diff --git a/changelog.md b/changelog.md index fc7d482f..f1ade603 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,9 @@ +texmath (unreleased) + + * TeX reader: consume a single token for unbraced script arguments. + For example, `x^12` and `x_12` now mean `x^{1}2` and `x_{1}2`, + while braced multi-digit and decimal arguments remain intact. + texmath (0.13.3.3) * Typst writer: add some needed `$` inside `[..]` content blocks. diff --git a/src/Text/TeXMath/Readers/TeX.hs b/src/Text/TeXMath/Readers/TeX.hs index b0bd5c38..64b0d42a 100644 --- a/src/Text/TeXMath/Readers/TeX.hs +++ b/src/Text/TeXMath/Readers/TeX.hs @@ -71,10 +71,13 @@ getPrimes cs = _ -> "\x2057" <> getPrimes (drop 4 cs) expr1 :: TP Exp -expr1 = choice +expr1 = expr1With number + +expr1With :: TP Exp -> TP Exp +expr1With numberParser = choice [ inbraces , variable - , number + , numberParser , operator , bareSubSup , enclosure @@ -628,10 +631,16 @@ isUnderover (EUnder _ _ (ESymbol TUnder "\x23B5")) = True -- \underbracket isUnderover (EUnder _ _ (ESymbol TUnder "\x23DF")) = True -- \underbrace isUnderover _ = False +-- Unbraced scripts take one token, so x^12 means x^{1}2. Braced groups +-- still use the normal expression parser, including multi-digit numbers. +scriptArg :: TP Exp +scriptArg = (fst <$> operatorname) + <|> expr1With (lexeme $ ENumber . T.singleton <$> digit) + subSup :: Maybe Bool -> Bool -> Exp -> TP Exp subSup limits convertible a = try $ do - let sub1 = symbol "_" >> expr1 -- see #273 - let sup1 = (symbol "^" >> expr1) <|> primes + let sub1 = symbol "_" >> scriptArg -- see #273 + let sup1 = (symbol "^" >> scriptArg) <|> primes (b,c) <- try (do {m <- sub1; n <- sup1; return (m,n)}) <|> (do {n <- sup1; m <- sub1; return (m,n)}) return $ case limits of @@ -642,7 +651,7 @@ subSup limits convertible a = try $ do superOrSubscripted :: Maybe Bool -> Bool -> Exp -> TP Exp superOrSubscripted limits convertible a = try $ do - (c,b) <- ((,) <$> oneOf "^_" <*> (spaces >> expr)) + (c,b) <- ((,) <$> oneOf "^_" <*> (ignorable >> scriptArg)) <|> (('^',) <$> primes) case c of '^' -> return $ case limits of diff --git a/test/reader/tex/decimal_scripts.test b/test/reader/tex/decimal_scripts.test new file mode 100644 index 00000000..57504bf3 --- /dev/null +++ b/test/reader/tex/decimal_scripts.test @@ -0,0 +1,19 @@ +<<< tex +x^1.2+x^.5+x^{1.2}+x_1.2+x_.5+x_{1.2} +>>> native +[ ESuper (EIdentifier "x") (ENumber "1") +, ENumber ".2" +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (ESymbol Ord ".") +, ENumber "5" +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (ENumber "1.2") +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ENumber "1") +, ENumber ".2" +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ESymbol Ord ".") +, ENumber "5" +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ENumber "1.2") +] diff --git a/test/reader/tex/numeric_script_primes.test b/test/reader/tex/numeric_script_primes.test new file mode 100644 index 00000000..8b265953 --- /dev/null +++ b/test/reader/tex/numeric_script_primes.test @@ -0,0 +1,14 @@ +<<< tex +x_1'+x_12'+x_{1'}+x^12' +>>> native +[ ESubsup (EIdentifier "x") (ENumber "1") (ESymbol Pun "\8242") +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ENumber "1") +, ESuper (ENumber "2") (ESymbol Pun "\8242") +, ESymbol Bin "+" +, ESub + (EIdentifier "x") (ESuper (ENumber "1") (ESymbol Pun "\8242")) +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (ENumber "1") +, ESuper (ENumber "2") (ESymbol Pun "\8242") +] diff --git a/test/reader/tex/numeric_scripts.test b/test/reader/tex/numeric_scripts.test new file mode 100644 index 00000000..a5886693 --- /dev/null +++ b/test/reader/tex/numeric_scripts.test @@ -0,0 +1,13 @@ +<<< tex +x^12+x^{12}+x_12+x_{12} +>>> native +[ ESuper (EIdentifier "x") (ENumber "1") +, ENumber "2" +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (ENumber "12") +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ENumber "1") +, ENumber "2" +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ENumber "12") +] diff --git a/test/reader/tex/numeric_subsup.test b/test/reader/tex/numeric_subsup.test new file mode 100644 index 00000000..7ff91c3a --- /dev/null +++ b/test/reader/tex/numeric_subsup.test @@ -0,0 +1,15 @@ +<<< tex +x_1^23+x^1_23+x_12^3+x^12_3 +>>> native +[ ESubsup (EIdentifier "x") (ENumber "1") (ENumber "2") +, ENumber "3" +, ESymbol Bin "+" +, ESubsup (EIdentifier "x") (ENumber "2") (ENumber "1") +, ENumber "3" +, ESymbol Bin "+" +, ESub (EIdentifier "x") (ENumber "1") +, ESuper (ENumber "2") (ENumber "3") +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (ENumber "1") +, ESub (ENumber "2") (ENumber "3") +] diff --git a/test/reader/tex/script_commands_and_comments.test b/test/reader/tex/script_commands_and_comments.test new file mode 100644 index 00000000..336d1f61 --- /dev/null +++ b/test/reader/tex/script_commands_and_comments.test @@ -0,0 +1,20 @@ +<<< tex +x_\alpha^12+x^\mathrm{12}3+x^\operatorname{foo}3+x^% comment +12+x_% comment +1^23 +>>> native +[ ESubsup (EIdentifier "x") (EIdentifier "\945") (ENumber "1") +, ENumber "2" +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (EStyled TextNormal [ ENumber "12" ]) +, ENumber "3" +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (EMathOperator "foo") +, ENumber "3" +, ESymbol Bin "+" +, ESuper (EIdentifier "x") (ENumber "1") +, ENumber "2" +, ESymbol Bin "+" +, ESubsup (EIdentifier "x") (ENumber "1") (ENumber "2") +, ENumber "3" +] diff --git a/test/reader/tex/simple_sum_formula.test b/test/reader/tex/simple_sum_formula.test index b329a460..4bb91672 100644 --- a/test/reader/tex/simple_sum_formula.test +++ b/test/reader/tex/simple_sum_formula.test @@ -1,5 +1,5 @@ <<< tex -\sum_{i=1}^100 x = \frac{100*101}{2} +\sum_{i=1}^{100} x = \frac{100*101}{2} >>> native [ EUnderover diff --git a/test/writer/starmath/script_token_boundaries.test b/test/writer/starmath/script_token_boundaries.test new file mode 100644 index 00000000..9f01b442 --- /dev/null +++ b/test/writer/starmath/script_token_boundaries.test @@ -0,0 +1,4 @@ +<<< tex +x^12+x^{1}2+x^{12}+x_12+x_{1}2+x_{12} +>>> starmath +x^1 2 + x^1 2 + x^12 + x_1 2 + x_1 2 + x_12 diff --git a/test/writer/starmath/script_token_boundaries_inline.test b/test/writer/starmath/script_token_boundaries_inline.test new file mode 100644 index 00000000..f1bc7c7d --- /dev/null +++ b/test/writer/starmath/script_token_boundaries_inline.test @@ -0,0 +1,4 @@ +<<< tex +x^12+x^{1}2+x^{12}+x_12+x_{1}2+x_{12} +>>> starmath-inline +x^1 2 + x^1 2 + x^12 + x_1 2 + x_1 2 + x_12