fixed tab issues, improved escapeinside behavior

TomLebeda · Nov 4, 2023 · 1ebd1a6 · 1ebd1a6
1 parent b59d98c
commit 1ebd1a6
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /target
 .vimproject
 sample_latex_project
+builder_script.sh
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/LICENSE b/LICENSE
diff --git a/examples/config-example.json b/examples/config-example.json
diff --git a/examples/example_full.pdf b/examples/example_full.pdf
diff --git a/examples/example_julia.png b/examples/example_julia.png
diff --git a/examples/example_rust.png b/examples/example_rust.png
diff --git a/examples/highlights-json.scm b/examples/highlights-json.scm
diff --git a/examples/highlights-julia.scm b/examples/highlights-julia.scm
diff --git a/examples/highlights-python.scm b/examples/highlights-python.scm
diff --git a/examples/highlights-rust.scm b/examples/highlights-rust.scm
diff --git a/readme.md b/readme.md
diff --git a/src/formatter.rs b/src/formatter.rs
@@ -27,6 +27,7 @@ impl HighlightedText {
                     .replace('{', "\\{")
                     .replace("\\textbackslash", "\\textbackslash{}") // now add the empty braces to break the command without escaping them
                     .replace(' ', "\\ ")
+                    .replace('\t', "\\ ".repeat(conf.tab_size).as_str())
                     .replace('_', "\\_")
                     .replace('^', " \\^") // the space in front is necessary otherwise it would add hat to letters
                     .replace('&', "\\&")
@@ -70,7 +71,8 @@ pub fn generate_latex_verbatim(
 	captionpos=b, % put the caption at the bottom (b) or top (t) or both (bt)
 	label={lst:CHANGE ME}, % label to be referenced via \ref{}
 	numbers=left, % line numbers on the left
-	numberstyle={\scriptsize\ttfamily\color{black!60}} % the style for line numbers
+	numberstyle={\scriptsize\ttfamily\color{black!60}}, % the style for line numbers
+	escapeinside={<@}{@>} % between those sequences are command evaluated
 ]";
     let footer = r"\end{lstlisting}";
     let mut buffer = "".to_string();

diff --git a/src/main.rs b/src/main.rs
@@ -14,7 +14,7 @@ use std::path::Path;
 #[derive(Parser)]
 #[command(
     author = "Tomáš Lebeda <[email protected]>",
-    version = "1.0.0",
+    version = "1.0.1",
     about = "Generate LaTeX for highlighted code listings with the power of TreeSitter."
 )]
 pub struct CliArgs {
@@ -34,6 +34,10 @@ pub struct CliArgs {
     #[arg(long, default_value_t = String::from("@>"))]
     pub escape_end: String,
 
+    /// Tab size as a number of spaces
+    #[arg(long, default_value_t = 4)]
+    pub tab_size: usize,
+
     /// If enabled, the output will not be wrapped by verbatim environment, it will be only the "raw insides".
     #[arg(short, long)]
     pub raw: bool,

diff --git a/src/parser.rs b/src/parser.rs
diff --git a/src/validator.rs b/src/validator.rs