summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-04-12 12:19:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-04-12 12:19:09 +0000
commitd984cfa161205fb12b161143bc2ad34fab8f62e7 (patch)
treef14cdd0d2d426a41a7f5cd453aea338ff50d51bc /Build
parent71f5df284c02ef0e91223f5dba53370e1271f061 (diff)
texk/dvisvgm 1.9.2
git-svn-id: svn://tug.org/texlive/trunk@36781 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/README2
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog5
-rwxr-xr-xBuild/source/texk/dvisvgm/configure26
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.1/Makefile.am9
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/README12
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2-PATCHES/ChangeLog (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1-PATCHES/ChangeLog)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2-PATCHES/TL-Changes (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1-PATCHES/TL-Changes)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/AUTHORS (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/AUTHORS)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/COPYING (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/COPYING)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/ChangeLog (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/ChangeLog)273
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/INSTALL (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/INSTALL)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/LGPL-2.1.txt (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/LGPL-2.1.txt)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/Makefile.am26
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/NEWS (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/NEWS)11
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/README (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/README)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/Makefile.am)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/clipper.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/clipper.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/clipper.hpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/clipper.hpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/config.h.in (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/config.h.in)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/configure.ac (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/configure.ac)14
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/Makefile.am)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/conf-dblatex-man.xsl (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/conf-dblatex-man.xsl)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/conf-dblatex-pdf.xsl (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/conf-dblatex-pdf.xsl)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/dvisvgm.1 (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/dvisvgm.1)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/dvisvgm.txt.in (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/dvisvgm.txt.in)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/tweak-dblatex-pdf.xsl (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/tweak-dblatex-pdf.xsl)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/m4/ax_code_coverage.m4229
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BasicDVIReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BasicDVIReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BasicDVIReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BasicDVIReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bezier.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bezier.cpp)46
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bezier.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bezier.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BgColorSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BgColorSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BgColorSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BgColorSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bitmap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bitmap.cpp)100
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bitmap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bitmap.h)21
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BoundingBox.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BoundingBox.cpp)54
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BoundingBox.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BoundingBox.h)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMap.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapManager.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapManager.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CRC32.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CRC32.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CRC32.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CRC32.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Calculator.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Calculator.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Calculator.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Calculator.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CharMapID.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CharMapID.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CharMapID.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CharMapID.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Character.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Character.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CmdLineParserBase.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CmdLineParserBase.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CmdLineParserBase.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CmdLineParserBase.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Color.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Color.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Color.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Color.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ColorSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ColorSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ColorSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ColorSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CommandLine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CommandLine.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CommandLine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CommandLine.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DLLoader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DLLoader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DLLoader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DLLoader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIActions.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVG.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVG.cpp)11
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVG.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVG.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVGActions.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVGActions.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVGActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVGActions.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DependencyGraph.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DependencyGraph.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Directory.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Directory.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Directory.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Directory.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DvisvgmSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DvisvgmSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DvisvgmSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DvisvgmSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSFile.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSFile.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSFile.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSFile.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSToSVG.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSToSVG.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSToSVG.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSToSVG.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EmSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EmSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EmSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EmSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EncFile.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EncFile.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EncFile.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EncFile.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileFinder.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileFinder.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FilePath.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FilePath.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FilePath.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FilePath.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileSystem.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileSystem.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileSystem.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileSystem.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Font.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Font.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Font.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontCache.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontCache.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontCache.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontCache.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEncoding.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEncoding.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEngine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEngine.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEngine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEngine.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontManager.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontManager.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMap.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMetrics.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMetrics.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMetrics.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMetrics.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontStyle.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontStyle.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFGlyphTracer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFGlyphTracer.cpp)24
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFGlyphTracer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFGlyphTracer.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFReader.cpp)13
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFReader.h)1
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFTracer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFTracer.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFTracer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFTracer.h)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Ghostscript.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Ghostscript.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Ghostscript.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Ghostscript.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Glyph.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Glyph.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GlyphTracerMessages.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GlyphTracerMessages.h)17
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GraphicPath.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GraphicPath.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/HtmlSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/HtmlSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/HtmlSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/HtmlSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputBuffer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputBuffer.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputBuffer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputBuffer.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/JFM.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/JFM.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/JFM.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/JFM.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Length.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Length.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Length.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Length.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Makefile.am)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MapLine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MapLine.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MapLine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MapLine.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Matrix.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Matrix.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Matrix.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Matrix.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Message.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Message.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Message.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MessageException.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MessageException.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MetafontWrapper.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MetafontWrapper.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MetafontWrapper.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MetafontWrapper.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MiKTeXCom.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MiKTeXCom.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MiKTeXCom.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MiKTeXCom.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NoPsSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NoPsSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NoPsSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NoPsSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NumericRanges.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NumericRanges.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSFilter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSFilter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSInterpreter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSInterpreter.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSInterpreter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSInterpreter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPattern.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPattern.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPattern.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPattern.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPreviewFilter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPreviewFilter.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPreviewFilter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPreviewFilter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageRanges.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageRanges.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageRanges.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageRanges.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageSize.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageSize.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageSize.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageSize.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Pair.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Pair.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PathClipper.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PathClipper.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PathClipper.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PathClipper.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PdfSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PdfSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PdfSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PdfSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PreScanDVIReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PreScanDVIReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PreScanDVIReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PreScanDVIReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Process.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Process.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Process.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Process.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PsSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PsSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PsSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PsSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/RangeMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/RangeMap.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/RangeMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/RangeMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGOutput.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGOutput.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGOutput.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGOutput.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGTree.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGTree.cpp)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGTree.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGTree.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ShadingPatch.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ShadingPatch.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ShadingPatch.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ShadingPatch.h)1
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SignalHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SignalHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SignalHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SignalHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialActions.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialManager.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialManager.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamWriter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamWriter.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamWriter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamWriter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Subfont.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Subfont.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Subfont.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Subfont.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/System.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/System.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/System.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/System.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TFM.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TFM.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TFM.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TFM.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TensorProductPatch.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TensorProductPatch.cpp)17
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TensorProductPatch.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TensorProductPatch.h)3
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Terminal.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Terminal.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Terminal.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Terminal.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ToUnicodeMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ToUnicodeMap.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ToUnicodeMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ToUnicodeMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TpicSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TpicSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TpicSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TpicSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TriangularPatch.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TriangularPatch.cpp)21
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TriangularPatch.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TriangularPatch.h)3
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Unicode.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Unicode.cpp)5
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Unicode.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Unicode.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFActions.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VectorIterator.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VectorIterator.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VectorStream.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VectorStream.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLDocument.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLDocument.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLDocument.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLDocument.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLNode.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLNode.cpp)97
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLNode.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLNode.h)32
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLString.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLString.cpp)57
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLString.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLString.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/dvisvgm.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/dvisvgm.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/gzstream.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/gzstream.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/gzstream.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/gzstream.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/iapi.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/iapi.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ierrors.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ierrors.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/macros.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/macros.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/options.dtd (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/options.dtd)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/options.xml (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/options.xml)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/psdefs.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/psdefs.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/types.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/types.h)0
-rw-r--r--Build/source/texk/dvisvgm/version.ac2
-rw-r--r--Build/source/texk/kpathsea/win32/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.am10
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.in37
-rw-r--r--Build/source/texk/kpathsea/win32/fmtutil.c959
221 files changed, 821 insertions, 1368 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 95ccd98d8f4..f788b1a5ce5 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -59,7 +59,7 @@ dvipos - ?
dvipsk - maintained here, by us
-dvisvgm 1.9.1 - checked 1mar15
+dvisvgm 1.9.2 - checked 12apr15
http://downloads.sourceforge.net/dvisvgm/
gsftopk - from Paul Vojta's xdvi?
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 46c1132d8c6..b8072b1abbb 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Imported release 1.9.2.
+ * version.ac: Adapted.
+
2015-03-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* Imported release 1.9.1.
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index b5003689060..7a3dc266db4 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/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 (TeX Live) 1.9.1.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.9.2.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,12 +590,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisvgm (TeX Live)'
PACKAGE_TARNAME='dvisvgm--tex-live-'
-PACKAGE_VERSION='1.9.1'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.9.1'
+PACKAGE_VERSION='1.9.2'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.9.2'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="dvisvgm-1.9.1/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.9.2/src/dvisvgm.cpp"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1372,7 +1372,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 (TeX Live) 1.9.1 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.9.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1443,7 +1443,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.9.1:";;
+ short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.9.2:";;
esac
cat <<\_ACEOF
@@ -1583,7 +1583,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.9.1
+dvisvgm (TeX Live) configure 1.9.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2405,7 +2405,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 (TeX Live) $as_me 1.9.1, which was
+It was created by dvisvgm (TeX Live) $as_me 1.9.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8091,7 +8091,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisvgm--tex-live-'
- VERSION='1.9.1'
+ VERSION='1.9.2'
cat >>confdefs.h <<_ACEOF
@@ -18263,7 +18263,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.9.1
+dvisvgm (TeX Live) config.lt 1.9.2
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20074,7 +20074,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
fi
-DVISVGM_TREE=dvisvgm-1.9.1
+DVISVGM_TREE=dvisvgm-1.9.2
ac_config_files="$ac_config_files Makefile"
@@ -20626,7 +20626,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 (TeX Live) $as_me 1.9.1, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.9.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20692,7 +20692,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 (TeX Live) config.status 1.9.1
+dvisvgm (TeX Live) config.status 1.9.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.9.1/Makefile.am
deleted file mode 100644
index e15c9893d7a..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## This file is part of dvisvgm
-## Copyright (C) 2005-2015 Martin Gieseking <martin.gieseking@uos.de>
-##
-## Process this file with automake.
-
-AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = COPYING LGPL-2.1.txt
-SUBDIRS = clipper src tests doc
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/README b/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/README
deleted file mode 100644
index a3fec5e256d..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/README
+++ /dev/null
@@ -1,12 +0,0 @@
-dvisvgm-1.4 (2013-08-02)
-- added basic support for CMap files and CID-based fonts
-- added character mapping from CIDs to char codes based on the encoding tables of a non-CID font
-- added support for OTF fonts
-- added evaluation of bounding box data generated by the preview package
-- extended option --linkmark to mark hyperlinked areas with an arbitrary background color
-- PS handler: improved evaluation of PS header specials
-- PS handler: improved evaluation of operator 'show'
-- removed DOCTYPE declaration from generated SVG files
-- removed encoding attribute from xml declaration (replaces ISO-8859-1 with UTF-8)
-- various code improvements and refactorings
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.9.2-PATCHES/ChangeLog
index 7de5778c6a7..e8de4ebf0a2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Import release 1.9.2.
+
2015-03-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* Import release 1.9.1.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.9.2-PATCHES/TL-Changes
index ae28f181a01..fafacf533aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the dvisvgm-1.9.1 tree as obtained from:
+Changes applied to the dvisvgm-1.9.2 tree as obtained from:
http://downloads.sourceforge.net/dvisvgm/
Removed:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/ChangeLog
index 1c24535d2a2..35e78dcf8b8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/ChangeLog
@@ -1,3 +1,133 @@
+2015-04-07 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/SVGTree.cpp:
+ apply --precision settings to font-size attributes too
+
+ * NEWS, README.md:
+ updated NEWS and README.md
+
+ * .travis.yml, configure.ac, src/Doxyfile:
+ set version to 1.9.2
+
+2015-04-04 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/SVGOutputTest.cpp:
+ remove output files created by SVGOutputTest::getPageStream()
+
+2015-04-02 Martin Gieseking <martin.gieseking@uos.de>
+
+ * README.md:
+ minor additions to README.md
+
+2015-03-26 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/GFReader.cpp, src/GFReader.h, tests/GFReaderTest.cpp:
+ improved GFReaderTest
+
+ * src/GlyphTracerMessages.h:
+ always skip tracer message if no glyphs have been traced
+
+2015-03-25 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/DVIToSVG.cpp:
+ avoid retracing of fonts if option --no-fonts is given
+
+ * src/GFGlyphTracer.cpp, src/GFTracer.h, tests/GFGlyphTracerTest.cpp,
+ tests/Makefile.am:
+ ensure GFGlyphTracer::executeChar() returns the correct status; added
+ GFGlyphtracerTest
+
+2015-03-22 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/SVGOutputTest.cpp:
+ improved SVGOutputTest
+
+ * tests/StreamWriterTest.cpp:
+ fixed StreamWriterTest
+
+2015-03-19 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/Makefile.am, tests/ShadingPatch.cpp:
+ added ShadingPatchTest
+
+2015-03-18 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/TensorProductPatch.h, tests/TensorProductPatchTest.cpp:
+ improved TensorProductPatchTest
+
+ * src/Bezier.cpp, src/Bezier.h, src/TensorProductPatch.cpp,
+ src/TriangularPatch.cpp, src/TriangularPatch.h,
+ tests/TriangularPatchTest.cpp:
+ renamed method pointAt() of class Bezier and TriangularPatch to
+ valueAt()
+
+ * src/ShadingPatch.h, src/TensorProductPatch.cpp,
+ src/TensorProductPatch.h, src/TriangularPatch.cpp, src/TriangularPatch.h,
+ tests/Makefile.am, tests/TriangularPatchTest.cpp:
+ added test for class TriangularPatch
+
+2015-03-17 Martin Gieseking <martin.gieseking@uos.de>
+
+ * autogen.sh:
+ updated autogen.sh
+
+2015-03-15 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/Makefile.am, tests/VectorIteratorTest.cpp:
+ added VectorIteratorTest
+
+ * Makefile.am, clipper/Makefile.am, configure.ac, m4/ax_code_coverage.m4,
+ src/Makefile.am, tests/Makefile.am, tests/create-makefile:
+ extended build system to generate coverage reports
+
+ * src/XMLNode.cpp, src/XMLNode.h, tests/Makefile.am,
+ tests/XMLNodeTest.cpp:
+ fixed a few issues in class XMLElementNode; added XMLNodeTest
+
+2015-03-13 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/XMLStringTest.cpp:
+ fixed test class name of XMLString
+
+2015-03-09 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/GraphicPathTest.cpp:
+ extended tests of class GraphicPath
+
+ * tests/CRC32Test.cpp:
+ added test for 'compute' methods of class CRC32
+
+2015-03-08 Martin Gieseking <martin.gieseking@uos.de>
+
+ * tests/StreamReaderTest.cpp:
+ exteded StreamReader tests
+
+2015-03-07 Martin Gieseking <martin.gieseking@uos.de>
+
+ * .gitignore:
+ added .gitignore
+
+ * src/XMLString.cpp, tests/Makefile.am, tests/XMLStringTest.cpp:
+ fixed conversion from C and C++ strings to XMLString; added
+ XMLStringTest
+
+2015-03-06 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/BoundingBox.cpp, src/BoundingBox.h, tests/BoundingBoxTest.cpp:
+ improved BoundingBox tests
+
+ * src/Bitmap.cpp, src/Bitmap.h, tests/BitmapTest.cpp,
+ tests/GFReaderTest.cpp, tests/Makefile.am:
+ small refactorings of class Bitmap; added tests for class Bitmap
+
+2015-03-01 Martin Gieseking <martin.gieseking@uos.de>
+
+ * README.md:
+ added license badge to README.md
+
+ * .travis.yml:
+ Travis conf: added configuration data for Coverity Scan
+
2015-02-28 Martin Gieseking <martin.gieseking@uos.de>
* NEWS, README.md:
@@ -31,9 +161,9 @@
* doc/dvisvgm.txt.in:
minor additions and formatting changes of the manpage
- * src/DVIToSVG.cpp, src/EPSToSVG.cpp, src/Makefile.am, src/SVGOutput.cpp,
- src/SVGOutput.h, src/SVGOutputBase.h, src/dvisvgm.cpp:
- moved class SVGOutput to separate compilation unit
+ * doc/dvisvgm.txt.in, src/SVGOutput.cpp, src/SVGOutput.h,
+ tests/Makefile.am, tests/SVGOutputTest.cpp, tests/create-makefile:
+ added width specifiers and exression evaluation to --output patterns
2015-02-19 Martin Gieseking <martin.gieseking@uos.de>
@@ -59,6 +189,11 @@
* src/TpicSpecialHandler.cpp:
use constant M_PI rather than computing PI locally
+2015-02-17 Martin Gieseking <martin.gieseking@uos.de>
+
+ * README, README.md:
+ updated README and README.md
+
2015-01-21 Martin Gieseking <martin.gieseking@uos.de>
* src/TensorProductPatch.cpp, src/TriangularPatch.cpp:
@@ -374,8 +509,10 @@ Breaks standard things
* src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h:
removed unused emit() methods from XML classes
- * src/dvisvgm.cpp:
- removed old code that moved cache files to new location
+2014-08-06 Martin Gieseking <martin.gieseking@uos.de>
+
+ * README.md:
+ minor fixes to README.md
2014-07-31 Martin Gieseking <martin.gieseking@uos.de>
@@ -1017,10 +1154,10 @@ Breaks standard things
replaced local std::map tables used in Font classes with new class
CharMap
-2013-08-23 Martin Gieseking <martin.gieseking@uos.de>
+2013-08-22 Martin Gieseking <martin.gieseking@uos.de>
- * src/SVGTree.cpp:
- appended px unit to font-size attributes in style section
+ * src/XMLString.cpp:
+ replace very small floating point numbers by 0
2013-08-20 Martin Gieseking <martin.gieseking@uos.de>
@@ -1323,9 +1460,8 @@ Breaks standard things
src/VFReader.cpp:
added missing member initializations to some classes
- * doc/dvisvgm.txt.in, src/CmdLineParserBase.cpp, src/CommandLine.cpp,
- src/options.dtd, src/options.xml:
- added information about 'dvisvgm -E' to usage line
+ * src/DVIToSVG.cpp, src/EPSToSVG.cpp, src/dvisvgm.cpp:
+ avoid output of empty parentheses if TARGET_SYSTEM is not set
2013-04-20 Martin Gieseking <martin.gieseking@uos.de>
@@ -1418,21 +1554,11 @@ Breaks standard things
added methods to lookup attribute values and selected descendant XML
nodes
- * src/XMLNode.cpp, src/XMLNode.h:
- added virtual constructor XMLNode::clone()
-
2013-02-19 Martin Gieseking <martin.gieseking@uos.de>
* src/FilePath.cpp:
adapt path separators on Windows systems to get the correct output path
- * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h,
- src/DVIToSVG.cpp, src/DVIToSVG.h, src/EPSFile.cpp, src/EPSFile.h,
- src/EPSToSVG.cpp, src/EPSToSVG.h, src/Makefile.am,
- src/PsSpecialHandler.cpp, src/SVGOutputBase.h, src/dvisvgm.cpp,
- src/options.xml:
- add option to directly convert EPS files to SVG
-
* src/PSInterpreter.cpp, src/PSInterpreter.h:
added PSInterpreter::limit() to limit the number of bytes to be
processed
@@ -1449,6 +1575,15 @@ Breaks standard things
src/CommandLine.cpp, src/CommandLine.h, src/dvisvgm.cpp, src/options.xml:
added optional parameter to option --help to specify output format
+2013-02-06 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/dvisvgm.txt.in, src/BoundingBox.cpp, src/CommandLine.cpp,
+ src/CommandLine.h, src/EmSpecialHandler.cpp, src/GraphicPath.h,
+ src/Matrix.cpp, src/PsSpecialHandler.cpp, src/TpicSpecialHandler.cpp,
+ src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/options.xml:
+ added option --precision to set the number of decimal places applied to
+ attribute values
+
2013-01-30 Martin Gieseking <martin.gieseking@uos.de>
* src/CommandLine.cpp:
@@ -1685,6 +1820,11 @@ Breaks standard things
tests/StreamInputBufferTest.cpp:
some refactorings of class InputReader; added InputReader::find()
+2012-10-24 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/DVIToSVG.cpp, src/DVIToSVG.h, src/dvisvgm.cpp:
+ don't show warning about disabled PS support in list of special handlers
+
2012-09-27 Martin Gieseking <martin.gieseking@uos.de>
* doc/Makefile.am:
@@ -1701,21 +1841,19 @@ Breaks standard things
* src/PsSpecialHandler.cpp, src/PsSpecialHandler.h:
removed Ghostscript info from ps entry in list of special handlers
-2012-09-19 Martin Gieseking <martin.gieseking@uos.de>
-
- * src/psdefs.ps, src/psdefs.psc:
- ignore dvips bop operators that might be present in PS specials
-
-2012-09-17 Martin Gieseking <martin.gieseking@uos.de>
-
- * src/StreamReader.cpp:
- fixed reading invalid number of string characters
+ * src/DVIToSVG.cpp:
+ show warning if processing of PS specials is disabled
2012-06-06 Martin Gieseking <martin.gieseking@uos.de>
* src/gfprint.mak:
fixed bugs in gfprint, and added gfprint.mak for easier builds
+2012-04-17 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/Makefile.am:
+ keep manpage when calling 'make clean' or 'make distclean'
+
2012-04-04 Martin Gieseking <martin.gieseking@uos.de>
* src/DVIToSVGActions.cpp, src/SVGTree.cpp, src/SVGTree.h,
@@ -1770,6 +1908,15 @@ Breaks standard things
* README:
updated information about bug reporting
+2012-01-26 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/CmdLineParserBase.h, src/DVIActions.h, src/DVIReader.h,
+ src/DVIToSVGActions.h, src/FontEngine.h, src/FontManager.h,
+ src/MetafontWrapper.h, src/SVGTree.h, src/SpecialActions.h,
+ src/SpecialHandler.h, src/SpecialManager.h, src/TFM.h, src/VFReader.h:
+ adapt forward declarations of classes and structs to their corresponding
+ definition (SF bug #3480013)
+
2012-01-09 Martin Gieseking <martin.gieseking@uos.de>
* src/TpicSpecialHandler.cpp:
@@ -2619,10 +2766,6 @@ Breaks standard things
src/SVGFontEmitter.cpp, src/SVGFontEmitter.h:
removed class Glyph and incorporated its functionality into Font class
- * src/Font.h, src/FontEncoding.cpp, src/FontEncoding.h,
- src/FontManager.cpp, src/FontManager.h, src/SVGFontEmitter.cpp:
- moved method encoding() from class FontManager to class FontEncoding
-
2010-02-05 Martin Gieseking <martin.gieseking@uos.de>
* src/DVIToSVG.cpp:
@@ -2850,10 +2993,10 @@ Breaks standard things
* src/GraphicPath.h, src/PsSpecialHandler.cpp:
PS handler: replace zero-length paths by dots
-2009-10-25 Martin Gieseking <martin.gieseking@uos.de>
+2009-10-29 Martin Gieseking <martin.gieseking@uos.de>
- * src/DvisvgmSpecialHandler.cpp:
- added macro {?nl} to dvisvgm:raw evaluator
+ * src/DVIToSVGActions.cpp, src/Font.cpp, src/Font.h:
+ fixed positioning of italic characters
2009-10-18 Martin Gieseking <martin.gieseking@uos.de>
@@ -3018,25 +3161,25 @@ Breaks standard things
* NEWS, src/PsSpecialHandler.cpp:
fixed another positioning bug reported by John Bowman
-2009-10-04 Martin Gieseking <martin.gieseking@uos.de>
+ * src/PsSpecialHandler.cpp:
+ convert PS path coordinated to TeX point units
- * src/Makefile.old, src/Makefile.orig:
- renamed the old original Makefile
+2009-10-04 Martin Gieseking <martin.gieseking@uos.de>
* src/GraphicPath.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h:
corrected positioning bug introduced with previous PS positioning fix
- * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVGActions.cpp,
- src/DVIToSVGActions.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h,
- src/SpecialActions.h, src/psdefs.ps, src/psdefs.psc:
- fixed positioning bug reported by John Bowman
-
2009-10-02 Martin Gieseking <martin.gieseking@uos.de>
* doc/Makefile.am, doc/dvisvgm.txt.in:
generate pdf manpage directly with groff; adapted manpage source to work
with latest asciidoc
+2009-10-01 Martin Gieseking <martin.gieseking@uos.de>
+
+ * doc/Makefile.am, doc/dvisvgm.txt.in:
+ replaced backticks in manpage by apostrophes; updated date on homepage
+
2009-09-30 Martin Gieseking <martin.gieseking@uos.de>
* Makefile.am, configure.ac, fedora/dvisvgm.spec, src/Doxyfile:
@@ -3048,17 +3191,13 @@ Breaks standard things
* doc/dvisvgm.txt.in:
added dvisvgm:raw example to man page
- * src/DvisvgmSpecialHandler.cpp:
- added optional depth parameter to special dvisvgm:raw
-
2009-09-17 Martin Gieseking <martin.gieseking@uos.de>
* doc/dvisvgm.txt.in:
minor changes of the documentation
- * doc/dvisvgm.txt.in:
- corrected info about --verbosity in manual page (reported by John
- Bowman)
+ * fedora/dvisvgm.spec:
+ updated spec file and fixed typo on website
* src/PsSpecialHandler.h:
increased the default linewidth to 0.5
@@ -3155,21 +3294,14 @@ Breaks standard things
src/SpecialManager.cpp, src/SpecialManager.h:
PS prologue files referenced in first page are now always loaded
- * fedora/dvisvgm-0.8.1-potrace.patch, fedora/dvisvgm-gs.patch,
- fedora/dvisvgm-potrace.patch, fedora/dvisvgm.spec:
- updated Fedora files
-
* configure.ac, fedora/dvisvgm.spec, src/Ghostscript.cpp,
src/Ghostscript.h, src/Makefile.am:
improved Ghostscript and potrace linking checks to simplify usage of
external devel files
-2009-08-25 Martin Gieseking <martin.gieseking@uos.de>
-
- * configure.ac, src/DVIToSVGActions.cpp, src/Ghostscript.cpp,
- src/Ghostscript.h:
- added configuration method to directly bind the Ghostscript shared
- library
+ * fedora/dvisvgm-0.8.1-potrace.patch, fedora/dvisvgm-gs.patch,
+ fedora/dvisvgm-potrace.patch, fedora/dvisvgm.spec:
+ updated Fedora files
2009-08-24 Martin Gieseking <martin.gieseking@uos.de>
@@ -3554,10 +3686,10 @@ Breaks standard things
2009-02-25 Martin Gieseking <martin.gieseking@uos.de>
- * configure.ac, doc/Makefile.am, doc/caution.png, doc/dvisvgm.1.in,
- doc/dvisvgm.txt, doc/note.png:
- replaced manually written dvisvgm.1.in by an asciidoc file
- (dvisvgm.txt.in)
+ * src/DVIToSVGActions.cpp, src/DVIToSVGActions.h,
+ src/DvisvgmSpecialHandler.cpp, src/EmSpecialHandler.cpp,
+ src/SpecialActions.h, src/TpicSpecialHandler.cpp:
+ renamed appendInPage() to appendToPage
2009-02-24 Martin Gieseking <martin.gieseking@uos.de>
@@ -3617,14 +3749,9 @@ Breaks standard things
2009-02-17 Martin Gieseking <martin.gieseking@uos.de>
- * src/BoundingBox.cpp, src/ColorSpecialHandler.cpp,
- src/ColorSpecialHandler.h, src/DVIToSVGActions.cpp, src/FontGlyph.cpp,
- src/InputBuffer.cpp, src/InputBuffer.h, src/Makefile.am, src/Pair.h,
- src/SpecialActions.h, src/SpecialColorHandler.cpp,
- src/SpecialColorHandler.h, src/SpecialEmHandler.cpp,
- src/SpecialEmHandler.h, src/TransformationMatrix.cpp,
- src/tests/ColorSpecialTest.h:
- added skeleton of em special handler; doesn't work yet
+ * src/DVIReader.cpp:
+ made DVICommand local to executeCommand, removed unnecessary if
+ statement
2009-02-15 Martin Gieseking <martin.gieseking@uos.de>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.2/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/Makefile.am
new file mode 100644
index 00000000000..bb09ff58c1f
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/Makefile.am
@@ -0,0 +1,26 @@
+## This file is part of dvisvgm
+## Copyright (C) 2005-2015 Martin Gieseking <martin.gieseking@uos.de>
+##
+## Process this file with automake.
+
+AUTOMAKE_OPTIONS = foreign
+EXTRA_DIST = COPYING LGPL-2.1.txt
+SUBDIRS = clipper src tests doc
+
+if CODE_COVERAGE_ENABLED
+lcov_dir=$(top_builddir)/lcov
+lcov_file=$(lcov_dir)/lcov.info
+
+lcov-report:
+ @mkdir -p $(lcov_dir)
+ lcov --capture --directory . --no-external -o $(lcov_file)
+ lcov --remove $(lcov_file) "gzstream.*" -o $(lcov_file)
+ genhtml --title "dvisvgm" --num-spaces 2 --legend -o $(lcov_dir) $(lcov_file)
+
+lcov-clean:
+ @rm -rf $(lcov_dir)
+ @find . -name "*.gcda" -exec rm {} \;
+ lcov --zerocounters --directory .
+
+coverage: lcov-clean check lcov-report
+endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/NEWS
index aebb6907224..ae53d02773e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/NEWS
@@ -1,8 +1,15 @@
+dvisvgm-1.9.2 (2015-04-08)
+- avoid retracing of fonts if option --no-fonts and --trace-all=y are given
+- skip tracer messages if no glyphs have been traced
+- extended the build system to generate code coverage reports
+- improved some tests of the test suite
+- some general code refactorings and improvements
+
dvisvgm-1.9.1 (2015-02-28)
- extended --output pattern syntax by arithmetic expressions and width specifiers
- improved formatting of manpage
- fixed Clang build issue (patch by Peter Breitenlohner)
-- fixed a build issue occured with old MinGW compilers
+- fixed a build issue occurred with old MinGW compilers
- code cleanup and refactorings
dvisvgm-1.9 (2014-12-29)
@@ -23,7 +30,7 @@ dvisvgm-1.9 (2014-12-29)
dvisvgm-1.8.1 (2014-08-29)
- unreferenced clipPath elements are now removed from the SVG files
-- fixed side-effectes caused by unexpected bop/eop operators in
+- fixed side-effects caused by unexpected bop/eop operators in
PS specials (LP bug #1350688)
- few improvements to configure.ac (patches by Khaled Hosny)
- removed redundant code
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/README b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/README
index f0e313387c4..f0e313387c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/Makefile.am
index a24a478e587..2da73955400 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/Makefile.am
@@ -1,7 +1,9 @@
noinst_LIBRARIES = libclipper.a
libclipper_a_SOURCES = clipper.cpp clipper.hpp
-
AM_CXXFLAGS = -Wall
clipper.cpp: clipper.hpp
+@CODE_COVERAGE_RULES@
+
+CLEANFILES = *.gcda *.gcno
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/clipper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/clipper.cpp
index 89b7e8e683d..89b7e8e683d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/clipper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/clipper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/clipper.hpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/clipper.hpp
index 566289f82b1..566289f82b1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/clipper/clipper.hpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/clipper/clipper.hpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/configure.ac
index 68cf96db2d9..bac329af3e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/configure.ac
@@ -4,10 +4,11 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.9.1],[martin.gieseking@uos.de])
-DATE="February 2015"
+AC_INIT([dvisvgm],[1.9.2],[martin.gieseking@uos.de])
+DATE="April 2015"
AC_CONFIG_SRCDIR(src)
AC_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
@@ -158,6 +159,15 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <kpathsea/kpathsea.h>]],
[Define to 1 if the kpathsea headers are not C++ safe.])])
AC_LANG_POP([C++])
+AX_CODE_COVERAGE
+AS_IF([ test "$enable_code_coverage" = "yes" ], [
+ # disable optimization
+ changequote({,})
+ CFLAGS=`echo $CFLAGS | sed 's/-O[1-9s]//g'`
+ CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[1-9s]//g'`
+ changequote([,])
+])
+
AC_SUBST(DATE)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_LDFLAGS)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/Makefile.am
index 3acae1631c4..3acae1631c4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/conf-dblatex-man.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/conf-dblatex-man.xsl
index 23283210027..23283210027 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/conf-dblatex-man.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/conf-dblatex-man.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/conf-dblatex-pdf.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/conf-dblatex-pdf.xsl
index 2a8aeec290a..2a8aeec290a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/conf-dblatex-pdf.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/conf-dblatex-pdf.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/dvisvgm.1
index 105037972ba..9be7787de8a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/dvisvgm.1
@@ -2,12 +2,12 @@
.\" Title: dvisvgm
.\" Author: Martin Gieseking <martin.gieseking@uos.de>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 02/28/2015
+.\" Date: 04/07/2015
.\" Manual: dvisvgm Manual
-.\" Source: dvisvgm 1.9.1
+.\" Source: dvisvgm 1.9.2
.\" Language: English
.\"
-.TH "DVISVGM" "1" "02/28/2015" "dvisvgm 1\&.9\&.1" "dvisvgm Manual"
+.TH "DVISVGM" "1" "04/07/2015" "dvisvgm 1\&.9\&.2" "dvisvgm Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/dvisvgm.txt.in
index 767700ceb2e..767700ceb2e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/dvisvgm.txt.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/tweak-dblatex-pdf.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/tweak-dblatex-pdf.xsl
index a28bbb97e30..a28bbb97e30 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/doc/tweak-dblatex-pdf.xsl
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/doc/tweak-dblatex-pdf.xsl
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.2/m4/ax_code_coverage.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/m4/ax_code_coverage.m4
new file mode 100644
index 00000000000..2751459c1d1
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/m4/ax_code_coverage.m4
@@ -0,0 +1,229 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_CODE_COVERAGE()
+#
+# DESCRIPTION
+#
+# Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be
+# included in the CFLAGS and LIBS/LDFLAGS variables of every build target
+# (program or library) which should be built with code coverage support.
+# Also defines CODE_COVERAGE_RULES which should be substituted in your
+# Makefile; and $enable_code_coverage which can be used in subsequent
+# configure output. CODE_COVERAGE_ENABLED is defined and substituted, and
+# corresponds to the value of the --enable-code-coverage option, which
+# defaults to being disabled.
+#
+# Test also for gcov program and create GCOV variable that could be
+# substituted.
+#
+# Note that all optimisation flags in CFLAGS must be disabled when code
+# coverage is enabled.
+#
+# Usage example:
+#
+# configure.ac:
+#
+# AX_CODE_COVERAGE
+#
+# Makefile.am:
+#
+# @CODE_COVERAGE_RULES@
+# my_program_LIBS = ... $(CODE_COVERAGE_LDFLAGS) ...
+# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
+#
+# This results in a "check-code-coverage" rule being added to any
+# Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
+# has been configured with --enable-code-coverage). Running `make
+# check-code-coverage` in that directory will run the module's test suite
+# (`make check`) and build a code coverage report detailing the code which
+# was touched, then print the URI for the report.
+#
+# This code was derived from Makefile.decl in GLib, originally licenced
+# under LGPLv2.1+.
+#
+# LICENSE
+#
+# Copyright (c) 2012 Philip Withnall
+# Copyright (c) 2012 Xan Lopez
+# Copyright (c) 2012 Christian Persch
+# Copyright (c) 2012 Paolo Borelli
+# Copyright (c) 2012 Dan Winship
+# Copyright (c) 2015 Bastien ROUCARIES
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or (at
+# your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#serial 5
+
+AC_DEFUN([AX_CODE_COVERAGE],[
+ dnl Check for --enable-code-coverage
+ AC_REQUIRE([AC_PROG_SED])
+
+ # allow to override gcov location
+ AC_ARG_WITH([gcov],
+ [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
+ [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
+ [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
+
+ AC_MSG_CHECKING([whether to build with code coverage support])
+ AC_ARG_ENABLE([code-coverage],
+ AS_HELP_STRING([--enable-code-coverage],
+ [Whether to enable code coverage support]),,
+ enable_code_coverage=no)
+
+ AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
+ AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
+ AC_MSG_RESULT($enable_code_coverage)
+
+ AS_IF([ test "$enable_code_coverage" = "yes" ], [
+ # check for gcov
+ AC_CHECK_TOOL([GCOV],
+ [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
+ [:])
+ AS_IF([test "X$GCOV" = "X:"],
+ [AC_MSG_ERROR([gcov is needed to do coverage])])
+ AC_SUBST([GCOV])
+
+ dnl Check if gcc is being used
+ AS_IF([ test "$GCC" = "no" ], [
+ AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
+ ])
+
+ # List of supported lcov versions.
+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
+
+ AC_CHECK_PROG([LCOV], [lcov], [lcov])
+ AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
+
+ AS_IF([ test "$LCOV" ], [
+ AC_CACHE_CHECK([for lcov version], ax_cv_lcov_version, [
+ ax_cv_lcov_version=invalid
+ lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+ for lcov_check_version in $lcov_version_list; do
+ if test "$lcov_version" = "$lcov_check_version"; then
+ ax_cv_lcov_version="$lcov_check_version (ok)"
+ fi
+ done
+ ])
+ ], [
+ lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+ AC_MSG_ERROR([$lcov_msg])
+ ])
+
+ case $ax_cv_lcov_version in
+ ""|invalid[)]
+ lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+ AC_MSG_ERROR([$lcov_msg])
+ LCOV="exit 0;"
+ ;;
+ esac
+
+ AS_IF([ test -z "$GENHTML" ], [
+ AC_MSG_ERROR([Could not find genhtml from the lcov package])
+ ])
+
+ dnl Build the code coverage flags
+ CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+ CODE_COVERAGE_LDFLAGS="-lgcov"
+
+ AC_SUBST([CODE_COVERAGE_CFLAGS])
+ AC_SUBST([CODE_COVERAGE_LDFLAGS])
+ ])
+
+CODE_COVERAGE_RULES='
+# Code coverage
+#
+# Optional:
+# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
+# (Default: $(top_builddir))
+# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
+# by lcov for code coverage. (Default:
+# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
+# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
+# reports to be created. (Default:
+# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
+# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
+# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance.
+# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
+# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance.
+# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
+# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
+# instance. (Default: empty)
+# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
+#
+# The generated report will be titled using the $(PACKAGE_NAME) and
+# $(PACKAGE_VERSION). In order to add the current git hash to the title,
+# use the git-version-gen script, available online.
+
+# Optional variables
+CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
+CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
+CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
+CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
+CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
+CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
+CODE_COVERAGE_GENHTML_OPTIONS ?=
+CODE_COVERAGE_IGNORE_PATTERN ?=
+
+code_coverage_quiet = $(code_coverage_quiet_$(V))
+code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
+code_coverage_quiet_0 = --quiet
+
+# Use recursive makes in order to ignore errors during check
+check-code-coverage:
+ifeq ($(CODE_COVERAGE_ENABLED),yes)
+ -$(MAKE) $(AM_MAKEFLAGS) -k check
+ $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
+else
+ @echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Capture code coverage data
+code-coverage-capture: code-coverage-capture-hook
+ifeq ($(CODE_COVERAGE_ENABLED),yes)
+ $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS)
+ $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)"
+ -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
+ LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
+ @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
+else
+ @echo "Need to reconfigure with --enable-code-coverage"
+endif
+
+# Hook rule executed before code-coverage-capture, overridable by the user
+code-coverage-capture-hook:
+
+ifeq ($(CODE_COVERAGE_ENABLED),yes)
+clean: code-coverage-clean
+code-coverage-clean:
+ -$(LCOV) --directory $(top_builddir) -z
+ -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+ -find . -name "*.gcda" -o -name "*.gcov" -delete
+endif
+
+GITIGNOREFILES ?=
+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+
+DISTCHECK_CONFIGURE_FLAGS ?=
+DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+
+.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
+'
+
+ AC_SUBST([CODE_COVERAGE_RULES])
+ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
+])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BasicDVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BasicDVIReader.cpp
index 0095accfb9d..0095accfb9d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BasicDVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BasicDVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BasicDVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BasicDVIReader.h
index 3003ecc600c..3003ecc600c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BasicDVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BasicDVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bezier.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bezier.cpp
index eec830a5959..46cc79d69d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bezier.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bezier.cpp
@@ -18,6 +18,7 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#include <algorithm>
#include <utility>
#include "Bezier.h"
@@ -45,7 +46,7 @@ Bezier::Bezier (const DPair &p0, const DPair &p1, const DPair &p2, const DPair &
* @param[in] t1 'time' parameter \f$\in[0,1]\f$ of source curve where the subcurve ends */
Bezier::Bezier (const Bezier &source, double t0, double t1) {
if (t0 == t1)
- _points[0] = _points[1] = _points[2] = _points[3] = source.pointAt(t0);
+ _points[0] = _points[1] = _points[2] = _points[3] = source.valueAt(t0);
else {
if (t0 > t1)
swap(t0, t1);
@@ -76,7 +77,7 @@ void Bezier::reverse() {
}
-DPair Bezier::pointAt (double t) const {
+DPair Bezier::valueAt (double t) const {
const double s = 1-t;
return _points[0]*s*s*s + _points[1]*3.0*s*s*t + _points[2]*3.0*s*t*t + _points[3]*t*t*t;
}
@@ -150,8 +151,9 @@ int Bezier::approximate (double delta, double t0, double t1, vector<DPair> &p, v
}
+/** Returns the signed area of the triangle (p1, p2, p3). */
static inline double signed_area (const DPair &p1, const DPair &p2, const DPair &p3) {
- return (p2.x()-p1.x())*(p3.y()-p1.y()) - (p3.x()-p1.x())*(p2.y()-p1.y());
+ return ((p2.x()-p1.x())*(p3.y()-p1.y()) - (p3.x()-p1.x())*(p2.y()-p1.y()))/2.0;
}
@@ -160,12 +162,17 @@ static inline double dot_prod (const DPair &p1, const DPair &p2) {
}
+/** Returns true if p3 is located between p1 and p2, i.e. p3 lays almost on the line
+ * between p1 and p2. */
static bool between (const DPair &p1, const DPair &p2, const DPair &p3, double delta) {
- if (fabs(signed_area(p1, p2, p3)) < delta) {
- double dotp = dot_prod(p2-p1, p3-p1);
- return dotp > 0 && dotp < dot_prod(p2-p1, p2-p1);
- }
- return false;
+ 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));
+ 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()
+ && min(p1.y(), p2.y()) <= p3.y()
+ && max(p1.y(), p2.y()) >= p3.y();
}
@@ -175,11 +182,17 @@ static inline bool near (const DPair &p1, const DPair &p2, double delta) {
}
+/** Tries to reduce the degree of the Bézier curve. This only works if the number of
+ * control points can be reduces without changing the shape of the curve significantly.
+ * @param[in] delta deviation tolerance
+ * @param[in] p control points of the reduced curve
+ * @return degree of the reduced curve */
int Bezier::reduceDegree (double delta, vector<DPair> &p) const {
+ p.clear();
if (near(_points[0], _points[1], delta) && near(_points[0], _points[2], delta) && near(_points[0], _points[3], delta))
p.push_back(_points[0]);
- else if (between(_points[0], _points[1], _points[3], delta) && between(_points[0], _points[2], _points[3], delta)) {
- p.push_back(_points[1]);
+ else if (between(_points[0], _points[3], _points[1], delta) && between(_points[0], _points[3], _points[2], delta)) {
+ p.push_back(_points[0]);
p.push_back(_points[3]);
}
else if (near((_points[1]-_points[0])*1.5+_points[0], (_points[2]-_points[3])*1.5+_points[3], delta)) {
@@ -188,8 +201,9 @@ int Bezier::reduceDegree (double delta, vector<DPair> &p) const {
p.push_back(_points[3]);
}
else {
+ p.resize(4);
for (int i=0; i < 4; i++)
- p.push_back(p[i]);
+ p[i] = _points[i];
}
return p.size()-1;
}
@@ -227,16 +241,16 @@ void Bezier::getBBox (BoundingBox &bbox) const {
double t1, t2;
if (solve_quadratic_equation(pa.x(), pb.x(), pc.x(), t1, t2)) {
if (t1 > 0.001 && t1 < 0.999)
- bbox.embed(pointAt(t1));
+ bbox.embed(valueAt(t1));
if (t1 != t2 && t2 > 0.001 && t2 < 0.999)
- bbox.embed(pointAt(t2));
+ bbox.embed(valueAt(t2));
}
if (solve_quadratic_equation(pa.y(), pb.y(), pc.y(), t1, t2)) {
if (t1 > 0.001 && t1 < 0.999)
- bbox.embed(pointAt(t1));
+ bbox.embed(valueAt(t1));
if (t1 != t2 && t2 > 0.001 && t2 < 0.999)
- bbox.embed(pointAt(t2));
+ bbox.embed(valueAt(t2));
}
bbox.embed(_points[0]);
bbox.embed(_points[3]);
-} \ No newline at end of file
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bezier.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bezier.h
index fd7ad12fdb4..dcb6ee393c6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bezier.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bezier.h
@@ -34,7 +34,7 @@ class Bezier
Bezier (const Bezier &source, double t0, double t1);
void setPoints (const DPair &p0, const DPair &p1, const DPair &p2, const DPair &p3);
void reverse ();
- DPair pointAt (double t) const;
+ DPair valueAt (double t) const;
DPair blossomValue (double u, double v, double w) const;
void subdivide (double t, Bezier *bezier1, Bezier *bezier2) const;
int approximate (double delta, std::vector<DPair> &p, std::vector<double> *t=0) const;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BgColorSpecialHandler.cpp
index 43bf3a9f68b..43bf3a9f68b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BgColorSpecialHandler.h
index 1d7ec2fbd10..1d7ec2fbd10 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bitmap.cpp
index 3bdbf6e1054..642f079b7ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bitmap.cpp
@@ -22,6 +22,7 @@
#include <algorithm>
#include <cstdlib>
#include <iostream>
+#include <limits>
#include "Bitmap.h"
#include "macros.h"
@@ -56,62 +57,99 @@ void Bitmap::resize (int minx, int maxx, int miny , int maxy) {
/** Sets n pixels of row r to 1 starting at pixel c.
- * @param[in] r number of row
- * @param[in] c number of column (pixel)
+ * @param[in] row number of row
+ * @param[in] col number of column (pixel)
* @param[in] n number of bits to be set */
-void Bitmap::setBits (int r, int c, int n) {
- r -= _yshift;
- c -= _xshift;
- UInt8 *byte = &_bytes[r*_bpr + c/8];// + (c%8 ? 1 : 0);
- while (n > 0) {
- int b = 7 - c%8; // number of leftmost bit in current byte to be set
+void Bitmap::setBits (int row, int col, int n) {
+ row -= _yshift;
+ col -= _xshift;
+ UInt8 *byte = &_bytes[row*_bpr + col/8];
+ if (byte < &_bytes[0])
+ return;
+ const UInt8 *maxptr = &_bytes[0]+_bytes.size()-1;
+ while (n > 0 && byte <= maxptr) {
+ int b = 7 - col%8; // number of leftmost bit in current byte to be set
int m = min(n, b+1); // number of bits to be set in current byte
int bitseq = (1 << m)-1; // sequence of n set bits (bits 0..n-1 are set)
bitseq <<= b-m+1; // move bit sequence so that bit b is the leftmost set bit
*byte |= UInt8(bitseq); // apply bit sequence to current byte
byte++;
n -= m;
- c += m;
+ col += m;
}
}
-void Bitmap::forAllPixels (ForAllData &data) const {
- for (int y=_rows-1; y >= 0 ; y--) {
- for (int c=0; c < _bpr; c++) {
- UInt8 byte = _bytes[y*_bpr+c];
+void Bitmap::forAllPixels (Callback &data) const {
+ for (int row=0; row < _rows ; row++) {
+ for (int col=0; col < _bpr; col++) {
+ UInt8 byte = _bytes[row*_bpr+col];
int x;
- for (int b=7; (b >= 0) && ((x = 8*c+(7-b)) < _cols); b--) {
- data.pixel(x, y, byte & (1 << b), *this);
- }
+ for (int b=7; (b >= 0) && ((x = 8*col+(7-b)) < _cols); b--)
+ data.pixel(x, row, byte & (1 << b), *this);
}
}
+ data.finish();
}
-struct BBoxData : public Bitmap::ForAllData
+class BBoxCallback : public Bitmap::Callback
{
- BBoxData () : maxx(0), maxy(0) {}
- void pixel (int x, int y, bool set, const Bitmap &bm) {
- if (set) {
- maxx = max(maxx, x);
- maxy = max(maxy, y);
+ public:
+ BBoxCallback () : _changed(false), _minx(numeric_limits<int>::max()), _miny(_minx), _maxx(0), _maxy(0) {}
+ int minx () const {return _minx;}
+ int miny () const {return _miny;}
+ int maxx () const {return _maxx;}
+ int maxy () const {return _maxy;}
+ bool empty () const {return !_changed;}
+
+ void pixel (int x, int y, bool set, const Bitmap&) {
+ if (set) {
+ _minx = min(_minx, x);
+ _miny = min(_miny, y);
+ _maxx = max(_maxx, x);
+ _maxy = max(_maxy, y);
+ _changed = true;
+ }
}
- }
- int maxx, maxy;
+
+ void finish () {
+ if (empty())
+ _minx = _miny = 0;
+ }
+
+ private:
+ bool _changed;
+ int _minx, _miny, _maxx, _maxy;
};
-void Bitmap::bbox (int &w, int &h) const {
- BBoxData data;
- forAllPixels(data);
- w = data.maxx+1;
- h = data.maxy+1;
+/** Computes the bounding box that spans all set pixels. */
+bool Bitmap::getBBox (int &minx, int &miny, int &maxx, int &maxy) const {
+ BBoxCallback bboxCallback;
+ forAllPixels(bboxCallback);
+ minx = bboxCallback.minx();
+ miny = bboxCallback.miny();
+ maxx = bboxCallback.maxx();
+ maxy = bboxCallback.maxy();
+ return !bboxCallback.empty();
+}
+
+
+/** Computes width and height of the bounding box that spans all set pixels. */
+void Bitmap::getExtent (int &w, int &h) const {
+ int minx, miny, maxx, maxy;
+ if (getBBox(minx, miny, maxx, maxy)) {
+ w = maxx-minx+1;
+ h = maxy-miny+1;
+ }
+ else
+ w = h = 0;
}
-ostream& Bitmap::write (ostream &os) const {
#if 0
+ostream& Bitmap::write (ostream &os) const {
for (int r=_rows-1; r >= 0 ; r--) {
for (int c=0; c < _bpr; c++) {
UInt8 byte = _bytes[r*_bpr+c];
@@ -121,6 +159,6 @@ ostream& Bitmap::write (ostream &os) const {
}
os << endl;
}
-#endif
return os;
}
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bitmap.h
index dbbb1b327ff..7a8210abeaa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Bitmap.h
@@ -29,26 +29,28 @@
class Bitmap
{
public:
- struct ForAllData {
- virtual ~ForAllData() {}
+ struct Callback {
+ virtual ~Callback() {}
virtual void pixel (int x, int y, bool set, Bitmap &bm) {}
virtual void pixel (int x, int y, bool set, const Bitmap &bm) {}
+ virtual void finish () {}
};
public:
Bitmap ();
Bitmap (int minx, int maxx, int miny , int maxy);
void resize (int minx, int maxx, int miny , int maxy);
- void setBits(int r, int c, int n);
- const UInt8* operator[] (int r) const {return &_bytes[r*_bpr];}
+ void setBits(int row, int col, int n);
+ const UInt8* rowPtr (int row) const {return &_bytes[row*_bpr];}
int height () const {return _rows;}
int width () const {return _cols;}
int xshift () const {return _xshift;}
int yshift () const {return _yshift;}
int bytesPerRow () const {return _bpr;}
bool empty () const {return (!_rows && !_cols) || _bytes.empty();}
- void bbox (int &w, int &h) const;
- void forAllPixels (ForAllData &data) const;
+ bool getBBox (int &minx, int &miny, int &maxx, int &maxy) const;
+ void getExtent (int &w, int &h) const;
+ void forAllPixels (Callback &callback) const;
template <typename T>
int copy (std::vector<T> &target, bool vflip=false) const;
@@ -56,7 +58,7 @@ class Bitmap
// template <typename T>
// void write (std::ostream &os, const std::vector<T> &v) const;
- std::ostream& write (std::ostream &os) const;
+// std::ostream& write (std::ostream &os) const;
private:
int _rows, _cols; ///< number of rows, columns
@@ -66,9 +68,10 @@ class Bitmap
};
-/** Copies the bitmap to a new target area and reorganize the bits.
+/** Copies the bitmap to a new target area and reorganizes the bits.
+ * @tparam T component type of target vector
* @param[out] target points to first T of new bitmap (must be deleted after usage)
- * @param[in] vflip true if the new bitmap should be flipped vertically
+ * @param[in] vflip true if the new bitmap should be flipped vertically
* @return number of Ts per row */
template <typename T>
int Bitmap::copy (std::vector<T> &target, bool vflip) const {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BoundingBox.cpp
index 3fcde07ba5d..30d711f0eb2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BoundingBox.cpp
@@ -155,29 +155,33 @@ void BoundingBox::embed (double x, double y) {
}
-/** Enlarges the box so that box bb is enclosed. */
-void BoundingBox::embed (const BoundingBox &bb) {
- if (!_locked && bb._valid) {
+/** Enlarges the box so that the given bounding box is enclosed. */
+void BoundingBox::embed (const BoundingBox &bbox) {
+ if (!_locked && bbox._valid) {
if (_valid) {
- embed(bb._ulx, bb._uly);
- embed(bb._lrx, bb._lry);
+ embed(bbox._ulx, bbox._uly);
+ embed(bbox._lrx, bbox._lry);
}
else {
- _ulx = bb._ulx;
- _uly = bb._uly;
- _lrx = bb._lrx;
- _lry = bb._lry;
+ _ulx = bbox._ulx;
+ _uly = bbox._uly;
+ _lrx = bbox._lrx;
+ _lry = bbox._lry;
_valid = true;
}
}
}
+/** Embeds a virtual circle into the box and enlarges it accordingly.
+ * @param[in] c center of the circle
+ * @param[in] r radius of the circle */
void BoundingBox::embed (const DPair &c, double r) {
embed(BoundingBox(c.x()-r, c.y()-r, c.x()+r, c.y()+r));
}
+/** Expands the box in all four directions by a given value. */
void BoundingBox::expand (double m) {
if (!_locked) {
_ulx -= m;
@@ -193,8 +197,10 @@ void BoundingBox::expand (double m) {
* @param[in] bbox box to intersect with
* @return false if *this is locked or both boxes are disjoint */
bool BoundingBox::intersect (const BoundingBox &bbox) {
+ // check if the two boxes are disjoint
if (_locked || _lrx < bbox._ulx || _lry < bbox._uly || _ulx > bbox._lrx || _uly > bbox._lry)
return false;
+ // not disjoint: compute the intersection
_ulx = max(_ulx, bbox._ulx);
_uly = max(_uly, bbox._uly);
_lrx = min(_lrx, bbox._lrx);
@@ -203,16 +209,34 @@ bool BoundingBox::intersect (const BoundingBox &bbox) {
}
-void BoundingBox::operator += (const BoundingBox &bb) {
+void BoundingBox::operator += (const BoundingBox &bbox) {
if (!_locked) {
- _ulx += bb._ulx;
- _uly += bb._uly;
- _lrx += bb._lrx;
- _lry += bb._lry;
+ _ulx += bbox._ulx;
+ _uly += bbox._uly;
+ _lrx += bbox._lrx;
+ _lry += bbox._lry;
}
}
+bool BoundingBox::operator == (const BoundingBox &bbox) const {
+ return _valid && bbox._valid
+ && _ulx == bbox._ulx
+ && _uly == bbox._uly
+ && _lrx == bbox._lrx
+ && _lry == bbox._lry;
+}
+
+
+bool BoundingBox::operator != (const BoundingBox &bbox) const {
+ return !_valid || !bbox._valid
+ || _ulx != bbox._ulx
+ || _uly != bbox._uly
+ || _lrx != bbox._lrx
+ || _lry != bbox._lry;
+}
+
+
void BoundingBox::scale (double sx, double sy) {
if (!_locked) {
_ulx *= sx;
@@ -252,7 +276,7 @@ ostream& BoundingBox::write (ostream &os) const {
}
-XMLElementNode* BoundingBox::toSVGRect () const {
+XMLElementNode* BoundingBox::createSVGRect () const {
XMLElementNode *rect = new XMLElementNode("rect");
rect->addAttribute("x", minX());
rect->addAttribute("y", minY());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BoundingBox.h
index 3bd4bece5e0..223e0433748 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/BoundingBox.h
@@ -65,15 +65,19 @@ class BoundingBox
double maxY () const {return _lry;}
double width () const {return _lrx-_ulx;}
double height () const {return _lry-_uly;}
+ bool valid() const {return _valid;}
+ bool locked() const {return _locked;}
void lock () {_locked = true;}
void unlock () {_locked = false;}
void invalidate () {_valid = false;}
- void operator += (const BoundingBox &bb);
+ void operator += (const BoundingBox &bbox);
+ bool operator == (const BoundingBox &bbox) const;
+ bool operator != (const BoundingBox &bbox) const;
void scale (double sx, double sy);
void transform (const Matrix &tm);
std::string toSVGViewBox () const;
std::ostream& write (std::ostream &os) const;
- XMLElementNode* toSVGRect () const;
+ XMLElementNode* createSVGRect () const;
private:
double _ulx, _uly; ///< coordinates of upper left vertex (in PS point units)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMap.cpp
index 2c9a22c8fbb..2c9a22c8fbb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMap.h
index 5a58ced5f3a..5a58ced5f3a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapManager.cpp
index d3b3fd399d6..d3b3fd399d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapManager.h
index 5388cb90f94..5388cb90f94 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapReader.cpp
index f655eca5139..f655eca5139 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapReader.h
index a7a243999d7..a7a243999d7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CMapReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CRC32.cpp
index 09670551baf..09670551baf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CRC32.h
index 3eacb17bf33..3eacb17bf33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Calculator.cpp
index d90405e8610..d90405e8610 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Calculator.h
index 76b07e40a60..76b07e40a60 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CharMapID.cpp
index 0bcd054104f..0bcd054104f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CharMapID.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CharMapID.h
index 0b4e6bf7e17..0b4e6bf7e17 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CharMapID.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Character.h
index 7ad3a7e36ff..7ad3a7e36ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Character.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CmdLineParserBase.cpp
index da935b4b0dc..da935b4b0dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CmdLineParserBase.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CmdLineParserBase.h
index 8096fa6500f..8096fa6500f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Color.cpp
index 2173cba9594..2173cba9594 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Color.h
index 6b1c50d5d71..6b1c50d5d71 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ColorSpecialHandler.cpp
index b3743a71979..b3743a71979 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ColorSpecialHandler.h
index f945492b05b..f945492b05b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CommandLine.cpp
index ead88465ae3..ead88465ae3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CommandLine.h
index 4c68706fc7e..4c68706fc7e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DLLoader.cpp
index f227cae1f80..f227cae1f80 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DLLoader.h
index 6050467277b..6050467277b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIActions.h
index d6248d59cf3..d6248d59cf3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIReader.cpp
index 3759707d644..3759707d644 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIReader.h
index ae77ac14750..ae77ac14750 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVG.cpp
index 0cef7c3aa7a..00becb10aeb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVG.cpp
@@ -22,6 +22,7 @@
#include <cstdlib>
#include <ctime>
#include <fstream>
+#include <set>
#include <sstream>
#include "Calculator.h"
#include "DVIToSVG.h"
@@ -263,12 +264,16 @@ void DVIToSVG::embedFonts (XMLElementNode *svgElement) {
collect_chars(usedChars);
GlyphTracerMessages messages;
+ set<const Font*> tracedFonts; // collect unique fonts already traced
FORALL(usedChars, UsedCharsMap::const_iterator, it) {
const Font *font = it->first;
if (const PhysicalFont *ph_font = dynamic_cast<const PhysicalFont*>(font)) {
- if (TRACE_MODE)
+ // Check if glyphs should be traced. Only trace the glyphs of unique fonts, i.e.
+ // avoid retracing the same glyphs again if they are referenced in various sizes.
+ if (TRACE_MODE != 0 && tracedFonts.find(ph_font->uniqueFont()) == tracedFonts.end()) {
ph_font->traceAllGlyphs(TRACE_MODE == 'a', &messages);
-
+ tracedFonts.insert(ph_font->uniqueFont());
+ }
if (font->path()) // does font file exist?
_svg.append(*ph_font, it->second, &messages);
else
@@ -332,4 +337,4 @@ void DVIToSVG::setProcessSpecials (const char *ignorelist, bool pswarning) {
string DVIToSVG::getSVGFilename (unsigned pageno) const {
return _out.filename(pageno, numberOfPages());
-} \ No newline at end of file
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVG.h
index 9e3f5d659ca..9e3f5d659ca 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVGActions.cpp
index adf4ebe549d..adf4ebe549d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVGActions.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVGActions.h
index 873f104550a..873f104550a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DVIToSVGActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DependencyGraph.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DependencyGraph.h
index e00a68ffbd1..e00a68ffbd1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DependencyGraph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DependencyGraph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Directory.cpp
index 0bc3c555e45..0bc3c555e45 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Directory.h
index 17bd10f507d..17bd10f507d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DvisvgmSpecialHandler.cpp
index 809172d0b8c..809172d0b8c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DvisvgmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DvisvgmSpecialHandler.h
index fb3a0c754aa..fb3a0c754aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/DvisvgmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSFile.cpp
index 3b8632599a3..3b8632599a3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSFile.h
index 24871103327..24871103327 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSToSVG.cpp
index 555e3549760..555e3549760 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSToSVG.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSToSVG.h
index 841ffe5d0a9..841ffe5d0a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EmSpecialHandler.cpp
index 994f46f7c4b..994f46f7c4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EmSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EmSpecialHandler.h
index 7b3c78b6b24..7b3c78b6b24 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EncFile.cpp
index cc1b8151e14..cc1b8151e14 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EncFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EncFile.h
index 249db961054..249db961054 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/EncFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp
index 2418c8fb786..2418c8fb786 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.h
index 6727bd3e81d..6727bd3e81d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FilePath.cpp
index fc8430145f5..fc8430145f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FilePath.h
index 005d9ecc66e..005d9ecc66e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileSystem.cpp
index a0c93177ac8..a0c93177ac8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileSystem.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileSystem.h
index d14454262ac..d14454262ac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp
index ef81abb43be..ef81abb43be 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Font.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Font.h
index ed862a9f165..ed862a9f165 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Font.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontCache.cpp
index df638715785..df638715785 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontCache.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontCache.h
index 49efb455495..49efb455495 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp
index d2dbfd8da50..d2dbfd8da50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.h
index e36eb899bac..e36eb899bac 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEncoding.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEngine.cpp
index 633be5514db..633be5514db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEngine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEngine.h
index 33a4cf7a63b..33a4cf7a63b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontManager.cpp
index 0c94f66318e..0c94f66318e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontManager.h
index 8320be356b9..8320be356b9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMap.cpp
index e6179c8115e..e6179c8115e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMap.h
index 0360a67d3df..0360a67d3df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMetrics.cpp
index 5792e8abbd5..5792e8abbd5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMetrics.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMetrics.h
index 7e7a9d3e12a..7e7a9d3e12a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontMetrics.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFGlyphTracer.cpp
index f858ebf41d2..19d9e0bb533 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFGlyphTracer.cpp
@@ -51,19 +51,19 @@ void GFGlyphTracer::reset (string &fname, double upp) {
bool GFGlyphTracer::executeChar (UInt8 c) {
- if (_glyph) {
- if (_callback)
- _callback->beginChar(c);
- bool ok = GFTracer::executeChar(c);
- if (_callback) {
- if (ok)
- _callback->endChar(c);
- else
- _callback->emptyChar(c);
- return ok;
- }
+ if (!_glyph)
+ return false;
+
+ if (_callback)
+ _callback->beginChar(c);
+ bool ok = GFTracer::executeChar(c);
+ if (_callback) {
+ if (ok)
+ _callback->endChar(c);
+ else
+ _callback->emptyChar(c);
}
- return false;
+ return ok;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFGlyphTracer.h
index 1449657465f..1449657465f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFReader.cpp
index 895ef6db68b..8e10c21373f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFReader.cpp
@@ -34,6 +34,7 @@ struct GFCommand
};
+/** Converts a fix point length to double (PS point units) */
static inline double fix2double (Int32 fix) {
return double(fix)/(1 << 20)*72/72.27;
}
@@ -156,6 +157,16 @@ bool GFReader::executeAllChars () {
}
+bool GFReader::executePreamble () {
+ _in.clear();
+ if (!_in)
+ return false;
+ _in.seekg(0);
+ executeCommand();
+ return true;
+}
+
+
bool GFReader::executePostamble () {
_in.clear();
if (!_in)
@@ -171,7 +182,7 @@ bool GFReader::executePostamble () {
}
-/** Returns the design size of this font int PS point units. */
+/** Returns the design size of this font in PS point units. */
double GFReader::getDesignSize () const {
return fix2double(_designSize);
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFReader.h
index 4297bce0148..a644fce901c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFReader.h
@@ -57,6 +57,7 @@ class GFReader
virtual ~GFReader () {}
bool executeChar (UInt8 c);
bool executeAllChars ();
+ bool executePreamble ();
bool executePostamble ();
virtual void preamble (const std::string &str) {}
virtual void postamble () {}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFTracer.cpp
index e071e93e1f6..e071e93e1f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFTracer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFTracer.h
index 6c0adb258c6..a288284f3ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GFTracer.h
@@ -30,10 +30,10 @@ class GFTracer : public GFReader
GFTracer (std::istream &is);
GFTracer (std::istream &is, double upp);
virtual ~GFTracer () {}
- virtual void moveTo (double x, double y) {}
- virtual void lineTo (double x, double y) {}
- virtual void curveTo (double c1x, double c1y, double c2x, double c2y, double x, double y) {}
- virtual void closePath () {}
+ virtual void moveTo (double x, double y) =0;
+ virtual void lineTo (double x, double y) =0;
+ virtual void curveTo (double c1x, double c1y, double c2x, double c2y, double x, double y) =0;
+ virtual void closePath () =0;
void beginChar (UInt32 c);
void endChar (UInt32 c);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Ghostscript.cpp
index 6a58ba0c6b5..6a58ba0c6b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Ghostscript.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Ghostscript.h
index c20c847dfbe..c20c847dfbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Glyph.h
index d19f130ceaf..d19f130ceaf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GlyphTracerMessages.h
index cd6c214afcd..c6190730ecf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GlyphTracerMessages.h
@@ -29,13 +29,23 @@
class GlyphTracerMessages : public GFGlyphTracer::Callback
{
public:
- GlyphTracerMessages (bool sfmsg=true, bool autonl=true) : _sfmsg(sfmsg), _autonl(autonl) {}
+ GlyphTracerMessages (bool sfmsg=true, bool autonl=true) : _sfmsg(sfmsg), _autonl(autonl), _traced(false) {}
~GlyphTracerMessages () {
if (_autonl)
Message::mstream() << '\n';
}
+ void beginChar (UInt8 c) {
+ if (!_traced) {
+ if (!_fname.empty())
+ Message::mstream() << '\n';
+ Message::mstream(false, Message::MC_STATE)
+ << "tracing glyphs of " << _fname.substr(0, _fname.length()-3) << '\n';
+ _traced = true;
+ }
+ }
+
void endChar (UInt8 c) {
std::ostringstream oss;
oss << '[';
@@ -49,16 +59,15 @@ class GlyphTracerMessages : public GFGlyphTracer::Callback
void setFont (const std::string &fname) {
if (_sfmsg && fname != _fname) {
- if (!_fname.empty())
- Message::mstream() << '\n';
- Message::mstream(false, Message::MC_STATE) << "tracing glyphs of " << fname.substr(0, fname.length()-3) << '\n';
_fname = fname;
+ _traced = false;
}
}
private:
std::string _fname;
bool _sfmsg, _autonl;
+ bool _traced; ///< true if a glyph of the current font has already been traced?
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GraphicPath.h
index 6d377eb8a59..6d377eb8a59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/GraphicPath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/HtmlSpecialHandler.cpp
index 29d0d88ada2..29d0d88ada2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/HtmlSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/HtmlSpecialHandler.h
index 4c5893c0306..4c5893c0306 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/HtmlSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputBuffer.cpp
index acf19e2f1c2..acf19e2f1c2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputBuffer.h
index 35ea9401a6e..35ea9401a6e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputReader.cpp
index cfe46f9d87f..cfe46f9d87f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputReader.h
index 5cf43b6142d..5cf43b6142d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/JFM.cpp
index fb93b716d01..fb93b716d01 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/JFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/JFM.h
index e3a98e8e94c..e3a98e8e94c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/JFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Length.cpp
index 7ed0a4d1dfe..7ed0a4d1dfe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Length.h
index b4782cb8b23..b4782cb8b23 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Makefile.am
index dbcbe26d881..31fcd868146 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Makefile.am
@@ -203,7 +203,10 @@ EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.h MiKTeXCom.cpp
AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \
-I$(top_srcdir)/clipper \
$(FREETYPE_CFLAGS) \
- $(ZLIB_CFLAGS)
+ $(ZLIB_CFLAGS) \
+ $(CODE_COVERAGE_CFLAGS)
+
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
# the command-line parser is generated from options.xml by opt2cpp
$(srcdir)/CommandLine.cpp: options.xml
@@ -223,3 +226,6 @@ $(srcdir)/psdefs.cpp: psdefs.ps
psdefs.ps: ;
+@CODE_COVERAGE_RULES@
+
+CLEANFILES = *.gcda *.gcno
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MapLine.cpp
index d65649a4c34..d65649a4c34 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MapLine.h
index ea3f92e526e..ea3f92e526e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Matrix.cpp
index 06537689c3f..06537689c3f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Matrix.h
index 02b94299fd5..02b94299fd5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp
index 17b9b526f9e..17b9b526f9e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Message.h
index e9ab6bf116b..e9ab6bf116b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MessageException.h
index c7a84b4b13c..c7a84b4b13c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MetafontWrapper.cpp
index 42fcaa266b0..42fcaa266b0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MetafontWrapper.h
index 93266c5122e..93266c5122e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MiKTeXCom.cpp
index 4f8a3a0c77d..4f8a3a0c77d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MiKTeXCom.h
index c278840c9c8..c278840c9c8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NoPsSpecialHandler.cpp
index 659cd81818b..659cd81818b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NoPsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NoPsSpecialHandler.h
index 5176d87a2a4..5176d87a2a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NoPsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NumericRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NumericRanges.h
index 34be8486fb2..34be8486fb2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/NumericRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/NumericRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSFilter.h
index 3b2a9391250..3b2a9391250 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSInterpreter.cpp
index a297bd2bb9b..a297bd2bb9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSInterpreter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSInterpreter.h
index 528e95ca83c..528e95ca83c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPattern.cpp
index 99c60c29827..99c60c29827 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPattern.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPattern.h
index d394f5a65ab..d394f5a65ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPreviewFilter.cpp
index 5029874c681..5029874c681 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPreviewFilter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPreviewFilter.h
index 3e9f9ad2052..3e9f9ad2052 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PSPreviewFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageRanges.cpp
index 8e6339c72e8..8e6339c72e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageRanges.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageRanges.h
index 0f5e2faafa3..0f5e2faafa3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageSize.cpp
index d3e60571d06..d3e60571d06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageSize.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageSize.h
index b86218393c1..b86218393c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PageSize.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Pair.h
index fa27033b199..fa27033b199 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PathClipper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PathClipper.cpp
index 02816ecac18..02816ecac18 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PathClipper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PathClipper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PathClipper.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PathClipper.h
index b9c9158a228..b9c9158a228 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PathClipper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PathClipper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PdfSpecialHandler.cpp
index 848d38b562d..848d38b562d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PdfSpecialHandler.h
index cdb24b6ad76..cdb24b6ad76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PreScanDVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PreScanDVIReader.cpp
index 9d45be980f1..9d45be980f1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PreScanDVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PreScanDVIReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PreScanDVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PreScanDVIReader.h
index 6e1642548f5..6e1642548f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PreScanDVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PreScanDVIReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Process.cpp
index b79331f4fab..b79331f4fab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Process.h
index bf6deb28a51..bf6deb28a51 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PsSpecialHandler.cpp
index 9e02f353e4b..9e02f353e4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PsSpecialHandler.h
index 38c04c50afa..38c04c50afa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/PsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/RangeMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/RangeMap.cpp
index ba9a9463b70..ba9a9463b70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/RangeMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/RangeMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/RangeMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/RangeMap.h
index a1d2f139070..a1d2f139070 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/RangeMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/RangeMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGOutput.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGOutput.cpp
index 26621d49303..26621d49303 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGOutput.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGOutput.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGOutput.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGOutput.h
index b696a32b8f8..b696a32b8f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGOutput.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGOutput.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGTree.cpp
index 27a2e8f574b..23b7f724b1f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGTree.cpp
@@ -263,7 +263,7 @@ void SVGTree::newTextNode (double x, double y) {
_text->addAttribute("class", string("f")+XMLString(_fontnum));
else {
_text->addAttribute("font-family", font->name());
- _text->addAttribute("font-size", font->scaledSize());
+ _text->addAttribute("font-size", XMLString(font->scaledSize()));
if (font->color() != Color::BLACK)
_text->addAttribute("fill", font->color().rgbString());
}
@@ -349,7 +349,7 @@ void SVGTree::appendFontStyles (const set<const Font*> &fonts) {
FORALL(sortmap, SortMap::const_iterator, it) {
style << "text.f" << it->first << ' '
<< "{font-family:" << it->second->name()
- << ";font-size:" << it->second->scaledSize() << "px";
+ << ";font-size:" << XMLString(it->second->scaledSize()) << "px";
if (it->second->color() != Color::BLACK)
style << ";fill:" << it->second->color().rgbString();
style << "}\n";
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGTree.h
index a8d123a013d..a8d123a013d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SVGTree.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ShadingPatch.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ShadingPatch.cpp
index 057f67f3f65..057f67f3f65 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ShadingPatch.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ShadingPatch.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ShadingPatch.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ShadingPatch.h
index 41618fc9993..84c44041e5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ShadingPatch.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ShadingPatch.h
@@ -48,6 +48,7 @@ class ShadingPatch
virtual void setColors (const ColorVec &colors, int edgeflag, ShadingPatch *patch) =0;
virtual int numPoints (int edgeflag) const =0;
virtual int numColors (int edgeflag) const =0;
+ virtual Color averageColor() const =0;
Color::ColorSpace colorSpace () const {return _colorspace;}
static ShadingPatch* create (int psShadingType, Color::ColorSpace cspace);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SignalHandler.cpp
index 3af78a66012..3af78a66012 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SignalHandler.h
index 25ee5fba118..25ee5fba118 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialActions.h
index e0f35c78738..e0f35c78738 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialHandler.h
index 1924bf12102..1924bf12102 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialManager.cpp
index 6699b9ee0c7..6699b9ee0c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialManager.h
index 29c325c20cc..29c325c20cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/SpecialManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamReader.cpp
index 95722a77c87..95722a77c87 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamReader.h
index 24c37c487d2..24c37c487d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamWriter.cpp
index db336b64d5f..db336b64d5f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamWriter.h
index a17c891e741..a17c891e741 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Subfont.cpp
index b71775e9297..b71775e9297 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Subfont.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Subfont.h
index 4585a0981df..4585a0981df 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/System.cpp
index 1bbd4378df4..1bbd4378df4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/System.h
index ffca48e1cd3..ffca48e1cd3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TFM.cpp
index 6e3ad81eb9a..6e3ad81eb9a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TFM.h
index 3afc88ec83d..3afc88ec83d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TensorProductPatch.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TensorProductPatch.cpp
index 92a69d7b528..2ad8a4c29dc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TensorProductPatch.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TensorProductPatch.cpp
@@ -145,10 +145,10 @@ DPair TensorProductPatch::valueAt (double u, double v) const {
DPair p[4];
for (int i=0; i < 4; i++) {
Bezier bezier(_points[i][0], _points[i][1], _points[i][2], _points[i][3]);
- p[i] = bezier.pointAt(u);
+ p[i] = bezier.valueAt(u);
}
Bezier bezier(p[0], p[1], p[2], p[3]);
- return bezier.pointAt(v);
+ return bezier.valueAt(v);
}
@@ -181,6 +181,11 @@ Color TensorProductPatch::colorAt (double u, double v) const {
}
+Color TensorProductPatch::averageColor () const {
+ return averageColor(_colors[0], _colors[1], _colors[2], _colors[3]);
+}
+
+
/** Compute the average of four given colors depending on the assigned color space. */
Color TensorProductPatch::averageColor (const Color &c1, const Color &c2, const Color &c3, const Color &c4) const {
ColorGetter getComponents;
@@ -225,7 +230,7 @@ void TensorProductPatch::verticalCurve (double u, Bezier &bezier) const {
DPair p[4];
for (int i=0; i < 4; i++) {
Bezier bezier(_points[i][0], _points[i][1], _points[i][2], _points[i][3]);
- p[i] = bezier.pointAt(u);
+ p[i] = bezier.valueAt(u);
}
bezier.setPoints(p[0], p[1], p[2], p[3]);
}
@@ -247,7 +252,7 @@ void TensorProductPatch::horizontalCurve (double v, Bezier &bezier) const {
DPair p[4];
for (int i=0; i < 4; i++) {
Bezier bezier(_points[0][i], _points[1][i], _points[2][i], _points[3][i]);
- p[i] = bezier.pointAt(v);
+ p[i] = bezier.valueAt(v);
}
bezier.setPoints(p[0], p[1], p[2], p[3]);
}
@@ -468,8 +473,8 @@ DPair CoonsPatch::valueAt (double u, double v) const {
Bezier bezier2(_points[0][0], _points[0][1], _points[0][2], _points[0][3]);
Bezier bezier3(_points[3][0], _points[2][0], _points[1][0], _points[0][0]);
Bezier bezier4(_points[3][3], _points[2][3], _points[1][3], _points[0][3]);
- DPair ph = bezier1.pointAt(u)*(1-v) + bezier2.pointAt(u)*v;
- DPair pv = bezier3.pointAt(v)*(1-u) + bezier4.pointAt(v)*u;
+ DPair ph = bezier1.valueAt(u)*(1-v) + bezier2.valueAt(u)*v;
+ DPair pv = bezier3.valueAt(v)*(1-u) + bezier4.valueAt(v)*u;
DPair pc = (_points[3][0]*(1-u) + _points[3][3]*u)*(1-v) + (_points[0][0]*(1-u) + _points[0][3]*u)*v;
return ph+pv-pc;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TensorProductPatch.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TensorProductPatch.h
index 9fc86b6420b..50fcac5a1e5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TensorProductPatch.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TensorProductPatch.h
@@ -42,7 +42,7 @@ class TensorProductPatch : public ShadingPatch
public:
TensorProductPatch () : ShadingPatch(Color::RGB_SPACE) {}
- TensorProductPatch (Color::ColorSpace &cspace) : ShadingPatch(cspace) {}
+ TensorProductPatch (Color::ColorSpace cspace) : ShadingPatch(cspace) {}
TensorProductPatch (const PointVec &points, const ColorVec &colors, Color::ColorSpace cspace, int edgeflag, TensorProductPatch *patch);
int psShadingType() const {return 7;}
void setPoints (const DPair points[4][4], int edgeflag, TensorProductPatch *patch);
@@ -50,6 +50,7 @@ class TensorProductPatch : public ShadingPatch
void setColors (const ColorVec &colors, int edgeflag, ShadingPatch *patch);
virtual DPair valueAt (double u, double v) const;
Color colorAt (double u, double v) const;
+ Color averageColor () const;
void horizontalCurve (double v, Bezier &bezier) const;
void verticalCurve (double u, Bezier &bezier) const;
void getBoundaryPath (GraphicPath<double> &path) const;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Terminal.cpp
index c0d74a5c16e..c0d74a5c16e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Terminal.h
index 8998e054f77..8998e054f77 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ToUnicodeMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ToUnicodeMap.cpp
index 35e676ee0e2..35e676ee0e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ToUnicodeMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ToUnicodeMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ToUnicodeMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ToUnicodeMap.h
index bf7788b7b98..bf7788b7b98 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ToUnicodeMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ToUnicodeMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TpicSpecialHandler.cpp
index de769352019..de769352019 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TpicSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TpicSpecialHandler.h
index 3c5ea9fa876..3c5ea9fa876 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TpicSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TriangularPatch.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TriangularPatch.cpp
index 773cce0764c..75b3132345b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TriangularPatch.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TriangularPatch.cpp
@@ -96,7 +96,7 @@ void TriangularPatch::setColors (const Color &c1, const Color &c2, const Color &
* of a point of the triangle, where \f$u, v \in [0,1]\f$ and \f$u+v \le 1\f$.
* The relation between the vertices of the triangle and their barycentric coordinates
* is as follows: \f$(1,0,0)=p_1, (0,1,0)=p_2, (0,0,1)=p_0\f$. */
-DPair TriangularPatch::pointAt (double u, double v) const {
+DPair TriangularPatch::valueAt (double u, double v) const {
return _points[0] + (_points[1]-_points[0])*u + (_points[2]-_points[0])*v;
}
@@ -119,6 +119,11 @@ Color TriangularPatch::colorAt (double u, double v) const {
}
+Color TriangularPatch::averageColor () const {
+ return averageColor(_colors[0], _colors[1], _colors[2]);
+}
+
+
/** Compute the average of three given colors depending on the assigned color space. */
Color TriangularPatch::averageColor (const Color &c1, const Color &c2, const Color &c3) const {
ColorGetter getComponents;
@@ -171,17 +176,17 @@ void TriangularPatch::approximate (int gridsize, bool overlap, double delta, Cal
if (!overlap || (snap(u1+ov2) <= 1 && snap(ou2+v1) <= 1)) {
// create triangular segments pointing in the same orientation as the whole patch
GraphicPath<double> path;
- path.moveto(pointAt(u1, v1));
- path.lineto(pointAt(ou2, v1));
- path.lineto(pointAt(u1, ov2));
+ path.moveto(valueAt(u1, v1));
+ path.lineto(valueAt(ou2, v1));
+ path.lineto(valueAt(u1, ov2));
path.closepath();
callback.patchSegment(path, averageColor(colorAt(u1, v1), colorAt(u2, v1), colorAt(u1, v2)));
if (snap(u2+v2) <= 1 && (!overlap || inc > delta)) {
// create triangular segments pointing in the opposite direction as the whole patch
path.clear();
- path.moveto(pointAt(u1, v2));
- path.lineto(pointAt(u2, v1));
- path.lineto(pointAt(u2, v2));
+ path.moveto(valueAt(u1, v2));
+ path.lineto(valueAt(u2, v1));
+ path.lineto(valueAt(u2, v2));
path.closepath();
callback.patchSegment(path, averageColor(colorAt(u1, v2), colorAt(u2, v1), colorAt(u2, v2)));
}
@@ -206,4 +211,4 @@ void TriangularPatch::getBBox (BoundingBox &bbox) const {
bbox.embed(_points[0]);
bbox.embed(_points[1]);
bbox.embed(_points[2]);
-} \ No newline at end of file
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TriangularPatch.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TriangularPatch.h
index b2dead5f32c..d18d76ebb0a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/TriangularPatch.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/TriangularPatch.h
@@ -32,8 +32,9 @@ class TriangularPatch : public ShadingPatch
TriangularPatch (Color::ColorSpace cspace) : ShadingPatch(cspace) {}
TriangularPatch (const PointVec &points, const ColorVec &colors, Color::ColorSpace cspace, int edgeflag, TriangularPatch *patch);
int psShadingType() const {return 4;}
- DPair pointAt (double u, double v) const;
+ DPair valueAt (double u, double v) const;
Color colorAt (double u, double v) const;
+ Color averageColor() const;
void setPoints (const PointVec &points, int edgeflag, ShadingPatch *patch);
void setPoints (const DPair &p1, const DPair &p2, const DPair &p3);
void setColors (const ColorVec &colors, int edgeflag, ShadingPatch *patch);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Unicode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Unicode.cpp
index 2b5e7530b0b..129c33ebdb7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Unicode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Unicode.cpp
@@ -58,8 +58,6 @@ string Unicode::utf8 (Int32 c) {
utf8 += 0xC0 + (c >> 6);
utf8 += 0x80 + (c & 0x3F);
}
- else if (c == 0xFFFE || c == 0xFFFF)
- utf8 += (c & 0xFF);
else if (c < 0x10000) {
utf8 += 0xE0 + (c >> 12);
utf8 += 0x80 + ((c >> 6) & 0x3F);
@@ -71,6 +69,7 @@ string Unicode::utf8 (Int32 c) {
utf8 += 0x80 + ((c >> 6) & 0x3F);
utf8 += 0x80 + (c & 0x3F);
}
+ // UTF-8 does not support codepoints >= 0x110000
}
return utf8;
-} \ No newline at end of file
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Unicode.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Unicode.h
index 588ef558f67..588ef558f67 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/Unicode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/Unicode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFActions.h
index 886771e75a7..886771e75a7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFReader.cpp
index f17a82c02f7..f17a82c02f7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFReader.h
index 00467f5746a..00467f5746a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VectorIterator.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VectorIterator.h
index dc27327a60c..dc27327a60c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VectorIterator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VectorIterator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VectorStream.h
index f3043943669..f3043943669 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLDocument.cpp
index 6b73f7cd436..6b73f7cd436 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLDocument.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLDocument.h
index e3b2727dfd9..e3b2727dfd9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLNode.cpp
index 59319f58fa9..4fd3b997391 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLNode.cpp
@@ -41,15 +41,19 @@ XMLElementNode::XMLElementNode (const XMLElementNode &node)
XMLElementNode::~XMLElementNode () {
- FORALL(_children, ChildList::iterator, i)
- delete *i;
+ while (!_children.empty()) {
+ delete _children.back();
+ _children.pop_back();
+ }
}
void XMLElementNode::clear () {
_attributes.clear();
- FORALL(_children, ChildList::iterator, i)
- (*i)->clear();
+ while (!_children.empty()) {
+ delete _children.back();
+ _children.pop_back();
+ }
}
@@ -93,7 +97,7 @@ void XMLElementNode::prepend (XMLNode *child) {
if (!textNode1 || _children.empty())
_children.push_front(child);
else {
- if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(_children.back()))
+ if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(_children.front()))
textNode2->prepend(textNode1); // merge two consecutive text nodes
else
_children.push_front(child);
@@ -111,11 +115,10 @@ bool XMLElementNode::insertBefore (XMLNode *child, XMLNode *sibling) {
ChildList::iterator it = _children.begin();
while (it != _children.end() && *it != sibling)
++it;
- if (it != _children.end()) {
- _children.insert(it, child);
- return true;
- }
- return false;
+ if (it == _children.end())
+ return false;
+ _children.insert(it, child);
+ return true;
}
@@ -129,11 +132,10 @@ bool XMLElementNode::insertAfter (XMLNode *child, XMLNode *sibling) {
ChildList::iterator it = _children.begin();
while (it != _children.end() && *it != sibling)
++it;
- if (it != _children.end()) {
- _children.insert(++it, child);
- return true;
- }
- return false;
+ if (it == _children.end())
+ return false;
+ _children.insert(++it, child);
+ return true;
}
@@ -154,12 +156,17 @@ bool XMLElementNode::getDescendants (const char *name, const char *attrName, vec
}
+/** Returns the first descendant element that matches the given properties in depth first order.
+ * @param[in] name element name; if 0, all elements are taken into account
+ * @param[in] attrName if not 0, only elements with an attribute of this name are considered
+ * @param[in] attrValue if not 0, only elements with attribute attrName="attrValue" are considered
+ * @return pointer to the found element or 0 */
XMLElementNode* XMLElementNode::getFirstDescendant (const char *name, const char *attrName, const char *attrValue) const {
FORALL(_children, ChildList::const_iterator, it) {
if (XMLElementNode *elem = dynamic_cast<XMLElementNode*>(*it)) {
if (!name || elem->getName() == name) {
const char *value;
- if (!attrName || !attrValue || !(value = elem->getAttributeValue(attrName)) || string(value) == attrValue)
+ if (!attrName || (((value = elem->getAttributeValue(attrName)) != 0) && (!attrValue || string(value) == attrValue)))
return elem;
}
if (XMLElementNode *descendant = elem->getFirstDescendant(name, attrName, attrValue))
@@ -229,7 +236,7 @@ void XMLTextNode::append (const string &str) {
void XMLTextNode::prepend (XMLNode *node) {
if (XMLTextNode *tn = dynamic_cast<XMLTextNode*>(node))
- prepend(tn);
+ _text = tn->_text + _text;
else
delete node;
}
@@ -237,62 +244,10 @@ void XMLTextNode::prepend (XMLNode *node) {
//////////////////////
-XMLDeclarationNode::XMLDeclarationNode (const string &n, const string &p)
- : _name(n), _params(p)
-{
-}
-
-
-XMLDeclarationNode::XMLDeclarationNode (const XMLDeclarationNode &node)
- : _name(node._name), _params(node._params)
-{
- FORALL(node._children, list<XMLDeclarationNode*>::const_iterator, it)
- _children.push_back(new XMLDeclarationNode(**it));
-}
-
-
-XMLDeclarationNode::~XMLDeclarationNode () {
- FORALL(_children, list<XMLDeclarationNode*>::iterator, i)
- delete *i;
-}
-
-
-void XMLDeclarationNode::clear () {
- _params.clear();
- FORALL(_children, list<XMLDeclarationNode*>::iterator, i)
- (*i)->clear();
-}
-
-
-/** Appends another declaration node to this one.
- * @param[in] child child to append, must be of type XMLDeclarationNode */
-void XMLDeclarationNode::append (XMLNode *child) {
- if (XMLDeclarationNode *decl_node = dynamic_cast<XMLDeclarationNode*>(child))
- _children.push_back(decl_node);
- else
- delete child;
-}
-
-
-ostream& XMLDeclarationNode::write (ostream &os) const {
- os << "<!" << _name << ' ' << _params;
- if (_children.empty())
- os << ">\n";
- else {
- os << "[\n";
- FORALL(_children, list<XMLDeclarationNode*>::const_iterator, i)
- (*i)->write(os);
- os << "]>\n";
- }
- return os;
-}
-
-//////////////////////
ostream& XMLCDataNode::write (ostream &os) const {
- os << "<![CDATA[\n"
- << _data
- << "]]>\n";
+ if (!_data.empty())
+ os << "<![CDATA[\n" << _data << "]]>\n";
return os;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLNode.h
index a95f20ce8b7..71bd5a8ada9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLNode.h
@@ -35,8 +35,6 @@ struct XMLNode
virtual XMLNode* clone () const =0;
virtual void clear () =0;
virtual std::ostream& write (std::ostream &os) const =0;
- virtual void append (XMLNode *child) {}
- virtual void prepend (XMLNode *child) {}
};
@@ -48,7 +46,7 @@ class XMLElementNode : public XMLNode
XMLElementNode (const std::string &name);
XMLElementNode (const XMLElementNode &node);
~XMLElementNode ();
- XMLNode* clone () const {return new XMLElementNode(*this);}
+ XMLElementNode* clone () const {return new XMLElementNode(*this);}
void clear ();
void addAttribute (const std::string &name, const std::string &value);
void addAttribute (const std::string &name, double value);
@@ -78,7 +76,7 @@ class XMLTextNode : public XMLNode
{
public:
XMLTextNode (const std::string &str) : _text(str) {}
- XMLNode* clone () const {return new XMLTextNode(*this);}
+ XMLTextNode* clone () const {return new XMLTextNode(*this);}
void clear () {_text.clear();}
void append (XMLNode *node);
void append (XMLTextNode *node);
@@ -96,8 +94,8 @@ class XMLCommentNode : public XMLNode
{
public:
XMLCommentNode (const std::string &str) : _text(str) {}
- XMLNode* clone () const {return new XMLCommentNode(*this);}
- void clear () {_text.clear();}
+ XMLCommentNode* clone () const {return new XMLCommentNode(*this);}
+ void clear () {_text.clear();}
std::ostream& write (std::ostream &os) const {return os << "<!--" << _text << "-->\n";}
private:
@@ -105,30 +103,12 @@ class XMLCommentNode : public XMLNode
};
-class XMLDeclarationNode : public XMLNode
-{
- public:
- XMLDeclarationNode (const std::string &n, const std::string &p);
- XMLDeclarationNode (const XMLDeclarationNode &node);
- ~XMLDeclarationNode ();
- XMLNode* clone () const {return new XMLDeclarationNode(*this);}
- void clear ();
- void append (XMLNode *child);
- std::ostream& write (std::ostream &os) const;
-
- private:
- std::string _name;
- std::string _params;
- std::list<XMLDeclarationNode*> _children;
-};
-
-
class XMLCDataNode : public XMLNode
{
public:
XMLCDataNode (const std::string &d) : _data(d) {}
- XMLNode* clone () const {return new XMLCDataNode(*this);}
- void clear () {return _data.clear();}
+ XMLCDataNode* clone () const {return new XMLCDataNode(*this);}
+ void clear () {_data.clear();}
std::ostream& write (std::ostream &os) const;
private:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLString.cpp
index 5b9691500ec..97aa91ee4ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLString.cpp
@@ -44,20 +44,9 @@ static string translate (UInt32 c) {
}
-/** Rounds a floating point value to a given number of decimal places.
- * @param[in] x number to round
- * @param[in] n number of decimal places (must be between 1 and 6)
- * @return rounded value */
-static inline double round (double x, long n) {
- const long pow10[] = {10L, 100L, 1000L, 10000L, 100000L, 1000000L};
- n--;
- return floor(x*pow10[n]+0.5)/pow10[n];
-}
-
-
XMLString::XMLString (const string &str, bool plain) {
if (plain)
- *this = str;
+ assign(str);
else {
FORALL(str, string::const_iterator, i)
*this += translate(*i);
@@ -68,7 +57,7 @@ XMLString::XMLString (const string &str, bool plain) {
XMLString::XMLString (const char *str, bool plain) {
if (str) {
if (plain)
- *this = str;
+ assign(str);
else {
while (*str)
*this += translate(*str++);
@@ -88,34 +77,28 @@ XMLString::XMLString (int n, bool cast) {
}
+/** Rounds a floating point value to a given number of decimal places.
+ * @param[in] x number to round
+ * @param[in] n number of decimal places (must be between 1 and 6)
+ * @return rounded value */
+static inline double round (double x, int n) {
+ const long pow10[] = {10L, 100L, 1000L, 10000L, 100000L, 1000000L};
+ const double eps = 1e-7;
+ n--;
+ if (x >= 0)
+ return floor(x*pow10[n]+0.5+eps)/pow10[n];
+ return ceil(x*pow10[n]-0.5-eps)/pow10[n];
+}
+
+
XMLString::XMLString (double x) {
stringstream ss;
+ if (fabs(x) < 1e-8)
+ x = 0;
if (DECIMAL_PLACES > 0)
x = round(x, DECIMAL_PLACES);
- else if (fabs(x) < 1e-8)
- x = 0;
+ // don't use fixed and setprecision() manipulators here to avoid
+ // banker's rounding applied in some STL implementations
ss << x;
ss >> *this;
}
-
-
-/*
-ostream& XMLString::write (ostream &os) const {
- const string *self = static_cast<const string*>(this);
- FORALL(*self, string::const_iterator, i) {
- unsigned char c = *i;
- switch (c) {
- case '<' : os << "&lt;"; break;
- case '&' : os << "&amp;"; break;
- case '"' : os << "&quot;"; break;
- case '\'': os << "&apos;"; break;
- default :
- if (c >= 32 && c <= 126)
- os << c;
- else
- os << "&#" << int(c) << ';';
- }
- }
- return os;
-}
-*/
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLString.h
index f160c4427a4..f160c4427a4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/dvisvgm.cpp
index 02ba1ae4cf9..02ba1ae4cf9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/dvisvgm.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/macros.h
index 50deb9417c1..50deb9417c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/options.dtd b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/options.dtd
index c5321e3444b..c5321e3444b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/options.dtd
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/options.dtd
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/options.xml
index a05d4489ef3..a05d4489ef3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/psdefs.cpp
index a9a818a3fe7..a9a818a3fe7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/types.h
index 54a028fe085..54a028fe085 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9.1/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9.2/src/types.h
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index fbf447b7539..31cc518c832 100644
--- a/Build/source/texk/dvisvgm/version.ac
+++ b/Build/source/texk/dvisvgm/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current dvisvgm version
-m4_define([dvisvgm_version], [1.9.1])
+m4_define([dvisvgm_version], [1.9.2])
diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog
index 1fd84adbd50..d0419ee6e9e 100644
--- a/Build/source/texk/kpathsea/win32/ChangeLog
+++ b/Build/source/texk/kpathsea/win32/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (bin_PROGRAMS): Drop fmtutil, now a perl script.
+ * fmtutil.c: Removed.
+
2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* mktexfmt.c, mktexpk.c, mktextfm.c: Replace the deprecated
diff --git a/Build/source/texk/kpathsea/win32/Makefile.am b/Build/source/texk/kpathsea/win32/Makefile.am
index 4edf1d1a077..f8a8296baf3 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.am
+++ b/Build/source/texk/kpathsea/win32/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/kpathsea/win32/
##
-## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
@@ -9,7 +9,6 @@ AM_CFLAGS = $(WARNING_CFLAGS)
# Build WIN32 replacements for Unix shell scripts.
bin_PROGRAMS = \
- fmtutil \
mktexfmt \
mktexlsr \
mktexmf \
@@ -17,13 +16,6 @@ bin_PROGRAMS = \
mktextfm \
mktexupd
-fmtutil_SOURCES = \
- dirutil.c \
- dirutil.h \
- fmtutil.c \
- mktexupd.c \
- mktexupd.h
-
mktexfmt_SOURCES = \
mktexfmt.c
diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in
index 50663a58139..bb10aee6f25 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.in
+++ b/Build/source/texk/kpathsea/win32/Makefile.in
@@ -88,9 +88,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = fmtutil$(EXEEXT) mktexfmt$(EXEEXT) mktexlsr$(EXEEXT) \
- mktexmf$(EXEEXT) mktexpk$(EXEEXT) mktextfm$(EXEEXT) \
- mktexupd$(EXEEXT)
+bin_PROGRAMS = mktexfmt$(EXEEXT) mktexlsr$(EXEEXT) mktexmf$(EXEEXT) \
+ mktexpk$(EXEEXT) mktextfm$(EXEEXT) mktexupd$(EXEEXT)
subdir = win32
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -114,19 +113,14 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
-am_fmtutil_OBJECTS = dirutil.$(OBJEXT) fmtutil.$(OBJEXT) \
- mktexupd.$(OBJEXT)
-fmtutil_OBJECTS = $(am_fmtutil_OBJECTS)
-fmtutil_LDADD = $(LDADD)
-fmtutil_DEPENDENCIES = ../libkpathsea.la
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
am_mktexfmt_OBJECTS = mktexfmt.$(OBJEXT)
mktexfmt_OBJECTS = $(am_mktexfmt_OBJECTS)
mktexfmt_LDADD = $(LDADD)
mktexfmt_DEPENDENCIES = ../libkpathsea.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
am_mktexlsr_OBJECTS = dirutil.$(OBJEXT) mktexlsr.$(OBJEXT)
mktexlsr_OBJECTS = $(am_mktexlsr_OBJECTS)
mktexlsr_LDADD = $(LDADD)
@@ -184,12 +178,11 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(fmtutil_SOURCES) $(mktexfmt_SOURCES) $(mktexlsr_SOURCES) \
+SOURCES = $(mktexfmt_SOURCES) $(mktexlsr_SOURCES) $(mktexmf_SOURCES) \
+ $(mktexpk_SOURCES) $(mktextfm_SOURCES) $(mktexupd_SOURCES)
+DIST_SOURCES = $(mktexfmt_SOURCES) $(mktexlsr_SOURCES) \
$(mktexmf_SOURCES) $(mktexpk_SOURCES) $(mktextfm_SOURCES) \
$(mktexupd_SOURCES)
-DIST_SOURCES = $(fmtutil_SOURCES) $(mktexfmt_SOURCES) \
- $(mktexlsr_SOURCES) $(mktexmf_SOURCES) $(mktexpk_SOURCES) \
- $(mktextfm_SOURCES) $(mktexupd_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -343,13 +336,6 @@ AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. \
-DWEB2C_KPSE_VERSION='"Web2C-$(WEB2CVERSION) \
Kpathsea-$(KPSEVERSION)"'
AM_CFLAGS = $(WARNING_CFLAGS)
-fmtutil_SOURCES = \
- dirutil.c \
- dirutil.h \
- fmtutil.c \
- mktexupd.c \
- mktexupd.h
-
mktexfmt_SOURCES = \
mktexfmt.c
@@ -475,10 +461,6 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
-fmtutil$(EXEEXT): $(fmtutil_OBJECTS) $(fmtutil_DEPENDENCIES) $(EXTRA_fmtutil_DEPENDENCIES)
- @rm -f fmtutil$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(fmtutil_OBJECTS) $(fmtutil_LDADD) $(LIBS)
-
mktexfmt$(EXEEXT): $(mktexfmt_OBJECTS) $(mktexfmt_DEPENDENCIES) $(EXTRA_mktexfmt_DEPENDENCIES)
@rm -f mktexfmt$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(mktexfmt_OBJECTS) $(mktexfmt_LDADD) $(LIBS)
@@ -510,7 +492,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirutil.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmtutil.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdestdir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktexfmt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktexlsr.Po@am__quote@
diff --git a/Build/source/texk/kpathsea/win32/fmtutil.c b/Build/source/texk/kpathsea/win32/fmtutil.c
deleted file mode 100644
index 495abf11f5c..00000000000
--- a/Build/source/texk/kpathsea/win32/fmtutil.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
-
-Try TEXMFVAR as a head directory, if not defined try TEXMFMAIN next.
-
-
-fmtutil.c (2002/10/06 --ak)
-Web2C-7.3.9 (2002/10/25 --ak)
-Web2C-7.4.2 (2002/12/27 --ak)
-Web2C-7.4.3 (2003/01/12 --ak)
-Web2C-7.5.2 (2003/11/09 --ak)
-Web2C-7.5.3 (2004/05/09 --ak)
-Web2C-7.5.3 (2004/06/11 --ak)
-Web2C-7.5.5 (2005/12/23 --ak)
-Web2C-7.5.5 (2006/11/25 --ak)
-Web2C-7.5.6 (2007/06/01 --ak) save log files.
-Web2C-7.5.6 (2008/01/20 --ak) Create necessary directories.
-Web2C-2009 (2009/06/11 --ak) error handling.
-Web2C-2009 (2009/08/13 Nobert) new option --byengine
-Web2C-2009 (2009/10/10 --ak) creates mplib-luatex.mem.
-Web2C-2010 (2010/05/31 --ak) multiple language files.
-Web2C-2010 (2010/07/03 --ak) new options.
-*/
-
-#include <kpathsea/kpathsea.h>
-
-#include "dirutil.h"
-#include "mktexupd.h"
-
-#define BLEN 512
-#define SLEN 256
-#define MAXFMT 128
-#define SIXTY4 64
-#define SIXTEEN 16
-#define DEFAULTCNF "fmtutil.cnf"
-#define REVISION "fmtutil (C version 0.7) 2002-2010 --ak"
-
-typedef struct {
-char *format;
-char *engine;
-char *hyphen;
-char *args;
-} cmd_t;
-
-/*
-Global variables
-*/
-cmd_t K[MAXFMT];
-int Fmtnum = 0;
-char Buff[BLEN];
-char Programname[BLEN];
-char Enginename[BLEN];
-char Realenginename[BLEN];
-char Destdir[BLEN];
-char Currdir[BLEN];
-char *Exefile[MAXFMT];
-unsigned char Exenum = 0;
-int Errorcnt = 0;
-int UserDestdir = 0;
-int QQQ = 0; /* quiet */
-
-static void
-revision(void)
-{
- printf(REVISION "\n");
-}
-
-static void
-usage(void)
-{
- printf(
-"Commands:\n"
-" --all recreate all format, base, mem files\n"
-" --missing create all missing format, base, mem files\n"
-" --refresh recreate existing format, base, mem files\n"
-" --byfmt FORMATNAME (re)create format for `FORMATNAME'\n"
-" `base' and `mem' files can also be created\n"
-" --byhyphen HYPHENFILE (re)create formats that depend on `HYPHENFILE'\n"
-" --byengine ENGINENAME (re)create formats that depend on `ENGINENAME'\n"
-" --showhyphen FORMATNAME print name of hyphenfile for format `FORMATNAME'\n"
-" --version show revision number\n"
-" --help show this message\n"
-" --enablefmt FORMATNAME (not implemented)\n"
-" --disablefmt FORMATNAME (not implemented)\n"
-" --listcfg (not implemented)\n"
-" --catcfg (not implemented)\n"
-" --edit (not implemented)\n"
-"\n"
-"Options:\n"
-" --cnffile FILE set configfile for fmtutil\n"
-" default is `fmtutil.cnf'\n"
-" --fmtdir DIRECTORY set destination directory for format files\n"
-" `DIRECTORY' must be an absolute path\n"
-" default is $TEXMFVAR/web2c/$engine\n"
-" or $TEXMFMAIN/web2c/$engine if TEXMFVAR is undefined\n"
-" --engine TEXENGINE specify the TeX engine (with --byfmt fmtname)\n"
-" --quiet be silent\n"
-" --no-error-if-no-format (just for compatibility)\n"
-" --no-engine-subdir (not implemented)\n"
-" --test (not implemented)\n"
-" --dolinks (not implemented)\n"
-" --force (not implemented)\n");
-}
-
-static void
-freeK(void)
-{
- int i;
- for(i=0; i < MAXFMT; i++) {
- free(K[i].format);
- free(K[i].engine);
- free(K[i].hyphen);
- free(K[i].args);
- free(Exefile[i]);
- }
-}
-
-static int
-do_initex(char *fm, char *en, char *args)
-{
- int ret, lsrflag;
- char fmt[BLEN];
- char ext[SIXTEEN];
- char cmd[BLEN];
- char progn[BLEN];
- char progn2[BLEN];
- char enginesubdir[BLEN];
- char src[BLEN];
- char dst[BLEN];
- char logdst[BLEN];
- char log[BLEN];
- char fullbin[256], *pp;
-
- if(!strnicmp(fm, "cont", 4)) strcpy(progn, "context");
- else if(!strnicmp(fm, "ptex-", 5)) strcpy(progn, "ptex");
- else if(!strnicmp(fm, "platex-", 7)) strcpy(progn, "platex");
- else strcpy(progn, fm);
-
- strcpy(enginesubdir, en);
-
- if(!strcasecmp(enginesubdir, "mf-nowin"))
- strcpy(enginesubdir, "metafont");
- if(!strcasecmp(enginesubdir, "mf"))
- strcpy(enginesubdir, "metafont");
- if(!strcasecmp(enginesubdir, "mpost"))
- strcpy(enginesubdir, "metapost");
-
- if(!strcasecmp(en, "mf-nowin")) {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".base");
- }
- else if(!strcasecmp(en, "mf")) {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".base");
- }
- else if(!strcasecmp(en, "mpost")) {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".mem");
- }
- else if(!strcasecmp(en, "pmpost")) {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".mem");
- }
- else if(!strcasecmp(en, "upmpost")) {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".mem");
- }
- else if(!strcasecmp(en, "mp641")) {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".mem");
- }
- else if(!strcasecmp(en, "nts")) {
- strcpy(fmt, "--fmt=");
- strcpy(ext, ".nfmt");
- }
- else {
- strcpy(fmt, "--jobname=");
- strcpy(ext, ".fmt");
- }
-
- if(!strcasecmp(en, "pmpost") || !strcasecmp(en, "mpost")
- || !strcasecmp(en, "upmpost") || !strcasecmp(en, "mp641"))
- strcpy(progn2, "mpost");
- else if(!strcasecmp(en, "mf-nowin"))
- strcpy(progn2, "mf");
- else if(!strcasecmp(en, "nts"))
- strcpy(progn2, "tex");
- else strcpy(progn2, progn);
-
- pp = kpse_var_value("SELFAUTOLOC");
- if(pp == NULL) {
- fprintf(stderr, "I cannot get SELFAUTOLOC\n");
- exit(100);
- }
- fullbin[0] = '\"';
- fullbin[1] = '\0';
- strcat(fullbin, pp);
- free(pp);
- for(pp=fullbin; *pp; pp++) {
- if(*pp == '/') *pp = '\\';
- }
- strcat(fullbin, "\\");
- strcat(fullbin, en);
- strcat(fullbin, "\"");
-
- if(!strcasecmp(en, "nts"))
- sprintf(cmd, "%s --ini --progname=%s %s <nul",
- fullbin, progn2, args);
- else
- sprintf(cmd, "%s --ini %s%s --progname=%s %s <nul",
- fullbin, fmt, fm, progn2, args);
-
- if(QQQ == 0)
- fprintf(stderr, "Running: %s\n", cmd);
- ret = system(cmd);
- strcpy(src, fm);
- strcpy(log, fm);
- strcat(log, ".log");
- strcat(src, ext);
- strcpy(dst, Destdir);
-
- if((UserDestdir == 0) && strcasecmp(enginesubdir, "nts")) {
- strcat(dst, enginesubdir);
- if(!is_dir(dst)) {
- if(make_dir(dst)) {
- fprintf(stderr, "Failed to make format in %s.\n", dst);
- return (-100);
- }
- }
- strcat(dst, "/");
- }
-
- strcpy(logdst, dst);
- strcat(logdst, log);
- strcat(dst, src);
- if(_access(dst, 0) == 0)
- lsrflag = 0;
- else
- lsrflag = 1;
-
- if((_access(src, 0) == 0) && ret == 0) {
- CopyFile(src, dst, FALSE);
- if(lsrflag) mktexupd(dst);
- if(strcasecmp(src, "mpost.mem") == 0) {
- int len;
- char *tmpstr;
- len = strlen(dst);
- tmpstr = (char *)malloc(len + 10);
- strcpy(tmpstr, dst);
- tmpstr[len-9] = '\0';
- strcat(tmpstr, "mplib-luatex.mem");
- if(_access(tmpstr, 0) == 0)
- free(tmpstr);
- else {
- CopyFile(src, tmpstr, FALSE);
- mktexupd(tmpstr);
- free(tmpstr);
- }
- }
- remove(src);
- if(_access(logdst, 0) == 0)
- lsrflag = 0;
- else
- lsrflag = 1;
- if(_access(log, 0) == 0) {
- CopyFile(log, logdst, FALSE);
- if(lsrflag) mktexupd(logdst);
- remove(log);
- }
- if(QQQ == 0)
- fprintf(stderr, "The file %s%s was created.\n", fm, ext);
- if(!strcmp(progn, "context"))
- strcpy(Exefile[Exenum], "texexec");
- else if(!strcmp(en, "nts"))
- strcpy(Exefile[Exenum], "nts");
- else
- strcpy(Exefile[Exenum], fm);
-
- Exenum++;
- } else {
- if(_access(src, 0) == 0)
- remove(src);
- if(_access(logdst, 0) == 0)
- lsrflag = 0;
- else
- lsrflag = 1;
- if(_access(log, 0) == 0) {
- CopyFile(log, logdst, FALSE);
- if(lsrflag) mktexupd(logdst);
- remove(log);
- }
- if(QQQ == 0) {
- fprintf(stderr, "\nThe file %s%s was not created due to some errors.\n",
- fm, ext);
- fprintf(stderr, "See the log file %s for details.\n", logdst);
- }
- Errorcnt++;
- ret = -100;
- }
- return ret;
-}
-
-static void
-do_all(void)
-{
- int i;
-
- for(i = 0; i < Fmtnum; i++)
- do_initex(K[i].format, K[i].engine, K[i].args);
-}
-
-static void
-show_hyphen(char *fm, char *hfile)
-{
- char *p, *q, *r;
- int cont;
- char progn[BLEN];
-
- if(!strcmp(hfile, "-")) {
- printf("%s\n", hfile);
- return;
- }
-
- if(!strnicmp(fm, "cont", 4)) strcpy(progn, "context");
- else strcpy(progn, fm);
- if(QQQ == 0)
- fprintf(stderr, "Searching ... \n");
- kpse_reset_program_name(progn);
- q = hfile;
- cont = 1;
- while(cont) {
- for(r=q; *r && *r != ','; r++)
- ;
- if(*r == '\0') cont = 0;
- *r = '\0';
- r++;
- p = kpse_find_file(q, kpse_tex_format, 0);
- if(!p) {
- if(QQQ == 0)
- fprintf(stderr, "%s not found.\n", q);
- q = r;
- continue;
- }
- printf("%s\n", p);
- free(p);
- q = r;
- }
- kpse_reset_program_name(Programname);
- return;
-}
-
-static int
-testexe(char *name, const char *suffix)
-{
- char buffer[BLEN];
- char *p;
-
- if(SearchPath(NULL, name, suffix, BLEN, buffer, &p))
- return 1;
- else
- return 0;
-}
-
-int
-main(int ac, char **av)
-{
- FILE *in;
-
- int i, j, k;
- char *cnfname;
- char *p;
- char cnffile[BLEN];
- char fmtname[BLEN];
- char hyphenfile[BLEN];
- char byenginename[BLEN];
- char kpsedot[BLEN];
- char enginesubdir[BLEN];
- char *tmp;
- int cdrive, tdrive;
-
- int flag;
-
-/*
-flag = 1 : --all
- 2 : --missing
- 3 : --byfmt formatname
- 4 : --byhyphen hyphenfile
- 5 : --showhyphen formatname
- 6 : --refresh
- 7 : --byengine engine
-*/
-
- flag = 0;
- cnffile[0] = '\0';
- fmtname[0] = '\0';
- hyphenfile[0] = '\0';
- byenginename[0] = '\0';
- Destdir[0] = '\0';
- Currdir[0] = '\0';
- Enginename[0] = '\0';
- Realenginename[0] = '\0';
-
- kpse_set_program_name(av[0], NULL);
- strcpy(Programname, kpse_invocation_short_name);
- if ((tmp = strrchr(Programname, '.'))) {
- if (strcasecmp (tmp, ".exe") == 0)
- *tmp = '\0';
- }
-
- tmp = getenv("TEMP");
- if(!tmp) tmp = getenv("TMP");
- if(!tmp) tmp = getenv("TMPDIR");
- if(!tmp) {
- fprintf(stderr, "Please define TEMP | TMP | TMPDIR.\n");
- return (100);
- }
-
- tmp = xstrdup(tmp);
- for(p = tmp; *p; p++) {
- if(*p == '\\')
- *p = '/';
- else if (IS_KANJI(p))
- p++;
- }
-
- i = strlen(tmp);
- if(tmp[i-1] == '/') tmp[i-1] = '\0';
-
- for(i = 1; i < ac; i++) {
- if(strlen(av[i]) > BLEN-1) {
- fprintf(stderr, "\nToo long a string.\n");
- return 100;
- }
- /* --cnffile FILE */
-
- if(!strncmp(av[i],"--cn", 4) || !strncmp(av[i], "-cn", 3)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- strcpy(cnffile, av[i]);
- continue;
- }
- /* --engine TEXENGINE */
-
- else if(!strncmp(av[i],"--eng", 5) || !strncmp(av[i], "-eng", 4)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- strcpy(Enginename, av[i]);
- continue;
- }
- /* --fmtdir DIRCTORY */
-
- else if(!strncmp(av[i],"--fm", 4) || !strncmp(av[i], "-fm", 3)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- strcpy(Destdir, av[i]);
- UserDestdir = 1;
- continue;
- }
- /* --all */
-
- else if(!strncmp(av[i],"--a", 3) || !strncmp(av[i], "-a", 2)) {
- flag = 1;
- continue;
- }
- /* --missing */
-
- else if(!strncmp(av[i],"--m", 3) || !strncmp(av[i], "-m", 2)) {
- flag = 2;
- continue;
- }
- /* --refresh */
-
- else if(!strncmp(av[i],"--r", 3) || !strncmp(av[i], "-r", 2)) {
- flag = 6;
- continue;
- }
- /* --byfmt FORMATNAME */
-
- else if(!strncmp(av[i],"--byf", 5) || !strncmp(av[i], "-byf", 4)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- flag = 3;
- strcpy(fmtname, av[i]);
- continue;
- }
- /* --byhyphen HYPHENFILE */
-
- else if(!strncmp(av[i],"--byh", 5) || !strncmp(av[i], "-byh", 4)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- flag = 4;
- strcpy(hyphenfile, av[i]);
- for(p=hyphenfile; *p; p++) {
- if(*p == '\\')
- *p = '/';
- else if (IS_KANJI(p))
- p++;
- }
- p = strrchr(hyphenfile, '/');
- if(p) {
- p++;
- strcpy(hyphenfile, p);
- }
- continue;
- }
- /* --byengine ENGINENAME */
-
- else if(!strncmp(av[i],"--bye", 5) || !strncmp(av[i], "-bye", 4)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- flag = 7;
- strcpy(byenginename, av[i]);
- continue;
- }
- /* --showhyphen FORMATNAME */
-
- else if(!strncmp(av[i],"--s", 3) || !strncmp(av[i], "-s", 2)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- flag = 5;
- strcpy(fmtname, av[i]);
- continue;
- }
- /* --version */
-
- else if(!strncmp(av[i],"--v", 3) || !strncmp(av[i], "-v", 2)) {
- revision();
- return 0;
- }
- /* --help */
-
- else if(!strncmp(av[i],"--h", 3) || !strncmp(av[i], "-h", 2)) {
- usage();
- return 0;
- }
- /* --enablefmt FORMATNAME */
-
- else if(!strncmp(av[i],"--ena", 5) || !strncmp(av[i], "-ena", 4)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- fprintf(stderr, "`--enablefmt FORMATNAME' is not implemented.\n");
- continue;
- }
- /* --disablefmt FORMATNAME */
-
- else if(!strncmp(av[i],"--di", 4) || !strncmp(av[i], "-di", 3)) {
- i++;
- if(i >= ac) {
- fprintf(stderr, "Invalid argument.\n");
- exit (100);
- }
- fprintf(stderr, "`--disablefmt FORMATNAME' is not implemented.\n");
- continue;
- }
- /* --listcfg */
-
- else if(!strncmp(av[i],"--l", 3) || !strncmp(av[i], "-l", 2)) {
- fprintf(stderr, "`--listcfg' is not implemented.\n");
- continue;
- }
- /* --catcfg */
-
- else if(!strncmp(av[i],"--ca", 4) || !strncmp(av[i], "-ca", 3)) {
- fprintf(stderr, "`--catcfg' is not implemented.\n");
- continue;
- }
- /* --edit */
-
- else if(!strncmp(av[i],"--ed", 4) || !strncmp(av[i], "-ed", 3)) {
- fprintf(stderr, "`--edit' is not implemented.\n");
- continue;
- }
- /* --test */
-
- else if(!strncmp(av[i],"--t", 3) || !strncmp(av[i], "-t", 2)) {
- fprintf(stderr, "`--test' is not implemented.\n");
- continue;
- }
- /* --dolinks */
-
- else if(!strncmp(av[i],"--do", 4) || !strncmp(av[i], "-do", 3)) {
- fprintf(stderr, "`--dolinks' is not implemented.\n");
- continue;
- }
- /* --force */
-
- else if(!strncmp(av[i],"--fo", 4) || !strncmp(av[i], "-fo", 3)) {
- fprintf(stderr, "`--force' is not implemented.\n");
- continue;
- }
- /* --no-engine-subdir */
-
- else if(!strncmp(av[i],"--no-en", 7) || !strncmp(av[i], "-no-en", 6)) {
- fprintf(stderr, "`--no-engine-subdir' is not implemented.\n");
- continue;
- }
- /* --no-error-if-no-format */
-
- else if(!strncmp(av[i],"--no-er", 7) || !strncmp(av[i], "-no-er", 6)) {
- continue;
- }
- /* --quiet */
-
- else if(!strncmp(av[i],"--q", 3) || !strncmp(av[i], "-q", 2)) {
- QQQ = 1;
- continue;
- }
- else {
- fprintf(stderr, "%s: Invalid argument.\n\n", av[0]);
- usage();
- return 100;
- }
- }
-
- if(flag == 0) {
- usage();
- return 100;
- }
-
-
- if(!cnffile[0]) strcpy(cnffile, DEFAULTCNF);
- cnfname = kpse_find_file(cnffile, kpse_web2c_format, 0);
- if(!cnfname) {
- fprintf(stderr, "Failed to find cnffile %s.\n", cnffile);
- exit (100);
- }
-
- in = fopen(cnfname, "r");
- free(cnfname);
- if(!in) {
- fprintf(stderr, "Failed to open %s.\n", cnffile);
- exit (100);
- }
-
- for(i=0; i < MAXFMT; i++) {
- K[i].format = (char *)malloc(BLEN);
- K[i].engine = (char *)malloc(BLEN);
- K[i].hyphen = (char *)malloc(BLEN);
- K[i].args = (char *)malloc(BLEN);
- Exefile[i] = (char *)malloc(BLEN);
- }
-
- i = 0;
- while(fgets(Buff, BLEN, in)) {
- if(Buff[0] == '#' ||
- Buff[0] == '\n' ||
- Buff[0] == 0x25)
- continue;
- p = strtok(Buff, " \t");
- if(p)
- strcpy(K[i].format, p);
- else
- K[i].format[0] = '\0';
- p = strtok(NULL, " \t");
- if(p)
- strcpy(K[i].engine, p);
- else
- K[i].engine[0] = '\0';
- p = strtok(NULL, " \t");
- if(p)
- strcpy(K[i].hyphen, p);
- else
- K[i].hyphen[0] = '\0';
- p = strtok(NULL, "\n");
- if(p) {
- while(*p == ' ' || *p == '\t')
- p++;
- j = strlen(p);
- if(*(p+j-1) == '\n')
- *(p+j-1) = '\0';
- strcpy(K[i].args, p);
- }
- else
- K[i].args[0] = '\0';
-
- if(!K[i].format[0] ||
- !K[i].engine[0] ||
- !K[i].hyphen[0] ||
- !K[i].args) {
- fprintf(stderr, "Invalid line in %s.\n", cnffile);
- freeK();
- return (100);
- }
- i++;
- if(i > MAXFMT) {
- fprintf(stderr, "Too many lines in %s.\n", cnffile);
- freeK();
- return (100);
- }
- }
-
- Fmtnum = i;
- fclose(in);
-
- j = 0;
- if(flag == 5) {
- for(i = 0; i < Fmtnum; i++) {
- if(!strcasecmp(K[i].format, fmtname)) {
- show_hyphen(K[i].format, K[i].hyphen);
- j++;
- }
- }
- if(j == 0)
- fprintf(stderr, "argument of --showhyphen must be a format name.\n");
- freeK();
- return 1;
- }
-
- if(strcasecmp(Programname, "fmtutil-sys") == 0) {
- char *px = kpse_var_value("TEXMFSYSVAR");
- if(px) {
- xputenv("TEXMFVAR", px);
- }
- }
-
- if(UserDestdir == 0) {
- p = kpse_var_value("TEXMFVAR");
- if(!p)
- p = kpse_var_value("TEXMFMAIN");
- if(!p) {
- fprintf(stderr, "TEXMFMAIN not defined.\n");
- freeK();
- return 100;
- }
- strcpy(Destdir, p);
- free(p);
- for(p = Destdir; *p ; p++) {
- if(*p == '\\')
- *p = '/';
- else if (IS_KANJI(p))
- p++;
- }
-
- i = strlen(Destdir);
- while (Destdir[i-1] == '/')
- i--;
- Destdir[i] = '\0';
- strcat(Destdir, "/web2c");
- }
-
- if(!is_dir(Destdir)) {
- if(make_dir_p(Destdir)) {
- fprintf(stderr, "Failed to make a format under %s.\n", Destdir);
- return (-100);
- }
- }
-
- strcat(Destdir, "/");
- p = _getcwd(Currdir, BLEN);
- if(p) {
- for(p = Currdir; *p ; p++) {
- if(*p == '\\')
- *p = '/';
- else if (IS_KANJI(p))
- p++;
- }
- i = strlen(Currdir);
- if(Currdir[i-1] == '/') Currdir[i-1] = '\0';
- strcpy(kpsedot, "KPSE_DOT=.;");
- strcat(kpsedot, Currdir);
- _putenv(kpsedot);
- }
-
- cdrive = _getdrive();
- if(tmp[1] == ':') {
- tdrive = tolower(*tmp) -'a' + 1;
- _chdrive(tdrive);
- }
- _chdir(tmp);
-
- j = 0;
-
- if(flag == 4) {
- char *p, *q;
- int cont;
- for(i = 0; i < Fmtnum; i++) {
- p = K[i].hyphen;
- cont = 1;
- while(cont) {
- for(q = p; *q && *q != ','; q++)
- ;
- if(*q == '\0') cont = 0;
- *q = '\0';
- q++;
- if(!strcasecmp(p, hyphenfile)) {
- do_initex(K[i].format, K[i].engine, K[i].args);
- j++;
- cont = 0;
- }
- p = q;
- }
- }
- if(j == 0)
- fprintf(stderr, "hyphen pattern %s not written in %s.\n",hyphenfile,cnffile);
- }
-
- else if(flag == 7) {
- if(strcasecmp(byenginename, "metafont") == 0)
- strcpy(byenginename, "mf-nowin");
- if(strcasecmp(byenginename, "metapost") == 0)
- strcpy(byenginename, "mpost");
- for(i = 0; i < Fmtnum; i++) {
- if(!strcasecmp(K[i].engine, byenginename)) {
- do_initex(K[i].format, K[i].engine, K[i].args);
- j++;
- }
- }
- if(j == 0) {
- fprintf(stderr, "engine name %s not written in %s.\n", byenginename, cnffile);
- }
- }
-
- else if(flag == 3) {
- for(i = 0; i < Fmtnum; i++) {
- if(Enginename[0]) {
- if(!strcasecmp(Enginename, "metafont"))
- strcpy(Realenginename, "mf-nowin");
- else if(!strcasecmp(Enginename, "metapost"))
- strcpy(Realenginename, "mpost");
- else
- strcpy(Realenginename, Enginename);
- if(!strcasecmp(K[i].format, fmtname) &&
- !strcasecmp(K[i].engine, Realenginename)) {
- do_initex(K[i].format, K[i].engine, K[i].args);
- j++;
- }
- }
- else {
- if(!strcasecmp(K[i].format, fmtname)) {
- do_initex(K[i].format, K[i].engine, K[i].args);
- j++;
- }
- }
- }
- if(j == 0) {
- if(Enginename[0])
- fprintf(stderr, "format name %s with engine %s not written in %s.\n",
- fmtname, Realenginename, cnffile);
- else
- fprintf(stderr, "format name %s not written in %s.\n", fmtname, cnffile);
- }
- }
-
- else if((flag == 2) || (flag == 6)) {
- for(i = 0; i < Fmtnum; i++) {
- strcpy(Buff, Destdir);
-
- strcpy(enginesubdir, K[i].engine);
- if(!strcasecmp(enginesubdir, "mf-nowin"))
- strcpy(enginesubdir, "metafont");
- if(!strcasecmp(enginesubdir, "mf"))
- strcpy(enginesubdir, "metafont");
- if(!strcasecmp(enginesubdir, "mpost"))
- strcpy(enginesubdir, "metapost");
- if(strcasecmp(enginesubdir, "nts"))
- strcat(Buff, enginesubdir);
- strcat(Buff, "/");
-
- strcat(Buff, K[i].format);
- if(!strcasecmp(K[i].engine, "nts"))
- strcat(Buff, ".nfmt");
- else if(!strcasecmp(K[i].engine, "mf"))
- strcat(Buff, ".base");
- else if(!strcasecmp(K[i].engine, "mf-nowin"))
- strcat(Buff, ".base");
- else if(!strcasecmp(K[i].engine, "mpost"))
- strcat(Buff, ".mem");
- else if(!strcasecmp(K[i].engine, "pmpost"))
- strcat(Buff, ".mem");
- else if(!strcasecmp(K[i].engine, "upmpost"))
- strcat(Buff, ".mem");
- else
- strcat(Buff, ".fmt");
- if(flag == 2) {
- if(_access(Buff, 0) != 0)
- do_initex(K[i].format, K[i].engine, K[i].args);
- else if(QQQ == 0)
- fprintf(stderr, "%s exists.\n", Buff);
- } else if(flag == 6) {
- if(_access(Buff, 0) == 0)
- do_initex(K[i].format, K[i].engine, K[i].args);
- else if(QQQ == 0)
- fprintf(stderr, "%s does not exist.\n", Buff);
- }
- }
- }
-
- else if(flag == 1)
- do_all();
-
- _chdrive(cdrive);
- _chdir(Currdir);
-
-/*
-Check executable files. (ignore "Batch" or "Script" files (case 'x'))
-*/
- if(Exenum && QQQ == 0) {
- fprintf(stderr, "\n\nNow I check executable files...\n");
- fprintf(stderr, "If some executable files do not exist, you must make them\n");
- fprintf(stderr, "by hard link (Windows NT/2000/XP/Vista/7),"
- " symbolic link (Vista/7)\n"
- "or copying (Windows 95/98/Me).\n\n");
-
- for(i = 0; i < Exenum; i++) {
- if(testexe(Exefile[i], ".exe"))
- sprintf(Buff, "OK. %s.exe exists.", Exefile[i]);
- else if(testexe(Exefile[i], ".bat"))
- sprintf(Buff, "OK. %s.bat exists.", Exefile[i]);
- else if(testexe(Exefile[i], ".sh"))
- sprintf(Buff, "OK. %s.sh exists.", Exefile[i]);
- else
- sprintf(Buff, "I cannot find %s.", Exefile[i]);
- j = strlen(Buff);
-
- if((i+1) % 2) {
- for(k = j; k < 36; k++)
- Buff[k] = ' ';
- Buff[k] = '\0';
- fprintf(stderr, "%s", Buff);
- }
- else {
- fprintf(stderr, "%s", Buff);
- fprintf(stderr, "\n");
- }
- }
- fprintf(stderr, "\n");
- }
-
- freeK();
- if(Errorcnt && QQQ == 0) {
- fprintf(stderr, "\n\nI could not create %d of format (base/mem) file(s).\n",
- Errorcnt);
- fprintf(stderr, "For details, see log file(s) in the (fmt/base/mem) dir(s).\n");
- }
- return Errorcnt != 0;
-}