From e597fcf5b7130f821364135d694addbec4a73766 Mon Sep 17 00:00:00 2001 From: pho Date: Sat, 24 Apr 2021 17:18:03 +0000 Subject: [PATCH] Update to texmath-0.12.2 texmath (0.12.2) * MathML input: support mmultiscripts element (#158, #100). * Make MathML tag/attr recognition case-insensitive (#158). * Pandoc writer: better handling of styling such as `\mathrm` (#145). Previously identifiers were always italic, no matter what styling was applied. * Ignore `\tag` in TeX input (#162). * TeX writer: avoid unneeded `\left` and `\right` for delimited. We don't need `\left` and `\right` when the contents are "standard height." * TeX reader: parse implicit EDelimited sections (#172). We now parse `(x)` as EDelimited, even though `\right` and `\left` are not used. texmath (0.12.1.1) * Fix compilation with GHC-9.0.1 (#169, Simon Jakobi). Background: https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.0#simplified-subsumption * Add eqn to online demo. * Improve error messages for unknown control sequences, and restructure tex parser to be more efficient (#167). texmath (0.12.1) * OMML writer: explicitly mark symbols as non-italic (#109). Otherwise, for some reason, they appear as italic by default. * Improve error messages in reading tex arrays. * Improve support for `\bmod`, `\mod`, etc. (#165). Allow them to take complex arguments like `\left( 1 \right)`. * Improve support for `\genfrac` (#164). * Ignore `\textstyle`, `\scriptstyle`, `\scriptscriptstyle`, as we currently ignore `\displaystyle`. * Parse siunitx commands in reading tex (#157). * Improve handling of `\not` in reading tex (#161). Previously we only handled `\not` in front of certain symbols. * Support `\pod` and `\pmod` and clean up spacing and font for `\mod` and `\bmod` (#160). texmath (0.12.0.3) * Allow pandoc-types 1.22. 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). * OMML reader: Fix dropped arrows (#153). Add tests. --- textproc/hs-texmath/Makefile | 11 +- textproc/hs-texmath/PLIST | 183 +++++++++++++++--------------- textproc/hs-texmath/buildlink3.mk | 5 +- textproc/hs-texmath/distinfo | 10 +- 4 files changed, 106 insertions(+), 103 deletions(-) diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile index 9c572c20ca48..613092f5111d 100644 --- a/textproc/hs-texmath/Makefile +++ b/textproc/hs-texmath/Makefile @@ -1,15 +1,18 @@ -# $NetBSD: Makefile,v 1.21 2020/01/11 10:21:27 pho Exp $ +# $NetBSD: Makefile,v 1.22 2021/04/24 17:18:03 pho Exp $ -DISTNAME= texmath-0.12 +DISTNAME= texmath-0.12.2 CATEGORIES= textproc MAINTAINER= szptvlfn@NetBSD.org COMMENT= Conversion between formats used to represent mathematics LICENSE= gnu-gpl-v2 -.include "../../mk/haskell.mk" +CONFIGURE_ARGS+= -fexecutable + +.include "../../converters/hs-aeson/buildlink3.mk" # Only used by the executable .include "../../textproc/hs-pandoc-types/buildlink3.mk" .include "../../devel/hs-syb/buildlink3.mk" .include "../../textproc/hs-xml/buildlink3.mk" -.include "../../converters/hs-aeson/buildlink3.mk" +.include "../../net/hs-network-uri/buildlink3.mk" # Only used by the executable +.include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/hs-texmath/PLIST b/textproc/hs-texmath/PLIST index 6b95c4cc2f29..db7d5784897b 100644 --- a/textproc/hs-texmath/PLIST +++ b/textproc/hs-texmath/PLIST @@ -1,92 +1,93 @@ -@comment $NetBSD: PLIST,v 1.3 2020/05/11 17:52:18 rillig Exp $ -${HS_INTF}/package-description -${HS_INTF}/package-id +@comment $NetBSD: PLIST,v 1.4 2021/04/24 17:18:03 pho Exp $ +bin/texmath +lib/texmath-${PKGVERSION}/${HS_VERSION}/package-description +lib/texmath-${PKGVERSION}/${HS_VERSION}/package-id lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so -${HS_IMPL}/Paths_texmath.dyn_hi -${HS_IMPL}/Paths_texmath.hi -${HS_IMPL}/Paths_texmath.p_hi -${HS_IMPL}/Text/TeXMath.dyn_hi -${HS_IMPL}/Text/TeXMath.hi -${HS_IMPL}/Text/TeXMath.p_hi -${HS_IMPL}/Text/TeXMath/Compat.dyn_hi -${HS_IMPL}/Text/TeXMath/Compat.hi -${HS_IMPL}/Text/TeXMath/Compat.p_hi -${HS_IMPL}/Text/TeXMath/Readers/MathML.dyn_hi -${HS_IMPL}/Text/TeXMath/Readers/MathML.hi -${HS_IMPL}/Text/TeXMath/Readers/MathML.p_hi -${HS_IMPL}/Text/TeXMath/Readers/MathML/EntityMap.dyn_hi -${HS_IMPL}/Text/TeXMath/Readers/MathML/EntityMap.hi -${HS_IMPL}/Text/TeXMath/Readers/MathML/EntityMap.p_hi -${HS_IMPL}/Text/TeXMath/Readers/MathML/MMLDict.dyn_hi -${HS_IMPL}/Text/TeXMath/Readers/MathML/MMLDict.hi -${HS_IMPL}/Text/TeXMath/Readers/MathML/MMLDict.p_hi -${HS_IMPL}/Text/TeXMath/Readers/OMML.dyn_hi -${HS_IMPL}/Text/TeXMath/Readers/OMML.hi -${HS_IMPL}/Text/TeXMath/Readers/OMML.p_hi -${HS_IMPL}/Text/TeXMath/Readers/TeX.dyn_hi -${HS_IMPL}/Text/TeXMath/Readers/TeX.hi -${HS_IMPL}/Text/TeXMath/Readers/TeX.p_hi -${HS_IMPL}/Text/TeXMath/Readers/TeX/Macros.dyn_hi -${HS_IMPL}/Text/TeXMath/Readers/TeX/Macros.hi -${HS_IMPL}/Text/TeXMath/Readers/TeX/Macros.p_hi -${HS_IMPL}/Text/TeXMath/Shared.dyn_hi -${HS_IMPL}/Text/TeXMath/Shared.hi -${HS_IMPL}/Text/TeXMath/Shared.p_hi -${HS_IMPL}/Text/TeXMath/TeX.dyn_hi -${HS_IMPL}/Text/TeXMath/TeX.hi -${HS_IMPL}/Text/TeXMath/TeX.p_hi -${HS_IMPL}/Text/TeXMath/Types.dyn_hi -${HS_IMPL}/Text/TeXMath/Types.hi -${HS_IMPL}/Text/TeXMath/Types.p_hi -${HS_IMPL}/Text/TeXMath/Unicode/Fonts.dyn_hi -${HS_IMPL}/Text/TeXMath/Unicode/Fonts.hi -${HS_IMPL}/Text/TeXMath/Unicode/Fonts.p_hi -${HS_IMPL}/Text/TeXMath/Unicode/ToTeX.dyn_hi -${HS_IMPL}/Text/TeXMath/Unicode/ToTeX.hi -${HS_IMPL}/Text/TeXMath/Unicode/ToTeX.p_hi -${HS_IMPL}/Text/TeXMath/Unicode/ToUnicode.dyn_hi -${HS_IMPL}/Text/TeXMath/Unicode/ToUnicode.hi -${HS_IMPL}/Text/TeXMath/Unicode/ToUnicode.p_hi -${HS_IMPL}/Text/TeXMath/Writers/Eqn.dyn_hi -${HS_IMPL}/Text/TeXMath/Writers/Eqn.hi -${HS_IMPL}/Text/TeXMath/Writers/Eqn.p_hi -${HS_IMPL}/Text/TeXMath/Writers/MathML.dyn_hi -${HS_IMPL}/Text/TeXMath/Writers/MathML.hi -${HS_IMPL}/Text/TeXMath/Writers/MathML.p_hi -${HS_IMPL}/Text/TeXMath/Writers/OMML.dyn_hi -${HS_IMPL}/Text/TeXMath/Writers/OMML.hi -${HS_IMPL}/Text/TeXMath/Writers/OMML.p_hi -${HS_IMPL}/Text/TeXMath/Writers/Pandoc.dyn_hi -${HS_IMPL}/Text/TeXMath/Writers/Pandoc.hi -${HS_IMPL}/Text/TeXMath/Writers/Pandoc.p_hi -${HS_IMPL}/Text/TeXMath/Writers/TeX.dyn_hi -${HS_IMPL}/Text/TeXMath/Writers/TeX.hi -${HS_IMPL}/Text/TeXMath/Writers/TeX.p_hi -${HS_IMPL}/libHS${HS_PKGID}.a -${HS_IMPL}/libHS${HS_PKGID}_p.a -${HS_DOCS}/LICENSE -${HS_DOCS}/html/Text-TeXMath-Readers-MathML-EntityMap.html -${HS_DOCS}/html/Text-TeXMath-Readers-MathML-MMLDict.html -${HS_DOCS}/html/Text-TeXMath-Readers-MathML.html -${HS_DOCS}/html/Text-TeXMath-Readers-OMML.html -${HS_DOCS}/html/Text-TeXMath-Readers-TeX-Macros.html -${HS_DOCS}/html/Text-TeXMath-Readers-TeX.html -${HS_DOCS}/html/Text-TeXMath-TeX.html -${HS_DOCS}/html/Text-TeXMath-Types.html -${HS_DOCS}/html/Text-TeXMath-Unicode-Fonts.html -${HS_DOCS}/html/Text-TeXMath-Unicode-ToTeX.html -${HS_DOCS}/html/Text-TeXMath-Unicode-ToUnicode.html -${HS_DOCS}/html/Text-TeXMath-Writers-Eqn.html -${HS_DOCS}/html/Text-TeXMath-Writers-MathML.html -${HS_DOCS}/html/Text-TeXMath-Writers-OMML.html -${HS_DOCS}/html/Text-TeXMath-Writers-Pandoc.html -${HS_DOCS}/html/Text-TeXMath-Writers-TeX.html -${HS_DOCS}/html/Text-TeXMath.html -${HS_DOCS}/html/doc-index.html -${HS_DOCS}/html/haddock-bundle.min.js -${HS_DOCS}/html/index.html -${HS_DOCS}/html/linuwial.css -${HS_DOCS}/html/meta.json -${HS_DOCS}/html/quick-jump.css -${HS_DOCS}/html/synopsis.png -${HS_DOCS}/html/texmath.haddock +lib/${HS_PLATFORM}/${HS_PKGID}/Paths_texmath.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Paths_texmath.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Paths_texmath.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Compat.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Compat.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Compat.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML/EntityMap.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML/EntityMap.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML/EntityMap.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML/MMLDict.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML/MMLDict.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/MathML/MMLDict.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/OMML.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/OMML.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/OMML.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/TeX.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/TeX.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/TeX.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/TeX/Macros.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/TeX/Macros.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Readers/TeX/Macros.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Shared.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Shared.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Shared.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/TeX.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/TeX.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/TeX.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Types.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Types.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Types.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/Fonts.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/Fonts.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/Fonts.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/ToTeX.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/ToTeX.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/ToTeX.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/ToUnicode.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/ToUnicode.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Unicode/ToUnicode.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/Eqn.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/Eqn.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/Eqn.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/MathML.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/MathML.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/MathML.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/OMML.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/OMML.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/OMML.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/Pandoc.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/Pandoc.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/Pandoc.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/TeX.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/TeX.hi +lib/${HS_PLATFORM}/${HS_PKGID}/Text/TeXMath/Writers/TeX.p_hi +lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a +lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/LICENSE +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Readers-MathML-EntityMap.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Readers-MathML-MMLDict.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Readers-MathML.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Readers-OMML.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Readers-TeX-Macros.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Readers-TeX.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-TeX.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Types.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Unicode-Fonts.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Unicode-ToTeX.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Unicode-ToUnicode.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Writers-Eqn.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Writers-MathML.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Writers-OMML.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Writers-Pandoc.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath-Writers-TeX.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/Text-TeXMath.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/doc-index.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/haddock-bundle.min.js +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/index.html +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/linuwial.css +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/meta.json +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/quick-jump.css +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/synopsis.png +share/doc/${HS_PLATFORM}/texmath-${PKGVERSION}/html/texmath.haddock diff --git a/textproc/hs-texmath/buildlink3.mk b/textproc/hs-texmath/buildlink3.mk index c8d6e5c5ead3..56a04ee7795d 100644 --- a/textproc/hs-texmath/buildlink3.mk +++ b/textproc/hs-texmath/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2020/01/11 10:21:27 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2021/04/24 17:18:03 pho Exp $ BUILDLINK_TREE+= hs-texmath @@ -6,13 +6,12 @@ BUILDLINK_TREE+= hs-texmath HS_TEXMATH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-texmath+= hs-texmath>=0.12 -BUILDLINK_ABI_DEPENDS.hs-texmath+= hs-texmath>=0.12 +BUILDLINK_ABI_DEPENDS.hs-texmath+= hs-texmath>=0.12.2 BUILDLINK_PKGSRCDIR.hs-texmath?= ../../textproc/hs-texmath .include "../../textproc/hs-pandoc-types/buildlink3.mk" .include "../../devel/hs-syb/buildlink3.mk" .include "../../textproc/hs-xml/buildlink3.mk" -.include "../../converters/hs-aeson/buildlink3.mk" .endif # HS_TEXMATH_BUILDLINK3_MK BUILDLINK_TREE+= -hs-texmath diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo index e96448154044..831727cb583c 100644 --- a/textproc/hs-texmath/distinfo +++ b/textproc/hs-texmath/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2020/01/11 10:21:27 pho Exp $ +$NetBSD: distinfo,v 1.5 2021/04/24 17:18:03 pho Exp $ -SHA1 (texmath-0.12.tar.gz) = 6ee49d5cc881f7473847a83aa849744e807dd2c0 -RMD160 (texmath-0.12.tar.gz) = 8539d2606150c2a5c9fea74ccd9e81ef402fce17 -SHA512 (texmath-0.12.tar.gz) = e8c304652b472c24a09460abfd473e4f8ef4d55685841cc1f3ead35abf50fc99dcaf5981c0025497d9997b0010e556ce5d99c0e8ad4872c79fa49d6d857cb1b1 -Size (texmath-0.12.tar.gz) = 1791515 bytes +SHA1 (texmath-0.12.2.tar.gz) = 0acb7a01ec95c1473b13a4387c392fb9d42756b8 +RMD160 (texmath-0.12.2.tar.gz) = aa953d6a9fddb1900f77bbf234640174c1780e0d +SHA512 (texmath-0.12.2.tar.gz) = 89f3dc5c1042980abf06f1e4d3ca6806922f2094c6d7ec2cc1e4673ac16a7aaf73693c5fa5526eac96d6f9f5c2f894f2341295bacebb7216ef49eb8be7cc0424 +Size (texmath-0.12.2.tar.gz) = 1807359 bytes