texmath 0.8.1 → 0.8.2
raw patch · 9 files changed
+24/−35 lines, 9 files
Files
- changelog +6/−0
- src/Text/TeXMath/Readers/TeX.hs +9/−1
- tests/readers/tex/11.native +1/−1
- tests/readers/tex/18.native +1/−1
- tests/writers/11.mml +1/−3
- tests/writers/11.omml +1/−9
- tests/writers/18.mml +2/−5
- tests/writers/18.omml +2/−14
- texmath.cabal +1/−1
changelog view
@@ -1,3 +1,9 @@+texmath (0.8.2)++ * Better handling of decimal points. Decimal points are now parsed+ as parts of numbers, not as separate symbols. E.g. in MathML they+ now appear in `<mn>` elements. Closes #74.+ texmath (0.8.1) * OMML: Don't force everything into Roman font by default.
src/Text/TeXMath/Readers/TeX.hs view
@@ -244,7 +244,15 @@ inbrackets = (brackets $ manyExp $ notFollowedBy (char ']') >> expr) number :: TP Exp-number = lexeme $ ENumber <$> many1 digit+number = lexeme $ ENumber <$> decimalNumber+ where decimalNumber = try $ do+ xs <- many digit+ pt <- option "" (string ".")+ if null pt+ then if null xs+ then mzero+ else return xs+ else ((xs ++ pt) ++) <$> many1 digit enclosure :: TP Exp enclosure = basicEnclosure <|> scaledEnclosure <|> delimited
tests/readers/tex/11.native view
@@ -1,1 +1,1 @@-[ESub (EIdentifier "\981") (EIdentifier "n"),ESymbol Open "(",EIdentifier "\954",ESymbol Close ")",ESymbol Rel "=",ENumber "0",ESymbol Ord ".",ENumber "033",ESubsup (EIdentifier "C") (EIdentifier "n") (ENumber "2"),ESuper (EIdentifier "\954") (EGrouped [ESymbol Bin "\8722",ENumber "11",ESymbol Ord "/",ENumber "3"]),ESymbol Pun ",",ESpace (1 % 1),EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "L") (ENumber "0")),ESymbol Rel "\8810",EIdentifier "\954",ESymbol Rel "\8810",EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "l") (ENumber "0"))]+[ESub (EIdentifier "\981") (EIdentifier "n"),ESymbol Open "(",EIdentifier "\954",ESymbol Close ")",ESymbol Rel "=",ENumber "0.033",ESubsup (EIdentifier "C") (EIdentifier "n") (ENumber "2"),ESuper (EIdentifier "\954") (EGrouped [ESymbol Bin "\8722",ENumber "11",ESymbol Ord "/",ENumber "3"]),ESymbol Pun ",",ESpace (1 % 1),EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "L") (ENumber "0")),ESymbol Rel "\8810",EIdentifier "\954",ESymbol Rel "\8810",EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "l") (ENumber "0"))]
tests/readers/tex/18.native view
@@ -1,1 +1,1 @@-[ENumber "1",ESymbol Ord ".",ENumber "3",ESymbol Bin "\215",ESymbol Ord ".",ENumber "2"]+[ENumber "1.3",ESymbol Bin "\215",ENumber ".2"]
tests/writers/11.mml view
@@ -9,9 +9,7 @@ <mi>κ</mi> <mo stretchy="false" form="postfix">)</mo> <mo>=</mo>- <mn>0</mn>- <mo>.</mo>- <mn>033</mn>+ <mn>0.033</mn> <msubsup> <mi>C</mi> <mi>n</mi>
tests/writers/11.omml view
@@ -36,15 +36,7 @@ </m:r> <m:r> <m:rPr />- <m:t>0</m:t>- </m:r>- <m:r>- <m:rPr />- <m:t>.</m:t>- </m:r>- <m:r>- <m:rPr />- <m:t>033</m:t>+ <m:t>0.033</m:t> </m:r> <m:sSubSup> <m:e>
tests/writers/18.mml view
@@ -1,11 +1,8 @@ <?xml version='1.0' ?> <math display="block" xmlns="http://www.w3.org/1998/Math/MathML"> <mrow>- <mn>1</mn>- <mo>.</mo>- <mn>3</mn>+ <mn>1.3</mn> <mo>×</mo>- <mo>.</mo>- <mn>2</mn>+ <mn>.2</mn> </mrow> </math>
tests/writers/18.omml view
@@ -6,15 +6,7 @@ <m:oMath> <m:r> <m:rPr />- <m:t>1</m:t>- </m:r>- <m:r>- <m:rPr />- <m:t>.</m:t>- </m:r>- <m:r>- <m:rPr />- <m:t>3</m:t>+ <m:t>1.3</m:t> </m:r> <m:r> <m:rPr />@@ -22,11 +14,7 @@ </m:r> <m:r> <m:rPr />- <m:t>.</m:t>- </m:r>- <m:r>- <m:rPr />- <m:t>2</m:t>+ <m:t>.2</m:t> </m:r> </m:oMath> </m:oMathPara>
texmath.cabal view
@@ -1,5 +1,5 @@ Name: texmath-Version: 0.8.1+Version: 0.8.2 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics.