Fix number_LeadingZeros

Author: YDX-2147483647

docs/file-format.md

@@ -540,10 +540,9 @@ range and contain only integers, but may contain negative numbers. Numeric varia
 page-range: S10-15  # Page S10 to 15
 ```
 
-Note that the prefix and suffix for a numeric variable should be non-numeric. If
-you specify a number with leading zeros or numeric suffix, then the whole variable
-will be interpreted as a [string](#string) instead. This improves the style for
-atypical page numbers like `011` and `11E201`.
+Note that if you specify a number with a numeric affix, the whole variable will
+be interpreted as a [string](#string) instead. This improves the style for
+atypical page numbers like `11E201`.
 
 #### Unicode Language Identifier
 

src/csl/rendering/mod.rs

@@ -1132,6 +1132,10 @@ impl<T: EntryLike> Iterator for BranchConditionIter<'_, '_, T> {
                             self.ctx.resolve_number_variable(var),
                             Some(NumberVariableResult::Regular(MaybeTyped::Typed(_)))
                         ),
+                        Variable::Page(var) => matches!(
+                            self.ctx.resolve_page_variable(var),
+                            Some(MaybeTyped::Typed(_))
+                        ),
                         _ => false,
                     })
                 } else {

src/types/mod.rs

@@ -552,6 +552,12 @@ mod tests {
         assert!(val.suffix.is_none());
         assert_eq!(&val.to_string(), "-5");
 
+        let val = Numeric::from_str("01").unwrap();
+        assert!(val.value == NumericValue::Number(1));
+        assert_eq!(val.prefix_str(), Some("0"));
+        assert!(val.suffix.is_none());
+        assert_eq!(&val.to_string(), "01");
+
         let val = Numeric::from_str("1st").unwrap();
         assert!(val.value == NumericValue::Number(1));
         assert!(val.prefix.is_none());

src/types/numeric.rs

@@ -247,7 +247,18 @@ impl FromStr for Numeric {
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         let mut s = Scanner::new(value);
         s.eat_whitespace();
-        let prefix = s.eat_while(|c: char| !c.is_numeric() && c != '-');
+
+        let prefix = {
+            // Eat non-numeric characters and leading zeros.
+            let start = s.cursor();
+            s.eat_while(|c: char| !c.is_numeric() && c != '-');
+            let zeros = s.eat_while('0');
+            if !zeros.is_empty() && s.peek().is_none_or(|c| !c.is_numeric()) {
+                // Uneat the last zero if the value is just zero.
+                s.uneat();
+            }
+            s.from(start)
+        };
 
         let value = number(&mut s).ok_or(NumericError::NoNumber)?;
         let space_after_value = s.eat_whitespace();
@@ -329,23 +340,18 @@ pub enum NumericError {
     MissingDelimiter,
 }
 
-/// Eat a number from the scanner.
-/// The number can be positive, negative, or zero, but can't have leading zeros.
+/// Eat a number from the scanner, assuming leading whitespaces and zeros have
+/// already been eaten.
+///
+/// The number can be positive, negative, or zero.
 fn number(s: &mut Scanner) -> Option<i32> {
-    let start = s.cursor();
-
     let negative = s.eat_if('-');
-    let leading_zero = s.eat_if('0');
     let num = s.eat_while(|c: char| c.is_numeric());
-
-    match (leading_zero, num.is_empty()) {
-        (true, true) => Some(0),
-        (false, false) => num.parse::<i32>().ok().map(|n| if negative { -n } else { n }),
-        _ => {
-            s.jump(start);
-            None
-        }
+    if num.is_empty() {
+        return None;
     }
+
+    num.parse::<i32>().ok().map(|n| if negative { -n } else { n })
 }
 
 impl Display for Numeric {

src/types/page.rs

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

tests/citeproc-pass.txt

@@ -409,6 +409,7 @@ nameorder_ShortNameAsSortDemoteNever
 namespaces_NonNada3
 number_FailingDelimiters
 number_IsNumericWithAlpha
+number_LeadingZeros
 number_MixedPageRange
 number_MixedText
 number_PageFirst