fmt, handle \r\n correctly in bibtex

Author: CraftSpider

crates/engine_bibtex/bibtex/bibtex.c

@@ -529,8 +529,16 @@ input_ln(peekable_input_t *peekable)
         buffer[last] = peekable_getc(peekable);
         last++;
     }
+    
+    // For side effects - consume the eoln we saw
+    int eoln = peekable_getc(peekable);
 
-    peekable_getc(peekable);
+    // Handle \r\n newlines on Windows by trying to consume a \n after a \r, unget if it's not that exact pair
+    int next = peekable_getc(peekable);
+    printf("Next Char: %d\n", next);
+    if (!(eoln == '\r' && next == '\n')) {
+        peekable_ungetc(peekable, next);
+    }
 
     while (last > 0) {
         if (lex_class[buffer[last - 1]] == 1 /*white_space */ )

tests/bibtex.rs

@@ -22,10 +22,7 @@ struct TestCase {
 }
 
 impl TestCase {
-    fn new(
-        stem: &str,
-        subdir: Option<&str>,
-    ) -> Self {
+    fn new(stem: &str, subdir: Option<&str>) -> Self {
         TestCase {
             stem: stem.to_owned(),
             subdir: subdir.map(String::from),
@@ -94,9 +91,7 @@ fn single_entry() {
 
 #[test]
 fn test_empty_files() {
-    TestCase::new("empty", Some("empty"))
-        .test_bbl(false)
-        .go()
+    TestCase::new("empty", Some("empty")).test_bbl(false).go()
 }
 
 #[test]

tests/util/mod.rs

@@ -166,8 +166,6 @@ impl ExpectedInfo {
     }
 
     pub fn test_data(&self, observed: &[u8]) {
-        println!("Expected:\n{:?}", self.contents);
-        println!("Observed:\n{observed:?}");
         if self.contents == observed {
             return;
         }