diff options
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | converter/Cargo.toml (renamed from parser/Cargo.toml) | 2 | ||||
| -rw-r--r-- | converter/src/bin/mdialogc.rs (renamed from parser/src/bin/mdialogp.rs) | 6 | ||||
| -rw-r--r-- | converter/src/error.rs (renamed from parser/src/error.rs) | 0 | ||||
| -rw-r--r-- | converter/src/lib.rs (renamed from parser/src/lib.rs) | 0 | ||||
| -rw-r--r-- | converter/src/macros.rs (renamed from parser/src/macros.rs) | 0 | ||||
| -rw-r--r-- | converter/src/parse.rs (renamed from parser/src/parse.rs) | 5 | ||||
| -rw-r--r-- | converter/src/syntax_checker.rs (renamed from parser/src/syntax_checker.rs) | 0 | ||||
| -rw-r--r-- | converter/src/utils.rs (renamed from parser/src/utils.rs) | 0 | ||||
| -rw-r--r-- | converter/src/utils/path_fmt.rs (renamed from parser/src/utils/path_fmt.rs) | 0 | ||||
| -rw-r--r-- | converter/usage.txt | 6 | ||||
| -rw-r--r-- | converter/version.txt | 2 | ||||
| -rw-r--r-- | src/lib.rs | 6 | ||||
| -rw-r--r-- | usage.txt | 6 | ||||
| -rw-r--r-- | version.txt | 1 |
16 files changed, 21 insertions, 21 deletions
@@ -89,12 +89,12 @@ name = "markdialog" version = "0.1.0" dependencies = [ "built_res", - "markdialog_parser", + "markdialog_converter", "markdialog_player", ] [[package]] -name = "markdialog_parser" +name = "markdialog_converter" version = "0.0.0" dependencies = [ "colored", @@ -7,10 +7,10 @@ edition = "2024" members = [ "built_res", # Built Resources "player", # Dialog Player - "parser" # Markdown Parser + "converter" # Markdown Converter ] [dependencies] built_res = { path = "built_res" } markdialog_player = { path = "player" } -markdialog_parser = { path = "parser" } +markdialog_converter = { path = "converter" } diff --git a/parser/Cargo.toml b/converter/Cargo.toml index 2d7cb0c..982d18a 100644 --- a/parser/Cargo.toml +++ b/converter/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "markdialog_parser" +name = "markdialog_converter" workspaces.version = true edition = "2024" diff --git a/parser/src/bin/mdialogp.rs b/converter/src/bin/mdialogc.rs index 50ed06f..ebe7804 100644 --- a/parser/src/bin/mdialogp.rs +++ b/converter/src/bin/mdialogc.rs @@ -1,4 +1,4 @@ -use markdialog_parser::{ +use markdialog_converter::{ error::{Exit, handle_exit}, parse::parse, special_argument, special_flag, @@ -12,13 +12,13 @@ fn process() -> Result<(), Exit> { let version = special_flag!(args, "--version") || special_flag!(args, "-v"); if version { - let version = include_str!("../../../version.txt"); + let version = include_str!("../../version.txt"); println!("{}", version.trim()); return Err(Exit::Code(0)); } if help || args.len() < 1 { - let usage = include_str!("../../../usage.txt"); + let usage = include_str!("../../usage.txt"); println!("{}", usage.trim()); return Err(Exit::Code(0)); } diff --git a/parser/src/error.rs b/converter/src/error.rs index b594165..b594165 100644 --- a/parser/src/error.rs +++ b/converter/src/error.rs diff --git a/parser/src/lib.rs b/converter/src/lib.rs index d7caac3..d7caac3 100644 --- a/parser/src/lib.rs +++ b/converter/src/lib.rs diff --git a/parser/src/macros.rs b/converter/src/macros.rs index 894b3f4..894b3f4 100644 --- a/parser/src/macros.rs +++ b/converter/src/macros.rs diff --git a/parser/src/parse.rs b/converter/src/parse.rs index c4c69f8..c480c3a 100644 --- a/parser/src/parse.rs +++ b/converter/src/parse.rs @@ -771,11 +771,11 @@ pub fn convert_to_step_sentence_structure(input: String) -> Result<String, Exit> if code_record_mode { // If code block marker is found again, end code recording if line.starts_with("```") && code_record_mode { - sentences_buffer.push_str("`\n"); + sentences_buffer.push_str("\n"); code_record_mode = false; continue; } - sentences_buffer.push_str(format!("{}\\n", line).as_str()); + sentences_buffer.push_str(format!("`{}`", line).as_str()); continue; } @@ -837,7 +837,6 @@ pub fn convert_to_step_sentence_structure(input: String) -> Result<String, Exit> // Start code recording if line.starts_with("```") && !code_record_mode { - sentences_buffer.push('`'); code_record_mode = true; continue; } diff --git a/parser/src/syntax_checker.rs b/converter/src/syntax_checker.rs index 334fa9d..334fa9d 100644 --- a/parser/src/syntax_checker.rs +++ b/converter/src/syntax_checker.rs diff --git a/parser/src/utils.rs b/converter/src/utils.rs index 0fbb516..0fbb516 100644 --- a/parser/src/utils.rs +++ b/converter/src/utils.rs diff --git a/parser/src/utils/path_fmt.rs b/converter/src/utils/path_fmt.rs index 8750db6..8750db6 100644 --- a/parser/src/utils/path_fmt.rs +++ b/converter/src/utils/path_fmt.rs diff --git a/converter/usage.txt b/converter/usage.txt new file mode 100644 index 0000000..e03897e --- /dev/null +++ b/converter/usage.txt @@ -0,0 +1,6 @@ +mdialogc -i <FILE> -o <FILE> + -i --input <FILE> Input file (Markdown / MarkDialog source) + -o, --output <FILE> Output file (Generated IR / result) + + -h, --help Show this content + -v, --version Show version diff --git a/converter/version.txt b/converter/version.txt new file mode 100644 index 0000000..032f755 --- /dev/null +++ b/converter/version.txt @@ -0,0 +1,2 @@ +mdialogc (0.1.0) +Mark Dialog Converter - Copyright © 2026 Weicao-CatilGrass @@ -3,9 +3,9 @@ // pub use markdialog_player::*; // } -// markdialog::parser -pub mod parser { - pub use markdialog_parser::*; +// markdialog::converter +pub mod converter { + pub use markdialog_converter::*; } // markdialog::res diff --git a/usage.txt b/usage.txt deleted file mode 100644 index 94d68b2..0000000 --- a/usage.txt +++ /dev/null @@ -1,6 +0,0 @@ -mdialogp -i <FILE> -o <FILE> - -i, --input <FILE> Input file (Markdown / MarkDialog source) - -o, --output <FILE> Output file (Generated IR / result) - - -h, --help Show help and exit - -v, --version Show version and exit diff --git a/version.txt b/version.txt deleted file mode 100644 index 6e8bf73..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -0.1.0 |