summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname1431
-rw-r--r--FILES.byname.gzbin2187099 -> 2186661 bytes
-rw-r--r--FILES.last07days1068
-rw-r--r--dviware/dvisvgm/ChangeLog351
-rw-r--r--dviware/dvisvgm/Makefile.am2
-rw-r--r--dviware/dvisvgm/NEWS20
-rw-r--r--dviware/dvisvgm/README2
-rwxr-xr-xdviware/dvisvgm/configure22
-rw-r--r--dviware/dvisvgm/configure.ac6
-rw-r--r--dviware/dvisvgm/doc/Makefile.am31
-rw-r--r--dviware/dvisvgm/doc/Makefile.in131
-rw-r--r--dviware/dvisvgm/doc/conf-dblatex-man.xsl2
-rw-r--r--dviware/dvisvgm/doc/conf-dblatex-pdf.xsl2
-rw-r--r--dviware/dvisvgm/doc/dvisvgm.1102
-rw-r--r--dviware/dvisvgm/doc/dvisvgm.txt.in65
-rw-r--r--dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl4
-rw-r--r--dviware/dvisvgm/doc/tweak-db-refentry.xsl2
-rw-r--r--dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl2
-rw-r--r--dviware/dvisvgm/libs/Makefile.am2
-rw-r--r--dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp2
-rw-r--r--dviware/dvisvgm/libs/xxHash/xxh3.h1579
-rw-r--r--dviware/dvisvgm/libs/xxHash/xxhash.c1133
-rw-r--r--dviware/dvisvgm/libs/xxHash/xxhash.h1799
-rw-r--r--dviware/dvisvgm/src/AGLTable.hpp2
-rw-r--r--dviware/dvisvgm/src/BasicDVIReader.cpp2
-rw-r--r--dviware/dvisvgm/src/BasicDVIReader.hpp2
-rw-r--r--dviware/dvisvgm/src/Bezier.cpp6
-rw-r--r--dviware/dvisvgm/src/Bezier.hpp2
-rw-r--r--dviware/dvisvgm/src/BgColorSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/BgColorSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/Bitmap.cpp2
-rw-r--r--dviware/dvisvgm/src/Bitmap.hpp2
-rw-r--r--dviware/dvisvgm/src/BoundingBox.cpp4
-rw-r--r--dviware/dvisvgm/src/BoundingBox.hpp2
-rw-r--r--dviware/dvisvgm/src/CLCommandLine.cpp2
-rw-r--r--dviware/dvisvgm/src/CLCommandLine.hpp2
-rw-r--r--dviware/dvisvgm/src/CLOption.hpp2
-rw-r--r--dviware/dvisvgm/src/CMap.cpp2
-rw-r--r--dviware/dvisvgm/src/CMap.hpp2
-rw-r--r--dviware/dvisvgm/src/CMapManager.cpp2
-rw-r--r--dviware/dvisvgm/src/CMapManager.hpp2
-rw-r--r--dviware/dvisvgm/src/CMapReader.cpp2
-rw-r--r--dviware/dvisvgm/src/CMapReader.hpp2
-rw-r--r--dviware/dvisvgm/src/Calculator.cpp2
-rw-r--r--dviware/dvisvgm/src/Calculator.hpp2
-rw-r--r--dviware/dvisvgm/src/CharMapID.cpp2
-rw-r--r--dviware/dvisvgm/src/CharMapID.hpp2
-rw-r--r--dviware/dvisvgm/src/Character.hpp2
-rw-r--r--dviware/dvisvgm/src/Color.cpp2
-rw-r--r--dviware/dvisvgm/src/Color.hpp2
-rw-r--r--dviware/dvisvgm/src/ColorSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/ColorSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/CommandLine.hpp10
-rw-r--r--dviware/dvisvgm/src/DLLoader.cpp2
-rw-r--r--dviware/dvisvgm/src/DLLoader.hpp2
-rw-r--r--dviware/dvisvgm/src/DVIActions.hpp2
-rw-r--r--dviware/dvisvgm/src/DVIReader.cpp2
-rw-r--r--dviware/dvisvgm/src/DVIReader.hpp2
-rw-r--r--dviware/dvisvgm/src/DVIToSVG.cpp2
-rw-r--r--dviware/dvisvgm/src/DVIToSVG.hpp2
-rw-r--r--dviware/dvisvgm/src/DVIToSVGActions.cpp2
-rw-r--r--dviware/dvisvgm/src/DVIToSVGActions.hpp2
-rw-r--r--dviware/dvisvgm/src/Directory.cpp2
-rw-r--r--dviware/dvisvgm/src/Directory.hpp2
-rw-r--r--dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/EPSFile.cpp2
-rw-r--r--dviware/dvisvgm/src/EPSFile.hpp2
-rw-r--r--dviware/dvisvgm/src/EPSToSVG.hpp4
-rw-r--r--dviware/dvisvgm/src/EllipticalArc.cpp2
-rw-r--r--dviware/dvisvgm/src/EllipticalArc.hpp2
-rw-r--r--dviware/dvisvgm/src/EmSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/EmSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/EncFile.cpp2
-rw-r--r--dviware/dvisvgm/src/EncFile.hpp2
-rw-r--r--dviware/dvisvgm/src/FileFinder.cpp2
-rw-r--r--dviware/dvisvgm/src/FileFinder.hpp2
-rw-r--r--dviware/dvisvgm/src/FilePath.cpp12
-rw-r--r--dviware/dvisvgm/src/FilePath.hpp4
-rw-r--r--dviware/dvisvgm/src/FileSystem.cpp2
-rw-r--r--dviware/dvisvgm/src/FileSystem.hpp2
-rw-r--r--dviware/dvisvgm/src/FixWord.hpp2
-rw-r--r--dviware/dvisvgm/src/Font.cpp8
-rw-r--r--dviware/dvisvgm/src/Font.hpp2
-rw-r--r--dviware/dvisvgm/src/FontCache.cpp2
-rw-r--r--dviware/dvisvgm/src/FontCache.hpp2
-rw-r--r--dviware/dvisvgm/src/FontEncoding.cpp2
-rw-r--r--dviware/dvisvgm/src/FontEncoding.hpp2
-rw-r--r--dviware/dvisvgm/src/FontEngine.cpp2
-rw-r--r--dviware/dvisvgm/src/FontEngine.hpp2
-rw-r--r--dviware/dvisvgm/src/FontManager.cpp2
-rw-r--r--dviware/dvisvgm/src/FontManager.hpp2
-rw-r--r--dviware/dvisvgm/src/FontMap.cpp2
-rw-r--r--dviware/dvisvgm/src/FontMap.hpp2
-rw-r--r--dviware/dvisvgm/src/FontMetrics.cpp2
-rw-r--r--dviware/dvisvgm/src/FontMetrics.hpp2
-rw-r--r--dviware/dvisvgm/src/FontStyle.hpp2
-rw-r--r--dviware/dvisvgm/src/FontWriter.cpp6
-rw-r--r--dviware/dvisvgm/src/FontWriter.hpp2
-rw-r--r--dviware/dvisvgm/src/GFGlyphTracer.cpp2
-rw-r--r--dviware/dvisvgm/src/GFGlyphTracer.hpp2
-rw-r--r--dviware/dvisvgm/src/GFReader.cpp2
-rw-r--r--dviware/dvisvgm/src/GFReader.hpp2
-rw-r--r--dviware/dvisvgm/src/GFTracer.cpp2
-rw-r--r--dviware/dvisvgm/src/GFTracer.hpp2
-rw-r--r--dviware/dvisvgm/src/Ghostscript.cpp5
-rw-r--r--dviware/dvisvgm/src/Ghostscript.hpp2
-rw-r--r--dviware/dvisvgm/src/Glyph.hpp2
-rw-r--r--dviware/dvisvgm/src/GlyphTracerMessages.hpp23
-rw-r--r--dviware/dvisvgm/src/GraphicsPath.hpp8
-rw-r--r--dviware/dvisvgm/src/HashFunction.cpp2
-rw-r--r--dviware/dvisvgm/src/HashFunction.hpp2
-rw-r--r--dviware/dvisvgm/src/HtmlSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/HtmlSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/HyperlinkManager.cpp2
-rw-r--r--dviware/dvisvgm/src/HyperlinkManager.hpp2
-rw-r--r--dviware/dvisvgm/src/ImageToSVG.cpp8
-rw-r--r--dviware/dvisvgm/src/ImageToSVG.hpp11
-rw-r--r--dviware/dvisvgm/src/InputBuffer.cpp2
-rw-r--r--dviware/dvisvgm/src/InputBuffer.hpp2
-rw-r--r--dviware/dvisvgm/src/InputReader.cpp2
-rw-r--r--dviware/dvisvgm/src/InputReader.hpp2
-rw-r--r--dviware/dvisvgm/src/JFM.cpp2
-rw-r--r--dviware/dvisvgm/src/JFM.hpp2
-rw-r--r--dviware/dvisvgm/src/Length.cpp2
-rw-r--r--dviware/dvisvgm/src/Length.hpp2
-rw-r--r--dviware/dvisvgm/src/MD5HashFunction.hpp2
-rw-r--r--dviware/dvisvgm/src/Makefile.am2
-rw-r--r--dviware/dvisvgm/src/MapLine.cpp2
-rw-r--r--dviware/dvisvgm/src/MapLine.hpp2
-rw-r--r--dviware/dvisvgm/src/Matrix.cpp30
-rw-r--r--dviware/dvisvgm/src/Matrix.hpp2
-rw-r--r--dviware/dvisvgm/src/Message.cpp2
-rw-r--r--dviware/dvisvgm/src/Message.hpp2
-rw-r--r--dviware/dvisvgm/src/MessageException.hpp2
-rw-r--r--dviware/dvisvgm/src/MetafontWrapper.cpp62
-rw-r--r--dviware/dvisvgm/src/MetafontWrapper.hpp8
-rw-r--r--dviware/dvisvgm/src/MiKTeXCom.cpp2
-rw-r--r--dviware/dvisvgm/src/MiKTeXCom.hpp2
-rw-r--r--dviware/dvisvgm/src/NoPsSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/NoPsSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/NumericRanges.hpp2
-rw-r--r--dviware/dvisvgm/src/PDFParser.cpp2
-rw-r--r--dviware/dvisvgm/src/PDFParser.hpp2
-rw-r--r--dviware/dvisvgm/src/PDFToSVG.hpp4
-rw-r--r--dviware/dvisvgm/src/PSFilter.hpp2
-rw-r--r--dviware/dvisvgm/src/PSInterpreter.cpp79
-rw-r--r--dviware/dvisvgm/src/PSInterpreter.hpp13
-rw-r--r--dviware/dvisvgm/src/PSPattern.cpp11
-rw-r--r--dviware/dvisvgm/src/PSPattern.hpp2
-rw-r--r--dviware/dvisvgm/src/PSPreviewFilter.cpp2
-rw-r--r--dviware/dvisvgm/src/PSPreviewFilter.hpp2
-rw-r--r--dviware/dvisvgm/src/PageRanges.cpp2
-rw-r--r--dviware/dvisvgm/src/PageRanges.hpp2
-rw-r--r--dviware/dvisvgm/src/PageSize.cpp18
-rw-r--r--dviware/dvisvgm/src/PageSize.hpp2
-rw-r--r--dviware/dvisvgm/src/Pair.hpp2
-rw-r--r--dviware/dvisvgm/src/PapersizeSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/PapersizeSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/PathClipper.cpp2
-rw-r--r--dviware/dvisvgm/src/PathClipper.hpp2
-rw-r--r--dviware/dvisvgm/src/PdfSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/PdfSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/PreScanDVIReader.cpp2
-rw-r--r--dviware/dvisvgm/src/PreScanDVIReader.hpp2
-rw-r--r--dviware/dvisvgm/src/Process.cpp2
-rw-r--r--dviware/dvisvgm/src/Process.hpp2
-rw-r--r--dviware/dvisvgm/src/PsSpecialHandler.cpp125
-rw-r--r--dviware/dvisvgm/src/PsSpecialHandler.hpp13
-rw-r--r--dviware/dvisvgm/src/RangeMap.cpp2
-rw-r--r--dviware/dvisvgm/src/RangeMap.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharHandlerFactory.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharHandlerFactory.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharPathHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharPathHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGOutput.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGOutput.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/SVGTree.cpp2
-rw-r--r--dviware/dvisvgm/src/SVGTree.hpp2
-rw-r--r--dviware/dvisvgm/src/ShadingPatch.cpp2
-rw-r--r--dviware/dvisvgm/src/ShadingPatch.hpp2
-rw-r--r--dviware/dvisvgm/src/SignalHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/SignalHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/SourceInput.cpp2
-rw-r--r--dviware/dvisvgm/src/SourceInput.hpp2
-rw-r--r--dviware/dvisvgm/src/SpecialActions.hpp2
-rw-r--r--dviware/dvisvgm/src/SpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/SpecialManager.cpp2
-rw-r--r--dviware/dvisvgm/src/SpecialManager.hpp2
-rw-r--r--dviware/dvisvgm/src/StreamReader.cpp2
-rw-r--r--dviware/dvisvgm/src/StreamReader.hpp2
-rw-r--r--dviware/dvisvgm/src/StreamWriter.cpp2
-rw-r--r--dviware/dvisvgm/src/StreamWriter.hpp2
-rw-r--r--dviware/dvisvgm/src/Subfont.cpp2
-rw-r--r--dviware/dvisvgm/src/Subfont.hpp2
-rw-r--r--dviware/dvisvgm/src/System.cpp2
-rw-r--r--dviware/dvisvgm/src/System.hpp2
-rw-r--r--dviware/dvisvgm/src/TFM.cpp2
-rw-r--r--dviware/dvisvgm/src/TFM.hpp2
-rw-r--r--dviware/dvisvgm/src/TTFAutohint.cpp2
-rw-r--r--dviware/dvisvgm/src/TTFAutohint.hpp2
-rw-r--r--dviware/dvisvgm/src/TensorProductPatch.cpp6
-rw-r--r--dviware/dvisvgm/src/TensorProductPatch.hpp2
-rw-r--r--dviware/dvisvgm/src/Terminal.cpp2
-rw-r--r--dviware/dvisvgm/src/Terminal.hpp2
-rw-r--r--dviware/dvisvgm/src/ToUnicodeMap.cpp2
-rw-r--r--dviware/dvisvgm/src/ToUnicodeMap.hpp2
-rw-r--r--dviware/dvisvgm/src/TpicSpecialHandler.cpp2
-rw-r--r--dviware/dvisvgm/src/TpicSpecialHandler.hpp2
-rw-r--r--dviware/dvisvgm/src/TriangularPatch.cpp6
-rw-r--r--dviware/dvisvgm/src/TriangularPatch.hpp2
-rw-r--r--dviware/dvisvgm/src/TrueTypeFont.cpp2
-rw-r--r--dviware/dvisvgm/src/TrueTypeFont.hpp2
-rw-r--r--dviware/dvisvgm/src/Unicode.cpp2
-rw-r--r--dviware/dvisvgm/src/Unicode.hpp2
-rw-r--r--dviware/dvisvgm/src/VFActions.hpp2
-rw-r--r--dviware/dvisvgm/src/VFReader.cpp2
-rw-r--r--dviware/dvisvgm/src/VFReader.hpp2
-rw-r--r--dviware/dvisvgm/src/VectorIterator.hpp2
-rw-r--r--dviware/dvisvgm/src/VectorStream.hpp2
-rw-r--r--dviware/dvisvgm/src/XMLDocument.cpp2
-rw-r--r--dviware/dvisvgm/src/XMLDocument.hpp2
-rw-r--r--dviware/dvisvgm/src/XMLNode.cpp49
-rw-r--r--dviware/dvisvgm/src/XMLNode.hpp5
-rw-r--r--dviware/dvisvgm/src/XMLString.cpp2
-rw-r--r--dviware/dvisvgm/src/XMLString.hpp2
-rw-r--r--dviware/dvisvgm/src/XXHashFunction.hpp2
-rw-r--r--dviware/dvisvgm/src/ZLibOutputStream.hpp2
-rw-r--r--dviware/dvisvgm/src/dvisvgm.cpp10
-rw-r--r--dviware/dvisvgm/src/ffwrapper.c2
-rw-r--r--dviware/dvisvgm/src/ffwrapper.h2
-rw-r--r--dviware/dvisvgm/src/macros.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/DependencyGraph.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/GroupCollapser.cpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/GroupCollapser.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/OptimizerModule.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp3
-rw-r--r--dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/TextSimplifier.cpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/TextSimplifier.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp35
-rw-r--r--dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp2
-rw-r--r--dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp2
-rw-r--r--dviware/dvisvgm/src/options.dtd2
-rw-r--r--dviware/dvisvgm/src/options.xml10
-rw-r--r--dviware/dvisvgm/src/psdefs.cpp230
-rw-r--r--dviware/dvisvgm/src/utility.cpp2
-rw-r--r--dviware/dvisvgm/src/utility.hpp24
-rw-r--r--dviware/dvisvgm/src/version.hpp.in2
-rw-r--r--dviware/dvisvgm/src/windows.hpp2
-rw-r--r--dviware/dvisvgm/tests/BezierTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/BitmapTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/BoundingBoxTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/CMapManagerTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/CMapReaderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/CMapTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/CalculatorTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/ColorSpecialTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/ColorTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/CommandLineTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/DVIReaderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/DependencyGraphTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/DirectoryTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/EllipticalArcTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/EmSpecialTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/FileFinderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/FilePathTest.cpp5
-rw-r--r--dviware/dvisvgm/tests/FileSystemTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/FontCacheTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/FontManagerTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/FontMapTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/GFGlyphTracerTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/GFReaderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/GhostscriptTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/GraphicsPathTest.cpp5
-rw-r--r--dviware/dvisvgm/tests/HashFunctionTest.cpp14
-rw-r--r--dviware/dvisvgm/tests/JFMReaderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/LengthTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/Makefile.am2
-rw-r--r--dviware/dvisvgm/tests/MapLineTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/MatrixTest.cpp4
-rw-r--r--dviware/dvisvgm/tests/MessageExceptionTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/PDFParserTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/PSInterpreterTest.cpp14
-rw-r--r--dviware/dvisvgm/tests/PageRagesTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/PageSizeTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/PairTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/PapersizeSpecialTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/RangeMapTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/SVGOutputTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/ShadingPatchTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/SpecialManagerTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/StreamInputBufferTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/StreamReaderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/StreamWriterTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/StringMatcherTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/SubfontTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/TFMReaderTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/TensorProductPatchTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/ToUnicodeMapTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/TpicSpecialTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/TriangularPatchTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/UnicodeTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/UtilityTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/VectorIteratorTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/VectorStreamTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/XMLNodeTest.cpp2
-rw-r--r--dviware/dvisvgm/tests/XMLStringTest.cpp2
-rwxr-xr-xdviware/dvisvgm/tests/check-conv2
-rw-r--r--dviware/dvisvgm/tests/data/Makefile.am2
-rwxr-xr-xdviware/dvisvgm/tests/genhashcheck.py2
-rw-r--r--dviware/dvisvgm/tests/normalize.xsl2
-rw-r--r--dviware/dvisvgm/tests/testmain.cpp2
-rw-r--r--graphics/pgf/contrib/milsymb/milsymb.pdf2627
-rw-r--r--graphics/pgf/contrib/milsymb/milsymb.sty58
-rw-r--r--graphics/pgf/contrib/milsymb/milsymb.tex11
-rw-r--r--macros/generic/schemata/README262
-rw-r--r--macros/generic/schemata/schemata.dtx9
-rw-r--r--macros/generic/schemata/schemata.pdfbin629338 -> 629768 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md11
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty14
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty19
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdfbin528139 -> 551082 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex15
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def14
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx8
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/README.md13
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx139
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx142
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx137
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/oscola-examples.bib1533
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx8
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/oscola.ist2
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/oscola.pdfbin607124 -> 886853 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/oscola/oscola.tex36
-rw-r--r--macros/latex/contrib/limecv/README.md1
-rw-r--r--macros/latex/contrib/limecv/examples/mwe-latex.pdfbin112373 -> 138929 bytes
-rw-r--r--macros/latex/contrib/limecv/examples/mwe-lualatex.pdfbin41474 -> 42544 bytes
-rw-r--r--macros/latex/contrib/limecv/examples/mwe-xelatex.pdfbin42445 -> 43259 bytes
-rw-r--r--macros/latex/contrib/limecv/limecv.dtx49
-rw-r--r--macros/latex/contrib/limecv/limecv.pdfbin205852 -> 207251 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin332466 -> 340142 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex621
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.dtx3825
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin723168 -> 780740 bytes
-rw-r--r--macros/luatex/latex/arabluatex/arabluatex.dtx95
-rw-r--r--macros/luatex/latex/arabluatex/arabluatex.lua8
-rw-r--r--macros/luatex/latex/arabluatex/arabluatex.pdfbin647013 -> 654486 bytes
-rw-r--r--macros/luatex/latex/arabluatex/samples/al-Jahiz.pdfbin112526 -> 112383 bytes
-rw-r--r--macros/luatex/latex/arabluatex/samples/exporting.pdfbin63557 -> 63544 bytes
-rw-r--r--macros/luatex/latex/arabluatex/samples/template-01.pdfbin63935 -> 64015 bytes
-rw-r--r--macros/luatex/latex/lua-ul/lua-ul.dtx164
-rw-r--r--macros/luatex/latex/lua-ul/lua-ul.pdfbin74195 -> 85488 bytes
-rw-r--r--macros/xetex/latex/quran/README4
-rw-r--r--macros/xetex/latex/quran/doc/quran-doc.pdfbin327382 -> 331344 bytes
-rw-r--r--macros/xetex/latex/quran/doc/quran-doc.tex73
-rw-r--r--macros/xetex/latex/quran/doc/quran-test.pdfbin33003 -> 33000 bytes
-rw-r--r--macros/xetex/latex/quran/doc/quran-test1.pdfbin54264 -> 54267 bytes
-rw-r--r--macros/xetex/latex/quran/doc/quran-test2.pdfbin63305 -> 63307 bytes
-rw-r--r--macros/xetex/latex/quran/tex/quran.sty6
-rw-r--r--obsolete/support/detex/Flex-patch (renamed from support/detex/Flex-patch)0
-rw-r--r--obsolete/support/detex/Makefile (renamed from support/detex/Makefile)0
-rw-r--r--obsolete/support/detex/README (renamed from support/detex/README)0
-rw-r--r--obsolete/support/detex/detex.1l (renamed from support/detex/detex.1l)0
-rw-r--r--obsolete/support/detex/detex.h (renamed from support/detex/detex.h)0
-rw-r--r--obsolete/support/detex/detex.l (renamed from support/detex/detex.l)0
-rw-r--r--obsolete/support/detex/lexout.c (renamed from support/detex/lexout.c)0
-rw-r--r--obsolete/support/detex/os2/README (renamed from support/detex/os2/README)0
-rw-r--r--obsolete/support/detex/os2/detex-32.def (renamed from support/detex/os2/detex-32.def)0
-rw-r--r--obsolete/support/detex/os2/detex.def (renamed from support/detex/os2/detex.def)0
-rw-r--r--obsolete/support/detex/os2/makefile.os2 (renamed from support/detex/os2/makefile.os2)0
-rw-r--r--obsolete/support/detex/states.sed (renamed from support/detex/states.sed)0
-rw-r--r--systems/win32/miktex/tm/packages/files.csv.lzmabin530223 -> 530221 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini6
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini6
-rw-r--r--systems/win32/w32tex/ChangeLog10
-rw-r--r--timestamp2
460 files changed, 11496 insertions, 7756 deletions
diff --git a/FILES.byname b/FILES.byname
index 0cfc1c1001..47915a885d 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -3474,27 +3474,27 @@
1990/10/02 | 159 | dviware/dvisun/makefile
1990/10/02 | 280 | dviware/dvisun/README
2019/06/09 | 55720 | dviware/dvisun.zip
-2019/12/07 | 56818 | dviware/dvisvgm/aclocal.m4
+2020/03/13 | 56818 | dviware/dvisvgm/aclocal.m4
2019/03/09 | 5827 | dviware/dvisvgm/ar-lib
2018/09/08 | 576 | dviware/dvisvgm/AUTHORS
-2019/12/07 | 387767 | dviware/dvisvgm/ChangeLog
+2020/03/13 | 402661 | dviware/dvisvgm/ChangeLog
2019/03/09 | 7383 | dviware/dvisvgm/compile
2019/03/09 | 44166 | dviware/dvisvgm/config.guess
-2019/12/07 | 4369 | dviware/dvisvgm/config.h.in
+2020/03/13 | 4369 | dviware/dvisvgm/config.h.in
2019/03/09 | 36408 | dviware/dvisvgm/config.sub
-2019/12/07 | 682161 | dviware/dvisvgm/configure
-2019/12/07 | 8412 | dviware/dvisvgm/configure.ac
+2020/03/13 | 682138 | dviware/dvisvgm/configure
+2020/03/13 | 8407 | dviware/dvisvgm/configure.ac
2016/09/03 | 35147 | dviware/dvisvgm/COPYING
2019/03/09 | 23568 | dviware/dvisvgm/depcomp
-2019/03/09 | 718 | dviware/dvisvgm/doc/conf-dblatex-man.xsl
-2019/03/09 | 2578 | dviware/dvisvgm/doc/conf-dblatex-pdf.xsl
-2019/12/07 | 63109 | dviware/dvisvgm/doc/dvisvgm.1
-2019/12/06 | 57019 | dviware/dvisvgm/doc/dvisvgm.txt.in
-2019/07/27 | 739 | dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl
-2019/07/28 | 3457 | dviware/dvisvgm/doc/Makefile.am
-2019/12/07 | 19892 | dviware/dvisvgm/doc/Makefile.in
-2019/03/09 | 1041 | dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl
-2019/07/27 | 1698 | dviware/dvisvgm/doc/tweak-db-refentry.xsl
+2020/03/02 | 718 | dviware/dvisvgm/doc/conf-dblatex-man.xsl
+2020/03/02 | 2578 | dviware/dvisvgm/doc/conf-dblatex-pdf.xsl
+2020/03/13 | 66263 | dviware/dvisvgm/doc/dvisvgm.1
+2020/03/13 | 59872 | dviware/dvisvgm/doc/dvisvgm.txt.in
+2020/03/13 | 804 | dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl
+2020/03/13 | 3527 | dviware/dvisvgm/doc/Makefile.am
+2020/03/13 | 21142 | dviware/dvisvgm/doc/Makefile.in
+2020/03/02 | 1041 | dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl
+2020/03/02 | 1698 | dviware/dvisvgm/doc/tweak-db-refentry.xsl
2016/09/03 | 9236 | dviware/dvisvgm/INSTALL
2019/03/09 | 15368 | dviware/dvisvgm/install-sh
2018/05/03 | 2446 | dviware/dvisvgm/libs/brotli/common/constants.h
@@ -3571,12 +3571,12 @@
2018/07/31 | 2615 | dviware/dvisvgm/libs/brotli/include/brotli/types.h
2017/12/28 | 1084 | dviware/dvisvgm/libs/brotli/LICENSE
2019/03/09 | 1899 | dviware/dvisvgm/libs/brotli/Makefile.am
-2019/12/07 | 31488 | dviware/dvisvgm/libs/brotli/Makefile.in
+2020/03/13 | 31488 | dviware/dvisvgm/libs/brotli/Makefile.in
2018/09/08 | 132235 | dviware/dvisvgm/libs/clipper/clipper.cpp
2016/09/03 | 15879 | dviware/dvisvgm/libs/clipper/clipper.hpp
2017/04/14 | 1374 | dviware/dvisvgm/libs/clipper/License.txt
2017/04/14 | 202 | dviware/dvisvgm/libs/clipper/Makefile.am
-2019/12/07 | 20338 | dviware/dvisvgm/libs/clipper/Makefile.in
+2020/03/13 | 20338 | dviware/dvisvgm/libs/clipper/Makefile.in
2019/03/09 | 467 | dviware/dvisvgm/libs/defs.am
2017/04/14 | 188824 | dviware/dvisvgm/libs/ff-woff/fontforge/alphabet.c
2017/04/14 | 32761 | dviware/dvisvgm/libs/ff-woff/fontforge/asmfpst.c
@@ -3633,7 +3633,7 @@
2017/04/14 | 210538 | dviware/dvisvgm/libs/ff-woff/fontforge/stemdb.c
2017/04/14 | 8655 | dviware/dvisvgm/libs/ff-woff/fontforge/stemdb.h
2017/04/14 | 114 | dviware/dvisvgm/libs/ff-woff/fontforge/tables.h
-2019/03/09 | 2041 | dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp
+2020/03/02 | 2041 | dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp
2017/04/14 | 83106 | dviware/dvisvgm/libs/ff-woff/fontforge/tottfaat.c
2017/04/14 | 217496 | dviware/dvisvgm/libs/ff-woff/fontforge/tottf.c
2017/04/14 | 149564 | dviware/dvisvgm/libs/ff-woff/fontforge/tottfgpos.c
@@ -3659,11 +3659,11 @@
2017/04/14 | 5185 | dviware/dvisvgm/libs/ff-woff/inc/utype.h
2017/04/14 | 9905 | dviware/dvisvgm/libs/ff-woff/LICENSE
2019/04/12 | 2027 | dviware/dvisvgm/libs/ff-woff/Makefile.am
-2019/12/07 | 40554 | dviware/dvisvgm/libs/ff-woff/Makefile.in
-2019/03/09 | 241 | dviware/dvisvgm/libs/Makefile.am
-2019/12/07 | 19936 | dviware/dvisvgm/libs/Makefile.in
+2020/03/13 | 40554 | dviware/dvisvgm/libs/ff-woff/Makefile.in
+2020/03/02 | 241 | dviware/dvisvgm/libs/Makefile.am
+2020/03/13 | 19936 | dviware/dvisvgm/libs/Makefile.in
2018/09/08 | 171 | dviware/dvisvgm/libs/md5/Makefile.am
-2019/12/07 | 19545 | dviware/dvisvgm/libs/md5/Makefile.in
+2020/03/13 | 19545 | dviware/dvisvgm/libs/md5/Makefile.in
2018/09/08 | 8743 | dviware/dvisvgm/libs/md5/md5.c
2018/09/08 | 1426 | dviware/dvisvgm/libs/md5/md5.h
2019/10/25 | 2146 | dviware/dvisvgm/libs/potrace/auxiliary.h
@@ -3675,7 +3675,7 @@
2019/10/25 | 442 | dviware/dvisvgm/libs/potrace/decompose.h
2019/10/25 | 11118 | dviware/dvisvgm/libs/potrace/lists.h
2019/03/09 | 330 | dviware/dvisvgm/libs/potrace/Makefile.am
-2019/12/07 | 20804 | dviware/dvisvgm/libs/potrace/Makefile.in
+2020/03/13 | 20804 | dviware/dvisvgm/libs/potrace/Makefile.in
2019/10/25 | 3122 | dviware/dvisvgm/libs/potrace/potracelib.c
2019/10/25 | 4573 | dviware/dvisvgm/libs/potrace/potracelib.h
2019/10/25 | 2654 | dviware/dvisvgm/libs/potrace/progress.h
@@ -3684,14 +3684,14 @@
2019/03/09 | 102582 | dviware/dvisvgm/libs/variant/include/mpark/variant.hpp
2017/10/30 | 1338 | dviware/dvisvgm/libs/variant/LICENSE.md
2019/03/09 | 71 | dviware/dvisvgm/libs/variant/Makefile.am
-2019/12/07 | 15593 | dviware/dvisvgm/libs/variant/Makefile.in
+2020/03/13 | 15593 | dviware/dvisvgm/libs/variant/Makefile.in
2017/10/30 | 1171 | dviware/dvisvgm/libs/woff2/include/woff2/decode.h
2017/10/30 | 1434 | dviware/dvisvgm/libs/woff2/include/woff2/encode.h
2017/10/30 | 2304 | dviware/dvisvgm/libs/woff2/include/woff2/output.h
2018/07/31 | 131 | dviware/dvisvgm/libs/woff2/include/woff2/version.h
2016/09/03 | 11358 | dviware/dvisvgm/libs/woff2/LICENSE
2019/03/09 | 701 | dviware/dvisvgm/libs/woff2/Makefile.am
-2019/12/07 | 24681 | dviware/dvisvgm/libs/woff2/Makefile.in
+2020/03/13 | 24681 | dviware/dvisvgm/libs/woff2/Makefile.in
2017/10/30 | 4185 | dviware/dvisvgm/libs/woff2/src/buffer.h
2018/07/31 | 12155 | dviware/dvisvgm/libs/woff2/src/font.cc
2017/10/30 | 3509 | dviware/dvisvgm/libs/woff2/src/font.h
@@ -3713,10 +3713,10 @@
2018/07/31 | 15423 | dviware/dvisvgm/libs/woff2/src/woff2_enc.cc
2017/10/30 | 1564 | dviware/dvisvgm/libs/woff2/src/woff2_out.cc
2019/10/25 | 200 | dviware/dvisvgm/libs/xxHash/Makefile.am
-2019/12/07 | 19650 | dviware/dvisvgm/libs/xxHash/Makefile.in
-2019/10/25 | 67360 | dviware/dvisvgm/libs/xxHash/xxh3.h
-2019/10/25 | 37885 | dviware/dvisvgm/libs/xxHash/xxhash.c
-2019/10/25 | 27250 | dviware/dvisvgm/libs/xxHash/xxhash.h
+2020/03/13 | 19650 | dviware/dvisvgm/libs/xxHash/Makefile.in
+2020/03/13 | 86868 | dviware/dvisvgm/libs/xxHash/xxh3.h
+2020/03/13 | 1859 | dviware/dvisvgm/libs/xxHash/xxhash.c
+2020/03/13 | 68784 | dviware/dvisvgm/libs/xxHash/xxhash.h
2019/03/09 | 324151 | dviware/dvisvgm/ltmain.sh
2019/03/09 | 2105 | dviware/dvisvgm/m4/ax_check_compile_flag.m4
2017/10/30 | 11836 | dviware/dvisvgm/m4/ax_code_coverage.m4
@@ -3727,267 +3727,267 @@
2019/03/09 | 4384 | dviware/dvisvgm/m4/ltsugar.m4
2019/03/09 | 699 | dviware/dvisvgm/m4/ltversion.m4
2019/03/09 | 95 | dviware/dvisvgm/m4/Makefile.am
-2019/12/07 | 13474 | dviware/dvisvgm/m4/Makefile.in
-2019/03/09 | 744 | dviware/dvisvgm/Makefile.am
-2019/12/07 | 27672 | dviware/dvisvgm/Makefile.in
+2020/03/13 | 13474 | dviware/dvisvgm/m4/Makefile.in
+2020/03/02 | 744 | dviware/dvisvgm/Makefile.am
+2020/03/13 | 27672 | dviware/dvisvgm/Makefile.in
2019/03/09 | 6878 | dviware/dvisvgm/missing
-2019/12/07 | 34303 | dviware/dvisvgm/NEWS
-2019/07/27 | 6173 | dviware/dvisvgm/README
-2019/03/09 | 158418 | dviware/dvisvgm/src/AGLTable.hpp
-2019/07/27 | 13439 | dviware/dvisvgm/src/BasicDVIReader.cpp
-2019/04/12 | 5087 | dviware/dvisvgm/src/BasicDVIReader.hpp
-2019/10/25 | 9135 | dviware/dvisvgm/src/Bezier.cpp
-2019/10/25 | 2502 | dviware/dvisvgm/src/Bezier.hpp
-2019/04/12 | 3175 | dviware/dvisvgm/src/BgColorSpecialHandler.cpp
-2019/03/09 | 2228 | dviware/dvisvgm/src/BgColorSpecialHandler.hpp
-2019/10/25 | 4889 | dviware/dvisvgm/src/Bitmap.cpp
-2019/10/25 | 4166 | dviware/dvisvgm/src/Bitmap.hpp
-2019/04/12 | 7865 | dviware/dvisvgm/src/BoundingBox.cpp
-2019/04/13 | 3912 | dviware/dvisvgm/src/BoundingBox.hpp
-2019/03/09 | 5855 | dviware/dvisvgm/src/Calculator.cpp
-2019/12/07 | 2272 | dviware/dvisvgm/src/Calculator.hpp
-2019/04/13 | 2000 | dviware/dvisvgm/src/Character.hpp
-2019/03/09 | 2040 | dviware/dvisvgm/src/CharMapID.cpp
-2019/12/07 | 2541 | dviware/dvisvgm/src/CharMapID.hpp
-2019/04/12 | 8299 | dviware/dvisvgm/src/CLCommandLine.cpp
-2019/04/13 | 2891 | dviware/dvisvgm/src/CLCommandLine.hpp
-2019/03/09 | 6531 | dviware/dvisvgm/src/CLOption.hpp
-2019/03/09 | 2676 | dviware/dvisvgm/src/CMap.cpp
-2019/04/13 | 4434 | dviware/dvisvgm/src/CMap.hpp
-2019/07/27 | 5322 | dviware/dvisvgm/src/CMapManager.cpp
-2019/03/09 | 2221 | dviware/dvisvgm/src/CMapManager.hpp
-2019/10/31 | 8274 | dviware/dvisvgm/src/CMapReader.cpp
-2019/10/31 | 3080 | dviware/dvisvgm/src/CMapReader.hpp
-2019/10/25 | 19513 | dviware/dvisvgm/src/Color.cpp
-2019/12/07 | 4778 | dviware/dvisvgm/src/Color.hpp
-2019/04/12 | 4118 | dviware/dvisvgm/src/ColorSpecialHandler.cpp
-2019/03/09 | 2118 | dviware/dvisvgm/src/ColorSpecialHandler.hpp
-2019/04/13 | 7437 | dviware/dvisvgm/src/CommandLine.hpp
-2019/12/07 | 3410 | dviware/dvisvgm/src/Directory.cpp
-2019/12/07 | 2053 | dviware/dvisvgm/src/Directory.hpp
-2019/03/09 | 2290 | dviware/dvisvgm/src/DLLoader.cpp
-2019/04/13 | 2539 | dviware/dvisvgm/src/DLLoader.hpp
-2019/04/13 | 2334 | dviware/dvisvgm/src/DVIActions.hpp
-2019/07/27 | 25282 | dviware/dvisvgm/src/DVIReader.cpp
-2019/03/09 | 8464 | dviware/dvisvgm/src/DVIReader.hpp
-2019/12/06 | 17328 | dviware/dvisvgm/src/dvisvgm.cpp
-2019/04/13 | 18126 | dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp
-2019/04/13 | 4562 | dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp
-2019/12/06 | 12234 | dviware/dvisvgm/src/DVIToSVGActions.cpp
-2019/12/06 | 4915 | dviware/dvisvgm/src/DVIToSVGActions.hpp
-2019/10/25 | 21303 | dviware/dvisvgm/src/DVIToSVG.cpp
-2019/10/25 | 5602 | dviware/dvisvgm/src/DVIToSVG.hpp
-2019/10/25 | 10960 | dviware/dvisvgm/src/EllipticalArc.cpp
-2019/10/25 | 3100 | dviware/dvisvgm/src/EllipticalArc.hpp
-2019/12/06 | 9971 | dviware/dvisvgm/src/EmSpecialHandler.cpp
-2019/12/06 | 2930 | dviware/dvisvgm/src/EmSpecialHandler.hpp
-2019/04/13 | 3935 | dviware/dvisvgm/src/EncFile.cpp
-2019/04/13 | 2116 | dviware/dvisvgm/src/EncFile.hpp
-2019/04/13 | 3776 | dviware/dvisvgm/src/EPSFile.cpp
-2019/04/13 | 2051 | dviware/dvisvgm/src/EPSFile.hpp
-2019/03/09 | 2092 | dviware/dvisvgm/src/EPSToSVG.hpp
-2019/03/09 | 3098 | dviware/dvisvgm/src/ffwrapper.c
-2019/03/09 | 1657 | dviware/dvisvgm/src/ffwrapper.h
-2019/12/07 | 9824 | dviware/dvisvgm/src/FileFinder.cpp
-2019/12/07 | 2586 | dviware/dvisvgm/src/FileFinder.hpp
-2019/12/06 | 10037 | dviware/dvisvgm/src/FilePath.cpp
-2019/10/31 | 3426 | dviware/dvisvgm/src/FilePath.hpp
-2019/12/07 | 9676 | dviware/dvisvgm/src/FileSystem.cpp
-2019/12/07 | 2754 | dviware/dvisvgm/src/FileSystem.hpp
-2019/12/07 | 1821 | dviware/dvisvgm/src/FixWord.hpp
-2019/10/25 | 12510 | dviware/dvisvgm/src/FontCache.cpp
-2019/10/25 | 2857 | dviware/dvisvgm/src/FontCache.hpp
-2019/07/27 | 21064 | dviware/dvisvgm/src/Font.cpp
-2019/04/12 | 3331 | dviware/dvisvgm/src/FontEncoding.cpp
-2019/04/13 | 2702 | dviware/dvisvgm/src/FontEncoding.hpp
-2019/10/25 | 13507 | dviware/dvisvgm/src/FontEngine.cpp
-2019/04/12 | 3254 | dviware/dvisvgm/src/FontEngine.hpp
-2019/07/27 | 17330 | dviware/dvisvgm/src/Font.hpp
-2019/04/13 | 12221 | dviware/dvisvgm/src/FontManager.cpp
-2019/04/12 | 3734 | dviware/dvisvgm/src/FontManager.hpp
-2019/03/09 | 9298 | dviware/dvisvgm/src/FontMap.cpp
-2019/04/13 | 2909 | dviware/dvisvgm/src/FontMap.hpp
-2019/03/09 | 1984 | dviware/dvisvgm/src/FontMetrics.cpp
-2019/04/12 | 3396 | dviware/dvisvgm/src/FontMetrics.hpp
-2019/12/07 | 1805 | dviware/dvisvgm/src/FontStyle.hpp
-2019/10/25 | 10194 | dviware/dvisvgm/src/FontWriter.cpp
-2019/04/13 | 2742 | dviware/dvisvgm/src/FontWriter.hpp
-2019/12/07 | 2745 | dviware/dvisvgm/src/GFGlyphTracer.cpp
-2019/12/07 | 2571 | dviware/dvisvgm/src/GFGlyphTracer.hpp
-2019/12/07 | 10894 | dviware/dvisvgm/src/GFReader.cpp
-2019/12/07 | 3967 | dviware/dvisvgm/src/GFReader.hpp
-2019/12/07 | 3610 | dviware/dvisvgm/src/GFTracer.cpp
-2019/12/07 | 2107 | dviware/dvisvgm/src/GFTracer.hpp
-2019/04/12 | 11748 | dviware/dvisvgm/src/Ghostscript.cpp
-2019/04/12 | 4032 | dviware/dvisvgm/src/Ghostscript.hpp
-2019/03/09 | 1537 | dviware/dvisvgm/src/Glyph.hpp
-2019/12/07 | 2924 | dviware/dvisvgm/src/GlyphTracerMessages.hpp
-2019/12/06 | 27897 | dviware/dvisvgm/src/GraphicsPath.hpp
-2019/10/25 | 3609 | dviware/dvisvgm/src/HashFunction.cpp
-2019/10/25 | 2550 | dviware/dvisvgm/src/HashFunction.hpp
-2019/04/12 | 3623 | dviware/dvisvgm/src/HtmlSpecialHandler.cpp
-2019/12/07 | 2214 | dviware/dvisvgm/src/HtmlSpecialHandler.hpp
-2019/10/25 | 9805 | dviware/dvisvgm/src/HyperlinkManager.cpp
-2019/12/07 | 3980 | dviware/dvisvgm/src/HyperlinkManager.hpp
+2020/03/13 | 35349 | dviware/dvisvgm/NEWS
+2020/03/02 | 6173 | dviware/dvisvgm/README
+2020/03/02 | 158418 | dviware/dvisvgm/src/AGLTable.hpp
+2020/03/02 | 13439 | dviware/dvisvgm/src/BasicDVIReader.cpp
+2020/03/02 | 5087 | dviware/dvisvgm/src/BasicDVIReader.hpp
+2020/03/02 | 9132 | dviware/dvisvgm/src/Bezier.cpp
+2020/03/02 | 2502 | dviware/dvisvgm/src/Bezier.hpp
+2020/03/02 | 3175 | dviware/dvisvgm/src/BgColorSpecialHandler.cpp
+2020/03/02 | 2228 | dviware/dvisvgm/src/BgColorSpecialHandler.hpp
+2020/03/02 | 4889 | dviware/dvisvgm/src/Bitmap.cpp
+2020/03/02 | 4166 | dviware/dvisvgm/src/Bitmap.hpp
+2020/03/02 | 7864 | dviware/dvisvgm/src/BoundingBox.cpp
+2020/03/02 | 3912 | dviware/dvisvgm/src/BoundingBox.hpp
+2020/03/02 | 5855 | dviware/dvisvgm/src/Calculator.cpp
+2020/03/02 | 2272 | dviware/dvisvgm/src/Calculator.hpp
+2020/03/02 | 2000 | dviware/dvisvgm/src/Character.hpp
+2020/03/02 | 2040 | dviware/dvisvgm/src/CharMapID.cpp
+2020/03/02 | 2541 | dviware/dvisvgm/src/CharMapID.hpp
+2020/03/02 | 8299 | dviware/dvisvgm/src/CLCommandLine.cpp
+2020/03/02 | 2891 | dviware/dvisvgm/src/CLCommandLine.hpp
+2020/03/02 | 6531 | dviware/dvisvgm/src/CLOption.hpp
+2020/03/02 | 2676 | dviware/dvisvgm/src/CMap.cpp
+2020/03/02 | 4434 | dviware/dvisvgm/src/CMap.hpp
+2020/03/02 | 5322 | dviware/dvisvgm/src/CMapManager.cpp
+2020/03/02 | 2221 | dviware/dvisvgm/src/CMapManager.hpp
+2020/03/02 | 8274 | dviware/dvisvgm/src/CMapReader.cpp
+2020/03/02 | 3080 | dviware/dvisvgm/src/CMapReader.hpp
+2020/03/02 | 19513 | dviware/dvisvgm/src/Color.cpp
+2020/03/02 | 4778 | dviware/dvisvgm/src/Color.hpp
+2020/03/02 | 4118 | dviware/dvisvgm/src/ColorSpecialHandler.cpp
+2020/03/02 | 2118 | dviware/dvisvgm/src/ColorSpecialHandler.hpp
+2020/03/13 | 7644 | dviware/dvisvgm/src/CommandLine.hpp
+2020/03/02 | 3410 | dviware/dvisvgm/src/Directory.cpp
+2020/03/02 | 2053 | dviware/dvisvgm/src/Directory.hpp
+2020/03/02 | 2290 | dviware/dvisvgm/src/DLLoader.cpp
+2020/03/02 | 2539 | dviware/dvisvgm/src/DLLoader.hpp
+2020/03/02 | 2334 | dviware/dvisvgm/src/DVIActions.hpp
+2020/03/02 | 25282 | dviware/dvisvgm/src/DVIReader.cpp
+2020/03/02 | 8464 | dviware/dvisvgm/src/DVIReader.hpp
+2020/03/13 | 17749 | dviware/dvisvgm/src/dvisvgm.cpp
+2020/03/02 | 18126 | dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp
+2020/03/02 | 4562 | dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp
+2020/03/02 | 12234 | dviware/dvisvgm/src/DVIToSVGActions.cpp
+2020/03/02 | 4915 | dviware/dvisvgm/src/DVIToSVGActions.hpp
+2020/03/02 | 21303 | dviware/dvisvgm/src/DVIToSVG.cpp
+2020/03/02 | 5602 | dviware/dvisvgm/src/DVIToSVG.hpp
+2020/03/02 | 10960 | dviware/dvisvgm/src/EllipticalArc.cpp
+2020/03/02 | 3100 | dviware/dvisvgm/src/EllipticalArc.hpp
+2020/03/02 | 9971 | dviware/dvisvgm/src/EmSpecialHandler.cpp
+2020/03/02 | 2930 | dviware/dvisvgm/src/EmSpecialHandler.hpp
+2020/03/02 | 3935 | dviware/dvisvgm/src/EncFile.cpp
+2020/03/02 | 2116 | dviware/dvisvgm/src/EncFile.hpp
+2020/03/02 | 3776 | dviware/dvisvgm/src/EPSFile.cpp
+2020/03/02 | 2051 | dviware/dvisvgm/src/EPSFile.hpp
+2020/03/02 | 2098 | dviware/dvisvgm/src/EPSToSVG.hpp
+2020/03/02 | 3098 | dviware/dvisvgm/src/ffwrapper.c
+2020/03/02 | 1657 | dviware/dvisvgm/src/ffwrapper.h
+2020/03/02 | 9824 | dviware/dvisvgm/src/FileFinder.cpp
+2020/03/02 | 2586 | dviware/dvisvgm/src/FileFinder.hpp
+2020/03/02 | 10157 | dviware/dvisvgm/src/FilePath.cpp
+2020/03/02 | 3434 | dviware/dvisvgm/src/FilePath.hpp
+2020/03/02 | 9676 | dviware/dvisvgm/src/FileSystem.cpp
+2020/03/02 | 2754 | dviware/dvisvgm/src/FileSystem.hpp
+2020/03/02 | 1821 | dviware/dvisvgm/src/FixWord.hpp
+2020/03/02 | 12510 | dviware/dvisvgm/src/FontCache.cpp
+2020/03/02 | 2857 | dviware/dvisvgm/src/FontCache.hpp
+2020/03/02 | 21067 | dviware/dvisvgm/src/Font.cpp
+2020/03/02 | 3331 | dviware/dvisvgm/src/FontEncoding.cpp
+2020/03/02 | 2702 | dviware/dvisvgm/src/FontEncoding.hpp
+2020/03/02 | 13507 | dviware/dvisvgm/src/FontEngine.cpp
+2020/03/02 | 3254 | dviware/dvisvgm/src/FontEngine.hpp
+2020/03/02 | 17330 | dviware/dvisvgm/src/Font.hpp
+2020/03/02 | 12221 | dviware/dvisvgm/src/FontManager.cpp
+2020/03/02 | 3734 | dviware/dvisvgm/src/FontManager.hpp
+2020/03/02 | 9298 | dviware/dvisvgm/src/FontMap.cpp
+2020/03/02 | 2909 | dviware/dvisvgm/src/FontMap.hpp
+2020/03/02 | 1984 | dviware/dvisvgm/src/FontMetrics.cpp
+2020/03/02 | 3396 | dviware/dvisvgm/src/FontMetrics.hpp
+2020/03/02 | 1805 | dviware/dvisvgm/src/FontStyle.hpp
+2020/03/02 | 10110 | dviware/dvisvgm/src/FontWriter.cpp
+2020/03/02 | 2742 | dviware/dvisvgm/src/FontWriter.hpp
+2020/03/02 | 2745 | dviware/dvisvgm/src/GFGlyphTracer.cpp
+2020/03/02 | 2571 | dviware/dvisvgm/src/GFGlyphTracer.hpp
+2020/03/02 | 10894 | dviware/dvisvgm/src/GFReader.cpp
+2020/03/02 | 3967 | dviware/dvisvgm/src/GFReader.hpp
+2020/03/02 | 3610 | dviware/dvisvgm/src/GFTracer.cpp
+2020/03/02 | 2107 | dviware/dvisvgm/src/GFTracer.hpp
+2020/03/02 | 11842 | dviware/dvisvgm/src/Ghostscript.cpp
+2020/03/02 | 4032 | dviware/dvisvgm/src/Ghostscript.hpp
+2020/03/02 | 1537 | dviware/dvisvgm/src/Glyph.hpp
+2020/03/02 | 2941 | dviware/dvisvgm/src/GlyphTracerMessages.hpp
+2020/03/02 | 27914 | dviware/dvisvgm/src/GraphicsPath.hpp
+2020/03/02 | 3609 | dviware/dvisvgm/src/HashFunction.cpp
+2020/03/02 | 2550 | dviware/dvisvgm/src/HashFunction.hpp
+2020/03/02 | 3623 | dviware/dvisvgm/src/HtmlSpecialHandler.cpp
+2020/03/02 | 2214 | dviware/dvisvgm/src/HtmlSpecialHandler.hpp
+2020/03/02 | 9805 | dviware/dvisvgm/src/HyperlinkManager.cpp
+2020/03/02 | 3980 | dviware/dvisvgm/src/HyperlinkManager.hpp
2016/09/03 | 10028 | dviware/dvisvgm/src/iapi.h
2016/09/03 | 4595 | dviware/dvisvgm/src/ierrors.h
-2019/10/25 | 6847 | dviware/dvisvgm/src/ImageToSVG.cpp
-2019/10/25 | 4360 | dviware/dvisvgm/src/ImageToSVG.hpp
-2019/03/09 | 3788 | dviware/dvisvgm/src/InputBuffer.cpp
-2019/04/13 | 4758 | dviware/dvisvgm/src/InputBuffer.hpp
-2019/04/13 | 12299 | dviware/dvisvgm/src/InputReader.cpp
-2019/04/13 | 4184 | dviware/dvisvgm/src/InputReader.hpp
-2019/07/27 | 4491 | dviware/dvisvgm/src/JFM.cpp
-2019/04/13 | 2120 | dviware/dvisvgm/src/JFM.hpp
-2019/07/27 | 4728 | dviware/dvisvgm/src/Length.cpp
-2019/12/07 | 4138 | dviware/dvisvgm/src/Length.hpp
-2019/03/09 | 2014 | dviware/dvisvgm/src/macros.hpp
-2019/10/25 | 7116 | dviware/dvisvgm/src/Makefile.am
-2019/12/07 | 59734 | dviware/dvisvgm/src/Makefile.in
-2019/07/27 | 8495 | dviware/dvisvgm/src/MapLine.cpp
-2019/04/13 | 3089 | dviware/dvisvgm/src/MapLine.hpp
-2019/07/27 | 16853 | dviware/dvisvgm/src/Matrix.cpp
-2019/04/13 | 4123 | dviware/dvisvgm/src/Matrix.hpp
-2019/10/25 | 2704 | dviware/dvisvgm/src/MD5HashFunction.hpp
-2019/04/13 | 7517 | dviware/dvisvgm/src/Message.cpp
-2019/04/12 | 1779 | dviware/dvisvgm/src/MessageException.hpp
-2019/04/13 | 3541 | dviware/dvisvgm/src/Message.hpp
-2019/12/07 | 4771 | dviware/dvisvgm/src/MetafontWrapper.cpp
-2019/04/13 | 1805 | dviware/dvisvgm/src/MetafontWrapper.hpp
-2019/12/07 | 3776 | dviware/dvisvgm/src/MiKTeXCom.cpp
-2019/07/27 | 1894 | dviware/dvisvgm/src/MiKTeXCom.hpp
-2019/03/09 | 2062 | dviware/dvisvgm/src/NoPsSpecialHandler.cpp
-2019/12/07 | 1999 | dviware/dvisvgm/src/NoPsSpecialHandler.hpp
-2019/03/09 | 3999 | dviware/dvisvgm/src/NumericRanges.hpp
-2019/07/27 | 8119 | dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp
-2019/12/06 | 2709 | dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp
-2019/04/13 | 4213 | dviware/dvisvgm/src/optimizer/DependencyGraph.hpp
-2019/07/27 | 6136 | dviware/dvisvgm/src/optimizer/GroupCollapser.cpp
-2019/12/06 | 1984 | dviware/dvisvgm/src/optimizer/GroupCollapser.hpp
+2020/03/02 | 6950 | dviware/dvisvgm/src/ImageToSVG.cpp
+2020/03/02 | 4430 | dviware/dvisvgm/src/ImageToSVG.hpp
+2020/03/02 | 3788 | dviware/dvisvgm/src/InputBuffer.cpp
+2020/03/02 | 4758 | dviware/dvisvgm/src/InputBuffer.hpp
+2020/03/02 | 12299 | dviware/dvisvgm/src/InputReader.cpp
+2020/03/02 | 4184 | dviware/dvisvgm/src/InputReader.hpp
+2020/03/02 | 4491 | dviware/dvisvgm/src/JFM.cpp
+2020/03/02 | 2120 | dviware/dvisvgm/src/JFM.hpp
+2020/03/02 | 4728 | dviware/dvisvgm/src/Length.cpp
+2020/03/02 | 4138 | dviware/dvisvgm/src/Length.hpp
+2020/03/02 | 2014 | dviware/dvisvgm/src/macros.hpp
+2020/03/02 | 7116 | dviware/dvisvgm/src/Makefile.am
+2020/03/13 | 59734 | dviware/dvisvgm/src/Makefile.in
+2020/03/02 | 8495 | dviware/dvisvgm/src/MapLine.cpp
+2020/03/02 | 3089 | dviware/dvisvgm/src/MapLine.hpp
+2020/03/13 | 16848 | dviware/dvisvgm/src/Matrix.cpp
+2020/03/02 | 4123 | dviware/dvisvgm/src/Matrix.hpp
+2020/03/02 | 2704 | dviware/dvisvgm/src/MD5HashFunction.hpp
+2020/03/02 | 7517 | dviware/dvisvgm/src/Message.cpp
+2020/03/02 | 1779 | dviware/dvisvgm/src/MessageException.hpp
+2020/03/02 | 3541 | dviware/dvisvgm/src/Message.hpp
+2020/03/02 | 5814 | dviware/dvisvgm/src/MetafontWrapper.cpp
+2020/03/02 | 1876 | dviware/dvisvgm/src/MetafontWrapper.hpp
+2020/03/02 | 3776 | dviware/dvisvgm/src/MiKTeXCom.cpp
+2020/03/02 | 1894 | dviware/dvisvgm/src/MiKTeXCom.hpp
+2020/03/02 | 2062 | dviware/dvisvgm/src/NoPsSpecialHandler.cpp
+2020/03/02 | 1999 | dviware/dvisvgm/src/NoPsSpecialHandler.hpp
+2020/03/02 | 3999 | dviware/dvisvgm/src/NumericRanges.hpp
+2020/03/02 | 8119 | dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp
+2020/03/02 | 2709 | dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp
+2020/03/02 | 4213 | dviware/dvisvgm/src/optimizer/DependencyGraph.hpp
+2020/03/02 | 6136 | dviware/dvisvgm/src/optimizer/GroupCollapser.cpp
+2020/03/02 | 1984 | dviware/dvisvgm/src/optimizer/GroupCollapser.hpp
2019/12/06 | 534 | dviware/dvisvgm/src/optimizer/Makefile.am
-2019/12/07 | 22166 | dviware/dvisvgm/src/optimizer/Makefile.in
-2019/04/12 | 1642 | dviware/dvisvgm/src/optimizer/OptimizerModule.hpp
-2019/04/12 | 3130 | dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp
-2019/04/12 | 1644 | dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp
-2019/12/06 | 4394 | dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp
-2019/04/12 | 2297 | dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp
-2019/12/06 | 4212 | dviware/dvisvgm/src/optimizer/TextSimplifier.cpp
-2019/12/06 | 1699 | dviware/dvisvgm/src/optimizer/TextSimplifier.hpp
-2019/10/25 | 6267 | dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp
-2019/10/25 | 1856 | dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp
-2019/04/12 | 2013 | dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp
-2019/04/12 | 1687 | dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp
-2019/03/09 | 2067 | dviware/dvisvgm/src/options.dtd
-2019/04/12 | 8785 | dviware/dvisvgm/src/options.xml
-2019/04/12 | 2848 | dviware/dvisvgm/src/PageRanges.cpp
-2019/03/09 | 1711 | dviware/dvisvgm/src/PageRanges.hpp
-2019/04/13 | 5364 | dviware/dvisvgm/src/PageSize.cpp
-2019/04/13 | 2092 | dviware/dvisvgm/src/PageSize.hpp
-2019/10/25 | 4043 | dviware/dvisvgm/src/Pair.hpp
-2019/03/09 | 4052 | dviware/dvisvgm/src/PapersizeSpecialHandler.cpp
-2019/03/09 | 2514 | dviware/dvisvgm/src/PapersizeSpecialHandler.hpp
-2019/10/25 | 12729 | dviware/dvisvgm/src/PathClipper.cpp
-2019/12/07 | 2289 | dviware/dvisvgm/src/PathClipper.hpp
-2019/07/27 | 15422 | dviware/dvisvgm/src/PDFParser.cpp
-2019/04/13 | 5841 | dviware/dvisvgm/src/PDFParser.hpp
-2019/04/13 | 10406 | dviware/dvisvgm/src/PdfSpecialHandler.cpp
-2019/03/09 | 2830 | dviware/dvisvgm/src/PdfSpecialHandler.hpp
-2019/10/25 | 2542 | dviware/dvisvgm/src/PDFToSVG.hpp
-2019/12/07 | 1913 | dviware/dvisvgm/src/PreScanDVIReader.cpp
-2019/12/07 | 1886 | dviware/dvisvgm/src/PreScanDVIReader.hpp
-2019/12/07 | 10029 | dviware/dvisvgm/src/Process.cpp
-2019/04/13 | 1815 | dviware/dvisvgm/src/Process.hpp
-2019/12/06 | 9653 | dviware/dvisvgm/src/psdefs.cpp
-2019/03/09 | 1806 | dviware/dvisvgm/src/PSFilter.hpp
-2019/12/06 | 14105 | dviware/dvisvgm/src/PSInterpreter.cpp
-2019/12/06 | 6493 | dviware/dvisvgm/src/PSInterpreter.hpp
-2019/04/12 | 6559 | dviware/dvisvgm/src/PSPattern.cpp
-2019/04/13 | 3928 | dviware/dvisvgm/src/PSPattern.hpp
-2019/12/07 | 4494 | dviware/dvisvgm/src/PSPreviewFilter.cpp
-2019/12/07 | 2605 | dviware/dvisvgm/src/PSPreviewFilter.hpp
-2019/12/06 | 47238 | dviware/dvisvgm/src/PsSpecialHandler.cpp
-2019/12/07 | 9457 | dviware/dvisvgm/src/PsSpecialHandler.hpp
-2019/04/13 | 7059 | dviware/dvisvgm/src/RangeMap.cpp
-2019/12/07 | 5180 | dviware/dvisvgm/src/RangeMap.hpp
-2019/03/09 | 2871 | dviware/dvisvgm/src/ShadingPatch.cpp
-2019/10/25 | 3150 | dviware/dvisvgm/src/ShadingPatch.hpp
-2019/12/07 | 4203 | dviware/dvisvgm/src/SignalHandler.cpp
-2019/12/07 | 2180 | dviware/dvisvgm/src/SignalHandler.hpp
-2019/03/09 | 4623 | dviware/dvisvgm/src/SourceInput.cpp
-2019/04/13 | 2388 | dviware/dvisvgm/src/SourceInput.hpp
-2019/12/06 | 4238 | dviware/dvisvgm/src/SpecialActions.hpp
-2019/04/12 | 2512 | dviware/dvisvgm/src/SpecialHandler.hpp
-2019/04/13 | 6511 | dviware/dvisvgm/src/SpecialManager.cpp
-2019/04/13 | 2958 | dviware/dvisvgm/src/SpecialManager.hpp
-2019/10/25 | 5021 | dviware/dvisvgm/src/StreamReader.cpp
-2019/10/25 | 2975 | dviware/dvisvgm/src/StreamReader.hpp
-2019/10/25 | 3768 | dviware/dvisvgm/src/StreamWriter.cpp
-2019/10/25 | 2196 | dviware/dvisvgm/src/StreamWriter.hpp
-2019/04/13 | 9272 | dviware/dvisvgm/src/Subfont.cpp
-2019/04/13 | 3529 | dviware/dvisvgm/src/Subfont.hpp
-2019/04/13 | 3760 | dviware/dvisvgm/src/SVGCharHandler.cpp
-2019/03/09 | 2024 | dviware/dvisvgm/src/SVGCharHandlerFactory.cpp
-2019/03/09 | 1645 | dviware/dvisvgm/src/SVGCharHandlerFactory.hpp
-2019/04/13 | 4093 | dviware/dvisvgm/src/SVGCharHandler.hpp
-2019/04/13 | 5746 | dviware/dvisvgm/src/SVGCharPathHandler.cpp
-2019/04/12 | 2455 | dviware/dvisvgm/src/SVGCharPathHandler.hpp
-2019/04/13 | 3754 | dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp
-2019/04/13 | 2041 | dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp
-2019/12/07 | 6355 | dviware/dvisvgm/src/SVGOutput.cpp
-2019/12/07 | 3493 | dviware/dvisvgm/src/SVGOutput.hpp
-2019/03/09 | 2119 | dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp
-2019/04/13 | 1784 | dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp
-2019/04/13 | 12250 | dviware/dvisvgm/src/SVGTree.cpp
-2019/04/12 | 4540 | dviware/dvisvgm/src/SVGTree.hpp
-2019/04/13 | 2005 | dviware/dvisvgm/src/System.cpp
-2019/03/09 | 1511 | dviware/dvisvgm/src/System.hpp
-2019/10/25 | 20892 | dviware/dvisvgm/src/TensorProductPatch.cpp
-2019/10/25 | 5274 | dviware/dvisvgm/src/TensorProductPatch.hpp
-2019/03/09 | 6113 | dviware/dvisvgm/src/Terminal.cpp
-2019/03/09 | 2284 | dviware/dvisvgm/src/Terminal.hpp
-2019/03/09 | 7079 | dviware/dvisvgm/src/TFM.cpp
-2019/12/07 | 3519 | dviware/dvisvgm/src/TFM.hpp
-2019/03/09 | 4761 | dviware/dvisvgm/src/ToUnicodeMap.cpp
-2019/03/09 | 1844 | dviware/dvisvgm/src/ToUnicodeMap.hpp
-2019/12/06 | 13166 | dviware/dvisvgm/src/TpicSpecialHandler.cpp
-2019/03/09 | 2613 | dviware/dvisvgm/src/TpicSpecialHandler.hpp
-2019/10/25 | 8162 | dviware/dvisvgm/src/TriangularPatch.cpp
-2019/10/25 | 3049 | dviware/dvisvgm/src/TriangularPatch.hpp
-2019/07/27 | 7114 | dviware/dvisvgm/src/TrueTypeFont.cpp
-2019/04/13 | 3275 | dviware/dvisvgm/src/TrueTypeFont.hpp
-2019/03/09 | 4167 | dviware/dvisvgm/src/TTFAutohint.cpp
-2019/03/09 | 2090 | dviware/dvisvgm/src/TTFAutohint.hpp
-2019/04/13 | 6714 | dviware/dvisvgm/src/Unicode.cpp
-2019/03/09 | 1708 | dviware/dvisvgm/src/Unicode.hpp
-2019/10/25 | 7171 | dviware/dvisvgm/src/utility.cpp
-2019/10/25 | 5023 | dviware/dvisvgm/src/utility.hpp
-2019/04/13 | 3452 | dviware/dvisvgm/src/VectorIterator.hpp
-2019/12/07 | 2949 | dviware/dvisvgm/src/VectorStream.hpp
-2019/03/09 | 1577 | dviware/dvisvgm/src/version.hpp.in
-2019/03/09 | 1911 | dviware/dvisvgm/src/VFActions.hpp
-2019/12/07 | 6570 | dviware/dvisvgm/src/VFReader.cpp
-2019/12/07 | 2443 | dviware/dvisvgm/src/VFReader.hpp
-2019/03/09 | 1604 | dviware/dvisvgm/src/windows.hpp
-2019/04/12 | 2240 | dviware/dvisvgm/src/XMLDocument.cpp
-2019/04/13 | 2053 | dviware/dvisvgm/src/XMLDocument.hpp
-2019/04/12 | 14696 | dviware/dvisvgm/src/XMLNode.cpp
-2019/12/06 | 9902 | dviware/dvisvgm/src/XMLNode.hpp
-2019/07/27 | 3036 | dviware/dvisvgm/src/XMLString.cpp
-2019/04/13 | 1887 | dviware/dvisvgm/src/XMLString.hpp
-2019/10/25 | 4557 | dviware/dvisvgm/src/XXHashFunction.hpp
-2019/04/13 | 5940 | dviware/dvisvgm/src/ZLibOutputStream.hpp
+2020/03/13 | 22166 | dviware/dvisvgm/src/optimizer/Makefile.in
+2020/03/02 | 1642 | dviware/dvisvgm/src/optimizer/OptimizerModule.hpp
+2020/03/02 | 3192 | dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp
+2020/03/02 | 1644 | dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp
+2020/03/02 | 4394 | dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp
+2020/03/02 | 2297 | dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp
+2020/03/02 | 4212 | dviware/dvisvgm/src/optimizer/TextSimplifier.cpp
+2020/03/02 | 1699 | dviware/dvisvgm/src/optimizer/TextSimplifier.hpp
+2020/03/02 | 6704 | dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp
+2020/03/02 | 1856 | dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp
+2020/03/02 | 2013 | dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp
+2020/03/02 | 1687 | dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp
+2020/03/02 | 2067 | dviware/dvisvgm/src/options.dtd
+2020/03/13 | 8986 | dviware/dvisvgm/src/options.xml
+2020/03/02 | 2848 | dviware/dvisvgm/src/PageRanges.cpp
+2020/03/02 | 1711 | dviware/dvisvgm/src/PageRanges.hpp
+2020/03/02 | 5332 | dviware/dvisvgm/src/PageSize.cpp
+2020/03/02 | 2092 | dviware/dvisvgm/src/PageSize.hpp
+2020/03/02 | 4043 | dviware/dvisvgm/src/Pair.hpp
+2020/03/02 | 4052 | dviware/dvisvgm/src/PapersizeSpecialHandler.cpp
+2020/03/02 | 2514 | dviware/dvisvgm/src/PapersizeSpecialHandler.hpp
+2020/03/02 | 12729 | dviware/dvisvgm/src/PathClipper.cpp
+2020/03/02 | 2289 | dviware/dvisvgm/src/PathClipper.hpp
+2020/03/02 | 15422 | dviware/dvisvgm/src/PDFParser.cpp
+2020/03/02 | 5841 | dviware/dvisvgm/src/PDFParser.hpp
+2020/03/02 | 10406 | dviware/dvisvgm/src/PdfSpecialHandler.cpp
+2020/03/02 | 2830 | dviware/dvisvgm/src/PdfSpecialHandler.hpp
+2020/03/02 | 2548 | dviware/dvisvgm/src/PDFToSVG.hpp
+2020/03/02 | 1913 | dviware/dvisvgm/src/PreScanDVIReader.cpp
+2020/03/02 | 1886 | dviware/dvisvgm/src/PreScanDVIReader.hpp
+2020/03/02 | 10029 | dviware/dvisvgm/src/Process.cpp
+2020/03/02 | 1815 | dviware/dvisvgm/src/Process.hpp
+2020/03/13 | 11910 | dviware/dvisvgm/src/psdefs.cpp
+2020/03/02 | 1806 | dviware/dvisvgm/src/PSFilter.hpp
+2020/03/13 | 16801 | dviware/dvisvgm/src/PSInterpreter.cpp
+2020/03/13 | 6894 | dviware/dvisvgm/src/PSInterpreter.hpp
+2020/03/02 | 6516 | dviware/dvisvgm/src/PSPattern.cpp
+2020/03/02 | 3928 | dviware/dvisvgm/src/PSPattern.hpp
+2020/03/02 | 4494 | dviware/dvisvgm/src/PSPreviewFilter.cpp
+2020/03/02 | 2605 | dviware/dvisvgm/src/PSPreviewFilter.hpp
+2020/03/13 | 50325 | dviware/dvisvgm/src/PsSpecialHandler.cpp
+2020/03/13 | 9808 | dviware/dvisvgm/src/PsSpecialHandler.hpp
+2020/03/02 | 7059 | dviware/dvisvgm/src/RangeMap.cpp
+2020/03/02 | 5180 | dviware/dvisvgm/src/RangeMap.hpp
+2020/03/02 | 2871 | dviware/dvisvgm/src/ShadingPatch.cpp
+2020/03/02 | 3150 | dviware/dvisvgm/src/ShadingPatch.hpp
+2020/03/02 | 4203 | dviware/dvisvgm/src/SignalHandler.cpp
+2020/03/02 | 2180 | dviware/dvisvgm/src/SignalHandler.hpp
+2020/03/02 | 4623 | dviware/dvisvgm/src/SourceInput.cpp
+2020/03/02 | 2388 | dviware/dvisvgm/src/SourceInput.hpp
+2020/03/02 | 4238 | dviware/dvisvgm/src/SpecialActions.hpp
+2020/03/02 | 2512 | dviware/dvisvgm/src/SpecialHandler.hpp
+2020/03/02 | 6511 | dviware/dvisvgm/src/SpecialManager.cpp
+2020/03/02 | 2958 | dviware/dvisvgm/src/SpecialManager.hpp
+2020/03/02 | 5021 | dviware/dvisvgm/src/StreamReader.cpp
+2020/03/02 | 2975 | dviware/dvisvgm/src/StreamReader.hpp
+2020/03/02 | 3768 | dviware/dvisvgm/src/StreamWriter.cpp
+2020/03/02 | 2196 | dviware/dvisvgm/src/StreamWriter.hpp
+2020/03/02 | 9272 | dviware/dvisvgm/src/Subfont.cpp
+2020/03/02 | 3529 | dviware/dvisvgm/src/Subfont.hpp
+2020/03/02 | 3760 | dviware/dvisvgm/src/SVGCharHandler.cpp
+2020/03/02 | 2024 | dviware/dvisvgm/src/SVGCharHandlerFactory.cpp
+2020/03/02 | 1645 | dviware/dvisvgm/src/SVGCharHandlerFactory.hpp
+2020/03/02 | 4093 | dviware/dvisvgm/src/SVGCharHandler.hpp
+2020/03/02 | 5746 | dviware/dvisvgm/src/SVGCharPathHandler.cpp
+2020/03/02 | 2455 | dviware/dvisvgm/src/SVGCharPathHandler.hpp
+2020/03/02 | 3754 | dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp
+2020/03/02 | 2041 | dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp
+2020/03/02 | 6355 | dviware/dvisvgm/src/SVGOutput.cpp
+2020/03/02 | 3493 | dviware/dvisvgm/src/SVGOutput.hpp
+2020/03/02 | 2119 | dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp
+2020/03/02 | 1784 | dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp
+2020/03/02 | 12250 | dviware/dvisvgm/src/SVGTree.cpp
+2020/03/02 | 4540 | dviware/dvisvgm/src/SVGTree.hpp
+2020/03/02 | 2005 | dviware/dvisvgm/src/System.cpp
+2020/03/02 | 1511 | dviware/dvisvgm/src/System.hpp
+2020/03/02 | 20890 | dviware/dvisvgm/src/TensorProductPatch.cpp
+2020/03/02 | 5274 | dviware/dvisvgm/src/TensorProductPatch.hpp
+2020/03/02 | 6113 | dviware/dvisvgm/src/Terminal.cpp
+2020/03/02 | 2284 | dviware/dvisvgm/src/Terminal.hpp
+2020/03/02 | 7079 | dviware/dvisvgm/src/TFM.cpp
+2020/03/02 | 3519 | dviware/dvisvgm/src/TFM.hpp
+2020/03/02 | 4761 | dviware/dvisvgm/src/ToUnicodeMap.cpp
+2020/03/02 | 1844 | dviware/dvisvgm/src/ToUnicodeMap.hpp
+2020/03/02 | 13166 | dviware/dvisvgm/src/TpicSpecialHandler.cpp
+2020/03/02 | 2613 | dviware/dvisvgm/src/TpicSpecialHandler.hpp
+2020/03/02 | 8160 | dviware/dvisvgm/src/TriangularPatch.cpp
+2020/03/02 | 3049 | dviware/dvisvgm/src/TriangularPatch.hpp
+2020/03/02 | 7114 | dviware/dvisvgm/src/TrueTypeFont.cpp
+2020/03/02 | 3275 | dviware/dvisvgm/src/TrueTypeFont.hpp
+2020/03/02 | 4167 | dviware/dvisvgm/src/TTFAutohint.cpp
+2020/03/02 | 2090 | dviware/dvisvgm/src/TTFAutohint.hpp
+2020/03/02 | 6714 | dviware/dvisvgm/src/Unicode.cpp
+2020/03/02 | 1708 | dviware/dvisvgm/src/Unicode.hpp
+2020/03/02 | 7171 | dviware/dvisvgm/src/utility.cpp
+2020/03/13 | 5501 | dviware/dvisvgm/src/utility.hpp
+2020/03/02 | 3452 | dviware/dvisvgm/src/VectorIterator.hpp
+2020/03/02 | 2949 | dviware/dvisvgm/src/VectorStream.hpp
+2020/03/02 | 1577 | dviware/dvisvgm/src/version.hpp.in
+2020/03/02 | 1911 | dviware/dvisvgm/src/VFActions.hpp
+2020/03/02 | 6570 | dviware/dvisvgm/src/VFReader.cpp
+2020/03/02 | 2443 | dviware/dvisvgm/src/VFReader.hpp
+2020/03/02 | 1604 | dviware/dvisvgm/src/windows.hpp
+2020/03/02 | 2240 | dviware/dvisvgm/src/XMLDocument.cpp
+2020/03/02 | 2053 | dviware/dvisvgm/src/XMLDocument.hpp
+2020/03/13 | 15597 | dviware/dvisvgm/src/XMLNode.cpp
+2020/03/02 | 9955 | dviware/dvisvgm/src/XMLNode.hpp
+2020/03/02 | 3036 | dviware/dvisvgm/src/XMLString.cpp
+2020/03/02 | 1887 | dviware/dvisvgm/src/XMLString.hpp
+2020/03/02 | 4557 | dviware/dvisvgm/src/XXHashFunction.hpp
+2020/03/02 | 5940 | dviware/dvisvgm/src/ZLibOutputStream.hpp
2019/03/09 | 4642 | dviware/dvisvgm/test-driver
-2019/10/25 | 6075 | dviware/dvisvgm/tests/BezierTest.cpp
-2019/03/09 | 2704 | dviware/dvisvgm/tests/BitmapTest.cpp
-2019/04/12 | 6074 | dviware/dvisvgm/tests/BoundingBoxTest.cpp
-2019/03/09 | 2910 | dviware/dvisvgm/tests/CalculatorTest.cpp
-2019/03/09 | 1216 | dviware/dvisvgm/tests/check-conv
-2019/03/09 | 2974 | dviware/dvisvgm/tests/CMapManagerTest.cpp
-2019/10/31 | 4223 | dviware/dvisvgm/tests/CMapReaderTest.cpp
-2019/03/09 | 4980 | dviware/dvisvgm/tests/CMapTest.cpp
-2019/03/09 | 4702 | dviware/dvisvgm/tests/ColorSpecialTest.cpp
-2019/03/09 | 6942 | dviware/dvisvgm/tests/ColorTest.cpp
-2019/04/12 | 8439 | dviware/dvisvgm/tests/CommandLineTest.cpp
+2020/03/02 | 6075 | dviware/dvisvgm/tests/BezierTest.cpp
+2020/03/02 | 2704 | dviware/dvisvgm/tests/BitmapTest.cpp
+2020/03/02 | 6074 | dviware/dvisvgm/tests/BoundingBoxTest.cpp
+2020/03/02 | 2910 | dviware/dvisvgm/tests/CalculatorTest.cpp
+2020/03/02 | 1216 | dviware/dvisvgm/tests/check-conv
+2020/03/02 | 2974 | dviware/dvisvgm/tests/CMapManagerTest.cpp
+2020/03/02 | 4223 | dviware/dvisvgm/tests/CMapReaderTest.cpp
+2020/03/02 | 4980 | dviware/dvisvgm/tests/CMapTest.cpp
+2020/03/02 | 4702 | dviware/dvisvgm/tests/ColorSpecialTest.cpp
+2020/03/02 | 6942 | dviware/dvisvgm/tests/ColorTest.cpp
+2020/03/02 | 8439 | dviware/dvisvgm/tests/CommandLineTest.cpp
2016/09/03 | 2508 | dviware/dvisvgm/tests/data/cidjmgr0-h.tfm
2016/09/03 | 24244 | dviware/dvisvgm/tests/data/cmr10.600gf
2017/11/23 | 35752 | dviware/dvisvgm/tests/data/cmr10.pfb
@@ -3997,8 +3997,8 @@
2016/09/03 | 2072 | dviware/dvisvgm/tests/data/frktest.dvi
2016/09/03 | 337419 | dviware/dvisvgm/tests/data/frktest-nf-cmp.svg
2016/09/03 | 163979 | dviware/dvisvgm/tests/data/frktest-wf-cmp.svg
-2019/03/09 | 428 | dviware/dvisvgm/tests/data/Makefile.am
-2019/12/07 | 13688 | dviware/dvisvgm/tests/data/Makefile.in
+2020/03/02 | 428 | dviware/dvisvgm/tests/data/Makefile.am
+2020/03/13 | 13688 | dviware/dvisvgm/tests/data/Makefile.in
2016/09/03 | 1207 | dviware/dvisvgm/tests/data/ot1.cmap
2016/09/03 | 1320 | dviware/dvisvgm/tests/data/sample.dvi
2016/09/03 | 60654 | dviware/dvisvgm/tests/data/sample-nf-cmp.svg
@@ -4006,23 +4006,23 @@
2017/11/23 | 1016 | dviware/dvisvgm/tests/data/sample_v2.dvi
2017/11/23 | 256 | dviware/dvisvgm/tests/data/sample_v3.dvi
2016/09/03 | 46985 | dviware/dvisvgm/tests/data/sample-wf-cmp.svg
-2019/04/12 | 2512 | dviware/dvisvgm/tests/DependencyGraphTest.cpp
-2019/03/09 | 2773 | dviware/dvisvgm/tests/DirectoryTest.cpp
-2019/04/12 | 33210 | dviware/dvisvgm/tests/DVIReaderTest.cpp
-2019/04/12 | 13220 | dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
-2019/10/25 | 5850 | dviware/dvisvgm/tests/EllipticalArcTest.cpp
-2019/04/12 | 7485 | dviware/dvisvgm/tests/EmSpecialTest.cpp
-2019/03/09 | 3124 | dviware/dvisvgm/tests/FileFinderTest.cpp
-2019/10/25 | 3661 | dviware/dvisvgm/tests/FilePathTest.cpp
-2019/03/09 | 3899 | dviware/dvisvgm/tests/FileSystemTest.cpp
-2019/10/25 | 5070 | dviware/dvisvgm/tests/FontCacheTest.cpp
-2019/03/09 | 2582 | dviware/dvisvgm/tests/FontManagerTest.cpp
-2019/03/09 | 2850 | dviware/dvisvgm/tests/FontMapTest.cpp
-2019/07/27 | 2026 | dviware/dvisvgm/tests/genhashcheck.py
-2019/04/12 | 4645 | dviware/dvisvgm/tests/GFGlyphTracerTest.cpp
-2019/03/09 | 12993 | dviware/dvisvgm/tests/GFReaderTest.cpp
-2019/03/09 | 2083 | dviware/dvisvgm/tests/GhostscriptTest.cpp
-2019/10/25 | 7234 | dviware/dvisvgm/tests/GraphicsPathTest.cpp
+2020/03/02 | 2512 | dviware/dvisvgm/tests/DependencyGraphTest.cpp
+2020/03/02 | 2773 | dviware/dvisvgm/tests/DirectoryTest.cpp
+2020/03/02 | 33210 | dviware/dvisvgm/tests/DVIReaderTest.cpp
+2020/03/02 | 13220 | dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
+2020/03/02 | 5850 | dviware/dvisvgm/tests/EllipticalArcTest.cpp
+2020/03/02 | 7485 | dviware/dvisvgm/tests/EmSpecialTest.cpp
+2020/03/02 | 3124 | dviware/dvisvgm/tests/FileFinderTest.cpp
+2020/03/02 | 3758 | dviware/dvisvgm/tests/FilePathTest.cpp
+2020/03/02 | 3899 | dviware/dvisvgm/tests/FileSystemTest.cpp
+2020/03/02 | 5070 | dviware/dvisvgm/tests/FontCacheTest.cpp
+2020/03/02 | 2582 | dviware/dvisvgm/tests/FontManagerTest.cpp
+2020/03/02 | 2850 | dviware/dvisvgm/tests/FontMapTest.cpp
+2020/03/02 | 2026 | dviware/dvisvgm/tests/genhashcheck.py
+2020/03/02 | 4645 | dviware/dvisvgm/tests/GFGlyphTracerTest.cpp
+2020/03/02 | 12993 | dviware/dvisvgm/tests/GFReaderTest.cpp
+2020/03/02 | 2083 | dviware/dvisvgm/tests/GhostscriptTest.cpp
+2020/03/02 | 7230 | dviware/dvisvgm/tests/GraphicsPathTest.cpp
2019/10/25 | 14367 | dviware/dvisvgm/tests/gtest/include/gtest/gtest-death-test.h
2019/10/25 | 93924 | dviware/dvisvgm/tests/gtest/include/gtest/gtest.h
2019/10/25 | 27039 | dviware/dvisvgm/tests/gtest/include/gtest/gtest-matchers.h
@@ -4060,45 +4060,45 @@
2019/10/25 | 14711 | dviware/dvisvgm/tests/gtest/src/gtest-printers.cc
2019/10/25 | 4010 | dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc
2019/10/25 | 3923 | dviware/dvisvgm/tests/gtest/src/gtest-typed-test.cc
-2019/10/25 | 5568 | dviware/dvisvgm/tests/HashFunctionTest.cpp
-2019/03/09 | 4034 | dviware/dvisvgm/tests/JFMReaderTest.cpp
-2019/03/09 | 7803 | dviware/dvisvgm/tests/LengthTest.cpp
-2019/10/25 | 15639 | dviware/dvisvgm/tests/Makefile.am
-2019/12/07 | 256010 | dviware/dvisvgm/tests/Makefile.in
-2019/03/09 | 5795 | dviware/dvisvgm/tests/MapLineTest.cpp
-2019/04/12 | 8284 | dviware/dvisvgm/tests/MatrixTest.cpp
-2019/03/09 | 2315 | dviware/dvisvgm/tests/MessageExceptionTest.cpp
-2019/03/09 | 4799 | dviware/dvisvgm/tests/normalize.xsl
-2019/03/09 | 4640 | dviware/dvisvgm/tests/PageRagesTest.cpp
-2019/03/09 | 2398 | dviware/dvisvgm/tests/PageSizeTest.cpp
-2019/03/09 | 4193 | dviware/dvisvgm/tests/PairTest.cpp
-2019/03/09 | 4922 | dviware/dvisvgm/tests/PapersizeSpecialTest.cpp
-2019/03/09 | 8452 | dviware/dvisvgm/tests/PDFParserTest.cpp
-2019/12/06 | 8335 | dviware/dvisvgm/tests/PSInterpreterTest.cpp
-2019/04/13 | 6392 | dviware/dvisvgm/tests/RangeMapTest.cpp
-2019/03/09 | 3629 | dviware/dvisvgm/tests/ShadingPatchTest.cpp
-2019/03/09 | 3801 | dviware/dvisvgm/tests/SpecialManagerTest.cpp
-2019/03/09 | 5392 | dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp
-2019/04/12 | 7499 | dviware/dvisvgm/tests/StreamInputBufferTest.cpp
-2019/10/25 | 4178 | dviware/dvisvgm/tests/StreamReaderTest.cpp
-2019/10/25 | 3420 | dviware/dvisvgm/tests/StreamWriterTest.cpp
-2019/04/12 | 4460 | dviware/dvisvgm/tests/StringMatcherTest.cpp
-2019/03/09 | 3346 | dviware/dvisvgm/tests/SubfontTest.cpp
-2019/10/25 | 6521 | dviware/dvisvgm/tests/SVGOutputTest.cpp
-2019/10/25 | 12810 | dviware/dvisvgm/tests/TensorProductPatchTest.cpp
-2019/03/09 | 1999 | dviware/dvisvgm/tests/testmain.cpp
+2020/03/13 | 5568 | dviware/dvisvgm/tests/HashFunctionTest.cpp
+2020/03/02 | 4034 | dviware/dvisvgm/tests/JFMReaderTest.cpp
+2020/03/02 | 7803 | dviware/dvisvgm/tests/LengthTest.cpp
+2020/03/02 | 15639 | dviware/dvisvgm/tests/Makefile.am
+2020/03/13 | 256010 | dviware/dvisvgm/tests/Makefile.in
+2020/03/02 | 5795 | dviware/dvisvgm/tests/MapLineTest.cpp
+2020/03/02 | 8338 | dviware/dvisvgm/tests/MatrixTest.cpp
+2020/03/02 | 2315 | dviware/dvisvgm/tests/MessageExceptionTest.cpp
+2020/03/02 | 4799 | dviware/dvisvgm/tests/normalize.xsl
+2020/03/02 | 4640 | dviware/dvisvgm/tests/PageRagesTest.cpp
+2020/03/02 | 2398 | dviware/dvisvgm/tests/PageSizeTest.cpp
+2020/03/02 | 4193 | dviware/dvisvgm/tests/PairTest.cpp
+2020/03/02 | 4922 | dviware/dvisvgm/tests/PapersizeSpecialTest.cpp
+2020/03/02 | 8452 | dviware/dvisvgm/tests/PDFParserTest.cpp
+2020/03/02 | 8553 | dviware/dvisvgm/tests/PSInterpreterTest.cpp
+2020/03/02 | 6392 | dviware/dvisvgm/tests/RangeMapTest.cpp
+2020/03/02 | 3629 | dviware/dvisvgm/tests/ShadingPatchTest.cpp
+2020/03/02 | 3801 | dviware/dvisvgm/tests/SpecialManagerTest.cpp
+2020/03/02 | 5392 | dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp
+2020/03/02 | 7499 | dviware/dvisvgm/tests/StreamInputBufferTest.cpp
+2020/03/02 | 4178 | dviware/dvisvgm/tests/StreamReaderTest.cpp
+2020/03/02 | 3420 | dviware/dvisvgm/tests/StreamWriterTest.cpp
+2020/03/02 | 4460 | dviware/dvisvgm/tests/StringMatcherTest.cpp
+2020/03/02 | 3346 | dviware/dvisvgm/tests/SubfontTest.cpp
+2020/03/02 | 6521 | dviware/dvisvgm/tests/SVGOutputTest.cpp
+2020/03/02 | 12810 | dviware/dvisvgm/tests/TensorProductPatchTest.cpp
+2020/03/02 | 1999 | dviware/dvisvgm/tests/testmain.cpp
2019/10/25 | 184 | dviware/dvisvgm/tests/testutil.hpp
-2019/03/09 | 3348 | dviware/dvisvgm/tests/TFMReaderTest.cpp
-2019/03/09 | 2501 | dviware/dvisvgm/tests/ToUnicodeMapTest.cpp
-2019/10/25 | 14085 | dviware/dvisvgm/tests/TpicSpecialTest.cpp
-2019/10/25 | 7066 | dviware/dvisvgm/tests/TriangularPatchTest.cpp
-2019/03/09 | 5016 | dviware/dvisvgm/tests/UnicodeTest.cpp
-2019/07/27 | 5208 | dviware/dvisvgm/tests/UtilityTest.cpp
-2019/03/09 | 3785 | dviware/dvisvgm/tests/VectorIteratorTest.cpp
-2019/03/09 | 2276 | dviware/dvisvgm/tests/VectorStreamTest.cpp
-2019/04/12 | 15061 | dviware/dvisvgm/tests/XMLNodeTest.cpp
-2019/03/09 | 3034 | dviware/dvisvgm/tests/XMLStringTest.cpp
-2019/12/09 | 3461852 | dviware/dvisvgm.zip
+2020/03/02 | 3348 | dviware/dvisvgm/tests/TFMReaderTest.cpp
+2020/03/02 | 2501 | dviware/dvisvgm/tests/ToUnicodeMapTest.cpp
+2020/03/02 | 14085 | dviware/dvisvgm/tests/TpicSpecialTest.cpp
+2020/03/02 | 7066 | dviware/dvisvgm/tests/TriangularPatchTest.cpp
+2020/03/02 | 5016 | dviware/dvisvgm/tests/UnicodeTest.cpp
+2020/03/02 | 5208 | dviware/dvisvgm/tests/UtilityTest.cpp
+2020/03/02 | 3785 | dviware/dvisvgm/tests/VectorIteratorTest.cpp
+2020/03/02 | 2276 | dviware/dvisvgm/tests/VectorStreamTest.cpp
+2020/03/02 | 15061 | dviware/dvisvgm/tests/XMLNodeTest.cpp
+2020/03/02 | 3034 | dviware/dvisvgm/tests/XMLStringTest.cpp
+2020/03/15 | 3477979 | dviware/dvisvgm.zip
1991/04/12 | 1728 | dviware/dvitops/aftopl.1
1991/04/12 | 12075 | dviware/dvitops/aftopl.c
1991/01/25 | 837 | dviware/dvitops/cms.h
@@ -5000,7 +5000,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2020/03/14 | 160509 | FILES.last07days
+2020/03/15 | 139957 | FILES.last07days
2018/06/27 | 99883 | fonts/academicons/academicons.pdf
2018/06/27 | 10779 | fonts/academicons/academicons.sty
2018/06/27 | 5774 | fonts/academicons/academicons.tex
@@ -134456,11 +134456,11 @@
2019/07/05 | 2151 | graphics/pgf/contrib/milsymb/manual_scripts/Space_lower_table.tex
2019/07/05 | 16946 | graphics/pgf/contrib/milsymb/manual_scripts/Space_main_table.tex
2019/07/05 | 3345 | graphics/pgf/contrib/milsymb/manual_scripts/Space_upper_table.tex
-2019/07/05 | 1078957 | graphics/pgf/contrib/milsymb/milsymb.pdf
-2019/07/05 | 186031 | graphics/pgf/contrib/milsymb/milsymb.sty
-2019/07/05 | 106841 | graphics/pgf/contrib/milsymb/milsymb.tex
+2020/03/15 | 1079786 | graphics/pgf/contrib/milsymb/milsymb.pdf
+2020/03/15 | 186752 | graphics/pgf/contrib/milsymb/milsymb.sty
+2020/03/15 | 107559 | graphics/pgf/contrib/milsymb/milsymb.tex
2019/06/17 | 649 | graphics/pgf/contrib/milsymb/README.md
-2019/07/06 | 1617429 | graphics/pgf/contrib/milsymb.zip
+2020/03/15 | 1618478 | graphics/pgf/contrib/milsymb.zip
2013/08/21 | 30526 | graphics/pgf/contrib/neuralnetwork/examples/neuralnetwork.pdf
2013/08/21 | 594709 | graphics/pgf/contrib/neuralnetwork/examples/neural-networks-ebook.pdf
2013/08/21 | 487 | graphics/pgf/contrib/neuralnetwork/examples/neuralnetwork.tex
@@ -162494,7 +162494,7 @@
2020/02/21 | 196178 | install/macros/luatex/generic/luamplib.tds.zip
2020/02/03 | 1852727 | install/macros/luatex/generic/luaotfload.tds.zip
2015/10/04 | 277014 | install/macros/luatex/generic/luatexbase.tds.zip
-2020/02/29 | 877348 | install/macros/luatex/latex/arabluatex.tds.zip
+2020/03/15 | 880532 | install/macros/luatex/latex/arabluatex.tds.zip
2013/09/26 | 155171 | install/macros/luatex/latex/luabibentry.tds.zip
2012/01/23 | 423265 | install/macros/luatex/latex/luacode.tds.zip
2010/11/19 | 426632 | install/macros/luatex/latex/luainputenc.tds.zip
@@ -175595,12 +175595,12 @@
1996/12/16 | 6503 | macros/generic/rlepsf/rlepsf.tex
2005/08/12 | 70707 | macros/generic/rlepsf.zip
2020/03/12 | 2121 | macros/generic/schemata/Makefile
-2020/03/13 | 10667 | macros/generic/schemata/README
-2020/03/13 | 85783 | macros/generic/schemata/schemata.dtx
-2020/03/13 | 629338 | macros/generic/schemata/schemata.pdf
+2020/03/14 | 3892 | macros/generic/schemata/README
+2020/03/14 | 85866 | macros/generic/schemata/schemata.dtx
+2020/03/14 | 629768 | macros/generic/schemata/schemata.pdf
2020/03/08 | 91134 | macros/generic/schemata/schemata.png
2020/03/13 | 12555 | macros/generic/schemata/schematest.tex
-2020/03/13 | 737943 | macros/generic/schemata.zip
+2020/03/15 | 737138 | macros/generic/schemata.zip
2006/05/29 | 25940 | macros/generic/shade/description.pdf
2011/04/25 | 1619 | macros/generic/shade/description.tex
2011/04/25 | 1437 | macros/generic/shade/README
@@ -180364,84 +180364,84 @@
2017/06/17 | 9858 | macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx
2017/06/17 | 5005 | macros/latex/contrib/biblatex-contrib/biblatex-enc/README
2017/06/17 | 11479 | macros/latex/contrib/biblatex-contrib/biblatex-enc.zip
-2019/11/30 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
-2019/11/30 | 3637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
-2019/11/30 | 15109 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
-2019/11/30 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
-2019/11/30 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
-2019/11/30 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
-2019/11/30 | 528139 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
-2019/11/30 | 8804 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
-2019/11/30 | 132911 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
-2019/11/30 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
-2019/11/30 | 9352 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
-2019/11/30 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
-2019/11/30 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
-2019/11/30 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
-2019/11/30 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
-2019/11/30 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
-2019/11/30 | 4612 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
-2019/11/30 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
-2019/11/30 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
-2019/11/30 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
-2019/11/30 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
-2019/11/30 | 4830 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
-2019/11/30 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
-2019/11/30 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
-2019/11/30 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
-2019/11/30 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
-2019/11/30 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
-2019/11/30 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
-2019/11/30 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
-2019/11/30 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
-2019/11/30 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
-2019/11/30 | 5257 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
-2019/11/30 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
-2019/11/30 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
-2019/11/30 | 8255 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
-2019/11/30 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
-2019/11/30 | 11663 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
-2019/11/30 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
-2019/11/30 | 5587 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
-2019/11/30 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
-2019/11/30 | 8705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
-2019/11/30 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
-2019/11/30 | 12128 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
-2019/11/30 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
-2019/11/30 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
-2019/11/30 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
-2019/11/30 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
-2019/11/30 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
-2019/11/30 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
-2019/11/30 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
-2019/11/30 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
-2019/11/30 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
-2019/11/30 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
-2019/11/30 | 11708 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
-2019/11/30 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
-2019/11/30 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
-2019/11/30 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
-2019/11/30 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
-2019/11/30 | 4617 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
-2019/11/30 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
-2019/11/30 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
-2019/11/30 | 36728 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
-2019/11/30 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
-2019/11/30 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
-2019/11/30 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
-2019/11/30 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
-2019/11/30 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
-2019/11/30 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
-2019/11/30 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
-2019/11/30 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
-2019/11/30 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
-2019/11/30 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
-2019/11/30 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
-2019/11/30 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
-2019/11/30 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
-2019/11/30 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
-2019/11/30 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
-2019/11/30 | 646160 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip
+2020/03/15 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
+2020/03/15 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+2020/03/15 | 15136 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+2020/03/15 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+2020/03/15 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+2020/03/15 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+2020/03/15 | 551082 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+2020/03/15 | 9314 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+2020/03/15 | 133009 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+2020/03/15 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+2020/03/15 | 9724 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+2020/03/15 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+2020/03/15 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+2020/03/15 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+2020/03/15 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+2020/03/15 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+2020/03/15 | 4612 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+2020/03/15 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+2020/03/15 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+2020/03/15 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+2020/03/15 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+2020/03/15 | 4830 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+2020/03/15 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+2020/03/15 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+2020/03/15 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+2020/03/15 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+2020/03/15 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+2020/03/15 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+2020/03/15 | 5257 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+2020/03/15 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+2020/03/15 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+2020/03/15 | 8255 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+2020/03/15 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+2020/03/15 | 11663 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+2020/03/15 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+2020/03/15 | 5587 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+2020/03/15 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+2020/03/15 | 8705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+2020/03/15 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+2020/03/15 | 12128 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+2020/03/15 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+2020/03/15 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+2020/03/15 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+2020/03/15 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+2020/03/15 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+2020/03/15 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+2020/03/15 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+2020/03/15 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+2020/03/15 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+2020/03/15 | 11700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+2020/03/15 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+2020/03/15 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+2020/03/15 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+2020/03/15 | 4617 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+2020/03/15 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+2020/03/15 | 36731 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+2020/03/15 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+2020/03/15 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+2020/03/15 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+2020/03/15 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+2020/03/15 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+2020/03/15 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+2020/03/15 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+2020/03/15 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+2020/03/15 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
+2020/03/15 | 669235 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip
2017/11/21 | 241897 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/doc/biblatex-fiwi.pdf
2017/11/21 | 86976 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/doc/biblatex-fiwi.tex
2017/11/21 | 570 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/doc/dissff.xdy
@@ -180936,16 +180936,17 @@
2016/12/01 | 3595 | macros/latex/contrib/biblatex-contrib/historische-zeitschrift/LIESMICH
2016/12/01 | 3334 | macros/latex/contrib/biblatex-contrib/historische-zeitschrift/README
2016/12/02 | 11262 | macros/latex/contrib/biblatex-contrib/historische-zeitschrift.zip
-2019/01/19 | 29033 | macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
-2019/01/19 | 29032 | macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx
-2019/01/19 | 29033 | macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx
-2019/01/19 | 102517 | macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx
-2019/01/19 | 14693 | macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx
-2019/01/19 | 231 | macros/latex/contrib/biblatex-contrib/oscola/oscola.ist
-2019/01/19 | 607124 | macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf
-2019/01/19 | 213709 | macros/latex/contrib/biblatex-contrib/oscola/oscola.tex
-2019/01/19 | 3345 | macros/latex/contrib/biblatex-contrib/oscola/README.md
-2019/01/20 | 692665 | macros/latex/contrib/biblatex-contrib/oscola.zip
+2020/03/15 | 29431 | macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
+2020/03/15 | 29430 | macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx
+2020/03/15 | 29430 | macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx
+2020/03/15 | 102331 | macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx
+2020/03/15 | 14693 | macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx
+2020/03/15 | 38693 | macros/latex/contrib/biblatex-contrib/oscola/oscola-examples.bib
+2020/03/15 | 230 | macros/latex/contrib/biblatex-contrib/oscola/oscola.ist
+2020/03/15 | 886853 | macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf
+2020/03/15 | 214160 | macros/latex/contrib/biblatex-contrib/oscola/oscola.tex
+2020/03/15 | 3466 | macros/latex/contrib/biblatex-contrib/oscola/README.md
+2020/03/15 | 711280 | macros/latex/contrib/biblatex-contrib/oscola.zip
2010/11/19 | 1269 | macros/latex/contrib/biblatex-contrib/README
2013/08/30 | 261 | macros/latex/contrib/biblatex-contrib/uni-wtal-ger/CHANGES
2013/08/30 | 4273 | macros/latex/contrib/biblatex-contrib/uni-wtal-ger/germanistik.bib
@@ -192292,20 +192293,20 @@
1995/06/29 | 105724 | macros/latex/contrib/lifia-th/test-lifia-th.ps
1995/06/19 | 10277 | macros/latex/contrib/lifia-th/test-lifia-th.texf
2007/12/25 | 243037 | macros/latex/contrib/lifia-th.zip
-2020/02/08 | 9951 | macros/latex/contrib/limecv/examples/limecv-icon.pdf
-2020/02/08 | 112373 | macros/latex/contrib/limecv/examples/mwe-latex.pdf
-2020/02/08 | 5565 | macros/latex/contrib/limecv/examples/mwe-latex.tex
-2020/02/08 | 41474 | macros/latex/contrib/limecv/examples/mwe-lualatex.pdf
-2020/02/08 | 5666 | macros/latex/contrib/limecv/examples/mwe-lualatex.tex
-2020/02/08 | 42445 | macros/latex/contrib/limecv/examples/mwe-xelatex.pdf
-2020/02/08 | 5453 | macros/latex/contrib/limecv/examples/mwe-xelatex.tex
-2020/02/08 | 3181 | macros/latex/contrib/limecv/examples/picture.png
-2020/02/08 | 13799 | macros/latex/contrib/limecv/LICENSE
-2020/02/08 | 87926 | macros/latex/contrib/limecv/limecv.dtx
-2020/02/08 | 1754 | macros/latex/contrib/limecv/limecv.ins
-2020/02/08 | 205852 | macros/latex/contrib/limecv/limecv.pdf
-2020/02/08 | 1876 | macros/latex/contrib/limecv/README.md
-2020/02/08 | 436570 | macros/latex/contrib/limecv.zip
+2020/03/15 | 9951 | macros/latex/contrib/limecv/examples/limecv-icon.pdf
+2020/03/15 | 138929 | macros/latex/contrib/limecv/examples/mwe-latex.pdf
+2020/03/15 | 5565 | macros/latex/contrib/limecv/examples/mwe-latex.tex
+2020/03/15 | 42544 | macros/latex/contrib/limecv/examples/mwe-lualatex.pdf
+2020/03/15 | 5666 | macros/latex/contrib/limecv/examples/mwe-lualatex.tex
+2020/03/15 | 43259 | macros/latex/contrib/limecv/examples/mwe-xelatex.pdf
+2020/03/15 | 5453 | macros/latex/contrib/limecv/examples/mwe-xelatex.tex
+2020/03/15 | 3181 | macros/latex/contrib/limecv/examples/picture.png
+2020/03/15 | 13799 | macros/latex/contrib/limecv/LICENSE
+2020/03/15 | 88303 | macros/latex/contrib/limecv/limecv.dtx
+2020/03/15 | 1754 | macros/latex/contrib/limecv/limecv.ins
+2020/03/15 | 207251 | macros/latex/contrib/limecv/limecv.pdf
+2020/03/15 | 1807 | macros/latex/contrib/limecv/README.md
+2020/03/15 | 464930 | macros/latex/contrib/limecv.zip
2011/02/25 | 30107 | macros/latex/contrib/linegoal/linegoal.dtx
2011/02/25 | 2653 | macros/latex/contrib/linegoal/linegoal.ins
2011/02/25 | 192294 | macros/latex/contrib/linegoal/linegoal.pdf
@@ -194505,13 +194506,13 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2020/02/28 | 289354 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2020/02/28 | 332466 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2020/02/28 | 93024 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2020/03/15 | 313787 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2020/03/15 | 340142 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2020/03/15 | 99443 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2019/01/16 | 1423 | macros/latex/contrib/nicematrix/nicematrix.ins
-2020/02/28 | 723168 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2020/03/15 | 780740 | macros/latex/contrib/nicematrix/nicematrix.pdf
2019/10/07 | 974 | macros/latex/contrib/nicematrix/README.md
-2020/02/28 | 1107068 | macros/latex/contrib/nicematrix.zip
+2020/03/15 | 1170152 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -207927,24 +207928,24 @@
2019/04/30 | 1787 | macros/luatex/latex/addliga/addliga.tex
2019/04/30 | 277 | macros/luatex/latex/addliga/README
2019/04/30 | 19086 | macros/luatex/latex/addliga.zip
-2020/02/29 | 218127 | macros/luatex/latex/arabluatex/arabluatex.dtx
-2020/02/29 | 40127 | macros/luatex/latex/arabluatex/arabluatex_fullvoc.lua
-2020/02/29 | 3551 | macros/luatex/latex/arabluatex/arabluatex.ins
-2020/02/29 | 38191 | macros/luatex/latex/arabluatex/arabluatex.lua
-2020/02/29 | 6273 | macros/luatex/latex/arabluatex/arabluatex_novoc.lua
-2020/02/29 | 647013 | macros/luatex/latex/arabluatex/arabluatex.pdf
-2020/02/29 | 35786 | macros/luatex/latex/arabluatex/arabluatex_trans.lua
-2020/02/29 | 32905 | macros/luatex/latex/arabluatex/arabluatex_voc.lua
-2020/02/29 | 2283 | macros/luatex/latex/arabluatex/makefile
-2020/02/29 | 4571 | macros/luatex/latex/arabluatex/README.md
-2020/02/29 | 5261 | macros/luatex/latex/arabluatex/README.tex
-2020/02/29 | 112526 | macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf
-2020/02/29 | 5896 | macros/luatex/latex/arabluatex/samples/al-Jahiz.tex
-2020/02/29 | 63557 | macros/luatex/latex/arabluatex/samples/exporting.pdf
-2020/02/29 | 6952 | macros/luatex/latex/arabluatex/samples/exporting.tex
-2020/02/29 | 63935 | macros/luatex/latex/arabluatex/samples/template-01.pdf
-2020/02/29 | 3935 | macros/luatex/latex/arabluatex/samples/template-01.tex
-2020/02/29 | 867468 | macros/luatex/latex/arabluatex.zip
+2020/03/15 | 220203 | macros/luatex/latex/arabluatex/arabluatex.dtx
+2020/03/15 | 40127 | macros/luatex/latex/arabluatex/arabluatex_fullvoc.lua
+2020/03/15 | 3551 | macros/luatex/latex/arabluatex/arabluatex.ins
+2020/03/15 | 38195 | macros/luatex/latex/arabluatex/arabluatex.lua
+2020/03/15 | 6273 | macros/luatex/latex/arabluatex/arabluatex_novoc.lua
+2020/03/15 | 654486 | macros/luatex/latex/arabluatex/arabluatex.pdf
+2020/03/15 | 35786 | macros/luatex/latex/arabluatex/arabluatex_trans.lua
+2020/03/15 | 32905 | macros/luatex/latex/arabluatex/arabluatex_voc.lua
+2020/03/15 | 2283 | macros/luatex/latex/arabluatex/makefile
+2020/03/15 | 4571 | macros/luatex/latex/arabluatex/README.md
+2020/03/15 | 5261 | macros/luatex/latex/arabluatex/README.tex
+2020/03/15 | 112383 | macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf
+2020/03/15 | 5896 | macros/luatex/latex/arabluatex/samples/al-Jahiz.tex
+2020/03/15 | 63544 | macros/luatex/latex/arabluatex/samples/exporting.pdf
+2020/03/15 | 6952 | macros/luatex/latex/arabluatex/samples/exporting.tex
+2020/03/15 | 64015 | macros/luatex/latex/arabluatex/samples/template-01.pdf
+2020/03/15 | 3935 | macros/luatex/latex/arabluatex/samples/template-01.tex
+2020/03/15 | 870630 | macros/luatex/latex/arabluatex.zip
2019/10/04 | 14332 | macros/luatex/latex/beamer-rl/beamer-rl.cls
2019/10/04 | 125490 | macros/luatex/latex/beamer-rl/Example-of-use-ar.pdf
2019/10/04 | 15023 | macros/luatex/latex/beamer-rl/Example-of-use-ar.tex
@@ -208274,11 +208275,11 @@
2020/02/16 | 2024 | macros/luatex/latex/luatodonotes/path_point.lua
2020/02/16 | 1114 | macros/luatex/latex/luatodonotes/README.md
2020/02/17 | 254567 | macros/luatex/latex/luatodonotes.zip
-2020/03/13 | 1389 | macros/luatex/latex/lua-ul/docstrip-luacode.sty
-2020/03/13 | 15844 | macros/luatex/latex/lua-ul/lua-ul.dtx
-2020/03/13 | 74195 | macros/luatex/latex/lua-ul/lua-ul.pdf
-2020/03/13 | 308 | macros/luatex/latex/lua-ul/README
-2020/03/13 | 77123 | macros/luatex/latex/lua-ul.zip
+2020/03/15 | 1389 | macros/luatex/latex/lua-ul/docstrip-luacode.sty
+2020/03/15 | 20548 | macros/luatex/latex/lua-ul/lua-ul.dtx
+2020/03/15 | 85488 | macros/luatex/latex/lua-ul/lua-ul.pdf
+2020/03/15 | 308 | macros/luatex/latex/lua-ul/README
+2020/03/15 | 89228 | macros/luatex/latex/lua-ul.zip
2018/12/02 | 292770 | macros/luatex/latex/makecookbook/makecookbook-doc.pdf
2018/12/02 | 120782 | macros/luatex/latex/makecookbook/makecookbook-doc.tex
2018/12/02 | 638 | macros/luatex/latex/makecookbook/mycookbook/cb-idxstyle.ist
@@ -216457,27 +216458,27 @@
2020/03/08 | 1251589 | macros/xetex/latex/quran-de/tex/qurantext-deii.translation.def
2020/03/08 | 1277612 | macros/xetex/latex/quran-de/tex/qurantext-deiv.translation.def
2020/03/08 | 1154544 | macros/xetex/latex/quran-de.zip
-2020/03/13 | 327382 | macros/xetex/latex/quran/doc/quran-doc.pdf
-2020/03/13 | 43780 | macros/xetex/latex/quran/doc/quran-doc.tex
-2020/03/13 | 8846 | macros/xetex/latex/quran/doc/quran.png
-2020/03/13 | 54264 | macros/xetex/latex/quran/doc/quran-test1.pdf
-2020/03/13 | 398 | macros/xetex/latex/quran/doc/quran-test1.tex
-2020/03/13 | 63305 | macros/xetex/latex/quran/doc/quran-test2.pdf
-2020/03/13 | 2191 | macros/xetex/latex/quran/doc/quran-test2.tex
-2020/03/13 | 33003 | macros/xetex/latex/quran/doc/quran-test.pdf
-2020/03/13 | 502 | macros/xetex/latex/quran/doc/quran-test.tex
-2020/03/13 | 716 | macros/xetex/latex/quran/README
-2020/03/13 | 36700 | macros/xetex/latex/quran/tex/quran.sty
-2020/03/13 | 1230282 | macros/xetex/latex/quran/tex/qurantext-de.translation.def
-2020/03/13 | 1089911 | macros/xetex/latex/quran/tex/qurantext-en.translation.def
-2020/03/13 | 1251810 | macros/xetex/latex/quran/tex/qurantext-en.transliteration.def
-2020/03/13 | 1601542 | macros/xetex/latex/quran/tex/qurantext-fa.translation.def
-2020/03/13 | 1447378 | macros/xetex/latex/quran/tex/qurantext-simple.def
-2020/03/13 | 1438728 | macros/xetex/latex/quran/tex/qurantext-uthmani.def
-2020/03/13 | 4555 | macros/xetex/latex/quran/tex/quran-transde.def
-2020/03/13 | 4575 | macros/xetex/latex/quran/tex/quran-transen.def
-2020/03/13 | 4563 | macros/xetex/latex/quran/tex/quran-transfa.def
-2020/03/13 | 4740 | macros/xetex/latex/quran/tex/quran-translt.def
+2020/03/15 | 331344 | macros/xetex/latex/quran/doc/quran-doc.pdf
+2020/03/15 | 45054 | macros/xetex/latex/quran/doc/quran-doc.tex
+2020/03/15 | 8846 | macros/xetex/latex/quran/doc/quran.png
+2020/03/15 | 54267 | macros/xetex/latex/quran/doc/quran-test1.pdf
+2020/03/15 | 398 | macros/xetex/latex/quran/doc/quran-test1.tex
+2020/03/15 | 63307 | macros/xetex/latex/quran/doc/quran-test2.pdf
+2020/03/15 | 2191 | macros/xetex/latex/quran/doc/quran-test2.tex
+2020/03/15 | 33000 | macros/xetex/latex/quran/doc/quran-test.pdf
+2020/03/15 | 502 | macros/xetex/latex/quran/doc/quran-test.tex
+2020/03/15 | 716 | macros/xetex/latex/quran/README
+2020/03/15 | 36732 | macros/xetex/latex/quran/tex/quran.sty
+2020/03/15 | 1230282 | macros/xetex/latex/quran/tex/qurantext-de.translation.def
+2020/03/15 | 1089911 | macros/xetex/latex/quran/tex/qurantext-en.translation.def
+2020/03/15 | 1251810 | macros/xetex/latex/quran/tex/qurantext-en.transliteration.def
+2020/03/15 | 1601542 | macros/xetex/latex/quran/tex/qurantext-fa.translation.def
+2020/03/15 | 1447378 | macros/xetex/latex/quran/tex/qurantext-simple.def
+2020/03/15 | 1438728 | macros/xetex/latex/quran/tex/qurantext-uthmani.def
+2020/03/15 | 4555 | macros/xetex/latex/quran/tex/quran-transde.def
+2020/03/15 | 4575 | macros/xetex/latex/quran/tex/quran-transen.def
+2020/03/15 | 4563 | macros/xetex/latex/quran/tex/quran-transfa.def
+2020/03/15 | 4740 | macros/xetex/latex/quran/tex/quran-translt.def
2020/03/08 | 8846 | macros/xetex/latex/quran-ur/doc/quran.png
2020/03/08 | 95524 | macros/xetex/latex/quran-ur/doc/quran-ur-doc.pdf
2020/03/08 | 7505 | macros/xetex/latex/quran-ur/doc/quran-ur-doc.tex
@@ -216494,7 +216495,7 @@
2020/03/08 | 1503110 | macros/xetex/latex/quran-ur/tex/qurantext-urv.translation.def
2020/03/08 | 14908 | macros/xetex/latex/quran-ur/tex/quran-ur.sty
2020/03/08 | 3339866 | macros/xetex/latex/quran-ur.zip
-2020/03/13 | 2432792 | macros/xetex/latex/quran.zip
+2020/03/15 | 2437290 | macros/xetex/latex/quran.zip
2015/06/16 | 449 | macros/xetex/latex/resumecls/example/config.mk
2015/06/16 | 449 | macros/xetex/latex/resumecls/example/config-sample.mk
2015/06/17 | 1080 | macros/xetex/latex/resumecls/example/Makefile
@@ -233732,6 +233733,19 @@
1994/01/24 | 4749 | obsolete/support/atops/atops.doc
1994/01/24 | 70816 | obsolete/support/atops/atops.exe
1994/01/24 | 261 | obsolete/support/atops/readme
+1999/05/12 | 4006 | obsolete/support/detex/detex.1l
+1999/05/12 | 1227 | obsolete/support/detex/detex.h
+1999/05/12 | 17353 | obsolete/support/detex/detex.l
+1999/06/11 | 259 | obsolete/support/detex/Flex-patch
+1999/05/12 | 50210 | obsolete/support/detex/lexout.c
+1999/05/12 | 1899 | obsolete/support/detex/Makefile
+1999/05/12 | 89 | obsolete/support/detex/os2/detex-32.def
+1999/05/12 | 72 | obsolete/support/detex/os2/detex.def
+1999/05/12 | 2007 | obsolete/support/detex/os2/makefile.os2
+1999/05/12 | 366 | obsolete/support/detex/os2/README
+1999/05/12 | 6904 | obsolete/support/detex/README
+1999/05/12 | 329 | obsolete/support/detex/states.sed
+2006/03/12 | 27384 | obsolete/support/detex.zip
2013/02/07 | 1681080 | obsolete/support/epspdf-extra/epspdf.0.6.0.exe
2013/02/07 | 273 | obsolete/support/epspdf-extra/README
2013/02/08 | 1655027 | obsolete/support/epspdf-extra.zip
@@ -241875,19 +241889,6 @@
2007/02/06 | 50828 | support/de-macro/user-guide.pdf
2007/02/06 | 4040 | support/de-macro/user-guide.tex
2007/02/06 | 59352 | support/de-macro.zip
-1999/05/12 | 4006 | support/detex/detex.1l
-1999/05/12 | 1227 | support/detex/detex.h
-1999/05/12 | 17353 | support/detex/detex.l
-1999/06/11 | 259 | support/detex/Flex-patch
-1999/05/12 | 50210 | support/detex/lexout.c
-1999/05/12 | 1899 | support/detex/Makefile
-1999/05/12 | 89 | support/detex/os2/detex-32.def
-1999/05/12 | 72 | support/detex/os2/detex.def
-1999/05/12 | 2007 | support/detex/os2/makefile.os2
-1999/05/12 | 366 | support/detex/os2/README
-1999/05/12 | 6904 | support/detex/README
-1999/05/12 | 329 | support/detex/states.sed
-2006/03/12 | 27384 | support/detex.zip
2006/01/11 | 26 | support/dinbrief-gui/dinbrief.bat
2006/01/30 | 968630 | support/dinbrief-gui/dinbrief.exe
2006/01/30 | 24782 | support/dinbrief-gui/dinbrief.kit
@@ -250786,31 +250787,33 @@
2019/06/21 | 199629 | systems/doc/etex.zip
2020/03/13 | 363626 | systems/doc/kpathsea/kpathsea.html
2020/03/13 | 402446 | systems/doc/kpathsea/kpathsea.pdf
-2019/10/13 | 35616 | systems/doc/luatex/luatex-backend.tex
-2019/10/23 | 35485 | systems/doc/luatex/luatex-callbacks.tex
+2020/03/14 | 187652 | systems/doc/luatex/graphics/luaharfbuzz.pdf
+2020/03/14 | 35672 | systems/doc/luatex/luatex-backend.tex
+2020/03/14 | 35529 | systems/doc/luatex/luatex-callbacks.tex
2019/10/13 | 241 | systems/doc/luatex/luatex-contents.tex
2019/10/13 | 46609 | systems/doc/luatex/luatex-enhancements.tex
2019/10/13 | 793 | systems/doc/luatex/luatex-export-titlepage.tex
2019/10/13 | 747 | systems/doc/luatex/luatex-firstpage.tex
2019/10/13 | 45488 | systems/doc/luatex/luatex-fontloader.tex
-2019/11/08 | 42001 | systems/doc/luatex/luatex-fonts.tex
+2020/03/14 | 42120 | systems/doc/luatex/luatex-fonts.tex
2019/10/13 | 33266 | systems/doc/luatex/luatex-graphics.tex
+2020/03/14 | 7640 | systems/doc/luatex/luatex-harfbuzz.tex
2019/10/13 | 9071 | systems/doc/luatex/luatex-introduction.tex
2019/10/13 | 47991 | systems/doc/luatex/luatex-languages.tex
2019/10/13 | 444 | systems/doc/luatex/luatex-logos.tex
2019/10/13 | 34166 | systems/doc/luatex/luatex-lua.tex
-2019/10/13 | 68804 | systems/doc/luatex/luatex-math.tex
-2019/10/13 | 47951 | systems/doc/luatex/luatex-modifications.tex
+2020/03/14 | 68812 | systems/doc/luatex/luatex-math.tex
+2020/03/14 | 48178 | systems/doc/luatex/luatex-modifications.tex
2019/10/13 | 97655 | systems/doc/luatex/luatex-nodes.tex
-2019/11/08 | 1563980 | systems/doc/luatex/luatex.pdf
-2019/10/13 | 5011 | systems/doc/luatex/luatex-preamble.tex
+2020/03/14 | 1756287 | systems/doc/luatex/luatex.pdf
+2020/03/14 | 5012 | systems/doc/luatex/luatex-preamble.tex
2019/10/13 | 1118 | systems/doc/luatex/luatex-registers.tex
2019/10/13 | 242 | systems/doc/luatex/luatex-statistics.tex
2019/10/13 | 11122 | systems/doc/luatex/luatex-style.tex
-2019/10/18 | 3015 | systems/doc/luatex/luatex.tex
-2019/11/08 | 95865 | systems/doc/luatex/luatex-tex.tex
+2020/03/14 | 3124 | systems/doc/luatex/luatex.tex
+2020/03/14 | 96397 | systems/doc/luatex/luatex-tex.tex
2019/10/13 | 1313 | systems/doc/luatex/luatex-titlepage.tex
-2019/11/09 | 1700688 | systems/doc/luatex.zip
+2020/03/15 | 2034212 | systems/doc/luatex.zip
2015/04/30 | 66584 | systems/doc/metapost/CHANGES
2009/05/30 | 7430 | systems/doc/metapost/grdemo-doc.pdf
2009/05/30 | 3044 | systems/doc/metapost/grdemo.pdf
@@ -268213,7 +268216,7 @@
2020/02/04 | 281488 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2020/03/14 | 530223 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/03/15 | 530221 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -269349,9 +269352,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2020/02/14 | 38792 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2020/02/14 | 42900 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/03/14 | 197688 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/03/14 | 1182614 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/03/14 | 1103274 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/03/15 | 197610 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/03/15 | 1182050 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/03/15 | 1103678 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2020/02/14 | 13041 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2020/02/14 | 14036 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -269502,184 +269505,184 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2019/09/11 | 231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2020/03/14 | 530307 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/03/14 | 29259 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2020/03/14 | 33371 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/03/14 | 940643 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/03/14 | 1049465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/03/14 | 28488 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2020/03/14 | 30680 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2020/03/14 | 29281 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/03/14 | 34829 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/03/14 | 49762 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2020/03/14 | 57203 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2020/03/14 | 84767 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2020/03/14 | 94269 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/03/14 | 62929 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/03/14 | 70754 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2020/03/14 | 26640 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/03/14 | 30278 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2020/03/14 | 328820 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2020/03/14 | 391650 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2020/03/14 | 32262 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2020/03/14 | 36354 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2020/03/14 | 49346 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/03/14 | 53971 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/03/14 | 4818 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2020/03/14 | 201567 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/03/14 | 220896 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/03/14 | 169242 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/03/14 | 184154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/03/14 | 52046 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/03/14 | 58806 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2020/03/14 | 20665 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2020/03/14 | 22937 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2020/03/14 | 451470 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
-2020/03/14 | 41036 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/03/14 | 45807 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2020/03/14 | 272537 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/03/14 | 310068 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/03/14 | 40711 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2020/03/14 | 44913 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/03/14 | 115645 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2020/03/14 | 130446 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2020/03/14 | 1249142 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2020/03/14 | 1377273 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2020/03/14 | 33560 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/03/14 | 38830 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2020/03/14 | 43418 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/03/14 | 47968 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2020/03/14 | 45473 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/03/14 | 50420 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2020/03/14 | 56649 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2020/03/14 | 61673 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/03/14 | 133229 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2020/03/14 | 152197 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2020/03/14 | 69581 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/03/14 | 72809 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/03/14 | 68775 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2020/03/14 | 77599 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2020/03/14 | 246417 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/03/14 | 281549 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/03/14 | 25302 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/03/14 | 28728 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/03/14 | 100409 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2020/03/14 | 116935 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/03/14 | 63299 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/03/14 | 72571 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/03/14 | 94168 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/03/14 | 110908 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/03/14 | 57764 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/03/14 | 64403 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/03/14 | 456888 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2020/03/14 | 544343 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/03/14 | 140831 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/03/14 | 149968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/03/14 | 92943 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/03/14 | 108840 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2020/03/14 | 15883 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2020/03/14 | 17668 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2020/03/14 | 27741 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/03/14 | 29676 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2020/03/14 | 615136 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/03/14 | 669892 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2020/03/14 | 498680 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/03/14 | 561014 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/03/14 | 539209 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/03/14 | 575227 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2020/03/14 | 93445 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/03/14 | 102459 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2020/03/14 | 1692044 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2020/03/14 | 1980458 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/03/14 | 67247 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/03/14 | 73606 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/03/14 | 26954 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/03/14 | 31226 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/03/14 | 7504 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/03/14 | 8465 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2020/03/14 | 167837 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/03/14 | 182739 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2020/03/14 | 247697 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/03/14 | 281291 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/03/14 | 87299 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/03/14 | 92353 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/03/14 | 78014 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/03/14 | 86604 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/03/14 | 165175 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2020/03/14 | 185534 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/03/14 | 148237 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/03/14 | 166975 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2020/03/14 | 195075 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2020/03/14 | 177599 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/03/14 | 80583 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2020/03/14 | 91432 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/03/14 | 30989 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/03/14 | 34838 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/03/14 | 56434 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/03/14 | 62855 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2020/03/14 | 41804 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2020/03/14 | 45708 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/03/14 | 45616 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/03/14 | 51990 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2020/03/14 | 354763 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma
-2020/03/14 | 387717 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma
-2020/03/14 | 321837 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2020/03/14 | 356476 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2020/03/14 | 186873 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/03/14 | 193582 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2020/03/14 | 207727 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/03/14 | 243446 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/03/14 | 78033 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/03/14 | 87199 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/03/14 | 932623 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/03/14 | 1042289 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/03/14 | 19887 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/03/14 | 23492 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2020/03/14 | 31158 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/03/14 | 36588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2020/03/14 | 63210 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/03/14 | 71691 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/03/14 | 42584 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2020/03/14 | 50980 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/03/14 | 1105029 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2020/03/14 | 1232154 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2020/03/14 | 41888 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/03/14 | 50865 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/03/14 | 53405 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
-2020/03/14 | 59437 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
-2020/03/14 | 26754 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/03/14 | 29030 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/03/14 | 16037 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/03/14 | 17754 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/03/14 | 63131 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/03/14 | 69223 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/03/14 | 147252 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2020/03/14 | 160827 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/03/14 | 74333 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2020/03/14 | 84354 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/03/14 | 91360 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2020/03/14 | 96316 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/03/14 | 2472949 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/03/14 | 2597651 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/03/14 | 54905 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/03/14 | 61354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2020/03/14 | 26509 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/03/14 | 32356 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2020/03/14 | 61534 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/03/14 | 65102 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2020/03/14 | 247046 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/03/14 | 276835 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2020/03/14 | 533438 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/03/14 | 563214 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2020/03/14 | 39216 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/03/14 | 42921 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/03/14 | 197542 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/03/14 | 1182672 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2020/03/14 | 1102632 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/03/14 | 13059 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/03/14 | 14034 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/03/15 | 530307 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/03/15 | 29258 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/03/15 | 33370 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/03/15 | 940643 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/03/15 | 1049465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/03/15 | 28489 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/03/15 | 30679 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/03/15 | 29282 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/03/15 | 34829 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/03/15 | 49762 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/03/15 | 57200 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/03/15 | 84767 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/03/15 | 94270 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/03/15 | 62930 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/03/15 | 70755 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/03/15 | 26641 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/03/15 | 30279 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/03/15 | 328819 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/03/15 | 391651 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/03/15 | 32263 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/03/15 | 36354 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/03/15 | 49345 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/03/15 | 53971 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/03/15 | 4817 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2020/03/15 | 201568 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/03/15 | 220895 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/03/15 | 169242 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/03/15 | 184154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/03/15 | 52045 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/03/15 | 58807 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/03/15 | 20665 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/03/15 | 22937 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/03/15 | 451472 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
+2020/03/15 | 41037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/03/15 | 45809 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/03/15 | 272537 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/03/15 | 310067 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/03/15 | 40711 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/03/15 | 44913 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/03/15 | 115646 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/03/15 | 130447 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/03/15 | 1249145 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/03/15 | 1377274 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/03/15 | 33561 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/03/15 | 38830 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/03/15 | 43418 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/03/15 | 47969 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/03/15 | 45472 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/03/15 | 50421 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/03/15 | 56649 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/03/15 | 61673 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/03/15 | 133230 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/03/15 | 152198 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/03/15 | 69581 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/03/15 | 72809 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/03/15 | 68776 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/03/15 | 77601 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/03/15 | 246417 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/03/15 | 281550 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/03/15 | 25303 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/03/15 | 28729 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/03/15 | 100409 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/03/15 | 116934 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/03/15 | 63299 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/03/15 | 72574 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/03/15 | 94170 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/03/15 | 110908 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/03/15 | 57763 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/03/15 | 64403 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/03/15 | 456891 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/03/15 | 544344 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/03/15 | 140832 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/03/15 | 149968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/03/15 | 92944 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/03/15 | 108840 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/03/15 | 15883 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/03/15 | 17668 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/03/15 | 27741 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/03/15 | 29677 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/03/15 | 615136 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/03/15 | 669893 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/03/15 | 498680 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/03/15 | 561015 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/03/15 | 539212 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/03/15 | 575227 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/03/15 | 93443 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/03/15 | 102460 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/03/15 | 1692042 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/03/15 | 1980458 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/03/15 | 67247 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/03/15 | 73606 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/03/15 | 26957 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/03/15 | 31226 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/03/15 | 7504 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/03/15 | 8464 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/03/15 | 167837 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/03/15 | 182739 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/03/15 | 247699 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/03/15 | 281290 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/03/15 | 87298 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/03/15 | 92354 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/03/15 | 78013 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/03/15 | 86603 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/03/15 | 165175 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/03/15 | 185536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/03/15 | 148239 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/03/15 | 166977 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/03/15 | 195075 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/03/15 | 177597 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/03/15 | 80585 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/03/15 | 91433 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/03/15 | 30988 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/03/15 | 34838 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/03/15 | 56435 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/03/15 | 62857 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/03/15 | 41803 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/03/15 | 45709 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/03/15 | 45616 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/03/15 | 51992 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/03/15 | 354763 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma
+2020/03/15 | 387718 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma
+2020/03/15 | 321837 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/03/15 | 356477 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/03/15 | 186873 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/03/15 | 193581 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/03/15 | 207726 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/03/15 | 243448 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/03/15 | 78034 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/03/15 | 87199 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/03/15 | 932624 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/03/15 | 1042289 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/03/15 | 19886 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/03/15 | 23491 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/03/15 | 31158 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/03/15 | 36590 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/03/15 | 63210 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/03/15 | 71690 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/03/15 | 42582 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/03/15 | 50979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/03/15 | 1105029 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/03/15 | 1232155 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/03/15 | 41888 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/03/15 | 50866 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/03/15 | 53405 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
+2020/03/15 | 59437 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
+2020/03/15 | 26755 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/03/15 | 29031 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/03/15 | 16038 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/03/15 | 17755 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/03/15 | 63132 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/03/15 | 69225 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/03/15 | 147252 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/03/15 | 160827 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/03/15 | 74336 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/03/15 | 84355 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/03/15 | 91360 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/03/15 | 96319 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/03/15 | 2472951 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/03/15 | 2597650 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/03/15 | 54905 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/03/15 | 61354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/03/15 | 26510 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/03/15 | 32356 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/03/15 | 61534 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/03/15 | 65103 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/03/15 | 247047 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/03/15 | 276836 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/03/15 | 533439 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/03/15 | 563214 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/03/15 | 39217 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/03/15 | 42921 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/03/15 | 197589 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/03/15 | 1181950 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/03/15 | 1102129 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/03/15 | 13060 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/03/15 | 14035 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2020/03/14 | 652 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/03/15 | 652 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -269995,7 +269998,7 @@
2008/11/07 | 35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma
2017/07/26 | 201385 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
-2020/03/14 | 347 | systems/win32/miktex/tm/packages/pr.ini
+2020/03/15 | 347 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -271122,7 +271125,7 @@
2020/03/13 | 4937896 | systems/win32/w32tex/aleph-w32.tar.xz
2020/03/04 | 64642084 | systems/win32/w32tex/biblatex-biber.tar.xz
2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz
-2020/03/13 | 608422 | systems/win32/w32tex/ChangeLog
+2020/03/14 | 608649 | systems/win32/w32tex/ChangeLog
2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0
2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1
2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2
@@ -271137,7 +271140,7 @@
2020/01/20 | 483388 | systems/win32/w32tex/dvi2tty-w32.tar.xz
2020/03/04 | 4650608 | systems/win32/w32tex/dvipdfm-w32.tar.xz
2020/03/04 | 4614124 | systems/win32/w32tex/dvipsk-w32.tar.xz
-2020/02/26 | 2605048 | systems/win32/w32tex/dvitools-w32.tar.xz
+2020/03/14 | 2606636 | systems/win32/w32tex/dvitools-w32.tar.xz
2020/03/02 | 1175432 | systems/win32/w32tex/extractpdfmark-w32.tar.xz
2020/01/20 | 17349048 | systems/win32/w32tex/gregorio-w32.tar.xz
2009/08/03 | 1072620 | systems/win32/w32tex/gtftex.zip
@@ -271146,7 +271149,7 @@
2020/02/29 | 29401516 | systems/win32/w32tex/latex.tar.xz
2020/01/20 | 996420 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz
2020/03/07 | 393114744 | systems/win32/w32tex/ltxpkgdocs.tar.xz
-2020/03/13 | 34405616 | systems/win32/w32tex/ltxpkgs.tar.xz
+2020/03/14 | 34408048 | systems/win32/w32tex/ltxpkgs.tar.xz
2020/02/18 | 3871452 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
2020/03/12 | 3846892 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
2020/03/12 | 3851848 | systems/win32/w32tex/luajittex-w32.tar.xz
@@ -271206,7 +271209,7 @@
2020/01/20 | 447572 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz
2020/02/29 | 796880 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
2020/03/01 | 788228 | systems/win32/w32tex/win64/dvipsk-w64.tar.xz
-2020/02/26 | 2327652 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
+2020/03/14 | 2338108 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
2020/03/02 | 1079176 | systems/win32/w32tex/win64/extractpdfmark-w64.tar.xz
2020/01/20 | 304780 | systems/win32/w32tex/win64/gregorio-w64.tar.xz
2020/02/10 | 587268 | systems/win32/w32tex/win64/jtex-w64.tar.xz
@@ -271239,7 +271242,7 @@
2020/03/12 | 1800324 | systems/win32/w32tex/win64/uptex-w64.tar.xz
2020/03/12 | 3380204 | systems/win32/w32tex/win64/web2c-w64.tar.xz
2020/03/12 | 11130984 | systems/win32/w32tex/win64/xetex-w64.tar.xz
-2020/03/13 | 49741952 | systems/win32/w32tex/xetex-w32.tar.xz
+2020/03/14 | 49739296 | systems/win32/w32tex/xetex-w32.tar.xz
2019/10/03 | 2936880 | systems/win32/w32tex/xindy-w32.tar.xz
2013/11/19 | 11356248 | systems/win32/w32tex/xymtex.tar.xz
2016/09/09 | 4334636 | systems/win32/w32tex/xypic.tar.xz
@@ -271336,7 +271339,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2020/03/15 | 186 | timestamp
+2020/03/16 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 9cc230ff51..5cbb4de08b 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index d419581241..533d9867a0 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,371 +1,558 @@
-2020/03/14 | 96316 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2020/03/14 | 94269 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2020/03/14 | 94168 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2020/03/14 | 940643 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2020/03/14 | 93445 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2020/03/14 | 932623 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2020/03/14 | 92943 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2020/03/14 | 92353 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2020/03/14 | 91432 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2020/03/14 | 91360 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/03/15 | 9951 | macros/latex/contrib/limecv/examples/limecv-icon.pdf
+2020/03/15 | 99443 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2020/03/15 | 9724 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+2020/03/15 | 96319 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2020/03/15 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+2020/03/15 | 94270 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2020/03/15 | 94170 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2020/03/15 | 940643 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2020/03/15 | 93443 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2020/03/15 | 932624 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2020/03/15 | 9314 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+2020/03/15 | 92944 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2020/03/15 | 92354 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2020/03/15 | 91433 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2020/03/15 | 91360 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2020/03/15 | 89228 | macros/luatex/latex/lua-ul.zip
+2020/03/15 | 886853 | macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf
+2020/03/15 | 8846 | macros/xetex/latex/quran/doc/quran.png
+2020/03/15 | 88303 | macros/latex/contrib/limecv/limecv.dtx
+2020/03/15 | 880532 | install/macros/luatex/latex/arabluatex.tds.zip
+2020/03/15 | 87298 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2020/03/15 | 87199 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2020/03/15 | 870630 | macros/luatex/latex/arabluatex.zip
+2020/03/15 | 8705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+2020/03/15 | 86603 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2020/03/15 | 85488 | macros/luatex/latex/lua-ul/lua-ul.pdf
+2020/03/15 | 84767 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2020/03/15 | 8464 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/03/15 | 84355 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2020/03/15 | 8255 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+2020/03/15 | 80585 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2020/03/15 | 780740 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2020/03/15 | 78034 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2020/03/15 | 78013 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2020/03/15 | 77601 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2020/03/15 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+2020/03/15 | 7504 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2020/03/15 | 74336 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/03/15 | 737138 | macros/generic/schemata.zip
+2020/03/15 | 73606 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2020/03/15 | 72809 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2020/03/15 | 72574 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2020/03/15 | 716 | macros/xetex/latex/quran/README
+2020/03/15 | 71690 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2020/03/15 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+2020/03/15 | 711280 | macros/latex/contrib/biblatex-contrib/oscola.zip
+2020/03/15 | 70755 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2020/03/15 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+2020/03/15 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+2020/03/15 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+2020/03/15 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+2020/03/15 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+2020/03/15 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+2020/03/15 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+2020/03/15 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+2020/03/15 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+2020/03/15 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+2020/03/15 | 69581 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2020/03/15 | 6952 | macros/luatex/latex/arabluatex/samples/exporting.tex
+2020/03/15 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+2020/03/15 | 69225 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2020/03/15 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+2020/03/15 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+2020/03/15 | 68776 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/03/15 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+2020/03/15 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+2020/03/15 | 67247 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2020/03/15 | 669893 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2020/03/15 | 669235 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip
+2020/03/15 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+2020/03/15 | 654486 | macros/luatex/latex/arabluatex/arabluatex.pdf
+2020/03/15 | 652 | systems/win32/miktex/tm/packages/next/pr.ini
+2020/03/15 | 65103 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2020/03/15 | 64403 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+2020/03/15 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+2020/03/15 | 64015 | macros/luatex/latex/arabluatex/samples/template-01.pdf
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+2020/03/15 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+2020/03/15 | 63544 | macros/luatex/latex/arabluatex/samples/exporting.pdf
+2020/03/15 | 63307 | macros/xetex/latex/quran/doc/quran-test2.pdf
+2020/03/15 | 63299 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2020/03/15 | 63210 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2020/03/15 | 63132 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2020/03/15 | 62930 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2020/03/15 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+2020/03/15 | 62857 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/03/15 | 6273 | macros/luatex/latex/arabluatex/arabluatex_novoc.lua
+2020/03/15 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+2020/03/15 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+2020/03/15 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+2020/03/15 | 61673 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2020/03/15 | 61534 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2020/03/15 | 615136 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2020/03/15 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+2020/03/15 | 61354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2020/03/15 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+2020/03/15 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
+2020/03/15 | 59437 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
+2020/03/15 | 5896 | macros/luatex/latex/arabluatex/samples/al-Jahiz.tex
+2020/03/15 | 58807 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2020/03/15 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+2020/03/15 | 57763 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2020/03/15 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+2020/03/15 | 575227 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2020/03/15 | 57200 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2020/03/15 | 5666 | macros/latex/contrib/limecv/examples/mwe-lualatex.tex
+2020/03/15 | 56649 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2020/03/15 | 56435 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2020/03/15 | 563214 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2020/03/15 | 561015 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2020/03/15 | 5587 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+2020/03/15 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+2020/03/15 | 5565 | macros/latex/contrib/limecv/examples/mwe-latex.tex
+2020/03/15 | 551082 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+2020/03/15 | 54905 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2020/03/15 | 5453 | macros/latex/contrib/limecv/examples/mwe-xelatex.tex
+2020/03/15 | 544344 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2020/03/15 | 54267 | macros/xetex/latex/quran/doc/quran-test1.pdf
+2020/03/15 | 53971 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2020/03/15 | 539212 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2020/03/15 | 53405 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
+2020/03/15 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+2020/03/15 | 533439 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2020/03/15 | 530307 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2020/03/15 | 530221 | systems/win32/miktex/tm/packages/files.csv.lzma
+2020/03/15 | 5261 | macros/luatex/latex/arabluatex/README.tex
+2020/03/15 | 5257 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+2020/03/15 | 52045 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2020/03/15 | 51992 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2020/03/15 | 50979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2020/03/15 | 50866 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2020/03/15 | 50421 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2020/03/15 | 502 | macros/xetex/latex/quran/doc/quran-test.tex
+2020/03/15 | 498680 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2020/03/15 | 49762 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2020/03/15 | 49345 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2020/03/15 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+2020/03/15 | 4830 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+2020/03/15 | 4817 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2020/03/15 | 47969 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/03/15 | 4740 | macros/xetex/latex/quran/tex/quran-translt.def
+2020/03/15 | 464930 | macros/latex/contrib/limecv.zip
+2020/03/15 | 4617 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+2020/03/15 | 4612 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+2020/03/15 | 45809 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2020/03/15 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+2020/03/15 | 4575 | macros/xetex/latex/quran/tex/quran-transen.def
+2020/03/15 | 4571 | macros/luatex/latex/arabluatex/README.md
+2020/03/15 | 45709 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2020/03/15 | 456891 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2020/03/15 | 4563 | macros/xetex/latex/quran/tex/quran-transfa.def
+2020/03/15 | 45616 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2020/03/15 | 4555 | macros/xetex/latex/quran/tex/quran-transde.def
+2020/03/15 | 45472 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2020/03/15 | 451472 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
+2020/03/15 | 45054 | macros/xetex/latex/quran/doc/quran-doc.tex
+2020/03/15 | 44913 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2020/03/15 | 43418 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2020/03/15 | 43259 | macros/latex/contrib/limecv/examples/mwe-xelatex.pdf
+2020/03/15 | 42921 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2020/03/15 | 42582 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2020/03/15 | 42544 | macros/latex/contrib/limecv/examples/mwe-lualatex.pdf
+2020/03/15 | 41888 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2020/03/15 | 41803 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/03/15 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+2020/03/15 | 41037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2020/03/15 | 40711 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2020/03/15 | 40127 | macros/luatex/latex/arabluatex/arabluatex_fullvoc.lua
+2020/03/15 | 398 | macros/xetex/latex/quran/doc/quran-test1.tex
+2020/03/15 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+2020/03/15 | 3935 | macros/luatex/latex/arabluatex/samples/template-01.tex
+2020/03/15 | 39217 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2020/03/15 | 391651 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2020/03/15 | 38830 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2020/03/15 | 387718 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma
+2020/03/15 | 38693 | macros/latex/contrib/biblatex-contrib/oscola/oscola-examples.bib
+2020/03/15 | 38195 | macros/luatex/latex/arabluatex/arabluatex.lua
+2020/03/15 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+2020/03/15 | 36732 | macros/xetex/latex/quran/tex/quran.sty
+2020/03/15 | 36731 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+2020/03/15 | 36590 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2020/03/15 | 36354 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2020/03/15 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+2020/03/15 | 35786 | macros/luatex/latex/arabluatex/arabluatex_trans.lua
+2020/03/15 | 356477 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2020/03/15 | 3551 | macros/luatex/latex/arabluatex/arabluatex.ins
+2020/03/15 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+2020/03/15 | 354763 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma
+2020/03/15 | 34838 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2020/03/15 | 34829 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2020/03/15 | 347 | systems/win32/miktex/tm/packages/pr.ini
+2020/03/15 | 3477979 | dviware/dvisvgm.zip
+2020/03/15 | 3466 | macros/latex/contrib/biblatex-contrib/oscola/README.md
+2020/03/15 | 340142 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2020/03/15 | 33561 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2020/03/15 | 33370 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2020/03/15 | 331344 | macros/xetex/latex/quran/doc/quran-doc.pdf
+2020/03/15 | 33000 | macros/xetex/latex/quran/doc/quran-test.pdf
+2020/03/15 | 32905 | macros/luatex/latex/arabluatex/arabluatex_voc.lua
+2020/03/15 | 328819 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2020/03/15 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+2020/03/15 | 32356 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2020/03/15 | 32263 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2020/03/15 | 321837 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2020/03/15 | 3181 | macros/latex/contrib/limecv/examples/picture.png
+2020/03/15 | 313787 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2020/03/15 | 31226 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2020/03/15 | 31158 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2020/03/15 | 310067 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2020/03/15 | 30988 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2020/03/15 | 308 | macros/luatex/latex/lua-ul/README
+2020/03/15 | 30679 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/03/15 | 30279 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2020/03/15 | 29677 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2020/03/15 | 29431 | macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
+2020/03/15 | 29430 | macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx
+2020/03/15 | 29430 | macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx
+2020/03/15 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+2020/03/15 | 29282 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2020/03/15 | 29258 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2020/03/15 | 29031 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2020/03/15 | 28729 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2020/03/15 | 28489 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2020/03/15 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+2020/03/15 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+2020/03/15 | 281550 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2020/03/15 | 281290 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2020/03/15 | 27741 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2020/03/15 | 276836 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2020/03/15 | 272537 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2020/03/15 | 26957 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2020/03/15 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+2020/03/15 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+2020/03/15 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+2020/03/15 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+2020/03/15 | 26755 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2020/03/15 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+2020/03/15 | 26641 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2020/03/15 | 26510 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2020/03/15 | 2597650 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2020/03/15 | 25303 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2020/03/15 | 247699 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2020/03/15 | 2472951 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2020/03/15 | 247047 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2020/03/15 | 246417 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2020/03/15 | 2437290 | macros/xetex/latex/quran.zip
+2020/03/15 | 243448 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2020/03/15 | 23491 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/03/15 | 230 | macros/latex/contrib/biblatex-contrib/oscola/oscola.ist
+2020/03/15 | 22937 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2020/03/15 | 2283 | macros/luatex/latex/arabluatex/makefile
+2020/03/15 | 220895 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2020/03/15 | 220203 | macros/luatex/latex/arabluatex/arabluatex.dtx
+2020/03/15 | 2191 | macros/xetex/latex/quran/doc/quran-test2.tex
+2020/03/15 | 214160 | macros/latex/contrib/biblatex-contrib/oscola/oscola.tex
+2020/03/15 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+2020/03/15 | 207726 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2020/03/15 | 207251 | macros/latex/contrib/limecv/limecv.pdf
+2020/03/15 | 20665 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2020/03/15 | 20548 | macros/luatex/latex/lua-ul/lua-ul.dtx
+2020/03/15 | 2034212 | systems/doc/luatex.zip
+2020/03/15 | 201568 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2020/03/15 | 19886 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2020/03/15 | 1980458 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2020/03/15 | 197610 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2020/03/15 | 197589 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2020/03/15 | 195075 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2020/03/15 | 193581 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2020/03/15 | 186873 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2020/03/15 | 186752 | graphics/pgf/contrib/milsymb/milsymb.sty
+2020/03/15 | 185536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2020/03/15 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+2020/03/15 | 184154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2020/03/15 | 182739 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/03/15 | 1807 | macros/latex/contrib/limecv/README.md
+2020/03/15 | 177597 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2020/03/15 | 17755 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2020/03/15 | 17668 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/03/15 | 1754 | macros/latex/contrib/limecv/limecv.ins
+2020/03/15 | 169242 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2020/03/15 | 1692042 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2020/03/15 | 167837 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2020/03/15 | 166977 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2020/03/15 | 165175 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2020/03/15 | 1618478 | graphics/pgf/contrib/milsymb.zip
+2020/03/15 | 160827 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2020/03/15 | 16038 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2020/03/15 | 1601542 | macros/xetex/latex/quran/tex/qurantext-fa.translation.def
+2020/03/15 | 15883 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2020/03/15 | 152198 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2020/03/15 | 15136 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+2020/03/15 | 149968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2020/03/15 | 148239 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2020/03/15 | 147252 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2020/03/15 | 14693 | macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx
+2020/03/15 | 1447378 | macros/xetex/latex/quran/tex/qurantext-simple.def
+2020/03/15 | 1438728 | macros/xetex/latex/quran/tex/qurantext-uthmani.def
+2020/03/15 | 140832 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2020/03/15 | 14035 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2020/03/15 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+2020/03/15 | 1389 | macros/luatex/latex/lua-ul/docstrip-luacode.sty
+2020/03/15 | 138929 | macros/latex/contrib/limecv/examples/mwe-latex.pdf
+2020/03/15 | 13799 | macros/latex/contrib/limecv/LICENSE
+2020/03/15 | 1377274 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2020/03/15 | 133230 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2020/03/15 | 133009 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+2020/03/15 | 13060 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2020/03/15 | 130447 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2020/03/15 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
+2020/03/15 | 1251810 | macros/xetex/latex/quran/tex/qurantext-en.transliteration.def
+2020/03/15 | 1249145 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2020/03/15 | 1232155 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2020/03/15 | 1230282 | macros/xetex/latex/quran/tex/qurantext-de.translation.def
+2020/03/15 | 12128 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+2020/03/15 | 1182050 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2020/03/15 | 1181950 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2020/03/15 | 1170152 | macros/latex/contrib/nicematrix.zip
+2020/03/15 | 11700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+2020/03/15 | 116934 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2020/03/15 | 11663 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+2020/03/15 | 115646 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2020/03/15 | 112383 | macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf
+2020/03/15 | 110908 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2020/03/15 | 1105029 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2020/03/15 | 1103678 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2020/03/15 | 1102129 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2020/03/15 | 1089911 | macros/xetex/latex/quran/tex/qurantext-en.translation.def
+2020/03/15 | 108840 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2020/03/15 | 1079786 | graphics/pgf/contrib/milsymb/milsymb.pdf
+2020/03/15 | 107559 | graphics/pgf/contrib/milsymb/milsymb.tex
+2020/03/15 | 1049465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2020/03/15 | 1042289 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2020/03/15 | 102460 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2020/03/15 | 102331 | macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx
+2020/03/15 | 100409 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2020/03/14 | 96397 | systems/doc/luatex/luatex-tex.tex
2020/03/14 | 91219 | language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.tex
-2020/03/14 | 87299 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2020/03/14 | 87199 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2020/03/14 | 86604 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2020/03/14 | 84767 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2020/03/14 | 8465 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2020/03/14 | 85866 | macros/generic/schemata/schemata.dtx
2020/03/14 | 846098 | systems/win32/miktex/tm/packages/tugboat.tar.lzma
-2020/03/14 | 84354 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2020/03/14 | 80583 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2020/03/14 | 78102 | systems/win32/miktex/tm/packages/lua-ul.tar.lzma
-2020/03/14 | 78033 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2020/03/14 | 78014 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2020/03/14 | 77599 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2020/03/14 | 775393 | systems/win32/miktex/tm/packages/l3build.tar.lzma
2020/03/14 | 774 | graphics/pstricks/contrib/pst-spirograph/Changes
2020/03/14 | 765968 | systems/win32/miktex/tm/packages/l3backend.tar.lzma
-2020/03/14 | 7504 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2020/03/14 | 74333 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2020/03/14 | 7640 | systems/doc/luatex/luatex-harfbuzz.tex
2020/03/14 | 739352 | systems/win32/miktex/tm/packages/schemata.tar.lzma
2020/03/14 | 737 | graphics/pstricks/contrib/pst-spirograph/doc/animation/animA.tex
-2020/03/14 | 73606 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2020/03/14 | 72809 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2020/03/14 | 72571 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2020/03/14 | 71691 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2020/03/14 | 70754 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2020/03/14 | 7024 | macros/luatex/generic/luatexko/ChangeLog
-2020/03/14 | 69581 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2020/03/14 | 69223 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2020/03/14 | 68775 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2020/03/14 | 68812 | systems/doc/luatex/luatex-math.tex
2020/03/14 | 67921 | macros/latex/contrib/els-cas-templates/cas-common.sty
-2020/03/14 | 67247 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2020/03/14 | 669892 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
2020/03/14 | 66090 | macros/luatex/generic/luatexko/luatexko.lua
-2020/03/14 | 652 | systems/win32/miktex/tm/packages/next/pr.ini
-2020/03/14 | 65102 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2020/03/14 | 65092 | macros/luatex/optex/doc/optex-doc.tex
-2020/03/14 | 64403 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2020/03/14 | 63299 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2020/03/14 | 63210 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2020/03/14 | 63131 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2020/03/14 | 62929 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2020/03/14 | 62855 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2020/03/14 | 629768 | macros/generic/schemata/schemata.pdf
2020/03/14 | 621 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim7.tex
-2020/03/14 | 61673 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2020/03/14 | 61534 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2020/03/14 | 615136 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2020/03/14 | 61354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2020/03/14 | 6134 | biblio/bibtex/contrib/gbt7714/README.md
+2020/03/14 | 608649 | systems/win32/w32tex/ChangeLog
2020/03/14 | 607 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim6.tex
2020/03/14 | 606 | graphics/pstricks/contrib/pst-spirograph/doc/animation/animB.tex
2020/03/14 | 604 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim8.tex
2020/03/14 | 600 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim5.tex
2020/03/14 | 597 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim4.tex
2020/03/14 | 595 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim1.tex
-2020/03/14 | 59437 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma
-2020/03/14 | 58806 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2020/03/14 | 580 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim3.tex
2020/03/14 | 580 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim2.tex
-2020/03/14 | 57764 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2020/03/14 | 575227 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2020/03/14 | 57216485 | graphics/pstricks/contrib/pst-spirograph/doc/pst-spirograph-doc.pdf
-2020/03/14 | 57203 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2020/03/14 | 566652 | systems/win32/miktex/tm/packages/hep-paper.tar.lzma
-2020/03/14 | 56649 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
2020/03/14 | 56600019 | graphics/pstricks/contrib/pst-spirograph.zip
-2020/03/14 | 56434 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2020/03/14 | 563214 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2020/03/14 | 561014 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2020/03/14 | 54905 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2020/03/14 | 544343 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2020/03/14 | 53971 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2020/03/14 | 539209 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2020/03/14 | 53405 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma
-2020/03/14 | 533438 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2020/03/14 | 530307 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2020/03/14 | 530223 | systems/win32/miktex/tm/packages/files.csv.lzma
-2020/03/14 | 52046 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2020/03/14 | 51990 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
2020/03/14 | 5113 | macros/luatex/optex/optex.ini
-2020/03/14 | 50980 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2020/03/14 | 50865 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2020/03/14 | 50420 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2020/03/14 | 503 | graphics/pstricks/contrib/pst-spirograph/doc/animation/animC.tex
-2020/03/14 | 498680 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2020/03/14 | 49762 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2020/03/14 | 49346 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2020/03/14 | 4818 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2020/03/14 | 47968 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2020/03/14 | 5012 | systems/doc/luatex/luatex-preamble.tex
+2020/03/14 | 49739296 | systems/win32/w32tex/xetex-w32.tar.xz
+2020/03/14 | 48178 | systems/doc/luatex/luatex-modifications.tex
2020/03/14 | 464 | graphics/pstricks/contrib/pst-spirograph/README
-2020/03/14 | 45807 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2020/03/14 | 45708 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2020/03/14 | 456888 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
2020/03/14 | 45638628 | systems/win32/miktex/tm/packages/pst-spirograph.tar.lzma
-2020/03/14 | 45616 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2020/03/14 | 45473 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2020/03/14 | 451470 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma
-2020/03/14 | 44913 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2020/03/14 | 43418 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2020/03/14 | 42921 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2020/03/14 | 42584 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2020/03/14 | 421951 | macros/luatex/optex/op-ring.png
2020/03/14 | 421951 | macros/luatex/optex/doc/op-ring.png
-2020/03/14 | 41888 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2020/03/14 | 41804 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2020/03/14 | 42120 | systems/doc/luatex/luatex-fonts.tex
2020/03/14 | 4165 | macros/latex/contrib/els-cas-templates/cas-sc.cls
2020/03/14 | 416081 | systems/win32/miktex/tm/packages/thesis-gwu.tar.lzma
2020/03/14 | 4131 | macros/latex/contrib/els-cas-templates/cas-dc.cls
-2020/03/14 | 41036 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2020/03/14 | 40711 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2020/03/14 | 39216 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2020/03/14 | 391650 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2020/03/14 | 38830 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2020/03/14 | 387717 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma
+2020/03/14 | 3892 | macros/generic/schemata/README
2020/03/14 | 3783 | macros/luatex/generic/luatexko/luatexko-uhc2utf8.lua
2020/03/14 | 375475 | biblio/bibtex/contrib/gbt7714.zip
2020/03/14 | 3720 | macros/luatex/generic/luatexko/README
-2020/03/14 | 36588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2020/03/14 | 36373 | macros/latex/contrib/draftwatermark/draftwatermark.dtx
-2020/03/14 | 36354 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2020/03/14 | 361195 | macros/luatex/generic/luatexko.zip
-2020/03/14 | 356476 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2020/03/14 | 354763 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma
-2020/03/14 | 34838 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2020/03/14 | 34829 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2020/03/14 | 347 | systems/win32/miktex/tm/packages/pr.ini
+2020/03/14 | 35672 | systems/doc/luatex/luatex-backend.tex
+2020/03/14 | 35529 | systems/doc/luatex/luatex-callbacks.tex
2020/03/14 | 344970 | language/korean/kotex-oblivoir.zip
2020/03/14 | 344133 | biblio/bibtex/contrib/gbt7714/gbt7714.pdf
+2020/03/14 | 34408048 | systems/win32/w32tex/ltxpkgs.tar.xz
2020/03/14 | 33845 | macros/luatex/optex/math-macros.opm
-2020/03/14 | 33560 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2020/03/14 | 33371 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2020/03/14 | 328820 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2020/03/14 | 324950 | macros/luatex/generic/luatexko/luatexko-doc.pdf
-2020/03/14 | 32356 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2020/03/14 | 3231 | macros/latex/contrib/draftwatermark/draftwatermark.ins
-2020/03/14 | 32262 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2020/03/14 | 321837 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
2020/03/14 | 31671 | macros/luatex/generic/luatexko/luatexko-doc.tex
-2020/03/14 | 31226 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2020/03/14 | 31158 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2020/03/14 | 310068 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2020/03/14 | 30989 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2020/03/14 | 30680 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2020/03/14 | 3124 | systems/doc/luatex/luatex.tex
2020/03/14 | 30593 | macros/luatex/generic/luatexko/luatexko.sty
-2020/03/14 | 30278 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2020/03/14 | 301132 | systems/win32/miktex/tm/packages/acronym.tar.lzma
-2020/03/14 | 29676 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
2020/03/14 | 2947 | macros/luatex/optex/lists.opm
-2020/03/14 | 29281 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2020/03/14 | 29259 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
2020/03/14 | 291 | graphics/pstricks/contrib/pst-spirograph/doc/animation/runall.sh
-2020/03/14 | 29030 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2020/03/14 | 28728 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2020/03/14 | 28488 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2020/03/14 | 281549 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2020/03/14 | 281291 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2020/03/14 | 27741 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2020/03/14 | 276835 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
2020/03/14 | 274931 | systems/win32/miktex/tm/packages/unicode-data.tar.lzma
-2020/03/14 | 272537 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2020/03/14 | 26954 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2020/03/14 | 26754 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2020/03/14 | 26640 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2020/03/14 | 26509 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2020/03/14 | 2597651 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2020/03/14 | 25302 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2020/03/14 | 247697 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2020/03/14 | 2472949 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2020/03/14 | 247046 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2020/03/14 | 246417 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2020/03/14 | 243446 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2020/03/14 | 23492 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2020/03/14 | 2606636 | systems/win32/w32tex/dvitools-w32.tar.xz
+2020/03/14 | 2338108 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
2020/03/14 | 2319 | graphics/pstricks/contrib/pst-spirograph/doc/pst-spirograph-doc.bib
2020/03/14 | 230610 | language/korean/kotex-oblivoir/doc/oblivoir-simpledoc.pdf
-2020/03/14 | 22937 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2020/03/14 | 2275 | macros/luatex/optex/others.opm
2020/03/14 | 22158 | language/korean/kotex-oblivoir/ChangeLog
-2020/03/14 | 220896 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2020/03/14 | 207727 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2020/03/14 | 20665 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2020/03/14 | 2057388 | systems/win32/miktex/tm/packages/scholax.tar.lzma
-2020/03/14 | 201567 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2020/03/14 | 19887 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2020/03/14 | 1980458 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2020/03/14 | 197688 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2020/03/14 | 197542 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2020/03/14 | 195075 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2020/03/14 | 19449 | macros/luatex/optex/parameters.opm
2020/03/14 | 193879 | macros/latex/contrib/draftwatermark.zip
-2020/03/14 | 193582 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2020/03/14 | 190 | graphics/pstricks/contrib/pst-spirograph/doc/animation/README.anim
2020/03/14 | 1895 | macros/latex/contrib/els-cas-templates/manifest.txt
2020/03/14 | 1884 | macros/luatex/optex/opmac-rest.opm
-2020/03/14 | 186873 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2020/03/14 | 185534 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2020/03/14 | 184154 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2020/03/14 | 182739 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2020/03/14 | 187652 | systems/doc/luatex/graphics/luaharfbuzz.pdf
2020/03/14 | 182386 | macros/latex/contrib/draftwatermark/draftwatermark.pdf
-2020/03/14 | 177599 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2020/03/14 | 17754 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2020/03/14 | 17668 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2020/03/14 | 1756287 | systems/doc/luatex/luatex.pdf
2020/03/14 | 171572 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal.zip
-2020/03/14 | 169242 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2020/03/14 | 1692044 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
2020/03/14 | 1678703 | systems/win32/miktex/tm/packages/quran.tar.lzma
-2020/03/14 | 167837 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2020/03/14 | 166975 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2020/03/14 | 16678 | graphics/pstricks/contrib/pst-spirograph/tex/pst-spirograph.tex
2020/03/14 | 1652 | macros/latex/contrib/els-cas-templates/README
-2020/03/14 | 165175 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2020/03/14 | 16457 | macros/luatex/generic/luatexko/luatexko-normalize.lua
-2020/03/14 | 160827 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2020/03/14 | 16037 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2020/03/14 | 15883 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2020/03/14 | 156310 | macros/luatex/optex/doc/optex-doc.pdf
2020/03/14 | 1550 | macros/latex/contrib/draftwatermark/README
-2020/03/14 | 152197 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2020/03/14 | 15185 | macros/luatex/optex/sections.opm
-2020/03/14 | 149968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2020/03/14 | 148237 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2020/03/14 | 147252 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
2020/03/14 | 14413 | graphics/pstricks/contrib/pst-spirograph/doc/pst-spirograph-doc.tex
-2020/03/14 | 140831 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2020/03/14 | 14034 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2020/03/14 | 1377273 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
2020/03/14 | 1356 | language/korean/kotex-oblivoir/README
-2020/03/14 | 133229 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2020/03/14 | 13059 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2020/03/14 | 130446 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
2020/03/14 | 12829 | macros/luatex/optex/unimath-codes.opm
2020/03/14 | 1278925 | macros/latex/contrib/els-cas-templates.zip
-2020/03/14 | 1249142 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2020/03/14 | 1248071 | macros/luatex/optex.zip
-2020/03/14 | 1232154 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2020/03/14 | 1189 | macros/luatex/optex/README
-2020/03/14 | 1182672 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2020/03/14 | 1182614 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2020/03/14 | 116935 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2020/03/14 | 115645 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2020/03/14 | 11542 | graphics/pstricks/contrib/pst-spirograph/dvips/pst-spirograph.pro
2020/03/14 | 11330 | macros/luatex/optex/plain-macros.opm
-2020/03/14 | 110908 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2020/03/14 | 1105029 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2020/03/14 | 1103274 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2020/03/14 | 1102 | biblio/bibtex/contrib/gbt7714/gbt7714.ins
-2020/03/14 | 1102632 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2020/03/14 | 108840 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2020/03/14 | 106804 | biblio/bibtex/contrib/gbt7714/gbt7714.dtx
2020/03/14 | 1049 | graphics/pstricks/contrib/pst-spirograph/latex/pst-spirograph.sty
-2020/03/14 | 1049465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2020/03/14 | 1042289 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2020/03/14 | 102459 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2020/03/14 | 1016 | graphics/pstricks/contrib/pst-spirograph/doc/animation/anim9.tex
-2020/03/14 | 100409 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
2020/03/13 | 9895 | macros/luatex/optex/table.opm
2020/03/13 | 98910444 | systems/win32/w32tex/web2c-lib.tar.xz
+2020/03/13 | 9808 | dviware/dvisvgm/src/PsSpecialHandler.hpp
2020/03/13 | 9354 | macros/luatex/optex/output.opm
+2020/03/13 | 8986 | dviware/dvisvgm/src/options.xml
2020/03/13 | 8936 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx
2020/03/13 | 890 | macros/latex/contrib/thesis-gwu/tex/methods.tex
2020/03/13 | 8909 | macros/latex/contrib/acronym/CHANGES
-2020/03/13 | 8846 | macros/xetex/latex/quran/doc/quran.png
2020/03/13 | 87078 | systems/doc/dvipng/dvipng.html
2020/03/13 | 8690 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.cbx
-2020/03/13 | 85783 | macros/generic/schemata/schemata.dtx
+2020/03/13 | 86868 | dviware/dvisvgm/libs/xxHash/xxh3.h
+2020/03/13 | 8407 | dviware/dvisvgm/configure.ac
2020/03/13 | 8394232 | systems/win32/w32tex/uptex-w32.tar.xz
2020/03/13 | 81004 | macros/latex/contrib/thesis-gwu/figures/picard_yes.jpg
+2020/03/13 | 804 | dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl
2020/03/13 | 790953 | install/macros/latex/contrib/l3build.tds.zip
2020/03/13 | 785715 | macros/latex/contrib/l3build.zip
-2020/03/13 | 77123 | macros/luatex/latex/lua-ul.zip
-2020/03/13 | 74195 | macros/luatex/latex/lua-ul/lua-ul.pdf
-2020/03/13 | 737943 | macros/generic/schemata.zip
+2020/03/13 | 7644 | dviware/dvisvgm/src/CommandLine.hpp
2020/03/13 | 73301 | macros/latex/contrib/acronym/acronym.dtx
-2020/03/13 | 716 | macros/xetex/latex/quran/README
2020/03/13 | 706872 | macros/latex/contrib/l3build/l3build.pdf
+2020/03/13 | 6894 | dviware/dvisvgm/src/PSInterpreter.hpp
+2020/03/13 | 68784 | dviware/dvisvgm/libs/xxHash/xxhash.h
+2020/03/13 | 682138 | dviware/dvisvgm/configure
2020/03/13 | 6783 | macros/latex/contrib/thesis-gwu/tex/intro-example.tex
+2020/03/13 | 66263 | dviware/dvisvgm/doc/dvisvgm.1
2020/03/13 | 6580 | macros/latex/contrib/thesis-gwu/tex/frontmatter.tex
2020/03/13 | 6551 | fonts/scholax/tex/scholax.sty
2020/03/13 | 6372904 | systems/win32/w32tex/ptex-ng-w32.tar.xz
-2020/03/13 | 63305 | macros/xetex/latex/quran/doc/quran-test2.pdf
-2020/03/13 | 629338 | macros/generic/schemata/schemata.pdf
-2020/03/13 | 608422 | systems/win32/w32tex/ChangeLog
+2020/03/13 | 59872 | dviware/dvisvgm/doc/dvisvgm.txt.in
+2020/03/13 | 59734 | dviware/dvisvgm/src/Makefile.in
2020/03/13 | 59640 | macros/latex/contrib/hep-paper/hep-paper.dtx
+2020/03/13 | 56818 | dviware/dvisvgm/aclocal.m4
2020/03/13 | 558444 | macros/latex/contrib/hep-paper.zip
-2020/03/13 | 54264 | macros/xetex/latex/quran/doc/quran-test1.pdf
+2020/03/13 | 5568 | dviware/dvisvgm/tests/HashFunctionTest.cpp
+2020/03/13 | 5501 | dviware/dvisvgm/src/utility.hpp
2020/03/13 | 5392 | macros/latex/contrib/l3build/l3build.lua
2020/03/13 | 535697 | macros/latex/contrib/hep-paper/hep-paper.pdf
2020/03/13 | 510423 | macros/latex/contrib/thesis-gwu.zip
-2020/03/13 | 502 | macros/xetex/latex/quran/doc/quran-test.tex
-2020/03/13 | 49741952 | systems/win32/w32tex/xetex-w32.tar.xz
+2020/03/13 | 50325 | dviware/dvisvgm/src/PsSpecialHandler.cpp
2020/03/13 | 49511 | macros/latex/contrib/thesis-gwu/thesis-gwu.cls
2020/03/13 | 4937896 | systems/win32/w32tex/aleph-w32.tar.xz
-2020/03/13 | 4740 | macros/xetex/latex/quran/tex/quran-translt.def
2020/03/13 | 473 | macros/latex/contrib/thesis-gwu/tex/results.tex
-2020/03/13 | 4575 | macros/xetex/latex/quran/tex/quran-transen.def
-2020/03/13 | 4563 | macros/xetex/latex/quran/tex/quran-transfa.def
-2020/03/13 | 4555 | macros/xetex/latex/quran/tex/quran-transde.def
2020/03/13 | 451 | macros/latex/contrib/thesis-gwu/thesis-sample.tex
2020/03/13 | 439 | macros/latex/contrib/thesis-gwu/tex/intro.tex
2020/03/13 | 438607 | systems/doc/dvips/dvips.html
-2020/03/13 | 43780 | macros/xetex/latex/quran/doc/quran-doc.tex
+2020/03/13 | 4369 | dviware/dvisvgm/config.h.in
2020/03/13 | 41264260 | systems/win32/w32tex/latex-dev.tar.xz
2020/03/13 | 412092 | systems/doc/dvips/dvips.pdf
+2020/03/13 | 40554 | dviware/dvisvgm/libs/ff-woff/Makefile.in
+2020/03/13 | 402661 | dviware/dvisvgm/ChangeLog
2020/03/13 | 402446 | systems/doc/kpathsea/kpathsea.pdf
-2020/03/13 | 398 | macros/xetex/latex/quran/doc/quran-test1.tex
2020/03/13 | 375 | macros/latex/contrib/thesis-gwu/tex/results-example.tex
-2020/03/13 | 36700 | macros/xetex/latex/quran/tex/quran.sty
2020/03/13 | 363626 | systems/doc/kpathsea/kpathsea.html
+2020/03/13 | 35349 | dviware/dvisvgm/NEWS
+2020/03/13 | 3527 | dviware/dvisvgm/doc/Makefile.am
2020/03/13 | 348 | macros/latex/contrib/thesis-gwu/tex/prevmethods.tex
-2020/03/13 | 34405616 | systems/win32/w32tex/ltxpkgs.tar.xz
2020/03/13 | 3436334 | install/fonts/scholax.tds.zip
2020/03/13 | 34114 | macros/latex/contrib/l3build/l3build-check.lua
2020/03/13 | 3399 | macros/luatex/optex/op-demo.tex
2020/03/13 | 338 | macros/latex/contrib/thesis-gwu/tex/discussion.tex
2020/03/13 | 3385086 | fonts/scholax.zip
-2020/03/13 | 33003 | macros/xetex/latex/quran/doc/quran-test.pdf
-2020/03/13 | 327382 | macros/xetex/latex/quran/doc/quran-doc.pdf
2020/03/13 | 3257 | macros/luatex/optex/styles.opm
2020/03/13 | 324592480 | systems/win32/w32tex/pstricks.tar.xz
2020/03/13 | 32422 | macros/latex/contrib/thesis-gwu/LICENSE.md
+2020/03/13 | 31488 | dviware/dvisvgm/libs/brotli/Makefile.in
2020/03/13 | 31299 | macros/latex/contrib/thesis-gwu/figures/tumblr_lrvyd1GuNe1r3aueno1_400.jpg
-2020/03/13 | 308 | macros/luatex/latex/lua-ul/README
2020/03/13 | 302475 | macros/latex/contrib/thesis-gwu/thesis-sample.pdf
2020/03/13 | 295540 | macros/latex/contrib/acronym.zip
+2020/03/13 | 27672 | dviware/dvisvgm/Makefile.in
2020/03/13 | 275685 | macros/latex/contrib/acronym/acronym.pdf
+2020/03/13 | 256010 | dviware/dvisvgm/tests/Makefile.in
2020/03/13 | 2541 | macros/latex/contrib/thesis-gwu/thesis-bib.bib
2020/03/13 | 2499968 | systems/win32/w32tex/tex4htk-w32.tar.xz
-2020/03/13 | 2432792 | macros/xetex/latex/quran.zip
+2020/03/13 | 24681 | dviware/dvisvgm/libs/woff2/Makefile.in
+2020/03/13 | 22166 | dviware/dvisvgm/src/optimizer/Makefile.in
2020/03/13 | 220376 | systems/doc/dvipng/dvipng.pdf
-2020/03/13 | 2191 | macros/xetex/latex/quran/doc/quran-test2.tex
2020/03/13 | 2165 | fonts/scholax/README
+2020/03/13 | 21142 | dviware/dvisvgm/doc/Makefile.in
+2020/03/13 | 20804 | dviware/dvisvgm/libs/potrace/Makefile.in
2020/03/13 | 20620688 | systems/win32/w32tex/pdftex-w32.tar.xz
+2020/03/13 | 20338 | dviware/dvisvgm/libs/clipper/Makefile.in
+2020/03/13 | 19936 | dviware/dvisvgm/libs/Makefile.in
2020/03/13 | 19935 | macros/latex/contrib/thesis-gwu/tex/manual-ex.tex
2020/03/13 | 1979 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/README.md
+2020/03/13 | 19650 | dviware/dvisvgm/libs/xxHash/Makefile.in
+2020/03/13 | 19545 | dviware/dvisvgm/libs/md5/Makefile.in
2020/03/13 | 19051 | macros/latex/contrib/thesis-gwu/figures/data.png
+2020/03/13 | 1859 | dviware/dvisvgm/libs/xxHash/xxhash.c
2020/03/13 | 1817 | macros/latex/contrib/l3build/l3build.1
+2020/03/13 | 17749 | dviware/dvisvgm/src/dvisvgm.cpp
2020/03/13 | 17698872 | systems/win32/w32tex/luatex-dev-w32.tar.xz
2020/03/13 | 17685688 | systems/win32/w32tex/luatex-exp-w32.tar.xz
2020/03/13 | 16895 | macros/latex/contrib/thesis-gwu/figures/orbital_mechanics.png
+2020/03/13 | 16848 | dviware/dvisvgm/src/Matrix.cpp
+2020/03/13 | 16801 | dviware/dvisvgm/src/PSInterpreter.cpp
2020/03/13 | 16765 | macros/latex/contrib/thesis-gwu/tex/manual.tex
2020/03/13 | 16730428 | systems/win32/w32tex/luatex-w32.tar.xz
2020/03/13 | 161299 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf
-2020/03/13 | 1601542 | macros/xetex/latex/quran/tex/qurantext-fa.translation.def
-2020/03/13 | 15844 | macros/luatex/latex/lua-ul/lua-ul.dtx
+2020/03/13 | 15597 | dviware/dvisvgm/src/XMLNode.cpp
+2020/03/13 | 15593 | dviware/dvisvgm/libs/variant/Makefile.in
2020/03/13 | 14993 | macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex
-2020/03/13 | 1447378 | macros/xetex/latex/quran/tex/qurantext-simple.def
-2020/03/13 | 1438728 | macros/xetex/latex/quran/tex/qurantext-uthmani.def
-2020/03/13 | 1389 | macros/luatex/latex/lua-ul/docstrip-luacode.sty
+2020/03/13 | 13688 | dviware/dvisvgm/tests/data/Makefile.in
+2020/03/13 | 13474 | dviware/dvisvgm/m4/Makefile.in
2020/03/13 | 13436 | macros/latex/contrib/hep-paper/bibliography.bib
2020/03/13 | 1291 | macros/latex/contrib/thesis-gwu/tex/litreview.tex
2020/03/13 | 12628 | macros/latex/contrib/l3build/CHANGELOG.md
2020/03/13 | 12555 | macros/generic/schemata/schematest.tex
-2020/03/13 | 1251810 | macros/xetex/latex/quran/tex/qurantext-en.transliteration.def
-2020/03/13 | 1230282 | macros/xetex/latex/quran/tex/qurantext-de.translation.def
2020/03/13 | 12276 | macros/latex/contrib/thesis-gwu/figures/file_extensions.png
+2020/03/13 | 11910 | dviware/dvisvgm/src/psdefs.cpp
2020/03/13 | 1185 | macros/latex/contrib/thesis-gwu/tex/appendix.tex
2020/03/13 | 1185 | macros/latex/contrib/thesis-gwu/tex/appendix-ex.tex
2020/03/13 | 112 | macros/latex/contrib/thesis-gwu/tex/conclusion.tex
-2020/03/13 | 1089911 | macros/xetex/latex/quran/tex/qurantext-en.translation.def
-2020/03/13 | 10667 | macros/generic/schemata/README
2020/03/13 | 106356 | macros/latex/contrib/l3build/l3build.dtx
2020/03/13 | 10318884 | systems/win32/w32tex/ptex-w32.tar.xz
2020/03/13 | 1024 | macros/latex/contrib/l3build/README.md
@@ -1266,452 +1453,3 @@
2020/03/09 | 10599882 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
2020/03/09 | 10474 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
2020/03/09 | 10019 | macros/latex/contrib/udesoftec/udesoftec-bibcommon.sty
-2020/03/08 | 998 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.2.tex
-2020/03/08 | 992 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.5.tex
-2020/03/08 | 990 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.1.tex
-2020/03/08 | 988 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.6.tex
-2020/03/08 | 988716 | macros/latex/contrib/chemmacros/chemmacros-manual.pdf
-2020/03/08 | 982 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.2.tex
-2020/03/08 | 95524 | macros/xetex/latex/quran-ur/doc/quran-ur-doc.pdf
-2020/03/08 | 946 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.4.tex
-2020/03/08 | 942 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.0.tex
-2020/03/08 | 941 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.5.tex
-2020/03/08 | 9370 | macros/latex/contrib/chemmacros/chemmacros.module.chemformula.code.tex
-2020/03/08 | 919 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.4.1.tex
-2020/03/08 | 914 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.2.tex
-2020/03/08 | 912 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.3.tex
-2020/03/08 | 91134 | macros/generic/schemata/schemata.png
-2020/03/08 | 907 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.3.tex
-2020/03/08 | 905 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.3.0.tex
-2020/03/08 | 904 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.2.tex
-2020/03/08 | 903 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.5.tex
-2020/03/08 | 895 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.3.1.tex
-2020/03/08 | 8846 | macros/xetex/latex/quran-ur/doc/quran.png
-2020/03/08 | 8846 | macros/xetex/latex/quran-de/doc/quran.png
-2020/03/08 | 880 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.3.1.tex
-2020/03/08 | 880 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.6.0.tex
-2020/03/08 | 859 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.1.tex
-2020/03/08 | 857 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.2.tex
-2020/03/08 | 855 | fonts/libertinus-fonts/CONTRIBUTING.txt
-2020/03/08 | 854 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.4.tex
-2020/03/08 | 851 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.3.tex
-2020/03/08 | 850 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.8.tex
-2020/03/08 | 850 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.7.tex
-2020/03/08 | 848 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.4.1.tex
-2020/03/08 | 847 | macros/xetex/latex/quran-ur/README
-2020/03/08 | 844 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.6.tex
-2020/03/08 | 842 | fonts/libertinus-fonts/CONTRIBUTORS.txt
-2020/03/08 | 8421 | macros/latex/contrib/chemmacros/chemmacros.sty
-2020/03/08 | 841272 | fonts/libertinus-fonts/LibertinusMath-Regular.otf
-2020/03/08 | 818 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.3.tex
-2020/03/08 | 817 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.5.0.tex
-2020/03/08 | 813 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.9.tex
-2020/03/08 | 811 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.2.tex
-2020/03/08 | 808 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.4.1.tex
-2020/03/08 | 80882 | macros/xetex/latex/quran-de/doc/quran-de-doc.pdf
-2020/03/08 | 805 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.1.tex
-2020/03/08 | 801 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.4.tex
-2020/03/08 | 8002 | macros/latex/contrib/chemmacros/chemmacros.module.isotopes.code.tex
-2020/03/08 | 798 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.9.tex
-2020/03/08 | 786 | macros/xetex/latex/quran-de/README
-2020/03/08 | 780 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.1.4.tex
-2020/03/08 | 780553 | macros/latex/contrib/tkz/tkz-euclide/doc/TKZdoc-euclide.pdf
-2020/03/08 | 775 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.2.tex
-2020/03/08 | 771 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.2.0.tex
-2020/03/08 | 769 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.3.tex
-2020/03/08 | 767 | macros/latex/contrib/tkz-doc/README
-2020/03/08 | 762 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.5.tex
-2020/03/08 | 756 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.3.1.tex
-2020/03/08 | 755 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.2.tex
-2020/03/08 | 7505 | macros/xetex/latex/quran-ur/doc/quran-ur-doc.tex
-2020/03/08 | 746 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.7.tex
-2020/03/08 | 746 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.5.tex
-2020/03/08 | 743 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.3.tex
-2020/03/08 | 742 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.3.1.tex
-2020/03/08 | 732 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.3.1.tex
-2020/03/08 | 732 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.2.tex
-2020/03/08 | 731 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.4.tex
-2020/03/08 | 729 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.1.tex
-2020/03/08 | 7293 | macros/latex/contrib/chemmacros/chemmacros.module.newman.code.tex
-2020/03/08 | 727 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.9.1.tex
-2020/03/08 | 7178 | macros/xetex/latex/quran-de/doc/quran-de-doc.tex
-2020/03/08 | 714 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.3.tex
-2020/03/08 | 710 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.3.tex
-2020/03/08 | 706 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.7.1.tex
-2020/03/08 | 702 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.2.tex
-2020/03/08 | 701 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.1.tex
-2020/03/08 | 701 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.3.tex
-2020/03/08 | 695 | fonts/libertinus-fonts/AUTHORS.txt
-2020/03/08 | 694 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.6.1.tex
-2020/03/08 | 693 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.0.tex
-2020/03/08 | 691 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.2.tex
-2020/03/08 | 690 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.8.tex
-2020/03/08 | 677 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.6.tex
-2020/03/08 | 676 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.2.0.tex
-2020/03/08 | 6730 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-main.tex
-2020/03/08 | 669 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.2.1.tex
-2020/03/08 | 657 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.1.tex
-2020/03/08 | 654 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.8.tex
-2020/03/08 | 651 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.6.tex
-2020/03/08 | 648 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.1.tex
-2020/03/08 | 648 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.1.tex
-2020/03/08 | 645 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.0.0.tex
-2020/03/08 | 643 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.3.tex
-2020/03/08 | 639 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.7.tex
-2020/03/08 | 634 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.2.tex
-2020/03/08 | 6324 | macros/latex/contrib/chemmacros/chemmacros.module.tikz.code.tex
-2020/03/08 | 631 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.3.tex
-2020/03/08 | 6314 | macros/xetex/latex/quran-de/tex/quran-de.sty
-2020/03/08 | 6264 | macros/latex/contrib/chemmacros/chemmacros.module.lang.code.tex
-2020/03/08 | 6225 | macros/latex/contrib/chemmacros/chemmacros.module.polymers.code.tex
-2020/03/08 | 621 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.6.1.tex
-2020/03/08 | 620 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.2.tex
-2020/03/08 | 620 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.6.0.tex
-2020/03/08 | 619 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.7.0.tex
-2020/03/08 | 616 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.3.tex
-2020/03/08 | 615 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.3.tex
-2020/03/08 | 613 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.8.0.tex
-2020/03/08 | 607 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.1.tex
-2020/03/08 | 606 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.2.tex
-2020/03/08 | 6069 | macros/latex/contrib/chemmacros/chemmacros.module.thermodynamics.code.tex
-2020/03/08 | 597 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.1.tex
-2020/03/08 | 594 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.5.tex
-2020/03/08 | 592 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.1.tex
-2020/03/08 | 592780 | fonts/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf
-2020/03/08 | 591 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.3.1.tex
-2020/03/08 | 589 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.1.1.tex
-2020/03/08 | 588156 | fonts/libertinus-fonts/LibertinusSerif-Regular.otf
-2020/03/08 | 587 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.2.tex
-2020/03/08 | 5863 | macros/latex/contrib/chemmacros/chemmacros.module.charges.code.tex
-2020/03/08 | 582 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.4.tex
-2020/03/08 | 578 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.9.tex
-2020/03/08 | 572 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-28.1.1.tex
-2020/03/08 | 572 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.5.tex
-2020/03/08 | 571 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.3.tex
-2020/03/08 | 571 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.3.tex
-2020/03/08 | 568 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.2.tex
-2020/03/08 | 563644 | fonts/libertinus-fonts/LibertinusSerif-Italic.otf
-2020/03/08 | 562 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.6.1.tex
-2020/03/08 | 561 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.10.tex
-2020/03/08 | 560 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-8.2.0.tex
-2020/03/08 | 559 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.0.tex
-2020/03/08 | 556 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.7.tex
-2020/03/08 | 553 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.3.tex
-2020/03/08 | 550 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.1.tex
-2020/03/08 | 550 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.2.1.tex
-2020/03/08 | 549 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.1.tex
-2020/03/08 | 549 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.1.tex
-2020/03/08 | 547 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.5.tex
-2020/03/08 | 547 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-22.3.1.tex
-2020/03/08 | 544712 | fonts/libertinus-fonts/LibertinusSerif-Bold.otf
-2020/03/08 | 5438 | macros/latex/contrib/chemmacros/chemmacros.module.acid-base.code.tex
-2020/03/08 | 543700 | fonts/libertinus-fonts/LibertinusSerif-Semibold.otf
-2020/03/08 | 542 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.1.tex
-2020/03/08 | 533 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.10.2.tex
-2020/03/08 | 531 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.4.tex
-2020/03/08 | 529 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.9.tex
-2020/03/08 | 528 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.8.tex
-2020/03/08 | 528 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.2.tex
-2020/03/08 | 526 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.4.tex
-2020/03/08 | 526 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.2.2.tex
-2020/03/08 | 524 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.7.tex
-2020/03/08 | 52463 | help/ctan/CTAN-upload-addendum.html
-2020/03/08 | 522 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.1.tex
-2020/03/08 | 521 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.4.tex
-2020/03/08 | 520644 | fonts/libertinus-fonts/LibertinusSerifDisplay-Regular.otf
-2020/03/08 | 519552 | fonts/libertinus-fonts/LibertinusSans-Bold.otf
-2020/03/08 | 514 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.2.tex
-2020/03/08 | 509 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.2.tex
-2020/03/08 | 509484 | fonts/libertinus-fonts/LibertinusSans-Italic.otf
-2020/03/08 | 503425 | fonts/libertinus-fonts/documentation/preview.svg
-2020/03/08 | 502 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.1.tex
-2020/03/08 | 501 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.1.tex
-2020/03/08 | 500019 | macros/latex/contrib/tkz/tkz-base.zip
-2020/03/08 | 497 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.4.tex
-2020/03/08 | 496 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.0.0.tex
-2020/03/08 | 496504 | fonts/libertinus-fonts/LibertinusSans-Regular.otf
-2020/03/08 | 492 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.2.tex
-2020/03/08 | 491 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.2.tex
-2020/03/08 | 489 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.5.tex
-2020/03/08 | 4889 | macros/latex/contrib/chemmacros/chemmacros.module.mechanisms.code.tex
-2020/03/08 | 485 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.1.tex
-2020/03/08 | 482 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.4.0.tex
-2020/03/08 | 482 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.1.tex
-2020/03/08 | 481 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.1.1.tex
-2020/03/08 | 476 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.3.tex
-2020/03/08 | 4763 | macros/latex/contrib/chemmacros/chemmacros.module.errorcheck.code.tex
-2020/03/08 | 475 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.4.1.tex
-2020/03/08 | 470 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.1.1.tex
-2020/03/08 | 466 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.3.1.tex
-2020/03/08 | 466 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.4.tex
-2020/03/08 | 46679 | macros/xetex/latex/quran-ur/doc/quran-ur-test.pdf
-2020/03/08 | 465 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.3.tex
-2020/03/08 | 464 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.1.tex
-2020/03/08 | 464 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.2.4.tex
-2020/03/08 | 464 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.0.tex
-2020/03/08 | 464 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.9.0.tex
-2020/03/08 | 462 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.8.1.tex
-2020/03/08 | 461 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.1.tex
-2020/03/08 | 4611 | macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex
-2020/03/08 | 457 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.6.tex
-2020/03/08 | 4561 | macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex
-2020/03/08 | 454 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.3.tex
-2020/03/08 | 454 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.2.tex
-2020/03/08 | 453 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.5.tex
-2020/03/08 | 453 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.2.3.tex
-2020/03/08 | 451 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.8.tex
-2020/03/08 | 4515 | macros/luatex/optex/multicolumns.opm
-2020/03/08 | 449 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.5.tex
-2020/03/08 | 449 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.3.tex
-2020/03/08 | 449 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.5.1.tex
-2020/03/08 | 448 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.2.tex
-2020/03/08 | 447 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.1.1.tex
-2020/03/08 | 446 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.5.1.tex
-2020/03/08 | 445 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.5.0.tex
-2020/03/08 | 445 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.3.tex
-2020/03/08 | 442 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-12.1.2.tex
-2020/03/08 | 4427 | fonts/libertinus-fonts/OFL.txt
-2020/03/08 | 441 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.6.tex
-2020/03/08 | 437 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.1.tex
-2020/03/08 | 436 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.9.tex
-2020/03/08 | 434 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.4.tex
-2020/03/08 | 434 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.2.tex
-2020/03/08 | 434 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.10.tex
-2020/03/08 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.2.0.tex
-2020/03/08 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.1.0.tex
-2020/03/08 | 431 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.1.tex
-2020/03/08 | 429 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.1.0.tex
-2020/03/08 | 428 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.2.0.tex
-2020/03/08 | 4287 | macros/latex/contrib/chemmacros/chemmacros.module.xfrac.code.tex
-2020/03/08 | 426 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.5.1.tex
-2020/03/08 | 426 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-25.4.1.tex
-2020/03/08 | 426 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.2.tex
-2020/03/08 | 423 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.2.tex
-2020/03/08 | 422 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.2.1.tex
-2020/03/08 | 421 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.4.1.tex
-2020/03/08 | 420 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.2.tex
-2020/03/08 | 419 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.2.tex
-2020/03/08 | 419 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.2.1.tex
-2020/03/08 | 419320 | fonts/libertinus-fonts/LibertinusSerif-BoldItalic.otf
-2020/03/08 | 416 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.4.tex
-2020/03/08 | 412 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.0.tex
-2020/03/08 | 412 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.1.tex
-2020/03/08 | 412 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.2.tex
-2020/03/08 | 410 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.2.tex
-2020/03/08 | 410 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.1.tex
-2020/03/08 | 409 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.1.tex
-2020/03/08 | 409 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.2.tex
-2020/03/08 | 409 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.5.2.tex
-2020/03/08 | 407 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.5.1.tex
-2020/03/08 | 40773 | macros/xetex/latex/quran-de/doc/quran-de-test.pdf
-2020/03/08 | 404 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.11.tex
-2020/03/08 | 403 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.2.1.tex
-2020/03/08 | 403 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.11.tex
-2020/03/08 | 401 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-9.2.0.tex
-2020/03/08 | 401 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.2.tex
-2020/03/08 | 401 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.3.0.tex
-2020/03/08 | 399 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.7.tex
-2020/03/08 | 398 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.2.9.tex
-2020/03/08 | 397 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.1.1.tex
-2020/03/08 | 396 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-20.3.2.tex
-2020/03/08 | 395 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.6.1.tex
-2020/03/08 | 393 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-11.4.0.tex
-2020/03/08 | 391 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.2.tex
-2020/03/08 | 391 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.1.3.tex
-2020/03/08 | 388 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.1.tex
-2020/03/08 | 387 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.1.0.tex
-2020/03/08 | 387 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.4.tex
-2020/03/08 | 386 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.12.3.tex
-2020/03/08 | 384 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.1.3.tex
-2020/03/08 | 383 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.3.1.tex
-2020/03/08 | 383 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.5.tex
-2020/03/08 | 382 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-26.1.1.tex
-2020/03/08 | 382 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.6.tex
-2020/03/08 | 380 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-10.1.10.tex
-2020/03/08 | 378 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.4.tex
-2020/03/08 | 376 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.2.1.tex
-2020/03/08 | 376 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.2.tex
-2020/03/08 | 376 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.4.0.tex
-2020/03/08 | 376 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.1.tex
-2020/03/08 | 376977 | macros/latex/contrib/tkz/tkz-base/doc/TKZdoc-base.pdf
-2020/03/08 | 375 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.2.2.tex
-2020/03/08 | 372 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.1.tex
-2020/03/08 | 372 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.6.tex
-2020/03/08 | 372 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.5.1.tex
-2020/03/08 | 371 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.1.2.tex
-2020/03/08 | 371 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.11.1.tex
-2020/03/08 | 3705 | macros/latex/contrib/tkz-doc/tkz-doc.cfg
-2020/03/08 | 369 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.3.0.tex
-2020/03/08 | 368 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-29.2.0.tex
-2020/03/08 | 366 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.3.2.tex
-2020/03/08 | 366 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.8.tex
-2020/03/08 | 363 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.1.1.tex
-2020/03/08 | 361 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.1.1.tex
-2020/03/08 | 360 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.1.2.tex
-2020/03/08 | 352 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.2.tex
-2020/03/08 | 3485526 | fonts/libertinus-fonts.zip
-2020/03/08 | 347 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.13.1.tex
-2020/03/08 | 344 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.2.1.tex
-2020/03/08 | 342 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.1.tex
-2020/03/08 | 342 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.3.tex
-2020/03/08 | 342 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.7.tex
-2020/03/08 | 342 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.2.tex
-2020/03/08 | 339 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.1.tex
-2020/03/08 | 338 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.3.tex
-2020/03/08 | 336 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-5.1.1.tex
-2020/03/08 | 336 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.2.tex
-2020/03/08 | 336 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.2.tex
-2020/03/08 | 335 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.4.0.tex
-2020/03/08 | 3339866 | macros/xetex/latex/quran-ur.zip
-2020/03/08 | 332 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.4.1.tex
-2020/03/08 | 331 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-23.2.2.tex
-2020/03/08 | 327 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.7.1.tex
-2020/03/08 | 325 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-24.5.0.tex
-2020/03/08 | 325 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-13.1.2.tex
-2020/03/08 | 324 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.7.tex
-2020/03/08 | 322 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.2.tex
-2020/03/08 | 322 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.3.1.tex
-2020/03/08 | 321 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.2.tex
-2020/03/08 | 3213 | macros/luatex/optex/languages.opm
-2020/03/08 | 318 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.2.3.tex
-2020/03/08 | 318 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.9.tex
-2020/03/08 | 316 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-21.1.1.tex
-2020/03/08 | 316 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.8.2.tex
-2020/03/08 | 311 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.9.1.tex
-2020/03/08 | 310 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-12.1.2.tex
-2020/03/08 | 309 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.3.tex
-2020/03/08 | 308 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.3.tex
-2020/03/08 | 307 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.4.0.tex
-2020/03/08 | 307 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.5.1.tex
-2020/03/08 | 307 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-14.1.1.tex
-2020/03/08 | 304 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.1.1.tex
-2020/03/08 | 303 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.1.tex
-2020/03/08 | 30361 | macros/latex/contrib/chemmacros/chemmacros.module.nomenclature.code.tex
-2020/03/08 | 302 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.4.tex
-2020/03/08 | 302 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.3.1.tex
-2020/03/08 | 300 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.3.tex
-2020/03/08 | 3001 | macros/latex/contrib/chemmacros/chemmacros.module.symbols.code.tex
-2020/03/08 | 297 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.4.tex
-2020/03/08 | 296 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.1.3.tex
-2020/03/08 | 296 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.1.tex
-2020/03/08 | 292 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.2.tex
-2020/03/08 | 291 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.2.tex
-2020/03/08 | 290 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.10.2.tex
-2020/03/08 | 289 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-7.0.3.tex
-2020/03/08 | 288 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.3.tex
-2020/03/08 | 2887 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-news.tex
-2020/03/08 | 287 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.5.tex
-2020/03/08 | 286 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.6.tex
-2020/03/08 | 284 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.5.tex
-2020/03/08 | 282 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-14.1.1.tex
-2020/03/08 | 2824 | macros/latex/contrib/tkz/tkz-euclide/README
-2020/03/08 | 2801 | macros/latex/contrib/tkz-doc/couverture.tex
-2020/03/08 | 279 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.4.0.tex
-2020/03/08 | 271 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.10.1.tex
-2020/03/08 | 270 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.4.tex
-2020/03/08 | 270 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.1.tex
-2020/03/08 | 269 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.5.tex
-2020/03/08 | 267 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.4.tex
-2020/03/08 | 267 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.1.tex
-2020/03/08 | 266 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.3.1.tex
-2020/03/08 | 266 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.1.tex
-2020/03/08 | 2656 | macros/latex/contrib/chemmacros/chemmacros.module.greek.code.tex
-2020/03/08 | 264 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-19.2.2.tex
-2020/03/08 | 264 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.8.tex
-2020/03/08 | 263 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.2.0.tex
-2020/03/08 | 261 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.3.tex
-2020/03/08 | 260 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-15.2.4.tex
-2020/03/08 | 260 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.2.0.tex
-2020/03/08 | 260 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-10.6.2.tex
-2020/03/08 | 259 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.11.tex
-2020/03/08 | 257 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.2.tex
-2020/03/08 | 257 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.10.tex
-2020/03/08 | 256 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-31.1.3.tex
-2020/03/08 | 255 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.2.5.tex
-2020/03/08 | 2540 | macros/latex/contrib/chemmacros/README
-2020/03/08 | 25185 | macros/latex/contrib/tkz/tkz-euclide/doc/latex/TKZdoc-euclide-presentation.tex
-2020/03/08 | 250 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.5.0.tex
-2020/03/08 | 250 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.6.tex
-2020/03/08 | 250 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.4.tex
-2020/03/08 | 248 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-5.1.2.tex
-2020/03/08 | 24637 | macros/latex/contrib/chemmacros/chemmacros.history
-2020/03/08 | 245 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.2.tex
-2020/03/08 | 244 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-17.7.1.tex
-2020/03/08 | 244 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.1.tex
-2020/03/08 | 244 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-15.4.1.tex
-2020/03/08 | 242 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-4.4.0.tex
-2020/03/08 | 242 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.3.1.tex
-2020/03/08 | 241 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.8.2.tex
-2020/03/08 | 2412 | macros/latex/contrib/chemmacros/chemmacros.module.all.code.tex
-2020/03/08 | 2407 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.12.tex
-2020/03/08 | 2406 | macros/latex/contrib/tkz/tkz-base/README
-2020/03/08 | 239 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-32.3.0.tex
-2020/03/08 | 238 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.1.tex
-2020/03/08 | 238 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.2.0.tex
-2020/03/08 | 237 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.9.1.tex
-2020/03/08 | 236 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.1.tex
-2020/03/08 | 234 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.5.0.tex
-2020/03/08 | 233 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.2.tex
-2020/03/08 | 2331 | macros/latex/contrib/chemmacros/chemmacros.module.units.code.tex
-2020/03/08 | 230 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.2.1.tex
-2020/03/08 | 225 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-13.4.1.tex
-2020/03/08 | 223 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.7.3.tex
-2020/03/08 | 2235 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.10.tex
-2020/03/08 | 221 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.3.tex
-2020/03/08 | 214 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-7.0.3.tex
-2020/03/08 | 21349 | macros/latex/contrib/chemmacros/chemmacros.module.orbital.code.tex
-2020/03/08 | 211 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-9.2.0.tex
-2020/03/08 | 2104442 | macros/xetex/latex/quran-ur/tex/qurantext-urviii.translation.def
-2020/03/08 | 202681 | fonts/libertinus-fonts/documentation/Sample.pdf
-2020/03/08 | 201 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-8.6.1.tex
-2020/03/08 | 201 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-6.1.1.tex
-2020/03/08 | 199 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-4.1.0.tex
-2020/03/08 | 197 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-3.1.0.tex
-2020/03/08 | 1886200 | macros/xetex/latex/quran-ur/tex/qurantext-urvii.translation.def
-2020/03/08 | 18725 | macros/latex/contrib/chemmacros/chemmacros.module.spectroscopy.code.tex
-2020/03/08 | 1824717 | macros/xetex/latex/quran-ur/tex/qurantext-urvi.translation.def
-2020/03/08 | 1817 | macros/latex/contrib/tkz/tkz-base/doc/latex/TKZdoc-base-news.tex
-2020/03/08 | 181064 | fonts/libertinus-fonts/LibertinusKeyboard-Regular.otf
-2020/03/08 | 1719145 | macros/xetex/latex/quran-ur/tex/qurantext-uriv.translation.def
-2020/03/08 | 1718268 | macros/xetex/latex/quran-ur/tex/qurantext-urii.translation.def
-2020/03/08 | 1714657 | macros/xetex/latex/quran-ur/tex/qurantext-uriii.translation.def
-2020/03/08 | 1644 | fonts/libertinus-fonts/README.txt
-2020/03/08 | 161982 | fonts/libertinus-fonts/documentation/Math-Sample.pdf
-2020/03/08 | 16144 | macros/latex/contrib/tkz-doc/tkzexample.sty
-2020/03/08 | 16098 | macros/luatex/optex/colors.opm
-2020/03/08 | 1566344 | macros/xetex/latex/quran-ur/tex/qurantext-uri.translation.def
-2020/03/08 | 15397 | macros/latex/contrib/chemmacros/chemmacros.module.redox.code.tex
-2020/03/08 | 153708 | fonts/libertinus-fonts/LibertinusSerifInitials-Regular.otf
-2020/03/08 | 1511 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.5.tex
-2020/03/08 | 1503110 | macros/xetex/latex/quran-ur/tex/qurantext-urv.translation.def
-2020/03/08 | 14908 | macros/xetex/latex/quran-ur/tex/quran-ur.sty
-2020/03/08 | 148726 | macros/latex/contrib/chemmacros/chemmacros-manual.tex
-2020/03/08 | 1482 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.7.tex
-2020/03/08 | 1465898 | macros/latex/contrib/tkz/tkz-euclide.zip
-2020/03/08 | 14592 | macros/latex/contrib/chemmacros/chemmacros.module.base.code.tex
-2020/03/08 | 14383 | macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
-2020/03/08 | 137918 | macros/latex/contrib/hitszthesis/hitszthesis.bst
-2020/03/08 | 135525 | macros/latex/contrib/chemmacros/chemmacros4.sty
-2020/03/08 | 1347 | macros/xetex/latex/quran-ur/doc/quran-ur-test.tex
-2020/03/08 | 12892 | macros/latex/contrib/chemmacros/chemmacros-manual.cls
-2020/03/08 | 12886 | fonts/libertinus-fonts/FONTLOG.txt
-2020/03/08 | 128345 | fonts/libertinus-fonts/documentation/Opentype-Features.pdf
-2020/03/08 | 1277612 | macros/xetex/latex/quran-de/tex/qurantext-deiv.translation.def
-2020/03/08 | 12740 | macros/latex/contrib/tkz-doc/tkz-doc.cls
-2020/03/08 | 1256 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-27.2.1.tex
-2020/03/08 | 1251589 | macros/xetex/latex/quran-de/tex/qurantext-deii.translation.def
-2020/03/08 | 1248 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.11.tex
-2020/03/08 | 1246 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-30.2.8.tex
-2020/03/08 | 1220920 | macros/xetex/latex/quran-de/tex/qurantext-deiii.translation.def
-2020/03/08 | 1154544 | macros/xetex/latex/quran-de.zip
-2020/03/08 | 11144 | macros/latex/contrib/tkz-doc.zip
-2020/03/08 | 1107295 | macros/latex/contrib/chemmacros.zip
-2020/03/08 | 1085 | macros/latex/contrib/tkz/tkz-base/examples/tkzBase-16.2.1.tex
-2020/03/08 | 10759 | macros/latex/contrib/chemmacros/chemmacros.module.scheme.code.tex
-2020/03/08 | 1074 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-16.0.8.tex
-2020/03/08 | 106592 | fonts/libertinus-fonts/LibertinusMono-Regular.otf
-2020/03/08 | 10593 | macros/latex/contrib/chemmacros/chemmacros5.sty
-2020/03/08 | 1038 | macros/xetex/latex/quran-de/doc/quran-de-test.tex
-2020/03/08 | 1031 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-6.1.6.tex
-2020/03/08 | 1022 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-18.1.4.tex
-2020/03/08 | 1015 | macros/latex/contrib/tkz/tkz-euclide/examples/tkzEuclide-1.3.3.tex
diff --git a/dviware/dvisvgm/ChangeLog b/dviware/dvisvgm/ChangeLog
index c540a278c9..9b23cf074b 100644
--- a/dviware/dvisvgm/ChangeLog
+++ b/dviware/dvisvgm/ChangeLog
@@ -1,3 +1,354 @@
+2020-03-13 Martin Gieseking <martin.gieseking@uos.de>
+
+ * NEWS:
+ updated NEWS and vc/README
+
+2020-03-12 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/dvisvgm.1:
+ added generated man page to repo
+
+2020-03-11 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/psdefs.cpp:
+ fixed xshow, yshow, and xyshow for multi-byte characters
+
+2020-03-10 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/Matrix.cpp:
+ replaced istream::ignore() with istream::get()
+to make gcc on NetBSD
+ happy
+
+ * .travis.yml:
+ travis: added packages required to build man page
+
+ * .appveyor.yml, .travis.yml, configure.ac, src/Doxyfile, src/version.hpp:
+ set version to 2.9
+
+2020-03-09 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/PsSpecialHandler.cpp:
+ create image files in tmpdir instead of cwd
+
+ * src/PsSpecialHandler.cpp:
+ fixed mime type of JPEG images
+
+ * src/utility.hpp:
+ base64_copy: added parameter to set line length
+
+ * src/XMLNode.cpp:
+ wrap lines with base64 image data (200 chars/line)
+
+ * doc/Makefile.am:
+ make install: use existing dvisvgm.1 if it can't be rebuilt
+However,
+ "make dist" and "make distcheck" should still fail if the man page
+can't
+ be built in order to ensure the tarball always contains a recent version.
+
+ * src/PsSpecialHandler.cpp, src/PsSpecialHandler.hpp:
+ some code cleanup
+
+2020-03-08 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/dvisvgm.txt.in, src/PSInterpreter.cpp:
+ added bitmap format 'none' to disable image processing
+
+2020-03-07 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/PSInterpreter.cpp, src/PSInterpreter.hpp, src/PsSpecialHandler.cpp,
+ src/PsSpecialHandler.hpp, src/psdefs.cpp:
+ added image support for various JPEG and PNG variants
+
+ * doc/dvisvgm.txt.in, src/CommandLine.hpp, src/dvisvgm.cpp,
+ src/options.xml:
+ added command-line option --bitmap-format
+
+ * doc/generate-dvisvgm-sty.xsl:
+ manual page: reduce distance of table rows
+
+2020-03-05 Martin Gieseking <martin.gieseking@uos.de>
+
+ * libs/xxHash/xxh3.h, libs/xxHash/xxhash.c, libs/xxHash/xxhash.h,
+ tests/HashFunctionTest.cpp:
+ updated xxhash to version 0.7.3
+
+2020-03-02 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/GlyphTracerMessages.hpp:
+ suppress tracer messages if no font info available
+
+ * src/MetafontWrapper.cpp, src/MetafontWrapper.hpp:
+ added fallback method to get GF resolution applied by Metafont
+
+2020-02-29 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/PsSpecialHandler.cpp:
+ fixed potential segfault
+
+ * src/Bezier.cpp, src/BoundingBox.cpp, src/Font.cpp, src/FontWriter.cpp,
+ src/Matrix.cpp, src/TensorProductPatch.cpp, src/TriangularPatch.cpp:
+ replaced fabs() with std::abs()
+
+2020-02-26 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/XMLNode.cpp:
+ fixed copy constructor of XMLElement
+
+ * src/PSInterpreter.cpp, src/PSInterpreter.hpp, src/PsSpecialHandler.cpp,
+ src/PsSpecialHandler.hpp, src/psdefs.cpp, tests/PSInterpreterTest.cpp:
+ fixed broken handling of PS tiling patterns
+
+ * src/PSPattern.cpp:
+ simplified loop expression
+
+ * src/XMLNode.cpp, src/optimizer/RedundantElementRemover.cpp:
+ don't remove clipPath elements if referenced in patterns
+
+ * src/PsSpecialHandler.cpp:
+ don't add clip path to path elements in pattern definitions
+
+2020-02-25 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/psdefs.cpp:
+ store image counter in globaldict
+
+ * src/PsSpecialHandler.cpp, src/PsSpecialHandler.hpp, src/XMLNode.cpp,
+ src/XMLNode.hpp, src/dvisvgm.cpp:
+ don't keep encoded image data in memory
+To prevent memory issues, add
+ the base64-encoded image data when serializing
+the XML tree.
+
+ * src/PsSpecialHandler.cpp:
+ prevent access to invalid vector component
+
+ * src/XMLNode.cpp, src/XMLNode.hpp:
+ prevent deep destructor recursion of XML nodes
+
+ * src/psdefs.cpp:
+ PS handler: prevent write access to protected pattern dictionary
+
+2020-02-21 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/psdefs.cpp:
+ don't access DataSource for shading types < 4
+
+2020-02-20 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/PsSpecialHandler.cpp:
+ apply clip path to image if present
+
+ * src/optimizer/TransformSimplifier.cpp:
+ TransformSimplifier: prevent width/height from getting negative
+
+ * src/Font.cpp, src/GraphicsPath.hpp, src/PsSpecialHandler.cpp,
+ tests/GraphicsPathTest.cpp:
+ changed signature of GraphicsPath::computeBBox()
+
+2020-02-18 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/psdefs.cpp:
+ image operator: reset output device correctly
+
+2020-02-17 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/PsSpecialHandler.cpp, src/psdefs.cpp:
+ stop image processing if PNG devices are unavailable
+Handling of PS
+ operator 'image' relies on the GS output devices 'png16m' and
+'pnggray'
+ (depending on the current color space). If they are unavailable,
+ the
+image processing is stopped now instead of leaving GS with an
+ internal error.
+
+ * src/PsSpecialHandler.cpp:
+ adapt bounding box to enclose embedded bitmaps
+
+2020-02-16 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/EPSToSVG.hpp, src/ImageToSVG.cpp, src/ImageToSVG.hpp,
+ src/PDFToSVG.hpp:
+ fixed getCurrentPageNumber() for EPS and PDF files
+
+ * src/FilePath.cpp, src/FilePath.hpp, tests/FilePathTest.cpp:
+ FilePath::suffix("") now removes the suffix if present
+
+ * src/PsSpecialHandler.cpp, src/PsSpecialHandler.hpp, src/psdefs.cpp:
+ sync location and base name of temporary PNG files with SVG file
+
+ * src/PsSpecialHandler.cpp, src/PsSpecialHandler.hpp, src/dvisvgm.cpp,
+ src/psdefs.cpp:
+ remove temporary PNG files if --keep is not given
+
+2020-02-15 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/psdefs.cpp:
+ added evaluation of PS Level 1 image operators
+
+2020-02-14 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/Matrix.cpp, tests/MatrixTest.cpp:
+ fixed row/column issue in Matrix::invert()
+
+ * src/FontWriter.cpp, src/utility.hpp:
+ added wrapper function for util::base64_copy()
+
+ * src/PSInterpreter.cpp, src/PSInterpreter.hpp, src/PsSpecialHandler.cpp,
+ src/PsSpecialHandler.hpp, src/psdefs.cpp, tests/PSInterpreterTest.cpp:
+ added processing of PS image operator
+
+2020-02-12 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/dvisvgm.txt.in:
+ manpage: added info on default values listed by --help
+
+2020-01-17 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/GraphicsPath.hpp:
+ arcto: use template type for rx and ry instead of double
+
+2020-01-14 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/PageSize.cpp:
+ replaced floor(x+0.5) with round(x)
+
+2020-01-06 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/Ghostscript.cpp:
+ added check for libgs.dylib.N (Mac only)
+
+2020-01-02 Martin Gieseking <martin.gieseking@uos.de>
+
+ * Makefile.am, README, README.md, configure.ac, doc/Makefile.am,
+ doc/conf-dblatex-man.xsl, doc/conf-dblatex-pdf.xsl, doc/db2html.xsl,
+ doc/dvisvgm.txt.in, doc/tweak-db-article.xsl, doc/tweak-db-refentry.xsl,
+ doc/tweak-dblatex-pdf.xsl, libs/Makefile.am,
+ libs/ff-woff/fontforge/tmpfile2.cpp, src/AGLTable.hpp,
+ src/BasicDVIReader.cpp, src/BasicDVIReader.hpp, src/Bezier.cpp,
+ src/Bezier.hpp, src/BgColorSpecialHandler.cpp,
+ src/BgColorSpecialHandler.hpp, src/Bitmap.cpp, src/Bitmap.hpp,
+ src/BoundingBox.cpp, src/BoundingBox.hpp, src/CLCommandLine.cpp,
+ src/CLCommandLine.hpp, src/CLOption.hpp, src/CMap.cpp, src/CMap.hpp,
+ src/CMapManager.cpp, src/CMapManager.hpp, src/CMapReader.cpp,
+ src/CMapReader.hpp, src/Calculator.cpp, src/Calculator.hpp,
+ src/CharMapID.cpp, src/CharMapID.hpp, src/Character.hpp, src/Color.cpp,
+ src/Color.hpp, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.hpp,
+ src/CommandLine.hpp, src/DLLoader.cpp, src/DLLoader.hpp,
+ src/DVIActions.hpp, src/DVIReader.cpp, src/DVIReader.hpp,
+ src/DVIToSVG.cpp, src/DVIToSVG.hpp, src/DVIToSVGActions.cpp,
+ src/DVIToSVGActions.hpp, src/Directory.cpp, src/Directory.hpp,
+ src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.hpp,
+ src/EPSFile.cpp, src/EPSFile.hpp, src/EPSToSVG.hpp,
+ src/EllipticalArc.cpp, src/EllipticalArc.hpp, src/EmSpecialHandler.cpp,
+ src/EmSpecialHandler.hpp, src/EncFile.cpp, src/EncFile.hpp,
+ src/FileFinder.cpp, src/FileFinder.hpp, src/FilePath.cpp,
+ src/FilePath.hpp, src/FileSystem.cpp, src/FileSystem.hpp,
+ src/FixWord.hpp, src/Font.cpp, src/Font.hpp, src/FontCache.cpp,
+ src/FontCache.hpp, src/FontEncoding.cpp, src/FontEncoding.hpp,
+ src/FontEngine.cpp, src/FontEngine.hpp, src/FontManager.cpp,
+ src/FontManager.hpp, src/FontMap.cpp, src/FontMap.hpp,
+ src/FontMetrics.cpp, src/FontMetrics.hpp, src/FontStyle.hpp,
+ src/FontWriter.cpp, src/FontWriter.hpp, src/GFGlyphTracer.cpp,
+ src/GFGlyphTracer.hpp, src/GFReader.cpp, src/GFReader.hpp,
+ src/GFTracer.cpp, src/GFTracer.hpp, src/Ghostscript.cpp,
+ src/Ghostscript.hpp, src/Glyph.hpp, src/GlyphTracerMessages.hpp,
+ src/GraphicsPath.hpp, src/HashFunction.cpp, src/HashFunction.hpp,
+ src/HtmlSpecialHandler.cpp, src/HtmlSpecialHandler.hpp,
+ src/HyperlinkManager.cpp, src/HyperlinkManager.hpp, src/ImageToSVG.cpp,
+ src/ImageToSVG.hpp, src/InputBuffer.cpp, src/InputBuffer.hpp,
+ src/InputReader.cpp, src/InputReader.hpp, src/JFM.cpp, src/JFM.hpp,
+ src/Length.cpp, src/Length.hpp, src/MD5HashFunction.hpp, src/Makefile.am,
+ src/MapLine.cpp, src/MapLine.hpp, src/Matrix.cpp, src/Matrix.hpp,
+ src/Message.cpp, src/Message.hpp, src/MessageException.hpp,
+ src/MetafontWrapper.cpp, src/MetafontWrapper.hpp, src/MiKTeXCom.cpp,
+ src/MiKTeXCom.hpp, src/NoPsSpecialHandler.cpp,
+ src/NoPsSpecialHandler.hpp, src/NumericRanges.hpp, src/PDFParser.cpp,
+ src/PDFParser.hpp, src/PDFToSVG.hpp, src/PSFilter.hpp,
+ src/PSInterpreter.cpp, src/PSInterpreter.hpp, src/PSPattern.cpp,
+ src/PSPattern.hpp, src/PSPreviewFilter.cpp, src/PSPreviewFilter.hpp,
+ src/PageRanges.cpp, src/PageRanges.hpp, src/PageSize.cpp,
+ src/PageSize.hpp, src/Pair.hpp, src/PapersizeSpecialHandler.cpp,
+ src/PapersizeSpecialHandler.hpp, src/PathClipper.cpp,
+ src/PathClipper.hpp, src/PdfSpecialHandler.cpp,
+ src/PdfSpecialHandler.hpp, src/PreScanDVIReader.cpp,
+ src/PreScanDVIReader.hpp, src/Process.cpp, src/Process.hpp,
+ src/PsSpecialHandler.cpp, src/PsSpecialHandler.hpp, src/RangeMap.cpp,
+ src/RangeMap.hpp, src/SVGCharHandler.cpp, src/SVGCharHandler.hpp,
+ src/SVGCharHandlerFactory.cpp, src/SVGCharHandlerFactory.hpp,
+ src/SVGCharPathHandler.cpp, src/SVGCharPathHandler.hpp,
+ src/SVGCharTspanTextHandler.cpp, src/SVGCharTspanTextHandler.hpp,
+ src/SVGOutput.cpp, src/SVGOutput.hpp, src/SVGSingleCharTextHandler.cpp,
+ src/SVGSingleCharTextHandler.hpp, src/SVGTree.cpp, src/SVGTree.hpp,
+ src/ShadingPatch.cpp, src/ShadingPatch.hpp, src/SignalHandler.cpp,
+ src/SignalHandler.hpp, src/SourceInput.cpp, src/SourceInput.hpp,
+ src/SpecialActions.hpp, src/SpecialHandler.hpp, src/SpecialManager.cpp,
+ src/SpecialManager.hpp, src/StreamReader.cpp, src/StreamReader.hpp,
+ src/StreamWriter.cpp, src/StreamWriter.hpp, src/Subfont.cpp,
+ src/Subfont.hpp, src/System.cpp, src/System.hpp, src/TFM.cpp,
+ src/TFM.hpp, src/TTFAutohint.cpp, src/TTFAutohint.hpp,
+ src/TensorProductPatch.cpp, src/TensorProductPatch.hpp, src/Terminal.cpp,
+ src/Terminal.hpp, src/ToUnicodeMap.cpp, src/ToUnicodeMap.hpp,
+ src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.hpp,
+ src/TriangularPatch.cpp, src/TriangularPatch.hpp, src/TrueTypeFont.cpp,
+ src/TrueTypeFont.hpp, src/Unicode.cpp, src/Unicode.hpp,
+ src/VFActions.hpp, src/VFReader.cpp, src/VFReader.hpp,
+ src/VectorIterator.hpp, src/VectorStream.hpp, src/XMLDocument.cpp,
+ src/XMLDocument.hpp, src/XMLNode.cpp, src/XMLNode.hpp, src/XMLString.cpp,
+ src/XMLString.hpp, src/XXHashFunction.hpp, src/ZLibOutputStream.hpp,
+ src/dvisvgm.cpp, src/ffwrapper.c, src/ffwrapper.h, src/macros.hpp,
+ src/optimizer/AttributeExtractor.cpp,
+ src/optimizer/AttributeExtractor.hpp, src/optimizer/DependencyGraph.hpp,
+ src/optimizer/GroupCollapser.cpp, src/optimizer/GroupCollapser.hpp,
+ src/optimizer/OptimizerModule.hpp,
+ src/optimizer/RedundantElementRemover.cpp,
+ src/optimizer/RedundantElementRemover.hpp,
+ src/optimizer/SVGOptimizer.cpp, src/optimizer/SVGOptimizer.hpp,
+ src/optimizer/TextSimplifier.cpp, src/optimizer/TextSimplifier.hpp,
+ src/optimizer/TransformSimplifier.cpp,
+ src/optimizer/TransformSimplifier.hpp, src/optimizer/WSNodeRemover.cpp,
+ src/optimizer/WSNodeRemover.hpp, src/options.dtd, src/options.xml,
+ src/psdefs.cpp, src/utility.cpp, src/utility.hpp, src/version.hpp,
+ src/version.hpp.in, src/windows.hpp, tests/BezierTest.cpp,
+ tests/BitmapTest.cpp, tests/BoundingBoxTest.cpp,
+ tests/CMapManagerTest.cpp, tests/CMapReaderTest.cpp, tests/CMapTest.cpp,
+ tests/CalculatorTest.cpp, tests/ColorSpecialTest.cpp,
+ tests/ColorTest.cpp, tests/CommandLineTest.cpp, tests/DVIReaderTest.cpp,
+ tests/DependencyGraphTest.cpp, tests/DirectoryTest.cpp,
+ tests/DvisvgmSpecialTest.cpp, tests/EllipticalArcTest.cpp,
+ tests/EmSpecialTest.cpp, tests/FileFinderTest.cpp,
+ tests/FilePathTest.cpp, tests/FileSystemTest.cpp,
+ tests/FontCacheTest.cpp, tests/FontManagerTest.cpp,
+ tests/FontMapTest.cpp, tests/GFGlyphTracerTest.cpp,
+ tests/GFReaderTest.cpp, tests/GhostscriptTest.cpp,
+ tests/GraphicsPathTest.cpp, tests/HashFunctionTest.cpp,
+ tests/JFMReaderTest.cpp, tests/LengthTest.cpp, tests/Makefile.am,
+ tests/MapLineTest.cpp, tests/MatrixTest.cpp,
+ tests/MessageExceptionTest.cpp, tests/PDFParserTest.cpp,
+ tests/PSInterpreterTest.cpp, tests/PageRagesTest.cpp,
+ tests/PageSizeTest.cpp, tests/PairTest.cpp,
+ tests/PapersizeSpecialTest.cpp, tests/RangeMapTest.cpp,
+ tests/SVGOutputTest.cpp, tests/ShadingPatchTest.cpp,
+ tests/SpecialManagerTest.cpp, tests/SplittedCharInputBufferTest.cpp,
+ tests/StreamInputBufferTest.cpp, tests/StreamReaderTest.cpp,
+ tests/StreamWriterTest.cpp, tests/StringMatcherTest.cpp,
+ tests/SubfontTest.cpp, tests/TFMReaderTest.cpp,
+ tests/TensorProductPatchTest.cpp, tests/ToUnicodeMapTest.cpp,
+ tests/TpicSpecialTest.cpp, tests/TriangularPatchTest.cpp,
+ tests/UnicodeTest.cpp, tests/UtilityTest.cpp,
+ tests/VectorIteratorTest.cpp, tests/VectorStreamTest.cpp,
+ tests/XMLNodeTest.cpp, tests/XMLStringTest.cpp, tests/check-conv,
+ tests/create-makefile, tests/data/Makefile.am, tests/genhashcheck.py,
+ tests/normalize.xsl, tests/testmain.cpp:
+ updated year in copyright statements to 2020
+
+2019-12-23 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/dvisvgm.txt.in:
+ few additions to the manual page
+
2019-12-07 Martin Gieseking <martin.gieseking@uos.de>
* NEWS:
diff --git a/dviware/dvisvgm/Makefile.am b/dviware/dvisvgm/Makefile.am
index 2bb31ddd4d..7bb20a01c7 100644
--- a/dviware/dvisvgm/Makefile.am
+++ b/dviware/dvisvgm/Makefile.am
@@ -1,5 +1,5 @@
## This file is part of dvisvgm
-## Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
diff --git a/dviware/dvisvgm/NEWS b/dviware/dvisvgm/NEWS
index 3efe71b2d3..0f58739ca2 100644
--- a/dviware/dvisvgm/NEWS
+++ b/dviware/dvisvgm/NEWS
@@ -1,3 +1,23 @@
+dvisvgm-2.9 (2020-03-13)
+- added processing of PS operators 'image' and 'colorimage' to embed bitmaps
+ present in PS/PDF data into the generated SVG
+- added command-line option --bitmap-format to set the format used to embed
+ bitmaps present in EPS/PDF files
+- added fallback method to retrieve the resolution of GF files if stdout
+ of the Metafont subprocess can't be read through a pipe (GH #129)
+- fixed broken conversion of PS tiling patterns
+- fixed the functionality of PS operators 'xshow', 'yshow', and 'xyshow' for
+ multibyte characters
+- fixed a PS error triggered by unsupported shading types < 4
+- prevent negative 'height' and 'width' attributes created by optimizer
+ module 'simplify-transform'
+- fixed potential segfault caused by deep recursion in huge SVG trees
+- look for Ghostscript library name 'libgs.dylib.N' additionally to
+ 'libgs.N.dylib' (Mac only)
+- ensure that 'make install' installs the bundled manual page if it can't be
+ rebuilt due to missing build tools
+- updated bundled xxHash library to version 0.7.3
+
dvisvgm-2.8.2 (2019-12-07)
- if available, call 'mf-nowin' instead of 'mf' to process Metafont files
(GH #121)
diff --git a/dviware/dvisvgm/README b/dviware/dvisvgm/README
index dd9513702e..f880af15f8 100644
--- a/dviware/dvisvgm/README
+++ b/dviware/dvisvgm/README
@@ -130,7 +130,7 @@ ADDITIONAL INFORMATION
COPYRIGHT
- Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+ Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/dviware/dvisvgm/configure b/dviware/dvisvgm/configure
index 690013405a..c1eb843556 100755
--- a/dviware/dvisvgm/configure
+++ b/dviware/dvisvgm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisvgm 2.8.2.
+# Generated by GNU Autoconf 2.69 for dvisvgm 2.9.
#
# Report bugs to <martin.gieseking@uos.de>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisvgm'
PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='2.8.2'
-PACKAGE_STRING='dvisvgm 2.8.2'
+PACKAGE_VERSION='2.9'
+PACKAGE_STRING='dvisvgm 2.9'
PACKAGE_BUGREPORT='martin.gieseking@uos.de'
PACKAGE_URL=''
@@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dvisvgm 2.8.2 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 2.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1477,7 +1477,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisvgm 2.8.2:";;
+ short | recursive ) echo "Configuration of dvisvgm 2.9:";;
esac
cat <<\_ACEOF
@@ -1625,7 +1625,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisvgm configure 2.8.2
+dvisvgm configure 2.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2169,7 +2169,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvisvgm $as_me 2.8.2, which was
+It was created by dvisvgm $as_me 2.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DATE="December 2019"
+DATE="March 2020"
ac_config_headers="$ac_config_headers config.h"
@@ -3157,7 +3157,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisvgm'
- VERSION='2.8.2'
+ VERSION='2.9'
cat >>confdefs.h <<_ACEOF
@@ -20138,7 +20138,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvisvgm $as_me 2.8.2, which was
+This file was extended by dvisvgm $as_me 2.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20204,7 +20204,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvisvgm config.status 2.8.2
+dvisvgm config.status 2.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/dviware/dvisvgm/configure.ac b/dviware/dvisvgm/configure.ac
index 3572e2d106..532bc08795 100644
--- a/dviware/dvisvgm/configure.ac
+++ b/dviware/dvisvgm/configure.ac
@@ -1,11 +1,11 @@
# This file is part of dvisvgm
-# Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+# Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
#
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[2.8.2],[martin.gieseking@uos.de])
-DATE="December 2019"
+AC_INIT([dvisvgm],[2.9],[martin.gieseking@uos.de])
+DATE="March 2020"
AC_CONFIG_SRCDIR(src)
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/dviware/dvisvgm/doc/Makefile.am b/dviware/dvisvgm/doc/Makefile.am
index a2bc63bd2e..fdbc24e1ce 100644
--- a/dviware/dvisvgm/doc/Makefile.am
+++ b/dviware/dvisvgm/doc/Makefile.am
@@ -1,14 +1,13 @@
## This file is part of dvisvgm
-## Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
# Don't try to install the manpage file if it can't be built due to missing utilities.
# However, the distribution tarball should always contain a recent manpage. We ensure
# this by adding a dist-hook rule below.
-if BUILD_MANPAGE
+
man_MANS = dvisvgm.1
-endif
EXTRA_DIST = $(man_MANS) \
conf-dblatex-man.xsl \
@@ -18,6 +17,8 @@ EXTRA_DIST = $(man_MANS) \
tweak-dblatex-pdf.xsl \
tweak-db-refentry.xsl
+if BUILD_MANPAGE
+
CONF_DBLATEX_MAN = $(dvisvgm_srcdir)/doc/conf-dblatex-man.xsl
CONF_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/conf-dblatex-pdf.xsl
TWEAK_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/tweak-dblatex-pdf.xsl
@@ -47,6 +48,9 @@ dvisvgm.dvi: dvisvgm.1
dvisvgm.html: dvisvgm-man.xml db2html.xsl
xsltproc -o $@ db2html.xsl $<
+dvisvgm.md: dvisvgm-man.xml db2md.xsl
+ xsltproc -o $@ db2md.xsl $<
+
dvisvgm.epub: dvisvgm-article.xml
a2x -darticle -fepub -L --icons --icons-dir=. $<
mv $(basename $<).epub $@
@@ -77,21 +81,24 @@ dvisvgm.txt: dvisvgm.txt.in ../configure.ac
epub: dvisvgm.epub
html: dvisvgm.html
man: dvisvgm.1
+md: dvisvgm.md
pdf: dvisvgm.pdf
+endif
+
clean:
- rm -f dvisvgm.pdf dvisvgm.html dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub
+ rm -f dvisvgm.pdf dvisvgm.html dvisvgm.md dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub
distclean-local:
- rm -f dvisvgm.pdf dvisvgm.html dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub dvisvgm.1
+ rm -f dvisvgm.pdf dvisvgm.html dvisvgm.md dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub dvisvgm.1
+if !BUILD_MANPAGE
# Ensure that distribution tarballs always contain a recent manpage, i.e.
# let "make dist" and "make distcheck" fail if dvisvgm.1 can't be built.
dist-hook:
- @if test ! -f $(dvisvgm_srcdir)/doc/dvisvgm.1; then \
- echo "----------------------------------------------------------------"; \
- echo "manpage file dvisvgm.1 could not be built because one or more of"; \
- echo "the following utilities are missing: asciidoc, xmlto, xsltproc "; \
- echo "----------------------------------------------------------------"; \
- false; \
- fi
+ @echo "----------------------------------------------------------------"; \
+ echo "manpage file dvisvgm.1 could not be built because one or more of"; \
+ echo "the following utilities are missing: asciidoc, xmlto, xsltproc "; \
+ echo "----------------------------------------------------------------"; \
+ false;
+endif
diff --git a/dviware/dvisvgm/doc/Makefile.in b/dviware/dvisvgm/doc/Makefile.in
index b5bf93ce6b..35bceae1d1 100644
--- a/dviware/dvisvgm/doc/Makefile.in
+++ b/dviware/dvisvgm/doc/Makefile.in
@@ -13,6 +13,10 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# Don't try to install the manpage file if it can't be built due to missing utilities.
+# However, the distribution tarball should always contain a recent manpage. We ensure
+# this by adding a dist-hook rule below.
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -314,11 +318,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Don't try to install the manpage file if it can't be built due to missing utilities.
-# However, the distribution tarball should always contain a recent manpage. We ensure
-# this by adding a dist-hook rule below.
-@BUILD_MANPAGE_TRUE@man_MANS = dvisvgm.1
+man_MANS = dvisvgm.1
EXTRA_DIST = $(man_MANS) \
conf-dblatex-man.xsl \
conf-dblatex-pdf.xsl \
@@ -327,13 +327,13 @@ EXTRA_DIST = $(man_MANS) \
tweak-dblatex-pdf.xsl \
tweak-db-refentry.xsl
-CONF_DBLATEX_MAN = $(dvisvgm_srcdir)/doc/conf-dblatex-man.xsl
-CONF_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/conf-dblatex-pdf.xsl
-TWEAK_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/tweak-dblatex-pdf.xsl
-TWEAK_DB_ARTICLE = $(dvisvgm_srcdir)/doc/tweak-db-article.xsl
-TWEAK_DB_REFENTRY = $(dvisvgm_srcdir)/doc/tweak-db-refentry.xsl
-GEN_DBLATEX_STY = $(dvisvgm_srcdir)/doc/generate-dvisvgm-sty.xsl
-DB_VARS = man.endnotes.list.enabled=0 man.endnotes.are.numbered=0 man.authors.section.enabled=0
+@BUILD_MANPAGE_TRUE@CONF_DBLATEX_MAN = $(dvisvgm_srcdir)/doc/conf-dblatex-man.xsl
+@BUILD_MANPAGE_TRUE@CONF_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/conf-dblatex-pdf.xsl
+@BUILD_MANPAGE_TRUE@TWEAK_DBLATEX_PDF = $(dvisvgm_srcdir)/doc/tweak-dblatex-pdf.xsl
+@BUILD_MANPAGE_TRUE@TWEAK_DB_ARTICLE = $(dvisvgm_srcdir)/doc/tweak-db-article.xsl
+@BUILD_MANPAGE_TRUE@TWEAK_DB_REFENTRY = $(dvisvgm_srcdir)/doc/tweak-db-refentry.xsl
+@BUILD_MANPAGE_TRUE@GEN_DBLATEX_STY = $(dvisvgm_srcdir)/doc/generate-dvisvgm-sty.xsl
+@BUILD_MANPAGE_TRUE@DB_VARS = man.endnotes.list.enabled=0 man.endnotes.are.numbered=0 man.authors.section.enabled=0
all: all-am
.SUFFIXES:
@@ -421,6 +421,7 @@ ctags CTAGS:
cscope cscopelist:
+@BUILD_MANPAGE_TRUE@dist-hook:
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -505,6 +506,8 @@ dvi: dvi-am
dvi-am:
+@BUILD_MANPAGE_FALSE@html: html-am
+
html-am:
info: info-am
@@ -547,6 +550,8 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+@BUILD_MANPAGE_FALSE@pdf: pdf-am
+
pdf-am:
ps: ps-am
@@ -575,74 +580,76 @@ uninstall-man: uninstall-man1
.PRECIOUS: Makefile
-dvisvgm.1: dvisvgm-man.xml $(CONF_DBLATEX_MAN)
- xmlto -m $(CONF_DBLATEX_MAN) $(addprefix --stringparam , $(DB_VARS)) man $<
+@BUILD_MANPAGE_TRUE@dvisvgm.1: dvisvgm-man.xml $(CONF_DBLATEX_MAN)
+@BUILD_MANPAGE_TRUE@ xmlto -m $(CONF_DBLATEX_MAN) $(addprefix --stringparam , $(DB_VARS)) man $<
-dvisvgm.pdf: dvisvgm-man.xml dvisvgm.sty $(CONF_DBLATEX_PDF) $(TWEAK_DBLATEX_PDF)
- mv $< $<.tmp
- xsltproc -o $< $(TWEAK_DBLATEX_PDF) $<.tmp
- dblatex -bxetex --texstyle=./dvisvgm.sty -p $(CONF_DBLATEX_PDF) $<
- mv $<.tmp $<
- mv $(basename $<).pdf $@
+@BUILD_MANPAGE_TRUE@dvisvgm.pdf: dvisvgm-man.xml dvisvgm.sty $(CONF_DBLATEX_PDF) $(TWEAK_DBLATEX_PDF)
+@BUILD_MANPAGE_TRUE@ mv $< $<.tmp
+@BUILD_MANPAGE_TRUE@ xsltproc -o $< $(TWEAK_DBLATEX_PDF) $<.tmp
+@BUILD_MANPAGE_TRUE@ dblatex -bxetex --texstyle=./dvisvgm.sty -p $(CONF_DBLATEX_PDF) $<
+@BUILD_MANPAGE_TRUE@ mv $<.tmp $<
+@BUILD_MANPAGE_TRUE@ mv $(basename $<).pdf $@
-dvi-pdf: dvisvgm.dvi
- dvipdfm $<
- rm -f $<
+@BUILD_MANPAGE_TRUE@dvi-pdf: dvisvgm.dvi
+@BUILD_MANPAGE_TRUE@ dvipdfm $<
+@BUILD_MANPAGE_TRUE@ rm -f $<
-dvisvgm.dvi: dvisvgm.1
- groff -Tdvi -mandoc ./$< >$@
+@BUILD_MANPAGE_TRUE@dvisvgm.dvi: dvisvgm.1
+@BUILD_MANPAGE_TRUE@ groff -Tdvi -mandoc ./$< >$@
-dvisvgm.html: dvisvgm-man.xml db2html.xsl
- xsltproc -o $@ db2html.xsl $<
+@BUILD_MANPAGE_TRUE@dvisvgm.html: dvisvgm-man.xml db2html.xsl
+@BUILD_MANPAGE_TRUE@ xsltproc -o $@ db2html.xsl $<
-dvisvgm.epub: dvisvgm-article.xml
- a2x -darticle -fepub -L --icons --icons-dir=. $<
- mv $(basename $<).epub $@
+@BUILD_MANPAGE_TRUE@dvisvgm.md: dvisvgm-man.xml db2md.xsl
+@BUILD_MANPAGE_TRUE@ xsltproc -o $@ db2md.xsl $<
-.SECONDARY: dvisvgm-article.xml dvisvgm-man.xml dvisvgm.sty
+@BUILD_MANPAGE_TRUE@dvisvgm.epub: dvisvgm-article.xml
+@BUILD_MANPAGE_TRUE@ a2x -darticle -fepub -L --icons --icons-dir=. $<
+@BUILD_MANPAGE_TRUE@ mv $(basename $<).epub $@
-dvisvgm-man.xml: dvisvgm.txt $(TWEAK_DB_REFENTRY)
- asciidoc -a icons -a 'iconsdir=.' -a badges -a 'revnumber=@VERSION@' --unsafe -bdocbook -dmanpage -o $@.tmp $<
- xsltproc -o $@ $(TWEAK_DB_REFENTRY) $@.tmp
- rm $@.tmp
+@BUILD_MANPAGE_TRUE@.SECONDARY: dvisvgm-article.xml dvisvgm-man.xml dvisvgm.sty
-dvisvgm-article.xml: dvisvgm.txt $(TWEAK_DB_ARTICLE)
- asciidoc -a icons -a 'iconsdir=.' -a badges -a 'revnumber=@VERSION@' --unsafe -bdocbook -darticle -o $@.tmp $<
- xsltproc -o $@ $(TWEAK_DB_ARTICLE) $@.tmp
- rm $@.tmp
- sed -i "s/{VERSION}/@VERSION@/" $@
+@BUILD_MANPAGE_TRUE@dvisvgm-man.xml: dvisvgm.txt $(TWEAK_DB_REFENTRY)
+@BUILD_MANPAGE_TRUE@ asciidoc -a icons -a 'iconsdir=.' -a badges -a 'revnumber=@VERSION@' --unsafe -bdocbook -dmanpage -o $@.tmp $<
+@BUILD_MANPAGE_TRUE@ xsltproc -o $@ $(TWEAK_DB_REFENTRY) $@.tmp
+@BUILD_MANPAGE_TRUE@ rm $@.tmp
-dvisvgm.sty: dvisvgm-man.xml $(GEN_DBLATEX_STY)
- xsltproc -o dvisvgm.sty $(GEN_DBLATEX_STY) $<
+@BUILD_MANPAGE_TRUE@dvisvgm-article.xml: dvisvgm.txt $(TWEAK_DB_ARTICLE)
+@BUILD_MANPAGE_TRUE@ asciidoc -a icons -a 'iconsdir=.' -a badges -a 'revnumber=@VERSION@' --unsafe -bdocbook -darticle -o $@.tmp $<
+@BUILD_MANPAGE_TRUE@ xsltproc -o $@ $(TWEAK_DB_ARTICLE) $@.tmp
+@BUILD_MANPAGE_TRUE@ rm $@.tmp
+@BUILD_MANPAGE_TRUE@ sed -i "s/{VERSION}/@VERSION@/" $@
-dvisvgm.txt: dvisvgm.txt.in ../configure.ac
- sed -e 's/@VERSION[@]/@VERSION@/g' -e 's/@PACKAGE_BUGREPORT[@]/@PACKAGE_BUGREPORT@/g' $< >$@
- if [ $< -nt ../configure.ac ]; \
- then touch -r $< $@; \
- else touch -r ../configure.ac $@; \
- fi
+@BUILD_MANPAGE_TRUE@dvisvgm.sty: dvisvgm-man.xml $(GEN_DBLATEX_STY)
+@BUILD_MANPAGE_TRUE@ xsltproc -o dvisvgm.sty $(GEN_DBLATEX_STY) $<
+
+@BUILD_MANPAGE_TRUE@dvisvgm.txt: dvisvgm.txt.in ../configure.ac
+@BUILD_MANPAGE_TRUE@ sed -e 's/@VERSION[@]/@VERSION@/g' -e 's/@PACKAGE_BUGREPORT[@]/@PACKAGE_BUGREPORT@/g' $< >$@
+@BUILD_MANPAGE_TRUE@ if [ $< -nt ../configure.ac ]; \
+@BUILD_MANPAGE_TRUE@ then touch -r $< $@; \
+@BUILD_MANPAGE_TRUE@ else touch -r ../configure.ac $@; \
+@BUILD_MANPAGE_TRUE@ fi
-epub: dvisvgm.epub
-html: dvisvgm.html
-man: dvisvgm.1
-pdf: dvisvgm.pdf
+@BUILD_MANPAGE_TRUE@epub: dvisvgm.epub
+@BUILD_MANPAGE_TRUE@html: dvisvgm.html
+@BUILD_MANPAGE_TRUE@man: dvisvgm.1
+@BUILD_MANPAGE_TRUE@md: dvisvgm.md
+@BUILD_MANPAGE_TRUE@pdf: dvisvgm.pdf
clean:
- rm -f dvisvgm.pdf dvisvgm.html dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub
+ rm -f dvisvgm.pdf dvisvgm.html dvisvgm.md dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub
distclean-local:
- rm -f dvisvgm.pdf dvisvgm.html dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub dvisvgm.1
+ rm -f dvisvgm.pdf dvisvgm.html dvisvgm.md dvisvgm-man.xml dvisvgm-article.xml dvisvgm.txt dvisvgm.sty dvisvgm.dvi dvisvgm.epub dvisvgm.1
# Ensure that distribution tarballs always contain a recent manpage, i.e.
# let "make dist" and "make distcheck" fail if dvisvgm.1 can't be built.
-dist-hook:
- @if test ! -f $(dvisvgm_srcdir)/doc/dvisvgm.1; then \
- echo "----------------------------------------------------------------"; \
- echo "manpage file dvisvgm.1 could not be built because one or more of"; \
- echo "the following utilities are missing: asciidoc, xmlto, xsltproc "; \
- echo "----------------------------------------------------------------"; \
- false; \
- fi
+@BUILD_MANPAGE_FALSE@dist-hook:
+@BUILD_MANPAGE_FALSE@ @echo "----------------------------------------------------------------"; \
+@BUILD_MANPAGE_FALSE@ echo "manpage file dvisvgm.1 could not be built because one or more of"; \
+@BUILD_MANPAGE_FALSE@ echo "the following utilities are missing: asciidoc, xmlto, xsltproc "; \
+@BUILD_MANPAGE_FALSE@ echo "----------------------------------------------------------------"; \
+@BUILD_MANPAGE_FALSE@ false;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dviware/dvisvgm/doc/conf-dblatex-man.xsl b/dviware/dvisvgm/doc/conf-dblatex-man.xsl
index 9802cdcdcf..2e52f9e96f 100644
--- a/dviware/dvisvgm/doc/conf-dblatex-man.xsl
+++ b/dviware/dvisvgm/doc/conf-dblatex-man.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This file is part of dvisvgm -->
-<!-- Copyright (C) 2015-2019 Martin Gieseking <martin.gieseking@uos.de> -->
+<!-- Copyright (C) 2015-2020 Martin Gieseking <martin.gieseking@uos.de> -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- output monospaced text in bold -->
<xsl:template match="literal">
diff --git a/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl b/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl
index 5b9b8c8194..321bc0f4fb 100644
--- a/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl
+++ b/dviware/dvisvgm/doc/conf-dblatex-pdf.xsl
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding="iso-8859-1"?>
<!-- This file is part of dvisvgm -->
-<!-- Copyright (C) 2015-2019 Martin Gieseking <martin.gieseking@uos.de> -->
+<!-- Copyright (C) 2015-2020 Martin Gieseking <martin.gieseking@uos.de> -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="xetex.font">
<xsl:text>\setmainfont{Source Sans Pro}&#10;</xsl:text>
diff --git a/dviware/dvisvgm/doc/dvisvgm.1 b/dviware/dvisvgm/doc/dvisvgm.1
index 5c7cb95e5a..43fd7e1126 100644
--- a/dviware/dvisvgm/doc/dvisvgm.1
+++ b/dviware/dvisvgm/doc/dvisvgm.1
@@ -2,12 +2,12 @@
.\" Title: dvisvgm
.\" Author: Martin Gieseking <martin.gieseking@uos.de>
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2019-11-12
+.\" Date: 2020-03-08
.\" Manual: dvisvgm Manual
-.\" Source: dvisvgm 2.8.2
+.\" Source: dvisvgm 2.9
.\" Language: English
.\"
-.TH "DVISVGM" "1" "2019\-11\-12" "dvisvgm 2\&.8\&.2" "dvisvgm Manual"
+.TH "DVISVGM" "1" "2020\-03\-08" "dvisvgm 2\&.9" "dvisvgm Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -46,10 +46,12 @@ SVG is a vector\-based graphics format and therefore dvisvgm tries to convert th
.sp
However, TeX\(cqs main source for font descriptions is Metafont, which produces bitmap output (GF files)\&. That\(cqs why not all obtainable TeX fonts are available in a scalable format\&. In these cases, dvisvgm tries to vectorize Metafont\(cqs output by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB or OTF counterparts, but are nonetheless really nice in most cases\&.
.sp
-When running dvisvgm without option \fB\-\-no\-fonts\fR, it creates \fIfont\fR elements (\fB<font>\fR\&...\fB</font>\fR) to embed the font data into the SVG files\&. Unfortunately, only few SVG renderers support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&.
+When running dvisvgm without option \fB\-\-no\-fonts\fR, it creates \fIfont\fR elements (\fB<font>\fR\&...\fB</font>\fR) to embed the font data into the SVG files\&. Unfortunately, only few SVG renderers support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&. Most web browsers (but only few external SVG renderers) also suppport WOFF and WOFF2 fonts that can be used instead of the default SVG fonts\&. Option \fB\-\-font\-format\fR offers the functionality to change the format applied to the fonts being embedded\&.
.SH "OPTIONS"
.sp
dvisvgm provides a POSIX\-compliant command\-line interface with short and long option names\&. They may be given before and/or after the name of the file to be converted\&. Also, the order of specifying the options is not significant, i\&.e\&. you can add them in any order without changing dvisvgm\(cqs behavior\&. Certain options accept or require additional parameters which are directly appended to or separated by whitespace from a short option (e\&.g\&. \fB\-v0\fR or \fB\-v 0\fR)\&. Long options require an additional equals sign (\fB=\fR) between option name and argument but without any surrounding whitespace (e\&.g\&. \fB\-\-verbosity=0\fR)\&. Multiple short options that don\(cqt expect a further parameter can be combined after a single dash (e\&.g\&. \fB\-ejs\fR rather than \fB\-e \-j \-s\fR)\&.
+.sp
+Long option names may also be shortened by omitting trailing characters\&. As long as the shortened name is unambiguous, it\(cqs recognized and applied\&. For example, option \fB\-\-exact\-bbox\fR can be shortened to \fB\-\-exact\fR, \fB\-\-exa\fR, or \fB\-\-ex\fR\&. In case of an ambiguous abbreviation, dvisvgm prints an error message together with all matching option names\&.
.PP
\fB\-b, \-\-bbox\fR=\fIfmt\fR
.RS 4
@@ -161,6 +163,85 @@ only affects the bounding box and does not transform the page content\&. Hence,
.RE
.RE
.PP
+\fB\-B, \-\-bitmap\-format\fR=\fIfmt\fR
+.RS 4
+This option sets the image format used to embed bitmaps extracted from PostScript or PDF data\&. By default, dvisvgm embeds all bitmaps as JPEG images because it\(cqs the most compact of the two formats supported by SVG\&. To select the alternative lossless PNG format,
+\fB\-\-bitmap\-format=png\fR
+can be used\&. There are some more format variants dvisvgm currently supports even though
+\fBjpeg\fR
+and
+\fBpng\fR
+should be sufficient in most cases\&. The following list gives an overview of the known format names which correspond to names of Ghostscript output devices\&.
+.TS
+tab(:);
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt.
+T{
+\fBnone\fR
+T}:T{
+disable processing of bitmap images
+T}
+T{
+\fBjpeg\fR
+T}:T{
+color JPEG format
+T}
+T{
+\fBjpeggray\fR
+T}:T{
+grayscale JPEG format
+T}
+T{
+\fBpng\fR
+T}:T{
+grayscale or 24\-bit color PNG format depending on current color space
+T}
+T{
+\fBpnggray\fR
+T}:T{
+grayscale PNG format
+T}
+T{
+\fBpngmono\fR
+T}:T{
+black\-and\-white PNG format
+T}
+T{
+\fBpngmonod\fR
+T}:T{
+dithered black\-and\-white PNG format
+T}
+T{
+\fBpng16\fR
+T}:T{
+4\-bit color PNG format
+T}
+T{
+\fBpng256\fR
+T}:T{
+8\-bit color PNG format
+T}
+T{
+\fBpng16m\fR
+T}:T{
+24\-bit color PNG format
+T}
+.TE
+.sp 1
+Since the collection of supported output devices can vary among local Ghostscript installations, not all formats may be available in some environments\&. dvisvgm quits with a PostScript error message if the selected output format requires a locally unsupported output device\&.
+.sp
+The two JPEG format specifiers accept an optional parameter to set the IJG quality level which must directly follow the format specifier separated by a colon, e\&.g\&.
+\fB\-\-bitmap\-format=jpeg:50\fR\&. The quality value is an integer between 0 and 100\&. Higher values result in better image quality but lower compression rates and therefore larger files\&. The default quality level is 75 which is applied if no quality parameter is given or if it\(cqs set to 0\&.
+.RE
+.PP
\fB\-C, \-\-cache\fR[=\fIdir\fR]
.RS 4
To speed up the conversion process of bitmap fonts, dvisvgm saves intermediate conversion information in cache files\&. By default, these files are stored in
@@ -317,7 +398,7 @@ dvipdfm (\m[blue]https://ctan.org/tex-archive/dviware/dvipdfm\m[])\&.
.RS 4
Tells dvisvgm to create overlapping grid segments when approximating color gradient fills (also see option
\fB\-\-grad\-segments\fR
-below)\&. By default, adjacent segments don\(cqt overlap but only touch each other like separate tiles\&. However, this alignment can lead to visible gaps between the segments because the background color usually influences the color at the boundary of the segments if the SVG renderer uses anti\-aliasing to create smooth contours\&. One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so that they extent into the area of their right and bottom neighbors\&. Since the latter are drawn on top of the overlapping parts, the visible size of all segments keeps unchanged\&. Just the former gaps disappear as the background is now completely covered by the correct colors\&. Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh may consist of multiple patches of the same type)\&. Therefore, there still might be visible gaps at the seam of two adjacent patches\&.
+below)\&. By default, adjacent segments don\(cqt overlap but only touch each other like separate tiles\&. However, this alignment can lead to visible gaps between the segments because the background color usually influences the color at the boundary of the segments if the SVG renderer uses anti\-aliasing to create smooth contours\&. One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so that they extend into the area of their right and bottom neighbors\&. Since the latter are drawn on top of the overlapping parts, the visible size of all segments keeps unchanged\&. Just the former gaps disappear as the background is now completely covered by the correct colors\&. Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh may consist of multiple patches of the same type)\&. Therefore, there still might be visible gaps at the seam of two adjacent patches\&.
.RE
.PP
\fB\-\-grad\-segments\fR=\fInumber\fR
@@ -341,6 +422,15 @@ If the size of the segments created to approximate gradient color fills falls be
Prints a short summary of all available command\-line options\&. The optional
\fImode\fR
parameter is an integer value between 0 and 2\&. It selects the display variant of the help text\&. Mode 0 lists all options divided into categories with section headers\&. This is also the default if dvisvgm is called without parameters\&. Mode 1 lists all options ordered by the short option names, while mode 2 sorts the lines by the long option names\&.
+.sp
+A values in brackets after the description text indicate the default parameter of the option\&. They are applied if an option with a mandatory parameter is not used or if an optional parameter is omitted\&. For example, option
+\fB\-\-bbox\fR
+requires a size parameter which defaults to
+\fBmin\fR
+if
+\fB\-\-bbox\fR
+is not used\&. Option
+\fB\-\-zip\fR, which isn\(cqt applied by default, accepts an optional compression level parameter\&. If it\(cqs omitted, the stated default value 9 is used\&.
.RE
.PP
\fB\-\-keep\fR
@@ -1591,4 +1681,4 @@ Please report bugs using the bug tracker at GitHub (\m[blue]https://github.com/m
Written by Martin Gieseking <\m[blue]\fBmartin\&.gieseking@uos\&.de\fR\m[]>
.SH "COPYING"
.sp
-Copyright \(co 2005\-2019 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
+Copyright \(co 2005\-2020 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
diff --git a/dviware/dvisvgm/doc/dvisvgm.txt.in b/dviware/dvisvgm/doc/dvisvgm.txt.in
index 1b5c669252..7afc9138b9 100644
--- a/dviware/dvisvgm/doc/dvisvgm.txt.in
+++ b/dviware/dvisvgm/doc/dvisvgm.txt.in
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////
// This file is part of dvisvgm -- a fast DVI to SVG converter //
-// Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> //
+// Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> //
// //
// This program is free software; you can redistribute it and/or //
// modify it under the terms of the GNU General Public License as //
@@ -22,7 +22,7 @@ Martin Gieseking <@PACKAGE_BUGREPORT@>
:man source: dvisvgm
:man version: @VERSION@
:man manual: dvisvgm Manual
-:revdate: 2019-11-12 20:21 +0100
+:revdate: 2020-03-08 09:20 +0100
Name
----
@@ -69,7 +69,9 @@ to embed the font data into the SVG files. Unfortunately, only few SVG renderers
elements yet. Most web browsers and vector graphics applications don't evaluate them properly so
that the text components of the resulting graphics might look strange. In order to create more
compatible SVG files, command-line option *--no-fonts* can be given to replace the font elements
-by plain graphics paths.
+by plain graphics paths. Most web browsers (but only few external SVG renderers) also suppport
+WOFF and WOFF2 fonts that can be used instead of the default SVG fonts. Option *--font-format*
+offers the functionality to change the format applied to the fonts being embedded.
Options
@@ -83,6 +85,11 @@ require an additional equals sign (+=+) between option name and argument but wit
whitespace (e.g. +--verbosity=0+). Multiple short options that don't expect a further parameter can
be combined after a single dash (e.g. +-ejs+ rather than +-e -j -s+).
+Long option names may also be shortened by omitting trailing characters. As long as the shortened
+name is unambiguous, it's recognized and applied. For example, option +--exact-bbox+ can be shortened
+to +--exact+, +--exa+, or +--ex+. In case of an ambiguous abbreviation, dvisvgm prints an error
+message together with all matching option names.
+
*-b, --bbox*='fmt'::
Sets the bounding box of the generated graphic to the specified format. The parameter 'fmt'
takes either one of the format specifiers listed below, or a sequence of four comma- or
@@ -106,11 +113,11 @@ Additionally, dvisvgm also supports the following format specifiers:
*Special bounding box sizes*;;
[horizontal]
- *dvi*::: page size stored in the DVI file
- *min*::: computes the minimal/tightest bounding box
- *none*::: no bounding box is assigned
- *papersize*::: box sizes specified by 'papersize' specials present in the DVI file
- *preview*::: bounding box data computed by the preview package (if present in the DVI file)
+ *dvi* ::: page size stored in the DVI file
+ *min* ::: computes the minimal/tightest bounding box
+ *none* ::: no bounding box is assigned
+ *papersize* ::: box sizes specified by 'papersize' specials present in the DVI file
+ *preview* ::: bounding box data computed by the preview package (if present in the DVI file)
//
*Page orientation*;;
The default page orientation for DIN/ISO and American paper sizes is 'portrait',
@@ -128,6 +135,38 @@ Hence, if you choose a landscape format, the page won't be rotated.
//
//
+*-B, --bitmap-format*='fmt'::
+This option sets the image format used to embed bitmaps extracted from PostScript or PDF data.
+By default, dvisvgm embeds all bitmaps as JPEG images because it's the most compact of the two formats
+supported by SVG. To select the alternative lossless PNG format, *--bitmap-format=png* can be used.
+There are some more format variants dvisvgm currently supports even though +jpeg+ and +png+ should be
+sufficient in most cases. The following list gives an overview of the known format names which
+correspond to names of Ghostscript output devices.
++
+--
+[horizontal]
+*none* ::: disable processing of bitmap images
+*jpeg* ::: color JPEG format
+*jpeggray* ::: grayscale JPEG format
+*png* ::: grayscale or 24-bit color PNG format depending on current color space
+*pnggray* ::: grayscale PNG format
+*pngmono* ::: black-and-white PNG format
+*pngmonod* ::: dithered black-and-white PNG format
+*png16* ::: 4-bit color PNG format
+*png256* ::: 8-bit color PNG format
+*png16m* ::: 24-bit color PNG format
+--
++
+Since the collection of supported output devices can vary among local Ghostscript installations,
+not all formats may be available in some environments. dvisvgm quits with a PostScript error message
+if the selected output format requires a locally unsupported output device.
++
+The two JPEG format specifiers accept an optional parameter to set the IJG quality level
+which must directly follow the format specifier separated by a colon, e.g. *--bitmap-format=jpeg:50*.
+The quality value is an integer between 0 and 100. Higher values result in better image quality but
+lower compression rates and therefore larger files. The default quality level is 75 which is applied
+if no quality parameter is given or if it's set to 0.
+
*-C, --cache*[='dir']::
To speed up the conversion process of bitmap fonts, dvisvgm saves intermediate conversion
information in cache files. By default, these files are stored in +$XDG_CACHE_HOME/dvisvgm/+
@@ -232,7 +271,7 @@ like separate tiles. However, this alignment can lead to visible gaps between th
because the background color usually influences the color at the boundary of the segments if the
SVG renderer uses anti-aliasing to create smooth contours.
One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so
-that they extent into the area of their right and bottom neighbors. Since the latter are drawn on top
+that they extend into the area of their right and bottom neighbors. Since the latter are drawn on top
of the overlapping parts, the visible size of all segments keeps unchanged. Just the former gaps
disappear as the background is now completely covered by the correct colors.
Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh
@@ -265,6 +304,12 @@ an integer value between 0 and 2. It selects the display variant of the help tex
lists all options divided into categories with section headers. This is also the default if
dvisvgm is called without parameters. Mode 1 lists all options ordered by the short option names,
while mode 2 sorts the lines by the long option names.
++
+A values in brackets after the description text indicate the default parameter of the option. They
+are applied if an option with a mandatory parameter is not used or if an optional parameter is omitted.
+For example, option *--bbox* requires a size parameter which defaults to +min+ if *--bbox* is not
+used. Option *--zip*, which isn't applied by default, accepts an optional compression level parameter.
+If it's omitted, the stated default value 9 is used.
*--keep*::
Disables the removal of temporary files as created by Metafont (usually .gf, .tfm, and .log files) or
@@ -944,7 +989,7 @@ Written by {author} <{email}>
Copying
-------
-Copyright (C) 2005-2019 Martin Gieseking. Free use of this software is
+Copyright (C) 2005-2020 Martin Gieseking. Free use of this software is
granted under the terms of the GNU General Public License (GPL) version 3
or, (at your option) any later version.
diff --git a/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl b/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl
index 9ce456d1b3..bdb279da99 100644
--- a/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl
+++ b/dviware/dvisvgm/doc/generate-dvisvgm-sty.xsl
@@ -7,6 +7,8 @@
\ProvidesPackage{dvisvgm}[2015/02/04 dvisvgm DocBook style]
\RequirePackageWithOptions{docbook}
\RequirePackage[english]{babel}
+\RequirePackage{underscore}
+\renewcommand*{\arraystretch}{-0.4}
\AtBeginDocument{%
\thispagestyle{empty}
\lhead[]{\refmiscinfomanual}
@@ -16,4 +18,4 @@
\def\tableofcontents{\stdtoc} % keep TOC on current page
}
</xsl:template>
-</xsl:stylesheet> \ No newline at end of file
+</xsl:stylesheet>
diff --git a/dviware/dvisvgm/doc/tweak-db-refentry.xsl b/dviware/dvisvgm/doc/tweak-db-refentry.xsl
index 088e2ce434..1750d7a4f7 100644
--- a/dviware/dvisvgm/doc/tweak-db-refentry.xsl
+++ b/dviware/dvisvgm/doc/tweak-db-refentry.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- This file is part of dvisvgm -->
-<!-- Copyright (C) 2015-2019 Martin Gieseking <martin.gieseking@uos.de> -->
+<!-- Copyright (C) 2015-2020 Martin Gieseking <martin.gieseking@uos.de> -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:date="http://exslt.org/dates-and-times"
diff --git a/dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl b/dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl
index 8b07434845..d1762adecb 100644
--- a/dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl
+++ b/dviware/dvisvgm/doc/tweak-dblatex-pdf.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This file is part of dvisvgm -->
-<!-- Copyright (C) 2015-2019 Martin Gieseking <martin.gieseking@uos.de> -->
+<!-- Copyright (C) 2015-2020 Martin Gieseking <martin.gieseking@uos.de> -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output doctype-public="-//OASIS//DTD DocBook XML V4.5//EN" doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
diff --git a/dviware/dvisvgm/libs/Makefile.am b/dviware/dvisvgm/libs/Makefile.am
index 7b6b80229d..6b6e0433e4 100644
--- a/dviware/dvisvgm/libs/Makefile.am
+++ b/dviware/dvisvgm/libs/Makefile.am
@@ -1,5 +1,5 @@
## This file is part of dvisvgm
-## Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
diff --git a/dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp b/dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp
index a3ef480662..d9e5280b2c 100644
--- a/dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp
+++ b/dviware/dvisvgm/libs/ff-woff/fontforge/tmpfile2.cpp
@@ -3,7 +3,7 @@
* works on POSIX and Windows systems.
* License: Revised BSD license used by FontForge
* https://github.com/fontforge/fontforge/blob/master/LICENSE
-* (C) 2017-2019 Martin Gieseking <martin.gieseking@uos.de> */
+* (C) 2017-2020 Martin Gieseking <martin.gieseking@uos.de> */
#include <cstdio>
#include <cstdlib>
diff --git a/dviware/dvisvgm/libs/xxHash/xxh3.h b/dviware/dvisvgm/libs/xxHash/xxh3.h
index b3a8295845..9e3e88ad61 100644
--- a/dviware/dvisvgm/libs/xxHash/xxh3.h
+++ b/dviware/dvisvgm/libs/xxHash/xxh3.h
@@ -1,50 +1,54 @@
/*
- xxHash - Extremely Fast Hash algorithm
- Development source file for `xxh3`
- Copyright (C) 2019-present, Yann Collet.
-
- BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- You can contact the author at :
- - xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
-
-/* Note :
- This file is separated for development purposes.
- It will be integrated into `xxhash.c` when development phase is complete.
-*/
-
-#ifndef XXH3_H
-#define XXH3_H
+ * xxHash - Extremely Fast Hash algorithm
+ * Development source file for `xxh3`
+ * Copyright (C) 2019-present, Yann Collet
+ *
+ * BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You can contact the author at:
+ * - xxHash homepage: https://www.xxhash.com
+ * - xxHash source repository: https://github.com/Cyan4973/xxHash
+ */
+/*
+ * Note: This file is separated for development purposes.
+ * It will be integrated into `xxhash.h` when development stage is completed.
+ *
+ * Credit: most of the work on vectorial and asm variants comes from @easyaspi314
+ */
-/* === Dependencies === */
+#ifndef XXH3_H_1397135465
+#define XXH3_H_1397135465
-#undef XXH_INLINE_ALL /* in case it's already defined */
-#define XXH_INLINE_ALL
+/* === Dependencies === */
+#ifndef XXHASH_H_5627135585666179
+/* special: when including `xxh3.h` directly, turn on XXH_INLINE_ALL */
+# undef XXH_INLINE_ALL /* avoid redefinition */
+# define XXH_INLINE_ALL
+#endif
#include "xxhash.h"
@@ -53,10 +57,20 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* >= C99 */
# define XXH_RESTRICT restrict
#else
-/* note : it might be useful to define __restrict or __restrict__ for some C++ compilers */
+/* Note: it might be useful to define __restrict or __restrict__ for some C++ compilers */
# define XXH_RESTRICT /* disable */
#endif
+#if (defined(__GNUC__) && (__GNUC__ >= 3)) \
+ || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) \
+ || defined(__clang__)
+# define XXH_likely(x) __builtin_expect(x, 1)
+# define XXH_unlikely(x) __builtin_expect(x, 0)
+#else
+# define XXH_likely(x) (x)
+# define XXH_unlikely(x) (x)
+#endif
+
#if defined(__GNUC__)
# if defined(__AVX2__)
# include <immintrin.h>
@@ -72,17 +86,50 @@
#endif
/*
- * Sanity check.
+ * One goal of XXH3 is to make it fast on both 32-bit and 64-bit, while
+ * remaining a true 64-bit/128-bit hash function.
+ *
+ * This is done by prioritizing a subset of 64-bit operations that can be
+ * emulated without too many steps on the average 32-bit machine.
+ *
+ * For example, these two lines seem similar, and run equally fast on 64-bit:
*
- * XXH3 only requires these features to be efficient:
+ * xxh_u64 x;
+ * x ^= (x >> 47); // good
+ * x ^= (x >> 13); // bad
+ *
+ * However, to a 32-bit machine, there is a major difference.
+ *
+ * x ^= (x >> 47) looks like this:
+ *
+ * x.lo ^= (x.hi >> (47 - 32));
+ *
+ * while x ^= (x >> 13) looks like this:
+ *
+ * // note: funnel shifts are not usually cheap.
+ * x.lo ^= (x.lo >> 13) | (x.hi << (32 - 13));
+ * x.hi ^= (x.hi >> 13);
+ *
+ * The first one is significantly faster than the second, simply because the
+ * shift is larger than 32. This means:
+ * - All the bits we need are in the upper 32 bits, so we can ignore the lower
+ * 32 bits in the shift.
+ * - The shift result will always fit in the lower 32 bits, and therefore,
+ * we can ignore the upper 32 bits in the xor.
+ *
+ * Thanks to this optimization, XXH3 only requires these features to be efficient:
*
* - Usable unaligned access
* - A 32-bit or 64-bit ALU
* - If 32-bit, a decent ADC instruction
* - A 32 or 64-bit multiply with a 64-bit result
+ * - For the 128-bit variant, a decent byteswap helps short inputs.
+ *
+ * The first two are already required by XXH32, and almost all 32-bit and 64-bit
+ * platforms which can run XXH32 can run XXH3 efficiently.
*
- * Almost all 32-bit and 64-bit targets meet this, except for Thumb-1, the
- * classic 16-bit only subset of ARM's instruction set.
+ * Thumb-1, the classic 16-bit only subset of ARM's instruction set, is one
+ * notable exception.
*
* First of all, Thumb-1 lacks support for the UMULL instruction which
* performs the important long multiply. This means numerous __aeabi_lmul
@@ -93,14 +140,16 @@
* Lo registers, and this shuffling results in thousands more MOVs than A32.
*
* A32 and T32 don't have this limitation. They can access all 14 registers,
- * do a 32->64 multiply with UMULL, and the flexible operand is helpful too.
+ * do a 32->64 multiply with UMULL, and the flexible operand allowing free
+ * shifts is helpful, too.
*
- * If compiling Thumb-1 for a target which supports ARM instructions, we
- * will give a warning.
+ * Therefore, we do a quick sanity check.
*
- * Usually, if this happens, it is because of an accident and you probably
- * need to specify -march, as you probably meant to compileh for a newer
- * architecture.
+ * If compiling Thumb-1 for a target which supports ARM instructions, we will
+ * emit a warning, as it is not a "sane" platform to compile for.
+ *
+ * Usually, if this happens, it is because of an accident and you probably need
+ * to specify -march, as you likely meant to compile for a newer architecture.
*/
#if defined(__thumb__) && !defined(__thumb2__) && defined(__ARM_ARCH_ISA_ARM)
# warning "XXH3 is highly inefficient without ARM or Thumb-2."
@@ -109,11 +158,11 @@
/* ==========================================
* Vectorization detection
* ========================================== */
-#define XXH_SCALAR 0
-#define XXH_SSE2 1
-#define XXH_AVX2 2
-#define XXH_NEON 3
-#define XXH_VSX 4
+#define XXH_SCALAR 0 /* Portable scalar version */
+#define XXH_SSE2 1 /* SSE2 for Pentium 4 and all x86_64 */
+#define XXH_AVX2 2 /* AVX2 for Haswell and Bulldozer */
+#define XXH_NEON 3 /* NEON for most ARMv7-A and all AArch64 */
+#define XXH_VSX 4 /* VSX and ZVector for POWER8/z13 */
#ifndef XXH_VECTOR /* can be defined on command line */
# if defined(__AVX2__)
@@ -125,47 +174,186 @@
&& (defined(__LITTLE_ENDIAN__) /* We only support little endian NEON */ \
|| (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
# define XXH_VECTOR XXH_NEON
-# elif defined(__PPC64__) && defined(__POWER8_VECTOR__) && defined(__GNUC__)
+# elif (defined(__PPC64__) && defined(__POWER8_VECTOR__)) \
+ || (defined(__s390x__) && defined(__VEC__)) \
+ && defined(__GNUC__) /* TODO: IBM XL */
# define XXH_VECTOR XXH_VSX
# else
# define XXH_VECTOR XXH_SCALAR
# endif
#endif
-/* control alignment of accumulator,
- * for compatibility with fast vector loads */
+/*
+ * Controls the alignment of the accumulator.
+ * This is for compatibility with aligned vector loads, which are usually faster.
+ */
#ifndef XXH_ACC_ALIGN
-# if XXH_VECTOR == 0 /* scalar */
+# if XXH_VECTOR == XXH_SCALAR /* scalar */
# define XXH_ACC_ALIGN 8
-# elif XXH_VECTOR == 1 /* sse2 */
+# elif XXH_VECTOR == XXH_SSE2 /* sse2 */
# define XXH_ACC_ALIGN 16
-# elif XXH_VECTOR == 2 /* avx2 */
+# elif XXH_VECTOR == XXH_AVX2 /* avx2 */
# define XXH_ACC_ALIGN 32
-# elif XXH_VECTOR == 3 /* neon */
+# elif XXH_VECTOR == XXH_NEON /* neon */
# define XXH_ACC_ALIGN 16
-# elif XXH_VECTOR == 4 /* vsx */
+# elif XXH_VECTOR == XXH_VSX /* vsx */
# define XXH_ACC_ALIGN 16
# endif
#endif
-/* xxh_u64 XXH_mult32to64(xxh_u32 a, xxh_u64 b) { return (xxh_u64)a * (xxh_u64)b; } */
-#if defined(_MSC_VER) && defined(_M_IX86)
-# include <intrin.h>
-# define XXH_mult32to64(x, y) __emulu(x, y)
-#else
-# define XXH_mult32to64(x, y) ((xxh_u64)((x) & 0xFFFFFFFF) * (xxh_u64)((y) & 0xFFFFFFFF))
+/*
+ * UGLY HACK:
+ * GCC usually generates the best code with -O3 for xxHash.
+ *
+ * However, when targeting AVX2, it is overzealous in its unrolling resulting
+ * in code roughly 3/4 the speed of Clang.
+ *
+ * There are other issues, such as GCC splitting _mm256_loadu_si256 into
+ * _mm_loadu_si128 + _mm256_inserti128_si256. This is an optimization which
+ * only applies to Sandy and Ivy Bridge... which don't even support AVX2.
+ *
+ * That is why when compiling the AVX2 version, it is recommended to use either
+ * -O2 -mavx2 -march=haswell
+ * or
+ * -O2 -mavx2 -mno-avx256-split-unaligned-load
+ * for decent performance, or to use Clang instead.
+ *
+ * Fortunately, we can control the first one with a pragma that forces GCC into
+ * -O2, but the other one we can't control without "failed to inline always
+ * inline function due to target mismatch" warnings.
+ */
+#if XXH_VECTOR == XXH_AVX2 /* AVX2 */ \
+ && defined(__GNUC__) && !defined(__clang__) /* GCC, not Clang */ \
+ && defined(__OPTIMIZE__) && !defined(__OPTIMIZE_SIZE__) /* respect -O0 and -Os */
+# pragma GCC push_options
+# pragma GCC optimize("-O2")
#endif
-/* VSX stuff. It's a lot because VSX support is mediocre across compilers and
- * there is a lot of mischief with endianness. */
+
+#if XXH_VECTOR == XXH_NEON
+/*
+ * NEON's setup for vmlal_u32 is a little more complicated than it is on
+ * SSE2, AVX2, and VSX.
+ *
+ * While PMULUDQ and VMULEUW both perform a mask, VMLAL.U32 performs an upcast.
+ *
+ * To do the same operation, the 128-bit 'Q' register needs to be split into
+ * two 64-bit 'D' registers, performing this operation::
+ *
+ * [ a | b ]
+ * | '---------. .--------' |
+ * | x |
+ * | .---------' '--------. |
+ * [ a & 0xFFFFFFFF | b & 0xFFFFFFFF ],[ a >> 32 | b >> 32 ]
+ *
+ * Due to significant changes in aarch64, the fastest method for aarch64 is
+ * completely different than the fastest method for ARMv7-A.
+ *
+ * ARMv7-A treats D registers as unions overlaying Q registers, so modifying
+ * D11 will modify the high half of Q5. This is similar to how modifying AH
+ * will only affect bits 8-15 of AX on x86.
+ *
+ * VZIP takes two registers, and puts even lanes in one register and odd lanes
+ * in the other.
+ *
+ * On ARMv7-A, this strangely modifies both parameters in place instead of
+ * taking the usual 3-operand form.
+ *
+ * Therefore, if we want to do this, we can simply use a D-form VZIP.32 on the
+ * lower and upper halves of the Q register to end up with the high and low
+ * halves where we want - all in one instruction.
+ *
+ * vzip.32 d10, d11 @ d10 = { d10[0], d11[0] }; d11 = { d10[1], d11[1] }
+ *
+ * Unfortunately we need inline assembly for this: Instructions modifying two
+ * registers at once is not possible in GCC or Clang's IR, and they have to
+ * create a copy.
+ *
+ * aarch64 requires a different approach.
+ *
+ * In order to make it easier to write a decent compiler for aarch64, many
+ * quirks were removed, such as conditional execution.
+ *
+ * NEON was also affected by this.
+ *
+ * aarch64 cannot access the high bits of a Q-form register, and writes to a
+ * D-form register zero the high bits, similar to how writes to W-form scalar
+ * registers (or DWORD registers on x86_64) work.
+ *
+ * The formerly free vget_high intrinsics now require a vext (with a few
+ * exceptions)
+ *
+ * Additionally, VZIP was replaced by ZIP1 and ZIP2, which are the equivalent
+ * of PUNPCKL* and PUNPCKH* in SSE, respectively, in order to only modify one
+ * operand.
+ *
+ * The equivalent of the VZIP.32 on the lower and upper halves would be this
+ * mess:
+ *
+ * ext v2.4s, v0.4s, v0.4s, #2 // v2 = { v0[2], v0[3], v0[0], v0[1] }
+ * zip1 v1.2s, v0.2s, v2.2s // v1 = { v0[0], v2[0] }
+ * zip2 v0.2s, v0.2s, v1.2s // v0 = { v0[1], v2[1] }
+ *
+ * Instead, we use a literal downcast, vmovn_u64 (XTN), and vshrn_n_u64 (SHRN):
+ *
+ * shrn v1.2s, v0.2d, #32 // v1 = (uint32x2_t)(v0 >> 32);
+ * xtn v0.2s, v0.2d // v0 = (uint32x2_t)(v0 & 0xFFFFFFFF);
+ *
+ * This is available on ARMv7-A, but is less efficient than a single VZIP.32.
+ */
+
+/*
+ * Function-like macro:
+ * void XXH_SPLIT_IN_PLACE(uint64x2_t &in, uint32x2_t &outLo, uint32x2_t &outHi)
+ * {
+ * outLo = (uint32x2_t)(in & 0xFFFFFFFF);
+ * outHi = (uint32x2_t)(in >> 32);
+ * in = UNDEFINED;
+ * }
+ */
+# if !defined(XXH_NO_VZIP_HACK) /* define to disable */ \
+ && defined(__GNUC__) \
+ && !defined(__aarch64__) && !defined(__arm64__)
+# define XXH_SPLIT_IN_PLACE(in, outLo, outHi) \
+ do { \
+ /* Undocumented GCC/Clang operand modifier: %e0 = lower D half, %f0 = upper D half */ \
+ /* https://github.com/gcc-mirror/gcc/blob/38cf91e5/gcc/config/arm/arm.c#L22486 */ \
+ /* https://github.com/llvm-mirror/llvm/blob/2c4ca683/lib/Target/ARM/ARMAsmPrinter.cpp#L399 */ \
+ __asm__("vzip.32 %e0, %f0" : "+w" (in)); \
+ (outLo) = vget_low_u32 (vreinterpretq_u32_u64(in)); \
+ (outHi) = vget_high_u32(vreinterpretq_u32_u64(in)); \
+ } while (0)
+# else
+# define XXH_SPLIT_IN_PLACE(in, outLo, outHi) \
+ do { \
+ (outLo) = vmovn_u64 (in); \
+ (outHi) = vshrn_n_u64 ((in), 32); \
+ } while (0)
+# endif
+#endif /* XXH_VECTOR == XXH_NEON */
+
+/*
+ * VSX and Z Vector helpers.
+ *
+ * This is very messy, and any pull requests to clean this up are welcome.
+ *
+ * There are a lot of problems with supporting VSX and s390x, due to
+ * inconsistent intrinsics, spotty coverage, and multiple endiannesses.
+ */
#if XXH_VECTOR == XXH_VSX
-# include <altivec.h>
-# undef vector
-typedef __vector unsigned long long U64x2;
-typedef __vector unsigned char U8x16;
-typedef __vector unsigned U32x4;
+# if defined(__s390x__)
+# include <s390intrin.h>
+# else
+# include <altivec.h>
+# endif
-#ifndef XXH_VSX_BE
+# undef vector /* Undo the pollution */
+
+typedef __vector unsigned long long xxh_u64x2;
+typedef __vector unsigned char xxh_u8x16;
+typedef __vector unsigned xxh_u32x4;
+
+# ifndef XXH_VSX_BE
# if defined(__BIG_ENDIAN__) \
|| (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
# define XXH_VSX_BE 1
@@ -175,67 +363,82 @@ typedef __vector unsigned U32x4;
# else
# define XXH_VSX_BE 0
# endif
-#endif
+# endif /* !defined(XXH_VSX_BE) */
-/* We need some helpers for big endian mode. */
-#if XXH_VSX_BE
+# if XXH_VSX_BE
/* A wrapper for POWER9's vec_revb. */
-# ifdef __POWER9_VECTOR__
+# if defined(__POWER9_VECTOR__) || (defined(__clang__) && defined(__s390x__))
# define XXH_vec_revb vec_revb
# else
-XXH_FORCE_INLINE U64x2 XXH_vec_revb(U64x2 val)
+XXH_FORCE_INLINE xxh_u64x2 XXH_vec_revb(xxh_u64x2 val)
{
- U8x16 const vByteSwap = { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
- 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08 };
+ xxh_u8x16 const vByteSwap = { 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
+ 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08 };
return vec_perm(val, val, vByteSwap);
}
# endif
+# endif /* XXH_VSX_BE */
-/* Power8 Crypto gives us vpermxor which is very handy for
- * PPC64EB.
- *
- * U8x16 vpermxor(U8x16 a, U8x16 b, U8x16 mask)
- * {
- * U8x16 ret;
- * for (int i = 0; i < 16; i++) {
- * ret[i] = a[mask[i] & 0xF] ^ b[mask[i] >> 4];
- * }
- * return ret;
- * }
- *
- * Because both of the main loops load the key, swap, and xor it with input,
- * we can combine the key swap into this instruction.
+/*
+ * Performs an unaligned load and byte swaps it on big endian.
*/
-# ifdef vec_permxor
-# define XXH_vec_permxor vec_permxor
-# else
-# define XXH_vec_permxor __builtin_crypto_vpermxor
-# endif
-#endif
+XXH_FORCE_INLINE xxh_u64x2 XXH_vec_loadu(const void *ptr)
+{
+ xxh_u64x2 ret;
+ memcpy(&ret, ptr, sizeof(xxh_u64x2));
+# if XXH_VSX_BE
+ ret = XXH_vec_revb(ret);
+# endif
+ return ret;
+}
+
/*
- * Because we reinterpret the multiply, there are endian memes: vec_mulo actually becomes
- * vec_mule.
+ * vec_mulo and vec_mule are very problematic intrinsics on PowerPC
*
- * Additionally, the intrinsic wasn't added until GCC 8, despite existing for a while.
- * Clang has an easy way to control this, we can just use the builtin which doesn't swap.
- * GCC needs inline assembly. */
-#if __has_builtin(__builtin_altivec_vmuleuw)
+ * These intrinsics weren't added until GCC 8, despite existing for a while,
+ * and they are endian dependent. Also, their meaning swap depending on version.
+ * */
+# if defined(__s390x__)
+ /* s390x is always big endian, no issue on this platform */
+# define XXH_vec_mulo vec_mulo
+# define XXH_vec_mule vec_mule
+# elif defined(__clang__) && __has_builtin(__builtin_altivec_vmuleuw)
+/* Clang has a better way to control this, we can just use the builtin which doesn't swap. */
# define XXH_vec_mulo __builtin_altivec_vmulouw
# define XXH_vec_mule __builtin_altivec_vmuleuw
-#else
+# else
+/* gcc needs inline assembly */
/* Adapted from https://github.com/google/highwayhash/blob/master/highwayhash/hh_vsx.h. */
-XXH_FORCE_INLINE U64x2 XXH_vec_mulo(U32x4 a, U32x4 b) {
- U64x2 result;
+XXH_FORCE_INLINE xxh_u64x2 XXH_vec_mulo(xxh_u32x4 a, xxh_u32x4 b)
+{
+ xxh_u64x2 result;
__asm__("vmulouw %0, %1, %2" : "=v" (result) : "v" (a), "v" (b));
return result;
}
-XXH_FORCE_INLINE U64x2 XXH_vec_mule(U32x4 a, U32x4 b) {
- U64x2 result;
+XXH_FORCE_INLINE xxh_u64x2 XXH_vec_mule(xxh_u32x4 a, xxh_u32x4 b)
+{
+ xxh_u64x2 result;
__asm__("vmuleuw %0, %1, %2" : "=v" (result) : "v" (a), "v" (b));
return result;
}
-#endif
-#endif
+# endif /* XXH_vec_mulo, XXH_vec_mule */
+#endif /* XXH_VECTOR == XXH_VSX */
+
+
+/* prefetch
+ * can be disabled, by declaring XXH_NO_PREFETCH build macro */
+#if defined(XXH_NO_PREFETCH)
+# define XXH_PREFETCH(ptr) (void)(ptr) /* disabled */
+#else
+# if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) /* _mm_prefetch() is not defined outside of x86/x64 */
+# include <mmintrin.h> /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */
+# define XXH_PREFETCH(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T0)
+# elif defined(__GNUC__) && ( (__GNUC__ >= 4) || ( (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) ) )
+# define XXH_PREFETCH(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */)
+# else
+# define XXH_PREFETCH(ptr) (void)(ptr) /* disabled */
+# endif
+#endif /* XXH_NO_PREFETCH */
/* ==========================================
@@ -248,6 +451,7 @@ XXH_FORCE_INLINE U64x2 XXH_vec_mule(U32x4 a, U32x4 b) {
# error "default keyset is not large enough"
#endif
+/* Pseudorandom secret taken directly from FARSH */
XXH_ALIGN(64) static const xxh_u8 kSecret[XXH_SECRET_DEFAULT_SIZE] = {
0xb8, 0xfe, 0x6c, 0x39, 0x23, 0xa4, 0x4b, 0xbe, 0x7c, 0x01, 0x81, 0x2c, 0xf7, 0x21, 0xad, 0x1c,
0xde, 0xd4, 0x6d, 0xe9, 0x83, 0x90, 0x97, 0xdb, 0x72, 0x40, 0xa4, 0xa4, 0xb7, 0xb3, 0x67, 0x1f,
@@ -265,16 +469,40 @@ XXH_ALIGN(64) static const xxh_u8 kSecret[XXH_SECRET_DEFAULT_SIZE] = {
};
/*
- * GCC for x86 has a tendency to use SSE in this loop. While it
- * successfully avoids swapping (as MUL overwrites EAX and EDX), it
- * slows it down because instead of free register swap shifts, it
- * must use pshufd and punpckl/hd.
+ * Does a 32-bit to 64-bit long multiply.
*
- * To prevent this, we use this attribute to shut off SSE.
+ * Wraps __emulu on MSVC x86 because it tends to call __allmul when it doesn't
+ * need to (but it shouldn't need to anyways, it is about 7 instructions to do
+ * a 64x64 multiply...). Since we know that this will _always_ emit MULL, we
+ * use that instead of the normal method.
+ *
+ * If you are compiling for platforms like Thumb-1 and don't have a better option,
+ * you may also want to write your own long multiply routine here.
+ *
+ * XXH_FORCE_INLINE xxh_u64 XXH_mult32to64(xxh_u64 x, xxh_u64 y)
+ * {
+ * return (x & 0xFFFFFFFF) * (y & 0xFFFFFFFF);
+ * }
+ */
+#if defined(_MSC_VER) && defined(_M_IX86)
+# include <intrin.h>
+# define XXH_mult32to64(x, y) __emulu((unsigned)(x), (unsigned)(y))
+#else
+/*
+ * Downcast + upcast is usually better than masking on older compilers like
+ * GCC 4.2 (especially 32-bit ones), all without affecting newer compilers.
+ *
+ * The other method, (x & 0xFFFFFFFF) * (y & 0xFFFFFFFF), will AND both operands
+ * and perform a full 64x64 multiply -- entirely redundant on 32-bit.
*/
-#if defined(__GNUC__) && !defined(__clang__) && defined(__i386__)
-__attribute__((__target__("no-sse")))
+# define XXH_mult32to64(x, y) ((xxh_u64)(xxh_u32)(x) * (xxh_u64)(xxh_u32)(y))
#endif
+
+/*
+ * Calculates a 64->128-bit long multiply.
+ *
+ * Uses __uint128_t and _umul128 if available, otherwise uses a scalar version.
+ */
static XXH128_hash_t
XXH_mult64to128(xxh_u64 lhs, xxh_u64 rhs)
{
@@ -287,9 +515,9 @@ XXH_mult64to128(xxh_u64 lhs, xxh_u64 rhs)
*
* Usually.
*
- * Despite being a 32-bit platform, Clang (and emscripten) define this
- * type despite not having the arithmetic for it. This results in a
- * laggy compiler builtin call which calculates a full 128-bit multiply.
+ * Despite being a 32-bit platform, Clang (and emscripten) define this type
+ * despite not having the arithmetic for it. This results in a laggy
+ * compiler builtin call which calculates a full 128-bit multiply.
* In that case it is best to use the portable one.
* https://github.com/Cyan4973/xxHash/issues/211#issuecomment-515575677
*/
@@ -322,29 +550,30 @@ XXH_mult64to128(xxh_u64 lhs, xxh_u64 rhs)
/*
* Portable scalar method. Optimized for 32-bit and 64-bit ALUs.
*
- * This is a fast and simple grade school multiply, which is shown
- * below with base 10 arithmetic instead of base 0x100000000.
+ * This is a fast and simple grade school multiply, which is shown below
+ * with base 10 arithmetic instead of base 0x100000000.
*
* 9 3 // D2 lhs = 93
* x 7 5 // D2 rhs = 75
* ----------
- * 1 5 // D2 lo_lo = (93 % 10) * (75 % 10)
- * 4 5 | // D2 hi_lo = (93 / 10) * (75 % 10)
- * 2 1 | // D2 lo_hi = (93 % 10) * (75 / 10)
- * + 6 3 | | // D2 hi_hi = (93 / 10) * (75 / 10)
+ * 1 5 // D2 lo_lo = (93 % 10) * (75 % 10) = 15
+ * 4 5 | // D2 hi_lo = (93 / 10) * (75 % 10) = 45
+ * 2 1 | // D2 lo_hi = (93 % 10) * (75 / 10) = 21
+ * + 6 3 | | // D2 hi_hi = (93 / 10) * (75 / 10) = 63
* ---------
- * 2 7 | // D2 cross = (15 / 10) + (45 % 10) + 21
- * + 6 7 | | // D2 upper = (27 / 10) + (45 / 10) + 63
+ * 2 7 | // D2 cross = (15 / 10) + (45 % 10) + 21 = 27
+ * + 6 7 | | // D2 upper = (27 / 10) + (45 / 10) + 63 = 67
* ---------
- * 6 9 7 5
+ * 6 9 7 5 // D4 res = (27 * 10) + (15 % 10) + (67 * 100) = 6975
*
* The reasons for adding the products like this are:
* 1. It avoids manual carry tracking. Just like how
- * (9 * 9) + 9 + 9 = 99, the same applies with this for
- * UINT64_MAX. This avoids a lot of complexity.
+ * (9 * 9) + 9 + 9 = 99, the same applies with this for UINT64_MAX.
+ * This avoids a lot of complexity.
*
* 2. It hints for, and on Clang, compiles to, the powerful UMAAL
- * instruction available in ARMv6+ A32/T32, which is shown below:
+ * instruction available in ARM's Digital Signal Processing extension
+ * in 32-bit ARMv6 and later, which is shown below:
*
* void UMAAL(xxh_u32 *RdLo, xxh_u32 *RdHi, xxh_u32 Rn, xxh_u32 Rm)
* {
@@ -353,12 +582,12 @@ XXH_mult64to128(xxh_u64 lhs, xxh_u64 rhs)
* *RdHi = (xxh_u32)(product >> 32);
* }
*
- * This instruction was designed for efficient long multiplication,
- * and allows this to be calculated in only 4 instructions which
- * is comparable to some 64-bit ALUs.
+ * This instruction was designed for efficient long multiplication, and
+ * allows this to be calculated in only 4 instructions at speeds
+ * comparable to some 64-bit ALUs.
*
- * 3. It isn't terrible on other platforms. Usually this will be
- * a couple of 32-bit ADD/ADCs.
+ * 3. It isn't terrible on other platforms. Usually this will be a couple
+ * of 32-bit ADD/ADCs.
*/
/* First calculate all of the cross products. */
@@ -378,17 +607,11 @@ XXH_mult64to128(xxh_u64 lhs, xxh_u64 rhs)
}
/*
- * We want to keep the attribute here because a target switch
- * disables inlining.
- *
* Does a 64-bit to 128-bit multiply, then XOR folds it.
- * The reason for the separate function is to prevent passing
- * too many structs around by value. This will hopefully inline
- * the multiply, but we don't force it.
+ *
+ * The reason for the separate function is to prevent passing too many structs
+ * around by value. This will hopefully inline the multiply, but we don't force it.
*/
-#if defined(__GNUC__) && !defined(__clang__) && defined(__i386__)
-__attribute__((__target__("no-sse")))
-#endif
static xxh_u64
XXH3_mul128_fold64(xxh_u64 lhs, xxh_u64 rhs)
{
@@ -396,32 +619,78 @@ XXH3_mul128_fold64(xxh_u64 lhs, xxh_u64 rhs)
return product.low64 ^ product.high64;
}
+/* Seems to produce slightly better code on GCC for some reason. */
+XXH_FORCE_INLINE xxh_u64 XXH_xorshift64(xxh_u64 v64, int shift)
+{
+ XXH_ASSERT(0 <= shift && shift < 64);
+ return v64 ^ (v64 >> shift);
+}
+/*
+ * We don't need to (or want to) mix as much as XXH64.
+ *
+ * Short hashes are more evenly distributed, so it isn't necessary.
+ */
static XXH64_hash_t XXH3_avalanche(xxh_u64 h64)
{
- h64 ^= h64 >> 37;
- h64 *= PRIME64_3;
- h64 ^= h64 >> 32;
+ h64 = XXH_xorshift64(h64, 37);
+ h64 *= 0x165667919E3779F9ULL;
+ h64 = XXH_xorshift64(h64, 32);
return h64;
}
/* ==========================================
* Short keys
- * ========================================== */
+ * ==========================================
+ * One of the shortcomings of XXH32 and XXH64 was that their performance was
+ * sub-optimal on short lengths. It used an iterative algorithm which strongly
+ * favored lengths that were a multiple of 4 or 8.
+ *
+ * Instead of iterating over individual inputs, we use a set of single shot
+ * functions which piece together a range of lengths and operate in constant time.
+ *
+ * Additionally, the number of multiplies has been significantly reduced. This
+ * reduces latency, especially when emulating 64-bit multiplies on 32-bit.
+ *
+ * Depending on the platform, this may or may not be faster than XXH32, but it
+ * is almost guaranteed to be faster than XXH64.
+ */
+/*
+ * At very short lengths, there isn't enough input to fully hide secrets, or use
+ * the entire secret.
+ *
+ * There is also only a limited amount of mixing we can do before significantly
+ * impacting performance.
+ *
+ * Therefore, we use different sections of the secret and always mix two secret
+ * samples with an XOR. This should have no effect on performance on the
+ * seedless or withSeed variants because everything _should_ be constant folded
+ * by modern compilers.
+ *
+ * The XOR mixing hides individual parts of the secret and increases entropy.
+ *
+ * This adds an extra layer of strength for custom secrets.
+ */
XXH_FORCE_INLINE XXH64_hash_t
XXH3_len_1to3_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed)
{
XXH_ASSERT(input != NULL);
XXH_ASSERT(1 <= len && len <= 3);
XXH_ASSERT(secret != NULL);
+ /*
+ * len = 1: combined = { input[0], 0x01, input[0], input[0] }
+ * len = 2: combined = { input[1], 0x02, input[0], input[1] }
+ * len = 3: combined = { input[2], 0x03, input[0], input[1] }
+ */
{ xxh_u8 const c1 = input[0];
xxh_u8 const c2 = input[len >> 1];
xxh_u8 const c3 = input[len - 1];
- xxh_u32 const combined = ((xxh_u32)c1) | (((xxh_u32)c2) << 8) | (((xxh_u32)c3) << 16) | (((xxh_u32)len) << 24);
- xxh_u64 const keyed = (xxh_u64)combined ^ (XXH_readLE32(secret) + seed);
- xxh_u64 const mixed = keyed * PRIME64_1;
+ xxh_u32 const combined = ((xxh_u32)c1<<16) | (((xxh_u32)c2) << 24) | (((xxh_u32)c3) << 0) | (((xxh_u32)len) << 8);
+ xxh_u64 const bitflip = (XXH_readLE32(secret) ^ XXH_readLE32(secret+4)) + seed;
+ xxh_u64 const keyed = (xxh_u64)combined ^ bitflip;
+ xxh_u64 const mixed = keyed * PRIME64_1;
return XXH3_avalanche(mixed);
}
}
@@ -431,13 +700,19 @@ XXH3_len_4to8_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_h
{
XXH_ASSERT(input != NULL);
XXH_ASSERT(secret != NULL);
- XXH_ASSERT(4 <= len && len <= 8);
- { xxh_u32 const input_lo = XXH_readLE32(input);
- xxh_u32 const input_hi = XXH_readLE32(input + len - 4);
- xxh_u64 const input_64 = input_lo | ((xxh_u64)input_hi << 32);
- xxh_u64 const keyed = input_64 ^ (XXH_readLE64(secret) + seed);
- xxh_u64 const mix64 = len + ((keyed ^ (keyed >> 51)) * PRIME32_1);
- return XXH3_avalanche((mix64 ^ (mix64 >> 47)) * PRIME64_2);
+ XXH_ASSERT(4 <= len && len < 8);
+ seed ^= (xxh_u64)XXH_swap32((xxh_u32)seed) << 32;
+ { xxh_u32 const input1 = XXH_readLE32(input);
+ xxh_u32 const input2 = XXH_readLE32(input + len - 4);
+ xxh_u64 const bitflip = (XXH_readLE64(secret+8) ^ XXH_readLE64(secret+16)) - seed;
+ xxh_u64 const input64 = input2 + (((xxh_u64)input1) << 32);
+ xxh_u64 x = input64 ^ bitflip;
+ /* this mix is inspired by Pelle Evensen's rrmxmx */
+ x ^= XXH_rotl64(x, 49) ^ XXH_rotl64(x, 24);
+ x *= 0x9FB21C651E98DF25ULL;
+ x ^= (x >> 35) + len ;
+ x *= 0x9FB21C651E98DF25ULL;
+ return XXH_xorshift64(x, 28);
}
}
@@ -446,10 +721,14 @@ XXH3_len_9to16_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_
{
XXH_ASSERT(input != NULL);
XXH_ASSERT(secret != NULL);
- XXH_ASSERT(9 <= len && len <= 16);
- { xxh_u64 const input_lo = XXH_readLE64(input) ^ (XXH_readLE64(secret) + seed);
- xxh_u64 const input_hi = XXH_readLE64(input + len - 8) ^ (XXH_readLE64(secret + 8) - seed);
- xxh_u64 const acc = len + (input_lo + input_hi) + XXH3_mul128_fold64(input_lo, input_hi);
+ XXH_ASSERT(8 <= len && len <= 16);
+ { xxh_u64 const bitflip1 = (XXH_readLE64(secret+24) ^ XXH_readLE64(secret+32)) + seed;
+ xxh_u64 const bitflip2 = (XXH_readLE64(secret+40) ^ XXH_readLE64(secret+48)) - seed;
+ xxh_u64 const input_lo = XXH_readLE64(input) ^ bitflip1;
+ xxh_u64 const input_hi = XXH_readLE64(input + len - 8) ^ bitflip2;
+ xxh_u64 const acc = len
+ + XXH_swap64(input_lo) + input_hi
+ + XXH3_mul128_fold64(input_lo, input_hi);
return XXH3_avalanche(acc);
}
}
@@ -458,10 +737,152 @@ XXH_FORCE_INLINE XXH64_hash_t
XXH3_len_0to16_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed)
{
XXH_ASSERT(len <= 16);
- { if (len > 8) return XXH3_len_9to16_64b(input, len, secret, seed);
- if (len >= 4) return XXH3_len_4to8_64b(input, len, secret, seed);
+ { if (XXH_likely(len > 8)) return XXH3_len_9to16_64b(input, len, secret, seed);
+ if (XXH_likely(len >= 4)) return XXH3_len_4to8_64b(input, len, secret, seed);
if (len) return XXH3_len_1to3_64b(input, len, secret, seed);
- return 0;
+ return XXH3_avalanche((PRIME64_1 + seed) ^ (XXH_readLE64(secret+56) ^ XXH_readLE64(secret+64)));
+ }
+}
+
+/*
+ * DISCLAIMER: There are known *seed-dependent* multicollisions here due to
+ * multiplication by zero, affecting hashes of lengths 17 to 240.
+ *
+ * However, they are very unlikely.
+ *
+ * Keep this in mind when using the unseeded XXH3_64bits() variant: As with all
+ * unseeded non-cryptographic hashes, it does not attempt to defend itself
+ * against specially crafted inputs, only random inputs.
+ *
+ * Compared to classic UMAC where a 1 in 2^31 chance of 4 consecutive bytes
+ * cancelling out the secret is taken an arbitrary number of times (addressed
+ * in XXH3_accumulate_512), this collision is very unlikely with random inputs
+ * and/or proper seeding:
+ *
+ * This only has a 1 in 2^63 chance of 8 consecutive bytes cancelling out, in a
+ * function that is only called up to 16 times per hash with up to 240 bytes of
+ * input.
+ *
+ * This is not too bad for a non-cryptographic hash function, especially with
+ * only 64 bit outputs.
+ *
+ * The 128-bit variant (which trades some speed for strength) is NOT affected
+ * by this, although it is always a good idea to use a proper seed if you care
+ * about strength.
+ */
+XXH_FORCE_INLINE xxh_u64 XXH3_mix16B(const xxh_u8* XXH_RESTRICT input,
+ const xxh_u8* XXH_RESTRICT secret, xxh_u64 seed64)
+{
+#if defined(__GNUC__) && !defined(__clang__) /* GCC, not Clang */ \
+ && defined(__i386__) && defined(__SSE2__) /* x86 + SSE2 */ \
+ && !defined(XXH_ENABLE_AUTOVECTORIZE) /* Define to disable like XXH32 hack */
+ /*
+ * UGLY HACK:
+ * GCC for x86 tends to autovectorize the 128-bit multiply, resulting in
+ * slower code.
+ *
+ * By forcing seed64 into a register, we disrupt the cost model and
+ * cause it to scalarize. See `XXH32_round()`
+ *
+ * FIXME: Clang's output is still _much_ faster -- On an AMD Ryzen 3600,
+ * XXH3_64bits @ len=240 runs at 4.6 GB/s with Clang 9, but 3.3 GB/s on
+ * GCC 9.2, despite both emitting scalar code.
+ *
+ * GCC generates much better scalar code than Clang for the rest of XXH3,
+ * which is why finding a more optimal codepath is an interest.
+ */
+ __asm__ ("" : "+r" (seed64));
+#endif
+ { xxh_u64 const input_lo = XXH_readLE64(input);
+ xxh_u64 const input_hi = XXH_readLE64(input+8);
+ return XXH3_mul128_fold64(
+ input_lo ^ (XXH_readLE64(secret) + seed64),
+ input_hi ^ (XXH_readLE64(secret+8) - seed64)
+ );
+ }
+}
+
+/* For mid range keys, XXH3 uses a Mum-hash variant. */
+XXH_FORCE_INLINE XXH64_hash_t
+XXH3_len_17to128_64b(const xxh_u8* XXH_RESTRICT input, size_t len,
+ const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
+ XXH64_hash_t seed)
+{
+ XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize;
+ XXH_ASSERT(16 < len && len <= 128);
+
+ { xxh_u64 acc = len * PRIME64_1;
+ if (len > 32) {
+ if (len > 64) {
+ if (len > 96) {
+ acc += XXH3_mix16B(input+48, secret+96, seed);
+ acc += XXH3_mix16B(input+len-64, secret+112, seed);
+ }
+ acc += XXH3_mix16B(input+32, secret+64, seed);
+ acc += XXH3_mix16B(input+len-48, secret+80, seed);
+ }
+ acc += XXH3_mix16B(input+16, secret+32, seed);
+ acc += XXH3_mix16B(input+len-32, secret+48, seed);
+ }
+ acc += XXH3_mix16B(input+0, secret+0, seed);
+ acc += XXH3_mix16B(input+len-16, secret+16, seed);
+
+ return XXH3_avalanche(acc);
+ }
+}
+
+#define XXH3_MIDSIZE_MAX 240
+
+XXH_NO_INLINE XXH64_hash_t
+XXH3_len_129to240_64b(const xxh_u8* XXH_RESTRICT input, size_t len,
+ const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
+ XXH64_hash_t seed)
+{
+ XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize;
+ XXH_ASSERT(128 < len && len <= XXH3_MIDSIZE_MAX);
+
+ #define XXH3_MIDSIZE_STARTOFFSET 3
+ #define XXH3_MIDSIZE_LASTOFFSET 17
+
+ { xxh_u64 acc = len * PRIME64_1;
+ int const nbRounds = (int)len / 16;
+ int i;
+ for (i=0; i<8; i++) {
+ acc += XXH3_mix16B(input+(16*i), secret+(16*i), seed);
+ }
+ acc = XXH3_avalanche(acc);
+ XXH_ASSERT(nbRounds >= 8);
+#if defined(__clang__) /* Clang */ \
+ && (defined(__ARM_NEON) || defined(__ARM_NEON__)) /* NEON */ \
+ && !defined(XXH_ENABLE_AUTOVECTORIZE) /* Define to disable */
+ /*
+ * UGLY HACK:
+ * Clang for ARMv7-A tries to vectorize this loop, similar to GCC x86.
+ * In everywhere else, it uses scalar code.
+ *
+ * For 64->128-bit multiplies, even if the NEON was 100% optimal, it
+ * would still be slower than UMAAL (see XXH_mult64to128).
+ *
+ * Unfortunately, Clang doesn't handle the long multiplies properly and
+ * converts them to the nonexistent "vmulq_u64" intrinsic, which is then
+ * scalarized into an ugly mess of VMOV.32 instructions.
+ *
+ * This mess is difficult to avoid without turning autovectorization
+ * off completely, but they are usually relatively minor and/or not
+ * worth it to fix.
+ *
+ * This loop is the easiest to fix, as unlike XXH32, this pragma
+ * _actually works_ because it is a loop vectorization instead of an
+ * SLP vectorization.
+ */
+ #pragma clang loop vectorize(disable)
+#endif
+ for (i=8 ; i < nbRounds; i++) {
+ acc += XXH3_mix16B(input+(16*i), secret+(16*(i-8)) + XXH3_MIDSIZE_STARTOFFSET, seed);
+ }
+ /* last bytes */
+ acc += XXH3_mix16B(input + len - 16, secret + XXH3_SECRET_SIZE_MIN - XXH3_MIDSIZE_LASTOFFSET, seed);
+ return XXH3_avalanche(acc);
}
}
@@ -474,6 +895,28 @@ XXH3_len_0to16_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_
typedef enum { XXH3_acc_64bits, XXH3_acc_128bits } XXH3_accWidth_e;
+/*
+ * XXH3_accumulate_512 is the tightest loop for long inputs, and it is the most optimized.
+ *
+ * It is a hardened version of UMAC, based off of FARSH's implementation.
+ *
+ * This was chosen because it adapts quite well to 32-bit, 64-bit, and SIMD
+ * implementations, and it is ridiculously fast.
+ *
+ * We harden it by mixing the original input to the accumulators as well as the product.
+ *
+ * This means that in the (relatively likely) case of a multiply by zero, the
+ * original input is preserved.
+ *
+ * On 128-bit inputs, we swap 64-bit pairs when we add the input to improve
+ * cross-pollination, as otherwise the upper and lower halves would be
+ * essentially independent.
+ *
+ * This doesn't matter on 64-bit hashes since they all get merged together in
+ * the end, so we skip the extra step.
+ *
+ * Both XXH3_64bits and XXH3_128bits use this subroutine.
+ */
XXH_FORCE_INLINE void
XXH3_accumulate_512( void* XXH_RESTRICT acc,
const void* XXH_RESTRICT input,
@@ -483,46 +926,75 @@ XXH3_accumulate_512( void* XXH_RESTRICT acc,
#if (XXH_VECTOR == XXH_AVX2)
XXH_ASSERT((((size_t)acc) & 31) == 0);
- { XXH_ALIGN(32) __m256i* const xacc = (__m256i *) acc;
- const __m256i* const xinput = (const __m256i *) input; /* not really aligned, just for ptr arithmetic, and because _mm256_loadu_si256() requires this type */
- const __m256i* const xsecret = (const __m256i *) secret; /* not really aligned, just for ptr arithmetic, and because _mm256_loadu_si256() requires this type */
+ { XXH_ALIGN(32) __m256i* const xacc = (__m256i *) acc;
+ /* Unaligned. This is mainly for pointer arithmetic, and because
+ * _mm256_loadu_si256 requires a const __m256i * pointer for some reason. */
+ const __m256i* const xinput = (const __m256i *) input;
+ /* Unaligned. This is mainly for pointer arithmetic, and because
+ * _mm256_loadu_si256 requires a const __m256i * pointer for some reason. */
+ const __m256i* const xsecret = (const __m256i *) secret;
size_t i;
for (i=0; i < STRIPE_LEN/sizeof(__m256i); i++) {
- __m256i const data_vec = _mm256_loadu_si256 (xinput+i);
- __m256i const key_vec = _mm256_loadu_si256 (xsecret+i);
- __m256i const data_key = _mm256_xor_si256 (data_vec, key_vec); /* uint32 dk[8] = {d0+k0, d1+k1, d2+k2, d3+k3, ...} */
- __m256i const product = _mm256_mul_epu32 (data_key, _mm256_shuffle_epi32 (data_key, 0x31)); /* uint64 mul[4] = {dk0*dk1, dk2*dk3, ...} */
+ /* data_vec = xinput[i]; */
+ __m256i const data_vec = _mm256_loadu_si256 (xinput+i);
+ /* key_vec = xsecret[i]; */
+ __m256i const key_vec = _mm256_loadu_si256 (xsecret+i);
+ /* data_key = data_vec ^ key_vec; */
+ __m256i const data_key = _mm256_xor_si256 (data_vec, key_vec);
+ /* data_key_lo = data_key >> 32; */
+ __m256i const data_key_lo = _mm256_shuffle_epi32 (data_key, _MM_SHUFFLE(0, 3, 0, 1));
+ /* product = (data_key & 0xffffffff) * (data_key_lo & 0xffffffff); */
+ __m256i const product = _mm256_mul_epu32 (data_key, data_key_lo);
if (accWidth == XXH3_acc_128bits) {
- __m256i const data_swap = _mm256_shuffle_epi32(data_vec, _MM_SHUFFLE(1,0,3,2));
- __m256i const sum = _mm256_add_epi64(xacc[i], data_swap);
- xacc[i] = _mm256_add_epi64(product, sum);
+ /* xacc[i] += swap(data_vec); */
+ __m256i const data_swap = _mm256_shuffle_epi32(data_vec, _MM_SHUFFLE(1, 0, 3, 2));
+ __m256i const sum = _mm256_add_epi64(xacc[i], data_swap);
+ /* xacc[i] += product; */
+ xacc[i] = _mm256_add_epi64(product, sum);
} else { /* XXH3_acc_64bits */
+ /* xacc[i] += data_vec; */
__m256i const sum = _mm256_add_epi64(xacc[i], data_vec);
- xacc[i] = _mm256_add_epi64(product, sum);
+ /* xacc[i] += product; */
+ xacc[i] = _mm256_add_epi64(product, sum);
}
} }
#elif (XXH_VECTOR == XXH_SSE2)
+ /* SSE2 is just a half-scale version of the AVX2 version. */
XXH_ASSERT((((size_t)acc) & 15) == 0);
- { XXH_ALIGN(16) __m128i* const xacc = (__m128i *) acc;
- const __m128i* const xinput = (const __m128i *) input; /* not really aligned, just for ptr arithmetic, and because _mm_loadu_si128() requires this type */
- const __m128i* const xsecret = (const __m128i *) secret; /* not really aligned, just for ptr arithmetic, and because _mm_loadu_si128() requires this type */
+ { XXH_ALIGN(16) __m128i* const xacc = (__m128i *) acc;
+ /* Unaligned. This is mainly for pointer arithmetic, and because
+ * _mm_loadu_si128 requires a const __m128i * pointer for some reason. */
+ const __m128i* const xinput = (const __m128i *) input;
+ /* Unaligned. This is mainly for pointer arithmetic, and because
+ * _mm_loadu_si128 requires a const __m128i * pointer for some reason. */
+ const __m128i* const xsecret = (const __m128i *) secret;
size_t i;
for (i=0; i < STRIPE_LEN/sizeof(__m128i); i++) {
- __m128i const data_vec = _mm_loadu_si128 (xinput+i);
- __m128i const key_vec = _mm_loadu_si128 (xsecret+i);
- __m128i const data_key = _mm_xor_si128 (data_vec, key_vec); /* uint32 dk[8] = {d0+k0, d1+k1, d2+k2, d3+k3, ...} */
- __m128i const product = _mm_mul_epu32 (data_key, _mm_shuffle_epi32 (data_key, 0x31)); /* uint64 mul[4] = {dk0*dk1, dk2*dk3, ...} */
+ /* data_vec = xinput[i]; */
+ __m128i const data_vec = _mm_loadu_si128 (xinput+i);
+ /* key_vec = xsecret[i]; */
+ __m128i const key_vec = _mm_loadu_si128 (xsecret+i);
+ /* data_key = data_vec ^ key_vec; */
+ __m128i const data_key = _mm_xor_si128 (data_vec, key_vec);
+ /* data_key_lo = data_key >> 32; */
+ __m128i const data_key_lo = _mm_shuffle_epi32 (data_key, _MM_SHUFFLE(0, 3, 0, 1));
+ /* product = (data_key & 0xffffffff) * (data_key_lo & 0xffffffff); */
+ __m128i const product = _mm_mul_epu32 (data_key, data_key_lo);
if (accWidth == XXH3_acc_128bits) {
+ /* xacc[i] += swap(data_vec); */
__m128i const data_swap = _mm_shuffle_epi32(data_vec, _MM_SHUFFLE(1,0,3,2));
- __m128i const sum = _mm_add_epi64(xacc[i], data_swap);
- xacc[i] = _mm_add_epi64(product, sum);
+ __m128i const sum = _mm_add_epi64(xacc[i], data_swap);
+ /* xacc[i] += product; */
+ xacc[i] = _mm_add_epi64(product, sum);
} else { /* XXH3_acc_64bits */
+ /* xacc[i] += data_vec; */
__m128i const sum = _mm_add_epi64(xacc[i], data_vec);
- xacc[i] = _mm_add_epi64(product, sum);
+ /* xacc[i] += product; */
+ xacc[i] = _mm_add_epi64(product, sum);
}
} }
@@ -537,117 +1009,66 @@ XXH3_accumulate_512( void* XXH_RESTRICT acc,
size_t i;
for (i=0; i < STRIPE_LEN / sizeof(uint64x2_t); i++) {
-#if !defined(__aarch64__) && !defined(__arm64__) && defined(__GNUC__) /* ARM32-specific hack */
- /* vzip on ARMv7 Clang generates a lot of vmovs (technically vorrs) without this.
- * vzip on 32-bit ARM NEON will overwrite the original register, and I think that Clang
- * assumes I don't want to destroy it and tries to make a copy. This slows down the code
- * a lot.
- * aarch64 not only uses an entirely different syntax, but it requires three
- * instructions...
- * ext v1.16B, v0.16B, #8 // select high bits because aarch64 can't address them directly
- * zip1 v3.2s, v0.2s, v1.2s // first zip
- * zip2 v2.2s, v0.2s, v1.2s // second zip
- * ...to do what ARM does in one:
- * vzip.32 d0, d1 // Interleave high and low bits and overwrite. */
-
- /* data_vec = xsecret[i]; */
- uint8x16_t const data_vec = vld1q_u8(xinput + (i * 16));
- /* key_vec = xsecret[i]; */
- uint8x16_t const key_vec = vld1q_u8(xsecret + (i * 16));
- /* data_key = data_vec ^ key_vec; */
- uint32x4_t data_key;
-
- if (accWidth == XXH3_acc_64bits) {
- /* Add first to prevent register swaps */
- /* xacc[i] += data_vec; */
- xacc[i] = vaddq_u64 (xacc[i], vreinterpretq_u64_u8(data_vec));
- } else { /* XXH3_acc_128bits */
- /* xacc[i] += swap(data_vec); */
- /* can probably be optimized better */
- uint64x2_t const data64 = vreinterpretq_u64_u8(data_vec);
- uint64x2_t const swapped= vextq_u64(data64, data64, 1);
- xacc[i] = vaddq_u64 (xacc[i], swapped);
- }
-
- data_key = vreinterpretq_u32_u8(veorq_u8(data_vec, key_vec));
-
- /* Here's the magic. We use the quirkiness of vzip to shuffle data_key in place.
- * shuffle: data_key[0, 1, 2, 3] = data_key[0, 2, 1, 3] */
- __asm__("vzip.32 %e0, %f0" : "+w" (data_key));
- /* xacc[i] += (uint64x2_t) data_key[0, 1] * (uint64x2_t) data_key[2, 3]; */
- xacc[i] = vmlal_u32(xacc[i], vget_low_u32(data_key), vget_high_u32(data_key));
-
-#else
- /* On aarch64, vshrn/vmovn seems to be equivalent to, if not faster than, the vzip method. */
-
- /* data_vec = xsecret[i]; */
- uint8x16_t const data_vec = vld1q_u8(xinput + (i * 16));
+ /* data_vec = xinput[i]; */
+ uint8x16_t data_vec = vld1q_u8(xinput + (i * 16));
/* key_vec = xsecret[i]; */
- uint8x16_t const key_vec = vld1q_u8(xsecret + (i * 16));
+ uint8x16_t key_vec = vld1q_u8(xsecret + (i * 16));
/* data_key = data_vec ^ key_vec; */
- uint64x2_t const data_key = vreinterpretq_u64_u8(veorq_u8(data_vec, key_vec));
- /* data_key_lo = (uint32x2_t) (data_key & 0xFFFFFFFF); */
- uint32x2_t const data_key_lo = vmovn_u64 (data_key);
- /* data_key_hi = (uint32x2_t) (data_key >> 32); */
- uint32x2_t const data_key_hi = vshrn_n_u64 (data_key, 32);
+ uint64x2_t data_key = vreinterpretq_u64_u8(veorq_u8(data_vec, key_vec));
+ uint32x2_t data_key_lo, data_key_hi;
if (accWidth == XXH3_acc_64bits) {
/* xacc[i] += data_vec; */
xacc[i] = vaddq_u64 (xacc[i], vreinterpretq_u64_u8(data_vec));
} else { /* XXH3_acc_128bits */
/* xacc[i] += swap(data_vec); */
- uint64x2_t const data64 = vreinterpretq_u64_u8(data_vec);
- uint64x2_t const swapped= vextq_u64(data64, data64, 1);
+ uint64x2_t const data64 = vreinterpretq_u64_u8(data_vec);
+ uint64x2_t const swapped = vextq_u64(data64, data64, 1);
xacc[i] = vaddq_u64 (xacc[i], swapped);
}
+ /* data_key_lo = (uint32x2_t) (data_key & 0xFFFFFFFF);
+ * data_key_hi = (uint32x2_t) (data_key >> 32);
+ * data_key = UNDEFINED; */
+ XXH_SPLIT_IN_PLACE(data_key, data_key_lo, data_key_hi);
/* xacc[i] += (uint64x2_t) data_key_lo * (uint64x2_t) data_key_hi; */
xacc[i] = vmlal_u32 (xacc[i], data_key_lo, data_key_hi);
-#endif
}
}
#elif (XXH_VECTOR == XXH_VSX)
- U64x2* const xacc = (U64x2*) acc; /* presumed aligned */
- U64x2 const* const xinput = (U64x2 const*) input; /* no alignment restriction */
- U64x2 const* const xsecret = (U64x2 const*) secret; /* no alignment restriction */
- U64x2 const v32 = { 32, 32 };
-#if XXH_VSX_BE
- U8x16 const vXorSwap = { 0x07, 0x16, 0x25, 0x34, 0x43, 0x52, 0x61, 0x70,
- 0x8F, 0x9E, 0xAD, 0xBC, 0xCB, 0xDA, 0xE9, 0xF8 };
-#endif
+ xxh_u64x2* const xacc = (xxh_u64x2*) acc; /* presumed aligned */
+ xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */
+ xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */
+ xxh_u64x2 const v32 = { 32, 32 };
size_t i;
- for (i = 0; i < STRIPE_LEN / sizeof(U64x2); i++) {
+ for (i = 0; i < STRIPE_LEN / sizeof(xxh_u64x2); i++) {
/* data_vec = xinput[i]; */
+ xxh_u64x2 const data_vec = XXH_vec_loadu(xinput + i);
/* key_vec = xsecret[i]; */
-#if XXH_VSX_BE
- /* byteswap */
- U64x2 const data_vec = XXH_vec_revb(vec_vsx_ld(0, xinput + i));
- U64x2 const key_raw = vec_vsx_ld(0, xsecret + i);
- /* See comment above. data_key = data_vec ^ swap(xsecret[i]); */
- U64x2 const data_key = (U64x2)XXH_vec_permxor((U8x16)data_vec, (U8x16)key_raw, vXorSwap);
-#else
- U64x2 const data_vec = vec_vsx_ld(0, xinput + i);
- U64x2 const key_vec = vec_vsx_ld(0, xsecret + i);
- U64x2 const data_key = data_vec ^ key_vec;
-#endif
+ xxh_u64x2 const key_vec = XXH_vec_loadu(xsecret + i);
+ xxh_u64x2 const data_key = data_vec ^ key_vec;
/* shuffled = (data_key << 32) | (data_key >> 32); */
- U32x4 const shuffled = (U32x4)vec_rl(data_key, v32);
- /* product = ((U64x2)data_key & 0xFFFFFFFF) * ((U64x2)shuffled & 0xFFFFFFFF); */
- U64x2 const product = XXH_vec_mulo((U32x4)data_key, shuffled);
+ xxh_u32x4 const shuffled = (xxh_u32x4)vec_rl(data_key, v32);
+ /* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */
+ xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled);
xacc[i] += product;
if (accWidth == XXH3_acc_64bits) {
xacc[i] += data_vec;
} else { /* XXH3_acc_128bits */
/* swap high and low halves */
- U64x2 const data_swapped = vec_xxpermdi(data_vec, data_vec, 2);
+#ifdef __s390x__
+ xxh_u64x2 const data_swapped = vec_permi(data_vec, data_vec, 2);
+#else
+ xxh_u64x2 const data_swapped = vec_xxpermdi(data_vec, data_vec, 2);
+#endif
xacc[i] += data_swapped;
}
}
#else /* scalar variant of Accumulator - universal */
- XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64* const xacc = (xxh_u64*) acc; /* presumed aligned on 32-bytes boundaries, little hint for the auto-vectorizer */
+ XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64* const xacc = (xxh_u64*) acc; /* presumed aligned */
const xxh_u8* const xinput = (const xxh_u8*) input; /* no alignment restriction */
const xxh_u8* const xsecret = (const xxh_u8*) secret; /* no alignment restriction */
size_t i;
@@ -666,6 +1087,26 @@ XXH3_accumulate_512( void* XXH_RESTRICT acc,
#endif
}
+/*
+ * XXH3_scrambleAcc: Scrambles the accumulators to improve mixing.
+ *
+ * Multiplication isn't perfect, as explained by Google in HighwayHash:
+ *
+ * // Multiplication mixes/scrambles bytes 0-7 of the 64-bit result to
+ * // varying degrees. In descending order of goodness, bytes
+ * // 3 4 2 5 1 6 0 7 have quality 228 224 164 160 100 96 36 32.
+ * // As expected, the upper and lower bytes are much worse.
+ *
+ * Source: https://github.com/google/highwayhash/blob/0aaf66b/highwayhash/hh_avx2.h#L291
+ *
+ * Since our algorithm uses a pseudorandom secret to add some variance into the
+ * mix, we don't need to (or want to) mix as often or as much as HighwayHash does.
+ *
+ * This isn't as tight as XXH3_accumulate, but still written in SIMD to avoid
+ * extraction.
+ *
+ * Both XXH3_64bits and XXH3_128bits use this subroutine.
+ */
XXH_FORCE_INLINE void
XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
{
@@ -673,7 +1114,9 @@ XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
XXH_ASSERT((((size_t)acc) & 31) == 0);
{ XXH_ALIGN(32) __m256i* const xacc = (__m256i*) acc;
- const __m256i* const xsecret = (const __m256i *) secret; /* not really aligned, just for ptr arithmetic, and because _mm256_loadu_si256() requires this argument type */
+ /* Unaligned. This is mainly for pointer arithmetic, and because
+ * _mm256_loadu_si256 requires a const __m256i * pointer for some reason. */
+ const __m256i* const xsecret = (const __m256i *) secret;
const __m256i prime32 = _mm256_set1_epi32((int)PRIME32_1);
size_t i;
@@ -687,7 +1130,7 @@ XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
__m256i const data_key = _mm256_xor_si256 (data_vec, key_vec);
/* xacc[i] *= PRIME32_1; */
- __m256i const data_key_hi = _mm256_shuffle_epi32 (data_key, 0x31);
+ __m256i const data_key_hi = _mm256_shuffle_epi32 (data_key, _MM_SHUFFLE(0, 3, 0, 1));
__m256i const prod_lo = _mm256_mul_epu32 (data_key, prime32);
__m256i const prod_hi = _mm256_mul_epu32 (data_key_hi, prime32);
xacc[i] = _mm256_add_epi64(prod_lo, _mm256_slli_epi64(prod_hi, 32));
@@ -698,7 +1141,9 @@ XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
XXH_ASSERT((((size_t)acc) & 15) == 0);
{ XXH_ALIGN(16) __m128i* const xacc = (__m128i*) acc;
- const __m128i* const xsecret = (const __m128i *) secret; /* not really aligned, just for ptr arithmetic, and because _mm_loadu_si128() requires this argument type */
+ /* Unaligned. This is mainly for pointer arithmetic, and because
+ * _mm_loadu_si128 requires a const __m128i * pointer for some reason. */
+ const __m128i* const xsecret = (const __m128i *) secret;
const __m128i prime32 = _mm_set1_epi32((int)PRIME32_1);
size_t i;
@@ -707,12 +1152,12 @@ XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
__m128i const acc_vec = xacc[i];
__m128i const shifted = _mm_srli_epi64 (acc_vec, 47);
__m128i const data_vec = _mm_xor_si128 (acc_vec, shifted);
- /* xacc[i] ^= xsecret; */
+ /* xacc[i] ^= xsecret[i]; */
__m128i const key_vec = _mm_loadu_si128 (xsecret+i);
__m128i const data_key = _mm_xor_si128 (data_vec, key_vec);
/* xacc[i] *= PRIME32_1; */
- __m128i const data_key_hi = _mm_shuffle_epi32 (data_key, 0x31);
+ __m128i const data_key_hi = _mm_shuffle_epi32 (data_key, _MM_SHUFFLE(0, 3, 0, 1));
__m128i const prod_lo = _mm_mul_epu32 (data_key, prime32);
__m128i const prod_hi = _mm_mul_epu32 (data_key_hi, prime32);
xacc[i] = _mm_add_epi64(prod_lo, _mm_slli_epi64(prod_hi, 32));
@@ -723,80 +1168,91 @@ XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
XXH_ASSERT((((size_t)acc) & 15) == 0);
- { uint64x2_t* const xacc = (uint64x2_t*) acc;
- uint8_t const* const xsecret = (uint8_t const*) secret;
- uint32x2_t const prime = vdup_n_u32 (PRIME32_1);
+ { uint64x2_t* xacc = (uint64x2_t*) acc;
+ uint8_t const* xsecret = (uint8_t const*) secret;
+ uint32x2_t prime = vdup_n_u32 (PRIME32_1);
size_t i;
for (i=0; i < STRIPE_LEN/sizeof(uint64x2_t); i++) {
- /* data_vec = xacc[i] ^ (xacc[i] >> 47); */
- uint64x2_t const acc_vec = xacc[i];
- uint64x2_t const shifted = vshrq_n_u64 (acc_vec, 47);
- uint64x2_t const data_vec = veorq_u64 (acc_vec, shifted);
-
- /* key_vec = xsecret[i]; */
- uint32x4_t const key_vec = vreinterpretq_u32_u8(vld1q_u8(xsecret + (i * 16)));
- /* data_key = data_vec ^ key_vec; */
- uint32x4_t const data_key = veorq_u32 (vreinterpretq_u32_u64(data_vec), key_vec);
- /* shuffled = { data_key[0, 2], data_key[1, 3] }; */
- uint32x2x2_t const shuffled = vzip_u32 (vget_low_u32(data_key), vget_high_u32(data_key));
-
- /* data_key *= PRIME32_1 */
-
- /* prod_hi = (data_key >> 32) * PRIME32_1; */
- uint64x2_t const prod_hi = vmull_u32 (shuffled.val[1], prime);
- /* xacc[i] = prod_hi << 32; */
- xacc[i] = vshlq_n_u64(prod_hi, 32);
- /* xacc[i] += (prod_hi & 0xFFFFFFFF) * PRIME32_1; */
- xacc[i] = vmlal_u32(xacc[i], shuffled.val[0], prime);
+ /* xacc[i] ^= (xacc[i] >> 47); */
+ uint64x2_t acc_vec = xacc[i];
+ uint64x2_t shifted = vshrq_n_u64 (acc_vec, 47);
+ uint64x2_t data_vec = veorq_u64 (acc_vec, shifted);
+
+ /* xacc[i] ^= xsecret[i]; */
+ uint8x16_t key_vec = vld1q_u8(xsecret + (i * 16));
+ uint64x2_t data_key = veorq_u64(data_vec, vreinterpretq_u64_u8(key_vec));
+
+ /* xacc[i] *= PRIME32_1 */
+ uint32x2_t data_key_lo, data_key_hi;
+ /* data_key_lo = (uint32x2_t) (xacc[i] & 0xFFFFFFFF);
+ * data_key_hi = (uint32x2_t) (xacc[i] >> 32);
+ * xacc[i] = UNDEFINED; */
+ XXH_SPLIT_IN_PLACE(data_key, data_key_lo, data_key_hi);
+ { /*
+ * prod_hi = (data_key >> 32) * PRIME32_1;
+ *
+ * Avoid vmul_u32 + vshll_n_u32 since Clang 6 and 7 will
+ * incorrectly "optimize" this:
+ * tmp = vmul_u32(vmovn_u64(a), vmovn_u64(b));
+ * shifted = vshll_n_u32(tmp, 32);
+ * to this:
+ * tmp = "vmulq_u64"(a, b); // no such thing!
+ * shifted = vshlq_n_u64(tmp, 32);
+ *
+ * However, unlike SSE, Clang lacks a 64-bit multiply routine
+ * for NEON, and it scalarizes two 64-bit multiplies instead.
+ *
+ * vmull_u32 has the same timing as vmul_u32, and it avoids
+ * this bug completely.
+ * See https://bugs.llvm.org/show_bug.cgi?id=39967
+ */
+ uint64x2_t prod_hi = vmull_u32 (data_key_hi, prime);
+ /* xacc[i] = prod_hi << 32; */
+ xacc[i] = vshlq_n_u64(prod_hi, 32);
+ /* xacc[i] += (prod_hi & 0xFFFFFFFF) * PRIME32_1; */
+ xacc[i] = vmlal_u32(xacc[i], data_key_lo, prime);
+ }
} }
#elif (XXH_VECTOR == XXH_VSX)
- U64x2* const xacc = (U64x2*) acc;
- const U64x2* const xsecret = (const U64x2*) secret;
- /* constants */
- U64x2 const v32 = { 32, 32 };
- U64x2 const v47 = { 47, 47 };
- U32x4 const prime = { PRIME32_1, PRIME32_1, PRIME32_1, PRIME32_1 };
- size_t i;
-#if XXH_VSX_BE
- /* endian swap */
- U8x16 const vXorSwap = { 0x07, 0x16, 0x25, 0x34, 0x43, 0x52, 0x61, 0x70,
- 0x8F, 0x9E, 0xAD, 0xBC, 0xCB, 0xDA, 0xE9, 0xF8 };
-#endif
- for (i = 0; i < STRIPE_LEN / sizeof(U64x2); i++) {
- U64x2 const acc_vec = xacc[i];
- U64x2 const data_vec = acc_vec ^ (acc_vec >> v47);
- /* key_vec = xsecret[i]; */
-#if XXH_VSX_BE
- /* swap bytes words */
- U64x2 const key_raw = vec_vsx_ld(0, xsecret + i);
- U64x2 const data_key = (U64x2)XXH_vec_permxor((U8x16)data_vec, (U8x16)key_raw, vXorSwap);
-#else
- U64x2 const key_vec = vec_vsx_ld(0, xsecret + i);
- U64x2 const data_key = data_vec ^ key_vec;
-#endif
-
- /* data_key *= PRIME32_1 */
+ XXH_ASSERT((((size_t)acc) & 15) == 0);
- /* prod_lo = ((U64x2)data_key & 0xFFFFFFFF) * ((U64x2)prime & 0xFFFFFFFF); */
- U64x2 const prod_even = XXH_vec_mule((U32x4)data_key, prime);
- /* prod_hi = ((U64x2)data_key >> 32) * ((U64x2)prime >> 32); */
- U64x2 const prod_odd = XXH_vec_mulo((U32x4)data_key, prime);
- xacc[i] = prod_odd + (prod_even << v32);
- }
+ { xxh_u64x2* const xacc = (xxh_u64x2*) acc;
+ const xxh_u64x2* const xsecret = (const xxh_u64x2*) secret;
+ /* constants */
+ xxh_u64x2 const v32 = { 32, 32 };
+ xxh_u64x2 const v47 = { 47, 47 };
+ xxh_u32x4 const prime = { PRIME32_1, PRIME32_1, PRIME32_1, PRIME32_1 };
+ size_t i;
+ for (i = 0; i < STRIPE_LEN / sizeof(xxh_u64x2); i++) {
+ /* xacc[i] ^= (xacc[i] >> 47); */
+ xxh_u64x2 const acc_vec = xacc[i];
+ xxh_u64x2 const data_vec = acc_vec ^ (acc_vec >> v47);
+
+ /* xacc[i] ^= xsecret[i]; */
+ xxh_u64x2 const key_vec = XXH_vec_loadu(xsecret + i);
+ xxh_u64x2 const data_key = data_vec ^ key_vec;
+
+ /* xacc[i] *= PRIME32_1 */
+ /* prod_lo = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)prime & 0xFFFFFFFF); */
+ xxh_u64x2 const prod_even = XXH_vec_mule((xxh_u32x4)data_key, prime);
+ /* prod_hi = ((xxh_u64x2)data_key >> 32) * ((xxh_u64x2)prime >> 32); */
+ xxh_u64x2 const prod_odd = XXH_vec_mulo((xxh_u32x4)data_key, prime);
+ xacc[i] = prod_odd + (prod_even << v32);
+ } }
#else /* scalar variant of Scrambler - universal */
- XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64* const xacc = (xxh_u64*) acc; /* presumed aligned on 32-bytes boundaries, little hint for the auto-vectorizer */
+ XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64* const xacc = (xxh_u64*) acc; /* presumed aligned */
const xxh_u8* const xsecret = (const xxh_u8*) secret; /* no alignment restriction */
size_t i;
XXH_ASSERT((((size_t)acc) & (XXH_ACC_ALIGN-1)) == 0);
for (i=0; i < ACC_NB; i++) {
xxh_u64 const key64 = XXH_readLE64(xsecret + 8*i);
xxh_u64 acc64 = xacc[i];
- acc64 ^= acc64 >> 47;
+ acc64 = XXH_xorshift64(acc64, 47);
acc64 ^= key64;
acc64 *= PRIME32_1;
xacc[i] = acc64;
@@ -805,9 +1261,15 @@ XXH3_scrambleAcc(void* XXH_RESTRICT acc, const void* XXH_RESTRICT secret)
#endif
}
-/* assumption : nbStripes will not overflow secret size */
+#define XXH_PREFETCH_DIST 384
+
+/*
+ * XXH3_accumulate()
+ * Loops over XXH3_accumulate_512().
+ * Assumption: nbStripes will not overflow the secret size
+ */
XXH_FORCE_INLINE void
-XXH3_accumulate( xxh_u64* XXH_RESTRICT acc,
+XXH3_accumulate( xxh_u64* XXH_RESTRICT acc,
const xxh_u8* XXH_RESTRICT input,
const xxh_u8* XXH_RESTRICT secret,
size_t nbStripes,
@@ -815,24 +1277,16 @@ XXH3_accumulate( xxh_u64* XXH_RESTRICT acc,
{
size_t n;
for (n = 0; n < nbStripes; n++ ) {
+ const xxh_u8* const in = input + n*STRIPE_LEN;
+ XXH_PREFETCH(in + XXH_PREFETCH_DIST);
XXH3_accumulate_512(acc,
- input + n*STRIPE_LEN,
+ in,
secret + n*XXH_SECRET_CONSUME_RATE,
accWidth);
}
}
-/* note : clang auto-vectorizes well in SS2 mode _if_ this function is `static`,
- * and doesn't auto-vectorize it at all if it is `FORCE_INLINE`.
- * However, it auto-vectorizes better AVX2 if it is `FORCE_INLINE`
- * Pretty much every other modes and compilers prefer `FORCE_INLINE`.
- */
-
-#if defined(__clang__) && (XXH_VECTOR==0) && !defined(__AVX2__) && !defined(__arm__) && !defined(__thumb__)
-static void
-#else
XXH_FORCE_INLINE void
-#endif
XXH3_hashLong_internal_loop( xxh_u64* XXH_RESTRICT acc,
const xxh_u8* XXH_RESTRICT input, size_t len,
const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
@@ -860,7 +1314,8 @@ XXH3_hashLong_internal_loop( xxh_u64* XXH_RESTRICT acc,
/* last stripe */
if (len & (STRIPE_LEN - 1)) {
const xxh_u8* const p = input + len - STRIPE_LEN;
-#define XXH_SECRET_LASTACC_START 7 /* do not align on 8, so that secret is different from scrambler */
+ /* Do not align on 8, so that the secret is different from the scrambler */
+#define XXH_SECRET_LASTACC_START 7
XXH3_accumulate_512(acc, p, secret + secretSize - STRIPE_LEN - XXH_SECRET_LASTACC_START, accWidth);
} }
}
@@ -899,19 +1354,27 @@ XXH3_hashLong_internal(const xxh_u8* XXH_RESTRICT input, size_t len,
/* converge into final hash */
XXH_STATIC_ASSERT(sizeof(acc) == 64);
-#define XXH_SECRET_MERGEACCS_START 11 /* do not align on 8, so that secret is different from accumulator */
+ /* do not align on 8, so that the secret is different from the accumulator */
+#define XXH_SECRET_MERGEACCS_START 11
XXH_ASSERT(secretSize >= sizeof(acc) + XXH_SECRET_MERGEACCS_START);
return XXH3_mergeAccs(acc, secret + XXH_SECRET_MERGEACCS_START, (xxh_u64)len * PRIME64_1);
}
-
-XXH_NO_INLINE XXH64_hash_t /* It's important for performance that XXH3_hashLong is not inlined. Not sure why (uop cache maybe ?), but difference is large and easily measurable */
+/*
+ * It's important for performance that XXH3_hashLong is not inlined. Not sure
+ * why (uop cache maybe?), but the difference is large and easily measurable.
+ */
+XXH_NO_INLINE XXH64_hash_t
XXH3_hashLong_64b_defaultSecret(const xxh_u8* XXH_RESTRICT input, size_t len)
{
return XXH3_hashLong_internal(input, len, kSecret, sizeof(kSecret));
}
-XXH_NO_INLINE XXH64_hash_t /* It's important for performance that XXH3_hashLong is not inlined. Not sure why (uop cache maybe ?), but difference is large and easily measurable */
+/*
+ * It's important for performance that XXH3_hashLong is not inlined. Not sure
+ * why (uop cache maybe?), but the difference is large and easily measurable.
+ */
+XXH_NO_INLINE XXH64_hash_t
XXH3_hashLong_64b_withSecret(const xxh_u8* XXH_RESTRICT input, size_t len,
const xxh_u8* XXH_RESTRICT secret, size_t secretSize)
{
@@ -942,14 +1405,18 @@ XXH_FORCE_INLINE void XXH3_initCustomSecret(xxh_u8* customSecret, xxh_u64 seed64
}
-/* XXH3_hashLong_64b_withSeed() :
- * Generate a custom key,
- * based on alteration of default kSecret with the seed,
+/*
+ * XXH3_hashLong_64b_withSeed():
+ * Generate a custom key based on alteration of default kSecret with the seed,
* and then use this key for long mode hashing.
+ *
* This operation is decently fast but nonetheless costs a little bit of time.
* Try to avoid it whenever possible (typically when seed==0).
+ *
+ * It's important for performance that XXH3_hashLong is not inlined. Not sure
+ * why (uop cache maybe?), but the difference is large and easily measurable.
*/
-XXH_NO_INLINE XXH64_hash_t /* It's important for performance that XXH3_hashLong is not inlined. Not sure why (uop cache maybe ?), but difference is large and easily measurable */
+XXH_NO_INLINE XXH64_hash_t
XXH3_hashLong_64b_withSeed(const xxh_u8* input, size_t len, XXH64_hash_t seed)
{
XXH_ALIGN(8) xxh_u8 secret[XXH_SECRET_DEFAULT_SIZE];
@@ -958,76 +1425,6 @@ XXH3_hashLong_64b_withSeed(const xxh_u8* input, size_t len, XXH64_hash_t seed)
return XXH3_hashLong_internal(input, len, secret, sizeof(secret));
}
-
-XXH_FORCE_INLINE xxh_u64 XXH3_mix16B(const xxh_u8* XXH_RESTRICT input,
- const xxh_u8* XXH_RESTRICT secret, xxh_u64 seed64)
-{
- xxh_u64 const input_lo = XXH_readLE64(input);
- xxh_u64 const input_hi = XXH_readLE64(input+8);
- return XXH3_mul128_fold64(
- input_lo ^ (XXH_readLE64(secret) + seed64),
- input_hi ^ (XXH_readLE64(secret+8) - seed64) );
-}
-
-
-XXH_FORCE_INLINE XXH64_hash_t
-XXH3_len_17to128_64b(const xxh_u8* XXH_RESTRICT input, size_t len,
- const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
- XXH64_hash_t seed)
-{
- XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize;
- XXH_ASSERT(16 < len && len <= 128);
-
- { xxh_u64 acc = len * PRIME64_1;
- if (len > 32) {
- if (len > 64) {
- if (len > 96) {
- acc += XXH3_mix16B(input+48, secret+96, seed);
- acc += XXH3_mix16B(input+len-64, secret+112, seed);
- }
- acc += XXH3_mix16B(input+32, secret+64, seed);
- acc += XXH3_mix16B(input+len-48, secret+80, seed);
- }
- acc += XXH3_mix16B(input+16, secret+32, seed);
- acc += XXH3_mix16B(input+len-32, secret+48, seed);
- }
- acc += XXH3_mix16B(input+0, secret+0, seed);
- acc += XXH3_mix16B(input+len-16, secret+16, seed);
-
- return XXH3_avalanche(acc);
- }
-}
-
-#define XXH3_MIDSIZE_MAX 240
-
-XXH_NO_INLINE XXH64_hash_t
-XXH3_len_129to240_64b(const xxh_u8* XXH_RESTRICT input, size_t len,
- const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
- XXH64_hash_t seed)
-{
- XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize;
- XXH_ASSERT(128 < len && len <= XXH3_MIDSIZE_MAX);
-
- #define XXH3_MIDSIZE_STARTOFFSET 3
- #define XXH3_MIDSIZE_LASTOFFSET 17
-
- { xxh_u64 acc = len * PRIME64_1;
- int const nbRounds = (int)len / 16;
- int i;
- for (i=0; i<8; i++) {
- acc += XXH3_mix16B(input+(16*i), secret+(16*i), seed);
- }
- acc = XXH3_avalanche(acc);
- XXH_ASSERT(nbRounds >= 8);
- for (i=8 ; i < nbRounds; i++) {
- acc += XXH3_mix16B(input+(16*i), secret+(16*(i-8)) + XXH3_MIDSIZE_STARTOFFSET, seed);
- }
- /* last bytes */
- acc += XXH3_mix16B(input + len - 16, secret + XXH3_SECRET_SIZE_MIN - XXH3_MIDSIZE_LASTOFFSET, seed);
- return XXH3_avalanche(acc);
- }
-}
-
/* === Public entry point === */
XXH_PUBLIC_API XXH64_hash_t XXH3_64bits(const void* input, size_t len)
@@ -1042,14 +1439,16 @@ XXH_PUBLIC_API XXH64_hash_t
XXH3_64bits_withSecret(const void* input, size_t len, const void* secret, size_t secretSize)
{
XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN);
- /* if an action must be taken should `secret` conditions not be respected,
+ /*
+ * If an action is to be taken if `secret` conditions are not respected,
* it should be done here.
* For now, it's a contract pre-condition.
- * Adding a check and a branch here would cost performance at every hash */
- if (len <= 16) return XXH3_len_0to16_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, 0);
- if (len <= 128) return XXH3_len_17to128_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, 0);
- if (len <= XXH3_MIDSIZE_MAX) return XXH3_len_129to240_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, 0);
- return XXH3_hashLong_64b_withSecret((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize);
+ * Adding a check and a branch here would cost performance at every hash.
+ */
+ if (len <= 16) return XXH3_len_0to16_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, 0);
+ if (len <= 128) return XXH3_len_17to128_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, 0);
+ if (len <= XXH3_MIDSIZE_MAX) return XXH3_len_129to240_64b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, 0);
+ return XXH3_hashLong_64b_withSecret((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize);
}
XXH_PUBLIC_API XXH64_hash_t
@@ -1152,6 +1551,9 @@ XXH3_consumeStripes( xxh_u64* acc,
}
}
+/*
+ * Both XXH3_64bits_update and XXH3_128bits_update use this routine.
+ */
XXH_FORCE_INLINE XXH_errorcode
XXH3_update(XXH3_state_t* state, const xxh_u8* input, size_t len, XXH3_accWidth_e accWidth)
{
@@ -1171,12 +1573,16 @@ XXH3_update(XXH3_state_t* state, const xxh_u8* input, size_t len, XXH3_accWidth_
state->bufferedSize += (XXH32_hash_t)len;
return XXH_OK;
}
- /* input now > XXH3_INTERNALBUFFER_SIZE */
+ /* input is now > XXH3_INTERNALBUFFER_SIZE */
#define XXH3_INTERNALBUFFER_STRIPES (XXH3_INTERNALBUFFER_SIZE / STRIPE_LEN)
XXH_STATIC_ASSERT(XXH3_INTERNALBUFFER_SIZE % STRIPE_LEN == 0); /* clean multiple */
- if (state->bufferedSize) { /* some input within internal buffer: fill then consume it */
+ /*
+ * There is some input left inside the internal buffer.
+ * Fill it, then consume it.
+ */
+ if (state->bufferedSize) {
size_t const loadSize = XXH3_INTERNALBUFFER_SIZE - state->bufferedSize;
XXH_memcpy(state->buffer + state->bufferedSize, input, loadSize);
input += loadSize;
@@ -1188,7 +1594,7 @@ XXH3_update(XXH3_state_t* state, const xxh_u8* input, size_t len, XXH3_accWidth_
state->bufferedSize = 0;
}
- /* consume input by full buffer quantities */
+ /* Consume input by full buffer quantities */
if (input+XXH3_INTERNALBUFFER_SIZE <= bEnd) {
const xxh_u8* const limit = bEnd - XXH3_INTERNALBUFFER_SIZE;
do {
@@ -1201,7 +1607,7 @@ XXH3_update(XXH3_state_t* state, const xxh_u8* input, size_t len, XXH3_accWidth_
} while (input<=limit);
}
- if (input < bEnd) { /* some remaining input input : buffer it */
+ if (input < bEnd) { /* Some remaining input: buffer it */
XXH_memcpy(state->buffer, input, (size_t)(bEnd-input));
state->bufferedSize = (XXH32_hash_t)(bEnd-input);
}
@@ -1220,7 +1626,11 @@ XXH3_64bits_update(XXH3_state_t* state, const void* input, size_t len)
XXH_FORCE_INLINE void
XXH3_digest_long (XXH64_hash_t* acc, const XXH3_state_t* state, XXH3_accWidth_e accWidth)
{
- memcpy(acc, state->acc, sizeof(state->acc)); /* digest locally, state remains unaltered, and can continue ingesting more input afterwards */
+ /*
+ * Digest on a local copy. This way, the state remains unaltered, and it can
+ * continue ingesting more input afterwards.
+ */
+ memcpy(acc, state->acc, sizeof(state->acc));
if (state->bufferedSize >= STRIPE_LEN) {
size_t const totalNbStripes = state->bufferedSize / STRIPE_LEN;
XXH32_hash_t nbStripesSoFar = state->nbStripesSoFar;
@@ -1271,40 +1681,52 @@ XXH3_len_1to3_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_
XXH_ASSERT(input != NULL);
XXH_ASSERT(1 <= len && len <= 3);
XXH_ASSERT(secret != NULL);
+ /*
+ * len = 1: combinedl = { input[0], 0x01, input[0], input[0] }
+ * len = 2: combinedl = { input[1], 0x02, input[0], input[1] }
+ * len = 3: combinedl = { input[2], 0x03, input[0], input[1] }
+ */
{ xxh_u8 const c1 = input[0];
xxh_u8 const c2 = input[len >> 1];
xxh_u8 const c3 = input[len - 1];
- xxh_u32 const combinedl = ((xxh_u32)c1) + (((xxh_u32)c2) << 8) + (((xxh_u32)c3) << 16) + (((xxh_u32)len) << 24);
- xxh_u32 const combinedh = XXH_swap32(combinedl);
- xxh_u64 const keyed_lo = (xxh_u64)combinedl ^ (XXH_readLE32(secret) + seed);
- xxh_u64 const keyed_hi = (xxh_u64)combinedh ^ (XXH_readLE32(secret+4) - seed);
- xxh_u64 const mixedl = keyed_lo * PRIME64_1;
- xxh_u64 const mixedh = keyed_hi * PRIME64_5;
+ xxh_u32 const combinedl = ((xxh_u32)c1<<16) | (((xxh_u32)c2) << 24) | (((xxh_u32)c3) << 0) | (((xxh_u32)len) << 8);
+ xxh_u32 const combinedh = XXH_rotl32(XXH_swap32(combinedl), 13);
+ xxh_u64 const bitflipl = (XXH_readLE32(secret) ^ XXH_readLE32(secret+4)) + seed;
+ xxh_u64 const bitfliph = (XXH_readLE32(secret+8) ^ XXH_readLE32(secret+12)) - seed;
+ xxh_u64 const keyed_lo = (xxh_u64)combinedl ^ bitflipl;
+ xxh_u64 const keyed_hi = (xxh_u64)combinedh ^ bitfliph;
+ xxh_u64 const mixedl = keyed_lo * PRIME64_1;
+ xxh_u64 const mixedh = keyed_hi * PRIME64_5;
XXH128_hash_t const h128 = { XXH3_avalanche(mixedl) /*low64*/, XXH3_avalanche(mixedh) /*high64*/ };
return h128;
}
}
-
XXH_FORCE_INLINE XXH128_hash_t
XXH3_len_4to8_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_hash_t seed)
{
XXH_ASSERT(input != NULL);
XXH_ASSERT(secret != NULL);
XXH_ASSERT(4 <= len && len <= 8);
+ seed ^= (xxh_u64)XXH_swap32((xxh_u32)seed) << 32;
{ xxh_u32 const input_lo = XXH_readLE32(input);
xxh_u32 const input_hi = XXH_readLE32(input + len - 4);
- xxh_u64 const input_64_lo = input_lo + ((xxh_u64)input_hi << 32);
- xxh_u64 const input_64_hi = XXH_swap64(input_64_lo);
- xxh_u64 const keyed_lo = input_64_lo ^ (XXH_readLE64(secret) + seed);
- xxh_u64 const keyed_hi = input_64_hi ^ (XXH_readLE64(secret + 8) - seed);
- xxh_u64 const mix64l1 = len + ((keyed_lo ^ (keyed_lo >> 51)) * PRIME32_1);
- xxh_u64 const mix64l2 = (mix64l1 ^ (mix64l1 >> 47)) * PRIME64_2;
- xxh_u64 const mix64h1 = ((keyed_hi ^ (keyed_hi >> 47)) * PRIME64_1) - len;
- xxh_u64 const mix64h2 = (mix64h1 ^ (mix64h1 >> 43)) * PRIME64_4;
- { XXH128_hash_t const h128 = { XXH3_avalanche(mix64l2) /*low64*/, XXH3_avalanche(mix64h2) /*high64*/ };
- return h128;
- } }
+ xxh_u64 const input_64 = input_lo + ((xxh_u64)input_hi << 32);
+ xxh_u64 const bitflip = (XXH_readLE64(secret+16) ^ XXH_readLE64(secret+24)) + seed;
+ xxh_u64 const keyed = input_64 ^ bitflip;
+
+ /* Shift len to the left to ensure it is even, this avoids even multiplies. */
+ XXH128_hash_t m128 = XXH_mult64to128(keyed, PRIME64_1 + (len << 2));
+
+ m128.high64 += (m128.low64 << 1);
+ m128.low64 ^= (m128.high64 >> 3);
+
+ m128.low64 = XXH_xorshift64(m128.low64, 35);
+ m128.low64 *= 0x9FB21C651E98DF25ULL;
+ m128.low64 = XXH_xorshift64(m128.low64, 28);
+ m128.high64 = XXH3_avalanche(m128.high64);
+ return m128;
+ }
}
XXH_FORCE_INLINE XXH128_hash_t
@@ -1313,15 +1735,66 @@ XXH3_len_9to16_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64
XXH_ASSERT(input != NULL);
XXH_ASSERT(secret != NULL);
XXH_ASSERT(9 <= len && len <= 16);
- { xxh_u64 const input_lo = XXH_readLE64(input) ^ (XXH_readLE64(secret) + seed);
- xxh_u64 const input_hi = XXH_readLE64(input + len - 8) ^ (XXH_readLE64(secret+8) - seed);
- XXH128_hash_t m128 = XXH_mult64to128(input_lo ^ input_hi, PRIME64_1);
- xxh_u64 const lenContrib = XXH_mult32to64(len, PRIME32_5);
- m128.low64 += lenContrib;
- m128.high64 += input_hi * PRIME64_1;
- m128.low64 ^= (m128.high64 >> 32);
- { XXH128_hash_t h128 = XXH_mult64to128(m128.low64, PRIME64_2);
+ { xxh_u64 const bitflipl = (XXH_readLE64(secret+32) ^ XXH_readLE64(secret+40)) - seed;
+ xxh_u64 const bitfliph = (XXH_readLE64(secret+48) ^ XXH_readLE64(secret+56)) + seed;
+ xxh_u64 const input_lo = XXH_readLE64(input);
+ xxh_u64 input_hi = XXH_readLE64(input + len - 8);
+ XXH128_hash_t m128 = XXH_mult64to128(input_lo ^ input_hi ^ bitflipl, PRIME64_1);
+ /*
+ * Put len in the middle of m128 to ensure that the length gets mixed to
+ * both the low and high bits in the 128x64 multiply below.
+ */
+ m128.low64 += (xxh_u64)(len - 1) << 54;
+ input_hi ^= bitfliph;
+ /*
+ * Add the high 32 bits of input_hi to the high 32 bits of m128, then
+ * add the long product of the low 32 bits of input_hi and PRIME32_2 to
+ * the high 64 bits of m128.
+ *
+ * The best approach to this operation is different on 32-bit and 64-bit.
+ */
+ if (sizeof(void *) < sizeof(xxh_u64)) { /* 32-bit */
+ /*
+ * 32-bit optimized version, which is more readable.
+ *
+ * On 32-bit, it removes an ADC and delays a dependency between the two
+ * halves of m128.high64, but it generates an extra mask on 64-bit.
+ */
+ m128.high64 += (input_hi & 0xFFFFFFFF00000000) + XXH_mult32to64((xxh_u32)input_hi, PRIME32_2);
+ } else {
+ /*
+ * 64-bit optimized (albeit more confusing) version.
+ *
+ * Uses some properties of addition and multiplication to remove the mask:
+ *
+ * Let:
+ * a = input_hi.lo = (input_hi & 0x00000000FFFFFFFF)
+ * b = input_hi.hi = (input_hi & 0xFFFFFFFF00000000)
+ * c = PRIME32_2
+ *
+ * a + (b * c)
+ * Inverse Property: x + y - x == y
+ * a + (b * (1 + c - 1))
+ * Distributive Property: x * (y + z) == (x * y) + (x * z)
+ * a + (b * 1) + (b * (c - 1))
+ * Identity Property: x * 1 == x
+ * a + b + (b * (c - 1))
+ *
+ * Substitute a, b, and c:
+ * input_hi.hi + input_hi.lo + ((xxh_u64)input_hi.lo * (PRIME32_2 - 1))
+ *
+ * Since input_hi.hi + input_hi.lo == input_hi, we get this:
+ * input_hi + ((xxh_u64)input_hi.lo * (PRIME32_2 - 1))
+ */
+ m128.high64 += input_hi + XXH_mult32to64((xxh_u32)input_hi, PRIME32_2 - 1);
+ }
+ /* m128 ^= XXH_swap64(m128 >> 64); */
+ m128.low64 ^= XXH_swap64(m128.high64);
+
+ { /* 128x64 multiply: h128 = m128 * PRIME64_2; */
+ XXH128_hash_t h128 = XXH_mult64to128(m128.low64, PRIME64_2);
h128.high64 += m128.high64 * PRIME64_2;
+
h128.low64 = XXH3_avalanche(h128.low64);
h128.high64 = XXH3_avalanche(h128.high64);
return h128;
@@ -1337,52 +1810,18 @@ XXH3_len_0to16_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64
{ if (len > 8) return XXH3_len_9to16_128b(input, len, secret, seed);
if (len >= 4) return XXH3_len_4to8_128b(input, len, secret, seed);
if (len) return XXH3_len_1to3_128b(input, len, secret, seed);
- { XXH128_hash_t const h128 = { 0, 0 };
+ { XXH128_hash_t h128;
+ xxh_u64 const bitflipl = XXH_readLE64(secret+64) ^ XXH_readLE64(secret+72);
+ xxh_u64 const bitfliph = XXH_readLE64(secret+80) ^ XXH_readLE64(secret+88);
+ h128.low64 = XXH3_avalanche((PRIME64_1 + seed) ^ bitflipl);
+ h128.high64 = XXH3_avalanche((PRIME64_2 - seed) ^ bitfliph);
return h128;
} }
}
-XXH_FORCE_INLINE XXH128_hash_t
-XXH3_hashLong_128b_internal(const xxh_u8* XXH_RESTRICT input, size_t len,
- const xxh_u8* XXH_RESTRICT secret, size_t secretSize)
-{
- XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64 acc[ACC_NB] = XXH3_INIT_ACC;
-
- XXH3_hashLong_internal_loop(acc, input, len, secret, secretSize, XXH3_acc_128bits);
-
- /* converge into final hash */
- XXH_STATIC_ASSERT(sizeof(acc) == 64);
- XXH_ASSERT(secretSize >= sizeof(acc) + XXH_SECRET_MERGEACCS_START);
- { xxh_u64 const low64 = XXH3_mergeAccs(acc, secret + XXH_SECRET_MERGEACCS_START, (xxh_u64)len * PRIME64_1);
- xxh_u64 const high64 = XXH3_mergeAccs(acc, secret + secretSize - sizeof(acc) - XXH_SECRET_MERGEACCS_START, ~((xxh_u64)len * PRIME64_2));
- XXH128_hash_t const h128 = { low64, high64 };
- return h128;
- }
-}
-
-XXH_NO_INLINE XXH128_hash_t /* It's important for performance that XXH3_hashLong is not inlined. Not sure why (uop cache maybe ?), but difference is large and easily measurable */
-XXH3_hashLong_128b_defaultSecret(const xxh_u8* input, size_t len)
-{
- return XXH3_hashLong_128b_internal(input, len, kSecret, sizeof(kSecret));
-}
-
-XXH_NO_INLINE XXH128_hash_t /* It's important for performance that XXH3_hashLong is not inlined. Not sure why (uop cache maybe ?), but difference is large and easily measurable */
-XXH3_hashLong_128b_withSecret(const xxh_u8* input, size_t len,
- const xxh_u8* secret, size_t secretSize)
-{
- return XXH3_hashLong_128b_internal(input, len, secret, secretSize);
-}
-
-XXH_NO_INLINE XXH128_hash_t /* It's important for performance that XXH3_hashLong is not inlined. Not sure why (uop cache maybe ?), but difference is large and easily measurable */
-XXH3_hashLong_128b_withSeed(const xxh_u8* input, size_t len, XXH64_hash_t seed)
-{
- XXH_ALIGN(8) xxh_u8 secret[XXH_SECRET_DEFAULT_SIZE];
- if (seed == 0) return XXH3_hashLong_128b_defaultSecret(input, len);
- XXH3_initCustomSecret(secret, seed);
- return XXH3_hashLong_128b_internal(input, len, secret, sizeof(secret));
-}
-
-
+/*
+ * A bit slower than XXH3_mix16B, but handles multiply by zero better.
+ */
XXH_FORCE_INLINE XXH128_hash_t
XXH128_mix32B(XXH128_hash_t acc, const xxh_u8* input_1, const xxh_u8* input_2, const xxh_u8* secret, XXH64_hash_t seed)
{
@@ -1393,6 +1832,36 @@ XXH128_mix32B(XXH128_hash_t acc, const xxh_u8* input_1, const xxh_u8* input_2, c
return acc;
}
+
+XXH_FORCE_INLINE XXH128_hash_t
+XXH3_len_17to128_128b(const xxh_u8* XXH_RESTRICT input, size_t len,
+ const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
+ XXH64_hash_t seed)
+{
+ XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize;
+ XXH_ASSERT(16 < len && len <= 128);
+
+ { XXH128_hash_t acc;
+ acc.low64 = len * PRIME64_1;
+ acc.high64 = 0;
+ if (len > 32) {
+ if (len > 64) {
+ if (len > 96) {
+ acc = XXH128_mix32B(acc, input+48, input+len-64, secret+96, seed);
+ }
+ acc = XXH128_mix32B(acc, input+32, input+len-48, secret+64, seed);
+ }
+ acc = XXH128_mix32B(acc, input+16, input+len-32, secret+32, seed);
+ }
+ acc = XXH128_mix32B(acc, input, input+len-16, secret, seed);
+ { xxh_u64 const low64 = acc.low64 + acc.high64;
+ xxh_u64 const high64 = (acc.low64 * PRIME64_1) + (acc.high64 * PRIME64_4) + ((len - seed) * PRIME64_2);
+ XXH128_hash_t const h128 = { XXH3_avalanche(low64), (XXH64_hash_t)0 - XXH3_avalanche(high64) };
+ return h128;
+ }
+ }
+}
+
XXH_NO_INLINE XXH128_hash_t
XXH3_len_129to240_128b(const xxh_u8* XXH_RESTRICT input, size_t len,
const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
@@ -1426,36 +1895,59 @@ XXH3_len_129to240_128b(const xxh_u8* XXH_RESTRICT input, size_t len,
}
}
-
XXH_FORCE_INLINE XXH128_hash_t
-XXH3_len_17to128_128b(const xxh_u8* XXH_RESTRICT input, size_t len,
- const xxh_u8* XXH_RESTRICT secret, size_t secretSize,
- XXH64_hash_t seed)
+XXH3_hashLong_128b_internal(const xxh_u8* XXH_RESTRICT input, size_t len,
+ const xxh_u8* XXH_RESTRICT secret, size_t secretSize)
{
- XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN); (void)secretSize;
- XXH_ASSERT(16 < len && len <= 128);
+ XXH_ALIGN(XXH_ACC_ALIGN) xxh_u64 acc[ACC_NB] = XXH3_INIT_ACC;
- { XXH128_hash_t acc;
- acc.low64 = len * PRIME64_1;
- acc.high64 = 0;
- if (len > 32) {
- if (len > 64) {
- if (len > 96) {
- acc = XXH128_mix32B(acc, input+48, input+len-64, secret+96, seed);
- }
- acc = XXH128_mix32B(acc, input+32, input+len-48, secret+64, seed);
- }
- acc = XXH128_mix32B(acc, input+16, input+len-32, secret+32, seed);
- }
- acc = XXH128_mix32B(acc, input, input+len-16, secret, seed);
- { xxh_u64 const low64 = acc.low64 + acc.high64;
- xxh_u64 const high64 = (acc.low64 * PRIME64_1) + (acc.high64 * PRIME64_4) + ((len - seed) * PRIME64_2);
- XXH128_hash_t const h128 = { XXH3_avalanche(low64), (XXH64_hash_t)0 - XXH3_avalanche(high64) };
- return h128;
- }
+ XXH3_hashLong_internal_loop(acc, input, len, secret, secretSize, XXH3_acc_128bits);
+
+ /* converge into final hash */
+ XXH_STATIC_ASSERT(sizeof(acc) == 64);
+ XXH_ASSERT(secretSize >= sizeof(acc) + XXH_SECRET_MERGEACCS_START);
+ { xxh_u64 const low64 = XXH3_mergeAccs(acc, secret + XXH_SECRET_MERGEACCS_START, (xxh_u64)len * PRIME64_1);
+ xxh_u64 const high64 = XXH3_mergeAccs(acc, secret + secretSize - sizeof(acc) - XXH_SECRET_MERGEACCS_START, ~((xxh_u64)len * PRIME64_2));
+ XXH128_hash_t const h128 = { low64, high64 };
+ return h128;
}
}
+/*
+ * It's important for performance that XXH3_hashLong is not inlined. Not sure
+ * why (uop cache maybe?), but the difference is large and easily measurable.
+ */
+XXH_NO_INLINE XXH128_hash_t
+XXH3_hashLong_128b_defaultSecret(const xxh_u8* input, size_t len)
+{
+ return XXH3_hashLong_128b_internal(input, len, kSecret, sizeof(kSecret));
+}
+
+/*
+ * It's important for performance that XXH3_hashLong is not inlined. Not sure
+ * why (uop cache maybe?), but the difference is large and easily measurable.
+ */
+XXH_NO_INLINE XXH128_hash_t
+XXH3_hashLong_128b_withSecret(const xxh_u8* input, size_t len,
+ const xxh_u8* secret, size_t secretSize)
+{
+ return XXH3_hashLong_128b_internal(input, len, secret, secretSize);
+}
+
+/*
+ * It's important for performance that XXH3_hashLong is not inlined. Not sure
+ * why (uop cache maybe?), but the difference is large and easily measurable.
+ */
+XXH_NO_INLINE XXH128_hash_t
+XXH3_hashLong_128b_withSeed(const xxh_u8* input, size_t len, XXH64_hash_t seed)
+{
+ XXH_ALIGN(8) xxh_u8 secret[XXH_SECRET_DEFAULT_SIZE];
+ if (seed == 0) return XXH3_hashLong_128b_defaultSecret(input, len);
+ XXH3_initCustomSecret(secret, seed);
+ return XXH3_hashLong_128b_internal(input, len, secret, sizeof(secret));
+}
+
+
XXH_PUBLIC_API XXH128_hash_t XXH3_128bits(const void* input, size_t len)
{
if (len <= 16) return XXH3_len_0to16_128b((const xxh_u8*)input, len, kSecret, 0);
@@ -1468,10 +1960,12 @@ XXH_PUBLIC_API XXH128_hash_t
XXH3_128bits_withSecret(const void* input, size_t len, const void* secret, size_t secretSize)
{
XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN);
- /* if an action must be taken should `secret` conditions not be respected,
+ /*
+ * If an action is to be taken if `secret` conditions are not respected,
* it should be done here.
* For now, it's a contract pre-condition.
- * Adding a check and a branch here would cost performance at every hash */
+ * Adding a check and a branch here would cost performance at every hash.
+ */
if (len <= 16) return XXH3_len_0to16_128b((const xxh_u8*)input, len, (const xxh_u8*)secret, 0);
if (len <= 128) return XXH3_len_17to128_128b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, 0);
if (len <= XXH3_MIDSIZE_MAX) return XXH3_len_129to240_128b((const xxh_u8*)input, len, (const xxh_u8*)secret, secretSize, 0);
@@ -1562,7 +2056,7 @@ XXH_PUBLIC_API XXH128_hash_t XXH3_128bits_digest (const XXH3_state_t* state)
/* 128-bit utility functions */
-#include <string.h> /* memcmp */
+#include <string.h> /* memcmp, memcpy */
/* return : 1 is equal, 0 if different */
XXH_PUBLIC_API int XXH128_isEqual(XXH128_hash_t h1, XXH128_hash_t h2)
@@ -1608,6 +2102,11 @@ XXH128_hashFromCanonical(const XXH128_canonical_t* src)
return h;
}
+/* Pop our optimization override from above */
+#if XXH_VECTOR == XXH_AVX2 /* AVX2 */ \
+ && defined(__GNUC__) && !defined(__clang__) /* GCC, not Clang */ \
+ && defined(__OPTIMIZE__) && !defined(__OPTIMIZE_SIZE__) /* respect -O0 and -Os */
+# pragma GCC pop_options
+#endif
-
-#endif /* XXH3_H */
+#endif /* XXH3_H_1397135465 */
diff --git a/dviware/dvisvgm/libs/xxHash/xxhash.c b/dviware/dvisvgm/libs/xxHash/xxhash.c
index 3f49b7d1d8..3e0da98f3e 100644
--- a/dviware/dvisvgm/libs/xxHash/xxhash.c
+++ b/dviware/dvisvgm/libs/xxHash/xxhash.c
@@ -1,1110 +1,43 @@
/*
-* xxHash - Fast Hash algorithm
-* Copyright (C) 2012-2016, Yann Collet
-*
-* BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following disclaimer
-* in the documentation and/or other materials provided with the
-* distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* You can contact the author at :
-* - xxHash homepage: http://www.xxhash.com
-* - xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
-
-
-/* since xxhash.c can be included (via XXH_INLINE_ALL),
- * it's good practice to protect it with guard
- * in case of multiples inclusions */
-#ifndef XXHASH_C_01393879
-#define XXHASH_C_01393879
-
-/* *************************************
-* Tuning parameters
-***************************************/
-/*!XXH_FORCE_MEMORY_ACCESS :
- * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
- * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
- * The below switch allow to select different access method for improved performance.
- * Method 0 (default) : use `memcpy()`. Safe and portable.
- * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
- * This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
- * Method 2 : direct access. This method doesn't depend on compiler but violate C standard.
- * It can generate buggy code on targets which do not support unaligned memory accesses.
- * But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
- * See http://stackoverflow.com/a/32095106/646947 for details.
- * Prefer these methods in priority order (0 > 1 > 2)
- */
-#ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
-# if !defined(__clang__) && defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED) && defined(__ARM_ARCH) && (__ARM_ARCH == 6)
-# define XXH_FORCE_MEMORY_ACCESS 2
-# elif !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
- (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7)))
-# define XXH_FORCE_MEMORY_ACCESS 1
-# endif
-#endif
-
-/*!XXH_ACCEPT_NULL_INPUT_POINTER :
- * If input pointer is NULL, xxHash default behavior is to dereference it, triggering a segfault.
- * When this macro is enabled, xxHash actively checks input for null pointer.
- * It it is, result for null input pointers is the same as a null-length input.
- */
-#ifndef XXH_ACCEPT_NULL_INPUT_POINTER /* can be defined externally */
-# define XXH_ACCEPT_NULL_INPUT_POINTER 0
-#endif
-
-/*!XXH_FORCE_ALIGN_CHECK :
- * This is a minor performance trick, only useful with lots of very small keys.
- * It means : check for aligned/unaligned input.
- * The check costs one initial branch per hash;
- * set it to 0 when the input is guaranteed to be aligned,
- * or when alignment doesn't matter for performance.
- */
-#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
-# if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
-# define XXH_FORCE_ALIGN_CHECK 0
-# else
-# define XXH_FORCE_ALIGN_CHECK 1
-# endif
-#endif
-
-/*!XXH_REROLL:
- * Whether to reroll XXH32_finalize, and XXH64_finalize,
- * instead of using an unrolled jump table/if statement loop.
+ * xxHash - Extremely Fast Hash algorithm
+ * Copyright (C) 2012-present, Yann Collet
*
- * This is automatically defined on -Os/-Oz on GCC and Clang. */
-#ifndef XXH_REROLL
-# if defined(__OPTIMIZE_SIZE__)
-# define XXH_REROLL 1
-# else
-# define XXH_REROLL 0
-# endif
-#endif
-
-/* *************************************
-* Includes & Memory related functions
-***************************************/
-/*! Modify the local functions below should you wish to use some other memory routines
-* for malloc(), free() */
-#include <stdlib.h>
-static void* XXH_malloc(size_t s) { return malloc(s); }
-static void XXH_free (void* p) { free(p); }
-/*! and for memcpy() */
-#include <string.h>
-static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
-
-#include <limits.h> /* ULLONG_MAX */
-
-#define XXH_STATIC_LINKING_ONLY
-#include "xxhash.h"
-
-
-/* *************************************
-* Compiler Specific Options
-***************************************/
-#ifdef _MSC_VER /* Visual Studio */
-# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
-# define XXH_FORCE_INLINE static __forceinline
-# define XXH_NO_INLINE static __declspec(noinline)
-#else
-# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
-# ifdef __GNUC__
-# define XXH_FORCE_INLINE static inline __attribute__((always_inline))
-# define XXH_NO_INLINE static __attribute__((noinline))
-# else
-# define XXH_FORCE_INLINE static inline
-# define XXH_NO_INLINE static
-# endif
-# else
-# define XXH_FORCE_INLINE static
-# define XXH_NO_INLINE static
-# endif /* __STDC_VERSION__ */
-#endif
-
-
-
-/* *************************************
-* Debug
-***************************************/
-/* DEBUGLEVEL is expected to be defined externally,
- * typically through compiler command line.
- * Value must be a number. */
-#ifndef DEBUGLEVEL
-# define DEBUGLEVEL 0
-#endif
-
-#if (DEBUGLEVEL>=1)
-# include <assert.h> /* note : can still be disabled with NDEBUG */
-# define XXH_ASSERT(c) assert(c)
-#else
-# define XXH_ASSERT(c) ((void)0)
-#endif
-
-/* note : use after variable declarations */
-#define XXH_STATIC_ASSERT(c) { enum { XXH_sa = 1/(int)(!!(c)) }; }
-
-
-/* *************************************
-* Basic Types
-***************************************/
-#if !defined (__VMS) \
- && (defined (__cplusplus) \
- || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
-# include <stdint.h>
- typedef uint8_t xxh_u8;
-#else
- typedef unsigned char xxh_u8;
-#endif
-typedef XXH32_hash_t xxh_u32;
-
-
-/* === Memory access === */
-
-#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
-
-/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
-static xxh_u32 XXH_read32(const void* memPtr) { return *(const xxh_u32*) memPtr; }
-
-#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
-
-/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
-/* currently only defined for gcc and icc */
-typedef union { xxh_u32 u32; } __attribute__((packed)) unalign;
-static xxh_u32 XXH_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
-
-#else
-
-/* portable and safe solution. Generally efficient.
- * see : http://stackoverflow.com/a/32095106/646947
- */
-static xxh_u32 XXH_read32(const void* memPtr)
-{
- xxh_u32 val;
- memcpy(&val, memPtr, sizeof(val));
- return val;
-}
-
-#endif /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
-
-
-/* === Endianess === */
-typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
-
-/* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */
-#ifndef XXH_CPU_LITTLE_ENDIAN
-# if defined(_WIN32) /* Windows is always little endian */ \
- || defined(__LITTLE_ENDIAN__) \
- || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-# define XXH_CPU_LITTLE_ENDIAN 1
-# elif defined(__BIG_ENDIAN__) \
- || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-# define XXH_CPU_LITTLE_ENDIAN 0
-# else
-static int XXH_isLittleEndian(void)
-{
- const union { xxh_u32 u; xxh_u8 c[4]; } one = { 1 }; /* don't use static : performance detrimental */
- return one.c[0];
-}
-# define XXH_CPU_LITTLE_ENDIAN XXH_isLittleEndian()
-# endif
-#endif
-
-
-
-
-/* ****************************************
-* Compiler-specific Functions and Macros
-******************************************/
-#define XXH_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-#if !defined(NO_CLANG_BUILTIN) && __has_builtin(__builtin_rotateleft32) && __has_builtin(__builtin_rotateleft64)
-# define XXH_rotl32 __builtin_rotateleft32
-# define XXH_rotl64 __builtin_rotateleft64
-/* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */
-#elif defined(_MSC_VER)
-# define XXH_rotl32(x,r) _rotl(x,r)
-# define XXH_rotl64(x,r) _rotl64(x,r)
-#else
-# define XXH_rotl32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
-# define XXH_rotl64(x,r) (((x) << (r)) | ((x) >> (64 - (r))))
-#endif
-
-#if defined(_MSC_VER) /* Visual Studio */
-# define XXH_swap32 _byteswap_ulong
-#elif XXH_GCC_VERSION >= 403
-# define XXH_swap32 __builtin_bswap32
-#else
-static xxh_u32 XXH_swap32 (xxh_u32 x)
-{
- return ((x << 24) & 0xff000000 ) |
- ((x << 8) & 0x00ff0000 ) |
- ((x >> 8) & 0x0000ff00 ) |
- ((x >> 24) & 0x000000ff );
-}
-#endif
-
-
-/* ***************************
-* Memory reads
-*****************************/
-typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
-
-XXH_FORCE_INLINE xxh_u32 XXH_readLE32(const void* ptr)
-{
- return XXH_CPU_LITTLE_ENDIAN ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
-}
-
-static xxh_u32 XXH_readBE32(const void* ptr)
-{
- return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr);
-}
-
-XXH_FORCE_INLINE xxh_u32
-XXH_readLE32_align(const void* ptr, XXH_alignment align)
-{
- if (align==XXH_unaligned) {
- return XXH_readLE32(ptr);
- } else {
- return XXH_CPU_LITTLE_ENDIAN ? *(const xxh_u32*)ptr : XXH_swap32(*(const xxh_u32*)ptr);
- }
-}
-
-
-/* *************************************
-* Misc
-***************************************/
-XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; }
-
-
-/* *******************************************************************
-* 32-bit hash functions
-*********************************************************************/
-static const xxh_u32 PRIME32_1 = 0x9E3779B1U; /* 0b10011110001101110111100110110001 */
-static const xxh_u32 PRIME32_2 = 0x85EBCA77U; /* 0b10000101111010111100101001110111 */
-static const xxh_u32 PRIME32_3 = 0xC2B2AE3DU; /* 0b11000010101100101010111000111101 */
-static const xxh_u32 PRIME32_4 = 0x27D4EB2FU; /* 0b00100111110101001110101100101111 */
-static const xxh_u32 PRIME32_5 = 0x165667B1U; /* 0b00010110010101100110011110110001 */
-
-static xxh_u32 XXH32_round(xxh_u32 acc, xxh_u32 input)
-{
- acc += input * PRIME32_2;
- acc = XXH_rotl32(acc, 13);
- acc *= PRIME32_1;
-#if defined(__GNUC__) && defined(__SSE4_1__) && !defined(XXH_ENABLE_AUTOVECTORIZE)
- /* UGLY HACK:
- * This inline assembly hack forces acc into a normal register. This is the
- * only thing that prevents GCC and Clang from autovectorizing the XXH32 loop
- * (pragmas and attributes don't work for some resason) without globally
- * disabling SSE4.1.
- *
- * The reason we want to avoid vectorization is because despite working on
- * 4 integers at a time, there are multiple factors slowing XXH32 down on
- * SSE4:
- * - There's a ridiculous amount of lag from pmulld (10 cycles of latency on newer chips!)
- * making it slightly slower to multiply four integers at once compared to four
- * integers independently. Even when pmulld was fastest, Sandy/Ivy Bridge, it is
- * still not worth it to go into SSE just to multiply unless doing a long operation.
- *
- * - Four instructions are required to rotate,
- * movqda tmp, v // not required with VEX encoding
- * pslld tmp, 13 // tmp <<= 13
- * psrld v, 19 // x >>= 19
- * por v, tmp // x |= tmp
- * compared to one for scalar:
- * roll v, 13 // reliably fast across the board
- * shldl v, v, 13 // Sandy Bridge and later prefer this for some reason
- *
- * - Instruction level parallelism is actually more beneficial here because the
- * SIMD actually serializes this operation: While v1 is rotating, v2 can load data,
- * while v3 can multiply. SSE forces them to operate together.
- *
- * How this hack works:
- * __asm__("" // Declare an assembly block but don't declare any instructions
- * : // However, as an Input/Output Operand,
- * "+r" // constrain a read/write operand (+) as a general purpose register (r).
- * (acc) // and set acc as the operand
- * );
- *
- * Because of the 'r', the compiler has promised that seed will be in a
- * general purpose register and the '+' says that it will be 'read/write',
- * so it has to assume it has changed. It is like volatile without all the
- * loads and stores.
- *
- * Since the argument has to be in a normal register (not an SSE register),
- * each time XXH32_round is called, it is impossible to vectorize. */
- __asm__("" : "+r" (acc));
-#endif
- return acc;
-}
-
-/* mix all bits */
-static xxh_u32 XXH32_avalanche(xxh_u32 h32)
-{
- h32 ^= h32 >> 15;
- h32 *= PRIME32_2;
- h32 ^= h32 >> 13;
- h32 *= PRIME32_3;
- h32 ^= h32 >> 16;
- return(h32);
-}
-
-#define XXH_get32bits(p) XXH_readLE32_align(p, align)
-
-static xxh_u32
-XXH32_finalize(xxh_u32 h32, const xxh_u8* ptr, size_t len, XXH_alignment align)
-{
-#define PROCESS1 \
- h32 += (*ptr++) * PRIME32_5; \
- h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
-
-#define PROCESS4 \
- h32 += XXH_get32bits(ptr) * PRIME32_3; \
- ptr+=4; \
- h32 = XXH_rotl32(h32, 17) * PRIME32_4 ;
-
- /* Compact rerolled version */
- if (XXH_REROLL) {
- len &= 15;
- while (len >= 4) {
- PROCESS4;
- len -= 4;
- }
- while (len > 0) {
- PROCESS1;
- --len;
- }
- return XXH32_avalanche(h32);
- } else {
- switch(len&15) /* or switch(bEnd - p) */ {
- case 12: PROCESS4;
- /* fallthrough */
- case 8: PROCESS4;
- /* fallthrough */
- case 4: PROCESS4;
- return XXH32_avalanche(h32);
-
- case 13: PROCESS4;
- /* fallthrough */
- case 9: PROCESS4;
- /* fallthrough */
- case 5: PROCESS4;
- PROCESS1;
- return XXH32_avalanche(h32);
-
- case 14: PROCESS4;
- /* fallthrough */
- case 10: PROCESS4;
- /* fallthrough */
- case 6: PROCESS4;
- PROCESS1;
- PROCESS1;
- return XXH32_avalanche(h32);
-
- case 15: PROCESS4;
- /* fallthrough */
- case 11: PROCESS4;
- /* fallthrough */
- case 7: PROCESS4;
- /* fallthrough */
- case 3: PROCESS1;
- /* fallthrough */
- case 2: PROCESS1;
- /* fallthrough */
- case 1: PROCESS1;
- /* fallthrough */
- case 0: return XXH32_avalanche(h32);
- }
- XXH_ASSERT(0);
- return h32; /* reaching this point is deemed impossible */
- }
-}
-
-XXH_FORCE_INLINE xxh_u32
-XXH32_endian_align(const xxh_u8* input, size_t len, xxh_u32 seed, XXH_alignment align)
-{
- const xxh_u8* bEnd = input + len;
- xxh_u32 h32;
-
-#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
- if (input==NULL) {
- len=0;
- bEnd=input=(const xxh_u8*)(size_t)16;
- }
-#endif
-
- if (len>=16) {
- const xxh_u8* const limit = bEnd - 15;
- xxh_u32 v1 = seed + PRIME32_1 + PRIME32_2;
- xxh_u32 v2 = seed + PRIME32_2;
- xxh_u32 v3 = seed + 0;
- xxh_u32 v4 = seed - PRIME32_1;
-
- do {
- v1 = XXH32_round(v1, XXH_get32bits(input)); input += 4;
- v2 = XXH32_round(v2, XXH_get32bits(input)); input += 4;
- v3 = XXH32_round(v3, XXH_get32bits(input)); input += 4;
- v4 = XXH32_round(v4, XXH_get32bits(input)); input += 4;
- } while (input < limit);
-
- h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7)
- + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
- } else {
- h32 = seed + PRIME32_5;
- }
-
- h32 += (xxh_u32)len;
-
- return XXH32_finalize(h32, input, len&15, align);
-}
-
-
-XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t len, XXH32_hash_t seed)
-{
-#if 0
- /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
- XXH32_state_t state;
- XXH32_reset(&state, seed);
- XXH32_update(&state, (const xxh_u8*)input, len);
- return XXH32_digest(&state);
-
-#else
-
- if (XXH_FORCE_ALIGN_CHECK) {
- if ((((size_t)input) & 3) == 0) { /* Input is 4-bytes aligned, leverage the speed benefit */
- return XXH32_endian_align((const xxh_u8*)input, len, seed, XXH_aligned);
- } }
-
- return XXH32_endian_align((const xxh_u8*)input, len, seed, XXH_unaligned);
-#endif
-}
-
-
-
-/*====== Hash streaming ======*/
-
-XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void)
-{
- return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
-}
-XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
-{
- XXH_free(statePtr);
- return XXH_OK;
-}
-
-XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState)
-{
- memcpy(dstState, srcState, sizeof(*dstState));
-}
-
-XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, XXH32_hash_t seed)
-{
- XXH32_state_t state; /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
- memset(&state, 0, sizeof(state));
- state.v1 = seed + PRIME32_1 + PRIME32_2;
- state.v2 = seed + PRIME32_2;
- state.v3 = seed + 0;
- state.v4 = seed - PRIME32_1;
- /* do not write into reserved, planned to be removed in a future version */
- memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved));
- return XXH_OK;
-}
-
-
-XXH_PUBLIC_API XXH_errorcode
-XXH32_update(XXH32_state_t* state, const void* input, size_t len)
-{
- if (input==NULL)
-#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
- return XXH_OK;
-#else
- return XXH_ERROR;
-#endif
-
- { const xxh_u8* p = (const xxh_u8*)input;
- const xxh_u8* const bEnd = p + len;
-
- state->total_len_32 += (XXH32_hash_t)len;
- state->large_len |= (XXH32_hash_t)((len>=16) | (state->total_len_32>=16));
-
- if (state->memsize + len < 16) { /* fill in tmp buffer */
- XXH_memcpy((xxh_u8*)(state->mem32) + state->memsize, input, len);
- state->memsize += (XXH32_hash_t)len;
- return XXH_OK;
- }
-
- if (state->memsize) { /* some data left from previous update */
- XXH_memcpy((xxh_u8*)(state->mem32) + state->memsize, input, 16-state->memsize);
- { const xxh_u32* p32 = state->mem32;
- state->v1 = XXH32_round(state->v1, XXH_readLE32(p32)); p32++;
- state->v2 = XXH32_round(state->v2, XXH_readLE32(p32)); p32++;
- state->v3 = XXH32_round(state->v3, XXH_readLE32(p32)); p32++;
- state->v4 = XXH32_round(state->v4, XXH_readLE32(p32));
- }
- p += 16-state->memsize;
- state->memsize = 0;
- }
-
- if (p <= bEnd-16) {
- const xxh_u8* const limit = bEnd - 16;
- xxh_u32 v1 = state->v1;
- xxh_u32 v2 = state->v2;
- xxh_u32 v3 = state->v3;
- xxh_u32 v4 = state->v4;
-
- do {
- v1 = XXH32_round(v1, XXH_readLE32(p)); p+=4;
- v2 = XXH32_round(v2, XXH_readLE32(p)); p+=4;
- v3 = XXH32_round(v3, XXH_readLE32(p)); p+=4;
- v4 = XXH32_round(v4, XXH_readLE32(p)); p+=4;
- } while (p<=limit);
-
- state->v1 = v1;
- state->v2 = v2;
- state->v3 = v3;
- state->v4 = v4;
- }
-
- if (p < bEnd) {
- XXH_memcpy(state->mem32, p, (size_t)(bEnd-p));
- state->memsize = (unsigned)(bEnd-p);
- }
- }
-
- return XXH_OK;
-}
-
-
-XXH_PUBLIC_API XXH32_hash_t XXH32_digest (const XXH32_state_t* state)
-{
- xxh_u32 h32;
-
- if (state->large_len) {
- h32 = XXH_rotl32(state->v1, 1)
- + XXH_rotl32(state->v2, 7)
- + XXH_rotl32(state->v3, 12)
- + XXH_rotl32(state->v4, 18);
- } else {
- h32 = state->v3 /* == seed */ + PRIME32_5;
- }
-
- h32 += state->total_len_32;
-
- return XXH32_finalize(h32, (const xxh_u8*)state->mem32, state->memsize, XXH_aligned);
-}
-
-
-/*====== Canonical representation ======*/
-
-/*! Default XXH result types are basic unsigned 32 and 64 bits.
-* The canonical representation follows human-readable write convention, aka big-endian (large digits first).
-* These functions allow transformation of hash result into and from its canonical format.
-* This way, hash values can be written into a file or buffer, remaining comparable across different systems.
-*/
-
-XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash)
-{
- XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t));
- if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash);
- memcpy(dst, &hash, sizeof(*dst));
-}
-
-XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src)
-{
- return XXH_readBE32(src);
-}
-
-
-#ifndef XXH_NO_LONG_LONG
-
-/* *******************************************************************
-* 64-bit hash functions
-*********************************************************************/
-
-/*====== Memory access ======*/
-
-typedef XXH64_hash_t xxh_u64;
-
-
-/*! XXH_REROLL_XXH64:
- * Whether to reroll the XXH64_finalize() loop.
+ * BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
*
- * Just like XXH32, we can unroll the XXH64_finalize() loop. This can be a performance gain
- * on 64-bit hosts, as only one jump is required.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * However, on 32-bit hosts, because arithmetic needs to be done with two 32-bit registers,
- * and 64-bit arithmetic needs to be simulated, it isn't beneficial to unroll. The code becomes
- * ridiculously large (the largest function in the binary on i386!), and rerolling it saves
- * anywhere from 3kB to 20kB. It is also slightly faster because it fits into cache better
- * and is more likely to be inlined by the compiler.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
*
- * If XXH_REROLL is defined, this is ignored and the loop is always rerolled. */
-#ifndef XXH_REROLL_XXH64
-# if (defined(__ILP32__) || defined(_ILP32)) /* ILP32 is often defined on 32-bit GCC family */ \
- || !(defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) /* x86-64 */ \
- || defined(_M_ARM64) || defined(__aarch64__) || defined(__arm64__) /* aarch64 */ \
- || defined(__PPC64__) || defined(__PPC64LE__) || defined(__ppc64__) || defined(__powerpc64__) /* ppc64 */ \
- || defined(__mips64__) || defined(__mips64)) /* mips64 */ \
- || (!defined(SIZE_MAX) || SIZE_MAX < ULLONG_MAX) /* check limits */
-# define XXH_REROLL_XXH64 1
-# else
-# define XXH_REROLL_XXH64 0
-# endif
-#endif /* !defined(XXH_REROLL_XXH64) */
-
-#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
-
-/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
-static xxh_u64 XXH_read64(const void* memPtr) { return *(const xxh_u64*) memPtr; }
-
-#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
-
-/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
-/* currently only defined for gcc and icc */
-typedef union { xxh_u32 u32; xxh_u64 u64; } __attribute__((packed)) unalign64;
-static xxh_u64 XXH_read64(const void* ptr) { return ((const unalign64*)ptr)->u64; }
-
-#else
-
-/* portable and safe solution. Generally efficient.
- * see : http://stackoverflow.com/a/32095106/646947
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You can contact the author at:
+ * - xxHash homepage: https://www.xxhash.com
+ * - xxHash source repository: https://github.com/Cyan4973/xxHash
*/
-static xxh_u64 XXH_read64(const void* memPtr)
-{
- xxh_u64 val;
- memcpy(&val, memPtr, sizeof(val));
- return val;
-}
-
-#endif /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
-
-#if defined(_MSC_VER) /* Visual Studio */
-# define XXH_swap64 _byteswap_uint64
-#elif XXH_GCC_VERSION >= 403
-# define XXH_swap64 __builtin_bswap64
-#else
-static xxh_u64 XXH_swap64 (xxh_u64 x)
-{
- return ((x << 56) & 0xff00000000000000ULL) |
- ((x << 40) & 0x00ff000000000000ULL) |
- ((x << 24) & 0x0000ff0000000000ULL) |
- ((x << 8) & 0x000000ff00000000ULL) |
- ((x >> 8) & 0x00000000ff000000ULL) |
- ((x >> 24) & 0x0000000000ff0000ULL) |
- ((x >> 40) & 0x000000000000ff00ULL) |
- ((x >> 56) & 0x00000000000000ffULL);
-}
-#endif
-
-XXH_FORCE_INLINE xxh_u64 XXH_readLE64(const void* ptr)
-{
- return XXH_CPU_LITTLE_ENDIAN ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
-}
-
-static xxh_u64 XXH_readBE64(const void* ptr)
-{
- return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr);
-}
-
-XXH_FORCE_INLINE xxh_u64
-XXH_readLE64_align(const void* ptr, XXH_alignment align)
-{
- if (align==XXH_unaligned)
- return XXH_readLE64(ptr);
- else
- return XXH_CPU_LITTLE_ENDIAN ? *(const xxh_u64*)ptr : XXH_swap64(*(const xxh_u64*)ptr);
-}
-
-
-/*====== xxh64 ======*/
-
-static const xxh_u64 PRIME64_1 = 0x9E3779B185EBCA87ULL; /* 0b1001111000110111011110011011000110000101111010111100101010000111 */
-static const xxh_u64 PRIME64_2 = 0xC2B2AE3D27D4EB4FULL; /* 0b1100001010110010101011100011110100100111110101001110101101001111 */
-static const xxh_u64 PRIME64_3 = 0x165667B19E3779F9ULL; /* 0b0001011001010110011001111011000110011110001101110111100111111001 */
-static const xxh_u64 PRIME64_4 = 0x85EBCA77C2B2AE63ULL; /* 0b1000010111101011110010100111011111000010101100101010111001100011 */
-static const xxh_u64 PRIME64_5 = 0x27D4EB2F165667C5ULL; /* 0b0010011111010100111010110010111100010110010101100110011111000101 */
-
-static xxh_u64 XXH64_round(xxh_u64 acc, xxh_u64 input)
-{
- acc += input * PRIME64_2;
- acc = XXH_rotl64(acc, 31);
- acc *= PRIME64_1;
- return acc;
-}
-
-static xxh_u64 XXH64_mergeRound(xxh_u64 acc, xxh_u64 val)
-{
- val = XXH64_round(0, val);
- acc ^= val;
- acc = acc * PRIME64_1 + PRIME64_4;
- return acc;
-}
-
-static xxh_u64 XXH64_avalanche(xxh_u64 h64)
-{
- h64 ^= h64 >> 33;
- h64 *= PRIME64_2;
- h64 ^= h64 >> 29;
- h64 *= PRIME64_3;
- h64 ^= h64 >> 32;
- return h64;
-}
-
-
-#define XXH_get64bits(p) XXH_readLE64_align(p, align)
-
-static xxh_u64
-XXH64_finalize(xxh_u64 h64, const xxh_u8* ptr, size_t len, XXH_alignment align)
-{
-#define PROCESS1_64 \
- h64 ^= (*ptr++) * PRIME64_5; \
- h64 = XXH_rotl64(h64, 11) * PRIME64_1;
-
-#define PROCESS4_64 \
- h64 ^= (xxh_u64)(XXH_get32bits(ptr)) * PRIME64_1; \
- ptr+=4; \
- h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
-
-#define PROCESS8_64 { \
- xxh_u64 const k1 = XXH64_round(0, XXH_get64bits(ptr)); \
- ptr+=8; \
- h64 ^= k1; \
- h64 = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4; \
-}
-
- /* Rerolled version for 32-bit targets is faster and much smaller. */
- if (XXH_REROLL || XXH_REROLL_XXH64) {
- len &= 31;
- while (len >= 8) {
- PROCESS8_64;
- len -= 8;
- }
- if (len >= 4) {
- PROCESS4_64;
- len -= 4;
- }
- while (len > 0) {
- PROCESS1_64;
- --len;
- }
- return XXH64_avalanche(h64);
- } else {
- switch(len & 31) {
- case 24: PROCESS8_64;
- /* fallthrough */
- case 16: PROCESS8_64;
- /* fallthrough */
- case 8: PROCESS8_64;
- return XXH64_avalanche(h64);
-
- case 28: PROCESS8_64;
- /* fallthrough */
- case 20: PROCESS8_64;
- /* fallthrough */
- case 12: PROCESS8_64;
- /* fallthrough */
- case 4: PROCESS4_64;
- return XXH64_avalanche(h64);
-
- case 25: PROCESS8_64;
- /* fallthrough */
- case 17: PROCESS8_64;
- /* fallthrough */
- case 9: PROCESS8_64;
- PROCESS1_64;
- return XXH64_avalanche(h64);
-
- case 29: PROCESS8_64;
- /* fallthrough */
- case 21: PROCESS8_64;
- /* fallthrough */
- case 13: PROCESS8_64;
- /* fallthrough */
- case 5: PROCESS4_64;
- PROCESS1_64;
- return XXH64_avalanche(h64);
-
- case 26: PROCESS8_64;
- /* fallthrough */
- case 18: PROCESS8_64;
- /* fallthrough */
- case 10: PROCESS8_64;
- PROCESS1_64;
- PROCESS1_64;
- return XXH64_avalanche(h64);
-
- case 30: PROCESS8_64;
- /* fallthrough */
- case 22: PROCESS8_64;
- /* fallthrough */
- case 14: PROCESS8_64;
- /* fallthrough */
- case 6: PROCESS4_64;
- PROCESS1_64;
- PROCESS1_64;
- return XXH64_avalanche(h64);
-
- case 27: PROCESS8_64;
- /* fallthrough */
- case 19: PROCESS8_64;
- /* fallthrough */
- case 11: PROCESS8_64;
- PROCESS1_64;
- PROCESS1_64;
- PROCESS1_64;
- return XXH64_avalanche(h64);
-
- case 31: PROCESS8_64;
- /* fallthrough */
- case 23: PROCESS8_64;
- /* fallthrough */
- case 15: PROCESS8_64;
- /* fallthrough */
- case 7: PROCESS4_64;
- /* fallthrough */
- case 3: PROCESS1_64;
- /* fallthrough */
- case 2: PROCESS1_64;
- /* fallthrough */
- case 1: PROCESS1_64;
- /* fallthrough */
- case 0: return XXH64_avalanche(h64);
- }
- }
- /* impossible to reach */
- XXH_ASSERT(0);
- return 0; /* unreachable, but some compilers complain without it */
-}
-
-XXH_FORCE_INLINE xxh_u64
-XXH64_endian_align(const xxh_u8* input, size_t len, xxh_u64 seed, XXH_alignment align)
-{
- const xxh_u8* bEnd = input + len;
- xxh_u64 h64;
-
-#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
- if (input==NULL) {
- len=0;
- bEnd=input=(const xxh_u8*)(size_t)32;
- }
-#endif
-
- if (len>=32) {
- const xxh_u8* const limit = bEnd - 32;
- xxh_u64 v1 = seed + PRIME64_1 + PRIME64_2;
- xxh_u64 v2 = seed + PRIME64_2;
- xxh_u64 v3 = seed + 0;
- xxh_u64 v4 = seed - PRIME64_1;
-
- do {
- v1 = XXH64_round(v1, XXH_get64bits(input)); input+=8;
- v2 = XXH64_round(v2, XXH_get64bits(input)); input+=8;
- v3 = XXH64_round(v3, XXH_get64bits(input)); input+=8;
- v4 = XXH64_round(v4, XXH_get64bits(input)); input+=8;
- } while (input<=limit);
-
- h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
- h64 = XXH64_mergeRound(h64, v1);
- h64 = XXH64_mergeRound(h64, v2);
- h64 = XXH64_mergeRound(h64, v3);
- h64 = XXH64_mergeRound(h64, v4);
-
- } else {
- h64 = seed + PRIME64_5;
- }
-
- h64 += (xxh_u64) len;
-
- return XXH64_finalize(h64, input, len, align);
-}
-
-
-XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t len, XXH64_hash_t seed)
-{
-#if 0
- /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
- XXH64_state_t state;
- XXH64_reset(&state, seed);
- XXH64_update(&state, (const xxh_u8*)input, len);
- return XXH64_digest(&state);
-
-#else
-
- if (XXH_FORCE_ALIGN_CHECK) {
- if ((((size_t)input) & 7)==0) { /* Input is aligned, let's leverage the speed advantage */
- return XXH64_endian_align((const xxh_u8*)input, len, seed, XXH_aligned);
- } }
-
- return XXH64_endian_align((const xxh_u8*)input, len, seed, XXH_unaligned);
-
-#endif
-}
-
-/*====== Hash Streaming ======*/
-
-XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void)
-{
- return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
-}
-XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
-{
- XXH_free(statePtr);
- return XXH_OK;
-}
-
-XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dstState, const XXH64_state_t* srcState)
-{
- memcpy(dstState, srcState, sizeof(*dstState));
-}
-
-XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t* statePtr, XXH64_hash_t seed)
-{
- XXH64_state_t state; /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
- memset(&state, 0, sizeof(state));
- state.v1 = seed + PRIME64_1 + PRIME64_2;
- state.v2 = seed + PRIME64_2;
- state.v3 = seed + 0;
- state.v4 = seed - PRIME64_1;
- /* do not write into reserved64, might be removed in a future version */
- memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved64));
- return XXH_OK;
-}
-
-XXH_PUBLIC_API XXH_errorcode
-XXH64_update (XXH64_state_t* state, const void* input, size_t len)
-{
- if (input==NULL)
-#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
- return XXH_OK;
-#else
- return XXH_ERROR;
-#endif
-
- { const xxh_u8* p = (const xxh_u8*)input;
- const xxh_u8* const bEnd = p + len;
-
- state->total_len += len;
-
- if (state->memsize + len < 32) { /* fill in tmp buffer */
- XXH_memcpy(((xxh_u8*)state->mem64) + state->memsize, input, len);
- state->memsize += (xxh_u32)len;
- return XXH_OK;
- }
-
- if (state->memsize) { /* tmp buffer is full */
- XXH_memcpy(((xxh_u8*)state->mem64) + state->memsize, input, 32-state->memsize);
- state->v1 = XXH64_round(state->v1, XXH_readLE64(state->mem64+0));
- state->v2 = XXH64_round(state->v2, XXH_readLE64(state->mem64+1));
- state->v3 = XXH64_round(state->v3, XXH_readLE64(state->mem64+2));
- state->v4 = XXH64_round(state->v4, XXH_readLE64(state->mem64+3));
- p += 32-state->memsize;
- state->memsize = 0;
- }
-
- if (p+32 <= bEnd) {
- const xxh_u8* const limit = bEnd - 32;
- xxh_u64 v1 = state->v1;
- xxh_u64 v2 = state->v2;
- xxh_u64 v3 = state->v3;
- xxh_u64 v4 = state->v4;
-
- do {
- v1 = XXH64_round(v1, XXH_readLE64(p)); p+=8;
- v2 = XXH64_round(v2, XXH_readLE64(p)); p+=8;
- v3 = XXH64_round(v3, XXH_readLE64(p)); p+=8;
- v4 = XXH64_round(v4, XXH_readLE64(p)); p+=8;
- } while (p<=limit);
-
- state->v1 = v1;
- state->v2 = v2;
- state->v3 = v3;
- state->v4 = v4;
- }
-
- if (p < bEnd) {
- XXH_memcpy(state->mem64, p, (size_t)(bEnd-p));
- state->memsize = (unsigned)(bEnd-p);
- }
- }
-
- return XXH_OK;
-}
-
-
-XXH_PUBLIC_API XXH64_hash_t XXH64_digest (const XXH64_state_t* state)
-{
- xxh_u64 h64;
-
- if (state->total_len >= 32) {
- xxh_u64 const v1 = state->v1;
- xxh_u64 const v2 = state->v2;
- xxh_u64 const v3 = state->v3;
- xxh_u64 const v4 = state->v4;
-
- h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
- h64 = XXH64_mergeRound(h64, v1);
- h64 = XXH64_mergeRound(h64, v2);
- h64 = XXH64_mergeRound(h64, v3);
- h64 = XXH64_mergeRound(h64, v4);
- } else {
- h64 = state->v3 /*seed*/ + PRIME64_5;
- }
-
- h64 += (xxh_u64) state->total_len;
-
- return XXH64_finalize(h64, (const xxh_u8*)state->mem64, (size_t)state->total_len, XXH_aligned);
-}
-
-
-/*====== Canonical representation ======*/
-
-XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash)
-{
- XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t));
- if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash);
- memcpy(dst, &hash, sizeof(*dst));
-}
-
-XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src)
-{
- return XXH_readBE64(src);
-}
-
-
-
-/* *********************************************************************
-* XXH3
-* New generation hash designed for speed on small keys and vectorization
-************************************************************************ */
-
-#include "xxh3.h"
+/*
+ * xxhash.c instantiates functions defined in xxhash.h
+ */
-#endif /* XXH_NO_LONG_LONG */
+#define XXH_STATIC_LINKING_ONLY /* access advanced declarations */
+#define XXH_IMPLEMENTATION /* access definitions */
-#endif /* XXHASH_C_01393879 */
+#include "xxhash.h"
diff --git a/dviware/dvisvgm/libs/xxHash/xxhash.h b/dviware/dvisvgm/libs/xxHash/xxhash.h
index df1d08765d..3677f8287b 100644
--- a/dviware/dvisvgm/libs/xxHash/xxhash.h
+++ b/dviware/dvisvgm/libs/xxHash/xxhash.h
@@ -1,40 +1,42 @@
/*
- xxHash - Extremely Fast Hash algorithm
- Header File
- Copyright (C) 2012-2016, Yann Collet.
-
- BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- You can contact the author at :
- - xxHash source repository : https://github.com/Cyan4973/xxHash
-*/
+ * xxHash - Extremely Fast Hash algorithm
+ * Header File
+ * Copyright (C) 2012-present, Yann Collet.
+ *
+ * BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You can contact the author at:
+ * - xxHash homepage: https://www.xxhash.com
+ * - xxHash source repository: https://github.com/Cyan4973/xxHash
+ */
-/* Notice extracted from xxHash homepage :
+/* TODO: update */
+/* Notice extracted from xxHash homepage:
-xxHash is an extremely fast Hash algorithm, running at RAM speed limits.
+xxHash is an extremely fast hash algorithm, running at RAM speed limits.
It also successfully passes all tests from the SMHasher suite.
Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz)
@@ -49,17 +51,19 @@ Lookup3 1.2 GB/s 9 Bob Jenkins
SuperFastHash 1.2 GB/s 1 Paul Hsieh
CityHash64 1.05 GB/s 10 Pike & Alakuijala
FNV 0.55 GB/s 5 Fowler, Noll, Vo
-CRC32 0.43 GB/s † 9
+CRC32 0.43 GB/s 9
MD5-32 0.33 GB/s 10 Ronald L. Rivest
SHA1-32 0.28 GB/s 10
-Note †: other CRC32 implementations can be over 40x faster than SMHasher's:
-http://fastcompression.blogspot.com/2019/03/presenting-xxh3.html?showComment=1552696407071#c3490092340461170735
-
Q.Score is a measure of quality of the hash function.
It depends on successfully passing SMHasher test set.
10 is a perfect score.
+Note: SMHasher's CRC32 implementation is not the fastest one.
+Other speed-oriented implementations can be faster,
+especially in combination with PCLMUL instruction:
+https://fastcompression.blogspot.com/2019/03/presenting-xxh3.html?showComment=1552696407071#c3490092340461170735
+
A 64-bit version, named XXH64, is available since r35.
It offers much better speed, but for 64-bit applications only.
Name Speed on 64 bits Speed on 32 bits
@@ -67,41 +71,38 @@ XXH64 13.8 GB/s 1.9 GB/s
XXH32 6.8 GB/s 6.0 GB/s
*/
-#ifndef XXHASH_H_5627135585666179
-#define XXHASH_H_5627135585666179 1
-
#if defined (__cplusplus)
extern "C" {
#endif
-
/* ****************************
-* Definitions
-******************************/
-#include <stddef.h> /* size_t */
-typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
-#define XXH_STATIC_LINKING_ONLY
-
-
-/* ****************************
- * API modifier
+ * INLINE mode
******************************/
-/** XXH_INLINE_ALL (and XXH_PRIVATE_API)
- * This build macro includes xxhash functions in `static` mode
- * in order to inline them, and remove their symbol from the public list.
- * Inlining offers great performance improvement on small keys,
- * and dramatic ones when length is expressed as a compile-time constant.
- * See https://fastcompression.blogspot.com/2018/03/xxhash-for-small-keys-impressive-power.html .
- * Methodology :
+/*!
+ * XXH_INLINE_ALL (and XXH_PRIVATE_API)
+ * Use these build macros to inline xxhash into the target unit.
+ * Inlining improves performance on small inputs, especially when the length is
+ * expressed as a compile-time constant:
+ *
+ * https://fastcompression.blogspot.com/2018/03/xxhash-for-small-keys-impressive-power.html
+ *
+ * It also keeps xxHash symbols private to the unit, so they are not exported.
+ *
+ * Usage:
* #define XXH_INLINE_ALL
* #include "xxhash.h"
- * `xxhash.c` is automatically included.
- * It's not useful to compile and link it as a separate object.
+ *
+ * Do not compile and link xxhash.o as a separate object, as it is not useful.
*/
-#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
-# ifndef XXH_STATIC_LINKING_ONLY
-# define XXH_STATIC_LINKING_ONLY
-# endif
+#if (defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)) \
+ && !defined(XXH_INLINE_ALL_31684351384)
+ /* this section should be traversed only once */
+# define XXH_INLINE_ALL_31684351384
+ /* give access to the advanced API, required to compile implementations */
+# undef XXH_STATIC_LINKING_ONLY /* avoid macro redef */
+# define XXH_STATIC_LINKING_ONLY
+ /* make all functions private */
+# undef XXH_PUBLIC_API
# if defined(__GNUC__)
# define XXH_PUBLIC_API static __inline __attribute__((unused))
# elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
@@ -109,10 +110,63 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
# elif defined(_MSC_VER)
# define XXH_PUBLIC_API static __inline
# else
- /* this version may generate warnings for unused static functions */
+ /* note: this version may generate warnings for unused static functions */
# define XXH_PUBLIC_API static
# endif
-#else
+
+ /*
+ * This part deals with the special case where a unit wants to inline xxHash,
+ * but "xxhash.h" has previously been included without XXH_INLINE_ALL, such
+ * as part of some previously included *.h header file.
+ * Without further action, the new include would just be ignored,
+ * and functions would effectively _not_ be inlined (silent failure).
+ * The following macros solve this situation by prefixing all inlined names,
+ * avoiding naming collision with previous inclusions.
+ */
+# ifdef XXH_NAMESPACE
+# error "XXH_INLINE_ALL with XXH_NAMESPACE is not supported"
+ /*
+ * Note: Alternative: #undef all symbols (it's a pretty large list).
+ * Without #error: it compiles, but functions are actually not inlined.
+ */
+# endif
+# define XXH_NAMESPACE XXH_INLINE_
+ /*
+ * Some identifiers (enums, type names) are not symbols, but they must
+ * still be renamed to avoid redeclaration.
+ * Alternative solution: do not redeclare them.
+ * However, this requires some #ifdefs, and is a more dispersed action.
+ * Meanwhile, renaming can be achieved in a single block
+ */
+# define XXH_IPREF(Id) XXH_INLINE_ ## Id
+# define XXH_OK XXH_IPREF(XXH_OK)
+# define XXH_ERROR XXH_IPREF(XXH_ERROR)
+# define XXH_errorcode XXH_IPREF(XXH_errorcode)
+# define XXH32_canonical_t XXH_IPREF(XXH32_canonical_t)
+# define XXH64_canonical_t XXH_IPREF(XXH64_canonical_t)
+# define XXH128_canonical_t XXH_IPREF(XXH128_canonical_t)
+# define XXH32_state_s XXH_IPREF(XXH32_state_s)
+# define XXH32_state_t XXH_IPREF(XXH32_state_t)
+# define XXH64_state_s XXH_IPREF(XXH64_state_s)
+# define XXH64_state_t XXH_IPREF(XXH64_state_t)
+# define XXH3_state_s XXH_IPREF(XXH3_state_s)
+# define XXH3_state_t XXH_IPREF(XXH3_state_t)
+# define XXH128_hash_t XXH_IPREF(XXH128_hash_t)
+ /* Ensure the header is parsed again, even if it was previously included */
+# undef XXHASH_H_5627135585666179
+# undef XXHASH_H_STATIC_13879238742
+#endif /* XXH_INLINE_ALL || XXH_PRIVATE_API */
+
+
+
+/* ****************************************************************
+ * Stable API
+ *****************************************************************/
+#ifndef XXHASH_H_5627135585666179
+#define XXHASH_H_5627135585666179 1
+
+/* specific declaration modes for Windows */
+#if !defined(XXH_INLINE_ALL) && !defined(XXH_PRIVATE_API)
# if defined(WIN32) && defined(_MSC_VER) && (defined(XXH_IMPORT) || defined(XXH_EXPORT))
# ifdef XXH_EXPORT
# define XXH_PUBLIC_API __declspec(dllexport)
@@ -122,18 +176,20 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
# else
# define XXH_PUBLIC_API /* do nothing */
# endif
-#endif /* XXH_INLINE_ALL || XXH_PRIVATE_API */
+#endif
-/*! XXH_NAMESPACE, aka Namespace Emulation :
+/*!
+ * XXH_NAMESPACE, aka Namespace Emulation:
*
- * If you want to include _and expose_ xxHash functions from within your own library,
- * but also want to avoid symbol collisions with other libraries which may also include xxHash,
+ * If you want to include _and expose_ xxHash functions from within your own
+ * library, but also want to avoid symbol collisions with other libraries which
+ * may also include xxHash, you can use XXH_NAMESPACE to automatically prefix
+ * any public symbol from xxhash library with the value of XXH_NAMESPACE
+ * (therefore, avoid empty or numeric values).
*
- * you can use XXH_NAMESPACE, to automatically prefix any public symbol from xxhash library
- * with the value of XXH_NAMESPACE (therefore, avoid NULL and numeric values).
- *
- * Note that no change is required within the calling program as long as it includes `xxhash.h` :
- * regular symbol name will be automatically translated by this header.
+ * Note that no change is required within the calling program as long as it
+ * includes `xxhash.h`: Regular symbol names will be automatically translated
+ * by this header.
*/
#ifdef XXH_NAMESPACE
# define XXH_CAT(A,B) A##B
@@ -165,11 +221,18 @@ typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
***************************************/
#define XXH_VERSION_MAJOR 0
#define XXH_VERSION_MINOR 7
-#define XXH_VERSION_RELEASE 2
+#define XXH_VERSION_RELEASE 3
#define XXH_VERSION_NUMBER (XXH_VERSION_MAJOR *100*100 + XXH_VERSION_MINOR *100 + XXH_VERSION_RELEASE)
XXH_PUBLIC_API unsigned XXH_versionNumber (void);
+/* ****************************
+* Definitions
+******************************/
+#include <stddef.h> /* size_t */
+typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
+
+
/*-**********************************************************************
* 32-bit hash
************************************************************************/
@@ -186,39 +249,43 @@ XXH_PUBLIC_API unsigned XXH_versionNumber (void);
# if ULONG_MAX == 0xFFFFFFFFUL
typedef unsigned long XXH32_hash_t;
# else
-# error "unsupported platform : need a 32-bit type"
+# error "unsupported platform: need a 32-bit type"
# endif
# endif
#endif
-/*! XXH32() :
- Calculate the 32-bit hash of sequence "length" bytes stored at memory address "input".
- The memory between input & input+length must be valid (allocated and read-accessible).
- "seed" can be used to alter the result predictably.
- Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s */
+/*!
+ * XXH32():
+ * Calculate the 32-bit hash of sequence "length" bytes stored at memory address "input".
+ * The memory between input & input+length must be valid (allocated and read-accessible).
+ * "seed" can be used to alter the result predictably.
+ * Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark): 5.4 GB/s
+ */
XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, XXH32_hash_t seed);
-/*====== Streaming ======*/
+/******* Streaming *******/
/*
* Streaming functions generate the xxHash value from an incrememtal input.
* This method is slower than single-call functions, due to state management.
* For small inputs, prefer `XXH32()` and `XXH64()`, which are better optimized.
*
- * XXH state must first be allocated, using XXH*_createState() .
+ * An XXH state must first be allocated using `XXH*_createState()`.
*
- * Start a new hash by initializing state with a seed, using XXH*_reset().
+ * Start a new hash by initializing the state with a seed using `XXH*_reset()`.
*
- * Then, feed the hash state by calling XXH*_update() as many times as necessary.
- * The function returns an error code, with 0 meaning OK, and any other value meaning there is an error.
+ * Then, feed the hash state by calling `XXH*_update()` as many times as necessary.
*
- * Finally, a hash value can be produced anytime, by using XXH*_digest().
+ * The function returns an error code, with 0 meaning OK, and any other value
+ * meaning there is an error.
+ *
+ * Finally, a hash value can be produced anytime, by using `XXH*_digest()`.
* This function returns the nn-bits hash as an int or long long.
*
- * It's still possible to continue inserting input into the hash state after a digest,
- * and generate some new hash values later on, by invoking again XXH*_digest().
+ * It's still possible to continue inserting input into the hash state after a
+ * digest, and generate new hash values later on by invoking `XXH*_digest()`.
*
- * When done, release the state, using XXH*_freeState().
+ * When done, release the state using `XXH*_freeState()`.
*/
typedef struct XXH32_state_s XXH32_state_t; /* incomplete type */
@@ -230,21 +297,25 @@ XXH_PUBLIC_API XXH_errorcode XXH32_reset (XXH32_state_t* statePtr, XXH32_hash_t
XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
XXH_PUBLIC_API XXH32_hash_t XXH32_digest (const XXH32_state_t* statePtr);
-/*====== Canonical representation ======*/
+/******* Canonical representation *******/
-/* Default return values from XXH functions are basic unsigned 32 and 64 bits.
+/*
+ * The default return values from XXH functions are unsigned 32 and 64 bit
+ * integers.
* This the simplest and fastest format for further post-processing.
- * However, this leaves open the question of what is the order of bytes,
- * since little and big endian conventions will write the same number differently.
*
- * The canonical representation settles this issue,
- * by mandating big-endian convention,
- * aka, the same convention as human-readable numbers (large digits first).
- * When writing hash values to storage, sending them over a network, or printing them,
- * it's highly recommended to use the canonical representation,
- * to ensure portability across a wider range of systems, present and future.
+ * However, this leaves open the question of what is the order on the byte level,
+ * since little and big endian conventions will store the same number differently.
+ *
+ * The canonical representation settles this issue by mandating big-endian
+ * convention, the same convention as human-readable numbers (large digits first).
*
- * The following functions allow transformation of hash values into and from canonical format.
+ * When writing hash values to storage, sending them over a network, or printing
+ * them, it's highly recommended to use the canonical representation to ensure
+ * portability across a wider range of systems, present and future.
+ *
+ * The following functions allow transformation of hash values to and from
+ * canonical format.
*/
typedef struct { unsigned char digest[4]; } XXH32_canonical_t;
@@ -266,14 +337,17 @@ XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src
typedef unsigned long long XXH64_hash_t;
#endif
-/*! XXH64() :
- Calculate the 64-bit hash of sequence of length "len" stored at memory address "input".
- "seed" can be used to alter the result predictably.
- This function runs faster on 64-bit systems, but slower on 32-bit systems (see benchmark).
-*/
+/*!
+ * XXH64():
+ * Returns the 64-bit hash of sequence of length @length stored at memory
+ * address @input.
+ * @seed can be used to alter the result predictably.
+ * This function usually runs faster on 64-bit systems, but slower on 32-bit
+ * systems (see benchmark).
+ */
XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, XXH64_hash_t seed);
-/*====== Streaming ======*/
+/******* Streaming *******/
typedef struct XXH64_state_s XXH64_state_t; /* incomplete type */
XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void);
XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr);
@@ -283,7 +357,7 @@ XXH_PUBLIC_API XXH_errorcode XXH64_reset (XXH64_state_t* statePtr, XXH64_hash_t
XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);
XXH_PUBLIC_API XXH64_hash_t XXH64_digest (const XXH64_state_t* statePtr);
-/*====== Canonical representation ======*/
+/******* Canonical representation *******/
typedef struct { unsigned char digest[8]; } XXH64_canonical_t;
XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash);
XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src);
@@ -291,20 +365,25 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src
#endif /* XXH_NO_LONG_LONG */
+#endif /* XXHASH_H_5627135585666179 */
+#define XXH_STATIC_LINKING_ONLY
-#ifdef XXH_STATIC_LINKING_ONLY
-
-/* ================================================================================================
- This section contains declarations which are not guaranteed to remain stable.
- They may change in future versions, becoming incompatible with a different version of the library.
- These declarations should only be used with static linking.
- Never use them in association with dynamic linking !
-=================================================================================================== */
+#if defined(XXH_STATIC_LINKING_ONLY) && !defined(XXHASH_H_STATIC_13879238742)
+#define XXHASH_H_STATIC_13879238742
+/* ****************************************************************************
+ * This section contains declarations which are not guaranteed to remain stable.
+ * They may change in future versions, becoming incompatible with a different
+ * version of the library.
+ * These declarations should only be used with static linking.
+ * Never use them in association with dynamic linking!
+ ***************************************************************************** */
-/* These definitions are only present to allow
- * static allocation of XXH state, on stack or in a struct for example.
- * Never **ever** use members directly. */
+/*
+ * These definitions are only present to allow static allocation of an XXH
+ * state, for example, on the stack or in a struct.
+ * Never **ever** access members directly.
+ */
struct XXH32_state_s {
XXH32_hash_t total_len_32;
@@ -318,7 +397,9 @@ struct XXH32_state_s {
XXH32_hash_t reserved; /* never read nor write, might be removed in a future version */
}; /* typedef'd to XXH32_state_t */
-#ifndef XXH_NO_LONG_LONG /* remove 64-bit support */
+
+#ifndef XXH_NO_LONG_LONG /* defined when there is no 64-bit support */
+
struct XXH64_state_s {
XXH64_hash_t total_len;
XXH64_hash_t v1;
@@ -330,81 +411,58 @@ struct XXH64_state_s {
XXH32_hash_t reserved32; /* required for padding anyway */
XXH64_hash_t reserved64; /* never read nor write, might be removed in a future version */
}; /* typedef'd to XXH64_state_t */
-#endif /* XXH_NO_LONG_LONG */
/*-**********************************************************************
* XXH3
* New experimental hash
************************************************************************/
-#ifndef XXH_NO_LONG_LONG
-
-/* ============================================
- * XXH3 is a new hash algorithm,
- * featuring improved speed performance for both small and large inputs.
- * See full speed analysis at : http://fastcompression.blogspot.com/2019/03/presenting-xxh3.html
- * In general, expect XXH3 to run about ~2x faster on large inputs,
- * and >3x faster on small ones, though exact differences depend on platform.
+/* ************************************************************************
+ * XXH3 is a new hash algorithm featuring:
+ * - Improved speed for both small and large inputs
+ * - True 64-bit and 128-bit outputs
+ * - SIMD acceleration
+ * - Improved 32-bit viability
+ *
+ * Speed analysis methodology is explained here:
*
- * The algorithm is portable, will generate the same hash on all platforms.
- * It benefits greatly from vectorization units, but does not require it.
+ * https://fastcompression.blogspot.com/2019/03/presenting-xxh3.html
+ *
+ * In general, expect XXH3 to run about ~2x faster on large inputs and >3x
+ * faster on small ones compared to XXH64, though exact differences depend on
+ * the platform.
+ *
+ * The algorithm is portable: Like XXH32 and XXH64, it generates the same hash
+ * on all platforms.
+ *
+ * It benefits greatly from SIMD and 64-bit arithmetic, but does not require it.
+ *
+ * Almost all 32-bit and 64-bit targets that can run XXH32 smoothly can run
+ * XXH3 at usable speeds, even if XXH64 runs slowly. Further details are
+ * explained in the implementation.
+ *
+ * Optimized implementations are provided for AVX2, SSE2, NEON, POWER8, ZVector,
+ * and scalar targets. This can be controlled with the XXH_VECTOR macro.
*
* XXH3 offers 2 variants, _64bits and _128bits.
- * When only 64 bits are needed, prefer calling the _64bits variant :
- * it reduces the amount of mixing, resulting in faster speed on small inputs.
+ * When only 64 bits are needed, prefer calling the _64bits variant, as it
+ * reduces the amount of mixing, resulting in faster speed on small inputs.
+ *
* It's also generally simpler to manipulate a scalar return type than a struct.
*
- * The XXH3 algorithm is still considered experimental.
- * Produced results can still change between versions.
- * Results produced by v0.7.x are not comparable with results from v0.7.y .
- * It's nonetheless possible to use XXH3 for ephemeral data (local sessions),
- * but avoid storing values in long-term storage for later reads.
+ * The 128-bit version adds additional strength, but it is slightly slower.
*
- * The API supports one-shot hashing, streaming mode, and custom secrets.
+ * The XXH3 algorithm is still in development.
+ * The results it produces may still change in future versions.
+ *
+ * Results produced by v0.7.x are not comparable with results from v0.7.y.
+ * However, the API is completely stable, and it can safely be used for
+ * ephemeral data (local sessions).
+ *
+ * Avoid storing values in long-term storage until the algorithm is finalized.
*
- * There are still a number of opened questions that community can influence during the experimental period.
- * I'm trying to list a few of them below, though don't consider this list as complete.
- *
- * - 128-bits output type : currently defined as a structure of two 64-bits fields.
- * That's because 128-bit values do not exist in C standard.
- * Note that it means that, at byte level, result is not identical depending on endianess.
- * However, at field level, they are identical on all platforms.
- * The canonical representation solves the issue of identical byte-level representation across platforms,
- * which is necessary for serialization.
- * Q1 : Would there be a better representation for a 128-bit hash result ?
- * Q2 : Are the names of the inner 64-bit fields important ? Should they be changed ?
- *
- * - Prototype XXH128() : XXH128() uses the same arguments as XXH64(), for consistency.
- * It means it maps to XXH3_128bits_withSeed().
- * This variant is slightly slower than XXH3_128bits(),
- * because the seed is now part of the algorithm, and can't be simplified.
- * Is that a good idea ?
- *
- * - Seed type for XXH128() : currently, it's a single 64-bit value, like the 64-bit variant.
- * It could be argued that it's more logical to offer a 128-bit seed input parameter for a 128-bit hash.
- * But 128-bit seed is more difficult to use, since it requires to pass a structure instead of a scalar value.
- * Such a variant could either replace current one, or become an additional one.
- * Farmhash, for example, offers both variants (the 128-bits seed variant is called `doubleSeed`).
- * Follow up question : if both 64-bit and 128-bit seeds are allowed, which variant should be called XXH128 ?
- *
- * - Result for len==0 : Currently, the result of hashing a zero-length input is always `0`.
- * It seems okay as a return value when using "default" secret and seed.
- * But is it still fine to return `0` when secret or seed are non-default ?
- * Are there use cases which could depend on generating a different hash result for zero-length input when the secret is different ?
- *
- * - Consistency (1) : Streaming XXH128 uses an XXH3 state, which is the same state as XXH3_64bits().
- * It means a 128bit streaming loop must invoke the following symbols :
- * XXH3_createState(), XXH3_128bits_reset(), XXH3_128bits_update() (loop), XXH3_128bits_digest(), XXH3_freeState().
- * Is that consistent enough ?
- *
- * - Consistency (2) : The canonical representation of `XXH3_64bits` is provided by existing functions
- * XXH64_canonicalFromHash(), and reverse operation XXH64_hashFromCanonical().
- * As a mirror, canonical functions for XXH128_hash_t results generated by `XXH3_128bits`
- * are XXH128_canonicalFromHash() and XXH128_hashFromCanonical().
- * Which means, `XXH3` doesn't appear in the names, because canonical functions operate on a type,
- * independently of which algorithm was used to generate that type.
- * Is that consistent enough ?
+ * The API supports one-shot hashing, streaming mode, and custom secrets.
*/
#ifdef XXH_NAMESPACE
@@ -423,28 +481,32 @@ struct XXH64_state_s {
# define XXH3_64bits_digest XXH_NAME2(XXH_NAMESPACE, XXH3_64bits_digest)
#endif
-/* XXH3_64bits() :
+/* XXH3_64bits():
* default 64-bit variant, using default secret and default seed of 0.
* It's the fastest variant. */
XXH_PUBLIC_API XXH64_hash_t XXH3_64bits(const void* data, size_t len);
-/* XXH3_64bits_withSecret() :
+/*
+ * XXH3_64bits_withSecret():
* It's possible to provide any blob of bytes as a "secret" to generate the hash.
- * This makes it more difficult for an external actor to prepare an intentional collision.
+ * This makes it more difficult for an external actor to prepare an intentional
+ * collision.
* The secret *must* be large enough (>= XXH3_SECRET_SIZE_MIN).
* It should consist of random bytes.
- * Avoid repeating same character, or sequences of bytes,
- * and especially avoid swathes of \0.
+ * Avoid trivial sequences, such as repeating sequences and especially '\0',
+ * as this can cancel out itself.
* Failure to respect these conditions will result in a poor quality hash.
*/
#define XXH3_SECRET_SIZE_MIN 136
XXH_PUBLIC_API XXH64_hash_t XXH3_64bits_withSecret(const void* data, size_t len, const void* secret, size_t secretSize);
-/* XXH3_64bits_withSeed() :
- * This variant generates on the fly a custom secret,
- * based on the default secret, altered using the `seed` value.
+/*
+ * XXH3_64bits_withSeed():
+ * This variant generates a custom secret on the fly based on the default
+ * secret, altered using the `seed` value.
* While this operation is decently fast, note that it's not completely free.
- * note : seed==0 produces same results as XXH3_64bits() */
+ * Note: seed==0 produces the same results as XXH3_64bits().
+ */
XXH_PUBLIC_API XXH64_hash_t XXH3_64bits_withSeed(const void* data, size_t len, XXH64_hash_t seed);
@@ -461,14 +523,24 @@ XXH_PUBLIC_API XXH64_hash_t XXH3_64bits_withSeed(const void* data, size_t len, X
# define XXH_ALIGN(n) /* disabled */
#endif
+/* Old GCC versions only accept the attribute after the type in structures. */
+#if !(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) /* C11+ */ \
+ && defined(__GNUC__)
+# define XXH_ALIGN_MEMBER(align, type) type XXH_ALIGN(align)
+#else
+# define XXH_ALIGN_MEMBER(align, type) XXH_ALIGN(align) type
+#endif
+
typedef struct XXH3_state_s XXH3_state_t;
#define XXH3_SECRET_DEFAULT_SIZE 192 /* minimum XXH3_SECRET_SIZE_MIN */
#define XXH3_INTERNALBUFFER_SIZE 256
struct XXH3_state_s {
- XXH_ALIGN(64) XXH64_hash_t acc[8];
- XXH_ALIGN(64) unsigned char customSecret[XXH3_SECRET_DEFAULT_SIZE]; /* used to store a custom secret generated from the seed. Makes state larger. Design might change */
- XXH_ALIGN(64) unsigned char buffer[XXH3_INTERNALBUFFER_SIZE];
+ XXH_ALIGN_MEMBER(64, XXH64_hash_t acc[8]);
+ /* used to store a custom secret generated from the seed. Makes state larger.
+ * Design might change */
+ XXH_ALIGN_MEMBER(64, unsigned char customSecret[XXH3_SECRET_DEFAULT_SIZE]);
+ XXH_ALIGN_MEMBER(64, unsigned char buffer[XXH3_INTERNALBUFFER_SIZE]);
XXH32_hash_t bufferedSize;
XXH32_hash_t nbStripesPerBlock;
XXH32_hash_t nbStripesSoFar;
@@ -478,30 +550,40 @@ struct XXH3_state_s {
XXH64_hash_t totalLen;
XXH64_hash_t seed;
XXH64_hash_t reserved64;
- const unsigned char* secret; /* note : there is some padding after, due to alignment on 64 bytes */
+ /* note: there is some padding after due to alignment on 64 bytes */
+ const unsigned char* secret;
}; /* typedef'd to XXH3_state_t */
-/* Streaming requires state maintenance.
- * This operation costs memory and cpu.
- * As a consequence, streaming is slower than one-shot hashing.
- * For better performance, prefer using one-shot functions whenever possible. */
+#undef XXH_ALIGN_MEMBER
+/*
+ * Streaming requires state maintenance.
+ * This operation costs memory and CPU.
+ * As a consequence, streaming is slower than one-shot hashing.
+ * For better performance, prefer one-shot functions whenever possible.
+ */
XXH_PUBLIC_API XXH3_state_t* XXH3_createState(void);
XXH_PUBLIC_API XXH_errorcode XXH3_freeState(XXH3_state_t* statePtr);
XXH_PUBLIC_API void XXH3_copyState(XXH3_state_t* dst_state, const XXH3_state_t* src_state);
-/* XXH3_64bits_reset() :
- * initialize with default parameters.
- * result will be equivalent to `XXH3_64bits()`. */
+/*
+ * XXH3_64bits_reset():
+ * Initialize with the default parameters.
+ * The result will be equivalent to `XXH3_64bits()`.
+ */
XXH_PUBLIC_API XXH_errorcode XXH3_64bits_reset(XXH3_state_t* statePtr);
-/* XXH3_64bits_reset_withSeed() :
- * generate a custom secret from `seed`, and store it into state.
- * digest will be equivalent to `XXH3_64bits_withSeed()`. */
+/*
+ * XXH3_64bits_reset_withSeed():
+ * Generate a custom secret from `seed`, and store it into `statePtr`.
+ * digest will be equivalent to `XXH3_64bits_withSeed()`.
+ */
XXH_PUBLIC_API XXH_errorcode XXH3_64bits_reset_withSeed(XXH3_state_t* statePtr, XXH64_hash_t seed);
-/* XXH3_64bits_reset_withSecret() :
- * `secret` is referenced, and must outlive the hash streaming session.
- * secretSize must be >= XXH3_SECRET_SIZE_MIN.
+/*
+ * XXH3_64bits_reset_withSecret():
+ * `secret` is referenced, and must outlive the hash streaming session, so
+ * be careful when using stack arrays.
+ * `secretSize` must be >= `XXH3_SECRET_SIZE_MIN`.
*/
XXH_PUBLIC_API XXH_errorcode XXH3_64bits_reset_withSecret(XXH3_state_t* statePtr, const void* secret, size_t secretSize);
@@ -547,20 +629,27 @@ XXH_PUBLIC_API XXH_errorcode XXH3_128bits_update (XXH3_state_t* statePtr, const
XXH_PUBLIC_API XXH128_hash_t XXH3_128bits_digest (const XXH3_state_t* statePtr);
-/* Note : for better performance, following functions can be inlined,
- * using XXH_INLINE_ALL */
+/* Note: For better performance, these functions can be inlined using XXH_INLINE_ALL */
-/* return : 1 is equal, 0 if different */
+/*!
+ * XXH128_isEqual():
+ * Return: 1 if `h1` and `h2` are equal, 0 if they are not.
+ */
XXH_PUBLIC_API int XXH128_isEqual(XXH128_hash_t h1, XXH128_hash_t h2);
-/* This comparator is compatible with stdlib's qsort().
- * return : >0 if *h128_1 > *h128_2
- * <0 if *h128_1 < *h128_2
- * =0 if *h128_1 == *h128_2 */
+/*!
+ * XXH128_cmp():
+ *
+ * This comparator is compatible with stdlib's `qsort()`/`bsearch()`.
+ *
+ * return: >0 if *h128_1 > *h128_2
+ * <0 if *h128_1 < *h128_2
+ * =0 if *h128_1 == *h128_2
+ */
XXH_PUBLIC_API int XXH128_cmp(const void* h128_1, const void* h128_2);
-/*====== Canonical representation ======*/
+/******* Canonical representation *******/
typedef struct { unsigned char digest[16]; } XXH128_canonical_t;
XXH_PUBLIC_API void XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash);
XXH_PUBLIC_API XXH128_hash_t XXH128_hashFromCanonical(const XXH128_canonical_t* src);
@@ -568,21 +657,1285 @@ XXH_PUBLIC_API XXH128_hash_t XXH128_hashFromCanonical(const XXH128_canonical_t*
#endif /* XXH_NO_LONG_LONG */
+#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
+# define XXH_IMPLEMENTATION
+#endif
+
+#endif /* defined(XXH_STATIC_LINKING_ONLY) && !defined(XXHASH_H_STATIC_13879238742) */
+
+
+/* ======================================================================== */
+/* ======================================================================== */
+/* ======================================================================== */
+
/*-**********************************************************************
-* XXH_INLINE_ALL
-************************************************************************/
-#if defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API)
-# include "xxhash.c" /* include xxhash function bodies as `static`, for inlining */
+ * xxHash implementation
+ *-**********************************************************************
+ * xxHash's implementation used to be found in xxhash.c.
+ *
+ * However, code inlining requires the implementation to be visible to the
+ * compiler, usually within the header.
+ *
+ * As a workaround, xxhash.c used to be included within xxhash.h. This caused
+ * some issues with some build systems, especially ones which treat .c files
+ * as source files.
+ *
+ * Therefore, the implementation is now directly integrated within xxhash.h.
+ * Another small advantage is that xxhash.c is no longer needed in /include.
+ ************************************************************************/
+
+#if ( defined(XXH_INLINE_ALL) || defined(XXH_PRIVATE_API) \
+ || defined(XXH_IMPLEMENTATION) ) && !defined(XXH_IMPLEM_13a8737387)
+# define XXH_IMPLEM_13a8737387
+
+/* *************************************
+* Tuning parameters
+***************************************/
+/*!
+ * XXH_FORCE_MEMORY_ACCESS:
+ * By default, access to unaligned memory is controlled by `memcpy()`, which is
+ * safe and portable.
+ *
+ * Unfortunately, on some target/compiler combinations, the generated assembly
+ * is sub-optimal.
+ *
+ * The below switch allow to select a different access method for improved
+ * performance.
+ * Method 0 (default):
+ * Use `memcpy()`. Safe and portable.
+ * Method 1:
+ * `__attribute__((packed))` statement. It depends on compiler extensions
+ * and is therefore not portable.
+ * This method is safe if your compiler supports it, and *generally* as
+ * fast or faster than `memcpy`.
+ * Method 2:
+ * Direct access via cast. This method doesn't depend on the compiler but
+ * violates the C standard.
+ * It can generate buggy code on targets which do not support unaligned
+ * memory accesses.
+ * But in some circumstances, it's the only known way to get the most
+ * performance (ie GCC + ARMv6)
+ * Method 3:
+ * Byteshift. This can generate the best code on old compilers which don't
+ * inline small `memcpy()` calls, and it might also be faster on big-endian
+ * systems which lack a native byteswap instruction.
+ * See https://stackoverflow.com/a/32095106/646947 for details.
+ * Prefer these methods in priority order (0 > 1 > 2 > 3)
+ */
+#ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
+# if !defined(__clang__) && defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED) && defined(__ARM_ARCH) && (__ARM_ARCH == 6)
+# define XXH_FORCE_MEMORY_ACCESS 2
+# elif !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
+ (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7)))
+# define XXH_FORCE_MEMORY_ACCESS 1
+# endif
#endif
+/*!
+ *XXH_ACCEPT_NULL_INPUT_POINTER:
+ * If the input pointer is NULL, xxHash's default behavior is to dereference it,
+ * triggering a segfault.
+ * When this macro is enabled, xxHash actively checks the input for a null pointer.
+ * If it is, the result for null input pointers is the same as a zero-length input.
+ */
+#ifndef XXH_ACCEPT_NULL_INPUT_POINTER /* can be defined externally */
+# define XXH_ACCEPT_NULL_INPUT_POINTER 0
+#endif
+/*!
+ * XXH_FORCE_ALIGN_CHECK:
+ * This is a minor performance trick, only useful with lots of very small keys.
+ * It means: check for aligned/unaligned input.
+ * The check costs one initial branch per hash;
+ * Set it to 0 when the input is guaranteed to be aligned or when alignment
+ * doesn't matter for performance.
+ *
+ * This option does not affect XXH3.
+ */
+#ifndef XXH_FORCE_ALIGN_CHECK /* can be defined externally */
+# if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
+# define XXH_FORCE_ALIGN_CHECK 0
+# else
+# define XXH_FORCE_ALIGN_CHECK 1
+# endif
+#endif
+
+/*!
+ * XXH_NO_INLINE_HINTS:
+ *
+ * By default, xxHash tries to force the compiler to inline almost all internal
+ * functions.
+ *
+ * This can usually improve performance due to reduced jumping and improved
+ * constant folding, but significantly increases the size of the binary which
+ * might not be favorable.
+ *
+ * Additionally, sometimes the forced inlining can be detrimental to performance,
+ * depending on the architecture.
+ *
+ * XXH_NO_INLINE_HINTS marks all internal functions as static, giving the
+ * compiler full control on whether to inline or not.
+ *
+ * When not optimizing (-O0), optimizing for size (-Os, -Oz), or using
+ * -fno-inline with GCC or Clang, this will automatically be defined.
+ */
+#ifndef XXH_NO_INLINE_HINTS
+# if defined(__OPTIMIZE_SIZE__) /* -Os, -Oz */ \
+ || defined(__NO_INLINE__) /* -O0, -fno-inline */
+# define XXH_NO_INLINE_HINTS 1
+# else
+# define XXH_NO_INLINE_HINTS 0
+# endif
+#endif
-#endif /* XXH_STATIC_LINKING_ONLY */
+/*!
+ * XXH_REROLL:
+ * Whether to reroll XXH32_finalize, and XXH64_finalize,
+ * instead of using an unrolled jump table/if statement loop.
+ *
+ * This is automatically defined on -Os/-Oz on GCC and Clang.
+ */
+#ifndef XXH_REROLL
+# if defined(__OPTIMIZE_SIZE__)
+# define XXH_REROLL 1
+# else
+# define XXH_REROLL 0
+# endif
+#endif
-#if defined (__cplusplus)
+/* *************************************
+* Includes & Memory related functions
+***************************************/
+/*!
+ * Modify the local functions below should you wish to use some other memory
+ * routines for malloc() and free()
+ */
+#include <stdlib.h>
+static void* XXH_malloc(size_t s) { return malloc(s); }
+static void XXH_free (void* p) { free(p); }
+/*! and for memcpy() */
+#include <string.h>
+static void* XXH_memcpy(void* dest, const void* src, size_t size)
+{
+ return memcpy(dest,src,size);
}
+
+#include <limits.h> /* ULLONG_MAX */
+
+
+/* *************************************
+* Compiler Specific Options
+***************************************/
+#ifdef _MSC_VER /* Visual Studio warning fix */
+# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
#endif
-#endif /* XXHASH_H_5627135585666179 */
+#if XXH_NO_INLINE_HINTS /* disable inlining hints */
+# define XXH_FORCE_INLINE static
+# define XXH_NO_INLINE static
+#elif defined(_MSC_VER) /* Visual Studio */
+# define XXH_FORCE_INLINE static __forceinline
+# define XXH_NO_INLINE static __declspec(noinline)
+#else
+# if defined (__cplusplus) \
+ || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
+# ifdef __GNUC__
+# define XXH_FORCE_INLINE static inline __attribute__((always_inline))
+# define XXH_NO_INLINE static __attribute__((noinline))
+# else
+# define XXH_FORCE_INLINE static inline
+# define XXH_NO_INLINE static
+# endif
+# else
+# define XXH_FORCE_INLINE static
+# define XXH_NO_INLINE static
+# endif /* __STDC_VERSION__ */
+#endif
+
+
+
+/* *************************************
+* Debug
+***************************************/
+/*
+ * DEBUGLEVEL is expected to be defined externally, typically via the compiler's
+ * command line options. The value must be a number.
+ */
+#ifndef DEBUGLEVEL
+# define DEBUGLEVEL 0
+#endif
+
+#if (DEBUGLEVEL>=1)
+# include <assert.h> /* note: can still be disabled with NDEBUG */
+# define XXH_ASSERT(c) assert(c)
+#else
+# define XXH_ASSERT(c) ((void)0)
+#endif
+
+/* note: use after variable declarations */
+#define XXH_STATIC_ASSERT(c) { enum { XXH_sa = 1/(int)(!!(c)) }; }
+
+
+/* *************************************
+* Basic Types
+***************************************/
+#if !defined (__VMS) \
+ && (defined (__cplusplus) \
+ || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+# include <stdint.h>
+ typedef uint8_t xxh_u8;
+#else
+ typedef unsigned char xxh_u8;
+#endif
+typedef XXH32_hash_t xxh_u32;
+
+
+/* *** Memory access *** */
+
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3))
+/*
+ * Manual byteshift. Best for old compilers which don't inline memcpy.
+ * We actually directly use XXH_readLE32 and XXH_readBE32.
+ */
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
+
+/*
+ * Force direct memory access. Only works on CPU which support unaligned memory
+ * access in hardware.
+ */
+static xxh_u32 XXH_read32(const void* memPtr) { return *(const xxh_u32*) memPtr; }
+
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
+
+/*
+ * __pack instructions are safer but compiler specific, hence potentially
+ * problematic for some compilers.
+ *
+ * Currently only defined for GCC and ICC.
+ */
+typedef union { xxh_u32 u32; } __attribute__((packed)) unalign;
+static xxh_u32 XXH_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
+
+#else
+
+/*
+ * Portable and safe solution. Generally efficient.
+ * see: https://stackoverflow.com/a/32095106/646947
+ */
+static xxh_u32 XXH_read32(const void* memPtr)
+{
+ xxh_u32 val;
+ memcpy(&val, memPtr, sizeof(val));
+ return val;
+}
+
+#endif /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
+
+
+/* *** Endianess *** */
+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;
+
+/*!
+ * XXH_CPU_LITTLE_ENDIAN:
+ * Defined to 1 if the target is little endian, or 0 if it is big endian.
+ * It can be defined externally, for example on the compiler command line.
+ *
+ * If it is not defined, a runtime check (which is usually constant folded)
+ * is used instead.
+ */
+#ifndef XXH_CPU_LITTLE_ENDIAN
+/*
+ * Try to detect endianness automatically, to avoid the nonstandard behavior
+ * in `XXH_isLittleEndian()`
+ */
+# if defined(_WIN32) /* Windows is always little endian */ \
+ || defined(__LITTLE_ENDIAN__) \
+ || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+# define XXH_CPU_LITTLE_ENDIAN 1
+# elif defined(__BIG_ENDIAN__) \
+ || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+# define XXH_CPU_LITTLE_ENDIAN 0
+# else
+static int XXH_isLittleEndian(void)
+{
+ /*
+ * Nonstandard, but well-defined behavior in practice.
+ * Don't use static: it is detrimental to performance.
+ */
+ const union { xxh_u32 u; xxh_u8 c[4]; } one = { 1 };
+ return one.c[0];
+}
+# define XXH_CPU_LITTLE_ENDIAN XXH_isLittleEndian()
+# endif
+#endif
+
+
+
+
+/* ****************************************
+* Compiler-specific Functions and Macros
+******************************************/
+#define XXH_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
+
+#if !defined(NO_CLANG_BUILTIN) && __has_builtin(__builtin_rotateleft32) \
+ && __has_builtin(__builtin_rotateleft64)
+# define XXH_rotl32 __builtin_rotateleft32
+# define XXH_rotl64 __builtin_rotateleft64
+/* Note: although _rotl exists for minGW (GCC under windows), performance seems poor */
+#elif defined(_MSC_VER)
+# define XXH_rotl32(x,r) _rotl(x,r)
+# define XXH_rotl64(x,r) _rotl64(x,r)
+#else
+# define XXH_rotl32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
+# define XXH_rotl64(x,r) (((x) << (r)) | ((x) >> (64 - (r))))
+#endif
+
+#if defined(_MSC_VER) /* Visual Studio */
+# define XXH_swap32 _byteswap_ulong
+#elif XXH_GCC_VERSION >= 403
+# define XXH_swap32 __builtin_bswap32
+#else
+static xxh_u32 XXH_swap32 (xxh_u32 x)
+{
+ return ((x << 24) & 0xff000000 ) |
+ ((x << 8) & 0x00ff0000 ) |
+ ((x >> 8) & 0x0000ff00 ) |
+ ((x >> 24) & 0x000000ff );
+}
+#endif
+
+
+/* ***************************
+* Memory reads
+*****************************/
+typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;
+
+/*
+ * XXH_FORCE_MEMORY_ACCESS==3 is an endian-independent byteshift load.
+ *
+ * This is ideal for older compilers which don't inline memcpy.
+ */
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3))
+
+XXH_FORCE_INLINE xxh_u32 XXH_readLE32(const void* memPtr)
+{
+ const xxh_u8* bytePtr = (const xxh_u8 *)memPtr;
+ return bytePtr[0]
+ | ((xxh_u32)bytePtr[1] << 8)
+ | ((xxh_u32)bytePtr[2] << 16)
+ | ((xxh_u32)bytePtr[3] << 24);
+}
+
+XXH_FORCE_INLINE xxh_u32 XXH_readBE32(const void* memPtr)
+{
+ const xxh_u8* bytePtr = (const xxh_u8 *)memPtr;
+ return bytePtr[3]
+ | ((xxh_u32)bytePtr[2] << 8)
+ | ((xxh_u32)bytePtr[1] << 16)
+ | ((xxh_u32)bytePtr[0] << 24);
+}
+
+#else
+XXH_FORCE_INLINE xxh_u32 XXH_readLE32(const void* ptr)
+{
+ return XXH_CPU_LITTLE_ENDIAN ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));
+}
+
+static xxh_u32 XXH_readBE32(const void* ptr)
+{
+ return XXH_CPU_LITTLE_ENDIAN ? XXH_swap32(XXH_read32(ptr)) : XXH_read32(ptr);
+}
+#endif
+
+XXH_FORCE_INLINE xxh_u32
+XXH_readLE32_align(const void* ptr, XXH_alignment align)
+{
+ if (align==XXH_unaligned) {
+ return XXH_readLE32(ptr);
+ } else {
+ return XXH_CPU_LITTLE_ENDIAN ? *(const xxh_u32*)ptr : XXH_swap32(*(const xxh_u32*)ptr);
+ }
+}
+
+
+/* *************************************
+* Misc
+***************************************/
+XXH_PUBLIC_API unsigned XXH_versionNumber (void) { return XXH_VERSION_NUMBER; }
+
+
+/* *******************************************************************
+* 32-bit hash functions
+*********************************************************************/
+static const xxh_u32 PRIME32_1 = 0x9E3779B1U; /* 0b10011110001101110111100110110001 */
+static const xxh_u32 PRIME32_2 = 0x85EBCA77U; /* 0b10000101111010111100101001110111 */
+static const xxh_u32 PRIME32_3 = 0xC2B2AE3DU; /* 0b11000010101100101010111000111101 */
+static const xxh_u32 PRIME32_4 = 0x27D4EB2FU; /* 0b00100111110101001110101100101111 */
+static const xxh_u32 PRIME32_5 = 0x165667B1U; /* 0b00010110010101100110011110110001 */
+
+static xxh_u32 XXH32_round(xxh_u32 acc, xxh_u32 input)
+{
+ acc += input * PRIME32_2;
+ acc = XXH_rotl32(acc, 13);
+ acc *= PRIME32_1;
+#if defined(__GNUC__) && defined(__SSE4_1__) && !defined(XXH_ENABLE_AUTOVECTORIZE)
+ /*
+ * UGLY HACK:
+ * This inline assembly hack forces acc into a normal register. This is the
+ * only thing that prevents GCC and Clang from autovectorizing the XXH32
+ * loop (pragmas and attributes don't work for some resason) without globally
+ * disabling SSE4.1.
+ *
+ * The reason we want to avoid vectorization is because despite working on
+ * 4 integers at a time, there are multiple factors slowing XXH32 down on
+ * SSE4:
+ * - There's a ridiculous amount of lag from pmulld (10 cycles of latency on
+ * newer chips!) making it slightly slower to multiply four integers at
+ * once compared to four integers independently. Even when pmulld was
+ * fastest, Sandy/Ivy Bridge, it is still not worth it to go into SSE
+ * just to multiply unless doing a long operation.
+ *
+ * - Four instructions are required to rotate,
+ * movqda tmp, v // not required with VEX encoding
+ * pslld tmp, 13 // tmp <<= 13
+ * psrld v, 19 // x >>= 19
+ * por v, tmp // x |= tmp
+ * compared to one for scalar:
+ * roll v, 13 // reliably fast across the board
+ * shldl v, v, 13 // Sandy Bridge and later prefer this for some reason
+ *
+ * - Instruction level parallelism is actually more beneficial here because
+ * the SIMD actually serializes this operation: While v1 is rotating, v2
+ * can load data, while v3 can multiply. SSE forces them to operate
+ * together.
+ *
+ * How this hack works:
+ * __asm__("" // Declare an assembly block but don't declare any instructions
+ * : // However, as an Input/Output Operand,
+ * "+r" // constrain a read/write operand (+) as a general purpose register (r).
+ * (acc) // and set acc as the operand
+ * );
+ *
+ * Because of the 'r', the compiler has promised that seed will be in a
+ * general purpose register and the '+' says that it will be 'read/write',
+ * so it has to assume it has changed. It is like volatile without all the
+ * loads and stores.
+ *
+ * Since the argument has to be in a normal register (not an SSE register),
+ * each time XXH32_round is called, it is impossible to vectorize.
+ */
+ __asm__("" : "+r" (acc));
+#endif
+ return acc;
+}
+
+/* mix all bits */
+static xxh_u32 XXH32_avalanche(xxh_u32 h32)
+{
+ h32 ^= h32 >> 15;
+ h32 *= PRIME32_2;
+ h32 ^= h32 >> 13;
+ h32 *= PRIME32_3;
+ h32 ^= h32 >> 16;
+ return(h32);
+}
+
+#define XXH_get32bits(p) XXH_readLE32_align(p, align)
+
+static xxh_u32
+XXH32_finalize(xxh_u32 h32, const xxh_u8* ptr, size_t len, XXH_alignment align)
+{
+#define PROCESS1 \
+ h32 += (*ptr++) * PRIME32_5; \
+ h32 = XXH_rotl32(h32, 11) * PRIME32_1 ;
+
+#define PROCESS4 \
+ h32 += XXH_get32bits(ptr) * PRIME32_3; \
+ ptr+=4; \
+ h32 = XXH_rotl32(h32, 17) * PRIME32_4 ;
+
+ /* Compact rerolled version */
+ if (XXH_REROLL) {
+ len &= 15;
+ while (len >= 4) {
+ PROCESS4;
+ len -= 4;
+ }
+ while (len > 0) {
+ PROCESS1;
+ --len;
+ }
+ return XXH32_avalanche(h32);
+ } else {
+ switch(len&15) /* or switch(bEnd - p) */ {
+ case 12: PROCESS4;
+ /* fallthrough */
+ case 8: PROCESS4;
+ /* fallthrough */
+ case 4: PROCESS4;
+ return XXH32_avalanche(h32);
+
+ case 13: PROCESS4;
+ /* fallthrough */
+ case 9: PROCESS4;
+ /* fallthrough */
+ case 5: PROCESS4;
+ PROCESS1;
+ return XXH32_avalanche(h32);
+
+ case 14: PROCESS4;
+ /* fallthrough */
+ case 10: PROCESS4;
+ /* fallthrough */
+ case 6: PROCESS4;
+ PROCESS1;
+ PROCESS1;
+ return XXH32_avalanche(h32);
+
+ case 15: PROCESS4;
+ /* fallthrough */
+ case 11: PROCESS4;
+ /* fallthrough */
+ case 7: PROCESS4;
+ /* fallthrough */
+ case 3: PROCESS1;
+ /* fallthrough */
+ case 2: PROCESS1;
+ /* fallthrough */
+ case 1: PROCESS1;
+ /* fallthrough */
+ case 0: return XXH32_avalanche(h32);
+ }
+ XXH_ASSERT(0);
+ return h32; /* reaching this point is deemed impossible */
+ }
+}
+
+XXH_FORCE_INLINE xxh_u32
+XXH32_endian_align(const xxh_u8* input, size_t len, xxh_u32 seed, XXH_alignment align)
+{
+ const xxh_u8* bEnd = input + len;
+ xxh_u32 h32;
+
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+ if (input==NULL) {
+ len=0;
+ bEnd=input=(const xxh_u8*)(size_t)16;
+ }
+#endif
+
+ if (len>=16) {
+ const xxh_u8* const limit = bEnd - 15;
+ xxh_u32 v1 = seed + PRIME32_1 + PRIME32_2;
+ xxh_u32 v2 = seed + PRIME32_2;
+ xxh_u32 v3 = seed + 0;
+ xxh_u32 v4 = seed - PRIME32_1;
+
+ do {
+ v1 = XXH32_round(v1, XXH_get32bits(input)); input += 4;
+ v2 = XXH32_round(v2, XXH_get32bits(input)); input += 4;
+ v3 = XXH32_round(v3, XXH_get32bits(input)); input += 4;
+ v4 = XXH32_round(v4, XXH_get32bits(input)); input += 4;
+ } while (input < limit);
+
+ h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7)
+ + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18);
+ } else {
+ h32 = seed + PRIME32_5;
+ }
+
+ h32 += (xxh_u32)len;
+
+ return XXH32_finalize(h32, input, len&15, align);
+}
+
+
+XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t len, XXH32_hash_t seed)
+{
+#if 0
+ /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
+ XXH32_state_t state;
+ XXH32_reset(&state, seed);
+ XXH32_update(&state, (const xxh_u8*)input, len);
+ return XXH32_digest(&state);
+
+#else
+
+ if (XXH_FORCE_ALIGN_CHECK) {
+ if ((((size_t)input) & 3) == 0) { /* Input is 4-bytes aligned, leverage the speed benefit */
+ return XXH32_endian_align((const xxh_u8*)input, len, seed, XXH_aligned);
+ } }
+
+ return XXH32_endian_align((const xxh_u8*)input, len, seed, XXH_unaligned);
+#endif
+}
+
+
+
+/******* Hash streaming *******/
+
+XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void)
+{
+ return (XXH32_state_t*)XXH_malloc(sizeof(XXH32_state_t));
+}
+XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr)
+{
+ XXH_free(statePtr);
+ return XXH_OK;
+}
+
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState)
+{
+ memcpy(dstState, srcState, sizeof(*dstState));
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, XXH32_hash_t seed)
+{
+ XXH32_state_t state; /* using a local state to memcpy() in order to avoid strict-aliasing warnings */
+ memset(&state, 0, sizeof(state));
+ state.v1 = seed + PRIME32_1 + PRIME32_2;
+ state.v2 = seed + PRIME32_2;
+ state.v3 = seed + 0;
+ state.v4 = seed - PRIME32_1;
+ /* do not write into reserved, planned to be removed in a future version */
+ memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved));
+ return XXH_OK;
+}
+
+
+XXH_PUBLIC_API XXH_errorcode
+XXH32_update(XXH32_state_t* state, const void* input, size_t len)
+{
+ if (input==NULL)
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+ return XXH_OK;
+#else
+ return XXH_ERROR;
+#endif
+
+ { const xxh_u8* p = (const xxh_u8*)input;
+ const xxh_u8* const bEnd = p + len;
+
+ state->total_len_32 += (XXH32_hash_t)len;
+ state->large_len |= (XXH32_hash_t)((len>=16) | (state->total_len_32>=16));
+
+ if (state->memsize + len < 16) { /* fill in tmp buffer */
+ XXH_memcpy((xxh_u8*)(state->mem32) + state->memsize, input, len);
+ state->memsize += (XXH32_hash_t)len;
+ return XXH_OK;
+ }
+
+ if (state->memsize) { /* some data left from previous update */
+ XXH_memcpy((xxh_u8*)(state->mem32) + state->memsize, input, 16-state->memsize);
+ { const xxh_u32* p32 = state->mem32;
+ state->v1 = XXH32_round(state->v1, XXH_readLE32(p32)); p32++;
+ state->v2 = XXH32_round(state->v2, XXH_readLE32(p32)); p32++;
+ state->v3 = XXH32_round(state->v3, XXH_readLE32(p32)); p32++;
+ state->v4 = XXH32_round(state->v4, XXH_readLE32(p32));
+ }
+ p += 16-state->memsize;
+ state->memsize = 0;
+ }
+
+ if (p <= bEnd-16) {
+ const xxh_u8* const limit = bEnd - 16;
+ xxh_u32 v1 = state->v1;
+ xxh_u32 v2 = state->v2;
+ xxh_u32 v3 = state->v3;
+ xxh_u32 v4 = state->v4;
+
+ do {
+ v1 = XXH32_round(v1, XXH_readLE32(p)); p+=4;
+ v2 = XXH32_round(v2, XXH_readLE32(p)); p+=4;
+ v3 = XXH32_round(v3, XXH_readLE32(p)); p+=4;
+ v4 = XXH32_round(v4, XXH_readLE32(p)); p+=4;
+ } while (p<=limit);
+
+ state->v1 = v1;
+ state->v2 = v2;
+ state->v3 = v3;
+ state->v4 = v4;
+ }
+
+ if (p < bEnd) {
+ XXH_memcpy(state->mem32, p, (size_t)(bEnd-p));
+ state->memsize = (unsigned)(bEnd-p);
+ }
+ }
+
+ return XXH_OK;
+}
+
+
+XXH_PUBLIC_API XXH32_hash_t XXH32_digest (const XXH32_state_t* state)
+{
+ xxh_u32 h32;
+
+ if (state->large_len) {
+ h32 = XXH_rotl32(state->v1, 1)
+ + XXH_rotl32(state->v2, 7)
+ + XXH_rotl32(state->v3, 12)
+ + XXH_rotl32(state->v4, 18);
+ } else {
+ h32 = state->v3 /* == seed */ + PRIME32_5;
+ }
+
+ h32 += state->total_len_32;
+
+ return XXH32_finalize(h32, (const xxh_u8*)state->mem32, state->memsize, XXH_aligned);
+}
+
+
+/******* Canonical representation *******/
+
+/*
+ * The default return values from XXH functions are unsigned 32 and 64 bit
+ * integers.
+ *
+ * The canonical representation uses big endian convention, the same convention
+ * as human-readable numbers (large digits first).
+ *
+ * This way, hash values can be written into a file or buffer, remaining
+ * comparable across different systems.
+ *
+ * The following functions allow transformation of hash values to and from their
+ * canonical format.
+ */
+XXH_PUBLIC_API void XXH32_canonicalFromHash(XXH32_canonical_t* dst, XXH32_hash_t hash)
+{
+ XXH_STATIC_ASSERT(sizeof(XXH32_canonical_t) == sizeof(XXH32_hash_t));
+ if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap32(hash);
+ memcpy(dst, &hash, sizeof(*dst));
+}
+
+XXH_PUBLIC_API XXH32_hash_t XXH32_hashFromCanonical(const XXH32_canonical_t* src)
+{
+ return XXH_readBE32(src);
+}
+
+
+#ifndef XXH_NO_LONG_LONG
+
+/* *******************************************************************
+* 64-bit hash functions
+*********************************************************************/
+
+/******* Memory access *******/
+
+typedef XXH64_hash_t xxh_u64;
+
+
+/*!
+ * XXH_REROLL_XXH64:
+ * Whether to reroll the XXH64_finalize() loop.
+ *
+ * Just like XXH32, we can unroll the XXH64_finalize() loop. This can be a
+ * performance gain on 64-bit hosts, as only one jump is required.
+ *
+ * However, on 32-bit hosts, because arithmetic needs to be done with two 32-bit
+ * registers, and 64-bit arithmetic needs to be simulated, it isn't beneficial
+ * to unroll. The code becomes ridiculously large (the largest function in the
+ * binary on i386!), and rerolling it saves anywhere from 3kB to 20kB. It is
+ * also slightly faster because it fits into cache better and is more likely
+ * to be inlined by the compiler.
+ *
+ * If XXH_REROLL is defined, this is ignored and the loop is always rerolled.
+ */
+#ifndef XXH_REROLL_XXH64
+# if (defined(__ILP32__) || defined(_ILP32)) /* ILP32 is often defined on 32-bit GCC family */ \
+ || !(defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) /* x86-64 */ \
+ || defined(_M_ARM64) || defined(__aarch64__) || defined(__arm64__) /* aarch64 */ \
+ || defined(__PPC64__) || defined(__PPC64LE__) || defined(__ppc64__) || defined(__powerpc64__) /* ppc64 */ \
+ || defined(__mips64__) || defined(__mips64)) /* mips64 */ \
+ || (!defined(SIZE_MAX) || SIZE_MAX < ULLONG_MAX) /* check limits */
+# define XXH_REROLL_XXH64 1
+# else
+# define XXH_REROLL_XXH64 0
+# endif
+#endif /* !defined(XXH_REROLL_XXH64) */
+
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3))
+/*
+ * Manual byteshift. Best for old compilers which don't inline memcpy.
+ * We actually directly use XXH_readLE64 and XXH_readBE64.
+ */
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==2))
+
+/* Force direct memory access. Only works on CPU which support unaligned memory access in hardware */
+static xxh_u64 XXH_read64(const void* memPtr) { return *(const xxh_u64*) memPtr; }
+
+#elif (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==1))
+
+/*
+ * __pack instructions are safer, but compiler specific, hence potentially
+ * problematic for some compilers.
+ *
+ * Currently only defined for GCC and ICC.
+ */
+typedef union { xxh_u32 u32; xxh_u64 u64; } __attribute__((packed)) unalign64;
+static xxh_u64 XXH_read64(const void* ptr) { return ((const unalign64*)ptr)->u64; }
+
+#else
+
+/*
+ * Portable and safe solution. Generally efficient.
+ * see: https://stackoverflow.com/a/32095106/646947
+ */
+static xxh_u64 XXH_read64(const void* memPtr)
+{
+ xxh_u64 val;
+ memcpy(&val, memPtr, sizeof(val));
+ return val;
+}
+
+#endif /* XXH_FORCE_DIRECT_MEMORY_ACCESS */
+
+#if defined(_MSC_VER) /* Visual Studio */
+# define XXH_swap64 _byteswap_uint64
+#elif XXH_GCC_VERSION >= 403
+# define XXH_swap64 __builtin_bswap64
+#else
+static xxh_u64 XXH_swap64 (xxh_u64 x)
+{
+ return ((x << 56) & 0xff00000000000000ULL) |
+ ((x << 40) & 0x00ff000000000000ULL) |
+ ((x << 24) & 0x0000ff0000000000ULL) |
+ ((x << 8) & 0x000000ff00000000ULL) |
+ ((x >> 8) & 0x00000000ff000000ULL) |
+ ((x >> 24) & 0x0000000000ff0000ULL) |
+ ((x >> 40) & 0x000000000000ff00ULL) |
+ ((x >> 56) & 0x00000000000000ffULL);
+}
+#endif
+
+
+/* XXH_FORCE_MEMORY_ACCESS==3 is an endian-independent byteshift load. */
+#if (defined(XXH_FORCE_MEMORY_ACCESS) && (XXH_FORCE_MEMORY_ACCESS==3))
+
+XXH_FORCE_INLINE xxh_u64 XXH_readLE64(const void* memPtr)
+{
+ const xxh_u8* bytePtr = (const xxh_u8 *)memPtr;
+ return bytePtr[0]
+ | ((xxh_u64)bytePtr[1] << 8)
+ | ((xxh_u64)bytePtr[2] << 16)
+ | ((xxh_u64)bytePtr[3] << 24)
+ | ((xxh_u64)bytePtr[4] << 32)
+ | ((xxh_u64)bytePtr[5] << 40)
+ | ((xxh_u64)bytePtr[6] << 48)
+ | ((xxh_u64)bytePtr[7] << 56);
+}
+
+XXH_FORCE_INLINE xxh_u64 XXH_readBE64(const void* memPtr)
+{
+ const xxh_u8* bytePtr = (const xxh_u8 *)memPtr;
+ return bytePtr[7]
+ | ((xxh_u64)bytePtr[6] << 8)
+ | ((xxh_u64)bytePtr[5] << 16)
+ | ((xxh_u64)bytePtr[4] << 24)
+ | ((xxh_u64)bytePtr[3] << 32)
+ | ((xxh_u64)bytePtr[2] << 40)
+ | ((xxh_u64)bytePtr[1] << 48)
+ | ((xxh_u64)bytePtr[0] << 56);
+}
+
+#else
+XXH_FORCE_INLINE xxh_u64 XXH_readLE64(const void* ptr)
+{
+ return XXH_CPU_LITTLE_ENDIAN ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));
+}
+
+static xxh_u64 XXH_readBE64(const void* ptr)
+{
+ return XXH_CPU_LITTLE_ENDIAN ? XXH_swap64(XXH_read64(ptr)) : XXH_read64(ptr);
+}
+#endif
+
+XXH_FORCE_INLINE xxh_u64
+XXH_readLE64_align(const void* ptr, XXH_alignment align)
+{
+ if (align==XXH_unaligned)
+ return XXH_readLE64(ptr);
+ else
+ return XXH_CPU_LITTLE_ENDIAN ? *(const xxh_u64*)ptr : XXH_swap64(*(const xxh_u64*)ptr);
+}
+
+
+/******* xxh64 *******/
+
+static const xxh_u64 PRIME64_1 = 0x9E3779B185EBCA87ULL; /* 0b1001111000110111011110011011000110000101111010111100101010000111 */
+static const xxh_u64 PRIME64_2 = 0xC2B2AE3D27D4EB4FULL; /* 0b1100001010110010101011100011110100100111110101001110101101001111 */
+static const xxh_u64 PRIME64_3 = 0x165667B19E3779F9ULL; /* 0b0001011001010110011001111011000110011110001101110111100111111001 */
+static const xxh_u64 PRIME64_4 = 0x85EBCA77C2B2AE63ULL; /* 0b1000010111101011110010100111011111000010101100101010111001100011 */
+static const xxh_u64 PRIME64_5 = 0x27D4EB2F165667C5ULL; /* 0b0010011111010100111010110010111100010110010101100110011111000101 */
+
+static xxh_u64 XXH64_round(xxh_u64 acc, xxh_u64 input)
+{
+ acc += input * PRIME64_2;
+ acc = XXH_rotl64(acc, 31);
+ acc *= PRIME64_1;
+ return acc;
+}
+
+static xxh_u64 XXH64_mergeRound(xxh_u64 acc, xxh_u64 val)
+{
+ val = XXH64_round(0, val);
+ acc ^= val;
+ acc = acc * PRIME64_1 + PRIME64_4;
+ return acc;
+}
+
+static xxh_u64 XXH64_avalanche(xxh_u64 h64)
+{
+ h64 ^= h64 >> 33;
+ h64 *= PRIME64_2;
+ h64 ^= h64 >> 29;
+ h64 *= PRIME64_3;
+ h64 ^= h64 >> 32;
+ return h64;
+}
+
+
+#define XXH_get64bits(p) XXH_readLE64_align(p, align)
+
+static xxh_u64
+XXH64_finalize(xxh_u64 h64, const xxh_u8* ptr, size_t len, XXH_alignment align)
+{
+#define PROCESS1_64 \
+ h64 ^= (*ptr++) * PRIME64_5; \
+ h64 = XXH_rotl64(h64, 11) * PRIME64_1;
+
+#define PROCESS4_64 \
+ h64 ^= (xxh_u64)(XXH_get32bits(ptr)) * PRIME64_1; \
+ ptr+=4; \
+ h64 = XXH_rotl64(h64, 23) * PRIME64_2 + PRIME64_3;
+
+#define PROCESS8_64 { \
+ xxh_u64 const k1 = XXH64_round(0, XXH_get64bits(ptr)); \
+ ptr+=8; \
+ h64 ^= k1; \
+ h64 = XXH_rotl64(h64,27) * PRIME64_1 + PRIME64_4; \
+}
+
+ /* Rerolled version for 32-bit targets is faster and much smaller. */
+ if (XXH_REROLL || XXH_REROLL_XXH64) {
+ len &= 31;
+ while (len >= 8) {
+ PROCESS8_64;
+ len -= 8;
+ }
+ if (len >= 4) {
+ PROCESS4_64;
+ len -= 4;
+ }
+ while (len > 0) {
+ PROCESS1_64;
+ --len;
+ }
+ return XXH64_avalanche(h64);
+ } else {
+ switch(len & 31) {
+ case 24: PROCESS8_64;
+ /* fallthrough */
+ case 16: PROCESS8_64;
+ /* fallthrough */
+ case 8: PROCESS8_64;
+ return XXH64_avalanche(h64);
+
+ case 28: PROCESS8_64;
+ /* fallthrough */
+ case 20: PROCESS8_64;
+ /* fallthrough */
+ case 12: PROCESS8_64;
+ /* fallthrough */
+ case 4: PROCESS4_64;
+ return XXH64_avalanche(h64);
+
+ case 25: PROCESS8_64;
+ /* fallthrough */
+ case 17: PROCESS8_64;
+ /* fallthrough */
+ case 9: PROCESS8_64;
+ PROCESS1_64;
+ return XXH64_avalanche(h64);
+
+ case 29: PROCESS8_64;
+ /* fallthrough */
+ case 21: PROCESS8_64;
+ /* fallthrough */
+ case 13: PROCESS8_64;
+ /* fallthrough */
+ case 5: PROCESS4_64;
+ PROCESS1_64;
+ return XXH64_avalanche(h64);
+
+ case 26: PROCESS8_64;
+ /* fallthrough */
+ case 18: PROCESS8_64;
+ /* fallthrough */
+ case 10: PROCESS8_64;
+ PROCESS1_64;
+ PROCESS1_64;
+ return XXH64_avalanche(h64);
+
+ case 30: PROCESS8_64;
+ /* fallthrough */
+ case 22: PROCESS8_64;
+ /* fallthrough */
+ case 14: PROCESS8_64;
+ /* fallthrough */
+ case 6: PROCESS4_64;
+ PROCESS1_64;
+ PROCESS1_64;
+ return XXH64_avalanche(h64);
+
+ case 27: PROCESS8_64;
+ /* fallthrough */
+ case 19: PROCESS8_64;
+ /* fallthrough */
+ case 11: PROCESS8_64;
+ PROCESS1_64;
+ PROCESS1_64;
+ PROCESS1_64;
+ return XXH64_avalanche(h64);
+
+ case 31: PROCESS8_64;
+ /* fallthrough */
+ case 23: PROCESS8_64;
+ /* fallthrough */
+ case 15: PROCESS8_64;
+ /* fallthrough */
+ case 7: PROCESS4_64;
+ /* fallthrough */
+ case 3: PROCESS1_64;
+ /* fallthrough */
+ case 2: PROCESS1_64;
+ /* fallthrough */
+ case 1: PROCESS1_64;
+ /* fallthrough */
+ case 0: return XXH64_avalanche(h64);
+ }
+ }
+ /* impossible to reach */
+ XXH_ASSERT(0);
+ return 0; /* unreachable, but some compilers complain without it */
+}
+
+XXH_FORCE_INLINE xxh_u64
+XXH64_endian_align(const xxh_u8* input, size_t len, xxh_u64 seed, XXH_alignment align)
+{
+ const xxh_u8* bEnd = input + len;
+ xxh_u64 h64;
+
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+ if (input==NULL) {
+ len=0;
+ bEnd=input=(const xxh_u8*)(size_t)32;
+ }
+#endif
+
+ if (len>=32) {
+ const xxh_u8* const limit = bEnd - 32;
+ xxh_u64 v1 = seed + PRIME64_1 + PRIME64_2;
+ xxh_u64 v2 = seed + PRIME64_2;
+ xxh_u64 v3 = seed + 0;
+ xxh_u64 v4 = seed - PRIME64_1;
+
+ do {
+ v1 = XXH64_round(v1, XXH_get64bits(input)); input+=8;
+ v2 = XXH64_round(v2, XXH_get64bits(input)); input+=8;
+ v3 = XXH64_round(v3, XXH_get64bits(input)); input+=8;
+ v4 = XXH64_round(v4, XXH_get64bits(input)); input+=8;
+ } while (input<=limit);
+
+ h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+ h64 = XXH64_mergeRound(h64, v1);
+ h64 = XXH64_mergeRound(h64, v2);
+ h64 = XXH64_mergeRound(h64, v3);
+ h64 = XXH64_mergeRound(h64, v4);
+
+ } else {
+ h64 = seed + PRIME64_5;
+ }
+
+ h64 += (xxh_u64) len;
+
+ return XXH64_finalize(h64, input, len, align);
+}
+
+
+XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t len, XXH64_hash_t seed)
+{
+#if 0
+ /* Simple version, good for code maintenance, but unfortunately slow for small inputs */
+ XXH64_state_t state;
+ XXH64_reset(&state, seed);
+ XXH64_update(&state, (const xxh_u8*)input, len);
+ return XXH64_digest(&state);
+
+#else
+
+ if (XXH_FORCE_ALIGN_CHECK) {
+ if ((((size_t)input) & 7)==0) { /* Input is aligned, let's leverage the speed advantage */
+ return XXH64_endian_align((const xxh_u8*)input, len, seed, XXH_aligned);
+ } }
+
+ return XXH64_endian_align((const xxh_u8*)input, len, seed, XXH_unaligned);
+
+#endif
+}
+
+/******* Hash Streaming *******/
+
+XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void)
+{
+ return (XXH64_state_t*)XXH_malloc(sizeof(XXH64_state_t));
+}
+XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr)
+{
+ XXH_free(statePtr);
+ return XXH_OK;
+}
+
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dstState, const XXH64_state_t* srcState)
+{
+ memcpy(dstState, srcState, sizeof(*dstState));
+}
+
+XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH64_state_t* statePtr, XXH64_hash_t seed)
+{
+ XXH64_state_t state; /* use a local state to memcpy() in order to avoid strict-aliasing warnings */
+ memset(&state, 0, sizeof(state));
+ state.v1 = seed + PRIME64_1 + PRIME64_2;
+ state.v2 = seed + PRIME64_2;
+ state.v3 = seed + 0;
+ state.v4 = seed - PRIME64_1;
+ /* do not write into reserved64, might be removed in a future version */
+ memcpy(statePtr, &state, sizeof(state) - sizeof(state.reserved64));
+ return XXH_OK;
+}
+
+XXH_PUBLIC_API XXH_errorcode
+XXH64_update (XXH64_state_t* state, const void* input, size_t len)
+{
+ if (input==NULL)
+#if defined(XXH_ACCEPT_NULL_INPUT_POINTER) && (XXH_ACCEPT_NULL_INPUT_POINTER>=1)
+ return XXH_OK;
+#else
+ return XXH_ERROR;
+#endif
+
+ { const xxh_u8* p = (const xxh_u8*)input;
+ const xxh_u8* const bEnd = p + len;
+
+ state->total_len += len;
+
+ if (state->memsize + len < 32) { /* fill in tmp buffer */
+ XXH_memcpy(((xxh_u8*)state->mem64) + state->memsize, input, len);
+ state->memsize += (xxh_u32)len;
+ return XXH_OK;
+ }
+
+ if (state->memsize) { /* tmp buffer is full */
+ XXH_memcpy(((xxh_u8*)state->mem64) + state->memsize, input, 32-state->memsize);
+ state->v1 = XXH64_round(state->v1, XXH_readLE64(state->mem64+0));
+ state->v2 = XXH64_round(state->v2, XXH_readLE64(state->mem64+1));
+ state->v3 = XXH64_round(state->v3, XXH_readLE64(state->mem64+2));
+ state->v4 = XXH64_round(state->v4, XXH_readLE64(state->mem64+3));
+ p += 32-state->memsize;
+ state->memsize = 0;
+ }
+
+ if (p+32 <= bEnd) {
+ const xxh_u8* const limit = bEnd - 32;
+ xxh_u64 v1 = state->v1;
+ xxh_u64 v2 = state->v2;
+ xxh_u64 v3 = state->v3;
+ xxh_u64 v4 = state->v4;
+
+ do {
+ v1 = XXH64_round(v1, XXH_readLE64(p)); p+=8;
+ v2 = XXH64_round(v2, XXH_readLE64(p)); p+=8;
+ v3 = XXH64_round(v3, XXH_readLE64(p)); p+=8;
+ v4 = XXH64_round(v4, XXH_readLE64(p)); p+=8;
+ } while (p<=limit);
+
+ state->v1 = v1;
+ state->v2 = v2;
+ state->v3 = v3;
+ state->v4 = v4;
+ }
+
+ if (p < bEnd) {
+ XXH_memcpy(state->mem64, p, (size_t)(bEnd-p));
+ state->memsize = (unsigned)(bEnd-p);
+ }
+ }
+
+ return XXH_OK;
+}
+
+
+XXH_PUBLIC_API XXH64_hash_t XXH64_digest (const XXH64_state_t* state)
+{
+ xxh_u64 h64;
+
+ if (state->total_len >= 32) {
+ xxh_u64 const v1 = state->v1;
+ xxh_u64 const v2 = state->v2;
+ xxh_u64 const v3 = state->v3;
+ xxh_u64 const v4 = state->v4;
+
+ h64 = XXH_rotl64(v1, 1) + XXH_rotl64(v2, 7) + XXH_rotl64(v3, 12) + XXH_rotl64(v4, 18);
+ h64 = XXH64_mergeRound(h64, v1);
+ h64 = XXH64_mergeRound(h64, v2);
+ h64 = XXH64_mergeRound(h64, v3);
+ h64 = XXH64_mergeRound(h64, v4);
+ } else {
+ h64 = state->v3 /*seed*/ + PRIME64_5;
+ }
+
+ h64 += (xxh_u64) state->total_len;
+
+ return XXH64_finalize(h64, (const xxh_u8*)state->mem64, (size_t)state->total_len, XXH_aligned);
+}
+
+
+/******* Canonical representation *******/
+
+XXH_PUBLIC_API void XXH64_canonicalFromHash(XXH64_canonical_t* dst, XXH64_hash_t hash)
+{
+ XXH_STATIC_ASSERT(sizeof(XXH64_canonical_t) == sizeof(XXH64_hash_t));
+ if (XXH_CPU_LITTLE_ENDIAN) hash = XXH_swap64(hash);
+ memcpy(dst, &hash, sizeof(*dst));
+}
+
+XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src)
+{
+ return XXH_readBE64(src);
+}
+
+
+
+/* *********************************************************************
+* XXH3
+* New generation hash designed for speed on small keys and vectorization
+************************************************************************ */
+
+#include "xxh3.h"
+
+
+#endif /* XXH_NO_LONG_LONG */
+
+
+#endif /* XXH_IMPLEMENTATION */
+
+
+#if defined (__cplusplus)
+}
+#endif
diff --git a/dviware/dvisvgm/src/AGLTable.hpp b/dviware/dvisvgm/src/AGLTable.hpp
index d973d1186b..c1d460273a 100644
--- a/dviware/dvisvgm/src/AGLTable.hpp
+++ b/dviware/dvisvgm/src/AGLTable.hpp
@@ -2,7 +2,7 @@
** AGLTable.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/BasicDVIReader.cpp b/dviware/dvisvgm/src/BasicDVIReader.cpp
index 272c88c3ad..bb30154e7b 100644
--- a/dviware/dvisvgm/src/BasicDVIReader.cpp
+++ b/dviware/dvisvgm/src/BasicDVIReader.cpp
@@ -2,7 +2,7 @@
** BasicDVIReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/BasicDVIReader.hpp b/dviware/dvisvgm/src/BasicDVIReader.hpp
index 14a1fb9858..7ce1f989e2 100644
--- a/dviware/dvisvgm/src/BasicDVIReader.hpp
+++ b/dviware/dvisvgm/src/BasicDVIReader.hpp
@@ -2,7 +2,7 @@
** BasicDVIReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Bezier.cpp b/dviware/dvisvgm/src/Bezier.cpp
index d2077bcfeb..87a0070621 100644
--- a/dviware/dvisvgm/src/Bezier.cpp
+++ b/dviware/dvisvgm/src/Bezier.cpp
@@ -2,7 +2,7 @@
** Bezier.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -168,7 +168,7 @@ static inline double dot_prod (const DPair &p1, const DPair &p2) {
static bool between (const DPair &p1, const DPair &p2, const DPair &p3, double delta) {
double sqr_dist = dot_prod(p2-p1, p2-p1);
double factor = sqr_dist == 0.0 ? 1.0 : sqr_dist;
- double area2 = fabs(signed_area(p1, p2, p3));
+ double area2 = abs(signed_area(p1, p2, p3));
return area2*area2/factor < delta // does p3 lay almost on the line through p1 and p2...
&& min(p1.x(), p2.x()) <= p3.x() // ...and on or inside the rectangle spanned by p1 and p2?
&& max(p1.x(), p2.x()) >= p3.x()
@@ -179,7 +179,7 @@ static bool between (const DPair &p1, const DPair &p2, const DPair &p3, double d
static inline bool near (const DPair &p1, const DPair &p2, double delta) {
DPair diff = p2-p1;
- return fabs(diff.x()) < delta && fabs(diff.y()) < delta;
+ return abs(diff.x()) < delta && abs(diff.y()) < delta;
}
diff --git a/dviware/dvisvgm/src/Bezier.hpp b/dviware/dvisvgm/src/Bezier.hpp
index 525ef23435..322dd4e72d 100644
--- a/dviware/dvisvgm/src/Bezier.hpp
+++ b/dviware/dvisvgm/src/Bezier.hpp
@@ -2,7 +2,7 @@
** Bezier.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/BgColorSpecialHandler.cpp b/dviware/dvisvgm/src/BgColorSpecialHandler.cpp
index 10c05fca05..3b315b50a3 100644
--- a/dviware/dvisvgm/src/BgColorSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/BgColorSpecialHandler.cpp
@@ -2,7 +2,7 @@
** BgColorSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/BgColorSpecialHandler.hpp b/dviware/dvisvgm/src/BgColorSpecialHandler.hpp
index e1061efc8c..9334a5c541 100644
--- a/dviware/dvisvgm/src/BgColorSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/BgColorSpecialHandler.hpp
@@ -2,7 +2,7 @@
** BgColorSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Bitmap.cpp b/dviware/dvisvgm/src/Bitmap.cpp
index 3fa554eed4..64ebd6195e 100644
--- a/dviware/dvisvgm/src/Bitmap.cpp
+++ b/dviware/dvisvgm/src/Bitmap.cpp
@@ -2,7 +2,7 @@
** Bitmap.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Bitmap.hpp b/dviware/dvisvgm/src/Bitmap.hpp
index 026edae9a2..0d04aa2a69 100644
--- a/dviware/dvisvgm/src/Bitmap.hpp
+++ b/dviware/dvisvgm/src/Bitmap.hpp
@@ -2,7 +2,7 @@
** Bitmap.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/BoundingBox.cpp b/dviware/dvisvgm/src/BoundingBox.cpp
index a076b52363..2dbcc2ebcd 100644
--- a/dviware/dvisvgm/src/BoundingBox.cpp
+++ b/dviware/dvisvgm/src/BoundingBox.cpp
@@ -2,7 +2,7 @@
** BoundingBox.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -207,7 +207,7 @@ void BoundingBox::operator += (const BoundingBox &bbox) {
static inline bool almost_equal (double v1, double v2) {
- return fabs(v1-v2) < 1e-10;
+ return abs(v1-v2) < 1e-10;
}
diff --git a/dviware/dvisvgm/src/BoundingBox.hpp b/dviware/dvisvgm/src/BoundingBox.hpp
index 8848f60f28..c52312a24a 100644
--- a/dviware/dvisvgm/src/BoundingBox.hpp
+++ b/dviware/dvisvgm/src/BoundingBox.hpp
@@ -2,7 +2,7 @@
** BoundingBox.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CLCommandLine.cpp b/dviware/dvisvgm/src/CLCommandLine.cpp
index 2b0c1b5359..1f6bb4475e 100644
--- a/dviware/dvisvgm/src/CLCommandLine.cpp
+++ b/dviware/dvisvgm/src/CLCommandLine.cpp
@@ -2,7 +2,7 @@
** CLCommandLine.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CLCommandLine.hpp b/dviware/dvisvgm/src/CLCommandLine.hpp
index a80d9b87d7..257ff4160f 100644
--- a/dviware/dvisvgm/src/CLCommandLine.hpp
+++ b/dviware/dvisvgm/src/CLCommandLine.hpp
@@ -2,7 +2,7 @@
** CLCommandLine.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CLOption.hpp b/dviware/dvisvgm/src/CLOption.hpp
index 54dff67025..d9da7ae008 100644
--- a/dviware/dvisvgm/src/CLOption.hpp
+++ b/dviware/dvisvgm/src/CLOption.hpp
@@ -2,7 +2,7 @@
** CLOption.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CMap.cpp b/dviware/dvisvgm/src/CMap.cpp
index fa92901eef..747fb5ad50 100644
--- a/dviware/dvisvgm/src/CMap.cpp
+++ b/dviware/dvisvgm/src/CMap.cpp
@@ -2,7 +2,7 @@
** CMap.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CMap.hpp b/dviware/dvisvgm/src/CMap.hpp
index 0f0259e853..63761ff2ff 100644
--- a/dviware/dvisvgm/src/CMap.hpp
+++ b/dviware/dvisvgm/src/CMap.hpp
@@ -2,7 +2,7 @@
** CMap.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CMapManager.cpp b/dviware/dvisvgm/src/CMapManager.cpp
index 779c6ee3a8..52b323ebc6 100644
--- a/dviware/dvisvgm/src/CMapManager.cpp
+++ b/dviware/dvisvgm/src/CMapManager.cpp
@@ -2,7 +2,7 @@
** CMapManager.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CMapManager.hpp b/dviware/dvisvgm/src/CMapManager.hpp
index 0635f2ec3e..aeb9156e84 100644
--- a/dviware/dvisvgm/src/CMapManager.hpp
+++ b/dviware/dvisvgm/src/CMapManager.hpp
@@ -2,7 +2,7 @@
** CMapManager.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CMapReader.cpp b/dviware/dvisvgm/src/CMapReader.cpp
index 6661afbbb1..51ba52b95d 100644
--- a/dviware/dvisvgm/src/CMapReader.cpp
+++ b/dviware/dvisvgm/src/CMapReader.cpp
@@ -2,7 +2,7 @@
** CMapReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CMapReader.hpp b/dviware/dvisvgm/src/CMapReader.hpp
index 3e5b841e0c..04ce5740c0 100644
--- a/dviware/dvisvgm/src/CMapReader.hpp
+++ b/dviware/dvisvgm/src/CMapReader.hpp
@@ -2,7 +2,7 @@
** CMapReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Calculator.cpp b/dviware/dvisvgm/src/Calculator.cpp
index 3091c9cf35..c5dc00df4d 100644
--- a/dviware/dvisvgm/src/Calculator.cpp
+++ b/dviware/dvisvgm/src/Calculator.cpp
@@ -2,7 +2,7 @@
** Calculator.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Calculator.hpp b/dviware/dvisvgm/src/Calculator.hpp
index cc3b2feb6b..92ec4e40b1 100644
--- a/dviware/dvisvgm/src/Calculator.hpp
+++ b/dviware/dvisvgm/src/Calculator.hpp
@@ -2,7 +2,7 @@
** Calculator.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CharMapID.cpp b/dviware/dvisvgm/src/CharMapID.cpp
index c04ae2ceb9..9c56afc73a 100644
--- a/dviware/dvisvgm/src/CharMapID.cpp
+++ b/dviware/dvisvgm/src/CharMapID.cpp
@@ -2,7 +2,7 @@
** CharMapID.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CharMapID.hpp b/dviware/dvisvgm/src/CharMapID.hpp
index cdc39ca94d..ed044a9cf3 100644
--- a/dviware/dvisvgm/src/CharMapID.hpp
+++ b/dviware/dvisvgm/src/CharMapID.hpp
@@ -2,7 +2,7 @@
** CharMapID.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Character.hpp b/dviware/dvisvgm/src/Character.hpp
index e232401fb8..667a583100 100644
--- a/dviware/dvisvgm/src/Character.hpp
+++ b/dviware/dvisvgm/src/Character.hpp
@@ -2,7 +2,7 @@
** Character.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Color.cpp b/dviware/dvisvgm/src/Color.cpp
index de7e9074ab..bf9a05d7a3 100644
--- a/dviware/dvisvgm/src/Color.cpp
+++ b/dviware/dvisvgm/src/Color.cpp
@@ -2,7 +2,7 @@
** Color.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Color.hpp b/dviware/dvisvgm/src/Color.hpp
index c58a97f0bb..6f6f812207 100644
--- a/dviware/dvisvgm/src/Color.hpp
+++ b/dviware/dvisvgm/src/Color.hpp
@@ -2,7 +2,7 @@
** Color.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ColorSpecialHandler.cpp b/dviware/dvisvgm/src/ColorSpecialHandler.cpp
index 4bfd494003..2cacf82992 100644
--- a/dviware/dvisvgm/src/ColorSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/ColorSpecialHandler.cpp
@@ -2,7 +2,7 @@
** ColorSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ColorSpecialHandler.hpp b/dviware/dvisvgm/src/ColorSpecialHandler.hpp
index 176253407e..eeab300f47 100644
--- a/dviware/dvisvgm/src/ColorSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/ColorSpecialHandler.hpp
@@ -2,7 +2,7 @@
** ColorSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/CommandLine.hpp b/dviware/dvisvgm/src/CommandLine.hpp
index b1f2636040..7ea6ddd76e 100644
--- a/dviware/dvisvgm/src/CommandLine.hpp
+++ b/dviware/dvisvgm/src/CommandLine.hpp
@@ -2,7 +2,7 @@
// It is part of the dvisvgm package and published under the terms
// of the GNU General Public License version 3, or (at your option) any later version.
// See file COPYING for further details.
-// Copyright (C) 2016-2019 Martin Gieseking <martin.gieseking@uos.de>
+// Copyright (C) 2016-2020 Martin Gieseking <martin.gieseking@uos.de>
#ifndef COMMANDLINE_HPP
#define COMMANDLINE_HPP
@@ -20,7 +20,7 @@ class CommandLine : public CL::CommandLine {
CommandLine () : CL::CommandLine(
"This program converts DVI files, as created by TeX/LaTeX, as well as\nEPS and PDF files to the XML-based scalable vector graphics format SVG.",
"[options] dvifile\n--eps [options] epsfile\n--pdf [options] pdffile",
- "Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>"
+ "Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>"
) {}
CommandLine (int argc, char **argv) : CommandLine() {
@@ -29,6 +29,7 @@ class CommandLine : public CL::CommandLine {
// option variables
TypedOption<std::string, Option::ArgMode::REQUIRED> bboxOpt {"bbox", 'b', "size", "min", "set size of bounding box"};
+ TypedOption<std::string, Option::ArgMode::REQUIRED> bitmapFormatOpt {"bitmap-format", 'B', "fmt", "jpeg", "set format used to embed PS/EPS bitmaps"};
TypedOption<std::string, Option::ArgMode::OPTIONAL> cacheOpt {"cache", 'C', "dir", "set/print path of cache directory"};
Option clipjoinOpt {"clipjoin", 'j', "compute intersection of clipping paths"};
Option colorOpt {"color", '\0', "colorize messages"};
@@ -36,7 +37,7 @@ class CommandLine : public CL::CommandLine {
Option commentsOpt {"comments", '\0', "add comments with additional information"};
Option epsOpt {"eps", 'E', "convert EPS file to SVG"};
Option exactBboxOpt {"exact-bbox", 'e', "compute exact glyph bounding boxes"};
- TypedOption<std::string, Option::ArgMode::REQUIRED> fontFormatOpt {"font-format", 'f', "format", "svg", "select file format of embedded fonts"};
+ TypedOption<std::string, Option::ArgMode::REQUIRED> fontFormatOpt {"font-format", 'f', "format", "svg", "set file format of embedded fonts"};
TypedOption<std::string, Option::ArgMode::REQUIRED> fontmapOpt {"fontmap", 'm', "filenames", "evaluate (additional) font map files"};
Option gradOverlapOpt {"grad-overlap", '\0', "create overlapping color gradient segments"};
TypedOption<int, Option::ArgMode::REQUIRED> gradSegmentsOpt {"grad-segments", '\0', "number", 20, "number of color gradient segments per row"};
@@ -98,6 +99,9 @@ class CommandLine : public CL::CommandLine {
{&stdinOpt, 0},
{&bboxOpt, 1},
#if !defined(DISABLE_GS)
+ {&bitmapFormatOpt, 1},
+#endif
+#if !defined(DISABLE_GS)
{&clipjoinOpt, 1},
#endif
{&colornamesOpt, 1},
diff --git a/dviware/dvisvgm/src/DLLoader.cpp b/dviware/dvisvgm/src/DLLoader.cpp
index b047203801..9a974e89d9 100644
--- a/dviware/dvisvgm/src/DLLoader.cpp
+++ b/dviware/dvisvgm/src/DLLoader.cpp
@@ -2,7 +2,7 @@
** DLLoader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DLLoader.hpp b/dviware/dvisvgm/src/DLLoader.hpp
index 6bfff573e2..469fd1c4aa 100644
--- a/dviware/dvisvgm/src/DLLoader.hpp
+++ b/dviware/dvisvgm/src/DLLoader.hpp
@@ -2,7 +2,7 @@
** DLLoader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIActions.hpp b/dviware/dvisvgm/src/DVIActions.hpp
index c42f446d9e..31ea693477 100644
--- a/dviware/dvisvgm/src/DVIActions.hpp
+++ b/dviware/dvisvgm/src/DVIActions.hpp
@@ -2,7 +2,7 @@
** DVIActions.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIReader.cpp b/dviware/dvisvgm/src/DVIReader.cpp
index b0bbabee94..417efe9304 100644
--- a/dviware/dvisvgm/src/DVIReader.cpp
+++ b/dviware/dvisvgm/src/DVIReader.cpp
@@ -2,7 +2,7 @@
** DVIReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIReader.hpp b/dviware/dvisvgm/src/DVIReader.hpp
index 972af2022a..fc1424aca3 100644
--- a/dviware/dvisvgm/src/DVIReader.hpp
+++ b/dviware/dvisvgm/src/DVIReader.hpp
@@ -2,7 +2,7 @@
** DVIReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIToSVG.cpp b/dviware/dvisvgm/src/DVIToSVG.cpp
index 4801bd80a0..7280495e83 100644
--- a/dviware/dvisvgm/src/DVIToSVG.cpp
+++ b/dviware/dvisvgm/src/DVIToSVG.cpp
@@ -2,7 +2,7 @@
** DVIToSVG.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIToSVG.hpp b/dviware/dvisvgm/src/DVIToSVG.hpp
index 40dbdc884f..1bafa7cb3d 100644
--- a/dviware/dvisvgm/src/DVIToSVG.hpp
+++ b/dviware/dvisvgm/src/DVIToSVG.hpp
@@ -2,7 +2,7 @@
** DVIToSVG.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIToSVGActions.cpp b/dviware/dvisvgm/src/DVIToSVGActions.cpp
index bb8e4d6f84..6239be3b01 100644
--- a/dviware/dvisvgm/src/DVIToSVGActions.cpp
+++ b/dviware/dvisvgm/src/DVIToSVGActions.cpp
@@ -2,7 +2,7 @@
** DVIToSVGActions.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DVIToSVGActions.hpp b/dviware/dvisvgm/src/DVIToSVGActions.hpp
index e9adc63e38..2ae3fb9a2e 100644
--- a/dviware/dvisvgm/src/DVIToSVGActions.hpp
+++ b/dviware/dvisvgm/src/DVIToSVGActions.hpp
@@ -2,7 +2,7 @@
** DVIToSVGActions.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Directory.cpp b/dviware/dvisvgm/src/Directory.cpp
index 748d1bc070..e7200a0dc3 100644
--- a/dviware/dvisvgm/src/Directory.cpp
+++ b/dviware/dvisvgm/src/Directory.cpp
@@ -2,7 +2,7 @@
** Directory.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Directory.hpp b/dviware/dvisvgm/src/Directory.hpp
index f6ec7a9602..d617b4fcbd 100644
--- a/dviware/dvisvgm/src/Directory.hpp
+++ b/dviware/dvisvgm/src/Directory.hpp
@@ -2,7 +2,7 @@
** Directory.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp b/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp
index dadf196f77..b2af27d636 100644
--- a/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/DvisvgmSpecialHandler.cpp
@@ -2,7 +2,7 @@
** DvisvgmSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp b/dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp
index a8bde952e6..0f73c73ecd 100644
--- a/dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/DvisvgmSpecialHandler.hpp
@@ -2,7 +2,7 @@
** DvisvgmSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EPSFile.cpp b/dviware/dvisvgm/src/EPSFile.cpp
index 5a5fccc08f..1a19c07cc7 100644
--- a/dviware/dvisvgm/src/EPSFile.cpp
+++ b/dviware/dvisvgm/src/EPSFile.cpp
@@ -2,7 +2,7 @@
** EPSFile.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EPSFile.hpp b/dviware/dvisvgm/src/EPSFile.hpp
index 4fdd03ee1b..7b02db95b1 100644
--- a/dviware/dvisvgm/src/EPSFile.hpp
+++ b/dviware/dvisvgm/src/EPSFile.hpp
@@ -2,7 +2,7 @@
** EPSFile.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EPSToSVG.hpp b/dviware/dvisvgm/src/EPSToSVG.hpp
index 9b193dc9cb..64f5ac604d 100644
--- a/dviware/dvisvgm/src/EPSToSVG.hpp
+++ b/dviware/dvisvgm/src/EPSToSVG.hpp
@@ -2,7 +2,7 @@
** EPSToSVG.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -30,7 +30,7 @@ class EPSToSVG : public ImageToSVG {
public:
EPSToSVG (const std::string &fname, SVGOutputBase &out) : ImageToSVG(fname, out) {}
bool isSinglePageFormat() const override {return true;}
- int totalPageCount() override {return 1;}
+ int totalPageCount() const override {return 1;}
protected:
std::string imageFormat () const override {return "EPS";}
diff --git a/dviware/dvisvgm/src/EllipticalArc.cpp b/dviware/dvisvgm/src/EllipticalArc.cpp
index b820af0052..a151c51307 100644
--- a/dviware/dvisvgm/src/EllipticalArc.cpp
+++ b/dviware/dvisvgm/src/EllipticalArc.cpp
@@ -2,7 +2,7 @@
** EllipticalArc.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EllipticalArc.hpp b/dviware/dvisvgm/src/EllipticalArc.hpp
index 5d20558196..422a40b207 100644
--- a/dviware/dvisvgm/src/EllipticalArc.hpp
+++ b/dviware/dvisvgm/src/EllipticalArc.hpp
@@ -2,7 +2,7 @@
** EllipticalArc.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EmSpecialHandler.cpp b/dviware/dvisvgm/src/EmSpecialHandler.cpp
index c93a798fd7..efbd7abef3 100644
--- a/dviware/dvisvgm/src/EmSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/EmSpecialHandler.cpp
@@ -2,7 +2,7 @@
** EmSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EmSpecialHandler.hpp b/dviware/dvisvgm/src/EmSpecialHandler.hpp
index 242ef248ef..e20339e548 100644
--- a/dviware/dvisvgm/src/EmSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/EmSpecialHandler.hpp
@@ -2,7 +2,7 @@
** EmSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EncFile.cpp b/dviware/dvisvgm/src/EncFile.cpp
index dba0a2544a..ce0f18d81e 100644
--- a/dviware/dvisvgm/src/EncFile.cpp
+++ b/dviware/dvisvgm/src/EncFile.cpp
@@ -2,7 +2,7 @@
** EncFile.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/EncFile.hpp b/dviware/dvisvgm/src/EncFile.hpp
index fac26fd201..8f2b14c430 100644
--- a/dviware/dvisvgm/src/EncFile.hpp
+++ b/dviware/dvisvgm/src/EncFile.hpp
@@ -2,7 +2,7 @@
** EncFile.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FileFinder.cpp b/dviware/dvisvgm/src/FileFinder.cpp
index e867f648a7..a52ccd37d3 100644
--- a/dviware/dvisvgm/src/FileFinder.cpp
+++ b/dviware/dvisvgm/src/FileFinder.cpp
@@ -2,7 +2,7 @@
** FileFinder.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FileFinder.hpp b/dviware/dvisvgm/src/FileFinder.hpp
index 08c59a3372..7218bf6c0b 100644
--- a/dviware/dvisvgm/src/FileFinder.hpp
+++ b/dviware/dvisvgm/src/FileFinder.hpp
@@ -2,7 +2,7 @@
** FileFinder.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FilePath.cpp b/dviware/dvisvgm/src/FilePath.cpp
index 6f162bfab9..2150cf31f7 100644
--- a/dviware/dvisvgm/src/FilePath.cpp
+++ b/dviware/dvisvgm/src/FilePath.cpp
@@ -2,7 +2,7 @@
** FilePath.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -191,14 +191,16 @@ string FilePath::suffix () const {
/** Changes the suffix of the filename. If FilePath represents the
- * location of a directory (and not of a file) nothing happens.
- * @param[in] s new suffix */
-void FilePath::suffix (const string &s) {
+ * location of a directory (and not of a file) nothing happens. An
+ * empty new suffix leads to the removal of the current one.
+ * @param[in] newSuffix the new suffix */
+void FilePath::suffix (const string &newSuffix) {
if (!_fname.empty()) {
string current_suffix = suffix();
if (!current_suffix.empty())
_fname.erase(_fname.length()-current_suffix.length()-1);
- _fname += "."+s;
+ if (!newSuffix.empty())
+ _fname += "."+newSuffix;
}
}
diff --git a/dviware/dvisvgm/src/FilePath.hpp b/dviware/dvisvgm/src/FilePath.hpp
index 32a9be6814..e9d55562c5 100644
--- a/dviware/dvisvgm/src/FilePath.hpp
+++ b/dviware/dvisvgm/src/FilePath.hpp
@@ -2,7 +2,7 @@
** FilePath.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -52,7 +52,7 @@ class FilePath {
std::string shorterAbsoluteOrRelative (std::string reldir="", bool with_filename=true) const;
std::string basename () const;
std::string suffix () const;
- void suffix (const std::string &s);
+ void suffix (const std::string &newSuffix);
size_t depth () const {return _dirs.size();}
bool isFile () const {return !_fname.empty();}
bool empty () const {return _dirs.empty() && _fname.empty();}
diff --git a/dviware/dvisvgm/src/FileSystem.cpp b/dviware/dvisvgm/src/FileSystem.cpp
index 6a081ee24f..a1fafbdece 100644
--- a/dviware/dvisvgm/src/FileSystem.cpp
+++ b/dviware/dvisvgm/src/FileSystem.cpp
@@ -2,7 +2,7 @@
** FileSystem.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FileSystem.hpp b/dviware/dvisvgm/src/FileSystem.hpp
index b882caa9fa..f82ff1e870 100644
--- a/dviware/dvisvgm/src/FileSystem.hpp
+++ b/dviware/dvisvgm/src/FileSystem.hpp
@@ -2,7 +2,7 @@
** FileSystem.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FixWord.hpp b/dviware/dvisvgm/src/FixWord.hpp
index 94166b232c..3414e1ead4 100644
--- a/dviware/dvisvgm/src/FixWord.hpp
+++ b/dviware/dvisvgm/src/FixWord.hpp
@@ -2,7 +2,7 @@
** FixWord.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Font.cpp b/dviware/dvisvgm/src/Font.cpp
index 97520c5953..e40ad8a392 100644
--- a/dviware/dvisvgm/src/Font.cpp
+++ b/dviware/dvisvgm/src/Font.cpp
@@ -2,7 +2,7 @@
** Font.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -425,10 +425,10 @@ int PhysicalFont::traceAllGlyphs (bool includeCached, GFGlyphTracer::Callback *c
* @param[out] bbox the computed bounding box
* @param[in] cb optional calback object forwarded to the tracer
* @return true if the box could be computed successfully */
-bool PhysicalFont::getExactGlyphBox(int c, BoundingBox& bbox, GFGlyphTracer::Callback* cb) const {
+bool PhysicalFont::getExactGlyphBox (int c, BoundingBox& bbox, GFGlyphTracer::Callback* cb) const {
Glyph glyph;
if (getGlyph(c, glyph, cb)) {
- glyph.computeBBox(bbox);
+ bbox = glyph.computeBBox();
double s = scaledSize()/unitsPerEm();
bbox.scale(s, s);
return true;
@@ -608,7 +608,7 @@ double NativeFont::charWidth (int c) const {
FontEngine::instance().setFont(*this);
int upem = FontEngine::instance().getUnitsPerEM();
double w = upem ? (scaledSize()*FontEngine::instance().getAdvance(c)/upem*_style.extend) : 0;
- w += fabs(_style.slant*charHeight(c));
+ w += abs(_style.slant*charHeight(c));
return w;
}
diff --git a/dviware/dvisvgm/src/Font.hpp b/dviware/dvisvgm/src/Font.hpp
index 3273a0c14b..59556e7a81 100644
--- a/dviware/dvisvgm/src/Font.hpp
+++ b/dviware/dvisvgm/src/Font.hpp
@@ -2,7 +2,7 @@
** Font.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontCache.cpp b/dviware/dvisvgm/src/FontCache.cpp
index 34478542df..e024558913 100644
--- a/dviware/dvisvgm/src/FontCache.cpp
+++ b/dviware/dvisvgm/src/FontCache.cpp
@@ -2,7 +2,7 @@
** FontCache.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontCache.hpp b/dviware/dvisvgm/src/FontCache.hpp
index 0068b6c78b..8a6025a3d2 100644
--- a/dviware/dvisvgm/src/FontCache.hpp
+++ b/dviware/dvisvgm/src/FontCache.hpp
@@ -2,7 +2,7 @@
** FontCache.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontEncoding.cpp b/dviware/dvisvgm/src/FontEncoding.cpp
index 3b038b63c6..8f2673f123 100644
--- a/dviware/dvisvgm/src/FontEncoding.cpp
+++ b/dviware/dvisvgm/src/FontEncoding.cpp
@@ -2,7 +2,7 @@
** FontEncoding.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontEncoding.hpp b/dviware/dvisvgm/src/FontEncoding.hpp
index fffccd4224..1c4a979aa9 100644
--- a/dviware/dvisvgm/src/FontEncoding.hpp
+++ b/dviware/dvisvgm/src/FontEncoding.hpp
@@ -2,7 +2,7 @@
** FontEncoding.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontEngine.cpp b/dviware/dvisvgm/src/FontEngine.cpp
index 61efd68916..bee1ca886d 100644
--- a/dviware/dvisvgm/src/FontEngine.cpp
+++ b/dviware/dvisvgm/src/FontEngine.cpp
@@ -2,7 +2,7 @@
** FontEngine.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontEngine.hpp b/dviware/dvisvgm/src/FontEngine.hpp
index 33c9b96da2..5796c2b1b3 100644
--- a/dviware/dvisvgm/src/FontEngine.hpp
+++ b/dviware/dvisvgm/src/FontEngine.hpp
@@ -2,7 +2,7 @@
** FontEngine.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontManager.cpp b/dviware/dvisvgm/src/FontManager.cpp
index 4f236b3866..58d2dfc261 100644
--- a/dviware/dvisvgm/src/FontManager.cpp
+++ b/dviware/dvisvgm/src/FontManager.cpp
@@ -2,7 +2,7 @@
** FontManager.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontManager.hpp b/dviware/dvisvgm/src/FontManager.hpp
index 4405f67ecd..2fe88bee38 100644
--- a/dviware/dvisvgm/src/FontManager.hpp
+++ b/dviware/dvisvgm/src/FontManager.hpp
@@ -2,7 +2,7 @@
** FontManager.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontMap.cpp b/dviware/dvisvgm/src/FontMap.cpp
index cc48aef0e6..727fdd83ba 100644
--- a/dviware/dvisvgm/src/FontMap.cpp
+++ b/dviware/dvisvgm/src/FontMap.cpp
@@ -2,7 +2,7 @@
** FontMap.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontMap.hpp b/dviware/dvisvgm/src/FontMap.hpp
index cd109c1809..f4824aa7f1 100644
--- a/dviware/dvisvgm/src/FontMap.hpp
+++ b/dviware/dvisvgm/src/FontMap.hpp
@@ -2,7 +2,7 @@
** FontMap.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontMetrics.cpp b/dviware/dvisvgm/src/FontMetrics.cpp
index 003b80acad..7d858fea90 100644
--- a/dviware/dvisvgm/src/FontMetrics.cpp
+++ b/dviware/dvisvgm/src/FontMetrics.cpp
@@ -2,7 +2,7 @@
** FontMetrics.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontMetrics.hpp b/dviware/dvisvgm/src/FontMetrics.hpp
index ccba26b727..66637e3044 100644
--- a/dviware/dvisvgm/src/FontMetrics.hpp
+++ b/dviware/dvisvgm/src/FontMetrics.hpp
@@ -2,7 +2,7 @@
** FontMetrics.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontStyle.hpp b/dviware/dvisvgm/src/FontStyle.hpp
index 1088df3c4e..79a03dac36 100644
--- a/dviware/dvisvgm/src/FontStyle.hpp
+++ b/dviware/dvisvgm/src/FontStyle.hpp
@@ -2,7 +2,7 @@
** FontStyle.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/FontWriter.cpp b/dviware/dvisvgm/src/FontWriter.cpp
index d93402baf5..4dd4c5c0d8 100644
--- a/dviware/dvisvgm/src/FontWriter.cpp
+++ b/dviware/dvisvgm/src/FontWriter.cpp
@@ -2,7 +2,7 @@
** FontWriter.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -145,7 +145,7 @@ static void writeSFD (const string &sfdname, const PhysicalFont &font, const set
// ensure that the sum of the SFD's Ascent and Descent values equals the font's units per EM
double yext = font.ascent()+font.descent();
- double scale = double(font.unitsPerEm())/(yext != 0 ? yext : fabs(font.ascent()));
+ double scale = double(font.unitsPerEm())/(yext != 0 ? yext : abs(font.ascent()));
sfd <<
"Ascent: " << font.ascent()*scale << "\n"
"Descent: " << font.descent()*scale << "\n"
@@ -260,7 +260,7 @@ bool FontWriter::writeCSSFontFace (FontFormat format, const set<int> &charcodes,
os << "@font-face{"
<< "font-family:" << _font.name() << ';'
<< "src:url(data:" << info->mimetype << ";base64,";
- util::base64_copy(istreambuf_iterator<char>(ifs), istreambuf_iterator<char>(), ostreambuf_iterator<char>(os));
+ util::base64_copy(ifs, os);
os << ") format('" << info->formatstr_long << "');}\n";
ifs.close();
if (!PhysicalFont::KEEP_TEMP_FILES)
diff --git a/dviware/dvisvgm/src/FontWriter.hpp b/dviware/dvisvgm/src/FontWriter.hpp
index 458952cad9..e6cad37e88 100644
--- a/dviware/dvisvgm/src/FontWriter.hpp
+++ b/dviware/dvisvgm/src/FontWriter.hpp
@@ -2,7 +2,7 @@
** FontWriter.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GFGlyphTracer.cpp b/dviware/dvisvgm/src/GFGlyphTracer.cpp
index 1b55afc593..db77ae1dc8 100644
--- a/dviware/dvisvgm/src/GFGlyphTracer.cpp
+++ b/dviware/dvisvgm/src/GFGlyphTracer.cpp
@@ -2,7 +2,7 @@
** GFGlyphTracer.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GFGlyphTracer.hpp b/dviware/dvisvgm/src/GFGlyphTracer.hpp
index afe1b95253..d0d45ffd61 100644
--- a/dviware/dvisvgm/src/GFGlyphTracer.hpp
+++ b/dviware/dvisvgm/src/GFGlyphTracer.hpp
@@ -2,7 +2,7 @@
** GFGlyphTracer.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GFReader.cpp b/dviware/dvisvgm/src/GFReader.cpp
index a7d314d3de..4712de41d3 100644
--- a/dviware/dvisvgm/src/GFReader.cpp
+++ b/dviware/dvisvgm/src/GFReader.cpp
@@ -2,7 +2,7 @@
** GFReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GFReader.hpp b/dviware/dvisvgm/src/GFReader.hpp
index ad1e8b2220..e829bf8ffa 100644
--- a/dviware/dvisvgm/src/GFReader.hpp
+++ b/dviware/dvisvgm/src/GFReader.hpp
@@ -2,7 +2,7 @@
** GFReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GFTracer.cpp b/dviware/dvisvgm/src/GFTracer.cpp
index e73aab12fd..4a3fa5e776 100644
--- a/dviware/dvisvgm/src/GFTracer.cpp
+++ b/dviware/dvisvgm/src/GFTracer.cpp
@@ -2,7 +2,7 @@
** GFTracer.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GFTracer.hpp b/dviware/dvisvgm/src/GFTracer.hpp
index efe9476a8f..e72848896d 100644
--- a/dviware/dvisvgm/src/GFTracer.hpp
+++ b/dviware/dvisvgm/src/GFTracer.hpp
@@ -2,7 +2,7 @@
** GFTracer.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Ghostscript.cpp b/dviware/dvisvgm/src/Ghostscript.cpp
index c097ace667..1ff82314ec 100644
--- a/dviware/dvisvgm/src/Ghostscript.cpp
+++ b/dviware/dvisvgm/src/Ghostscript.cpp
@@ -2,7 +2,7 @@
** Ghostscript.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -144,6 +144,9 @@ static string get_libgs (const string &fname) {
dlname = "libgs." + to_string(i) + ".dylib";
if (loader.loadLibrary(dlname))
return dlname;
+ dlname = "libgs.dylib." + to_string(i);
+ if (loader.loadLibrary(dlname))
+ return dlname;
#endif
}
#endif
diff --git a/dviware/dvisvgm/src/Ghostscript.hpp b/dviware/dvisvgm/src/Ghostscript.hpp
index 4ea62f775f..8c9a429798 100644
--- a/dviware/dvisvgm/src/Ghostscript.hpp
+++ b/dviware/dvisvgm/src/Ghostscript.hpp
@@ -2,7 +2,7 @@
** Ghostscript.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Glyph.hpp b/dviware/dvisvgm/src/Glyph.hpp
index 6f457a778f..dfa8cb366a 100644
--- a/dviware/dvisvgm/src/Glyph.hpp
+++ b/dviware/dvisvgm/src/Glyph.hpp
@@ -2,7 +2,7 @@
** Glyph.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/GlyphTracerMessages.hpp b/dviware/dvisvgm/src/GlyphTracerMessages.hpp
index d48fe6f1b4..f291d05ccc 100644
--- a/dviware/dvisvgm/src/GlyphTracerMessages.hpp
+++ b/dviware/dvisvgm/src/GlyphTracerMessages.hpp
@@ -2,7 +2,7 @@
** GlyphTracerMessages.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -37,17 +37,18 @@ class GlyphTracerMessages : public GFGlyphTracer::Callback {
void beginChar (uint8_t c) override {
if (!_traced) {
- if (!_fname.empty())
+ if (!_fname.empty()) {
Message::mstream() << '\n';
- // extract font name from file path
- std::string fontname = _fname;
- size_t pos;
- if ((pos = fontname.rfind('/')) != std::string::npos)
- fontname = fontname.substr(pos+1);
- if ((pos = fontname.rfind('.')) != std::string::npos)
- fontname = fontname.substr(0, pos);
- Message::mstream(false, Message::MC_STATE)
- << "tracing glyphs of " << fontname << '\n';
+ // extract font name from file path
+ std::string fontname = _fname;
+ size_t pos;
+ if ((pos = fontname.rfind('/')) != std::string::npos)
+ fontname = fontname.substr(pos+1);
+ if ((pos = fontname.rfind('.')) != std::string::npos)
+ fontname = fontname.substr(0, pos);
+ Message::mstream(false, Message::MC_STATE)
+ << "tracing glyphs of " << fontname << '\n';
+ }
_traced = true;
}
}
diff --git a/dviware/dvisvgm/src/GraphicsPath.hpp b/dviware/dvisvgm/src/GraphicsPath.hpp
index bf09a37d09..565251c0d0 100644
--- a/dviware/dvisvgm/src/GraphicsPath.hpp
+++ b/dviware/dvisvgm/src/GraphicsPath.hpp
@@ -2,7 +2,7 @@
** GraphicsPath.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -540,7 +540,7 @@ class GraphicsPath {
}
}
- void arcto (double rx, double ry, double angle, bool laf, bool sweep, const Point &p) {
+ void arcto (T rx, T ry, double angle, bool laf, bool sweep, const Point &p) {
_commands.emplace_back(ArcTo{rx, ry, angle, laf, sweep, p});
_finalPoint = p;
}
@@ -597,7 +597,8 @@ class GraphicsPath {
/** Computes the bounding box of the current path.
* @param[out] bbox the computed bounding box */
- void computeBBox (BoundingBox &bbox) const {
+ BoundingBox computeBBox () const {
+ BoundingBox bbox;
struct BBoxActions : IterationActions {
explicit BBoxActions (BoundingBox &bb) : bbox(bb) {}
void moveto (const Point &p) override {bbox.embed(p);}
@@ -610,6 +611,7 @@ class GraphicsPath {
BoundingBox &bbox;
} actions(bbox);
iterate(actions, false);
+ return bbox;
}
/** Checks whether the current path describes a dot/point only (with no extent).
diff --git a/dviware/dvisvgm/src/HashFunction.cpp b/dviware/dvisvgm/src/HashFunction.cpp
index 517cc8f3cc..7f99dacaf0 100644
--- a/dviware/dvisvgm/src/HashFunction.cpp
+++ b/dviware/dvisvgm/src/HashFunction.cpp
@@ -2,7 +2,7 @@
** HashFunction.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/HashFunction.hpp b/dviware/dvisvgm/src/HashFunction.hpp
index bba61918ed..b13ee39a50 100644
--- a/dviware/dvisvgm/src/HashFunction.hpp
+++ b/dviware/dvisvgm/src/HashFunction.hpp
@@ -2,7 +2,7 @@
** HashFunction.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/HtmlSpecialHandler.cpp b/dviware/dvisvgm/src/HtmlSpecialHandler.cpp
index 43d3dbc224..01051f9d64 100644
--- a/dviware/dvisvgm/src/HtmlSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/HtmlSpecialHandler.cpp
@@ -2,7 +2,7 @@
** HtmlSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/HtmlSpecialHandler.hpp b/dviware/dvisvgm/src/HtmlSpecialHandler.hpp
index bb85b2ad2c..e09a6d7b51 100644
--- a/dviware/dvisvgm/src/HtmlSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/HtmlSpecialHandler.hpp
@@ -2,7 +2,7 @@
** HtmlSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/HyperlinkManager.cpp b/dviware/dvisvgm/src/HyperlinkManager.cpp
index de412afcdc..ef636c5aac 100644
--- a/dviware/dvisvgm/src/HyperlinkManager.cpp
+++ b/dviware/dvisvgm/src/HyperlinkManager.cpp
@@ -2,7 +2,7 @@
** HyperlinkManager.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/HyperlinkManager.hpp b/dviware/dvisvgm/src/HyperlinkManager.hpp
index 762b4a4cca..ca8d4fd0ef 100644
--- a/dviware/dvisvgm/src/HyperlinkManager.hpp
+++ b/dviware/dvisvgm/src/HyperlinkManager.hpp
@@ -2,7 +2,7 @@
** HyperlinkManager.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ImageToSVG.cpp b/dviware/dvisvgm/src/ImageToSVG.cpp
index 26edb3c753..dfb7943a06 100644
--- a/dviware/dvisvgm/src/ImageToSVG.cpp
+++ b/dviware/dvisvgm/src/ImageToSVG.cpp
@@ -2,7 +2,7 @@
** ImageToSVG.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -67,6 +67,7 @@ void ImageToSVG::convert (int pageno) {
"lly=" << bbox.minY() << " "
"urx=" << bbox.maxX() << " "
"ury=" << bbox.maxY();
+ _currentPageNumber = pageno;
if (!isSinglePageFormat())
ss << " page=" << pageno;
try {
@@ -147,8 +148,9 @@ void ImageToSVG::convert (const std::string &rangestr, pair<int,int> *pageinfo)
FilePath ImageToSVG::getSVGFilePath (unsigned pageno) const {
FilePath path;
- if (pageno == 1)
- path = _out.filepath(1, 1);
+ unsigned numPages = totalPageCount();
+ if (pageno >= 1 && pageno <= numPages)
+ path = _out.filepath(pageno, numPages);
return path;
}
diff --git a/dviware/dvisvgm/src/ImageToSVG.hpp b/dviware/dvisvgm/src/ImageToSVG.hpp
index a4e4de223f..92a860949c 100644
--- a/dviware/dvisvgm/src/ImageToSVG.hpp
+++ b/dviware/dvisvgm/src/ImageToSVG.hpp
@@ -2,7 +2,7 @@
** ImageToSVG.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -39,9 +39,9 @@ class ImageToSVG : protected SpecialActions {
void setPageTransformation (const std::string &transCmds) {_transCmds = transCmds;}
// void setPageSize (const std::string &name);
std::string filename () const {return _fname;}
- PSInterpreter& psInterpreter () {return _psHandler.psInterpreter();}
+ PSInterpreter& psInterpreter () const {return _psHandler.psInterpreter();}
virtual bool isSinglePageFormat () const =0;
- virtual int totalPageCount () =0;
+ virtual int totalPageCount () const =0;
protected:
void checkGSAndFileFormat ();
@@ -65,7 +65,7 @@ class ImageToSVG : protected SpecialActions {
void embed (const BoundingBox &bbox) override {_bbox.embed(bbox);}
void embed (const DPair &p, double r=0) override {if (r==0) _bbox.embed(p); else _bbox.embed(p, r);}
void progress (const char *id) override;
- unsigned getCurrentPageNumber() const override {return 0;}
+ unsigned getCurrentPageNumber() const override {return _currentPageNumber;}
BoundingBox& bbox () override {return _bbox;}
BoundingBox& bbox (const std::string &name, bool reset=false) override {return _bbox;}
FilePath getSVGFilePath (unsigned pageno) const override;
@@ -76,8 +76,9 @@ class ImageToSVG : protected SpecialActions {
SVGTree _svg;
SVGOutputBase &_out;
double _x=0, _y=0;
+ unsigned _currentPageNumber=0;
BoundingBox _bbox;
- PsSpecialHandler _psHandler;
+ mutable PsSpecialHandler _psHandler;
bool _haveGS=false; ///< true if Ghostscript is available
std::string _transCmds; ///< transformation commands
};
diff --git a/dviware/dvisvgm/src/InputBuffer.cpp b/dviware/dvisvgm/src/InputBuffer.cpp
index a952369afc..b6e85f27e1 100644
--- a/dviware/dvisvgm/src/InputBuffer.cpp
+++ b/dviware/dvisvgm/src/InputBuffer.cpp
@@ -2,7 +2,7 @@
** InputBuffer.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/InputBuffer.hpp b/dviware/dvisvgm/src/InputBuffer.hpp
index 8a62b6b011..1474ce0a52 100644
--- a/dviware/dvisvgm/src/InputBuffer.hpp
+++ b/dviware/dvisvgm/src/InputBuffer.hpp
@@ -2,7 +2,7 @@
** InputBuffer.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/InputReader.cpp b/dviware/dvisvgm/src/InputReader.cpp
index 5c9b9f5c62..074c184822 100644
--- a/dviware/dvisvgm/src/InputReader.cpp
+++ b/dviware/dvisvgm/src/InputReader.cpp
@@ -2,7 +2,7 @@
** InputReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/InputReader.hpp b/dviware/dvisvgm/src/InputReader.hpp
index 0ca4f10772..9825156c09 100644
--- a/dviware/dvisvgm/src/InputReader.hpp
+++ b/dviware/dvisvgm/src/InputReader.hpp
@@ -2,7 +2,7 @@
** InputReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/JFM.cpp b/dviware/dvisvgm/src/JFM.cpp
index a79fdf0c03..7c749fd34e 100644
--- a/dviware/dvisvgm/src/JFM.cpp
+++ b/dviware/dvisvgm/src/JFM.cpp
@@ -2,7 +2,7 @@
** JFM.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/JFM.hpp b/dviware/dvisvgm/src/JFM.hpp
index c51f371a5e..8d4a1daf21 100644
--- a/dviware/dvisvgm/src/JFM.hpp
+++ b/dviware/dvisvgm/src/JFM.hpp
@@ -2,7 +2,7 @@
** JFM.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Length.cpp b/dviware/dvisvgm/src/Length.cpp
index cbee103d49..d20af5056c 100644
--- a/dviware/dvisvgm/src/Length.cpp
+++ b/dviware/dvisvgm/src/Length.cpp
@@ -2,7 +2,7 @@
** Length.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Length.hpp b/dviware/dvisvgm/src/Length.hpp
index 3c4de91fae..1b0d35d35f 100644
--- a/dviware/dvisvgm/src/Length.hpp
+++ b/dviware/dvisvgm/src/Length.hpp
@@ -2,7 +2,7 @@
** Length.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/MD5HashFunction.hpp b/dviware/dvisvgm/src/MD5HashFunction.hpp
index e233673d36..f0eda874f2 100644
--- a/dviware/dvisvgm/src/MD5HashFunction.hpp
+++ b/dviware/dvisvgm/src/MD5HashFunction.hpp
@@ -2,7 +2,7 @@
** MD5HashFunction.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Makefile.am b/dviware/dvisvgm/src/Makefile.am
index fcab2ba5cc..e7c7c27522 100644
--- a/dviware/dvisvgm/src/Makefile.am
+++ b/dviware/dvisvgm/src/Makefile.am
@@ -1,5 +1,5 @@
## This file is part of dvisvgm
-## Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
diff --git a/dviware/dvisvgm/src/MapLine.cpp b/dviware/dvisvgm/src/MapLine.cpp
index 57aa116f02..cd3d8ae7ea 100644
--- a/dviware/dvisvgm/src/MapLine.cpp
+++ b/dviware/dvisvgm/src/MapLine.cpp
@@ -2,7 +2,7 @@
** MapLine.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/MapLine.hpp b/dviware/dvisvgm/src/MapLine.hpp
index ea41fae0d0..9a6fa17648 100644
--- a/dviware/dvisvgm/src/MapLine.hpp
+++ b/dviware/dvisvgm/src/MapLine.hpp
@@ -2,7 +2,7 @@
** MapLine.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Matrix.cpp b/dviware/dvisvgm/src/Matrix.cpp
index f94e84809c..75d571877a 100644
--- a/dviware/dvisvgm/src/Matrix.cpp
+++ b/dviware/dvisvgm/src/Matrix.cpp
@@ -2,7 +2,7 @@
** Matrix.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -169,7 +169,7 @@ Matrix& Matrix::rotate (double deg) {
Matrix& Matrix::xskewByAngle (double deg) {
- if (fmod(fabs(deg)-90, 180) != 0)
+ if (fmod(abs(deg)-90, 180) != 0)
return xskewByRatio(tan(deg2rad(deg)));
return *this;
}
@@ -186,7 +186,7 @@ Matrix& Matrix::xskewByRatio (double xyratio) {
Matrix& Matrix::yskewByAngle (double deg) {
- if (fmod(fabs(deg)-90, 180) != 0)
+ if (fmod(abs(deg)-90, 180) != 0)
return yskewByRatio(tan(deg2rad(deg)));
return *this;
}
@@ -246,17 +246,17 @@ Matrix& Matrix::lmultiply (const Matrix &tm) {
Matrix& Matrix::invert () {
Matrix ret;
- if (double denom = det(*this)) {
- for (int i=0; i < 3; ++i) {
- for (int j=0; j < 3; ++j) {
- ret._values[i][j] = det(*this, i, j)/denom;
- if ((i+j)%2 != 0)
- ret._values[i][j] *= -1;
- }
+ double denom = det(*this);
+ if (abs(denom) < 1e-12)
+ throw exception();
+ for (int i=0; i < 3; ++i) {
+ for (int j=0; j < 3; ++j) {
+ ret._values[j][i] = det(*this, i, j)/denom;
+ if ((i+j)%2 != 0)
+ ret._values[j][i] *= -1;
}
- return *this = ret;
}
- throw exception();
+ return *this = ret;
}
@@ -469,7 +469,7 @@ static const char* ord_suffix (int n) {
static void skip_comma_wsp (istream &is) {
is >> ws;
- if (is.peek() == ',') is.ignore(1);
+ if (is.peek() == ',') is.get();
is >> ws;
}
@@ -494,13 +494,13 @@ static size_t parse_transform_cmd (istream &is, string cmd, size_t minparams, si
params.push_back(val);
is >> ws;
if (i == minparams && is.peek() == ')') {
- is.ignore(1);
+ is.get();
return i;
}
if (i == maxparams) {
if (is.peek() != ')')
throw ParserException("missing ')' at end of command '"+cmd+"'");
- is.ignore(1);
+ is.get();
}
skip_comma_wsp(is);
}
diff --git a/dviware/dvisvgm/src/Matrix.hpp b/dviware/dvisvgm/src/Matrix.hpp
index 733ff71fad..154ac8a37b 100644
--- a/dviware/dvisvgm/src/Matrix.hpp
+++ b/dviware/dvisvgm/src/Matrix.hpp
@@ -2,7 +2,7 @@
** Matrix.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Message.cpp b/dviware/dvisvgm/src/Message.cpp
index 85ed204cb4..caf8051f88 100644
--- a/dviware/dvisvgm/src/Message.cpp
+++ b/dviware/dvisvgm/src/Message.cpp
@@ -2,7 +2,7 @@
** Message.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Message.hpp b/dviware/dvisvgm/src/Message.hpp
index a7e6034021..fd6f048622 100644
--- a/dviware/dvisvgm/src/Message.hpp
+++ b/dviware/dvisvgm/src/Message.hpp
@@ -2,7 +2,7 @@
** Message.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/MessageException.hpp b/dviware/dvisvgm/src/MessageException.hpp
index c7aa342860..325e83e403 100644
--- a/dviware/dvisvgm/src/MessageException.hpp
+++ b/dviware/dvisvgm/src/MessageException.hpp
@@ -2,7 +2,7 @@
** MessageException.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/MetafontWrapper.cpp b/dviware/dvisvgm/src/MetafontWrapper.cpp
index 202b65d6ec..11667fb5e7 100644
--- a/dviware/dvisvgm/src/MetafontWrapper.cpp
+++ b/dviware/dvisvgm/src/MetafontWrapper.cpp
@@ -2,7 +2,7 @@
** MetafontWrapper.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -79,18 +79,8 @@ bool MetafontWrapper::call (const string &mode, double mag) {
string mf_messages;
mf_process.run(_dir, &mf_messages);
- // get resolution value from stdout created by above MF command
- char buf[256];
- istringstream iss(mf_messages);
- int resolution = 0;
- while (iss) {
- iss.getline(buf, sizeof(buf));
- string line = buf;
- if (line.substr(0, 3) == ">> ") {
- resolution = stoi(line.substr(3));
- break;
- }
- }
+ int resolution = getResolution(mf_messages);
+
// compose expected name of GF file (see Metafont Book, p. 324)
string gfname = _dir + _fontname + ".";
if (resolution > 0)
@@ -101,6 +91,52 @@ bool MetafontWrapper::call (const string &mode, double mag) {
}
+/** Returns the resolution applied to a GF file generated by Metafont. Since the resolution
+ * is part of the filename suffix, we need this value in order to address the file.
+ * @param[in] mfMessage output written to stdout by Metafont
+ * @return the resolution (>0 on success, 0 otherwise) */
+int MetafontWrapper::getResolution (const string &mfMessage) const {
+ int res = 0;
+ char buf[256];
+ if (!mfMessage.empty()) {
+ // try get resolution value written to stdout by above MF command
+ istringstream iss(mfMessage);
+ while (iss) {
+ iss.getline(buf, sizeof(buf));
+ string line = buf;
+ if (line.substr(0, 3) == ">> ") {
+ res = stoi(line.substr(3));
+ break;
+ }
+ }
+ }
+ // couldn't read resolution from stdout, try to get it from log file
+ if (res == 0) {
+ ifstream ifs(_dir+_fontname+".log");
+ while (ifs) {
+ ifs.getline(buf, sizeof(buf));
+ string line = buf;
+ if (line.substr(0, 18) == "Output written on ") {
+ line = line.substr(18);
+ size_t pos = line.find(' ');
+ line = line.substr(0, pos);
+ pos = line.rfind('.');
+ if (pos != string::npos && line.substr(line.length()-2) == "gf") {
+ line.pop_back();
+ line.pop_back();
+ try {
+ res = stoi(line.substr(pos+1));
+ }
+ catch (...) {
+ }
+ }
+ }
+ }
+ }
+ return res;
+}
+
+
/** Calls Metafont if output files (tfm and gf) don't already exist.
* @param[in] mode Metafont mode to be used (e.g. 'ljfour')
* @param[in] mag magnification factor
diff --git a/dviware/dvisvgm/src/MetafontWrapper.hpp b/dviware/dvisvgm/src/MetafontWrapper.hpp
index 031eb01ebd..582a146aee 100644
--- a/dviware/dvisvgm/src/MetafontWrapper.hpp
+++ b/dviware/dvisvgm/src/MetafontWrapper.hpp
@@ -2,7 +2,7 @@
** MetafontWrapper.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -26,14 +26,16 @@
class FileFinder;
-class MetafontWrapper
-{
+class MetafontWrapper {
public:
MetafontWrapper (std::string fname, std::string dir);
bool call (const std::string &mode, double mag);
bool make (const std::string &mode, double mag);
bool success () const;
+ protected:
+ int getResolution (const std::string &mfMessage) const;
+
private:
std::string _fontname;
std::string _dir;
diff --git a/dviware/dvisvgm/src/MiKTeXCom.cpp b/dviware/dvisvgm/src/MiKTeXCom.cpp
index 957173f126..9cd02edf41 100644
--- a/dviware/dvisvgm/src/MiKTeXCom.cpp
+++ b/dviware/dvisvgm/src/MiKTeXCom.cpp
@@ -2,7 +2,7 @@
** MiKTeXCom.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/MiKTeXCom.hpp b/dviware/dvisvgm/src/MiKTeXCom.hpp
index 5bf1981167..3da270cea1 100644
--- a/dviware/dvisvgm/src/MiKTeXCom.hpp
+++ b/dviware/dvisvgm/src/MiKTeXCom.hpp
@@ -2,7 +2,7 @@
** MiKTeXCom.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/NoPsSpecialHandler.cpp b/dviware/dvisvgm/src/NoPsSpecialHandler.cpp
index 533e5390be..f5b3d7244e 100644
--- a/dviware/dvisvgm/src/NoPsSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/NoPsSpecialHandler.cpp
@@ -2,7 +2,7 @@
** NoPsSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/NoPsSpecialHandler.hpp b/dviware/dvisvgm/src/NoPsSpecialHandler.hpp
index 027ea3fb62..9af3d47df5 100644
--- a/dviware/dvisvgm/src/NoPsSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/NoPsSpecialHandler.hpp
@@ -2,7 +2,7 @@
** NoPsSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/NumericRanges.hpp b/dviware/dvisvgm/src/NumericRanges.hpp
index c51f1eba73..a6ee109568 100644
--- a/dviware/dvisvgm/src/NumericRanges.hpp
+++ b/dviware/dvisvgm/src/NumericRanges.hpp
@@ -2,7 +2,7 @@
** NumericRanges.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PDFParser.cpp b/dviware/dvisvgm/src/PDFParser.cpp
index 1ecd40cba8..e511d4dc39 100644
--- a/dviware/dvisvgm/src/PDFParser.cpp
+++ b/dviware/dvisvgm/src/PDFParser.cpp
@@ -2,7 +2,7 @@
** PDFParser.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PDFParser.hpp b/dviware/dvisvgm/src/PDFParser.hpp
index 6471668307..b261ee9cf7 100644
--- a/dviware/dvisvgm/src/PDFParser.hpp
+++ b/dviware/dvisvgm/src/PDFParser.hpp
@@ -2,7 +2,7 @@
** PDFParser.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PDFToSVG.hpp b/dviware/dvisvgm/src/PDFToSVG.hpp
index d1871d0bb1..a6c71f964b 100644
--- a/dviware/dvisvgm/src/PDFToSVG.hpp
+++ b/dviware/dvisvgm/src/PDFToSVG.hpp
@@ -2,7 +2,7 @@
** PDFToSVG.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -32,7 +32,7 @@ class PDFToSVG : public ImageToSVG {
bool isSinglePageFormat() const override {return false;}
/** Returns the total number of pages in the PDF file. */
- int totalPageCount() override {
+ int totalPageCount() const override {
if (_totalPageCount < 0) {
_totalPageCount = psInterpreter().pdfPageCount(filename());
if (_totalPageCount < 1)
diff --git a/dviware/dvisvgm/src/PSFilter.hpp b/dviware/dvisvgm/src/PSFilter.hpp
index 2e1cac5c77..87aff89a7c 100644
--- a/dviware/dvisvgm/src/PSFilter.hpp
+++ b/dviware/dvisvgm/src/PSFilter.hpp
@@ -2,7 +2,7 @@
** PSFilter.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PSInterpreter.cpp b/dviware/dvisvgm/src/PSInterpreter.cpp
index 4b1d1fbc15..038e1326f2 100644
--- a/dviware/dvisvgm/src/PSInterpreter.cpp
+++ b/dviware/dvisvgm/src/PSInterpreter.cpp
@@ -2,7 +2,7 @@
** PSInterpreter.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -30,6 +30,7 @@
#include "PSFilter.hpp"
#include "PSInterpreter.hpp"
#include "SignalHandler.hpp"
+#include "utility.hpp"
using namespace std;
@@ -266,6 +267,7 @@ void PSInterpreter::callActions (InputReader &in) {
{"grestore", { 0, &PSActions::grestore}},
{"grestoreall", { 0, &PSActions::grestoreall}},
{"gsave", { 0, &PSActions::gsave}},
+ {"image", { 3, &PSActions::image}},
{"initclip", { 0, &PSActions::initclip}},
{"lineto", { 2, &PSActions::lineto}},
{"makepattern", {-1, &PSActions::makepattern}},
@@ -278,6 +280,7 @@ void PSInterpreter::callActions (InputReader &in) {
{"save", { 1, &PSActions::save}},
{"scale", { 2, &PSActions::scale}},
{"setblendmode", { 1, &PSActions::setblendmode}},
+ {"setcolorspace", { 1, &PSActions::setcolorspace}},
{"setcmykcolor", { 4, &PSActions::setcmykcolor}},
{"setdash", {-1, &PSActions::setdash}},
{"setgray", { 1, &PSActions::setgray}},
@@ -378,3 +381,77 @@ BoundingBox PSInterpreter::pdfPageBox (const string &fname, int pageno) {
pagebox = BoundingBox(stod(_rawData[0]), stod(_rawData[1]), stod(_rawData[2]), stod(_rawData[3]));
return pagebox;
}
+
+
+vector<PSDeviceInfo> PSInterpreter::getImageDeviceInfos () {
+ vector<PSDeviceInfo> infos {
+ {"none", "no processing of bitmap images"},
+ {"jpeg", "color JPEG format"},
+ {"jpeggray", "grayscale JPEG format"},
+ {"png", "grayscale or 24-bit color PNG format"},
+ {"pnggray", "grayscale PNG format"},
+ {"pngmono", "black-and-white PNG format"},
+ {"pngmonod", "dithered black-and-white PNG format"},
+ {"png16", "4-bit color PNG format"},
+ {"png256", "8-bit color PNG format"},
+ {"png16m", "24-bit color PNG format"},
+ };
+ return infos;
+}
+
+
+void PSInterpreter::listImageDeviceInfos (ostream &os) {
+ for (const PSDeviceInfo &info : getImageDeviceInfos())
+ os << setw(8) << left << info.name << " | " << info.description << '\n';
+}
+
+
+/** Returns true if a given PS device name is known. The function deosn't
+ * check whether the device is actually available.
+ * @param[in] deviceStr device specifier of the form <device name>[:<param>] */
+bool PSInterpreter::imageDeviceKnown (string deviceStr) {
+ if (deviceStr.empty() || !isalpha(deviceStr[0]))
+ return false;
+ deviceStr = deviceStr.substr(0, deviceStr.find(':')); // strip optional argument
+ auto infos = getImageDeviceInfos();
+ auto it = find_if(infos.begin(), infos.end(), [&](PSDeviceInfo &info) {
+ return info.name == deviceStr;
+ });
+ return it != infos.end();
+}
+
+
+/** Sets the output device used to create bitmap images.
+ * @param[in] deviceStr device specifier of the form <device name>[:<param>]
+ * @return true on success, false if device is not supported */
+bool PSInterpreter::setImageDevice (const string &deviceStr) {
+ auto params = util::split(deviceStr, ":");
+ string name = util::tolower(params[0]);
+ if (!imageDeviceKnown(name))
+ return false;
+ if (name != "jpeg" && name != "png" && name != "none") {
+ // check if image device is supported by Ghostscript
+ executeRaw("devicedict/"+name+" known{1}{0}ifelse\n", 1);
+ if (_rawData.empty() || _rawData[0] != "1")
+ throw PSException("output device '"+name+"' is not available");
+ }
+ string ps = "/@imgdevice("+name+")store ";
+ try {
+ if (params.size() > 1) {
+ // set JPEG quality level if given
+ if (name.substr(0, 4) == "jpeg") {
+ int quality = max(0, min(stoi(params[1]), 100));
+ ps += "/JPEGQ "+to_string(quality)+" def ";
+ }
+ else if (name == "pngmonod") {
+ int minFeatureSize = max(0, min(stoi(params[1]), 4));
+ ps += "/MinFeatureSize "+to_string(minFeatureSize)+" def ";
+ }
+ }
+ }
+ catch (...) {
+ throw PSException("invalid device option '"+params[1]+"' (integer expected)");
+ }
+ execute(ps);
+ return true;
+}
diff --git a/dviware/dvisvgm/src/PSInterpreter.hpp b/dviware/dvisvgm/src/PSInterpreter.hpp
index 8e75e3c5f1..138242abb7 100644
--- a/dviware/dvisvgm/src/PSInterpreter.hpp
+++ b/dviware/dvisvgm/src/PSInterpreter.hpp
@@ -2,7 +2,7 @@
** PSInterpreter.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -51,6 +51,7 @@ struct PSActions {
virtual void gsave (std::vector<double> &p) =0;
virtual void grestore (std::vector<double> &p) =0;
virtual void grestoreall (std::vector<double> &p) =0;
+ virtual void image (std::vector<double> &p) =0;
virtual void initclip (std::vector<double> &p) =0;
virtual void lineto (std::vector<double> &p) =0;
virtual void makepattern (std::vector<double> &p) =0;
@@ -62,6 +63,7 @@ struct PSActions {
virtual void save (std::vector<double> &p) =0;
virtual void scale (std::vector<double> &p) =0;
virtual void setblendmode (std::vector<double> &p) =0;
+ virtual void setcolorspace (std::vector<double> &p) =0;
virtual void setcmykcolor (std::vector<double> &cmyk) =0;
virtual void setdash (std::vector<double> &p) =0;
virtual void setgray (std::vector<double> &p) =0;
@@ -85,6 +87,11 @@ struct PSActions {
class PSFilter;
+struct PSDeviceInfo {
+ std::string name;
+ std::string description;
+};
+
/** This class provides methods to execute chunks of PostScript code and calls
* several template methods on invocation of selected PS operators (see PSActions). */
class PSInterpreter {
@@ -105,6 +112,10 @@ class PSInterpreter {
int pdfPageCount (const std::string &fname);
BoundingBox pdfPageBox (const std::string &fname, int pageno);
const std::vector<std::string>& rawData () const {return _rawData;}
+ bool setImageDevice (const std::string &deviceStr);
+ static std::vector<PSDeviceInfo> getImageDeviceInfos ();
+ static void listImageDeviceInfos (std::ostream &os);
+ static bool imageDeviceKnown (std::string deviceStr);
protected:
void init ();
diff --git a/dviware/dvisvgm/src/PSPattern.cpp b/dviware/dvisvgm/src/PSPattern.cpp
index 90ff6a5685..4659dc7a84 100644
--- a/dviware/dvisvgm/src/PSPattern.cpp
+++ b/dviware/dvisvgm/src/PSPattern.cpp
@@ -2,7 +2,7 @@
** PSPattern.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -151,12 +151,11 @@ void PSUncoloredTilingPattern::apply (SpecialActions &actions) {
setGroupNode(util::static_unique_ptr_cast<XMLElement>(getGroupNode()->clone()));
// assign current color to the pattern graphic
vector<XMLElement*> colored_elems;
- const array<const char*, 2> attribs = {{"fill", "stroke"}};
- for (const char *attrib : attribs) {
- getGroupNode()->getDescendants(nullptr, attrib, colored_elems);
+ for (const char *attrName : {"fill", "stroke"}) {
+ getGroupNode()->getDescendants(nullptr, attrName, colored_elems);
for (XMLElement *elem : colored_elems) {
- if (string(elem->getAttributeValue(attrib)) != "none")
- elem->addAttribute(attrib, _currentColor.svgColorString());
+ if (string(elem->getAttributeValue(attrName)) != "none")
+ elem->addAttribute(attrName, _currentColor.svgColorString());
}
colored_elems.clear();
}
diff --git a/dviware/dvisvgm/src/PSPattern.hpp b/dviware/dvisvgm/src/PSPattern.hpp
index 7dde27827d..2c53dd2b3e 100644
--- a/dviware/dvisvgm/src/PSPattern.hpp
+++ b/dviware/dvisvgm/src/PSPattern.hpp
@@ -2,7 +2,7 @@
** PSPattern.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PSPreviewFilter.cpp b/dviware/dvisvgm/src/PSPreviewFilter.cpp
index 6dac4945a8..20e8b53643 100644
--- a/dviware/dvisvgm/src/PSPreviewFilter.cpp
+++ b/dviware/dvisvgm/src/PSPreviewFilter.cpp
@@ -2,7 +2,7 @@
** PSPreviewFilter.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PSPreviewFilter.hpp b/dviware/dvisvgm/src/PSPreviewFilter.hpp
index 630a277b16..acadf9f39e 100644
--- a/dviware/dvisvgm/src/PSPreviewFilter.hpp
+++ b/dviware/dvisvgm/src/PSPreviewFilter.hpp
@@ -2,7 +2,7 @@
** PSPreviewFilter.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PageRanges.cpp b/dviware/dvisvgm/src/PageRanges.cpp
index e6c1a8287b..a08ad4aa54 100644
--- a/dviware/dvisvgm/src/PageRanges.cpp
+++ b/dviware/dvisvgm/src/PageRanges.cpp
@@ -2,7 +2,7 @@
** PageRanges.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PageRanges.hpp b/dviware/dvisvgm/src/PageRanges.hpp
index 5ecc7a998c..e6909b9cd1 100644
--- a/dviware/dvisvgm/src/PageRanges.hpp
+++ b/dviware/dvisvgm/src/PageRanges.hpp
@@ -2,7 +2,7 @@
** PageRanges.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PageSize.cpp b/dviware/dvisvgm/src/PageSize.cpp
index 2f0a48aeb9..ac8e1c5275 100644
--- a/dviware/dvisvgm/src/PageSize.cpp
+++ b/dviware/dvisvgm/src/PageSize.cpp
@@ -2,7 +2,7 @@
** PageSize.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -33,8 +33,8 @@ using namespace std;
* @param[out] width contains the page width when function returns
* @param[out] height contains the page height when function returns */
static void computeASize (int n, Length &width, Length &height) {
- height.set(floor(1189.0/pow(math::SQRT2, n)+0.5), Length::Unit::MM);
- width.set(floor(height.mm()/math::SQRT2+0.5), Length::Unit::MM);
+ height.set(round(1189.0/pow(math::SQRT2, n)), Length::Unit::MM);
+ width.set(round(height.mm()/math::SQRT2), Length::Unit::MM);
}
@@ -46,8 +46,8 @@ static void computeBSize (int n, Length &width, Length &height) {
Length w, h;
computeASize(n, width, height);
computeASize(n-1, w, h);
- width.set(floor(sqrt(width.mm() * w.mm())+0.5), Length::Unit::MM);
- height.set(floor(sqrt(height.mm() * h.mm())+0.5), Length::Unit::MM);
+ width.set(round(sqrt(width.mm() * w.mm())), Length::Unit::MM);
+ height.set(round(sqrt(height.mm() * h.mm())), Length::Unit::MM);
}
@@ -59,8 +59,8 @@ static void computeCSize (int n, Length &width, Length &height) {
Length w, h;
computeASize(n, width, height);
computeBSize(n, w, h);
- width.set(floor(sqrt(width.mm() * w.mm())+0.5), Length::Unit::MM);
- height.set(floor(sqrt(height.mm() * h.mm())+0.5), Length::Unit::MM);
+ width.set(round(sqrt(width.mm() * w.mm())), Length::Unit::MM);
+ height.set(round(sqrt(height.mm() * h.mm())), Length::Unit::MM);
}
@@ -72,8 +72,8 @@ static void computeDSize (int n, Length &width, Length &height) {
Length w, h;
computeASize(n, width, height);
computeBSize(n+1, w, h);
- width.set(floor(sqrt(width.mm() * w.mm())+0.5), Length::Unit::MM);
- height.set(floor(sqrt(height.mm() * h.mm())+0.5), Length::Unit::MM);
+ width.set(round(sqrt(width.mm() * w.mm())), Length::Unit::MM);
+ height.set(round(sqrt(height.mm() * h.mm())), Length::Unit::MM);
}
diff --git a/dviware/dvisvgm/src/PageSize.hpp b/dviware/dvisvgm/src/PageSize.hpp
index c785a89564..43c555b9dd 100644
--- a/dviware/dvisvgm/src/PageSize.hpp
+++ b/dviware/dvisvgm/src/PageSize.hpp
@@ -2,7 +2,7 @@
** PageSize.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Pair.hpp b/dviware/dvisvgm/src/Pair.hpp
index 5dd7c68a93..63806c5b6a 100644
--- a/dviware/dvisvgm/src/Pair.hpp
+++ b/dviware/dvisvgm/src/Pair.hpp
@@ -2,7 +2,7 @@
** Pair.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PapersizeSpecialHandler.cpp b/dviware/dvisvgm/src/PapersizeSpecialHandler.cpp
index 0907afc8f0..c2ab96a8a8 100644
--- a/dviware/dvisvgm/src/PapersizeSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/PapersizeSpecialHandler.cpp
@@ -2,7 +2,7 @@
** PapersizeSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PapersizeSpecialHandler.hpp b/dviware/dvisvgm/src/PapersizeSpecialHandler.hpp
index c7f8f26d60..ed836f37d7 100644
--- a/dviware/dvisvgm/src/PapersizeSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/PapersizeSpecialHandler.hpp
@@ -2,7 +2,7 @@
** PapersizeSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PathClipper.cpp b/dviware/dvisvgm/src/PathClipper.cpp
index f646289d25..4aa4373f46 100644
--- a/dviware/dvisvgm/src/PathClipper.cpp
+++ b/dviware/dvisvgm/src/PathClipper.cpp
@@ -2,7 +2,7 @@
** PathClipper.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PathClipper.hpp b/dviware/dvisvgm/src/PathClipper.hpp
index fb375db35f..e3e6bd1681 100644
--- a/dviware/dvisvgm/src/PathClipper.hpp
+++ b/dviware/dvisvgm/src/PathClipper.hpp
@@ -2,7 +2,7 @@
** PathClipper.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PdfSpecialHandler.cpp b/dviware/dvisvgm/src/PdfSpecialHandler.cpp
index 70174b0fe1..3466e44f8e 100644
--- a/dviware/dvisvgm/src/PdfSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/PdfSpecialHandler.cpp
@@ -2,7 +2,7 @@
** PdfSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PdfSpecialHandler.hpp b/dviware/dvisvgm/src/PdfSpecialHandler.hpp
index 389ee96b86..67512dd403 100644
--- a/dviware/dvisvgm/src/PdfSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/PdfSpecialHandler.hpp
@@ -2,7 +2,7 @@
** PdfSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PreScanDVIReader.cpp b/dviware/dvisvgm/src/PreScanDVIReader.cpp
index 7c964fae86..8e255ef088 100644
--- a/dviware/dvisvgm/src/PreScanDVIReader.cpp
+++ b/dviware/dvisvgm/src/PreScanDVIReader.cpp
@@ -2,7 +2,7 @@
** PreScanDVIReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PreScanDVIReader.hpp b/dviware/dvisvgm/src/PreScanDVIReader.hpp
index 5176f5a1f3..900fd1fc01 100644
--- a/dviware/dvisvgm/src/PreScanDVIReader.hpp
+++ b/dviware/dvisvgm/src/PreScanDVIReader.hpp
@@ -2,7 +2,7 @@
** PreScanDVIReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Process.cpp b/dviware/dvisvgm/src/Process.cpp
index de5394f1fd..2e15153b9e 100644
--- a/dviware/dvisvgm/src/Process.cpp
+++ b/dviware/dvisvgm/src/Process.cpp
@@ -2,7 +2,7 @@
** Process.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Process.hpp b/dviware/dvisvgm/src/Process.hpp
index 70eeafb9d8..53311921c9 100644
--- a/dviware/dvisvgm/src/Process.hpp
+++ b/dviware/dvisvgm/src/Process.hpp
@@ -2,7 +2,7 @@
** Process.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/PsSpecialHandler.cpp b/dviware/dvisvgm/src/PsSpecialHandler.cpp
index 31f8aa55e7..2301eeb571 100644
--- a/dviware/dvisvgm/src/PsSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/PsSpecialHandler.cpp
@@ -2,7 +2,7 @@
** PsSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -23,7 +23,6 @@
#include <fstream>
#include <memory>
#include <sstream>
-#include "EPSFile.hpp"
#include "FileFinder.hpp"
#include "FilePath.hpp"
#include "FileSystem.hpp"
@@ -36,6 +35,7 @@
#include "SVGTree.hpp"
#include "TensorProductPatch.hpp"
#include "TriangularPatch.hpp"
+#include "utility.hpp"
using namespace std;
@@ -44,10 +44,12 @@ bool PsSpecialHandler::COMPUTE_CLIPPATHS_INTERSECTIONS = false;
bool PsSpecialHandler::SHADING_SEGMENT_OVERLAP = false;
int PsSpecialHandler::SHADING_SEGMENT_SIZE = 20;
double PsSpecialHandler::SHADING_SIMPLIFY_DELTA = 0.01;
+string PsSpecialHandler::BITMAP_FORMAT;
-PsSpecialHandler::PsSpecialHandler () : _psi(this), _actions(), _previewFilter(_psi), _xmlnode(), _savenode()
+PsSpecialHandler::PsSpecialHandler () : _psi(this), _previewFilter(_psi)
{
+ _psi.setImageDevice(BITMAP_FORMAT);
}
@@ -83,6 +85,7 @@ void PsSpecialHandler::initgraphics () {
_blendmode = 0; // "normal" mode (no blending)
_sx = _sy = _cos = 1.0;
_pattern = nullptr;
+ _patternEnabled = false;
_currentcolor = Color::BLACK;
_dashoffset = 0;
_dashpattern.clear();
@@ -381,6 +384,13 @@ void PsSpecialHandler::imgfile (FileType filetype, const string &fname, const ma
}
+/** Returns path + basename of temporary bitmap images. */
+static string image_base_path (SpecialActions &actions) {
+ FilePath imgpath = actions.getSVGFilePath(actions.getCurrentPageNumber());
+ return FileSystem::tmpdir() + "/" + imgpath.basename() + "-tmp-";
+}
+
+
/** Creates an XML element containing the image data depending on the file type.
* @param[in] type file type of the image
* @param[in] fname file name/path of image file
@@ -421,14 +431,15 @@ unique_ptr<XMLElement> PsSpecialHandler::createImageNode (FileType type, const s
node = util::make_unique<XMLElement>("g"); // put SVG nodes created from the EPS/PDF file in this group
_xmlnode = node.get();
_psi.execute(
- "\n@beginspecial @setspecial" // enter special environment
- "/setpagedevice{@setpagedevice}def " // activate processing of operator "setpagedevice"
- "matrix setmatrix" // don't apply outer PS transformations
- "/FirstPage "+to_string(pageno)+" def" // set number of first page to convert (PDF only)
- "/LastPage "+to_string(pageno)+" def " // set number of last page to convert (PDF only)
- +rectclip+ // clip to bounding box (if requexted by attribute 'clip')
- "(" + pathstr + ")run " // execute file content
- "@endspecial " // leave special environment
+ "\n@beginspecial @setspecial" // enter special environment
+ "/setpagedevice{@setpagedevice}def " // activate processing of operator "setpagedevice"
+ "/@imgbase("+image_base_path(*_actions)+")store " // path and basename of image files
+ "matrix setmatrix" // don't apply outer PS transformations
+ "/FirstPage "+to_string(pageno)+" def" // set number of first page to convert (PDF only)
+ "/LastPage "+to_string(pageno)+" def " // set number of last page to convert (PDF only)
+ +rectclip+ // clip to bounding box (if requexted by attribute 'clip')
+ "(" + pathstr + ")run " // execute file content
+ "@endspecial\n" // leave special environment
);
if (node->empty())
node.reset(nullptr);
@@ -468,6 +479,11 @@ static bool transform_box_extents (const Matrix &matrix, double &w, double &h, d
}
+void PsSpecialHandler::dviBeginPage (unsigned int pageno, SpecialActions &actions) {
+ _psi.execute("/@imgbase("+image_base_path(actions)+")store\n"); // path and basename of image files
+}
+
+
void PsSpecialHandler::dviEndPage (unsigned, SpecialActions &actions) {
BoundingBox bbox;
if (_previewFilter.getBoundingBox(bbox)) { // is there any data written by preview package?
@@ -638,7 +654,7 @@ void PsSpecialHandler::stroke (vector<double> &p) {
}
else {
// compute bounding box
- _path.computeBBox(bbox);
+ bbox = _path.computeBBox();
bbox.expand(_linewidth/2);
ostringstream oss;
@@ -669,12 +685,10 @@ void PsSpecialHandler::stroke (vector<double> &p) {
path->addAttribute("stroke-dashoffset", _dashoffset);
}
}
- if (path && _clipStack.path()) {
+ if (path && _clipStack.path() && !_savenode) {
// assign clipping path and clip bounding box
path->addAttribute("clip-path", XMLString("url(#clip")+XMLString(_clipStack.topID())+")");
- BoundingBox clipbox;
- _clipStack.path()->computeBBox(clipbox);
- bbox.intersect(clipbox);
+ bbox.intersect(_clipStack.path()->computeBBox());
_clipStack.removePrependedPath();
}
if (_xmlnode)
@@ -696,8 +710,7 @@ void PsSpecialHandler::fill (vector<double> &p, bool evenodd) {
return;
// compute bounding box
- BoundingBox bbox;
- _path.computeBBox(bbox);
+ BoundingBox bbox = _path.computeBBox();
if (!_actions->getMatrix().isIdentity()) {
_path.transform(_actions->getMatrix());
if (!_xmlnode)
@@ -714,12 +727,10 @@ void PsSpecialHandler::fill (vector<double> &p, bool evenodd) {
path->addAttribute("fill", XMLString("url(#")+_pattern->svgID()+")");
else if (_actions->getColor() != Color::BLACK || _savenode)
path->addAttribute("fill", _actions->getColor().svgColorString());
- if (_clipStack.path()) {
+ if (_clipStack.path() && !_savenode) { // clip path active and not inside pattern definition?
// assign clipping path and clip bounding box
path->addAttribute("clip-path", XMLString("url(#clip")+XMLString(_clipStack.topID())+")");
- BoundingBox clipbox;
- _clipStack.path()->computeBBox(clipbox);
- bbox.intersect(clipbox);
+ bbox.intersect(_clipStack.path()->computeBBox());
_clipStack.removePrependedPath();
}
if (evenodd) // SVG default fill rule is "nonzero" algorithm
@@ -738,6 +749,62 @@ void PsSpecialHandler::fill (vector<double> &p, bool evenodd) {
}
+/** Postprocesses the 'image' operation performed by the PS interpreter. If
+ * the PS image operator succeeded, there's now a PNG file that must be embedded
+ * into the SVG file. */
+void PsSpecialHandler::image (std::vector<double> &p) {
+ int imgID = static_cast<int>(p[0]); // ID of PNG file written
+ if (imgID < 0) // no bitmap file written?
+ return;
+
+ double width = p[1];
+ double height = p[2];
+ string suffix = (BITMAP_FORMAT.substr(0, 3) == "png" ? ".png" : ".jpg");
+ string fname = image_base_path(*_actions)+to_string(imgID)+suffix;
+ ifstream ifs(fname, ios::binary);
+ if (ifs) {
+ ifs.close();
+ auto image = util::make_unique<XMLElement>("image");
+ double x = _actions->getX();
+ double y = _actions->getY();
+ image->addAttribute("x", x);
+ image->addAttribute("y", y);
+ image->addAttribute("width", util::to_string(width));
+ image->addAttribute("height", util::to_string(height));
+
+ // The current transformation matrix (CTM) maps the unit square to the rectangular region
+ // of the target canvas showing the bitmap (see PS Reference Manual, 4.10.3). Therefore,
+ // the local pixel coordinates of the original bitmap must be transformed by CTM*inv(M) to
+ // get the target coordinates. M is the matrix that maps the unit square to the bitmap rectangle.
+ Matrix matrix{width, 0, 0, 0, -height, height}; // maps unit square to bitmap rectangle
+ matrix = matrix.invert().lmultiply(_actions->getMatrix());
+ image->addAttribute("transform", matrix.toSVG());
+
+ // To prevent memory issues, only add the filename to the href attribute and tag it by '@'
+ // for later base64 encoding.
+ image->addAttribute("@xlink:href", string("data:image/")+(suffix == ".png" ? "png" : "jpeg")+";base64,"+fname);
+
+ // if set, assign clipping path to image
+ if (_clipStack.path()) {
+ auto group = util::make_unique<XMLElement>("g");
+ group->addAttribute("clip-path", XMLString("url(#clip")+XMLString(_clipStack.topID())+")");
+ group->append(std::move(image));
+ image = std::move(group); // handle the entire group as image to add
+ }
+ if (_xmlnode)
+ _xmlnode->append(std::move(image));
+ else {
+ _actions->svgTree().appendToPage(std::move(image));
+ BoundingBox bbox(x, y, x+width, y+height);
+ bbox.transform(matrix);
+ if (_clipStack.path())
+ bbox.intersect(_clipStack.path()->computeBBox());
+ _actions->embed(bbox);
+ }
+ }
+}
+
+
/** Creates a Matrix object from a given sequence of 6 double values.
* The given values must be arranged in PostScript matrix order.
* @param[in] v vector containing the matrix values
@@ -774,7 +841,6 @@ static void create_matrix (vector<double> &v, int startindex, Matrix &matrix) {
* 9-14: pattern matrix */
void PsSpecialHandler::makepattern (vector<double> &p) {
int pattern_type = static_cast<int>(p[0]);
- int id = static_cast<int>(p[1]);
switch (pattern_type) {
case 0:
// pattern definition completed
@@ -784,6 +850,7 @@ void PsSpecialHandler::makepattern (vector<double> &p) {
}
break;
case 1: { // tiling pattern
+ int id = static_cast<int>(p[1]);
BoundingBox bbox(p[2], p[3], p[4], p[5]);
const double &xstep=p[6], &ystep=p[7]; // horizontal and vertical distance of adjacent tiles
int paint_type = static_cast<int>(p[8]);
@@ -1184,7 +1251,8 @@ void PsSpecialHandler::rotate (vector<double> &p) {
void PsSpecialHandler::setgray (vector<double> &p) {
- _pattern = nullptr;
+ if (!_patternEnabled)
+ _pattern = nullptr;
_currentcolor.setGray(p[0]);
if (_actions)
_actions->setColor(_currentcolor);
@@ -1192,7 +1260,8 @@ void PsSpecialHandler::setgray (vector<double> &p) {
void PsSpecialHandler::setrgbcolor (vector<double> &p) {
- _pattern= nullptr;
+ if (!_patternEnabled)
+ _pattern= nullptr;
_currentcolor.setRGB(p[0], p[1], p[2]);
if (_actions)
_actions->setColor(_currentcolor);
@@ -1200,7 +1269,8 @@ void PsSpecialHandler::setrgbcolor (vector<double> &p) {
void PsSpecialHandler::setcmykcolor (vector<double> &p) {
- _pattern = nullptr;
+ if (!_patternEnabled)
+ _pattern = nullptr;
_currentcolor.setCMYK(p[0], p[1], p[2], p[3]);
if (_actions)
_actions->setColor(_currentcolor);
@@ -1208,7 +1278,8 @@ void PsSpecialHandler::setcmykcolor (vector<double> &p) {
void PsSpecialHandler::sethsbcolor (vector<double> &p) {
- _pattern = nullptr;
+ if (!_patternEnabled)
+ _pattern = nullptr;
_currentcolor.setHSB(p[0], p[1], p[2]);
if (_actions)
_actions->setColor(_currentcolor);
diff --git a/dviware/dvisvgm/src/PsSpecialHandler.hpp b/dviware/dvisvgm/src/PsSpecialHandler.hpp
index 6251e20a47..9dcbc2d4ce 100644
--- a/dviware/dvisvgm/src/PsSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/PsSpecialHandler.hpp
@@ -2,7 +2,7 @@
** PsSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -95,6 +95,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions {
static bool SHADING_SEGMENT_OVERLAP;
static int SHADING_SEGMENT_SIZE;
static double SHADING_SIMPLIFY_DELTA;
+ static std::string BITMAP_FORMAT;
protected:
void initialize ();
@@ -104,6 +105,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions {
void processHeaderFile (const char *fname);
void imgfile (FileType type, const std::string &fname, const std::map<std::string,std::string> &attr);
std::unique_ptr<XMLElement> createImageNode (FileType type, const std::string &fname, int pageno, BoundingBox bbox, bool clip);
+ void dviBeginPage (unsigned int pageno, SpecialActions &actions) override;
void dviEndPage (unsigned pageno, SpecialActions &actions) override;
void clip (Path path, bool evenodd);
void processSequentialPatchMesh (int shadingTypeID, ColorSpace cspace, VectorIterator<double> &it);
@@ -125,6 +127,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions {
void grestore (std::vector<double> &p) override;
void grestoreall (std::vector<double> &p) override;
void gsave (std::vector<double> &p) override;
+ void image (std::vector<double> &p) override;
void initclip (std::vector<double> &p) override;
void lineto (std::vector<double> &p) override;
void makepattern (std::vector<double> &p) override;
@@ -136,6 +139,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions {
void save (std::vector<double> &p) override;
void scale (std::vector<double> &p) override;
void setblendmode (std::vector<double> &p) override {_blendmode = int(p[0]);}
+ void setcolorspace (std::vector<double> &p) override {_patternEnabled = bool(p[0]);}
void setcmykcolor (std::vector<double> &cmyk) override;
void setdash (std::vector<double> &p) override;
void setgray (std::vector<double> &p) override;
@@ -158,11 +162,11 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions {
private:
PSInterpreter _psi;
- SpecialActions *_actions;
+ SpecialActions *_actions=nullptr;
PSPreviewFilter _previewFilter; ///< filter to extract information generated by the preview package
PsSection _psSection=PS_NONE; ///< current section processed (nothing yet, headers, or body specials)
- XMLElement *_xmlnode; ///< if != 0, created SVG elements are appended to this node
- XMLElement *_savenode; ///< pointer to temporaryly store _xmlnode
+ XMLElement *_xmlnode=nullptr; ///< if != 0, created SVG elements are appended to this node
+ XMLElement *_savenode=nullptr; ///< pointer to temporaryly store _xmlnode
std::string _headerCode; ///< collected literal PS header code
Path _path;
DPair _currentpoint; ///< current PS position in bp units
@@ -181,6 +185,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions {
ClippingStack _clipStack;
std::map<int, std::unique_ptr<PSPattern>> _patterns;
PSTilingPattern *_pattern; ///< current pattern
+ bool _patternEnabled; ///< true if active color space is a pattern
};
#endif
diff --git a/dviware/dvisvgm/src/RangeMap.cpp b/dviware/dvisvgm/src/RangeMap.cpp
index 5fa2bb10ab..86190cacf9 100644
--- a/dviware/dvisvgm/src/RangeMap.cpp
+++ b/dviware/dvisvgm/src/RangeMap.cpp
@@ -2,7 +2,7 @@
** RangeMap.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/RangeMap.hpp b/dviware/dvisvgm/src/RangeMap.hpp
index 9d3f2c2d95..3e3bff9d4b 100644
--- a/dviware/dvisvgm/src/RangeMap.hpp
+++ b/dviware/dvisvgm/src/RangeMap.hpp
@@ -2,7 +2,7 @@
** RangeMap.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharHandler.cpp b/dviware/dvisvgm/src/SVGCharHandler.cpp
index 3733053e4d..f8d75a28d3 100644
--- a/dviware/dvisvgm/src/SVGCharHandler.cpp
+++ b/dviware/dvisvgm/src/SVGCharHandler.cpp
@@ -2,7 +2,7 @@
** SVGCharHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharHandler.hpp b/dviware/dvisvgm/src/SVGCharHandler.hpp
index 48d24496fa..f75df47215 100644
--- a/dviware/dvisvgm/src/SVGCharHandler.hpp
+++ b/dviware/dvisvgm/src/SVGCharHandler.hpp
@@ -2,7 +2,7 @@
** SVGCharHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharHandlerFactory.cpp b/dviware/dvisvgm/src/SVGCharHandlerFactory.cpp
index 613f7e7d8b..397943ace0 100644
--- a/dviware/dvisvgm/src/SVGCharHandlerFactory.cpp
+++ b/dviware/dvisvgm/src/SVGCharHandlerFactory.cpp
@@ -2,7 +2,7 @@
** SVGCharHandlerFactory.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharHandlerFactory.hpp b/dviware/dvisvgm/src/SVGCharHandlerFactory.hpp
index 92a08dc196..f37b9977c2 100644
--- a/dviware/dvisvgm/src/SVGCharHandlerFactory.hpp
+++ b/dviware/dvisvgm/src/SVGCharHandlerFactory.hpp
@@ -2,7 +2,7 @@
** SVGCharHandlerFactory.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharPathHandler.cpp b/dviware/dvisvgm/src/SVGCharPathHandler.cpp
index 3962168ae2..7a766bae49 100644
--- a/dviware/dvisvgm/src/SVGCharPathHandler.cpp
+++ b/dviware/dvisvgm/src/SVGCharPathHandler.cpp
@@ -2,7 +2,7 @@
** SVGCharPathHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharPathHandler.hpp b/dviware/dvisvgm/src/SVGCharPathHandler.hpp
index ba172de340..c404cbcd5a 100644
--- a/dviware/dvisvgm/src/SVGCharPathHandler.hpp
+++ b/dviware/dvisvgm/src/SVGCharPathHandler.hpp
@@ -2,7 +2,7 @@
** SVGCharPathHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp b/dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp
index a48f5f9a93..6b89348dc1 100644
--- a/dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp
+++ b/dviware/dvisvgm/src/SVGCharTspanTextHandler.cpp
@@ -2,7 +2,7 @@
** SVGCharTspanTextHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp b/dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp
index 01567997b6..b847965a1a 100644
--- a/dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp
+++ b/dviware/dvisvgm/src/SVGCharTspanTextHandler.hpp
@@ -2,7 +2,7 @@
** SVGCharTspanTextHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGOutput.cpp b/dviware/dvisvgm/src/SVGOutput.cpp
index 1f9e244883..18702be776 100644
--- a/dviware/dvisvgm/src/SVGOutput.cpp
+++ b/dviware/dvisvgm/src/SVGOutput.cpp
@@ -2,7 +2,7 @@
** SVGOutput.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGOutput.hpp b/dviware/dvisvgm/src/SVGOutput.hpp
index 1f4da20ee8..f29a032674 100644
--- a/dviware/dvisvgm/src/SVGOutput.hpp
+++ b/dviware/dvisvgm/src/SVGOutput.hpp
@@ -2,7 +2,7 @@
** SVGOutput.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp b/dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp
index 0d36b5a8b8..89d1c548b0 100644
--- a/dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp
+++ b/dviware/dvisvgm/src/SVGSingleCharTextHandler.cpp
@@ -2,7 +2,7 @@
** SVGSingleCharTextHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp b/dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp
index 7fd2174f12..67fcabd44c 100644
--- a/dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp
+++ b/dviware/dvisvgm/src/SVGSingleCharTextHandler.hpp
@@ -2,7 +2,7 @@
** SVGSingleCharTextHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGTree.cpp b/dviware/dvisvgm/src/SVGTree.cpp
index 57b5fd5a4f..e35a14d9b3 100644
--- a/dviware/dvisvgm/src/SVGTree.cpp
+++ b/dviware/dvisvgm/src/SVGTree.cpp
@@ -2,7 +2,7 @@
** SVGTree.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SVGTree.hpp b/dviware/dvisvgm/src/SVGTree.hpp
index d351ec9799..a441a314a5 100644
--- a/dviware/dvisvgm/src/SVGTree.hpp
+++ b/dviware/dvisvgm/src/SVGTree.hpp
@@ -2,7 +2,7 @@
** SVGTree.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ShadingPatch.cpp b/dviware/dvisvgm/src/ShadingPatch.cpp
index 1ad0011daf..847dc3aa0c 100644
--- a/dviware/dvisvgm/src/ShadingPatch.cpp
+++ b/dviware/dvisvgm/src/ShadingPatch.cpp
@@ -2,7 +2,7 @@
** ShadingPatch.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ShadingPatch.hpp b/dviware/dvisvgm/src/ShadingPatch.hpp
index 4346301e7b..573188b77b 100644
--- a/dviware/dvisvgm/src/ShadingPatch.hpp
+++ b/dviware/dvisvgm/src/ShadingPatch.hpp
@@ -2,7 +2,7 @@
** ShadingPatch.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SignalHandler.cpp b/dviware/dvisvgm/src/SignalHandler.cpp
index 5af70be2e4..14badba085 100644
--- a/dviware/dvisvgm/src/SignalHandler.cpp
+++ b/dviware/dvisvgm/src/SignalHandler.cpp
@@ -2,7 +2,7 @@
** SignalHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SignalHandler.hpp b/dviware/dvisvgm/src/SignalHandler.hpp
index b97449399e..647a3650fc 100644
--- a/dviware/dvisvgm/src/SignalHandler.hpp
+++ b/dviware/dvisvgm/src/SignalHandler.hpp
@@ -2,7 +2,7 @@
** SignalHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SourceInput.cpp b/dviware/dvisvgm/src/SourceInput.cpp
index 35cdd24af9..5cd2e22749 100644
--- a/dviware/dvisvgm/src/SourceInput.cpp
+++ b/dviware/dvisvgm/src/SourceInput.cpp
@@ -2,7 +2,7 @@
** SourceInput.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SourceInput.hpp b/dviware/dvisvgm/src/SourceInput.hpp
index 3b0f7b3c62..63f4af9b7a 100644
--- a/dviware/dvisvgm/src/SourceInput.hpp
+++ b/dviware/dvisvgm/src/SourceInput.hpp
@@ -2,7 +2,7 @@
** SourceInput.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SpecialActions.hpp b/dviware/dvisvgm/src/SpecialActions.hpp
index 7e53303792..f8eba3fd12 100644
--- a/dviware/dvisvgm/src/SpecialActions.hpp
+++ b/dviware/dvisvgm/src/SpecialActions.hpp
@@ -2,7 +2,7 @@
** SpecialActions.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SpecialHandler.hpp b/dviware/dvisvgm/src/SpecialHandler.hpp
index 4a3439bb24..6c676a6ba0 100644
--- a/dviware/dvisvgm/src/SpecialHandler.hpp
+++ b/dviware/dvisvgm/src/SpecialHandler.hpp
@@ -2,7 +2,7 @@
** SpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SpecialManager.cpp b/dviware/dvisvgm/src/SpecialManager.cpp
index 4838cbdf47..f3b2f3aa50 100644
--- a/dviware/dvisvgm/src/SpecialManager.cpp
+++ b/dviware/dvisvgm/src/SpecialManager.cpp
@@ -2,7 +2,7 @@
** SpecialManager.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/SpecialManager.hpp b/dviware/dvisvgm/src/SpecialManager.hpp
index fe88eaf58e..4c4ccae281 100644
--- a/dviware/dvisvgm/src/SpecialManager.hpp
+++ b/dviware/dvisvgm/src/SpecialManager.hpp
@@ -2,7 +2,7 @@
** SpecialManager.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/StreamReader.cpp b/dviware/dvisvgm/src/StreamReader.cpp
index ccfb176abe..200b6592d9 100644
--- a/dviware/dvisvgm/src/StreamReader.cpp
+++ b/dviware/dvisvgm/src/StreamReader.cpp
@@ -2,7 +2,7 @@
** StreamReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/StreamReader.hpp b/dviware/dvisvgm/src/StreamReader.hpp
index 05c4e1e701..653b451b69 100644
--- a/dviware/dvisvgm/src/StreamReader.hpp
+++ b/dviware/dvisvgm/src/StreamReader.hpp
@@ -2,7 +2,7 @@
** StreamReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/StreamWriter.cpp b/dviware/dvisvgm/src/StreamWriter.cpp
index 6216468695..c0885c31b1 100644
--- a/dviware/dvisvgm/src/StreamWriter.cpp
+++ b/dviware/dvisvgm/src/StreamWriter.cpp
@@ -2,7 +2,7 @@
** StreamWriter.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/StreamWriter.hpp b/dviware/dvisvgm/src/StreamWriter.hpp
index 441a9a7e7f..16a54b1050 100644
--- a/dviware/dvisvgm/src/StreamWriter.hpp
+++ b/dviware/dvisvgm/src/StreamWriter.hpp
@@ -2,7 +2,7 @@
** StreamWriter.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Subfont.cpp b/dviware/dvisvgm/src/Subfont.cpp
index e0b2570d8c..eb7f244cdb 100644
--- a/dviware/dvisvgm/src/Subfont.cpp
+++ b/dviware/dvisvgm/src/Subfont.cpp
@@ -2,7 +2,7 @@
** Subfont.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Subfont.hpp b/dviware/dvisvgm/src/Subfont.hpp
index ca88520ea2..5125194e9d 100644
--- a/dviware/dvisvgm/src/Subfont.hpp
+++ b/dviware/dvisvgm/src/Subfont.hpp
@@ -2,7 +2,7 @@
** Subfont.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/System.cpp b/dviware/dvisvgm/src/System.cpp
index b2724bdcab..ed14df6821 100644
--- a/dviware/dvisvgm/src/System.cpp
+++ b/dviware/dvisvgm/src/System.cpp
@@ -2,7 +2,7 @@
** System.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/System.hpp b/dviware/dvisvgm/src/System.hpp
index fa29325252..72a0cb3da8 100644
--- a/dviware/dvisvgm/src/System.hpp
+++ b/dviware/dvisvgm/src/System.hpp
@@ -2,7 +2,7 @@
** System.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TFM.cpp b/dviware/dvisvgm/src/TFM.cpp
index 005081533e..ea6f2ecbe4 100644
--- a/dviware/dvisvgm/src/TFM.cpp
+++ b/dviware/dvisvgm/src/TFM.cpp
@@ -2,7 +2,7 @@
** TFM.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TFM.hpp b/dviware/dvisvgm/src/TFM.hpp
index f2fd3027eb..261a5ce736 100644
--- a/dviware/dvisvgm/src/TFM.hpp
+++ b/dviware/dvisvgm/src/TFM.hpp
@@ -2,7 +2,7 @@
** TFM.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TTFAutohint.cpp b/dviware/dvisvgm/src/TTFAutohint.cpp
index a7aef2a5ec..ad1b03f21a 100644
--- a/dviware/dvisvgm/src/TTFAutohint.cpp
+++ b/dviware/dvisvgm/src/TTFAutohint.cpp
@@ -2,7 +2,7 @@
** TTFAutohint.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TTFAutohint.hpp b/dviware/dvisvgm/src/TTFAutohint.hpp
index 417661d3bb..d23ceb2be0 100644
--- a/dviware/dvisvgm/src/TTFAutohint.hpp
+++ b/dviware/dvisvgm/src/TTFAutohint.hpp
@@ -2,7 +2,7 @@
** TTFAutohint.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TensorProductPatch.cpp b/dviware/dvisvgm/src/TensorProductPatch.cpp
index 52acd63179..dcd31e275d 100644
--- a/dviware/dvisvgm/src/TensorProductPatch.cpp
+++ b/dviware/dvisvgm/src/TensorProductPatch.cpp
@@ -2,7 +2,7 @@
** TensorProductPatch.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -300,9 +300,9 @@ DPair TensorProductPatch::blossomValue (double u1, double u2, double u3, double
/** Snaps value x to the interval [0,1]. Values lesser than or near 0 are mapped to 0, values
* greater than or near 1 are mapped to 1. */
static inline double snap (double x) {
- if (fabs(x) < 0.001)
+ if (abs(x) < 0.001)
return 0;
- if (fabs(1-x) < 0.001)
+ if (abs(1-x) < 0.001)
return 1;
return x;
}
diff --git a/dviware/dvisvgm/src/TensorProductPatch.hpp b/dviware/dvisvgm/src/TensorProductPatch.hpp
index 711feefc2d..e53604cf52 100644
--- a/dviware/dvisvgm/src/TensorProductPatch.hpp
+++ b/dviware/dvisvgm/src/TensorProductPatch.hpp
@@ -2,7 +2,7 @@
** TensorProductPatch.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Terminal.cpp b/dviware/dvisvgm/src/Terminal.cpp
index 0e46874895..3b2ff2b871 100644
--- a/dviware/dvisvgm/src/Terminal.cpp
+++ b/dviware/dvisvgm/src/Terminal.cpp
@@ -2,7 +2,7 @@
** Terminal.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Terminal.hpp b/dviware/dvisvgm/src/Terminal.hpp
index e452aa042f..fd7a920c16 100644
--- a/dviware/dvisvgm/src/Terminal.hpp
+++ b/dviware/dvisvgm/src/Terminal.hpp
@@ -2,7 +2,7 @@
** Terminal.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ToUnicodeMap.cpp b/dviware/dvisvgm/src/ToUnicodeMap.cpp
index f002038aec..6ab99a248e 100644
--- a/dviware/dvisvgm/src/ToUnicodeMap.cpp
+++ b/dviware/dvisvgm/src/ToUnicodeMap.cpp
@@ -2,7 +2,7 @@
** ToUnicodeMap.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ToUnicodeMap.hpp b/dviware/dvisvgm/src/ToUnicodeMap.hpp
index 8ab3474e65..74d6dcb648 100644
--- a/dviware/dvisvgm/src/ToUnicodeMap.hpp
+++ b/dviware/dvisvgm/src/ToUnicodeMap.hpp
@@ -2,7 +2,7 @@
** ToUnicodeMap.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TpicSpecialHandler.cpp b/dviware/dvisvgm/src/TpicSpecialHandler.cpp
index b97fa439af..47d3e46988 100644
--- a/dviware/dvisvgm/src/TpicSpecialHandler.cpp
+++ b/dviware/dvisvgm/src/TpicSpecialHandler.cpp
@@ -2,7 +2,7 @@
** TpicSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TpicSpecialHandler.hpp b/dviware/dvisvgm/src/TpicSpecialHandler.hpp
index fa8ba706fd..f6ec271994 100644
--- a/dviware/dvisvgm/src/TpicSpecialHandler.hpp
+++ b/dviware/dvisvgm/src/TpicSpecialHandler.hpp
@@ -2,7 +2,7 @@
** TpicSpecialHandler.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TriangularPatch.cpp b/dviware/dvisvgm/src/TriangularPatch.cpp
index 01efe2e8f0..fadeb725ff 100644
--- a/dviware/dvisvgm/src/TriangularPatch.cpp
+++ b/dviware/dvisvgm/src/TriangularPatch.cpp
@@ -2,7 +2,7 @@
** TriangularPatch.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -142,9 +142,9 @@ Color TriangularPatch::averageColor (const Color &c1, const Color &c2, const Col
/** Snaps value x to the interval [0,1]. Values lesser than or near 0 are mapped to 0, values
* greater than or near 1 are mapped to 1. */
static inline double snap (double x) {
- if (fabs(x) < 0.001)
+ if (abs(x) < 0.001)
return 0;
- if (fabs(1-x) < 0.001)
+ if (abs(1-x) < 0.001)
return 1;
return x;
}
diff --git a/dviware/dvisvgm/src/TriangularPatch.hpp b/dviware/dvisvgm/src/TriangularPatch.hpp
index d329e43fa1..797068bacd 100644
--- a/dviware/dvisvgm/src/TriangularPatch.hpp
+++ b/dviware/dvisvgm/src/TriangularPatch.hpp
@@ -2,7 +2,7 @@
** TriangularPatch.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TrueTypeFont.cpp b/dviware/dvisvgm/src/TrueTypeFont.cpp
index 408a00eede..2921af59ea 100644
--- a/dviware/dvisvgm/src/TrueTypeFont.cpp
+++ b/dviware/dvisvgm/src/TrueTypeFont.cpp
@@ -2,7 +2,7 @@
** TrueTypeFont.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/TrueTypeFont.hpp b/dviware/dvisvgm/src/TrueTypeFont.hpp
index d2e5b6e98d..0ae155c52c 100644
--- a/dviware/dvisvgm/src/TrueTypeFont.hpp
+++ b/dviware/dvisvgm/src/TrueTypeFont.hpp
@@ -2,7 +2,7 @@
** TrueTypeFont.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Unicode.cpp b/dviware/dvisvgm/src/Unicode.cpp
index d4a18a7bb9..950209bda0 100644
--- a/dviware/dvisvgm/src/Unicode.cpp
+++ b/dviware/dvisvgm/src/Unicode.cpp
@@ -2,7 +2,7 @@
** Unicode.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/Unicode.hpp b/dviware/dvisvgm/src/Unicode.hpp
index e281edc791..bc9db7e731 100644
--- a/dviware/dvisvgm/src/Unicode.hpp
+++ b/dviware/dvisvgm/src/Unicode.hpp
@@ -2,7 +2,7 @@
** Unicode.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/VFActions.hpp b/dviware/dvisvgm/src/VFActions.hpp
index 73567109f7..2d4a2a2c5f 100644
--- a/dviware/dvisvgm/src/VFActions.hpp
+++ b/dviware/dvisvgm/src/VFActions.hpp
@@ -2,7 +2,7 @@
** VFActions.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/VFReader.cpp b/dviware/dvisvgm/src/VFReader.cpp
index 47f5e3f7b6..eb1193ddaa 100644
--- a/dviware/dvisvgm/src/VFReader.cpp
+++ b/dviware/dvisvgm/src/VFReader.cpp
@@ -2,7 +2,7 @@
** VFReader.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/VFReader.hpp b/dviware/dvisvgm/src/VFReader.hpp
index bd42289039..bbf4986d7f 100644
--- a/dviware/dvisvgm/src/VFReader.hpp
+++ b/dviware/dvisvgm/src/VFReader.hpp
@@ -2,7 +2,7 @@
** VFReader.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/VectorIterator.hpp b/dviware/dvisvgm/src/VectorIterator.hpp
index 17707fbc96..0fb53d78e4 100644
--- a/dviware/dvisvgm/src/VectorIterator.hpp
+++ b/dviware/dvisvgm/src/VectorIterator.hpp
@@ -2,7 +2,7 @@
** VectorIterator.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/VectorStream.hpp b/dviware/dvisvgm/src/VectorStream.hpp
index 9672e67435..0372d368d0 100644
--- a/dviware/dvisvgm/src/VectorStream.hpp
+++ b/dviware/dvisvgm/src/VectorStream.hpp
@@ -2,7 +2,7 @@
** VectorStream.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/XMLDocument.cpp b/dviware/dvisvgm/src/XMLDocument.cpp
index be14eaf678..ffe23b1f80 100644
--- a/dviware/dvisvgm/src/XMLDocument.cpp
+++ b/dviware/dvisvgm/src/XMLDocument.cpp
@@ -2,7 +2,7 @@
** XMLDocument.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/XMLDocument.hpp b/dviware/dvisvgm/src/XMLDocument.hpp
index e9132c44d8..2eaaee4a28 100644
--- a/dviware/dvisvgm/src/XMLDocument.hpp
+++ b/dviware/dvisvgm/src/XMLDocument.hpp
@@ -2,7 +2,7 @@
** XMLDocument.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/XMLNode.cpp b/dviware/dvisvgm/src/XMLNode.cpp
index 128be5b9e5..db07d95dd2 100644
--- a/dviware/dvisvgm/src/XMLNode.cpp
+++ b/dviware/dvisvgm/src/XMLNode.cpp
@@ -2,7 +2,7 @@
** XMLNode.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -19,15 +19,18 @@
*************************************************************************/
#include <algorithm>
-#include <map>
+#include <fstream>
#include <list>
+#include <map>
#include <sstream>
+#include "FileSystem.hpp"
#include "utility.hpp"
#include "XMLNode.hpp"
#include "XMLString.hpp"
using namespace std;
+bool XMLNode::KEEP_ENCODED_FILES=false;
bool XMLElement::WRITE_NEWLINES=true;
@@ -69,7 +72,7 @@ XMLElement::XMLElement (string name) : _name(std::move(name)) {
XMLElement::XMLElement (const XMLElement &node)
: XMLNode(node), _name(node._name), _attributes(node._attributes)
{
- for (XMLNode *child=_firstChild.get(); child; child = child->next())
+ for (XMLNode *child=node._firstChild.get(); child; child = child->next())
insertLast(child->clone());
}
@@ -84,6 +87,14 @@ XMLElement::XMLElement (XMLElement &&node) noexcept
}
+XMLElement::~XMLElement () {
+ // explicitly remove child nodes by iteration to prevent deep recursion
+ unique_ptr<XMLNode> child = std::move(_firstChild);
+ while (child && child->next())
+ child->removeNext();
+}
+
+
/** Removes all attributes and children. */
void XMLElement::clear () {
_attributes.clear();
@@ -315,8 +326,10 @@ unique_ptr<XMLNode> XMLElement::remove (XMLNode *child) {
bool XMLElement::getDescendants (const char *name, const char *attrName, vector<XMLElement*> &descendants) const {
for (XMLNode *child = _firstChild.get(); child; child = child->next()) {
if (XMLElement *elem = child->toElement()) {
- if ((!name || elem->name() == name) && (!attrName || elem->hasAttribute(attrName)))
- descendants.push_back(elem);
+ if (!name || !name[0] || (name[0] != '!' && elem->name() == name) || (name[0] == '!' && elem->name() != name+1)) {
+ if (!attrName || elem->hasAttribute(attrName))
+ descendants.push_back(elem);
+ }
elem->getDescendants(name, attrName, descendants);
}
}
@@ -347,8 +360,30 @@ XMLElement* XMLElement::getFirstDescendant (const char *name, const char *attrNa
ostream& XMLElement::write (ostream &os) const {
os << '<' << _name;
- for (const auto &attrib : _attributes)
- os << ' ' << attrib.name << "='" << attrib.value << '\'';
+ for (const auto &attrib : _attributes) {
+ os << ' ';
+ if (attrib.name.front() != '@')
+ os << attrib.name << "='" << attrib.value << '\'';
+ else {
+ os << attrib.name.substr(1) << "='";
+ size_t pos = attrib.value.find("base64,");
+ if (pos == string::npos)
+ os << attrib.value;
+ else {
+ os << attrib.value.substr(0, pos+7);
+ string fname = attrib.value.substr(pos+7);
+ ifstream ifs(fname, ios::binary);
+ if (ifs) {
+ os << '\n';
+ util::base64_copy(ifs, os, 200);
+ ifs.close();
+ if (!KEEP_ENCODED_FILES)
+ FileSystem::remove(fname);
+ }
+ }
+ os << "'";
+ }
+ }
if (empty())
os << "/>";
else {
diff --git a/dviware/dvisvgm/src/XMLNode.hpp b/dviware/dvisvgm/src/XMLNode.hpp
index b4e5ed6f2b..534ae87bd7 100644
--- a/dviware/dvisvgm/src/XMLNode.hpp
+++ b/dviware/dvisvgm/src/XMLNode.hpp
@@ -2,7 +2,7 @@
** XMLNode.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -63,6 +63,8 @@ class XMLNode {
XMLNode* prev () const {return _prev;}
XMLNode* next () const {return _next.get();}
+ static bool KEEP_ENCODED_FILES;
+
protected:
XMLNode* insertNext (std::unique_ptr<XMLNode> node);
std::unique_ptr<XMLNode> removeNext ();
@@ -126,6 +128,7 @@ class XMLElement : public XMLNode {
explicit XMLElement (std::string name);
XMLElement (const XMLElement &node);
XMLElement (XMLElement &&node) noexcept;
+ ~XMLElement ();
std::unique_ptr<XMLNode> clone () const override {return util::make_unique<XMLElement>(*this);}
void clear () override;
void addAttribute (const std::string &name, const std::string &value);
diff --git a/dviware/dvisvgm/src/XMLString.cpp b/dviware/dvisvgm/src/XMLString.cpp
index fcafb8d1ee..31de6a7b33 100644
--- a/dviware/dvisvgm/src/XMLString.cpp
+++ b/dviware/dvisvgm/src/XMLString.cpp
@@ -2,7 +2,7 @@
** XMLString.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/XMLString.hpp b/dviware/dvisvgm/src/XMLString.hpp
index fa9cf15f9e..52c227ae8a 100644
--- a/dviware/dvisvgm/src/XMLString.hpp
+++ b/dviware/dvisvgm/src/XMLString.hpp
@@ -2,7 +2,7 @@
** XMLString.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/XXHashFunction.hpp b/dviware/dvisvgm/src/XXHashFunction.hpp
index f81deddbd4..e44083f182 100644
--- a/dviware/dvisvgm/src/XXHashFunction.hpp
+++ b/dviware/dvisvgm/src/XXHashFunction.hpp
@@ -2,7 +2,7 @@
** XXHashFunction.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ZLibOutputStream.hpp b/dviware/dvisvgm/src/ZLibOutputStream.hpp
index 8331cb9eed..c1c065e357 100644
--- a/dviware/dvisvgm/src/ZLibOutputStream.hpp
+++ b/dviware/dvisvgm/src/ZLibOutputStream.hpp
@@ -2,7 +2,7 @@
** ZLibOutputStream.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/dvisvgm.cpp b/dviware/dvisvgm/src/dvisvgm.cpp
index 5828299fce..74a8e83abc 100644
--- a/dviware/dvisvgm/src/dvisvgm.cpp
+++ b/dviware/dvisvgm/src/dvisvgm.cpp
@@ -2,7 +2,7 @@
** dvisvgm.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -363,10 +363,18 @@ static void set_variables (const CommandLine &cmdline) {
PhysicalFont::KEEP_TEMP_FILES = cmdline.keepOpt.given();
PhysicalFont::METAFONT_MAG = max(1.0, cmdline.magOpt.value());
XMLString::DECIMAL_PLACES = max(0, min(6, cmdline.precisionOpt.value()));
+ XMLNode::KEEP_ENCODED_FILES = cmdline.keepOpt.given();
PsSpecialHandler::COMPUTE_CLIPPATHS_INTERSECTIONS = cmdline.clipjoinOpt.given();
PsSpecialHandler::SHADING_SEGMENT_OVERLAP = cmdline.gradOverlapOpt.given();
PsSpecialHandler::SHADING_SEGMENT_SIZE = max(1, cmdline.gradSegmentsOpt.value());
PsSpecialHandler::SHADING_SIMPLIFY_DELTA = cmdline.gradSimplifyOpt.value();
+ PsSpecialHandler::BITMAP_FORMAT = util::tolower(cmdline.bitmapFormatOpt.value());
+ if (!PSInterpreter::imageDeviceKnown(PsSpecialHandler::BITMAP_FORMAT)) {
+ ostringstream oss;
+ oss << "unknown image format '" << PsSpecialHandler::BITMAP_FORMAT << "'\nknown formats:\n";
+ PSInterpreter::listImageDeviceInfos(oss);
+ throw CL::CommandLineException(oss.str());
+ }
if (cmdline.optimizeOpt.given()) {
SVGOptimizer::MODULE_SEQUENCE = cmdline.optimizeOpt.value();
vector<string> modnames;
diff --git a/dviware/dvisvgm/src/ffwrapper.c b/dviware/dvisvgm/src/ffwrapper.c
index 68377f0762..61f17fdc6d 100644
--- a/dviware/dvisvgm/src/ffwrapper.c
+++ b/dviware/dvisvgm/src/ffwrapper.c
@@ -2,7 +2,7 @@
** ffwrapper.c **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/ffwrapper.h b/dviware/dvisvgm/src/ffwrapper.h
index f652a97f9a..e3e2f98832 100644
--- a/dviware/dvisvgm/src/ffwrapper.h
+++ b/dviware/dvisvgm/src/ffwrapper.h
@@ -2,7 +2,7 @@
** ffwrapper.h **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/macros.hpp b/dviware/dvisvgm/src/macros.hpp
index beeb54f04b..0a03776057 100644
--- a/dviware/dvisvgm/src/macros.hpp
+++ b/dviware/dvisvgm/src/macros.hpp
@@ -2,7 +2,7 @@
** macros.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp b/dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp
index e26018253d..28046e45a2 100644
--- a/dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp
+++ b/dviware/dvisvgm/src/optimizer/AttributeExtractor.cpp
@@ -2,7 +2,7 @@
** AttributeExtractor.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp b/dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp
index c882e8b4c8..b4c6f2775c 100644
--- a/dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp
+++ b/dviware/dvisvgm/src/optimizer/AttributeExtractor.hpp
@@ -2,7 +2,7 @@
** AttributeExtractor.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/DependencyGraph.hpp b/dviware/dvisvgm/src/optimizer/DependencyGraph.hpp
index c9111b43d5..98d2a8d699 100644
--- a/dviware/dvisvgm/src/optimizer/DependencyGraph.hpp
+++ b/dviware/dvisvgm/src/optimizer/DependencyGraph.hpp
@@ -2,7 +2,7 @@
** DependencyGraph.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/GroupCollapser.cpp b/dviware/dvisvgm/src/optimizer/GroupCollapser.cpp
index 36bf3a8cd5..b8a32786c1 100644
--- a/dviware/dvisvgm/src/optimizer/GroupCollapser.cpp
+++ b/dviware/dvisvgm/src/optimizer/GroupCollapser.cpp
@@ -2,7 +2,7 @@
** GroupCollapser.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/GroupCollapser.hpp b/dviware/dvisvgm/src/optimizer/GroupCollapser.hpp
index 9b5eb01829..08db518a90 100644
--- a/dviware/dvisvgm/src/optimizer/GroupCollapser.hpp
+++ b/dviware/dvisvgm/src/optimizer/GroupCollapser.hpp
@@ -2,7 +2,7 @@
** GroupCollapser.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/OptimizerModule.hpp b/dviware/dvisvgm/src/optimizer/OptimizerModule.hpp
index ff4fec1b4d..276cfa5578 100644
--- a/dviware/dvisvgm/src/optimizer/OptimizerModule.hpp
+++ b/dviware/dvisvgm/src/optimizer/OptimizerModule.hpp
@@ -2,7 +2,7 @@
** OptimizerModule.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp b/dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp
index 85d8e5b1fa..906ccc2d14 100644
--- a/dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp
+++ b/dviware/dvisvgm/src/optimizer/RedundantElementRemover.cpp
@@ -2,7 +2,7 @@
** RedundantElementRemover.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -54,6 +54,7 @@ void RedundantElementRemover::execute (XMLElement *defs, XMLElement *context) {
}
// collect elements that reference a clipPath, i.e. have a clip-path attribute
vector<XMLElement*> descendants;
+ defs->getDescendants("!clipPath", "clip-path", descendants);
context->getDescendants(nullptr, "clip-path", descendants);
// remove referenced IDs and their dependencies from the dependency graph
for (const XMLElement *elem : descendants) {
diff --git a/dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp b/dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp
index dd46cfeba5..8d5a6b689f 100644
--- a/dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp
+++ b/dviware/dvisvgm/src/optimizer/RedundantElementRemover.hpp
@@ -2,7 +2,7 @@
** RedundantElementRemover.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp b/dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp
index 0320f8b565..b2d45176e7 100644
--- a/dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp
+++ b/dviware/dvisvgm/src/optimizer/SVGOptimizer.cpp
@@ -2,7 +2,7 @@
** SVGOptimizer.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp b/dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp
index 809f1f497c..0da157fbbb 100644
--- a/dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp
+++ b/dviware/dvisvgm/src/optimizer/SVGOptimizer.hpp
@@ -2,7 +2,7 @@
** SVGOptimizer.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/TextSimplifier.cpp b/dviware/dvisvgm/src/optimizer/TextSimplifier.cpp
index 23e0e386df..b94ab9458e 100644
--- a/dviware/dvisvgm/src/optimizer/TextSimplifier.cpp
+++ b/dviware/dvisvgm/src/optimizer/TextSimplifier.cpp
@@ -2,7 +2,7 @@
** TextSimplifier.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/TextSimplifier.hpp b/dviware/dvisvgm/src/optimizer/TextSimplifier.hpp
index 86f44e5051..cfdd548e87 100644
--- a/dviware/dvisvgm/src/optimizer/TextSimplifier.hpp
+++ b/dviware/dvisvgm/src/optimizer/TextSimplifier.hpp
@@ -2,7 +2,7 @@
** TextSimplifier.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp b/dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp
index b9d4c3db59..461698b62a 100644
--- a/dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp
+++ b/dviware/dvisvgm/src/optimizer/TransformSimplifier.cpp
@@ -2,7 +2,7 @@
** TransformSimplifier.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -61,7 +61,7 @@ void TransformSimplifier::execute (XMLElement *context) {
/** Tries to incorporate the translation and scaling components of the 'transform' attribute
* of a given element into the positional and/or size attributes of that element. If successful,
- * the 'transform' attribute is removed.
+ * the 'transform' attribute is either removed or simplified to a scale() matrix.
* Currently, only 'image' and 'rect' elements are considered.
* @param[in] elem element to check
* @param[in] matrix matrix representing the 'transform' attribute of the element
@@ -72,17 +72,30 @@ bool TransformSimplifier::incorporateTransform (XMLElement *elem, const Matrix &
double ty = matrix.get(1, 2);
double sx = matrix.get(0, 0);
double sy = matrix.get(1, 1);
+ double x=0, y=0;
+
if (const char *xstr = elem->getAttributeValue("x"))
- tx += sx*strtod(xstr, nullptr);
+ x = strtod(xstr, nullptr);
if (const char *ystr = elem->getAttributeValue("y"))
- ty += sy*strtod(ystr, nullptr);
- if (const char *wstr = elem->getAttributeValue("width"))
- elem->addAttribute("width", sx*strtod(wstr, nullptr));
- if (const char *hstr = elem->getAttributeValue("height"))
- elem->addAttribute("height", sy*strtod(hstr, nullptr));
- elem->addAttribute("x", tx); // update x attribute
- elem->addAttribute("y", ty); // update x attribute
- elem->removeAttribute("transform");
+ y = strtod(ystr, nullptr);
+ // width and height attributes must not become negative. Hence, only apply the scaling
+ // values if they are non-negative. Otherwise, keep a scaling matrix
+ if (sx < 0 || sy < 0) {
+ x += (sx == 0 ? 0 : tx/sx);
+ y += (sy == 0 ? 0 : ty/sy);
+ elem->addAttribute("transform", "scale("+XMLString(sx)+","+XMLString(sy)+")");
+ }
+ else {
+ x = x*sx + tx;
+ y = y*sy + ty;
+ if (const char *wstr = elem->getAttributeValue("width"))
+ elem->addAttribute("width", sx*strtod(wstr, nullptr));
+ if (const char *hstr = elem->getAttributeValue("height"))
+ elem->addAttribute("height", sy*strtod(hstr, nullptr));
+ elem->removeAttribute("transform");
+ }
+ elem->addAttribute("x", x); // update x attribute
+ elem->addAttribute("y", y); // update y attribute
return true;
}
return false;
diff --git a/dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp b/dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp
index c4b6d9ee16..5d503635ba 100644
--- a/dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp
+++ b/dviware/dvisvgm/src/optimizer/TransformSimplifier.hpp
@@ -2,7 +2,7 @@
** TransformSimplifier.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp b/dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp
index 2135e285bb..be58bf70fd 100644
--- a/dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp
+++ b/dviware/dvisvgm/src/optimizer/WSNodeRemover.cpp
@@ -2,7 +2,7 @@
** WSNodeRemover.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp b/dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp
index c4fe7f989e..8c21ce2b6e 100644
--- a/dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp
+++ b/dviware/dvisvgm/src/optimizer/WSNodeRemover.hpp
@@ -2,7 +2,7 @@
** WSNodeRemover.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/options.dtd b/dviware/dvisvgm/src/options.dtd
index 7e29babc43..d2806badce 100644
--- a/dviware/dvisvgm/src/options.dtd
+++ b/dviware/dvisvgm/src/options.dtd
@@ -3,7 +3,7 @@
** options.dtd **
** **
** This file is part of dvisvgm - a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/options.xml b/dviware/dvisvgm/src/options.xml
index 27975f1591..b1911694dd 100644
--- a/dviware/dvisvgm/src/options.xml
+++ b/dviware/dvisvgm/src/options.xml
@@ -3,7 +3,7 @@
** options.xml **
** **
** This file is part of dvisvgm - a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -26,7 +26,7 @@
<usage>--eps [options] epsfile</usage>
<usage>--pdf [options] pdffile</usage>
<description>This program converts DVI files, as created by TeX/LaTeX, as well as\nEPS and PDF files to the XML-based scalable vector graphics format SVG.</description>
- <copyright>Copyright (C) 2005-2019 Martin Gieseking &lt;martin.gieseking@uos.de></copyright>
+ <copyright>Copyright (C) 2005-2020 Martin Gieseking &lt;martin.gieseking@uos.de></copyright>
</program>
<options>
<section title="Input options">
@@ -53,6 +53,10 @@
<arg type="string" name="size" default="min"/>
<description>set size of bounding box</description>
</option>
+ <option long="bitmap-format" short="B" if="!defined(DISABLE_GS)">
+ <arg type="string" name="fmt" default="jpeg"/>
+ <description>set format used to embed PS/EPS bitmaps</description>
+ </option>
<option long="clipjoin" short="j" if="!defined(DISABLE_GS)">
<description>compute intersection of clipping paths</description>
</option>
@@ -64,7 +68,7 @@
</option>
<option long="font-format" short="f" if="!defined(DISABLE_WOFF)">
<arg type="string" name="format" default="svg"/>
- <description>select file format of embedded fonts</description>
+ <description>set file format of embedded fonts</description>
</option>
<option long="grad-overlap" if="!defined(DISABLE_GS)">
<description>create overlapping color gradient segments</description>
diff --git a/dviware/dvisvgm/src/psdefs.cpp b/dviware/dvisvgm/src/psdefs.cpp
index 04abb6227d..9c5991217d 100644
--- a/dviware/dvisvgm/src/psdefs.cpp
+++ b/dviware/dvisvgm/src/psdefs.cpp
@@ -2,7 +2,7 @@
** psdefs.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -22,104 +22,132 @@
const char *PSInterpreter::PSDEFS =
"<</Install{matrix setmatrix}/HWResolution[72 72]/PageSize[10000 10000]/Imaging"
-"BBox null>>setpagedevice/@dodraw true store/@patcnt 0 store/@GD globaldict def"
-"/@SD systemdict def/@UD userdict def @GD/@nulldev false put true setglobal @SD"
-"/:save @SD/save get put @SD/:restore @SD/restore get put @SD/:gsave @SD/gsave "
-"get put @SD/:grestore @SD/grestore get put @SD/:grestoreall @SD/grestoreall ge"
-"t put @SD/:newpath @SD/newpath get put @SD/:stroke @SD/stroke get put @SD/:fil"
-"l @SD/fill get put @SD/:eofill @SD/eofill get put @SD/:clip @SD/clip get put @"
-"SD/:eoclip @SD/eoclip get put @SD/:charpath @SD/charpath get put @SD/:show @SD"
-"/show get put @SD/:stringwidth @SD/stringwidth get put @SD/:nulldevice @SD/nul"
-"ldevice get put @SD/.setopacityalpha known not{@SD/.setopacityalpha{pop}put}if"
-" @SD/.setshapealpha known not{@SD/.setshapealpha{pop}put}if @SD/.setblendmode "
-"known not{@SD/.setblendmode{pop}put}if @SD/prseq{-1 1{-1 roll =only( )print}fo"
-"r(\\n)print}put @SD/prcmd{( )exch(\\ndvi.)3{print}repeat prseq}put @SD/cvxall{"
-"{cvx}forall}put @SD/defpr{[exch[/copy @SD]cvxall 5 -1 roll dup 6 1 roll[/get/e"
-"xec]cvxall 6 -1 roll dup 7 1 roll 4 -1 roll dup 5 1 roll dup length string cvs"
-"/prcmd cvx]cvx def}put @SD/querypos{{currentpoint}stopped{$error/newerror fals"
-"e put}{2(querypos)prcmd}ifelse}put @SD/applyscalevals{1 0 dtransform exch dup "
-"mul exch dup mul add sqrt 0 1 dtransform exch dup mul exch dup mul add sqrt 1 "
-"0 dtransform dup mul exch dup dup mul 3 -1 roll add dup 0 eq{pop}{sqrt div}ife"
-"lse 3(applyscalevals)prcmd}put @SD/prpath{{2(moveto)prcmd}{2(lineto)prcmd}{6(c"
-"urveto)prcmd}{0(closepath)prcmd}pathforall}put @SD/nulldevice{@GD/@nulldev tru"
-"e put :nulldevice 1 1(setnulldevice)prcmd}put @SD/charpath{/@dodraw false stor"
-"e :charpath/@dodraw true store}put @SD/stringwidth{/@dodraw false store :strin"
-"gwidth/@dodraw true store}put @SD/show{@dodraw @GD/@nulldev get not and{dup :g"
-"save currentpoint 2{50 mul exch}repeat :newpath moveto 50 50/scale sysexec tru"
-"e charpath fill :grestore/@dodraw false store :show/@dodraw true store}{:show}"
-"ifelse}put @SD/varxyshow{exch dup type/arraytype eq{<</arr 3 -1 roll/prc 5 -1 "
-"roll/chr 1 string/idx 0>>begin{chr 0 3 -1 roll put :gsave chr show :grestore c"
-"urrentpoint prc moveto/idx idx 1 add store}forall end}{pop show}ifelse}put @SD"
-"/xyshow{{exch arr idx 2 mul get add exch arr idx 2 mul 1 add get add}varxyshow"
-"}put @SD/xshow{{exch arr idx get add exch}varxyshow}put @SD/yshow{{arr idx get"
-" add}varxyshow}put @SD/awidthshow{{1 string dup 0 5 index put :gsave show :gre"
-"store pop 0 rmoveto 3 index eq{4 index 4 index rmoveto}if 1 index 1 index rmov"
-"eto}exch cshow 5{pop}repeat}put @SD/widthshow{0 0 3 -1 roll pstack awidthshow}"
-"put @SD/ashow{0 0 0 6 3 roll awidthshow}put @SD/newpath{:newpath 1 1(newpath)p"
-"rcmd}put @SD/stroke{@dodraw @GD/@nulldev get not and{prcolor 0 1(newpath)prcmd"
-" prpath 0(stroke)prcmd :newpath}{:stroke}ifelse}put @SD/fill{@dodraw @GD/@null"
-"dev get not and{prcolor 0 1(newpath)prcmd prpath 0(fill)prcmd :newpath}{:fill}"
-"ifelse}put @SD/eofill{@dodraw @GD/@nulldev get not and{prcolor 0 1(newpath)prc"
-"md prpath 0(eofill)prcmd :newpath}{:eofill}ifelse}put @SD/clip{:clip @GD/@null"
-"dev get not{0 1(newpath)prcmd prpath 0(clip)prcmd}if}put @SD/eoclip{:eoclip @G"
-"D/@nulldev get not{0 1(newpath)prcmd prpath 0(eoclip)prcmd}}put @SD/shfill{beg"
-"in currentdict/ShadingType known currentdict/ColorSpace known and currentdict/"
-"DataSource known and currentdict/Function known not and ShadingType 4 ge and D"
-"ataSource type/arraytype eq and{<</DeviceGray 1/DeviceRGB 3/DeviceCMYK 4/bgkno"
-"wn currentdict/Background known/bbknown currentdict/BBox known>>begin currentd"
-"ict ColorSpace known{ShadingType ColorSpace load bgknown{1 Background aload po"
-"p}{0}ifelse bbknown{1 BBox aload pop}{0}ifelse ShadingType 5 eq{VerticesPerRow"
-"}if DataSource aload length 4 add bgknown{ColorSpace load add}if bbknown{4 add"
-"}if ShadingType 5 eq{1 add}if(shfill)prcmd}if end}if end}put/@rect{4 -2 roll m"
-"oveto exch dup 0 rlineto exch 0 exch rlineto neg 0 rlineto closepath}bind def/"
-"@rectcc{4 -2 roll moveto 2 copy 0 lt exch 0 lt xor{dup 0 exch rlineto exch 0 r"
-"lineto neg 0 exch rlineto}{exch dup 0 rlineto exch 0 exch rlineto neg 0 rlinet"
-"o}ifelse closepath}bind def @SD/rectclip{:newpath dup type/arraytype eq{aload "
-"length 4 idiv{@rectcc}repeat}{@rectcc}ifelse clip :newpath}put @SD/rectfill{gs"
-"ave :newpath dup type/arraytype eq{aload length 4 idiv{@rectcc}repeat}{@rectcc"
-"}ifelse fill grestore}put @SD/rectstroke{gsave :newpath dup type/arraytype eq{"
-"aload length 4 idiv{@rect}repeat}{@rect}ifelse stroke grestore}put false setgl"
-"obal @SD readonly pop/initclip 0 defpr/clippath 0 defpr/sysexec{@SD exch get e"
-"xec}def/adddot{dup length 1 add string dup 0 46 put dup 3 -1 roll 1 exch putin"
-"terval}def/setlinewidth{dup/setlinewidth sysexec 1(setlinewidth)prcmd}def/setl"
-"inecap 1 defpr/setlinejoin 1 defpr/setmiterlimit 1 defpr/setdash{mark 3 1 roll"
-" 2 copy/setdash sysexec exch aload length 1 add -1 roll counttomark(setdash)pr"
-"cmd pop}def/@setpagedevice{pop<<>>/setpagedevice sysexec matrix setmatrix newp"
-"ath 0(setpagedevice)prcmd}def/@checknulldev{@GD/@nulldev get{currentpagedevice"
-" maxlength 0 ne{@GD/@nulldev false put 0 1(setnulldevice)prcmd}if}if}def/prcol"
-"or{currentrgbcolor 3(setrgbcolor)prcmd}def/printgstate{@dodraw @GD/@nulldev ge"
-"t not and{matrix currentmatrix aload pop 6(setmatrix)prcmd applyscalevals curr"
-"entlinewidth 1(setlinewidth)prcmd currentlinecap 1(setlinecap)prcmd currentlin"
-"ejoin 1(setlinejoin)prcmd currentmiterlimit 1(setmiterlimit)prcmd currentrgbco"
-"lor 3(setrgbcolor)prcmd currentdash mark 3 1 roll exch aload length 1 add -1 r"
-"oll counttomark(setdash)prcmd pop}if}def/setgstate{/setgstate sysexec printgst"
-"ate}def/save{@UD begin/@saveID vmstatus pop pop def end :save @saveID 1(save)p"
-"rcmd}def/restore{:restore @checknulldev printgstate @UD/@saveID known{@UD begi"
-"n @saveID end}{0}ifelse 1(restore)prcmd}def/gsave 0 defpr/grestore{:grestore @"
-"checknulldev printgstate 0(grestore)prcmd}def/grestoreall{:grestoreall @checkn"
-"ulldev setstate 0(grestoreall)prcmd}def/rotate{dup type/arraytype ne @dodraw a"
-"nd{dup 1(rotate)prcmd}if/rotate sysexec applyscalevals}def/scale{dup type/arra"
-"ytype ne @dodraw and{2 copy 2(scale)prcmd}if/scale sysexec applyscalevals}def/"
-"translate{dup type/arraytype ne @dodraw and{2 copy 2(translate)prcmd}if/transl"
-"ate sysexec}def/setmatrix{dup/setmatrix sysexec @dodraw{aload pop 6(setmatrix)"
-"prcmd applyscalevals}{pop}ifelse}def/initmatrix{matrix setmatrix}def/concat{ma"
-"trix currentmatrix matrix concatmatrix setmatrix}def/makepattern{gsave<</mx 3 "
-"-1 roll>>begin dup/XUID[1000000 @patcnt]put mx/makepattern sysexec dup dup beg"
-"in PatternType @patcnt BBox aload pop XStep YStep PaintType mx aload pop 15(ma"
-"kepattern)prcmd :newpath matrix setmatrix PaintProc 0 1(makepattern)prcmd end/"
-"@patcnt @patcnt 1 add store end grestore}def/setpattern{begin PatternType 1 eq"
-"{PaintType 1 eq{XUID aload pop exch pop 1}{:gsave[currentcolorspace aload leng"
-"th -1 roll pop]setcolorspace/setcolor sysexec XUID aload pop exch pop currentr"
-"gbcolor :grestore 4}ifelse(setpattern)prcmd}{/setpattern sysexec}ifelse end}de"
-"f/setcolor{dup type/dicttype eq{setpattern}{/setcolor sysexec/currentrgbcolor "
-"sysexec setrgbcolor}ifelse}def/setgray 1 defpr/setcmykcolor 4 defpr/sethsbcolo"
-"r 3 defpr/setrgbcolor 3 defpr/.setopacityalpha{dup/.setopacityalpha sysexec 1("
-"setopacityalpha)prcmd}def/.setshapealpha{dup/.setshapealpha sysexec 1(setshape"
-"alpha)prcmd}def/.setblendmode{dup/.setblendmode sysexec<</Normal 0/Compatible "
-"0/Multiply 1/Screen 2/Overlay 3/SoftLight 4/HardLight 5/ColorDodge 6/ColorBurn"
-" 7/Darken 8/Lighten 9/Difference 10/Exclusion 11/Hue 12/Saturation 13/Color 14"
-"/Luminosity 15/CompatibleOverprint 16>>exch get 1(setblendmode)prcmd}def/@pdfp"
-"agecount{(r)file runpdfbegin pdfpagecount runpdfend}def/@pdfpagebox{(r)file ru"
-"npdfbegin dup dup 1 lt exch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget p"
-"op aload pop}ifelse runpdfend}def DELAYBIND{.bindnow}if ";
+"BBox null>>setpagedevice/@dodraw true store/@GD globaldict def/@SD systemdict "
+"def/@UD userdict def @GD/@nulldev false put @GD/@patcnt 0 put true setglobal @"
+"SD/:save @SD/save get put @SD/:restore @SD/restore get put @SD/:gsave @SD/gsav"
+"e get put @SD/:grestore @SD/grestore get put @SD/:grestoreall @SD/grestoreall "
+"get put @SD/:newpath @SD/newpath get put @SD/:stroke @SD/stroke get put @SD/:f"
+"ill @SD/fill get put @SD/:eofill @SD/eofill get put @SD/:clip @SD/clip get put"
+" @SD/:eoclip @SD/eoclip get put @SD/:charpath @SD/charpath get put @SD/:show @"
+"SD/show get put @SD/:stringwidth @SD/stringwidth get put @SD/:nulldevice @SD/n"
+"ulldevice get put @SD/:image @SD/image get put @SD/:colorimage @SD/colorimage "
+"get put @SD/.setopacityalpha known not{@SD/.setopacityalpha{pop}put}if @SD/.se"
+"tshapealpha known not{@SD/.setshapealpha{pop}put}if @SD/.setblendmode known no"
+"t{@SD/.setblendmode{pop}put}if @SD/prseq{-1 1{-1 roll =only( )print}for(\\n)pr"
+"int}put @SD/prcmd{( )exch(\\ndvi.)3{print}repeat prseq}put @SD/cvxall{{cvx}for"
+"all}put @SD/defpr{[exch[/copy @SD]cvxall 5 -1 roll dup 6 1 roll[/get/exec]cvxa"
+"ll 6 -1 roll dup 7 1 roll 4 -1 roll dup 5 1 roll dup length string cvs/prcmd c"
+"vx]cvx def}put @SD/querypos{{currentpoint}stopped{$error/newerror false put}{2"
+"(querypos)prcmd}ifelse}put @SD/applyscalevals{1 0 dtransform exch dup mul exch"
+" dup mul add sqrt 0 1 dtransform exch dup mul exch dup mul add sqrt 1 0 dtrans"
+"form dup mul exch dup dup mul 3 -1 roll add dup 0 eq{pop}{sqrt div}ifelse 3(ap"
+"plyscalevals)prcmd}put @SD/prpath{{2(moveto)prcmd}{2(lineto)prcmd}{6(curveto)p"
+"rcmd}{0(closepath)prcmd}pathforall}put @SD/nulldevice{@GD/@nulldev true put :n"
+"ulldevice 1 1(setnulldevice)prcmd}put @SD/charpath{/@dodraw false store :charp"
+"ath/@dodraw true store}put @SD/stringwidth{/@dodraw false store :stringwidth/@"
+"dodraw true store}put @SD/show{@dodraw @GD/@nulldev get not and{dup :gsave cur"
+"rentpoint 2{50 mul exch}repeat :newpath moveto 50 50/scale sysexec true charpa"
+"th fill :grestore/@dodraw false store :show/@dodraw true store}{:show}ifelse}p"
+"ut @SD/varxyshow{dup 0 ge{<</chr 3 -1 roll string/prc 5 -1 roll/arr 7 -1 roll/"
+"str 9 -1 roll/idx 0>>begin 0 chr length str length 1 sub{str exch chr length g"
+"etinterval/chr exch store :gsave chr show :grestore currentpoint prc moveto/id"
+"x idx 1 add store}for end}{pop pop show}ifelse}put @SD/xyshow{dup dup type/arr"
+"aytype eq exch length 0 gt and{dup length 2 idiv 2 index length exch idiv}{-1}"
+"ifelse{exch arr idx 2 mul get add exch arr idx 2 mul 1 add get add}exch varxys"
+"how}put @SD/xshow{dup dup type/arraytype eq exch length 0 gt and{dup length 2 "
+"index length exch idiv}{-1}ifelse{exch arr idx get add exch}exch varxyshow}put"
+" @SD/yshow{dup dup type/arraytype eq exch length 0 gt and{dup length 2 index l"
+"ength exch idiv}{-1}ifelse{arr idx get add}exch varxyshow}put @SD/awidthshow{{"
+"1 string dup 0 5 index put :gsave show :grestore pop 0 rmoveto 3 index eq{4 in"
+"dex 4 index rmoveto}if 1 index 1 index rmoveto}exch cshow 5{pop}repeat}put @SD"
+"/widthshow{0 0 3 -1 roll awidthshow}put @SD/ashow{0 0 0 6 3 roll awidthshow}pu"
+"t @SD/newpath{:newpath 1 1(newpath)prcmd}put @SD/stroke{@dodraw @GD/@nulldev g"
+"et not and{prcolor 0 1(newpath)prcmd prpath 0(stroke)prcmd :newpath}{:stroke}i"
+"felse}put @SD/fill{@dodraw @GD/@nulldev get not and{prcolor 0 1(newpath)prcmd "
+"prpath 0(fill)prcmd :newpath}{:fill}ifelse}put @SD/eofill{@dodraw @GD/@nulldev"
+" get not and{prcolor 0 1(newpath)prcmd prpath 0(eofill)prcmd :newpath}{:eofill"
+"}ifelse}put @SD/clip{:clip @GD/@nulldev get not{0 1(newpath)prcmd prpath 0(cli"
+"p)prcmd}if}put @SD/eoclip{:eoclip @GD/@nulldev get not{0 1(newpath)prcmd prpat"
+"h 0(eoclip)prcmd}}put @SD/shfill{begin currentdict/ShadingType known currentdi"
+"ct/ColorSpace known and currentdict/DataSource known and currentdict/Function "
+"known not and ShadingType 4 ge{DataSource type/arraytype eq{<</DeviceGray 1/De"
+"viceRGB 3/DeviceCMYK 4/bgknown currentdict/Background known/bbknown currentdic"
+"t/BBox known>>begin currentdict ColorSpace known{ShadingType ColorSpace load b"
+"gknown{1 Background aload pop}{0}ifelse bbknown{1 BBox aload pop}{0}ifelse Sha"
+"dingType 5 eq{VerticesPerRow}if DataSource aload length 4 add bgknown{ColorSpa"
+"ce load add}if bbknown{4 add}if ShadingType 5 eq{1 add}if(shfill)prcmd}if end}"
+"if}if end}put @SD/image{dup type/dicttype eq{dup}{<</Width 6 index/Height 7 in"
+"dex/colorimg false>>}ifelse @execimg}put @SD/colorimage{<<2 index{/Width 2 ind"
+"ex 8 add index/Height 4 index 9 add index}{/Width 8 index/Height 9 index}ifels"
+"e/colorimg true>>@execimg}put/@imgbase(./)def/@imgdevice(jpeg)def/@execimg{@GD"
+"/@imgcnt 2 copy .knownget{1 add}{1}ifelse put begin<</imgdev null/imgid @GD/@i"
+"mgcnt get/ispng @imgdevice 0 3 getinterval(png)eq dup/suffix exch{(.png)}{(.jp"
+"g)}ifelse/colorimg currentdict/colorimg .knownget dup{pop}if/colordev 1 index "
+"currentcolorspace dup length 1 ne exch 0 get/DeviceGray ne or or>>begin @imgde"
+"vice(png)ne @imgdevice(jpeg)ne and{@imgdevice cvn}{colordev{ispng{/png16m}{/jp"
+"eg}ifelse}{ispng{/pnggray}{/jpeggray}ifelse}ifelse}ifelse dup devicedict exch "
+"known{:gsave/imgdev exch finddevice def mark/OutputFile @imgbase imgid 20 stri"
+"ng cvs strconcat suffix strconcat/PageSize[Width Height]/UseFastColor true isp"
+"ng{@imgdevice(pngmonod)eq{/MinFeatureSize where{pop/MinFeatureSize MinFeatureS"
+"ize}if}if}{/JPEGQ where{pop/JPEGQ JPEGQ}if}ifelse imgdev putdeviceprops setdev"
+"ice[Width 0 0 Height neg 0 Height]/setmatrix sysexec colorimg{:colorimage}{:im"
+"age}ifelse/copypage sysexec mark/OutputFile()imgdev putdeviceprops pop :gresto"
+"re imgid Width Height 3(image)prcmd}{pop colorimg{:colorimage}{:image}ifelse}i"
+"felse end end}def/@rect{4 -2 roll moveto exch dup 0 rlineto exch 0 exch rlinet"
+"o neg 0 rlineto closepath}bind def/@rectcc{4 -2 roll moveto 2 copy 0 lt exch 0"
+" lt xor{dup 0 exch rlineto exch 0 rlineto neg 0 exch rlineto}{exch dup 0 rline"
+"to exch 0 exch rlineto neg 0 rlineto}ifelse closepath}bind def @SD/rectclip{:n"
+"ewpath dup type/arraytype eq{aload length 4 idiv{@rectcc}repeat}{@rectcc}ifels"
+"e clip :newpath}put @SD/rectfill{:gsave :newpath dup type/arraytype eq{aload l"
+"ength 4 idiv{@rectcc}repeat}{@rectcc}ifelse fill :grestore}put @SD/rectstroke{"
+"gsave :newpath dup type/arraytype eq{aload length 4 idiv{@rect}repeat}{@rect}i"
+"felse stroke grestore}put false setglobal @SD readonly pop/initclip 0 defpr/cl"
+"ippath 0 defpr/sysexec{@SD exch get exec}def/adddot{dup length 1 add string du"
+"p 0 46 put dup 3 -1 roll 1 exch putinterval}def/setlinewidth{dup/setlinewidth "
+"sysexec 1(setlinewidth)prcmd}def/setlinecap 1 defpr/setlinejoin 1 defpr/setmit"
+"erlimit 1 defpr/setdash{mark 3 1 roll 2 copy/setdash sysexec exch aload length"
+" 1 add -1 roll counttomark(setdash)prcmd pop}def/@setpagedevice{pop<<>>/setpag"
+"edevice sysexec matrix setmatrix newpath 0(setpagedevice)prcmd}def/@checknulld"
+"ev{@GD/@nulldev get{currentpagedevice maxlength 0 ne{@GD/@nulldev false put 0 "
+"1(setnulldevice)prcmd}if}if}def/prcolor{currentcolorspace @setcolorspace curre"
+"ntrgbcolor 3(setrgbcolor)prcmd}def/printgstate{@dodraw @GD/@nulldev get not an"
+"d{matrix currentmatrix aload pop 6(setmatrix)prcmd applyscalevals currentlinew"
+"idth 1(setlinewidth)prcmd currentlinecap 1(setlinecap)prcmd currentlinejoin 1("
+"setlinejoin)prcmd currentmiterlimit 1(setmiterlimit)prcmd prcolor currentdash "
+"mark 3 1 roll exch aload length 1 add -1 roll counttomark(setdash)prcmd pop}if"
+"}def/strconcat{exch dup length 2 index length add string dup dup 4 2 roll copy"
+" length 4 -1 roll putinterval}def/setgstate{/setgstate sysexec printgstate}def"
+"/save{@UD begin/@saveID vmstatus pop pop def end :save @saveID 1(save)prcmd}de"
+"f/restore{:restore @checknulldev printgstate @UD/@saveID known{@UD begin @save"
+"ID end}{0}ifelse 1(restore)prcmd}def/gsave 0 defpr/grestore{:grestore @checknu"
+"lldev printgstate 0(grestore)prcmd}def/grestoreall{:grestoreall @checknulldev "
+"setstate 0(grestoreall)prcmd}def/rotate{dup type/arraytype ne @dodraw and{dup "
+"1(rotate)prcmd}if/rotate sysexec applyscalevals}def/scale{dup type/arraytype n"
+"e @dodraw and{2 copy 2(scale)prcmd}if/scale sysexec applyscalevals}def/transla"
+"te{dup type/arraytype ne @dodraw and{2 copy 2(translate)prcmd}if/translate sys"
+"exec}def/setmatrix{dup/setmatrix sysexec @dodraw{aload pop 6(setmatrix)prcmd a"
+"pplyscalevals}{pop}ifelse}def/initmatrix{matrix setmatrix}def/concat{matrix cu"
+"rrentmatrix matrix concatmatrix setmatrix}def/makepattern{gsave<</mx 3 -1 roll"
+">>begin<</XUID[1000000 @patcnt]>>copy mx/makepattern sysexec dup begin Pattern"
+"Type 2 lt{PatternType @patcnt BBox aload pop XStep YStep PaintType mx aload po"
+"p 15(makepattern)prcmd :newpath matrix setmatrix dup PaintProc 0 1(makepattern"
+")prcmd @GD/@patcnt @patcnt 1 add put}if end end grestore}def/setpattern{begin "
+"PatternType 1 eq{PaintType 1 eq{XUID aload pop exch pop 1}{:gsave[currentcolor"
+"space aload length -1 roll pop]/setcolorspace sysexec/setcolor sysexec XUID al"
+"oad pop exch pop currentrgbcolor :grestore 4}ifelse(setpattern)prcmd currentco"
+"lorspace 0 get/Pattern ne{[/Pattern currentcolorspace]/setcolorspace sysexec}i"
+"f currentcolorspace @setcolorspace}{/setpattern sysexec}ifelse end}def/setcolo"
+"r{dup type/dicttype eq{setpattern}{/setcolor sysexec/currentrgbcolor sysexec s"
+"etrgbcolor}ifelse}def/setcolorspace{dup/setcolorspace sysexec @setcolorspace}d"
+"ef/@setcolorspace{dup type/arraytype eq{0 get}if/Pattern eq{1}{0}ifelse 1(setc"
+"olorspace)prcmd}def/setgray 1 defpr/setcmykcolor 4 defpr/sethsbcolor 3 defpr/s"
+"etrgbcolor 3 defpr/.setopacityalpha{dup/.setopacityalpha sysexec 1(setopacitya"
+"lpha)prcmd}def/.setshapealpha{dup/.setshapealpha sysexec 1(setshapealpha)prcmd"
+"}def/.setblendmode{dup/.setblendmode sysexec<</Normal 0/Compatible 0/Multiply "
+"1/Screen 2/Overlay 3/SoftLight 4/HardLight 5/ColorDodge 6/ColorBurn 7/Darken 8"
+"/Lighten 9/Difference 10/Exclusion 11/Hue 12/Saturation 13/Color 14/Luminosity"
+" 15/CompatibleOverprint 16>>exch get 1(setblendmode)prcmd}def/@pdfpagecount{(r"
+")file runpdfbegin pdfpagecount runpdfend}def/@pdfpagebox{(r)file runpdfbegin d"
+"up dup 1 lt exch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget pop aload po"
+"p}ifelse runpdfend}def DELAYBIND{.bindnow}if ";
diff --git a/dviware/dvisvgm/src/utility.cpp b/dviware/dvisvgm/src/utility.cpp
index f1ae59ec08..8fe31fcf2d 100644
--- a/dviware/dvisvgm/src/utility.cpp
+++ b/dviware/dvisvgm/src/utility.cpp
@@ -2,7 +2,7 @@
** utility.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/utility.hpp b/dviware/dvisvgm/src/utility.hpp
index 7127280284..7ad3bc8d69 100644
--- a/dviware/dvisvgm/src/utility.hpp
+++ b/dviware/dvisvgm/src/utility.hpp
@@ -2,7 +2,7 @@
** utility.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -88,10 +88,12 @@ std::vector<uint8_t> bytes (T val, int n=0) {
* the result to the range starting at 'dest'.
* @param[in] first initial position of the range to be encoded
* @param[in] last final position of the range to be encoded
- * @param[in] dest first position of the destination range */
+ * @param[in] dest first position of the destination range
+ * @param[in] wrap if > 0, add a newline after the given number of characters written */
template <typename InputIterator, typename OutputIterator>
-void base64_copy (InputIterator first, InputIterator last, OutputIterator dest) {
+void base64_copy (InputIterator first, InputIterator last, OutputIterator dest, int wrap=0) {
static const char *base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ int count=0;
while (first != last) {
int padding = 0;
unsigned char c0 = *first++, c1=0, c2=0;
@@ -106,15 +108,29 @@ void base64_copy (InputIterator first, InputIterator last, OutputIterator dest)
}
uint32_t n = (c0 << 16) | (c1 << 8) | c2;
for (int i=0; i <= 3-padding; i++) {
+ if (wrap > 0 && ++count > wrap) {
+ count = 1;
+ *dest++ = '\n';
+ }
*dest++ = base64_chars[(n >> 18) & 0x3f];
n <<= 6;
}
- while (padding--)
+ while (padding--) {
+ if (wrap > 0 && ++count > wrap) {
+ count = 1;
+ *dest++ = '\n';
+ }
*dest++ = '=';
+ }
}
}
+inline void base64_copy (std::istream &is, std::ostream &os, int wrap=0) {
+ base64_copy(std::istreambuf_iterator<char>(is), std::istreambuf_iterator<char>(), std::ostreambuf_iterator<char>(os), wrap);
+}
+
+
/** Simple implementation mimicking std::make_unique introduced in C++14.
* Constructs an object of class T on the heap and returns a unique_ptr<T> to it.
* @param[in] args arguments forwarded to an constructor of T */
diff --git a/dviware/dvisvgm/src/version.hpp.in b/dviware/dvisvgm/src/version.hpp.in
index efbe631d5b..20ba32bbd5 100644
--- a/dviware/dvisvgm/src/version.hpp.in
+++ b/dviware/dvisvgm/src/version.hpp.in
@@ -2,7 +2,7 @@
** version.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/src/windows.hpp b/dviware/dvisvgm/src/windows.hpp
index e548ee099a..114420c3d5 100644
--- a/dviware/dvisvgm/src/windows.hpp
+++ b/dviware/dvisvgm/src/windows.hpp
@@ -2,7 +2,7 @@
** windows.hpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/BezierTest.cpp b/dviware/dvisvgm/tests/BezierTest.cpp
index 0c6ae70074..e03e4670fe 100644
--- a/dviware/dvisvgm/tests/BezierTest.cpp
+++ b/dviware/dvisvgm/tests/BezierTest.cpp
@@ -2,7 +2,7 @@
** BezierTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/BitmapTest.cpp b/dviware/dvisvgm/tests/BitmapTest.cpp
index 8a93519186..7c12d80b35 100644
--- a/dviware/dvisvgm/tests/BitmapTest.cpp
+++ b/dviware/dvisvgm/tests/BitmapTest.cpp
@@ -2,7 +2,7 @@
** BitmapTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/BoundingBoxTest.cpp b/dviware/dvisvgm/tests/BoundingBoxTest.cpp
index 31d23fe571..417080b5be 100644
--- a/dviware/dvisvgm/tests/BoundingBoxTest.cpp
+++ b/dviware/dvisvgm/tests/BoundingBoxTest.cpp
@@ -2,7 +2,7 @@
** BoundingBoxTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/CMapManagerTest.cpp b/dviware/dvisvgm/tests/CMapManagerTest.cpp
index 980eb70d91..5e4a98b9e7 100644
--- a/dviware/dvisvgm/tests/CMapManagerTest.cpp
+++ b/dviware/dvisvgm/tests/CMapManagerTest.cpp
@@ -2,7 +2,7 @@
** CMapManagerTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/CMapReaderTest.cpp b/dviware/dvisvgm/tests/CMapReaderTest.cpp
index 7e64d6d4e5..28df86bb41 100644
--- a/dviware/dvisvgm/tests/CMapReaderTest.cpp
+++ b/dviware/dvisvgm/tests/CMapReaderTest.cpp
@@ -2,7 +2,7 @@
** CMapReaderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/CMapTest.cpp b/dviware/dvisvgm/tests/CMapTest.cpp
index e18431f648..68a216a898 100644
--- a/dviware/dvisvgm/tests/CMapTest.cpp
+++ b/dviware/dvisvgm/tests/CMapTest.cpp
@@ -2,7 +2,7 @@
** CMapTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/CalculatorTest.cpp b/dviware/dvisvgm/tests/CalculatorTest.cpp
index a82b8c6955..28ebf342b8 100644
--- a/dviware/dvisvgm/tests/CalculatorTest.cpp
+++ b/dviware/dvisvgm/tests/CalculatorTest.cpp
@@ -2,7 +2,7 @@
** CalculatorTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/ColorSpecialTest.cpp b/dviware/dvisvgm/tests/ColorSpecialTest.cpp
index a7c2369afc..f05393a61a 100644
--- a/dviware/dvisvgm/tests/ColorSpecialTest.cpp
+++ b/dviware/dvisvgm/tests/ColorSpecialTest.cpp
@@ -2,7 +2,7 @@
** ColorSpecialTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/ColorTest.cpp b/dviware/dvisvgm/tests/ColorTest.cpp
index 36acfe4a16..c82d384fae 100644
--- a/dviware/dvisvgm/tests/ColorTest.cpp
+++ b/dviware/dvisvgm/tests/ColorTest.cpp
@@ -2,7 +2,7 @@
** ColorTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/CommandLineTest.cpp b/dviware/dvisvgm/tests/CommandLineTest.cpp
index 5e10af8432..ad7b0768c2 100644
--- a/dviware/dvisvgm/tests/CommandLineTest.cpp
+++ b/dviware/dvisvgm/tests/CommandLineTest.cpp
@@ -2,7 +2,7 @@
** CommandLineTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/DVIReaderTest.cpp b/dviware/dvisvgm/tests/DVIReaderTest.cpp
index 572c1f8397..e5b0ef8dc0 100644
--- a/dviware/dvisvgm/tests/DVIReaderTest.cpp
+++ b/dviware/dvisvgm/tests/DVIReaderTest.cpp
@@ -2,7 +2,7 @@
** DVIReaderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/DependencyGraphTest.cpp b/dviware/dvisvgm/tests/DependencyGraphTest.cpp
index fdf788e9d6..866d505864 100644
--- a/dviware/dvisvgm/tests/DependencyGraphTest.cpp
+++ b/dviware/dvisvgm/tests/DependencyGraphTest.cpp
@@ -2,7 +2,7 @@
** DependencyGraphTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/DirectoryTest.cpp b/dviware/dvisvgm/tests/DirectoryTest.cpp
index 848b3b710f..b610737930 100644
--- a/dviware/dvisvgm/tests/DirectoryTest.cpp
+++ b/dviware/dvisvgm/tests/DirectoryTest.cpp
@@ -2,7 +2,7 @@
** DirectoryTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp b/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
index 4b4cdb6d42..829b4ca5ad 100644
--- a/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
+++ b/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
@@ -2,7 +2,7 @@
** DvisvgmSpecialTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/EllipticalArcTest.cpp b/dviware/dvisvgm/tests/EllipticalArcTest.cpp
index 127f7b08e3..4bf4977cca 100644
--- a/dviware/dvisvgm/tests/EllipticalArcTest.cpp
+++ b/dviware/dvisvgm/tests/EllipticalArcTest.cpp
@@ -2,7 +2,7 @@
** EllipticalArcTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/EmSpecialTest.cpp b/dviware/dvisvgm/tests/EmSpecialTest.cpp
index 1a14e9e5f6..00cc10f73c 100644
--- a/dviware/dvisvgm/tests/EmSpecialTest.cpp
+++ b/dviware/dvisvgm/tests/EmSpecialTest.cpp
@@ -2,7 +2,7 @@
** EmSpecialTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/FileFinderTest.cpp b/dviware/dvisvgm/tests/FileFinderTest.cpp
index 0ce1085fbc..7ea9bce627 100644
--- a/dviware/dvisvgm/tests/FileFinderTest.cpp
+++ b/dviware/dvisvgm/tests/FileFinderTest.cpp
@@ -2,7 +2,7 @@
** FileFinderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/FilePathTest.cpp b/dviware/dvisvgm/tests/FilePathTest.cpp
index 6cce81ef43..d5b6f67d4b 100644
--- a/dviware/dvisvgm/tests/FilePathTest.cpp
+++ b/dviware/dvisvgm/tests/FilePathTest.cpp
@@ -2,7 +2,7 @@
** FilePathTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -77,6 +77,9 @@ TEST(FilePathTest, file1) {
fp.suffix("new");
ASSERT_EQ(fp.suffix(), "new");
ASSERT_EQ(fp.relative("/a/b/x/y"), "../../c/d/f.new");
+ fp.suffix("");
+ ASSERT_EQ(fp.suffix(), "");
+ ASSERT_EQ(fp.relative("/a/b/x/y"), "../../c/d/f");
}
diff --git a/dviware/dvisvgm/tests/FileSystemTest.cpp b/dviware/dvisvgm/tests/FileSystemTest.cpp
index 0c8597f02c..e5acd22b73 100644
--- a/dviware/dvisvgm/tests/FileSystemTest.cpp
+++ b/dviware/dvisvgm/tests/FileSystemTest.cpp
@@ -2,7 +2,7 @@
** FileSystemTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/FontCacheTest.cpp b/dviware/dvisvgm/tests/FontCacheTest.cpp
index d7928b5bb8..d0e05be49a 100644
--- a/dviware/dvisvgm/tests/FontCacheTest.cpp
+++ b/dviware/dvisvgm/tests/FontCacheTest.cpp
@@ -2,7 +2,7 @@
** FontCacheTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/FontManagerTest.cpp b/dviware/dvisvgm/tests/FontManagerTest.cpp
index 869b7b7305..2ddb5b1064 100644
--- a/dviware/dvisvgm/tests/FontManagerTest.cpp
+++ b/dviware/dvisvgm/tests/FontManagerTest.cpp
@@ -2,7 +2,7 @@
** FontManagerTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/FontMapTest.cpp b/dviware/dvisvgm/tests/FontMapTest.cpp
index 5d4158c554..f73dfe39bd 100644
--- a/dviware/dvisvgm/tests/FontMapTest.cpp
+++ b/dviware/dvisvgm/tests/FontMapTest.cpp
@@ -2,7 +2,7 @@
** FontMapTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp b/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp
index 060e7cc824..71c08ee8e5 100644
--- a/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp
+++ b/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp
@@ -2,7 +2,7 @@
** GFGlyphTracerTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/GFReaderTest.cpp b/dviware/dvisvgm/tests/GFReaderTest.cpp
index 2387d28c3a..ac582dcb29 100644
--- a/dviware/dvisvgm/tests/GFReaderTest.cpp
+++ b/dviware/dvisvgm/tests/GFReaderTest.cpp
@@ -2,7 +2,7 @@
** GFReaderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/GhostscriptTest.cpp b/dviware/dvisvgm/tests/GhostscriptTest.cpp
index 180dbd558a..909fc80f6a 100644
--- a/dviware/dvisvgm/tests/GhostscriptTest.cpp
+++ b/dviware/dvisvgm/tests/GhostscriptTest.cpp
@@ -2,7 +2,7 @@
** GhostscriptTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/GraphicsPathTest.cpp b/dviware/dvisvgm/tests/GraphicsPathTest.cpp
index 92420f653e..a6af6cdc77 100644
--- a/dviware/dvisvgm/tests/GraphicsPathTest.cpp
+++ b/dviware/dvisvgm/tests/GraphicsPathTest.cpp
@@ -2,7 +2,7 @@
** GraphicsPathTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -109,8 +109,7 @@ TEST(GraphicsPathTest, computeBBox) {
path.cubicto(5,5,30,10,90,70);
path.lineto(20,30);
path.closepath();
- BoundingBox bbox;
- path.computeBBox(bbox);
+ BoundingBox bbox = path.computeBBox();
EXPECT_EQ(bbox, BoundingBox(5, 5, 100, 100));
}
diff --git a/dviware/dvisvgm/tests/HashFunctionTest.cpp b/dviware/dvisvgm/tests/HashFunctionTest.cpp
index 64559c5aab..6b287014df 100644
--- a/dviware/dvisvgm/tests/HashFunctionTest.cpp
+++ b/dviware/dvisvgm/tests/HashFunctionTest.cpp
@@ -2,7 +2,7 @@
** HashFunctionTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -75,13 +75,13 @@ TEST(HashFunctionTest, xxh128) {
XXH128HashFunction xxh128;
ASSERT_EQ(xxh128.digestSize(), 16);
xxh128.update("0123456789");
- EXPECT_EQ(xxh128.digestString(), "942eb242912d99ecb1844fcc57198e3a");
+ EXPECT_EQ(xxh128.digestString(), "e353667619ec664b49655fc9692165fb");
xxh128.update("abcdefghij");
- EXPECT_EQ(xxh128.digestString(), "f37bc26b7087c656f0345fdf02a75bc4");
+ EXPECT_EQ(xxh128.digestString(), "5f64782bdc987c162389e97fd11aed64");
xxh128.reset();
xxh128.update("0123456789");
- EXPECT_EQ(xxh128.digestString(), "942eb242912d99ecb1844fcc57198e3a");
- vector<uint8_t> bytes = {0x94, 0x2e, 0xb2, 0x42, 0x91, 0x2d, 0x99, 0xec, 0xb1, 0x84, 0x4f, 0xcc, 0x57, 0x19, 0x8e, 0x3a};
+ EXPECT_EQ(xxh128.digestString(), "e353667619ec664b49655fc9692165fb");
+ vector<uint8_t> bytes = {0xe3, 0x53, 0x66, 0x76, 0x19, 0xec, 0x66, 0x4b, 0x49, 0x65, 0x5F, 0xc9, 0x69, 0x21, 0x65, 0xfb};
EXPECT_EQ(xxh128.digestValue(), bytes);
}
#endif
@@ -128,11 +128,11 @@ TEST(HashFunctionTest, createXXH128) {
auto hashfunc = HashFunction::create("xxh128");
ASSERT_TRUE(dynamic_cast<XXH128HashFunction*>(hashfunc.get()) != nullptr);
hashfunc->update("0123456789");
- EXPECT_EQ(hashfunc->digestString(), "942eb242912d99ecb1844fcc57198e3a");
+ EXPECT_EQ(hashfunc->digestString(), "e353667619ec664b49655fc9692165fb");
hashfunc = HashFunction::create("xxh128", "0123456789");
ASSERT_TRUE(dynamic_cast<XXH128HashFunction*>(hashfunc.get()) != nullptr);
- EXPECT_EQ(hashfunc->digestString(), "942eb242912d99ecb1844fcc57198e3a");
+ EXPECT_EQ(hashfunc->digestString(), "e353667619ec664b49655fc9692165fb");
}
#endif
diff --git a/dviware/dvisvgm/tests/JFMReaderTest.cpp b/dviware/dvisvgm/tests/JFMReaderTest.cpp
index 6259325f54..b82d00febf 100644
--- a/dviware/dvisvgm/tests/JFMReaderTest.cpp
+++ b/dviware/dvisvgm/tests/JFMReaderTest.cpp
@@ -2,7 +2,7 @@
** JFMReaderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/LengthTest.cpp b/dviware/dvisvgm/tests/LengthTest.cpp
index 83da5d4766..f6a5bca573 100644
--- a/dviware/dvisvgm/tests/LengthTest.cpp
+++ b/dviware/dvisvgm/tests/LengthTest.cpp
@@ -2,7 +2,7 @@
** LengthTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/Makefile.am b/dviware/dvisvgm/tests/Makefile.am
index 002e7e82bf..438a06b02b 100644
--- a/dviware/dvisvgm/tests/Makefile.am
+++ b/dviware/dvisvgm/tests/Makefile.am
@@ -1,5 +1,5 @@
## This file is part of dvisvgm
-## Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
diff --git a/dviware/dvisvgm/tests/MapLineTest.cpp b/dviware/dvisvgm/tests/MapLineTest.cpp
index 7364f495b8..2d25c914f6 100644
--- a/dviware/dvisvgm/tests/MapLineTest.cpp
+++ b/dviware/dvisvgm/tests/MapLineTest.cpp
@@ -2,7 +2,7 @@
** MapLineTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/MatrixTest.cpp b/dviware/dvisvgm/tests/MatrixTest.cpp
index 62eb6a1805..2858c66aa6 100644
--- a/dviware/dvisvgm/tests/MatrixTest.cpp
+++ b/dviware/dvisvgm/tests/MatrixTest.cpp
@@ -2,7 +2,7 @@
** MatrixTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -207,6 +207,8 @@ TEST(MatrixTest, invert) {
for (int i=0; i < 3; ++i)
for (int j=0; j < 3; ++j)
EXPECT_DOUBLE_EQ(m2.get(i,j), m3.get(i,j));
+ Matrix m4{0};
+ EXPECT_THROW(m4.invert(), exception);
}
diff --git a/dviware/dvisvgm/tests/MessageExceptionTest.cpp b/dviware/dvisvgm/tests/MessageExceptionTest.cpp
index bff72088a2..706921c223 100644
--- a/dviware/dvisvgm/tests/MessageExceptionTest.cpp
+++ b/dviware/dvisvgm/tests/MessageExceptionTest.cpp
@@ -2,7 +2,7 @@
** MessageExceptionTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/PDFParserTest.cpp b/dviware/dvisvgm/tests/PDFParserTest.cpp
index 58e879c7e0..868b04de97 100644
--- a/dviware/dvisvgm/tests/PDFParserTest.cpp
+++ b/dviware/dvisvgm/tests/PDFParserTest.cpp
@@ -2,7 +2,7 @@
** PDFParserTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/PSInterpreterTest.cpp b/dviware/dvisvgm/tests/PSInterpreterTest.cpp
index 629f8d753b..cf8f772e06 100644
--- a/dviware/dvisvgm/tests/PSInterpreterTest.cpp
+++ b/dviware/dvisvgm/tests/PSInterpreterTest.cpp
@@ -2,7 +2,7 @@
** PSInterpreterTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -38,7 +38,8 @@ class PSTestActions : public PSActions {
void fill (vector<double> &p) override {print("fill", p);}
void gsave (vector<double> &p) override {print("gsave", p);}
void grestore (vector<double> &p) override {print("grestore", p);}
- void grestoreall(std::vector<double> &p) override {print("grestoreall", p);}
+ void grestoreall (std::vector<double> &p) override{print("grestoreall", p);}
+ void image (std::vector<double> &p) override {print("image", p);}
void initclip (vector<double> &p) override {print("initclip", p);}
void lineto (vector<double> &p) override {print("lineto", p);}
void moveto (vector<double> &p) override {print("moveto", p);}
@@ -52,6 +53,7 @@ class PSTestActions : public PSActions {
void save(std::vector<double> &p) override {print("save", p);}
void scale (vector<double> &p) override {print("scale", p);}
void setblendmode (vector<double> &p) override {print("setblendmode", p);}
+ void setcolorspace (vector<double> &p) override {print("setcolorspace", p);}
void setcmykcolor (vector<double> &p) override {print("setcmykcolor", p);}
void setdash (vector<double> &p) override {print("setdash", p);}
void setgray (vector<double> &p) override {print("setgray", p);}
@@ -102,7 +104,7 @@ TEST(PSInterpreterTest, gsave_grestore) {
actions.clear();
psi.execute("grestore ");
- EXPECT_EQ(actions.result(), "setmatrix 1 0 0 1 0 0;applyscalevals 1 1 1;setlinewidth 1;setlinecap 0;setlinejoin 0;setmiterlimit 10;setrgbcolor 0 0 0;setdash 0;grestore;");
+ EXPECT_EQ(actions.result(), "setmatrix 1 0 0 1 0 0;applyscalevals 1 1 1;setlinewidth 1;setlinecap 0;setlinejoin 0;setmiterlimit 10;setcolorspace 0;setrgbcolor 0 0 0;setdash 0;grestore;");
actions.clear();
psi.execute("1 setlinecap 5 setmiterlimit 0 1 0 setrgbcolor gsave 0 setlinecap 10 setmiterlimit ");
@@ -110,7 +112,7 @@ TEST(PSInterpreterTest, gsave_grestore) {
actions.clear();
psi.execute("grestore ");
- EXPECT_EQ(actions.result(), "setmatrix 1 0 0 1 0 0;applyscalevals 1 1 1;setlinewidth 1;setlinecap 1;setlinejoin 0;setmiterlimit 5;setrgbcolor 0 1 0;setdash 0;grestore;");
+ EXPECT_EQ(actions.result(), "setmatrix 1 0 0 1 0 0;applyscalevals 1 1 1;setlinewidth 1;setlinecap 1;setlinejoin 0;setmiterlimit 5;setcolorspace 0;setrgbcolor 0 1 0;setdash 0;grestore;");
}
@@ -118,11 +120,11 @@ TEST(PSInterpreterTest, stroke_fill) {
PSTestActions actions;
PSInterpreter psi(&actions);
psi.execute("0 0 moveto 10 10 lineto 0 10 lineto closepath stroke ");
- EXPECT_EQ(actions.result(), "setrgbcolor 0 0 0;newpath 0;moveto 0 0;lineto 10 10;lineto 0 10;closepath;stroke;");
+ EXPECT_EQ(actions.result(), "setcolorspace 0;setrgbcolor 0 0 0;newpath 0;moveto 0 0;lineto 10 10;lineto 0 10;closepath;stroke;");
actions.clear();
psi.execute("0 0 moveto 10 10 lineto 0 10 lineto closepath fill ");
- EXPECT_EQ(actions.result(), "setrgbcolor 0 0 0;newpath 0;moveto 0 0;lineto 10 10;lineto 0 10;closepath;fill;");
+ EXPECT_EQ(actions.result(), "setcolorspace 0;setrgbcolor 0 0 0;newpath 0;moveto 0 0;lineto 10 10;lineto 0 10;closepath;fill;");
}
diff --git a/dviware/dvisvgm/tests/PageRagesTest.cpp b/dviware/dvisvgm/tests/PageRagesTest.cpp
index 7be21c6e40..60b6eb77ab 100644
--- a/dviware/dvisvgm/tests/PageRagesTest.cpp
+++ b/dviware/dvisvgm/tests/PageRagesTest.cpp
@@ -2,7 +2,7 @@
** PageRagesTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/PageSizeTest.cpp b/dviware/dvisvgm/tests/PageSizeTest.cpp
index 9b7aa2c2dc..be9a25ec16 100644
--- a/dviware/dvisvgm/tests/PageSizeTest.cpp
+++ b/dviware/dvisvgm/tests/PageSizeTest.cpp
@@ -2,7 +2,7 @@
** PageSizeTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/PairTest.cpp b/dviware/dvisvgm/tests/PairTest.cpp
index 5e6d6a1e2b..bbff66b2f7 100644
--- a/dviware/dvisvgm/tests/PairTest.cpp
+++ b/dviware/dvisvgm/tests/PairTest.cpp
@@ -2,7 +2,7 @@
** PairTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp b/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp
index 9960af3906..a4a155e8bc 100644
--- a/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp
+++ b/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp
@@ -2,7 +2,7 @@
** PapersizeSpecialTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/RangeMapTest.cpp b/dviware/dvisvgm/tests/RangeMapTest.cpp
index 63f31ff1bb..1d9f46b82f 100644
--- a/dviware/dvisvgm/tests/RangeMapTest.cpp
+++ b/dviware/dvisvgm/tests/RangeMapTest.cpp
@@ -2,7 +2,7 @@
** RangeMapTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/SVGOutputTest.cpp b/dviware/dvisvgm/tests/SVGOutputTest.cpp
index 60e3beefd9..a20dfd63cb 100644
--- a/dviware/dvisvgm/tests/SVGOutputTest.cpp
+++ b/dviware/dvisvgm/tests/SVGOutputTest.cpp
@@ -2,7 +2,7 @@
** SVGOutputTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/ShadingPatchTest.cpp b/dviware/dvisvgm/tests/ShadingPatchTest.cpp
index 17eefc287f..3cf6b1096b 100644
--- a/dviware/dvisvgm/tests/ShadingPatchTest.cpp
+++ b/dviware/dvisvgm/tests/ShadingPatchTest.cpp
@@ -2,7 +2,7 @@
** ShadingPatchTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/SpecialManagerTest.cpp b/dviware/dvisvgm/tests/SpecialManagerTest.cpp
index 38635634af..156dd14f2f 100644
--- a/dviware/dvisvgm/tests/SpecialManagerTest.cpp
+++ b/dviware/dvisvgm/tests/SpecialManagerTest.cpp
@@ -2,7 +2,7 @@
** SpecialManagerTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp b/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp
index c29a33c15a..6ca61d53ed 100644
--- a/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp
+++ b/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp
@@ -2,7 +2,7 @@
** SplittedCharInputBufferTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/StreamInputBufferTest.cpp b/dviware/dvisvgm/tests/StreamInputBufferTest.cpp
index e5bf646ec9..10124341e8 100644
--- a/dviware/dvisvgm/tests/StreamInputBufferTest.cpp
+++ b/dviware/dvisvgm/tests/StreamInputBufferTest.cpp
@@ -2,7 +2,7 @@
** StreamInputBufferTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/StreamReaderTest.cpp b/dviware/dvisvgm/tests/StreamReaderTest.cpp
index e769ab0f44..864efab3b4 100644
--- a/dviware/dvisvgm/tests/StreamReaderTest.cpp
+++ b/dviware/dvisvgm/tests/StreamReaderTest.cpp
@@ -2,7 +2,7 @@
** StreamReaderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/StreamWriterTest.cpp b/dviware/dvisvgm/tests/StreamWriterTest.cpp
index aa2cadb9c9..05d5da2e3f 100644
--- a/dviware/dvisvgm/tests/StreamWriterTest.cpp
+++ b/dviware/dvisvgm/tests/StreamWriterTest.cpp
@@ -2,7 +2,7 @@
** StreamWriterTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/StringMatcherTest.cpp b/dviware/dvisvgm/tests/StringMatcherTest.cpp
index df2bb81cdb..89ee78fa8b 100644
--- a/dviware/dvisvgm/tests/StringMatcherTest.cpp
+++ b/dviware/dvisvgm/tests/StringMatcherTest.cpp
@@ -2,7 +2,7 @@
** StringMatcherTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/SubfontTest.cpp b/dviware/dvisvgm/tests/SubfontTest.cpp
index c3a6c2466f..609a0efe99 100644
--- a/dviware/dvisvgm/tests/SubfontTest.cpp
+++ b/dviware/dvisvgm/tests/SubfontTest.cpp
@@ -2,7 +2,7 @@
** SubfontTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/TFMReaderTest.cpp b/dviware/dvisvgm/tests/TFMReaderTest.cpp
index ce950e92fe..fa701f036d 100644
--- a/dviware/dvisvgm/tests/TFMReaderTest.cpp
+++ b/dviware/dvisvgm/tests/TFMReaderTest.cpp
@@ -2,7 +2,7 @@
** TFMReaderTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/TensorProductPatchTest.cpp b/dviware/dvisvgm/tests/TensorProductPatchTest.cpp
index a051f7d70d..576ce581a8 100644
--- a/dviware/dvisvgm/tests/TensorProductPatchTest.cpp
+++ b/dviware/dvisvgm/tests/TensorProductPatchTest.cpp
@@ -2,7 +2,7 @@
** TensorProductPatchTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp b/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp
index 1aea8b9b87..a0a5ee9868 100644
--- a/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp
+++ b/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp
@@ -2,7 +2,7 @@
** ToUnicodeMapTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/TpicSpecialTest.cpp b/dviware/dvisvgm/tests/TpicSpecialTest.cpp
index afc92d54be..9f88b13412 100644
--- a/dviware/dvisvgm/tests/TpicSpecialTest.cpp
+++ b/dviware/dvisvgm/tests/TpicSpecialTest.cpp
@@ -2,7 +2,7 @@
** TpicSpecialTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/TriangularPatchTest.cpp b/dviware/dvisvgm/tests/TriangularPatchTest.cpp
index 07c8819e2c..86ef13fb36 100644
--- a/dviware/dvisvgm/tests/TriangularPatchTest.cpp
+++ b/dviware/dvisvgm/tests/TriangularPatchTest.cpp
@@ -2,7 +2,7 @@
** TriangularPatchTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/UnicodeTest.cpp b/dviware/dvisvgm/tests/UnicodeTest.cpp
index 11a0b2fac1..dc4e77d165 100644
--- a/dviware/dvisvgm/tests/UnicodeTest.cpp
+++ b/dviware/dvisvgm/tests/UnicodeTest.cpp
@@ -2,7 +2,7 @@
** UnicodeTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/UtilityTest.cpp b/dviware/dvisvgm/tests/UtilityTest.cpp
index 2faa4c2a96..4ca490379f 100644
--- a/dviware/dvisvgm/tests/UtilityTest.cpp
+++ b/dviware/dvisvgm/tests/UtilityTest.cpp
@@ -2,7 +2,7 @@
** UtilityTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/VectorIteratorTest.cpp b/dviware/dvisvgm/tests/VectorIteratorTest.cpp
index 0f705596e2..905a6fa743 100644
--- a/dviware/dvisvgm/tests/VectorIteratorTest.cpp
+++ b/dviware/dvisvgm/tests/VectorIteratorTest.cpp
@@ -2,7 +2,7 @@
** VectorIteratorTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/VectorStreamTest.cpp b/dviware/dvisvgm/tests/VectorStreamTest.cpp
index 4b0263185c..022b1c1fdc 100644
--- a/dviware/dvisvgm/tests/VectorStreamTest.cpp
+++ b/dviware/dvisvgm/tests/VectorStreamTest.cpp
@@ -2,7 +2,7 @@
** VectorStreamTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/XMLNodeTest.cpp b/dviware/dvisvgm/tests/XMLNodeTest.cpp
index eb3a37c434..8108d88db8 100644
--- a/dviware/dvisvgm/tests/XMLNodeTest.cpp
+++ b/dviware/dvisvgm/tests/XMLNodeTest.cpp
@@ -2,7 +2,7 @@
** XMLNodeTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/XMLStringTest.cpp b/dviware/dvisvgm/tests/XMLStringTest.cpp
index 1c74c03c4c..18c129c4cc 100644
--- a/dviware/dvisvgm/tests/XMLStringTest.cpp
+++ b/dviware/dvisvgm/tests/XMLStringTest.cpp
@@ -2,7 +2,7 @@
** XMLStringTest.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/check-conv b/dviware/dvisvgm/tests/check-conv
index a43800b9a4..f87496762c 100755
--- a/dviware/dvisvgm/tests/check-conv
+++ b/dviware/dvisvgm/tests/check-conv
@@ -2,7 +2,7 @@
# This file is part of the dvisvgm package and published under the
# terms of the GNU General Public License version 3 or later.
# See file COPYING for further details.
-# Copyright (C) 2009-2019 Martin Gieseking <martin.gieseking@uos.de>
+# Copyright (C) 2009-2020 Martin Gieseking <martin.gieseking@uos.de>
files=(sample frktest)
diff --git a/dviware/dvisvgm/tests/data/Makefile.am b/dviware/dvisvgm/tests/data/Makefile.am
index 27632f3299..55818cc0c6 100644
--- a/dviware/dvisvgm/tests/data/Makefile.am
+++ b/dviware/dvisvgm/tests/data/Makefile.am
@@ -1,5 +1,5 @@
## This file is part of dvisvgm
-## Copyright (C) 2016-2019 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2016-2020 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
diff --git a/dviware/dvisvgm/tests/genhashcheck.py b/dviware/dvisvgm/tests/genhashcheck.py
index f7ac46c488..5f3495128c 100755
--- a/dviware/dvisvgm/tests/genhashcheck.py
+++ b/dviware/dvisvgm/tests/genhashcheck.py
@@ -2,7 +2,7 @@
# This file is part of the dvisvgm package and published under the
# terms of the GNU General Public License version 3 or later.
# See file COPYING for further details.
-# Copyright (C) 2016-2019 Martin Gieseking <martin.gieseking@uos.de>
+# Copyright (C) 2016-2020 Martin Gieseking <martin.gieseking@uos.de>
import re
import sys
diff --git a/dviware/dvisvgm/tests/normalize.xsl b/dviware/dvisvgm/tests/normalize.xsl
index cc568c3aec..2b39eba9f7 100644
--- a/dviware/dvisvgm/tests/normalize.xsl
+++ b/dviware/dvisvgm/tests/normalize.xsl
@@ -2,7 +2,7 @@
<!-- *********************************************************************
** Stylesheet to rearrange font-/path-elements in an SVG file. **
** It's part of the dvisvgm package. **
-** Copyright (C) 2009-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2009-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/dviware/dvisvgm/tests/testmain.cpp b/dviware/dvisvgm/tests/testmain.cpp
index 8336939079..ce75cb5664 100644
--- a/dviware/dvisvgm/tests/testmain.cpp
+++ b/dviware/dvisvgm/tests/testmain.cpp
@@ -2,7 +2,7 @@
** testmain.cpp **
** **
** This file is part of dvisvgm -- a fast DVI to SVG converter **
-** Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/graphics/pgf/contrib/milsymb/milsymb.pdf b/graphics/pgf/contrib/milsymb/milsymb.pdf
index 6e736c98e0..f8df78f57f 100644
--- a/graphics/pgf/contrib/milsymb/milsymb.pdf
+++ b/graphics/pgf/contrib/milsymb/milsymb.pdf
@@ -647,36 +647,36 @@ endobj
endobj
435 0 obj
<<
-/Length 5345
+/Length 5347
/Filter /FlateDecode
>>
stream
-x\I$qϯ( p
-??pb\uq'5m@߅5Z z/{ÈwI+n#sit62Y<5Y#od#oc~JK^3fOrZBlV2QÛ9ܯ9ư|fiX ?7?ЉXw!Y=Pⳟ
-f9zg:[63x
-<ړ/p]}"K'Ǟ:+:޸ABaaѢV%l:g'Ё8bDu|=?q%kB4`xP.z!!ʆ]^Hz^ AlIifhs;NОާ2&"ـ^g[63 0nO:a6i=t9x>/#ӆNg Iχ}l=ri 0*ˡaN>u*QyY0ρvF
-
-A'-LY;RЁZ!$X+v *y'W+X}P*pLDcA3 0*[kiC'ՕA[p$f7bCtbklһr;Iyi[Nx/ T'V]):A vnPN7v
- LniGQ
-`OEXɈ5f#vɖmS*I4-c|`{Hݒs:b5$^LL57!/3A- ̊RC% hP Mߕl
-RپVdlXX32i&>.Z
-M~G&0"3' 6w{LH1)fr B0٫(8pi/'7Fe8(=Z!ry,x,*?<e} JjhQy{C;~a2RB`b
+x\I$qϯ( p
+3gdsêh^%[^qdj|8 5wҍH{׍w˩B7/.d_-V^83xP>D[i3'JxGn;tx٭:LpX1(rNgHg:-ށG( } GKig`ITI8!h˫3]ū#V"x+"Y(6^؛k].G0BldL,kTs yEm9oHvGV0I׋>ٲSמ|Y]:10= ]0L 
+ }46z(w`C9;4'5#
+p6'+]Ãus T6우m݆FN7rH`CLJ3 Fqp
+>1p:۲ɞi9tuIU;Ia|6̌v> \ eMz>d ecKk1V8_ pS^$Ϋʇ}3R"r8@ rd^$őGXu6bHY>D`[̶#%D԰Uj<!
+]}VdlXX32i&>.Z
+M~G&0"3' 6ӻ=byRYYj3MU 4ŗxq8(=Z!ry,p,*?<e} JjhQy{C;~a2RB`b
O_cU=Xwh_
-|UQ)qe:=ĊPY0a6k@ n ;Qs;jgU1хω, [5 GirMh>)ppBU'ѱh[lviOµ9J{8MbLxP d+\E¼gLÖtU^Qjqԫ9I-/auQaq̰}~ځ u}:Yv3fXfXU)yK8O :]SFhVfʾRSQPLruZH f>!j*X}J
-m7!\*嵱\QI8l\Zg,\$KHRCA9IV;' Sد>R l@GJV\h)v5YyJoT&tL$qx%5f ˬ4\j%;_.FÃhh橣s j]dNyv,A4>ݎv{|%1M22%MjS^w{̨ 9S){oImPJ;<}:L MK>L8`'oW_4]LY=Z!V:QګŤLFNdbK8`$,
-n벧kͨb^YD̛@u}[QYI7:CvrRՖԠc8&G.$*z;rtrɛ2e+VCu˟|/0絯L .2-3 :O F*to5`a&s%K<]Hug癑î鯃B>wwʋBO
+|UQ)qe:=ĊPY0a6k@ n ;Qs;jgU1хω, [5 GirMh>)ppBU'ѱh[lviOµ9J{8MbLxP d+\E¼gLÖtU^Qjqԫ9I-/auQaq̰}~ځ u}:Yv3fXfXU)yK8O :]SFhVfʾRSQPLruZH g>!j*X}J
+m7!\*嵱\QI8l\Zg,\$KHRCA9IV;' Sد>R l@GJV\h)v5YyJoT&tL$qp%5f ˬ4\j%;_.FÃhh橣s j]dNyv,A4>ݎv{|%1M22%MjS^w{̨ 9S){oImPJ;<}:L MK>L8`'o_4]LY=Z!V:QګŤLFNdbK8`$,
+n벧kͨb^YD̛@u}[QYI7:CvrRՖԠc8&G]TIΕUfowF" 䲓7eʲW?W0絯L .2- :O F*to5`a&s%K<]Hug癑®鯃B>wwʋBO
Of=Y<`n .<%68K.;bm[tG݅*Wܐa8IC$4 <E=$ ~H`V2TT2
|lP9\jCx1$ncu*^
-tȞGWw:ֻ"R0dDknk!PJN";݀ hJ5Ts®lnBލ$\Cu<o罹J6-br> &,Mg9}ל6I,
-M;[}t܅HdYiz@%iJP ffJHMhGu)=qJE+ȋ +|FÉ h~
-TVe^CSe,'TBDi PTp;D 1S4yKP"tmX 5_Q6jb:,.?zД;+Rajjš^fB'j\?;:nC'n:M<),"mk
+tȞGWw:ֻ"R0dDknk!PJN";݀ hJ5Ts®lnBލ$\Cu<o/SS%19bjarU&k賜kN$8u|<p
+H\V;zFVcδjA8%ӽ
+`ɋ;1/R-1&e3`@^`C)#7ص`L:,C$[
+CeIa:s&uy:k>
+s}iW2,md ɴe=
+evmW Z^p]gp&}YN*U<} nIA‡*v<)+r+ci:DRQ۰ktqݣl
+ubX\~)wWBrjš^fB'j\?;:nC'n:M<),"mk
HpO|db lPH;xHlp
-,ěJ']WvN*C%\._i٣噧ɜ&㨎=љ/PZ#TjLyQ^-z7p ܬGfz1trP)#ӣ]GJW?[1r0'</H Ň]B|šEV0gֽ[J bJni:0R_ZnP}5]
-9_>E4T]*yg缡eG^!7 %7)~V!viYNxH,RRj4x|'c-2RoBS;FMJ8:י*8diKeDCA͍ }>k[|oKҠ=re87Bl`5աer,,[gРAx
-mk- ]ȷ>MHn
+,śJ']WvN*C%\._i٣噧ɜ&㨎=љ/PZ#TjLyQ^-z7p ܬGfz1trP)#ӣ]GJW?[1r0'</H ]B|šEV0ֽ[J bJni:0R_ZnP}5]
+9_>E4T]*yg缡eG^!7 %7)~V!viYN!!HmJ?ǏrbHA ME$r7%*IKh:\gLa-)J -o477ANpNmi'eߖ|{A'K߃;z!qn8jCX*Y#ΠA'
-φ{h.Ν;$pڑljGb`C>y?)ޥ7%#zvZjOPn,
-\](\nS}ӥ܀ihAuFhy|
-^+.tc"?NtuJH LpXUNhl][Ɨ q c*zUDjD?_SNz%-ۋ[c>{))JHQ¢_/ot橙T|%;
+\](\nS}ӥǹтRND.>
+[)w'/§9Tռ_o!n ^rK[j[1glM9_|([0(Y$p<}
endstream
endobj
433 0 obj
@@ -707,13 +707,11 @@ endobj
endobj
445 0 obj
<<
-/Length 378
+/Length 887
/Filter /FlateDecode
>>
stream
-xڍn0y
-/T{leۻBvAm 4퍲lsw{enW/U~!IMV򅑗,+
-/ ?h{τ&!t>{*7*B69K"[IzMQR+:ƣWUh2A:.``LQ ݅9Y`DsW>;$m*ϔjZN+f"]`r(|uԙPxT}aAz%̑G[~
+xڍVMs6W(?nҴ顝i549$lqB AKfR_$
endstream
endobj
444 0 obj
@@ -732,7 +730,7 @@ endobj
endobj
448 0 obj
<<
-/D [444 0 R /XYZ 49.606 745.957 null]
+/D [444 0 R /XYZ 49.606 752.532 null]
>>
endobj
443 0 obj
@@ -2253,26 +2251,27 @@ endobj
endobj
619 0 obj
<<
-/Length 3328
+/Length 3463
/Filter /FlateDecode
>>
stream
-x[_6OG/W
-)(-p}zY_mkv7!)R&pAX 3Ù!'U+V`_W3M+meT!
-V5zLКsh.Zjb u+s5Nhk0ɻ.j`VTUٶqj @huB+ŻO?MI`ōBR8?r
-˥lgo,ffЦufA,N( gn>}6DuTuu܂Rͮa7t}Zwt=7jx#n}/?1&tƳ4ۀN%#S o۠՛_~+6z0X0ܗq{q`h!ӪDMi-SueX; {/, ]wv-Eh`AZ6f7.rQ}wnY1=Ű|;ʕQ&*HQ8+]s7)=M wM+]Ec#[4,A<?n9YPtA݇
-<QH<&8==M_\$q{N(qpRZHDSC#==S[]9HhŊP[<stLV$֏4~0R`5 šVY?~c$y! mcav(dBpsHhQQHrQ5ɩpQHcup0v ԨUlBPƴ
-Zȵ,K[X^L$&pFdHP8z"h. k&
-7vM u
-B(>TyGE+,=@㓊ճNm9ֳ|ZǘjR8v!ͱ(Sֽ@^X"q6?NI NW=8p
-%u;V= aTR")zl&U/Od#ǺwFLj#
-c3kRqVB:`szHKו^O jӢvG3κoLLIY\}b tZtb
-`5QjiόPq]
-CPr{a,= [ 9
-Q7emZ%S A|5/eLoa`m:`335s&3جW(ڌz L.
-qA{Rˀr7]}4vLJÎ&Ʀ,,[Ԭӧ]vo!J=Z<>|~/z2 F/uDv<bcHX@ȲcQħ=Zl 3)\6Iߐԛ|fW~Wy4u1PrE}F] nTtnNӎ@XR.r8+΂P~Mf9 (]u.U
-Xr>;LI6Ie`D
-:!cVRf#(%oB*{+nskY➎m):,T
+xZoF_G{mqh DǺHku w)ɡԍΏۊV?\/i*Ԅs^WWCX(Usd֌1j@< u1TXT!0EY`5V
+R-QRYՆPuSOS#q~dn?WW)kt,#JŻ9Upb"
+Uë<g9>t(I#4 L
+:IgZeH-Jy}s-i]"͢eo7fȤz3LuM줕$]f|xƟĹ&zS0iKL#+ҼpMq%aFEǩtV yW~ѐ6%~v;9TC T 2znIbVTS=᧎O}(iGrʃgl<So$"R4R3E_2Mz^ۛ/1L4G^Éo!'$Dqq!Ƨqj"B,9~Dպğz4dy?M1p${oaUV=o=>EHK"hm@"BCN (Og~Lө?*sT,YC8re~Ǭ^>0phlIZJ; u V\ɭvޮWz=^yf
+~ad3װk
+s5a3F#ʇ-b!aőkb# -þxh>9ݸ]y:}y7,ap1ȧp<ڈ5WۈwU wwwߡ#1 fl
+BY] ={ˍ}vy"`f%uvr&u^T6@ZH>u׵|vخbޑا8~uk7f`ܴUF/_"J݀NSF:rOˇuM6zI(,˸A0הhΉ2r3D;캖Tv/,_wi];-ME v
+pα,w~=nÓ̒>ĸ3\iJ>
+[bSm\GrJ]$O*H߇1W_7?ko_5kpJ38!9?`YSrL9%ޯ{eP)]fhK/.㰁{`:^MLOwCm4`,;n l\:gw-x&SOׇz~ߧ."sYAŊ.P5' , =X DFLKPo D8U C!3]W96!@E]EqR<DӘQ!^G{Tu
+԰T_SXA'r4USsf3Zr2y^P8x"i.k& 7;퀛^Wǀ u
+/@ihBtdso3PƷO@mlyMz4T8Քyk!nU| j*"Ȋ?Ty*YSl@ٟ>NB $+f_P(*JyEӄ;t ['zpԮzPu:[Mdc&R#l,q*cgizHTD CK6d9,juwh$F FH_W-$h?(w!9Q]K`c.muX;ā?mIvQ8qtk; >r|.9?" s>jA8A(%p|
+| z=)'Rvz %
+imaI2te(1>7݃‘tE%m
+@(glYycL18vͣA[
+&ƕ敦)TT;YO W}z5z\v;?.f 0D#A"lhN"ci!-cNEvhnasdk>DQ>\5:Fݿy_ށ:ϸYz|[ e pMi_xeE籢5{,n6*~*S-xW
+Xrh.ɇX~a
+?x
endstream
endobj
618 0 obj
@@ -2320,12 +2319,12 @@ endobj
endobj
623 0 obj
<<
-/D [618 0 R /XYZ 49.606 393.177 null]
+/D [618 0 R /XYZ 49.606 369.266 null]
>>
endobj
77 0 obj
<<
-/D [618 0 R /XYZ 49.606 185.481 null]
+/D [618 0 R /XYZ 49.606 161.57 null]
>>
endobj
617 0 obj
@@ -2337,24 +2336,20 @@ endobj
endobj
628 0 obj
<<
-/Length 2427
+/Length 2522
/Filter /FlateDecode
>>
stream
-xZKsFWHU<jf+Fjsp|Hdroϋx
-IUraY6AO?i72>G8z7ý+qD"%LES-ֳ/H #UGf1QAX*Dbbݙ"$&U/vJӨf@B3chvr-I0 RRq0m '}bNQB1(
-1.66 ٩=x3" J_Yw?mr~f
-&4
-c4jU@
-6愓í5A"NjGL$&<a16K $tkk6S Mt'8
-A\NҘGNs!=lۜQ:%9f7V+wo2
--Cؿi-x`R ]f-
-2!FA4?cb=8/]G6nj^ӈxV5E!ھ| N\E]wmJI  >Øfx${K&|uo;UUdiyq1Mz'$-<%E^Xf hzûD0 F DM`>{>lϰ0{}X_Wrxe~Ak
-_x8] @.
-Xӓ_T'e ͼjVyT:/:<wrO|n:s.5K/mR»r#_@䋛 X%˻"-w#>l5g"l3ԛn= vݧv,mk $햋3]F@4pHQ0Oj& jSo(/٦(]8Wˇ?b)wYnx;2KΈ
-[.>X!Hń.+1B %J|o]{E^۲onm=auOk5:t~ai
-/y
-qhP#zÃsGWg@ ye\ri}\g9M%)ƀCf5(.{7ܨEߦ")g 9:ފ
+x[KsW̑Z{T ;uTك- *{zxHXM`ӏk}FzۈG)tDJ`)挢8-MR?~~Kl XY,z(:\޺-vz(WJqɊa% 
+8b!\
+8ME00ݨ0!X;! d`zSC[rt_W`N%
+ e2AZʆD
+Hbk$.a=UEdMV"e#Zz섿fZde{0xZXpqa*!ţS&fR (Xk OjlDnDyzBA
+(M᭧"ª [
+]=WsEQE?Q*OuhOV4-Pfv\<N)!}>հxshʶbX~::`8vi6R5+YyOxt==o[k ͆Ab7CfBQf@ l`xypSd9
+WDcg߃Q{z;w[p*01 uog5hf[ AZ=+[Ւ2I P5Liy16MfgħoWw_,MFf5IHhlĊY/Fx1j^M#k/3Ƀ2v Ie Zϲf?hgF'Ni2IAU;"+l]mQDjD 8BX[ѻg-Y=M73xMMQdI}Zou}:fڝOͰ`a,ey4fu50'u
+ `Cw
endstream
endobj
627 0 obj
@@ -2371,7 +2366,7 @@ endobj
<<
/Type /Annot
/Border[0 0 0]/H/I/C[0 1 1]
-/Rect [168.042 550.872 213.511 562.484]
+/Rect [168.042 513.896 213.511 525.507]
/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.awl.edu.pl/images/en/APP_6_C.pdf)>>
>>
endobj
@@ -2380,7 +2375,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [212.137 305.895 220.465 317.506]
+/Rect [212.137 268.919 220.465 280.53]
/A << /S /GoTo /D (table.caption.11) >>
>>
endobj
@@ -2391,33 +2386,33 @@ endobj
endobj
630 0 obj
<<
-/D [627 0 R /XYZ 49.606 798.261 null]
+/D [627 0 R /XYZ 49.606 761.285 null]
>>
endobj
81 0 obj
<<
-/D [627 0 R /XYZ 49.606 577.776 null]
+/D [627 0 R /XYZ 49.606 540.8 null]
>>
endobj
631 0 obj
<<
-/D [627 0 R /XYZ 49.606 544.895 null]
+/D [627 0 R /XYZ 49.606 507.918 null]
>>
endobj
85 0 obj
<<
-/D [627 0 R /XYZ 49.606 380.62 null]
+/D [627 0 R /XYZ 49.606 343.643 null]
>>
endobj
632 0 obj
<<
-/D [627 0 R /XYZ 49.606 299.917 null]
+/D [627 0 R /XYZ 49.606 262.941 null]
>>
endobj
626 0 obj
<<
/ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R
-/Font << /F81 439 0 R /F93 449 0 R /F84 441 0 R /F90 447 0 R /F115 467 0 R /F122 591 0 R >>
+/Font << /F93 449 0 R /F125 600 0 R /F81 439 0 R /F84 441 0 R /F90 447 0 R /F115 467 0 R /F122 591 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
@@ -7710,7 +7705,7 @@ endobj
endobj
421 0 obj
<<
-/D [1182 0 R /XYZ 65.245 4130.304 null]
+/D [1182 0 R /XYZ 51.333 4130.304 null]
>>
endobj
1181 0 obj
@@ -10076,81 +10071,70 @@ endobj
endobj
1226 0 obj
<<
-/Length1 2163
-/Length2 14713
+/Length1 2192
+/Length2 14872
/Length3 0
-/Length 15954
+/Length 16128
/Filter /FlateDecode
>>
stream
-xڕuXi-Hpwi,@!8i\ww Np
-(.흍F_8?X`U9[[؀M qſHf3#%mMdbfP9:r32Lp180ifX[576|%vs
-622+8![
-mX˯bfnh 6vp
- vX v'
-!7_7zc1 11%؃ VfܫߊX^3
-e cs0FA+_9Z z!P>&\ȷ -6SJ;GE% Qf^=d2:OF WqHxbږrXwc>YV)M9 ~I'Fe*夰P]Nꊶ"͓q ؞z<?1=WB(t
-YΩ^ihb% j28 j[ןJ g׺| 1}Zd 7
-[8~ڗR2=F74E)"$x<$~+11z+p)jQՍ;KP; It-C S\6tYUVt%L3I<P^Km~hqp 4pvCs~nL8Q6$ꯡײO7ӟg.!{M[@M54WY®Y;'gd5Hx2<I" Ѓߗ:He5P !/FQ회n4?JS)t_Zd& ? Xi\㏗yWiT20h>R7m4!=1.GK7:zɛ4/k-x\T~E-j-!J30,i2kߝ4 i{H`Zq} 5쮡uy ZfK=t'fԃ܎䦬0#=<A(.){߾|yе(utJJpPV'U*(?=ݓA@plr-dfQiqiPs h)nz>{3vVTd%Qjk/ 9XZ^.*=^mLz]B&kxGr#75zn˚3k`tilNqCl- 'Um\6vɔ|u{/íi X{gvFě
-aJkR /q]8!a؛/u^.ԞDQ{Wc0\/Œ%~n{o*?Pno ݂|~oIRH{PhtڌC-Gs 5YI(-jC!Y%Cڙt<̌bV,'Zګ R94rHox >f9ůa62/5;v\4@~tXVUNHO=Zxe<< {f >@*KɖⴼNtu):<u:S /i1~^RHB ro' 8t*>f&ſsLi 5鼪hp#!_CSǕ!11?0i׭4+Prd.Uu 0!OQ_xTx%XbAR[j
-~y[Zkl]k` 瀩|'5 &gf)|Nq'r̄>C
-awPb^J]d'6_cS[fd/n9?
-Lv,͉ݧP(zQ!u*bK"sKY y변P<?dc圽uQ
-g䞄H2jRV{Cy7Z~گV ]FZl#Y0˺ii#WߤN++<-_?}NQRr[_nexRޗ*&,77{LɠF6\2D
-PCEՐʊf,6fIG)/׊^pJ؉[H^Ҹ{ U96O?na"͉6eJi ~T~wC<p Vd`OVGg]θ1'K L+|ZOqn8VkӐ{97b %|\mi\rJ%c*%cS樶DuW9M8d[V3Ee- Zlk%?? ZIm@ @z!g‘l-
-$E I|\ZR i:F>uA } ! a?KEjh`We,gL! *!H)җ;yB4 zG/;FlkRU9&mE"vHLSbw:S&Vtn>PL̾K}p]nhUN.5f
-E-"J{Mţ\ -R,&aKWz!H̒2n5MDnmal/~ eU97x2d]-A^|zXtu*6E\2ѿ Jq/87- ɉ砍Qy0!2rJǼѻ*:1ca|Y;a_D^JB_jj$5PNr)sdrӐ{{tU~CVˠ8PAJIr\3+wr?Amۆ|QzT8[[L60La7#"W-|} xHAFOĘ}uM*5+8Cޘ=U(SނmZ"'B\G(fA4%hnhG9gx̿%i?zXe}MSPWX<Aw |㶻myw'( Ř nnq5*.n=hPaJh4
-lo8M܅X'\k,Wd(>!u$ѓq~s^Fτ  |Sx|d`5Am%~V1 r໬ZW?W6oyB+W~4G owҳ(篅>QX?4w3U&ˊH@F3+oېJdm`bB;xEpSՆ
-o(#$-'~;ۃk whxbLw#P}!%céF%ŝA>ZT{hY>l|6!8S"WO^z Y -Ro0{QE+Y!h
-R({ /c~o㦁d2wg4 2/ןJG&1<^W,I0Ť݉9&š@9~Ziz{g&)n$d&DTӉh\X|L_7ƣ3VFEL$WԈ&ԯd a0ۄ ZVc-i񑯱`}ϣ8Y!ᅎEAڇ%`UQ{0;q[_M]8t)͙Xk&Gt;%/]IBEVwsQ4@4:,k^5H26P;Sd·R3v-~"4X EM
-9u9<ֽP8%Piku) n^)tLI/(Mu#Ù^(#>ں(6vjwU GM!jLaL[
-%@ϠM~GG_Ltďhi!u\"ô4~ä#]wuiYWegʁJTT#> /<LƎd%5^vG1%U;\XMg@
-#b|Q9w'Ag|:txnONi7XcjͪrE %"QDB}e~U6("kZk@"꿕啿| Q
-7RZ˰Ѣ#gpsMx&q{ɘh<S+/2;ږ)ClyW 3մ9)nІP™FUS
-ψFc&w%:lf;
-4.6G7+OZQ! ڲJv=&> _{;.5a"(_y.,zg;SQZvR.`g
-ƛw26%dG5Np\}E6(&6*P Д@P€+8?2H˙Ʋ'fd6Ҥa!(a{3miPnԱL${ЂDS|4Q0<M4zPT@c_6:msm+CCi!FGO6U[v _ JYt:+)'<18Fa2| f;
-<6=dɀK״"N]= 䳵gOI +T=Wmcl"}J/Ś8S.3WWW^<WNӓ=? hBOD-
-dH<<M1 /2.;bӅcV6L!o(BΓPgl!]FBP[sX+v_H6@Z:|N
-%<ZiM<JLޟ‡Ģxe~,J ߄>0I̾t*5ATNI80×m
-swU8F:bh}5?H
-#û"J-^uS٤AggpoѢ"KJZ9;z (ޢ)7+ltG U=Pr_}DExFUkB ^%T+Auyg洛[F,! }cw쓄$sA:-<qUYQ=' cB?#YR<6GSF둷ULL q`sW'KIޙ7w
-(MV A\5h\n2G]߳ ` Ka1&s$ba97?HFY
--.w4 -Lt䮮<T% Y mM? tHSI&0ɖ;clmǵ= <ZZY-ȾP%e.,*iEPa{ϰp2Hf$Y !D`ӊw/=$~u9ߧ}P0nC61x} i
-e-q4֫>]":tթ i7V
-q%#/>HWQ@
-9"9K2+LZƠ-تkuYK߀f \I$]
-ട
-~]fTq6 aau/c8PX5B9IHVjhD4Ht3) Z"&W k'sD
-nq$B30^`F'"8~ERXM.cZ3]c?XlGFOq
-}pF!yW`_h碢򕶜UJ ma)ICy} 2[K.'~GxZ&%Kg
-RTPsVٔb|B39= \fm%kS16i<]M}s+CIBJߥ#{^ *Rnq7T/UhE9iRuL.3 &j:]~9
-h!r%^ToU]u㩺N6ÚZLqi) ruGLPUzl9}m㺚^uWLdM#4s! \L;DJJzH}R٘|:'XsXEe7 V ߙ9s}DM7
-+}={8HcBň+!/9.6jni-!aGW#(pz㑹sz:K:r1ٝ} ס5WWc4] ZW`dE8MڞfuLfc.#x<fA<T/y c ]f
-VcIEu6hy׷P1҉ bbz;$[;5U|aӉ,8mV چH{}|i)e0YIuKڈF :EfNZN\ETy1mZ#}w+`bm40+8)f:ĸH#q@T7S|!ghb<9|jn7d)~ n u<EMw1J.Z<GY.ﺆ" >ZOڃ@R(c kO(jMT?FPIt^wT:4Ӷw*<cCěgda?!"—e=2B=o
-fTZ)lGU
-sw,P$݊Pß#y Ǵ=a!~\Cm:TbULюD !ܵ,ڮaVv,ڈ
-O62V7lC=[3n=E<)Fo1,;J0Y.90
-/%>6xq~\z{rƳ n?rT,.;ddޗ\r 7и]ovuޱ=FMK<@/ @>.k:c0{|S 'TmYtvFJF<3n֭dKPH^tߓqآt
-ӓ8~$F3ژSRˁ kr7 BqB#|Kݰy
-RRfS%[]3'"S1WsIi3F,8-ReM7IŒ̶ʨ2[-GG} ZhYզ]NQ2mcvmd@M̯d!%0'xD<a]fJWgPTƇKe=pZl 0͵jdE -E@8ܼnZ]g+^Efp*PhaAgsbx_oKrs' fe\p}X^YyQ8;6D'8%nL
-)ᓛ}#Cs?Bg(btۼ$ 9vJNKIP|ܱGi%X>Ø$6魓l8]5v[4jx\}iDoL2}?
-~^1L9jjQ,=[v6S*kKZ 0cog[am9R(/CULHi
-eҬ=k|0 ':/?a3 %&ن KZ䷁_.҇cQtU{F_azyv ޏNEBEӑ X2ԗRb* &QwW ;|`Ա#:b-(Kx֊`4U4~{X Q#C=A)@B٦#HJ
-AdagMjٞO<4EP6ʚxi4%=?SeW(!OiF(%s/! u+jN|+"3
- J]P@1VX6L,WEY`zt  3
-'h {/zl@L`mcIxC_ _%7:\)oZtGS+.ZaG~z- g:O&@n|Pdo$72{촔$"PC۟+` $lD̾ˏ[F6`SՍ[II0Pъ &%:Tܩxxqik u}91~_?ESs(<QTXzc.YbQCU?Ȭ)LT8;jP/~-n}[0-t( GA!? \Hsk՘],[7m97č='H
-./l u N$m_>6 *N=|;xrS"( p2ViS~ s6 !c]ʨ/ƯÑ%~ /1O"Xj%f> Dnrn؅LwCԈVmIƻv+ő-PI}g@,HaTPH Oc~|s"/t^/rj=4O)uPceIY5KI=w*n]+XV<ET=DZ>4txLo.RHgBm7˿+3s`^*zqkL =׀>w%j N䨔11 yY>=5||-I"P%fh3 =# nJyi`f1MC~7\x&Bk6k٧Qicj
-OLƀg|-avơ> :/ƗwZː0|y}~ S3ieAq5Ț*k i:Xt뻴~ p"`ږQO
-nN#V{|x ӕa߇ ;r>k-ۿ\+B5EּP=܂9 $EOe%*ɒ"{'E[n`*2uWtoF~7ڔz
-M)<Te#r&@F"z]8> <xe]S_},&ѵcYL4ap-Ü)Fy
-Xz6z7ad*j>2oޯ(P٭14jS٫@ZP
+xڕeTi-w/5k(܃Cpw \]zznw~|jU>9=ϳTYQ,ikq
+ՍT]
+ؑۆ`&'=(Up1UX\4p!t-۳ O;uf:_{֨im/,FNіn5;Vr u0͠sB&Qy>B|-nhhk'g>}GrC||m-4?d]#SND(of1:0ᘤEʍڬLŶpPt&O'F"㬴TSNꆶ*ǟq{؛}:e<Gy_a bUGxŮl76eq7y0['Fp^V=b|~RnRAt$4vMV9ZvE/ER -ή_Jس8B0+JtvlXz c|0GI #+GQJd@)8
+):yIZZ<QQp •[d=vRC/ms' r g/zӮ߳<KG-ٌr;QFriUgH!Es`h)pS{ {1z#,}ɦm $w7奉 t-kԦFBJ>l!҄]+tx58b-ZN@(,wE)TY GaBf\=t6dg1#4맲 ѳK>dzGG7Zc`rA/эYk[ (*׷t1i8MxX҅-.J^ IlašaQ0UΤ8D
+#2iMNxڮF'x"X_p F\yb1SPiǧ*cM1+'&R 7@i0yb֊c=]ÞQJkeug/- gei= '
+zܤT.0m߸!0}d]/$-<wY(m"]<E)kNjFvL؃ض
+gl];$ћ <C*q8c@$Dfȏu."KX.SyƧ9`MsUKR{PG%l?V9_ L/ 8gv#aਈcм,Nɪk m-ߏ!̒X(y7
+;yZ< z_r ;
+Fl{FU-6}]2nDBG,M]&V\ŧC"DCYSמ" i}B,rrY^cG޿h& T$^YkdD0m}jVJP’2[ mۣTÞ'n]a\a+eUd
+#ˮ0T蜐!Cm^9"!b@eKQBrEh sً<r훞rK'|лM(ubbg%y{i,!
+=T{U5ˣΓqY:hrKl-H1dzJo<[YXZq!B%IPW"F!Ο5bvۊE_rLkJE j hÕ~`RjFr L4B!SQk 1in=P4WZgDRo_haf=2<WSdl1{G]W,T L˦UvJ+g4=g^ݢW5[
++'hJ>Kw+P̙65n&m'ʱ_͝'^!e\-UJ/M`E ɉHt3؈2r!Vl#ĢR*K7я}qI_:6o/>>j89fWPYW+ @OhЏ Kŗ|T)«
+1oJEO9#e]lX\V|iA|un-uQ3xjZ ʬ3dMQqE1><8hii!qté><dek_&򑨿PTF96,;9hY^g;N~ޕS^c\$$[.&RGJ[N8.~aDISf^0:IeCH49J>PW˻׫/RmO;h* ^<
+wPWƽ' uN
+)= "iss7 x<bl痮%"8HjkTyԇ V1G)@$uiۇ/U: z8ouƑEJ&+{HV,2ܷn))QyƳ߮"Zy0mb|x葊!MȔjc?Gi{Fi[jvgڒ?i d gݝS(a
+˧j?9kp و$yBUQy,
+b= ޫ|7Vy[:<4
+i(BȂdt
+e`p>Z낚,:3|FW I!*ήYp]G2[D礖{j@^0D3_M^{S ω8zL8 ;
+e; 67i!ĴDYQ# kqȐv?%|iN֢%BP.谎ۺHH=ތ/P/5w $ ]폥ҷqE=a"i?xdLټƆ5cn<;aCTds~#*:OSD̸tLLHG!8;n8{1
+g~ƷwO])JHTIW1Tӈ Ec?<F$XW˳bEa|g2ZH^tnppGnF,iq9xՁ*\-$
+ ㅥ]炠-4m-ON4Fy2Uץ"Oz;= ^83-90Vnrۋ{ǡTqpF{HtX3j{F Kjkĉ8}IX,/4rlT7?t$#z,+~ۧxݶd@ekyxGI,bD֫l7:{ߌXh>Ƣk'!4yí:nJE=vW7FF<?9MƖmoUJ;Tv@T>L"(8gw%XDLץd]$ǽ9 |/^(XMFJ~^&G7\8R Rȿ[eB[ǚxf?ySC
+Pk8*b1צvV(R'i!k9u$K`R,-up  V:bdc5
+?#
+aqp呃.;Y$V_NՎYq )>+e. ,s,ܢf[DhP]wK0OMJT rhL7k$m%2(,!87( y'*mi$Båp%wyIH2kcuqKR<%?iYO2#ӃJG ݖSS
+`ɝA/XV7NI'ѐ3&`9wm 6Q$sfTcn?rP _e09-~u'SKy
+W#I6A+snY<G9`ːBO>$Uƴ4d=&I&s 3R
+yiMJUg#ΘΣuI^h[`,nhlAh eX_Br2 =g;kV b?h>`V_O:En^8:86f v.\-܇
+AC|
+s0Swզ rM@{h쀈ҀS܏~N Xۃݲ'мsԔkmS"[;W(!i Dˇ
+=㻎"J]]Úӟ]^ 3GEYTbu*ts dQ|So79 ,Na WV
+ttvH Fsl
+GzE3jt^8TzswWN,-~wp941
+(G+Y[K~J|5*;M犫># )H!Tϝ-u/@Ϡ9_04kJIޙ\v.~8YFd-˯E֥\105p-zѐckbO*j5G_LD~t}F>XhU7h__ 3ØJ<YΣ&?b-D,E6D1Yk ᙸ:Bzdx9MkOf
+?F.DBYn~g{تgTM s=Iptk.
+GWJC [; [;@Yڇtj D r~4/i!/ =yӓ86qu_+)#y}PLg؝n^T`<sz4pa)+Yjۮ+M'{Z4W.wxgae}밇lI*o'TQ$>
+i%{pA?s]_?[1- zzp@}OM+c~ !Y@FtNaW[7e) I}o<[x:մE˪DY)$n/6]0<Ntzx.[iW6a_QvU#3;nP(.~?(fOFUtC]P͆Ѷ2L߆hi~D}֑<D^W?Pd* S#BnWb)O-3*hԢSgς;,%=U/O6 #FGe+L랖`lΒQ[:F#fK%'! =0
+KS34Ngy'P&)HF5E?M)<?="wÃ9#&-9]+:FJ2n?7Gz]o8;PfwWwVKx6s).PwTwоhܤ>C?Uwc=OEYGųLt(="r*AC~nPP6`S%c>Q;&>йҶ{dVwx^.'{'YS | j\ ;m'>[okGB(e;zFl;<ױ8"MBzJ}l-ͯ_=oF pG"t}w~iNM/Hs' 3<Kepg̭a|)DPHP0=쎞O]*&]A"5ٷűD2a2"RNfx,ߘ01Q7\w9td/{!U.A H» іwSQV }^
+j]Dm8qmNXQm #ꖌWFWxa%D޺ATU_I&R\Cz i^E h e1nTNN$:NڤNܻ{ZSB."&]Dvf/) Fyo~"7
+Fqm~aEW$'"s> 7|'6 ۟r> MP.LCu2\WڟbM &:W.02Y_#t}bOFl*;zEM]Gh\l}:3̕ z%txт$q\I;Xl.7K5/,uK/߸=W38+c>8^J^SIiRNjem{rB0TIOfG >_V qX5G'шv$l4/VS:I*_&BzP̖7,NAh=5:Xɥ&-Sҥb#\W 7 O_">ʻ!)=~kmW!x͈h*k))Oy\( :SP íöU~rbB: W y^#g郛ʻOG@aGY{5[{Ӓrᵂ;5b5M#V,W[ 4.Lxn\qCvݧA|O/eDw}H .3zs 6F Zɨcb"i6{.qdUd>"DKQgGSk%bϸwﰟg@(G2YL[.t>NB2Ǟ lJ.#1,zK;Z
+T69K{ISa,o:5{Gjs-!/GEP.w@j*}+:_foi, @mį,?14şT0= ݦuݼV[N'(8 -K{ILWV3ם Tug/jC`i(hETw1#Ni6rmeEeCpDݩݗ:RL5̴ 3P bSw`>fۼMvf/^9Ƥw;}La`@lPf]Ί d$7nqfXe
+9uY+J %9Fw(p?PDsHCFz0ci=P,Z[3|bo{PgDZٙZ
+o*#^rβ#B\+Kri=Yq6Бk?r=gX6ҭZjJr`;\vTR
+ϖ <N[7I{4U'!-~(Cpb0_
+9}nh8Ģ躓{Oȗ,P9EfplA@_2,~R2.g^o}n)ڄ]wMV{<I1E\8/eEuT#1k2-& PA
+f}i@mXUKMuNcuIoZztkQBFgU#5e9+4Ds9l[p~&V+ m6&ѷKgr:EQ@1DH0kyjjkG6`mohM]`gfOU_5C,Y`k5h]!jwۉnգ_ a8{``۔6%V@W%~[(
+GJLOLES,E!:br&3{)pdm',1x:_z 6;B%9%eՇyI]'4>&S-c3X.mRSJ餑,Jpmuِ/XěB6$pv!Wߍ0 W=ݶWBF!slh(/О_[eDbt(5"9X ,g|BLk:,'zgܢ{&"`?v Џ]B]{dZ1,7#YYJDCaI3:}.EI`}{7=q*{$ݹODb9,Glޓ@*[Ac3[Ӽiʺb"߇d:[;.H.'4l]3>|naFeC*%u͟|i6_QxBJ;;~C(Mi!{rQ^技i[\Y c+%3RܒeBPJC[-KUX'WKBmg&!n-`,LvxVg`iOR\S67vWNf
+~!ꌺ^T4a!-Ͼz=\s2?Z5:;+&HTR|<5.Y=nZsJb`믣5^Pf?,dX']޼?v1e>9q[o,h
+ν_1SCPv $=q#kx椤r!u\ PZK@0hP&2iŶM|_3%,4V֪BDS:<L
+!dLk.&cW>HVqKwu
+cbb<U{<]z>.QL/ LT*61ؠ`.9_8B)u^b;H"^ʈ  urv&g{qASJ58IX[^g|ccb:@=`uoh
endstream
endobj
1227 0 obj
<<
/Type /FontDescriptor
-/FontName /AHCECM+ArevSans-Oblique
+/FontName /NQSNVP+ArevSans-Oblique
/Flags 4
/FontBBox [-821 -298 1958 933]
/Ascent 749
@@ -10164,85 +10148,96 @@ endobj
endobj
1228 0 obj
<<
-/Length1 2640
-/Length2 17993
+/Length1 2626
+/Length2 17913
/Length3 0
-/Length 19446
+/Length 19361
/Filter /FlateDecode
>>
stream
-xڔP۶5Ӹ5K 8=!NxϾw'WǴ5XsLUI (szj:1;9:ԁ@S7 JQT@W7'G#^hH4=
-ʠg禍,i]'$HgX e2uʆ˜?F$Mwye[v&r#\7)׷>cOvTo9̙w Vn'WO -5$JyΛx,l\YCI!~n3|+D~7.; S5$+eHre$GteEz|阘[j_o&w~H*i'DZxX {bѓl2 QU$d *yoj
-gi9`LX2f]9u}3߯s Z6}FHL|s s~zěWюy4&J+UǸë=kȆT{ H$ o}N Wd0n7XHI* RO<*e
-$aKX} "DO57h? ]VUѸn26~|6J}Xn׊\y +c=IfǕF}>Q]v%@
-<IH%16aY&[/kMB5q<E<`$hH"?
-n곘?( [ڋ{E^W)n}8,0`*NיnAkFuzxbdkQd(te:=!&e .XP۔ԃJ goճ38#M[cGۉkf4EuIoͽ89-5ᨏ,%`?TI0;)ԔVS쉉۲a[%̲UyLӕIuT!Šqoq82>}&o;M%@nN4BW|/?Y r)0E]u~^s&0S<T1#Xi?PuޣiDQ]^՝w❒Nsݦ_ҭ렒nEIZrmF.䗡oq#,#֬=GT"2 ([=<.c%Pʢ阾91e"+)p -$`
-w09$96QBa5cU}{Q_%p=sALJ6#2F $Êx7&i:e DfMNdBT7Sw
-i qp\v2!A~{PYL`r^X<=9ڂ_{N=\j?BmnݨRhSw&AsYY&ֺ*j` NO腔{K-ֹ&ݽd}4$&F`Nc_E^n)u`@#;"٦&>(4gx"ҹW=Ӳv$y Gm3[4<qݾsp0,5b34vCm= /c* ,sNPJla,{G5V
-$&e|~zV$SZP(V[0Z?t}Bts,ǰ[62.C.#lIےfr[Vgj%0]MQ-ah4]ߵ5ggwgf
-Nak՛_
-liv Ofzc=sufSs_{ ǥP%iO662" gS[sl`c0R u(+)t+/Q(,gw؋MhIO ъ1ViՂs>fs- Y6KLy_P=N+8Kt:; {>rI:*b5N빇ptQؚK|`֚|fr34m~O~\PWԑƒ+ܯɫM\K}
-J\^IQd
-caM Vez' )P߲omnƃC[l0"o@*<}F0)(f'#90Q[YO(k!}lf<x;CNlXAX\ݐr LOU v9U< ;{CEAJ@p$Le^e.\CJ#Aٗz'l&rG R hT^AM8QJUQn;ё>Mf9
-1+EoCNȝ2>cKDi|nÆSS,{F%|Lh,Q+{otD(Be#;X7ޫh'Xgw{E
-_-g Idl3pG]X4i*z6.4N9'x`j0%r. ui@;C/ΓakC TYp.8ضqnv^
-U#ϑ.ńFےZдc'R7uJAzնt&aV@7J}MXǫ_Is$]Iύgq3q]0D.>"B
-7ǕoggL02-*5cQTl<?<ZL'ԴG+reɲ~CR'*%:8}RXyw8x χmt| n\U+ⵜL:4-_Ѿֽ&GQ|F;6ø՘83("H*(¹p5:I7_W.B*o
-7hŤ,}?7>8jyU.aʡ
-6K5-C%`
-8@J $ifRNnb$_UϤϗT)+214 wBoy.Gdj\wЖ
-$FPKD~&sY|h )ԍTgk?XŬm-,U^*wCk:#܍XxȭP11pd qku{ю5(,\ u~.[04c8_+:Y%Z3"BcYSG#gh;ȡ͹P EepC?dX! tZ/qThݎ{Hc Yv'W?SڝǷA:&|I| ˌ>(;1Sug"#qoÏvU-
-^=N۳8;Ay <Nen(}
-$Lt]J+糠1poϏ?QI igQڞ,W9-ŖE$
-:ì@ͮC0oΉ[ }0?k.Ώd~eY3}/әFcq-NCϙŠNI>{
-=M)U3;@ cT8^2&zYR[AƎm.{܇:eᤏI%Ql;V?]' ԭ;~fy)׃ YlEw"eLOGdy
-|6%R+k8 oINgNMRsy*;@.cEh
- l%9. 5vI|(_}5 U<D}Ԝz*BW)1qS)=iʻ,RI*4H{y.vWgUy[.0R7!ۛү Ei$L=Q;7_1xN F0fiC^?^:s{BsPzQ;||!3uwJꕾo[Z|Ō~n~ㄜ:ћ?%`ri
-b%\`g_fjx6?>&8R$
-9H"jwAYldA7Bo&bR)U1Sd6 i,\XuԈôOٻ07*( LlYq0>s~)e;6ٴ#WB<T:5sT/!x4xȼ8J)Siz]l m)`׽Pa m<Z]M^)|epļNWRۉxB6flpeuaEVz<qvyl_\U+ބ&v]X\׺t+|KW8w]x!c tSg|VEnRy ^ä8 )< ʱJP-竑3~:3JqM̛OS\>̅(w=W٩O|
-\IP6ޟYZg/d~aCkKI
-,E9WVO1(^,̞*1>ѭuÈ99 vEyo3)VxOB58̛'m7`zwI@B
-
-W
-2; ,;J=oc%\%s ^vBϘrLtx$+ S6`6/%1 C3
-&$6KmxL_0nޣRP>
-WˏH!W3 ޻L>CH&$a,X^VR!<KM! ]]SMZnojpD%x ɮ<cۜ&e ל
-*=uC 01G=W$l.~*33 V1ZPDg'@BXzѨ) ֫i3di㸔#0@x2CA`vpR#sF'DzV?Ca;&҈5ѩ)u,bW=َ:W}PCp/lWY]+z[iNfoP; ;lWP$*mi'ӚeaU",j*F/p<KPy8w1tTLd; U#JC 2&0;6}ŘA]/7D𕘍GHOkw+P6CzEEYf01}&F:!q'No|eCP^:#цq6s_*1zJyVV7a^ߝQ[\6pIF=TS*XLkbvx6ˠdX^3ښq;m)AϤo^6#]ߑųmP~ =ΛkA-UZk[2_=z^M.m}
-ܕHPb]AfEY[?@dݽaqP֋6BdاHx;lgo@@\FT$]M
-R:'2w2Y*yU%&.pXHjMRZs.`r8$\Yo1L#_~^~C5gDWǞ
-O!^ 93Ò[zcrcOOrvJ4Ԭ*삟).H%#SZpǶvQ$gK;$n@dM.}ORR
-(<@.c9d_C1-^EO9gmJJ7dB[I<Ab,J)7& '&CbyP*Un5ُZ՛ quUKU(Tb8h=A=h;5
-͠+$`Flp͋O^?}%_Gr%zg{2:[3yEۡ;c|,o}ӃOVKw X\2̆Ob/ ANc&rř&htUgqH!Hf2\?fᲠ7|H &PDТ^@JGއG$Ms>jƵeL9NFR<wg2b=1rKS]~B\XOw\]iYH\xEr0e>lu cO\j[ۏ7#zVd6nĻNXxFW
-zUjotXJ,ړ>Y2@ү5qVkIvڍ ಈVS"Jӟ:0Lm FMI#~D i[>fiRU}`dPir)ɟ)l=ϔK7s,]hh %zl2eN?4yFogAnU~s{⥹އNTM)sr:o $;}`X +ZhVU/Ap$.!, ԳI8R~er:2(ӏ?kLWOٳQxZ|6z.q#(߳8GLH£wP2?ъy
-'+(XC-,Ua|ָ_JSzC5`KZ!O$l+Ed|T%X04:W~dMG$ܓ)z2cpc|{7GhAoj1\2904梓!rAl4umk×vVͅ{0䷝cD98G5SCy25mP6{}j 1- =̬ϕ vvР.8chb:Qh٥P]>wў)iEhT^M Qp]CP g֪$[#˦>SXtᗁm4y9nɍcu!A1UC櫷ǷW PV@8Ir91jxcY?Ԕ p-d;젉:ǟܮNz7Qc)Mu6y2 )ciD,M\0G SM<3g}[6JUmoun5Bc?'6 ¯a3,B#`^Yy2":ty#=_%L ~ěp,\ݶi_)A]!pɳa^3@.n$9O3wew\nUQ(Gi ѹ"Ud}
-~i}X8)ǝv ̯I[JY^B-THv_7:
-پ3JTK
-ϒ.Ұ2Α֩v2Sh^{bƣvn@QqT|yso<{sPflԜlUGԺC7v<;~zvcƻH֙%-B7tqN1~q|ZJ $M'vu]g!ʨ2&KD $}Re9[.1,<6c^G)'0hH
-=9vO=auw!O]f=f Ti6s[֥PPp:J@#= lb7B_{bvGxi _)d+A :O-i4iQ!2U.:,xhw nc2t7*zkQɜ*$J82sc^Xi8~P˾Y5X/ǤX˵ctGDmƏC͠G=;~ۛ3eA4[dɦd1eɛ}aTWg8xmi݋w!L"1ʛ-jreO[D+su.0k2Q슆:?іĄa[BY'<3D/iiHlMH2iӓOJ DT9
-s`>߂0)PdQt]{~Z;L)uL&uIg)+تQ@JI[6PP3"C+=`ԕ-!Mdf{YiPRm!vUBIX qy{ـb_J0Y c+<lعaTGt*nYy7K;XPfaEɤ"V>S:5o?U-vx_Q
-yX蠍`s
-puԕcRz<>"9yg
-Y<
-Tl5wYh08Q4@nt@5?ɍt>Kd%3\EQ a"yi=STKT`J,v]c`n)ϸ<3e#CPY4re.q&J
-)+,/RY
-41AoP4.yG;ߢn$o|<:xtIa۳ i^} .Eu?
-N}( OA`>3+:Ҵ9|')])
-gʽ3
-MNk w]CH]Te;h*ry|'M\չd.k"YQ;5kɞo<D\xSS]ӺyH4$0G^` ҉*,/9 e={/(‡Csΐ>{M-JlDHє?I"hpv'`5a@'}p][]<ls8H+u
-
-&KFC#LZYQ(r&L:+)4̰҉2D㷁za{ cf5AԈ
-JȋPsAb]@$9÷QmYzt|`޹4DUć%gQ*sa) Z|%u
-ʼm/RaiZM_ڣ`7m;ҡxU6tGQa3Kb?q
-E/8(*z؝ID
-!MQ 8`L _ ݃/l;B#( #D4b 0!_R(Ya:SS6C9l?߫ ghܣYF!1%Η6AmccrXe56h]aKFf9{x^Җ4w#T'- շ^"%<ZGǭp
-kE"@IƋ2~D15a;S}ѤsU{^N)ȂzxkޟhbAJUW9t%bC mr3]xA_3{)G%n1: >2M8~[ל>Lf0̰苦=^/=%2*U hCQRJ( *LnTݐXJ>! zpE1gYM'B+Jٱz۵8c@9'4[v6%K J
-luu@oѮJ(,C(ca\> UЖvWwCUEd%x+hAME; bNcyc2X9BrҌA{e`zV-VD0ՌTzc`}6Uаpɭ4Dț
+xڔT]ٶ-{Ѝqw @p=8:uo%uߠCs̵TEQ (uz:199:Ԁ@S7 RQZ@W7'G#^hH4<
+ fj*GH,KE)'W+qhݝ-A.˿\LnL@wfZ̒N@Gw7r%l\ }jihW]3PVbA&6+;
+GZ?j۸IټZظ[5-6@'70pv6v@77
+
+5vf4s55^i]8@$ANe_dYY@XA-+ 3{S?r@YEXxQ/ ? ov:Al M
+weNP#Z (7)8udcq&m $b "tsCRk +H 7SГǹur#TbǮA I}~U_EsWy-m@l =aeɜ?Զ>Vqݛ B=w&>%<2Ϸ<i$TƬ!! $㸽x:`100 dϘ.h/Y'e{$ӥPw$z;<rQ! (W>Zy >WP僙` @nE-|vYՉa/8.^aF[5h)/%:!QCˇK4Ph>*އK
+Fu?b(R5} Wtxh%VKi T!%zȚ&24.=V)XҊ9Uυ>gXiL9]^2^A:Ǭ*h$ j?Qxδh$ ~EpovLPhr
+9嫝h(I5]$b)Hإ"_Dt11kL؛gsS 5TN}RŕyM a4mPܣE-C\Clr؎y6|9tHV
+
+a. %&VߡP]l"GU n?L
+$qcH}
+ɘm545[5TAc2-nlQյR[5o@P#VXuytUµgeE \8HZyC\^7*ni9E%fv5xL[V5X4^GzJ( !VёSd2HgU 0'.ݞIvbIZ}wDA#SXq/~RL[= f$%kzF}5!{\@KT1c
+/s`u[WpeC0׵㆗el5i!~.93B`!ɆGz)x;~5ÖyGa쒨.[͘J;QDCR5, hoN@ShMߐo+cHVhPtܜ;l
+=K M{ +YPD ʜƥá}n9NnybR8t #yTΔ=Yr|j(VgU!h^՘ߞFJB- ,c"):BN ecp2~Yէpim5M(5o1Ճ8V W<pEX=
+tG n O_Tu4[&!Pf}?)L V{B͌֬8?;WT2 G",$%6
+6t!63fwC@!fFt=}CC]]ETe4't^$~ކRΌkF(daF4P*y\
+=nHD:r 1<b<mb'6a߄vEFc*}ZbGkyF!W$vdZ',dc9E.۞uih8#3(gaueSЋP2Zty˄86bxDzаۡ,0J]c4>EUmd*q׏g s#,p][l: @N2Jkz{EH2M7RL*Jvl.C\3BPssi/*2u%6}萴#?X@6OA4$kw|t,Wd#wΔP +#g؝vRx4^ SJ+4wc `T
+9OTMG}:=R@vgz{2/u盡ȺȊgwsh:Pc='~_kƉt<ke_s=BBL)weJ/5~Lўd <XUf V]+ˤM7iY|;s@#u}u:Ye>Vpc= 33!EmYI׎ D9!8<廲B~ʝkAP74o}![99VS)<n,]_ xq):t 9>݂& P'BN
+U-@Fy)FB@)2FOz[N(>F™rc1ق~Ι1C$xF =5!cYƕ
+K*̶̢-\../moeD3$,;E:X>q0p2KRv2@c$6 ^ƶD ˜R:qx5K<ܩ$st:I9qxM\+Jʐ;N[}Fq%U5 ]6MHs3O/J2eD0Naڥ\2d`!AAvHYQ1sY'1v)Ѽ/YnB+bU_MZ5,^ж Q_L#?jme"L6Ϥq3e:4
+| mAHvZ*Kn{O͟ )%Ufw}bԑ舘ezg~œ-~6J4 = a RHN[A:/DNA⇓ :vB0֚^*Ƭ_YݥM]צ9t(W2P7ʾVeoAg>;%
+ABJ0`:Di(Mg
+7䈟= X5rG2itoTj$iztfys̅;Kd-;C0lhSDR<jtR(*p~YQ0
+whL87'Ct^Áy>ή$<J HF٧{X
+NB1u8)  J>[TU.(Ln[ vSS}m^~oy7-
+m
+KlHдO1 +$$m#.o^_^> sO%JsS5? C@@DKl?3hGT,J įćp稜LòECA"6Bɯӝލ$W|m++\nQ +_t;#К<DtbGN2N/%{"߷;/kt|*H4@
+) vK{2!ϻs% { oMX 8kvyCԏfR[?FhMa6=*L#8G8`c"K^$ЇnŠL0\jLK%};҆`ynzr3[ČrM-Ο2ʲzg3f12qog~
+B[c%V](=Pgryas2RLqXB3
+ J<iӦGHաC
+j UV0uZ]Ѣˢꈜ R6DlYD(T%T1sg=. 1ziڹ9ѷ^CtOTz% rG@Ҙ0aʫl% rlUd,4ZE
+R;Q)y͟m{9'6K=E8|v`HRVeKT#0DQ;~DIna-[#,v^jIPE(lNlY ]"WiwDy_BGVלhkT"PZ=^Y?vpL)ԟ&/gx=z0Lli梻G"I;2{lVx6wI/ B!ej~QĹi+!6l`lMa!y^m[m E#m*h}CQ3Nrh˱+?=Z#n;ؘ6QRx:a'p1 }!?,p/
+aSt1]NBҋ*
+Nʢ;3ʌ:ci
+_Y޲?GZc=a{)\kc; yò"ӫN]tS|*ISےNogǬ;Z1CL6 F
+G6T[a}ϠŽYBDlT b\f飰ެi\ e(DU߉y6WM/𕦤[e\0E5q\
+|X:od2ެzXl~LjK=wV֏R$͍u5EA'HkTC'iuzjT4iZq)X.'{{挿K|À :
+pO1NYYȹz7K1yMcr I MTy.m$PZE(?E=LJWf#xE
+!VC8xifwW]
+Q4(E^{d;C}ƛkIC3[/|>AU9t#̖V'Yef)'nT9^l눹4E$)e^-8ZcaꚗK$Xā݋[=1t`x8S+.2UctWYZN1T~-qX ԨO3]4|) wdyV`aAÁ7R2>K$[]Q]>zˆ08j<U^LdpG Mxv5 JCݸB|?-lQč~= ?ja3;b`Ci$Ҙe4{os-*֡
+;LH -A/q[g~h_='Q#8I)Wi+=30xd<ҋ>rۇCmՅvlh0 ?KN;u$
+/NsaxyqL7"M}f;6. ZPQ:+hc2߉Rf
+nI 8t3ы
+"wzM89$?4,\VZRt#յC_}_G xGN[6raux^HZ/Xh^P 1a\䙒Fׂ}O{cl2;fR|-\|D4
+S}ĵ"EjakRñ~Rr)JR.1Lu֠G Mfa%_e 깳X|6~qtKC N[Ai9.49Aܢ;Mgɥz"4MSQ dzX$̙R8;bx22&y܋\dr%0-;EX@t>'0 % Yv-#oz-o
+f[M!C"pjd%?|GxpRy<%}ǣkaFVsKxDAZ$zUv #楛6r$QF+rEl5]LIͣy
+ 1
+śE/e|PsdJ+/zCyE%;Hv8EqHO QLpv dFI)W'ig-UHEUGZu!|O`rp~شt\[O&
+}/Ķ: b0N͒tn[
+`a.f1UK)B  nnɋr)aySrJ`99LrW܎0mW]IDŽ}*hd~~4 = &@
+ ?Wk M/w5|F R{#ڒO%7w9h<0sщSȟ>Q2ݍ ѝiL'u$PĮ[DĒC $$S H꘮%-+F"!Y<Q{MzLxAǃ1_Z I#s=ј͋
+ռCK(HJd. t\#Λ82P#5:0p[]b4R
+$aUh4J} 5kˮT~U^STHhFdԘé
+D8 0Ge?-SW u$J3v>$jVv*m3㏷QyJԗQs;E]v,jaE*?T,w"<ZX8 ougVyR:;sCC<1oD{N. "NH"\ baM'X3X٠+!A4a'[tŢ]Fa)3o.fox!
+XF|wc3DBB?= ,1gwa(3 qtqNO+'?`kX<QGRO hMd6R .Y5\+JѺ3W%G!+y]BX̤+Zk7W0jtn-I[Sc\PiF5Ugc
+=4#)-34~\'2LRlN}"`e_xˮ7]r?1% ?'+._gUV:.Ƕ0HV%'I''ȧ%ru.Y< GtI᳴Z8ᣎ'AIi[rwЦ>>0\OW>ӑ(
+F:(bĄkz݂VvN41c8RNj?p=Fմ
+70fk@>h伢Yy^- īUrqPVWL}#3T'f
+~;[툅Na~$ZCI="
+Yo@>v-6lě~&%g@_r_*Ћ5$ _Y<W*|3vyܲSLqW7uЮC 2P j
+ ,:#& V:pAE><~ILs+RY@ ɴoAQ niv:efUpx]4$MҲE_ds D]^mCK[4\hǀ=d\ǵC6 o!vq.cuNîfb2W~O.1.HSss3cV$T_pT G]N?A)wS H@R&>vFj[B~>`O s$)@,㔟ɯ/=Xsi}Ǐ>[kj%cErO+DήRf懁. [.!ڥHb32Y5ra~H ݊GhC"R;]RCQhמ'Av1Ib#eB*̜9#t9&:&xI$RNN\BK'T唐\|`b%hŃ[tRW%-#%6|6~`ZB`v8#"- \UX$“NkK0]Ys̢9kvZkAGf't[Ϣ5ҋEW! 0懃vOu&!$xrؙF<|_MݬN:%:gUĝla.?HHpLg踍`PlEO
+, ɹve\>g:gY#M=Y숤S hŮG9}ENEM7ZNXMk+0cHx(]T3(Q8Vcܥ K/{c 6\i+iw`Ҫ PtLx&Y1N }8ge
+t瘼h>uH;lL#Ê4{6"NZN}
+"8FJB }=cO=odg7"c;%>p! +$x!</9axqcw=*2o-dSZ/P\FR$Ue ZOOh%v0ߢ~P9-q( jCBt8SE7+BD}2m=a_9iI:ThjINlvmGR}/+*p]re 'RQgN$SN73_g}pطdOiy5zhVI>:jFG7`ma] /`1.a]v}
+PQ>~FvvΫ
+?-ٛfyO%M*NsiFI0ȟːks8΅Y}׊R?ďB
+هTbKd׬cчi"Yuy: __8f4@OGuȖ**~g %H'#F`\ @ eq"0նq6zTlK
+._-_ڣ(UWfe 82&]~Y-Ŝ@=T+Z͠ #bųڹ iPgx7cf+ջ I RژboTsii9+zѭS=8^@p<ܘŽH=\AtF7Йz8f/!
+mc*RKd1ywflڃCB>/".,-soo^F67.4P|ۯ
+ ^tq^b7ynW{hO4Kc 0?|tȦWUw6 ".TR/OS+(Ģ!/z+E
+w*%y9uyM! =t,٪fkB1%2Rt%?%xv;_3*~O d*A-θuMz9"O,הyiV W#4Я3*M45\:/1&a!S9#
+Bjgq kԅxoZlYU\Fڔ@,BiifL,%Ba2ƵTG HS잾SqR?[t4cW
+khl?XeڬPB$+KɌPv"Zx%)y(zy-ރG탦sΚ ^ (diFqCvq.iW,6)::h -1 WڝA 5\*JVr^tʿbe*#<e-" ;иFS|߬v0͘4rZ(Q&[
+ow"I3V/=>V_,,P%T!8r>7VU k@B4rr8#
+y["LXa}ֿl2h6XRGڳUPؿ*.mAFuP
+x_n=cfI qWwY)
+FSk<|0ΘJa1?xr(c`*f9X--,+cU(J
endstream
endobj
1229 0 obj
<<
/Type /FontDescriptor
-/FontName /IDISUM+ArevSans-Roman
+/FontName /XBZHPU+ArevSans-Roman
/Flags 4
/FontBBox [-737 -298 1951 933]
/Ascent 751
@@ -10565,7 +10560,7 @@ endobj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /IDISUM+ArevSans-Roman
+/BaseFont /XBZHPU+ArevSans-Roman
/FontDescriptor 1229 0 R
/FirstChar 34
/LastChar 123
@@ -10577,7 +10572,7 @@ endobj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /IDISUM+ArevSans-Roman
+/BaseFont /XBZHPU+ArevSans-Roman
/FontDescriptor 1229 0 R
/FirstChar 2
/LastChar 248
@@ -10589,7 +10584,7 @@ endobj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /AHCECM+ArevSans-Oblique
+/BaseFont /NQSNVP+ArevSans-Oblique
/FontDescriptor 1227 0 R
/FirstChar 2
/LastChar 148
@@ -12293,8 +12288,8 @@ endobj
1320 0 obj
<<
/Author()/Title()/Subject()/Creator(LaTeX with hyperref)/Producer(pdfTeX-1.40.19)/Keywords()
-/CreationDate (D:20190705222139+01'00')
-/ModDate (D:20190705222139+01'00')
+/CreationDate (D:20200315191456Z)
+/ModDate (D:20200315191456Z)
/Trapped /False
/PTEX.Fullbanner (This is MiKTeX-pdfTeX 2.9.6870 (1.40.19))
>>
@@ -12302,1331 +12297,1331 @@ endobj
xref
0 1321
0000001187 65535 f
-0000927148 00000 n
-0000927168 00000 n
-0000927188 00000 n
+0000927900 00000 n
+0000927920 00000 n
+0000927940 00000 n
0000000015 00000 n
-0000045816 00000 n
-0001038418 00000 n
+0000046327 00000 n
+0001039259 00000 n
0000000060 00000 n
0000000090 00000 n
-0000045875 00000 n
-0001038346 00000 n
+0000046386 00000 n
+0001039187 00000 n
0000000140 00000 n
0000000174 00000 n
-0000045934 00000 n
-0001038260 00000 n
+0000046445 00000 n
+0001039101 00000 n
0000000225 00000 n
0000000264 00000 n
-0000045994 00000 n
-0001038150 00000 n
+0000046505 00000 n
+0001038991 00000 n
0000000315 00000 n
0000000347 00000 n
-0000046053 00000 n
-0001038076 00000 n
+0000046564 00000 n
+0001038917 00000 n
0000000403 00000 n
0000000437 00000 n
-0000046113 00000 n
-0001038002 00000 n
+0000046624 00000 n
+0001038843 00000 n
0000000493 00000 n
0000000531 00000 n
-0000049959 00000 n
-0001037874 00000 n
+0000050470 00000 n
+0001038715 00000 n
0000000577 00000 n
0000000611 00000 n
-0000050019 00000 n
-0001037762 00000 n
+0000050530 00000 n
+0001038603 00000 n
0000000662 00000 n
0000000706 00000 n
-0000050079 00000 n
-0001037650 00000 n
+0000050590 00000 n
+0001038491 00000 n
0000000762 00000 n
0000000792 00000 n
-0000055056 00000 n
-0001037576 00000 n
+0000055567 00000 n
+0001038417 00000 n
0000000846 00000 n
0000000869 00000 n
-0000055116 00000 n
-0001037489 00000 n
+0000055627 00000 n
+0001038330 00000 n
0000000923 00000 n
0000000947 00000 n
-0000055176 00000 n
-0001037402 00000 n
+0000055687 00000 n
+0001038243 00000 n
0000001001 00000 n
0000001025 00000 n
-0000055236 00000 n
-0001037315 00000 n
+0000055747 00000 n
+0001038156 00000 n
0000001079 00000 n
0000001110 00000 n
-0000055356 00000 n
-0001037228 00000 n
+0000055867 00000 n
+0001038069 00000 n
0000001164 00000 n
0000001190 00000 n
-0000059338 00000 n
-0001037141 00000 n
+0000059849 00000 n
+0001037982 00000 n
0000001244 00000 n
0000001273 00000 n
-0000059458 00000 n
-0001037054 00000 n
+0000059969 00000 n
+0001037895 00000 n
0000001327 00000 n
0000001351 00000 n
-0000063557 00000 n
-0001036967 00000 n
+0000064203 00000 n
+0001037808 00000 n
0000001405 00000 n
0000001432 00000 n
-0000063678 00000 n
-0001036880 00000 n
+0000064324 00000 n
+0001037721 00000 n
0000001486 00000 n
0000001531 00000 n
-0000063799 00000 n
-0001036793 00000 n
+0000064445 00000 n
+0001037634 00000 n
0000001586 00000 n
0000001635 00000 n
-0000067192 00000 n
-0001036706 00000 n
+0000067931 00000 n
+0001037547 00000 n
0000001690 00000 n
0000001737 00000 n
-0000067313 00000 n
-0001036632 00000 n
+0000068050 00000 n
+0001037473 00000 n
0000001792 00000 n
0000001837 00000 n
-0000070574 00000 n
-0001036545 00000 n
+0000071326 00000 n
+0001037386 00000 n
0000001893 00000 n
0000001923 00000 n
-0000070634 00000 n
-0001036458 00000 n
+0000071386 00000 n
+0001037299 00000 n
0000001979 00000 n
0000002014 00000 n
-0000070694 00000 n
-0001036384 00000 n
+0000071446 00000 n
+0001037225 00000 n
0000002070 00000 n
0000002097 00000 n
-0000077429 00000 n
-0001036254 00000 n
+0000078181 00000 n
+0001037095 00000 n
0000002149 00000 n
0000002191 00000 n
-0000077490 00000 n
-0001036136 00000 n
+0000078242 00000 n
+0001036977 00000 n
0000002248 00000 n
0000002287 00000 n
-0000077551 00000 n
-0001036057 00000 n
+0000078303 00000 n
+0001036898 00000 n
0000002342 00000 n
0000002366 00000 n
-0000090716 00000 n
-0001035964 00000 n
+0000091468 00000 n
+0001036805 00000 n
0000002421 00000 n
0000002446 00000 n
-0000100397 00000 n
-0001035885 00000 n
+0000101149 00000 n
+0001036726 00000 n
0000002501 00000 n
0000002526 00000 n
-0000100519 00000 n
-0001035767 00000 n
+0000101271 00000 n
+0001036608 00000 n
0000002583 00000 n
0000002613 00000 n
-0000100580 00000 n
-0001035702 00000 n
+0000101332 00000 n
+0001036543 00000 n
0000002668 00000 n
0000002699 00000 n
-0000106473 00000 n
-0001035571 00000 n
+0000107225 00000 n
+0001036412 00000 n
0000002751 00000 n
0000002801 00000 n
-0000106534 00000 n
-0001035453 00000 n
+0000107286 00000 n
+0001036294 00000 n
0000002858 00000 n
0000002887 00000 n
-0000106595 00000 n
-0001035374 00000 n
+0000107347 00000 n
+0001036215 00000 n
0000002942 00000 n
0000002966 00000 n
-0000109515 00000 n
-0001035295 00000 n
+0000110267 00000 n
+0001036136 00000 n
0000003021 00000 n
0000003046 00000 n
-0000109637 00000 n
-0001035177 00000 n
+0000110389 00000 n
+0001036018 00000 n
0000003103 00000 n
0000003133 00000 n
-0000109698 00000 n
-0001035112 00000 n
+0000110450 00000 n
+0001035953 00000 n
0000003188 00000 n
0000003219 00000 n
-0000113779 00000 n
-0001034981 00000 n
+0000114531 00000 n
+0001035822 00000 n
0000003271 00000 n
0000003315 00000 n
-0000113840 00000 n
-0001034863 00000 n
+0000114592 00000 n
+0001035704 00000 n
0000003372 00000 n
0000003411 00000 n
-0000113901 00000 n
-0001034784 00000 n
+0000114653 00000 n
+0001035625 00000 n
0000003466 00000 n
0000003490 00000 n
-0000148538 00000 n
-0001034691 00000 n
+0000149290 00000 n
+0001035532 00000 n
0000003545 00000 n
0000003570 00000 n
-0000172162 00000 n
-0001034612 00000 n
+0000172914 00000 n
+0001035453 00000 n
0000003625 00000 n
0000003650 00000 n
-0000182962 00000 n
-0001034480 00000 n
+0000183714 00000 n
+0001035321 00000 n
0000003707 00000 n
0000003737 00000 n
-0000183023 00000 n
-0001034401 00000 n
+0000183775 00000 n
+0001035242 00000 n
0000003792 00000 n
0000003819 00000 n
-0000187318 00000 n
-0001034308 00000 n
+0000188070 00000 n
+0001035149 00000 n
0000003874 00000 n
0000003904 00000 n
-0000187439 00000 n
-0001034215 00000 n
+0000188191 00000 n
+0001035056 00000 n
0000003959 00000 n
0000003985 00000 n
-0000187560 00000 n
-0001034136 00000 n
+0000188312 00000 n
+0001034977 00000 n
0000004040 00000 n
0000004071 00000 n
-0000195299 00000 n
-0001034043 00000 n
+0000196051 00000 n
+0001034884 00000 n
0000004128 00000 n
0000004160 00000 n
-0000200686 00000 n
-0001033964 00000 n
+0000201438 00000 n
+0001034805 00000 n
0000004217 00000 n
0000004254 00000 n
-0000203923 00000 n
-0001033833 00000 n
+0000204675 00000 n
+0001034674 00000 n
0000004306 00000 n
0000004360 00000 n
-0000203984 00000 n
-0001033715 00000 n
+0000204736 00000 n
+0001034556 00000 n
0000004417 00000 n
0000004456 00000 n
-0000204044 00000 n
-0001033636 00000 n
+0000204796 00000 n
+0001034477 00000 n
0000004511 00000 n
0000004535 00000 n
-0000223908 00000 n
-0001033557 00000 n
+0000224660 00000 n
+0001034398 00000 n
0000004590 00000 n
0000004618 00000 n
-0000228145 00000 n
-0001033439 00000 n
+0000228897 00000 n
+0001034280 00000 n
0000004675 00000 n
0000004705 00000 n
-0000228206 00000 n
-0001033374 00000 n
+0000228958 00000 n
+0001034215 00000 n
0000004760 00000 n
0000004791 00000 n
-0000237347 00000 n
-0001033243 00000 n
+0000238099 00000 n
+0001034084 00000 n
0000004843 00000 n
0000004903 00000 n
-0000237408 00000 n
-0001033125 00000 n
+0000238160 00000 n
+0001033966 00000 n
0000004960 00000 n
0000004999 00000 n
-0000237469 00000 n
-0001033046 00000 n
+0000238221 00000 n
+0001033887 00000 n
0000005054 00000 n
0000005078 00000 n
-0000244625 00000 n
-0001032967 00000 n
+0000245377 00000 n
+0001033808 00000 n
0000005133 00000 n
0000005158 00000 n
-0000248707 00000 n
-0001032849 00000 n
+0000249459 00000 n
+0001033690 00000 n
0000005215 00000 n
0000005245 00000 n
-0000248768 00000 n
-0001032784 00000 n
+0000249520 00000 n
+0001033625 00000 n
0000005300 00000 n
0000005331 00000 n
-0000256296 00000 n
-0001032653 00000 n
+0000257048 00000 n
+0001033494 00000 n
0000005383 00000 n
0000005440 00000 n
-0000256357 00000 n
-0001032535 00000 n
+0000257109 00000 n
+0001033376 00000 n
0000005497 00000 n
0000005536 00000 n
-0000256418 00000 n
-0001032456 00000 n
+0000257170 00000 n
+0001033297 00000 n
0000005591 00000 n
0000005615 00000 n
-0000280060 00000 n
-0001032363 00000 n
+0000280812 00000 n
+0001033204 00000 n
0000005670 00000 n
0000005695 00000 n
-0000285634 00000 n
-0001032284 00000 n
+0000286386 00000 n
+0001033125 00000 n
0000005750 00000 n
0000005775 00000 n
-0000288814 00000 n
-0001032166 00000 n
+0000289566 00000 n
+0001033007 00000 n
0000005832 00000 n
0000005862 00000 n
-0000288876 00000 n
-0001032101 00000 n
+0000289628 00000 n
+0001032942 00000 n
0000005917 00000 n
0000005948 00000 n
-0000292106 00000 n
-0001032009 00000 n
+0000292858 00000 n
+0001032850 00000 n
0000006000 00000 n
0000006048 00000 n
-0000296253 00000 n
-0001031878 00000 n
+0000297005 00000 n
+0001032719 00000 n
0000006100 00000 n
0000006163 00000 n
-0000296315 00000 n
-0001031760 00000 n
+0000297067 00000 n
+0001032601 00000 n
0000006220 00000 n
0000006259 00000 n
-0000296377 00000 n
-0001031681 00000 n
+0000297129 00000 n
+0001032522 00000 n
0000006314 00000 n
0000006338 00000 n
-0000304420 00000 n
-0001031588 00000 n
+0000305172 00000 n
+0001032429 00000 n
0000006393 00000 n
0000006418 00000 n
-0000310414 00000 n
-0001031509 00000 n
+0000311166 00000 n
+0001032350 00000 n
0000006473 00000 n
0000006498 00000 n
-0000313747 00000 n
-0001031391 00000 n
+0000314499 00000 n
+0001032232 00000 n
0000006555 00000 n
0000006585 00000 n
-0000313809 00000 n
-0001031326 00000 n
+0000314561 00000 n
+0001032167 00000 n
0000006640 00000 n
0000006671 00000 n
-0000317356 00000 n
-0001031195 00000 n
+0000318108 00000 n
+0001032036 00000 n
0000006724 00000 n
0000006772 00000 n
-0000320942 00000 n
-0001031091 00000 n
+0000321694 00000 n
+0001031932 00000 n
0000006830 00000 n
0000006860 00000 n
-0000321004 00000 n
-0001031026 00000 n
+0000321756 00000 n
+0001031867 00000 n
0000006916 00000 n
0000006947 00000 n
-0000325702 00000 n
-0001030895 00000 n
+0000326454 00000 n
+0001031736 00000 n
0000007000 00000 n
0000007046 00000 n
-0000325764 00000 n
-0001030777 00000 n
+0000326516 00000 n
+0001031618 00000 n
0000007104 00000 n
0000007143 00000 n
-0000325826 00000 n
-0001030698 00000 n
+0000326578 00000 n
+0001031539 00000 n
0000007199 00000 n
0000007223 00000 n
-0000336003 00000 n
-0001030605 00000 n
+0000336755 00000 n
+0001031446 00000 n
0000007279 00000 n
0000007304 00000 n
-0000341032 00000 n
-0001030526 00000 n
+0000341784 00000 n
+0001031367 00000 n
0000007360 00000 n
0000007385 00000 n
-0000341157 00000 n
-0001030408 00000 n
+0000341909 00000 n
+0001031249 00000 n
0000007443 00000 n
0000007473 00000 n
-0000341219 00000 n
-0001030343 00000 n
+0000341971 00000 n
+0001031184 00000 n
0000007529 00000 n
0000007560 00000 n
-0000343647 00000 n
-0001030251 00000 n
+0000344399 00000 n
+0001031092 00000 n
0000007613 00000 n
0000007667 00000 n
-0000348453 00000 n
-0001030134 00000 n
+0000349205 00000 n
+0001030975 00000 n
0000007720 00000 n
0000007772 00000 n
-0000348515 00000 n
-0001030016 00000 n
+0000349267 00000 n
+0001030857 00000 n
0000007830 00000 n
0000007869 00000 n
-0000348577 00000 n
-0001029937 00000 n
+0000349329 00000 n
+0001030778 00000 n
0000007925 00000 n
0000007949 00000 n
-0000358795 00000 n
-0001029858 00000 n
+0000359547 00000 n
+0001030699 00000 n
0000008005 00000 n
0000008030 00000 n
-0000358920 00000 n
-0001029740 00000 n
+0000359672 00000 n
+0001030581 00000 n
0000008088 00000 n
0000008118 00000 n
-0000358982 00000 n
-0001029675 00000 n
+0000359734 00000 n
+0001030516 00000 n
0000008174 00000 n
0000008205 00000 n
-0000366495 00000 n
-0001029543 00000 n
+0000367247 00000 n
+0001030384 00000 n
0000008252 00000 n
0000008298 00000 n
-0000366557 00000 n
-0001029464 00000 n
+0000367309 00000 n
+0001030305 00000 n
0000008350 00000 n
0000008410 00000 n
-0000371247 00000 n
-0001029371 00000 n
+0000371999 00000 n
+0001030212 00000 n
0000008462 00000 n
0000008496 00000 n
-0000371372 00000 n
-0001029278 00000 n
+0000372124 00000 n
+0001030119 00000 n
0000008548 00000 n
0000008582 00000 n
-0000371434 00000 n
-0001029185 00000 n
+0000372186 00000 n
+0001030026 00000 n
0000008634 00000 n
0000008670 00000 n
-0000371496 00000 n
-0001029092 00000 n
+0000372248 00000 n
+0001029933 00000 n
0000008722 00000 n
0000008750 00000 n
-0000377081 00000 n
-0001028974 00000 n
+0000377833 00000 n
+0001029815 00000 n
0000008802 00000 n
0000008856 00000 n
-0000377143 00000 n
-0001028895 00000 n
+0000377895 00000 n
+0001029736 00000 n
0000008913 00000 n
0000008947 00000 n
-0000377267 00000 n
-0001028802 00000 n
+0000378019 00000 n
+0001029643 00000 n
0000009004 00000 n
0000009038 00000 n
-0000384237 00000 n
-0001028723 00000 n
+0000384989 00000 n
+0001029564 00000 n
0000009095 00000 n
0000009128 00000 n
-0000385958 00000 n
-0001028590 00000 n
+0000386710 00000 n
+0001029431 00000 n
0000009175 00000 n
0000009203 00000 n
-0000386019 00000 n
-0001028511 00000 n
+0000386771 00000 n
+0001029352 00000 n
0000009255 00000 n
0000009286 00000 n
-0000923003 00000 n
-0001028432 00000 n
+0000923755 00000 n
+0001029273 00000 n
0000009338 00000 n
0000009385 00000 n
-0000926934 00000 n
-0001028352 00000 n
+0000927686 00000 n
+0001029193 00000 n
0000009432 00000 n
0000009468 00000 n
-0000014944 00000 n
-0000015185 00000 n
+0000014946 00000 n
+0000015187 00000 n
0000009518 00000 n
-0000015063 00000 n
-0000015124 00000 n
-0001024115 00000 n
-0001025344 00000 n
-0001025518 00000 n
-0001024288 00000 n
-0001025667 00000 n
-0000016048 00000 n
-0000015807 00000 n
-0000015348 00000 n
-0000015926 00000 n
-0001023944 00000 n
-0000015987 00000 n
-0001024988 00000 n
-0000017404 00000 n
-0000017590 00000 n
-0000017777 00000 n
-0000017963 00000 n
-0000018149 00000 n
-0000018359 00000 n
-0000018554 00000 n
-0000018749 00000 n
-0000018907 00000 n
-0000019120 00000 n
-0000019315 00000 n
-0000019510 00000 n
-0000019766 00000 n
-0000017177 00000 n
-0000016198 00000 n
-0000019705 00000 n
-0000929145 00000 n
-0001024634 00000 n
-0000923065 00000 n
-0000022205 00000 n
-0000022355 00000 n
-0000022510 00000 n
-0000022664 00000 n
-0000022818 00000 n
-0000022979 00000 n
-0000023140 00000 n
-0000023290 00000 n
-0000023444 00000 n
-0000023605 00000 n
-0000023764 00000 n
-0000023923 00000 n
-0000024083 00000 n
-0000024243 00000 n
-0000024403 00000 n
-0000024561 00000 n
-0000024721 00000 n
-0000024881 00000 n
-0000025041 00000 n
-0000025202 00000 n
-0000025362 00000 n
-0000025523 00000 n
-0000025684 00000 n
-0000025845 00000 n
-0000026006 00000 n
-0000026161 00000 n
-0000026321 00000 n
-0000026481 00000 n
-0000026641 00000 n
-0000026801 00000 n
-0000026961 00000 n
-0000027121 00000 n
-0000027276 00000 n
-0000027437 00000 n
-0000027596 00000 n
-0000027756 00000 n
-0000027917 00000 n
-0000028076 00000 n
-0000028230 00000 n
-0000028390 00000 n
-0000028550 00000 n
-0000028710 00000 n
-0000028870 00000 n
-0000029031 00000 n
-0000029191 00000 n
-0000029351 00000 n
-0000029511 00000 n
-0000029671 00000 n
-0000029832 00000 n
-0000029993 00000 n
-0000030145 00000 n
-0000030306 00000 n
-0000030466 00000 n
-0000030625 00000 n
-0000030786 00000 n
-0000030946 00000 n
-0000031100 00000 n
-0000031258 00000 n
-0000031416 00000 n
-0000033774 00000 n
-0000031635 00000 n
-0000021602 00000 n
-0000019943 00000 n
-0000031574 00000 n
-0000033935 00000 n
-0000034094 00000 n
-0000034249 00000 n
-0000034409 00000 n
-0000034569 00000 n
-0000034729 00000 n
-0000034889 00000 n
-0000035050 00000 n
-0000035210 00000 n
-0000035365 00000 n
-0000035519 00000 n
-0000035680 00000 n
-0000035840 00000 n
-0000035998 00000 n
-0000036158 00000 n
-0000036315 00000 n
-0000036475 00000 n
-0000036631 00000 n
-0000036793 00000 n
-0000036953 00000 n
-0000037109 00000 n
-0000037270 00000 n
-0000037431 00000 n
-0000037591 00000 n
-0000037752 00000 n
-0000037914 00000 n
-0000038075 00000 n
-0000038230 00000 n
-0000038386 00000 n
-0000038548 00000 n
-0000038708 00000 n
-0000038869 00000 n
-0000039031 00000 n
-0000039192 00000 n
-0000039341 00000 n
-0000039496 00000 n
-0000039651 00000 n
-0000039806 00000 n
-0000039961 00000 n
-0000040116 00000 n
-0000040270 00000 n
-0000040431 00000 n
-0000040591 00000 n
-0000040751 00000 n
-0000040901 00000 n
-0000041056 00000 n
-0000041211 00000 n
-0000041421 00000 n
-0000033259 00000 n
-0000031799 00000 n
-0000041360 00000 n
-0000045212 00000 n
-0000045404 00000 n
-0000045596 00000 n
-0000046234 00000 n
-0000045057 00000 n
-0000041585 00000 n
-0000045755 00000 n
-0001024460 00000 n
-0000046173 00000 n
-0000049392 00000 n
-0000049582 00000 n
-0000049742 00000 n
-0000050139 00000 n
-0000049237 00000 n
-0000046438 00000 n
-0000049898 00000 n
-0001025165 00000 n
-0001025785 00000 n
-0000054995 00000 n
-0000054742 00000 n
-0000055416 00000 n
-0000054603 00000 n
-0000050344 00000 n
-0000054934 00000 n
-0000055295 00000 n
-0000059024 00000 n
-0000059518 00000 n
-0000058885 00000 n
-0000055593 00000 n
-0000059216 00000 n
-0000059277 00000 n
-0000059397 00000 n
-0000063243 00000 n
-0000063859 00000 n
-0000063104 00000 n
-0000059695 00000 n
-0000063435 00000 n
-0000063496 00000 n
-0000063617 00000 n
-0000063738 00000 n
-0000066719 00000 n
-0000066911 00000 n
-0000067433 00000 n
-0000066572 00000 n
-0000064064 00000 n
-0000067070 00000 n
-0000067131 00000 n
-0000067252 00000 n
-0000067372 00000 n
-0000070754 00000 n
-0000070333 00000 n
-0000067624 00000 n
-0000070452 00000 n
-0000070513 00000 n
-0001024810 00000 n
-0000073374 00000 n
-0000073133 00000 n
-0000070973 00000 n
-0000073252 00000 n
-0000073313 00000 n
-0001025903 00000 n
-0000077177 00000 n
-0000077673 00000 n
-0000077038 00000 n
-0000073525 00000 n
-0000077368 00000 n
-0000077612 00000 n
-0000081280 00000 n
-0000081100 00000 n
-0000077864 00000 n
-0000081219 00000 n
-0000085013 00000 n
-0000084833 00000 n
-0000081430 00000 n
-0000084952 00000 n
-0000086851 00000 n
-0000086671 00000 n
-0000085163 00000 n
-0000086790 00000 n
-0000090838 00000 n
-0000090536 00000 n
-0000087015 00000 n
-0000090655 00000 n
-0000090777 00000 n
-0000094623 00000 n
-0000094443 00000 n
-0000091015 00000 n
-0000094562 00000 n
-0001026021 00000 n
-0000096185 00000 n
-0000096005 00000 n
-0000094773 00000 n
-0000096124 00000 n
-0000099832 00000 n
-0000099990 00000 n
-0000100148 00000 n
-0000100641 00000 n
-0000099677 00000 n
-0000096349 00000 n
-0000100336 00000 n
-0000100458 00000 n
-0000102641 00000 n
-0000102702 00000 n
-0000102824 00000 n
-0000102461 00000 n
-0000100818 00000 n
-0000102580 00000 n
-0000102763 00000 n
-0000106221 00000 n
-0000106717 00000 n
-0000106082 00000 n
-0000103001 00000 n
-0000106412 00000 n
-0000106656 00000 n
-0000109758 00000 n
-0000109335 00000 n
-0000106922 00000 n
-0000109454 00000 n
-0000109576 00000 n
-0000113526 00000 n
-0000114023 00000 n
-0000113387 00000 n
-0000109935 00000 n
-0000113718 00000 n
-0000113962 00000 n
-0001026139 00000 n
-0000117523 00000 n
-0000117343 00000 n
-0000114227 00000 n
-0000117462 00000 n
-0000121072 00000 n
-0000120892 00000 n
-0000117673 00000 n
-0000121011 00000 n
-0000124250 00000 n
-0000124070 00000 n
-0000121222 00000 n
-0000124189 00000 n
-0000129018 00000 n
-0000128838 00000 n
-0000124400 00000 n
-0000128957 00000 n
-0000132206 00000 n
-0000132026 00000 n
-0000129168 00000 n
-0000132145 00000 n
-0000135710 00000 n
-0000135530 00000 n
-0000132356 00000 n
-0000135649 00000 n
-0001026257 00000 n
-0000139204 00000 n
-0000139024 00000 n
-0000135873 00000 n
-0000139143 00000 n
-0000142360 00000 n
-0000142180 00000 n
-0000139354 00000 n
-0000142299 00000 n
-0000145445 00000 n
-0000145265 00000 n
-0000142510 00000 n
-0000145384 00000 n
-0000148660 00000 n
-0000148358 00000 n
-0000145609 00000 n
-0000148477 00000 n
-0000148599 00000 n
-0000152526 00000 n
-0000152346 00000 n
-0000148837 00000 n
-0000152465 00000 n
-0000155808 00000 n
-0000155628 00000 n
-0000152676 00000 n
-0000155747 00000 n
-0001026375 00000 n
-0000159326 00000 n
-0000159146 00000 n
-0000155958 00000 n
-0000159265 00000 n
-0000162797 00000 n
-0000162617 00000 n
-0000159476 00000 n
-0000162736 00000 n
-0000165959 00000 n
-0000165779 00000 n
-0000162960 00000 n
-0000165898 00000 n
-0000168879 00000 n
-0000168699 00000 n
-0000166109 00000 n
-0000168818 00000 n
-0000172284 00000 n
-0000171982 00000 n
-0000169043 00000 n
-0000172101 00000 n
-0000172223 00000 n
-0000175536 00000 n
-0000175356 00000 n
-0000172461 00000 n
-0000175475 00000 n
-0001026493 00000 n
-0000179061 00000 n
-0000178881 00000 n
-0000175686 00000 n
-0000179000 00000 n
-0000182744 00000 n
-0000183145 00000 n
-0000182605 00000 n
-0000179211 00000 n
-0000182901 00000 n
-0000183084 00000 n
-0000186696 00000 n
-0000186856 00000 n
-0000187004 00000 n
-0000187682 00000 n
-0000186541 00000 n
-0000183348 00000 n
-0000187196 00000 n
-0000187257 00000 n
-0000187378 00000 n
-0000187499 00000 n
-0000187621 00000 n
-0000228267 00000 n
-0000191404 00000 n
-0000191466 00000 n
-0000190236 00000 n
-0000187873 00000 n
-0000190355 00000 n
-0000190416 00000 n
-0000190477 00000 n
-0000190539 00000 n
-0000190601 00000 n
-0000190663 00000 n
-0000190725 00000 n
-0000190787 00000 n
-0000190849 00000 n
-0000190911 00000 n
-0000190972 00000 n
-0000191034 00000 n
-0000191095 00000 n
-0000191157 00000 n
-0000191219 00000 n
-0000191281 00000 n
-0000191342 00000 n
-0000195088 00000 n
-0000195421 00000 n
-0000194949 00000 n
-0000191616 00000 n
-0000195238 00000 n
-0000195360 00000 n
-0000198530 00000 n
-0000198350 00000 n
-0000195626 00000 n
-0000198469 00000 n
-0001026611 00000 n
-0000200808 00000 n
-0000200445 00000 n
-0000198693 00000 n
-0000200564 00000 n
-0000200625 00000 n
-0000200747 00000 n
-0000203670 00000 n
-0000204166 00000 n
-0000203531 00000 n
-0000201013 00000 n
-0000203862 00000 n
-0000204105 00000 n
-0000207324 00000 n
-0000207144 00000 n
-0000204371 00000 n
-0000207263 00000 n
-0000210033 00000 n
-0000209853 00000 n
-0000207474 00000 n
-0000209972 00000 n
-0000212726 00000 n
-0000212546 00000 n
-0000210183 00000 n
-0000212665 00000 n
-0000215757 00000 n
-0000215577 00000 n
-0000212876 00000 n
-0000215696 00000 n
-0001026729 00000 n
-0000218470 00000 n
-0000218290 00000 n
-0000215907 00000 n
-0000218409 00000 n
-0000220109 00000 n
-0000219929 00000 n
-0000218620 00000 n
-0000220048 00000 n
-0000224030 00000 n
-0000223728 00000 n
-0000220273 00000 n
-0000223847 00000 n
-0000223969 00000 n
-0000227582 00000 n
-0000227742 00000 n
-0000227892 00000 n
-0000228389 00000 n
-0000227427 00000 n
-0000224194 00000 n
-0000228084 00000 n
-0000228328 00000 n
-0000232000 00000 n
-0000232062 00000 n
-0000230890 00000 n
-0000228580 00000 n
-0000231009 00000 n
-0000231070 00000 n
-0000231132 00000 n
-0000231194 00000 n
-0000231256 00000 n
-0000231318 00000 n
-0000231380 00000 n
-0000231442 00000 n
-0000231504 00000 n
-0000231566 00000 n
-0000231628 00000 n
-0000231690 00000 n
-0000231752 00000 n
-0000231814 00000 n
-0000231876 00000 n
-0000231938 00000 n
-0000233111 00000 n
-0000232931 00000 n
-0000232212 00000 n
-0000233050 00000 n
-0001026847 00000 n
-0000237096 00000 n
-0000237591 00000 n
-0000236957 00000 n
-0000233275 00000 n
-0000237286 00000 n
-0000237530 00000 n
-0000240939 00000 n
-0000240759 00000 n
-0000237796 00000 n
-0000240878 00000 n
-0000244747 00000 n
-0000244445 00000 n
-0000241129 00000 n
-0000244564 00000 n
-0000244686 00000 n
-0000248145 00000 n
-0000248305 00000 n
-0000248455 00000 n
-0000248950 00000 n
-0000247990 00000 n
-0000244937 00000 n
-0000248646 00000 n
-0000248829 00000 n
-0000248889 00000 n
-0000252051 00000 n
-0000252112 00000 n
-0000251200 00000 n
-0000249141 00000 n
-0000251319 00000 n
-0000251380 00000 n
-0000251441 00000 n
-0000251502 00000 n
-0000251563 00000 n
-0000251624 00000 n
-0000251685 00000 n
-0000251746 00000 n
-0000251807 00000 n
-0000251868 00000 n
-0000251929 00000 n
-0000251990 00000 n
-0000252723 00000 n
-0000252543 00000 n
-0000252275 00000 n
-0000252662 00000 n
-0001026965 00000 n
-0000256043 00000 n
-0000256540 00000 n
-0000255904 00000 n
-0000252861 00000 n
-0000256235 00000 n
-0000256479 00000 n
-0000260362 00000 n
-0000260182 00000 n
-0000256731 00000 n
-0000260301 00000 n
-0000263804 00000 n
-0000263624 00000 n
-0000260512 00000 n
-0000263743 00000 n
-0000267134 00000 n
-0000266954 00000 n
-0000263954 00000 n
-0000267073 00000 n
-0000270508 00000 n
-0000270328 00000 n
-0000267284 00000 n
-0000270447 00000 n
-0000273707 00000 n
-0000273527 00000 n
-0000270658 00000 n
-0000273646 00000 n
-0001027083 00000 n
-0000276828 00000 n
-0000276648 00000 n
-0000273857 00000 n
-0000276767 00000 n
-0000280182 00000 n
-0000279880 00000 n
-0000276992 00000 n
-0000279999 00000 n
-0000280121 00000 n
-0000282457 00000 n
-0000282276 00000 n
-0000280359 00000 n
-0000282395 00000 n
-0000285759 00000 n
-0000285449 00000 n
-0000282621 00000 n
-0000285571 00000 n
-0000285696 00000 n
-0000288240 00000 n
-0000288400 00000 n
-0000288558 00000 n
-0000289001 00000 n
-0000288079 00000 n
-0000285937 00000 n
-0000288751 00000 n
-0000288938 00000 n
-0000291980 00000 n
-0000291724 00000 n
-0000292230 00000 n
-0000291580 00000 n
-0000289193 00000 n
-0000291917 00000 n
-0000292043 00000 n
-0000292167 00000 n
-0001027203 00000 n
-0000295997 00000 n
-0000296502 00000 n
-0000295853 00000 n
-0000292409 00000 n
-0000296190 00000 n
-0000296439 00000 n
-0000300352 00000 n
-0000300166 00000 n
-0000296694 00000 n
-0000300289 00000 n
-0000304545 00000 n
-0000304234 00000 n
-0000300517 00000 n
-0000304357 00000 n
-0000304482 00000 n
-0000306802 00000 n
-0000306616 00000 n
-0000304723 00000 n
-0000306739 00000 n
-0000310539 00000 n
-0000310228 00000 n
-0000306967 00000 n
-0000310351 00000 n
-0000310476 00000 n
-0000313171 00000 n
-0000313331 00000 n
-0000313491 00000 n
-0000313934 00000 n
-0000313009 00000 n
-0000310717 00000 n
-0000313684 00000 n
-0000313871 00000 n
-0001027328 00000 n
-0000317230 00000 n
-0000316817 00000 n
-0000316977 00000 n
-0000317418 00000 n
-0000316664 00000 n
-0000314126 00000 n
-0000317167 00000 n
-0000317293 00000 n
-0000320879 00000 n
-0000321066 00000 n
-0000320693 00000 n
-0000317610 00000 n
-0000320816 00000 n
-0000325448 00000 n
-0000325951 00000 n
-0000325304 00000 n
-0000321231 00000 n
-0000325639 00000 n
-0000325888 00000 n
-0000330366 00000 n
-0000330180 00000 n
-0000326130 00000 n
-0000330303 00000 n
-0000333205 00000 n
-0000333019 00000 n
-0000330517 00000 n
-0000333142 00000 n
-0000336128 00000 n
-0000335817 00000 n
-0000333370 00000 n
-0000335940 00000 n
-0000336065 00000 n
-0001027453 00000 n
-0000340457 00000 n
-0000340618 00000 n
-0000340776 00000 n
-0000343233 00000 n
-0000343392 00000 n
-0000341469 00000 n
-0000340295 00000 n
-0000336306 00000 n
-0000340969 00000 n
-0000341094 00000 n
-0000341281 00000 n
-0000341344 00000 n
-0000341406 00000 n
-0000343772 00000 n
-0000343080 00000 n
-0000341661 00000 n
-0000343584 00000 n
-0000343709 00000 n
-0000348198 00000 n
-0000348702 00000 n
-0000348054 00000 n
-0000343951 00000 n
-0000348390 00000 n
-0000348639 00000 n
-0000352615 00000 n
-0000352429 00000 n
-0000348908 00000 n
-0000352552 00000 n
-0000354490 00000 n
-0000354304 00000 n
-0000352766 00000 n
-0000354427 00000 n
-0000358231 00000 n
-0000358390 00000 n
-0000358540 00000 n
-0000359044 00000 n
-0000358069 00000 n
-0000354655 00000 n
-0000358732 00000 n
-0000358857 00000 n
-0001027578 00000 n
-0000362102 00000 n
-0000362931 00000 n
-0000362995 00000 n
-0000361916 00000 n
-0000359236 00000 n
-0000362039 00000 n
-0000362165 00000 n
-0000362228 00000 n
-0000362292 00000 n
-0000362356 00000 n
-0000362420 00000 n
-0000362484 00000 n
-0000362548 00000 n
-0000362612 00000 n
-0000362676 00000 n
-0000362740 00000 n
-0000362803 00000 n
-0000362867 00000 n
-0000366682 00000 n
-0000366309 00000 n
-0000363173 00000 n
-0000366432 00000 n
-0000366619 00000 n
-0000370831 00000 n
-0000371023 00000 n
-0000371558 00000 n
-0000370678 00000 n
-0000366847 00000 n
-0000371184 00000 n
-0000371309 00000 n
-0000376189 00000 n
-0000376350 00000 n
-0000376501 00000 n
-0000376662 00000 n
-0000376825 00000 n
-0000377392 00000 n
-0000376009 00000 n
-0000371750 00000 n
-0000377018 00000 n
-0000377204 00000 n
-0000377329 00000 n
-0000380861 00000 n
-0000380675 00000 n
-0000377557 00000 n
-0000380798 00000 n
-0000384362 00000 n
-0000384051 00000 n
-0000381012 00000 n
-0000384174 00000 n
-0000384299 00000 n
-0001027703 00000 n
-0000386082 00000 n
-0000385761 00000 n
-0000384526 00000 n
-0000385895 00000 n
-0000395461 00000 n
-0000922654 00000 n
+0000015065 00000 n
+0000015126 00000 n
+0001024956 00000 n
+0001026185 00000 n
+0001026359 00000 n
+0001025129 00000 n
+0001026508 00000 n
+0000016559 00000 n
+0000016318 00000 n
+0000015350 00000 n
+0000016437 00000 n
+0001024785 00000 n
+0000016498 00000 n
+0001025829 00000 n
+0000017915 00000 n
+0000018101 00000 n
+0000018288 00000 n
+0000018474 00000 n
+0000018660 00000 n
+0000018870 00000 n
+0000019065 00000 n
+0000019260 00000 n
+0000019418 00000 n
+0000019631 00000 n
+0000019826 00000 n
+0000020021 00000 n
+0000020277 00000 n
+0000017688 00000 n
+0000016709 00000 n
+0000020216 00000 n
+0000929897 00000 n
+0001025475 00000 n
+0000923817 00000 n
+0000022716 00000 n
+0000022866 00000 n
+0000023021 00000 n
+0000023175 00000 n
+0000023329 00000 n
+0000023490 00000 n
+0000023651 00000 n
+0000023801 00000 n
+0000023955 00000 n
+0000024116 00000 n
+0000024275 00000 n
+0000024434 00000 n
+0000024594 00000 n
+0000024754 00000 n
+0000024914 00000 n
+0000025072 00000 n
+0000025232 00000 n
+0000025392 00000 n
+0000025552 00000 n
+0000025713 00000 n
+0000025873 00000 n
+0000026034 00000 n
+0000026195 00000 n
+0000026356 00000 n
+0000026517 00000 n
+0000026672 00000 n
+0000026832 00000 n
+0000026992 00000 n
+0000027152 00000 n
+0000027312 00000 n
+0000027472 00000 n
+0000027632 00000 n
+0000027787 00000 n
+0000027948 00000 n
+0000028107 00000 n
+0000028267 00000 n
+0000028428 00000 n
+0000028587 00000 n
+0000028741 00000 n
+0000028901 00000 n
+0000029061 00000 n
+0000029221 00000 n
+0000029381 00000 n
+0000029542 00000 n
+0000029702 00000 n
+0000029862 00000 n
+0000030022 00000 n
+0000030182 00000 n
+0000030343 00000 n
+0000030504 00000 n
+0000030656 00000 n
+0000030817 00000 n
+0000030977 00000 n
+0000031136 00000 n
+0000031297 00000 n
+0000031457 00000 n
+0000031611 00000 n
+0000031769 00000 n
+0000031927 00000 n
+0000034285 00000 n
+0000032146 00000 n
+0000022113 00000 n
+0000020454 00000 n
+0000032085 00000 n
+0000034446 00000 n
+0000034605 00000 n
+0000034760 00000 n
+0000034920 00000 n
+0000035080 00000 n
+0000035240 00000 n
+0000035400 00000 n
+0000035561 00000 n
+0000035721 00000 n
+0000035876 00000 n
+0000036030 00000 n
+0000036191 00000 n
+0000036351 00000 n
+0000036509 00000 n
+0000036669 00000 n
+0000036826 00000 n
+0000036986 00000 n
+0000037142 00000 n
+0000037304 00000 n
+0000037464 00000 n
+0000037620 00000 n
+0000037781 00000 n
+0000037942 00000 n
+0000038102 00000 n
+0000038263 00000 n
+0000038425 00000 n
+0000038586 00000 n
+0000038741 00000 n
+0000038897 00000 n
+0000039059 00000 n
+0000039219 00000 n
+0000039380 00000 n
+0000039542 00000 n
+0000039703 00000 n
+0000039852 00000 n
+0000040007 00000 n
+0000040162 00000 n
+0000040317 00000 n
+0000040472 00000 n
+0000040627 00000 n
+0000040781 00000 n
+0000040942 00000 n
+0000041102 00000 n
+0000041262 00000 n
+0000041412 00000 n
+0000041567 00000 n
+0000041722 00000 n
+0000041932 00000 n
+0000033770 00000 n
+0000032310 00000 n
+0000041871 00000 n
+0000045723 00000 n
+0000045915 00000 n
+0000046107 00000 n
+0000046745 00000 n
+0000045568 00000 n
+0000042096 00000 n
+0000046266 00000 n
+0001025301 00000 n
+0000046684 00000 n
+0000049903 00000 n
+0000050093 00000 n
+0000050253 00000 n
+0000050650 00000 n
+0000049748 00000 n
+0000046949 00000 n
+0000050409 00000 n
+0001026006 00000 n
+0001026626 00000 n
+0000055506 00000 n
+0000055253 00000 n
+0000055927 00000 n
+0000055114 00000 n
+0000050855 00000 n
+0000055445 00000 n
+0000055806 00000 n
+0000059535 00000 n
+0000060029 00000 n
+0000059396 00000 n
+0000056104 00000 n
+0000059727 00000 n
+0000059788 00000 n
+0000059908 00000 n
+0000063889 00000 n
+0000064504 00000 n
+0000063750 00000 n
+0000060206 00000 n
+0000064081 00000 n
+0000064142 00000 n
+0000064263 00000 n
+0000064384 00000 n
+0000067459 00000 n
+0000067651 00000 n
+0000068171 00000 n
+0000067312 00000 n
+0000064709 00000 n
+0000067809 00000 n
+0000067870 00000 n
+0000067989 00000 n
+0000068110 00000 n
+0000071506 00000 n
+0000071085 00000 n
+0000068376 00000 n
+0000071204 00000 n
+0000071265 00000 n
+0001025651 00000 n
+0000074126 00000 n
+0000073885 00000 n
+0000071725 00000 n
+0000074004 00000 n
+0000074065 00000 n
+0001026744 00000 n
+0000077929 00000 n
+0000078425 00000 n
+0000077790 00000 n
+0000074277 00000 n
+0000078120 00000 n
+0000078364 00000 n
+0000082032 00000 n
+0000081852 00000 n
+0000078616 00000 n
+0000081971 00000 n
+0000085765 00000 n
+0000085585 00000 n
+0000082182 00000 n
+0000085704 00000 n
+0000087603 00000 n
+0000087423 00000 n
+0000085915 00000 n
+0000087542 00000 n
+0000091590 00000 n
+0000091288 00000 n
+0000087767 00000 n
+0000091407 00000 n
+0000091529 00000 n
+0000095375 00000 n
+0000095195 00000 n
+0000091767 00000 n
+0000095314 00000 n
+0001026862 00000 n
+0000096937 00000 n
+0000096757 00000 n
+0000095525 00000 n
+0000096876 00000 n
+0000100584 00000 n
+0000100742 00000 n
+0000100900 00000 n
+0000101393 00000 n
+0000100429 00000 n
+0000097101 00000 n
+0000101088 00000 n
+0000101210 00000 n
+0000103393 00000 n
+0000103454 00000 n
+0000103576 00000 n
+0000103213 00000 n
+0000101570 00000 n
+0000103332 00000 n
+0000103515 00000 n
+0000106973 00000 n
+0000107469 00000 n
+0000106834 00000 n
+0000103753 00000 n
+0000107164 00000 n
+0000107408 00000 n
+0000110510 00000 n
+0000110087 00000 n
+0000107674 00000 n
+0000110206 00000 n
+0000110328 00000 n
+0000114278 00000 n
+0000114775 00000 n
+0000114139 00000 n
+0000110687 00000 n
+0000114470 00000 n
+0000114714 00000 n
+0001026980 00000 n
+0000118275 00000 n
+0000118095 00000 n
+0000114979 00000 n
+0000118214 00000 n
+0000121824 00000 n
+0000121644 00000 n
+0000118425 00000 n
+0000121763 00000 n
+0000125002 00000 n
+0000124822 00000 n
+0000121974 00000 n
+0000124941 00000 n
+0000129770 00000 n
+0000129590 00000 n
+0000125152 00000 n
+0000129709 00000 n
+0000132958 00000 n
+0000132778 00000 n
+0000129920 00000 n
+0000132897 00000 n
+0000136462 00000 n
+0000136282 00000 n
+0000133108 00000 n
+0000136401 00000 n
+0001027098 00000 n
+0000139956 00000 n
+0000139776 00000 n
+0000136625 00000 n
+0000139895 00000 n
+0000143112 00000 n
+0000142932 00000 n
+0000140106 00000 n
+0000143051 00000 n
+0000146197 00000 n
+0000146017 00000 n
+0000143262 00000 n
+0000146136 00000 n
+0000149412 00000 n
+0000149110 00000 n
+0000146361 00000 n
+0000149229 00000 n
+0000149351 00000 n
+0000153278 00000 n
+0000153098 00000 n
+0000149589 00000 n
+0000153217 00000 n
+0000156560 00000 n
+0000156380 00000 n
+0000153428 00000 n
+0000156499 00000 n
+0001027216 00000 n
+0000160078 00000 n
+0000159898 00000 n
+0000156710 00000 n
+0000160017 00000 n
+0000163549 00000 n
+0000163369 00000 n
+0000160228 00000 n
+0000163488 00000 n
+0000166711 00000 n
+0000166531 00000 n
+0000163712 00000 n
+0000166650 00000 n
+0000169631 00000 n
+0000169451 00000 n
+0000166861 00000 n
+0000169570 00000 n
+0000173036 00000 n
+0000172734 00000 n
+0000169795 00000 n
+0000172853 00000 n
+0000172975 00000 n
+0000176288 00000 n
+0000176108 00000 n
+0000173213 00000 n
+0000176227 00000 n
+0001027334 00000 n
+0000179813 00000 n
+0000179633 00000 n
+0000176438 00000 n
+0000179752 00000 n
+0000183496 00000 n
+0000183897 00000 n
+0000183357 00000 n
+0000179963 00000 n
+0000183653 00000 n
+0000183836 00000 n
+0000187448 00000 n
+0000187608 00000 n
+0000187756 00000 n
+0000188434 00000 n
+0000187293 00000 n
+0000184100 00000 n
+0000187948 00000 n
+0000188009 00000 n
+0000188130 00000 n
+0000188251 00000 n
+0000188373 00000 n
+0000229019 00000 n
+0000192156 00000 n
+0000192218 00000 n
+0000190988 00000 n
+0000188625 00000 n
+0000191107 00000 n
+0000191168 00000 n
+0000191229 00000 n
+0000191291 00000 n
+0000191353 00000 n
+0000191415 00000 n
+0000191477 00000 n
+0000191539 00000 n
+0000191601 00000 n
+0000191663 00000 n
+0000191724 00000 n
+0000191786 00000 n
+0000191847 00000 n
+0000191909 00000 n
+0000191971 00000 n
+0000192033 00000 n
+0000192094 00000 n
+0000195840 00000 n
+0000196173 00000 n
+0000195701 00000 n
+0000192368 00000 n
+0000195990 00000 n
+0000196112 00000 n
+0000199282 00000 n
+0000199102 00000 n
+0000196378 00000 n
+0000199221 00000 n
+0001027452 00000 n
+0000201560 00000 n
+0000201197 00000 n
+0000199445 00000 n
+0000201316 00000 n
+0000201377 00000 n
+0000201499 00000 n
+0000204422 00000 n
+0000204918 00000 n
+0000204283 00000 n
+0000201765 00000 n
+0000204614 00000 n
+0000204857 00000 n
+0000208076 00000 n
+0000207896 00000 n
+0000205123 00000 n
+0000208015 00000 n
+0000210785 00000 n
+0000210605 00000 n
+0000208226 00000 n
+0000210724 00000 n
+0000213478 00000 n
+0000213298 00000 n
+0000210935 00000 n
+0000213417 00000 n
+0000216509 00000 n
+0000216329 00000 n
+0000213628 00000 n
+0000216448 00000 n
+0001027570 00000 n
+0000219222 00000 n
+0000219042 00000 n
+0000216659 00000 n
+0000219161 00000 n
+0000220861 00000 n
+0000220681 00000 n
+0000219372 00000 n
+0000220800 00000 n
+0000224782 00000 n
+0000224480 00000 n
+0000221025 00000 n
+0000224599 00000 n
+0000224721 00000 n
+0000228334 00000 n
+0000228494 00000 n
+0000228644 00000 n
+0000229141 00000 n
+0000228179 00000 n
+0000224946 00000 n
+0000228836 00000 n
+0000229080 00000 n
+0000232752 00000 n
+0000232814 00000 n
+0000231642 00000 n
+0000229332 00000 n
+0000231761 00000 n
+0000231822 00000 n
+0000231884 00000 n
+0000231946 00000 n
+0000232008 00000 n
+0000232070 00000 n
+0000232132 00000 n
+0000232194 00000 n
+0000232256 00000 n
+0000232318 00000 n
+0000232380 00000 n
+0000232442 00000 n
+0000232504 00000 n
+0000232566 00000 n
+0000232628 00000 n
+0000232690 00000 n
+0000233863 00000 n
+0000233683 00000 n
+0000232964 00000 n
+0000233802 00000 n
+0001027688 00000 n
+0000237848 00000 n
+0000238343 00000 n
+0000237709 00000 n
+0000234027 00000 n
+0000238038 00000 n
+0000238282 00000 n
+0000241691 00000 n
+0000241511 00000 n
+0000238548 00000 n
+0000241630 00000 n
+0000245499 00000 n
+0000245197 00000 n
+0000241881 00000 n
+0000245316 00000 n
+0000245438 00000 n
+0000248897 00000 n
+0000249057 00000 n
+0000249207 00000 n
+0000249702 00000 n
+0000248742 00000 n
+0000245689 00000 n
+0000249398 00000 n
+0000249581 00000 n
+0000249641 00000 n
+0000252803 00000 n
+0000252864 00000 n
+0000251952 00000 n
+0000249893 00000 n
+0000252071 00000 n
+0000252132 00000 n
+0000252193 00000 n
+0000252254 00000 n
+0000252315 00000 n
+0000252376 00000 n
+0000252437 00000 n
+0000252498 00000 n
+0000252559 00000 n
+0000252620 00000 n
+0000252681 00000 n
+0000252742 00000 n
+0000253475 00000 n
+0000253295 00000 n
+0000253027 00000 n
+0000253414 00000 n
+0001027806 00000 n
+0000256795 00000 n
+0000257292 00000 n
+0000256656 00000 n
+0000253613 00000 n
+0000256987 00000 n
+0000257231 00000 n
+0000261114 00000 n
+0000260934 00000 n
+0000257483 00000 n
+0000261053 00000 n
+0000264556 00000 n
+0000264376 00000 n
+0000261264 00000 n
+0000264495 00000 n
+0000267886 00000 n
+0000267706 00000 n
+0000264706 00000 n
+0000267825 00000 n
+0000271260 00000 n
+0000271080 00000 n
+0000268036 00000 n
+0000271199 00000 n
+0000274459 00000 n
+0000274279 00000 n
+0000271410 00000 n
+0000274398 00000 n
+0001027924 00000 n
+0000277580 00000 n
+0000277400 00000 n
+0000274609 00000 n
+0000277519 00000 n
+0000280934 00000 n
+0000280632 00000 n
+0000277744 00000 n
+0000280751 00000 n
+0000280873 00000 n
+0000283209 00000 n
+0000283028 00000 n
+0000281111 00000 n
+0000283147 00000 n
+0000286511 00000 n
+0000286201 00000 n
+0000283373 00000 n
+0000286323 00000 n
+0000286448 00000 n
+0000288992 00000 n
+0000289152 00000 n
+0000289310 00000 n
+0000289753 00000 n
+0000288831 00000 n
+0000286689 00000 n
+0000289503 00000 n
+0000289690 00000 n
+0000292732 00000 n
+0000292476 00000 n
+0000292982 00000 n
+0000292332 00000 n
+0000289945 00000 n
+0000292669 00000 n
+0000292795 00000 n
+0000292919 00000 n
+0001028044 00000 n
+0000296749 00000 n
+0000297254 00000 n
+0000296605 00000 n
+0000293161 00000 n
+0000296942 00000 n
+0000297191 00000 n
+0000301104 00000 n
+0000300918 00000 n
+0000297446 00000 n
+0000301041 00000 n
+0000305297 00000 n
+0000304986 00000 n
+0000301269 00000 n
+0000305109 00000 n
+0000305234 00000 n
+0000307554 00000 n
+0000307368 00000 n
+0000305475 00000 n
+0000307491 00000 n
+0000311291 00000 n
+0000310980 00000 n
+0000307719 00000 n
+0000311103 00000 n
+0000311228 00000 n
+0000313923 00000 n
+0000314083 00000 n
+0000314243 00000 n
+0000314686 00000 n
+0000313761 00000 n
+0000311469 00000 n
+0000314436 00000 n
+0000314623 00000 n
+0001028169 00000 n
+0000317982 00000 n
+0000317569 00000 n
+0000317729 00000 n
+0000318170 00000 n
+0000317416 00000 n
+0000314878 00000 n
+0000317919 00000 n
+0000318045 00000 n
+0000321631 00000 n
+0000321818 00000 n
+0000321445 00000 n
+0000318362 00000 n
+0000321568 00000 n
+0000326200 00000 n
+0000326703 00000 n
+0000326056 00000 n
+0000321983 00000 n
+0000326391 00000 n
+0000326640 00000 n
+0000331118 00000 n
+0000330932 00000 n
+0000326882 00000 n
+0000331055 00000 n
+0000333957 00000 n
+0000333771 00000 n
+0000331269 00000 n
+0000333894 00000 n
+0000336880 00000 n
+0000336569 00000 n
+0000334122 00000 n
+0000336692 00000 n
+0000336817 00000 n
+0001028294 00000 n
+0000341209 00000 n
+0000341370 00000 n
+0000341528 00000 n
+0000343985 00000 n
+0000344144 00000 n
+0000342221 00000 n
+0000341047 00000 n
+0000337058 00000 n
+0000341721 00000 n
+0000341846 00000 n
+0000342033 00000 n
+0000342096 00000 n
+0000342158 00000 n
+0000344524 00000 n
+0000343832 00000 n
+0000342413 00000 n
+0000344336 00000 n
+0000344461 00000 n
+0000348950 00000 n
+0000349454 00000 n
+0000348806 00000 n
+0000344703 00000 n
+0000349142 00000 n
+0000349391 00000 n
+0000353367 00000 n
+0000353181 00000 n
+0000349660 00000 n
+0000353304 00000 n
+0000355242 00000 n
+0000355056 00000 n
+0000353518 00000 n
+0000355179 00000 n
+0000358983 00000 n
+0000359142 00000 n
+0000359292 00000 n
+0000359796 00000 n
+0000358821 00000 n
+0000355407 00000 n
+0000359484 00000 n
+0000359609 00000 n
+0001028419 00000 n
+0000362854 00000 n
+0000363683 00000 n
+0000363747 00000 n
+0000362668 00000 n
+0000359988 00000 n
+0000362791 00000 n
+0000362917 00000 n
+0000362980 00000 n
+0000363044 00000 n
+0000363108 00000 n
+0000363172 00000 n
+0000363236 00000 n
+0000363300 00000 n
+0000363364 00000 n
+0000363428 00000 n
+0000363492 00000 n
+0000363555 00000 n
+0000363619 00000 n
+0000367434 00000 n
+0000367061 00000 n
+0000363925 00000 n
+0000367184 00000 n
+0000367371 00000 n
+0000371583 00000 n
+0000371775 00000 n
+0000372310 00000 n
+0000371430 00000 n
+0000367599 00000 n
+0000371936 00000 n
+0000372061 00000 n
+0000376941 00000 n
+0000377102 00000 n
+0000377253 00000 n
+0000377414 00000 n
+0000377577 00000 n
+0000378144 00000 n
+0000376761 00000 n
+0000372502 00000 n
+0000377770 00000 n
+0000377956 00000 n
+0000378081 00000 n
+0000381613 00000 n
+0000381427 00000 n
+0000378309 00000 n
+0000381550 00000 n
+0000385114 00000 n
+0000384803 00000 n
+0000381764 00000 n
+0000384926 00000 n
+0000385051 00000 n
+0001028544 00000 n
+0000386834 00000 n
+0000386513 00000 n
+0000385278 00000 n
+0000386647 00000 n
+0000396213 00000 n
+0000923406 00000 n
0000000000 00000 f
-0000922726 00000 n
-0000923127 00000 n
-0000395301 00000 n
-0000386233 00000 n
-0000922940 00000 n
-0000899915 00000 n
-0000925229 00000 n
-0000925032 00000 n
-0000923315 00000 n
-0000925166 00000 n
-0000926000 00000 n
-0000925803 00000 n
-0000925367 00000 n
-0000925937 00000 n
-0000926684 00000 n
-0000926996 00000 n
-0000926540 00000 n
-0000926138 00000 n
-0000926871 00000 n
-0001023330 00000 n
-0000927241 00000 n
-0000927441 00000 n
-0000927805 00000 n
-0000928380 00000 n
-0000928712 00000 n
-0000928943 00000 n
-0000929397 00000 n
-0000929508 00000 n
-0000929593 00000 n
-0000929647 00000 n
-0000930043 00000 n
-0000930524 00000 n
-0000931496 00000 n
-0000931520 00000 n
-0001023865 00000 n
-0000932111 00000 n
-0000932444 00000 n
-0000948064 00000 n
-0000948278 00000 n
-0000964354 00000 n
-0000964573 00000 n
-0000984141 00000 n
-0000984356 00000 n
-0000988873 00000 n
-0000989092 00000 n
-0000991492 00000 n
-0000991715 00000 n
-0001000622 00000 n
-0001000841 00000 n
-0001005271 00000 n
-0001005495 00000 n
-0001012702 00000 n
-0001012910 00000 n
-0001023111 00000 n
-0001027828 00000 n
-0001027948 00000 n
-0001028068 00000 n
-0001028193 00000 n
-0001028276 00000 n
-0001038528 00000 n
-0001038702 00000 n
-0001038873 00000 n
-0001039042 00000 n
-0001039211 00000 n
-0001039382 00000 n
-0001039552 00000 n
-0001039725 00000 n
-0001039900 00000 n
-0001040074 00000 n
-0001040280 00000 n
-0001040531 00000 n
-0001040784 00000 n
-0001041039 00000 n
-0001041286 00000 n
-0001041481 00000 n
-0001041666 00000 n
-0001041837 00000 n
-0001042007 00000 n
-0001042178 00000 n
-0001042348 00000 n
-0001042519 00000 n
-0001042689 00000 n
-0001042860 00000 n
-0001043029 00000 n
-0001043198 00000 n
-0001043369 00000 n
-0001043539 00000 n
-0001043711 00000 n
-0001043886 00000 n
-0001044063 00000 n
-0001044238 00000 n
-0001044415 00000 n
-0001044645 00000 n
-0001044890 00000 n
-0001045146 00000 n
-0001045401 00000 n
-0001045652 00000 n
-0001045903 00000 n
-0001046154 00000 n
-0001046405 00000 n
-0001046605 00000 n
-0001046830 00000 n
-0001047060 00000 n
-0001047287 00000 n
-0001047514 00000 n
-0001047775 00000 n
-0001048048 00000 n
-0001048315 00000 n
-0001048582 00000 n
-0001048849 00000 n
-0001049026 00000 n
-0001049205 00000 n
-0001049386 00000 n
-0001049571 00000 n
-0001049756 00000 n
-0001049954 00000 n
-0001050200 00000 n
-0001050362 00000 n
-0001050480 00000 n
-0001050606 00000 n
-0001050732 00000 n
-0001050848 00000 n
-0001050964 00000 n
-0001051090 00000 n
-0001051224 00000 n
-0001051360 00000 n
-0001051489 00000 n
-0001051596 00000 n
-0001051724 00000 n
-0001051840 00000 n
-0001051930 00000 n
-0001051970 00000 n
-0001052102 00000 n
+0000923478 00000 n
+0000923879 00000 n
+0000396053 00000 n
+0000386985 00000 n
+0000923692 00000 n
+0000900667 00000 n
+0000925981 00000 n
+0000925784 00000 n
+0000924067 00000 n
+0000925918 00000 n
+0000926752 00000 n
+0000926555 00000 n
+0000926119 00000 n
+0000926689 00000 n
+0000927436 00000 n
+0000927748 00000 n
+0000927292 00000 n
+0000926890 00000 n
+0000927623 00000 n
+0001024171 00000 n
+0000927993 00000 n
+0000928193 00000 n
+0000928557 00000 n
+0000929132 00000 n
+0000929464 00000 n
+0000929695 00000 n
+0000930149 00000 n
+0000930260 00000 n
+0000930345 00000 n
+0000930399 00000 n
+0000930795 00000 n
+0000931276 00000 n
+0000932248 00000 n
+0000932272 00000 n
+0001024706 00000 n
+0000932863 00000 n
+0000933196 00000 n
+0000948816 00000 n
+0000949030 00000 n
+0000965280 00000 n
+0000965499 00000 n
+0000984982 00000 n
+0000985197 00000 n
+0000989714 00000 n
+0000989933 00000 n
+0000992333 00000 n
+0000992556 00000 n
+0001001463 00000 n
+0001001682 00000 n
+0001006112 00000 n
+0001006336 00000 n
+0001013543 00000 n
+0001013751 00000 n
+0001023952 00000 n
+0001028669 00000 n
+0001028789 00000 n
+0001028909 00000 n
+0001029034 00000 n
+0001029117 00000 n
+0001039369 00000 n
+0001039543 00000 n
+0001039714 00000 n
+0001039883 00000 n
+0001040052 00000 n
+0001040223 00000 n
+0001040393 00000 n
+0001040566 00000 n
+0001040741 00000 n
+0001040915 00000 n
+0001041121 00000 n
+0001041372 00000 n
+0001041625 00000 n
+0001041880 00000 n
+0001042127 00000 n
+0001042322 00000 n
+0001042507 00000 n
+0001042678 00000 n
+0001042848 00000 n
+0001043019 00000 n
+0001043189 00000 n
+0001043360 00000 n
+0001043530 00000 n
+0001043701 00000 n
+0001043870 00000 n
+0001044039 00000 n
+0001044210 00000 n
+0001044380 00000 n
+0001044552 00000 n
+0001044727 00000 n
+0001044904 00000 n
+0001045079 00000 n
+0001045256 00000 n
+0001045486 00000 n
+0001045731 00000 n
+0001045987 00000 n
+0001046242 00000 n
+0001046493 00000 n
+0001046744 00000 n
+0001046995 00000 n
+0001047246 00000 n
+0001047446 00000 n
+0001047671 00000 n
+0001047901 00000 n
+0001048128 00000 n
+0001048355 00000 n
+0001048616 00000 n
+0001048889 00000 n
+0001049156 00000 n
+0001049423 00000 n
+0001049690 00000 n
+0001049867 00000 n
+0001050046 00000 n
+0001050227 00000 n
+0001050412 00000 n
+0001050597 00000 n
+0001050795 00000 n
+0001051041 00000 n
+0001051203 00000 n
+0001051321 00000 n
+0001051447 00000 n
+0001051573 00000 n
+0001051689 00000 n
+0001051805 00000 n
+0001051931 00000 n
+0001052065 00000 n
+0001052201 00000 n
+0001052330 00000 n
+0001052437 00000 n
+0001052565 00000 n
+0001052681 00000 n
+0001052771 00000 n
+0001052811 00000 n
+0001052943 00000 n
trailer
<< /Size 1321
/Root 1319 0 R
/Info 1320 0 R
-/ID [<ECB60BDDD25429AE2E54494948C7EF96> <ECB60BDDD25429AE2E54494948C7EF96>] >>
+/ID [<1EAD06C609847E7B1D23082717716451> <1EAD06C609847E7B1D23082717716451>] >>
startxref
-1052370
+1053199
%%EOF
diff --git a/graphics/pgf/contrib/milsymb/milsymb.sty b/graphics/pgf/contrib/milsymb/milsymb.sty
index 5fb21de65a..1342818961 100644
--- a/graphics/pgf/contrib/milsymb/milsymb.sty
+++ b/graphics/pgf/contrib/milsymb/milsymb.sty
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% MilSymb Style File %%
%%-------------------- %%
-%% Version: 1.01 %%
-%% Last Updated: 05/07/2019 %%
+%% Version: 1.02 %%
+%% Last Updated: 2020-03-15 %%
%% Github: https://github.com/ralphieraccoon/MilSymb %%
%% Copyright: Damian Crosby 2018 %%
%% Licence: Creative Commons Attribution-ShareAlike 4.0 International License %%
@@ -19,6 +19,7 @@
\RequirePackage{amssymb}
\RequirePackage{xifthen}
\RequirePackage{xparse}
+\RequirePackage{textcomp}
\definecolor{friendlyA}{RGB}{128, 224, 255}
\definecolor{hostileA}{RGB}{255, 128, 128}
\definecolor{neutralA}{RGB}{170, 255, 170}
@@ -2135,8 +2136,6 @@ frame status/normal/.style={/MilSymb/line=solid},
frame status/anticipated/.style={/MilSymb/line=dashed},
frame status/uncertain/.style={/MilSymb/line=uncertainline},
fill=gray,
-frame status=normal,
-scale=1,
}
\newcommand*{\clipfriendly}{
(-0.75, -0.5) rectangle (0.75, 0.5)
@@ -2257,8 +2256,10 @@ scale=1,
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
call sign=,
position and movement=,
@@ -2319,6 +2320,8 @@ scale=1,
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
+ frame status=normal,
+ scale=1,
track number=,
call sign=,
position and movement=,
@@ -2683,6 +2686,8 @@ scale=1,
offset/.value required,
movement/.code 2 args={\begin{scope}[shift={(#2)}]\ifthenelse{\equal{\MilSymb@drawH}{true}\AND \equal{\MilSymb@selectedfaction}{friendly}}{ \draw [-{Stealth[inset=0pt,scale=1]}] (-0.75, -0.75) -- +($(0, -##1) - (0, -0.75)$) -- +(##2);}{\draw [-{Stealth[inset=0pt,scale=1]}] (0,0) -- +(0, -##1) -- +(##2);}\end{scope}},
movement/.value required,
+ frame status=normal,
+ scale=1,
faction=friendly,
main=none,
upper=none,
@@ -2745,7 +2750,11 @@ scale=1,
\newcounter{exitem}
\newlength{\itemlength}
\NewDocumentEnvironment{landheadquarters}{ o D(){0,0}}{
-\tikzset{#1}
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\setlength{\itemlength}{0pt}
\begin{scope}[shift={(#2)}, scale=\MilSymb@scale, transform shape]
\setcounter{exitem}{0}
@@ -2762,7 +2771,11 @@ scale=1,
\stepcounter{exitem}}
}{\end{scope}}
\NewDocumentEnvironment{landgroup}{ o D(){0,0}}{
-\tikzset{#1}
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\setlength{\itemlength}{0pt}
\begin{scope}[local bounding box=G, shift={(#2)}, scale=\MilSymb@scale, transform shape]
\RenewDocumentCommand\item{m}{
@@ -2906,6 +2919,8 @@ scale=1,
equipment teardown time/.store in=\MilSymb@SymbAE,
common identifier/.store in=\MilSymb@SymbAF,
speed/.store in=\MilSymb@SymbZ,
+ frame status=normal,
+ scale=1,
faction=none,
main=none,
mobility=none,
@@ -3043,6 +3058,8 @@ scale=1,
altitude value/.store in=\MilSymb@SymbX,
location/.store in=\MilSymb@SymbY,
speed/.store in=\MilSymb@SymbZ,
+ frame status=normal,
+ scale=1,
headquarters=false,
feint or dummy=false,
country indicator=,
@@ -3227,8 +3244,10 @@ scale=1,
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3258,8 +3277,12 @@ scale=1,
\end{scope}
\IfNoValueF{#4}{\node [anchor=west, align=left] at (#3.east) {#4};}
}
-\NewDocumentCommand\OwnShip{o D(){0,0} d() g}{
-\tikzset{#1}
+\NewDocumentCommand\OwnShip{ O{} D(){0,0} d() g}{
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\begin{scope}[shift={(#2)}, local bounding box=#3, scale=\MilSymb@scale, transform shape]
\draw [ultra thick, friendlyA] (0, 0) circle (0.5);
\draw [ultra thick, friendlyA] (0.5, 0) -- (-0.5, 0);
@@ -3348,8 +3371,10 @@ scale=1,
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3406,13 +3431,15 @@ scale=1,
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
identification=,
additional information=,
date-time group=,
- faction=none,
+ faction=friendly,
mine=normal,
neutralised=false,
#1,
@@ -3503,8 +3530,10 @@ scale=1,
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3544,6 +3573,7 @@ scale=1,
man made/.is if=manmade,
size=small,
man made=false,
+ scale=1,
#1,
}%
\begin{scope}[shift={(#2)}, local bounding box=#3, scale=\MilSymb@scale, transform shape]
@@ -3615,6 +3645,8 @@ scale=1,
offset/.value required,
movement/.code 2 args={\begin{scope}[shift={(#2)}]\ifthenelse{\equal{\MilSymb@drawH}{true}\AND \equal{\MilSymb@selectedfaction}{friendly}}{ \draw [-{Stealth[inset=0pt,scale=1]}] (-0.75, -0.75) -- +($(0, -##1) - (0, -0.75)$) -- +(##2);}{\draw [-{Stealth[inset=0pt,scale=1]}] (0,0) -- +(0, -##1) -- +(##2);}\end{scope}},
movement/.value required,
+ frame status=normal,
+ scale=1,
faction=friendly,
main=none,
upper=none,
diff --git a/graphics/pgf/contrib/milsymb/milsymb.tex b/graphics/pgf/contrib/milsymb/milsymb.tex
index 434a299855..fe7704f53b 100644
--- a/graphics/pgf/contrib/milsymb/milsymb.tex
+++ b/graphics/pgf/contrib/milsymb/milsymb.tex
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% MilSymb Manual File %%
%%-------------------- %%
-%% Version: 1.01 %%
-%% Last Updated: 03/07/2019 %%
+%% Version: 1.02 %%
+%% Last Updated: 2020-03-15 %%
%% Github: https://github.com/ralphieraccoon/MilSymb %%
%% Copyright: Damian Crosby 2018 %%
%% Licence: Creative Commons Attribution-ShareAlike 4.0 International License %%
@@ -76,8 +76,9 @@
\begin{versionhistory}
\renewcommand \vhAuthorColWidth{6cm}
-\vhEntry{1.0}{29/04/2018}{Damian Crosby}{Creation}
-\vhEntry{1.01}{05/07/2019}{Damian Crosby}{Added clarification on DVI output, added clarification that multiple class symbols are found in \texttt{multi}}.
+\vhEntry{1.0}{2018-04-29}{Damian Crosby}{Creation.}
+\vhEntry{1.01}{2019-05-07}{Damian Crosby}{Added clarification on DVI output, added clarification that multiple class symbols are found in \texttt{multi}.}
+\vhEntry{1.02}{2020-03-15}{Damian Crosby}{Fixed scaling and placement errors in the \texttt{speed leader} key code, added note to define \texttt{scale} first in manual when using \texttt{speed leader}, fixed compilation issues in \texttt{landgroup} and \texttt{landheadqurters} to account for updated \texttt{xparse} package, fixed issue with \texttt{frame status} and \texttt{scale} keys not always being updated between commands, changed datestamps to be ISO 8601 compliant as per CTAN request.}
\end{versionhistory}
\clearpage
@@ -330,6 +331,8 @@ This key draws a line from the centre of the symbol at a specified heading for a
\texttt{speed leader=\{\textit{heading}\}\{\textit{length}\}}
+\textit{When using this key along with the \texttt{scale} key, the \texttt{scale} key should be defined first. This is because the \texttt{speed leader} key immediately executes code that uses the \texttt{scale} key.}
+
\begin{figure}[H]
\centering
\begin{tikzpicture}
diff --git a/macros/generic/schemata/README b/macros/generic/schemata/README
index 93c0a037d7..1a7653d9a3 100644
--- a/macros/generic/schemata/README
+++ b/macros/generic/schemata/README
@@ -115,265 +115,3 @@ This material is subject to the LaTeX Project Public License:
http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
Happy TeXing!
-\ifx\fmtname\schemataLaTeX\else
- \catcode`@=11\relax
-\fi
-\newbox\@schemata@rhs
-\newbox\@schemata@lhs
-\newdimen\@schemata@rheight
-\newdimen\@schemata@lheight
-\newif\if@schemata@LCBox
-\newif\if@schemata@SWBox
-\newif\if@schemata@NudgeBox
-\ifx\fmtname\schemataLaTeX
- \DeclareOption{braces}%
- {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
- \DeclareOption{brackets}%
- {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
- \DeclareOption{parens}%
- {\let\@schemata@LD( \let\@schemata@RD)}
- \DeclareOption{groups}%
- {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
- \ExecuteOptions{braces}
- \ProcessOptions\relax
-\else
- \let\@schemata@LD\lbrace%
- \let\@schemata@RD\rbrace%
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\DoBraces}%
- {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
-\else
- \def\DoBraces%
- {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\DoBrackets}%
- {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
-\else
- \def\DoBrackets%
- {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\DoParens}%
- {\let\@schemata@LD( \let\@schemata@RD)}
-\else
- \def\DoParens%
- {\let\@schemata@LD( \let\@schemata@RD)}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\DoGroups}%
- {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
-\else
- \def\DoGroups%
- {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\LCschema}{\@schemata@LCBoxtrue}
-\else
- \def\LCschema{\@schemata@LCBoxtrue}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\UCschema}{\@schemata@LCBoxfalse}
-\else
- \def\UCschema{\@schemata@LCBoxfalse}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\SwitchSB}{\@schemata@SWBoxtrue}%
-\else
- \def\SwitchSB{\@schemata@SWBoxtrue}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\NudgeSB}{\@schemata@NudgeBoxtrue}
-\else
- \def\NudgeSB{\@schemata@NudgeBoxtrue}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand{\SBNudgeFactor}{\kern0.2em}
-\else
- \def\SBNudgeFactor{\kern0.2em}
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\schemabox}[2][0pt]{\@schemata@schemabox[#1]{#2}}
-\else
- \def\schemabox{\futurelet\testchar\@schemata@schemab@x}
- \def\@schemata@schemab@x{%
- \ifx[\testchar
- \let\next\@schemata@schemabox%
- \else
- \let\next\@schemata@@schemab@x%
- \fi
- \next%
- }%
- \def\@schemata@@schemab@x#1{\@schemata@schemabox[0pt]{#1}}
-\fi
-\def\@schemata@schemabox[#1]#2{%
- \ifinner
- \if@schemata@LCBox
- \def\@Adj{}%
- \if@schemata@SWBox\def\@Adj{\strut}\fi
- \else
- \def\@Adj{\strut}%
- \if@schemata@SWBox\def\@Adj{}\fi
- \fi
- \if@schemata@NudgeBox
- \let\@Nudge\SBNudgeFactor%
- \else
- \def\@Nudge{}%
- \fi
- \ifdim#1<1pt
- \def\\{\@Nudge\egroup\hbox\bgroup\ignorespaces }%
- \vbox{\hbox\bgroup\@Adj\ignorespaces #2\@Nudge\egroup}%
- \else
- \def\\{\hfil\egroup\hbox to #1\bgroup\ignorespaces }%
- \vbox{\hbox to #1\bgroup\@Adj\ignorespaces #2\hfil\egroup}%
- \fi
- \else
- #2%
- \fi
- \@schemata@SWBoxfalse%
- \@schemata@NudgeBoxfalse%
-}
-\ifx\fmtname\schemataLaTeX
- \newcommand{\schema}[3][open]{%
- \@schemata@schema[#1]{#2}{#3}}
-\else
- \long\def\schema{\futurelet\testchar\@schemata@schem@}
- \long\def\@schemata@schem@{%
- \ifx[\testchar
- \let\next\@schemata@schema%
- \else
- \let\next\@schemata@@schem@%
- \fi
- \next%
- }%
- \long\def\@schemata@@schem@#1#2{%
- \@schemata@schema[open]{#1}{#2}}
-\fi
-\long\def\@schemata@schema[#1]#2#3{%
- \def\@ption{#1}\def\@pen{open}%
- \ifx\@ption\@pen
- \setbox\@schemata@rhs=\vbox{#3}%
- \@schemata@rheight=\ht\@schemata@rhs%
- \advance\@schemata@rheight\dp\@schemata@rhs%
- \advance\@schemata@rheight by 1.44265ex%
- \hbox{$\vcenter{#2}%
- \@schemata@lbrace{\@schemata@rheight}%
- \vcenter{#3}$}%
- \else
- \setbox\@schemata@lhs=\vbox{#2}%
- \@schemata@lheight=\ht\@schemata@lhs%
- \advance\@schemata@lheight\dp\@schemata@lhs%
- \advance\@schemata@lheight by 1.44265ex%
- \hbox{$\vcenter{#2}%
- \kern-0.2em\@schemata@rbrace{\@schemata@lheight}%
- \vcenter{#3}$}%
- \fi
-}
-\ifx\fmtname\schemataLaTeX
- \newcommand{\Schema}[5][open]{%
- \@schemata@Schema[#1]{#2}{#3}{#4}{#5}}
-\else
- \long\def\Schema{\futurelet\testchar\@schemata@Schem@}
- \long\def\@schemata@Schem@{%
- \ifx[\testchar
- \let\next\@schemata@Schema%
- \else
- \let\next\@schemata@@Schem@%
- \fi
- \next%
- }%
- \long\def\@schemata@@Schem@#1#2#3#4{%
- \@schemata@Schema[open]{#1}{#2}{#3}{#4}}
-\fi
-\long\def\@schemata@Schema[#1]#2#3#4#5{%
- \def\@ption{#1}%
- \def\@pen{open}%
- \dimen0=#2%
- \ifx\@ption\@pen
- \hbox{$\vcenter{\vskip1.44265\dimen0#4}%
- \@schemata@biglbrace{#2}{#3}\vcenter{#5}$}%
- \else
- \hbox{$\vcenter{\vskip1.44265\dimen0#4}\kern-0.2em%
- \@schemata@bigrbrace{#2}{#3}\vcenter{#5}$}%
- \fi
-}
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\@schemata@lbrace}[1]{%
- \ifmmode
- \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD%
- \fi
- }
-\else
- \def\@schemata@lbrace#1{%
- \ifmmode
- \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD%
- \fi
- }
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\@schemata@rbrace}[1]{%
- \ifmmode
- \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.%
- \fi
- }
-\else
- \def\@schemata@rbrace#1{%
- \ifmmode
- \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.%
- \fi
- }
-\fi
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\@schemata@biglbrace}[2]{%
- \@schemata@@biglbrace{#1}{#2}}
-\else
- \def\@schemata@biglbrace#1#2{%
- \@schemata@@biglbrace{#1}{#2}}
-\fi
-\def\@schemata@@biglbrace#1#2{%
- \dimen0=#1%
- \dimen2=#2%
- \dimen4=-\dimen2%
- \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
- \ifdim\dimen0<0pt
- \ifmmode\vcenter{\hbox{$\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@LD%
- \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
- \else
- \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
- \atop\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@LD$}}\fi
- \fi
-}
-\ifx\fmtname\schemataLaTeX
- \newcommand*{\@schemata@bigrbrace}[2]{%
- \@schemata@@bigrbrace{#1}{#2}%
- }
-\else
- \def\@schemata@bigrbrace#1#2{%
- \@schemata@@bigrbrace{#1}{#2}%
- }
-\fi
-\def\@schemata@@bigrbrace#1#2{%
- \dimen0=#1%
- \dimen2=#2%
- \dimen4=-\dimen2%
- \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
- \ifdim\dimen0<0pt
- \ifmmode\vcenter{\hbox{$\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@RD%
- \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
- \else
- \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
- \atop\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@RD$}}\fi
- \fi
-}
-\ifx\fmtname\schemataLaTeX\else
- \catcode`@=12\relax
-\fi
diff --git a/macros/generic/schemata/schemata.dtx b/macros/generic/schemata/schemata.dtx
index 6de7e4a9db..82b39c2f38 100644
--- a/macros/generic/schemata/schemata.dtx
+++ b/macros/generic/schemata/schemata.dtx
@@ -202,7 +202,7 @@ Running "make install" installs the files in the local TeX tree.
%<package>\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}
%<package>\ProvidesPackage{schemata}
%<*package>
- [2020/03/13 v1.0 generic package to aid construction of topical categories]
+ [2020/03/14 v1.1 generic package to aid construction of topical categories]
%</package>
%<package>\fi
%<*driver>
@@ -285,6 +285,7 @@ Running "make install" installs the files in the local TeX tree.
% \changes{v0.6}{2013/03/10}{Added features}
% \changes{v0.7}{2013/09/23}{Changed contact info}
% \changes{v0.8}{2016/01/25}{Rewrote manual; moved to dtxgen}
+% \changes{v1.1}{2020/03/14}{Fix issue with dtx guards}
%
% \GetFileInfo{\jobname.dtx}
% \DoNotIndex{\bgroup, \csname, \DeclareOption, \def, \dimen, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \expandafter, \fi, \futurelet, \gdef, \hbox, \hfil, \if, \ifcsname, \ifdim, \ifmmode, \ifx, \ignorespaces, \index, \let, \newbox, \newcommand, \newdimen, \newif, \next, \PackageWarning, \ProcessOptions, \relax, \RequirePackage, \setbox, \space, \testchar, \vbox, \vcenter, \vfil, \vskip}
@@ -2052,7 +2053,9 @@ Running "make install" installs the files in the local TeX tree.
% \newpage\PrintChanges
% \newpage\PrintIndex
%}
-%
+% \iffalse
+%<*package>
+% \fi
% \section{Implementation}
%
% Shorter macros are written in both \LaTeX{} and generic \TeX. Longer macros implement a platform-specific front end and a common back end. The macros default to \LaTeXe{} format. If the format test fails, then generic macros are selected.\medskip
@@ -2064,7 +2067,7 @@ Running "make install" installs the files in the local TeX tree.
% \leavevmode\llap{\scriptsize 4\ \ }\verb+%<package>\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}+
% \leavevmode\llap{\scriptsize 5\ \ }\verb+%<package>\ProvidesPackage{schemata}+
% \verb+%<*package>+
-% \leavevmode\llap{\scriptsize 6\ \ }\verb+ [2020/03/13 v1.0 generic package to aid construction of topical categories]+
+% \leavevmode\llap{\scriptsize 6\ \ }\verb+ [2020/03/14 v1.1 generic package to aid construction of topical categories]+
% \verb+%</package>+
% \leavevmode\llap{\scriptsize 7\ \ }\verb+%<package>\fi+
% \egroup
diff --git a/macros/generic/schemata/schemata.pdf b/macros/generic/schemata/schemata.pdf
index 461a1fd8c0..2551bc87b9 100644
--- a/macros/generic/schemata/schemata.pdf
+++ b/macros/generic/schemata/schemata.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
index e2733ecc1a..c317295d77 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
@@ -1,5 +1,16 @@
# Changelog
+## Version 0.8d (2020-03-15)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.8c...v0.8d>
+
+### Fixed
+- Avoid an error about the bibmacro `labeltitle` being undefined
+ in some contexts.
+ Define and use `tabular:labeltitle` in 'tabular:sortname`.
+ If available `tabular:labeltitle` is just `labeltitle`,
+ if not we recreate the definition from `authoryear.bbx`.
+
## Version 0.8c (2019-11-30)
See <https://github.com/moewew/biblatex-ext/compare/v0.8b...v0.8c>
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
index 369bb0ebb7..589aca46bd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
@@ -83,7 +83,7 @@ installation instructions.
## Licence
-Copyright 2017-2019 Moritz Wemheuer
+Copyright 2017-2020 Moritz Wemheuer
This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua`
files mentioned above.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
index 8f67360f22..73c8034a52 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa-doiapi}
- [2019/11/30 v0.8c Obtain open access information from DOI via
+ [2020/03/15 v0.8d Obtain open access information from DOI via
unpaywall.org and doi.org (MW)]
\RequirePackage{etoolbox}
@@ -7,16 +7,16 @@
\protected\def\extblx@oa@api@error#1#2{%
\PackageError{biblatex-ext-oa-doiapi}{#1}{#2.}}
-\protected\def\extblx@oa@api@warning@noline#1{%
- \PackageWarningNoLine{biblatex-ext-oa-doiapi}{#1}}
+\protected\def\extblx@oa@api@warning@noline{%
+ \PackageWarningNoLine{biblatex-ext-oa-doiapi}}
\protected\def\extblx@oa@api@info@noline#1{%
\PackageInfo{biblatex-ext-oa-doiapi}{#1\@gobble}}
\let\extblx@oa@api@warning\extblx@oa@api@warning@noline
\AtEndOfPackage{%
- \protected\def\extblx@oa@api@warning#1{%
- \PackageWarning{biblatex-ext-oa-doiapi}{#1}}}
+ \protected\def\extblx@oa@api@warning{%
+ \PackageWarning{biblatex-ext-oa-doiapi}}}
% LuaLaTeX only!
\ifundef\luatexversion
@@ -43,8 +43,8 @@
% OA data
\IfFileExists{\jobname.oai}
{\extblx@oa@api@info@noline{%
- Load OA database from\MessageBreak
- \jobname.oai}%
+ Loading OA database from\MessageBreak
+ \jobname.oai ...}%
\directlua{dofile(\extblx@oa@api@luastring{\jobname.oai})}}
{\extblx@oa@api@info@noline{%
No OA database file present at\MessageBreak
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
index 6fd7d73301..1cc321adf2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
@@ -1,5 +1,7 @@
\ProvidesPackage{biblatex-ext-oa}
- [2019/11/30 v0.8c mark open access in biblatex bibliographies (MW)]
+ [2020/03/15 v0.8d mark open access in biblatex bibliographies (MW)]
+
+\RequirePackage{etoolbox}
\protected\def\extblx@oa@error#1#2{%
\PackageError{biblatex-ext-oa}{#1}{#2.}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
index 189be34ab6..dad02d54b7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -1,7 +1,7 @@
\RequirePackage{expl3}
\ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
- {2019/11/30} {0.8c}
+ {2020/03/15} {0.8d}
{open access symbols with l3draw (MW)}
\RequirePackage{xparse}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
index 2d71d36aa2..ba430c0c68 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-pict2e}
- [2019/11/30 v0.8c open access symbols with pict2e (MW)]
+ [2020/03/15 v0.8d open access symbols with pict2e (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
index 827aa659b5..625d67484d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-tikz}
- [2019/11/30 v0.8c open access symbols with TikZ (MW)]
+ [2020/03/15 v0.8d open access symbols with TikZ (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
index 7ffd71b79b..85500743cc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-tabular}
- [2019/11/30 v0.8c tabular bibliographies for biblatex (MW)]
+ [2020/03/15 v0.8d tabular bibliographies for biblatex (MW)]
% Code based on Audrey's
% (https://tex.stackexchange.com/users/4483/audrey)
@@ -96,7 +96,6 @@
% underlying macros
\def\extblxtab@bibtabular#1{%
- \blx@langstrings
\blx@bibheading\blx@theheading\blx@thetitle
\blx@bibnote\blx@theprenote
\begingroup
@@ -244,7 +243,7 @@
% appropriate
\newbibmacro*{tabular:sortname}{%
\ifnameundef{labelname}
- {\usebibmacro{labeltitle}}
+ {\usebibmacro{tabular:labeltitle}}
{\printnames[sortname]{labelname}%
\iffieldequalstr{labelnamesource}{editor}
{\setunit{\printdelim{editortypedelim}}%
@@ -261,6 +260,20 @@
{}
{\clearname{\thefield{labelnamesource}}}}
+% as it turns out 'labeltitle' is only defined in authoryear.bbx
+% so we need a replacement if we can't have it
+\ifbibmacroundef{labeltitle}
+ {\newbibmacro*{tabular:labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}
+ {\printfield[title]{shorttitle}}}
+ {\printfield{label}}}}
+ {\ifundef\letbibmacro
+ {\newbibmacro*{tabular:labeltitle}{\usebibmacro{labeltitle}}}
+ {\letbibmacro{tabular:labeltitle}{labeltitle}}}
+
\endinput
%
% This file is part of the biblatex-ext bundle.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
index a0a1d3fe8e..f040de55f1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
index 9361fd6f06..a3485ec19b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
@@ -455,7 +455,7 @@
\newcommand*{\ctan}{\mkbibacro{CTAN}}
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.8c}
+\newcommand*{\extblxversion}{0.8d}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -528,7 +528,7 @@
author = {Moritz Wemheuer},
link = {mwemheu@gmail.com},%
revision = {\extblxversion},
- date = {\DTMDate{2019-11-30}},
+ date = {\DTMDate{2020-03-15}},
}
\hypersetup{%
@@ -693,7 +693,7 @@ under the terms of the \lppl, version 1.3c%
\fnurl{https://www.latex-project.org/lppl/lppl-1-3c.txt}
or (at your option) any later version%
\fnurl{https://www.latex-project.org/lppl.txt}.
-This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2019).
+This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2020).
\subsection{Feedback}\label{sec:feedback}
@@ -2403,8 +2403,8 @@ You may want to look into fixed-width flush-left or flush-right columns%
The package also defines two helpful bibliography macros.
\begin{keymarglistbook}
- \item[tabular:sortname] Prints the labelname/sortname.
- \item[tabular:omitsortname] Suppresses the labelname/sortname in the current
+ \keyitem[tabular:sortname] Prints the labelname/sortname.
+ \keyitem[tabular:omitsortname] Suppresses the labelname/sortname in the current
group.
\end{keymarglistbook}
@@ -3176,9 +3176,12 @@ See also \filename{CHANGES.md}.
The numbers on the right indicate the relevant section of the manual.
\begin{changelog}
+\begin{release}{0.8d}{2020-03-15}
+ \item Fixed issue with \hyperbibmacro{tabular:sortname}\see{sec:tabularbib}
+\end{release}
\begin{release}{0.8c}{2019-11-30}
\item Stopped querying \url{https://doi.org} API for DOI
- verification \hypersty{biblatex-ext-oa-doiapi}\see{sec:oa:doiapi}
+ verification\see{sec:oa:doiapi}
\end{release}
\begin{release}{0.8b}{2019-11-01}
\item Fixed bug in \blxstyle{ext-verbose-trad2}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
index 53c80ee319..5793769dc9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
@@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {}
local blxextdoiapi_module = {
name = "blxextdoiapi",
- version = "v0.8c",
- date = "2019/11/30",
+ version = "v0.8d",
+ date = "2020/03/15",
description = "Obtain open access information from DOI via unpaywall.org",
author = "Moritz Wemheuer",
license = "LPPL v1.3c",
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
index f0d090e9b7..8c666baab1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2019/11/30 v0.8c extended biblatex alphabetic-verb
+ [2020/03/15 v0.8d extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
index 6e3d5abd24..f15217f528 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2019/11/30 v0.8c extended biblatex alphabetic-verb citation style
+ [2020/03/15 v0.8d extended biblatex alphabetic-verb citation style
(MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
index 3760359aba..2f470bda86 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2019/11/30 v0.8c extended biblatex alphabetic bibliography style (MW)]
+ [2020/03/15 v0.8d extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
index 05e079ea76..322e5c309c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2019/11/30 v0.8c extended biblatex alphabetic citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex alphabetic citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
index 38f7035f16..c53138d5f9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2019/11/30 v0.8c common files for extended biblatex
+ [2020/03/15 v0.8d common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
index 5195a16023..bb641162df 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle-comp
+ [2020/03/15 v0.8d extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
index dd3162a4af..40ae7bf49c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle-comp
+ [2020/03/15 v0.8d extended biblatex authortitle-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
index 039b30edab..7f0c00ff76 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle-ibid
+ [2020/03/15 v0.8d extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
index 6b3ef59a1b..c8739a0054 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle-ibid
+ [2020/03/15 v0.8d extended biblatex authortitle-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
index bc734bc063..75c73b2110 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle-icomp
+ [2020/03/15 v0.8d extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
index 3ab3384d5f..6e4a4d17a8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle-icomp
+ [2020/03/15 v0.8d extended biblatex authortitle-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
index 0bfaef52b3..f7b89bcab3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle-tcomp
+ [2020/03/15 v0.8d extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
index d4f2ca530d..4211e23e58 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle-tcomp
+ [2020/03/15 v0.8d extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
index 744a0ce05b..45c105c729 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle-terse
+ [2020/03/15 v0.8d extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
index ece3445148..94512c2f7f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle-terse
+ [2020/03/15 v0.8d extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
index 1c4e410f49..68cd1cd07b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle-ticomp
+ [2020/03/15 v0.8d extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
index 25c8f55a61..c104f72c53 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle-ticomp citation style
+ [2020/03/15 v0.8d extended biblatex authortitle-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authortitle-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
index b3f402f166..32d7c05546 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2019/11/30 v0.8c extended biblatex authortitle
+ [2020/03/15 v0.8d extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
index 7838fccf57..7d23543d32 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.cbx}
- [2019/11/30 v0.8c extended biblatex authortitle citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex authortitle citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
index 28ec13dafb..b13da3a86d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2019/11/30 v0.8c common files for extended biblatex
+ [2020/03/15 v0.8d common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
index 7b3c90af87..504df8b4dd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-comp
+ [2020/03/15 v0.8d extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
index 7c7d1e4e81..6b8b391572 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-comp
+ [2020/03/15 v0.8d extended biblatex authoryear-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
index 78cca6c2ef..1fa1d080c7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.bbx}
- [2019/11/30 v0.8c biblatex authoryear-ecomp
+ [2020/03/15 v0.8d biblatex authoryear-ecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
index 7c2ca3c251..75af266356 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.cbx}
- [2019/11/30 v0.8c biblatex authoryear-ecomp
+ [2020/03/15 v0.8d biblatex authoryear-ecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
index db1a53a0a7..04edea84dd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-ibid
+ [2020/03/15 v0.8d extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
index b094e28138..08278f8c99 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-ibid
+ [2020/03/15 v0.8d extended biblatex authoryear-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
index 5e6737b256..883545cc18 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-icomp
+ [2020/03/15 v0.8d extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
index 97b60e02c8..0408a79c05 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-icomp
+ [2020/03/15 v0.8d extended biblatex authoryear-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
index 49bdd95cd1..ebc60b2cba 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.bbx}
- [2019/11/30 v0.8c biblatex authoryear-iecomp
+ [2020/03/15 v0.8d biblatex authoryear-iecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
index f547f89589..2a78bcdddb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.cbx}
- [2019/11/30 v0.8c biblatex authoryear-iecomp
+ [2020/03/15 v0.8d biblatex authoryear-iecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
index 80ea4b6d2e..6fdf039da1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-tcomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
index 86b23c4e43..e9a7cc08c6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-tcomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
index 17f775a8b2..0ba10be06c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-tecomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
index 42a508b694..31a942594d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-tecomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tecomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-ecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
index 6a4aa515c8..5115dc8bcd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-terse
+ [2020/03/15 v0.8d extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
index 2c498b3547..f8ad390401 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-terse
+ [2020/03/15 v0.8d extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
index da62448b8c..5c5cb0ef41 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-ticomp
+ [2020/03/15 v0.8d extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
index 3518b16c5f..1fc55ebf89 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-ticomp citation style
+ [2020/03/15 v0.8d extended biblatex authoryear-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
index 0d95445d36..e586b240b1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear-tiecomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tiecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
index 028916f975..f778df25bb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear-tiecomp citation style
+ [2020/03/15 v0.8d extended biblatex authoryear-tiecomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-iecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
index 5d2661476c..b134ddf872 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2019/11/30 v0.8c extended biblatex authoryear bibliography style (MW)]
+ [2020/03/15 v0.8d extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
index d1b21cc36e..0661cb4862 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.cbx}
- [2019/11/30 v0.8c extended biblatex authoryear citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex authoryear citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
index e4a5b909f2..869ea690d5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
@@ -1,16 +1,16 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2019/11/30 v0.8c auxiliaries for extended biblatex citation style
+ [2020/03/15 v0.8d auxiliaries for extended biblatex citation style
(MW)]
-\def\extblx@requiredbiblatexversion{3.13a}
-\def\extblx@requiredbiblatexdate{2019/08/31}
+\def\extblx@requiredbiblatexversion{3.14}
+\def\extblx@requiredbiblatexdate{2019/12/01}
-\newrobustcmd*{\extblx@info}{\PackageInfo{biblatex-ext}}
-\newrobustcmd*{\extblx@warning}{\PackageWarning{biblatex-ext}}
-\newrobustcmd*{\extblx@warning@noline}{%
+\protected\def\extblx@info{\PackageInfo{biblatex-ext}}
+\protected\def\extblx@warning{\PackageWarning{biblatex-ext}}
+\protected\def\extblx@warning@noline{%
\PackageWarningNoLine{biblatex-ext}}
-\newrobustcmd*{\extblx@error}[2]{\PackageError{biblatex-ext}{#1}{#2.}}
+\protected\def\extblx@error#1#2{\PackageError{biblatex-ext}{#1}{#2.}}
\@ifpackagelater{biblatex}{\extblx@requiredbiblatexdate}
{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
index 80cac50719..44764981e7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2019/11/30 v0.8c common files for extended biblatex
+ [2020/03/15 v0.8d common files for extended biblatex
dashed bibliography styles (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
index 20f4f1facb..182abbb619 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2019/11/30 v0.8c extended biblatex numeric-comp
+ [2020/03/15 v0.8d extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
index cc0dadec83..6c725966b7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2019/11/30 v0.8c extended biblatex numeric-comp citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric-comp citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
index 081c056afc..a3f25d89ad 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2019/11/30 v0.8c extended biblatex numeric-verb
+ [2020/03/15 v0.8d extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
index 1d51d83ac5..9329075202 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2019/11/30 v0.8c extended biblatex numeric-verb citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric-verb citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
index b20100fe0f..4ba671890a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2019/11/30 v0.8c extended biblatex numeric bibliography style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
index 76bc8543e1..53c669bb63 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.cbx}
- [2019/11/30 v0.8c extended biblatex numeric citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
index eaea493bd4..b147192e20 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
@@ -1,9 +1,9 @@
-% biblatex-ext v0.8c (2019-11-30)
+% biblatex-ext v0.8d (2020-03-15)
% Maintainer: Moritz Wemheuer
% Licence: LaTeX Project Public License v1.3c or later
%
\ProvidesFile{ext-standard.bbx}
- [2019/11/30 v0.8c extended biblatex standard style (MW)]
+ [2020/03/15 v0.8d extended biblatex standard style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
@@ -22,7 +22,7 @@
\DeclareBiblatexOption{global,type,entry}[boolean]{citexref}[true]{%
\settoggle{bbx:citexref}{#1}}
\DeclareBiblatexOption{global,type,entry}[boolean]{citeinxref}[true]{%
- \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak
+ \extblx@warning{The option 'citeinxref' is deprecated.\MessageBreak
Use 'citexref' (without in) instead.\MessageBreak
Setting 'citexref' now}%
\settoggle{bbx:citexref}{#1}}
@@ -1265,7 +1265,7 @@
\endinput
-% Copyright 2017-2019 Moritz Wemheuer
+% Copyright 2017-2020 Moritz Wemheuer
%
% This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua`
% files
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
index 510db28bf5..9fe1fafe5d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2019/11/30 v0.8c extended biblatex verbose-ibid
+ [2020/03/15 v0.8d extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
index edfff4f63a..77002522b7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2019/11/30 v0.8c extended biblatex verbose-ibid citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-ibid citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
index e55d414ad2..ae8a1636e9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2019/11/30 v0.8c extended biblatex verbose-inote
+ [2020/03/15 v0.8d extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
index fc254381a3..a97685ae39 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2019/11/30 v0.8c extended biblatex verbose-inote citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-inote citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
index 3e1c64352f..92f2929ec0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2019/11/30 v0.8c extended biblatex verbose-note
+ [2020/03/15 v0.8d extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
index 33f97dbe96..c30d9fc2dc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2019/11/30 v0.8c extended biblatex verbose-note citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-note citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
index 5a6c4a62f9..c3d884aded 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2019/11/30 v0.8c extended biblatex verbose-trad1
+ [2020/03/15 v0.8d extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
index 074743f605..6a7fb52723 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2019/11/30 v0.8c extended biblatex verbose-trad1 citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-trad1 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
index dbf16a731d..507c33ccda 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2019/11/30 v0.8c extended biblatex verbose-trad2
+ [2020/03/15 v0.8d extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
index 85d01f8238..6eda3ffe63 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2019/11/30 v0.8c extended biblatex verbose-trad2 citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-trad2 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
index de23b2c3c4..a74c5622dc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2019/11/30 v0.8c extended biblatex verbose-trad3
+ [2020/03/15 v0.8d extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
index b7f322b2e5..81a20c7ba6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2019/11/30 v0.8c extended biblatex verbose-trad3 citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-trad3 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
index cf176b729c..5e0ba9f2b1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2019/11/30 v0.8c extended biblatex verbose
+ [2020/03/15 v0.8d extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
index f8e7e02d62..576c4b4433 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.cbx}
- [2019/11/30 v0.8c extended biblatex verbose citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/README.md b/macros/latex/contrib/biblatex-contrib/oscola/README.md
index c71883d783..df42e7376f 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/README.md
+++ b/macros/latex/contrib/biblatex-contrib/oscola/README.md
@@ -1,7 +1,7 @@
# Summary
-The Oscola package works (only!) with Biblatex (v 2.0 or later) and
-Biber (v 1.0 or later). It aims to implement, almost completely, the
+The Oscola package works (only!) with Biblatex (v3.14 or later) and
+Biber (v2.14 or later). It aims to implement, almost completely, the
OSCOLA style of legal citation, according to the
[4th edition](https://www.law.ox.ac.uk/sites/files/oxlaw/oscola_4th_edn_hart_2012.pdf). For
further information about coverage see the documentation.
@@ -13,13 +13,13 @@ further information about coverage see the documentation.
The package consists of five principal files (`oscola.bbx`, `oscola.cbx`, and three language definition files,
`english-oscola.lbx`, `british-oscola.lbx`, and `american-oscola.lbx`). There is also a very short index
style file, `oscola.ist`. Those files are copyright (c) Paul Stanley
-2012-18.
+2012-20.
This work may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
or (at your option) any later version.
-The latest version of the license is in [available online](http://www.latex-project.org/lppl.txt)
+The latest version of the license is in [available online](http://www.latex-project.org/lppl.txt)
and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
This work has the LPPL maintenance status 'maintained'. The current
@@ -56,7 +56,7 @@ August 2012 Version 1 Original release
May 2013 Version 1.2 Various bugfixes, and implementation
of citation scheme for UN documents
-
+
October 2013 Version 1.3 Corrected spacing bug
May 2014 Version 1.4 Various bugs have been fixed, an additional
@@ -73,3 +73,6 @@ March 2018 Version 1.6 The package has been updated again to take
account of minor changes in Biblatex; various
bugs have been fixed; support for \\textcite has been
improved.
+
+March 2020 Version 1.7 The package has been updated to take
+ account of changes in Biblatex.
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx b/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
index 83ae46a8a7..1df7a04f1b 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
+++ b/macros/latex/contrib/biblatex-contrib/oscola/american-oscola.lbx
@@ -2,8 +2,8 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+\ProvidesFile{american-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx b/macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx
index 9e72e5341a..c98b38c57e 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx
+++ b/macros/latex/contrib/biblatex-contrib/oscola/british-oscola.lbx
@@ -2,12 +2,13 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{british-oscola.lbx}[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
-
-\InheritBibliographyExtras{british}
+\ProvidesFile{british-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
+\InheritBibliographyExtras{british}
+
\NewBibliographyString{regulation,
regulations,
eucase,
@@ -75,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -93,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -529,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -551,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx b/macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx
index 83ae46a8a7..7c2497045f 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx
+++ b/macros/latex/contrib/biblatex-contrib/oscola/english-oscola.lbx
@@ -3,7 +3,7 @@
% oscola.lbx for copyright and licence information
\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/oscola-examples.bib b/macros/latex/contrib/biblatex-contrib/oscola/oscola-examples.bib
new file mode 100644
index 0000000000..096bd6a80a
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/oscola/oscola-examples.bib
@@ -0,0 +1,1533 @@
+% This file contains various sample entries for testing the
+% biblatex-oscola package. It is distributed under the
+% Creative Commons Attribution 3.0-Unported License (CC BY 3.0).
+% A copy of that license is available at
+% http://creativecommons.org/licenses/by/3.0/deed.en_GB}
+
+@misc{amazon:email,
+ title = {Email from Amazon.co.uk to author},
+ date = {2008-12-16},
+}
+
+@book{bar00,
+ author = {von Bar, Christian},
+ title = {The Common European Law of Torts},
+ volume = 2,
+ publisher = {CH Beck},
+ date = 2000,
+ pagination = {paragraph},
+}
+
+@legislation{ucta,
+ title = {Unfair Contract Terms Act},
+ shorttitle = {UCTA 77},
+ date = {1977},
+ entrysubtype = {primary},
+ pagination = {section},
+ keywords = {en},
+ number = {23 Eliz II, cap 23}
+}
+
+@legislation{disorderly,
+ title = {Penalties for Disorderly Behaviour (Amendment of
+ Minimum Age) Order},
+ date = {2004},
+ entrysubtype = {secondary},
+ pagination = {regulation},
+ keywords = {en},
+ number = {SI 2004\slash 3166},
+}
+
+@legislation{hollowware,
+ title = {Hollow-ware and Galvanising Welfare Order},
+ date = {1921},
+ number = {SR~\&~O 1921\slash 2032},
+ pagination = {rule},
+ entrysubtype = {secondary},
+}
+
+@legislation{eggs,
+ title = {Eggs and Chicks (England) Regulations},
+ date = {2009},
+ number = {SI 2009\slash 2163},
+ pagination = {regulation},
+ entrysubtype = {secondary},
+}
+
+@legislation{learner,
+ title = {The Learner Travel (Wales) Measure 2008
+ (Commencement No 2) Order},
+ number = {SI 2009\slash 2819},
+ pagination = {regulation},
+ keywords = {cy},
+ userb = {W~245},
+ entrysubtype = {secondary},
+}
+
+@legislation{learner08,
+ title = {Learner Travel (Wales) Measure},
+ date = {2008},
+ number = {nawm 2},
+ keywords = {cy},
+ entrysubtype = {primary},
+ pagination = {section},
+}
+
+@legislation{gorchymyn,
+ title = {Gorchymyn Mesur Teithio gan Ddysgwyr (Cymru)
+ (Cychwyn Rhif 2)\nopunct},
+ number = {SI 2009\slash 2819},
+ pagination = {regulation},
+ keywords = {cy},
+ userb = {Cy 245},
+ entrysubtype = {secondary},
+ language = {welsh},
+}
+
+@legislation{breedingdogs,
+ title = {Breeding of Dogs (Licensing Records) (Scotland) Regulations},
+ date = {1999},
+ number = {SSI 1999\slash 176},
+ keywords = {sc},
+ pagination = {regulation},
+ entrysubtype = {secondary},
+}
+
+@legislation{sederunt:session,
+ title = {Act of Sederunt (Rules of the Court of Session 1994)},
+ date = {1994},
+ number = {SI 1994\slash 1443},
+ keywords = {sc},
+ pagination = {rule},
+ entrysubtype = {secondary},
+}
+
+@legislation{adjournal,
+ title = {Act of Adjournal (Criminal Appeals)},
+ date = {2003},
+ number = {SSI 2003\slash 387},
+ keywords = {sc},
+ entrysybtype = {secondary},
+}
+
+@legislation{bann,
+ title = {The River Bann Navigation Order (Northern Ireland)},
+ date = {2010},
+ number = {SR 2010\slash 126},
+ keywords = {ni},
+ entrysubtype = {secondary},
+}
+
+@legislation{cpr,
+ title = {Civil Procedure Rules},
+ shorttitle = {CPR},
+ keywords = {en},
+ entrysubtype = {procedure-rule},
+ date = {1999},
+}
+
+@legislation{pd,
+ title = {CPR Practice Directions},
+ shorttitle = {PD},
+ keywords = {en},
+ entrysubtype = {procedure-rule},
+}
+
+@legislation{rsc,
+ title = {Rules of the Supreme Court},
+ shorttitle = {RSC},
+ keywords = {en},
+ date = {1965},
+ entrysubtype = {procedure-rule},
+ pagination = {rule},
+}
+
+@legislation{ccr,
+ title = {County Court Rules},
+ shorttitle = {CCR},
+ keywords = {en},
+ date = {1985},
+ pagination = {rule},
+ entrysubtype = {procedure-rule},
+}
+
+@legislation{2002/60,
+ title = {Council Directive 2002\slash 60\slash EC of
+ 27 June 2002 laying down specific provisions
+ for the control of African swine fever and
+ amending Directive 99\slash 119\slash EEC as
+ regards Teschen disease and African swine
+ fever},
+ date = {2002},
+ origdate = {2002-06-27},
+ journaltitle = {OJ},
+ series = {L},
+ issue = {192},
+ pages = {27},
+ type = {directive},
+ number = {2002/60/EC},
+ pagination = {article},
+ keywords = {eu},
+}
+
+@legislation{merger,
+ title = {Council Regulation (EC) No 139/2004 of 20
+ January 2004 on the control
+ of concentrations between undertakings},
+ type = {regulation},
+ entrysubtype = {regulation},
+ journaltitle = {OJ},
+ volume = {24},
+ series = {L},
+ date = {2004},
+ pages = {1--22},
+ keywords = {eu},
+ number = {139/2004},
+}
+
+@legislation{teu,
+ title = {Consolidated Version of the
+ Treaty on European Union},
+ indextitle = {Treaty on European Union},
+ date = {2010},
+ journaltitle = {OJ},
+ series = {C},
+ volume = {83},
+ pages = {13},
+ shorthand = {TEU},
+ entrysubtype = {eu-treaty},
+ pagination = {article},
+ keywords = {eu},
+}
+
+@jurisdiction{antaios85,
+ title = {Antaios Compania Naviera S.A. v. Salen Rederierna A.B. (The Nema)},
+ shorttitle = {The Nema},
+ date = {1985},
+ reporter = {A.C.},
+ pages = {191},
+ court = {H.L.},
+ additionalreports = {[1984] 3 WLR 592 and (1984) 128 SJ 564 and [1984] 3 All ER 229 and [1984] 2 Lloyd's Rep 235},
+ keywords = {gb},
+}
+
+@jurisdiction{clearbrook,
+ title = {Clearbrook Ironworks Ltd. v. Letorneau},
+ number = {2006 FCA 42},
+ volume = {46},
+ reporter = {C.P.R.},
+ series = {4th},
+ pages = {241},
+ date = {2006},
+ pagination = {paragraph},
+ keywords = {ca},
+}
+
+@jurisdiction{tang,
+ title = {R. v. Tang},
+ date = {2008},
+ volume = {237},
+ reporter = {C.L.R.},
+ pages = {1},
+ keywords = {au},
+}
+
+@jurisdiction{bakker,
+ title = {Bakker v. Stewart},
+ date = {1980},
+ reporter = {V.R.},
+ pages = {17},
+ keywords = {au},
+}
+
+@book{birks87,
+ translator = {Birks, Peter and McLeod, Grant},
+ title = {The Institutes of Justinian},
+ indextitle = {Institutes of Justinian, The},
+ publisher = {Duckworth},
+ date = 1987,
+ location = {London},
+}
+
+@jurisdiction{adbhu,
+ keywords = {eu},
+ title = {Procureur de la R\'epublique v ADBHU},
+ shorttitle = {ADBHU},
+ number = {240/83},
+ institution = {ECJ},
+ date = {1985},
+ reporter = {ECR},
+ pages = {531},
+ ecli = {EU:C:1985:59},
+}
+
+@jurisdiction{C430/93,
+ keywords = {eu},
+ title = {Jereon van Schijndel v Stichting Pensioenfonds voor Fysiotherapeuten},
+ shorttitle = {van Schijndel},
+ number = {C-430/93--C-431/93},
+ institution = {ECJ},
+ reporter = {ECR},
+ volume = {I},
+ date = {1998},
+ pages = {4705},
+}
+
+@jurisdiction{T344/99,
+ keywords = {eu},
+ title = {Arne Mathisen AS v Council},
+ shorttitle = {Arne Mathisen},
+ number = {T-344/99},
+ institution = {CFI},
+ reporter = {ECR},
+ volume = {II},
+ pages = {2905},
+ date = {2002},
+}
+
+@jurisdiction{C556/07,
+ keywords = {eu},
+ title = {Commission v France},
+ date = {2009},
+ reporter = {OJ},
+ series = {C},
+ volume = {102},
+ pages = {8},
+ number = {C-556/07},
+ institution = {ECJ},
+}
+
+@jurisdiction{T277/08,
+ keywords = {eu},
+ title = {Bayer Healthcare v OHMI--Uriach Aquilea OTC},
+ institution = {CFI},
+ number = {T-277/08},
+ date = {2009-11-11},}
+
+@jurisdiction{alcatel,
+ keywords = {eu},
+ title = {Alcatel/Telettra},
+ userb = {IV/M.042},
+ number = {91\slash 251\slash EEC},
+ institution = {commission},
+ type = {Decision},
+ date = {1991},
+ reporter = {OJ},
+ series = {L},
+ volume = {122},
+ pages = {48},
+}
+
+@jurisdiction{C176/03,
+ keywords = {eu},
+ title = {Commission v Council},
+ number = {C\textendash176/03},
+ date = {2005},
+ reporter = {ECR},
+ volume = {I},
+ pages = {7879},
+ institution = {ECJ},
+}
+
+@jurisdiction{verkehrsorgani,
+ keywords = {eu},
+ title = {Georg Verkehrsorgani v Ferrovie dello Stato},
+ userb = {Case COMP\slash 37.685},
+ number = {2004/33/EC},
+ institution = {commission},
+ year = {2004},
+ reporter = {OJ},
+ series = {L},
+ issue = {11},
+ pages = {17},
+ hyphenation = {italian},
+}
+
+@jurisdiction{boardman,
+ title = {Phipps v Boardman},
+ keywords = {gb},
+ reporter = {AC},
+ date = {1967},
+ volume = 2,
+ pages = {46},
+ institution = {HL},
+ options = {year-essential=true},
+ shorthand = {Phipps},
+}
+
+@article{bm:note,
+ author = {Neil Andrews},
+ journaltitle = {CLJ},
+ date = 1986,
+ pages = 220,
+ entrysubtype = {casenote},
+ crossref = {boardman},
+}
+
+@jurisdiction{corr08,
+ title = {Corr v I.B.C. Vehicles Ltd.},
+ keywords = {gb},
+ date = {2008},
+ number = {[2008] UKHL 13},
+ reporter = {AC},
+ volume = {1},
+ pages = {884},
+ options = {year-essential=true},
+ institution = {HL},
+ shorttitle = {Corr},
+ pagination = {[]},
+}
+
+@jurisdiction{jameel04,
+ title = {Jameel v. Wall Street Journal
+ Europe SPRL},
+ shorttitle = {Jameel v Wall Street Journal},
+ number = {[2006] UKHL 44},
+ date = {2007},
+ volume = {1},
+ reporter = {A.C.},
+ pages = {359},
+ options = {year-essential},
+}
+
+@Book{book:1,
+ author = {A N Author},
+ title = {Title of Book},
+ date = 1998,
+ location = {London},
+ publisher = {{Sweet \& Maxwell}}
+}
+
+@jurisdiction{page96,
+ title = {Page v Smith},
+ keywords = {en},
+ date = {1996},
+ reporter = {AC},
+ pages = {155},
+ institution = {HL},
+ annotation = {affirmed \cite{corr}},
+}
+
+@jurisdiction{barrett01,
+ title = {Barrett v Enfield LBC},
+ keywords = {en},
+ date = {2001},
+ reporter = {AC},
+ volume = {2},
+ pages = {550},
+ institution = {HL},
+ options = {year-essential=true},
+}
+
+@jurisdiction{barrett01a,
+ title = {Barrett v Enfield LBC},
+ keywords = {en},
+ date = {2001},
+ reporter = {BMLR},
+ volume = {49},
+ pages = {1},
+ lista = {First and Second and Third},
+ institution = {HL},
+}
+
+@jurisdiction{rea01,
+ title = {Re A (Conjoined Twins)},
+ indextitle = {A (Conjoined Twins), Re},
+ keywords = {en},
+ date = {2001},
+ reporter = {Fam},
+ options = {year-essential=false},
+ pages = 147,
+}
+
+@jurisdiction{madoff09,
+ title = {Re Bernard L Madoff Investment Securities LLC},
+ number = {[2009] EWHC 442 (Ch)},
+ date = {2010},
+ origdate = {2009},
+ reporter = {BCC},
+ pages = 328,
+ pagination = {[]},
+ shorthand = {Re Madoff Securities},
+}
+
+@jurisdiction{taylor79,
+ title = {Taylor v Glass},
+ date = {1979},
+ reporter = {CLY},
+ institution = {CA},
+ pages = {672},
+ options = {year-essential=true},
+}
+
+@jurisdiction{quainoo82,
+ title = {Quainoo v Brent and Harrow AHA},
+ date = {1982},
+ volume = {132},
+ reporter = {NLJ},
+ pages = {1100},
+ institution = {QB},
+}
+
+@jurisdiction{powick93,
+ title = {Powick v Malvern Wells Water Co},
+ date = {1993-09-28},
+ reporter = {The Times},
+ institution = {QB},
+ entrysubtype = {newspaper},
+}
+
+@jurisdiction{emerald10,
+ title = {Emerald Supplies Ltd v British Airways plc},
+ number = {[2009] EWHC 741 (Ch)},
+ date = {2010},
+ origdate = {2009},
+ reporter = {Ch},
+ pages = {48},
+ shorttitle = {Emerald Supplies Ltd},
+}
+
+@jurisdiction{stubbs90,
+ title = {Stubbs v Sayer},
+ institution = {CA},
+ date = {1990-11-08},
+}
+
+@jurisdiction{calvert02,
+ title = {Calvert v Gardiner},
+ number = {[2002] EWHC 1394 (QB)},
+ institution = {QB},
+ date = {2002-01-01},
+}
+
+@article{boyle04,
+ author = {Boyle, James},
+ title = {A Manifesto on WIPO and the Future of Intellectual
+ Property},
+ journaltitle = {2004 Duke L \& Tech Review 0009},
+ url =
+ {http://dltr.law.duke.edu/2004/09/08/a-manifesto-on-wipo-and-the-future-of-intellectual-property},
+ urldate = {2012-07-18},
+ options = {url=true},
+}
+
+@misc{brown:letter,
+ title = {Letter from Gordon Brown to Lady Ashton},
+ date = {2009-11-20},
+}
+
+@book{burrows02,
+ author = {Burrows, Andrew},
+ title = {The Law of Resitution},
+ edition = 2,
+ publisher = {Butterworths},
+ date = 2002,
+}
+
+@book{burrows04,
+ author = {Burrows, Andrew},
+ title = {Remedies for Torts and Breach of Contract},
+ edition = 3,
+ publisher = {OUP},
+ date = 2004,
+}
+
+@inbook{cartwright09,
+ author = {Cartwright, John},
+ title = {The Fiction of the \enquote{Reasonable Man}},
+ crossref = {castermans09},
+}
+
+@book{castermans09,
+ editor = {Castermans, A. G. and others},
+ title = {Ex Libris Hans Nieuwenhuis},
+ publisher = {Kluwer},
+ date = 2009,
+}
+
+@article{craig05,
+ author = {Craig, Paul},
+ title = {Theory \enquote{Pure Theory} and Values in Public
+ Law},
+ date = 2005,
+ journaltitle = {PL},
+ pages = 440,
+}
+
+@article{croft,
+ title = {Supreme Court Warns on Quality},
+ author = {Jane Croft},
+ journaltitle = {Financial Times},
+ location = {London},
+ date = {2010-07-01},
+ pages = 3,
+ entrysubtype = {newspaper},
+}
+
+@book{endicott09,
+ author = {Endicott, Timothy},
+ title = {Administrative Law},
+ publisher = {OUP},
+ location = {Oxford},
+ date = 2009,
+}
+
+@article{greenleaf10,
+ author = {Greenleaf, Graham},
+ title = {The Global Development of Free Access to Legal
+ Information},
+ date = 2010,
+ url = {http://ejlt.org/article/view/17},
+ urldate = {2010-07-10},
+ journaltitle = {EJLT},
+ volume = 1,
+ issue = 1,
+}
+
+@article{griffith01,
+ author = {Griffith, J. A. G.},
+ title = {The Common Law and the Political Constitution},
+ date = 2001,
+ journaltitle = {L.Q.R.},
+ volume = 117,
+ pages = 42,
+}
+
+@book{hart08,
+ author = {Hart, H. L. A.},
+ title = {Punishment and Responsibility},
+ subtitle = {Essays in the Philosophy of Law},
+ editor = {Gardner, John},
+ edition = 2,
+ publisher = {OUP},
+ date = 2008,
+}
+
+@misc{honore:interview,
+ author = {Endicott, Timothy and Gardner, John},
+ title = {Interview with Tony Honor\'e, Emeritus Regius
+ Professor of Civil Law, University of Oxford},
+ location = {Oxford},
+ date = {2007-07-17},
+ shorttitle = {Interview with Tony Honor\'e},
+}
+
+@book{horder00,
+ editor = {Horder, Jeremy},
+ title = {Oxford Essays in Jurisprudence: Fourth Series},
+ publisher = {OUP},
+ date = 2000,
+}
+
+@book{jones09,
+ author = {Jones, Gareth},
+ title = {Goff and Jones: The Law of Restitution},
+ edition = {1st Supp, 7th edn},
+ publisher = {{Sweet~\& Maxwell}},
+ date = 2009,
+ location = {London},
+}
+
+@book{kotz98,
+ author = {Zweigert, K. and K\"otz, H.},
+ title = {An Introduction to Comparative Law},
+ translator = {Weir, Tony},
+ edition = 3,
+ publisher = {OUP},
+ date = 1998,
+}
+
+@misc{kull:interview,
+ title = {Interview with Irene Kull, Assistant Dean, Faculty
+ of Law, Tartu University},
+ location = {Tartu, Estonia},
+ date = {2003-08-04},
+}
+
+@book{lenaerts2,
+ title = {Constitutional Law of the European Union},
+ edition = 2,
+ author = {Lenaerts, Koen and Piet van Nuffel},
+ editor = {Bray, Robert},
+ publisher = {Sweet \& Maxwell},
+ date = 2005,
+}
+
+@book{leviathan,
+ author = {Hobbes, Thomas},
+ title = {Leviathan},
+ publisher = {Penguin},
+ date = 1985,
+ origdate = 1651,
+ location = {Harmondsworth},
+}
+
+@article{loader,
+ title = {The Great Victim of this Get Tough Hyperactivity is
+ Labour},
+ author = {Ian Loader},
+ journaltitle = {The Guardian},
+ location = {London},
+ date = {2008-06-19},
+ url =
+ {http://www.guardian.co.uk/commentisfree/2008/jun/19/justice.ukcrime},
+ urldate = {2009-11-19},
+ entrysubtype = {newspaper},
+}
+
+@reference{halsbury5,
+ title = {Halsbury's Laws},
+ pagination = {paragraph},
+ edition = {5},
+ date = {2010},
+ publisher = {Butterworths},
+}
+
+@inreference{halsbury5:57,
+ volume = {57},
+ crossref = {halsbury5},
+ pagination = {paragraph},
+}
+
+@reference{iess,
+ title = {International Encyclopaedia of the Social Sciences III},
+ date = {1968},
+}
+
+@inreference{friedrich68,
+ title = {Constitutions and Constitutionalism},
+ author = {Friedrich, CJ},
+ pages = 319,
+ maintitle = {International Encyclopaedia of the
+ Social Sciences III},
+ date = {1968},
+}
+
+@inreference{friedrich68a,
+ title = {Constitutions and Constitutionalism},
+ author = {Friedrich, C.J.},
+ pages = {319},
+ volume = {III},
+ maintitle = {International Encyclopaedia of the
+ Social Sciences},
+ date = {1968},
+}
+
+@reference{cross,
+ title = {Cross on Local Government Law},
+ options = {looseleaf},
+ date = {2010},
+}
+
+@commentary{stair,
+ author = {Stair},
+ title = {Institutions},
+ keywords = {sc},
+ }
+
+@commentary{colitt,
+ author = {Coke},
+ title = {Co Litt},
+ keywords = {en},
+}
+
+@commentary{blackstone,
+ author = {Blackstone},
+ title = {Commentaries},
+ shorttitle = {Bl Comm},
+ keywords = {en},
+}
+
+@legislation{supremacy1558,
+ title = {Act of Supremacy},
+ date = {1558},
+ entrysubtype= {primary},
+ pagination = {section},
+ keywords = {en},
+}
+
+@legislation{shipping1995,
+ title = {Shipping and Trading Interests (Protection) Act},
+ date = {1995},
+ entrysubtype= {primary},
+ pagination = {section},
+ keywords = {en},
+}
+
+@legislation{nia1965,
+ title = {Nuclear Installations Act},
+ date = {1965},
+ shorthand = {NIA 1965},
+ keywords = {en},
+ pagination = {section},
+ entrysubtype= {primary},
+ keywords = {en},
+ note = {as amended},
+}
+
+@legislation{cpa1987,
+ title = {Consumer Protection Act},
+ year = {1987},
+ keywords = {en},
+ pagination= {section},
+ type = {primary},
+}
+
+@jurisdiction{boulton57,
+ title = {Boulton v Jones},
+ date = {1857},
+ volume = {2},
+ journaltitle = {H\&N},
+ pages = {564},
+ keywords = {en},
+ userb = {157},
+ userc = {ER},
+ usere = {232--242},
+}
+
+@jurisdiction{henly28,
+ title = {Henly v Mayor of Lyme},
+ shorttitle = {Henly},
+ date = {1828},
+ volume = {5},
+ reporter = {Bing},
+ pages = {91},
+ keywords = {en},
+ parvolume = {130},
+ parreporter= {ER},
+ parpages = {995},
+ options = {no-ibid=true},
+}
+
+@jurisdiction{johnston86,
+ title = {Johnston v Ireland},
+ reporter = {Series A},
+ pages = {122},
+ date = {1986},
+ institution = {ECtHR},
+ keywords = {echr},
+}
+
+@jurisdiction{osman98,
+ title = {Osman v UK},
+ reporter = {ECHR},
+ date = {1998},
+ volume = {8},
+ pages = {3124},
+ institution = {ECtHR},
+ keywords = {echr},
+}
+
+@jurisdiction{omojudi10,
+ title = {Omojudi v UK},
+ reporter = {EHRR},
+ date = {2010},
+ pages = {10},
+ volume = {51},
+ institution = {ECtHR},
+ keywords = {echr},
+}
+
+@jurisdiction{x71,
+ title = {X v Netherlands},
+ date = {1971},
+ volume = {38},
+ reporter = {CD},
+ pages = {9},
+ court = {Commission},
+ keywords = {echr},
+}
+
+@jurisdiction{ccsu87,
+ title = {Council of Civil Service Unions v UK},
+ date = {1987},
+ volume = {10},
+ reporter = {EHRR},
+ pages = {269},
+ institution = {Commission},
+ keywords = {echr},
+}
+
+@jurisdiction{simpson86,
+ title = {Simpson v UK},
+ date = {1989},
+ volume = {64},
+ reporter = {DR},
+ pages = {188},
+ institution = {Commission},
+ keywords = {echr},
+}
+
+@jurisdiction{balogh04,
+ title = {Balogh v Hungary},
+ number = {47940/99},
+ date = {2004-07-20},
+ institution = {E{\mbox{Ct}}HR},
+ keywords = {echr},
+}
+
+@jurisdiction{hislop42,
+ title = {Hislop v Durham},
+ date = {1842},
+ volume = {4},
+ reporter = {D},
+ pages = {1168},
+ keywords = {sc},
+}
+
+@jurisdiction{adams03,
+ title = {Adams v Advocate General},
+ date = {2003},
+ reporter = {SC},
+ pages = {171},
+ institution = {OH},
+ keywords = {sc},
+}
+
+@jurisdiction{dodds03,
+ title = {Dodds v HM Advocate},
+ date = {2003},
+ reporter = {JC},
+ pages = {8},
+ keywords = {sc},
+}
+
+@jurisdiction{crofters02,
+ title = {Crofters Commission v Scottish Ministers},
+ date = {2002},
+ reporter = {SLT},
+ series = {(Land Ct)},
+ pages = {19},
+ keywords = {sc},
+}
+
+@jurisdiction{davidson05,
+ title = {Davidson v Scottish Ministers},
+ date = {2006},
+ number = {[2005] UKHL 74},
+ reporter = {SC (HL)},
+ keywords = {gb},
+ options = {scottish-style=true},
+}
+
+@jurisdiction{smart06,
+ title = {Smart v HM Advocate},
+ number = {[2006] HJAC 12},
+ date = {2006},
+ reporter = {JC},
+ pages = {119},
+ keywords = {sc},
+}
+
+
+@jurisdiction{p88,
+ title = {P v UK},
+ number = {13473/87},
+ date = {1988-07-11},
+ institution = {Commission},
+ keywords = {echr},
+}
+
+@report{rc:capital,
+ title = {Report of the Royal Commission on Capital Punishment},
+ author = {{Home Office}},
+ series = {Cmd},
+ number = {8932},
+ date = {1953},
+ pagination = {paragraph},
+}
+
+@report{autumnperf,
+ title = {2008 Autumn Performance Report},
+ institution = {Department for Children, Schools and Families},
+ series = {Cm},
+ number = {7507},
+ date = {2008},
+}
+
+@report{eliminating:poverty,
+ title = {Eliminating World Poverty},
+ subtitle = {Building our Common Future},
+ author = {{Department for International Development}},
+ number = {Cm 7656},
+ type = {White Paper},
+ date = {2009},
+}
+
+@report{lawcom313,
+ title = {Reforming Bribery},
+ institution = {Law Commission},
+ number = {Law Com No 313},
+ date = {2008},
+ pagination = {paragraph},
+}
+
+@report{scotlawcom196,
+ title = {Damages for Psychiatric Injury},
+ institution = {Scottish Law Commission},
+ number = {Scot Law Com No 196},
+ date = {2004-11-11},
+ pagination = {paragraph},
+ usera = {officialreports},
+}
+
+@report{lawcomcp121,
+ title = {Privity of Contract: Contracts for the Benefit
+ of Third Parties},
+ author = {{Law Commission}},
+ number = {Law Com CP No 121},
+ date = {1991},
+ pagination = {paragraph},
+}
+
+@report{genomic,
+ title = {Genomic Medicine},
+ author = {Science and Technology Committee},
+ entrysubtype = {parliamentary},
+ number = {HL 107},
+ volume = {1},
+ date = {2008/2009},
+}
+
+@report{equality,
+ title = {Legislative Scrutiny: Equality Bill (second report);
+ Digital Economy Bill},
+ institution = {Joint Committee on Human Rights},
+ entrysubtype = {parliamentary},
+ date = {2009/2010},
+ number = {HL 73, HC 425},
+}
+
+@report{patient,
+ title = {Patient Safety},
+ institution = {Health Committee},
+ entrysubtype = {parliamentary},
+ date = {2008/2009},
+ volume = {1},
+ number = {HC 151},
+ pagination = {paragraph},
+}
+
+@legal{hansardhc,
+ title = {Official Report, House of Commons},
+ shorttitle = {HC Deb},
+ entrysubtype = {parliamentary},
+ pagination = {column}
+}
+
+@legal{hra:hc:2,
+ crossref = {hansardhc},
+ volume = {123},
+ options = {skipbib=true},
+ date = {2004-07-31},
+ pages = {333--54},
+}
+
+@legal{hra:hc:3,
+ crossref = {hansardhc},
+ volume = {145},
+ date = {2004-08-21},
+ pages = {100-103},
+}
+
+@legal{foia:2r,
+ volume = {340},
+ pages = {714--98},
+ date = {1999-12-07},
+ crossref = {hansardhc},
+ entrysubtype = {parliamentary},
+ options = {skipbib=true},
+
+}
+
+@legal{healthbill,
+ title = {Health Bill Deb},
+ date = {2007-01-30},
+ pagination = {column},
+ entrysubtype = {parliamentary},
+}
+
+
+
+@report{com895,
+ title = {Proposal for a Council Decision on the conclusion,
+ on behalf of the European Community, of a Protocol
+ on the Implementation of the Alpine Convention in
+ the Field of Transport (Transport Protocol)},
+ institution = {Commission},
+ number = {COM (2008) 895 final},
+ entrysubtype = {comdoc}
+}
+
+@report{com13,
+ title = {Action Plan on consumer access to justice and the
+ settlement of disputes in the internal market},
+ type = {Communication},
+ number = {COM (96) 13 final},
+ institution = {Commission},
+ entrysubtype = {comdoc}
+}
+
+@report{com348,
+ title = {Proposal for a Council Regulation on jurisdiction and
+ the recognition and enforcement of judgments in civil
+ and commercial matters},
+ number = {COM (99) 348 final},
+ institution = {Commission},
+ entrysubtype = {comdoc},
+}
+
+@book{mcgill:guide,
+ title = {Canadian Guide to Uniform Legal Citation},
+ author = {{McGill Law Journal}},
+ edition = 7,
+ date = 2010,
+ publisher = {Carswell},
+}
+
+@book{melbourne,
+ title = {Australian Guide to Legal Citation},
+ author = {{Melbourne University Law Review Association Inc}},
+ publisher = {Melbourne University Law Review Association and
+ Melbourne Journal of International Law},
+ edition = 3,
+ date = 2010,
+ url = {http://mulr.law.unimelb.edu.au/go/aglc},
+ urldate = {2012-07-18},
+}
+
+@book{oscola,
+ title = {OSCOLA},
+ subtitle = {Oxford Standard for the Citation of Legal
+ Authorities},
+ author = {{Faculty of Law, University of Oxford}},
+ url = {http://www.law.ox.ac.uk/oscola},
+ date = 2010,
+ edition = 4,
+ shorthand = {{{\scshape oscola}}},
+}
+@online{cole09,
+ title = {Virtual Friend Fires Employee},
+ journaltitle = {Naked Law},
+ date = {2009-05-01},
+ url = {http://www.nakedlaw.com/2009/05/index.html},
+ urldate = {2009-11-09},
+ author = {Cole, Sarah},
+}
+@thesis{herberg89,
+ title = {Injunctive Relief for Wrongful Termination of
+ Employment},
+ author = {Herberg, Javan},
+ date = {1989},
+ institution = {{University of Oxford}},
+ type = {DPhil thesis},
+}
+@jurisdiction{corfu,
+ title = {Corfu Channel Case},
+ subtitle = {UK v Albania},
+ titleaddon = {Merits},
+ date = {1949},
+ reporter = {ICJ Rep},
+ pages = {4},
+ keywords = {int},
+}
+@jurisdiction{nicaragua,
+ title = {Land, Island and Maritime Frontier
+ Case},
+ subtitle = {El Salvador\slash Hon\-duras, Nicaragua
+ intervening},
+ titleaddon = {Application for Intervention},
+ date = {1994},
+ reporter = {ICJ Rep},
+ pages = {92},
+ keywords = {int},
+}
+@jurisdiction{wall,
+ title = {Legal Consequences of the Construction
+ of a Wall},
+ titleaddon = {Advisory Opinion},
+ date = {2004},
+ url = {http://www.icj-cij.org/icjwww/imwp/imwpframe.htm},
+ urldate = {2005-07-21},
+ pagination = {[]},
+ keywords = {int},
+}
+@jurisdiction{chorzow,
+ title = {Case Concerning the Factory at Chorz\'ow},
+ subtitle = {Germany v Poland},
+ titleaddon = {Merits},
+ indextitle = {Chorz\'ow Factory Case},
+ reporter = {PCIJ Rep},
+ date = {1928},
+ series = {A},
+ pages = {17},
+ keywords = {int},
+}
+@jurisdiction{gex,
+ title = {Case of the Free Zones of Upper Savoy and
+ the District of Gex},
+ subtitle = {Switzerland v France},
+ reporter = {PCIJ Rep},
+ series = {Series A/B},
+ pages = {No 46},
+ keywords = {int},
+}
+@jurisdiction{consular,
+ title = {Case Concerning the Vienna Convention on
+ Consular Relations},
+ subtitle = {Germany v USA},
+ titleaddon = {Request for the Indication of Provisional
+ Measures: Order},
+ number = {General List No 104},
+ reporter = {ICJ},
+ date = {1999},
+ pages = {1},
+ keywords = {int},
+}
+@legislation{confund,
+ title = {Consolidated Fund Bill},
+ date = {2008/2009},
+ institution = {HC},
+ number = {5},
+ keywords = {gb, draft},
+ entrysubtype = {primary},
+ pagination = {clause},
+}
+
+@book{oscola3,
+ title = {OSCOLA},
+ subtitle = {Oxford Standard for the Citation of Legal
+ Authorities},
+ author = {{Faculty of Law, University of Oxford}},
+ url =
+ {http://www.law.ox.ac.uk/published/oscola/oscola_2006.pdf},
+ date = 2006,
+ edition = 3,
+}
+@legislation{confund2,
+ title = {Consolidated Fund Bill},
+ date = {2008/2009},
+ institution = {HC},
+ number = {34},
+ keywords = {gb, draft},
+ entrysubtype = {primary},
+ pagination = {clause},
+}
+@legislation{academies,
+ title = {Academies Bill},
+ date = {2010/2011},
+ institution = {HL},
+ number = {1},
+ keywords = {gb, draft},
+ entrysubtype = {primary},
+ pagination = {clause},
+}
+@legal{charitiesnotes,
+ title = {Explanatory Notes on the Charities Act 2006},
+ indextitle = {Charities Act 2006, Explanatory Note},
+ pagination = {paragraph},
+ entrysubtype = {explanatory note},
+}
+@report{biblatex2,
+ author = {Lehman, Philip and Boruvka, Audrey and Kime, Philip and Wright, Joseph},
+ title = {The \texttt{biblatex} Package},
+ sorttitle = {The biblatex package},
+ date = {2019},
+ edition = {v 3.14},
+}
+@legal{scheldt,
+ title = {International Agreement on the Scheldt},
+ shorttitle = {Scheldt Agreement},
+ parties = {Belgium and France and Netherlands},
+ execution = {signed=2002-12-01 and inforce=2005-12-01},
+ pagination = {article},
+ volume = {2351},
+ journaltitle = {UNTS},
+ pages = {13},
+ entrysubtype = {piltreaty},
+}
+@legal{aaland,
+ title = {Convention Relating to the Non-Fortification
+ and Neutralisation of the Aaland Islands},
+ parties = {{Aaaland Islands} and Germany and Denmark and Estonia
+ and Finland and France},
+ lista = {opened=1921-10-02 and inforce=1922-12-06},
+ pagination = {article},
+ volume = {9},
+ date = {1921},
+ journaltitle = {LNTS},
+ pages = {211},
+ entrysubtype = {piltreaty},
+}
+@legal{mongolia,
+ title = {Agreement with Mongolia (Economic Co-operation)},
+ shortitle = {Mongolia Cooperation Agreement},
+ journaltitle= {O.J.},
+ series = {L},
+ issue = {264},
+ pages = {1},
+ date = {1978},
+ entrysubtype= {piltreaty},
+}
+
+@inbook{pila10,
+ author = {Pila, Justine},
+ editor = {Dutton, William H. and Jeffreys, Paul W.},
+ booktitle = {World Wide Research: Reshaping the Sciences and
+ Humanities in the Century of Information},
+ publisher = {MIT Press},
+ date = 2010,
+ title = {The Value of Authorship in the Digital Environment},
+ pages = {210--231},
+}
+
+@inproceedings{reliance,
+ author = {McFarlane, Ben and Nolan, Donal},
+ title = {Remedying Reliance: The Future Development of
+ Promissory and Proprietary Estoppel in English Law},
+ eventtitle = {Obligations III conference},
+ location = {Brisbane},
+ eventdate = {2006-07-01},
+}
+
+@book{roberts09,
+ author = {Roberts, Julian V and Hough, Mike},
+ title = {Public Opinion and the Jury: An International
+ Literature Review},
+ series = {Ministry of Justice Research Series},
+ number = {1/09},
+ date = 2009,
+}
+
+@article{rowbottom07,
+ entrysubtype = {casenote},
+ author = {Rowbottom, Jacob},
+ crossref = {jameel04},
+ date = 2007,
+ journaltitle = {C.L.J.},
+ pages = {8--11},
+}
+
+@misc{spbill4,
+ title = {SP Bill 4 Abolition of Feudal Tenure etc (Scotland)
+ Bill [as introduced] Session 1},
+ date = 1999,
+ tabulate = {pmats},
+ options = {skipbib},
+}
+
+@Book{testbook,
+ author = {A T Author},
+ title = {Title},
+ editor = {Editor, E and Beditor, B},
+ publisher = {Publisher},
+ origdate = 1232,
+ translator = {Translator},
+ volume = 1,
+ location = {Location},
+ edition = 3,
+ note = {note},
+ eprint = {eprintreference},
+ eprinttype = {google},
+ pagination = {paragraph},
+ year = 2000
+}
+@jurisdiction{western97,
+ title = {Western Alliance Insurance Co. v. Gill},
+ volume = {686},
+ reporter = {N.E.},
+ series = {2},
+ pages = {997},
+ location = {Mass.},
+ date = {1997},
+ keywords = {us},
+}
+@jurisdiction{harbor91,
+ title = {Harbor Insurance Co. v. Tishman Construction Co.},
+ volume = {578},
+ reporter = {N.E.2d.},
+ pages = {1197},
+ location = {Ill.},
+ court = {App. Ct.},
+ date = {1991},
+ keywords = {us},
+}
+@jurisdiction{operadora09,
+ title = {Re Operadora D.B. Mexico S.A.},
+ indextitle = {Operadora D.B. Mexico S.A., Re},
+ number = {6:09-{}cv-{}383-{}Orl 022GJK},
+ eprint = {2009 WL 2423138},
+ court = {M.D. Fla.},
+ date = {2009},
+ keywords = {us},
+}
+
+@article{waldron06,
+ author = {Waldron, Jeremy},
+ title = {The Core of the Case against Judicial Review},
+ date = 2006,
+ volume = 115,
+ journaltitle = {Yale L.J.},
+ pages = 1346,
+}
+
+@article{young09,
+ author = {Young, Alison L.},
+ title = {In Defence of Due Deference},
+ date = 2009,
+ journaltitle = {MLR},
+ volume = 72,
+ pages = 554,
+}
+
+@legal{echr:treaty,
+ title = {Convention for the Protection of Human Rights
+ and Fundamental Freedoms},
+ execution = { opened=1950-11-04 and inforce=1953-09-03 },
+ volume = {213},
+ reporter = {U.N.T.S.},
+ pages = {221},
+ note = {as amended by Protocol No 14bis to the Convention
+ for the Protection of Human Rights and
+ Fundamental Freedoms
+ (opened for signature 27 May 2009, entered into force
+ 1 September 2009) CETS No 204},
+ shorthand = {ECHR},
+ entrysubtype = {piltreaty},
+}
+@ARTICLE{JAB0960,
+ title = {A Nonparty View},
+ author = {A },
+ address = {London},
+ date = {1911-07-28},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0218,
+ title = {Ireland and the Political Situation},
+ author = {Blake, Henry. A.},
+ address = {London},
+ date = {1910-02-07},
+ pages = {6},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0266,
+ title = {The Political Situation},
+ author = {Blake, Henry. A.},
+ address = {London},
+ date = {1910-02-23},
+ pages = {9},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0304,
+ title = {The House Of Lords},
+ author = {Blake, Henry. A.},
+ address = {London},
+ date = {1910-03-23},
+ pages = {10},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0025,
+ title = {Forcible Feeding},
+ author = {{A.C.P} },
+ address = {London},
+ date = {1909-11-10},
+ pages = {10},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0976,
+ title = {The Last Ditch},
+ author = {{A Bottomless Pitman}},
+ address = {London},
+ date = {1911-07-29},
+ pages = {10},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0642,
+ title = {Scandal-Mongers- A Butlers Protest},
+ author = {{A Butler}},
+ address = {London},
+ date = {1911-01-28},
+ pages = {12},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {inactive},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0217,
+ title = {The Political Outlook},
+ author = {Academicus},
+ address = {London},
+ date = {1910-02-04},
+ pages = {7},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@ARTICLE{JAB0904,
+ title = {Reculer Pour Mieux Sauter},
+ author = {Academicus},
+ address = {London},
+ date = {1911-07-25},
+ pages = {7},
+ entrysubtype = {newspaper},
+ options = {skipbib=true},
+ abstract = {active},
+ journaltitle = {The Times}
+}
+
+@misc{Indep,
+ institution = {UNGA},
+ title = {Declaration on the Granting of Independence to Colonial
+ Countries and Peoples},
+ instrument_no = {Res 1514 (XV)},
+ date = {1960-12-14},
+ doc_no = {UN~Doc A/4684 (1961)},
+ shorttitle = {Res 1514 (XV)},
+ entrysubtype = {undoc},
+}
+
+@misc{res51_210,
+ institution = {UNGA},
+ instrument_no = {Res 51/210},
+ date = {1996-12-17},
+ doc_no = {UN~Doc A/RES/51/210},
+ entrysubtype = {undoc},
+}
+
+@misc{badinter4,
+title = {Opinion No 4},
+author = {{Badinter Commission}},
+indextitle = {Badinter Commission Opinion 4},
+year = 1992,
+volume = 31,
+journaltitle = {I.L.M.},
+pages = 1501,
+entrysubtype = {undoc},
+} \ No newline at end of file
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx b/macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx
index 3cdcf29104..cf65250089 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx
+++ b/macros/latex/contrib/biblatex-contrib/oscola/oscola.bbx
@@ -13,7 +13,7 @@
% This work has the LPPL maintenance status 'maintained'.
% The current maintainer of this work is Paul Stanley (pstanley@essexcourt.net)
-\ProvidesFile{oscola.bbx}[2019/01/20 v1.6 Biblatex bibliography style for OSCOLA standard]
+\ProvidesFile{oscola.bbx}[2020/03/15 v1.7 Biblatex bibliography style for OSCOLA standard]
\RequireBibliographyStyle{authortitle}
@@ -131,12 +131,6 @@
\newboolean{bbx@year-essential}\setboolean{bbx@year-essential}{false}
% Entry options
-\DeclareEntryOption{url}[true]{%
- \settoggle{bbx:url}{#1}}
-\DeclareEntryOption{doi}[true]{%
- \settoggle{bbx:doi}{#1}}
-\DeclareEntryOption{eprint}[true]{%
- \settoggle{bbx:eprint}{#1}}
\DeclareEntryOption{scottish-style}[true]{%
\settoggle{bbx:scotstyle}{#1}}
\DeclareEntryOption{no-ibid}[true]{%
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx b/macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx
index 72770b3db8..18ba1ca80a 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx
+++ b/macros/latex/contrib/biblatex-contrib/oscola/oscola.cbx
@@ -2,7 +2,7 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{oscola.cbx}[2018/03/22 v1.6 Biblatex citation style for OSCOLA standard]
+\ProvidesFile{oscola.cbx}[2020/03/15 v1.7 Biblatex citation style for OSCOLA standard]
\RequireCitationStyle{verbose-inote}
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/oscola.ist b/macros/latex/contrib/biblatex-contrib/oscola/oscola.ist
index 2bd72651bf..13cf384fae 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/oscola.ist
+++ b/macros/latex/contrib/biblatex-contrib/oscola/oscola.ist
@@ -1,6 +1,6 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-% v 1.6 22/03/2018
+% 2020/03/15 v1.7
delim_0 "\\space\\dotfill\\space "
delim_1 "\\space\\dotfill\\space "
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf b/macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf
index 82f396d857..bf2ece89c6 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf
+++ b/macros/latex/contrib/biblatex-contrib/oscola/oscola.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/oscola/oscola.tex b/macros/latex/contrib/biblatex-contrib/oscola/oscola.tex
index 1d2e5d16c3..fc6a71f102 100644
--- a/macros/latex/contrib/biblatex-contrib/oscola/oscola.tex
+++ b/macros/latex/contrib/biblatex-contrib/oscola/oscola.tex
@@ -19,8 +19,8 @@
{scrartcl}
% SET VERSION NUMBER AND RELEASE DATE
-\def\releasedate{20 January 2019}
-\def\versionnumber{1.6}
+\def\releasedate{15 March 2019}
+\def\versionnumber{1.7}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{geometry}
@@ -351,11 +351,11 @@ order.\index[general]{Biblatex!introduction
Basic use of \oscola\ will require:
\begin{itemize}
\item The \textsc{biblatex} package. This is to be found in any modern
- \TeX\ distribution. You need version 3.9 (or higher).\index[general]{Biblatex!version 3.9 required}\index[general]{prerequisites!Biblatex}
-\item The files \texttt{oscola.bbx}, \texttt{oscola.cbx} and
- \texttt{english-oscola.lbx}, installed where \LaTeX\ can find them.\index[general]{oscola.bbx@\texttt{oscola.bbx}}\index[general]{oscola.cbx@\texttt{oscola.cbx}}\index[general]{english-oscola.lbx@\texttt{english-oscola.lbx}}\index[general]{prerequisites!package files}
+ \TeX\ distribution. You need version 3.14 (or higher).\index[general]{Biblatex!version 3.14 required}\index[general]{prerequisites!Biblatex}
+\item The files \texttt{oscola.bbx}, \texttt{oscola.cbx}, \texttt{american-oscola.lbx}, \texttt{british-oscola.lbx} and
+ \texttt{english-oscola.lbx}, installed where \LaTeX\ can find them.\index[general]{oscola.bbx@\texttt{oscola.bbx}}\index[general]{oscola.cbx@\texttt{oscola.cbx}}\index[general]{american-oscola.lbx@\texttt{american-oscola.lbx}}\index[general]{british-oscola.lbx@\texttt{british-oscola.lbx}}\index[general]{english-oscola.lbx@\texttt{english-oscola.lbx}}\index[general]{prerequisites!package files}
\item A working version of \textsc{biber}; this is also to be found in
- any modern \TeX\ distribution. You need version 1.0 (or higher).\index[general]{prerequisites!Biber}\index[general]{Biber!version 1.0 required}
+ any modern \TeX\ distribution. You need version 2.14 (or higher).\index[general]{prerequisites!Biber}\index[general]{Biber!version 2.14 required}
\end{itemize}
If you intend to use the facilities that the package offers to produce
@@ -383,12 +383,14 @@ automatic tables of cases and legislation, you will also need:
\index[general]{oscola.bbx@\texttt{oscola.bbx}}
\index[general]{oscola.cbx@\texttt{oscola.cbx}}
\index[general]{oscola.ist@\texttt{oscola.ist}}
-\index[general]{english-oscola.ist@\texttt{english-oscola.ist}}
+\index[general]{american-oscola.lbx@\texttt{american-oscola.lbx}}
+\index[general]{british-oscola.lbx@\texttt{british-oscola.lbx}}
+\index[general]{english-oscola.lbx@\texttt{english-oscola.lbx}}
I would suggest installation in your (local) \TeX\ directory as follows:
\begin{description}
-\item The operational files (that is \verb|oscola.bbx|, \verb|oscola.cbx|, \verb|english-oscola.lbx| and \verb|british-oscola.lbx| go with \LaTeX\ macros under \verb|.../tex/latex/oscola|.
+\item The operational files (that is \verb|oscola.bbx|, \verb|oscola.cbx|, \verb|american-oscola.lbx|, \verb|british-oscola.lbx| and \verb|english-oscola.lbx|) go with \LaTeX\ macros under \verb|.../tex/latex/oscola|.
\item The index style file \verb|oscola.idx| goes with other such files under \verb|.../makeindex/oscola|.
-\item The documentation files (\verb|oscola.tex| and \verb|oscola.pdf| go under \verb|.../doc/latex/oscola|.
+\item The documentation files (\verb|oscola.tex|, \verb|oscola-examples.bib| and \verb|oscola.pdf|) go under \verb|.../doc/latex/oscola|.
\end{description}
\section{Basic Use}
@@ -5034,9 +5036,9 @@ will produce
\clearpage
-\addcontentsline{toc}{section}{Appendices}
-
\appendix
+\phantomsection
+\addcontentsline{toc}{section}{Appendices}
\section{Licence}
@@ -5046,6 +5048,8 @@ The \oscola\ package for \biblatex\ consists of the following files:
\begin{itemize}
\item \texttt{oscola.bbx}
\item \texttt{oscola.cbx}
+\item \texttt{american-oscola.lbx}
+\item \texttt{british-oscola.lbx}
\item \texttt{english-oscola.lbx}
\item \texttt{oscola.ist}
\end{itemize}
@@ -5208,13 +5212,14 @@ At the end of the document, we specify the indexes to be printed.
\printindex[pmats] % UK parliamentary material and
\end{verbatim}
-I then run \texttt{latex}, \texttt{biber}, \texttt{latex}, \texttt{splitindex} and finally \texttt{latex} again. The document's `general' index is generated separately using individual indexing commands. In order to deal with the styling, I run \textsc{splitindex} with the options \texttt{-- -s oscola} (which generates indexes with dot leaders), and then separately run \textsc{makeindex} on \texttt{oscola-documentation-general} to produce the general index.
+I then run \texttt{latex}, \texttt{biber}, \texttt{latex}, \texttt{splitindex} and finally \texttt{latex} again. The document's `general' index is generated separately using individual indexing commands. In order to deal with the styling, I run \textsc{splitindex} with the options \verb|-- -s oscola| (which generates indexes with dot leaders), and then separately run \textsc{makeindex} on \texttt{oscola-documentation-general} to produce the general index.
\clearpage
-\addcontentsline{toc}{section}{Table of Examples}
+
{\def\indexname{Table of Examples}
\begin{theindex}
+\addcontentsline{toc}{section}{Table of Examples}
References are to examples, which are numbered in the margin.
\bigskip
@@ -5338,9 +5343,8 @@ References are to examples, which are numbered in the margin.
\clearpage
-\addcontentsline{toc}{section}{Bibliography}
-
-\printbibliography[nottype=jurisdiction,
+\printbibliography[heading=bibintoc,
+ nottype=jurisdiction,
nottype=legislation,
nottype=legal,
notsubtype=parliamentary,
diff --git a/macros/latex/contrib/limecv/README.md b/macros/latex/contrib/limecv/README.md
index 7f6d8dcb43..f7043a60b8 100644
--- a/macros/latex/contrib/limecv/README.md
+++ b/macros/latex/contrib/limecv/README.md
@@ -47,4 +47,3 @@ Default profile picture courtesy of Twitter.
[blog]: https://olivierpieters.be/blog/archive/tag/limecv
[FA]: http://fontawesome.io
[fira]: https://github.com/mozilla/Fira
-[docs]: http://ctan.org/tex-archive/macros/generic/limecv/limecv.pdf
diff --git a/macros/latex/contrib/limecv/examples/mwe-latex.pdf b/macros/latex/contrib/limecv/examples/mwe-latex.pdf
index 5c713461d1..d23fb38b77 100644
--- a/macros/latex/contrib/limecv/examples/mwe-latex.pdf
+++ b/macros/latex/contrib/limecv/examples/mwe-latex.pdf
Binary files differ
diff --git a/macros/latex/contrib/limecv/examples/mwe-lualatex.pdf b/macros/latex/contrib/limecv/examples/mwe-lualatex.pdf
index 2c45a52ba2..a5d151f860 100644
--- a/macros/latex/contrib/limecv/examples/mwe-lualatex.pdf
+++ b/macros/latex/contrib/limecv/examples/mwe-lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/limecv/examples/mwe-xelatex.pdf b/macros/latex/contrib/limecv/examples/mwe-xelatex.pdf
index 9f8a7415ea..cfe0391675 100644
--- a/macros/latex/contrib/limecv/examples/mwe-xelatex.pdf
+++ b/macros/latex/contrib/limecv/examples/mwe-xelatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/limecv/limecv.dtx b/macros/latex/contrib/limecv/limecv.dtx
index ade6d1febc..99600b830c 100644
--- a/macros/latex/contrib/limecv/limecv.dtx
+++ b/macros/latex/contrib/limecv/limecv.dtx
@@ -26,7 +26,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{limecv}
%<*class>
- [2020/02/08 v0.1.7 limecv Document class for CVs.]
+ [2020/03/15 v0.1.8 limecv Document class for CVs.]
%</class>
%
%<*driver>
@@ -69,7 +69,7 @@
%</driver>
% \fi
%
-% \CheckSum{1630}
+% \CheckSum{1632}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -97,13 +97,14 @@
% \changes{v0.1.5}{2018/06/05}{Custom contact fields.}
% \changes{v0.1.6}{2018/06/17}{Added support for French.}
% \changes{v0.1.7}{2020/02/08}{Added support for Italian.}
+% \changes{v0.1.8}{2020/03/15}{Upgrade to Font Awesome 5.}
%
% \DoNotIndex{\NewDocumentCommand,\NewDocumentEnvironment}
%
% \providecommand*{\url}{\texttt}
%
-% \def\fileversion{v0.1.3}
-% \def\filedate{2017/11/25}
+% \def\fileversion{v0.1.8}
+% \def\filedate{2020/03/15}
%
% \GetFileInfo{limecv.dtx}
% \title{The \textsf{limecv} document class\thanks{This document corresponds %
@@ -163,10 +164,10 @@
% and |\cvMainFont| command. The mono spaced font can be changed by means of
% the |monofont| class option.
%
-% \cvRequirement{FontAwesome}\footnote{\url{http://fontawesome.io}} is the
+% \cvRequirement{FontAwesome5}\footnote{\url{http://fontawesome.io}} is the
% icon font used. This font should also be available and cannot be replaced by
% another icon font. Most modern TeX distributions ship with this font since
-% they provide the |fontawesome| package.
+% they provide the |fontawesome5| package.
%
% \section{General Macros and Document Class Options}
%
@@ -968,6 +969,7 @@ Dear Miss.\ Smith
\definecolor{cvRed}{HTML}{7f2d35}
\definecolor{cvDark}{HTML}{2F3142}
\definecolor{cvAccent}{HTML}{474A65}
+\definecolor{cvBackground}{HTML}{FFFFFF}
% \end{macrocode}
%
% \subsection{New Column Types}
@@ -1139,7 +1141,7 @@ Dear Miss.\ Smith
minimum width=\cvProgressAreaWidth,
minimum height=\cvProgressAreaHeight,
rectangle,
- draw,
+ draw=cvBackground,
cvGreen,
progressArea
},
@@ -1175,7 +1177,7 @@ Dear Miss.\ Smith
% \begin{macrocode}
\NewDocumentCommand{\cv@loadFonts}{}{
\RequirePackage{fontspec}
- \RequirePackage{fontawesome}
+ \RequirePackage{fontawesome5}
% \end{macrocode}
%
% Load the fonts. By default Fira will be loaded, but this can be overwritten
@@ -1193,13 +1195,13 @@ Dear Miss.\ Smith
% \begin{macrocode}
\ifcv@fontPath
\newfontfamily{\cv@FA}[Path=\limecv@path]%
- {FontAwesome}
+ {Font Awesome 5 Free}
\else
- \newfontfamily{\cv@FA}{FontAwesome}
+ \newfontfamily{\cv@FA}{Font Awesome 5 Free}
\fi
% \end{macrocode}
%
-% The |fontawesome| package does not feature all of the latest icons available,
+% The |fontawesome5| package does not feature all of the latest icons available,
% so we define some of the manually since they are relevant for this CV.
%
% \begin{macro}{\faAddressCard}
@@ -1221,7 +1223,7 @@ Dear Miss.\ Smith
% \end{macrocode}
% \end{macro}
%
-% In the future, the |fontawesome| dependency can be dropped if a manually coded
+% In the future, the |fontawesome5| dependency can be dropped if a manually coded
% icon is included, such as those defined in monderncv. Example:
% \url{https://raw.githubusercontent.com/xdanaux/moderncv/%
% master/moderncviconsmarvosym.sty}
@@ -1240,7 +1242,7 @@ Dear Miss.\ Smith
\ifluatex
\cv@loadFonts
\else
- \RequirePackage{fontawesome}
+ \RequirePackage{fontawesome5}
\RenewDocumentCommand{\familydefault}{}{\sfdefault}
\fi
\fi
@@ -1397,7 +1399,7 @@ Dear Miss.\ Smith
\newlength\cvSkillSep
\setlength\cvSkillSep{1ex}
\newlength\cvHeaderIconWidth
-\setlength\cvHeaderIconWidth{0pt}
+\setlength\cvHeaderIconWidth{10pt}
% \end{macrocode}
%
%
@@ -1416,10 +1418,10 @@ Dear Miss.\ Smith
\NewDocumentCommand{\cvSkill}{m}{%
\begingroup
\my@repeat@count=\z@
- \@whilenum\my@repeat@count<#1\do{\faCircle\advance%
+ \@whilenum\my@repeat@count<#1\do{\faCircle[solid]\advance%
\my@repeat@count\@ne}%
\my@repeat@count=\numexpr5-\z@\relax
- \@whilenum\my@repeat@count>#1\do{\faCircleO\advance%
+ \@whilenum\my@repeat@count>#1\do{\faCircle[regular]\advance%
\my@repeat@count\m@ne}%
\endgroup
}
@@ -1449,8 +1451,15 @@ Dear Miss.\ Smith
% \begin{macrocode}
\NewDocumentCommand{\cv@Title}{mm}{%
\ifnodedefined{cv@last item \the\value{cv@lastItem}}{%
- \setlength\cvHeaderIconWidth{%
- \maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}%
+ \setlength\cvHeaderIconWidth\cvHeaderIconWidth%{%
+ %\maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}%
+% \end{macrocode}
+%
+% \changes{v0.1.8}{2020/03/15}{For now, the |widthof| macro is not used
+% anymore since there is an issue with the latest version of Font Awesome 5
+% (5.7.0).}
+%
+% \begin{macrocode}
\protected@write\@auxout{}{\global\cvHeaderIconWidth=\the\cvHeaderIconWidth}
\node[%
below=\cvSectionSep of cv@last item %
@@ -1858,7 +1867,7 @@ Dear Miss.\ Smith
%
% \begin{macrocode}
\NewDocumentEnvironment{cvPublications}{}{%
-\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaperO}
+\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaper}
% \end{macrocode}
% insures uniqueness
% \begin{macrocode}
@@ -2176,7 +2185,7 @@ Dear Miss.\ Smith
\cv@ContactTemplateLink{\cvContactWebsite}{\faGlobe}
\cv@ContactTemplateLink{\cvContactGithub}{\faGithub}
\cv@ContactTemplateLink{\cvContactGitlab}{\faGitlab}
- \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedinSquare}
+ \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedin}
\cv@ContactTemplateLink{\cvContactTwitter}{\faTwitter}
\cv@ContactTemplateLink{\cvContactKeybase}{\faKey}
\begin{tikzpicture}[%
diff --git a/macros/latex/contrib/limecv/limecv.pdf b/macros/latex/contrib/limecv/limecv.pdf
index 3f9abc7069..c88b31ac72 100644
--- a/macros/latex/contrib/limecv/limecv.pdf
+++ b/macros/latex/contrib/limecv/limecv.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 3b7adbbf92..67e958be03 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 5a8d655762..3f3c6dc7d1 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -8,15 +8,18 @@
\geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}}
\usepackage{amsmath}
-\usepackage{color}
+
\usepackage{array}
\usepackage{colortbl}
\usepackage{nicematrix}
+\usepackage{tikz}
+\usetikzlibrary{fit}
+
+
\usepackage{enumitem}
\usepackage{siunitx}
-\usepackage{unicode-math}
\usepackage{arydshln}
\usepackage{verbatim}
@@ -44,6 +47,8 @@
\usepackage{booktabs}
+\usepackage{varwidth}
+
\usepackage[hyperfootnotes = false]{hyperref}
\hypersetup
@@ -90,9 +95,9 @@ tableau.
Cette extension peut être utilisée avec |xelatex|, |lualatex| et |pdflatex| mais aussi avec le cheminement
classique |latex|-|dvips|-|ps2pdf| (ou Adobe Distiller). Deux ou trois compilations successives peuvent être
nécessaires. Cette extension nécessite et charge les extensions \pkg{expl3}, \pkg{l3keys2e}, \pkg{xparse},
-\pkg{array}, \pkg{amsmath} et \pkg{tikz}. Elle charge aussi la bibliothèque Tikz \pkg{fit}. L'utilisateur final n'a
-qu'à charger l'extension \pkg{nicematrix} avec l'instruction habituelle :
-|\usepackage{nicematrix}|.
+\pkg{array}, \pkg{amsmath} et \pkg{pgfcore} ainsi que le module \pkg{shapes} de \textsc{pgf} (l'extension
+\pkg{tikz} n'est \emph{pas} chargée). L'utilisateur final n'a qu'à charger l'extension \pkg{nicematrix} avec
+l'instruction habituelle : |\usepackage{nicematrix}|.
@@ -115,11 +120,11 @@ $\begin{bNiceArray}{CCCC}[first-row,first-col,
code-for-first-col=\color{blue}\scriptstyle,
code-for-first-row=\color{blue}\scriptstyle,
columns-width = auto]
- & C_1 & C_2 & \Cdots & C_n \\
-L_1 & a_{11} & a_{12} & \Cdots & a_{1n} \\
-L_2 & a_{21} & a_{22} & \Cdots & a_{2n} \\
-\Vdots & \Vdots & \Vdots & \Ddots & \Vdots\\
-L_n & a_{n1} & a_{n2} & \Cdots & a_{nn}
+ & C_1 & C_2 & \Cdots & C_n \\
+L_1 & a_{11} & a_{12} & \Cdots & a_{1n} \\
+L_2 & a_{21} & a_{22} & \Cdots & a_{2n} \\
+\Vdots & \Vdots & \Vdots & \Ddots & \Vdots \\
+L_n & a_{n1} & a_{n2} & \Cdots & a_{nn}
\end{bNiceArray}$
@@ -229,26 +234,32 @@ Chacune de ces commandes doit être utilisée seule dans la case du tableau et e
entre les premières cases non vides\footnote{La définition précise de ce qui est considéré comme une «case vide»
est donnée plus loin (cf. p.~\pageref{empty-cells}).} situées de part et d'autre de la case courante. Bien
entendu, pour |\Ldots| et |\Cdots|, c'est une ligne horizontale ; pour |\Vdots|, c'est une ligne verticale et pour
-|\Ddots| et |\Iddots|, ce sont des lignes diagonales.\par\nobreak
+|\Ddots| et |\Iddots|, ce sont des lignes diagonales. On peut changer la couleur d'une ligne avec
+l'option~|color|.\footnote{Il est aussi possible de changer la couleur de toutes ces lignes pointillées avec
+ l'option |xdots/color| (\textsl{xdots} pour rappeler que cela s'applique à |\Cdots|, |\Ldots|, |Vdots|, etc.)
+}\par\nobreak
\bigskip
\begin{BVerbatim}[baseline=c,boxwidth=10cm]
\begin{bNiceMatrix}
-a_1 & \Cdots & & & a_1 \\
-\Vdots & a_2 & \Cdots & & a_2 \\
- & \Vdots & \Ddots \\
+a_1 & \Cdots & & & a_1 \\
+\Vdots & a_2 & \Cdots & & a_2 \\
+ & \Vdots & \Ddots[color=red] \\
\\
a_1 & a_2 & & & a_n
\end{bNiceMatrix}
\end{BVerbatim}
$\begin{bNiceMatrix}
-a_1 & \Cdots & & & a_1 \\
-\Vdots & a_2 & \Cdots & & a_2 \\
- & \Vdots & \Ddots \\
+a_1 & \Cdots & & & a_1 \\
+\Vdots & a_2 & \Cdots & & a_2 \\
+ & \Vdots & \Ddots[color=red] \\
\\
a_1 & a_2 & & & a_n
\end{bNiceMatrix}$
+
+
+
\interitem
Pour représenter la matrice nulle, on peut choisir d'utiliser le codage suivant :\par\nobreak
@@ -343,102 +354,70 @@ Considérons la matrice suivante qui a été composée classiquement avec l'envi
\pkg{amsmath}.\par\nobreak
\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=8cm]
+\begin{BVerbatim}[baseline=c,boxwidth=10cm]
$A = \begin{pmatrix}
-a_0 & b \\
-a_1 & \\
-a_2 & \\
-a_3 & \\
-a_4 & \\
-a_5 & b
+h & i & j & k & l & m \\
+x & & & & & x \\
\end{pmatrix}$
\end{BVerbatim}
$A = \begin{pmatrix}
-a_0 & b \\
-a_1 & \\
-a_2 & \\
-a_3 & \\
-a_4 & \\
-a_5 & b
+h & i & j & k & l & m \\
+x & & & & & x \\
\end{pmatrix}$
\bigskip
-Si nous ajoutons des instructions |\vdots| dans la seconde colonne, la géométrie de la matrice est
+Si nous ajoutons des instructions |\ldots| dans la seconde rangée, la géométrie de la matrice est
modifiée.\par\nobreak
\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=8cm]
+\begin{BVerbatim}[baseline=c,boxwidth=10cm]
$B = \begin{pmatrix}
-a_0 & b \\
-a_1 & \vdots \\
-a_2 & \vdots \\
-a_3 & \vdots \\
-a_4 & \vdots \\
-a_5 & b
+h & i & j & k & l & m \\
+x & \ldots & \ldots & \ldots & \ldots & x \\
\end{pmatrix}$
\end{BVerbatim}
$B = \begin{pmatrix}
-a_0 & b \\
-a_1 & \vdots \\
-a_2 & \vdots \\
-a_3 & \vdots \\
-a_4 & \vdots \\
-a_5 & b
+h & i & j & k & l & m \\
+x & \ldots & \ldots & \ldots & \ldots & x \\
\end{pmatrix}$
\bigskip
-Par défaut, avec \pkg{nicematrix}, si nous remplaçons |{pmatrix}| par |{pNiceMatrix}| et |\vdots| par |\Vdots|, la
+Par défaut, avec \pkg{nicematrix}, si nous remplaçons |{pmatrix}| par |{pNiceMatrix}| et |\ldots| par |\Ldots|, la
géométrie de la matrice n'est pas changée.\par\nobreak
\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=8cm]
+\begin{BVerbatim}[baseline=c,boxwidth=10cm]
$C = \begin{pNiceMatrix}
-a_0 & b \\
-a_1 & \Vdots \\
-a_2 & \Vdots \\
-a_3 & \Vdots \\
-a_4 & \Vdots \\
-a_5 & b
+h & i & j & k & l & m \\
+x & \Ldots & \Ldots & \Ldots & \Ldots & x \\
\end{pNiceMatrix}$
\end{BVerbatim}
$C = \begin{pNiceMatrix}
-a_0 & b \\
-a_1 & \Vdots \\
-a_2 & \Vdots \\
-a_3 & \Vdots \\
-a_4 & \Vdots \\
-a_5 & b
+h & i & j & k & l & m \\
+x & \Ldots & \Ldots & \Ldots & \Ldots & x \\
\end{pNiceMatrix}$
\bigskip
On pourrait toutefois préférer la géométrie de la première matrice $A$ et vouloir avoir la même géométrie avec une
-ligne en pointillés continue dans la seconde colonne. C'est possible en utilisant l'option |nullify-dots| (et une
-seule instruction |\Vdots| suffit).\par\nobreak
+ligne en pointillés continue dans la seconde rangée. C'est possible en utilisant l'option |nullify-dots| (et une
+seule instruction |\Ldots| suffit).\par\nobreak
\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=8cm]
+\begin{BVerbatim}[baseline=c,boxwidth=10cm]
$D = \begin{pNiceMatrix}[~emphase#nullify-dots@]
-a_0 & b \\
-a_1 & \Vdots \\
-a_2 & \\
-a_3 & \\
-a_4 & \\
-a_5 & b
+h & i & j & k & l & m \\
+x & \Ldots & & & & x \\
\end{pNiceMatrix}$
\end{BVerbatim}
$D = \begin{pNiceMatrix}[nullify-dots]
-a_0 & b \\
-a_1 & \Vdots \\
-a_2 & \\
-a_3 & \\
-a_4 & \\
-a_5 & b
+h & i & j & k & l & m \\
+x & \Ldots & & & & x \\
\end{pNiceMatrix}$
\medskip
-L'option |nullify-dots| «smashe» les instructions |\Ldots| (et ses variantes) verticalement mais aussi
-horizontalement.
+L'option |nullify-dots| «smashe» les instructions |\Ldots| (et ses variantes) horizontalement mais aussi
+verticalement.
\medskip
{\bfseries Il doit n'y avoir aucun espace devant le crochet ouvrant (|[|) des options de l'environnement.}
@@ -548,21 +527,109 @@ $\begin{pmatrix}
\end{scope}
-\subsection{Réglage fin des lignes en pointillés}
+\subsection{Personnalisation des lignes en pointillés}
+
+Les lignes pointillées tracées par |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots|, |\Idots| et |\Hdotsfor| (ainsi que par la
+commande |\line| dans le |code-after| décrite p.~\pageref{line-in-code-after}) peuvent être
+paramétrées par trois options (que l'on met entre crochets après la commande) :
+%
+\begin{itemize}
+\item |color| ;
+\item |shorten| ;
+\item |line-style|.
+\end{itemize}
+
+Ces options peuvent aussi être fixées avec |\NiceMatrixOption| ou bien au niveau d'un environnement mais elles
+doivent alors être préfixées par |xdots|, ce qui fait que leurs noms deviennent :
+%
+\begin{itemize}
+\item |xdots/color| ;
+\item |xdots/shorten| ;
+\item |xdots/line-style|.
+\end{itemize}
+%
+Pour la clarté, dans la suite, on utilisera ces noms-là.
+
+\bigskip
+\textbf{L'option xdots/color}\par\nobreak
+
+\smallskip
+L'option |xdots/color| indique bien entendu la couleur de la ligne tracée. On remarquera néanmoins que les lignes
+tracées dans les rangées et colonnes extérieures (décrites plus loin) bénificient d'un régime spécial : cf.
+p.~\pageref{exterior}.
+
+
+\bigskip
+\textbf{L'option xdots/shorten}\par\nobreak
+
+\smallskip
+L'option |xdots/shorten| indique la marge qui est laissée aux deux extrémités de la ligne. Le nom s'inspire des options
+«|shorten >|» et «|shorten <|» de Tikz, mais il faut remarquer que \pkg{nicematrix} ne propose que |xdots/shorten|.
+La valeur initiale de ce paramètre est de $0.3$~em (il est conseillé d'utiliser une unité de mesure dépendante de
+la fonte courante).
+
+
+\bigskip
+\textbf{L'option xdots/line-style}\par\nobreak
+
+\smallskip
+Il faut savoir que, par défaut, les lignes de Tikz tracées avec le paramètre |dotted| sont composées de points
+carrés et non pas ronds.\footnote{La raison de départ est que le format \textsc{pdf} comporte un système de description
+ de lignes en tiretés, qui, puisqu'il est incorporé dans le \textsc{pdf}, est affiché très rapidement par les
+ lecteurs de \textsc{pdf}. Il est facile à partir de ce type de ligne de créer des lignes de points carrés alors
+ qu'une ligne de points ronds doit être construite explicitement point par point.}
-L'écart entre un nœud et l'extrémité d'une ligne en pointillés est fixée par |dotted-lines-margin|. La valeur
-initiale de cette clé est de $0.3$~em (il est conseillé d'utiliser une unité de mesure dépendante de la fonte
-courante). Pour un exemple, voir p.~\pageref{permutation}.
+\begin{BVerbatim}[baseline=c,boxwidth=9cm]
+\tikz \draw [dotted] (0,0) -- (5,0) ;
+\end{BVerbatim}
+\tikz \draw [dotted] (0,0) -- (5,0) ;
+\bigskip
+Voulant proposer des lignes avec des points ronds dans le style de celui de |\ldots| (au moins celui des fontes
+\emph{Computer Modern}), l'extension \pkg{nicematrix} contient en interne son propre système de ligne en pointillés
+(qui, au passage n'utilise que \pkg{pgf} et non \pkg{tikz}). Ce style est appelé le style |standard|. Cette valeur
+est la valeur initiale du paramètre |xdots/line-style|.
+\bigskip
+Néanmoins (quand Tikz est chargé), on peut utiliser pour |xdots/line-style| n'importe quel style proposé par Tikz,
+c'est-à-dire n'importe quelle suite d'options Tikz applicables à un chemin (à l'exception de «|color|»,
+«|shorten >|» et «|shorten <|»).
-\section{Les nœuds Tikz créés par l'extension nicematrix}
+\medskip
+Voici par exemple une matrice tridiagonale avec le style |loosely dotted| :\par\nobreak
+
+\medskip
+\begin{BVerbatim}[baseline=c]
+$\begin{pNiceMatrix}[nullify-dots,~emphase#xdots/line-style=loosely dotted@]
+a & b & 0 & & \Cdots & 0 \\
+b & a & b & \Ddots & & \Vdots \\
+0 & b & a & \Ddots & & \\
+ & \Ddots & \Ddots & \Ddots & & 0 \\
+\Vdots & & & & & b \\
+0 & \Cdots & & 0 & b & a
+\end{pNiceMatrix}$
+\end{BVerbatim}
+
+
+\[\begin{pNiceMatrix}[nullify-dots,xdots/line-style=loosely dotted]
+a & b & 0 & & \Cdots & 0 \\
+b & a & b & \Ddots & & \Vdots \\
+0 & b & a & \Ddots & & \\
+ & \Ddots & \Ddots & \Ddots & & 0 \\
+\Vdots & & & & & b \\
+0 & \Cdots & & 0 & b & a
+\end{pNiceMatrix}\]
+
+
+\section{Les nœuds PGF-Tikz créés par l'extension nicematrix}
\label{name}
-L'extension \pkg{nicematrix} crée un nœud Tikz pour chaque case du tableau considéré. Ces nœuds sont utilisés pour
-tracer les lignes en pointillés entre les cases du tableau. Toutefois, l'utilisateur peut aussi utiliser
-directement ces nœuds. On commence par donner un nom au tableau (avec l'option |name|). Cela étant fait, les nœuds
+L'extension \pkg{nicematrix} crée un nœud PGF-Tikz pour chaque case (non vide) du tableau considéré. Ces nœuds sont
+utilisés pour tracer les lignes en pointillés entre les cases du tableau. Toutefois, l'utilisateur peut aussi
+utiliser directement ces nœuds (s'il a chargé Tikz\footnote{On rappelle que depuis la version 3.13,
+ \pkg{nicematrix} ne charge plus Tikz par défaut, mais seulement \textsc{pgf} (Tikz est une surcouche de
+ \textsc{pgf}).}). On commence par donner un nom au tableau (avec l'option |name|). Cela étant fait, les nœuds
sont accessibles à travers les noms «\textsl{nom}-$i$-$j$» où \textsl{nom} est le nom donné au tableau et $i$ et
$j$ les numéros de rangée et de colonne de la case considérée.
@@ -589,14 +656,25 @@ Ne pas oublier les options |remember picture| et |overlay|.
\bigskip
Dans l'exemple suivant, nous avons surligné toutes les cases de la matrice.
-\begin{scope}
-\tikzset{every node/.style = {fill = red!15, inner sep = 0pt}}
-\[\begin{pNiceMatrix}
+\[\begin{pNiceMatrix}[
+ code-after = {\begin{tikzpicture}
+ [every node/.style = {blend mode = multiply,
+ inner sep = 0 pt ,
+ fill = red!15}]
+ \node [fit = (1-1)] {} ;
+ \node [fit = (1-3)] {} ;
+ \node [fit = (2-2)] {} ;
+ \node [fit = (3-1)] {} ;
+ \node [fit = (3-3)] {} ;
+ \node [fit = (1-2)] {} ;
+ \node [fit = (2-1)] {} ;
+ \node [fit = (2-3)] {} ;
+ \node [fit = (3-2)] {} ;
+ \end{tikzpicture}}]
a & a + b & a + b + c \\
a & a & a + b \\
a & a & a
\end{pNiceMatrix}\]
-\end{scope}
\bigskip
@@ -615,7 +693,7 @@ comme définition de ces nœuds.
code-after = {\begin{tikzpicture}
[every node/.style = {fill = red!15,
blend mode = multiply,
- inner sep = -\pgflinewidth/2},
+ inner sep = 0 pt},
name suffix = -medium]
\node [fit = (1-1)] {} ;
\node [fit = (1-2)] {} ;
@@ -643,7 +721,7 @@ définition de ces nœuds.\footnote{Il n'y a pas de «nœuds larges» créés da
create-large-nodes,
code-after = {\begin{tikzpicture}
[every node/.style = {blend mode = multiply,
- inner sep = -\pgflinewidth/2},
+ inner sep = 0 pt},
name suffix = -large]
\node [fit = (1-1),fill = red!15] {} ;
\node [fit = (1-3),fill = red!15] {} ;
@@ -673,7 +751,7 @@ dernière colonne. Dans l'exemple suivant, nous avons utilisé les options |left
create-large-nodes,left-margin,right-margin,
code-after = {\begin{tikzpicture}
[every node/.style = {blend mode = multiply,
- inner sep = -\pgflinewidth/2},
+ inner sep = 0 pt},
name suffix = -large]
\node [fit = (1-1),fill = red!15] {} ;
\node [fit = (1-3),fill = red!15] {} ;
@@ -698,7 +776,7 @@ avons utilisé |extra-left-margin| et |extra-right-margin| avec la valeur $3$~pt
create-large-nodes,left-margin,right-margin,extra-right-margin=3pt,extra-left-margin=3pt,
code-after = {\begin{tikzpicture}
[every node/.style = {blend mode = multiply,
- inner sep = -\pgflinewidth/2},
+ inner sep = 0 pt},
name suffix = -large]
\node [fit = (1-1),fill = red!15] {} ;
\node [fit = (1-3),fill = red!15] {} ;
@@ -722,7 +800,7 @@ rangée du tableau.
create-large-nodes,left-margin,right-margin,extra-right-margin=3pt,extra-left-margin=3pt,
code-after = {\begin{tikzpicture}
[every node/.style = {blend mode = multiply,
- inner sep = -\pgflinewidth/2},
+ inner sep = 0 pt},
name suffix = -large]
\node [fit = (1-1),fill = red!15] {} ;
\node [fit = (1-3),fill = red!15] {} ;
@@ -744,30 +822,34 @@ On explique plus loin comment surligner les nœuds créés par Tikz (cf. p. \pag
\section{Le code-after}
-L'option |code-after| peut être utilisée pour indiquer du code qui sera exécuté après la construction de la matrice
-(et donc, en particulier, après la construction de tous les nœuds).
+\label{code-after}
+
+L'option |code-after| peut être utilisée pour indiquer du code qui sera exécuté après la construction de la matrice,
+et donc, en particulier, après la construction de tous les nœuds.
-Dans le |code-after|, les nœuds Tikz doivent être désignés sous la forme $i$-$j$ (sans le préfixe correspondant au
-nom de l'environnement).
+\textbf{Si on a chargé Tikz}\footnote{On rappelle que depuis la version 3.13, \pkg{nicematrix} ne charge plus Tikz
+ par défaut, mais seulement \textsc{pgf} (Tikz est une surcouche de \textsc{pgf}).}, on peut accéder à ces nœuds
+avec des instructions Tikz classiques. Les nœuds devront être désignés sous la forme $i$-$j$ (sans le préfixe
+correspondant au nom de l'environnement).
De plus, une commande spéciale, nommée |\line| est disponible pour tracer directement des lignes en pointillés
entre les nœuds).
+\label{line-in-code-after}
\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=12cm]
-$\begin{pNiceMatrix}[~emphase#code-after = \line{1-1}{3-3}@]
+\begin{BVerbatim}[baseline=c,boxwidth=13cm]
+$\begin{pNiceMatrix}[~emphase#code-after = {\line{1-1}{3-3}[color=blue]}@]
0 & 0 & 0 \\
0 & & 0 \\
0 & 0 & 0
\end{pNiceMatrix}$
\end{BVerbatim}
-$\begin{pNiceMatrix}[code-after = \line{1-1}{3-3}]
+$\begin{pNiceMatrix}[code-after = {\line{1-1}{3-3}[color=blue]}]
0 & 0 & 0 \\
0 & & 0 \\
0 & 0 & 0
\end{pNiceMatrix}$
-
\section{L'environnement \{NiceArray\}}
\label{NiceArray}
@@ -804,7 +886,7 @@ $A =
\end{NiceArray}$
\smallskip
-L'option |hvlines| est présentée plus loin (cf. p. \pageref{hvlines}).
+L'option |hvlines| utilisée dans cet exemple est présentée plus loin (cf. p. \pageref{hvlines}).
\medskip
L'option |baseline| peut aussi prendre les trois valeurs spéciales |t|, |c| et |b|. Ces trois lettres peuvent aussi
@@ -818,7 +900,7 @@ On remarquera que la présence d'un |\hline| initial n'empêche pas l'alignement
rangée (avec |{array}| de {array}, il faut utiliser |\firsthline|\footnote{On peut aussi utiliser |\firsthline|
avec |{NiceArray}|.}).
-
+\smallskip
\begin{BVerbatim}[baseline=c,boxwidth=9cm]
\begin{enumerate}
\item un item
@@ -962,28 +1044,28 @@ Les environnements de \pkg{nicematrix} permettent de composer des rangées et de
|first-row|, |last-row|, |first-col| et |last-col|.
\label{exterior}
-Si elle est présente, la première rangée est numérotée par $0$ (et non $1$). Il en est de même pour la première
-colonne. Dans le cas général, on doit spécifier le numéro de la dernière rangée et de la dernière colonne comme
-valeurs des options |last-row| et |last-col| (si elles sont présentes).
+Si elle est présente, la «première rangée» (extérieure) est numérotée par $0$ (et non $1$). Il en est de même pour
+la «première rangée». Dans le cas général, on doit spécifier le numéro de la dernière rangée et de la dernière
+colonne comme valeurs des options |last-row| et |last-col| (si elles sont présentes).
\begin{Verbatim}
-$\begin{pNiceMatrix}[~emphase#first-row,last-row=5,first-col,last-col=5@]
- & C_1 & C_2 & C_3 & C_4 & \\
-L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
-L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
- & C_1 & C_2 & C_3 & C_4 &
+$\begin{pNiceMatrix}[~emphase#first-row,last-row=5,first-col,last-col=5@,nullify-dots]
+ & C_1 & \Cdots & & C_4 & \\
+L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+\Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
+ & a_{31} & a_{32} & a_{33} & a_{34} & \\
+L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+ & C_1 & \Cdots & & C_4 &
\end{pNiceMatrix}$
\end{Verbatim}
%
-\[\begin{pNiceMatrix}[first-row,last-row=5,first-col,last-col=5]
- & C_1 & C_2 & C_3 & C_4 & \\
-L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
-L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
- & C_1 & C_2 & C_3 & C_4 &
+\[\begin{pNiceMatrix}[first-row,last-row=5,first-col,last-col=5,nullify-dots]
+ & C_1 & \Cdots & & C_4 & \\
+L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+\Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
+ & a_{31} & a_{32} & a_{33} & a_{34} & \\
+L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+ & C_1 & \Cdots & & C_4 &
\end{pNiceMatrix}\]
\bigskip
@@ -1017,14 +1099,14 @@ insérées au début de chaque case de la rangée ou de la colonne considérée.
~emphase#code-for-first-col@ = \color{blue},
~emphase#code-for-last-row@ = \color{green},
~emphase#code-for-last-col@ = \color{magenta}}
-$\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col]
- & C_1 & C_2 & C_3 & C_4 & \\
-L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
+$\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col,nullify-dots]
+ & C_1 & \Cdots & & C_4 & \\
+L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+\Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
\hline
-L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
- & C_1 & C_2 & C_3 & C_4 &
+ & a_{31} & a_{32} & a_{33} & a_{34} & \\
+L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+ & C_1 & \Cdots & & C_4 &
\end{pNiceArray}$
\end{Verbatim}
%
@@ -1034,14 +1116,14 @@ L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
code-for-last-row = \color{green},
code-for-last-col = \color{magenta}}
\begin{displaymath}
-\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col]
- & C_1 & \multicolumn1C{C_2} & C_3 & C_4 & \\
-L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
+\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col,nullify-dots]
+ & C_1 & \multicolumn1C{\Cdots} & & C_4 & \\
+L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+\Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
\hline
-L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
- & C_1 & \multicolumn1C{C_2} & C_3 & C_4 &
+ & a_{31} & a_{32} & a_{33} & a_{34} & \\
+L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+ & C_1 & \multicolumn1C{\Cdots} & & C_4 &
\end{pNiceArray}
\end{displaymath}
\end{scope}
@@ -1060,6 +1142,8 @@ ailleurs, si on veut vraiment un filet qui s'étende dans la première et la der
Si on veut définir de nouveaux spécificateurs de colonnes pour des filets (par exemple plus épais), on aura
peut-être intérêt à utiliser la commande |\OnlyMainNiceMatrix| décrite p.~\pageref{OnlyMainNiceMatrix}.
+\item Une spécification de couleur présente dans |code-for-first-row| s'applique à une ligne pointillée tracée
+dans cette «première rangée» (sauf si une valeur a été donnée à |xdots/color|). Idem pour les autres.
\item Sans surprise, une éventuelle option |columns-width| (décrite p.~\pageref{width}) ne s'applique pas à la
«première colonne» ni à la «dernière colonne».
\item Pour des raisons techniques, il n'est pas possible d'utiliser l'option de la commande |\\| après la
@@ -1114,7 +1198,7 @@ $\begin{pNiceArray}{CCCC:C}
\bigskip
-Ces lignes en pointillés ne s'étendent pas dans les rangées et colonnes extérieures.
+Ces lignes en pointillés ne s'étendent pas dans les rangées et colonnes extérieures.\par\nobreak
\medskip
@@ -1153,27 +1237,35 @@ verticaux fournis à la fois par \pkg{arydshln} et par \pkg{nicematrix}.
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
-\NiceMatrixOptions{letter-for-dotted-lines = V}
-\begin{pNiceArray}{~emphase#C|C:CVC@}
+\NiceMatrixOptions{letter-for-dotted-lines = I}
+\arrayrulecolor{blue}
+\begin{pNiceArray}{~emphase#C|C:CIC@}
1 & 2 & 3 & 4 \\
5 & 6 & 7 & 8 \\
9 & 10 & 11 & 12
\end{pNiceArray}
+\arrayrulecolor{black}
\end{BVerbatim}
\begin{scope}
-\NiceMatrixOptions{letter-for-dotted-lines = V}
-$\begin{pNiceArray}{C|C:CVC}
+\arrayrulecolor{blue}
+\NiceMatrixOptions{letter-for-dotted-lines = I}
+$\begin{pNiceArray}{C|C:CIC}
1 & 2 & 3 & 4 \\
5 & 6 & 7 & 8 \\
9 & 10 & 11 & 12
\end{pNiceArray}$
+\arrayrulecolor{black}
\end{scope}
+\smallskip
+On a utilisé |\arrayrulecolor| de \pkg{colortbl} pour colorier les trois traits.
+
+
\bigskip
\emph{Remarque} : Quand l'extension \pkg{array} (sur laquelle s'appuie \pkg{nicematrix}) est chargée, les traits
verticaux et horizontaux que l'on insère rendent le tableau plus large ou plus long d'une quantité égale à la
-largeur du trait\footnote{En fait, cela est vrai pour |\hline| et ``\verb+|+'' mais pas pour |\cline|.}. Avec
-\pkg{nicematrix}, les lignes en pointillés tracées par |\hdottedline| et ``|:|'' ont le même effet.
+largeur du trait\footnote{En fait, cela est vrai pour |\hline| et «\verb+|+» mais pas pour |\cline|.}. Avec
+\pkg{nicematrix}, les lignes en pointillés tracées par |\hdottedline| et «|:|» ont le même effet.
\section{La largeur des colonnes}
\label{width}
@@ -1199,8 +1291,8 @@ $\begin{pNiceArray}{Wc{1cm}CC}
\bigskip
-Dans les environnements de \pkg{nicematrix}, il est aussi possible de fixer la largeur de toutes les colonnes de la
-matrice directement avec l'option |columns-width|.
+Dans les environnements de \pkg{nicematrix}, il est aussi possible de fixer la largeur \emph{minimale} de toutes
+les colonnes de la matrice directement avec l'option |columns-width|.
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=10cm]
@@ -1241,8 +1333,8 @@ $\begin{pNiceMatrix}[columns-width = auto]
\end{pNiceMatrix}$
\bigskip
-Sans surprise, il est possible de fixer la largeur de toutes les colonnes de toutes les matrices dans une certaine
-portion de document avec la commande |\NiceMatrixOptions|.\par\nobreak
+Sans surprise, il est possible de fixer la largeur minimale de toutes les colonnes de toutes les matrices dans une
+certaine portion de document avec la commande |\NiceMatrixOptions|.\par\nobreak
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=8.5cm]
@@ -1385,6 +1477,28 @@ Pour des raisons techniques, il n'est pas possible d'écrire |\Block{|$i$|-|$j$|
\section{Fonctionnalités avancées}
+\subsection{Option d'alignement dans NiceMatrix}
+
+Les environnements sans préambule (|{NiceMatrix}|, |{pNiceMatrix}|, |{bNiceMatrix}|, etc.) proposent les options
+|l| et |r| (possédant |L| et |R| comme alias) qui imposent des colonnes alignées à gauche ou à
+droite.\footnote{Cela reprend une partie des fonctionnalités proposées par les environnements |{pmatrix*}|,
+ |{bmatrix*}|, etc. de \pkg{mathtools}.}
+
+\medskip
+\begin{BVerbatim}[baseline=c,boxwidth=10cm]
+$\begin{bNiceMatrix}[R]
+\cos x & - \sin x \\
+\sin x & \cos x
+\end{bNiceMatrix}$
+\end{BVerbatim}
+$\begin{bNiceMatrix}[R]
+\cos x & - \sin x \\
+\sin x & \cos x
+\end{bNiceMatrix}$
+
+
+
+
\subsection{La commande \textbackslash rotate}
Utilisée au début d'une case, la commande |\rotate| (fournie par \pkg{nicematrix}) compose le contenu après une
@@ -1398,32 +1512,58 @@ Dans l'exemple suivant, on l'utilise dans le |code-for-first-row|.
\NiceMatrixOptions%
{code-for-first-row = \scriptstyle ~emphase#\rotate@ \text{image de },
code-for-last-col = \scriptstyle }
-$\begin{pNiceMatrix}[first-row,last-col=4]
+$A = \begin{pNiceMatrix}[first-row,last-col=4]
e_1 & e_2 & e_3 \\
1 & 2 & 3 & e_1 \\
4 & 5 & 6 & e_2 \\
7 & 8 & 9 & e_3 \\
\end{pNiceMatrix}$
\end{BVerbatim}
-%
-\begin{scope}
+\begin{varwidth}{10cm}
\NiceMatrixOptions%
{code-for-first-row = \scriptstyle\rotate \text{image de },
code-for-last-col = \scriptstyle }
-\begin{minipage}{3cm}
-$\begin{pNiceMatrix}[first-row,last-col=4]
+$ A = \begin{pNiceMatrix}[first-row,last-col=4]
e_1 & e_2 & e_3 \\
1 & 2 & 3 & e_1 \\
4 & 5 & 6 & e_2 \\
7 & 8 & 9 & e_3 \\
\end{pNiceMatrix}$
-\end{minipage}
-\end{scope}
+\end{varwidth}
+\bigskip
+Si la commande |\rotate| est utilisée dans la ``dernière rangée'' (extérieure à la matrice), les éléments qui
+subissent cette rotation sont alignés vers le haut.
+
+\bigskip
+\begin{BVerbatim}[baseline=c,boxwidth=12cm]
+\NiceMatrixOptions%
+ {code-for-last-row = \scriptstyle ~emphase#\rotate@ ,
+ code-for-last-col = \scriptstyle }
+$A = \begin{pNiceMatrix}[last-row,last-col=4]
+1 & 2 & 3 & e_1 \\
+4 & 5 & 6 & e_2 \\
+7 & 8 & 9 & e_3 \\
+\text{image de } e_1 & e_2 & e_3 \\
+\end{pNiceMatrix}$
+\end{BVerbatim}
+\begin{varwidth}{10cm}
+\NiceMatrixOptions%
+ {code-for-last-row = \scriptstyle\rotate ,
+ code-for-last-col = \scriptstyle }%
+$A = \begin{pNiceMatrix}[last-row,last-col=4]
+1 & 2 & 3 & e_1 \\
+4 & 5 & 6 & e_2 \\
+7 & 8 & 9 & e_3 \\
+\text{image de } e_1 & e_2 & e_3 \\
+\end{pNiceMatrix}$
+\end{varwidth}
\subsection{L'option small}
+\label{small}
+
Avec l'option |small|, les environnements de l'extension \pkg{nicematrix} sont composés d'une manière proche de ce
que propose l'environnement |{smallmatrix}| de l'\pkg{amsmath} (et les environnements |{psmallmatrix}|,
|{bsmallmatrix}|, etc. de \pkg{mathtools}).
@@ -1471,6 +1611,9 @@ numéro de la rangée courante et le numéro de la colonne courante\footnote{On
Bien entendu, l'utilisateur ne doit pas modifier les valeurs de ces compteurs qui sont utilisés en interne par
\pkg{nicematrix}.
+Dans le |code-after| (cf. p. \pageref{code-after}), |iRow| représente le nombre total de rangées (hors éventuelles
+rangées extérieures) et |jCol| le nombre total de colonnes (hors potentielles colonnes extérieures).
+
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
$\begin{pNiceMatrix}%
@@ -1581,7 +1724,7 @@ a & b & c & d \\
\end{NiceArray}$
\bigskip
-Dans le cas d'un environnement avec délimiteurs (par exemple |{pNiceArray}| ou |pNiceMatrix|), l'option |vlines| ne
+Dans le cas d'un environnement avec délimiteurs (par exemple |{pNiceArray}| ou |{pNiceMatrix}|), l'option |vlines| ne
trace pas de filets verticaux au niveau des deux délimiteurs (bien entendu).
\medskip
@@ -1612,29 +1755,24 @@ L'option |light-syntax|\footnote{Cette option est inspirée de
l'extension \pkg{spalign} de Joseph Rabinoff.} permet d'alléger la saisie des matrices, ainsi que leur lisibilité dans le source TeX.
Lorsque cette option est activée, on doit utiliser le point-virgule comme marqueur de fin de rangée et séparer les
colonnes par des espaces. On remarquera toutefois que, comme souvent dans le monde TeX, les espaces après les
-séquences de contrôles ne sont pas comptées et que les éléments entre accolades sont considérés comme un tout.
+séquences de contrôle ne sont pas comptées et que les éléments entre accolades sont considérés comme un tout.
-\bigskip
-L'exemple suivant a été composé avec XeLaTeX en utilisant \pkg{unicode-math}, ce qui permet d'utiliser directement
-les lettres grecques en Unicode.
\medskip
\begin{scope}
-\def\alpha{$α$}
-\def\beta{$β$}
\begin{BVerbatim}[baseline=c,boxwidth=10cm]
$\begin{bNiceMatrix}[~emphase#light-syntax@,first-row,first-col]
-{} ~alpha ~beta ;
-~alpha 2\cos ~alpha {\cos ~alpha + \cos ~beta} ;
-~beta \cos ~alpha+\cos ~beta { 2 \cos ~beta }
+{} a b ;
+a 2\cos a {\cos a + \cos b} ;
+b \cos a+\cos b { 2 \cos b }
\end{bNiceMatrix}$
\end{BVerbatim}
\end{scope}
%
$\begin{bNiceMatrix}[light-syntax,first-row,first-col]
-{} α β ;
-α 2\cos α {\cos α + \cos β} ;
-β \cos α+\cos β { 2 \cos β }
+{} a b ;
+a 2\cos a {\cos a + \cos b} ;
+b \cos a+\cos b { 2 \cos b }
\end{bNiceMatrix}$
\medskip
@@ -1725,10 +1863,10 @@ arrive à une autre ligne pointillée déjà tracée par l'une de ces commandes.
lignes sont tracées a son importance pour le résultat final. Voici cet ordre (c'est à dessein qu'il a été choisi
ainsi) : |\Hdotsfor|, |\Vdots|, |\Ddots|, |\Iddots|, |\Cdots| et |\Ldots|.
-De ce fait, on peut tracer la matrice suivante :
-
-
\medskip
+De ce fait, on peut tracer la matrice suivante :\par\nobreak
+
+\smallskip
\begin{BVerbatim}[baseline = c, boxwidth = 10.5cm]
$\begin{pNiceMatrix}[nullify-dots]
1 & 2 & 3 & \Cdots & n \\
@@ -1749,11 +1887,12 @@ $\begin{pNiceMatrix}[nullify-dots]
\end{pNiceMatrix}$
-\subsection{Le nom des nœuds Tikz créés par nicematrix}
-Les nœuds Tikz créés par \pkg{nicematrix} peuvent être utilisés hors des environnements de \pkg{nicematrix} après
-avoir nommé l'environnement concerné avec l'option |name| (cf. p.~\pageref{name}). Il s'agit là de la méthode
-conseillée mais on décrit néanmoins maintenant le nom Tikz interne de ces nœuds.
+\subsection{Le nom des nœuds PGF créés par nicematrix}
+
+Les nœuds PGF-Tikz créés par \pkg{nicematrix} peuvent être utilisés hors des environnements de \pkg{nicematrix}
+après avoir nommé l'environnement concerné avec l'option |name| (cf. p.~\pageref{name}). Il s'agit là de la méthode
+conseillée mais on décrit néanmoins maintenant le nom Tikz interne de ces nœuds.
Les environnements créés par \pkg{nicematrix} sont numérotés par un compteur global interne. La commande
|\NiceMatrixLastEnv| donne le numéro du dernier de ces environnements (pour LaTeX, il s'agit d'une commande —
@@ -1829,6 +1968,7 @@ a+b & \Cdots & a+b & 1
\end{pNiceMatrix}$
+
\end{scope}
\subsection{Les cases «vides»}
@@ -1855,12 +1995,7 @@ c \\
la dernière case (deuxième rangée et deuxième colonne) est vide.
\medskip
-\item Chaque case avec un rendu par TeX de largeur inférieure à 0.5~pt est vide.
-
-\medskip
-\item Une case qui contient une commande |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots| ou |\Iddots| est vide. On rappelle
-que ces commandes doivent être employées seules dans une case.
-
+\item Chaque case avec un rendu par TeX de largeur nulle est vide.
\medskip
\item Une case avec une commande |\Hspace| (ou |\Hspace*|) est vide. Cette commande |\Hspace| est une commande
@@ -1878,26 +2013,21 @@ particulier, il y a un espace égal à |\arraycolsep| avant et après le tableau
l'environnement |{array}| n'était probablement pas une bonne idée\footnote{Dans la documentation de |{amsmath}|, on
peut lire : {\itshape The extra space of |\arraycolsep| that \pkg{array} adds on each side is a waste so we
remove it [in |{matrix}|] (perhaps we should instead remove it from array in general, but that's a harder
- task).} Il est possible de supprimer les espaces pour un environnement |{array}| donné par une construction du
- type |\begin{array}{@{}ccccc@{}}...\end{array}|.}. L'environnement |{matrix}| et ses variantes (|{pmatrix}|,
-|{vmatrix}|, etc.) de \pkg{amsmath} préfèrent supprimer ces espaces avec des instructions explicites
-|\hskip -\arraycolsep|. L'extension \pkg{nicematrix} fait de même dans \emph{tous} ses environnements y compris
-l'environnement |{NiceArray}|. Néanmoins, si l'utilisateur souhaite que l'environnement |{NiceArray}| se comporte
-par défaut comme l'environnement |{array}| de \pkg{array} (par exemple pour faciliter l'adaptation d'un document
-existant), il peut contrôler ce comportement avec l'option |exterior-arraycolsep| accessible via la commande
-|\NiceMatrixOptions|. Avec cette option, des espaces extérieurs de longueur |\arraycolsep| seront insérés dans les
-environnements |{NiceArray}| (les autres environnements de l'extension \pkg{nicematrix} ne sont pas affectés).
+ task).}}. L'environnement |{matrix}| et ses variantes (|{pmatrix}|,
+|{vmatrix}|, etc.) de \pkg{amsmath} préfèrent supprimer ces espaces avec des instructions explicites
+|\hskip -\arraycolsep|\footnote{Et non en insérant |@{}| de part et d'autre du préambule, ce qui fait que la
+ longueur des |\hline| n'est pas modifiée et elle peut paraître trop longue, surtout avec des crochets.}.
+L'extension \pkg{nicematrix} fait de même dans \emph{tous} ses environnements y compris l'environnement
+|{NiceArray}|. Néanmoins, si l'utilisateur souhaite que l'environnement |{NiceArray}| se comporte par défaut comme
+l'environnement |{array}| de \pkg{array} (par exemple pour faciliter l'adaptation d'un document existant), il peut
+contrôler ce comportement avec l'option |exterior-arraycolsep| accessible via la commande |\NiceMatrixOptions|.
+Avec cette option, des espaces extérieurs de longueur |\arraycolsep| seront insérés dans les environnements
+|{NiceArray}| (les autres environnements de l'extension \pkg{nicematrix} ne sont pas affectés).
\subsection{L'option de classe draft}
-L'extension \pkg{nicematrix} est relativement lente pour tracer les lignes en pointillés (créées par |\Cdots|,
-|\Ldots|, |\Ddots|, etc. mais aussi par le spécificateur «|:|»).\footnote{La principale raison est que nous voulons
- des lignes en pointillés avec des points ronds et non carrés. Pour atteindre ce but, il a fallu construire notre
- propre système de lignes en pointillés.}
-
-
-C'est pourquoi, avec l'option de classe |draft|, les lignes en pointillés ne sont pas tracées, pour accélérer la
+Quand l'option de classe |draft| est utilisée, les lignes en pointillés ne sont pas tracées, pour accélérer la
compilation.
@@ -1994,41 +2124,15 @@ seront certainement supprimés dans une prochaine version de \pkg{nicematrix}.
\subsection{Lignes en pointillés}
-\medskip
-Une matrice tridiagonale :\par\nobreak
-\bigskip
-\begin{BVerbatim}[baseline=c]
-$\begin{pNiceMatrix}[nullify-dots]
-a & b & 0 & & \Cdots & 0 \\
-b & a & b & \Ddots & & \Vdots \\
-0 & b & a & \Ddots & & \\
- & \Ddots & \Ddots & \Ddots & & 0 \\
-\Vdots & & & & & b \\
-0 & \Cdots & & 0 & b & a
-\end{pNiceMatrix}$
-\end{BVerbatim}
-\hspace{1.5cm}
-$\begin{pNiceMatrix}[nullify-dots]
-a & b & 0 & & \Cdots & 0 \\
-b & a & b & \Ddots & & \Vdots \\
-0 & b & a & \Ddots & & \\
- & \Ddots & \Ddots & \Ddots & & 0 \\
-\Vdots & & & & & b \\
-0 & \Cdots & & 0 & b & a
-\end{pNiceMatrix}$
+Une matrice de permutation.\par\nobreak
-\vspace{2cm}
+À titre d'exemple, on a augmenté la valeur du paramètre |xdots/shorten|.\par\nobreak
-Une matrice de permutation.
-
-À titre d'exemple, on a augmenté la valeur du paramètre |dotted-lines-margin|.
-
-\label{permutation}
\bigskip
\begin{BVerbatim}[baseline=c]
-$\begin{pNiceMatrix}[~emphase#dotted-lines-margin=6em@]
+$\begin{pNiceMatrix}[~emphase#xdots/shorten=6em@]
0 & 1 & 0 & & \Cdots & 0 \\
\Vdots & & & \Ddots & & \Vdots \\
& & & \Ddots & & \\
@@ -2038,7 +2142,7 @@ $\begin{pNiceMatrix}[~emphase#dotted-lines-margin=6em@]
\end{pNiceMatrix}$
\end{BVerbatim}
\hspace{2.5cm}
-$\begin{pNiceMatrix}[dotted-lines-margin=0.6em]
+$\begin{pNiceMatrix}[xdots/shorten=0.6em]
0 & 1 & 0 & & \Cdots & 0 \\
\Vdots & & & \Ddots & & \Vdots \\
& & & \Ddots & & \\
@@ -2049,10 +2153,10 @@ $\begin{pNiceMatrix}[dotted-lines-margin=0.6em]
\vspace{2cm}
-Un exemple avec |\Iddots|: \par\nobreak
+Un exemple avec |\Iddots|. On a augmenté encore davantage la valeur de |xdots/shorten|.\par\nobreak
\bigskip
\begin{BVerbatim}[baseline=c]
-$\begin{pNiceMatrix}
+$\begin{pNiceMatrix}[~emphase#xdots/shorten = 0.9em@]
1 & \Cdots & & 1 \\
\Vdots & & & 0 \\
& ~emphase#\Iddots@ & ~emphase#\Iddots@ & \Vdots \\
@@ -2060,7 +2164,7 @@ $\begin{pNiceMatrix}
\end{pNiceMatrix}$
\end{BVerbatim}
\hspace{4cm}
-$\begin{pNiceMatrix}
+$\begin{pNiceMatrix}[xdots/shorten = 0.9em]
1 & \Cdots & & 1 \\
\Vdots & & & 0 \\
& \Iddots & \Iddots & \Vdots \\
@@ -2262,10 +2366,24 @@ $\begin{pNiceArray}{CCCC:C}[last-col]
\label{highlight}
\medskip
+Les exemples suivants nécessitent d'avoir chargé Tikz (\pkg{nicematrix} ne charge que \textsc{pgf}) ainsi que la
+bibliothèque Tikz |fit|, ce qui peut se faire avec les deux instructions suivantes dans le préambule du document :
+
+\begin{verbatim}
+\usepackage{tikz}
+\usetikzlibrary{fit}
+\end{verbatim}
+
+
+
+\medskip
Pour mettre en évidence une case, il est possible de «dessiner» l'un des nœuds (le «nœud normal», le «nœud moyen»
ou le «nœud large»). Dans l'exemple suivant, on utilise les «nœuds larges» de la diagonale de la matrice (avec la
-clé de Tikz «|name suffix|», il est facile d'utiliser les «nœuds larges»). Pour avoir la continuité des lignes, on
-doit fixer |inner sep = -\pgflinewidth/2|.
+clé de Tikz «|name suffix|», il est facile d'utiliser les «nœuds larges»).
+
+Nous redessinons les nœuds avec de nouveaux nœuds en utilisant la bibliothèque \pkg{fit} de Tikz. Comme nous
+voulons recréer des nœuds identiques aux premiers, nous devons fixer |inner sep = 0pt| (si on ne fait
+pas cela, les nouveaux nœuds seront plus grands que les nœuds d'origine créés par \pkg{nicematrix}).
\begin{Verbatim}
$\begin{pNiceArray}{>{\strut}CCCC}%
@@ -2273,7 +2391,7 @@ $\begin{pNiceArray}{>{\strut}CCCC}%
code-after = {\begin{tikzpicture}
[~emphase#name suffix = -large@,
every node/.style = {draw,
- ~emphase#inner sep = -\pgflinewidth/2@}]
+ ~emphase#inner sep = 0pt@}]
\node [fit = (1-1)] {} ;
\node [fit = (2-2)] {} ;
\node [fit = (3-3)] {} ;
@@ -2291,7 +2409,7 @@ a_{41} & a_{42} & a_{43} & a_{44}
create-large-nodes,margin,extra-margin=2pt,
code-after = {\begin{tikzpicture}[name suffix = -large,
every node/.style = {draw,
- inner sep = -\pgflinewidth/2}]
+ inner sep = 0pt}]
\node [fit = (1-1)] {} ;
\node [fit = (2-2)] {} ;
\node [fit = (3-3)] {} ;
@@ -2304,9 +2422,10 @@ a_{41} & a_{42} & a_{43} & a_{44}
\end{pNiceArray}\]
%
On remarquera que les traits que l'on vient de tracer sont dessinés \emph{après} la matrice sans modifier la
-position des composantes de celle-ci. En revanche, les traits tracés par |\hline| ou le spécificateur ``\verb+|+"''
-«écartent» les composantes de la matrice (quand l'extension \pkg{array} est chargée, ce qui est toujours le cas
-avec \pkg{nicematrix}).\footnote{En revanche les traits tracés par |\ncline| n'écartent pas les lignes de la matrice.}
+position des composantes de celle-ci. En revanche, les traits tracés par |\hline|, le spécificateur «\verb+|+» ou
+les options |hlines| et |vlines| «écartent» les composantes de la matrice (quand l'extension \pkg{array} est
+chargée, ce qui est toujours le cas avec \pkg{nicematrix}).\footnote{En revanche les traits tracés par |\ncline|
+ n'écartent pas les lignes de la matrice.}
\vspace{1cm}
@@ -2553,7 +2672,7 @@ A_{41} & A_{42} & A_{43} & A_{44}
Dans l'exemple suivant, on souhaite illustrer le produit mathématique de deux matrices.
\medskip
-L'utilisation de |{NiceMatrixBlock}| avec l'option |auto-columns-width| va permettre que toutes les colonnes aient
+L'utilisation de |{NiceMatrixBlock}| avec l'option |auto-columns-width| va permettre que toutes les colonnes aient
la même largeur ce qui permettra un alignement des deux matrices superposées.
\begin{Verbatim}
\begin{NiceMatrixBlock}[auto-columns-width]
@@ -2572,11 +2691,11 @@ $\begin{array}{cc}
La matrice $B$ a une «première rangée» (pour $C_j$) d'où l'option |first-row|.
\begin{Verbatim}
\begin{bNiceArray}{C>{\strut}CCCC}[name=B,first-row]
- & & C_j \\
-b_{11} & \Cdots & b_{1j} & \Cdots & b_{1n} \\
-\Vdots & & \Vdots & & \Vdots \\
- & & b_{kj} \\
- & & \Vdots \\
+ & & ~emphase#C_j@ \\
+b_{11} & \Cdots & b_{1j} & \Cdots & b_{1n} \\
+\Vdots & & \Vdots & & \Vdots \\
+ & & b_{kj} \\
+ & & \Vdots \\
b_{n1} & \Cdots & b_{nj} & \Cdots & b_{nn}
\end{bNiceArray} \\ \\
\end{Verbatim}
@@ -2584,11 +2703,11 @@ b_{11} & \Cdots & b_{1j} & \Cdots & b_{1n} \\
La matrice $A$ a une «première colonne» (pour $L_i$) d'où l'option |first-col|.
\begin{Verbatim}
\begin{bNiceArray}{CC>{\strut}CCC}[name=A,first-col]
- & a_{11} & \Cdots & & & a_{1n} \\
- & \Vdots & & & & \Vdots \\
-L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
- & \Vdots & & & & \Vdots \\
- & a_{n1} & \Cdots & & & a_{nn} \\
+ & a_{11} & \Cdots & & & a_{1n} \\
+ & \Vdots & & & & \Vdots \\
+~emphase#L_i@ & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
+ & \Vdots & & & & \Vdots \\
+ & a_{n1} & \Cdots & & & a_{nn} \\
\end{bNiceArray}
&
\end{Verbatim}
@@ -2596,9 +2715,9 @@ L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
Dans la matrice produit, on remarquera que les lignes en pointillés sont «semi-ouvertes».
\begin{Verbatim}
\begin{bNiceArray}{CC>{\strut}CCC}
- & & & & \\
- & & \Vdots \\
-\Cdots & & c_{ij} \\
+ & & & & \\
+ & & \Vdots \\
+\Cdots & & c_{ij} \\
\\
\\
\end{bNiceArray}
@@ -2614,7 +2733,7 @@ Dans la matrice produit, on remarquera que les lignes en pointillés sont «semi
\draw [color = gray] (A-3-3) to [bend left] (B-3-3) ;
\end{tikzpicture}
\end{Verbatim}
-
+
\begin{NiceMatrixBlock}[auto-columns-width]
\NiceMatrixOptions{nullify-dots}
@@ -2637,9 +2756,9 @@ L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
\end{bNiceArray}
&
\begin{bNiceArray}{CC>{\strut}CCC}
- & & & & \\
- & & \Vdots \\
-\Cdots & & c_{ij} \\
+ & & & & \\
+ & & \Vdots \\
+\Cdots & & c_{ij} \\
\\
\\
\end{bNiceArray}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 9e446e9d48..ede600b7d7 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{3.12}
-\def\myfiledate{2020/02/28}
+\def\myfileversion{3.13}
+\def\myfiledate{2020/03/15}
%
%
%<*batchfile>
@@ -52,6 +52,8 @@ version 2005/12/01 or later.
\geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}}
\usepackage{colortbl}
+\usepackage{tikz}
+\usetikzlibrary{fit}
\usepackage{nicematrix}
\usepackage{siunitx}
@@ -67,7 +69,7 @@ version 2005/12/01 or later.
\usepackage{arydshln}
\setlength{\columnseprule}{0.4pt}
\usepackage{footnotehyper}
-\usepackage{unicode-math}
+\usepackage{varwidth}
\parindent 0pt
\EnableCrossrefs
@@ -107,8 +109,9 @@ version 2005/12/01 or later.
% the classical workflow |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). Two or
% three compilations may be necessary. This package requires and \textbf{loads}
% the packages \pkg{expl3}, \pkg{l3keys2e}, \pkg{xparse}, \pkg{array},
-% \pkg{amsmath} and \pkg{tikz}. It also loads the Tikz library \pkg{fit}. The
-% final user only has to load the extension with |\usepackage{nicematrix}|.
+% \pkg{amsmath}, \pkg{pgfcore} and the module \pkg{shapes} of \textsc{pgf}
+% (\pkg{tikz} is \emph{not} loaded). The final user only has to load the
+% extension with |\usepackage{nicematrix}|.
%
%
% \medskip
@@ -242,22 +245,25 @@ version 2005/12/01 or later.
% ``non-empty cell'' is given below (cf. p.~\pageref{empty-cells}).} on both
% sides of the current cell. Of course, for |\Ldots| and |\Cdots|, it's an
% horizontal line; for |\Vdots|, it's a vertical line and for |\Ddots| and
-% |\Iddots| diagonal ones.\par\nobreak
+% |\Iddots| diagonal ones. It's possible to change the color of these lines
+% with the option |color|.\footnote{It's also possible to change the color of
+% all theses dotted lines with the option |xdots/color| (\textsl{xdots} to
+% remind that it works for |\Cdots|, |\Ldots|, |\Vdots|, etc.)}\par\nobreak
%
% \bigskip
% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
% \begin{bNiceMatrix}
-% a_1 & \Cdots & & & a_1 \\
-% \Vdots & a_2 & \Cdots & & a_2 \\
-% & \Vdots & \Ddots \\
+% a_1 & \Cdots & & & a_1 \\
+% \Vdots & a_2 & \Cdots & & a_2 \\
+% & \Vdots & \Ddots[color=red] \\
% \\
% a_1 & a_2 & & & a_n
% \end{bNiceMatrix}
% \end{BVerbatim}
% $\begin{bNiceMatrix}
-% a_1 & \Cdots & & & a_1 \\
-% \Vdots & a_2 & \Cdots & & a_2 \\
-% & \Vdots & \Ddots \\
+% a_1 & \Cdots & & & a_1 \\
+% \Vdots & a_2 & \Cdots & & a_2 \\
+% & \Vdots & \Ddots[color=red] \\
% \\
% a_1 & a_2 & & & a_n
% \end{bNiceMatrix}$
@@ -357,109 +363,78 @@ version 2005/12/01 or later.
% \end{bNiceMatrix}$
%
% \subsection{The option nullify-dots}
+%
%
% Consider the following matrix composed classicaly with the environment
-% |{pmatrix}| of \pkg{amsmath}.\par\nobreak
-%
+% \verb|{pmatrix}| of \pkg{amsmath}.\par\nobreak
+%
% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=8cm]
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
% $A = \begin{pmatrix}
-% a_0 & b \\
-% a_1 & \\
-% a_2 & \\
-% a_3 & \\
-% a_4 & \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & & & & & x \\
% \end{pmatrix}$
% \end{BVerbatim}
% $A = \begin{pmatrix}
-% a_0 & b \\
-% a_1 & \\
-% a_2 & \\
-% a_3 & \\
-% a_4 & \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & & & & & x \\
% \end{pmatrix}$
%
%
% \bigskip
-% If we add |\vdots| instructions in the second column, the geometry of the
+% If we add \verb|\ldots| instructions in the second row, the geometry of the
% matrix is modified.\par\nobreak
%
% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=8cm]
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
% $B = \begin{pmatrix}
-% a_0 & b \\
-% a_1 & \vdots \\
-% a_2 & \vdots \\
-% a_3 & \vdots \\
-% a_4 & \vdots \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & \ldots & \ldots & \ldots & \ldots & x \\
% \end{pmatrix}$
% \end{BVerbatim}
% $B = \begin{pmatrix}
-% a_0 & b \\
-% a_1 & \vdots \\
-% a_2 & \vdots \\
-% a_3 & \vdots \\
-% a_4 & \vdots \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & \ldots & \ldots & \ldots & \ldots & x \\
% \end{pmatrix}$
%
% \bigskip
-% By default, with \pkg{nicematrix}, if we replace |{pmatrix}| by
-% |{pNiceMatrix}| and |\vdots| by |\Vdots|, the geometry of the matrix is not
+% By default, with \pkg{nicematrix}, if we replace \verb|{pmatrix}| by
+% \verb|{pNiceMatrix}| and \verb|\ldots| by \verb|\Ldots|, the geometry of the matrix is not
% changed.\par\nobreak
%
% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=8cm]
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
% $C = \begin{pNiceMatrix}
-% a_0 & b \\
-% a_1 & \Vdots \\
-% a_2 & \Vdots \\
-% a_3 & \Vdots \\
-% a_4 & \Vdots \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & \Ldots & \Ldots & \Ldots & \Ldots & x \\
% \end{pNiceMatrix}$
% \end{BVerbatim}
% $C = \begin{pNiceMatrix}
-% a_0 & b \\
-% a_1 & \Vdots \\
-% a_2 & \Vdots \\
-% a_3 & \Vdots \\
-% a_4 & \Vdots \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & \Ldots & \Ldots & \Ldots & \Ldots & x \\
% \end{pNiceMatrix}$
%
% \bigskip
% However, one may prefer the geometry of the first matrix $A$ and would like to
-% have such a geometry with a dotted line in the second column. It's possible by
-% using the option |nullify-dots| (and only one instruction |\Vdots| is
+% have such a geometry with a dotted line in the second row. It's possible by
+% using the option \verb|nullify-dots| (and only one instruction \verb|\Ldots| is
% necessary).\par\nobreak
%
% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=8cm]
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
% $D = \begin{pNiceMatrix}[~emphase#nullify-dots@]
-% a_0 & b \\
-% a_1 & \Vdots \\
-% a_2 & \\
-% a_3 & \\
-% a_4 & \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & \Ldots & & & & x \\
% \end{pNiceMatrix}$
% \end{BVerbatim}
% $D = \begin{pNiceMatrix}[nullify-dots]
-% a_0 & b \\
-% a_1 & \Vdots \\
-% a_2 & \\
-% a_3 & \\
-% a_4 & \\
-% a_5 & b
+% h & i & j & k & l & m \\
+% x & \Ldots & & & & x \\
% \end{pNiceMatrix}$
%
% \medskip
% The option |nullify-dots| smashes the instructions |\Ldots| (and the variants)
-% vertically but also horizontally.
+% horizontally but also vertically.
%
% \medskip
% \textbf{There must be no space before the opening bracket (|[|) of the options
@@ -576,25 +551,118 @@ version 2005/12/01 or later.
% \end{pmatrix}$
% \end{scope}
%
-% \subsection{Fine tuning of the dotted lines}
+% \subsection{Customization of the dotted lines}
%
-% The distance between a node and the end of a dotted line is set by
-% |dotted-lines-margin|. The initial value of this key is $0.3$~em (it's
-% recommended to use a unit dependent of the current font). For an example,
-% cf.~p.~\pageref{permutation}.
+% The dotted lines drawn by |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots|, |\Iddots|
+% and |\Hdotsfor| (and by the command |\line| in the |code-after| which is described
+% in p.~\pageref{line-in-code-after}) may be customized by three options (specified
+% between square brackets after the command):
+% \begin{itemize}
+% \item |color|;
+% \item |shorten|;
+% \item |line-style|.
+% \end{itemize}
+%
+% These options may also be fixed with |\NiceMatrixOptions| or at the level of a
+% given environment but, in those cases, they must be prefixed by |xdots|, and,
+% thus have for names:
+% \begin{itemize}
+% \item |xdots/color|;
+% \item |xdots/shorten|;
+% \item |xdots/line-style|.
+% \end{itemize}
+%
+% For the clarity of the explanations, we will use those names.
+%
+% \bigskip
+% \textbf{The option xdots/color}\par\nobreak
+%
+% \smallskip
+% The option |xdots/color| fixes the color or the dotted line. However, one should
+% remark that the dotted lines drawn in the exterior rows and columns have a
+% special treatment: cf. p.~\pageref{exterior}.
%
+% \bigskip
+% \textbf{The option xdots/shorten}\par\nobreak
+%
+% \smallskip
+% The option |xdots/shorten| fixes the margin of both extremities of the line.
+% The name is derived from the options ``|shorten >|'' and ``|shorten <|'' of
+% Tikz but one should notice that \pkg{nicematrix} only provides
+% |xdots/shorten|. The initial value of this parameter is 0.3~em (it is
+% recommanded to use a unit of length dependent of the current font).
%
-% \section{The Tikz nodes created by nicematrix}
+% \bigskip
+% \textbf{The option xdots/line-style}\par\nobreak
+%
+% \smallskip
+% It should be pointed that, by default, the lines drawn by Tikz with the
+% parameter |dotted| are composed of square dots (and not rounded
+% ones).\footnote{The first reason of this behaviour is that the \textsc{pdf}
+% format includes a description for dashed lines. The lines specified with this
+% descriptor are displayed very efficiently by the \textsc{pdf} readers. It's
+% easy, starting from these dashed lines,
+% to create a line composed by square dots whereas a line of rounded dots needs
+% a specification of each dot in the \textsc{pdf} file.}
+%
+% \begin{BVerbatim}[baseline=c,boxwidth=9cm]
+% \tikz \draw [dotted] (0,0) -- (5,0) ;
+% \end{BVerbatim}
+% \tikz \draw [dotted] (0,0) -- (5,0) ;
+%
+% \medskip
+% In order to provide lines with rounded dots in the style of those provided by
+% |\ldots| (at least with the \emph{Computer Modern} fonts), the extension
+% \pkg{nicematrix} embeds its own system to draw a dotted line (and this system
+% uses \textsc{pgf} and not Tikz). This style is called |standard| and that's
+% the initial value of the parameter |xdots/line-style|.
+%
+% However (when Tikz is loaded) it's possible to use for |xdots/line-style| any style
+% provided by Tikz, that is to say any sequence of options provided by Tikz for
+% the Tizk pathes (with the exception of ``|color|'', ``|shorten >|'' and
+% ``|shorten <|'').
+%
+% \medskip
+% Here is for example a tridiagonal matrix with the style |loosely dotted|:\par\nobreak
+%
+% \medskip
+% \begin{BVerbatim}[baseline=c]
+% $\begin{pNiceMatrix}[nullify-dots,~emphase#xdots/line-style=loosely dotted@]
+% a & b & 0 & & \Cdots & 0 \\
+% b & a & b & \Ddots & & \Vdots \\
+% 0 & b & a & \Ddots & & \\
+% & \Ddots & \Ddots & \Ddots & & 0 \\
+% \Vdots & & & & & b \\
+% 0 & \Cdots & & 0 & b & a
+% \end{pNiceMatrix}$
+% \end{BVerbatim}
+%
+%
+% \[\begin{pNiceMatrix}[nullify-dots,xdots/line-style=loosely dotted]
+% a & b & 0 & & \Cdots & 0 \\
+% b & a & b & \Ddots & & \Vdots \\
+% 0 & b & a & \Ddots & & \\
+% & \Ddots & \Ddots & \Ddots & & 0 \\
+% \Vdots & & & & & b \\
+% 0 & \Cdots & & 0 & b & a
+% \end{pNiceMatrix}\]
+%
+%
+%
+% \section{The PGF/Tikz nodes created by nicematrix}
%
% \label{name}
%
-% The package \pkg{nicematrix} creates a Tikz node for each cell of the
-% considered array. These nodes are used to draw the dotted lines between the
-% cells of the matrix. However, the user may wish to use directly these nodes.
-% It's possible. First, the user have to give a name to the array (with the key
-% called |name|). Then, the nodes are accessible through the names
-% ``\textsl{name}-$i$-$j$'' where \textsl{name} is the name given to the array
-% and $i$ and $j$ the numbers of the row and the column of the considered cell.
+% The package \pkg{nicematrix} creates a PGF/Tikz node for each (non-empty) cell
+% of the considered array. These nodes are used to draw the dotted lines between
+% the cells of the matrix. However, the user may wish to use directly these
+% nodes. It's possible (if Tikz has been loaded\footnote{We remind that, since
+% the version 3.13, \pkg{nicematrix} doesn't load Tikz by default by only
+% \textsc{pgf} (Tikz is a layer over \textsc{pfg}).}). First, the user have to
+% give a name to the array (with the key called |name|). Then, the nodes are
+% accessible through the names ``\textsl{name}-$i$-$j$'' where \textsl{name} is
+% the name given to the array and $i$ and $j$ the numbers of the row and the
+% column of the considered cell.
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=11cm]
@@ -619,14 +687,25 @@ version 2005/12/01 or later.
%
% \bigskip
% In the following example, we have underlined all the nodes of the matrix.
-% \begin{scope}
-% \tikzset{every node/.style = {fill = red!15, inner sep = 0pt}}
-% \[\begin{pNiceMatrix}
+% \[\begin{pNiceMatrix}[
+% code-after = {\begin{tikzpicture}
+% [every node/.style = {blend mode = multiply,
+% fill = red!15,
+% inner sep = 0 pt }]
+% \node [fit = (1-1)] {} ;
+% \node [fit = (1-3)] {} ;
+% \node [fit = (2-2)] {} ;
+% \node [fit = (3-1)] {} ;
+% \node [fit = (3-3)] {} ;
+% \node [fit = (1-2)] {} ;
+% \node [fit = (2-1)] {} ;
+% \node [fit = (2-3)] {} ;
+% \node [fit = (3-2)] {} ;
+% \end{tikzpicture}}]
% a & a + b & a + b + c \\
% a & a & a + b \\
% a & a & a
% \end{pNiceMatrix}\]
-% \end{scope}
%
%
% \bigskip
@@ -647,7 +726,7 @@ version 2005/12/01 or later.
% code-after = {\begin{tikzpicture}
% [every node/.style = {fill = red!15,
% blend mode = multiply,
-% inner sep = -\pgflinewidth/2},
+% inner sep = 0pt},
% name suffix = -medium]
% \node [fit = (1-1)] {} ;
% \node [fit = (1-2)] {} ;
@@ -676,7 +755,7 @@ version 2005/12/01 or later.
% create-large-nodes,
% code-after = {\begin{tikzpicture}
% [every node/.style = {blend mode = multiply,
-% inner sep = -\pgflinewidth/2},
+% inner sep = 0pt},
% name suffix = -large]
% \node [fit = (1-1),fill = red!15] {} ;
% \node [fit = (1-3),fill = red!15] {} ;
@@ -708,7 +787,7 @@ version 2005/12/01 or later.
% create-large-nodes,left-margin,right-margin,
% code-after = {\begin{tikzpicture}
% [every node/.style = {blend mode = multiply,
-% inner sep = -\pgflinewidth/2},
+% inner sep = 0pt},
% name suffix = -large]
% \node [fit = (1-1),fill = red!15] {} ;
% \node [fit = (1-3),fill = red!15] {} ;
@@ -735,7 +814,7 @@ version 2005/12/01 or later.
% create-large-nodes,margin,extra-margin=3pt,
% code-after = {\begin{tikzpicture}
% [every node/.style = {blend mode = multiply,
-% inner sep = -\pgflinewidth/2},
+% inner sep = 0 pt},
% name suffix = -large]
% \node [fit = (1-1),fill = red!15] {} ;
% \node [fit = (1-3),fill = red!15] {} ;
@@ -760,7 +839,7 @@ version 2005/12/01 or later.
% extra-left-margin=3pt,
% code-after = {\begin{tikzpicture}
% [every node/.style = {blend mode = multiply,
-% inner sep = -\pgflinewidth/2},
+% inner sep = 0 pt},
% name suffix = -large]
% \node [fit = (1-1),fill = red!15] {} ;
% \node [fit = (1-3),fill = red!15] {} ;
@@ -783,25 +862,30 @@ version 2005/12/01 or later.
%
% \section{The code-after}
%
+% \label{code-after}
% The option |code-after| may be used to give some code that will be excuted
-% after the construction of the matrix (and, hence, after the construction of
-% all the Tikz nodes).
+% after the construction of the matrix (and thus after the construction of
+% all the nodes).
%
-% In the |code-after|, the Tikz nodes should be accessed by a name of the form
-% $i$-$j$ (without the prefix of the name of the environment).
+% \smallskip
+% \textbf{If Tikz is loaded}\footnote{We remind that, since the version 3.13,
+% \pkg{nicematrix} doesn't load Tikz by default but only \textsc{pgf} (Tikz is a
+% layer over \textsc{pfg}).}, one may access to that nodes with classical Tikz
+% instructions. The nodes should be designed as $i$-$j$ (without the prefix
+% corresponding to the name of the environment).
%
-% Moreover, a special command, called |\line| is available to draw directly
-% dotted lines between nodes.
+% Moreover, a special command, called |\line|, is available to draw directly
+% dotted lines between nodes. \label{line-in-code-after}
%
% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=12cm]
-% $\begin{pNiceMatrix}[~emphase#code-after = \line{1-1}{3-3}@]
+% \begin{BVerbatim}[baseline=c,boxwidth=13cm]
+% $\begin{pNiceMatrix}[~emphase#code-after = {\line{1-1}{3-3}[color=blue]}@]
% 0 & 0 & 0 \\
% 0 & & 0 \\
% 0 & 0 & 0
% \end{pNiceMatrix}$
% \end{BVerbatim}
-% $\begin{pNiceMatrix}[code-after = \line{1-1}{3-3}]
+% $\begin{pNiceMatrix}[code-after = {\line{1-1}{3-3}[color=blue]}]
% 0 & 0 & 0 \\
% 0 & & 0 \\
% 0 & 0 & 0
@@ -1001,30 +1085,34 @@ version 2005/12/01 or later.
% \pkg{nicematrix}.
% \label{exterior}
%
-% A potential first row has the number $0$ (and not $1$). Idem for the potential
-% first column. In general cases, one must specify the number of the last row
-% and the number of the last column as values of |last-row| and |last-col|.
+% A potential ``first row'' (exterior) has the number $0$ (and not $1$). Idem
+% for the potential ``first column''. In general cases, one must specify the
+% number of the last row and the number of the last column as values of
+% |last-row| and |last-col|.
%
% \begin{Verbatim}
% $\begin{pNiceMatrix}[~emphase#first-row,last-row=5,first-col,last-col=5@]
-% & C_1 & C_2 & C_3 & C_4 & \\
-% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-% L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
-% L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
-% & C_1 & C_2 & C_3 & C_4 &
+% $\begin{pNiceMatrix}[~emphase#first-row,last-row=5,first-col,last-col=5@,nullify-dots]
+% & C_1 & \Cdots & & C_4 & \\
+% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+% \Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
+% & a_{31} & a_{32} & a_{33} & a_{34} & \\
+% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+% & C_1 & \Cdots & & C_4 &
+% \end{pNiceMatrix}$
% \end{pNiceMatrix}$
% \end{Verbatim}
%
-% \[\begin{pNiceMatrix}[first-row,last-row=5,first-col,last-col=5]
-% & C_1 & C_2 & C_3 & C_4 & \\
-% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-% L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
-% L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
-% & C_1 & C_2 & C_3 & C_4 &
+% \[\begin{pNiceMatrix}[first-row,last-row=5,first-col,last-col=5,nullify-dots]
+% & C_1 & \Cdots & & C_4 & \\
+% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+% \Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
+% & a_{31} & a_{32} & a_{33} & a_{34} & \\
+% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+% & C_1 & \Cdots & & C_4 &
% \end{pNiceMatrix}\]
%
+%
% \bigskip
% We have several remarks to do.
% \begin{itemize}
@@ -1055,14 +1143,14 @@ version 2005/12/01 or later.
% ~emphase#code-for-first-col@ = \color{blue},
% ~emphase#code-for-last-row@ = \color{green},
% ~emphase#code-for-last-col@ = \color{magenta}}
-% $\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col]
-% & C_1 & C_2 & C_3 & C_4 & \\
-% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-% L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
+% $\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col,nullify-dots]
+% & C_1 & \Cdots & & C_4 & \\
+% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+% \Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
% \hline
-% L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
-% & C_1 & C_2 & C_3 & C_4 &
+% & a_{31} & a_{32} & a_{33} & a_{34} & \\
+% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+% & C_1 & \Cdots & & C_4 &
% \end{pNiceArray}$
% \end{Verbatim}
%
@@ -1071,15 +1159,17 @@ version 2005/12/01 or later.
% code-for-first-col = \color{blue},
% code-for-last-row = \color{green},
% code-for-last-col = \color{magenta}}
-% \[\begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col]
-% & C_1 & \multicolumn1C{C_2} & C_3 & C_4 & \\
-% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
-% L_2 & a_{21} & a_{22} & a_{23} & a_{24} & L_2 \\
+% \begin{displaymath}
+% \begin{pNiceArray}{CC|CC}[first-row,last-row,first-col,last-col,nullify-dots]
+% & C_1 & \multicolumn1C{\Cdots} & & C_4 & \\
+% L_1 & a_{11} & a_{12} & a_{13} & a_{14} & L_1 \\
+% \Vdots & a_{21} & a_{22} & a_{23} & a_{24} & \Vdots \\
% \hline
-% L_3 & a_{31} & a_{32} & a_{33} & a_{34} & L_3 \\
-% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
-% & C_1 & \multicolumn1C{C_2} & C_3 & C_4 &
-% \end{pNiceArray}\]
+% & a_{31} & a_{32} & a_{33} & a_{34} & \\
+% L_4 & a_{41} & a_{42} & a_{43} & a_{44} & L_4 \\
+% & C_1 & \multicolumn1C{\Cdots} & & C_4 &
+% \end{pNiceArray}
+% \end{displaymath}
% \end{scope}
%
%
@@ -1099,6 +1189,10 @@ version 2005/12/01 or later.
% rules (for example thicker than the standard rules), he should consider the
% command |\OnlyMainNiceMatrix| described on page~\pageref{OnlyMainNiceMatrix}.
%
+% \item A specification of color present in |code-for-first-row| also applies to
+% a dotted line draw in this exterior ``first row'' (excepted if a value has
+% been given to |xdots/color|). Idem for the other exterior rows and columns.
+%
% \item Logically, the potential option |columns-width| (described
% p.~\pageref{width}) doesn't apply to the ``first column'' and ``last column''.
% \item For technical reasons, it's not possible to use the option of the
@@ -1116,7 +1210,7 @@ version 2005/12/01 or later.
% In the environments of the extension \pkg{nicematrix}, it's possible to use
% the command |\hdottedline| (provided by \pkg{nicematrix}) which is a
% counterpart of the classical commands |\hline| and |\hdashline| (the latter is
-% a command of\pkg{arydshln}).
+% a command of \pkg{arydshln}).
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
@@ -1195,28 +1289,36 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
-% \NiceMatrixOptions{letter-for-dotted-lines = V}
-% \left(\begin{NiceArray}{~emphase#C|C:CVC@}
+% \NiceMatrixOptions{letter-for-dotted-lines = I}
+% \arrayrulecolor{blue}
+% \left(\begin{NiceArray}{~emphase#C|C:CIC@}
% 1 & 2 & 3 & 4 \\
% 5 & 6 & 7 & 8 \\
% 9 & 10 & 11 & 12
% \end{NiceArray}\right)
+% \arrayrulecolor{black}
% \end{BVerbatim}
% \begin{scope}
-% \NiceMatrixOptions{letter-for-dotted-lines = V}
-% $\left(\begin{NiceArray}{C|C:CVC}
+% \NiceMatrixOptions{letter-for-dotted-lines = I}
+% \arrayrulecolor{blue}
+% $\left(\begin{NiceArray}{C|C:CIC}
% 1 & 2 & 3 & 4 \\
% 5 & 6 & 7 & 8 \\
% 9 & 10 & 11 & 12
% \end{NiceArray}\right)$
+% \arrayrulecolor{black}
% \end{scope}
+%
+% \smallskip
+% We have used the command |\arrayrulecolor| (de \pkg{colortbl}) to draw in blue
+% the three rules.
%
% \bigskip
% \emph{Remark} : In the extension \pkg{array} (on which the extension
% \pkg{nicematrix} relies), horizontal and vertical rules make the array larger
% or wider by a quantity equal to the width of the rule\footnote{In fact, this
% is true only for |\hline| and ``"|"'' but not for |\cline|.}. In
-% \pkg{nicematrix}, the dotted lines drawn |\hdottedline| and ``|:|'' do
+% \pkg{nicematrix}, the dotted lines drawn by |\hdottedline| and ``|:|'' do
% likewise.
%
%
@@ -1226,7 +1328,10 @@ version 2005/12/01 or later.
%
% In the environments with an explicit preamble (like |{NiceArray}|,
% |{pNiceArray}|, etc.), it's possible to fix the width of a given column with
-% the standard letters |w| and |W| of the package \pkg{array}.
+% the standard letters |w| and |W| of the package \pkg{array}. In the
+% environments of \pkg{nicematrix}, the cells of such columns are composed in
+% mathematical mode, whereas, in |{array}| of \pkg{array}, they are composed in
+% text mode.
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
@@ -1244,8 +1349,8 @@ version 2005/12/01 or later.
%
%
% \bigskip
-% In the environments of \pkg{nicematrix}, it's also possible to fix the width
-% of all the columns of a matrix directly with the option |columns-width|.
+% In the environments of \pkg{nicematrix}, it's also possible to fix the \emph{minimal}
+% width of all the columns of a matrix directly with the option |columns-width|.
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
@@ -1288,8 +1393,9 @@ version 2005/12/01 or later.
% \end{pNiceMatrix}$
%
% \bigskip
-% Without surprise, it's possible to fix the width of the columns of all the
-% matrices of a current scope with the command |\NiceMatrixOptions|.\par\nobreak
+% Without surprise, it's possible to fix the minimal width of the columns of all
+% the matrices of a current scope with the command
+% |\NiceMatrixOptions|.\par\nobreak
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=8.5cm]
@@ -1437,6 +1543,29 @@ version 2005/12/01 or later.
%
% \section{Advanced features}
%
+%
+% \subsection{Alignement option in NiceMatrix}
+%
+% The environments without preamble (|{NiceMatrix}|, |{pNiceMatrix}|,
+% |{bNiceMatrix}|, etc.) provide two options |l| and |r| (equivalent at |L| and
+% |R|) which generate all the columns aligned leftwards (or
+% rightwards).\footnote{This is a part of the functionality provided by the
+% environments |{pmatrix*}|, |{bmatrix*}|, etc. of \pkg{mathtools}.}
+%
+%
+% \medskip
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
+% $\begin{bNiceMatrix}[R]
+% \cos x & - \sin x \\
+% \sin x & \cos x
+% \end{bNiceMatrix}$
+% \end{BVerbatim}
+% $\begin{bNiceMatrix}[R]
+% \cos x & - \sin x \\
+% \sin x & \cos x
+% \end{bNiceMatrix}$
+%
+%
% \subsection{The command \textbackslash rotate}
%
% The package \pkg{nicematrix} provides a command |\rotate|. When used in the
@@ -1447,33 +1576,63 @@ version 2005/12/01 or later.
%
%\bigskip
%
-% \begin{BVerbatim}[baseline=c,boxwidth=12cm]
+%\begin{BVerbatim}[baseline=c,boxwidth=12cm]
% \NiceMatrixOptions%
% {code-for-first-row = \scriptstyle ~emphase#\rotate@ \text{image of },
% code-for-last-col = \scriptstyle }
-% $\begin{pNiceMatrix}[first-row,last-col=4]
+% $A = \begin{pNiceMatrix}[first-row,last-col=4]
+% e_1 & e_2 & e_3 \\
+% 1 & 2 & 3 & e_1 \\
+% 4 & 5 & 6 & e_2 \\
+% 7 & 8 & 9 & e_3 \\
+% \end{pNiceMatrix}$
+% \end{BVerbatim}
+% \begin{varwidth}{10cm}
+% \NiceMatrixOptions%
+% {code-for-first-row = \scriptstyle\rotate \text{image of },
+% code-for-last-col = \scriptstyle }
+% $ A = \begin{pNiceMatrix}[first-row,last-col=4]
% e_1 & e_2 & e_3 \\
% 1 & 2 & 3 & e_1 \\
% 4 & 5 & 6 & e_2 \\
% 7 & 8 & 9 & e_3 \\
% \end{pNiceMatrix}$
-% \end{BVerbatim}
-% \begin{scope}
+% \end{varwidth}
+%
+% \bigskip
+% If the command |\rotate| is used in the ``last row'' (exterior to the matrix),
+% the corresponding elements are aligned upwards as shown below.
+%
+% \bigskip
+% \begin{BVerbatim}[baseline=c,boxwidth=12cm]
% \NiceMatrixOptions%
-% {code-for-first-row = \scriptstyle\rotate \text{image of },
+% {code-for-last-row = \scriptstyle ~emphase#\rotate@ ,
% code-for-last-col = \scriptstyle }
-% \begin{minipage}{3cm}
-% $\begin{pNiceMatrix}[first-row,last-col=4]
-% e_1 & e_2 & e_3 \\
+% $A = \begin{pNiceMatrix}[last-row,last-col=4]
% 1 & 2 & 3 & e_1 \\
% 4 & 5 & 6 & e_2 \\
% 7 & 8 & 9 & e_3 \\
+% \text{image of } e_1 & e_2 & e_3 \\
% \end{pNiceMatrix}$
-% \end{minipage}
-% \end{scope}
+% \end{BVerbatim}
+% \begin{varwidth}{10cm}
+% \NiceMatrixOptions%
+% {code-for-last-row = \scriptstyle\rotate ,
+% code-for-last-col = \scriptstyle }%
+% $A = \begin{pNiceMatrix}[last-row,last-col=4]
+% 1 & 2 & 3 & e_1 \\
+% 4 & 5 & 6 & e_2 \\
+% 7 & 8 & 9 & e_3 \\
+% \text{image of } e_1 & e_2 & e_3 \\
+% \end{pNiceMatrix}$
+% \end{varwidth}
+%
+%
%
% \subsection{The option small}
%
+% \label{small}
+%
% With the option |small|, the environments of the extension \pkg{nicematrix}
% are composed in a way similar to the environment |{smallmatrix}| of the
% extension \pkg{amsmath} (and the environments |{psmallmatrix}|,
@@ -1521,10 +1680,14 @@ version 2005/12/01 or later.
%
% In the cells of the array, it's possible to use the LaTeX counters |iRow| and
% |jCol| which represent the number of the current row and the number of the
-% current column\footnote{We recall that the first row (if it exists) has the
-% number~$0$ and that the first column (if it exists) has also the number~$0$.}.
-% Of course, the user must not change the value of these counters which are used
-% internally by \pkg{nicematrix}.
+% current column\footnote{We recall that the exterior ``first row'' (if it
+% exists) has the number~$0$ and that the exterior ``first column'' (if it
+% exists) has also the number~$0$.}. Of course, the user must not change the
+% value of these counters which are used internally by \pkg{nicematrix}.
+%
+% In the |code-after| (cf. p. \pageref{code-after}), |iRow| represents the total
+% number of rows (excepted the potential exterior rows) and |jCol| represents
+% the total number of columns (excepted the potential exterior columns).
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
@@ -1675,20 +1838,18 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{scope}
-% \def\alpha{$α$}
-% \def\beta{$β$}
% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
% $\begin{bNiceMatrix}[~emphase#light-syntax@,first-row,first-col]
-% {} ~alpha ~beta ;
-% ~alpha 2\cos ~alpha {\cos ~alpha + \cos ~beta} ;
-% ~beta \cos ~alpha+\cos ~beta { 2 \cos ~beta }
+% {} a b ;
+% a 2\cos a {\cos a + \cos b} ;
+% b \cos a+\cos b { 2 \cos b }
% \end{bNiceMatrix}$
% \end{BVerbatim}
% \end{scope}
% $\begin{bNiceMatrix}[light-syntax,first-row,first-col]
-% {} α β ;
-% α 2\cos α {\cos α + \cos β} ;
-% β \cos α+\cos β { 2 \cos β }
+% {} a b ;
+% a 2\cos a {\cos a + \cos b} ;
+% b \cos a+\cos b { 2 \cos b }
% \end{bNiceMatrix}$
%
% \medskip
@@ -1739,14 +1900,14 @@ version 2005/12/01 or later.
% not in an eventual exterior row.
%
% For example, one may wish to define a new column type |?| in order to draw a
-% (black) thick rule of width 1~pt. The following definition will do the
+% (black) heavy rule of width 1~pt. The following definition will do the
% job\footnote{The command |\vrule| is a TeX (and not LaTeX) command.}:
%
% \begin{Verbatim}
% \newcolumntype{?}{!{\OnlyMainNiceMatrix{\vrule width 1 pt}}}
% \end{Verbatim}
%
-% The thick vertical rule won't extend in the exterior rows:
+% The heavy vertical rule won't extend in the exterior rows:
% \medskip
% \begin{scope}
% \newcolumntype{?}{!{\OnlyMainNiceMatrix{\vrule width 1 pt}}}
@@ -1808,10 +1969,10 @@ version 2005/12/01 or later.
% & \Cdots & & & \\
% \end{pNiceMatrix}$
%
-% \subsection{The names of the Tikz nodes created by nicematrix}
+% \subsection{The names of the PGF nodes created by nicematrix}
%
% We have said that, when a name is given to an environment of \pkg{nicematrix},
-% it's possible to access the Tikz nodes through this name (cf.
+% it's possible to access the PGF/Tikz nodes through this name (cf.
% p.~\pageref{name}).
%
% That's the recommended way to access these nodes. However, we describe now the
@@ -1823,8 +1984,8 @@ version 2005/12/01 or later.
% command and not a counter).
%
% For the environment of number~$n$, the node in row~$i$ and column~$j$ has the
-% name |nm-|$n$|-|$i$|-|$j$. The |medium| and |large| have the same name, suffixed by
-% |-medium| and |-large|.
+% name |nm-|$n$|-|$i$|-|$j$. The |medium| and |large| nodes have the same name,
+% suffixed by |-medium| and |-large|.
%
%
% \subsection{Diagonal lines}
@@ -1840,7 +2001,7 @@ version 2005/12/01 or later.
% \medskip
% In the following examples, the first |\Ddots| instruction is written in color:
%
-% \medskip
+% % \medskip
% \begin{scope}
% \begin{minipage}{9.5cm}
% Example with parallelization (default):
@@ -1904,7 +2065,7 @@ version 2005/12/01 or later.
% An instruction like |\Ldots|, |\Cdots|, etc. tries to determine the first
% non-empty cells on both sides. However, an empty cell is not necessarily a
% cell with no TeX content (that is to say a cell with no token between the two
-% ampersands~|&|). Indeed, a cell with contents |\hspace*{1cm}| may be
+% ampersands~|&|). Indeed, a cell which only contains |\hspace*{1cm}| may be
% considered as empty.
%
% \interitem
@@ -1923,12 +2084,8 @@ version 2005/12/01 or later.
% the last cell (second row and second column) is empty.
%
% \medskip
-% \item Each cell whose TeX ouput has a width less than 0.5~pt is empty.
+% \item Each cell whose TeX ouput has a width equal to zero is empty.
%
-% \medskip
-% \item A cell which contains a command |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots|
-% or |\Iddots| is empty. We recall that these commands should be used alone in a
-% cell.
%
% \medskip
% \item A cell with a command |\Hspace| (or |\Hspace*|) is empty. This command
@@ -1948,33 +2105,26 @@ version 2005/12/01 or later.
% |{amsmath}|, we can read: {\itshape The extra space of |\arraycolsep| that
% \pkg{array} adds on each side is a waste so we remove it [in |{matrix}|]
% (perhaps we should instead remove it from array in general, but that's a
-% harder task).} It's possible to suppress these spaces for a given environment
-% |{array}| with a construction like
-% |\begin{array}{@{}ccccc@{}}...\end{array}|.}.
-% The environment |{matrix}| of \pkg{amsmath} and its variants (|{pmatrix}|,
-% |{vmatrix}|, etc.) of \pkg{amsmath} prefer to delete these spaces with
-% explicit instructions |\hskip -\arraycolsep|. The extension \pkg{nicematrix}
-% does the same in all its environments, |{NiceArray}| included. However, if the
-% user wants the environment |{NiceArray}| behaving by default like the
-% environment |{array}| of \pkg{array} (for example, when adapting an existing
-% document) it's possible to control this behaviour with the option
-% |exterior-arraycolsep|, set by the command |\NiceMatrixOptions|. With this
-% option, exterior spaces of length |\arraycolsep| will be inserted in the
-% environments |{NiceArray}| (the other environments of \pkg{nicematrix} are not
-% affected).
+% harder task).}}. The environment |{matrix}| of
+% \pkg{amsmath} and its variants (|{pmatrix}|, |{vmatrix}|, etc.) of
+% \pkg{amsmath} prefer to delete these spaces with explicit instructions
+% |\hskip -\arraycolsep|\footnote{And not by inserting |@{}| on both sides of the
+% preamble of the array. As a consequence, the length of the |\hline| is not
+% modified and may appear too long, in particular when using square brackets}.
+% The extension \pkg{nicematrix} does the same in all its environments,
+% |{NiceArray}| included. However, if the user wants the environment
+% |{NiceArray}| behaving by default like the environment |{array}| of
+% \pkg{array} (for example, when adapting an existing document) it's possible to
+% control this behaviour with the option |exterior-arraycolsep|, set by the
+% command |\NiceMatrixOptions|. With this option, exterior spaces of length
+% |\arraycolsep| will be inserted in the environments |{NiceArray}| (the other
+% environments of \pkg{nicematrix} are not affected).
%
%
% \subsection{The class option draft}
%
-% The package \pkg{nicematrix} is rather slow when drawing the dotted lines
-% (generated by |\Cdots|, |\Ldots|, |\Ddots|, etc. but also by |\hdottedline| or
-% the specifier |:|).\footnote{The main reason is that we want dotted lines with
-% round dots (and not square dots) with the same space on both extremities of
-% the lines. To achieve this goal, we have to construct our own system of dotted
-% lines.}
-%
-% That's why, when the class option |draft| is used, the dotted lines are not
-% drawn, for a faster compilation.
+% When the class option |draft| is used, the dotted lines are not drawn, for a
+% faster compilation.
%
% \subsection{A technical problem with the argument of
% \textbackslash\textbackslash}
@@ -2071,39 +2221,14 @@ version 2005/12/01 or later.
%
% \subsection{Dotted lines}
%
-% \medskip
-% A tridiagonal matrix:
-%
-% \bigskip
-% \begin{BVerbatim}[baseline=c]
-% $\begin{pNiceMatrix}[nullify-dots]
-% a & b & 0 & & \Cdots & 0 \\
-% b & a & b & \Ddots & & \Vdots \\
-% 0 & b & a & \Ddots & & \\
-% & \Ddots & \Ddots & \Ddots & & 0 \\
-% \Vdots & & & & & b \\
-% 0 & \Cdots & & 0 & b & a
-% \end{pNiceMatrix}$
-% \end{BVerbatim}
-% \hspace{1.5cm}
-% $\begin{pNiceMatrix}[nullify-dots]
-% a & b & 0 & & \Cdots & 0 \\
-% b & a & b & \Ddots & & \Vdots \\
-% 0 & b & a & \Ddots & & \\
-% & \Ddots & \Ddots & \Ddots & & 0 \\
-% \Vdots & & & & & b \\
-% 0 & \Cdots & & 0 & b & a
-% \end{pNiceMatrix}$
-%
-% \vspace{2cm}
%
% A permutation matrix (as an example, we have raised the value of
-% |dotted-lines-margin|).
+% |xdots/shorten|).
%
% \label{permutation}
% \bigskip
% \begin{BVerbatim}[baseline=c]
-% $\begin{pNiceMatrix}[~emphase#dotted-lines-margin=0.6em@]
+% $\begin{pNiceMatrix}[~emphase#xdots/shorten=0.6em@]
% 0 & 1 & 0 & & \Cdots & 0 \\
% \Vdots & & & \Ddots & & \Vdots \\
% & & & \Ddots & & \\
@@ -2113,7 +2238,7 @@ version 2005/12/01 or later.
% \end{pNiceMatrix}$
% \end{BVerbatim}
% \hspace{2.5cm}
-% $\begin{pNiceMatrix}[dotted-lines-margin=0.6em]
+% $\begin{pNiceMatrix}[xdots/shorten=0.6em]
% 0 & 1 & 0 & & \Cdots & 0 \\
% \Vdots & & & \Ddots & & \Vdots \\
% & & & \Ddots & & \\
@@ -2124,11 +2249,12 @@ version 2005/12/01 or later.
%
% \vspace{2cm}
%
-% An example with |\Iddots|: \par\nobreak
+% An example with |\Iddots|. We have raised even more the value of
+% |xdots/shorten|.\par\nobreak
%
% \bigskip
% \begin{BVerbatim}[baseline=c]
-% $\begin{pNiceMatrix}
+% $\begin{pNiceMatrix}[~emphase#xdots/shorten=0.9em@]
% 1 & \Cdots & & 1 \\
% \Vdots & & & 0 \\
% & ~emphase#\Iddots@ & ~emphase#\Iddots@ & \Vdots \\
@@ -2136,7 +2262,7 @@ version 2005/12/01 or later.
% \end{pNiceMatrix}$
% \end{BVerbatim}
% \hspace{4cm}
-% $\begin{pNiceMatrix}
+% $\begin{pNiceMatrix}[xdots/shorten=0.9em]
% 1 & \Cdots & & 1 \\
% \Vdots & & & 0 \\
% & \Iddots & \Iddots & \Vdots \\
@@ -2339,7 +2465,16 @@ version 2005/12/01 or later.
%
% \subsection{How to highlight cells of the matrix}
%
+%
% \label{highlight}
+% The following examples require Tikz (by default, \pkg{nicematrix} only loads
+% \textsc{pgf}) and the Tikz library |fit|. The following lines in the preamble
+% of your document may do the job:
+% \begin{verbatim}
+% \usepackage{tikz}
+% \usetikzlibrary{fit}
+% \end{verbatim}
+%
% \medskip
% In order to highlight a cell of a matrix, it's possible to ``draw'' one of the
% correspondant nodes (the ``normal node'', the ``medium node'' or the ``large
@@ -2347,8 +2482,10 @@ version 2005/12/01 or later.
% of the matrix (with the Tikz key ``|name suffix|'', it's easy to use the
% ``large nodes'').
%
-% In order to have the continuity of the lines, we have to set
-% |inner sep = -\pgflinewidth/2|.
+% We redraw the nodes with other nodes by using the Tikz library |fit|. Since we
+% want to redraw the nodes exactly, we have to set |inner sep = 0 pt| (if we
+% don't do that, the new nodes will be larger that the nodes created by
+% \pkg{nicematrix}).
%
% \begin{Verbatim}
% $\begin{pNiceArray}{>{\strut}CCCC}%
@@ -2356,7 +2493,7 @@ version 2005/12/01 or later.
% code-after = {\begin{tikzpicture}
% [~emphase#name suffix = -large@,
% every node/.style = {draw,
-% ~emphase#inner sep = -\pgflinewidth/2@}]
+% ~emphase#inner sep = 0 pt@}]
% \node [fit = (1-1)] {} ;
% \node [fit = (2-2)] {} ;
% \node [fit = (3-3)] {} ;
@@ -2374,7 +2511,7 @@ version 2005/12/01 or later.
% create-large-nodes,margin,extra-margin = 2pt,
% code-after = {\begin{tikzpicture}[name suffix = -large,
% every node/.style = {draw,
-% inner sep = -\pgflinewidth/2}]
+% inner sep = 0 pt}]
% \node [fit = (1-1)] {} ;
% \node [fit = (2-2)] {} ;
% \node [fit = (3-3)] {} ;
@@ -2387,12 +2524,12 @@ version 2005/12/01 or later.
% \end{pNiceArray}\]
%
% We should remark that the rules we have drawn are drawn \emph{after} the
-% construction of the array and, hence, they don't spread the cells of the
-% array. We recall that, on the other side, the command |\hline| and the
-% specifier ``"|"'' spread the cells (when the package \pkg{array} is loaded
-% but, when the package \pkg{nicematrix} is loaded, \pkg{array} is always
-% loaded).\footnote{On the other side, the command |\cline| doesn't spread the
-% rows of the array.}
+% construction of the array and thus, they don't spread the cells of the
+% array. We recall that, on the other side, the command |\hline|, the specifier
+% ``"|"'' and the options |hlines| and |vlines| spread the cells (when the
+% package \pkg{array} is loaded but, when the package \pkg{nicematrix} is
+% loaded, \pkg{array} is always loaded).\footnote{On the other side, the command
+% |\cline| doesn't spread the rows of the array.}
%
%
% \vspace{1cm}
@@ -2494,7 +2631,7 @@ version 2005/12/01 or later.
% \end{pNiceMatrix}$
%
% \vspace{1cm}
-% Considerer now the following matrix which we have named |example|.
+% Consider now the following matrix which we have named |example|.
%
% \medskip
% \begin{Verbatim}
@@ -2663,12 +2800,12 @@ version 2005/12/01 or later.
% |first-row|.
% \begin{Verbatim}
% \begin{bNiceArray}{C>{\strut}CCCC}[name=B,first-row]
-% & & C_j \\
-% b_{11} & \Cdots & b_{1j} & \Cdots & b_{1n} \\
-% \Vdots & & \Vdots & & \Vdots \\
-% & & b_{kj} \\
-% & & \Vdots \\
-% b_{n1} & \Cdots & b_{nj} & \Cdots & b_{nn}
+% & & C_j \\
+% b_{11} & \Cdots & b_{1j} & \Cdots & b_{1n} \\
+% \Vdots & & \Vdots & & \Vdots \\
+% & & b_{kj} \\
+% & & \Vdots \\
+% b_{n1} & \Cdots & b_{nj} & \Cdots & b_{nn}
% \end{bNiceArray} \\ \\
% \end{Verbatim}
%
@@ -2676,11 +2813,11 @@ version 2005/12/01 or later.
% key |first-col|.
% \begin{Verbatim}
% \begin{bNiceArray}{CC>{\strut}CCC}[name=A,first-col]
-% & a_{11} & \Cdots & & & a_{1n} \\
-% & \Vdots & & & & \Vdots \\
+% & a_{11} & \Cdots & & & a_{1n} \\
+% & \Vdots & & & & \Vdots \\
% L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\
-% & \Vdots & & & & \Vdots \\
-% & a_{n1} & \Cdots & & & a_{nn} \\
+% & \Vdots & & & & \Vdots \\
+% & a_{n1} & \Cdots & & & a_{nn} \\
% \end{bNiceArray}
% &
% \end{Verbatim}
@@ -2688,9 +2825,9 @@ version 2005/12/01 or later.
% In the matrix product, the two dotted lines have an open extremity.
% \begin{Verbatim}
% \begin{bNiceArray}{CC>{\strut}CCC}
-% & & & & \\
-% & & \Vdots \\
-% \Cdots & & c_{ij} \\
+% & & & & \\
+% & & \Vdots \\
+% \Cdots & & c_{ij} \\
% \\
% \\
% \end{bNiceArray}
@@ -2778,27 +2915,25 @@ version 2005/12/01 or later.
% See: |http://mirrors.ctan.org/macros/latex/contrib/l3kernel/l3prefixes.pdf|
%
%<@@=nicematrix>
-%
-% \bigskip
-% First, \pkg{tikz} and the Tikz library |fit| are loaded before the
-% |\ProvidesExplPackage|. They are loaded this way because |\usetikzlibrary| in
-% |expl3| code fails.\footnote{cf.
-% |tex.stackexchange.com/questions/57424/using-of-usetikzlibrary-in-an-expl3-package-fails|}
%
+% \bigskip
+% First, we load \pkg{pgfcore} and the module \pkg{shapes}. We do so because
+% it's not possible to use |\usepgfmodule| in |\ExplSyntaxOn|.
% \begin{macrocode}
-\RequirePackage{tikz}
-\usetikzlibrary{fit}
+\RequirePackage{pgfcore}
+\usepgfmodule{shapes}
\RequirePackage{expl3}[2020/02/08]
% \end{macrocode}
+%
%
-% We give the traditionnal declaration of a package written with |expl3|:
+% We give the traditional declaration of a package written with |expl3|:
% \begin{macrocode}
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{nicematrix}
{\myfiledate}
{\myfileversion}
- {Mathematical matrices with TikZ}
+ {Mathematical matrices with PGF/TikZ}
% \end{macrocode}
%
%
@@ -2836,7 +2971,7 @@ version 2005/12/01 or later.
% this package for technical reasons.
%
% \bigskip
-% We load \pkg{array} and \pkg{amsmath}.
+% We load some packages.
% \begin{macrocode}
\RequirePackage { array }
\RequirePackage { amsmath }
@@ -2863,6 +2998,35 @@ version 2005/12/01 or later.
% \bigskip
% \subsection*{Technical definitions}
%
+% \begin{macrocode}
+\bool_new:N \c_@@_tikz_loaded_bool
+\AtBeginDocument
+ {
+ \@ifpackageloaded { tikz }
+ {
+% \end{macrocode}
+% In some constructions, we will have to use a |{pgfpicture}| which \emph{must}
+% be replaced by a |{tikzpicture}| if Tikz is loaded. However, this switch
+% between |{pgfpicture}| |{tikzpicture}| can't be done dynamically with a
+% conditional because, when the |external| Tikz library, the pair
+% |\tikzpicture|-|\endtikpicture| (or |\begin{tikzpicture}-\end{tikzpicture}|
+% must be statically ``visible'' (even when extenalization is not activated).
+%
+% That's why we create these token lists |\c_@@_pgfortikzpicture_tl| and
+% |\c_@@_endpgfortikzpicture_tl| which will be used to construct in a
+% |\AtBeginDocument| the correct version of some commands.
+% \begin{macrocode}
+ \bool_set_true:N \c_@@_tikz_loaded_bool
+ \tl_const:Nn \c_@@_pgfortikzpicture_tl { \exp_not:N \tikzpicture }
+ \tl_const:Nn \c_@@_endpgfortikzpicture_tl { \exp_not:N \endtikzpicture }
+ }
+ {
+ \tl_const:Nn \c_@@_pgfortikzpicture_tl { \exp_not:N \pgfpicture }
+ \tl_const:Nn \c_@@_endpgfortikzpicture_tl { \exp_not:N \endpgfpicture }
+ }
+ }
+% \end{macrocode}
+%
% We test whether the current class is \cls{revtex4-1} or \cls{revtex4-2}
% because these classes redefines |\array| (of \pkg{array}) in a way
% incompatible with our programmation.
@@ -2885,8 +3049,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\bool_if:NT \c_@@_draft_bool
- { \msg_warning:nn { nicematrix } { Draft~mode } }
+\bool_if:NT \c_@@_draft_bool { \msg_warning:nn { nicematrix } { Draft~mode } }
% \end{macrocode}
%
%
@@ -2924,6 +3087,12 @@ version 2005/12/01 or later.
\int_new:N \g_@@_env_int
% \end{macrocode}
%
+% \begin{macrocode}
+\cs_new:Npn \@@_env: { nm - \int_use:N \g_@@_env_int }
+\cs_new_protected:Npn \@@_qpoint: #1
+ { \pgfpointanchor { \@@_env: - #1 } { center } }
+% \end{macrocode}
+%
% \bigskip
% We also define a counter to count the environments |{NiceMatrixBlock}|.
% \begin{macrocode}
@@ -2978,29 +3147,6 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \bigskip
-% Consider the following code:
-% \begin{Verbatim}
-% $\begin{pNiceMatrix}
-% a & b & c \\
-% d & e & \Vdots \\
-% f & \Cdots \\
-% g & h & i \\
-% \end{pNiceMatrix}$
-% \end{Verbatim}
-%
-% First, the dotted line created by the |\Vdots| will be drawn. The implicit
-% cell in position 2-3 will be considered as ``dotted''. Then, we will have to
-% draw the dotted line specified by the |\Cdots|; the final extremity of that
-% line will be exactly in position 2-3 and, for that new second line, it should
-% be considered as a \emph{closed} extremity (since it is dotted). However, we
-% don't have the (normal) Tikz node of that node (since it's an implicit cell):
-% we can't draw such a line. That's why that dotted line will be said
-% \emph{impossible} and an error will be raised.\footnote{Of course, the user
-% should solve the problem by adding the lacking ampersands.}
-% \begin{macrocode}
-\bool_new:N \l_@@_impossible_line_bool
-% \end{macrocode}
%
%
% \bigskip
@@ -3019,13 +3165,9 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \bigskip
-% We have put a argument |w| (\emph{weird}) for the following function because
-% its argument should be a specifier of \pkg{pgf} point between rounded
-% brackets.
% \begin{macrocode}
-\cs_set_protected:Npn \@@_extract_coords:w
- { \tikz@parse@node \pgfutil@firstofone }
+\colorlet { nicematrix-last-col } { . }
+\colorlet { nicematrix-last-row } { . }
% \end{macrocode}
%
% \bigskip
@@ -3038,26 +3180,29 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% The length |\l_@@_dotted_lines_margin_dim| is the minimal distance between a
+% The length |\l_@@_xdots_shorten_dim| is the minimal distance between a
% node (in fact an anchor of that node) and a dotted line (we say ``minimal''
% because, by definition, a dotted line is not a continuous line and, therefore,
% this distance may vary a little).
% \begin{macrocode}
-\dim_new:N \l_@@_dotted_lines_margin_dim
-\dim_set:Nn \l_@@_dotted_lines_margin_dim { 0.3 em }
+\dim_new:N \l_@@_xdots_shorten_dim
+\dim_set:Nn \l_@@_xdots_shorten_dim { 0.3 em }
% \end{macrocode}
%
% \bigskip
-% The length |\l_@@_radius_dim| is the radius of the dots for the dotted lines.
-% The default value is 0.53~pt but it will be changed if the option |small| is
-% used (to 0.37~pt).
+% The length |\l_@@_radius_dim| is the radius of the dots for the dotted lines
+% (for |\hdottedline| and |\dottedline| and for all the other dotted lines when
+% |line-style| is equal to |standard|, which is the initial value). The initial
+% value is 0.53~pt but it will be changed if the option |small| is used (to
+% 0.37~pt).
% \begin{macrocode}
\dim_new:N \l_@@_radius_dim
\dim_set:Nn \l_@@_radius_dim { 0.53 pt }
% \end{macrocode}
%
% \bigskip
-% The name of the current environment or the current command (despite the name).
+% The name of the current environment or the current command (despite the name
+% which contains \textsl{env}).
% \begin{macrocode}
\str_new:N \g_@@_name_env_str
% \end{macrocode}
@@ -3071,8 +3216,9 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% The following control sequence will be able to reconstruct the full name of
-% the current command or environment (despite the name). This command must
-% \emph{not} be protected since it's used in error messages.
+% the current command or environment (despite the name which contains
+% \textsl{env}). This command must \emph{not} be protected since it's used in
+% error messages.
% \begin{macrocode}
\cs_new:Npn \@@_full_name_env:
{
@@ -3084,6 +3230,7 @@ version 2005/12/01 or later.
%
% \bigskip
% \begin{macrocode}
+\tl_new:N \g_@@_internal_code_after_tl
\tl_new:N \g_@@_code_after_tl
% \end{macrocode}
%
@@ -3104,7 +3251,40 @@ version 2005/12/01 or later.
\bool_new:N \g_@@_row_of_col_done_bool
% \end{macrocode}
%
+% \begin{macrocode}
+\tl_new:N \l_@@_initial_suffix_tl
+\tl_new:N \l_@@_initial_anchor_tl
+\tl_new:N \l_@@_final_suffix_tl
+\tl_new:N \l_@@_final_anchor_tl
+% \end{macrocode}
+%
+% \begin{macrocode}
+\dim_new:N \l_@@_x_initial_dim
+\dim_new:N \l_@@_y_initial_dim
+\dim_new:N \l_@@_x_final_dim
+\dim_new:N \l_@@_y_final_dim
+% \end{macrocode}
+%
+% \begin{macrocode}
+\dim_new:N \l_tmpc_dim
+\dim_new:N \l_tmpd_dim
+% \end{macrocode}
%
+% \begin{macrocode}
+\bool_new:N \g_@@_empty_cell_bool
+% \end{macrocode}
+%
+% \medskip
+% The token list |\l_@@_xdots_line_style_tl| corresponds to the option |tikz| of the
+% commands |\Cdots|, |\Ldots|, etc. and of the options |line-style| for the
+% environments and |\NiceMatrixOptions|. The constant |\c_@@_standard_tl| will
+% be used in some tests.
+% \begin{macrocode}
+\tl_new:N \l_@@_xdots_line_style_tl
+\tl_const:Nn \c_@@_standard_tl { standard }
+\tl_set_eq:NN \l_@@_xdots_line_style_tl \c_@@_standard_tl
+% \end{macrocode}
+%
% \bigskip
% \textbf{Variables for the exterior rows and columns}\par\nobreak
%
@@ -3250,14 +3430,6 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set_protected:Npn \@@_adapt_S_column:
{
-% \end{macrocode}
-% In the preamble of the LaTeX document, the boolean |\c_@@_siunitx_loaded_bool|
-% won't be known. That's why we test the existence of
-% |\c_@@_siunitx_loaded_bool| and not its value.\footnote{Indeed,
-% \pkg{nicematrix} may be used in the preamble of the LaTeX document. For
-% example, you can compose a matrix in a box before the loading of
-% \pkg{arydshln} (not totally compatible with \pkg{nicematrix}).}
-% \begin{macrocode}
\bool_if:NT \c_@@_siunitx_loaded_bool
{
\group_begin:
@@ -3313,6 +3485,12 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+% \bigskip
+% The following command is only for efficiency. It must \emph{not} be protected
+% because it will be used (for instance) in names of \textsc{pgf} nodes.
+% \begin{macrocode}
+\cs_new:Npn \@@_succ:N #1 { \the \numexpr #1 + 1 \relax }
+% \end{macrocode}
%
% \bigskip
% \subsection*{The options}
@@ -3392,14 +3570,14 @@ version 2005/12/01 or later.
% ``medium nodes'' are created in the array. Idem for the ``large nodes''.
% \begin{macrocode}
\bool_new:N \l_@@_medium_nodes_bool
-\bool_new:N \g_@@_medium_nodes_bool
\bool_new:N \l_@@_large_nodes_bool
-\bool_new:N \g_@@_large_nodes_bool
% \end{macrocode}
%
% \bigskip
-% The dimension |\l_@@_left_margin_dim| correspondto the option |left-margin|
-% (idem for the right margin).
+% The dimension |\l_@@_left_margin_dim| correspond to the option |left-margin|.
+% Idem for the right margin. These parameters are involved in the creation of
+% the ``medium nodes'' but also in the placement of the delimiters and the
+% drawing of the horizontal dotted lines (|\hdottedline|).
% \begin{macrocode}
\dim_new:N \l_@@_left_margin_dim
\dim_new:N \l_@@_right_margin_dim
@@ -3432,6 +3610,14 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
+% The following parameter is for the color the dotted lines drawn by |\Cdots|,
+% |\Ldots|, |\Vdots|, |\Ddots|, |\Iddots| and |\Hdotsfor| but \emph{not} the
+% dotted lines drawn by |\hdottedline| and ``|:|''.
+% \begin{macrocode}
+\tl_new:N \l_@@_xdots_color_tl
+% \end{macrocode}
+%
+% \medskip
% Sometimes, we want to have several arrays vertically juxtaposed in order to
% have an alignment of the columns of these arrays. To acheive this goal, one
% may wish to use the same width for all the columns (for example with the
@@ -3450,11 +3636,35 @@ version 2005/12/01 or later.
% First, we define a set of keys ``|NiceMatrix / Global|'' which will be used
% (with the mechanism of |.inherit:n|) by other sets of keys.
% \begin{macrocode}
+\keys_define:nn { NiceMatrix / xdots }
+ {
+ line-style .code:n =
+ {
+ \bool_lazy_or:nnTF
+% \end{macrocode}
+% We can't use |\c_@@_tikz_loaded_bool| to test whether \pkg{tikz} is loaded
+% because |\NiceMatrixOptions| may be used in the preamble of the document.
+% \begin{macrocode}
+ { \cs_if_exist_p:N \tikzpicture }
+ { \str_if_eq_p:nn { #1 } { standard } }
+ { \tl_set:Nn \l_@@_xdots_line_style_tl { #1 } }
+ { \@@_error:n { bad~option~for~line-style } }
+ } ,
+ line-style .value_required:n = true ,
+ color .tl_set:N = \l_@@_xdots_color_tl ,
+ color .value_required:n = true ,
+ shorten .dim_set:N = \l_@@_xdots_shorten_dim ,
+ shorten .value_required:n = true ,
+ unknown .code:n = \@@_error:n { Unknown~option~for~xdots }
+ }
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
\keys_define:nn { NiceMatrix / Global }
{
+ xdots .code:n = \keys_set:nn { NiceMatrix / xdots } { #1 } ,
max-delimiter-width .bool_set:N = \l_@@_max_delimiter_width_bool ,
- dotted-lines-margin .dim_set:N = \l_@@_dotted_lines_margin_dim ,
- dotted-lines-margin .value_required:n = true ,
light-syntax .bool_set:N = \l_@@_light_syntax_bool ,
light-syntax .default:n = true ,
end-of-row .tl_set:N = \l_@@_end_of_row_tl ,
@@ -3501,7 +3711,8 @@ version 2005/12/01 or later.
extra-left-margin .dim_set:N = \l_@@_extra_left_margin_dim ,
extra-right-margin .dim_set:N = \l_@@_extra_right_margin_dim ,
extra-margin .meta:n =
- { extra-left-margin = #1 , extra-right-margin = #1 }
+ { extra-left-margin = #1 , extra-right-margin = #1 } ,
+ extra-margin .value_required:n = true
}
% \end{macrocode}
%
@@ -3517,6 +3728,11 @@ version 2005/12/01 or later.
{ \dim_set:Nn \l_@@_columns_width_dim { #1 } } ,
columns-width .value_required:n = true ,
name .code:n =
+% \end{macrocode}
+% We test whether we are in the measuring phase of an environment of
+% \pkg{amsmath} (always loaded by \pkg{nicematrix}) because we want to avoid a
+% fallaicous message of duplicate name in this case.
+% \begin{macrocode}
\legacy_if:nF { measuring@ }
{
\str_set:Nn \l_tmpa_str { #1 }
@@ -3543,24 +3759,28 @@ version 2005/12/01 or later.
\keys_define:nn { NiceMatrix }
{
NiceMatrixOptions .inherit:n =
- {
+ {
NiceMatrix / Global ,
} ,
+ NiceMatrixOptions / xdots .inherit:n = NiceMatrix / xdots ,
NiceMatrix .inherit:n =
{
NiceMatrix / Global ,
- NiceMatrix / Env
+ NiceMatrix / Env ,
} ,
+ NiceMatrix / xdots .inherit:n = NiceMatrix / xdots ,
NiceArray .inherit:n =
{
NiceMatrix / Global ,
NiceMatrix / Env ,
} ,
+ NiceArray / xdots .inherit:n = NiceMatrix / xdots ,
pNiceArray .inherit:n =
{
NiceMatrix / Global ,
NiceMatrix / Env ,
- }
+ } ,
+ pNiceArray / xdots .inherit:n = NiceMatrix / xdots
}
% \end{macrocode}
%
@@ -3629,10 +3849,6 @@ version 2005/12/01 or later.
{ \@@_error:n { Bad~value~for~letter~for~dotted~lines } }
} ,
letter-for-dotted-lines .value_required:n = true ,
-% \end{macrocode}
-%
-% \bigskip
-% \begin{macrocode}
unknown .code:n = \@@_error:n { Unknown~key~for~NiceMatrixOptions }
}
% \end{macrocode}
@@ -3662,6 +3878,10 @@ version 2005/12/01 or later.
last-col .code:n = \tl_if_empty:nTF {#1}
{ \@@_error:n { last-col~empty~for~NiceMatrix } }
{ \int_set:Nn \l_@@_last_col_int { #1 } } ,
+ l .code:n = \tl_set:Nn \l_@@_type_of_col_tl L ,
+ r .code:n = \tl_set:Nn \l_@@_type_of_col_tl R ,
+ L .code:n = \tl_set:Nn \l_@@_type_of_col_tl L ,
+ R .code:n = \tl_set:Nn \l_@@_type_of_col_tl R ,
unknown .code:n = \@@_error:n { Unknown~option~for~NiceMatrix }
}
% \end{macrocode}
@@ -3737,12 +3957,8 @@ version 2005/12/01 or later.
% in the |\halign| that we don't want to take into account.
% \begin{macrocode}
\int_compare:nNnT \c@jCol = 1
- {
- \int_compare:nNnT \l_@@_first_col_int = 1
- \@@_begin_of_row:
- }
- \int_gset:Nn \g_@@_col_total_int
- { \int_max:nn \g_@@_col_total_int \c@jCol }
+ { \int_compare:nNnT \l_@@_first_col_int = 1 \@@_begin_of_row: }
+ \int_gset:Nn \g_@@_col_total_int { \int_max:nn \g_@@_col_total_int \c@jCol }
% \end{macrocode}
% The content of the cell is composed in the box |\l_@@_cell_box| because we want
% to compute some dimensions of the box. The |\hbox_set_end:| corresponding to
@@ -3762,10 +3978,19 @@ version 2005/12/01 or later.
% corners of the matrix.
% \begin{macrocode}
\int_compare:nNnTF \c@iRow = 0
- { \int_compare:nNnT \c@jCol > 0 \l_@@_code_for_first_row_tl }
+ {
+ \int_compare:nNnT \c@jCol > 0
+ {
+ \l_@@_code_for_first_row_tl
+ \xglobal \colorlet { nicematrix-first-row } { . }
+ }
+ }
{
\int_compare:nNnT \c@iRow = \l_@@_last_row_int
- \l_@@_code_for_last_row_tl
+ {
+ \l_@@_code_for_last_row_tl
+ \xglobal \colorlet { nicematrix-last-row } { . }
+ }
}
}
% \end{macrocode}
@@ -3781,8 +4006,18 @@ version 2005/12/01 or later.
\dim_gset_eq:NN \g_@@_dp_ante_last_row_dim \g_@@_dp_last_row_dim
\dim_gset:Nn \g_@@_dp_last_row_dim { \box_dp:N \@arstrutbox }
\dim_gset:Nn \g_@@_ht_last_row_dim { \box_ht:N \@arstrutbox }
- \tikz [ remember~picture , baseline ] \coordinate
- ( nm - \int_use:N \g_@@_env_int - row - \int_use:N \c@iRow - base ) ;
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgfcoordinate
+ { \@@_env: - row - \int_use:N \c@iRow - base }
+ \pgfpointorigin
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfnodealias
+ { \@@_env: - row - \int_use:N \c@iRow - base }
+ { \l_@@_name_str - row - \int_use:N \c@iRow - base }
+ }
+ \endpgfpicture
}
% \end{macrocode}
%
@@ -3834,72 +4069,80 @@ version 2005/12/01 or later.
\@@_update_for_first_and_last_row:
% \end{macrocode}
%
-% Now, we can create the Tikz node of the cell.
+% \medskip
+% If the cell is empty, or may be considered as if, we must not create the
+% \textsc{pgf} node, for two reasons:
+% \begin{itemize}
+% \item it's a waste of time since such a node would be rather pointless;
+% \item we test the existence of these nodes in order to determine whether a
+% cell is empty when we search the extremities of a dotted line.
+% \end{itemize}
+% However, it's very difficult to determine whether a cell is empty. As of now,
+% we use the following technic:
+% \begin{itemize}
+% \item if the width of the box |\l_@@_cell_box| (created with the content of
+% the cell) is equal to zero, we consider the cell as empty (however,
+% this is not perfect since the user may have use a |\rlap|, a |\llap| or a
+% |\mathclap| of \pkg{mathtools}.
+% \item the cells with a command |\Ldots| or |\Cdots|, |\Vdots|, etc.,
+% should also be considered as empty; if |nullify-dots| is in force, there would
+% be nothing to do (in this case the previous commands only write an instruction
+% in a kind of |code-after|); however, if |nullify-dots| is not in force, a
+% phantom of |\ldots|, |\cdots|, |\vdots| is inserted and its width is not equal
+% to zero; that's why these commands raise a boolean |\g_@@_empty_cell_bool| and
+% we begin by testing this boolean.
+% \end{itemize}
% \begin{macrocode}
- \tikz
- [
- remember~picture ,
- inner~sep = \c_zero_dim ,
- minimum~width = \c_zero_dim ,
- baseline
- ]
- \node
- [
- anchor = base ,
- name = nm - \int_use:N \g_@@_env_int -
- \int_use:N \c@iRow -
- \int_use:N \c@jCol ,
- alias =
- \str_if_empty:NF \l_@@_name_str
- {
- \l_@@_name_str -
- \int_use:N \c@iRow -
- \int_use:N \c@jCol
- }
- ]
- { \box_use_drop:N \l_@@_cell_box } ;
+ \bool_if:NTF \g_@@_empty_cell_bool
+ {
+ \box_use_drop:N \l_@@_cell_box
+ \bool_gset_false:N \g_@@_empty_cell_bool
+ }
+ {
+ \dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim
+ \@@_node_for_the_cell:
+ { \box_use_drop:N \l_@@_cell_box }
+ }
+ \bool_gset_false:N \g_@@_empty_cell_bool
}
% \end{macrocode}
-%
-%
-% \begin{macrocode}
-\cs_generate_variant:Nn \dim_set:Nn { N x }
-% \end{macrocode}
%
-% \bigskip
-% In the environment |{NiceArrayWithDelims}|, we will have to redefine the
-% column types |w| and |W|. The redefinition of these two column types are very
-% close and that's why we use a macro |\@@_renewcolumntype:nn|. The first
-% argument is the type of the column (|w| or |W|) and the second argument is a
-% code inserted at a special place and which is the only difference between the
-% two definitions.
+% \medskip
+% The following command creates the \textsc{pgf} name of the node with, of
+% course, |\l_@@_cell_box| as the content.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_renewcolumntype:nn #1 #2
+\cs_new_protected:Npn \@@_node_for_the_cell:
{
- \newcolumntype #1 [ 2 ]
+ \pgfpicture
+ \pgfsetbaseline \c_zero_dim
+ \pgfrememberpicturepositiononpagetrue
+ \pgfset
{
- > {
- \hbox_set:Nw \l_@@_cell_box
- \@@_Cell:
- }
- c
- < {
- \@@_end_Cell:
- \hbox_set_end:
- #2
- \makebox [ ##2 ] [ ##1 ] { \box_use_drop:N \l_@@_cell_box }
- }
+ inner~sep = \c_zero_dim ,
+ minimum~width = \c_zero_dim
+ }
+ \pgfnode
+ { rectangle }
+ { base }
+ { \box_use_drop:N \l_@@_cell_box }
+ { \@@_env: - \int_use:N \c@iRow - \int_use:N \c@jCol }
+ { }
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfnodealias
+ { \l_@@_name_str - \int_use:N \c@iRow - \int_use:N \c@jCol }
+ { \@@_env: - \int_use:N \c@iRow - \int_use:N \c@jCol }
}
+ \endpgfpicture
}
% \end{macrocode}
%
-%
% \interitem
-% The argument of the following command |\@@_instruction_of_type:n| defined
-% below is the type of the instruction (|Cdots|, |Vdots|, |Ddots|, etc.). This
-% command writes in the corresponding |\g_@@_|\textsl{type}|_lines_tl| the
-% instruction which will actually draw the line after the construction of the
-% matrix.
+% The first argument of the following command |\@@_instruction_of_type:nn|
+% defined below is the type of the instruction (|Cdots|, |Vdots|, |Ddots|,
+% etc.). The second argument is the list of options. This command writes in the
+% corresponding |\g_@@_|\textsl{type}|_lines_tl| the instruction which will
+% actually draw the line after the construction of the matrix.
%
% \medskip
% For example, for the following matrix,
@@ -3909,13 +4152,13 @@ version 2005/12/01 or later.
% \begin{pNiceMatrix}
% 1 & 2 & 3 & 4 \\
% 5 & \Cdots & & 6 \\
-% 7 & \Cdots \\
+% 7 & \Cdots[color=red] \\
% \end{pNiceMatrix}
% \end{BVerbatim}
% $\begin{pNiceMatrix}
% 1 & 2 & 3 & 4 \\
% 5 & \Cdots & & 6 \\
-% 7 & \Cdots \\
+% 7 & \Cdots[color=red] \\
% \end{pNiceMatrix}$
%
% \smallskip
@@ -3924,19 +4167,20 @@ version 2005/12/01 or later.
% \smallskip
% \begin{scope}
% \color{gray}
-% \verb|\@@_draw_Cdots:nn {2}{2}|
+% \verb|\@@_draw_Cdots:nnn {2}{2}{}|
%
-% \verb|\@@_draw_Cdots:nn {3}{2}|
+% \verb|\@@_draw_Cdots:nnn {3}{2}{color=red}|
% \end{scope}
%
-%
+%
+% \bigskip
% We begin with a test of the flag |\c_@@_draft_bool| because, if the key
% |draft| is used, the dotted lines are not drawn.
% \begin{macrocode}
\bool_if:NTF \c_@@_draft_bool
- { \cs_set_protected:Npn \@@_instruction_of_type:n #1 { } }
+ { \cs_set_protected:Npn \@@_instruction_of_type:nn #1 #2 { } }
{
- \cs_new_protected:Npn \@@_instruction_of_type:n #1
+ \cs_new_protected:Npn \@@_instruction_of_type:nn #1 #2
{
% \end{macrocode}
% It's important to use a |\tl_gput_right:cx| and not a |\tl_gput_left:cx|
@@ -3946,9 +4190,13 @@ version 2005/12/01 or later.
\tl_gput_right:cx
{ g_@@_ #1 _ lines _ tl }
{
- \use:c { @@ _ draw _ #1 : nn }
+ \use:c { @@ _ draw _ #1 : nnn }
{ \int_use:N \c@iRow }
{ \int_use:N \c@jCol }
+% \end{macrocode}
+% Maybe we should prevent the expansion of the list of key-value.
+% \begin{macrocode}
+ { #2 }
}
}
}
@@ -4001,13 +4249,21 @@ version 2005/12/01 or later.
{
\int_gzero:N \c@jCol
% \end{macrocode}
-% The |\hbox:n| is mandatory.
+% The |\hbox:n| (or |\hbox|) is mandatory.
% \begin{macrocode}
- \hbox:n
+ \hbox
{
- \tikz [ remember~picture ]
- \coordinate
- ( nm - \int_use:N \g_@@_env_int - row - \int_eval:n { \c@iRow + 1 } ) ;
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgfcoordinate { \@@_env: - row - \@@_succ:N \c@iRow }
+ \pgfpointorigin
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfnodealias
+ { \@@_env: - row - \int_use:N \c@iRow - row }
+ { \l_@@_name_str - row - \int_use:N \c@iRow - row }
+ }
+ \endpgfpicture
}
% \end{macrocode}
% We add the potential horizontal lines specified by the option |hlines|.
@@ -4066,15 +4322,6 @@ version 2005/12/01 or later.
% \end{macrocode}
%
%
-% \medskip
-% We switch to a global version of the |\l_@@_medium_nodes_bool| and
-% |\l_@@_large_nodes_bool| because these booleans may be raised in cells of the
-% array (for exemple in commands |\Block|).
-% \begin{macrocode}
- \bool_gset_eq:NN \g_@@_medium_nodes_bool \l_@@_medium_nodes_bool
- \bool_gset_eq:NN \g_@@_large_nodes_bool \l_@@_large_nodes_bool
-% \end{macrocode}
-%
% \bigskip
% The environment |{array}| uses internally the command |\ialign|. We change the
% definition of |\ialign| for several reasons. In particular, |\ialign| sets
@@ -4136,8 +4383,16 @@ version 2005/12/01 or later.
\newcolumntype C { > \@@_Cell: c < \@@_end_Cell: }
\newcolumntype R { > \@@_Cell: r < \@@_end_Cell: }
% \end{macrocode}
-%
-% \begin{macrocode}
+% We keep in memory the old versions or |\ldots|, |\cdots|, etc. only because we
+% use them inside |\phantom| commands in order that the new commands |\Ldots|,
+% |\Cdots|, etc. give the same spacing (except when the option |nullify-dots| is
+% used).
+% \begin{macrocode}
+ \cs_set_eq:NN \@@_ldots \ldots
+ \cs_set_eq:NN \@@_cdots \cdots
+ \cs_set_eq:NN \@@_vdots \vdots
+ \cs_set_eq:NN \@@_ddots \ddots
+ \cs_set_eq:NN \@@_iddots \iddots
\cs_set_eq:NN \firsthline \hline
\cs_set_eq:NN \lasthline \hline
\cs_set_eq:NN \Ldots \@@_Ldots
@@ -4210,8 +4465,40 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set_eq:NN \NC@find@w \relax
\cs_set_eq:NN \NC@find@W \relax
- \@@_renewcolumntype:nn w { }
- \@@_renewcolumntype:nn W { \cs_set_eq:NN \hss \hfil }
+ \newcolumntype w [ 2 ]
+ {
+ > {
+ \hbox_set:Nw \l_@@_cell_box
+ \@@_Cell:
+ }
+ c
+ < {
+ \@@_end_Cell:
+ \hbox_set_end:
+% \end{macrocode}
+% The |\str_lowercase:n| is only for giving the user the ability to write
+% |wC{1cm}| instead of |wc{1cm}| for homogeneity with the letters |L|, |C| and
+% |R| used elsewhere in the preamble instead of |l|, |c| and |r|.
+% \begin{macrocode}
+ \makebox [ ##2 ] [ \str_lowercase:n { ##1 } ]
+ { \box_use_drop:N \l_@@_cell_box }
+ }
+ }
+ \newcolumntype W [ 2 ]
+ {
+ > {
+ \hbox_set:Nw \l_@@_cell_box
+ \@@_Cell:
+ }
+ c
+ < {
+ \@@_end_Cell:
+ \hbox_set_end:
+ \cs_set_eq:NN \hss \hfil
+ \makebox [ ##2 ] [ \str_lowercase:n { ##1 } ]
+ { \box_use_drop:N \l_@@_cell_box }
+ }
+ }
% \end{macrocode}
%
% \bigskip
@@ -4241,7 +4528,7 @@ version 2005/12/01 or later.
\int_compare:nNnF \c@iRow = 0
{
\int_compare:nNnF \c@iRow = \l_@@_last_row_int
- { \skip_horizontal:n { 2 \l_@@_radius_dim } }
+ { \skip_horizontal:N 2\l_@@_radius_dim }
}
% \end{macrocode}
%
@@ -4268,10 +4555,10 @@ version 2005/12/01 or later.
\int_compare:nNnT \c@jCol > \g_@@_last_vdotted_col_int
{
\int_gset_eq:NN \g_@@_last_vdotted_col_int \c@jCol
- \tl_gput_right:Nx \g_@@_code_after_tl
+ \tl_gput_right:Nx \g_@@_internal_code_after_tl
% \end{macrocode}
% The command |\@@_vdottedline:n| is protected, and, therefore, won't be
-% expanded before writing on |\g_@@_code_after_tl|.
+% expanded before writing on |\g_@@_internal_code_after_tl|.
% \begin{macrocode}
{ \@@_vdottedline:n { \int_use:N \c@jCol } }
}
@@ -4303,6 +4590,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentEnvironment { NiceArrayWithDelims } { m m O { } m ! O { } }
{
+ \tl_set:Nn \l_@@_left_delim_tl { #1 }
+ \tl_set:Nn \l_@@_right_delim_tl { #2 }
\bool_gset_false:N \g_@@_row_of_col_done_bool
\str_if_empty:NT \g_@@_name_env_str
{ \str_gset:Nn \g_@@_name_env_str { NiceArrayWithDelims } }
@@ -4312,10 +4601,8 @@ version 2005/12/01 or later.
\bool_set_true:N \l_@@_in_env_bool
% \end{macrocode}
%
-% We deactivate Tikz externalization.
-%
-% Since we use Tikz pictures with the options |overlay| and |remember picture|,
-% there would be errors).
+% We deactivate Tikz externalization because we will use \textsc{pgf} pictures with the
+% options |overlay| and |remember picture| (or equivalent forms).
% \begin{macrocode}
\cs_if_exist:NT \tikz@library@external@loaded
{
@@ -4333,6 +4620,7 @@ version 2005/12/01 or later.
{ \dim_gzero_new:N \g_@@_max_cell_width_dim }
% \end{macrocode}
%
+%
% We do a redefinition of |\@arrayrule| because we want that the vertical rules
% drawn by "|" in the preamble of the array don't extend in the potential
% exterior rows.
@@ -4343,7 +4631,7 @@ version 2005/12/01 or later.
%
% The set of keys is not exactly the same for |{NiceArray}| and for the variants
% of |{NiceArray}| (|{pNiceArray}|, |{bNiceArray}|, etc.) because, for
-% |{NiceArray}|, we have the options |t|, |c| and |b|.
+% |{NiceArray}|, we have the options |t|, |c|, |b| and |baseline|.
% \begin{macrocode}
\bool_if:NTF \l_@@_NiceArray_bool
{ \keys_set:nn { NiceMatrix / NiceArray } }
@@ -4404,27 +4692,18 @@ version 2005/12/01 or later.
\dim_zero_new:N \l_@@_left_delim_dim
\dim_zero_new:N \l_@@_right_delim_dim
\bool_if:NTF \l_@@_NiceArray_bool
- {
+ {
\dim_gset:Nn \l_@@_left_delim_dim { 2 \arraycolsep }
\dim_gset:Nn \l_@@_right_delim_dim { 2 \arraycolsep }
}
{
- \hbox_set:Nn \l_tmpa_box
- {
- \c_math_toggle_token
- \left #1 \vcenter to 3 cm { } \right.
- \c_math_toggle_token
- }
- \dim_set:Nn \l_@@_left_delim_dim
- { \box_wd:N \l_tmpa_box - \nulldelimiterspace }
- \hbox_set:Nn \l_tmpa_box
- {
- \c_math_toggle_token
- \left. \vcenter to 3 cm { } \right #2
- \c_math_toggle_token
- }
- \dim_set:Nn \l_@@_right_delim_dim
- { \box_wd:N \l_tmpa_box - \nulldelimiterspace }
+% \end{macrocode}
+% The command |\bBigg@| is a command of \pkg{amsmath}.
+% \begin{macrocode}
+ \hbox_set:Nn \l_tmpa_box { $ \bBigg@ 5 #1 $ }
+ \dim_set:Nn \l_@@_left_delim_dim { \box_wd:N \l_tmpa_box }
+ \hbox_set:Nn \l_tmpa_box { $\bBigg@ 5 #2 $ }
+ \dim_set:Nn \l_@@_right_delim_dim { \box_wd:N \l_tmpa_box }
}
% \end{macrocode}
%
@@ -4442,22 +4721,22 @@ version 2005/12/01 or later.
\int_compare:nNnTF \l_@@_first_col_int = 0
{ \tl_put_left:NV \l_tmpa_tl \c_@@_preamble_first_col_tl }
{
- \bool_if:nT
+ \bool_lazy_all:nT
{
- \l_@@_NiceArray_bool
- && ! \l_@@_vlines_bool
- && ! \l_@@_exterior_arraycolsep_bool
+ \l_@@_NiceArray_bool
+ { \bool_not_p:n \l_@@_vlines_bool }
+ { \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
}
{ \tl_put_left:Nn \l_tmpa_tl { @ { } } }
}
\int_compare:nNnTF \l_@@_last_col_int > { -1 }
{ \tl_put_right:NV \l_tmpa_tl \c_@@_preamble_last_col_tl }
{
- \bool_if:nT
+ \bool_lazy_all:nT
{
- \l_@@_NiceArray_bool
- && ! \l_@@_vlines_bool
- && ! \l_@@_exterior_arraycolsep_bool
+ \l_@@_NiceArray_bool
+ { \bool_not_p:n \l_@@_vlines_bool }
+ { \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
}
{ \tl_put_right:Nn \l_tmpa_tl { @ { } } }
}
@@ -4475,13 +4754,13 @@ version 2005/12/01 or later.
% |\arraycolsep| is used once (between columns, |\arraycolsep| is used twice).
% That's why we add a |0.5\arrayrulewidth| more.
% \begin{macrocode}
- \bool_if:NT \l_@@_vlines_bool
+ \bool_if:NT \l_@@_vlines_bool
{
\dim_add:Nn \arraycolsep { 0.5 \arrayrulewidth }
- \skip_horizontal:n { 0.5 \arrayrulewidth }
+ \skip_horizontal:N 0.5\arrayrulewidth
}
- \skip_horizontal:n \l_@@_left_margin_dim
- \skip_horizontal:n \l_@@_extra_left_margin_dim
+ \skip_horizontal:N \l_@@_left_margin_dim
+ \skip_horizontal:N \l_@@_extra_left_margin_dim
\c_math_toggle_token
\bool_if:NTF \l_@@_light_syntax_bool
{ \begin { @@-light-syntax } }
@@ -4496,8 +4775,8 @@ version 2005/12/01 or later.
{ \end { @@-light-syntax } }
{ \end { @@-normal-syntax } }
\c_math_toggle_token
- \skip_horizontal:n \l_@@_right_margin_dim
- \skip_horizontal:n \l_@@_extra_right_margin_dim
+ \skip_horizontal:N \l_@@_right_margin_dim
+ \skip_horizontal:N \l_@@_extra_right_margin_dim
% \end{macrocode}
% If the key |\vlines| is used, we have increased |\arraycolsep| by
% |0.5\arrayrulewidth| in order to reserve space for the width of the vertical
@@ -4505,7 +4784,7 @@ version 2005/12/01 or later.
% |\arraycolsep| is used once (between columns, |\arraycolsep| is used twice).
% That's we add a |0.5 \arrayrulewidth| more.
% \begin{macrocode}
- \bool_if:NT \l_@@_vlines_bool { \skip_horizontal:n { 0.5 \arrayrulewidth } }
+ \bool_if:NT \l_@@_vlines_bool { \skip_horizontal:N 0.5\arrayrulewidth }
\hbox_set_end:
% \end{macrocode}
% End of the construction of the array (in the box |\l_@@_the_array_box|).
@@ -4532,7 +4811,7 @@ version 2005/12/01 or later.
% |\g_@@_col_total_int| change: |\c@jCol| will be the number of
% columns without the ``last column''; |\g_@@_col_total_int| will be the
% number of columns with this ``last column''.\footnote{We remind that the
-% potential ``first column'' has the number~$0$.}
+% potential ``first column'' (exterior) has the number~$0$.}
% \begin{macrocode}
\int_gset_eq:NN \c@jCol \g_@@_col_total_int
\bool_if:nT \g_@@_last_col_found_bool { \int_gdecr:N \c@jCol }
@@ -4556,15 +4835,14 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_compare:nNnT \l_@@_first_col_int = 0
{
- \skip_horizontal:n \arraycolsep
- \skip_horizontal:n \g_@@_width_first_col_dim
+ \skip_horizontal:N \arraycolsep
+ \skip_horizontal:N \g_@@_width_first_col_dim
}
% \end{macrocode}
%
-% The construction of the real box is different in |{NiceArray}| and in its
-% variants (|{pNiceArray}|, etc.) because, in |{NiceArray}|, we have to take
-% into account the option of position (|t|, |c| or |b|). We begin with
-% |{NiceArray}|.
+% The construction of the real box is different in |{NiceArray}| and in the
+% other environments because, in |{NiceArray}|, we have to take into account the
+% value of |baseline| and we have no delimiter to put. We begin with |{NiceArray}|.
% \begin{macrocode}
\bool_if:NTF \l_@@_NiceArray_bool
{
@@ -4575,16 +4853,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\str_if_eq:VnTF \l_@@_baseline_str { b }
{
- \begin { tikzpicture }
- \@@_extract_coords:w ( nm - \int_use:N \g_@@_env_int - row - 1 )
+ \pgfpicture
+ \@@_qpoint: { row - 1 }
\dim_gset_eq:NN \g_tmpa_dim \pgf@y
- \@@_extract_coords:w
- (
- nm - \int_use:N \g_@@_env_int -
- row - \int_use:N \c@iRow - base
- )
+ \@@_qpoint: { row - \int_use:N \c@iRow - base }
\dim_gsub:Nn \g_tmpa_dim \pgf@y
- \end { tikzpicture }
+ \endpgfpicture
\int_compare:nNnT \l_@@_first_row_int = 0
{
\dim_gadd:Nn \g_tmpa_dim
@@ -4608,7 +4882,7 @@ version 2005/12/01 or later.
\int_set:Nn \l_tmpa_int \l_@@_baseline_str
\bool_if:nT
{
- \int_compare_p:nNn \l_tmpa_int < 0
+ \int_compare_p:nNn \l_tmpa_int < \l_@@_first_row_int
|| \int_compare_p:nNn \l_tmpa_int > \g_@@_row_total_int
}
{
@@ -4616,19 +4890,14 @@ version 2005/12/01 or later.
\int_set:Nn \l_tmpa_int 1
}
% \end{macrocode}
-% We use a |{tikzpicture}| to extract coordinates (nothing is drawn).
+% We use a |{pgfpicture}| to extract coordinates (nothing is drawn).
% \begin{macrocode}
- \begin { tikzpicture }
- \@@_extract_coords:w
- ( nm - \int_use:N \g_@@_env_int - row - 1 )
+ \pgfpicture
+ \@@_qpoint: { row - 1 }
\dim_gset_eq:NN \g_tmpa_dim \pgf@y
- \@@_extract_coords:w
- (
- nm - \int_use:N \g_@@_env_int -
- row - \int_use:N \l_tmpa_int- base
- )
+ \@@_qpoint: { row - \int_use:N \l_tmpa_int - base }
\dim_gsub:Nn \g_tmpa_dim \pgf@y
- \end { tikzpicture }
+ \endpgfpicture
\int_compare:nNnT \l_@@_first_row_int = 0
{
\dim_gadd:Nn \g_tmpa_dim
@@ -4648,8 +4917,8 @@ version 2005/12/01 or later.
{
\int_compare:nNnTF \l_@@_first_row_int = 0
{
- \dim_set:Nn \l_tmpa_dim
- { \g_@@_dp_row_zero_dim + \g_@@_ht_row_zero_dim }
+ \dim_set_eq:NN \l_tmpa_dim \g_@@_dp_row_zero_dim
+ \dim_add:Nn \l_tmpa_dim \g_@@_ht_row_zero_dim
}
{ \dim_zero:N \l_tmpa_dim }
% \end{macrocode}
@@ -4663,8 +4932,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_compare:nNnTF \l_@@_last_row_int > { -2 }
{
- \dim_set:Nn \l_tmpb_dim
- { \g_@@_ht_last_row_dim + \g_@@_dp_last_row_dim }
+ \dim_set_eq:NN \l_tmpb_dim \g_@@_ht_last_row_dim
+ \dim_add:Nn \l_tmpb_dim \g_@@_dp_last_row_dim
}
{ \dim_zero:N \l_tmpb_dim }
% \end{macrocode}
@@ -4678,20 +4947,20 @@ version 2005/12/01 or later.
{
% \end{macrocode}
% We take into account the ``first row'' (we have previously computed its total
-% height in |\l_tmpa_dim|).
+% height in |\l_tmpa_dim|). The |\hbox:n| (or |\hbox|) is necessary here.
% \begin{macrocode}
- \skip_vertical:n { - \l_tmpa_dim }
- \hbox:n
- {
- \skip_horizontal:n { - \arraycolsep }
+ \skip_vertical:N -\l_tmpa_dim
+ \hbox
+ {
+ \skip_horizontal:N -\arraycolsep
\box_use_drop:N \l_@@_the_array_box
- \skip_horizontal:n { - \arraycolsep }
+ \skip_horizontal:N -\arraycolsep
}
% \end{macrocode}
% We take into account the ``last row'' (we have previously computed its total
% height in |\l_tmpb_dim|).
% \begin{macrocode}
- \skip_vertical:n { - \l_tmpb_dim }
+ \skip_vertical:N -\l_tmpb_dim
}
\right #2
\c_math_toggle_token
@@ -4714,7 +4983,10 @@ version 2005/12/01 or later.
% |\g_@@_width_last_col_dim|: see p.~\pageref{overlap-right}).
% \begin{macrocode}
\bool_if:NT \g_@@_last_col_found_bool
- { \skip_horizontal:n { \g_@@_width_last_col_dim + \arraycolsep } }
+ {
+ \skip_horizontal:N \g_@@_width_last_col_dim
+ \skip_horizontal:N \arraycolsep
+ }
\@@_after_array:
}
% \end{macrocode}
@@ -4781,9 +5053,11 @@ version 2005/12/01 or later.
% Now, we can put the box in the TeX flow with the horizontal adjustments on
% both sides.
% \begin{macrocode}
- \skip_horizontal:n { \l_@@_left_delim_dim - \l_@@_real_left_delim_dim }
+ \skip_horizontal:N \l_@@_left_delim_dim
+ \skip_horizontal:N -\l_@@_real_left_delim_dim
\@@_put_box_in_flow:
- \skip_horizontal:n { \l_@@_right_delim_dim - \l_@@_real_right_delim_dim }
+ \skip_horizontal:N \l_@@_right_delim_dim
+ \skip_horizontal:N -\l_@@_real_right_delim_dim
}
% \end{macrocode}
%
@@ -4812,15 +5086,6 @@ version 2005/12/01 or later.
{ \exp_args:NV \@@_array: \l_tmpa_tl }
}
{
-% \end{macrocode}
-%
-% If all the columns must have the same width (if the user has used the option
-% |columns-width| or the option |auto-columns-width| of the environment
-% |{NiceMatrixBlock}|), we will add a row in the array to fix the width of the
-% columns and construct the ``|col|'' nodes |nm-|\textsl{a}|-col-|\textsl{j}
-% (these nodes will be used by the horizontal open dotted lines and by the
-% commands |\@@_vdottedline:n|). We have written a dedicated function for that job.
-% \begin{macrocode}
\@@_create_col_nodes:
\endarray
}
@@ -4838,12 +5103,7 @@ version 2005/12/01 or later.
% course, this test is more easy than the similar test for the ``normal syntax''
% because we have the whole body of the environment in |#1|.
% \begin{macrocode}
- \tl_if_empty:nT { #1 } { \@@_fatal:n { empty~environment } }
-% \end{macrocode}
-% Here is the call to |\array| (we have a dedicated macro |\@@_array:| because
-% of compatibility with the classes \cls{revtex4-1} and \cls{revtex4-2}).
-% \begin{macrocode}
- \exp_args:NV \@@_array: \l_tmpa_tl
+ \tl_if_empty:nT { #1 } { \@@_fatal:n { empty~environment } }
% \end{macrocode}
% The body of the environment, which is stored in the argument |#1|, is now
% splitted into items (and \emph{not} tokens)
@@ -4852,6 +5112,19 @@ version 2005/12/01 or later.
\tl_set_rescan:Nno \l_@@_end_of_row_tl { } \l_@@_end_of_row_tl
\exp_args:NNV \seq_gset_split:Nnn \g_@@_rows_seq \l_@@_end_of_row_tl { #1 }
% \end{macrocode}
+% If the environment uses the option |last-row| without value (i.e. without
+% saying the number of the rows), we have now the opportunity to know that
+% value. We do it, and so, if the token list |\l_@@_code_for_last_row_tl| is not
+% empty, we will use directly where it should be.
+% \begin{macrocode}
+ \int_compare:nNnT \l_@@_last_row_int = { -1 }
+ { \int_set:Nn \l_@@_last_row_int { \seq_count:N \g_@@_rows_seq } }
+% \end{macrocode}
+% Here is the call to |\array| (we have a dedicated macro |\@@_array:| because
+% of compatibility with the classes \cls{revtex4-1} and \cls{revtex4-2}).
+% \begin{macrocode}
+ \exp_args:NV \@@_array: \l_tmpa_tl
+% \end{macrocode}
% We need a global affectation because, when executing |\l_tmpa_tl|, we will
% exit the first cell of the array.
% \begin{macrocode}
@@ -4922,48 +5195,50 @@ version 2005/12/01 or later.
\int_compare:nNnT \l_@@_first_col_int = 0 { \omit & }
\omit
% \end{macrocode}
-% The following instruction must be put after the instructions |\omit|.
+% The following instruction must be put after the instruction |\omit|.
% \begin{macrocode}
\bool_gset_true:N \g_@@_row_of_col_done_bool
% \end{macrocode}
% First, we put a ``|col|'' node on the left of the first column (of course, we
% have to do that \emph{after} the |\omit|).
% \begin{macrocode}
- \tikz [ remember~picture ]
- \coordinate ( nm - \int_use:N \g_@@_env_int - col - 1 ) ;
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgfcoordinate { \@@_env: - col - 1 } \pgfpointorigin
+ \str_if_empty:NF \l_@@_name_str
+ { \pgfnodealias { \@@_env: - col - 1 } { \l_@@_name_str - col - 1 } }
+ \endpgfpicture
% \end{macrocode}
% We compute in |\g_tmpa_skip| the common width of the columns (it's a skip and
% not a dimension). We use a global variable because we are in a cell of an
% |\halign| and because we have to use this variable in other cells (of the same
% row). The affectation of |\g_tmpa_skip|, like all the affectations, must be
% done after the |\omit| of the cell.
+%
+% \smallskip
+% We give a default value for |\g_tmpa_skip| (|0 pt plus 1 fill|) but it will
+% just after erased by a fixed value in the concerned cases.
% \begin{macrocode}
- \bool_if:nTF
+ \skip_gset:Nn \g_tmpa_skip { 0 pt~plus 1 fill }
+ \bool_if:NF \l_@@_auto_columns_width_bool
+ { \dim_compare:nNnT \l_@@_columns_width_dim > \c_zero_dim }
{
- \l_@@_auto_columns_width_bool
- || \dim_compare_p:nNn \l_@@_columns_width_dim > \c_zero_dim
- }
- {
- \bool_if:nTF
- {
- \l_@@_auto_columns_width_bool
- && ! \l_@@_block_auto_columns_width_bool
- }
- {
- \skip_gset:Nn \g_tmpa_skip
- { \g_@@_max_cell_width_dim + 2 \arraycolsep }
- }
- {
- \skip_gset:Nn \g_tmpa_skip
- { \l_@@_columns_width_dim + 2 \arraycolsep }
- }
+ \bool_lazy_and:nnTF
+ \l_@@_auto_columns_width_bool
+ { \bool_not_p:n \l_@@_block_auto_columns_width_bool }
+ { \skip_gset_eq:NN \g_tmpa_skip \g_@@_max_cell_width_dim }
+ { \skip_gset_eq:NN \g_tmpa_skip \l_@@_columns_width_dim }
+ \skip_gadd:Nn \g_tmpa_skip { 2 \arraycolsep }
}
- { \skip_gset:Nn \g_tmpa_skip { 0 pt~plus 1 fill } }
\skip_horizontal:N \g_tmpa_skip
- \hbox:n
+ \hbox
{
- \tikz [ remember~picture ]
- \coordinate ( nm - \int_use:N \g_@@_env_int - col - 2 ) ;
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgfcoordinate { \@@_env: - col - 2 } \pgfpointorigin
+ \str_if_empty:NF \l_@@_name_str
+ { \pgfnodealias { \@@_env: - col - 2 } { \l_@@_name_str - col - 2 } }
+ \endpgfpicture
}
% \end{macrocode}
% We begin a loop over the columns. The integer |\g_tmpa_int| will be the
@@ -4985,12 +5260,17 @@ version 2005/12/01 or later.
% \end{macrocode}
% We create the ``|col|'' node on the right of the current column.
% \begin{macrocode}
- \tikz [ remember~picture ]
- \coordinate
- (
- nm - \int_use:N \g_@@_env_int -
- col - \int_eval:n { \g_tmpa_int + 1 }
- ) ;
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgfcoordinate { \@@_env: - col - \@@_succ:N \g_tmpa_int }
+ \pgfpointorigin
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfnodealias
+ { \@@_env: - col - \@@_succ:N \g_tmpa_int }
+ { \l_@@_name_str - col - \@@_succ:N \g_tmpa_int }
+ }
+ \endpgfpicture
}
\cr
}
@@ -5017,17 +5297,17 @@ version 2005/12/01 or later.
% We insert |\l_@@_code_for_first_col_tl|... but we don't insert it in the
% potential ``first row'' and in the potential ``last row''.
% \begin{macrocode}
- \bool_if:nT
+ \bool_lazy_and:nnT
+ { \int_compare_p:nNn \c@iRow > 0 }
{
- \int_compare_p:nNn \c@iRow > 0
- &&
- (
- \int_compare_p:nNn \l_@@_last_row_int < 0
- ||
- \int_compare_p:nNn \c@iRow < \l_@@_last_row_int
- )
+ \bool_lazy_or_p:nn
+ { \int_compare_p:nNn \l_@@_last_row_int < 0 }
+ { \int_compare_p:nNn \c@iRow < \l_@@_last_row_int }
+ }
+ {
+ \l_@@_code_for_first_col_tl
+ \xglobal \colorlet { nicematrix-first-col } { . }
}
- { \l_@@_code_for_first_col_tl }
}
% \end{macrocode}
% Be careful: despite this letter |l| the cells of the ``first column'' are
@@ -5044,49 +5324,21 @@ version 2005/12/01 or later.
% after the construction of the array.
% \begin{macrocode}
\dim_gset:Nn \g_@@_width_first_col_dim
- {
- \dim_max:nn
- \g_@@_width_first_col_dim
- { \box_wd:N \l_@@_cell_box }
- }
+ { \dim_max:nn \g_@@_width_first_col_dim { \box_wd:N \l_@@_cell_box } }
% \end{macrocode}
% The content of the cell is inserted in an overlapping position.
% \label{overlap-left}
% \begin{macrocode}
\hbox_overlap_left:n
{
- \tikz
- [
- remember~picture ,
- inner~sep = \c_zero_dim ,
- minimum~width = \c_zero_dim ,
- baseline
- ]
- \node
- [
- anchor = base ,
- name =
- nm -
- \int_use:N \g_@@_env_int -
- \int_use:N \c@iRow -
- 0 ,
- alias =
- \str_if_empty:NF \l_@@_name_str
- {
- \l_@@_name_str -
- \int_use:N \c@iRow -
- 0
- }
- ]
- { \box_use_drop:N \l_@@_cell_box } ;
- \skip_horizontal:n
- {
- \l_@@_left_delim_dim +
- \l_@@_left_margin_dim +
- \l_@@_extra_left_margin_dim
- }
+ \dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim
+ \@@_node_for_the_cell:
+ { \box_use_drop:N \l_@@_cell_box }
+ \skip_horizontal:N \l_@@_left_delim_dim
+ \skip_horizontal:N \l_@@_left_margin_dim
+ \skip_horizontal:N \l_@@_extra_left_margin_dim
}
- \skip_horizontal:n { - 2 \arraycolsep }
+ \skip_horizontal:N -2\arraycolsep
}
}
% \end{macrocode}
@@ -5118,17 +5370,16 @@ version 2005/12/01 or later.
% We insert |\l_@@_code_for_last_col_tl|... but we don't insert it in the
% potential ``first row'' and in the potential ``last row''.
% \begin{macrocode}
- \bool_if:nT
+ \int_compare:nNnT \c@iRow > 0
{
- \int_compare_p:nNn \c@iRow > 0
- &&
- (
- \int_compare_p:nNn \l_@@_last_row_int < 0
- ||
- \int_compare_p:nNn \c@iRow < \l_@@_last_row_int
- )
+ \bool_lazy_or:nnT
+ { \int_compare_p:nNn \l_@@_last_row_int < 0 }
+ { \int_compare_p:nNn \c@iRow < \l_@@_last_row_int }
+ {
+ \l_@@_code_for_last_col_tl
+ \xglobal \colorlet { nicematrix-last-col } { . }
+ }
}
- { \l_@@_code_for_last_col_tl }
}
l
<
@@ -5141,48 +5392,21 @@ version 2005/12/01 or later.
% after the construction of the array.
% \begin{macrocode}
\dim_gset:Nn \g_@@_width_last_col_dim
- {
- \dim_max:nn
- \g_@@_width_last_col_dim
- { \box_wd:N \l_@@_cell_box }
- }
- \skip_horizontal:n { - 2 \arraycolsep }
+ { \dim_max:nn \g_@@_width_last_col_dim { \box_wd:N \l_@@_cell_box } }
+ \skip_horizontal:N -2\arraycolsep
% \end{macrocode}
% The content of the cell is inserted in an overlapping position.
% \label{overlap-right}
% \begin{macrocode}
\hbox_overlap_right:n
{
- \skip_horizontal:n
- {
- \l_@@_right_delim_dim +
- \l_@@_right_margin_dim +
- \l_@@_extra_right_margin_dim
+ \dim_compare:nNnT { \box_wd:N \l_@@_cell_box } > \c_zero_dim
+ {
+ \skip_horizontal:N \l_@@_right_delim_dim
+ \skip_horizontal:N \l_@@_right_margin_dim
+ \skip_horizontal:N \l_@@_extra_right_margin_dim
+ \@@_node_for_the_cell:
}
- \tikz
- [
- remember~picture ,
- inner~sep = \c_zero_dim ,
- minimum~width = \c_zero_dim ,
- baseline
- ]
- \node
- [
- anchor = base ,
- name =
- nm -
- \int_use:N \g_@@_env_int -
- \int_use:N \c@iRow -
- \int_use:N \c@jCol ,
- alias =
- \str_if_empty:NF \l_@@_name_str
- {
- \l_@@_name_str -
- \int_use:N \c@iRow -
- \int_use:N \c@jCol
- }
- ]
- { \box_use_drop:N \l_@@_cell_box } ;
}
}
}
@@ -5212,8 +5436,7 @@ version 2005/12/01 or later.
%
%
% \interitem
-% We create the variants of the environment |{NiceArrayWithDelims}|. These
-% variants exist since the version 3.0 of \pkg{nicematrix}.
+% We create the variants of the environment |{NiceArrayWithDelims}|.
%
% \begin{macrocode}
\NewDocumentEnvironment { pNiceArray } { }
@@ -5279,23 +5502,31 @@ version 2005/12/01 or later.
\NewDocumentEnvironment { #1 NiceMatrix } { ! O { } }
{
\str_gset:Nn \g_@@_name_env_str { #1 NiceMatrix }
+ \tl_set:Nn \l_@@_type_of_col_tl C
\keys_set:nn { NiceMatrix / NiceMatrix } { ##1 }
- \begin { #1 NiceArray }
- {
- *
- {
- \int_compare:nNnTF \l_@@_last_col_int = { -1 }
- \c@MaxMatrixCols
- { \int_eval:n { \l_@@_last_col_int - 1 } }
- }
- C
- }
+ \exp_args:Nnx \@@_begin_of_NiceMatrix:nn { #1 } \l_@@_type_of_col_tl
}
{ \end { #1 NiceArray } }
}
% \end{macrocode}
%
% \begin{macrocode}
+\cs_new_protected:Npn \@@_begin_of_NiceMatrix:nn #1 #2
+ {
+ \begin { #1 NiceArray }
+ {
+ *
+ {
+ \int_compare:nNnTF \l_@@_last_col_int = { -1 }
+ \c@MaxMatrixCols
+ { \int_eval:n { \l_@@_last_col_int - 1 } }
+ }
+ #2
+ }
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
\@@_define_env:n { }
\@@_define_env:n p
\@@_define_env:n b
@@ -5305,130 +5536,36 @@ version 2005/12/01 or later.
% \end{macrocode}
%
%
-% \bigskip
-% \subsection*{How to know whether a cell is ``empty''}
-%
-% The conditionnal |\@@_if_not_empty_cell:nnT| tests whether a cell is empty.
-% The first two arguments must be LaTeX3 counters for the row and the column of
-% the considered cell.
-% \begin{macrocode}
-\prg_set_conditional:Npnn \@@_if_not_empty_cell:nn #1 #2 { T , TF }
- {
-% \end{macrocode}
-% First, we want to test whether the cell is in the virtual sequence of
-% ``non-empty'' cells. There are several important remarks:
-% \begin{itemize}
-% \item we don't use a |expl3| sequence for efficiency;
-% \item the ``non-empty'' cells in this sequence are not, in fact, all the
-% non-empty cells of the array: on the contrary they are only cells declared
-% as non-empty for a special reason (as of now, there are only cells which are
-% on a dotted line which is already drawn or which will be drawn ``just
-% after'');
-% \item the flag |\l_tmpa_bool| will be raised when the cell is actually on
-% this virtual sequence.
-% \end{itemize}
-% \begin{macrocode}
- \bool_set_false:N \l_tmpa_bool
- \cs_if_exist:cTF
- { @@ _ dotted _ \int_use:N #1 - \int_use:N #2 }
- \prg_return_true:
- {
-% \end{macrocode}
-% We know that the cell is not in the virtual sequence of the ``non-empty''
-% cells. Now, we test wether the cell is a ``virtual cell'', that is to say a
-% cell after the |\\| of the line of the array. It's easy to known whether a
-% cell is vitual: the cell is virtual if, and only if, the corresponding Tikz
-% node doesn't exist.
-% \begin{macrocode}
- \cs_if_free:cTF
- {
- pgf@sh@ns@nm -
- \int_use:N \g_@@_env_int -
- \int_use:N #1 -
- \int_use:N #2
- }
- { \prg_return_false: }
- {
-% \end{macrocode}
-% Now, we want to test whether the cell is in the virtual sequence of
-% ``empty'' cells. There are several important remarks:
-% \begin{itemize}
-% \item we don't use a |expl3| sequence for efficiency ;
-% \item the ``empty'' cells in this sequence are not, in fact, all the
-% non-empty cells of the array: on the contrary they are only cells declared
-% as non-empty for a special reason ;
-% \item the flag |\l_tmpa_bool| will be raised when the cell is actually on
-% this virtual sequence.
-% \end{itemize}
-% \begin{macrocode}
- \bool_set_false:N \l_tmpa_bool
- \cs_if_exist:cT
- { @@ _ empty _ \int_use:N #1 - \int_use:N #2 }
- {
- \int_compare:nNnT
- { \use:c { @@ _ empty _ \int_use:N #1 - \int_use:N #2 } }
- =
- \g_@@_env_int
- { \bool_set_true:N \l_tmpa_bool }
- }
- \bool_if:NTF \l_tmpa_bool
- \prg_return_false:
-% \end{macrocode}
-% In the general case, we consider the width of the Tikz node corresponding to
-% the cell. In order to compute this width, we have to extract the coordinate of
-% the west and east anchors of the node. This extraction needs a command
-% environment |{pgfpicture}| but, in fact, nothing is drawn.
-% \begin{macrocode}
- {
- \begin { pgfpicture }
-% \end{macrocode}
-% We store the name of the node corresponding to the cell in |\l_tmpa_tl|.
-% \begin{macrocode}
- \tl_set:Nx \l_tmpa_tl
- {
- nm -
- \int_use:N \g_@@_env_int -
- \int_use:N #1 -
- \int_use:N #2
- }
- \pgfpointanchor \l_tmpa_tl { east }
- \dim_gset:Nn \g_tmpa_dim \pgf@x
- \pgfpointanchor \l_tmpa_tl { west }
- \dim_gset:Nn \g_tmpb_dim \pgf@x
- \end { pgfpicture }
- \dim_compare:nNnTF
- { \dim_abs:n { \g_tmpb_dim - \g_tmpa_dim } } < { 0.5 pt }
- \prg_return_false:
- \prg_return_true:
- }
- }
- }
- }
-% \end{macrocode}
%
%
% \bigskip
% \subsection*{After the construction of the array}
%
-%
-% \medskip
-% We deactivate Tikz externalization.
-%
-% Since we use Tikz pictures with the options |overlay| and |remember picture|,
-% there would be errors.
+% \medskip
% \begin{macrocode}
\cs_new_protected:Npn \@@_after_array:
{
\group_begin:
- \cs_if_exist:NT \tikz@library@external@loaded
- { \tikzset { external / export = false } }
% \end{macrocode}
%
-% In the user has used the option |last-row| without value, we write in the
-% |aux| file the number of that last row for the next run.
+% If a last column is announced in the options, but without the value (because
+% we are in an environment with preamble, it's time to fix the real value of
+% |\l_@@_last_col_int|).
+% \begin{macrocode}
+ \int_compare:nNnT \l_@@_last_col_int = 0
+ {
+ \bool_if:NT \g_@@_last_col_found_bool
+ { \dim_set_eq:NN \l_@@_last_col_int \g_@@_col_total_int }
+ }
+% \end{macrocode}
+%
+% It's also time to give to |\l_@@_last_row_int| its real value. But, if the
+% user had used the option |last-row| without value, we write in the |aux| file
+% the number of that last row for the next run.
% \begin{macrocode}
\bool_if:NT \l_@@_last_row_without_value_bool
{
+ \dim_set_eq:NN \l_@@_last_row_int \g_@@_row_total_int
\iow_now:Nn \@mainaux \ExplSyntaxOn
\iow_now:Nx \@mainaux
{
@@ -5461,38 +5598,32 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:NT \l_@@_parallelize_diags_bool
{
- \int_zero_new:N \l_@@_ddots_int
- \int_zero_new:N \l_@@_iddots_int
+ \int_gzero_new:N \g_@@_ddots_int
+ \int_gzero_new:N \g_@@_iddots_int
% \end{macrocode}
%
-% The dimensions |\l_@@_delta_x_one_dim| and |\l_@@_delta_y_one_dim| will
+% The dimensions |\g_@@_delta_x_one_dim| and |\g_@@_delta_y_one_dim| will
% contain the $\Delta_x$ and $\Delta_y$ of the first |\Ddots| diagonal. We have
% to store these values in order to draw the others |\Ddots| diagonals parallel
-% to the first one. Similarly |\l_@@_delta_x_two_dim| and
-% |\l_@@_delta_y_two_dim| are the $\Delta_x$ and $\Delta_y$ of the first
+% to the first one. Similarly |\g_@@_delta_x_two_dim| and
+% |\g_@@_delta_y_two_dim| are the $\Delta_x$ and $\Delta_y$ of the first
% |\Iddots| diagonal.
% \begin{macrocode}
- \dim_zero_new:N \l_@@_delta_x_one_dim
- \dim_zero_new:N \l_@@_delta_y_one_dim
- \dim_zero_new:N \l_@@_delta_x_two_dim
- \dim_zero_new:N \l_@@_delta_y_two_dim
+ \dim_gzero_new:N \g_@@_delta_x_one_dim
+ \dim_gzero_new:N \g_@@_delta_y_one_dim
+ \dim_gzero_new:N \g_@@_delta_x_two_dim
+ \dim_gzero_new:N \g_@@_delta_y_two_dim
}
% \end{macrocode}
%
-% The booleans |\g_@@_medium_nodes_bool| and |\g_@@_large_nodes_bool| may be
-% raised directly in cells of the array (for example in commands |\Block|) but
-% also because the user has used the options |create-medium-nodes| and
-% |create-large-nodes| (these options raise |\l_@@_medium_nodes_bool| and
-% |\l_@@_large_nodes_bool| but theses booleans are converted into the global
-% versions before the creation of the array).
% \begin{macrocode}
- \bool_if:nTF \g_@@_medium_nodes_bool
+ \bool_if:nTF \l_@@_medium_nodes_bool
{
- \bool_if:NTF \g_@@_large_nodes_bool
+ \bool_if:NTF \l_@@_large_nodes_bool
\@@_create_medium_and_large_nodes:
\@@_create_medium_nodes:
}
- { \bool_if:NT \g_@@_large_nodes_bool \@@_create_large_nodes: }
+ { \bool_if:NT \l_@@_large_nodes_bool \@@_create_large_nodes: }
\int_zero_new:N \l_@@_initial_i_int
\int_zero_new:N \l_@@_initial_j_int
\int_zero_new:N \l_@@_final_i_int
@@ -5502,43 +5633,50 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% If the option |small| is used, the values |\l_@@_radius_dim| and
-% |\l_@@_inter_dots_dim| (used to draw the dotted lines) are changed.
+% |\l_@@_inter_dots_dim| (used to draw the dotted lines created by
+% |\hdottedline| and |\vdotteline| and also for all the other dotted lines when
+% |line-style| is equal to |standard|, which is the initial value) are changed.
% \begin{macrocode}
\bool_if:NT \l_@@_small_bool
{
\dim_set:Nn \l_@@_radius_dim { 0.37 pt }
\dim_set:Nn \l_@@_inter_dots_dim { 0.25 em }
+% \end{macrocode}
+% The dimension |\l_@@_xdots_shorten_dim| corresponds to the option
+% |xdots/shorten| available to the user. That's why we give a new value
+% according to the current value, and not a absolute value.
+% \begin{macrocode}
+ \dim_set:Nn \l_@@_xdots_shorten_dim { 0.6 \l_@@_xdots_shorten_dim }
}
% \end{macrocode}
%
+%
% \bigskip
-% Now, we really draw the lines. The code to draw the lines has been constructed
-% in the token lists |\g_@@_Vdots_lines_tl|, etc.
+% Now, we really draw the lines.
% \begin{macrocode}
- \g_@@_Hdotsfor_lines_tl
- \g_@@_Vdots_lines_tl
- \g_@@_Ddots_lines_tl
- \g_@@_Iddots_lines_tl
- \g_@@_Cdots_lines_tl
- \g_@@_Ldots_lines_tl
+ \@@_draw_dotted_lines:
% \end{macrocode}
-%
%
-%
-% \bigskip
-% Now, the |code-after|.
+% We draw the vertical rules of the option |vlines| before the
+% |internal-code-after| because the option |white| of a |\Block| may have to
+% erase these vertical rules.
% \begin{macrocode}
- \tikzset
- {
- every~picture / .style =
+ \bool_if:NT \l_@@_vlines_bool \@@_draw_vlines:
+ \g_@@_internal_code_after_tl
+ \tl_gclear:N \g_@@_internal_code_after_tl
+ \bool_if:NT \c_@@_tikz_loaded_bool
+ {
+ \tikzset
{
- overlay ,
- remember~picture ,
- name~prefix = nm - \int_use:N \g_@@_env_int -
- }
+ every~picture / .style =
+ {
+ overlay ,
+ remember~picture ,
+ name~prefix = \@@_env: -
+ }
+ }
}
- \bool_if:NT \l_@@_vlines_bool \@@_draw_vlines:
- \cs_set_eq:NN \line \@@_line:nn
+ \cs_set_eq:NN \line \@@_line
\g_@@_code_after_tl
\tl_gclear:N \g_@@_code_after_tl
\group_end:
@@ -5548,56 +5686,38 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
+% We recall that, when externalization is used, |\tikzpicture| and
+% |\endtikzpicture| (or |\pgfpicture| and |\endpgfpicture|) must be directly
+% ``visible''. That's why we have to define the adequate version of
+% |\@@_draw_dotted_lines:| whether Tikz is loaded or not (in that case, only
+% \textsc{pgf} is loaded).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_vlines:
+\AtBeginDocument
{
- \group_begin:
-% \end{macrocode}
-% The command |\CT@arc@| is a command of color from \pkg{colortbl}.
-% \begin{macrocode}
- \bool_if:NT \c_@@_colortbl_loaded_bool \CT@arc@
- \begin { tikzpicture } [ line~width = \arrayrulewidth ]
-% \end{macrocode}
-% First, we compute in |\l_tmpa_dim| the height of the rules we have to draw.
-% \begin{macrocode}
- \@@_extract_coords:w ( row - 1 )
- \dim_set_eq:NN \l_tmpa_dim \pgf@y
- \@@_extract_coords:w ( row - \int_eval:n { \c@iRow + 1 } )
- \dim_set:Nn \l_tmpa_dim { \l_tmpa_dim - \pgf@y }
-% \end{macrocode}
-% We translate vertically to take into account the potential ``last row''.
-% \begin{macrocode}
- \dim_zero:N \l_tmpb_dim
- \int_compare:nNnT \l_@@_last_row_int > { -1 }
+ \cs_new_protected:Npx \@@_draw_dotted_lines:
{
- \dim_set:Nn \l_tmpb_dim
- { \g_@@_dp_last_row_dim + \g_@@_ht_last_row_dim }
-% \end{macrocode}
-% We adjust the value of |\l_tmpa_dim| by the width of the horizontal rule just
-% before the ``last row''.
-% \begin{macrocode}
- \@@_extract_coords:w ( row - \int_eval:n { \c@iRow + 1 } )
- \dim_add:Nn \l_tmpa_dim \pgf@y
- \@@_extract_coords:w ( row - \int_eval:n { \g_@@_row_total_int + 1 } )
- \dim_sub:Nn \l_tmpa_dim \pgf@y
- \dim_sub:Nn \l_tmpa_dim \l_tmpb_dim
- }
+ \c_@@_pgfortikzpicture_tl
+ \@@_draw_dotted_lines_i:
+ \c_@@_endpgfortikzpicture_tl
+ }
+ }
% \end{macrocode}
%
-% Now, we can draw the lines with a loop.
+% The following command \emph{must} be protected because it will appear in the
+% construction of the command |\@@_draw_dotted_lines:|.
% \begin{macrocode}
- \int_step_inline:nnn
- { \bool_if:NTF \l_@@_NiceArray_bool 1 2 }
- { \bool_if:NTF \l_@@_NiceArray_bool { \c@jCol + 1 } \c@jCol }
- {
- \draw ( col - ##1 ) ++ ( 0 , \dim_use:N \l_tmpb_dim )
- -- ++ ( 0 , \dim_use:N \l_tmpa_dim ) ;
- }
- \end { tikzpicture }
- \group_end:
+\cs_new_protected:Npn \@@_draw_dotted_lines_i:
+ {
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
+ \g_@@_Hdotsfor_lines_tl
+ \g_@@_Vdots_lines_tl
+ \g_@@_Ddots_lines_tl
+ \g_@@_Iddots_lines_tl
+ \g_@@_Cdots_lines_tl
+ \g_@@_Ldots_lines_tl
}
% \end{macrocode}
-%
%
% \bigskip
% \begin{macrocode}
@@ -5617,18 +5737,6 @@ version 2005/12/01 or later.
% a & \Cdots \\
% a & a+b & a+b+c
% \end{pNiceMatrix}\]
-% For a closed extremity, we use the normal node and for a open one, we use the
-% ``medium node'' or the |col|-node.
-% \[ \begin{pNiceMatrix}[create-medium-nodes,
-% code-after = {\begin{tikzpicture}
-% \node [highlight = (2-1)] {} ;
-% \node [highlight = (2-3-medium) ] {};
-% \end{tikzpicture}
-% }]
-% a+b+c & a+b & a\\
-% a & \Cdots \\
-% a & a+b & a+b+c
-% \end{pNiceMatrix}\]
%
%
% \bigskip
@@ -5706,12 +5814,11 @@ version 2005/12/01 or later.
\bool_if:NTF \l_@@_final_open_bool
% \end{macrocode}
% If we are outside the matrix, we have found the extremity of the dotted line
-% and it's a \emph{open} extremity.
+% and it's an \emph{open} extremity.
% \begin{macrocode}
{
% \end{macrocode}
-% We do a step backwards because we will draw the dotted line upon the last cell
-% in the matrix (we will use the ``medium node'' of this cell).
+% We do a step backwards.
% \begin{macrocode}
\int_sub:Nn \l_@@_final_i_int { #3 }
\int_sub:Nn \l_@@_final_j_int { #4 }
@@ -5723,48 +5830,49 @@ version 2005/12/01 or later.
% |\l_@@_final_i_int| and |\l_@@_final_j_int|.
% \begin{macrocode}
{
- \@@_if_not_empty_cell:nnTF \l_@@_final_i_int \l_@@_final_j_int
- { \bool_set_true:N \l_@@_stop_loop_bool }
+ \cs_if_exist:cTF
+ {
+ @@ _ dotted _
+ \int_use:N \l_@@_final_i_int -
+ \int_use:N \l_@@_final_j_int
+ }
+ {
+ \int_sub:Nn \l_@@_final_i_int { #3 }
+ \int_sub:Nn \l_@@_final_j_int { #4 }
+ \bool_set_true:N \l_@@_final_open_bool
+ \bool_set_true:N \l_@@_stop_loop_bool
+ }
+ {
+ \cs_if_exist:cTF
+ {
+ pgf @ sh @ ns @ \@@_env:
+ - \int_use:N \l_@@_final_i_int
+ - \int_use:N \l_@@_final_j_int
+ }
+ { \bool_set_true:N \l_@@_stop_loop_bool }
% \end{macrocode}
% If the case is empty, we declare that the cell as non-empty. Indeed, we will
% draw a dotted line and the cell will be on that dotted line. All the cells of
% a dotted line have to be mark as ``dotted'' because we don't want
-% intersections between dotted lines.
+% intersections between dotted lines. We recall that the research of the
+% extremities of the lines are all done in the same TeX group (the group of the
+% environnement), even though, when the extremities are found, each line is
+% drawn in a TeX group that we will open for the options of the line.
% \begin{macrocode}
- {
- \cs_set:cpn
{
- @@ _ dotted _
- \int_use:N \l_@@_final_i_int -
- \int_use:N \l_@@_final_j_int
- }
- { }
+ \cs_set:cpn
+ {
+ @@ _ dotted _
+ \int_use:N \l_@@_final_i_int -
+ \int_use:N \l_@@_final_j_int
+ }
+ { }
+ }
}
}
}
% \end{macrocode}
-% We test wether the initial extremity of the dotted line is an implicit cell
-% already dotted (by another dotted line). In this case, we can't draw the line
-% because we have no Tikz node at the extremity of the arrow.
%
-% \begin{macrocode}
- \cs_if_free:cT
- {
- pgf@sh@ns@nm -
- \int_use:N \g_@@_env_int -
- \int_use:N \l_@@_final_i_int -
- \int_use:N \l_@@_final_j_int
- }
- {
- \bool_if:NF \l_@@_final_open_bool
- {
- \msg_error:nnx { nicematrix } { Impossible~line }
- { \int_use:N \l_@@_final_i_int }
- \bool_set_true:N \l_@@_impossible_line_bool
- }
- }
-% \end{macrocode}
-%
% \interitem
% For |\l_@@_initial_i_int| and |\l_@@_initial_j_int| the programmation is
% similar to the previous one.
@@ -5801,142 +5909,106 @@ version 2005/12/01 or later.
\bool_set_true:N \l_@@_stop_loop_bool
}
{
- \@@_if_not_empty_cell:nnTF
- \l_@@_initial_i_int \l_@@_initial_j_int
- { \bool_set_true:N \l_@@_stop_loop_bool }
+ \cs_if_exist:cTF
+ {
+ @@ _ dotted _
+ \int_use:N \l_@@_initial_i_int -
+ \int_use:N \l_@@_initial_j_int
+ }
+ {
+ \int_add:Nn \l_@@_initial_i_int { #3 }
+ \int_add:Nn \l_@@_initial_j_int { #4 }
+ \bool_set_true:N \l_@@_initial_open_bool
+ \bool_set_true:N \l_@@_stop_loop_bool
+ }
{
- \cs_set:cpn
+ \cs_if_exist:cTF
{
- @@ _ dotted _
- \int_use:N \l_@@_initial_i_int -
- \int_use:N \l_@@_initial_j_int
+ pgf @ sh @ ns @ \@@_env:
+ - \int_use:N \l_@@_initial_i_int
+ - \int_use:N \l_@@_initial_j_int
+ }
+ { \bool_set_true:N \l_@@_stop_loop_bool }
+ {
+ \cs_set:cpn
+ {
+ @@ _ dotted _
+ \int_use:N \l_@@_initial_i_int -
+ \int_use:N \l_@@_initial_j_int
+ }
+ { }
}
- { }
- }
- }
- }
-% \end{macrocode}
-% We test whether the initial extremity of the dotted line is an implicit cell
-% already dotted (by another dotted line). In this case, we can't draw the line
-% because we have no Tikz node at the extremity of the arrow.
-% \begin{macrocode}
- \cs_if_free:cT
- {
- pgf@sh@ns@nm -
- \int_use:N \g_@@_env_int -
- \int_use:N \l_@@_initial_i_int -
- \int_use:N \l_@@_initial_j_int
- }
- {
- \bool_if:NF \l_@@_initial_open_bool
- {
- \msg_error:nnx { nicematrix } { Impossible~line }
- { \int_use:N \l_@@_initial_i_int }
- \bool_set_true:N \l_@@_impossible_line_bool
+ }
}
}
+ }
% \end{macrocode}
-% If we have at least one open extremity, we create the ``medium nodes'' in the
-% matrix but we should change that because, for an open extremity on the left or
-% the right side of the array, we actually use the |col|-nodes.
-% We remind that, when used once, the command |\@@_create_medium_nodes:| becomes
-% no-op in the current TeX group.
-% \begin{macrocode}
- \bool_if:NT \l_@@_initial_open_bool \@@_create_medium_nodes:
- \bool_if:NT \l_@@_final_open_bool \@@_create_medium_nodes:
- }
-% \end{macrocode}
-%
-%
-%
-% \interitem
-% The command |\@@_retrieve_coords:nn| retrieves the Tikz coordinates of the two
-% extremities of the dotted line we will have to draw \footnote{In fact, with
-% diagonal lines, or vertical lines in columns of type |L| or |R|, an adjustment
-% of one of the coordinates may be done.}. This command has four implicit
-% arguments which are |\l_@@_initial_i_int|, |\l_@@_initial_j_int|,
-% |\l_@@_final_i_int| and |\l_@@_final_j_int|.
-%
-% The two arguments of the command |\@@_retrieve_coords:nn| are the suffix and
-% the anchor that must be used for the two nodes.
-%
-% The coordinates are stored in four variables:
-% \begin{itemize}
-% \item |\g_@@_x_initial_dim|
-% \item |\g_@@_y_initial_dim|
-% \item |\g_@@_x_final_dim|
-% \item |\g_@@_y_final_dim|.
-% \end{itemize}
%
-% These variables are global for technical reasons: we have to do an affectation
-% in an environment |{tikzpicture}|.
+% \medskip
% \begin{macrocode}
-\cs_new_protected:Npn \@@_retrieve_coords:nn #1 #2
+\cs_new:Nn \@@_initial_cell:
+ { \@@_env: - \int_use:N \l_@@_initial_i_int - \int_use:N \l_@@_initial_j_int }
+\cs_new:Nn \@@_final_cell:
+ { \@@_env: - \int_use:N \l_@@_final_i_int - \int_use:N \l_@@_final_j_int }
+\cs_new_protected:Npn \@@_set_initial_coords:
{
- \dim_gzero_new:N \g_@@_x_initial_dim
- \dim_gzero_new:N \g_@@_y_initial_dim
- \dim_gzero_new:N \g_@@_x_final_dim
- \dim_gzero_new:N \g_@@_y_final_dim
- \begin { tikzpicture } [ remember~picture ]
- \@@_extract_coords:w
- ( nm - \int_use:N \g_@@_env_int -
- \int_use:N \l_@@_initial_i_int -
- \int_use:N \l_@@_initial_j_int #1 )
- \dim_gset:Nn \g_@@_x_initial_dim \pgf@x
- \dim_gset:Nn \g_@@_y_initial_dim \pgf@y
- \@@_extract_coords:w
- ( nm - \int_use:N \g_@@_env_int -
- \int_use:N \l_@@_final_i_int -
- \int_use:N \l_@@_final_j_int #2 )
- \dim_gset:Nn \g_@@_x_final_dim \pgf@x
- \dim_gset:Nn \g_@@_y_final_dim \pgf@y
- \end { tikzpicture }
- }
-\cs_generate_variant:Nn \@@_retrieve_coords:nn { x x }
-% \end{macrocode}
-%
-% \interitem
-% For the horizontal lines with open extremities, we take into account the
-% ``|col|'' nodes. The following command will recompute the $x$-value of the
-% extremities in this case (erasing the value computed in
-% |\@@_retrieve_coords:nn|).
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_adjust_with_col_nodes:
+ \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
+ }
+\cs_new_protected:Npn \@@_set_final_coords:
{
- \bool_if:NT \l_@@_initial_open_bool
- {
- \begin { tikzpicture } [ remember~picture ]
- \@@_extract_coords:w ( nm - \int_use:N \g_@@_env_int - col - 1 )
- \dim_gset:Nn \g_@@_x_initial_dim \pgf@x
- \end { tikzpicture }
- }
- \bool_if:NT \l_@@_final_open_bool
- {
- \begin { tikzpicture } [ remember~picture ]
- \@@_extract_coords:w
- ( nm - \int_use:N \g_@@_env_int - col - \int_eval:n { \c@jCol + 1 } )
- \dim_gset:Nn \g_@@_x_final_dim \pgf@x
- \end { tikzpicture }
- }
+ \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
+ \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
+ }
+\cs_new_protected:Npn \@@_set_initial_coords_from_anchor:n #1
+ {
+ \pgfpointanchor \@@_initial_cell: { #1 }
+ \@@_set_initial_coords:
+ }
+\cs_new_protected:Npn \@@_set_final_coords_from_anchor:n #1
+ {
+ \pgfpointanchor \@@_final_cell: { #1 }
+ \@@_set_final_coords:
}
% \end{macrocode}
%
% \interitem
+% The first and the second arguments are the coordinates of the cell where the
+% command has been issued. The third argument is the list of the options.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_Ldots:nn #1 #2
+\cs_new_protected:Npn \@@_draw_Ldots:nnn #1 #2 #3
{
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
- \bool_set_false:N \l_@@_impossible_line_bool
\@@_find_extremities_of_line:nnnn { #1 } { #2 } 0 1
- \bool_if:NF \l_@@_impossible_line_bool \@@_actually_draw_Ldots:
+% \end{macrocode}
+% The previous command may have changed the current environment by marking some
+% cells as ``dotted'', but, fortunately, it is outside the group for the options
+% of the line.
+% \begin{macrocode}
+ \group_begin:
+ \int_compare:nNnTF { #1 } = 0
+ { \color { nicematrix-first-row } }
+ {
+% \end{macrocode}
+% We remind that, when there is a ``last row'' |\l_@@_last_row_int| will always
+% be (after the construction of the array) the number of that ``last row'' even
+% if the option |last-row| has been used without value.
+% \begin{macrocode}
+ \int_compare:nNnT { #1 } = \l_@@_last_row_int
+ { \color { nicematrix-last-row } }
+ }
+ \keys_set:nn { NiceMatrix / xdots } { #3 }
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \@@_actually_draw_Ldots:
+ \group_end:
}
}
% \end{macrocode}
%
+%
% \medskip
-% The command |\@@_actually_draw_Ldots:| draws the |Ldots| line using the
-% following variables:
+% The command |\@@_actually_draw_Ldots:| has the following implicit arguments:
% \begin{itemize}
% \item |\l_@@_initial_i_int|
% \item |\l_@@_initial_j_int|
@@ -5946,128 +6018,244 @@ version 2005/12/01 or later.
% \item |\l_@@_final_open_bool|.
% \end{itemize}
%
-% We have a dedicated command because it is used also by |\Hdotsfor|.
+% The following function is also used by |\Hdotsfor|.
% \begin{macrocode}
\cs_new_protected:Npn \@@_actually_draw_Ldots:
{
- \@@_retrieve_coords:xx
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { - medium.base~west }
- { .base~east }
+ \bool_if:NTF \l_@@_initial_open_bool
+ {
+ \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int }
+ \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
+ \dim_add:Nn \l_@@_x_initial_dim \arraycolsep
+ \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int - base }
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
}
+ { \@@_set_initial_coords_from_anchor:n { base~east } }
+ \bool_if:NTF \l_@@_final_open_bool
{
- \bool_if:NTF \l_@@_final_open_bool
- { - medium.base~east }
- { .base~west }
+ \@@_qpoint: { col - \@@_succ:N \l_@@_final_j_int }
+ \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
+ \dim_sub:Nn \l_@@_x_final_dim \arraycolsep
+ \@@_qpoint: { row - \int_use:N \l_@@_final_i_int - base }
+ \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
}
- \@@_adjust_with_col_nodes:
- \bool_if:NT \l_@@_initial_open_bool
- { \dim_gset_eq:NN \g_@@_y_initial_dim \g_@@_y_final_dim }
- \bool_if:NT \l_@@_final_open_bool
- { \dim_gset_eq:NN \g_@@_y_final_dim \g_@@_y_initial_dim }
+ { \@@_set_final_coords_from_anchor:n { base~west } }
% \end{macrocode}
% We raise the line of a quantity equal to the radius of the dots because we
% want the dots really ``on'' the line of texte.
% \begin{macrocode}
- \dim_gadd:Nn \g_@@_y_initial_dim { 0.53 pt }
- \dim_gadd:Nn \g_@@_y_final_dim { 0.53 pt }
- \@@_draw_tikz_line:
+ \dim_add:Nn \l_@@_y_initial_dim \l_@@_radius_dim
+ \dim_add:Nn \l_@@_y_final_dim \l_@@_radius_dim
+ \@@_draw_line:
+% \end{macrocode}
+% The values of |\l_@@_x_initial_dim|, |\l_@@_y_initial_dim|, |\l_@@_x_final_dim|,
+% |\l_@@_y_final_dim|,
+%
+% |\l_@@_initial_open_bool| and |\l_@@_final_open_bool| are still available
+% after the |\@@_draw_line:|.
+% \begin{macrocode}
}
% \end{macrocode}
%
-% \bigskip
+% \interitem
+% The first and the second arguments are the coordinates of the cell where the
+% command has been issued. The third argument is the list of the options.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_Cdots:nn #1 #2
+\cs_new_protected:Npn \@@_draw_Cdots:nnn #1 #2 #3
{
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
- \bool_set_false:N \l_@@_impossible_line_bool
\@@_find_extremities_of_line:nnnn { #1 } { #2 } 0 1
- \bool_if:NF \l_@@_impossible_line_bool
- {
- \@@_retrieve_coords:xx
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { - medium.mid~west }
- { .mid~east }
- }
- {
- \bool_if:NTF \l_@@_final_open_bool
- { - medium.mid~east }
- { .mid~west }
- }
- \@@_adjust_with_col_nodes:
- \bool_if:NT \l_@@_initial_open_bool
- { \dim_gset_eq:NN \g_@@_y_initial_dim \g_@@_y_final_dim }
- \bool_if:NT \l_@@_final_open_bool
- { \dim_gset_eq:NN \g_@@_y_final_dim \g_@@_y_initial_dim }
- \@@_draw_tikz_line:
- }
+% \end{macrocode}
+% The previous command may have changed the current environment by marking some
+% cells as ``dotted'', but, fortunately, it is outside the group for the options
+% of the line.
+% \begin{macrocode}
+ \group_begin:
+ \int_compare:nNnTF { #1 } = 0
+ { \color { nicematrix-first-row } }
+ {
+% \end{macrocode}
+% We remind that, when there is a ``last row'' |\l_@@_last_row_int| will always
+% be (after the construction of the array) the number of that ``last row'' even
+% if the option |last-row| has been used without value.
+% \begin{macrocode}
+ \int_compare:nNnT { #1 } = \l_@@_last_row_int
+ { \color { nicematrix-last-row } }
+ }
+ \keys_set:nn { NiceMatrix / xdots } { #3 }
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \@@_actually_draw_Cdots:
+ \group_end:
}
}
% \end{macrocode}
%
-% \bigskip
-% For the vertical dots, we have to distinguish different instances because we
-% want really vertical lines. Be careful: it's not possible to insert the
-% command |\@@_retrieve_coords:nn| in the arguments |T| and |F| of the
-% \pkg{expl3} commands (why?).
+% \medskip
+% The command |\@@_actually_draw_Cdots:| has the following implicit arguments:
+% \begin{itemize}
+% \item |\l_@@_initial_i_int|
+% \item |\l_@@_initial_j_int|
+% \item |\l_@@_initial_open_bool|
+% \item |\l_@@_final_i_int|
+% \item |\l_@@_final_j_int|
+% \item |\l_@@_final_open_bool|.
+% \end{itemize}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_actually_draw_Cdots:
+ {
+ \bool_if:NTF \l_@@_initial_open_bool
+ {
+ \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int }
+ \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
+ \dim_add:Nn \l_@@_x_initial_dim \arraycolsep
+ }
+ { \@@_set_initial_coords_from_anchor:n { mid~east } }
+ \bool_if:NTF \l_@@_final_open_bool
+ {
+ \@@_qpoint: { col - \@@_succ:N \l_@@_final_j_int }
+ \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
+ \dim_sub:Nn \l_@@_x_final_dim \arraycolsep
+ }
+ { \@@_set_final_coords_from_anchor:n { mid~west } }
+ \bool_lazy_and:nnTF
+ \l_@@_initial_open_bool
+ \l_@@_final_open_bool
+ {
+ \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int }
+ \dim_set_eq:NN \l_tmpa_dim \pgf@y
+ \@@_qpoint: { row - \@@_succ:N \l_@@_initial_i_int }
+ \dim_set:Nn \l_@@_y_initial_dim { ( \l_tmpa_dim + \pgf@y ) / 2 }
+ \dim_set_eq:NN \l_@@_y_final_dim \l_@@_y_initial_dim
+ }
+ {
+ \bool_if:NT \l_@@_initial_open_bool
+ { \dim_set_eq:NN \l_@@_y_initial_dim \l_@@_y_final_dim }
+ \bool_if:NT \l_@@_final_open_bool
+ { \dim_set_eq:NN \l_@@_y_final_dim \l_@@_y_initial_dim }
+ }
+ \@@_draw_line:
+% \end{macrocode}
+% The values of |\l_@@_x_initial_dim|, |\l_@@_y_initial_dim|, |\l_@@_x_final_dim|,
+% |\l_@@_y_final_dim|,
+%
+% |\l_@@_initial_open_bool| and |\l_@@_final_open_bool| are still available
+% after the |\@@_draw_line:|.
+% \begin{macrocode}
+ }
+% \end{macrocode}
+%
+%
+% The first and the second arguments are the coordinates of the cell where the
+% command has been issued. The third argument is the list of the options.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_Vdots:nn #1 #2
+\cs_new_protected:Npn \@@_draw_Vdots:nnn #1 #2 #3
{
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
- \bool_set_false:N \l_@@_impossible_line_bool
\@@_find_extremities_of_line:nnnn { #1 } { #2 } 1 0
- \bool_if:NF \l_@@_impossible_line_bool
- {
- \@@_retrieve_coords:xx
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { - medium.north~west }
- { .south~west }
- }
- {
- \bool_if:NTF \l_@@_final_open_bool
- { - medium.south~west }
- { .north~west }
- }
+% \end{macrocode}
+% The previous command may have changed the current environment by marking some
+% cells as ``dotted'', but, fortunately, it is outside the group for the options
+% of the line.
+% \begin{macrocode}
+ \group_begin:
+ \int_compare:nNnTF { #2 } = 0
+ { \color { nicematrix-first-col } }
+ {
+ \int_compare:nNnT { #2 } = \l_@@_last_col_int
+ { \color { nicematrix-last-col } }
+ }
+ \keys_set:nn { NiceMatrix / xdots } { #3 }
+ \@@_actually_draw_Vdots:
+ \group_end:
+ }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% The command |\@@_actually_draw_Vdots:| has the following implicit arguments:
+% \begin{itemize}
+% \item |\l_@@_initial_i_int|
+% \item |\l_@@_initial_j_int|
+% \item |\l_@@_initial_open_bool|
+% \item |\l_@@_final_i_int|
+% \item |\l_@@_final_j_int|
+% \item |\l_@@_final_open_bool|.
+% \end{itemize}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_actually_draw_Vdots:
+ {
% \end{macrocode}
% The boolean |\l_tmpa_bool| indicates whether the column is of type |l| (|L| of
% |{NiceArray}|) or may be considered as if.
% \begin{macrocode}
- \bool_set:Nn \l_tmpa_bool
- { \dim_compare_p:nNn \g_@@_x_initial_dim = \g_@@_x_final_dim }
- \@@_retrieve_coords:xx
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { - medium.north }
- { .south }
- }
- {
- \bool_if:NTF \l_@@_final_open_bool
- { - medium.south }
- { .north }
- }
+ \bool_set_false:N \l_tmpa_bool
+ \bool_lazy_or:nnF \l_@@_initial_open_bool \l_@@_final_open_bool
+ {
+ \@@_set_initial_coords_from_anchor:n { south~west }
+ \@@_set_final_coords_from_anchor:n { north~west }
+ \bool_set:Nn \l_tmpa_bool
+ { \dim_compare_p:nNn \l_@@_x_initial_dim = \l_@@_x_final_dim }
+ }
% \end{macrocode}
-% The boolean |\l_tmpb_bool| indicates whether the column is of type |c| (|C| of
+% Now, we try to determine whether the column is of type |c| (|C| of
% |{NiceArray}|) or may be considered as if.
+% \begin{macrocode}
+ \bool_if:NTF \l_@@_initial_open_bool
+ {
+ \@@_qpoint: { row - 1 }
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
+ }
+ { \@@_set_initial_coords_from_anchor:n { south } }
+ \bool_if:NTF \l_@@_final_open_bool
+ {
+ \@@_qpoint: { row - \@@_succ:N \c@iRow }
+ \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
+ }
+ { \@@_set_final_coords_from_anchor:n { north } }
+ \bool_if:NTF \l_@@_initial_open_bool
+ {
+ \bool_if:NTF \l_@@_final_open_bool
+ {
+ \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int }
+ \dim_set_eq:NN \l_tmpa_dim \pgf@x
+ \@@_qpoint: { col - \@@_succ:N \l_@@_initial_j_int }
+ \dim_set:Nn \l_@@_x_initial_dim { ( \pgf@x + \l_tmpa_dim ) / 2 }
+ \dim_set_eq:NN \l_@@_x_final_dim \l_@@_x_initial_dim
+ }
+ { \dim_set_eq:NN \l_@@_x_initial_dim \l_@@_x_final_dim }
+ }
+ {
+ \bool_if:NTF \l_@@_final_open_bool
+ { \dim_set_eq:NN \l_@@_x_final_dim \l_@@_x_initial_dim }
+ {
+% \end{macrocode}
+% Now the case where both extremities are closed. The first conditional tests
+% whether the column is of type |c| (|C| of |{NiceArray}|) or may be considered
+% as if.
% \begin{macrocode}
- \bool_set:Nn \l_tmpb_bool
- { \dim_compare_p:nNn \g_@@_x_initial_dim = \g_@@_x_final_dim }
- \bool_if:NF \l_tmpb_bool
+ \dim_compare:nNnF \l_@@_x_initial_dim = \l_@@_x_final_dim
{
- \dim_gset:Nn \g_@@_x_initial_dim
+ \dim_set:Nn \l_@@_x_initial_dim
{
\bool_if:NTF \l_tmpa_bool \dim_min:nn \dim_max:nn
- \g_@@_x_initial_dim \g_@@_x_final_dim
+ \l_@@_x_initial_dim \l_@@_x_final_dim
}
- \dim_gset_eq:NN \g_@@_x_final_dim \g_@@_x_initial_dim
+ \dim_set_eq:NN \l_@@_x_final_dim \l_@@_x_initial_dim
}
- \@@_draw_tikz_line:
- }
+ }
}
+ \@@_draw_line:
+% \end{macrocode}
+% The values of |\l_@@_x_initial_dim|, |\l_@@_y_initial_dim|, |\l_@@_x_final_dim|,
+% |\l_@@_y_final_dim|,
+%
+% |\l_@@_initial_open_bool| and |\l_@@_final_open_bool| are
+% still available after the |\@@_draw_line:|.
+% \begin{macrocode}
}
% \end{macrocode}
%
@@ -6075,118 +6263,190 @@ version 2005/12/01 or later.
% For the diagonal lines, the situation is a bit more complicated because, by
% default, we parallelize the diagonals lines. The first diagonal line is drawn
% and then, all the other diagonal lines are drawn parallel to the first one.
+%
+% The first and the second arguments are the coordinates of the cell where the
+% command has been issued. The third argument is the list of the options.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_Ddots:nn #1 #2
+\cs_new_protected:Npn \@@_draw_Ddots:nnn #1 #2 #3
{
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
- \bool_set_false:N \l_@@_impossible_line_bool
\@@_find_extremities_of_line:nnnn { #1 } { #2 } 1 1
- \bool_if:NF \l_@@_impossible_line_bool
- {
- \@@_retrieve_coords:xx
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { - medium.north~west }
- { .south~east }
- }
- {
- \bool_if:NTF \l_@@_final_open_bool
- { - medium.south~east }
- { .north~west }
- }
+% \end{macrocode}
+% The previous command may have changed the current environment by marking some
+% cells as ``dotted'', but, fortunately, it is outside the group for the options
+% of the line.
+% \begin{macrocode}
+ \group_begin:
+ \keys_set:nn { NiceMatrix / xdots } { #3 }
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \@@_actually_draw_Ddots:
+ \group_end:
+ }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% The command |\@@_actually_draw_Ddots:| has the following implicit arguments:
+% \begin{itemize}
+% \item |\l_@@_initial_i_int|
+% \item |\l_@@_initial_j_int|
+% \item |\l_@@_initial_open_bool|
+% \item |\l_@@_final_i_int|
+% \item |\l_@@_final_j_int|
+% \item |\l_@@_final_open_bool|.
+% \end{itemize}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_actually_draw_Ddots:
+ {
+ \bool_if:NTF \l_@@_initial_open_bool
+ {
+ \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int }
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
+ \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int }
+ \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
+ }
+ { \@@_set_initial_coords_from_anchor:n { south~east } }
+ \bool_if:NTF \l_@@_final_open_bool
+ {
+ \@@_qpoint: { row - \@@_succ:N \l_@@_final_i_int }
+ \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
+ \@@_qpoint: { col - \@@_succ:N \l_@@_final_j_int }
+ \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
+ }
+ { \@@_set_final_coords_from_anchor:n { north~west } }
% \end{macrocode}
% We have retrieved the coordinates in the usual way (they are stored in
-% |\g_@@_x_initial_dim|, etc.). If the parallelization of the diagonals is set,
+% |\l_@@_x_initial_dim|, etc.). If the parallelization of the diagonals is set,
% we will have (maybe) to adjust the fourth coordinate.
% \begin{macrocode}
- \bool_if:NT \l_@@_parallelize_diags_bool
- {
- \int_incr:N \l_@@_ddots_int
+ \bool_if:NT \l_@@_parallelize_diags_bool
+ {
+ \int_gincr:N \g_@@_ddots_int
% \end{macrocode}
-% We test if the diagonal line is the first one (the counter |\l_@@_ddots_int|
+% We test if the diagonal line is the first one (the counter |\g_@@_ddots_int|
% is created for this usage).
% \begin{macrocode}
- \int_compare:nNnTF \l_@@_ddots_int = 1
+ \int_compare:nNnTF \g_@@_ddots_int = 1
% \end{macrocode}
% If the diagonal line is the first one, we have no adjustment of the line to do
% but we store the $\Delta_x$ and the $\Delta_y$ of the line because these
% values will be used to draw the others diagonal lines parallels to the first
% one.
% \begin{macrocode}
- {
- \dim_set:Nn \l_@@_delta_x_one_dim
- { \g_@@_x_final_dim - \g_@@_x_initial_dim }
- \dim_set:Nn \l_@@_delta_y_one_dim
- { \g_@@_y_final_dim - \g_@@_y_initial_dim }
- }
+ {
+ \dim_gset:Nn \g_@@_delta_x_one_dim
+ { \l_@@_x_final_dim - \l_@@_x_initial_dim }
+ \dim_gset:Nn \g_@@_delta_y_one_dim
+ { \l_@@_y_final_dim - \l_@@_y_initial_dim }
+ }
% \end{macrocode}
% If the diagonal line is not the first one, we have to adjust the second
-% extremity of the line by modifying the coordinate |\g_@@_y_initial_dim|.
+% extremity of the line by modifying the coordinate |\l_@@_x_initial_dim|.
% \begin{macrocode}
- {
- \dim_gset:Nn \g_@@_y_final_dim
- {
- \g_@@_y_initial_dim +
- ( \g_@@_x_final_dim - \g_@@_x_initial_dim ) *
- \dim_ratio:nn \l_@@_delta_y_one_dim \l_@@_delta_x_one_dim
- }
- }
+ {
+ \dim_set:Nn \l_@@_y_final_dim
+ {
+ \l_@@_y_initial_dim +
+ ( \l_@@_x_final_dim - \l_@@_x_initial_dim ) *
+ \dim_ratio:nn \g_@@_delta_y_one_dim \g_@@_delta_x_one_dim
}
-% \end{macrocode}
-% Now, we can draw the dotted line (after a possible change of
-% |\g_@@_y_initial_dim|).
-% \begin{macrocode}
- \@@_draw_tikz_line:
}
}
+ \@@_draw_line:
+% \end{macrocode}
+% The values of |\l_@@_x_initial_dim|, |\l_@@_y_initial_dim|, |\l_@@_x_final_dim|,
+% |\l_@@_y_final_dim|,
+%
+% |\l_@@_initial_open_bool| and |\l_@@_final_open_bool| are still available
+% after the |\@@_draw_line:|.
+% \begin{macrocode}
}
% \end{macrocode}
%
% \bigskip
% We draw the |\Iddots| diagonals in the same way.
+%
+% The first and the second arguments are the coordinates of the cell where the
+% command has been issued. The third argument is the list of the options.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_Iddots:nn #1 #2
+\cs_new_protected:Npn \@@_draw_Iddots:nnn #1 #2 #3
{
\cs_if_free:cT { @@ _ dotted _ #1 - #2 }
{
- \bool_set_false:N \l_@@_impossible_line_bool
\@@_find_extremities_of_line:nnnn { #1 } { #2 } 1 { -1 }
- \bool_if:NF \l_@@_impossible_line_bool
- {
- \@@_retrieve_coords:xx
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { - medium.north~east }
- { .south~west }
- }
- {
- \bool_if:NTF \l_@@_final_open_bool
- { - medium.south~west }
- { .north~east }
- }
- \bool_if:NT \l_@@_parallelize_diags_bool
+% \end{macrocode}
+% The previous command may have changed the current environment by marking some
+% cells as ``dotted'', but, fortunately, it is outside the group for the options
+% of the line.
+% \begin{macrocode}
+ \group_begin:
+ \keys_set:nn { NiceMatrix / xdots } { #3 }
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \@@_actually_draw_Iddots:
+ \group_end:
+ }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% The command |\@@_actually_draw_Iddots:| has the following implicit arguments:
+% \begin{itemize}
+% \item |\l_@@_initial_i_int|
+% \item |\l_@@_initial_j_int|
+% \item |\l_@@_initial_open_bool|
+% \item |\l_@@_final_i_int|
+% \item |\l_@@_final_j_int|
+% \item |\l_@@_final_open_bool|.
+% \end{itemize}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_actually_draw_Iddots:
+ {
+ \bool_if:NTF \l_@@_initial_open_bool
+ {
+ \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int }
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
+ \@@_qpoint: { col - \@@_succ:N \l_@@_initial_j_int }
+ \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
+ }
+ { \@@_set_initial_coords_from_anchor:n { south~west } }
+ \bool_if:NTF \l_@@_final_open_bool
+ {
+ \@@_qpoint: { row - \@@_succ:N \l_@@_final_i_int }
+ \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
+ \@@_qpoint: { col - \int_use:N \l_@@_final_j_int }
+ \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
+ }
+ { \@@_set_final_coords_from_anchor:n { north~east } }
+ \bool_if:NT \l_@@_parallelize_diags_bool
+ {
+ \int_gincr:N \g_@@_iddots_int
+ \int_compare:nNnTF \g_@@_iddots_int = 1
+ {
+ \dim_gset:Nn \g_@@_delta_x_two_dim
+ { \l_@@_x_final_dim - \l_@@_x_initial_dim }
+ \dim_gset:Nn \g_@@_delta_y_two_dim
+ { \l_@@_y_final_dim - \l_@@_y_initial_dim }
+ }
+ {
+ \dim_set:Nn \l_@@_y_final_dim
{
- \int_incr:N \l_@@_iddots_int
- \int_compare:nNnTF \l_@@_iddots_int = 1
- {
- \dim_set:Nn \l_@@_delta_x_two_dim
- { \g_@@_x_final_dim - \g_@@_x_initial_dim }
- \dim_set:Nn \l_@@_delta_y_two_dim
- { \g_@@_y_final_dim - \g_@@_y_initial_dim }
- }
- {
- \dim_gset:Nn \g_@@_y_final_dim
- {
- \g_@@_y_initial_dim +
- ( \g_@@_x_final_dim - \g_@@_x_initial_dim ) *
- \dim_ratio:nn \l_@@_delta_y_two_dim \l_@@_delta_x_two_dim
- }
- }
+ \l_@@_y_initial_dim +
+ ( \l_@@_x_final_dim - \l_@@_x_initial_dim ) *
+ \dim_ratio:nn \g_@@_delta_y_two_dim \g_@@_delta_x_two_dim
}
- \@@_draw_tikz_line:
}
}
+ \@@_draw_line:
+% \end{macrocode}
+% The values of |\l_@@_x_initial_dim|, |\l_@@_y_initial_dim|, |\l_@@_x_final_dim|,
+% |\l_@@_y_final_dim|,
+%
+% |\l_@@_initial_open_bool| and |\l_@@_final_open_bool| are still available
+% after the |\@@_draw_line:|.
+% \begin{macrocode}
}
% \end{macrocode}
%
@@ -6205,95 +6465,153 @@ version 2005/12/01 or later.
% \bigskip
% \subsection*{The actual instructions for drawing the dotted line with Tikz}
%
-% The command |\@@_draw_tikz_line:| draws the line using four implicit
-% arguments:
+% The command |\@@_draw_line:| should be used in a |{pgfpicture}|. It has six
+% implicit arguments:
+%
+% \begin{itemize}
+% \item |\l_@@_x_initial_dim|
+% \item |\l_@@_y_initial_dim|
+% \item |\l_@@_x_final_dim|
+% \item |\l_@@_y_final_dim|
+% \item |\l_@@_initial_open_bool|
+% \item |\l_@@_final_open_bool|
+% \end{itemize}
+%
%
-% \quad |\g_@@_x_initial_dim|, |\g_@@_y_initial_dim|, |\g_@@_x_final_dim| and
-% |\g_@@_y_final_dim|. These variables are global for technical reasons: their
-% first affectation was in an instruction |\tikz|.
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_draw_tikz_line:
+\cs_new_protected:Npn \@@_draw_line:
+ {
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
+ \tl_if_eq:NNTF \l_@@_xdots_line_style_tl \c_@@_standard_tl
+ \@@_draw_standard_dotted_line:
+ \@@_draw_non_standard_dotted_line:
+ }
+% \end{macrocode}
+%
+% \medskip
+% We have to do a special construction with |\exp_args:NV| to be able to put in
+% the list of options in the correct place in the Tikz instruction.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_non_standard_dotted_line:
+ {
+ \begin { scope }
+ \exp_args:No \@@_draw_non_standard_dotted_line:n
+ { \l_@@_xdots_line_style_tl , \l_@@_xdots_color_tl }
+ }
+% \end{macrocode}
+% We have used the fact that, in \textsc{pgf}, un color name can be put directly
+% in a list of options (that's why we have put diredtly |\l_@@_xdots_color_tl|).
+%
+% \smallskip
+% The argument of |\@@_draw_non_standard_dotted_line:n| is, in fact, the list of options.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_non_standard_dotted_line:n #1
+ {
+ \draw
+ [
+ #1 ,
+ shorten~> = \l_@@_xdots_shorten_dim ,
+ shorten~< = \l_@@_xdots_shorten_dim ,
+ ]
+ ( \l_@@_x_initial_dim , \l_@@_y_initial_dim )
+ -- ( \l_@@_x_final_dim , \l_@@_y_final_dim ) ;
+ \end { scope }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% The command |\@@_draw_standard_dotted_line:| draws the line with our system of points
+% (which give a dotted line with real round points).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_standard_dotted_line:
{
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
+ \group_begin:
% \end{macrocode}
% The dimension |\l_@@_l_dim| is the length $\ell$ of the line to draw. We use
% the floating point reals of \pkg{expl3} to compute this length.
% \begin{macrocode}
- \dim_zero_new:N \l_@@_l_dim
- \dim_set:Nn \l_@@_l_dim
- {
- \fp_to_dim:n
- {
- sqrt
- (
- ( \dim_use:N \g_@@_x_final_dim
- - \dim_use:N \g_@@_x_initial_dim
- ) ^ 2
- +
- ( \dim_use:N \g_@@_y_final_dim
- - \dim_use:N \g_@@_y_initial_dim
- ) ^ 2
- )
- }
- }
+ \dim_zero_new:N \l_@@_l_dim
+ \dim_set:Nn \l_@@_l_dim
+ {
+ \fp_to_dim:n
+ {
+ sqrt
+ (
+ ( \l_@@_x_final_dim - \l_@@_x_initial_dim ) ^ 2
+ +
+ ( \l_@@_y_final_dim - \l_@@_y_initial_dim ) ^ 2
+ )
+ }
+ }
% \end{macrocode}
% We draw only if the length is not equal to zero (in fact, in the first
-% compilation, the length may be equal to zero).
+% compilation, the length may be equal to zero when the command |\line| is used).
+% \begin{macrocode}
+ \dim_compare:nNnF \l_@@_l_dim = \c_zero_dim \@@_actually_draw_line:
+ \group_end:
+ }
+% \end{macrocode}
+%
+%
% \begin{macrocode}
- \dim_compare:nNnF \l_@@_l_dim = \c_zero_dim
+\cs_new_protected:Npn \@@_actually_draw_line:
+ {
% \end{macrocode}
% The integer |\l_tmpa_int| is the number of dots of the dotted line.
% \begin{macrocode}
+ \bool_if:NTF \l_@@_initial_open_bool
{
- \bool_if:NTF \l_@@_initial_open_bool
+ \bool_if:NTF \l_@@_final_open_bool
{
- \bool_if:NTF \l_@@_final_open_bool
+ \int_set:Nn \l_tmpa_int
+ { \dim_ratio:nn \l_@@_l_dim \l_@@_inter_dots_dim }
+ }
+ {
+ \int_set:Nn \l_tmpa_int
{
- \int_set:Nn \l_tmpa_int
- { \dim_ratio:nn \l_@@_l_dim \l_@@_inter_dots_dim }
- }
- {
- \int_set:Nn \l_tmpa_int
- {
- \dim_ratio:nn
- { \l_@@_l_dim - \l_@@_dotted_lines_margin_dim }
- \l_@@_inter_dots_dim
- }
+ \dim_ratio:nn
+ { \l_@@_l_dim - \l_@@_xdots_shorten_dim }
+ \l_@@_inter_dots_dim
}
}
+ }
+ {
+ \bool_if:NTF \l_@@_final_open_bool
{
- \bool_if:NTF \l_@@_final_open_bool
+ \int_set:Nn \l_tmpa_int
{
- \int_set:Nn \l_tmpa_int
- {
- \dim_ratio:nn
- { \l_@@_l_dim - \l_@@_dotted_lines_margin_dim }
- \l_@@_inter_dots_dim
- }
+ \dim_ratio:nn
+ { \l_@@_l_dim - \l_@@_xdots_shorten_dim }
+ \l_@@_inter_dots_dim
}
+ }
+ {
+ \int_set:Nn \l_tmpa_int
{
- \int_set:Nn \l_tmpa_int
- {
- \dim_ratio:nn
- { \l_@@_l_dim - ( 2 \l_@@_dotted_lines_margin_dim ) }
- \l_@@_inter_dots_dim
- }
+ \dim_ratio:nn
+ { \l_@@_l_dim - ( 2 \l_@@_xdots_shorten_dim ) }
+ \l_@@_inter_dots_dim
}
}
+ }
% \end{macrocode}
% The dimensions |\l_tmpa_dim| and |\l_tmpb_dim| are the coordinates of the
% vector between two dots in the dotted line.
% \begin{macrocode}
- \dim_set:Nn \l_tmpa_dim
- {
- ( \g_@@_x_final_dim - \g_@@_x_initial_dim ) *
- \dim_ratio:nn \l_@@_inter_dots_dim \l_@@_l_dim
- }
- \dim_set:Nn \l_tmpb_dim
- {
- ( \g_@@_y_final_dim - \g_@@_y_initial_dim ) *
- \dim_ratio:nn \l_@@_inter_dots_dim \l_@@_l_dim
- }
+ \dim_set:Nn \l_tmpa_dim
+ {
+ ( \l_@@_x_final_dim - \l_@@_x_initial_dim ) *
+ \dim_ratio:nn \l_@@_inter_dots_dim \l_@@_l_dim
+ }
+ \dim_set:Nn \l_tmpb_dim
+ {
+ ( \l_@@_y_final_dim - \l_@@_y_initial_dim ) *
+ \dim_ratio:nn \l_@@_inter_dots_dim \l_@@_l_dim
+ }
% \end{macrocode}
%
% The length $\ell$ is the length of the dotted line. We note $\Delta$ the
@@ -6302,73 +6620,50 @@ version 2005/12/01 or later.
% extremity of the line and the first dot will be equal to $k\cdot\delta$ where
% $k=0$, $1$ or $2$. We first compute this number $k$ in |\l_tmpb_int|.
% \begin{macrocode}
- \int_set:Nn \l_tmpb_int
- {
- \bool_if:NTF \l_@@_initial_open_bool
- { \bool_if:NTF \l_@@_final_open_bool 1 0 }
- { \bool_if:NTF \l_@@_final_open_bool 2 1 }
- }
+ \int_set:Nn \l_tmpb_int
+ {
+ \bool_if:NTF \l_@@_initial_open_bool
+ { \bool_if:NTF \l_@@_final_open_bool 1 0 }
+ { \bool_if:NTF \l_@@_final_open_bool 2 1 }
+ }
% \end{macrocode}
-% In the loop over the dots, the dimensions |\g_@@_x_initial_dim| and
-% |\g_@@_y_initial_dim| will be used for the coordinates of the dots. But,
+% In the loop over the dots, the dimensions |\l_@@_x_initial_dim| and
+% |\l_@@_y_initial_dim| will be used for the coordinates of the dots. But,
% before the loop, we must move until the first dot.
%
% \begin{macrocode}
- \dim_gadd:Nn \g_@@_x_initial_dim
- {
- ( \g_@@_x_final_dim - \g_@@_x_initial_dim ) *
- \dim_ratio:nn
- { \l_@@_l_dim - \l_@@_inter_dots_dim * \l_tmpa_int }
- { 2 \l_@@_l_dim }
- * \l_tmpb_int
- }
- \dim_gadd:Nn \g_@@_y_initial_dim
- {
- ( \g_@@_y_final_dim - \g_@@_y_initial_dim ) *
- \dim_ratio:nn
- { \l_@@_l_dim - \l_@@_inter_dots_dim * \l_tmpa_int }
- { 2 \l_@@_l_dim }
- * \l_tmpb_int
- }
- \begin { tikzpicture } [ overlay ]
- \int_step_inline:nnn 0 \l_tmpa_int
- {
- \pgfpathcircle
- { \pgfpoint { \g_@@_x_initial_dim } { \g_@@_y_initial_dim } }
- { \l_@@_radius_dim }
- \pgfusepath { fill }
- \dim_gadd:Nn \g_@@_x_initial_dim \l_tmpa_dim
- \dim_gadd:Nn \g_@@_y_initial_dim \l_tmpb_dim
- }
- \end { tikzpicture }
+ \dim_gadd:Nn \l_@@_x_initial_dim
+ {
+ ( \l_@@_x_final_dim - \l_@@_x_initial_dim ) *
+ \dim_ratio:nn
+ { \l_@@_l_dim - \l_@@_inter_dots_dim * \l_tmpa_int }
+ { 2 \l_@@_l_dim }
+ * \l_tmpb_int
+ }
+ \dim_gadd:Nn \l_@@_y_initial_dim
+ {
+ ( \l_@@_y_final_dim - \l_@@_y_initial_dim ) *
+ \dim_ratio:nn
+ { \l_@@_l_dim - \l_@@_inter_dots_dim * \l_tmpa_int }
+ { 2 \l_@@_l_dim }
+ * \l_tmpb_int
}
+ \pgf@relevantforpicturesizefalse
+ \int_step_inline:nnn 0 \l_tmpa_int
+ {
+ \pgfpathcircle
+ { \pgfpoint \l_@@_x_initial_dim \l_@@_y_initial_dim }
+ { \l_@@_radius_dim }
+ \dim_add:Nn \l_@@_x_initial_dim \l_tmpa_dim
+ \dim_add:Nn \l_@@_y_initial_dim \l_tmpb_dim
+ }
+ \pgfusepathqfill
}
% \end{macrocode}
%
% \bigskip
% \subsection*{User commands available in the new environments}
%
-% We give new names for the commands |\ldots|, |\cdots|, |\vdots| and |\ddots|
-% because these commands will be redefined (if the option |renew-dots| is used).
-% \begin{macrocode}
-\cs_set_eq:NN \@@_ldots \ldots
-\cs_set_eq:NN \@@_cdots \cdots
-\cs_set_eq:NN \@@_vdots \vdots
-\cs_set_eq:NN \@@_ddots \ddots
-\cs_set_eq:NN \@@_iddots \iddots
-% \end{macrocode}
-%
-% \interitem
-% The command |\@@_add_to_empty_cells:| declares the current cell as empty. For
-% efficiency, this is done by creating a special control sequence.
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_add_to_empty_cells:
- {
- \cs_gset:cpx
- { @@ _ empty _ \int_use:N \c@iRow - \int_use:N \c@jCol }
- { \int_use:N \g_@@_env_int }
- }
-% \end{macrocode}
%
% \interitem
% The commands |\@@_Ldots|, |\@@_Cdots|, |\@@_Vdots|, |\@@_Ddots| and
@@ -6376,54 +6671,64 @@ version 2005/12/01 or later.
% |\Iddots| in the environments |{NiceArray}| (the other environments of
% \pkg{nicematrix} rely upon |{NiceArray}|).
%
-% The starred versions of these commands are deprecated since version~3.1 but
-% they are still available.
+% The starred versions of these commands are deprecated since version~3.1 but,
+% as for now, they are still available with an error.
% \begin{macrocode}
-\NewDocumentCommand \@@_Ldots { s }
+\NewDocumentCommand \@@_Ldots { s O { } }
{
- \bool_if:nF { #1 } { \@@_instruction_of_type:n { Ldots } }
+ \bool_if:nTF { #1 }
+ { \@@_error:n { starred~commands } }
+ { \@@_instruction_of_type:nn { Ldots } { #2 } }
\bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_ldots }
- \@@_add_to_empty_cells:
+ \bool_gset_true:N \g_@@_empty_cell_bool
}
% \end{macrocode}
%
% \bigskip
% \begin{macrocode}
-\NewDocumentCommand \@@_Cdots { s }
+\NewDocumentCommand \@@_Cdots { s O { } }
{
- \bool_if:nF { #1 } { \@@_instruction_of_type:n { Cdots } }
+ \bool_if:nTF { #1 }
+ { \@@_error:n { starred~commands } }
+ { \@@_instruction_of_type:nn { Cdots } { #2 } }
\bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_cdots }
- \@@_add_to_empty_cells:
+ \bool_gset_true:N \g_@@_empty_cell_bool
}
% \end{macrocode}
%
% \bigskip
% \begin{macrocode}
-\NewDocumentCommand \@@_Vdots { s }
+\NewDocumentCommand \@@_Vdots { s O { } }
{
- \bool_if:nF { #1 } { \@@_instruction_of_type:n { Vdots } }
+ \bool_if:nTF { #1 }
+ { \@@_error:n { starred~commands } }
+ { \@@_instruction_of_type:nn { Vdots } { #2 } }
\bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_vdots }
- \@@_add_to_empty_cells:
+ \bool_gset_true:N \g_@@_empty_cell_bool
}
% \end{macrocode}
%
% \bigskip
% \begin{macrocode}
-\NewDocumentCommand \@@_Ddots { s }
+\NewDocumentCommand \@@_Ddots { s O { } }
{
- \bool_if:nF { #1 } { \@@_instruction_of_type:n { Ddots } }
+ \bool_if:nTF { #1 }
+ { \@@_error:n { starred~commands } }
+ { \@@_instruction_of_type:nn { Ddots } { #2 } }
\bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_ddots }
- \@@_add_to_empty_cells:
+ \bool_gset_true:N \g_@@_empty_cell_bool
}
% \end{macrocode}
%
% \bigskip
% \begin{macrocode}
-\NewDocumentCommand \@@_Iddots { s }
+\NewDocumentCommand \@@_Iddots { s O { } }
{
- \bool_if:nF { #1 } { \@@_instruction_of_type:n { Iddots } }
+ \bool_if:nTF { #1 }
+ { \@@_error:n { starred~commands } }
+ { \@@_instruction_of_type:nn { Iddots } { #2 } }
\bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_iddots }
- \@@_add_to_empty_cells:
+ \bool_gset_true:N \g_@@_empty_cell_bool
}
% \end{macrocode}
%
@@ -6433,7 +6738,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_Hspace:
{
- \@@_add_to_empty_cells:
+ \bool_gset_true:N \g_@@_empty_cell_bool
\hspace
}
% \end{macrocode}
@@ -6483,18 +6788,23 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:NTF \c_@@_draft_bool
{
- \NewDocumentCommand \@@_Hdotsfor_i { O { } m }
+% \end{macrocode}
+% We don't put |!| before the last optionnal argument for homogeneity with
+% |\Cdots|, etc. which have only one optional argument.
+% \begin{macrocode}
+ \NewDocumentCommand \@@_Hdotsfor_i { O { } m O { } }
{ \prg_replicate:nn { #2 - 1 } { & \multicolumn { 1 } { C } { } } }
}
{
- \NewDocumentCommand \@@_Hdotsfor_i { O { } m }
+ \NewDocumentCommand \@@_Hdotsfor_i { O { } m O { } }
{
\tl_gput_right:Nx \g_@@_Hdotsfor_lines_tl
{
- \@@_Hdotsfor:nnn
+ \@@_Hdotsfor:nnnn
{ \int_use:N \c@iRow }
{ \int_use:N \c@jCol }
{ #2 }
+ { #3 }
}
\prg_replicate:nn { #2 - 1 } { & \multicolumn { 1 } { C } { } }
}
@@ -6503,7 +6813,7 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{macrocode}
-\cs_new_protected:Npn \@@_Hdotsfor:nnn #1 #2 #3
+\cs_new_protected:Npn \@@_Hdotsfor:nnnn #1 #2 #3 #4
{
\bool_set_false:N \l_@@_initial_open_bool
\bool_set_false:N \l_@@_final_open_bool
@@ -6511,7 +6821,7 @@ version 2005/12/01 or later.
% For the row, it's easy.
% \begin{macrocode}
\int_set:Nn \l_@@_initial_i_int { #1 }
- \int_set:Nn \l_@@_final_i_int { #1 }
+ \int_set_eq:NN \l_@@_final_i_int \l_@@_initial_i_int
% \end{macrocode}
% For the column, it's a bit more complicated.
% \begin{macrocode}
@@ -6521,8 +6831,12 @@ version 2005/12/01 or later.
\bool_set_true:N \l_@@_initial_open_bool
}
{
- \int_set:Nn \l_tmpa_int { #2 - 1 }
- \@@_if_not_empty_cell:nnTF \l_@@_initial_i_int \l_tmpa_int
+ \cs_if_exist:cTF
+ {
+ pgf @ sh @ ns @ \@@_env:
+ - \int_use:N \l_@@_initial_i_int
+ - \int_eval:n { #2 - 1 }
+ }
{ \int_set:Nn \l_@@_initial_j_int { #2 - 1 } }
{
\int_set:Nn \l_@@_initial_j_int { #2 }
@@ -6535,29 +6849,31 @@ version 2005/12/01 or later.
\bool_set_true:N \l_@@_final_open_bool
}
{
- \int_set:Nn \l_tmpa_int { #2 + #3 }
- \@@_if_not_empty_cell:nnTF \l_@@_final_i_int \l_tmpa_int
+ \cs_if_exist:cTF
+ {
+ pgf @ sh @ ns @ \@@_env:
+ - \int_use:N \l_@@_final_i_int
+ - \int_eval:n { #2 + #3 }
+ }
{ \int_set:Nn \l_@@_final_j_int { #2 + #3 } }
{
\int_set:Nn \l_@@_final_j_int { #2 + #3 - 1 }
\bool_set_true:N \l_@@_final_open_bool
}
}
- \bool_if:nT { \l_@@_initial_open_bool || \l_@@_final_open_bool }
- \@@_create_medium_nodes:
% \end{macrocode}
%
-% \medskip
-% The command |\@@_adjust_with_col_nodes:| is used in the command
-% |\@@_actually_draw_Ldots:| in order to recompute the $x$-value of
-% the initial point and the $x$-value of the final point with the exact position
-% of the left side and the right side of the array (these informations are in
-% the |col|-node. However, we don't want this operation with the dotted lines
-% drawn by |\Hdotsfor|. That's why we deactivate locally this command.
% \begin{macrocode}
\group_begin:
- \cs_set:Npn \@@_adjust_with_col_nodes: { }
- \@@_actually_draw_Ldots:
+ \int_compare:nNnTF { #1 } = 0
+ { \color { nicematrix-first-row } }
+ {
+ \int_compare:nNnT { #1 } = \g_@@_row_total_int
+ { \color { nicematrix-last-row } }
+ }
+ \keys_set:nn { NiceMatrix / xdots } { #4 }
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \@@_actually_draw_Ldots:
\group_end:
% \end{macrocode}
%
@@ -6587,7 +6903,27 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_rotate: { \group_insert_after:N \@@_rotate_i: }
\cs_new_protected:Npn \@@_rotate_i: { \group_insert_after:N \@@_rotate_ii: }
\cs_new_protected:Npn \@@_rotate_ii: { \group_insert_after:N \@@_rotate_iii: }
-\cs_new_protected:Npn \@@_rotate_iii: { \box_rotate:Nn \l_@@_cell_box { 90 } }
+\cs_new_protected:Npn \@@_rotate_iii:
+ {
+ \box_rotate:Nn \l_@@_cell_box { 90 }
+% \end{macrocode}
+% If we are in the last row, we want all the boxes composed with the command
+% |\rotate| aligned upwards.
+% \begin{macrocode}
+ \int_compare:nNnT \c@iRow = \l_@@_last_row_int
+ {
+ \vbox_set_top:Nn \l_@@_cell_box
+ {
+ \vbox_to_zero:n { }
+% \end{macrocode}
+% |0.8 ex| will be the distance between the principal part of the array and our
+% element (which is composed with |\rotate|.
+% \begin{macrocode}
+ \skip_vertical:n { - \box_ht:N \@arstrutbox + 0.8 ex }
+ \box_use:N \l_@@_cell_box
+ }
+ }
+ }
% \end{macrocode}
%
% \bigskip
@@ -6614,54 +6950,78 @@ version 2005/12/01 or later.
% construction uses the fact the |\@@_line_i:nn| is protected and that
% |\@@_double_int_eval:n| is fully expandable).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_line:nn #1 #2
+\NewDocumentCommand \@@_line { O { } m m ! O { } }
{
- \use:x
- {
- \@@_line_i:nn
- { \@@_double_int_eval:n #1 \q_stop }
- { \@@_double_int_eval:n #2 \q_stop }
- }
+ \group_begin:
+ \keys_set:nn { NiceMatrix / xdots } { #1 , #4 }
+ \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \use:x
+ {
+ \@@_line_i:nn
+ { \@@_double_int_eval:n #2 \q_stop }
+ { \@@_double_int_eval:n #3 \q_stop }
+ }
+ \group_end:
}
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_line_i:nn #1 #2
+\bool_if:NTF \c_@@_draft_bool
+ { \cs_new_protected:Npn \@@_line_i:nn #1 #2 { } }
{
- \bool_if:NF \c_@@_draft_bool
+ \cs_new_protected:Npn \@@_line_i:nn #1 #2
{
- \dim_zero_new:N \g_@@_x_initial_dim
- \dim_zero_new:N \g_@@_y_initial_dim
- \dim_zero_new:N \g_@@_x_final_dim
- \dim_zero_new:N \g_@@_y_final_dim
\bool_set_false:N \l_@@_initial_open_bool
\bool_set_false:N \l_@@_final_open_bool
\bool_if:nTF
{
- \cs_if_exist_p:c { pgf@sh@ns@nm - \int_use:N \g_@@_env_int - #1 }
- &&
- \cs_if_exist_p:c { pgf@sh@ns@nm - \int_use:N \g_@@_env_int - #2 }
- }
- {
- \begin { tikzpicture }
- \path~(#1)~--~(#2)~node[at~start]~(i)~{}~node[at~end]~(f)~{} ;
- \@@_extract_coords:w ( i )
- \dim_gset:Nn \g_@@_x_initial_dim \pgf@x
- \dim_gset:Nn \g_@@_y_initial_dim \pgf@y
- \@@_extract_coords:w ( f )
- \dim_gset:Nn \g_@@_x_final_dim \pgf@x
- \dim_gset:Nn \g_@@_y_final_dim \pgf@y
- \end { tikzpicture }
- \@@_draw_tikz_line:
+ \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #1 }
+ ||
+ \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #2 }
}
{
- \@@_error:nnn { unknown~cell~for~line~in~code-after }
- { #1 } { #2 }
- }
+ \@@_error:nnn { unknown~cell~for~line~in~code-after } { #1 } { #2 }
+ }
+ { \@@_draw_line_ii:nn { #1 } { #2 } }
+ }
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AtBeginDocument
+ {
+ \cs_new_protected:Npx \@@_draw_line_ii:nn #1 #2
+ {
+% \end{macrocode}
+% We recall that, when externalization is used, |\tikzpicture| and
+% |\endtikzpicture| (or |\pgfpicture| and |\endpgfpicture|) must be directly
+% ``visible'' and that why we do this static construction of the command
+% |\@@_draw_line_ii:|.
+% \begin{macrocode}
+ \c_@@_pgfortikzpicture_tl
+ \@@_draw_line_iii:nn { #1 } { #2 }
+ \c_@@_endpgfortikzpicture_tl
}
}
% \end{macrocode}
%
+% \bigskip
+% The following command \emph{must} be protected since it's used in the
+% construction of |\@@_draw_line_ii:nn|.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_line_iii:nn #1 #2
+ {
+ \pgfrememberpicturepositiononpagetrue
+ \pgfpointshapeborder { \@@_env: - #1 } { \@@_qpoint: { #2 } }
+ \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
+ \pgfpointshapeborder { \@@_env: - #2 } { \@@_qpoint: { #1 } }
+ \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
+ \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
+ \@@_draw_line:
+ }
+% \end{macrocode}
+%
%
% The commands |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots|, and |\Iddots| don't use
% this command because they have to do other settings (for example, the diagonal
@@ -6762,6 +7122,98 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
+% The command |\@@_draw_vlines| will be executed when the user uses the option
+% |vlines| (which draws all the vlines of the array).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_vlines:
+ {
+ \group_begin:
+% \end{macrocode}
+% The command |\CT@arc@| is a command of color from \pkg{colortbl}.
+% \begin{macrocode}
+ \bool_if:NT \c_@@_colortbl_loaded_bool \CT@arc@
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
+ \pgfsetlinewidth \arrayrulewidth
+% \end{macrocode}
+% First, we compute in |\l_tmpa_dim| the height of the rules we have to draw.
+% \begin{macrocode}
+ \@@_qpoint: {row - 1 }
+ \dim_set_eq:NN \l_tmpa_dim \pgf@y
+ \pgfusepathqfill
+ \@@_qpoint: { row - \@@_succ:N \c@iRow }
+ \dim_sub:Nn \l_tmpa_dim \pgf@y
+ \pgfusepathqfill
+% \end{macrocode}
+% We translate vertically to take into account the potential ``last row''.
+% \begin{macrocode}
+ \dim_zero:N \l_tmpb_dim
+ \int_compare:nNnT \l_@@_last_row_int > { -1 }
+ {
+ \dim_set_eq:NN \l_tmpb_dim \g_@@_dp_last_row_dim
+ \dim_add:Nn \l_tmpb_dim \g_@@_ht_last_row_dim
+% \end{macrocode}
+% We adjust the value of |\l_tmpa_dim| by the width of the horizontal rule just
+% before the ``last row''.
+% \begin{macrocode}
+ \@@_qpoint: { row - \@@_succ:N\c@iRow }
+ \dim_add:Nn \l_tmpa_dim \pgf@y
+ \@@_qpoint: { row - \@@_succ:N \g_@@_row_total_int }
+ \dim_sub:Nn \l_tmpa_dim \pgf@y
+ \dim_sub:Nn \l_tmpa_dim \l_tmpb_dim
+ }
+% \end{macrocode}
+%
+% Now, we can draw the lines with a loop.
+% \begin{macrocode}
+ \int_step_inline:nnn
+ { \bool_if:NTF \l_@@_NiceArray_bool 1 2 }
+ { \bool_if:NTF \l_@@_NiceArray_bool { \@@_succ:N \c@jCol } \c@jCol }
+ {
+ \pgfpathmoveto
+ {
+ \pgfpointadd
+ { \@@_qpoint: { col - ##1 } }
+ {
+ \pgfpoint
+ {
+ -0.5 \arrayrulewidth
+ \int_compare:nNnT { ##1 } = 1
+ {
+ \int_compare:nNnT \l_@@_first_col_int = 1
+ { + \arrayrulewidth }
+ }
+ }
+ { \l_tmpb_dim }
+ }
+ }
+ \pgfpathlineto
+ {
+ \pgfpointadd
+ { \@@_qpoint: { col - ##1 } }
+ {
+ \pgfpoint
+ {
+ -0.5 \arrayrulewidth
+ \int_compare:nNnT { ##1 } = 1
+ {
+ \int_compare:nNnT \l_@@_first_col_int = 1
+ { + \arrayrulewidth }
+ }
+ }
+ { \l_tmpb_dim + \l_tmpa_dim }
+ }
+ }
+ }
+ \pgfusepathqstroke
+ \endpgfpicture
+ \group_end:
+ }
+% \end{macrocode}
+%
+%
+% \bigskip
% \subsection*{The commands to draw dotted lines to separate columns and rows}
%
% These commands don't use the normal nodes, the medium nor the large nodes.
@@ -6773,11 +7225,12 @@ version 2005/12/01 or later.
% The following command must \emph{not} be protected because it's meant to be
% expanded in a |\noalign|.
% \begin{macrocode}
-\cs_new:Npn \@@_hdottedline:
+\bool_if:NTF \c_@@_draft_bool
+ { \cs_new:Npn \@@_hdottedline: { } }
{
- \bool_if:NF \c_@@_draft_bool
+ \cs_new:Npn \@@_hdottedline:
{
- \noalign{ \skip_vertical:n { 2 \l_@@_radius_dim } }
+ \noalign { \skip_vertical:N 2\l_@@_radius_dim }
\@@_hdottedline_i:
}
}
@@ -6791,9 +7244,9 @@ version 2005/12/01 or later.
% \end{macrocode}
% We write in the code-after the instruction that will eventually draw the
% dotted line. It's not possible to draw this dotted line now because we don't
-% known the length of the line (we don't even know the number of columns).
+% know the length of the line (we don't even know the number of columns).
% \begin{macrocode}
- \tl_gput_right:Nx \g_@@_code_after_tl
+ \tl_gput_right:Nx \g_@@_internal_code_after_tl
{ \@@_hdottedline:n { \int_use:N \c@iRow } }
}
% \end{macrocode}
@@ -6804,29 +7257,117 @@ version 2005/12/01 or later.
% that will actually draw the dotted line. Its argument is the number of the row
% \emph{before} which we will draw the row.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_hdottedline:n #1
+\AtBeginDocument
+ {
+% \end{macrocode}
+% We recall that, when externalization is used, |\tikzpicture| and
+% |\endtikzpicture| (or |\pgfpicture| and |\endpgfpicture|) must be directly
+% ``visible''.
+% \begin{macrocode}
+ \cs_new_protected:Npx \@@_hdottedline:n #1
+ {
+ \bool_set_true:N \exp_not:N \l_@@_initial_open_bool
+ \bool_set_true:N \exp_not:N \l_@@_final_open_bool
+ \c_@@_pgfortikzpicture_tl
+ \@@_hdottedline_i:n { #1 }
+ \c_@@_endpgfortikzpicture_tl
+ }
+ }
+% \end{macrocode}
+%
+% The following command \emph{must} be protected since it is used in the
+% construction of |\@@_hdottedline:n|.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_hdottedline_i:n #1
{
- \dim_zero_new:N \g_@@_x_initial_dim
- \dim_zero_new:N \g_@@_y_initial_dim
- \dim_zero_new:N \g_@@_x_final_dim
- \dim_zero_new:N \g_@@_y_final_dim
- \bool_set_true:N \l_@@_initial_open_bool
- \bool_set_true:N \l_@@_final_open_bool
- \begin { tikzpicture } [ remember~picture ]
- \@@_extract_coords:w ( row - #1 )
+ \pgfrememberpicturepositiononpagetrue
+ \@@_qpoint: { row - #1 }
% \end{macrocode}
% We do a translation par |-\l_@@_radius_dim| because we want the dotted line to
% have exactly the same position as a vertical rule drawn by ``"|"''
% (considering the rule having a width equal to the diameter of the dots).
% \begin{macrocode}
- \dim_gset:Nn \g_@@_y_initial_dim { \pgf@y - \l_@@_radius_dim }
- \dim_gset:Nn \g_@@_y_final_dim { \pgf@y - \l_@@_radius_dim }
- \@@_extract_coords:w ( col - 1 )
- \dim_gset:Nn \g_@@_x_initial_dim \pgf@x
- \@@_extract_coords:w ( col - \int_eval:n { \c@jCol + 1 } )
- \dim_gset:Nn \g_@@_x_final_dim \pgf@x
- \end { tikzpicture }
- \@@_draw_tikz_line:
+ \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
+ \dim_sub:Nn \l_@@_y_initial_dim \l_@@_radius_dim
+ \dim_set_eq:NN \l_@@_y_final_dim \l_@@_y_initial_dim
+% \end{macrocode}
+%
+% \medskip
+% The dotted line will be extended if the user uses |margin| (or |left-margin|
+% and |right-margin|).
+%
+% \smallskip
+% The aim is that, by standard the dotted line fits between square brackets
+% (|\hline| doesn't).
+%
+% \smallskip
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
+% \begin{bNiceMatrix}
+% 1 & 2 & 3 & 4 \\
+% \hline
+% 1 & 2 & 3 & 4 \\
+% \hdottedline
+% 1 & 2 & 3 & 4 \\
+% \end{bNiceMatrix}
+% \end{BVerbatim}
+% $\begin{bNiceMatrix}
+% 1 & 2 & 3 & 4 \\
+% \hline
+% 1 & 2 & 3 & 4 \\
+% \hdottedline
+% 1 & 2 & 3 & 4 \\
+% \end{bNiceMatrix}$
+%
+% \smallskip
+% But, if the user uses |margin|, the dotted line extends to have the same width
+% as a |\hline|.
+%
+% \smallskip
+% \begin{BVerbatim}[baseline=c,boxwidth=10cm]
+% \begin{bNiceMatrix}[margin]
+% 1 & 2 & 3 & 4 \\
+% \hline
+% 1 & 2 & 3 & 4 \\
+% \hdottedline
+% 1 & 2 & 3 & 4 \\
+% \end{bNiceMatrix}
+% \end{BVerbatim}
+% $\begin{bNiceMatrix}[margin]
+% 1 & 2 & 3 & 4 \\
+% \hline
+% 1 & 2 & 3 & 4 \\
+% \hdottedline
+% 1 & 2 & 3 & 4 \\
+% \end{bNiceMatrix}$
+%
+% \medskip
+% \begin{macrocode}
+ \@@_qpoint: { col - 1 }
+ \dim_set:Nn \l_@@_x_initial_dim
+ { \pgf@x + \arraycolsep - \l_@@_left_margin_dim }
+ \@@_qpoint: { col - \@@_succ:N \c@jCol }
+ \dim_set:Nn \l_@@_x_final_dim
+ { \pgf@x - \arraycolsep + \l_@@_right_margin_dim }
+% \end{macrocode}
+% For reasons purely aesthetic, we do an adjustment in the case of a rounded
+% bracket. The correction by |0.5 \l_@@_inter_dots_dim| is \emph{ad hoc} for a
+% better result.
+% \begin{macrocode}
+ \tl_set:Nn \l_tmpa_tl { ( }
+ \tl_if_eq:NNF \l_@@_left_delim_tl \l_tmpa_tl
+ { \dim_gadd:Nn \l_@@_x_initial_dim { 0.5 \l_@@_inter_dots_dim } }
+ \tl_set:Nn \l_tmpa_tl { ) }
+ \tl_if_eq:NNF \l_@@_right_delim_tl \l_tmpa_tl
+ { \dim_gsub:Nn \l_@@_x_final_dim { 0.5 \l_@@_inter_dots_dim } }
+% \end{macrocode}
+%
+% \medskip
+% As for now, we have no option to control the style of the lines drawn by
+% |\hdottedline| and the specifier ``|:|'' in the preamble. That's why we impose
+% the style |standard|.
+% \begin{macrocode}
+ \tl_set_eq:NN \l_@@_xdots_line_style_tl \c_@@_standard_tl
+ \@@_draw_line:
}
% \end{macrocode}
%
@@ -6835,17 +7376,33 @@ version 2005/12/01 or later.
% \bigskip
% \textbf{Vertical dotted lines}\par\nobreak
%
+%
% \medskip
% \begin{macrocode}
-\cs_new_protected:Npn \@@_vdottedline:n #1
+\bool_if:nTF \c_@@_draft_bool
+ { \cs_new_protected:Npn \@@_vdottedline:n #1 { } }
{
+ \cs_new_protected:Npn \@@_vdottedline:n #1
+ {
+ \bool_set_true:N \l_@@_initial_open_bool
+ \bool_set_true:N \l_@@_final_open_bool
% \end{macrocode}
-% We should allow the letter ``|:|'' in the first position of the preamble
-% but that would need a special programmation.
+% We recall that, when externalization is used, |\tikzpicture| and
+% |\endtikzpicture| (or |\pgfpicture| and |\endpgfpicture|) must be directly
+% ``visible''.
% \begin{macrocode}
- \int_compare:nNnTF #1 = 0
- { \@@_error:n { Use~of~:~in~first~position } }
- { \bool_if:NF \c_@@_draft_bool { \@@_vdottedline_i:n { #1 } } }
+ \bool_if:NTF \c_@@_tikz_loaded_bool
+ {
+ \tikzpicture
+ \@@_vdottedline_i:n { #1 }
+ \endtikzpicture
+ }
+ {
+ \pgfpicture
+ \@@_vdottedline_i:n { #1 }
+ \endpgfpicture
+ }
+ }
}
% \end{macrocode}
%
@@ -6853,31 +7410,34 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_vdottedline_i:n #1
{
- \dim_zero_new:N \g_@@_x_initial_dim
- \dim_zero_new:N \g_@@_y_initial_dim
- \dim_zero_new:N \g_@@_x_final_dim
- \dim_zero_new:N \g_@@_y_final_dim
- \bool_set_true:N \l_@@_initial_open_bool
- \bool_set_true:N \l_@@_final_open_bool
- \begin { tikzpicture } [ remember~picture ]
- \@@_extract_coords:w ( col - \int_eval:n { #1 + 1 } )
+% \end{macrocode}
+% The command |\CT@arc@| is a command of color from \pkg{colortbl}.
+% \begin{macrocode}
+ \bool_if:NT \c_@@_colortbl_loaded_bool \CT@arc@
+ \pgfrememberpicturepositiononpagetrue
+ \@@_qpoint: { col - \int_eval:n { #1 + 1 } }
% \end{macrocode}
% We do a translation par |-\l_@@_radius_dim| because we want the dotted line to
% have exactly the same position as a vertical rule drawn by ``"|"''
% (considering the rule having a width equal to the diameter of the dots).
% \begin{macrocode}
- \dim_gset:Nn \g_@@_x_initial_dim { \pgf@x - \l_@@_radius_dim }
- \dim_gset:Nn \g_@@_x_final_dim { \pgf@x - \l_@@_radius_dim }
- \@@_extract_coords:w ( row - 1 )
+ \dim_set:Nn \l_@@_x_initial_dim { \pgf@x - \l_@@_radius_dim }
+ \dim_set:Nn \l_@@_x_final_dim { \pgf@x - \l_@@_radius_dim }
+ \@@_qpoint: { row - 1 }
% \end{macrocode}
% We arbitrary decrease the height of the dotted line by a quantity equal to
% |\l_@@_inter_dots_dim| in order to improve the visual impact.
% \begin{macrocode}
- \dim_gset:Nn \g_@@_y_initial_dim { \pgf@y - ( \l_@@_inter_dots_dim / 2 ) }
- \@@_extract_coords:w ( row - \int_eval:n { \c@iRow + 1 } )
- \dim_gset:Nn \g_@@_y_final_dim { \pgf@y + ( \l_@@_inter_dots_dim / 2 ) }
- \end { tikzpicture }
- \@@_draw_tikz_line:
+ \dim_set:Nn \l_@@_y_initial_dim { \pgf@y - 0.5 \l_@@_inter_dots_dim }
+ \@@_qpoint: { row - \@@_succ:N \c@iRow }
+ \dim_set:Nn \l_@@_y_final_dim { \pgf@y + 0.5 \l_@@_inter_dots_dim }
+% \end{macrocode}
+% As for now, we have no option to control the style of the lines drawn by
+% |\hdottedline| and the specifier ``|:|'' in the preamble. That's why we impose
+% the style |standard|.
+% \begin{macrocode}
+ \tl_set_eq:NN \l_@@_xdots_line_style_tl \c_@@_standard_tl
+ \@@_draw_line:
}
% \end{macrocode}
%
@@ -6918,8 +7478,8 @@ version 2005/12/01 or later.
{
\cs_if_exist:cT { @@_max_cell_width_ \int_use:N \g_@@_NiceMatrixBlock_int }
{
- \dim_set:Nx \l_@@_columns_width_dim
- { \use:c { @@_max_cell_width _ \int_use:N \g_@@_NiceMatrixBlock_int } }
+ \exp_args:NNc \dim_set:Nn \l_@@_columns_width_dim
+ { @@_max_cell_width _ \int_use:N \g_@@_NiceMatrixBlock_int }
}
}
}
@@ -6939,7 +7499,11 @@ version 2005/12/01 or later.
{
\cs_gset:cpn
{ @@ _ max _ cell _ width _ \int_use:N \g_@@_NiceMatrixBlock_int }
- { \dim_use:N \g_@@_max_cell_width_dim }
+% \end{macrocode}
+% For technical reasons, we have to include the width of an eventual rule on the
+% right side of the cells.
+% \begin{macrocode}
+ { \dim_eval:n { \g_@@_max_cell_width_dim + \arrayrulewidth } }
}
\iow_now:Nn \@mainaux \ExplSyntaxOff
}
@@ -6957,9 +7521,8 @@ version 2005/12/01 or later.
%
% \bigskip
% We have three macros of creation of nodes: |\@@_create_medium_nodes:|,
-% |\@@_create_large_nodes:| and |\@@_create_medium_and_large_nodes:|. They must
-% \emph{not} be used in the |code-after| because the |code-after| is executed in
-% a scope of |prefix name| of Tikz.
+% |\@@_create_large_nodes:| and |\@@_create_medium_and_large_nodes:|.
+%
%
% \bigskip
% We have to compute the mathematical coordinates of the ``medium nodes''. These
@@ -6969,7 +7532,7 @@ version 2005/12/01 or later.
%
% \bigskip
% The command |\@@_computations_for_medium_nodes:| must be used in a
-% |{tikzpicture}|.
+% |{pgfpicture}|.
%
% \medskip
% For each row $i$, we compute two dimensions
@@ -7019,15 +7582,15 @@ version 2005/12/01 or later.
% \begin{macrocode}
{
\cs_if_exist:cT
- { pgf@sh@ns@nm - \int_use:N \g_@@_env_int - \@@_i: - \@@_j: }
+ { pgf @ sh @ ns @ \@@_env: - \@@_i: - \@@_j: }
% \end{macrocode}
% We retrieve the coordinates of the anchor |south west| of the (normal) node of
% the cell ($i$-$j$). They will be stored in |\pgf@x| and |\pgf@y|.
% \begin{macrocode}
{
- \@@_extract_coords:w
- ( nm - \int_use:N \g_@@_env_int
- - \@@_i: - \@@_j: .south~west )
+ \pgfpointanchor
+ { \@@_env: - \@@_i: - \@@_j: }
+ { south~west }
\dim_set:cn { l_@@_row_\@@_i: _min_dim}
{ \dim_min:vn { l_@@_row _ \@@_i: _min_dim } \pgf@y }
\seq_if_in:NxF \g_@@_multicolumn_cells_seq { \@@_i: - \@@_j: }
@@ -7039,8 +7602,9 @@ version 2005/12/01 or later.
% We retrieve the coordinates of the anchor |north east| of the (normal) node of
% the cell ($i$-$j$). They will be stored in |\pgf@x| and |\pgf@y|.
% \begin{macrocode}
- \@@_extract_coords:w
- ( nm - \int_use:N \g_@@_env_int - \@@_i: - \@@_j: .north~east )
+ \pgfpointanchor
+ { \@@_env: - \@@_i: - \@@_j: }
+ { north~east }
\dim_set:cn { l_@@_row _ \@@_i: _ max_dim }
{ \dim_max:vn { l_@@_row _ \@@_i: _ max_dim } \pgf@y }
\seq_if_in:NxF \g_@@_multicolumn_cells_seq { \@@_i: - \@@_j: }
@@ -7057,25 +7621,22 @@ version 2005/12/01 or later.
%
% \bigskip
% Here is the command |\@@_create_medium_nodes:|. When this command is used, the
-% ``medium nodes'' are created. These nodes won't be constructed twice because
-% when used once, this command becomes no-op.
+% ``medium nodes'' are created.
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_create_medium_nodes:
{
- \begin { tikzpicture } [ remember~picture , overlay ]
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
\@@_computations_for_medium_nodes:
- \tikzset { name~suffix = -medium }
% \end{macrocode}
% Now, we can create the ``medium nodes''. We use a command |\@@_create_nodes:|
-% because this command will also be used for the creation of the ``large nodes''
-% (after changing the value of |name-suffix|).
+% because this command will also be used for the creation of the ``large nodes''.
% \begin{macrocode}
+ \tl_set:Nn \l_@@_suffix_tl { -medium }
\@@_create_nodes:
- \end { tikzpicture }
- \cs_set_protected:Npn \@@_create_medium_nodes: { }
- \cs_set_protected:Npn \@@_create_medium_and_large_nodes:
- { \@@_create_large_nodes: }
+ \endpgfpicture
}
% \end{macrocode}
%
@@ -7091,37 +7652,34 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_create_large_nodes:
{
- \begin { tikzpicture } [ remember~picture , overlay ]
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
\@@_computations_for_medium_nodes:
\@@_computations_for_large_nodes:
- \tikzset { name~suffix = -large }
+ \tl_set:Nn \l_@@_suffix_tl { - large }
\@@_create_nodes:
- \end { tikzpicture }
- \cs_set_protected:Npn \@@_create_large_nodes: { }
- \cs_set_protected:Npn \@@_create_medium_and_large_nodes:
- { \@@_create_medium_nodes: }
+ \endpgfpicture
}
% \end{macrocode}
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_create_medium_and_large_nodes:
{
- \begin { tikzpicture } [ remember~picture , overlay ]
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
\@@_computations_for_medium_nodes:
% \end{macrocode}
% Now, we can create the ``medium nodes''. We use a command |\@@_create_nodes:|
-% because this command will also be used for the creation of the ``large nodes''
-% (after changing the value of |name-suffix|).
+% because this command will also be used for the creation of the ``large nodes''.
% \begin{macrocode}
- \tikzset { name~suffix = -medium }
+ \tl_set:Nn \l_@@_suffix_tl { - medium }
\@@_create_nodes:
\@@_computations_for_large_nodes:
- \tikzset { name~suffix = -large }
- \@@_create_nodes:
- \end { tikzpicture }
- \cs_set_protected:Npn \@@_create_medium_and_large_nodes: { }
- \cs_set_protected:Npn \@@_create_medium_nodes: { }
- \cs_set_protected:Npn \@@_create_large_nodes: { }
+ \tl_set:Nn \l_@@_suffix_tl { - large }
+ \@@_create_nodes:
+ \endpgfpicture
}
% \end{macrocode}
%
@@ -7169,12 +7727,15 @@ version 2005/12/01 or later.
\dim_set_eq:cc { l_@@_column _ \int_eval:n { \@@_j: + 1 } _ min _ dim }
{ l_@@_column _ \@@_j: _ max _ dim }
}
+% \end{macrocode}
+% Here, we have to use |\dim_sub:cn| because of the number 1 in the name.
+% \begin{macrocode}
\dim_sub:cn
{ l_@@_column _ 1 _ min _ dim }
\l_@@_left_margin_dim
\dim_add:cn
- { l_@@_column _ \int_use:N \c@jCol _ max _ dim }
- \l_@@_right_margin_dim
+ { l_@@_column _ \int_use:N \c@jCol _ max _ dim }
+ \l_@@_right_margin_dim
}
% \end{macrocode}
%
@@ -7189,42 +7750,30 @@ version 2005/12/01 or later.
% \texttt{l_@@_column_\textsl{j}_max_dim}. Between the construction of the
% ``medium nodes'' and the ``large nodes'', the values of these dimensions are
% changed.
+%
+% The function also uses |\l_@@_suffix_tl| (|-medium| or |-large|).
% \begin{macrocode}
\cs_new_protected:Npn \@@_create_nodes:
{
\int_step_variable:nnNn \l_@@_first_row_int \g_@@_row_total_int \@@_i:
{
\int_step_variable:nnNn \l_@@_first_col_int \g_@@_col_total_int \@@_j:
+ {
% \end{macrocode}
-% We create two ponctual nodes for the extremities of a diagonal of the
-% rectangular node we want to create. These nodes |(@@~south~west)| and
-% |(@@~north~east)| are not available for the user of \pkg{nicematrix}. That's
-% why their names are independent of the row and the column. In the two nested
-% loops, they will be overwritten until the last cell.
+% We draw the rectangular node for the cell (|\@@_i|-|\@@_j|).
% \begin{macrocode}
- {
- \coordinate ( @@~south~west )
- at ( \dim_use:c { l_@@_column_ \@@_j: _min_dim } ,
- \dim_use:c { l_@@_row_ \@@_i: _min_dim } ) ;
- \coordinate ( @@~north~east )
- at ( \dim_use:c { l_@@_column_ \@@_j: _max_dim } ,
- \dim_use:c { l_@@_row_ \@@_i: _max_dim } ) ;
-% \end{macrocode}
-% We can eventually draw the rectangular node for the cell (|\@@_i|-|\@@_j|).
-% This node is created with the Tikz library \pkg{fit}. Don't forget that the
-% Tikz option |name suffix| has been set to |-medium| or |-large|.
-% \begin{macrocode}
- \node
- [
- node~contents = { } ,
- fit = ( @@~south~west ) ( @@~north~east ) ,
- inner~sep = \c_zero_dim ,
- name = nm - \int_use:N \g_@@_env_int - \@@_i: - \@@_j: ,
- alias =
- \str_if_empty:NF \l_@@_name_str
- { \l_@@_name_str - \@@_i: - \@@_j: }
- ]
- ;
+ \@@_pgf_rect_node:nnnnn
+ { \@@_env: - \@@_i: - \@@_j: \l_@@_suffix_tl }
+ { \dim_use:c { l_@@_column_ \@@_j: _min_dim } }
+ { \dim_use:c { l_@@_row_ \@@_i: _min_dim } }
+ { \dim_use:c { l_@@_column_ \@@_j: _max_dim } }
+ { \dim_use:c { l_@@_row_ \@@_i: _max_dim } }
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfnodealias
+ { \l_@@_name_str - \@@_i: - \@@_j: \l_@@_suffix_tl }
+ { \@@_env: - \@@_i: - \@@_j: \l_@@_suffix_tl }
+ }
}
}
% \end{macrocode}
@@ -7258,27 +7807,18 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_node_for_multicolumn:nn #1 #2
{
\@@_extract_coords_values: #1 \q_stop
- \coordinate ( @@~south~west ) at
- (
- \dim_use:c { l_@@_column _ \@@_j: _ min _ dim } ,
- \dim_use:c { l_@@_row _ \@@_i: _ min _ dim }
- ) ;
- \coordinate ( @@~north~east ) at
- (
- \dim_use:c { l_@@_column _ \int_eval:n { \@@_j: + #2 - 1 } _ max _ dim} ,
- \dim_use:c { l_@@_row _ \@@_i: _ max _ dim }
- ) ;
- \node
- [
- node~contents = { } ,
- fit = ( @@~south~west ) ( @@~north~east ) ,
- inner~sep = \c_zero_dim ,
- name = nm - \int_use:N \g_@@_env_int - \@@_i: - \@@_j: ,
- alias =
- \str_if_empty:NF \l_@@_name_str
- { \l_@@_name_str - \@@_i: - \@@_j: }
- ]
- ;
+ \@@_pgf_rect_node:nnnnn
+ { \@@_env: - \@@_i: - \@@_j: \l_@@_suffix_tl }
+ { \dim_use:c { l_@@_column _ \@@_j: _ min _ dim } }
+ { \dim_use:c { l_@@_row _ \@@_i: _ min _ dim } }
+ { \dim_use:c { l_@@_column _ \int_eval:n { \@@_j: +#2-1 } _ max _ dim } }
+ { \dim_use:c { l_@@_row _ \@@_i: _ max _ dim } }
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfnodealias
+ { \l_@@_name_str - \@@_i: - \@@_j: \l_@@_suffix_tl }
+ { \int_use:N \g_@@_env_int - \@@_i: - \@@_j: \l_@@_suffix_tl}
+ }
}
% \end{macrocode}
%
@@ -7322,7 +7862,7 @@ version 2005/12/01 or later.
% instructions written by the user in the |code-after| (these instructions may
% use the Tikz node of the created block).
% \begin{macrocode}
- \tl_gput_left:Nx \g_@@_code_after_tl
+ \tl_gput_left:Nx \g_@@_internal_code_after_tl
{
\@@_Block_iii:nnnnnn
{ \int_use:N \c@iRow }
@@ -7390,70 +7930,77 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% The construction of the node corresponding to the merged cells. First, we
-% construct |\coordinate| corresponding to the upper-left and the lower-right
-% corners of the cell. They are called |one| and |two|.
+% The construction of the node corresponding to the merged cells.
% \begin{macrocode}
- \begin { tikzpicture }
- \int_set:Nn \l_tmpa_int { #1 }
- \int_decr:N \l_tmpa_int
- \int_set:Nn \l_tmpb_int { #2 }
- \int_decr:N \l_tmpb_int
- \@@_extract_coords:w ( row - \int_eval:n { \l_tmpa_int + 1 } )
- \dim_set_eq:NN \l_tmpa_dim \pgf@y
- \@@_extract_coords:w ( col - \int_eval:n { \l_tmpb_int + 1 } )
- \dim_set_eq:NN \l_tmpb_dim \pgf@x
- \coordinate ( one ) at ( \l_tmpb_dim , \l_tmpa_dim ) ;
- \@@_extract_coords:w ( row - \int_eval:n { #3 + 1 } )
+ \pgfpicture
+ \pgfrememberpicturepositiononpagetrue
+ \pgf@relevantforpicturesizefalse
+ \@@_qpoint: { row - #1 }
\dim_set_eq:NN \l_tmpa_dim \pgf@y
- \@@_extract_coords:w ( col - \int_eval:n { #4 + 1 } )
+ \@@_qpoint: { col - #2 }
\dim_set_eq:NN \l_tmpb_dim \pgf@x
- \coordinate ( two ) at ( \l_tmpb_dim , \l_tmpa_dim ) ;
+ \@@_qpoint: { row - \@@_succ:N #3 }
+ \dim_set_eq:NN \l_tmpc_dim \pgf@y
+ \@@_qpoint: { col - \@@_succ:N #4 }
+ \dim_set_eq:NN \l_tmpd_dim \pgf@x
% \end{macrocode}
-%
+%
+% \medskip
+% The following code doesn't work for the first vertical rule. You should allow
+% the option |white| if and only if the option |vlines| and |hlines| has been used.
% \begin{macrocode}
\bool_if:NT \l_@@_white_bool
{
- \fill [ white , line~width = 0 pt]
- ( [ yshift = -\arrayrulewidth ] one )
- rectangle
- ( [ xshift = -\arrayrulewidth ] two ) ;
+ \begin { pgfscope }
+ \pgfsetfillcolor { white }
+% \end{macrocode}
+% Usually, the vertical rules are \emph{before} the |col|-nodes. But there is an
+% exception: if there is no ``first col'', the first vertical rule is after the
+% col node.\footnote{That's true for the vertical rules drawn by ``"|"'' due to
+% the conception of |{array}| (of \pkg{array}) and we have managed to have the
+% same behaviour with |vlines|.}
+%
+% Since we don't want the white rectangle to erase a part of this
+% first rule, we have to do an adjustment in this case.
+% \emph{after} the ``col node''.
+% \begin{macrocode}
+ \int_compare:nNnT { #2 } = 1
+ {
+ \int_compare:nNnT \l_@@_first_col_int = 1
+ { \dim_add:Nn \l_tmpb_dim \arrayrulewidth }
+ }
+ \pgfpathrectanglecorners
+ { \pgfpoint \l_tmpb_dim { \l_tmpa_dim - \arrayrulewidth } }
+ { \pgfpoint { \l_tmpd_dim - \arrayrulewidth } \l_tmpc_dim }
+ \pgfusepathqfill
+ \end { pgfscope }
}
% \end{macrocode}
%
-% Now, we can construct the real node fitting the nodes |one| and |two|.
-% We have to insert |\l_@@_tikz_tl| in the list of the options and that's why we
-% use |\use:x|.
-% \begin{macrocode}
- \use:x
- {
- \exp_not:N \node
- [
- fit = ( one ) ( two ) ,
- inner~sep = 0 pt ,
- \l_@@_tikz_tl
- ]
- }
-% \end{macrocode}
-% The node of the block has a name |(#1-#2-block)| and we will use it internally just
-% after to put the label of the block.
+% We construct the node for the block with the name |(#1-#2-block)|.
+% The function |\@@_pgf_rect_node:nnnnn| takes as arguments the name of the node
+% and the four coordinates of two opposite corner points of the rectangle.
% \begin{macrocode}
- (#1-#2-block) { } ;
+ \begin { pgfscope }
+ \exp_args:Nx \pgfset { \l_@@_tikz_tl }
+ \@@_pgf_rect_node:nnnnn
+ { \@@_env: - #1 - #2 - block }
+ \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim
+ \end { pgfscope }
% \end{macrocode}
+%
%
% \medskip
% If the creation of the ``medium nodes'' is required, we create a ``medium
-% node'' for the block.
+% node'' for the block. The function |\@@_pgf_rect_node:nnnnn| takes as
+% arguments the name of the node and two \textsc{pgf} points.
% \begin{macrocode}
\bool_if:NT \l_@@_medium_nodes_bool
{
- \node
- [
- fit = ( #1 - #2 - medium . north~west )
- ( #3 - #4 - medium . south~east ) ,
- inner~sep = 0 pt ,
- ]
- (#1-#2-block-medium) { } ;
+ \@@_pgf_rect_node:nnn
+ { \@@_env: - #1 - #2 - block - medium }
+ { \pgfpointanchor { \@@_env: - #1 - #2 - medium } { north~west } }
+ { \pgfpointanchor { \@@_env: - #3 - #4 - medium } { south~east } }
}
% \end{macrocode}
% \medskip
@@ -7464,20 +8011,20 @@ version 2005/12/01 or later.
% \end{macrocode}
% If the block has only one row, we want the label of the block perfectly
% aligned on the baseline of the row. That's why we have constructed a
-% |\coordinate| on the baseline of the row, in the first column of the array.
+% |\pgfcoordinate| on the baseline of the row, in the first column of the array.
% Now, we retrieve the $y$-value of that node and we store it in |\l_tmpa_dim|.
% \begin{macrocode}
- \@@_extract_coords:w (row-#1-base)
- \dim_set_eq:NN \l_tmpa_dim \pgf@y
+ \pgfextracty \l_tmpa_dim { \@@_qpoint: { row - #1 - base } }
% \end{macrocode}
% We retrieve (in |\pgf@x|) the $x$-value of the center of the block.
% \begin{macrocode}
- \@@_extract_coords:w (#1-#2-block)
+ \@@_qpoint: { #1 - #2 - block }
% \end{macrocode}
% We put the label of the block which has been composed in |\l_@@_cell_box|.
% \begin{macrocode}
- \path (\pgf@x,\l_tmpa_dim) node [ anchor = base ]
- { \box_use_drop:N \l_@@_cell_box } ;
+ \pgftransformshift { \pgfpoint \pgf@x \l_tmpa_dim }
+ \pgfnode { rectangle } { base }
+ { \box_use_drop:N \l_@@_cell_box } { } { }
}
% \end{macrocode}
%
@@ -7486,8 +8033,12 @@ version 2005/12/01 or later.
% the center of the node (the label of the block has been composed in
% |\l_@@_cell_box|).
% \begin{macrocode}
- { \node at (#1-#2-block.center) { \box_use_drop:N \l_@@_cell_box } ; }
- \end { tikzpicture }
+ {
+ \pgftransformshift { \@@_qpoint: { #1 - #2 - block } }
+ \pgfnode { rectangle } { center }
+ { \box_use_drop:N \l_@@_cell_box } { } { }
+ }
+ \endpgfpicture
}
\group_end:
}
@@ -7607,7 +8158,12 @@ version 2005/12/01 or later.
transparent .meta:n = { renew-dots , renew-matrix } ,
transparent .value_forbidden:n = true,
obsolete-environments .code:n =
- \@@_msg_redirect_name:nn { Obsolete~environment } { none }
+ \@@_msg_redirect_name:nn { Obsolete~environment } { none } ,
+ obsolete-environments .value_forbidden:n = true,
+ starred-commands .code:n =
+ \@@_msg_redirect_name:nn { starred~commands } { none } ,
+ starred-commands .value_forbidden:n = true ,
+
}
\ProcessKeysOptions { NiceMatrix / Package }
% \end{macrocode}
@@ -7665,43 +8221,87 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+% The following command must \emph{not} be protected since it's used in an error message.
+% \begin{macrocode}
+\cs_new:Npn \@@_message_hdotsfor:
+ {
+ \tl_if_empty:VF \g_@@_Hdotsfor_lines_tl
+ { ~Maybe~your~use~of~\token_to_str:N \Hdotsfor\ is~incorrect.}
+ }
+% \end{macrocode}
%
+%
% \begin{macrocode}
\@@_msg_new:nn { too~much~cols~for~matrix~with~last~col }
{
You~try~to~use~more~columns~than~allowed~by~your~
- \@@_full_name_env:.~The~maximal~number~of~columns~is~
- \int_eval:n { \l_@@_last_col_int - 1 }~(plus~the~potential~
+ \@@_full_name_env:.\@@_message_hdotsfor:\ The~maximal~number~of~
+ columns~is~\int_eval:n { \l_@@_last_col_int - 1 }~(plus~the~potential~
exterior~ones).~This~error~is~fatal.
}
% \end{macrocode}
%
-%
+%
% \begin{macrocode}
\@@_msg_new:nn { too~much~cols~for~matrix }
{
You~try~to~use~more~columns~than~allowed~by~your~
- \@@_full_name_env:.~ Recall~that~the~maximal~number~of~columns~
- for~a~matrix~is~fixed~by~the~LaTeX~counter~'MaxMatrixCols'.~
- Its~actual~value~is~\int_use:N \c@MaxMatrixCols.~This~error~is~fatal.
+ \@@_full_name_env:.\@@_message_hdotsfor:\ Recall~that~the~maximal~
+ number~of~columns~for~a~matrix~is~fixed~by~the~LaTeX~counter~
+ 'MaxMatrixCols'.~Its~actual~value~is~\int_use:N \c@MaxMatrixCols.~
+ This~error~is~fatal.
}
% \end{macrocode}
%
+% \medskip
+% For the following message, remind that the test is not done after the
+% construction of the array but in each row. That's why we have to put
+% |\c@jCol-1| and not |\c@jCol|.
% \begin{macrocode}
\@@_msg_new:nn { too~much~cols~for~array }
{
You~try~to~use~more~columns~than~allowed~by~your~
- \@@_full_name_env:.~The~maximal~number~of~columns~is~
- \int_use:N \c@jCol\space (plus~the~potential~exterior~ones).~
+ \@@_full_name_env:.\@@_message_hdotsfor:\ The~maximal~number~of~columns~is~
+ \int_eval:n { \c@jCol - 1 }~(plus~the~potential~exterior~ones).~
This~error~is~fatal.
}
% \end{macrocode}
%
+%
+% \begin{macrocode}
+\@@_msg_new:nn { bad~option~for~line-style }
+ {
+ Since~you~haven't~loaded~Tikz,~the~only~value~you~can~give~to~'line-style'~
+ is~'standard'.~If~you~go~on,~this~option~will~be~ignored.
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\@@_msg_new:nn { Unknown~option~for~xdots }
+ {
+ As~for~now~there~is~only~three~options~available~here:~'color',~'line-style'~
+ and~'shorten'~(and~you~try~to~use~'\l_keys_key_str').~If~you~go~on,~
+ this~option~will~be~ignored.
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\@@_msg_new:nn { starred~commands }
+ {
+ The~starred~versions~of~\token_to_str:N \Cdots,~\token_to_str:N \Ldots,~
+ \token_to_str:N \Vdots,~\token_to_str:N\Ddots\ and~\token_to_str:N\Iddots\
+ are~deprecated.~However,~you~can~go~on~for~this~time.~If~you~don't~want~to~
+ see~this~error~we~should~load~'nicematrix'~with~the~option~
+ 'starred-commands'.
+ }
+% \end{macrocode}
+%
% \begin{macrocode}
\@@_msg_new:nn { bad~value~for~baseline }
{
- The~value~you~gave~to~'baseline'~(\int_use:N \l_tmpa_int)~is~not~
- valid.\\
+ The~value~given~to~'baseline'~(\int_use:N \l_tmpa_int)~is~not~
+ valid.~The~value~must~be~between~\int_use:N \l_@@_first_row_int\ and~
+ \int_use:N \g_@@_row_total_int\ or~equal~to~'t',~'c'~or~'b'.\\
If~you~go~on,~a~value~of~1~will~be~used.
}
% \end{macrocode}
@@ -7724,7 +8324,7 @@ version 2005/12/01 or later.
\@@_msg_new:nn { unknown~cell~for~line~in~code-after }
{
Your~command~\token_to_str:N\line\{#1\}\{#2\}~in~the~'code-after'~
- can't~be~executed~because~a~Tikz~node~doesn't~exist.\\
+ can't~be~executed~because~a~cell~doesn't~exist.\\
If~you~go~on~this~command~will~be~ignored.
}
% \end{macrocode}
@@ -7760,15 +8360,6 @@ version 2005/12/01 or later.
%
%
% \begin{macrocode}
-\@@_msg_new:nn { Impossible~line }
- {
- A~dotted~line~can't~be~drawn~because~you~have~not~put~
- all~the~ampersands~required~on~the~row~#1.\\
- If~you~go~on,~this~dotted~line~will~be~ignored.
- }
-% \end{macrocode}
-%
-% \begin{macrocode}
\@@_msg_new:nn { Wrong~last~row }
{
You~have~used~'last-row=\int_use:N \l_@@_last_row_int'~but~your~
@@ -7824,7 +8415,6 @@ version 2005/12/01 or later.
create-extra-nodes,~
create-medium-nodes,~
create-large-nodes,~
- dotted-lines-margin,~
end-of-row,~
exterior-arraycolsep,~
hlines,~
@@ -7838,8 +8428,11 @@ version 2005/12/01 or later.
renew-matrix,~
right-margin,~
small,~
- transparent~
- and~vlines.
+ transparent,~
+ vlines,~
+ xdots/color,~
+ xdots/shorten~and~
+ xdots/line-style.
}
% \end{macrocode}
%
@@ -7865,7 +8458,6 @@ version 2005/12/01 or later.
create-extra-nodes,~
create-medium-nodes,~
create-large-nodes,~
- dotted-lines-margin,~
end-of-row,~
extra-left-margin,~
extra-right-margin,~
@@ -7884,7 +8476,10 @@ version 2005/12/01 or later.
right-margin,~
small,~
t,~
- and~vlines.
+ vlines,~
+ xdots/color,~
+ xdots/shorten~and~
+ xdots/line-style.
}
% \end{macrocode}
%
@@ -7911,7 +8506,6 @@ version 2005/12/01 or later.
create-extra-nodes,~
create-medium-nodes,~
create-large-nodes,~
- dotted-lines-margin,~
end-of-row,~
extra-left-margin,~
extra-right-margin,~
@@ -7919,6 +8513,7 @@ version 2005/12/01 or later.
first-row,~
hlines,~
hvlines,~
+ l~(=L),~
last-col,~
last-row,~
left-margin,~
@@ -7926,10 +8521,14 @@ version 2005/12/01 or later.
name,~
nullify-dots,~
parallelize-diags,~
+ r~(=R),~
renew-dots,~
right-margin,~
small,~
- and~vlines.
+ vlines,~
+ xdots/color,~
+ xdots/shorten~and~
+ xdots/line-style.
}
% \end{macrocode}
%
@@ -7967,14 +8566,6 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \begin{macrocode}
-\@@_msg_new:nn { Use~of~:~in~first~position }
- {
- You~can't~use~the~column~specifier~'\l_@@_letter_for_dotted_lines_str'~in~the~
- first~position~of~the~preamble~of~the~\@@_full_name_env:. \\
- If~you~go~on,~this~dotted~line~will~be~ignored.
- }
-% \end{macrocode}
%
% \bigskip
% \subsection*{Obsolete environments}
@@ -8122,6 +8713,75 @@ version 2005/12/01 or later.
{ \endNiceArrayWithDelims }
% \end{macrocode}
%
+%
+% \subsection*{Command for creation of rectangle nodes}
+%
+%
+% The following command should be used in a |{pgfpicture}|. It creates an
+% rectangular (empty but with a name) when the four corners are given.
+%
+% |#1| is the name of the node which will be created;
+% |#2| and |#3| are the coordinates of one of the corner of the rectangle;
+% |#4| and |#5| are the coordinates of the opposite corner.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_pgf_rect_node:nnnnn #1 #2 #3 #4 #5
+ {
+ \begin { pgfscope }
+ \pgfset
+ {
+ outer~sep = \c_zero_dim ,
+ inner~sep = \c_zero_dim ,
+ minimum~size = \c_zero_dim
+ }
+ \pgftransformshift { \pgfpoint { 0.5 * ( #2 + #4 ) } { 0.5 * ( #3 + #5 ) } }
+ \pgfnode
+ { rectangle }
+ { center }
+ {
+ \vbox_to_ht:nn
+ { \dim_abs:n { #5 - #3 } }
+ {
+ \vfill
+ \hbox_to_wd:nn { \dim_abs:n { #4 - #2 } } { }
+ }
+ }
+ { #1 }
+ { }
+ \end { pgfscope }
+ }
+% \end{macrocode}
+%
+% \medskip
+% The command |\@@_pgf_rect_node:nnn| is a variant of |\@@_pgr_rect_node:nnnn|:
+% it takes two \textsc{pgf} points as arguments instead of the four dimensions
+% which are the coordinates.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_pgf_rect_node:nnn #1 #2 #3
+ {
+ \begin { pgfscope }
+ \pgfset
+ {
+ outer~sep = \c_zero_dim ,
+ inner~sep = \c_zero_dim ,
+ minimum~size = \c_zero_dim
+ }
+ \pgftransformshift { \pgfpointscale { 0.5 } { \pgfpointadd { #2 } { #3 } } }
+ \pgfpointdiff { #3 } { #2 }
+ \pgfgetlastxy \l_tmpa_dim \l_tmpb_dim
+ \pgfnode
+ { rectangle }
+ { center }
+ {
+ \vbox_to_ht:nn
+ { \dim_abs:n { \l_tmpb_dim } }
+ { \vfill \hbox_to_wd:nn { \dim_abs:n { \l_tmpa_dim } } { } }
+ }
+ { #1 }
+ { }
+ \end { pgfscope }
+ }
+% \end{macrocode}
+%
%
% \vspace{1cm}
% \section{History}
@@ -8201,7 +8861,7 @@ version 2005/12/01 or later.
% \[\begin{pNiceArray}{Wc{5mm}CWc{5mm}}[first-row,last-col]
% & C_j & \\
% \mbox{\Large $0$} & \Vdots & \mbox{\Large $0$} \\
-% & \strut a & \Cdots & L_i \\
+% \strut & a & \Cdots & L_i \\
% \mbox{\Large $0$} & & \mbox{\Large $0$} \\
% \end{pNiceArray}\]
%
@@ -8263,18 +8923,18 @@ version 2005/12/01 or later.
% Error message when the user gives an incorrect value for |last-row|.
%
% A dotted line can no longer cross another dotted line (excepted the dotted
-% lines drawn by |\cdottedline|, the symbol |:| (in the preamble of the array) and
-% |\line| in |code-after|).
+% lines drawn by |\cdottedline|, the symbol ``|:|'' (in the preamble of the
+% array) and |\line| in |code-after|).
%
% The starred versions of |\Cdots|, |\Ldots|, etc. are now deprecated because,
% with the new implementation, they become pointless. These starred versions
% are no longer documented.
%
-% The vertical rules in the matrices (drawn by "|") are now compatible with
+% The vertical rules in the matrices (drawn by ``"|"'') are now compatible with
% the color fixed by \pkg{colortbl}.
%
-% Correction of a bug: it was not possible to use the colon |:| in the preamble
-% of an array when |pdflatex| was used with \pkg{french-babel} (because
+% Correction of a bug: it was not possible to use the colon ``|:|'' in the
+% preamble of an array when |pdflatex| was used with \pkg{french-babel} (because
% \pkg{french-babel} activates the colon in the beginning of the document).
%
%
@@ -8366,7 +9026,7 @@ version 2005/12/01 or later.
%
% Options |vlines|, |hlines| and |hvlines|.
%
-% Option |baseline| pour |{NiceArray}| (uniquement).
+% Option |baseline| pour |{NiceArray}| (not for the other environments).
%
% The name of the Tikz nodes created by the command |\Block| has changed: when
% the command has been issued in the cell $i$|-|$j$, the name is
@@ -8379,6 +9039,27 @@ version 2005/12/01 or later.
% The package must be loaded with the option |obsolete-environments| if we want
% to use the deprecated environments.
%
+% \subsection*{Changes between versions 3.12 and 3.13}
+%
+% The behaviour of the command |\rotate| is improved when used in the ``last
+% row''.
+%
+% The option |dotted-lines-margin| has been renamed in |xdots/shorten| and the
+% options |xdots/color| and |xdots/line-style| have been added for a complete
+% customization of the dotted lines.
+%
+% In the environments without preamble (|{NiceMatrix}|, |{pNiceMatrix}|, etc.),
+% it's possible to use the options |l| (=|L|) or |r| (=|R|) to specify the type
+% of the columns.
+%
+% The starred versions of the commands |\Cdots|, |\Ldots|, |\Vdots|, |\Ddots|
+% and |\Iddots| are deprecated since the version 3.1 of \pkg{nicematrix}. Now,
+% one should load \pkg{nicematrix} with the option |starred-commands| to avoid
+% an error at the compilation.
+%
+% The code of \pkg{nicematrix} no longer uses Tikz but only \textsc{pgf}. By
+% default, Tikz is \emph{not} loaded by \pkg{nicematrix}.
+%
% \PrintIndex
%
% \tableofcontents
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index f56d0ccfd1..fe0d364d95 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/luatex/latex/arabluatex/arabluatex.dtx b/macros/luatex/latex/arabluatex/arabluatex.dtx
index 534271e52c..4d3fb48e01 100644
--- a/macros/luatex/latex/arabluatex/arabluatex.dtx
+++ b/macros/luatex/latex/arabluatex/arabluatex.dtx
@@ -27,7 +27,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{arabluatex}
%<*package>
- [2020/02/29 v1.18 An ArabTeX-like interface for LuaLaTeX]
+ [2020/03/15 v1.19 ArabTeX for LuaLaTeX]
%</package>
%
%<*driver>
@@ -88,6 +88,16 @@
location = {Toronto}
}
+@software{pkg:lua-ul,
+ title = {The Lua-ul package},
+ subtitle = {Underlining for LuaLaTeX},
+ author = {Krüger, Marcel},
+ maintainer = {Krüger, Marcel},
+ url = {http://www.ctan.org/pkg/lua-ul},
+ date = {2020-03-12},
+ version = {0.0.1}
+}
+
@MVBook{Wright,
author = {Wright, W. LL.D},
title = {A Grammar of the Arabic Language},
@@ -156,7 +166,7 @@
\babelfont{sf}{NewComputerModern Sans}
\babelfont{tt}{NewComputerModern Mono}
\usepackage{metalogox}
-\usepackage{arabluatex}[2020/02/29]
+\usepackage{arabluatex}[2020/03/15]
\SetArbUp{\textsuperscript{\thinspace#1}} % Old Standard needs this
\usepackage[nopar]{quran}
\usepackage[noindex]{nameauth}
@@ -259,7 +269,7 @@
%</driver>
% \fi
%
-% \CheckSum{1006}
+% \CheckSum{1014}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -2043,17 +2053,17 @@
% Arabic environments. In that case, \package{arabluatex} does not
% print the stroke as a distinctive mark over the number for it is
% not surrounded by other Arabic words. In case one nonetheless
-% wishes to print the stroke, he can either use the \cs{aemph}
-% command that is described below in \vref{sec:emphasis} or insert
-% the \arb[trans]{'ab^gad} number in |\arb[novoc]{}|:---
+% wishes to print the stroke, he can either use the \cs{aoline*}
+% command that is described below in \vref{sec:underlining} or
+% insert the \arb[trans]{'ab^gad} number in |\arb[novoc]{}|:---
% \begin{quote}
% |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
% |\abjad{1874}| The \arb[trans]{'abjad} number for 1874 is
% \abjad{1874}.
%
% |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
-% |\aemph*{\abjad{1874}}| The \arb[trans]{'abjad} number for 1874
-% is \aemph*{\abjad{1874}}.
+% |\aoline*{\abjad{1874}}| The \arb[trans]{'abjad} number for 1874
+% is \aoline*{\abjad{1874}}.
%
% |The| |\arb[trans]{'abjad}| |number| |for| |1874| |is|
% |\arb[novoc]{\abjad{1874}}| The \arb[trans]{'abjad} number for
@@ -2153,7 +2163,23 @@
% \arb[voc]{\abjad{45}: kitAbu-hu \aemph*{fI 'l-`AdAt-i}}
% \arb[trans]{\abjad{45}: kitAbu-hu \aemph*{fI 'l-\uc{`AdAt-i}}}.
% \end{quoting}
-%
+%
+% \subsubsection{Underlining words or numbers}
+% \label{sec:underlining}
+% \DescribeMacro{\aoline}%
+% \DescribeMacro{\aoline*}%
+% \DescribeMacro{\auline}%
+% \NEWfeature{v1.19}Three additional, non context-sensitive commands
+% are provided to distinguish words or numbers:---
+% \begin{enumerate}
+% \item \cs{aoline}, which is equivalent to \cs{aemph*} described
+% above.
+% \item \cs{aoline*}, which is the same as \cs{aoline}, but better
+% suited for \arb[trans]{'ab^gad} numbers.\footnote{See the example
+% provided above \vref{sec:abjad}.}
+% \item \cs{auline}, which can be used to underline Arabic words.
+% \end{enumerate}
+%
% \section{Arabic poetry}
% \label{sec:poetry}
% \NEWfeature{v1.6} \package{arabluatex} provides a special
@@ -2621,16 +2647,25 @@
%
% It is encoded |&| in Arab\TeX\ scheme.
%
-% In the following example, the \cs{uline} command would have
-% prevented adjacent Arabic letters from being connected if the
-% \enquote*{Zero width joiner} had not been used:---%
+% In elegantly printed books where many of the letters are interwoven
+% with one another so as to form ligatures, it may be convenient to
+% bring the letters into line in some instances. In the following
+% example, the \enquote*{zero width joiner} is used to prevent two
+% adjacent letters, viz.\ \arb[novoc]{s} and \arb[novoc]{.h}, from
+% standing one above the other in the name of \prname{'is.h_aq}
+% (\arb[fullvoc]{'is.h_aq"}):\footnote{\cs{underLine} and
+% \cs{highLight} are taken from the \package{lua-ul} package which is
+% loaded by \package{arabluatex}. See \textcite{pkg:lua-ul}.}---
% \iffalse
%<*example>
% \fi
\begin{example}
\begin{arab}[fullvoc]
- huwa 'abU zaydiN .hunaynu bnu 'is.h_aqa 'l-`a&\uline{&bA}diyyu
- bi-fat.hi 'l-`ayni wa-ta_hfIfi 'l-bA'i.
+ huwa 'abU zaydiN .hunaynu bnu 'is&\underLine{&.h_a}qa
+ 'l-`a\underLine{bA}diyyu bi-fat.hi 'l-`ayni wa-ta_hfIfi 'l-bA'i.
+
+ huwa 'abU zaydiN .hunaynu bnu 'is&\highLight{&.h_a}qa
+ 'l-`a\highLight{bA}diyyu bi-fat.hi 'l-`ayni wa-ta_hfIfi 'l-bA'i.
\end{arab}
\end{example}
% \iffalse
@@ -4363,8 +4398,7 @@
\RequirePackage{xparse}
\RequirePackage{adjustbox}
\RequirePackage{xstring}
-\PassOptionsToPackage{normalem}{ulem}
-\RequirePackage{ulem}
+\RequirePackage{lua-ul}
% \end{macrocode}
% The following boolean will be set to |true| in |RL| mode:
% \begin{macrocode}
@@ -4440,16 +4474,28 @@
% \begin{macro}{\aemph} Arabic emphasis. Needs to be redefined as
% well. The function is actually coded in Lua.
% \changes{v1.16}{2018/11/06}{Now uses \textsf{ulem}}
+% \changes{v1.19}{2020/03/15}{Now uses \textsf{lua-ul}}
% \begin{macro}{\aemph*} The \enquote*{starred} version of this
% command alway puts the stroke over its argument.
% \changes{v1.9.2}{2017/10/24}{Starred version which always puts the
-% stroke over its argument}As of v1.16 \package{arabluatex} uses
-% \package{ulem} to render the strokes, thus allowing line breaks
+% stroke over its argument}As of v1.19, \package{arabluatex} uses
+% \package{lua-ul} to render the strokes, thus allowing line breaks
% and manual hyphenation for transliterated Arabic.
+% \begin{macro}{\aoline}
+% \begin{macro}{\aoline*}
+% \begin{macro}{\auline}
+% \changes{v1.19}{2020/03/15}{Non context-sensitive command to
+% underline Arabic words is provided}\cs{aoline} and \cs{auline}
+% derive from \cs{newunderlinetype} provided by the \package{lua-ul}
+% package whereas \cs{aoline*}, which uses \cs{overline} in math-mode,
+% is better suited for so-called \arb[trans]{'ab^gad} numbers.
% \begin{macrocode}
-\def\oline{\@ifstar\@oline\@@oline}
-\def\@oline#1{\ensuremath{\overline{\mbox{#1}}}}
-\def\@@oline{\bgroup \ULdepth=-3ex \ULset}
+\newunderlinetype\@aoverLine{\leaders\vrule height 3ex depth -2.9ex}
+\def\aoline{\@ifstar\@aoline\@@aoline}
+\def\@aoline#1{\ensuremath{\overline{\mbox{#1}}}}
+\def\@@aoline#1{{\@aoverLine#1}}
+\newunderlinetype\@aunderLine{\leaders\vrule height -.65ex depth .75ex}
+\def\auline#1{{\@aunderLine#1}}
\AtBeginDocument{\ifdef{\aemph}%
{\RenewDocumentCommand{\aemph}{s m}{%
\IfBooleanTF{#1}{%
@@ -4466,6 +4512,9 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\arbcolor}\changes{v1.12}{2018/06/24}{Standard color
% command for Arabic environments}
% \cs{arbcolor}\oarg{color}\marg{Arabic text} takes the Arabic text to
@@ -4942,13 +4991,13 @@
\ifdefined\abjad%
\RenewDocumentCommand{\abjad}{m}%
{\ifbool{al@rlmode}%
- {\oline*{%
+ {\aoline*{%
\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
{\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
\else%
\NewDocumentCommand{\abjad}{m}%
{\ifbool{al@rlmode}%
- {\oline*{%
+ {\aoline*{%
\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
{\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
\fi}
diff --git a/macros/luatex/latex/arabluatex/arabluatex.lua b/macros/luatex/latex/arabluatex/arabluatex.lua
index 868e11692d..cc3f713bfa 100644
--- a/macros/luatex/latex/arabluatex/arabluatex.lua
+++ b/macros/luatex/latex/arabluatex/arabluatex.lua
@@ -724,7 +724,7 @@ local function processarbtoutf(str)
bbody = string.sub(bbody, 2, -2)
if tonumber(bbody) ~= nil then
bbody = arabluatex.abjadify(bbody)
- return string.format("\\oline*{\\arb[novoc]{%s}}", bbody)
+ return string.format("\\aoline*{\\arb[novoc]{%s}}", bbody)
else
return string.format("%s{%s}", btag, bbody)
end
@@ -1183,12 +1183,12 @@ end
function arabluatex.aemph(str, opt)
if tex.textdir == "TRT" then
- str = "\\oline{\\textdir TRT{}"..str.."}"
+ str = "\\aoline{\\textdir TRT{}"..str.."}"
elseif tex.textdir == "TLT" then
if opt == "over" then
- str = "\\oline{"..str.."}"
+ str = "\\aoline{"..str.."}"
else
- str = "\\uline{"..str.."}"
+ str = "\\auline{"..str.."}"
end
end
return str
diff --git a/macros/luatex/latex/arabluatex/arabluatex.pdf b/macros/luatex/latex/arabluatex/arabluatex.pdf
index 44e83c9d4a..dd09d3127e 100644
--- a/macros/luatex/latex/arabluatex/arabluatex.pdf
+++ b/macros/luatex/latex/arabluatex/arabluatex.pdf
Binary files differ
diff --git a/macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf b/macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf
index c56297fc96..10e5ab3ca8 100644
--- a/macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf
+++ b/macros/luatex/latex/arabluatex/samples/al-Jahiz.pdf
Binary files differ
diff --git a/macros/luatex/latex/arabluatex/samples/exporting.pdf b/macros/luatex/latex/arabluatex/samples/exporting.pdf
index 5911562443..f1072cae6f 100644
--- a/macros/luatex/latex/arabluatex/samples/exporting.pdf
+++ b/macros/luatex/latex/arabluatex/samples/exporting.pdf
Binary files differ
diff --git a/macros/luatex/latex/arabluatex/samples/template-01.pdf b/macros/luatex/latex/arabluatex/samples/template-01.pdf
index db695d716b..e964923f32 100644
--- a/macros/luatex/latex/arabluatex/samples/template-01.pdf
+++ b/macros/luatex/latex/arabluatex/samples/template-01.pdf
Binary files differ
diff --git a/macros/luatex/latex/lua-ul/lua-ul.dtx b/macros/luatex/latex/lua-ul/lua-ul.dtx
index be033be0b5..9573212ba2 100644
--- a/macros/luatex/latex/lua-ul/lua-ul.dtx
+++ b/macros/luatex/latex/lua-ul/lua-ul.dtx
@@ -43,6 +43,7 @@
\documentclass{article}
\usepackage{lua-ul}
\usepackage{csquotes,doc,framed,metalogo,hyperref,luacolor,tikzducks,pict2e}
+\RecordChanges
\begin{document}
\DocInput{lua-ul.dtx}
\PrintIndex
@@ -116,6 +117,32 @@
% \end{document}
% \end{verbatim}
%
+% The \verb+\highLight+ command highlights the argument in yellow by default. This color can be changed
+% either by providing a color as optional argument or by changing the default through \verb+\LuaULSetHighLightColor+:
+%
+% \begin{verbatim}
+% \documentclass{article}
+% \usepackage{xcolor,luacolor,lua-ul}
+% \LuaULSetHighLightColor{green}
+% \begin{document}
+% Lots of stuff is \highLight{important enough to be highlighted},
+% but only few things are dangerous enough to deserve
+% \highLight[red]{red highlighting.}
+%
+% \LuaULSetHighLightColor{yellow}
+% Let's go back to traditional \highLight{highlighting}.
+% \end{document}
+% \end{verbatim}
+%
+% \begin{framed}
+% \LuaULSetHighLightColor{green}
+% Lots of stuff is \highLight{important enough to be highlighted}, but only few things
+% are dangerous enough to deserve \highLight[red]{red highlighting.}
+%
+% \LuaULSetHighLightColor{yellow}
+% Let's go back to traditional \highLight{highlighting}.
+% \end{framed}
+%
% \section{Expert interface}
% \DescribeMacro{\newunderlinetype}§
% Sometimes, you might try to solve more interesting problems than boring underlining,
@@ -178,6 +205,7 @@
%
% \StopEventually{}
% \section{The implementation}
+% \changes{0.0.1}{2020-03-12}{Initial release}
% \subsection{Helper modules}
% First we need a separate Lua module \verb+pre_append_to_vlist_filter+ which
% provides a variant of the \verb+append_to_vlist_filter+ callback which can be
@@ -313,15 +341,48 @@ local function set_underline()
end
tex.attribute[j] = token.scan_int()
end
+% \end{macrocode}
+% \changes{0.0.2}{2020-03-15}{Add command to disable active underlining}
+% \begin{macrocode}
+local function reset_underline()
+ local reset_all = token.scan_keyword'*'
+ local j
+ for i=1,#underlineattrs do
+ local attr = underlineattrs[i]
+ if tex.attribute[attr] ~= -0x7FFFFFFF then
+ if reset_all then
+ tex.attribute[attr] = -0x7FFFFFFF
+ else
+ j = attr
+ end
+ end
+ end
+ if not j then
+ if not reset_all then
+ tex.error("No underline active", {"You tried to disable \z
+ underlining but underlining was not active",
+ "in the first place. Maybe you wanted to ensure that \z
+ no underling can be active anymore?", "Then you should \z
+ append a *."})
+ end
+ return
+ end
+ tex.attribute[j] = -0x7FFFFFFF
+end
local functions = lua.get_functions_table()
+local set_lua = token.set_lua
local new_underline_type_func =
luatexbase.new_luafunction"luaul.new_underline_type"
local set_underline_func =
luatexbase.new_luafunction"luaul.set_underline_func"
-token.set_lua("LuaULNewUnderlineType", new_underline_type_func)
-token.set_lua("LuaULSetUnderline", set_underline_func, "protected")
+local reset_underline_func =
+ luatexbase.new_luafunction"luaul.reset_underline_func"
+set_lua("LuaULNewUnderlineType", new_underline_type_func)
+set_lua("LuaULSetUnderline", set_underline_func, "protected")
+set_lua("LuaULResetUnderline", reset_underline_func, "protected")
functions[new_underline_type_func] = new_underline_type
functions[set_underline_func] = set_underline
+functions[reset_underline_func] = reset_underline
local add_underline_h
local function add_underline_v(head, attr)
@@ -379,9 +440,10 @@ function add_underline_h(head, attr)
local width = node.rangedimensions(head, first)
local kern = node.new(kern_t)
kern.kern = -width
- kern.next = node.copy(underline_types[last_value])
- kern.next.width = width
- node.tail(head.head).next = kern
+ local lead = node.copy(underline_types[last_value])
+ lead.width = width
+ head.head = node.insert_before(head.head, first, lead)
+ node.insert_after(head, lead, kern)
end
end
local function filter(b, loc, prev, mirror)
@@ -407,7 +469,7 @@ luatexbase.add_to_callback('pre_append_to_vlist_filter',
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{lua-ul}
- [2020/03/12 v0.0.1 Underlining and related functionality for LuaTeX]
+ [2020/03/15 v0.0.2 Underlining and related functionality for LuaTeX]
% \fi
% Only \LuaLaTeX{} is supported.
@@ -438,7 +500,19 @@ luatexbase.add_to_callback('pre_append_to_vlist_filter',
\fi
\csname#1\endcsname
}
-
+% \end{macrocode}
+% The default for the context argument. Give that most stuff should
+% scale vertically with the font size, we expect most arguments
+% to be given in \texttt{ex}. Additionally especially traditional
+% underlines will use the currently active text color, so especially
+% when luacolor is loaded we have to include the color attribute too.
+% \begin{macrocode}
+ \newcommand\luaul@defaultcontext{%
+ \number\dimexpr1ex
+ @\unless\ifx\undefined\LuaCol@Attribute
+ \the\LuaCol@Attribute
+ \fi
+ }
% \end{macrocode}
% The main macro.
% \begin{macrocode}
@@ -452,21 +526,58 @@ luatexbase.add_to_callback('pre_append_to_vlist_filter',
}}%
}
\ifluaul@predefined
- \newcommand\luaul@defaultcontext{%
- \number\dimexpr1ex
- @\unless\ifx\undefined\LuaCol@Attribute
- \the\LuaCol@Attribute
+% \end{macrocode}
+% \changes{0.0.2}{2020-03-15}{Allow \texttt{\protect\string\protect\highLight} color customization}
+% For \verb+\highLight+, the color should be customizable.
+% There are two cases: If \verb+xcolor+ is not loaded, we just accept
+% a simple color name. Otherwise, we accept color as documented in
+% xcolor for PSTricks: Either a color name, a color expression or a
+% combination of colormodel and associated values.
+% \begin{macrocode}
+ \newcommand\luaul@highlight@color{yellow}
+ \def\luaul@@setcolor\xcolor@#1#2{}
+ \newcommand\luaul@setcolor[1]{%
+ \ifx\XC@getcolor\undefined
+ \def\luaul@highlight@currentcolor{#1}
+ \else
+ \begingroup
+ \XC@getcolor{#1}\luaul@tmpcolor
+ \expanded{\endgroup
+ \def\noexpand\luaul@highlight@currentcolor{%
+ \expandafter\luaul@@setcolor\luaul@tmpcolor}}%
\fi
}
+% \end{macrocode}
+% Now a user-level command to set the default color.
+% \begin{macrocode}
+\NewDocumentCommand\LuaULSetHighLightColor{om}{%
+ \edef\luaul@highlight@color{\IfValueTF{#1}{[#1]{#2}}{#2}}%
+}
+% \end{macrocode}
+% The sizes for the predefined commands are stolen from the \enquote{soul}
+% default values.
+% \begin{macrocode}
\newunderlinetype\@underLine%
{\leaders\vrule height -.65ex depth .75ex}
\newcommand\underLine[1]{{\@underLine#1}}
\newunderlinetype\@strikeThrough%
{\leaders\vrule height .55ex depth -.45ex}
\newcommand\strikeThrough[1]{{\@strikeThrough#1}}
- \newunderlinetype\@highLight[\number\dimexpr1ex]%
- {\color{yellow}\leaders\vrule height 1.75ex depth .75ex}
- \newcommand\highLight[1]{{\@highLight#1}}
+
+ \newunderlinetype\@highLight[\number\dimexpr1ex@%
+ \luaul@highlight@currentcolor]%
+ {%
+ \ifx\XC@getcolor\undefined
+ \color{\luaul@highlight@currentcolor}%
+ \else
+ \expandafter\XC@undeclaredcolor\luaul@highlight@currentcolor
+ \fi
+ \leaders\vrule height 1.75ex depth .75ex
+ }
+ \newcommand\highLight[2][\luaul@highlight@color]{{%
+ \luaul@setcolor{#1}%
+ \@highLight#2%
+ }}
\ifluaul@soulnames
\let\textul\underLine \let\ul\textul
\let\textst\strikeThrough \let\st\textst
@@ -474,6 +585,31 @@ luatexbase.add_to_callback('pre_append_to_vlist_filter',
\fi
\fi
% \end{macrocode}
+% \changes{0.0.2}{2020-03-15}{Patch \texttt{\protect\string\protect\reset@font}}
+% Finally patch \verb+\reset@font+ to ensure that underlines do not propagate
+% into unexpected places.
+% \begin{macrocode}
+\ifx \reset@font \normalfont
+ \let \reset@font \relax
+ \DeclareRobustCommand \reset@font {%
+ \normalfont
+ \LuaULResetUnderline*%
+ }
+\else
+ \MakeRobust \reset@font
+ \begingroup
+ \expandafter \let
+ \expandafter \helper
+ \csname reset@font \endcsname
+ \expandafter \endgroup
+ \expandafter \gdef
+ \csname reset@font \expandafter \endcsname
+ \expandafter {%
+ \helper%
+ \LuaULResetUnderline*%
+ }
+\fi
+% \end{macrocode}
% \iffalse
%</package>
% \fi
diff --git a/macros/luatex/latex/lua-ul/lua-ul.pdf b/macros/luatex/latex/lua-ul/lua-ul.pdf
index e8472c65bb..257d7fee40 100644
--- a/macros/luatex/latex/lua-ul/lua-ul.pdf
+++ b/macros/luatex/latex/lua-ul/lua-ul.pdf
Binary files differ
diff --git a/macros/xetex/latex/quran/README b/macros/xetex/latex/quran/README
index ab20fad712..5fdc2a77d8 100644
--- a/macros/xetex/latex/quran/README
+++ b/macros/xetex/latex/quran/README
@@ -1,6 +1,6 @@
_____________________
The quran package
-v1.62
+v1.63
The package is prepared for typesetting the holy Quran.
This work provides several macros for typesetting the whole or
@@ -8,7 +8,7 @@ any parts of the holy Quran based on its popular divisions.
For more information, please see the documentation.
-Current version release date: 2020/03/12
+Current version release date: 2020/03/14
___________________
Seiied-Mohammad-Javad Razvian
javadr@gmail.com
diff --git a/macros/xetex/latex/quran/doc/quran-doc.pdf b/macros/xetex/latex/quran/doc/quran-doc.pdf
index c405785ca2..adbc70245e 100644
--- a/macros/xetex/latex/quran/doc/quran-doc.pdf
+++ b/macros/xetex/latex/quran/doc/quran-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/quran/doc/quran-doc.tex b/macros/xetex/latex/quran/doc/quran-doc.tex
index 4a2ab24537..585c0ba6b5 100644
--- a/macros/xetex/latex/quran/doc/quran-doc.tex
+++ b/macros/xetex/latex/quran/doc/quran-doc.tex
@@ -1,8 +1,29 @@
+%% This is file `quran-doc.tex',
+%%
+%% Copyright © 2015-2020
+%% Seiied-Mohammad-Javad Razavian <javadr@gmail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% This work is “author-maintained” (as per LPPL maintenance status).
+%%
+%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
+%%
+%% to one who has devoted his life to Quran
+%%
\documentclass{ltxdoc}
\usepackage{forloop}
\usepackage{booktabs}
-\usepackage{tabularx}
+\usepackage{longtable}
\usepackage{holtxdoc}
\usepackage{fancyvrb}
\usepackage{url}
@@ -13,10 +34,6 @@
\usepackage[toc]{multitoc}
\usepackage{manfnt}
-\AtBeginDocument{\ifdefined\arabicfont\relax\else
-\PackageWarning{quran}{\string\arabicfont\ is not defined!^^JI will try to load Amiri}%
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
-
\usepackage[trans={lt, de, en, fa}, wordwise]{quran}
\newfontfamily\quran[Script=Arabic]{Scheherazade}
\newfontfamily\amiri[Script=Arabic]{Amiri}
@@ -392,19 +409,17 @@ If \meta{chunk range} includes just one number, the output will be from the
\meta{number}\textsuperscript{th} word to the end of \meta{ayah range}.
\centerline{\mx{quranayah[2][156][6]}{\quranayah[2][156][6]} \hfill
- \mx{quranayah[2][286][35-49]}{\quranayah[2][286][35-49]}}
+ \mx{quranayah[2][286][31-43]}{\quranayah[2][286][31-43]}}
The way the package enumerates the words of a specified \meta{range} could be shown in the footnote if these commands followed by \tt{+}.
-%\centerline{\mxf{quranayah[2][286][35-49]+}{\quranayah[2][286][35-49]+}}
-
-\centerline{\mxf{quranayah[Ar-Rad][23-24][11]+}{\quranayah[Ar-Rad][23-24][11]+}}
+\centerline{\mxf{quranayah[Ar-Rad][23-24][10]+}{\quranayah[Ar-Rad][23-24][10]+}}
\pagebreak[4]
Fetching just one word from
-an ayah needs the \meta{chuck range} to have both \meta{number}s as the same.
+an ayah needs the \meta{chunck range} to have both \meta{number}s as the same.
-\centerline{\mx{quranayah[18][19][37-37]}{\quranayah[18][19][37-37]} }
+\centerline{\mx{quranayah[18][19][34-34]}{\quranayah[18][19][34-34]} }
\section{Miscellaneous}
@@ -522,7 +537,7 @@ Version 1.6 comes wtih the \xmgpar{wordwise} option
which makes the package capable of outputing any chunks of an ayah.
See section~\ref{chunk} for more details.
- \centerline{\mx{quranayah[9][111][1-26]}{\quranayah[9][111][2-26]}}
+ \centerline{\mx{quranayah[9][111][1-23]}{\quranayah[9][111][1-23]}}
\medskip
@@ -896,7 +911,7 @@ fontspec{,} and bidi"]
\begin{Version}{2016/11/12 v1.24}
\item Documentation updates.
- \item \emph{waqf} symbols were missed from the penultimate version of uthmani script.
+ \item Pause marks (waqf symbols) were missed from the penultimate version of uthmani script.
\end{Version}
\begin{Version}{2016/11/15 v1.241}
@@ -956,10 +971,18 @@ fontspec{,} and bidi"]
\item A typo in quran-transde.def.
\end{Version}
+ \begin{Version}{2018/12/01}
+ \item \xpackage{quran-de} package is released adding 3 more translations of the German language.
+ \end{Version}
+
\begin{Version}{2018/12/31 v1.5}
\item Minor bugs in \cs{ToggleBasmalah} and \cs{quransurah}.
\end{Version}
+ \begin{Version}{2019/05/03}
+ \item \xpackage{quran-ur} package is released adding 8 translations of the Urdu language.
+ \end{Version}
+
\begin{Version}{2019/05/04 v1.51}
\item A typo in quran-transde.def.
\end{Version}
@@ -980,14 +1003,25 @@ fontspec{,} and bidi"]
\item License update to LPPL Version 1.3c from LPPL Version 1.3
\end{Version}
- \begin{table}[!htbp]
+ \begin{Version}{2020/03/14 v1.63}
+ \item Pause marks (waqf symbols) have been removed from \cs{quranayah} and \cs{qurantext}
+ whenever \oarg{chunk range} optional parameter is used.
+ \end{Version}
+
\def\cb{{\tiny$\bullet$\space}}
\def\mrule{\leaders\vrule height 2.5pt depth -1.5pt \hfill}
\begin{small}
- \begin{tabularx}{\textwidth}{|c|l|X|}
+ \begin{longtable}{|c|l|p{9cm}|}
\toprule
Date & Ver. & \multicolumn{1}{c|}{Feature} \\
\midrule
+ \endhead
+ \bottomrule
+ \multicolumn{3}{r}{\scriptsize continued on next page}\\
+ \endfoot
+ \multicolumn{3}{c}{}\\
+ \caption{Brief History of the \xpackage{quran} Development}
+ \endlastfoot
2015/06/01 & 0.1 & \cb Initial release in Parsi\LaTeX, named \xpackage{qurantext} \par
\cb \cs{qurantext} \\
2015/06/02 & 0.2 & \cb Implementation of \cs{do@qt} in a nonrecursive style \\
@@ -1015,14 +1049,14 @@ fontspec{,} and bidi"]
2016/11/07 & 1.21 & \cb Some minor bugs \\
2016/11/08 & 1.22 & \cb Documentation updates \\
2016/11/12 & 1.24 & \cb Documentation updates\par
- \cb \emph{waqf} symbols were missed from uthmani script\\
+ \cb Pause marks (waqf symbols) were missed from uthmani script\\
2016/11/15 & 1.241 & \cb Documentation updates \\
2016/12/25 & 1.25 & \cb Documentation updates \\
2016/12/25 & 1.251 & \cb Documentation updates \\
2017/02/28 & 1.252 & \cb Minor improvements \\
2017/08/22 & 1.26 & \cb Minor improvements\par
\cb Bug fix in \cs{quranayah[x][y]}\par
- \cb Documentation updates. \\
+ \cb Documentation updates \\
2016/08/22 & 1.261 & \cb Documentation updates \\
2017/10/22 & 1.3 & \cb Transliteration supported via \xoption{translt} option \\
2017/10/28 & 1.4 & \cb Persian, English, and Deutsch translations via \xoption{transfa}, \xoption{transen}, and \xoption{transde} options\par
@@ -1039,11 +1073,10 @@ fontspec{,} and bidi"]
\cb \cs{Basmalah} \hfil \cb Documentation revision\\
2020/03/09 & 1.61 & \cb Minor update in \cs{quranayah} and \cs{qurantext} \\
2020/03/12 & 1.62 & \cb License update to LPPL Version 1.3c \\
+ 2020/03/14 & 1.63 & \cb Removing pause marks with \meta{chunk range} optional parameter\\
\bottomrule
- \end{tabularx}
+ \end{longtable}
\end{small}
- \caption{Brief History of the \xpackage{quran} Development}
- \end{table}
\end{History}
diff --git a/macros/xetex/latex/quran/doc/quran-test.pdf b/macros/xetex/latex/quran/doc/quran-test.pdf
index 3ac1c65f93..3f045733d9 100644
--- a/macros/xetex/latex/quran/doc/quran-test.pdf
+++ b/macros/xetex/latex/quran/doc/quran-test.pdf
Binary files differ
diff --git a/macros/xetex/latex/quran/doc/quran-test1.pdf b/macros/xetex/latex/quran/doc/quran-test1.pdf
index 17e33396bc..06a32b8da0 100644
--- a/macros/xetex/latex/quran/doc/quran-test1.pdf
+++ b/macros/xetex/latex/quran/doc/quran-test1.pdf
Binary files differ
diff --git a/macros/xetex/latex/quran/doc/quran-test2.pdf b/macros/xetex/latex/quran/doc/quran-test2.pdf
index 54360a26b0..ea134ee1ad 100644
--- a/macros/xetex/latex/quran/doc/quran-test2.pdf
+++ b/macros/xetex/latex/quran/doc/quran-test2.pdf
Binary files differ
diff --git a/macros/xetex/latex/quran/tex/quran.sty b/macros/xetex/latex/quran/tex/quran.sty
index f5c41924a4..ecc1a85c73 100644
--- a/macros/xetex/latex/quran/tex/quran.sty
+++ b/macros/xetex/latex/quran/tex/quran.sty
@@ -20,14 +20,14 @@
%% to one who has devoted his life to Quran
%%
\NeedsTeXFormat{LaTeX2e}
-\def\qurandate{2020/03/12}
-\def\quranversion{1.62}
+\def\qurandate{2020/03/14}
+\def\quranversion{1.63}
\ProvidesPackage{quran}[\qurandate\space v\quranversion^^JAn easy way to typeset the whole or any parts of the holy Quran]
\RequirePackage{ifxetex}
\RequirePackage{biditools}
\RequirePackage{xkeyval}
\RequirePackage{listofitems}
-\setsepchar{ ||\qt@par||\par}\ignoreemptyitems%
+\setsepchar{ ||\qt@par||\par||ۖ||ۗ||ۘ||ۙ||ۚ||ۛ||ۜ||۞}\ignoreemptyitems%
\RequirePackage{xparse}
\RequirePackage{xstring}
\RequirePackage{xspace}
diff --git a/support/detex/Flex-patch b/obsolete/support/detex/Flex-patch
index dd12337433..dd12337433 100644
--- a/support/detex/Flex-patch
+++ b/obsolete/support/detex/Flex-patch
diff --git a/support/detex/Makefile b/obsolete/support/detex/Makefile
index 14db5fdabd..14db5fdabd 100644
--- a/support/detex/Makefile
+++ b/obsolete/support/detex/Makefile
diff --git a/support/detex/README b/obsolete/support/detex/README
index 59fb6b558c..59fb6b558c 100644
--- a/support/detex/README
+++ b/obsolete/support/detex/README
diff --git a/support/detex/detex.1l b/obsolete/support/detex/detex.1l
index 93e7100574..93e7100574 100644
--- a/support/detex/detex.1l
+++ b/obsolete/support/detex/detex.1l
diff --git a/support/detex/detex.h b/obsolete/support/detex/detex.h
index 2ed7fbf1eb..2ed7fbf1eb 100644
--- a/support/detex/detex.h
+++ b/obsolete/support/detex/detex.h
diff --git a/support/detex/detex.l b/obsolete/support/detex/detex.l
index 67b0266b61..67b0266b61 100644
--- a/support/detex/detex.l
+++ b/obsolete/support/detex/detex.l
diff --git a/support/detex/lexout.c b/obsolete/support/detex/lexout.c
index f7bb364f3a..f7bb364f3a 100644
--- a/support/detex/lexout.c
+++ b/obsolete/support/detex/lexout.c
diff --git a/support/detex/os2/README b/obsolete/support/detex/os2/README
index 7b0c562dd1..7b0c562dd1 100644
--- a/support/detex/os2/README
+++ b/obsolete/support/detex/os2/README
diff --git a/support/detex/os2/detex-32.def b/obsolete/support/detex/os2/detex-32.def
index 88cc9457ef..88cc9457ef 100644
--- a/support/detex/os2/detex-32.def
+++ b/obsolete/support/detex/os2/detex-32.def
diff --git a/support/detex/os2/detex.def b/obsolete/support/detex/os2/detex.def
index 616c315692..616c315692 100644
--- a/support/detex/os2/detex.def
+++ b/obsolete/support/detex/os2/detex.def
diff --git a/support/detex/os2/makefile.os2 b/obsolete/support/detex/os2/makefile.os2
index daf50a0b7b..daf50a0b7b 100644
--- a/support/detex/os2/makefile.os2
+++ b/obsolete/support/detex/os2/makefile.os2
diff --git a/support/detex/states.sed b/obsolete/support/detex/states.sed
index 1c99ebabe9..1c99ebabe9 100644
--- a/support/detex/states.sed
+++ b/obsolete/support/detex/states.sed
diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index 02f4cd82cf..1fcd604053 100644
--- a/systems/win32/miktex/tm/packages/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index da6d89a62a..e0f0540c04 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -2,9 +2,9 @@
[repository]
-date=1584220674
+date=1584306902
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=b271e3b73d7d949f490587a3ef4c75c0
+lstdigest=cbd1f765011dd43597cbba7aace6fde8
numpkg=3875
relstate=next
-version=7378
+version=7379
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index d98647b294..6616ac1e32 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -2,9 +2,9 @@
[repository]
-date=1584220322
+date=1584306703
lastupd=acronym hep-paper l3backend l3build lua-ul pst-spirograph quran schemata scholax thesis-gwu tugboat unicode-data autosp cases hitszthesis import langsci-avm oops pmhanguljamo pst-fractal
-lstdigest=aab422c5f6f6cfe46d882c331942b197
+lstdigest=15beabe33fae0ce078f1eeefdcac9d3d
numpkg=3875
relstate=stable
-version=7378
+version=7379
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog
index 90f118f69d..81d1263eba 100644
--- a/systems/win32/w32tex/ChangeLog
+++ b/systems/win32/w32tex/ChangeLog
@@ -1,5 +1,15 @@
W32TeX (x86 & x64) ChangeLog
+[2020/03/14]
+(01) dvitools-w32.tar.xz
+ Update dvisvgm.exe (2.9).
+(02) ltxpkgs.tar.xz
+ Update acronym, and l3build.
+(03) xetex-w32.tar.xz
+ Update quran.
+(04) win64/dvitools-w64.tar.xz
+ Update dvisvgm.exe (2.9).
+
[2020/03/13]
(01) aleph-w32.tar.xz
Update format files.
diff --git a/timestamp b/timestamp
index 09e5373c87..a67b9ac160 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2020-03-15-02-02
+2020-03-16-02-02