Also preserve whitespaces after values

Relates to #327

Author: YDX-2147483647

src/types/mod.rs

@@ -610,11 +610,12 @@ mod tests {
     fn test_preserve_space_separator() {
         // https://github.com/typst/hayagriva/issues/312
         // https://github.com/typst/hayagriva/issues/440
-        let serial_numbers = &["ISO/IEC 23009-1:2022(E)", "GB/T 7714—2025", "GB/T 7714"];
+        let serial_numbers =
+            &["ISO/IEC 23009-1:2022(E)", "GB/T 7714—2025", "GB/T 7714", "第 6 册"];
         for s in serial_numbers {
             let val: MaybeTyped<Numeric> = MaybeTyped::infallible_from_str(s);
             // It can be either typed or string, as long as whitespaces between
-            // prefixes and numbers are preserved.
+            // affixes and numbers are preserved.
             assert_eq!(val.to_string(), *s);
         }
 

src/types/numeric.rs

@@ -250,7 +250,7 @@ impl FromStr for Numeric {
         let prefix = s.eat_while(|c: char| !c.is_numeric() && c != '-');
 
         let value = number(&mut s).ok_or(NumericError::NoNumber)?;
-        s.eat_whitespace();
+        let space_after_value = s.eat_whitespace();
 
         let value = match s.peek() {
             Some(c) if is_delimiter(c) => {
@@ -290,7 +290,11 @@ impl FromStr for Numeric {
             } else {
                 Some(Box::new(prefix.to_string()))
             },
-            suffix: if post.is_empty() { None } else { Some(Box::new(post.to_string())) },
+            suffix: if post.is_empty() {
+                None
+            } else {
+                Some(Box::new(format!("{space_after_value}{post}")))
+            },
         })
     }
 }

src/types/page.rs

@@ -416,15 +416,14 @@ mod test {
     #[test]
     fn nonnumeric_page() {
         // https://github.com/typst/hayagriva/issues/170
-        for s in &["11E201", "072711"] {
+        for s in &["11E201", "072711", "1.1-1.36", "011-012"] {
             let n: MaybeTyped<PageRanges> = MaybeTyped::infallible_from_str(s);
             assert_eq!(n, MaybeTyped::String(s.to_string()));
         }
 
         // Page ranges should still be parsed as numeric values.
-        let n: MaybeTyped<PageRanges> = MaybeTyped::infallible_from_str("S10-15");
         assert_eq!(
-            n,
+            MaybeTyped::<PageRanges>::infallible_from_str("S10-15"),
             MaybeTyped::Typed(PageRanges::new(vec![PageRangesPart::Range(
                 Numeric::from_str("S10").unwrap(),
                 Numeric::from_str("15").unwrap(),

tests/citeproc-pass.txt

@@ -410,6 +410,7 @@ namespaces_NonNada3
 number_FailingDelimiters
 number_IsNumericWithAlpha
 number_MixedPageRange
+number_MixedText
 number_PageFirst
 number_PageRange
 number_SimpleNumberArabic