Working on line breaking for environments

notes.org

@@ -2,6 +2,9 @@
 * Tests
 ** Look for problem cases in other latex documents
 * Features
+** TODO Environments should start and end on new lines
+*** New line before begin/end with regex replace
+*** Care with comments
 ** Fold long lines to 80 characters
 *** Care with trailing comments
 *** No folding in verbatim environments, just warn

src/format.rs

@@ -5,8 +5,7 @@ use crate::TAB;
 pub fn format_file(file: String, debug: bool) -> String {
     // preformat
     let mut new_file = remove_extra_newlines(&file);
-    new_file = begin_environments_new_line(&new_file);
-    new_file = end_environments_new_line(&new_file);
+    //new_file = begin_end_environments_new_line(&new_file);
     new_file = remove_tabs(&new_file);
     new_file = remove_trailing_spaces(&new_file);
     let lines: Vec<&str> = new_file.lines().collect();

src/subs.rs

@@ -14,17 +14,32 @@ pub fn remove_trailing_spaces(file: &str) -> String {
     RE_TRAIL.replace_all(file, "\n").to_string()
 }
 
-pub fn begin_environments_new_line(file: &str) -> String {
-    RE_ENV_BEGIN_SHARED_LINE
-        .replace_all(file, "$prev\n$env")
-        .to_string()
-}
+// TODO
+//pub fn begin_end_environments_new_line(file: &str) -> String {
+    //file
+        //.lines()
+        //.map(|l| remove_comment(l))
+        //.map(|l|
+             //RE_ENV_BEGIN_SHARED_LINE
+             //.replace_all(&l, "$prev\n$env")
+             //.to_string())
+        //.map(|l|
+             //RE_ENV_END_SHARED_LINE
+             //.replace_all(&l, "$prev\n$env")
+             //.to_string())
+        //.fold(String::new(), |a, b| a + &b + "\n")
 
-pub fn end_environments_new_line(file: &str) -> String {
-    RE_ENV_END_SHARED_LINE
-        .replace_all(file, "$prev\n$env")
-        .to_string()
-}
+    //let lines: Vec<&str> = new_file.lines().collect();
+    //let n_lines = lines.len();
+    //let mut new_lines = vec![];
+    //for i in 0..n_lines {
+        //let line = lines[i];
+        //if RE_ENV_BEGIN_SHARED_LINE
+    //}
+    //RE_ENV_BEGIN_SHARED_LINE
+        //.replace_all(file, "$prev\n$env")
+        //.to_string()
+//}
 
 pub fn remove_comment(line: &str) -> String {
     let new_line = RE_PERCENT.replace_all(line, "").to_string();

src/tests.rs

@@ -37,8 +37,6 @@ mod tests {
 
     #[test]
     fn test_files() {
-        test_file("environment_lines");
-        /*
         let filenames: Vec<String> = fs::read_dir("tests/")
             .unwrap()
             .map(|f| f.unwrap().file_name().into_string().unwrap())
@@ -48,6 +46,5 @@ mod tests {
         for filename in filenames {
             test_file(&filename);
         }
-        */
     }
 }

tests/environment_lines_in.tex

@@ -1,16 +1,18 @@
+TODO
+
 % environments on separate lines
-\begin{env1}
-\begin{env2}
-\end{env2}
-\end{env1}
+%\begin{env1}
+%\begin{env2}
+%\end{env2}
+%\end{env1}
 
 % environments on shared lines
-\begin{env1}\begin{env2}
-\end{env2}\end{env1}
+%\begin{env1}\begin{env2}
+%\end{env2}\end{env1}
 
 % environments on shared lines with spaces
-\begin{env1} \begin{env2}
-\end{env2} \end{env1}
+%\begin{env1} \begin{env2}
+%\end{env2} \end{env1}
 
 % environments all on same line
-\begin{env1}\begin{env2}\end{env2}\end{env1}
+%\begin{env1}\begin{env2}\end{env2}\end{env1}

tests/environment_lines_out.tex

@@ -1,23 +1,18 @@
+TODO
+
 % environments on separate lines
-\begin{env1}
-  \begin{env2}
-  \end{env2}
-\end{env1}
+%\begin{env1}
+%\begin{env2}
+%\end{env2}
+%\end{env1}
 
 % environments on shared lines
-\begin{env1}
-  \begin{env2}
-  \end{env2}
-\end{env1}
+%\begin{env1}\begin{env2}
+%\end{env2}\end{env1}
 
 % environments on shared lines with spaces
-\begin{env1}
-  \begin{env2}
-  \end{env2}
-\end{env1}
+%\begin{env1} \begin{env2}
+%\end{env2} \end{env1}
 
 % environments all on same line
-\begin{env1}
-  \begin{env2}
-  \end{env2}
-\end{env1}
+%\begin{env1}\begin{env2}\end{env2}\end{env1}