Hello community, here is the log from the commit of package texmath for openSUSE:Leap:15.2 checked in at 2020-05-18 11:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/texmath (Old) and /work/SRC/openSUSE:Leap:15.2/.texmath.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texmath" Mon May 18 11:00:14 2020 rev:15 rq:806133 version:0.12.0.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/texmath/texmath.changes 2020-03-13 10:57:08.304424550 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.texmath.new.2738/texmath.changes 2020-05-18 11:00:15.438743625 +0200 @@ -1,0 +2,11 @@ +Wed May 6 06:54:10 UTC 2020 - [email protected] + +- Update texmath to version 0.12.0.2. + texmath (0.12.0.2) + + * Allow pandoc-types 1.21. + * Pandoc output: omit empty Emph for sub/superscript without base (#155). + * tex writer: Use `\overline{\overline{B}}` instead of unicode + double line accent (#153). + +------------------------------------------------------------------- Old: ---- texmath-0.12.0.1.tar.gz New: ---- texmath-0.12.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texmath.spec ++++++ --- /var/tmp/diff_new_pack.s8DINE/_old 2020-05-18 11:00:15.858744495 +0200 +++ /var/tmp/diff_new_pack.s8DINE/_new 2020-05-18 11:00:15.858744495 +0200 @@ -19,7 +19,7 @@ %global pkg_name texmath %bcond_with tests Name: %{pkg_name} -Version: 0.12.0.1 +Version: 0.12.0.2 Release: 0 Summary: Conversion between formats used to represent mathematics License: GPL-2.0-or-later ++++++ texmath-0.12.0.1.tar.gz -> texmath-0.12.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.0.1/changelog new/texmath-0.12.0.2/changelog --- old/texmath-0.12.0.1/changelog 2020-02-15 06:54:18.000000000 +0100 +++ new/texmath-0.12.0.2/changelog 2020-04-19 17:11:21.000000000 +0200 @@ -1,3 +1,10 @@ +texmath (0.12.0.2) + + * Allow pandoc-types 1.21. + * Pandoc output: omit empty Emph for sub/superscript without base (#155). + * tex writer: Use `\overline{\overline{B}}` instead of unicode + double line accent (#153). + texmath (0.12.0.1) * OMML writer: Fix overline and accent rendering (#152). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.0.1/src/Text/TeXMath/Writers/Pandoc.hs new/texmath-0.12.0.2/src/Text/TeXMath/Writers/Pandoc.hs --- old/texmath-0.12.0.1/src/Text/TeXMath/Writers/Pandoc.hs 2019-11-12 20:07:47.000000000 +0100 +++ new/texmath-0.12.0.2/src/Text/TeXMath/Writers/Pandoc.hs 2020-03-21 02:11:11.000000000 +0100 @@ -72,33 +72,34 @@ medspace = EText TextNormal "\x2005" widespace = EText TextNormal "\x2004" -renderStr :: TextType -> T.Text -> Inline +renderStr :: TextType -> T.Text -> [Inline] +renderStr _ "" = [] renderStr tt s = case tt of - TextNormal -> Str s - TextBold -> Strong [Str s] - TextItalic -> Emph [Str s] - TextMonospace -> Code nullAttr s - TextSansSerif -> Str s - TextDoubleStruck -> Str $ toUnicode tt s - TextScript -> Str $ toUnicode tt s - TextFraktur -> Str $ toUnicode tt s - TextBoldItalic -> Strong [Emph [Str s]] - TextSansSerifBold -> Strong [Str s] - TextBoldScript -> Strong [Str $ toUnicode tt s] - TextBoldFraktur -> Strong [Str $ toUnicode tt s] - TextSansSerifItalic -> Emph [Str s] - TextSansSerifBoldItalic -> Strong [Emph [Str s]] + TextNormal -> [Str s] + TextBold -> [Strong [Str s]] + TextItalic -> [Emph [Str s]] + TextMonospace -> [Code nullAttr s] + TextSansSerif -> [Str s] + TextDoubleStruck -> [Str $ toUnicode tt s] + TextScript -> [Str $ toUnicode tt s] + TextFraktur -> [Str $ toUnicode tt s] + TextBoldItalic -> [Strong [Emph [Str s]]] + TextSansSerifBold -> [Strong [Str s]] + TextBoldScript -> [Strong [Str $ toUnicode tt s]] + TextBoldFraktur -> [Strong [Str $ toUnicode tt s]] + TextSansSerifItalic -> [Emph [Str s]] + TextSansSerifBoldItalic -> [Strong [Emph [Str s]]] expToInlines :: TextType -> Exp -> Maybe [Inline] -expToInlines tt (ENumber s) = Just [renderStr tt s] -expToInlines TextNormal (EIdentifier s) = Just [renderStr TextItalic s] -expToInlines tt (EIdentifier s) = Just [renderStr tt s] -expToInlines tt (EMathOperator s) = Just [renderStr tt s] -expToInlines tt (ESymbol _ s) = Just [renderStr tt s] +expToInlines tt (ENumber s) = Just $ renderStr tt s +expToInlines TextNormal (EIdentifier s) = Just $ renderStr TextItalic s +expToInlines tt (EIdentifier s) = Just $ renderStr tt s +expToInlines tt (EMathOperator s) = Just $ renderStr tt s +expToInlines tt (ESymbol _ s) = Just $ renderStr tt s expToInlines tt (EDelimited start end xs) = do - xs' <- mapM (either (return . (:[]) . renderStr tt) (expToInlines tt)) xs - return $ [renderStr tt start] ++ concat xs' ++ [renderStr tt end] + xs' <- mapM (either (return . renderStr tt) (expToInlines tt)) xs + return $ renderStr tt start ++ concat xs' ++ renderStr tt end expToInlines tt (EGrouped xs) = expsToInlines tt xs expToInlines _ (EStyled tt' xs) = expsToInlines tt' xs expToInlines _ (ESpace n) = Just [Str $ getSpaceChars n] @@ -118,30 +119,30 @@ y' <- expToInlines tt y z' <- expToInlines tt z return $ x' ++ [Subscript y'] ++ [Superscript z'] -expToInlines _ (EText tt' x) = Just [renderStr tt' x] +expToInlines _ (EText tt' x) = Just $ renderStr tt' x expToInlines tt (EOver b (EGrouped [EIdentifier (T.unpack -> [c])]) (ESymbol Accent (T.unpack -> [accent]))) = expToInlines tt (EOver b (EIdentifier $ T.singleton c) (ESymbol Accent $ T.singleton accent)) expToInlines tt (EOver _ (EIdentifier (T.unpack -> [c])) (ESymbol Accent (T.unpack -> [accent]))) = case accent of - '\x203E' -> Just [renderStr tt' $ T.pack [c,'\x0304']] -- bar - '\x0304' -> Just [renderStr tt' $ T.pack [c,'\x0304']] -- bar combining - '\x00B4' -> Just [renderStr tt' $ T.pack [c,'\x0301']] -- acute - '\x0301' -> Just [renderStr tt' $ T.pack [c,'\x0301']] -- acute combining - '\x0060' -> Just [renderStr tt' $ T.pack [c,'\x0300']] -- grave - '\x0300' -> Just [renderStr tt' $ T.pack [c,'\x0300']] -- grave combining - '\x02D8' -> Just [renderStr tt' $ T.pack [c,'\x0306']] -- breve - '\x0306' -> Just [renderStr tt' $ T.pack [c,'\x0306']] -- breve combining - '\x02C7' -> Just [renderStr tt' $ T.pack [c,'\x030C']] -- check - '\x030C' -> Just [renderStr tt' $ T.pack [c,'\x030C']] -- check combining - '.' -> Just [renderStr tt' $ T.pack [c,'\x0307']] -- dot - '\x0307' -> Just [renderStr tt' $ T.pack [c,'\x0307']] -- dot combining - '\x00B0' -> Just [renderStr tt' $ T.pack [c,'\x030A']] -- ring - '\x030A' -> Just [renderStr tt' $ T.pack [c,'\x030A']] -- ring combining - '\x20D7' -> Just [renderStr tt' $ T.pack [c,'\x20D7']] -- arrow right - '\x20D6' -> Just [renderStr tt' $ T.pack [c,'\x20D6']] -- arrow left - '\x005E' -> Just [renderStr tt' $ T.pack [c,'\x0302']] -- hat - '\x0302' -> Just [renderStr tt' $ T.pack [c,'\x0302']] -- hat combining - '~' -> Just [renderStr tt' $ T.pack [c,'\x0303']] -- tilde - '\x0303' -> Just [renderStr tt' $ T.pack [c,'\x0303']] -- tilde combining + '\x203E' -> Just $ renderStr tt' $ T.pack [c,'\x0304'] -- bar + '\x0304' -> Just $ renderStr tt' $ T.pack [c,'\x0304'] -- bar combining + '\x00B4' -> Just $ renderStr tt' $ T.pack [c,'\x0301'] -- acute + '\x0301' -> Just $ renderStr tt' $ T.pack [c,'\x0301'] -- acute combining + '\x0060' -> Just $ renderStr tt' $ T.pack [c,'\x0300'] -- grave + '\x0300' -> Just $ renderStr tt' $ T.pack [c,'\x0300'] -- grave combining + '\x02D8' -> Just $ renderStr tt' $ T.pack [c,'\x0306'] -- breve + '\x0306' -> Just $ renderStr tt' $ T.pack [c,'\x0306'] -- breve combining + '\x02C7' -> Just $ renderStr tt' $ T.pack [c,'\x030C'] -- check + '\x030C' -> Just $ renderStr tt' $ T.pack [c,'\x030C'] -- check combining + '.' -> Just $ renderStr tt' $ T.pack [c,'\x0307'] -- dot + '\x0307' -> Just $ renderStr tt' $ T.pack [c,'\x0307'] -- dot combining + '\x00B0' -> Just $ renderStr tt' $ T.pack [c,'\x030A'] -- ring + '\x030A' -> Just $ renderStr tt' $ T.pack [c,'\x030A'] -- ring combining + '\x20D7' -> Just $ renderStr tt' $ T.pack [c,'\x20D7'] -- arrow right + '\x20D6' -> Just $ renderStr tt' $ T.pack [c,'\x20D6'] -- arrow left + '\x005E' -> Just $ renderStr tt' $ T.pack [c,'\x0302'] -- hat + '\x0302' -> Just $ renderStr tt' $ T.pack [c,'\x0302'] -- hat combining + '~' -> Just $ renderStr tt' $ T.pack [c,'\x0303'] -- tilde + '\x0303' -> Just $ renderStr tt' $ T.pack [c,'\x0303'] -- tilde combining _ -> Nothing where tt' = if tt == TextNormal then TextItalic else tt expToInlines tt (EScaled _ e) = expToInlines tt e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.0.1/src/Text/TeXMath/Writers/TeX.hs new/texmath-0.12.0.2/src/Text/TeXMath/Writers/TeX.hs --- old/texmath-0.12.0.1/src/Text/TeXMath/Writers/TeX.hs 2020-02-15 06:38:01.000000000 +0100 +++ new/texmath-0.12.0.2/src/Text/TeXMath/Writers/TeX.hs 2020-02-17 18:07:26.000000000 +0100 @@ -315,6 +315,12 @@ unless convertible $ tell [ControlSeq "\\limits"] tell [Token $ case pos of { Over -> '^'; Under -> '_' }] tellGroup (checkSubstack e1) + | case pos of {Over -> True; _ -> False} + , e1 == ESymbol Accent "\831" -> do -- double bar + tell [ControlSeq "\\overline", Literal "{", + ControlSeq "\\overline"] + tellGroup (writeExp b) + tell [Literal "}"] | otherwise -> do case pos of Over -> tell [ControlSeq "\\overset"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmath-0.12.0.1/texmath.cabal new/texmath-0.12.0.2/texmath.cabal --- old/texmath-0.12.0.1/texmath.cabal 2020-02-15 06:54:29.000000000 +0100 +++ new/texmath-0.12.0.2/texmath.cabal 2020-04-19 17:10:17.000000000 +0200 @@ -1,5 +1,5 @@ Name: texmath -Version: 0.12.0.1 +Version: 0.12.0.2 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics. @@ -87,8 +87,8 @@ Library Build-depends: base >= 4.8 && < 5, syb >= 0.4.2 && < 0.8, xml, parsec >= 3, containers, - pandoc-types >= 1.20 && < 1.21, mtl, text - + pandoc-types >= 1.20 && < 1.22, mtl, text + Exposed-modules: Text.TeXMath, Text.TeXMath.Types, Text.TeXMath.TeX, @@ -130,7 +130,7 @@ if flag(executable) Buildable: True Build-Depends: base >= 4.8 && < 5, texmath, xml, - pandoc-types >= 1.20 && < 1.21, + pandoc-types >= 1.20 && < 1.22, aeson, bytestring, text else Buildable: False
