summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-04-13 13:09:23 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-04-13 13:09:23 +0000
commit4da7602b3a788dd14cd4d5dcd5f8ca3c7c69b49f (patch)
treec013ebbd78b28708e72e9e1f52fa7574b8362ac8
parent6511d4c92941623192bdd0e9c368a97132c9b304 (diff)
dvisvgm 1.5.3
git-svn-id: svn://tug.org/texlive/trunk@33433 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/README2
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog6
-rw-r--r--Build/source/texk/dvisvgm/Makefile.am3
-rw-r--r--Build/source/texk/dvisvgm/Makefile.in6
-rwxr-xr-xBuild/source/texk/dvisvgm/configure26
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/README7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.cpp27
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/ChangeLog (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/ChangeLog)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/TL-Changes (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/TL-Changes)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/AUTHORS (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/AUTHORS)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/COPYING (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/COPYING)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/ChangeLog (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/ChangeLog)45
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/INSTALL (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/INSTALL)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/LGPL-2.1.txt (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/LGPL-2.1.txt)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/Makefile.am)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/NEWS (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/NEWS)5
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/README (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/README)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/config.h.in (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/config.h.in)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/configure.ac (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/configure.ac)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/Makefile.am)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.1 (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.1)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.txt.in (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.txt.in)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.h)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.cpp)3
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Character.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Character.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.cpp)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.cpp)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.cpp)104
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.h)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.cpp)27
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.cpp)16
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.cpp)23
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.cpp)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.cpp)11
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.cpp)1
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.h)14
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.cpp)21
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.cpp)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontStyle.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontStyle.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.cpp)12
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.cpp)3
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Glyph.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Glyph.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GlyphTracerMessages.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GlyphTracerMessages.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GraphicPath.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GraphicPath.h)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Makefile.am)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MessageException.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MessageException.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSFilter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSFilter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.cpp)1
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.cpp)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.cpp)24
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.h)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.cpp)1
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.h)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Pair.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Pair.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.cpp)45
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGOutputBase.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGOutputBase.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.cpp)24
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialActions.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialHandler.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.cpp)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.cpp)5
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.cpp)17
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.cpp)39
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFActions.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.cpp)5
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VectorStream.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VectorStream.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/dvisvgm.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/dvisvgm.cpp)3
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/iapi.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/iapi.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ierrors.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ierrors.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/macros.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/macros.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/options.xml (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/options.xml)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/psdefs.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/psdefs.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/types.h (renamed from Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/types.h)0
-rw-r--r--Build/source/texk/dvisvgm/version.ac2
189 files changed, 332 insertions, 328 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 53a00855374..9f8b435413a 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -61,7 +61,7 @@ dvipos - ?
dvipsk - maintained here, by us
-dvisvgm 1.5.2 - checked 13jan14
+dvisvgm 1.5.3 - checked 13apr14
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 4d5bf1c3d0f..4e9ef8a58a7 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Imported release 1.5.3.
+ * version.ac: Adapted.
+ * Makefile.am: Adjusted.
+
2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* Imported release 1.5.2.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index e1a13c95330..b1eabc821ef 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dvisvgm/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
#************************************************************************
@@ -66,7 +66,6 @@ nodist_libdvisvgm_a_SOURCES = \
@DVISVGM_TREE@/src/Color.cpp \
@DVISVGM_TREE@/src/ColorSpecialHandler.cpp \
@DVISVGM_TREE@/src/CommandLine.cpp \
- @DVISVGM_TREE@/src/DVIActions.cpp \
@DVISVGM_TREE@/src/DVIReader.cpp \
@DVISVGM_TREE@/src/DVIToSVG.cpp \
@DVISVGM_TREE@/src/DVIToSVGActions.cpp \
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index 757594ca645..43c603fc83e 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -149,7 +149,6 @@ nodist_libdvisvgm_a_OBJECTS = \
@DVISVGM_TREE@/src/Color.$(OBJEXT) \
@DVISVGM_TREE@/src/ColorSpecialHandler.$(OBJEXT) \
@DVISVGM_TREE@/src/CommandLine.$(OBJEXT) \
- @DVISVGM_TREE@/src/DVIActions.$(OBJEXT) \
@DVISVGM_TREE@/src/DVIReader.$(OBJEXT) \
@DVISVGM_TREE@/src/DVIToSVG.$(OBJEXT) \
@DVISVGM_TREE@/src/DVIToSVGActions.$(OBJEXT) \
@@ -684,7 +683,6 @@ nodist_libdvisvgm_a_SOURCES = \
@DVISVGM_TREE@/src/Color.cpp \
@DVISVGM_TREE@/src/ColorSpecialHandler.cpp \
@DVISVGM_TREE@/src/CommandLine.cpp \
- @DVISVGM_TREE@/src/DVIActions.cpp \
@DVISVGM_TREE@/src/DVIReader.cpp \
@DVISVGM_TREE@/src/DVIToSVG.cpp \
@DVISVGM_TREE@/src/DVIToSVGActions.cpp \
@@ -838,9 +836,6 @@ clean-noinstLIBRARIES:
@DVISVGM_TREE@/src/CommandLine.$(OBJEXT): \
@DVISVGM_TREE@/src/$(am__dirstamp) \
@DVISVGM_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@DVISVGM_TREE@/src/DVIActions.$(OBJEXT): \
- @DVISVGM_TREE@/src/$(am__dirstamp) \
- @DVISVGM_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@DVISVGM_TREE@/src/DVIReader.$(OBJEXT): \
@DVISVGM_TREE@/src/$(am__dirstamp) \
@DVISVGM_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@@ -1096,7 +1091,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/ColorSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/CommandLine.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/DLLoader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/DVIActions.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/DVIReader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/DVIToSVG.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@DVISVGM_TREE@/src/$(DEPDIR)/DVIToSVGActions.Po@am__quote@
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 1b484d71c7f..2a413e90ee1 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.5.2.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 1.5.3.
#
# 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.5.2'
-PACKAGE_STRING='dvisvgm (TeX Live) 1.5.2'
+PACKAGE_VERSION='1.5.3'
+PACKAGE_STRING='dvisvgm (TeX Live) 1.5.3'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="dvisvgm-1.5.2/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.5.3/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.5.2 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 1.5.3 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.5.2:";;
+ short | recursive ) echo "Configuration of dvisvgm (TeX Live) 1.5.3:";;
esac
cat <<\_ACEOF
@@ -1581,7 +1581,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisvgm (TeX Live) configure 1.5.2
+dvisvgm (TeX Live) configure 1.5.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2403,7 +2403,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.5.2, which was
+It was created by dvisvgm (TeX Live) $as_me 1.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7894,7 +7894,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisvgm--tex-live-'
- VERSION='1.5.2'
+ VERSION='1.5.3'
cat >>confdefs.h <<_ACEOF
@@ -17755,7 +17755,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvisvgm (TeX Live) config.lt 1.5.2
+dvisvgm (TeX Live) config.lt 1.5.3
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19566,7 +19566,7 @@ $as_echo "#define KPSE_CXX_UNSAFE 1" >>confdefs.h
fi
-DVISVGM_TREE=dvisvgm-1.5.2
+DVISVGM_TREE=dvisvgm-1.5.3
ac_config_files="$ac_config_files Makefile"
@@ -20118,7 +20118,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.5.2, which was
+This file was extended by dvisvgm (TeX Live) $as_me 1.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20184,7 +20184,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.5.2
+dvisvgm (TeX Live) config.status 1.5.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/README b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/README
deleted file mode 100644
index 5ba5d35cbb4..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/README
+++ /dev/null
@@ -1,7 +0,0 @@
-dvisvgm-1.5.1 (2013-10-29)
-- fixed processing of bounding box data created by the preview package
-- fixed processing of font definitions across DVI pages
-- fixed compilation issues occurred if processing of PS specials is disabled
-- don't print the logical page number if it's equal to the physical one
-- some minor code improvements
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.cpp
deleted file mode 100644
index 157847cd2f1..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************
-** DVIActions.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2014 Martin Gieseking <martin.gieseking@uos.de> **
-** **
-** This program is free software; you can redistribute it and/or **
-** modify it under the terms of the GNU General Public License as **
-** published by the Free Software Foundation; either version 3 of **
-** the License, or (at your option) any later version. **
-** **
-** This program 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 General Public License for more details. **
-** **
-** You should have received a copy of the GNU General Public License **
-** along with this program; if not, see <http://www.gnu.org/licenses/>. **
-*************************************************************************/
-
-#include <config.h>
-#include "DVIActions.h"
-
-const double DVIActions::BP = 72.0/72.27;
-const double DVIActions::IN = 1.0/72.27;
-const double DVIActions::CM = 2.54*IN;
-const double DVIActions::MM = 25.4*IN;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/ChangeLog
index 002ebf7dbff..fed2bc44065 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Import release 1.5.3.
+
2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* Import release 1.5.2.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/TL-Changes
index f9bad58fcb1..0b154b3f170 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2-PATCHES/TL-Changes
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the dvisvgm-1.5.2 tree as obtained from:
+Changes applied to the dvisvgm-1.5.3 tree as obtained from:
http://downloads.sourceforge.net/dvisvgm/
Removed:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/AUTHORS
index d9b6468421e..d9b6468421e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/ChangeLog
index 791465cf9d2..aa07685bdc0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/ChangeLog
@@ -1,3 +1,48 @@
+2014-04-11 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/CMap.cpp, src/CmdLineParserBase.cpp, src/ColorSpecialHandler.cpp,
+ src/DVIReader.cpp, src/DVIToSVGActions.cpp, src/Doxyfile,
+ src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h,
+ src/EPSFile.cpp, src/EmSpecialHandler.cpp, src/FileFinder.cpp,
+ src/FileSystem.cpp, src/Font.cpp, src/FontCache.cpp, src/FontEncoding.h,
+ src/FontEngine.cpp, src/FontMap.cpp, src/GraphicPath.h,
+ src/PSInterpreter.cpp, src/PageRanges.cpp, src/PsSpecialHandler.cpp,
+ src/SVGTree.cpp, src/SVGTree.h, src/SpecialManager.cpp, src/Subfont.cpp,
+ src/TFM.cpp, src/TpicSpecialHandler.cpp, src/XMLDocument.cpp,
+ src/XMLNode.cpp, src/dvisvgm.cpp:
+ fixed issues in the doxygen documentation
+
+2014-04-09 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/BoundingBox.h, src/DVIActions.cpp, src/DVIActions.h,
+ src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp,
+ src/DVIToSVGActions.cpp, src/DVIToSVGActions.h,
+ src/DvisvgmSpecialHandler.cpp, src/EPSToSVG.cpp,
+ src/EmSpecialHandler.cpp, src/Font.h, src/FontManager.cpp,
+ src/GFGlyphTracer.cpp, src/GFReader.cpp, src/GFTracer.cpp,
+ src/GFTracer.h, src/GraphicPath.h, src/HtmlSpecialHandler.h,
+ src/Makefile.am, src/PSPattern.cpp, src/PSPreviewFilter.cpp,
+ src/PSPreviewFilter.h, src/PageSize.cpp, src/PageSize.h,
+ src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SVGTree.cpp,
+ src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h,
+ src/TFM.cpp, src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h,
+ src/VFReader.cpp:
+ switched internal computations from TeX points (pt) to PS points (bp)
+
+ * src/DVIToSVGActions.cpp:
+ equalize implementations of moveToX and moveToY
+
+2014-02-05 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/DVIReader.cpp, src/DVIReader.h:
+ ensure updating the SVG cursor position when executing DVI command
+ set_rule
+
+2014-01-13 Martin Gieseking <martin.gieseking@uos.de>
+
+ * src/Ghostscript.cpp:
+ check if library given by --libgs is actually a GS library
+
2014-01-10 Martin Gieseking <martin.gieseking@uos.de>
* NEWS:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/Makefile.am
index b73dbf588f8..b73dbf588f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/NEWS
index 1cdaa6b62c2..bc9e7e02d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/NEWS
@@ -1,3 +1,8 @@
+dvisvgm-1.5.3 (2014-04-11)
+- improved positioning of PostScript graphics
+- fixed positioning of DVI rules/rectangles
+- switched internal computations from TeX points (pt) to PostScript points (bp)
+
dvisvgm-1.5.2 (2014-01-10)
- fixed handling of global font colors and color specials
- several code improvements
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/README b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/README
index 2454a2a23f4..2454a2a23f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/README
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/config.h.in
index fcd8cf41872..fcd8cf41872 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/config.h.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/configure.ac
index 2fcd9fc499d..f52b8295a0f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/configure.ac
@@ -4,8 +4,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[1.5.2],[martin.gieseking@uos.de])
-DATE="January 2014"
+AC_INIT([dvisvgm],[1.5.3],[martin.gieseking@uos.de])
+DATE="April 2014"
AC_CONFIG_SRCDIR(src)
AC_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/Makefile.am
index 13254cb773a..13254cb773a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.1
index 4f64318e71b..c0814786d09 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/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: 01/03/2014
+.\" Date: 04/11/2014
.\" Manual: dvisvgm Manual
-.\" Source: dvisvgm 1.5.2
+.\" Source: dvisvgm 1.5.3
.\" Language: English
.\"
-.TH "DVISVGM" "1" "01/03/2014" "dvisvgm 1\&.5\&.2" "dvisvgm Manual"
+.TH "DVISVGM" "1" "04/11/2014" "dvisvgm 1\&.5\&.3" "dvisvgm Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.txt.in
index 06cf27d35a6..06cf27d35a6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/doc/dvisvgm.txt.in
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.cpp
index dd19e4b5f53..dd19e4b5f53 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.h
index edd764e86b2..edd764e86b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BgColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.cpp
index 265533b1ef5..265533b1ef5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.h
index af03597be33..af03597be33 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.cpp
index f6c5d0b3b9b..f6c5d0b3b9b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.h
index bfc3eec56fb..1996973d42d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/BoundingBox.h
@@ -75,8 +75,8 @@ class BoundingBox
XMLElementNode* toSVGRect () const;
private:
- double _ulx, _uly; ///< coordinates of upper left vertex (in TeX point units)
- double _lrx, _lry; ///< coordinates of lower right vertex (in TeX point unitx)
+ double _ulx, _uly; ///< coordinates of upper left vertex (in PS point units)
+ double _lrx, _lry; ///< coordinates of lower right vertex (in PS point units)
bool _valid : 1; ///< true if the box coordinates are properly set
bool _locked : 1; ///< if true, the box data is read-only
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.cpp
index 285a553ec69..f6a46a31a86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.cpp
@@ -133,7 +133,7 @@ void SegmentedCMap::adaptNeighbors (Ranges &ranges, Ranges::iterator it) {
/** Adds a new code range. The range describes a mapping from character codes c to CIDs, where
- * c \in [cmin,cmax] and CID(c):=cid+c-cmin.
+ * \f$c \in [cmin,cmax]\f$ and \f$CID(c):=cid+c-cmin\f$.
* @param[in,out] ranges collection the new range is added to
* @param[in] cmin smallest character code in the range
* @param[in] cmax largest character code in the range
@@ -203,6 +203,7 @@ UInt32 SegmentedCMap::bfcode (UInt32 cid) const {
/** Finds the index of the range that contains a given value c.
+ * @param[in] ranges lookup value in these set of ranges
* @param[in] c find range that contains this value
* @return index of the range found, or -1 if range was not found */
int SegmentedCMap::lookup (const Ranges &ranges, UInt32 c) const {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.h
index 2a3e9c7dbbb..2a3e9c7dbbb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.cpp
index cbad12746c9..cbad12746c9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.h
index fb71886753c..fb71886753c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.cpp
index 502e42ef2e0..502e42ef2e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.h
index 5986e92b13d..5986e92b13d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CMapReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CMapReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.cpp
index 3f85710c6b7..3f85710c6b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.h
index 4376b192077..4376b192077 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CRC32.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CRC32.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.cpp
index 2e0bb06a361..2e0bb06a361 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.h
index 89d2c08560d..89d2c08560d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Calculator.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.cpp
index 3e749add96b..3e749add96b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.h
index 8faeffa21c1..8faeffa21c1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.cpp
index 2c6e1cd8a59..2c6e1cd8a59 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.h
index ea30d50d266..ea30d50d266 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CharMapID.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CharMapID.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Character.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Character.h
index a9d0f6a2d6d..a9d0f6a2d6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Character.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Character.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.cpp
index 002a0a9cc5e..2c8d133cc97 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.cpp
@@ -36,6 +36,8 @@ void CmdLineParserBase::init () {
/** Parses all options given on the command line.
+ * @param[in] argc number of command-line arguments
+ * @param[in] argv array providing the command-line arguments
* @param[in] printErrors enable/disable printing of error messages */
void CmdLineParserBase::parse (int argc, char **argv, bool printErrors) {
init();
@@ -132,7 +134,7 @@ void CmdLineParserBase::status () const {
/** Returns the option information of a given short option name.
* If the option name can't be found 0 is returned.
- * @param[in] longname long version of the option without leading hyphen (e.g. p, not -p) */
+ * @param[in] shortname short version of the option without leading hyphen (e.g. p, not -p) */
const CmdLineParserBase::Option* CmdLineParserBase::option (char shortname) const {
size_t numopts; // number of available options
for (const Option *opts = options(&numopts); numopts > 0; ++opts) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.h
index 87e740feaf3..87e740feaf3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CmdLineParserBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.cpp
index 7e8d9d56069..7e8d9d56069 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.h
index 99d847560e0..99d847560e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Color.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.cpp
index 42ec2639a8c..31b9de68c01 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.cpp
@@ -53,12 +53,12 @@ static void read_floats (istream &is, vector<float> &v) {
/** Reads a color statement from an input stream and converts it to RGB.
* A color statement has the following syntax:
- * <color model> <component values>
+ * _color model_ _component values_
* Currently, the following color models are supported: rgb, cmyk, hsb and gray.
* Examples: rgb 1 0.5 0, gray 0.5
* @param[in] model if model != "" this value specifies the model, otherwise it's read from the stream
* @param[in] is stream to be read from
- * @param[out] resulting RGB triple
+ * @param[out] color italicresulting RGB triple
* @return true if statement has successfully been read */
static void read_color (string model, istream &is, Color &color) {
if (model.empty())
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.h
index 27dfe984a00..27dfe984a00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ColorSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.cpp
index b13fc520cec..b13fc520cec 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.h
index dedf935a112..dedf935a112 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/CommandLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.cpp
index 2386da70fed..2386da70fed 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.h
index e699fa219db..e699fa219db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DLLoader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIActions.h
index 79bae4e6143..613be5365d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIActions.h
@@ -32,10 +32,6 @@ class SpecialManager;
struct DVIActions
{
- static const double BP;
- static const double IN;
- static const double CM;
- static const double MM;
virtual ~DVIActions () {}
virtual void setChar (double x, double y, unsigned c, bool vertical, const Font *f) {}
virtual void setRule (double x, double y, double height, double width) {}
@@ -45,7 +41,7 @@ struct DVIActions
virtual bool fontProcessingEnabled () const {return true;}
virtual void defineFont (int num, const Font *font) {}
virtual void setFont (int num, const Font *font) {}
- virtual void special (const std::string &s, double dvi2pt) {}
+ virtual void special (const std::string &s, double dvi2bp) {}
virtual void preamble (const std::string &cmt) {}
virtual void postamble () {}
virtual void beginPage (unsigned pageno, Int32 *c) {}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.cpp
index d256502520d..f9edfd0536d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.cpp
@@ -44,7 +44,7 @@ DVIReader::DVIReader (istream &is, DVIActions *a) : StreamReader(is), _dviFormat
{
_inPage = false;
_pageHeight = _pageWidth = 0;
- _scaleFactor = 0.0;
+ _dvi2bp = 0.0;
_tx = _ty = 0; // no cursor translation
_prevYPos = numeric_limits<double>::min();
_inPostamble = false;
@@ -68,7 +68,7 @@ DVIActions* DVIReader::replaceActions (DVIActions *a) {
/** Evaluates the next DVI command, and computes the corresponding handler.
* @param[in] compute_size if true, the size of variable-length parameters is computed
* @param[out] handler handler for current DVI command
- * @param[out] number of parameter bytes
+ * @param[out] length number of parameter bytes
* @param[out] param the handler must be called with this parameter
* @return opcode of current DVI command */
int DVIReader::evalCommand (bool compute_size, CommandHandler &handler, int &length, int &param) {
@@ -306,14 +306,14 @@ void DVIReader::executePostamble () {
}
-/** Returns the current x coordinate in TeX point units.
+/** Returns the current x coordinate in PS point units.
* This is the horizontal position where the next output would be placed. */
double DVIReader::getXPos () const {
return _dviState.h+_tx;
}
-/** Returns the current y coordinate in TeX point units.
+/** Returns the current y coordinate in PS point units.
* This is the vertical position where the next output would be placed. */
double DVIReader::getYPos () const {
return _dviState.v+_ty;
@@ -357,8 +357,8 @@ void DVIReader::cmdPre (int) {
UInt32 k = readUnsigned(1); // length of following comment
string cmt = readString(k); // comment
// 1 dviunit * num/den == multiples of 0.0000001m
- // 1 dviunit * _scaleFactor: length of 1 dviunit in TeX points * _mag/1000
- _scaleFactor = num/25400000.0*7227.0/den*_mag/1000.0;
+ // 1 dviunit * _dvibp: length of 1 dviunit in PS points * _mag/1000
+ _dvi2bp = num/254000.0*72.0/den*_mag/1000.0;
if (_actions)
_actions->preamble(cmt);
}
@@ -377,10 +377,10 @@ void DVIReader::cmdPost (int) {
readUnsigned(2); // max. stack depth
_totalPages = readUnsigned(2); // total number of pages
// 1 dviunit * num/den == multiples of 0.0000001m
- // 1 dviunit * _scaleFactor: length of 1 dviunit in TeX points * _mag/1000
- _scaleFactor = num/25400000.0*7227.0/den*_mag/1000.0;
- _pageHeight *= _scaleFactor; // to pt units
- _pageWidth *= _scaleFactor;
+ // 1 dviunit * _dvi2bp: length of 1 dviunit in PS points * _mag/1000
+ _dvi2bp = num/254000.0*72.0/den*_mag/1000.0;
+ _pageHeight *= _dvi2bp; // to pt units
+ _pageWidth *= _dvi2bp;
_inPostamble = true;
if (_actions)
_actions->postamble();
@@ -491,8 +491,9 @@ void DVIReader::putChar (UInt32 c, bool moveCursor) {
int save_fontnum = _currFontNum; // save current font number
fm.enterVF(vf); // new font number context
cmdFontNum0(fm.vfFirstFontNum(vf));
- double save_scale = _scaleFactor;
- _scaleFactor = vf->scaledSize()/(1 << 20);
+ double save_scale = _dvi2bp;
+ // DVI units in virtual fonts are multiples of 1^(-20) times the scaled size of the VF
+ _dvi2bp = vf->scaledSize()/(1 << 20);
VectorInputStream<UInt8> vis(*dvi);
istream &is = replaceStream(vis);
@@ -503,7 +504,7 @@ void DVIReader::putChar (UInt32 c, bool moveCursor) {
// Message::estream(true) << "invalid dvi in vf: " << e.getMessage() << endl; // @@
}
replaceStream(is); // restore previous input stream
- _scaleFactor = save_scale; // restore previous scale factor
+ _dvi2bp = save_scale; // restore previous scale factor
fm.leaveVF(); // restore previous font number context
cmdFontNum0(save_fontnum); // restore previous font number
_dviState = pos; // restore previous cursor position
@@ -561,11 +562,11 @@ void DVIReader::cmdPutChar (int len) {
* @throw DVIException if method is called ouside a bop/eop pair */
void DVIReader::cmdSetRule (int) {
if (_inPage) {
- double height = _scaleFactor*readSigned(4);
- double width = _scaleFactor*readSigned(4);
+ double height = _dvi2bp*readSigned(4);
+ double width = _dvi2bp*readSigned(4);
if (_actions && height > 0 && width > 0)
_actions->setRule(_dviState.h+_tx, _dviState.v+_ty, height, width);
- moveRight(width, (height <= 0 || width <= 0));
+ moveRight(width);
}
else
throw DVIException("set_rule outside of page");
@@ -577,8 +578,8 @@ void DVIReader::cmdSetRule (int) {
* @throw DVIException if method is called ouside a bop/eop pair */
void DVIReader::cmdPutRule (int) {
if (_inPage) {
- double height = _scaleFactor*readSigned(4);
- double width = _scaleFactor*readSigned(4);
+ double height = _dvi2bp*readSigned(4);
+ double width = _dvi2bp*readSigned(4);
if (_actions && height > 0 && width > 0)
_actions->setRule(_dviState.h+_tx, _dviState.v+_ty, height, width);
}
@@ -587,46 +588,46 @@ void DVIReader::cmdPutRule (int) {
}
-void DVIReader::moveRight (double x, bool callAction) {
+void DVIReader::moveRight (double dx) {
switch (_dviState.d) {
- case WMODE_LR: _dviState.h += x; break;
- case WMODE_TB: _dviState.v += x; break;
- case WMODE_BT: _dviState.v -= x; break;
+ case WMODE_LR: _dviState.h += dx; break;
+ case WMODE_TB: _dviState.v += dx; break;
+ case WMODE_BT: _dviState.v -= dx; break;
}
- if (_actions && callAction) {
+ if (_actions) {
if (_dviState.d == WMODE_LR)
- _actions->moveToX(x+_tx);
+ _actions->moveToX(_dviState.h+_tx);
else
- _actions->moveToY(x+_ty);
+ _actions->moveToY(_dviState.v+_ty);
}
}
-void DVIReader::moveDown (double y) {
+void DVIReader::moveDown (double dy) {
switch (_dviState.d) {
- case WMODE_LR: _dviState.v += y; break;
- case WMODE_TB: _dviState.h -= y; break;
- case WMODE_BT: _dviState.h += y; break;
+ case WMODE_LR: _dviState.v += dy; break;
+ case WMODE_TB: _dviState.h -= dy; break;
+ case WMODE_BT: _dviState.h += dy; break;
}
if (_actions) {
if (_dviState.d == WMODE_LR)
- _actions->moveToY(y+_ty);
+ _actions->moveToY(_dviState.v+_ty);
else
- _actions->moveToX(y+_tx);
+ _actions->moveToX(_dviState.h+_tx);
}
}
-void DVIReader::cmdRight (int len) {moveRight(_scaleFactor*readSigned(len));}
-void DVIReader::cmdDown (int len) {moveDown(_scaleFactor*readSigned(len));}
+void DVIReader::cmdRight (int len) {moveRight(_dvi2bp*readSigned(len));}
+void DVIReader::cmdDown (int len) {moveDown(_dvi2bp*readSigned(len));}
void DVIReader::cmdX0 (int) {moveRight(_dviState.x);}
void DVIReader::cmdY0 (int) {moveDown(_dviState.y);}
void DVIReader::cmdW0 (int) {moveRight(_dviState.w);}
void DVIReader::cmdZ0 (int) {moveDown(_dviState.z);}
-void DVIReader::cmdX (int len) {_dviState.x = _scaleFactor*readSigned(len); cmdX0(0);}
-void DVIReader::cmdY (int len) {_dviState.y = _scaleFactor*readSigned(len); cmdY0(0);}
-void DVIReader::cmdW (int len) {_dviState.w = _scaleFactor*readSigned(len); cmdW0(0);}
-void DVIReader::cmdZ (int len) {_dviState.z = _scaleFactor*readSigned(len); cmdZ0(0);}
+void DVIReader::cmdX (int len) {_dviState.x = _dvi2bp*readSigned(len); cmdX0(0);}
+void DVIReader::cmdY (int len) {_dviState.y = _dvi2bp*readSigned(len); cmdY0(0);}
+void DVIReader::cmdW (int len) {_dviState.w = _dvi2bp*readSigned(len); cmdW0(0);}
+void DVIReader::cmdZ (int len) {_dviState.z = _dvi2bp*readSigned(len); cmdZ0(0);}
void DVIReader::cmdNop (int) {}
@@ -652,7 +653,7 @@ void DVIReader::cmdXXX (int len) {
UInt32 numBytes = readUnsigned(len);
string s = readString(numBytes);
if (_actions)
- _actions->special(s, _scaleFactor);
+ _actions->special(s, _dvi2bp);
}
else
throw DVIException("special outside of page");
@@ -691,9 +692,9 @@ void DVIReader::cmdFontNum (int len) {
/** Helper function to handle a font definition.
* @param[in] fontnum local font number
* @param[in] name font name
- * @param[in] checksum checksum to be compared with TFM checksum
- * @param[in] ds design size in TeX point units
- * @param[in] ss scaled size in TeX point units */
+ * @param[in] cs checksum to be compared with TFM checksum
+ * @param[in] ds design size in PS point units
+ * @param[in] ss scaled size in PS point units */
void DVIReader::defineFont (UInt32 fontnum, const string &name, UInt32 cs, double ds, double ss) {
if (_actions && !_actions->fontProcessingEnabled())
return;
@@ -727,16 +728,17 @@ void DVIReader::cmdFontDef (int len) {
string fontname = readString(namelen);
// @@ TODO: avoid processing the font definitions in the postamble
- defineFont(fontnum, fontname, checksum, dsize*_scaleFactor, ssize*_scaleFactor);
+ defineFont(fontnum, fontname, checksum, dsize*_dvi2bp, ssize*_dvi2bp);
}
/** This template method is called by the VFReader after reading a font definition from a VF file.
* @param[in] fontnum local font number
+ * @param[in] path path to font file
* @param[in] name font name
* @param[in] checksum checksum to be compared with TFM checksum
- * @param[in] dsize design size in TeX point units
- * @param[in] ssize scaled size in TeX point units */
+ * @param[in] dsize design size in PS point units
+ * @param[in] ssize scaled size in PS point units */
void DVIReader::defineVFFont (UInt32 fontnum, string path, string name, UInt32 checksum, double dsize, double ssize) {
if (VirtualFont *vf = FontManager::instance().getVF())
defineFont(fontnum, name, checksum, dsize, ssize * vf->scaleFactor());
@@ -766,7 +768,7 @@ void DVIReader::cmdXPic (int) {
void DVIReader::cmdXFontDef (int) {
Int32 fontnum = readSigned(4);
- double ptsize = _scaleFactor*readUnsigned(4);
+ double ptsize = _dvi2bp*readUnsigned(4);
UInt16 flags = readUnsigned(2);
UInt8 psname_len = readUnsigned(1);
UInt8 fmname_len = readUnsigned(1);
@@ -786,11 +788,11 @@ void DVIReader::cmdXFontDef (int) {
color.set(UInt8(rgba >> 24), UInt8((rgba >> 16) & 0xff), UInt8((rgba >> 8) & 0xff));
}
if (flags & 0x1000) // extend?
- style.extend = _scaleFactor*readSigned(4);
+ style.extend = _dvi2bp*readSigned(4);
if (flags & 0x2000) // slant?
- style.slant = _scaleFactor*readSigned(4);
+ style.slant = _dvi2bp*readSigned(4);
if (flags & 0x4000) // embolden?
- style.bold = _scaleFactor*readSigned(4);
+ style.bold = _dvi2bp*readSigned(4);
if (flags & 0x0800) { // variations?
UInt16 num_variations = readSigned(2);
for (int i=0; i < num_variations; i++)
@@ -812,7 +814,7 @@ void DVIReader::cmdXGlyphS (int) {
void DVIReader::putGlyphArray (bool xonly) {
- double strwidth = _scaleFactor*readSigned(4);
+ double strwidth = _dvi2bp*readSigned(4);
UInt16 num_glyphs = readUnsigned(2);
vector<Int32> x(num_glyphs);
vector<Int32> y(num_glyphs);
@@ -824,8 +826,8 @@ void DVIReader::putGlyphArray (bool xonly) {
if (Font *font = FontManager::instance().getFont(_currFontNum)) {
for (int i=0; i < num_glyphs; i++) {
UInt16 glyph_index = readUnsigned(2);
- double xx = _dviState.h + x[i]*_scaleFactor + _tx;
- double yy = _dviState.v + y[i]*_scaleFactor + _ty;
+ double xx = _dviState.h + x[i]*_dvi2bp + _tx;
+ double yy = _dviState.v + y[i]*_dvi2bp + _ty;
_actions->setChar(xx, yy, glyph_index, false, font);
}
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.h
index c8f50972bf3..f55a611625b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIReader.h
@@ -87,8 +87,8 @@ class DVIReader : public StreamReader, protected VFActions
void verifyDVIFormat (int id) const;
int executeCommand ();
int evalCommand (bool compute_size, CommandHandler &handler, int &length, int &param);
- void moveRight (double x, bool callAction=true);
- void moveDown (double y);
+ void moveRight (double dx);
+ void moveDown (double dy);
void putChar (UInt32 c, bool moveCursor);
void putGlyphArray (bool xonly);
void defineFont (UInt32 fontnum, const std::string &name, UInt32 cs, double ds, double ss);
@@ -141,11 +141,11 @@ class DVIReader : public StreamReader, protected VFActions
unsigned _totalPages; ///< total number of pages in dvi file
unsigned _currPageNum; ///< current page number
int _currFontNum; ///< current font number
- double _scaleFactor; ///< 1 dvi unit = scaleFactor * TeX points
+ double _dvi2bp; ///< factor to convert dvi units to PS points
UInt32 _mag; ///< magnification factor * 1000
bool _inPostamble; ///< true if stream pointer is inside the postamble
Int32 _prevBop; ///< pointer to previous bop
- double _pageHeight, _pageWidth; ///< page height and width in TeX points
+ double _pageHeight, _pageWidth; ///< page height and width in PS points
DVIState _dviState; ///< current cursor position
std::stack<DVIState> _stateStack;
double _prevYPos; ///< previous vertical cursor position
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.cpp
index 17dbc6d1c63..b474443fd68 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.cpp
@@ -82,10 +82,10 @@ class PSHeaderActions : public DVIActions
public :
PSHeaderActions (DVIToSVG &dvisvg) : _dvisvg(dvisvg) {}
- void special (const std::string &str, double dvi2pt) {
+ void special (const std::string &str, double dvi2bp) {
// execute PS headers only
if (!str.empty() && (str[0] == '!' || str.substr(0, 7) == "header="))
- _dvisvg.specialManager().process(str, dvi2pt, 0);
+ _dvisvg.specialManager().process(str, dvi2bp, 0);
}
bool fontProcessingEnabled () const {
@@ -234,8 +234,8 @@ void DVIToSVG::endPage (unsigned pageno) {
if (size.valid()) {
// convention: DVI position (0,0) equals (1in, 1in) relative
// to the upper left vertex of the page (see DVI specification)
- const double border = -72.27;
- bbox = BoundingBox(border, border, size.widthInPT()+border, size.heightInPT()+border);
+ const double border = -72;
+ bbox = BoundingBox(border, border, size.widthInBP()+border, size.heightInBP()+border);
}
}
else { // set/modify bounding box by explicitly given values
@@ -258,11 +258,13 @@ void DVIToSVG::endPage (unsigned pageno) {
else {
_svg.setBBox(bbox);
+ const double bp2pt = 72.27/72;
+ const double bp2mm = 25.4/72;
Message::mstream(false) << '\n';
- Message::mstream(false, Message::MC_PAGE_SIZE) << "page size: " << XMLString(bbox.width()) << "pt"
- " x " << XMLString(bbox.height()) << "pt"
- " (" << XMLString(bbox.width()/72.27*25.4) << "mm"
- " x " << XMLString(bbox.height()/72.27*25.4) << "mm)";
+ Message::mstream(false, Message::MC_PAGE_SIZE) << "page size: " << XMLString(bbox.width()*bp2pt) << "pt"
+ " x " << XMLString(bbox.height()*bp2pt) << "pt"
+ " (" << XMLString(bbox.width()*bp2mm) << "mm"
+ " x " << XMLString(bbox.height()*bp2mm) << "mm)";
Message::mstream(false) << '\n';
}
}
@@ -275,11 +277,12 @@ void DVIToSVG::getPageTransformation(Matrix &matrix) const {
else {
Calculator calc;
if (getActions()) {
+ const double bp2pt = 72.27/72;
BoundingBox &bbox = getActions()->bbox();
- calc.setVariable("ux", bbox.minX());
- calc.setVariable("uy", bbox.minY());
- calc.setVariable("w", bbox.width());
- calc.setVariable("h", bbox.height());
+ calc.setVariable("ux", bbox.minX()*bp2pt);
+ calc.setVariable("uy", bbox.minY()*bp2pt);
+ calc.setVariable("w", bbox.width()*bp2pt);
+ calc.setVariable("h", bbox.height()*bp2pt);
}
calc.setVariable("pt", 1);
calc.setVariable("in", 72.27);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.h
index 626e27c568a..626e27c568a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.cpp
index d8514175740..7d25678d227 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.cpp
@@ -70,7 +70,7 @@ void DVIToSVGActions::setPageMatrix (const Matrix &matrix) {
void DVIToSVGActions::moveToX (double x) {
_dvisvg.specialManager().notifyPositionChange(getX(), getY());
- _svg.setX(getX()); // get current horizontal DVI position
+ _svg.setX(x);
}
@@ -85,6 +85,7 @@ void DVIToSVGActions::moveToY (double y) {
* @param[in] x horizontal position of left bounding box edge
* @param[in] y vertical position of the character's baseline
* @param[in] c character code relative to the current font
+ * @param[in] vertical true if we're in vertical mode
* @param[in] font font to be used */
void DVIToSVGActions::setChar (double x, double y, unsigned c, bool vertical, const Font *font) {
// If we use SVG fonts there is no need to record all font name/char/size combinations
@@ -162,10 +163,6 @@ void DVIToSVGActions::setChar (double x, double y, unsigned c, bool vertical, co
* @param[in] height length of the vertical edges
* @param[in] width length of the horizontal edges */
void DVIToSVGActions::setRule (double x, double y, double height, double width) {
-/* x *= BP;
- y *= BP;
- height *= BP;
- width *= BP; */
// (x,y) is the lower left corner of the rectangle
XMLElementNode *rect = new XMLElementNode("rect");
rect->addAttribute("x", x);
@@ -198,10 +195,10 @@ void DVIToSVGActions::setFont (int num, const Font *font) {
/** This method is called when a "special" command was found in the DVI file.
* @param[in] s the special expression
- * @param[in] dvi2pt factor to scale DVI units to TeX points */
-void DVIToSVGActions::special (const string &s, double dvi2pt) {
+ * @param[in] dvi2bp factor to scale DVI units to PS points */
+void DVIToSVGActions::special (const string &s, double dvi2bp) {
try {
- _dvisvg.specialManager().process(s, dvi2pt, this, this);
+ _dvisvg.specialManager().process(s, dvi2bp, this, this);
// @@ output message in case of unsupported specials?
}
catch (const SpecialException &e) {
@@ -229,7 +226,8 @@ void DVIToSVGActions::postamble () {
/** This method is called when a "begin of page (bop)" command was found in the DVI file.
- * @param[in] c array with 10 components representing \count0 ... \count9. c[0] contains the
+ * @param[in] pageno physical page number
+ * @param[in] c array with 10 components representing \\count0 ... \\count9. c[0] contains the
* current (printed) page number (may differ from page count) */
void DVIToSVGActions::beginPage (unsigned pageno, Int32 *c) {
_svg.newPage(++_pageCount);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.h
index 89e1fc57246..6891a0d48a2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DVIToSVGActions.h
@@ -64,7 +64,7 @@ class DVIToSVGActions : public DVIActions, public SpecialActions, public Special
void moveToX (double x);
void moveToY (double y);
void setFont (int num, const Font *font);
- void special (const std::string &s, double dvi2pt);
+ void special (const std::string &s, double dvi2bp);
void preamble (const std::string &cmt);
void postamble ();
void beginPage (unsigned pageno, Int32 *c);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.cpp
index 925b3065c8d..925b3065c8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.h
index 0d1e9406b4e..0d1e9406b4e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Directory.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.cpp
index 3aa915bbd12..58f6a6e7ca1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.cpp
@@ -75,9 +75,10 @@ static void expand_constants (string &str, SpecialActions *actions) {
/** Embeds the virtual rectangle (x, y ,w , h) into the current bounding box,
* where (x,y) is the lower left vertex composed of the current DVI position.
- * @param[in] w width of the rectangle in TeX point units
- * @param[in] h height of the rectangle in TeX point units
- * @param[in] d depth of the rectangle in TeX point units */
+ * @param[in] w width of the rectangle in PS point units
+ * @param[in] h height of the rectangle in PS point units
+ * @param[in] d depth of the rectangle in PS point units
+ * @param[in] actions object providing the actions that can be performed by the SpecialHandler */
static void update_bbox (double w, double h, double d, SpecialActions *actions) {
double x = actions->getX();
double y = actions->getY();
@@ -120,6 +121,7 @@ static void raw (InputReader &in, SpecialActions *actions, bool group=false) {
* variant 3: dvisvgm:bbox f[ix] <x1> <y1> <x2> <y2>
* variant 4: dvisvgm:bbox n[ew] <name> */
static void bbox (InputReader &in, SpecialActions *actions) {
+ const double pt2bp = 72/72.27;
in.skipSpace();
int c = in.peek();
if (isalpha(c)) {
@@ -137,7 +139,7 @@ static void bbox (InputReader &in, SpecialActions *actions) {
else if (c == 'a' || c == 'f') {
double p[4];
for (int i=0; i < 4; i++)
- p[i] = in.getDouble();
+ p[i] = in.getDouble()*pt2bp;
BoundingBox b(p[0], p[1], p[2], p[3]);
if (c == 'a')
actions->embed(b);
@@ -151,9 +153,9 @@ static void bbox (InputReader &in, SpecialActions *actions) {
c = 'r'; // no mode specifier => relative box parameters
if (c == 'r') {
- double w = in.getDouble();
- double h = in.getDouble();
- double d = in.getDouble();
+ double w = in.getDouble()*pt2bp;
+ double h = in.getDouble()*pt2bp;
+ double d = in.getDouble()*pt2bp;
update_bbox(w, h, d, actions);
}
}
@@ -161,8 +163,9 @@ static void bbox (InputReader &in, SpecialActions *actions) {
static void img (InputReader &in, SpecialActions *actions) {
if (actions) {
- double w = in.getDouble();
- double h = in.getDouble();
+ const double pt2bp = 72/72.27;
+ double w = in.getDouble()*pt2bp;
+ double h = in.getDouble()*pt2bp;
string f = in.getString();
update_bbox(w, h, 0, actions);
XMLElementNode *img = new XMLElementNode("image");
@@ -181,7 +184,7 @@ static void img (InputReader &in, SpecialActions *actions) {
/** Evaluates and executes a dvisvgm special statement.
* @param[in] prefix special prefix read by the SpecialManager
* @param[in] is the special statement is read from this stream
- * @param[in,out] in the raw text is read from this input buffer */
+ * @param[in] actions object providing the actions that can be performed by the SpecialHandler */
bool DvisvgmSpecialHandler::process (const char *prefix, istream &is, SpecialActions *actions) {
if (actions) {
StreamInputBuffer ib(is);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.h
index 0e5c3009977..1c6424c6fb8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/DvisvgmSpecialHandler.h
@@ -29,7 +29,7 @@ class DvisvgmSpecialHandler : public SpecialHandler
const char* name () const {return "dvisvgm";}
const char* info () const {return "special set for embedding raw SVG snippets";}
const char** prefixes () const;
- bool process (const char *prefix, std::istream &in, SpecialActions *actions);
+ bool process (const char *prefix, std::istream &is, SpecialActions *actions);
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.cpp
index b1512f4a96e..d3def37dc68 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.cpp
@@ -86,7 +86,7 @@ istream& EPSFile::istream () const {
/** Extracts the bounding box information from the DSC header/footer (if present)
- * @param[out] the extracted bounding box
+ * @param[out] box the extracted bounding box
* @return true if %%BoundingBox data could be read successfully */
bool EPSFile::bbox (BoundingBox &box) const {
std::istream &is = EPSFile::istream();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.h
index 19b60a42797..19b60a42797 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.cpp
index cfe02f78deb..c92dbb9c10d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.cpp
@@ -67,10 +67,12 @@ void EPSToSVG::convert () {
_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm " VERSION_STR " "));
_svg.write(_out.getPageStream(1, 1));
string svgfname = _out.filename(1, 1);
- Message::mstream(false, Message::MC_PAGE_SIZE) << "graphic size: " << XMLString(bbox.width()) << "pt"
- " x " << XMLString(bbox.height()) << "pt"
- " (" << XMLString(bbox.width()/72.27*25.4) << "mm"
- " x " << XMLString(bbox.height()/72.27*25.4) << "mm)\n";
+ const double bp2pt = 72.27/72;
+ const double bp2mm = 25.4/72;
+ Message::mstream(false, Message::MC_PAGE_SIZE) << "graphic size: " << XMLString(bbox.width()*bp2pt) << "pt"
+ " x " << XMLString(bbox.height()*bp2pt) << "pt"
+ " (" << XMLString(bbox.width()*bp2mm) << "mm"
+ " x " << XMLString(bbox.height()*bp2mm) << "mm)\n";
Message::mstream(false, Message::MC_PAGE_WRITTEN) << "graphic written to " << (svgfname.empty() ? "<stdout>" : svgfname) << '\n';
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.h
index e3ea67ca87d..e3ea67ca87d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EPSToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EPSToSVG.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.cpp
index 4e18fd647a7..cc06289464c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.cpp
@@ -30,7 +30,7 @@
using namespace std;
-EmSpecialHandler::EmSpecialHandler () : _linewidth(0.4), _actions(0) {
+EmSpecialHandler::EmSpecialHandler () : _linewidth(0.4*72/72.27), _actions(0) {
}
@@ -64,11 +64,12 @@ static DPair cut_vector (char c, const DPair &v, double lw) {
/** Creates the SVG element that will a the line.
- * @param[in] p1 first endpoint in TeX point units
- * @param[in] p2 second endpoint in TeX point units
+ * @param[in] p1 first endpoint in PS point units
+ * @param[in] p2 second endpoint in PS point units
* @param[in] c1 cut method of first endpoint ('h', 'v' or 'p')
* @param[in] c2 cut method of second endpoint ('h', 'v' or 'p')
- * @param[in] lw line width in TeX point units */
+ * @param[in] lw line width in PS point units
+ * @param[in] actions object providing the actions that can be performed by the SpecialHandler */
static void create_line (const DPair &p1, const DPair &p2, char c1, char c2, double lw, SpecialActions *actions) {
XMLElementNode *node=0;
DPair dir = p2-p1;
@@ -134,7 +135,7 @@ static double read_length (InputReader &in) {
len *= p->factor;
break;
}
- return len;
+ return len*72/72.27;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.h
index 17e84a3e6e2..17e84a3e6e2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EmSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.cpp
index 103090bc3e3..103090bc3e3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.h
index 10b21c15547..10b21c15547 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/EncFile.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/EncFile.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.cpp
index 3055013d969..e8269991053 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.cpp
@@ -209,7 +209,6 @@ static const char* find_file (const std::string &fname, const char *ftype) {
/** Checks whether the given file is mapped to a different name and if the
* file can be found under this name.
* @param[in] fname name of file to look up
- * @param[in] fontmap font mappings
* @return file path on success, 0 otherwise */
static const char* find_mapped_file (std::string fname) {
size_t pos = fname.rfind('.');
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.h
index 5057e9b2593..5057e9b2593 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileFinder.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.cpp
index 92922d99354..92922d99354 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.h
index c1c1bab7064..c1c1bab7064 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FilePath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FilePath.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.cpp
index d3d514a8068..e938e65a207 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.cpp
@@ -113,7 +113,7 @@ string FileSystem::getcwd () {
/** Changes the work directory.
- * @param[in] path to new work directory
+ * @param[in] dir path to new work directory
* @return true on success */
bool FileSystem::chdir (const char *dir) {
bool success = false;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.h
index f60fcd0ac86..f60fcd0ac86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FileSystem.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.cpp
index 15d609a5182..a7f78e80427 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.cpp
@@ -424,7 +424,7 @@ int PhysicalFont::traceAllGlyphs (bool includeCached, GFGlyphTracer::Callback *c
/** Computes the exact bounding box of a glyph.
* @param[in] c character code of the glyph
* @param[out] bbox the computed bounding box
- * @param[in] optional calback object forwarded to the tracer
+ * @param[in] cb optional calback object forwarded to the tracer
* @return true if the box could be computed successfully */
bool PhysicalFont::getExactGlyphBox(int c, BoundingBox& bbox, GFGlyphTracer::Callback* cb) const {
Glyph glyph;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.h
index 277a97f8248..bc33f630004 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Font.h
@@ -186,8 +186,8 @@ class TFMFont : public virtual Font
mutable FontMetrics *_metrics;
std::string _fontname;
UInt32 _checksum; ///< cheksum to be compared with TFM checksum
- double _dsize; ///< design size in TeX point units
- double _ssize; ///< scaled size
+ double _dsize; ///< design size in PS point units
+ double _ssize; ///< scaled size in PS point units
};
@@ -220,8 +220,8 @@ class PhysicalFontProxy : public PhysicalFont
private:
const PhysicalFont *_pf;
- double _dsize; ///< design size in TeX point units
- double _ssize; ///< scaled size
+ double _dsize; ///< design size in PS point units
+ double _ssize; ///< scaled size in PS point units
};
@@ -279,7 +279,7 @@ class NativeFont : public PhysicalFont
NativeFont (double ptsize, const FontStyle &style, Color color) : _ptsize(ptsize), _style(style), _color(color) {}
private:
- double _ptsize;
+ double _ptsize; ///< font size in PS point units
FontStyle _style;
Color _color;
};
@@ -356,8 +356,8 @@ class VirtualFontProxy : public VirtualFont
private:
const VirtualFont *_vf;
- double _dsize; ///< design size in TeX point units
- double _ssize; ///< scaled size in TeX point units
+ double _dsize; ///< design size in PS point units
+ double _ssize; ///< scaled size in PS point units
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.cpp
index 7e5ace9aad0..e617bc9fd34 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.cpp
@@ -197,7 +197,7 @@ bool FontCache::read (const char *fontname, const char *dir) {
/** Reads font glyph information from a stream.
* @param[in] fontname name of font data to read
- * @param[in] dir input stream
+ * @param[in] is input stream to read the glyph data from
* @return true if reading was successful */
bool FontCache::read (const char *fontname, istream &is) {
if (_fontname == fontname)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.h
index c6c868edf49..c6c868edf49 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontCache.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.cpp
index dfa5b6c750e..dfa5b6c750e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.h
index 81d65806387..4c366182632 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEncoding.h
@@ -35,7 +35,7 @@ struct FontEncoding
virtual Character decode (UInt32 c) const =0;
virtual bool mapsToCharIndex () const =0;
virtual const FontEncoding* findCompatibleBaseFontMap (const PhysicalFont *font, CharMapID &charmapID) const {return 0;}
- static FontEncoding* encoding (const std::string &fontname);
+ static FontEncoding* encoding (const std::string &encname);
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.cpp
index 8894586c3f3..5bfeba236d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.cpp
@@ -377,11 +377,11 @@ static int cubicto (FTVectorPtr control1, FTVectorPtr control2, FTVectorPtr to,
/** Traces the outline of a glyph by calling the corresponding "drawing" functions.
* Each glyph is composed of straight lines, quadratic (conic) or cubic B�zier curves.
- * This function takes all these outline segments and processes them by calling
- * the corresponding functions. The functions must be provided in form of a
- * FEGlyphCommands object.
- * @param[in] index index of the glyph that will be traced
- * @param[in] commands the drawing commands to be executed
+ * This function creates a Glyph object representing these graphics segments.
+ * @param[in] face FreeType object representing the font to scan
+ * @param[in] font corresponding Font object providing additional data
+ * @param[in] index index of the glyph to be traced
+ * @param[out] glyph resulting Glyph object containing the graphics segments
* @param[in] scale if true the current pt size will be considered otherwise the plain TrueType units are used.
* @return false on errors */
static bool trace_outline (FT_Face face, const Font *font, int index, Glyph &glyph, bool scale) {
@@ -413,13 +413,10 @@ static bool trace_outline (FT_Face face, const Font *font, int index, Glyph &gly
/** Traces the outline of a glyph by calling the corresponding "drawing" functions.
* Each glyph is composed of straight lines, quadratic (conic) or cubic B�zier curves.
- * This function takes all these outline segments and processes them by calling
- * the corresponding functions. The functions must be provided in form of a
- * FEGlyphCommands object.
- * @param[in] chr the glyph of this character will be traced
- * @param[in] commands the drawing commands to be executed
- * @param[in] scale if true the current pt size will be considered otherwise
- * the plain TrueType units are used.
+ * This function creates a Glyph object representing these graphics segments.
+ * @param[in] c the glyph of this character will be traced
+ * @param[out] glyph resulting Glyph object containing the graphics segments
+ * @param[in] scale if true the current pt size will be considered otherwise the plain TrueType units are used.
* @return false on errors */
bool FontEngine::traceOutline (const Character &c, Glyph &glyph, bool scale) const {
if (_currentFace)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.h
index 353613a40ef..353613a40ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontEngine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.cpp
index 2064ed1e43a..7db9bad13bb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.cpp
@@ -174,8 +174,8 @@ static Font* create_font (const string &filename, const string &fontname, int fo
* @param[in] fontnum local font number, as used in DVI and VF files
* @param[in] name TFM fontname given in DVI file, e.g. cmr10
* @param[in] checksum checksum to be compared with TFM checksum
- * @param[in] dsize design size in TeX point units
- * @param[in] ssize scaled size in TeX point units
+ * @param[in] dsize design size in PS point units
+ * @param[in] ssize scaled size in PS point units
* @return id of registered font */
int FontManager::registerFont (UInt32 fontnum, string name, UInt32 checksum, double dsize, double ssize) {
int id = fontID(fontnum);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.h
index 24402f5ae5e..24402f5ae5e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontManager.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.cpp
index c5b87303c6e..a094093b2f1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.cpp
@@ -246,7 +246,7 @@ ostream& FontMap::write (ostream &os) const {
/** Reads and evaluates all map files in the given directory.
- * @param[in] path to directory containing the map files to be read */
+ * @param[in] dirname path to directory containing the map files to be read */
void FontMap::readdir (const string &dirname) {
Directory dir(dirname);
while (const char *fname = dir.read(Directory::ET_FILE)) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.h
index 8bd2f712340..8bd2f712340 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.cpp
index 3920e4e6e76..3920e4e6e76 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.h
index 50207211d2c..50207211d2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontMetrics.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontMetrics.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontStyle.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontStyle.h
index 932c09291cc..932c09291cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/FontStyle.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/FontStyle.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.cpp
index a3604aebbb7..4eff0912d42 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.cpp
@@ -30,7 +30,7 @@ GFGlyphTracer::GFGlyphTracer () : GFTracer(_ifs, 0), _glyph(0), _callback(0)
/** Constructs a new glyph tracer.
* @param[in] is GF input stream
- * @param[in] upp target units per TeX point */
+ * @param[in] upp target units per PS point */
GFGlyphTracer::GFGlyphTracer (string &fname, double upp, Callback *cb)
: GFTracer(_ifs, upp), _glyph(0), _callback(cb)
{
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.h
index 84063a994b5..84063a994b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFGlyphTracer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.cpp
index 95e8e14d1ce..0c0238b5766 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.cpp
@@ -35,7 +35,7 @@ struct GFCommand
static inline double fix2double (Int32 fix) {
- return double(fix)/(1 << 20);
+ return double(fix)/(1 << 20)*72/72.27;
}
@@ -171,22 +171,22 @@ bool GFReader::executePostamble () {
}
-/** Returns the design size of this font int TeX point units. */
+/** Returns the design size of this font int PS point units. */
double GFReader::getDesignSize () const {
return fix2double(_designSize);
}
/** Returns the number of horizontal pixels per point. */
double GFReader::getHPixelsPerPoint () const {
- return scaled2double(_hppp);
+ return scaled2double(_hppp)*72/72.27;
}
/** Returns the number of vertical pixels per point. */
double GFReader::getVPixelsPerPoint () const {
- return scaled2double(_vppp);
+ return scaled2double(_vppp)*72/72.27;
}
-/** Returns the width of character c in TeX point units */
+/** Returns the width of character c in PS point units */
double GFReader::getCharWidth (UInt32 c) const {
ConstIterator it = _charInfoMap.find(c%256);
return it == _charInfoMap.end() ? 0 : it->second.width*getDesignSize()/(1<<24);
@@ -210,7 +210,7 @@ void GFReader::cmdPre (int) {
/** Reads the postamble. */
void GFReader::cmdPost (int) {
- readUnsigned(4); // pointer to byte after final eoc
+ readUnsigned(4); // pointer to byte after final eoc
_designSize = readUnsigned(4); // design size of font in points
_checksum = readUnsigned(4); // checksum
_hppp = readUnsigned(4); // horizontal pixels per point (scaled int)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.h
index 62c36a0498b..62c36a0498b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.cpp
index af8d5eecce9..89ff4359fda 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.cpp
@@ -45,7 +45,7 @@ GFTracer::GFTracer (istream &is)
/** Constructs a new GFTracer.
* @param[in] is GF file is read from this stream
- * @param[in] upp target units per TeX point */
+ * @param[in] upp target units per PS point */
GFTracer::GFTracer (istream &is, double upp)
: GFReader(is), _unitsPerPoint(upp)
{
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.h
index 9bd50e719c9..7171ac1e3aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GFTracer.h
@@ -41,7 +41,7 @@ class GFTracer : public GFReader
void unitsPerPoint(double upp) {_unitsPerPoint = upp;}
private:
- double _unitsPerPoint; ///< target units per TeX point
+ double _unitsPerPoint; ///< target units per PS point
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.cpp
index eee5de49212..cc94a331d28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.cpp
@@ -97,7 +97,8 @@ bool Ghostscript::available () {
#if defined(HAVE_LIBGS)
return true;
#else
- return loaded();
+ gsapi_revision_t rev;
+ return loaded() && revision(&rev);
#endif
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.h
index d223ad04edf..d223ad04edf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Ghostscript.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Glyph.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Glyph.h
index 5a003a2196b..5a003a2196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Glyph.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Glyph.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GlyphTracerMessages.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GlyphTracerMessages.h
index 6256bb843a0..6256bb843a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GlyphTracerMessages.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GlyphTracerMessages.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GraphicPath.h
index 3b401b2a162..e1bd457d554 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/GraphicPath.h
@@ -182,8 +182,8 @@ class GraphicPath
* @param[in] os output stream used to write the SVG commands to
* @param[in] sx horizontal scale factor
* @param[in] sy vertical scale factor
- * @param[in] dx horizontal translation in TeX point units
- * @param[in] sy vertical translation in TeX point units */
+ * @param[in] dx horizontal translation in PS point units
+ * @param[in] dy vertical translation in PS point units */
void writeSVG (std::ostream &os, double sx=1.0, double sy=1.0, double dx=0.0, double dy=0.0) const {
struct WriteActions : Actions {
WriteActions (std::ostream &os, double sx, double sy, double dx, double dy)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.cpp
index f8681aceb8f..f8681aceb8f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.h
index d58b6afc7b4..df420145d37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/HtmlSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/HtmlSpecialHandler.h
@@ -34,7 +34,7 @@ class HtmlSpecialHandler : public SpecialHandler, public DVIEndPageListener, pub
NamedAnchor () : id(0), pos(0) {}
NamedAnchor (int i, double p) : id(i), pos(p) {}
int id; ///< unique numerical ID (< 0 if anchor is unreferenced)
- double pos; ///< vertical position of named anchor (in TeX point units)
+ double pos; ///< vertical position of named anchor (in PS point units)
};
enum AnchorType {AT_NONE, AT_HREF, AT_NAME};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.cpp
index 79e0dcf39c7..79e0dcf39c7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.h
index c29a943a7e7..c29a943a7e7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputBuffer.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.cpp
index b2f01f5ea1e..b2f01f5ea1e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.h
index c0d726424f6..c0d726424f6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/InputReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.cpp
index 89c4796616c..89c4796616c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.h
index 86585477f74..86585477f74 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/JFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/JFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.cpp
index 63d1509d3fd..63d1509d3fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.h
index f2e4f5d4114..f2e4f5d4114 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Length.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Makefile.am
index 726863b714e..b504093a3bf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Makefile.am
@@ -24,7 +24,7 @@ libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator
VFActions.h VFReader.h XMLDocument.h XMLNode.h XMLString.h \
BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CharMap.cpp CharMapID.cpp CMap.cpp CMapManager.cpp \
CMapReader.cpp CmdLineParserBase.cpp Color.cpp ColorSpecialHandler.cpp CommandLine.cpp CRC32.cpp Directory.cpp DLLoader.cpp \
- DVIActions.cpp DVIReader.cpp DvisvgmSpecialHandler.cpp DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp EncFile.cpp \
+ DVIReader.cpp DvisvgmSpecialHandler.cpp DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp EncFile.cpp \
EPSFile.cpp EPSToSVG.cpp FileFinder.cpp FilePath.cpp FileSystem.cpp Font.cpp FontCache.cpp FontEncoding.cpp FontEngine.cpp \
FontManager.cpp FontMap.cpp FontMetrics.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp HtmlSpecialHandler.cpp \
InputBuffer.cpp InputReader.cpp JFM.cpp Length.cpp MapLine.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp NoPsSpecialHandler.cpp \
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.cpp
index b225b0ba4fd..b225b0ba4fd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.h
index 16ee9687ae3..16ee9687ae3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MapLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MapLine.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.cpp
index 9eb956f0529..9eb956f0529 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.h
index 1da461d99a0..1da461d99a0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Matrix.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.cpp
index c875109633f..c875109633f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.h
index 7c39127dbd4..7c39127dbd4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Message.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MessageException.h
index 48ae4b5bb4c..48ae4b5bb4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MessageException.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.cpp
index d7922b1825b..d7922b1825b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.h
index 3b2485122d0..3b2485122d0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MetafontWrapper.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.cpp
index bb4353f8ee4..bb4353f8ee4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.h
index dcb6271a4bc..dcb6271a4bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/MiKTeXCom.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/MiKTeXCom.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.cpp
index 0a5119f6938..0a5119f6938 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.h
index 7a017fecb06..7a017fecb06 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/NoPsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/NoPsSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSFilter.h
index e2c5c092dd3..e2c5c092dd3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSFilter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.cpp
index 00a9e66cb3c..9ca5ed39c27 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.cpp
@@ -146,6 +146,7 @@ bool PSInterpreter::execute (const char *str, size_t len, bool flush) {
/** Executes a chunk of PostScript code read from a stream. The method returns on EOF.
* @param[in] is the input stream
+ * @param[in] flush If true, a final 'flush' is sent which forces the output buffer to be written immediately.
* @return true if the assigned number of bytes have been read */
bool PSInterpreter::execute (istream &is, bool flush) {
char buf[4096];
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.h
index c1f30598e16..c1f30598e16 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSInterpreter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.cpp
index a0eea24f94b..107dac4f795 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.cpp
@@ -47,10 +47,6 @@ void PSPattern::apply (SpecialActions *actions) {
PSTilingPattern::PSTilingPattern (int id, BoundingBox &bbox, Matrix &matrix, double xstep, double ystep)
: PSPattern(id), _bbox(bbox), _matrix(matrix), _xstep(xstep), _ystep(ystep), _groupNode(0)
{
- const double bp2pt = 72.27/72.0; // factor to convert bp to pt
- _bbox.scale(bp2pt, bp2pt);
- _xstep *= bp2pt;
- _ystep *= bp2pt;
_groupNode = PSTilingPattern::createGroupNode();
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.h
index db11b59f0e0..db11b59f0e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPattern.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPattern.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.cpp
index 9995fd1d93b..c9b3b080118 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.cpp
@@ -30,7 +30,7 @@
using namespace std;
PSPreviewFilter::PSPreviewFilter (PSInterpreter &psi)
- : PSFilter(psi), _active(false), _tightpage(false), _dvi2pt(1.0/65536.0)
+ : PSFilter(psi), _active(false), _tightpage(false), _dvi2bp(1.0/65536.0)
{
}
@@ -81,7 +81,7 @@ void PSPreviewFilter::execute (const char *code, size_t len) {
bool PSPreviewFilter::getBoundingBox (BoundingBox &bbox) const {
if (_boxExtents.size() < 7)
return false;
- double left = -_boxExtents[0]*_dvi2pt;
+ double left = -_boxExtents[0]*_dvi2bp;
bbox = BoundingBox(-left, -height(), width()-left, depth());
return true;
}
@@ -92,27 +92,27 @@ bool PSPreviewFilter::getBoundingBox (BoundingBox &bbox) const {
bool PSPreviewFilter::getBorders (double &left, double &right, double &top, double &bottom) const {
if (_boxExtents.size() < 4)
return false;
- left = -_boxExtents[0]*_dvi2pt;
- top = -_boxExtents[1]*_dvi2pt;
- right = _boxExtents[2]*_dvi2pt;
- bottom = _boxExtents[3]*_dvi2pt;
+ left = -_boxExtents[0]*_dvi2bp;
+ top = -_boxExtents[1]*_dvi2bp;
+ right = _boxExtents[2]*_dvi2bp;
+ bottom = _boxExtents[3]*_dvi2bp;
return true;
}
-/** Returns the box height in TeX points, or -1 if no data was found or read yet. */
+/** Returns the box height in PS points, or -1 if no data was found or read yet. */
double PSPreviewFilter::height () const {
- return _boxExtents.size() > 4 ? (_boxExtents[4]-_boxExtents[1])*_dvi2pt : -1;
+ return _boxExtents.size() > 4 ? (_boxExtents[4]-_boxExtents[1])*_dvi2bp : -1;
}
-/** Returns the box depth in TeX points, or -1 if no data was found or read yet. */
+/** Returns the box depth in PS points, or -1 if no data was found or read yet. */
double PSPreviewFilter::depth () const {
- return _boxExtents.size() > 5 ? (_boxExtents[5]+_boxExtents[3])*_dvi2pt : -1;
+ return _boxExtents.size() > 5 ? (_boxExtents[5]+_boxExtents[3])*_dvi2bp : -1;
}
-/** Returns the box width in TeX points, or -1 if no data was found or read yet. */
+/** Returns the box width in PS points, or -1 if no data was found or read yet. */
double PSPreviewFilter::width () const {
- return _boxExtents.size() > 6 ? (_boxExtents[6]+_boxExtents[2]-_boxExtents[0])*_dvi2pt : -1;
+ return _boxExtents.size() > 6 ? (_boxExtents[6]+_boxExtents[2]-_boxExtents[0])*_dvi2bp : -1;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.h
index 792116a7083..bbed9640aab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PSPreviewFilter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PSPreviewFilter.h
@@ -37,7 +37,7 @@ class PSPreviewFilter : public PSFilter
bool active () const {return _active;}
std::string version () const {return _version;}
bool tightpage () const {return _tightpage;}
- void setDviScaleFactor (double dvi2pt) {_dvi2pt = dvi2pt;}
+ void setDviScaleFactor (double dvi2bp) {_dvi2bp = dvi2bp;}
bool getBorders (double &left, double &right, double &top, double &bottom) const;
void assignBorders (BoundingBox &bbox) const;
bool getBoundingBox (BoundingBox &bbox) const;
@@ -49,7 +49,7 @@ class PSPreviewFilter : public PSFilter
std::string _version; ///< version string of preview package
bool _active; ///< true if filter is active
bool _tightpage; ///< true if tightpage option was given
- double _dvi2pt; ///< factor to convert dvi units to TeX points
+ double _dvi2bp; ///< factor to convert dvi units to PS points
std::vector<int> _boxExtents;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.cpp
index f7991464ca9..71650753d67 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.cpp
@@ -33,7 +33,6 @@ using namespace std;
* Syntax: ([0-9]+(-[0-9]*)?)|(-[0-9]+)(,([0-9]+(-[0-9]*)?)|(-[0-9]+))*
* @param[in] str string to parse
* @param[in] max_page greatest allowed value
- * @param[out] ranges the extracted range sequence
* @return true on success; false denotes a syntax error */
bool PageRanges::parse (string str, int max_page) {
StringInputBuffer ib(str);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.h
index 57b47b91e44..57b47b91e44 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageRanges.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageRanges.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.cpp
index c6adbfbb2f2..2cc3f36512d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.cpp
@@ -150,8 +150,8 @@ void PageSize::resize (string name) {
if (landscape)
swap(_width, _height);
- const double ptpmm = 72.27/25.4; // TeX points per millimeter (72.27pt = 1in = 25.4mm)
- _width *= ptpmm;
- _height *= ptpmm;
+ const double bppmm = 72/25.4; // PS points per millimeter (72pt = 1in = 25.4mm)
+ _width *= bppmm;
+ _height *= bppmm;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.h
index 4c20c5ca2a9..77cbdbcc44d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PageSize.h
@@ -35,14 +35,14 @@ class PageSize
PageSize (std::string name);
void resize (std:: string name);
void resize (double w, double h);
- double widthInPT () const {return _width;}
- double heightInPT () const {return _height;}
- double widthInMM () const {return _width*25.4/72.27;}
- double heightInMM () const {return _height*25.4/72.27;}
+ double widthInBP () const {return _width;}
+ double heightInBP () const {return _height;}
+ double widthInMM () const {return _width*25.4/72;}
+ double heightInMM () const {return _height*25.4/72;}
bool valid () const {return _width > 0 && _height > 0;}
private:
- double _width, _height; // in pt
+ double _width, _height; // in PS points
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Pair.h
index 4c2d465e7c0..4c2d465e7c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Pair.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.cpp
index 998b8016eae..998b8016eae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.h
index a5391fbf141..a5391fbf141 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PdfSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PdfSpecialHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.cpp
index 41c3bec0daa..41c3bec0daa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.h
index df2e0545049..df2e0545049 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Process.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Process.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.cpp
index 8958dfa1f8d..f0742a36194 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.cpp
@@ -123,9 +123,8 @@ void PsSpecialHandler::enterBodySection () {
/** Move PS graphic position to current DVI location. */
void PsSpecialHandler::moveToDVIPos () {
if (_actions) {
- const double bp=72.0/72.27; // pt -> bp
- const double x = _actions->getX()*bp;
- const double y = _actions->getY()*bp;
+ const double x = _actions->getX();
+ const double y = _actions->getY();
ostringstream oss;
oss << '\n' << x << ' ' << y << " moveto ";
_psi.execute(oss.str());
@@ -144,9 +143,8 @@ static void exec_and_syncpos (PSInterpreter &psi, istream &is, const DPair &pos,
psi.execute(is);
psi.execute("\nquerypos "); // retrieve current PS position (stored in 'pos')
if (actions) {
- const double pt = 72.27/72.0; // bp -> pt
- actions->setX(pos.x()*pt);
- actions->setY(pos.y()*pt);
+ actions->setX(pos.x());
+ actions->setY(pos.y());
}
}
@@ -241,7 +239,7 @@ bool PsSpecialHandler::process (const char *prefix, istream &is, SpecialActions
/** Handles psfile special.
* @param[in] fname EPS file to be included
- * @param[in] attr attributes given with \special psfile */
+ * @param[in] attr attributes given with \\special psfile */
void PsSpecialHandler::psfile (const string &fname, const map<string,string> &attr) {
EPSFile epsfile(fname);
istream &is = epsfile.istream();
@@ -249,23 +247,22 @@ void PsSpecialHandler::psfile (const string &fname, const map<string,string> &at
Message::wstream(true) << "file '" << fname << "' not found in special 'psfile'\n";
else {
map<string,string>::const_iterator it;
- const double pt = 72.27/72.0; // bp -> pt
// bounding box of EPS figure
- double llx = (it = attr.find("llx")) != attr.end() ? str2double(it->second)*pt : 0;
- double lly = (it = attr.find("lly")) != attr.end() ? str2double(it->second)*pt : 0;
- double urx = (it = attr.find("urx")) != attr.end() ? str2double(it->second)*pt : 0;
- double ury = (it = attr.find("ury")) != attr.end() ? str2double(it->second)*pt : 0;
+ double llx = (it = attr.find("llx")) != attr.end() ? str2double(it->second) : 0;
+ double lly = (it = attr.find("lly")) != attr.end() ? str2double(it->second) : 0;
+ double urx = (it = attr.find("urx")) != attr.end() ? str2double(it->second) : 0;
+ double ury = (it = attr.find("ury")) != attr.end() ? str2double(it->second) : 0;
// desired width/height of resulting figure
- double rwi = (it = attr.find("rwi")) != attr.end() ? str2double(it->second)/10.0*pt : -1;
- double rhi = (it = attr.find("rhi")) != attr.end() ? str2double(it->second)/10.0*pt : -1;
+ double rwi = (it = attr.find("rwi")) != attr.end() ? str2double(it->second)/10.0 : -1;
+ double rhi = (it = attr.find("rhi")) != attr.end() ? str2double(it->second)/10.0 : -1;
if (rwi == 0 || rhi == 0 || urx-llx == 0 || ury-lly == 0)
return;
// user transformations (default values chosen according to dvips manual)
- double hoffset = (it = attr.find("hoffset")) != attr.end() ? str2double(it->second)*pt : 0;
- double voffset = (it = attr.find("voffset")) != attr.end() ? str2double(it->second)*pt : 0;
+ double hoffset = (it = attr.find("hoffset")) != attr.end() ? str2double(it->second) : 0;
+ double voffset = (it = attr.find("voffset")) != attr.end() ? str2double(it->second) : 0;
// double hsize = (it = attr.find("hsize")) != attr.end() ? str2double(it->second) : 612;
// double vsize = (it = attr.find("vsize")) != attr.end() ? str2double(it->second) : 792;
double hscale = (it = attr.find("hscale")) != attr.end() ? str2double(it->second) : 100;
@@ -326,7 +323,7 @@ void PsSpecialHandler::psfile (const string &fname, const map<string,string> &at
}
-/** Apply transformation to width, height, and depth set by preview package.
+/** Apply transformation to width, height, and depth set by preview package.
* @param[in] matrix transformation matrix to apply
* @param[out] w width
* @param[out] h height
@@ -440,11 +437,6 @@ void PsSpecialHandler::stroke (vector<double> &p) {
bbox.transform(_actions->getMatrix());
}
- const double pt = 72.27/72.0; // factor to convert bp -> pt
- ScalingMatrix scale(pt, pt);
- _path.transform(scale);
- bbox.transform(scale);
-
XMLElementNode *path=0;
Pair<double> point;
if (_path.isDot(point)) { // zero-length path?
@@ -525,10 +517,6 @@ void PsSpecialHandler::fill (vector<double> &p, bool evenodd) {
if (!_xmlnode)
bbox.transform(_actions->getMatrix());
}
- const double pt = 72.27/72.0; // factor to convert bp -> pt
- ScalingMatrix scale(pt, pt);
- _path.transform(scale);
- bbox.transform(scale);
ostringstream oss;
_path.writeSVG(oss);
@@ -671,11 +659,6 @@ void PsSpecialHandler::clip (vector<double> &p, bool evenodd) {
if (!_actions->getMatrix().isIdentity())
_path.transform(_actions->getMatrix());
- const double pt = 72.27/72.0; // factor to convert bp -> pt
- ScalingMatrix scale(pt, pt);
- _path.transform(scale);
-
-
int oldID = _clipStack.topID();
_clipStack.replace(_path);
int newID = _clipStack.topID();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.h
index 01bb1ada1ee..8fc3d6b5ae3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/PsSpecialHandler.h
@@ -71,7 +71,7 @@ class PsSpecialHandler : public SpecialHandler, public DVIEndPageListener, prote
const char* info () const {return "dvips PostScript specials";}
const char** prefixes () const;
bool process (const char *prefix, std::istream &is, SpecialActions *actions);
- void setDviScaleFactor (double dvi2pt) {_previewFilter.setDviScaleFactor(dvi2pt);}
+ void setDviScaleFactor (double dvi2bp) {_previewFilter.setDviScaleFactor(dvi2bp);}
void enterBodySection ();
protected:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGOutputBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGOutputBase.h
index cad892ea068..cad892ea068 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGOutputBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGOutputBase.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.cpp
index c61526e4de8..b68e5f8c2cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.cpp
@@ -60,15 +60,11 @@ void SVGTree::reset () {
/** Sets the bounding box of the document.
- * @param[in] bbox bounding box in TeX point units */
+ * @param[in] bbox bounding box in PS point units */
void SVGTree::setBBox (const BoundingBox &bbox) {
- double bp = 72.0/72.27; // pt -> bp
- ScalingMatrix scale(bp, bp);
- BoundingBox scaled_box = bbox;
- scaled_box.transform(scale);
- _root->addAttribute("width", XMLString(scaled_box.width())+"pt");
- _root->addAttribute("height", XMLString(scaled_box.height())+"pt");
- _root->addAttribute("viewBox", scaled_box.toSVGViewBox());
+ _root->addAttribute("width", XMLString(bbox.width())+"pt");
+ _root->addAttribute("height", XMLString(bbox.height())+"pt");
+ _root->addAttribute("viewBox", bbox.toSVGViewBox());
}
@@ -285,18 +281,15 @@ void SVGTree::newTextNode (double x, double y) {
void SVGTree::transformPage (const Matrix *usermatrix) {
- double bp = 72.0/72.27; // pt -> bp
- ScalingMatrix matrix(bp, bp);
- if (usermatrix)
- matrix.rmultiply(*usermatrix);
- if (!matrix.isIdentity())
- _page->addAttribute("transform", matrix.getSVG());
+ if (usermatrix && !usermatrix->isIdentity())
+ _page->addAttribute("transform", usermatrix->getSVG());
}
/** Creates an SVG element for a single glyph.
* @param[in] c character number
* @param[in] font font to extract the glyph from
+ * @param[in] cb pointer to callback object for sending feedback to the glyph tracer (may be 0)
* @return pointer to element node if glyph exists, 0 otherwise */
static XMLElementNode* createGlyphNode (int c, const PhysicalFont &font, GFGlyphTracer::Callback *cb) {
Glyph glyph;
@@ -359,7 +352,8 @@ void SVGTree::appendFontStyles (const set<const Font*> &fonts) {
/** Appends glyph definitions of a given font to the defs section of the SVG tree.
* @param[in] font font to be appended
- * @param[in] chars codes of the characters whose glyph outlines should be appended */
+ * @param[in] chars codes of the characters whose glyph outlines should be appended
+ * @param[in] cb pointer to callback object for sending feedback to the glyph tracer (may be 0) */
void SVGTree::append (const PhysicalFont &font, const set<int> &chars, GFGlyphTracer::Callback *cb) {
if (chars.empty())
return;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.h
index fb27c661c71..1ac375d7fbb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SVGTree.h
@@ -89,7 +89,7 @@ class SVGTree
public:
static bool USE_FONTS; ///< if true, create font references and don't draw paths directly
- static bool CREATE_STYLE; ///< should <style>...</style> and class attributes be used to reference fonts?
+ static bool CREATE_STYLE; ///< should style elements and class attributes be used to reference fonts?
static bool CREATE_USE_ELEMENTS; ///< allow generation of <use/> elements?
protected:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.cpp
index 6e91a05442d..6e91a05442d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.h
index dfece9963e4..dfece9963e4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SignalHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SignalHandler.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialActions.h
index d28a24a766e..d28a24a766e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialHandler.h
index 29df03728e8..b11bab4782c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialHandler.h
@@ -58,7 +58,7 @@ struct SpecialHandler
virtual const char** prefixes () const=0;
virtual const char* info () const=0;
virtual const char* name () const=0;
- virtual void setDviScaleFactor (double dvi2pt) {}
+ virtual void setDviScaleFactor (double dvi2bp) {}
virtual bool process (const char *prefix, std::istream &is, SpecialActions *actions)=0;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.cpp
index d6b9569e1aa..86aca42cd02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.cpp
@@ -48,7 +48,7 @@ void SpecialManager::unregisterHandlers () {
/** Registers a single special handler. This method doesn't check if a
* handler of the same class is already registered.
- * @param[in] pointer to handler to be registered */
+ * @param[in] handler pointer to handler to be registered */
void SpecialManager::registerHandler (SpecialHandler *handler) {
if (handler) {
// get array of prefixes this handler is responsible for
@@ -113,19 +113,19 @@ static string extract_prefix (istream &is) {
/** Executes a special command.
* @param[in] special the special expression
- * @param[in] dvi2pt factor to convert DVI units to TeX points
+ * @param[in] dvi2bp factor to convert DVI units to PS points
* @param[in] actions actions the special handlers can perform
* @param[in] listener object that wants to be notified about the processing state
* @return true if the special could be processed successfully
* @throw SpecialException in case of errors during special processing */
-bool SpecialManager::process (const string &special, double dvi2pt, SpecialActions *actions, Listener *listener) const {
+bool SpecialManager::process (const string &special, double dvi2bp, SpecialActions *actions, Listener *listener) const {
istringstream iss(special);
string prefix = extract_prefix(iss);
bool success=false;
if (SpecialHandler *handler = findHandler(prefix)) {
if (listener)
listener->beginSpecial(prefix.c_str());
- handler->setDviScaleFactor(dvi2pt);
+ handler->setDviScaleFactor(dvi2bp);
success = handler->process(prefix.c_str(), iss, actions);
if (listener)
listener->endSpecial(prefix.c_str());
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.h
index 930367259ea..a0cdd26ac91 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/SpecialManager.h
@@ -51,7 +51,7 @@ class SpecialManager
void registerHandler (SpecialHandler *handler);
void registerHandlers (SpecialHandler **handlers, const char *ignorelist);
void unregisterHandlers ();
- bool process (const std::string &special, double dvi2pt, SpecialActions *actions, Listener *listener=0) const;
+ bool process (const std::string &special, double dvi2bp, SpecialActions *actions, Listener *listener=0) const;
void notifyEndPage (unsigned pageno) const;
void notifyPositionChange (double x, double y) const;
void writeHandlerInfo (std::ostream &os) const;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.cpp
index 1464b9fdcf6..1464b9fdcf6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.h
index a35bae2d91f..a35bae2d91f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.cpp
index 203a1788f87..203a1788f87 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.h
index 05999c48fb5..05999c48fb5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/StreamWriter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/StreamWriter.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.cpp
index 88452fd1dcc..1ac23a66139 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.cpp
@@ -184,7 +184,7 @@ UInt16 Subfont::decode (unsigned char c) {
/** Skips the mapping data of a subfont entry.
- * @param[in] stream to read from
+ * @param[in] is stream to read from
* @return number of lines skipped */
static int skip_mapping_data (istream &is) {
char buf[1024];
@@ -207,7 +207,8 @@ static int skip_mapping_data (istream &is) {
* @param[in] line the line of text to be scanned
* @param[in] lineno line number used in exception messages
* @param[in,out] mapping the mapping data
- * @param[in,out] offest position/index of next mapping value
+ * @param[in] fname name of the mapfile being scanned
+ * @param[in,out] offset position/index of next mapping value
* @return true if the line is the last one the current mapping sequence, i.e. the line doesn't end with a backslash */
static bool scan_line (const char *line, int lineno, UInt16 *mapping, const string &fname, int &offset) {
const char *p=line;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.h
index 03ce75c3e99..03ce75c3e99 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Subfont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Subfont.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.cpp
index 6769f843cae..6769f843cae 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.h
index 9485f029d96..9485f029d96 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/System.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/System.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.cpp
index b4c1f06b569..db36b7f50b6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.cpp
@@ -31,7 +31,7 @@ using namespace std;
/** Reads a sequence of n TFM words (4 Bytes each).
- * @param[in] is reads from this stream
+ * @param[in] sr the TFM data is read from this object
* @param[out] v the read words
* @param[in] n number of words to be read */
template <typename T>
@@ -43,9 +43,10 @@ static void read_words (StreamReader &sr, vector<T> &v, unsigned n) {
}
-/** Converts a TFM fix point value to double. */
+/** Converts a TFM fix point value to double (PS point units). */
static double fix2double (FixWord fix) {
- return double(fix)/(1 << 20);
+ const double pt2bp = 72/72.27;
+ return double(fix)/(1 << 20)*pt2bp;
}
@@ -91,7 +92,7 @@ void TFM::readTables (StreamReader &sr, int nw, int nh, int nd, int ni) {
}
-/** Returns the design size of this font in TeX point units. */
+/** Returns the design size of this font in PS point units. */
double TFM::getDesignSize () const {
return fix2double(_designSize);
}
@@ -115,7 +116,7 @@ int TFM::charIndex (int c) const {
// xxxxxxxx | xxxx xxxx | xxxxxx xx | xxxxxxxx
// w | h d | it tg | remainder
-/** Returns the width of char c in TeX point units. */
+/** Returns the width of char c in PS point units. */
double TFM::getCharWidth (int c) const {
int index = charIndex(c);
if (index < 0)
@@ -125,7 +126,7 @@ double TFM::getCharWidth (int c) const {
}
-/** Returns the height of char c in TeX point units. */
+/** Returns the height of char c in PS point units. */
double TFM::getCharHeight (int c) const {
int index = charIndex(c);
if (index < 0)
@@ -135,7 +136,7 @@ double TFM::getCharHeight (int c) const {
}
-/** Returns the depth of char c in TeX point units. */
+/** Returns the depth of char c in PS point units. */
double TFM::getCharDepth (int c) const {
int index = charIndex(c);
if (index < 0)
@@ -145,7 +146,7 @@ double TFM::getCharDepth (int c) const {
}
-/** Returns the italic correction of char c in TeX point units. */
+/** Returns the italic correction of char c in PS point units. */
double TFM::getItalicCorr (int c) const {
int index = charIndex(c);
if (index < 0)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.h
index 1f75d76cb50..1f75d76cb50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TFM.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.cpp
index e95111d196b..e95111d196b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.h
index 08ac7e6300a..08ac7e6300a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/Terminal.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/Terminal.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.cpp
index f5b15cd4c41..b9412f3a74d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.cpp
@@ -54,8 +54,9 @@ void TpicSpecialHandler::reset () {
/** Creates SVG elements that draw lines through the recorded points.
* @param[in] stroke if true, the (out)line is drawn (in black)
* @param[in] fill if true, enclosed area is filled with current color
- * @param[in] ddist dash/dot distance of line in TeX point units
- * (0:solid line, >0:dashed line, <0:dotted line) */
+ * @param[in] ddist dash/dot distance of line in PS point units
+ * (0:solid line, >0:dashed line, <0:dotted line)
+ * @param[in] actions object providing the actions that can be performed by the SpecialHandler */
void TpicSpecialHandler::drawLines (bool stroke, bool fill, double ddist, SpecialActions *actions) {
if (actions && !_points.empty()) {
XMLElementNode *elem=0;
@@ -114,7 +115,8 @@ void TpicSpecialHandler::drawLines (bool stroke, bool fill, double ddist, Specia
* with a straight line from the mid-point of the last line to the last point.
* If ddist=0, the spline is stroked solid. Otherwise ddist denotes the length
* of the dashes and the gaps inbetween.
- * @param[in] ddist length of dashes and gaps */
+ * @param[in] ddist length of dashes and gaps
+ * @param[in] actions object providing the actions that can be performed by the SpecialHandler */
void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
if (actions && !_points.empty()) {
const size_t size = _points.size();
@@ -177,7 +179,8 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
* @param[in] rx length of horizonal semi-axis
* @param[in] ry length of vertical semi-axis
* @param[in] angle1 starting angle (clockwise) relative to x-axis
- * @param[in] angle2 ending angle (clockwise) relative to x-axis */
+ * @param[in] angle2 ending angle (clockwise) relative to x-axis
+ * @param[in] actions object providing the actions that can be performed by the SpecialHandler */
void TpicSpecialHandler::drawArc (double cx, double cy, double rx, double ry, double angle1, double angle2, SpecialActions *actions) {
if (actions) {
const double PI2 = 4*asin(1.0);
@@ -245,12 +248,12 @@ bool TpicSpecialHandler::process (const char *prefix, istream &is, SpecialAction
if (!prefix || strlen(prefix) != 2)
return false;
- const double PT=0.07227; // factor for milli-inch to TeX points
+ const double mi2bp=0.072; // factor for milli-inch to PS points
StreamInputBuffer ib(is);
BufferInputReader in(ib);
switch (cmd_id(prefix[0], prefix[1])) {
case cmd_id('p','n'): // set pen width in milli-inches
- _penwidth = in.getDouble()*PT;
+ _penwidth = in.getDouble()*mi2bp;
break;
case cmd_id('b','k'): // set fill color to black
_fill = 0;
@@ -265,8 +268,8 @@ bool TpicSpecialHandler::process (const char *prefix, istream &is, SpecialAction
case cmd_id('t','x'): // set fill pattern
break;
case cmd_id('p','a'): { // add point to path
- double x=in.getDouble()*PT;
- double y=in.getDouble()*PT;
+ double x = in.getDouble()*mi2bp;
+ double y = in.getDouble()*mi2bp;
_points.push_back(DPair(x,y));
break;
}
@@ -277,10 +280,10 @@ bool TpicSpecialHandler::process (const char *prefix, istream &is, SpecialAction
drawLines(false, true, 0, actions);
break;
case cmd_id('d','a'): // as fp but draw dashed lines
- drawLines(true, _fill >= 0, in.getDouble()*72.27, actions);
+ drawLines(true, _fill >= 0, in.getDouble()*72, actions);
break;
case cmd_id('d','t'): // as fp but draw dotted lines
- drawLines(true, _fill >= 0, -in.getDouble()*72.27, actions);
+ drawLines(true, _fill >= 0, -in.getDouble()*72, actions);
break;
case cmd_id('s','p'): { // draw quadratic splines through recorded points
double ddist = in.getDouble();
@@ -288,20 +291,20 @@ bool TpicSpecialHandler::process (const char *prefix, istream &is, SpecialAction
break;
}
case cmd_id('a','r'): { // draw elliptical arc
- double cx = in.getDouble()*PT;
- double cy = in.getDouble()*PT;
- double rx = in.getDouble()*PT;
- double ry = in.getDouble()*PT;
+ double cx = in.getDouble()*mi2bp;
+ double cy = in.getDouble()*mi2bp;
+ double rx = in.getDouble()*mi2bp;
+ double ry = in.getDouble()*mi2bp;
double a1 = in.getDouble();
double a2 = in.getDouble();
drawArc(cx, cy, rx, ry, a1, a2, actions);
break;
}
case cmd_id('i','a'): { // fill elliptical arc
- double cx = in.getDouble()*PT;
- double cy = in.getDouble()*PT;
- double rx = in.getDouble()*PT;
- double ry = in.getDouble()*PT;
+ double cx = in.getDouble()*mi2bp;
+ double cy = in.getDouble()*mi2bp;
+ double rx = in.getDouble()*mi2bp;
+ double ry = in.getDouble()*mi2bp;
double a1 = in.getDouble();
double a2 = in.getDouble();
if (_fill < 0)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.h
index 5c8e73cef67..9afdf9a31fc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/TpicSpecialHandler.h
@@ -42,7 +42,7 @@ class TpicSpecialHandler : public SpecialHandler, public DVIEndPageListener
void drawArc (double cx, double cy, double rx, double ry, double angle1, double angle2, SpecialActions *actions);
private:
- double _penwidth; ///< pen width in TeX point units
+ double _penwidth; ///< pen width in PS point units
double _fill; ///< fill intensity [0,1]; if < 0, we don't fill anything
std::vector<DPair> _points;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFActions.h
index a8e86831fe9..a8e86831fe9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFActions.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.cpp
index b4a0f965492..eb9ed4d22ee 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.cpp
@@ -28,9 +28,10 @@
using namespace std;
-/** Converts a TFM fix point value to double. */
+/** Converts a TFM fix point value to double (PS point units). */
inline static double fix2double (FixWord fix) {
- return double(fix)/(1 << 20);
+ const double pt2bp = 72/72.27;
+ return double(fix)/(1 << 20)*pt2bp;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.h
index f6d9474ccbe..f6d9474ccbe 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VFReader.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VectorStream.h
index 345b319c7b3..345b319c7b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/VectorStream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.cpp
index da19bfc6740..caee2ec7439 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.cpp
@@ -78,7 +78,7 @@ ostream& XMLDocument::write (ostream &os) const {
* (this node won't be printed at all). If a node was only partly emitted, i.e.
* its child was the stop node, a further call of emit will continue the output.
* @param[in] os stream to which the output is written
- * @param[in] stopElement node where emitting stops (if 0 the whole tree will be emitted)
+ * @param[in] stopNode node where emitting stops (if 0 the whole tree will be emitted)
* @return true if node was completely emitted */
bool XMLDocument::emit (ostream& os, XMLNode *stopNode) {
if (_rootElement) { // no root element => no output
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.h
index c3d6b928ee7..c3d6b928ee7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLDocument.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.cpp
index e61f35b1e8c..82b85b52ffd 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.cpp
@@ -175,7 +175,7 @@ ostream& XMLElementNode::write (ostream &os) const {
* (this node won't be printed at all). If a node was only partly emitted, i.e.
* its child was the stop node, a further call of emit will continue the output.
* @param[in] os stream to which the output is sent to
- * @param[in] stopElement node where emitting stops (if 0 the whole tree will be emitted)
+ * @param[in] stopNode node where emitting stops (if 0 the whole tree will be emitted)
* @return true if node was emitted completely */
bool XMLElementNode::emit (ostream &os, XMLNode *stopNode) {
if (this == stopNode)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.h
index cd878701db9..cd878701db9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLNode.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.cpp
index ea4487f45bc..ea4487f45bc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.h
index ae27053a856..ae27053a856 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/XMLString.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/dvisvgm.cpp
index 85bd428f5eb..c3e4cccbae6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/dvisvgm.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/dvisvgm.cpp
@@ -106,7 +106,8 @@ class SVGOutput : public SVGOutputBase
/** Returns the name of the SVG file containing the given page.
- * @param[in] page number of page */
+ * @param[in] page number of current page
+ * @param[in] numPages total number of pages */
string filename (int page, int numPages) const {
if (_stdout)
return "";
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.cpp
index 2893c299891..2893c299891 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.h
index 60f38c4fac7..60f38c4fac7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/macros.h
index 73217c763e0..73217c763e0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/macros.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/options.xml
index bf1e0106999..bf1e0106999 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/options.xml
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/psdefs.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/psdefs.cpp
index 4edce3af1d8..4edce3af1d8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/psdefs.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/psdefs.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/types.h
index 306a0ab4e26..306a0ab4e26 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5.2/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5.3/src/types.h
diff --git a/Build/source/texk/dvisvgm/version.ac b/Build/source/texk/dvisvgm/version.ac
index 101d22febc4..8a89039b26a 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.5.2])
+m4_define([dvisvgm_version], [1.5.3])