Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package texmath for openSUSE:Factory checked in at 2023-11-08 22:17:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texmath (Old) and /work/SRC/openSUSE:Factory/.texmath.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texmath" Wed Nov 8 22:17:45 2023 rev:56 rq:1124062 version:0.12.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/texmath/texmath.changes 2023-09-21 22:23:55.126760463 +0200 +++ /work/SRC/openSUSE:Factory/.texmath.new.17445/texmath.changes 2023-11-08 22:18:03.935917527 +0100 @@ -1,0 +2,14 @@ +Fri Oct 27 16:59:02 UTC 2023 - Peter Simons <[email protected]> + +- Update texmath to version 0.12.8.4. + texmath (0.12.8.4) + + * TeX reader: ignore `\allowbreak` (#230). + + * TeX reader: handle `*{5}{lr}` in array column specifier (#229). + + * OMML reader: allow `m:e` to be missing in `m:nary` (#228). + Technically this is not allowed, according to the spec, but + Word and LibreOffice seem to tolerate it. + +------------------------------------------------------------------- Old: ---- texmath-0.12.8.3.tar.gz New: ---- texmath-0.12.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texmath.spec ++++++ --- /var/tmp/diff_new_pack.gj4ZOJ/_old 2023-11-08 22:18:04.571940892 +0100 +++ /var/tmp/diff_new_pack.gj4ZOJ/_new 2023-11-08 22:18:04.571940892 +0100 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: %{pkg_name} -Version: 0.12.8.3 +Version: 0.12.8.4 Release: 0 Summary: Conversion between math formats License: GPL-2.0-or-later ++++++ texmath-0.12.8.3.tar.gz -> texmath-0.12.8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.8.3/changelog new/texmath-0.12.8.4/changelog --- old/texmath-0.12.8.3/changelog 2001-09-09 03:46:40.000000000 +0200 +++ new/texmath-0.12.8.4/changelog 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,13 @@ +texmath (0.12.8.4) + + * TeX reader: ignore `\allowbreak` (#230). + + * TeX reader: handle `*{5}{lr}` in array column specifier (#229). + + * OMML reader: allow `m:e` to be missing in `m:nary` (#228). + Technically this is not allowed, according to the spec, but + Word and LibreOffice seem to tolerate it. + texmath (0.12.8.3) * OMML writer: use "on" and "off" instead of "1" and "0" for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.8.3/src/Text/TeXMath/Readers/OMML.hs new/texmath-0.12.8.4/src/Text/TeXMath/Readers/OMML.hs --- old/texmath-0.12.8.3/src/Text/TeXMath/Readers/OMML.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/texmath-0.12.8.4/src/Text/TeXMath/Readers/OMML.hs 2001-09-09 03:46:40.000000000 +0200 @@ -34,7 +34,7 @@ module Text.TeXMath.Readers.OMML (readOMML) where import Text.XML.Light -import Data.Maybe (isJust, mapMaybe, fromMaybe) +import Data.Maybe (isJust, mapMaybe, fromMaybe, maybeToList) import Data.List (intercalate) import Data.Char (isDigit, readLitChar) import qualified Data.Text as T @@ -385,19 +385,19 @@ (\e -> return $ concat $ mapMaybe (elemToExps) (elChildren e)) supExps <- filterChildName (hasElemName "m" "sup") element >>= (\e -> return $ concat $ mapMaybe (elemToExps) (elChildren e)) - baseExp <- filterChildName (hasElemName "m" "e") element >>= - elemToBase + let baseExp = maybeToList $ + filterChildName (hasElemName "m" "e") element >>= elemToBase case limLoc of - Just "undOvr" -> return [EUnderover True + Just "undOvr" -> return $ EUnderover True (ESymbol Op opChr) (EGrouped subExps) (EGrouped supExps) - , baseExp] - _ -> return [ESubsup + : baseExp + _ -> return $ ESubsup (ESymbol Op opChr) (EGrouped subExps) (EGrouped supExps) - , baseExp] + : baseExp elemToExps' element | isElem "m" "phant" element = do baseExp <- filterChildName (hasElemName "m" "e") element >>= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.8.3/src/Text/TeXMath/Readers/TeX.hs new/texmath-0.12.8.4/src/Text/TeXMath/Readers/TeX.hs --- old/texmath-0.12.8.3/src/Text/TeXMath/Readers/TeX.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/texmath-0.12.8.4/src/Text/TeXMath/Readers/TeX.hs 2001-09-09 03:46:40.000000000 +0200 @@ -45,6 +45,7 @@ import Data.Generics (everywhere, mkT) import Text.TeXMath.Readers.TeX.Commands ( styleOps, textOps, enclosures, operators, symbols, siUnitMap ) +import Data.Text.Read (decimal) type TP = Parser @@ -142,6 +143,7 @@ <|> tag <|> () <$ ctrlseq "nonumber" <|> (skipMany1 space <?> "whitespace") + <|> (() <$ ctrlseq "allowbreak") comment :: TP () comment = char '%' *> skipMany (noneOf "\n") *> optional newline @@ -434,13 +436,22 @@ -- we don't represent the line, but it shouldn't crash parsing arrayAlignments :: TP [Alignment] -arrayAlignments = try $ do - as <- braces (many (letter <|> char '|')) - let letterToAlignment 'l' = AlignLeft - letterToAlignment 'c' = AlignCenter - letterToAlignment 'r' = AlignRight - letterToAlignment _ = AlignCenter - return $ map letterToAlignment $ filter (/= '|') as +arrayAlignments = mconcat <$> + braces (many (((:[]) . letterToAlignment <$> letter) + <|> ([] <$ char '|') + <|> (do char '*' + num <- T.pack <$> braces (many1 digit) + cols <- arrayAlignments + case decimal num of + Left msg -> fail msg + Right (n :: Int, _) + -> return $ mconcat $ replicate n cols) + )) + where + letterToAlignment 'l' = AlignLeft + letterToAlignment 'c' = AlignCenter + letterToAlignment 'r' = AlignRight + letterToAlignment _ = AlignCenter environment :: Text -> TP Exp environment "\\begin" = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.8.3/test/reader/tex/issue229.test new/texmath-0.12.8.4/test/reader/tex/issue229.test --- old/texmath-0.12.8.3/test/reader/tex/issue229.test 1970-01-01 01:00:00.000000000 +0100 +++ new/texmath-0.12.8.4/test/reader/tex/issue229.test 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,16 @@ +<<< tex +\begin{array}{l*{2}{rc}} +1 & 2 & 3 & 4 & 5 +\end{array} + +>>> native +[ EArray + [ AlignLeft , AlignRight , AlignCenter , AlignRight , AlignCenter ] + [ [ [ ENumber "1" ] + , [ ENumber "2" ] + , [ ENumber "3" ] + , [ ENumber "4" ] + , [ ENumber "5" ] + ] + ] +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.8.3/texmath.cabal new/texmath-0.12.8.4/texmath.cabal --- old/texmath-0.12.8.3/texmath.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/texmath-0.12.8.4/texmath.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: texmath -Version: 0.12.8.3 +Version: 0.12.8.4 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between math formats.
