summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/teckit/Makefile.in2
-rw-r--r--Build/source/libs/teckit/README0
-rw-r--r--Build/source/texk/README4
-rw-r--r--Build/source/texk/bibtexu/Makefile.in2
-rw-r--r--Build/source/texk/bibtexu/README0
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog5
-rw-r--r--Build/source/texk/dvisvgm/Makefile.am12
-rw-r--r--Build/source/texk/dvisvgm/Makefile.in163
-rw-r--r--Build/source/texk/dvisvgm/README0
-rwxr-xr-xBuild/source/texk/dvisvgm/configure26
-rw-r--r--Build/source/texk/dvisvgm/configure.ac2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes14
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning24
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings87
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized14
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual26
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn79
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS134
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members23
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd16
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help12
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime58
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.cpp87
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.cpp125
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.cpp277
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.h145
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.am55
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.cpp74
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.cpp125
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.cpp213
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.h70
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamCounter.h100
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/dvisvgm.cpp307
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/psdefs.psc56
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.am85
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/ChangeLog (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog)17
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen11
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-07-libdvisvgm-uint32 (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members23
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-30-WIN32-warning (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-30-WIN32-warning)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/AUTHORS (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/AUTHORS)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/COPYING (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/COPYING)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/INSTALL (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/INSTALL)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/LGPL-2.1.txt (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/LGPL-2.1.txt)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/Makefile.am)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/Makefile.in)22
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/NEWS (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/NEWS)46
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/README (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/README)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/aclocal.m4 (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/aclocal.m4)166
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/config.h.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/config.h.in)21
-rwxr-xr-xBuild/source/texk/dvisvgm/dvisvgm-1.0.1/configure (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/configure)5897
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure.ac (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/configure.ac)110
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/Makefile.am)7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/Makefile.in)14
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.1 (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/dvisvgm.1)136
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.txt.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/dvisvgm.txt.in)160
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.am (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/Makefile.am)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/Makefile.in)7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/auxiliary.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/auxiliary.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/bitmap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/bitmap.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.c (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/curve.c)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/curve.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.c (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/decompose.c)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/decompose.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/lists.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/lists.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.c (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/potracelib.c)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/potracelib.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/progress.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/progress.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.c (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/trace.c)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/trace.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BgColorSpecialHandler.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BgColorSpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Bitmap.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Bitmap.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BoundingBox.cpp)82
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BoundingBox.h)13
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Calculator.cpp)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Calculator.h)33
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CmdLineParserBase.cpp)69
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CmdLineParserBase.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Color.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Color.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ColorSpecialHandler.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ColorSpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CommandLine.cpp)87
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CommandLine.h)37
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DLLoader.cpp)9
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DLLoader.h)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIActions.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIActions.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIReader.cpp)152
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIReader.h)49
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp)168
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.h)30
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVGActions.cpp)227
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVGActions.h)33
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Directory.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Directory.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DvisvgmSpecialHandler.cpp)39
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DvisvgmSpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/EmSpecialHandler.cpp)18
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/EmSpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileFinder.cpp)7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileFinder.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.cpp249
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.h61
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileSystem.cpp)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileSystem.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.cpp390
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.h)132
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontCache.cpp)249
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontCache.h)21
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEncoding.cpp)29
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEncoding.h)9
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp)58
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.h)49
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontManager.cpp)44
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontManager.h)45
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontMap.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontMap.h)21
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFGlyphTracer.cpp)76
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFGlyphTracer.h)27
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFReader.cpp)86
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFReader.h)50
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFTracer.cpp)5
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFTracer.h)9
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp)13
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h)11
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Glyph.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/StreamCounterTest.cpp)25
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GlyphTracerMessages.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.h)69
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GraphicPath.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GraphicPath.h)209
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputBuffer.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputBuffer.h)16
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputReader.cpp)8
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputReader.h)7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Length.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Length.h)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.am49
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.in)78
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Matrix.cpp)11
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Matrix.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.cpp161
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.h80
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MessageException.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MessageException.h)13
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MetafontWrapper.cpp)4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MetafontWrapper.h)17
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PSInterpreter.cpp)82
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PSInterpreter.h)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.cpp135
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.h50
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PageSize.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PageSize.h)9
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Pair.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Pair.h)19
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PsSpecialHandler.cpp)25
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PsSpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGTree.cpp)144
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGTree.h)18
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialActions.h)9
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialManager.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialManager.h)7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamReader.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamReader.h)23
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.cpp51
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEmitter.h)32
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.h)54
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.h)20
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TFM.cpp)57
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TFM.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.cpp165
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.h53
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TpicSpecialHandler.cpp)20
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TpicSpecialHandler.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFActions.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFActions.h)15
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFReader.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFReader.h)19
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VectorStream.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VectorStream.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocTypeNode.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocTypeNode.h)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocument.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocument.h)12
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLNode.cpp)38
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLNode.h)64
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLString.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLString.h)21
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/dvisvgm.cpp331
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/gzstream.cpp)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/gzstream.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/iapi.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/iapi.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ierrors.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ierrors.h)0
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/macros.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/macros.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/options.xml (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/options.xml)39
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/psdefs.psc60
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/types.h (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/types.h)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/BoundingBoxTest.cpp53
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CalculatorTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/CalculatorTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/ColorSpecialTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/ColorSpecialTest.cpp)6
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CommandLineTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/CommandLineTest.cpp)51
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/DirectoryTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/DirectoryTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FileFinderTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FileFinderTest.cpp)19
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FilePathTest.cpp89
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontManagerTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FontManagerTest.cpp)10
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontMapTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FontMapTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/GraphicPathTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/GraphicPathTest.cpp)19
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/LengthTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/LengthTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.am100
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.in (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.in)174
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/MatrixTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/MatrixTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageRagesTest.cpp167
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageSizeTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/PageSizeTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/SplittedCharInputBufferTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/SplittedCharInputBufferTest.cpp)2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/StreamInputBufferTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/StreamInputBufferTest.cpp)38
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/VectorStreamTest.cpp (renamed from Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/VectorStreamTest.cpp)2
-rwxr-xr-xBuild/source/texk/dvisvgm/dvisvgm-1.0.1/tests/check-conv50
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-nf-cmp.svg1223
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-wf-cmp.svg353
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/normalize.xsl135
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-nf-cmp.svg204
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-wf-cmp.svg206
220 files changed, 9412 insertions, 7846 deletions
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 70bb248a616..08a441865d3 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -37,7 +37,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = teckit_compile$(EXEEXT)
subdir = .
-DIST_COMMON = README $(am__configure_deps) \
+DIST_COMMON = $(am__configure_deps) \
$(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
$(srcdir)/../../build-aux/depcomp \
diff --git a/Build/source/libs/teckit/README b/Build/source/libs/teckit/README
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Build/source/libs/teckit/README
+++ /dev/null
diff --git a/Build/source/texk/README b/Build/source/texk/README
index b5a7ab1b122..dd97f90326f 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -60,8 +60,8 @@ dvipos - ?
dvipsk - maintained here by Tom Rokicki, Karl Berry, Akira Kakuto, ...
-dvisvgm - checked 13nov09
- http://downloads.sourceforge.net/dvisvgm/dvisvgm-0.8.7.tar.gz
+dvisvgm - checked 11jun10
+ http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.1.tar.gz
gsftopk - from Paul Vojta's xdvi?
diff --git a/Build/source/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in
index dd8ab119dba..598be770995 100644
--- a/Build/source/texk/bibtexu/Makefile.in
+++ b/Build/source/texk/bibtexu/Makefile.in
@@ -37,7 +37,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = bibtexu$(EXEEXT)
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_btdoc_DATA) \
+DIST_COMMON = $(am__configure_deps) $(dist_btdoc_DATA) \
$(dist_csf_DATA) $(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
$(srcdir)/../../build-aux/depcomp \
diff --git a/Build/source/texk/bibtexu/README b/Build/source/texk/bibtexu/README
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Build/source/texk/bibtexu/README
+++ /dev/null
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 6aed46c51bc..39109acad3b 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Imported release 1.0.1.
+ * configure.ac, Makefile.am: Adapted.
+
2010-03-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Check if dlopen() requires `-ldl'.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 439e4a238ea..72c37dd9af7 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -14,9 +14,6 @@ ACLOCAL_AMFLAGS = -I ../../m4
## We want to re-distribute the whole original dvisvgm source tree.
##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(DVISVGM_TREE).
EXTRA_DIST = $(DVISVGM_TREE)
## Patches applied to the original source tree
@@ -57,7 +54,6 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/Bitmap.cpp \
$(DVISVGM_TREE)/src/BoundingBox.cpp \
$(DVISVGM_TREE)/src/Calculator.cpp \
- $(DVISVGM_TREE)/src/CharmapTranslator.cpp \
$(DVISVGM_TREE)/src/CmdLineParserBase.cpp \
$(DVISVGM_TREE)/src/Color.cpp \
$(DVISVGM_TREE)/src/ColorSpecialHandler.cpp \
@@ -70,12 +66,12 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/DVIToSVGActions.cpp \
$(DVISVGM_TREE)/src/EmSpecialHandler.cpp \
$(DVISVGM_TREE)/src/FileFinder.cpp \
+ $(DVISVGM_TREE)/src/FilePath.cpp \
$(DVISVGM_TREE)/src/FileSystem.cpp \
$(DVISVGM_TREE)/src/Font.cpp \
$(DVISVGM_TREE)/src/FontCache.cpp \
$(DVISVGM_TREE)/src/FontEncoding.cpp \
$(DVISVGM_TREE)/src/FontEngine.cpp \
- $(DVISVGM_TREE)/src/FontGlyph.cpp \
$(DVISVGM_TREE)/src/FontManager.cpp \
$(DVISVGM_TREE)/src/FontMap.cpp \
$(DVISVGM_TREE)/src/GFReader.cpp \
@@ -88,14 +84,16 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/Matrix.cpp \
$(DVISVGM_TREE)/src/Message.cpp \
$(DVISVGM_TREE)/src/MetafontWrapper.cpp \
+ $(DVISVGM_TREE)/src/PageRanges.cpp \
$(DVISVGM_TREE)/src/PageSize.cpp \
$(DVISVGM_TREE)/src/PSInterpreter.cpp \
$(DVISVGM_TREE)/src/PsSpecialHandler.cpp \
$(DVISVGM_TREE)/src/SpecialManager.cpp \
$(DVISVGM_TREE)/src/StreamReader.cpp \
- $(DVISVGM_TREE)/src/SVGFontEmitter.cpp \
- $(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp \
+ $(DVISVGM_TREE)/src/StreamWriter.cpp \
$(DVISVGM_TREE)/src/SVGTree.cpp \
+ $(DVISVGM_TREE)/src/System.cpp \
+ $(DVISVGM_TREE)/src/Terminal.cpp \
$(DVISVGM_TREE)/src/TFM.cpp \
$(DVISVGM_TREE)/src/TpicSpecialHandler.cpp \
$(DVISVGM_TREE)/src/VFReader.cpp \
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index c713c310074..f1c75bc3c18 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -40,7 +40,7 @@ bin_PROGRAMS = dvisvgm$(EXEEXT)
@dlloader_TRUE@ $(DVISVGM_TREE)/src/DLLoader.cpp
subdir = .
-DIST_COMMON = README $(am__configure_deps) \
+DIST_COMMON = $(am__configure_deps) \
$(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
$(srcdir)/../../build-aux/depcomp \
@@ -82,23 +82,23 @@ libdvisvgm_a_LIBADD =
@dlloader_TRUE@am__objects_1 = DLLoader.$(OBJEXT)
nodist_libdvisvgm_a_OBJECTS = BgColorSpecialHandler.$(OBJEXT) \
Bitmap.$(OBJEXT) BoundingBox.$(OBJEXT) Calculator.$(OBJEXT) \
- CharmapTranslator.$(OBJEXT) CmdLineParserBase.$(OBJEXT) \
- Color.$(OBJEXT) ColorSpecialHandler.$(OBJEXT) \
- CommandLine.$(OBJEXT) Directory.$(OBJEXT) DVIActions.$(OBJEXT) \
- DVIReader.$(OBJEXT) DvisvgmSpecialHandler.$(OBJEXT) \
- DVIToSVG.$(OBJEXT) DVIToSVGActions.$(OBJEXT) \
- EmSpecialHandler.$(OBJEXT) FileFinder.$(OBJEXT) \
- FileSystem.$(OBJEXT) Font.$(OBJEXT) FontCache.$(OBJEXT) \
- FontEncoding.$(OBJEXT) FontEngine.$(OBJEXT) \
- FontGlyph.$(OBJEXT) FontManager.$(OBJEXT) FontMap.$(OBJEXT) \
+ CmdLineParserBase.$(OBJEXT) Color.$(OBJEXT) \
+ ColorSpecialHandler.$(OBJEXT) CommandLine.$(OBJEXT) \
+ Directory.$(OBJEXT) DVIActions.$(OBJEXT) DVIReader.$(OBJEXT) \
+ DvisvgmSpecialHandler.$(OBJEXT) DVIToSVG.$(OBJEXT) \
+ DVIToSVGActions.$(OBJEXT) EmSpecialHandler.$(OBJEXT) \
+ FileFinder.$(OBJEXT) FilePath.$(OBJEXT) FileSystem.$(OBJEXT) \
+ Font.$(OBJEXT) FontCache.$(OBJEXT) FontEncoding.$(OBJEXT) \
+ FontEngine.$(OBJEXT) FontManager.$(OBJEXT) FontMap.$(OBJEXT) \
GFReader.$(OBJEXT) GFGlyphTracer.$(OBJEXT) GFTracer.$(OBJEXT) \
Ghostscript.$(OBJEXT) InputBuffer.$(OBJEXT) \
InputReader.$(OBJEXT) Length.$(OBJEXT) Matrix.$(OBJEXT) \
- Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) PageSize.$(OBJEXT) \
+ Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) \
+ PageRanges.$(OBJEXT) PageSize.$(OBJEXT) \
PSInterpreter.$(OBJEXT) PsSpecialHandler.$(OBJEXT) \
SpecialManager.$(OBJEXT) StreamReader.$(OBJEXT) \
- SVGFontEmitter.$(OBJEXT) SVGFontTraceEmitter.$(OBJEXT) \
- SVGTree.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
+ StreamWriter.$(OBJEXT) SVGTree.$(OBJEXT) System.$(OBJEXT) \
+ Terminal.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
VFReader.$(OBJEXT) XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) \
XMLString.$(OBJEXT) $(am__objects_1)
libdvisvgm_a_OBJECTS = $(nodist_libdvisvgm_a_OBJECTS)
@@ -343,7 +343,6 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/Bitmap.cpp \
$(DVISVGM_TREE)/src/BoundingBox.cpp \
$(DVISVGM_TREE)/src/Calculator.cpp \
- $(DVISVGM_TREE)/src/CharmapTranslator.cpp \
$(DVISVGM_TREE)/src/CmdLineParserBase.cpp \
$(DVISVGM_TREE)/src/Color.cpp \
$(DVISVGM_TREE)/src/ColorSpecialHandler.cpp \
@@ -356,11 +355,11 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/DVIToSVGActions.cpp \
$(DVISVGM_TREE)/src/EmSpecialHandler.cpp \
$(DVISVGM_TREE)/src/FileFinder.cpp \
+ $(DVISVGM_TREE)/src/FilePath.cpp \
$(DVISVGM_TREE)/src/FileSystem.cpp \
$(DVISVGM_TREE)/src/Font.cpp $(DVISVGM_TREE)/src/FontCache.cpp \
$(DVISVGM_TREE)/src/FontEncoding.cpp \
$(DVISVGM_TREE)/src/FontEngine.cpp \
- $(DVISVGM_TREE)/src/FontGlyph.cpp \
$(DVISVGM_TREE)/src/FontManager.cpp \
$(DVISVGM_TREE)/src/FontMap.cpp \
$(DVISVGM_TREE)/src/GFReader.cpp \
@@ -372,14 +371,15 @@ nodist_libdvisvgm_a_SOURCES = \
$(DVISVGM_TREE)/src/Length.cpp $(DVISVGM_TREE)/src/Matrix.cpp \
$(DVISVGM_TREE)/src/Message.cpp \
$(DVISVGM_TREE)/src/MetafontWrapper.cpp \
+ $(DVISVGM_TREE)/src/PageRanges.cpp \
$(DVISVGM_TREE)/src/PageSize.cpp \
$(DVISVGM_TREE)/src/PSInterpreter.cpp \
$(DVISVGM_TREE)/src/PsSpecialHandler.cpp \
$(DVISVGM_TREE)/src/SpecialManager.cpp \
$(DVISVGM_TREE)/src/StreamReader.cpp \
- $(DVISVGM_TREE)/src/SVGFontEmitter.cpp \
- $(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp \
- $(DVISVGM_TREE)/src/SVGTree.cpp $(DVISVGM_TREE)/src/TFM.cpp \
+ $(DVISVGM_TREE)/src/StreamWriter.cpp \
+ $(DVISVGM_TREE)/src/SVGTree.cpp $(DVISVGM_TREE)/src/System.cpp \
+ $(DVISVGM_TREE)/src/Terminal.cpp $(DVISVGM_TREE)/src/TFM.cpp \
$(DVISVGM_TREE)/src/TpicSpecialHandler.cpp \
$(DVISVGM_TREE)/src/VFReader.cpp \
$(DVISVGM_TREE)/src/XMLDocument.cpp \
@@ -516,7 +516,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bitmap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BoundingBox.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Calculator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CharmapTranslator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CmdLineParserBase.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Color.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ColorSpecialHandler.Po@am__quote@
@@ -530,12 +529,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DvisvgmSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EmSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileFinder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilePath.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileSystem.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Font.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontCache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontEncoding.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontGlyph.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontMap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GFGlyphTracer.Po@am__quote@
@@ -549,14 +548,16 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Message.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetafontWrapper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSInterpreter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageRanges.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSize.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsSpecialHandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGFontEmitter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGFontTraceEmitter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGTree.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpecialManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamReader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamWriter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/System.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TFM.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Terminal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TpicSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VFReader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLDocument.Po@am__quote@
@@ -723,20 +724,6 @@ Calculator.obj: $(DVISVGM_TREE)/src/Calculator.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Calculator.obj `if test -f '$(DVISVGM_TREE)/src/Calculator.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/Calculator.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/Calculator.cpp'; fi`
-CharmapTranslator.o: $(DVISVGM_TREE)/src/CharmapTranslator.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CharmapTranslator.o -MD -MP -MF $(DEPDIR)/CharmapTranslator.Tpo -c -o CharmapTranslator.o `test -f '$(DVISVGM_TREE)/src/CharmapTranslator.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/CharmapTranslator.cpp
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/CharmapTranslator.Tpo $(DEPDIR)/CharmapTranslator.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/CharmapTranslator.cpp' object='CharmapTranslator.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CharmapTranslator.o `test -f '$(DVISVGM_TREE)/src/CharmapTranslator.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/CharmapTranslator.cpp
-
-CharmapTranslator.obj: $(DVISVGM_TREE)/src/CharmapTranslator.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CharmapTranslator.obj -MD -MP -MF $(DEPDIR)/CharmapTranslator.Tpo -c -o CharmapTranslator.obj `if test -f '$(DVISVGM_TREE)/src/CharmapTranslator.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/CharmapTranslator.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/CharmapTranslator.cpp'; fi`
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/CharmapTranslator.Tpo $(DEPDIR)/CharmapTranslator.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/CharmapTranslator.cpp' object='CharmapTranslator.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CharmapTranslator.obj `if test -f '$(DVISVGM_TREE)/src/CharmapTranslator.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/CharmapTranslator.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/CharmapTranslator.cpp'; fi`
-
CmdLineParserBase.o: $(DVISVGM_TREE)/src/CmdLineParserBase.cpp
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CmdLineParserBase.o -MD -MP -MF $(DEPDIR)/CmdLineParserBase.Tpo -c -o CmdLineParserBase.o `test -f '$(DVISVGM_TREE)/src/CmdLineParserBase.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/CmdLineParserBase.cpp
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/CmdLineParserBase.Tpo $(DEPDIR)/CmdLineParserBase.Po
@@ -905,6 +892,20 @@ FileFinder.obj: $(DVISVGM_TREE)/src/FileFinder.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileFinder.obj `if test -f '$(DVISVGM_TREE)/src/FileFinder.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/FileFinder.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/FileFinder.cpp'; fi`
+FilePath.o: $(DVISVGM_TREE)/src/FilePath.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FilePath.o -MD -MP -MF $(DEPDIR)/FilePath.Tpo -c -o FilePath.o `test -f '$(DVISVGM_TREE)/src/FilePath.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/FilePath.cpp
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FilePath.Tpo $(DEPDIR)/FilePath.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/FilePath.cpp' object='FilePath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FilePath.o `test -f '$(DVISVGM_TREE)/src/FilePath.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/FilePath.cpp
+
+FilePath.obj: $(DVISVGM_TREE)/src/FilePath.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FilePath.obj -MD -MP -MF $(DEPDIR)/FilePath.Tpo -c -o FilePath.obj `if test -f '$(DVISVGM_TREE)/src/FilePath.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/FilePath.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/FilePath.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FilePath.Tpo $(DEPDIR)/FilePath.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/FilePath.cpp' object='FilePath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FilePath.obj `if test -f '$(DVISVGM_TREE)/src/FilePath.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/FilePath.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/FilePath.cpp'; fi`
+
FileSystem.o: $(DVISVGM_TREE)/src/FileSystem.cpp
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystem.o -MD -MP -MF $(DEPDIR)/FileSystem.Tpo -c -o FileSystem.o `test -f '$(DVISVGM_TREE)/src/FileSystem.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/FileSystem.cpp
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FileSystem.Tpo $(DEPDIR)/FileSystem.Po
@@ -975,20 +976,6 @@ FontEngine.obj: $(DVISVGM_TREE)/src/FontEngine.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontEngine.obj `if test -f '$(DVISVGM_TREE)/src/FontEngine.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/FontEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/FontEngine.cpp'; fi`
-FontGlyph.o: $(DVISVGM_TREE)/src/FontGlyph.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontGlyph.o -MD -MP -MF $(DEPDIR)/FontGlyph.Tpo -c -o FontGlyph.o `test -f '$(DVISVGM_TREE)/src/FontGlyph.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/FontGlyph.cpp
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FontGlyph.Tpo $(DEPDIR)/FontGlyph.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/FontGlyph.cpp' object='FontGlyph.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontGlyph.o `test -f '$(DVISVGM_TREE)/src/FontGlyph.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/FontGlyph.cpp
-
-FontGlyph.obj: $(DVISVGM_TREE)/src/FontGlyph.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontGlyph.obj -MD -MP -MF $(DEPDIR)/FontGlyph.Tpo -c -o FontGlyph.obj `if test -f '$(DVISVGM_TREE)/src/FontGlyph.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/FontGlyph.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/FontGlyph.cpp'; fi`
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FontGlyph.Tpo $(DEPDIR)/FontGlyph.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/FontGlyph.cpp' object='FontGlyph.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontGlyph.obj `if test -f '$(DVISVGM_TREE)/src/FontGlyph.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/FontGlyph.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/FontGlyph.cpp'; fi`
-
FontManager.o: $(DVISVGM_TREE)/src/FontManager.cpp
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontManager.o -MD -MP -MF $(DEPDIR)/FontManager.Tpo -c -o FontManager.o `test -f '$(DVISVGM_TREE)/src/FontManager.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/FontManager.cpp
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FontManager.Tpo $(DEPDIR)/FontManager.Po
@@ -1157,6 +1144,20 @@ MetafontWrapper.obj: $(DVISVGM_TREE)/src/MetafontWrapper.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MetafontWrapper.obj `if test -f '$(DVISVGM_TREE)/src/MetafontWrapper.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/MetafontWrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/MetafontWrapper.cpp'; fi`
+PageRanges.o: $(DVISVGM_TREE)/src/PageRanges.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageRanges.o -MD -MP -MF $(DEPDIR)/PageRanges.Tpo -c -o PageRanges.o `test -f '$(DVISVGM_TREE)/src/PageRanges.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/PageRanges.cpp
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PageRanges.Tpo $(DEPDIR)/PageRanges.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/PageRanges.cpp' object='PageRanges.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageRanges.o `test -f '$(DVISVGM_TREE)/src/PageRanges.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/PageRanges.cpp
+
+PageRanges.obj: $(DVISVGM_TREE)/src/PageRanges.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageRanges.obj -MD -MP -MF $(DEPDIR)/PageRanges.Tpo -c -o PageRanges.obj `if test -f '$(DVISVGM_TREE)/src/PageRanges.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/PageRanges.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/PageRanges.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PageRanges.Tpo $(DEPDIR)/PageRanges.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/PageRanges.cpp' object='PageRanges.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageRanges.obj `if test -f '$(DVISVGM_TREE)/src/PageRanges.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/PageRanges.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/PageRanges.cpp'; fi`
+
PageSize.o: $(DVISVGM_TREE)/src/PageSize.cpp
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageSize.o -MD -MP -MF $(DEPDIR)/PageSize.Tpo -c -o PageSize.o `test -f '$(DVISVGM_TREE)/src/PageSize.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/PageSize.cpp
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/PageSize.Tpo $(DEPDIR)/PageSize.Po
@@ -1227,33 +1228,19 @@ StreamReader.obj: $(DVISVGM_TREE)/src/StreamReader.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamReader.obj `if test -f '$(DVISVGM_TREE)/src/StreamReader.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/StreamReader.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/StreamReader.cpp'; fi`
-SVGFontEmitter.o: $(DVISVGM_TREE)/src/SVGFontEmitter.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGFontEmitter.o -MD -MP -MF $(DEPDIR)/SVGFontEmitter.Tpo -c -o SVGFontEmitter.o `test -f '$(DVISVGM_TREE)/src/SVGFontEmitter.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SVGFontEmitter.cpp
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SVGFontEmitter.Tpo $(DEPDIR)/SVGFontEmitter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/SVGFontEmitter.cpp' object='SVGFontEmitter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGFontEmitter.o `test -f '$(DVISVGM_TREE)/src/SVGFontEmitter.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SVGFontEmitter.cpp
-
-SVGFontEmitter.obj: $(DVISVGM_TREE)/src/SVGFontEmitter.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGFontEmitter.obj -MD -MP -MF $(DEPDIR)/SVGFontEmitter.Tpo -c -o SVGFontEmitter.obj `if test -f '$(DVISVGM_TREE)/src/SVGFontEmitter.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SVGFontEmitter.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SVGFontEmitter.cpp'; fi`
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SVGFontEmitter.Tpo $(DEPDIR)/SVGFontEmitter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/SVGFontEmitter.cpp' object='SVGFontEmitter.obj' libtool=no @AMDEPBACKSLASH@
+StreamWriter.o: $(DVISVGM_TREE)/src/StreamWriter.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamWriter.o -MD -MP -MF $(DEPDIR)/StreamWriter.Tpo -c -o StreamWriter.o `test -f '$(DVISVGM_TREE)/src/StreamWriter.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/StreamWriter.cpp
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StreamWriter.Tpo $(DEPDIR)/StreamWriter.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/StreamWriter.cpp' object='StreamWriter.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGFontEmitter.obj `if test -f '$(DVISVGM_TREE)/src/SVGFontEmitter.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SVGFontEmitter.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SVGFontEmitter.cpp'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamWriter.o `test -f '$(DVISVGM_TREE)/src/StreamWriter.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/StreamWriter.cpp
-SVGFontTraceEmitter.o: $(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGFontTraceEmitter.o -MD -MP -MF $(DEPDIR)/SVGFontTraceEmitter.Tpo -c -o SVGFontTraceEmitter.o `test -f '$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SVGFontTraceEmitter.Tpo $(DEPDIR)/SVGFontTraceEmitter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp' object='SVGFontTraceEmitter.o' libtool=no @AMDEPBACKSLASH@
+StreamWriter.obj: $(DVISVGM_TREE)/src/StreamWriter.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamWriter.obj -MD -MP -MF $(DEPDIR)/StreamWriter.Tpo -c -o StreamWriter.obj `if test -f '$(DVISVGM_TREE)/src/StreamWriter.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/StreamWriter.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/StreamWriter.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/StreamWriter.Tpo $(DEPDIR)/StreamWriter.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/StreamWriter.cpp' object='StreamWriter.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGFontTraceEmitter.o `test -f '$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp
-
-SVGFontTraceEmitter.obj: $(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp
-@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGFontTraceEmitter.obj -MD -MP -MF $(DEPDIR)/SVGFontTraceEmitter.Tpo -c -o SVGFontTraceEmitter.obj `if test -f '$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp'; fi`
-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SVGFontTraceEmitter.Tpo $(DEPDIR)/SVGFontTraceEmitter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp' object='SVGFontTraceEmitter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGFontTraceEmitter.obj `if test -f '$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp'; fi`
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamWriter.obj `if test -f '$(DVISVGM_TREE)/src/StreamWriter.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/StreamWriter.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/StreamWriter.cpp'; fi`
SVGTree.o: $(DVISVGM_TREE)/src/SVGTree.cpp
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGTree.o -MD -MP -MF $(DEPDIR)/SVGTree.Tpo -c -o SVGTree.o `test -f '$(DVISVGM_TREE)/src/SVGTree.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/SVGTree.cpp
@@ -1269,6 +1256,34 @@ SVGTree.obj: $(DVISVGM_TREE)/src/SVGTree.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGTree.obj `if test -f '$(DVISVGM_TREE)/src/SVGTree.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/SVGTree.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/SVGTree.cpp'; fi`
+System.o: $(DVISVGM_TREE)/src/System.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT System.o -MD -MP -MF $(DEPDIR)/System.Tpo -c -o System.o `test -f '$(DVISVGM_TREE)/src/System.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/System.cpp
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/System.Tpo $(DEPDIR)/System.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/System.cpp' object='System.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o System.o `test -f '$(DVISVGM_TREE)/src/System.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/System.cpp
+
+System.obj: $(DVISVGM_TREE)/src/System.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT System.obj -MD -MP -MF $(DEPDIR)/System.Tpo -c -o System.obj `if test -f '$(DVISVGM_TREE)/src/System.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/System.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/System.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/System.Tpo $(DEPDIR)/System.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/System.cpp' object='System.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o System.obj `if test -f '$(DVISVGM_TREE)/src/System.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/System.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/System.cpp'; fi`
+
+Terminal.o: $(DVISVGM_TREE)/src/Terminal.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Terminal.o -MD -MP -MF $(DEPDIR)/Terminal.Tpo -c -o Terminal.o `test -f '$(DVISVGM_TREE)/src/Terminal.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/Terminal.cpp
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Terminal.Tpo $(DEPDIR)/Terminal.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/Terminal.cpp' object='Terminal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Terminal.o `test -f '$(DVISVGM_TREE)/src/Terminal.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/Terminal.cpp
+
+Terminal.obj: $(DVISVGM_TREE)/src/Terminal.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Terminal.obj -MD -MP -MF $(DEPDIR)/Terminal.Tpo -c -o Terminal.obj `if test -f '$(DVISVGM_TREE)/src/Terminal.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/Terminal.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/Terminal.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Terminal.Tpo $(DEPDIR)/Terminal.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(DVISVGM_TREE)/src/Terminal.cpp' object='Terminal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Terminal.obj `if test -f '$(DVISVGM_TREE)/src/Terminal.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/Terminal.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/Terminal.cpp'; fi`
+
TFM.o: $(DVISVGM_TREE)/src/TFM.cpp
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TFM.o -MD -MP -MF $(DEPDIR)/TFM.Tpo -c -o TFM.o `test -f '$(DVISVGM_TREE)/src/TFM.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/TFM.cpp
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/TFM.Tpo $(DEPDIR)/TFM.Po
diff --git a/Build/source/texk/dvisvgm/README b/Build/source/texk/dvisvgm/README
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Build/source/texk/dvisvgm/README
+++ /dev/null
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 914944c8cc1..72297888bf6 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.65 for dvisvgm 0.8.7.
+# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.1.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -701,12 +701,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisvgm'
PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='0.8.7'
-PACKAGE_STRING='dvisvgm 0.8.7'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='dvisvgm 1.0.1'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="dvisvgm-0.8.7/src/dvisvgm.cpp"
+ac_unique_file="dvisvgm-1.0.1/src/dvisvgm.cpp"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1464,7 +1464,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 0.8.7 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1534,7 +1534,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisvgm 0.8.7:";;
+ short | recursive ) echo "Configuration of dvisvgm 1.0.1:";;
esac
cat <<\_ACEOF
@@ -1659,7 +1659,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisvgm configure 0.8.7
+dvisvgm configure 1.0.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2355,7 +2355,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvisvgm $as_me 0.8.7, which was
+It was created by dvisvgm $as_me 1.0.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -7081,7 +7081,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisvgm'
- VERSION='0.8.7'
+ VERSION='1.0.1'
cat >>confdefs.h <<_ACEOF
@@ -16613,7 +16613,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvisvgm config.lt 0.8.7
+dvisvgm config.lt 1.0.1
configured by $0, generated by GNU Autoconf 2.65.
Copyright (C) 2008 Free Software Foundation, Inc.
@@ -18294,7 +18294,7 @@ CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
-DVISVGM_TREE=dvisvgm-0.8.7
+DVISVGM_TREE=dvisvgm-1.0.1
ac_config_files="$ac_config_files Makefile"
@@ -18837,7 +18837,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvisvgm $as_me 0.8.7, which was
+This file was extended by dvisvgm $as_me 1.0.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18903,7 +18903,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvisvgm config.status 0.8.7
+dvisvgm config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index 59bc01124ed..fc49ad4e597 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -13,7 +13,7 @@ dnl Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
dnl
dnl *********************************************************************
dnl
-m4_define([dvisvgm_version], [0.8.7])[]dnl using unmodified dvisvgm source tree
+m4_define([dvisvgm_version], [1.0.1])[]dnl using unmodified dvisvgm source tree
AC_INIT([dvisvgm], dvisvgm_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([dvisvgm-]dvisvgm_version[/src/dvisvgm.cpp])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes
deleted file mode 100644
index a7749f10b42..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes
+++ /dev/null
@@ -1,14 +0,0 @@
-Changes applied to the dvisvgm-0.8.7 tree as obtained from:
- http://downloads.sourceforge.net/dvisvgm/dvisvgm-0.8.7.tar.gz
-
-Removed:
- config.guess
- config.sub
- depcomp
- install-sh
- missing
-
-Converted mixed Dos/Win and Unix line ends to native:
- src/DLLoader.cpp
- src/DLLoader.h
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning
deleted file mode 100644
index aa4a5f56d47..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning
+++ /dev/null
@@ -1,24 +0,0 @@
- Avoid compiler warning.
-
-diff -ur dvisvgm-0.8.7.orig/potracelib/potracelib.c dvisvgm-0.8.7/potracelib/potracelib.c
---- dvisvgm-0.8.7.orig/potracelib/potracelib.c 2009-08-29 22:06:31.000000000 +0200
-+++ dvisvgm-0.8.7/potracelib/potracelib.c 2009-11-13 13:33:11.000000000 +0100
-@@ -108,6 +108,6 @@
- free(p);
- }
-
--char *potrace_version(void) {
-+const char *potrace_version(void) {
- return "potracelib "VERSION"";
- }
-diff -ur dvisvgm-0.8.7.orig/potracelib/potracelib.h dvisvgm-0.8.7/potracelib/potracelib.h
---- dvisvgm-0.8.7.orig/potracelib/potracelib.h 2009-08-29 22:06:31.000000000 +0200
-+++ dvisvgm-0.8.7/potracelib/potracelib.h 2009-11-13 13:33:12.000000000 +0100
-@@ -126,6 +126,6 @@
-
- /* return a static plain text version string identifying this version
- of potracelib */
--char *potrace_version(void);
-+const char *potrace_version(void);
-
- #endif /* POTRACELIB_H */
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings
deleted file mode 100644
index 63544c87c7e..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings
+++ /dev/null
@@ -1,87 +0,0 @@
- Various casts to avoid compiler warnings.
-
-diff -ur dvisvgm-0.8.7.orig/src/Color.cpp dvisvgm-0.8.7/src/Color.cpp
---- dvisvgm-0.8.7.orig/src/Color.cpp 2009-11-09 17:36:55.000000000 +0100
-+++ dvisvgm-0.8.7/src/Color.cpp 2009-11-13 18:21:01.000000000 +0100
-@@ -32,7 +32,7 @@
-
-
- static inline UInt8 float_to_byte (float v) {
-- return floor(255*v+0.5);
-+ return (UInt8) (floor(255*v+0.5));
- }
-
-
-@@ -101,7 +101,7 @@
- rgb[0] = rgb[1] = rgb[2] = hsb[2];
- else {
- float h = hsb[0]-floor(hsb[0]);
-- int i = 6*h;
-+ int i = (int) (6*h);
- float f = 6*h-i;
- float p = hsb[2]*(1-hsb[1]);
- float q = hsb[2]*(1-hsb[1]*f);
-diff -ur dvisvgm-0.8.7.orig/src/ColorSpecialHandler.cpp dvisvgm-0.8.7/src/ColorSpecialHandler.cpp
---- dvisvgm-0.8.7.orig/src/ColorSpecialHandler.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/ColorSpecialHandler.cpp 2009-11-13 18:21:56.000000000 +0100
-@@ -49,7 +49,7 @@
- rgb[0] = rgb[1] = rgb[2] = hsb[2];
- else {
- float h = hsb[0]-floor(hsb[0]);
-- int i = 6*h;
-+ int i = (int) (6*h);
- float f = 6*h-i;
- float p = hsb[2]*(1-hsb[1]);
- float q = hsb[2]*(1-hsb[1]*f);
-diff -ur dvisvgm-0.8.7.orig/src/FontManager.cpp dvisvgm-0.8.7/src/FontManager.cpp
---- dvisvgm-0.8.7.orig/src/FontManager.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/FontManager.cpp 2009-11-13 18:42:59.000000000 +0100
-@@ -100,7 +100,7 @@
-
- int FontManager::vfFirstFontNum (VirtualFont *vf) const {
- VfFirstFontMap::const_iterator it = _vfFirstFontMap.find(vf);
-- return (it == _vfFirstFontMap.end()) ? -1 : it->second;
-+ return (it == _vfFirstFontMap.end()) ? -1 : (int) it->second;
- }
-
-
-diff -ur dvisvgm-0.8.7.orig/src/PsSpecialHandler.cpp dvisvgm-0.8.7/src/PsSpecialHandler.cpp
---- dvisvgm-0.8.7.orig/src/PsSpecialHandler.cpp 2009-11-09 17:36:55.000000000 +0100
-+++ dvisvgm-0.8.7/src/PsSpecialHandler.cpp 2009-11-13 14:12:39.000000000 +0100
-@@ -558,8 +558,8 @@
- void PsSpecialHandler::setdash (vector<double> &p) {
- _dashpattern.clear();
- for (size_t i=0; i < p.size()-1; i++)
-- _dashpattern.push_back(p[i]*1.00375);
-- _dashoffset = p.back()*1.00375;
-+ _dashpattern.push_back((int) (p[i]*1.00375));
-+ _dashoffset = (int) (p.back()*1.00375);
- }
-
-
-diff -ur dvisvgm-0.8.7.orig/src/PsSpecialHandler.h dvisvgm-0.8.7/src/PsSpecialHandler.h
---- dvisvgm-0.8.7.orig/src/PsSpecialHandler.h 2009-11-09 17:36:55.000000000 +0100
-+++ dvisvgm-0.8.7/src/PsSpecialHandler.h 2009-11-13 14:08:37.000000000 +0100
-@@ -82,8 +82,8 @@
- void setdash (std::vector<double> &p);
- void setgray (std::vector<double> &p);
- void sethsbcolor (std::vector<double> &hsb);
-- void setlinecap (std::vector<double> &p) {_linecap = p[0];}
-- void setlinejoin (std::vector<double> &p) {_linejoin = p[0];}
-+ void setlinecap (std::vector<double> &p) {_linecap = (unsigned int) p[0];}
-+ void setlinejoin (std::vector<double> &p) {_linejoin = (unsigned int) p[0];}
- void setlinewidth (std::vector<double> &p) {_linewidth = p[0] ? p[0]*1.00375 : 0.5;}
- void setmatrix (std::vector<double> &p);
- void setmiterlimit (std::vector<double> &p) {_miterlimit = p[0]*1.00375;}
-diff -ur dvisvgm-0.8.7.orig/src/TpicSpecialHandler.cpp dvisvgm-0.8.7/src/TpicSpecialHandler.cpp
---- dvisvgm-0.8.7.orig/src/TpicSpecialHandler.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/TpicSpecialHandler.cpp 2009-11-13 18:20:12.000000000 +0100
-@@ -172,7 +172,7 @@
- angle1 *= -1;
- angle2 *= -1;
- if (fabs(angle1) > PI2) {
-- int n = angle1/PI2;
-+ int n = (int) (angle1/PI2);
- angle1 = angle1 - n*PI2;
- angle2 = angle2 - n*PI2;
- }
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized
deleted file mode 100644
index 4b69380bc6e..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized
+++ /dev/null
@@ -1,14 +0,0 @@
- Avoid uninitialized variable.
-
-diff -ur dvisvgm-0.8.7.orig/src/InputReader.cpp dvisvgm-0.8.7/src/InputReader.cpp
---- dvisvgm-0.8.7.orig/src/InputReader.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/InputReader.cpp 2009-11-13 18:26:47.000000000 +0100
-@@ -45,7 +45,7 @@
- * @param[in] consume if true, the buffer pointer is moved to the first charater following string s
- * @return true if s was found */
- bool InputReader::skipUntil (const char *s, bool consume) {
-- bool found;
-+ bool found = false;
- while (!eof() && !(found = check(s, consume)))
- get();
- return found;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual
deleted file mode 100644
index 2a24096e311..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual
+++ /dev/null
@@ -1,26 +0,0 @@
- Add virtual destructors to avoid compiler warning.
-
- May actually be required, or just be a warning?
-
-diff -ur dvisvgm-0.8.7.orig/src/CmdLineParserBase.h dvisvgm-0.8.7/src/CmdLineParserBase.h
---- dvisvgm-0.8.7.orig/src/CmdLineParserBase.h 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/CmdLineParserBase.h 2009-11-13 18:55:12.000000000 +0100
-@@ -72,6 +72,7 @@
- protected:
- CmdLineParserBase () : _error(false) {}
- CmdLineParserBase (const CmdLineParserBase &cmd) {}
-+ virtual ~CmdLineParserBase () {}
- virtual void init ();
- virtual void error (const Option &opt, bool longopt, const char *msg) const;
- bool checkArgPrefix (InputReader &ir, const Option &opt, bool longopt) const;
-diff -ur dvisvgm-0.8.7.orig/src/CommandLine.h dvisvgm-0.8.7/src/CommandLine.h
---- dvisvgm-0.8.7.orig/src/CommandLine.h 2009-11-06 22:22:55.000000000 +0100
-+++ dvisvgm-0.8.7/src/CommandLine.h 2009-11-13 18:55:09.000000000 +0100
-@@ -14,6 +14,7 @@
- public:
- CommandLine () {init();}
- CommandLine (int argc, char **argv, bool printErrors) {parse(argc, argv, printErrors);}
-+ virtual ~CommandLine () {}
- void help () const;
- void status () const;
- int numOptions () const {return 22;}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn
deleted file mode 100644
index bef0dbd8862..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn
+++ /dev/null
@@ -1,79 +0,0 @@
- Do not #include <dlfcn.h> when not used (might not exits).
-
- Use defined(DISABLE_GS) instead of DISABLE_GS, to avoid gcc
- preprocessor warning (-Wundef).
-
-diff -ur dvisvgm-0.8.7.orig/src/DVIToSVG.cpp dvisvgm-0.8.7/src/DVIToSVG.cpp
---- dvisvgm-0.8.7.orig/src/DVIToSVG.cpp 2009-11-09 17:36:55.000000000 +0100
-+++ dvisvgm-0.8.7/src/DVIToSVG.cpp 2009-11-18 00:30:05.000000000 +0100
-@@ -18,6 +18,13 @@
- ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
- *************************************************************************/
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
-+#else
-+#define VERSION_STR ""
-+#endif
-+
- #include <cstdlib>
- #include <ctime>
- #include <fstream>
-@@ -50,20 +57,13 @@
- #include "DvisvgmSpecialHandler.h"
- #include "EmSpecialHandler.h"
- //#include "HtmlSpecialHandler.h"
--#if !DISABLE_GS
-+#if !defined(DISABLE_GS)
- #include "PsSpecialHandler.h"
- #endif
- #include "TpicSpecialHandler.h"
- ///////////////////////////////////
-
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
--#else
--#define VERSION_STR ""
--#endif
--
- using namespace std;
-
- // static class variables
-diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.cpp dvisvgm-0.8.7/src/Ghostscript.cpp
---- dvisvgm-0.8.7.orig/src/Ghostscript.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/Ghostscript.cpp 2009-11-18 00:30:50.000000000 +0100
-@@ -19,7 +19,7 @@
- *************************************************************************/
-
- #include "Ghostscript.h"
--#if !DISABLE_GS
-+#if !defined(DISABLE_GS)
-
- #include <cstring>
- #include <sstream>
-diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.h dvisvgm-0.8.7/src/Ghostscript.h
---- dvisvgm-0.8.7.orig/src/Ghostscript.h 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/Ghostscript.h 2009-11-18 00:33:30.000000000 +0100
-@@ -26,7 +26,9 @@
- #endif
-
- #include <string>
--#if HAVE_LIBGS
-+#if defined(DISABLE_GS)
-+ #include "iapi.h"
-+#elif HAVE_LIBGS
- #include <ghostscript/iapi.h>
- #else
- #include "DLLoader.h"
-@@ -37,7 +39,7 @@
- #define _Windows
- #endif
-
--#if DISABLE_GS
-+#if defined(DISABLE_GS)
- struct Ghostscript
- {
- typedef int (GSDLLCALLPTR Stdin) (void *caller, char *buf, int len);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS
deleted file mode 100644
index 5f29442d43c..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS
+++ /dev/null
@@ -1,134 +0,0 @@
- Replace '#if HAVE_LIBGS' by '#if defined(HAVE_LIBGS)'.
-
-diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.cpp dvisvgm-0.8.7/src/Ghostscript.cpp
---- dvisvgm-0.8.7.orig/src/Ghostscript.cpp 2009-11-18 00:30:50.000000000 +0100
-+++ dvisvgm-0.8.7/src/Ghostscript.cpp 2009-11-18 14:28:08.000000000 +0100
-@@ -36,7 +36,7 @@
- /** Loads the Ghostscript library but does not create an instance. This
- * constructor should only be used to call available() and revision(). */
- Ghostscript::Ghostscript ()
--#if !HAVE_LIBGS
-+#if !defined(HAVE_LIBGS)
- : DLLoader(GS_DL_NAME)
- #endif
- {
-@@ -49,7 +49,7 @@
- * @param[in] argv parameters passed to Ghostscript
- * @param[in] caller this parameter is passed to all callback functions */
- Ghostscript::Ghostscript (int argc, const char **argv, void *caller)
--#if !HAVE_LIBGS
-+#if !defined(HAVE_LIBGS)
- : DLLoader(GS_DL_NAME)
- #endif
- {
-@@ -73,7 +73,7 @@
-
- /** Returns true if Ghostscript library was found and can be loaded. */
- bool Ghostscript::available () {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return true;
- #else
- return loaded();
-@@ -85,7 +85,7 @@
- * @param[out] r takes the revision information (see GS API documentation for further details)
- * @return true on success */
- bool Ghostscript::revision (gsapi_revision_t *r) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return (gsapi_revision(r, sizeof(gsapi_revision_t)) == 0);
- #else
- if (PFN_gsapi_revision fn = (PFN_gsapi_revision)loadFunction("gsapi_revision"))
-@@ -111,7 +111,7 @@
- * @param[out] psinst handle of newly created instance (or 0 on error)
- * @param[in] caller pointer forwarded to callback functions */
- int Ghostscript::new_instance (void **psinst, void *caller) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_new_instance(psinst, caller);
- #else
- if (PFN_gsapi_new_instance fn = (PFN_gsapi_new_instance)loadFunction("gsapi_new_instance"))
-@@ -125,7 +125,7 @@
- /** Destroys the current instance of Ghostscript. This method is called by the destructor
- * and should not be used elsewhere. */
- void Ghostscript::delete_instance () {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- gsapi_delete_instance(_inst);
- #else
- if (PFN_gsapi_delete_instance fn = (PFN_gsapi_delete_instance)loadFunction("gsapi_delete_instance"))
-@@ -136,7 +136,7 @@
-
- /** Exits the interpreter. Must be called before destroying the GS instance. */
- int Ghostscript::exit () {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_exit(_inst);
- #else
- if (PFN_gsapi_exit fn = (PFN_gsapi_exit)loadFunction("gsapi_exit"))
-@@ -151,7 +151,7 @@
- * @param[in] out pointer to stdout handler
- * @param[in] err pointer to stderr handler */
- int Ghostscript::set_stdio (Stdin in, Stdout out, Stderr err) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_set_stdio(_inst, in, out, err);
- #else
- if (PFN_gsapi_set_stdio fn = (PFN_gsapi_set_stdio)loadFunction("gsapi_set_stdio"))
-@@ -166,7 +166,7 @@
- * @param[in] argc number of paramters
- * @param[in] argv parameters passed to Ghostscript */
- int Ghostscript::init_with_args (int argc, char **argv) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_init_with_args(_inst, argc, argv);
- #else
- if (PFN_gsapi_init_with_args fn = (PFN_gsapi_init_with_args)loadFunction("gsapi_init_with_args"))
-@@ -178,7 +178,7 @@
-
- /** Tells Ghostscript that several calls of run_string_continue will follow. */
- int Ghostscript::run_string_begin (int user_errors, int *pexit_code) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_run_string_begin(_inst, user_errors, pexit_code);
- #else
- if (PFN_gsapi_run_string_begin fn = (PFN_gsapi_run_string_begin)loadFunction("gsapi_run_string_begin"))
-@@ -197,7 +197,7 @@
- * @param[in] user_errors if non-negative, the default PS error values will be generated, otherwise this value is returned
- * @param[out] pexit_code takes the PS error code */
- int Ghostscript::run_string_continue (const char *str, unsigned length, int user_errors, int *pexit_code) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_run_string_continue(_inst, str, length, user_errors, pexit_code);
- #else
- if (PFN_gsapi_run_string_continue fn = (PFN_gsapi_run_string_continue)loadFunction("gsapi_run_string_continue"))
-@@ -210,7 +210,7 @@
-
- /** Terminates the successive code feeding. Must be called after the last call of run_string_continue. */
- int Ghostscript::run_string_end (int user_errors, int *pexit_code) {
--#if HAVE_LIBGS
-+#if defined(HAVE_LIBGS)
- return gsapi_run_string_end(_inst, user_errors, pexit_code);
- #else
- if (PFN_gsapi_run_string_end fn = (PFN_gsapi_run_string_end)loadFunction("gsapi_run_string_end"))
-diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.h dvisvgm-0.8.7/src/Ghostscript.h
---- dvisvgm-0.8.7.orig/src/Ghostscript.h 2009-11-18 00:33:30.000000000 +0100
-+++ dvisvgm-0.8.7/src/Ghostscript.h 2009-11-18 14:28:02.000000000 +0100
-@@ -28,7 +28,7 @@
- #include <string>
- #if defined(DISABLE_GS)
- #include "iapi.h"
--#elif HAVE_LIBGS
-+#elif defined(HAVE_LIBGS)
- #include <ghostscript/iapi.h>
- #else
- #include "DLLoader.h"
-@@ -62,7 +62,7 @@
-
- /** Wrapper class of (a subset of) the Ghostscript API. */
- class Ghostscript
--#if !HAVE_LIBGS
-+#if !defined(HAVE_LIBGS)
- : public DLLoader
- #endif
- {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members
deleted file mode 100644
index 36ac400e2e2..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur dvisvgm-0.8.7.orig/src/FontCache.cpp dvisvgm-0.8.7/src/FontCache.cpp
---- dvisvgm-0.8.7.orig/src/FontCache.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/FontCache.cpp 2010-06-07 15:36:00.565125189 +0200
-@@ -31,6 +31,7 @@
-
- using namespace std;
-
-+const UInt8 FontCache::VERSION;
-
- static UInt32 read_unsigned (int bytes, istream &is) {
- UInt32 ret = 0;
-diff -ur dvisvgm-0.8.7.orig/src/gzstream.cpp dvisvgm-0.8.7/src/gzstream.cpp
---- dvisvgm-0.8.7.orig/src/gzstream.cpp 2009-08-29 22:06:31.000000000 +0200
-+++ dvisvgm-0.8.7/src/gzstream.cpp 2010-06-07 15:36:00.565125189 +0200
-@@ -34,6 +34,8 @@
- namespace GZSTREAM_NAMESPACE {
- #endif
-
-+const int gzstreambuf::bufferSize;
-+
- // ----------------------------------------------------------------------------
- // Internal classes to implement gzstream. See header file for user classes.
- // ----------------------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd
deleted file mode 100644
index b79619b0d3e..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd
+++ /dev/null
@@ -1,16 +0,0 @@
- <unistd.h> is ubiquitious these days.
- Needed on AIX, tlbuild 28 May 2010 15:08:06.
-
-diff -ur dvisvgm-0.8.7.orig/src/FileSystem.cpp dvisvgm-0.8.7/src/FileSystem.cpp
---- dvisvgm-0.8.7.orig/src/FileSystem.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/FileSystem.cpp 2010-05-31 19:29:13.000000000 +0200
-@@ -23,9 +23,7 @@
- #include <fstream>
- #include "FileSystem.h"
-
--#ifdef __GNUC__
- #include <unistd.h>
--#endif
-
-
- using namespace std;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help
deleted file mode 100644
index d4f33b59751..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur dvisvgm-0.8.7.orig/src/dvisvgm.cpp dvisvgm-0.8.7/src/dvisvgm.cpp
---- dvisvgm-0.8.7.orig/src/dvisvgm.cpp 2009-11-09 17:36:55.000000000 +0100
-+++ dvisvgm-0.8.7/src/dvisvgm.cpp 2009-11-13 14:49:31.000000000 +0100
-@@ -73,7 +73,7 @@
- static void show_help (const CommandLine &cmd) {
- cout << PACKAGE_STRING "\n\n";
- cmd.help();
-- cout << "\nCopyright (C) 2005-2009 Martin Gieseking" EMAIL "\n\n";
-+ cout << "\nCopyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> \n\n";
- }
-
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime
deleted file mode 100644
index 891117407da..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime
+++ /dev/null
@@ -1,58 +0,0 @@
- Use gettimeofday(), ftime(), or time(), as available.
-
-diff -ur dvisvgm-0.8.7.orig/configure.ac dvisvgm-0.8.7/configure.ac
---- dvisvgm-0.8.7.orig/configure.ac 2009-11-09 18:17:17.000000000 +0100
-+++ dvisvgm-0.8.7/configure.ac 2009-12-14 14:23:12.000000000 +0100
-@@ -22,6 +22,9 @@
- AC_PROG_RANLIB
- AC_LANG(C)
-
-+AC_CHECK_FUNCS([ftime gettimeofday])
-+AC_CHECK_HEADERS([sys/time.h sys/timeb.h])
-+
- # Check whether MikTeX import libraries should be linked
- case $host in
- *-mingw32* | *-windows*)
-diff -ur dvisvgm-0.8.7.orig/src/dvisvgm.cpp dvisvgm-0.8.7/src/dvisvgm.cpp
---- dvisvgm-0.8.7.orig/src/dvisvgm.cpp 2009-11-13 14:49:31.000000000 +0100
-+++ dvisvgm-0.8.7/src/dvisvgm.cpp 2009-12-14 14:37:35.000000000 +0100
-@@ -23,7 +23,6 @@
- #include <iostream>
- #include <sstream>
- #include <string>
--#include <sys/timeb.h>
- #include <time.h>
- #include "gzstream.h"
- #include "CommandLine.h"
-@@ -46,6 +45,12 @@
- #define EMAIL "Martin Gieseking <martin.gieseking@uos.de>"
- #endif
-
-+#if defined (HAVE_SYS_TIME_H)
-+#include <sys/time.h>
-+#elif defined (HAVE_SYS_TIMEB_H)
-+#include <sys/timeb.h>
-+#endif
-+
- using namespace std;
-
-
-@@ -106,9 +111,18 @@
-
- /** Returns timestamp (wall time) in seconds. */
- static double get_time () {
-+#if defined (HAVE_SYS_TIME_H)
-+ struct timeval tv;
-+ gettimeofday(&tv, NULL);
-+ return tv.tv_sec + tv.tv_usec/1000000.0;
-+#elif defined (HAVE_SYS_TIMEB_H)
- struct timeb tb;
- ftime(&tb);
- return tb.time + tb.millitm/1000.0;
-+#else
-+ time_t myclock = time((time_t*)NULL);
-+ return myclock;
-+#endif
- }
-
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.cpp
deleted file mode 100644
index 54875d928a5..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************
-** CharmapTranslator.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 <fstream>
-#include "CharmapTranslator.h"
-#include "Font.h"
-#include "FontEngine.h"
-#include "FileFinder.h"
-#include "macros.h"
-
-using namespace std;
-
-/** Returns true if 'unicode' is a valid unicode value in XML documents.
- * XML version 1.0 doesn't allow various unicode character references
- * (&#1; for example). */
-static bool valid_unicode (UInt32 unicode) {
- UInt32 ranges[] = {
- 0x0000, 0x0020,
- 0x007f, 0x0084,
- 0x0086, 0x009f,
- 0xfdd0, 0xfddf
- };
- for (int i=0; i < 4; i++)
- if (unicode >= ranges[2*i] && unicode <= ranges[2*i+1])
- return false;
- return true;
-}
-
-
-CharmapTranslator::CharmapTranslator (const Font *font) {
- setFont(font);
-}
-
-
-CharmapTranslator::CharmapTranslator (const FontEngine &fe) {
- fe.buildTranslationMap(translationMap);
-}
-
-
-void CharmapTranslator::setFont (const Font *font) {
- translationMap.clear();
-
- const PhysicalFont *pf = dynamic_cast<const PhysicalFont*>(font);
- if (pf && pf->type() != PhysicalFont::MF) {
- const char *path = font->path();
- FontEngine fe;
- if (fe.setFont(path))
- fe.buildTranslationMap(translationMap);
- }
-}
-
-
-UInt32 CharmapTranslator::unicode (UInt32 customCode) const {
- ConstIterator it = translationMap.find(customCode);
- if (it != translationMap.end())
- return it->second;
-
- // No unicode equivalent found in font file.
- // Now we should look for a smart alternative but at the moment
- // it's sufficient to simply choose a valid unused unicode value...
- map<UInt32,UInt32> reverseMap;
- FORALL(translationMap, ConstIterator, i)
- reverseMap[i->second] = i->first;
- // can we use charcode itself as unicode replacement?
- if (valid_unicode(customCode) && (reverseMap.empty() || reverseMap.find(customCode) != reverseMap.end()))
- return customCode;
- // @@ this should be optimized :-)
- return 0x3400+customCode;
-}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.cpp
deleted file mode 100644
index a36725aa4be..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*************************************************************************
-** Font.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include "Font.h"
-#include "FileFinder.h"
-#include "Message.h"
-#include "TFM.h"
-#include "VFReader.h"
-#include "macros.h"
-
-using namespace std;
-
-
-TFMFont::TFMFont (string name, UInt32 cs, double ds, double ss)
- : tfm(0), fontname(name), checksum(cs), dsize(ds), ssize(ss)
-{
-}
-
-
-TFMFont::~TFMFont () {
- delete tfm;
-}
-
-
-const TFM* TFMFont::getTFM () const {
- if (!tfm) {
- tfm = TFM::createFromFile(fontname.c_str());
- if (!tfm)
- throw FontException("can't find "+fontname+".tfm");
- }
- return tfm;
-}
-
-
-double TFMFont::charWidth (int c) const {return getTFM()->getCharWidth(c);}
-double TFMFont::charDepth (int c) const {return getTFM()->getCharDepth(c);}
-double TFMFont::charHeight (int c) const {return getTFM()->getCharHeight(c);}
-double TFMFont::italicCorr (int c) const {return getTFM()->getItalicCorr(c);}
-
-//////////////////////////////////////////////////////////////////////////////
-
-Font* PhysicalFont::create (string name, UInt32 checksum, double dsize, double ssize, PhysicalFont::Type type) {
- return new PhysicalFontImpl(name, checksum, dsize, ssize, type);
-}
-
-
-Font* VirtualFont::create (string name, UInt32 checksum, double dsize, double ssize) {
- return new VirtualFontImpl(name, checksum, dsize, ssize);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-PhysicalFontImpl::PhysicalFontImpl (string name, UInt32 cs, double ds, double ss, PhysicalFont::Type type)
- : TFMFont(name, cs, ds, ss), filetype(type)
-{
-}
-
-
-const char* PhysicalFontImpl::path () const {
- string ext;
- switch (filetype) {
- case PFB: ext = "pfb"; break;
- case TTF: ext = "ttf"; break;
- case MF : ext = "mf"; break;
- }
- return FileFinder::lookup(name()+"."+ext);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-
-VirtualFontImpl::VirtualFontImpl (string name, UInt32 cs, double ds, double ss)
- : TFMFont(name, cs, ds, ss)
-{
-}
-
-
-VirtualFontImpl::~VirtualFontImpl () {
- // delete dvi vectors received by VFReaderAction
- for (map<UInt32, DVIVector*>::iterator i=charDefs.begin(); i != charDefs.end(); ++i)
- delete i->second;
-}
-
-
-const char* VirtualFontImpl::path () const {
- return FileFinder::lookup(name()+".vf");
-}
-
-
-void VirtualFontImpl::assignChar (UInt32 c, DVIVector *dvi) {
- if (dvi) {
- if (charDefs.find(c) == charDefs.end())
- charDefs[c] = dvi;
- else
- delete dvi;
- }
-}
-
-
-const vector<UInt8>* VirtualFontImpl::getDVI (int c) const {
- map<UInt32,DVIVector*>::const_iterator it = charDefs.find(c);
- return (it == charDefs.end() ? 0 : it->second);
-}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.cpp
deleted file mode 100644
index 882fb5a0292..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*************************************************************************
-** FontGlyph.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 "FontEncoding.h"
-#include "FontEngine.h"
-#include "FontGlyph.h"
-#include "Message.h"
-#include "Pair.h"
-#include "macros.h"
-
-using namespace std;
-
-GlyphCommand::GlyphCommand (const LPair &p) : _params(1) {
- _params[0] = p;
-}
-
-
-GlyphCommand::GlyphCommand (const LPair &p1, const LPair &p2) : _params(2) {
- _params[0] = p1;
- _params[1] = p2;
-}
-
-
-GlyphCommand::GlyphCommand (const LPair &p1, const LPair &p2, const LPair &p3) : _params(3) {
- _params[0] = p1;
- _params[1] = p2;
- _params[2] = p3;
-}
-
-
-LPair GlyphCommand::param (int n) const {
- if (n < 0)
- n = _params.size() + n;
- if (n >= 0 && size_t(n) < _params.size())
- return _params[n];
- return LPair();
-}
-
-
-void GlyphCommand::writeSVGCommand (ostream &os, double sx, double sy) const {
- os << getSVGPathCommand();
- FORALL(_params, ConstIterator, i) {
- if (i != _params.begin())
- os << ' ';
- os << (i->x()*sx) << ' ' << (i->y()*sy);
- }
-}
-
-
-GlyphCommand* GlyphMoveTo::combine (GlyphCommand &cmd) {
- if (cmd.getSVGPathCommand() == 'M' && _params.size() == 1)
- return &cmd;
- if (cmd.getSVGPathCommand() == 'L') {
- _params.insert(_params.end(), cmd.params().begin(), cmd.params().end());
- return this;
- }
- return 0;
-}
-
-
-GlyphCommand* GlyphLineTo::combine (GlyphCommand &cmd) {
- if (cmd.getSVGPathCommand() == getSVGPathCommand()) {
- _params.insert(_params.end(), cmd.params().begin(), cmd.params().end());
- return this;
- }
- return 0;
-}
-
-
-void GlyphHorizontalLineTo::writeSVGCommand (ostream &os, double sx, double sy) const {
- os << getSVGPathCommand() << _params[0].x()*sx;
-}
-
-
-void GlyphVerticalLineTo::writeSVGCommand (ostream &os, double sx, double sy) const {
- os << getSVGPathCommand() << _params[0].y()*sy;
-}
-
-
-GlyphCommand* GlyphCubicTo::combine (GlyphCommand &cmd) {
-/* if (cmd.getSVGPathCommand() == 'C' && cmd.getParams().size() == 3) {
- LPair c1 = getParam(-2);
- LPair e1 = getParam(-1);
- LPair b2 = cmd.getParam(0);
- LPair c2 = cmd.getParam(1);
- if (e1 == b2 && c2 == e1*2-c1)
- return new GlyphShortCubicTo(cmd.getParam(-2), cmd.getParam(-1));
- else {
- _params.insert(_params.end(), cmd.getParams().begin(), cmd.getParams().end());
- return this;
- }
- }*/
- return 0;
-}
-
-
-///////////////////////////
-
-
-class Commands : public FEGlyphCommands {
- public:
- Commands (Glyph &g) : glyph(g) {}
-
- void moveTo(long x, long y) {
- glyph.addCommand(new GlyphMoveTo(LPair(x, y)));
- }
-
- void lineTo(long x, long y) {
- glyph.addCommand(new GlyphLineTo(LPair(x, y)));
- }
-
- void conicTo(long x1, long y1, long x2, long y2) {
- glyph.addCommand(new GlyphConicTo(LPair(x1, y1), LPair(x2, y2)));
- }
-
- void cubicTo(long x1, long y1, long x2, long y2, long x3, long y3) {
- glyph.addCommand(new GlyphCubicTo(LPair(x1, y1), LPair(x2, y2), LPair(x3, y3)));
- }
-
- private:
- Glyph &glyph;
-};
-
-
-Glyph::~Glyph () {
- clear();
-}
-
-
-/** Removes all path commands from the glyph and frees the allocated objects. */
-void Glyph::clear () {
- FORALL(_commands, Iterator, i)
- delete *i;
- _commands.clear();
-}
-
-
-/** Appends a new path command to the current glyph.
- * @param[in] cmd command to append */
-void Glyph::addCommand (GlyphCommand *cmd) {
- if (cmd)
- _commands.push_back(cmd);
-}
-
-
-void Glyph::read (unsigned char c, const FontEncoding *encoding, const FontEngine &fontEngine) {
- Commands _commands(*this);
- if (encoding) {
- if (const char *name = encoding->getEntry(c))
- fontEngine.traceOutline(name, _commands, false);
- else
- Message::wstream(true) << "no encoding for char #" << int(c) << " in '" << encoding->name() << "'\n";
- }
- else
- fontEngine.traceOutline(c, _commands, false);
-}
-
-
-/** Writes an SVG representation of the path commands to a stream. The parameters
- * can be scaled by the given factors.
- * @param[in] os output stream
- * @param[in] sx horizontal scale factor
- * @param[in] sy vertical scale factor */
-void Glyph::writeSVGCommands (ostream &os, double sx, double sy) const {
- FORALL (_commands, ConstIterator, i)
- (*i)->writeSVGCommand(os, sx, sy);
-}
-
-
-/** Calls a function for all path sections/commands.
- * @param[in] f function to be called
- * @param[in] userParam parameter passed to function f */
-void Glyph::forAllCommands (void (*f)(GlyphCommand*, void*), void *userParam) {
- FORALL(_commands, Iterator, i)
- f(*i, userParam);
-}
-
-
-/** Detects all open paths of the glyph's outline and closes them by adding a closePath command.
- * Most font formats only support closed outline paths so there are no explicit closePath statements
- * in the glyph's outline description. All open paths are automatically closed by the renderer.
- * This method detects all open paths and adds the missing closePath statement. */
-void Glyph::closeOpenPaths () {
- GlyphCommand *prevCommand = 0;
- FORALL(_commands, Iterator, i) {
- if ((*i)->getSVGPathCommand() == 'M' && prevCommand && prevCommand->getSVGPathCommand() != 'Z') {
- prevCommand = *i;
- _commands.insert(i, new GlyphClosePath);
- ++i; // skip inserted closePath command in next iteration step
- }
- else
- prevCommand = *i;
- }
- if (!_commands.empty())
- _commands.push_back(new GlyphClosePath);
-}
-
-
-/** Optimizes the glyph's outline description by using command sequences with less parameters.
- * TrueType and Type1 fonts only support 3 drawing commands (moveto, lineto, conicto/cubicto).
- * In the case of successive bezier curve sequences, control points or tangent slopes are often
- * identical so that the path description contains redundant information. SVG provides shorthand
- * curve commands that need less parameters because they reuse previously given arguments.
- * This method detects such command sequences and replaces them by their short form. It does not
- * recompute the whole paths to reduce the number of necessary line/curve segments. */
-void Glyph::optimizeCommands () {
- LPair fp; // first point of current path
- LPair cp; // current point (where path drawing continues)
- ConstIterator prev; // preceding command
- LPair pstore[2];
- FORALL(_commands, Iterator, it) {
- char cmd = (*it)->getSVGPathCommand();
- const vector<LPair> &params = (*it)->params();
- GlyphCommand *new_command = 0;
- switch (cmd) {
- case 'M':
- fp = params[0]; // record first point of path
- break;
- case 'Z':
- cp = fp;
- break;
- case 'L':
- if (params[0].x() == cp.x())
- new_command = new GlyphVerticalLineTo(params[0]);
- else if (params[0].y() == cp.y())
- new_command = new GlyphHorizontalLineTo(params[0]);
- break;
- case 'C':
- if ((*prev)->getSVGPathCommand() == 'C' || (*prev)->getSVGPathCommand() == 'S') {
- if (params[0] == pstore[1]*2-pstore[0]) // is first control point reflection of preceding second control point?
- new_command = new GlyphShortCubicTo(params[1], params[2]);
- }
- pstore[0] = params[1]; // store second control point and
- pstore[1] = params[2]; // curve endpoint
- break;
- case 'Q':
- if ((*prev)->getSVGPathCommand() == 'Q' || (*prev)->getSVGPathCommand() == 'T') {
- if (params[0] == pstore[1]*2-pstore[0])
- new_command = new GlyphShortConicTo(params[1]);
- }
- // [pass through]
- case 'S':
- case 'T':
- pstore[0] = params[0]; // store (second) control point and
- pstore[1] = params[1]; // curve endpoint
- break;
- }
- // update current point
- if (!(*it)->params().empty())
- cp = (*it)->param(-1);
-
- // replace current command by shorthand form
- if (new_command) {
- delete *it;
- *it = new_command;
- new_command = 0;
- }
- prev = it;
- }
-}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.h b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.h
deleted file mode 100644
index 44a6b65553b..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontGlyph.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************
-** FontGlyph.h **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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/>. **
-*************************************************************************/
-
-#ifndef FONTGLYPH_H
-#define FONTGLYPH_H
-
-#include <ostream>
-#include <list>
-#include <vector>
-#include "Pair.h"
-
-using std::ostream;
-using std::list;
-using std::vector;
-
-class GlyphCommand
-{
- public:
- GlyphCommand () {}
- GlyphCommand (const LPair &p);
- GlyphCommand (const LPair &p1, const LPair &p2);
- GlyphCommand (const LPair &p1, const LPair &p2, const LPair &p3);
- virtual ~GlyphCommand () {}
- virtual char getSVGPathCommand () const =0;
- virtual GlyphCommand* combine (GlyphCommand &cmd) {return 0;}
- virtual const vector<LPair>& params () const {return _params;}
- virtual LPair param (int n) const;
- virtual void writeSVGCommand (ostream &os, double sx=1, double sy=1) const;
-
- protected:
- typedef vector<LPair>::iterator Iterator;
- typedef vector<LPair>::const_iterator ConstIterator;
- vector<LPair> _params;
-};
-
-
-struct GlyphMoveTo : public GlyphCommand
-{
- GlyphMoveTo (const LPair &p) : GlyphCommand(p) {}
- char getSVGPathCommand () const {return 'M';}
- GlyphCommand* combine (GlyphCommand &cmd);
-};
-
-
-struct GlyphLineTo : public GlyphCommand
-{
- GlyphLineTo (const LPair &p) : GlyphCommand(p) {}
- char getSVGPathCommand () const {return 'L';}
- GlyphCommand* combine (GlyphCommand &cmd);
-};
-
-
-struct GlyphHorizontalLineTo : public GlyphLineTo
-{
- GlyphHorizontalLineTo (const LPair &p) : GlyphLineTo(LPair(p.x(), 0)) {}
- char getSVGPathCommand () const {return 'H';}
- void writeSVGCommand (ostream &os, double sx=1, double sy=1) const;
-};
-
-
-struct GlyphVerticalLineTo : public GlyphLineTo
-{
- GlyphVerticalLineTo (const LPair &p) : GlyphLineTo(LPair(0, p.y())) {}
- char getSVGPathCommand () const {return 'V';}
- void writeSVGCommand (ostream &os, double sx=1, double sy=1) const;
-};
-
-
-struct GlyphConicTo : public GlyphCommand
-{
- GlyphConicTo (const LPair &p1, const LPair &p2) : GlyphCommand(p1, p2) {}
- char getSVGPathCommand () const {return 'Q';}
-};
-
-
-struct GlyphShortConicTo : public GlyphCommand
-{
- GlyphShortConicTo (const LPair &p) : GlyphCommand(p) {}
- char getSVGPathCommand () const {return 'T';}
-};
-
-
-struct GlyphCubicTo : public GlyphCommand
-{
- GlyphCubicTo (const LPair &p1, const LPair &p2, const LPair &p3) : GlyphCommand(p1, p2, p3) {}
- char getSVGPathCommand () const {return 'C';}
- GlyphCommand* combine (GlyphCommand &cmd);
-};
-
-
-struct GlyphShortCubicTo : public GlyphCommand
-{
- GlyphShortCubicTo (const LPair &p1, const LPair &p2) : GlyphCommand(p1, p2) {}
- char getSVGPathCommand () const {return 'S';}
-};
-
-
-struct GlyphClosePath : public GlyphCommand
-{
- char getSVGPathCommand () const {return 'Z';}
-};
-
-
-class FontEncoding;
-class FontEngine;
-
-class Glyph
-{
- typedef list<GlyphCommand*> CommandList;
- typedef CommandList::iterator Iterator;
- typedef CommandList::const_iterator ConstIterator;
- public:
- ~Glyph ();
- void addCommand(GlyphCommand *cmd);
- void clear ();
- void closeOpenPaths ();
- void optimizeCommands ();
- void read (unsigned char c, const FontEncoding *encoding, const FontEngine &fontEngine);
- void writeSVGCommands (ostream &os, double sx, double sy) const;
- void forAllCommands (void (*f)(GlyphCommand*, void*), void *userParam=0);
- bool empty () const {return _commands.empty();}
- const CommandList& commands () const {return _commands;}
-
- private:
- CommandList _commands;
-};
-
-#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.am
deleted file mode 100644
index a86c5611b28..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-## This file is part of dvisvgm
-## Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
-##
-## Process this file with automake.
-
-bin_PROGRAMS = dvisvgm
-noinst_LIBRARIES = libdvisvgm.a
-
-dvisvgm_SOURCES = gzstream.h StreamCounter.h \
- dvisvgm.cpp gzstream.cpp
-
-dvisvgm_LDADD = $(noinst_LIBRARIES) @EXTRA_LIBS@
-dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
-
-libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CharmapTranslator.h CmdLineParserBase.h Color.h \
- ColorSpecialHandler.h CommandLine.h Directory.h DLLoader.h DVIActions.h DVIReader.h DvisvgmSpecialHandler.h DVIToSVG.h \
- DVIToSVGActions.h EmSpecialHandler.h FileFinder.h FileSystem.h Font.h FontCache.h FontEmitter.h FontEncoding.h FontEngine.h \
- FontGlyph.h FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h GraphicPath.h InputBuffer.h InputReader.h \
- Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h \
- SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h SVGFontEmitter.h SVGFontTraceEmitter.h SVGTree.h \
- TpicSpecialHandler.h TFM.h types.h VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h XMLDocument.h XMLNode.h XMLString.h \
- BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CharmapTranslator.cpp CmdLineParserBase.cpp Color.cpp \
- ColorSpecialHandler.cpp CommandLine.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp DvisvgmSpecialHandler.cpp \
- DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FileSystem.cpp Font.cpp FontCache.cpp FontEncoding.cpp \
- FontEngine.cpp FontGlyph.cpp FontManager.cpp FontMap.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp \
- InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp PageSize.cpp PSInterpreter.cpp \
- PsSpecialHandler.cpp SpecialManager.cpp StreamReader.cpp SVGFontEmitter.cpp SVGFontTraceEmitter.cpp SVGTree.cpp TFM.cpp \
- TpicSpecialHandler.cpp VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
-
-EXTRA_DIST = options.xml psdefs.psc iapi.h ierrors.h
-
-AM_CXXFLAGS = -Wall
-
-# the commandline parser is generated from options.xml by opt2cpp
-CommandLine.cpp: options.xml
- if test -f opt2cpp.xsl; then \
- rm -f $@ $*.h; \
- xsltproc opt2cpp.xsl $<; \
- fi
-
-# The required MikTeX functions are declared in .def files that reference a DLL.
-# It's necessary to create import libraries from these .def files. dlltool helps us
-# to do that.
-.def.a:
- dlltool -d $< -l $@ -U
-
-
-# Create a C string definition containing the PostScript routines psdefs.ps needed by class PSInterpreter
-psdefs.psc: psdefs.ps
- if test -f $<; then \
- ps2c PSInterpreter::PSDEFS $< >$@; \
- fi
-
-psdefs.ps: ;
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.cpp
deleted file mode 100644
index 5a4e0b05526..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
-** Message.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 <cstdarg>
-#include <iostream>
-#include "Message.h"
-
-using namespace std;
-
-
-struct NullStreamBuf : public streambuf
-{
- streambuf::int_type overflow (int c) {return 0;}
- streambuf::int_type underflow () {return traits_type::eof();}
- int sync () {return traits_type::eof();}
-};
-
-
-struct NullStream : public ostream
-{
- NullStream () : ostream(new NullStreamBuf) {}
- ~NullStream () {delete rdbuf();}
-};
-
-
-static NullStream nullStream;
-
-// maximal verbosity
-int Message::level = Message::MESSAGES | Message::WARNINGS | Message::ERRORS;
-
-
-/** Returns the stream for usual messages. */
-ostream& Message::mstream (bool prefix) {
- ostream *os = (level & MESSAGES) ? &cerr : &nullStream;
- if (prefix)
- *os << "MESSAGE: ";
- return *os;
-}
-
-
-/** Returns the stream for warning messages. */
-ostream& Message::wstream (bool prefix) {
- ostream *os = (level & WARNINGS) ? &cerr : &nullStream;
- if (prefix)
- *os << "WARNING: ";
- return *os;
-}
-
-
-/** Returns the stream for error messages. */
-ostream& Message::estream (bool prefix) {
- ostream *os = (level & ERRORS) ? &cerr : &nullStream;
- if (prefix)
- *os << "ERROR: ";
- return *os;
-}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.cpp
deleted file mode 100644
index 88bae2b3813..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*************************************************************************
-** SVGFontEmitter.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 <sstream>
-#include "macros.h"
-#include "CharmapTranslator.h"
-#include "Font.h"
-#include "FontEncoding.h"
-#include "FontEngine.h"
-#include "FontManager.h"
-#include "FontGlyph.h"
-#include "SVGFontEmitter.h"
-#include "SVGTree.h"
-#include "XMLNode.h"
-#include "XMLString.h"
-
-using namespace std;
-
-
-SVGFontEmitter::SVGFontEmitter (const Font *font, const FontManager &fm, const CharmapTranslator &cmt, SVGTree &svg, bool uf)
- : _fontManager(fm), _charmapTranslator(cmt), _svg(svg), _useFonts(uf)
-{
- _font = font;
- _fontEngine.setFont(font->path());
-}
-
-
-
-int SVGFontEmitter::emitFont (const char *id) {
- return emitFont(0, id);
-}
-
-
-int SVGFontEmitter::emitFont (const set<int> &usedChars, const char *id) {
- return emitFont(&usedChars, id);
-}
-
-
-int SVGFontEmitter::emitFont (const set<int> *usedChars, const char *id) {
- if (!usedChars || usedChars->empty())
- return 0;
-
- XMLElementNode *fontNode=0;
- if (_useFonts) {
- fontNode = new XMLElementNode("font");
- if (id && strlen(id) > 0)
- fontNode->addAttribute("id", id);
- fontNode->addAttribute("horiz-adv", XMLString(_fontEngine.getHAdvance()));
- _svg.appendToDefs(fontNode);
-
- XMLElementNode *faceNode = new XMLElementNode("font-face");
- faceNode->addAttribute("font-family", (id && strlen(id) > 0) ? id : _fontEngine.getFamilyName());
- faceNode->addAttribute("units-per-em", XMLString(_fontEngine.getUnitsPerEM()));
- faceNode->addAttribute("ascent", XMLString(_fontEngine.getAscender()));
- faceNode->addAttribute("descent", XMLString(_fontEngine.getDescender()));
- fontNode->append(faceNode);
- FORALL(*usedChars, set<int>::const_iterator, i) {
- emitGlyph(*i); // create new glyphNode
- fontNode->append(_glyphNode);
- }
- }
- else {
- FORALL(*usedChars, set<int>::const_iterator, i) {
- emitGlyph(*i); // create new glyphNode
- _svg.appendToDefs(_glyphNode);
- }
- }
- return usedChars->size();
-}
-
-
-bool SVGFontEmitter::emitGlyph (int c) {
- double sx=1.0, sy=1.0;
- FontEncoding *encoding = _fontManager.encoding(_font);
- if (_useFonts) {
- _glyphNode = new XMLElementNode("glyph");
- _glyphNode->addAttribute("unicode", XMLString(_charmapTranslator.unicode(c), false));
- int advance;
- string name;
- if (encoding && encoding->getEntry(c)) {
- advance = _fontEngine.getHAdvance(encoding->getEntry(c));
- name = encoding->getEntry(c);
- }
- else {
- advance = _fontEngine.getHAdvance(c);
- name = _fontEngine.getGlyphName(c);
- }
- _glyphNode->addAttribute("horiz-adv-x", XMLString(advance));
- _glyphNode->addAttribute("glyph-name", name);
- }
- else {
- ostringstream oss;
- oss << 'g' << _fontManager.fontID(_font) << c;
- _glyphNode = new XMLElementNode("path");
- _glyphNode->addAttribute("id" , oss.str());
- sx = double(_font->scaledSize())/_fontEngine.getUnitsPerEM();
- sy = -sx;
- }
- ostringstream path;
- Glyph glyph;
- glyph.read(c, encoding, _fontEngine);
- glyph.closeOpenPaths();
- glyph.optimizeCommands();
- glyph.writeSVGCommands(path, sx, sy);
- _glyphNode->addAttribute("d", path.str());
- return true;
-}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.cpp
deleted file mode 100644
index e7da9986581..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*************************************************************************
-** SVGFontTraceEmitter.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 <cstring>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include "Font.h"
-#include "FontCache.h"
-#include "FontManager.h"
-#include "GFGlyphTracer.h"
-#include "macros.h"
-#include "Message.h"
-#include "MetafontWrapper.h"
-#include "SVGFontTraceEmitter.h"
-#include "SVGTree.h"
-#include "TFM.h"
-#include "XMLNode.h"
-#include "XMLString.h"
-
-using namespace std;
-
-const char *SVGFontTraceEmitter::CACHE_PATH = 0;
-bool SVGFontTraceEmitter::TRACE_ALL = false;
-double SVGFontTraceEmitter::METAFONT_MAG = 4;
-
-
-SVGFontTraceEmitter::SVGFontTraceEmitter (const Font *f, const FontManager &fm, const CharmapTranslator &cmt, SVGTree &svg, bool uf)
- : _gfTracer(0), _in(0), _font(f), _fontManager(fm), _cache(0),
- _charmapTranslator(cmt), _svg(svg), _glyphNode(0), _useFonts(uf)
-{
- if (CACHE_PATH && _font) {
- _cache = new FontCache;
- if (TRACE_ALL && prepareTracer()) {
- traceAllGlyphs();
- _cache->write(_font->name().c_str(), CACHE_PATH);
- }
- else
- _cache->read(_font->name().c_str(), CACHE_PATH);
- }
-}
-
-
-SVGFontTraceEmitter::~SVGFontTraceEmitter () {
- delete _gfTracer;
- delete _in;
- if (_cache && _font)
- _cache->write(_font->name().c_str(), CACHE_PATH);
- delete _cache;
- MetafontWrapper::removeOutputFiles(_font->name());
-}
-
-
-/** Creates the tracer object and calls Metafont to generate a GF file of the current font.
- * @return true if GF file tracer were successfully created */
-bool SVGFontTraceEmitter::prepareTracer () {
- if (!_gfTracer) {
- MetafontWrapper mf(_font->name());
- mf.make("ljfour", METAFONT_MAG); // call Metafont if necessary
- if (mf.success() && _font->getTFM()) {
- _in = new ifstream((_font->name()+".gf").c_str(), ios_base::binary);
- _gfTracer = new GFGlyphTracer(*_in, 1000.0/_font->getTFM()->getDesignSize()); // 1000 units per em
- Message::mstream() << "tracing glyphs of " << _font->name() << endl;
- }
- else {
- Message::wstream(true) << "unable to find " << _font->name() << ".mf, can't embed font\n";
- return false; // Metafont failed
- }
- }
- return true;
-}
-
-
-int SVGFontTraceEmitter::emitFont (const char *id) {
- // @@ not needed at the moment
- return 0;
-}
-
-
-/** Appends a new font element of the current font to the SVG document.
- * @param[in] usedChars characters to be embedded
- * @param[in] id unique font identifier (usually the font name)
- * @return number of embedded glyphs */
-int SVGFontTraceEmitter::emitFont (const set<int> &usedChars, const char *id) {
- return emitFont(&usedChars, id);
-}
-
-
-/** Appends a new font element of the current font to the SVG document.
- * @param[in] usedChars characters to be embedded
- * @param[in] id unique font identifier (usually the font name)
- * @return number of embedded glyphs */
-int SVGFontTraceEmitter::emitFont (const set<int> *usedChars, const char *id) {
- if (!usedChars || usedChars->empty())
- return 0;
-
- XMLElementNode *fontNode=0;
- if (_useFonts) {
- fontNode = new XMLElementNode("font");
- if (id && strlen(id) > 0)
- fontNode->addAttribute("id", id);
- _svg.appendToDefs(fontNode);
-
- XMLElementNode *faceNode = new XMLElementNode("font-face");
- faceNode->addAttribute("font-family", id);
- faceNode->addAttribute("units-per-em", XMLString(1000));
- fontNode->append(faceNode);
- FORALL(*usedChars, set<int>::const_iterator, i) {
- emitGlyph(*i); // create new glyphNode
- fontNode->append(_glyphNode);
- }
- }
- else {
- FORALL(*usedChars, set<int>::const_iterator, i) {
- emitGlyph(*i); // create new glyphNode
- _svg.appendToDefs(_glyphNode);
- }
- }
-
- if (_gfTracer)
- Message::mstream() << endl;
- return usedChars->size();
-}
-
-
-static inline void write_char_info (int c, ostream &os) {
- os << '[';
- if (isprint(c))
- os << char(c);
- else
- os << '#' << c;
-}
-
-
-/** Creates the SVG definition of a single glyph.
- * @param[in] c character code of the glyph
- * @param[in] duplicate true if the glyph is already included in different size */
-bool SVGFontTraceEmitter::emitGlyph (int c) {
- const TFM *tfm = _font->getTFM();
- if (!tfm)
- return false;
-
- bool write_info=false;
- const Glyph *glyph = _cache ? _cache->getGlyph(c) : 0;
- if (!glyph && prepareTracer()) {
- write_char_info(c, Message::wstream());
- _gfTracer->executeChar(c);
- glyph = &_gfTracer->getGlyph();
- if (_cache)
- _cache->setGlyph(c, _gfTracer->transferGlyph());
- write_info = true;
- }
-
- ostringstream path;
- double sx=1.0, sy=1.0;
- if (_useFonts) {
- _glyphNode = new XMLElementNode("glyph");
- _glyphNode->addAttribute("unicode", XMLString(_charmapTranslator.unicode(c), false));
- _glyphNode->addAttribute("horiz-adv-x", XMLString(1000.0*tfm->getCharWidth(c)/tfm->getDesignSize()));
- }
- else {
- ostringstream oss;
- oss << 'g' << _fontManager.fontID(_font) << c;
- _glyphNode = new XMLElementNode("path");
- _glyphNode->addAttribute("id", oss.str());
- sx = _font->scaledSize()/1000.0; // 1000 units per em
- sy = -sx;
- }
- glyph->writeSVGCommands(path, sx, sy);
- _glyphNode->addAttribute("d", path.str());
- if (write_info)
- Message::mstream() << ']';
- return true;
-}
-
-
-/** Traces all glyphs of the current font and stores them in the cache.
- * If caching is disabled nothing happens. */
-void SVGFontTraceEmitter::traceAllGlyphs () {
- const TFM *tfm = _font->getTFM();
- if (tfm && _cache && prepareTracer()) {
- int fchar = tfm->firstChar();
- int lchar = tfm->lastChar();
- for (int i=fchar; i <= lchar; i++) {
- if (!_cache->getGlyph(i)) {
- write_char_info(i, Message::wstream());
- if (_gfTracer->executeChar(i)) // does char i exist in font?
- _cache->setGlyph(i, _gfTracer->transferGlyph());
- else
- Message::wstream() << "(empty)";
- Message::wstream() << ']';
- }
- }
- }
-}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.h b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.h
deleted file mode 100644
index 347d0d32f00..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontTraceEmitter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************
-** SVGFontTraceEmitter.h **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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/>. **
-*************************************************************************/
-
-#ifndef SVGFONTTRACEREMITTER_H
-#define SVGFONTTRACEREMITTER_H
-
-#include <istream>
-#include <set>
-#include "CharmapTranslator.h"
-#include "FontEmitter.h"
-#include "XMLNode.h"
-
-
-class FileFinder;
-class Font;
-class FontCache;
-class FontManager;
-class GFGlyphTracer;
-class SVGTree;
-class XMLElementNode;
-
-class SVGFontTraceEmitter : public FontEmitter
-{
- public:
- SVGFontTraceEmitter (const Font *font, const FontManager &fm, const CharmapTranslator &cmt, SVGTree &svg, bool uf);
- ~SVGFontTraceEmitter ();
- int emitFont (const char *id);
- int emitFont (const std::set<int> &usedChars, const char *id);
- bool emitGlyph (int c);
-
- public:
- static const char *CACHE_PATH; ///< path to cache directory (0 if caching is disabled)
- static bool TRACE_ALL; ///< if true, not only the actually used, but all font glyphs are traced
- static double METAFONT_MAG; ///< magnification factor for Metafont calls
-
- protected:
- int emitFont (const std::set<int> *usedChars, const char *id);
- bool prepareTracer ();
- void traceAllGlyphs ();
-
- private:
- GFGlyphTracer *_gfTracer;
- std::istream *_in;
- const Font *_font;
- const FontManager &_fontManager;
- FontCache *_cache;
- const CharmapTranslator &_charmapTranslator;
- SVGTree &_svg;
- XMLElementNode *_glyphNode;
- bool _useFonts;
-};
-
-#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamCounter.h b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamCounter.h
deleted file mode 100644
index 00df0703b8a..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamCounter.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************
-** StreamCounter.h **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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/>. **
-*************************************************************************/
-
-#ifndef STREAMCOUNTER_H
-#define STREAMCOUNTER_H
-
-#include <ostream>
-#include "types.h"
-
-
-/** This class template is used to count the number of characters
- * written to a stream buffer. It simply counts the characters written
- * and forwards them to the target buffer. */
-template <typename C, typename T=std::char_traits<C> >
-class CountingStreamBuf : public std::basic_streambuf<C,T>
-{
- public:
- explicit CountingStreamBuf (std::basic_streambuf<C,T> *b)
- : targetBuf(b), counter(0) {}
-
- UInt64 count () const {return counter;}
- void reset () {counter = 0;}
-
- protected:
- CountingStreamBuf (const CountingStreamBuf &csb);
- CountingStreamBuf& operator = (const CountingStreamBuf &csb);
-
- typename T::int_type overflow (typename T::int_type c=T::eof()) {
- typename T::int_type n = targetBuf->sputc(c);
- if (!T::eq_int_type(c, T::eof()) && !T::eq_int_type(n, T::eof()))
- counter++;
- return n;
- }
-
- std::streamsize xsputn (const C *buf, std::streamsize bufsize) {
- std::streamsize n = targetBuf->sputn(buf, bufsize);
- counter += n;
- return n;
- }
-
- private:
- std::basic_streambuf<C,T> *targetBuf;
- UInt64 counter;
-};
-
-
-/** This class template assigns a counting buffer to a stream. It makes
- * the use of CountingStreamBuf more comfortable. */
-template <typename C, typename T=std::char_traits<C> >
-class StreamCounter
-{
- public:
- explicit StreamCounter (std::basic_ios<C,T> &stream)
- : targetStream(stream),
- targetBuf(stream.rdbuf()),
- countingBuf(new CountingStreamBuf<C,T>(stream.rdbuf()))
- {
- stream.rdbuf(countingBuf);
- valid = true;
- }
-
- ~StreamCounter () {
- if (valid)
- targetStream.rdbuf(targetBuf);
- delete countingBuf;
- }
-
- UInt64 count () const {return countingBuf->count();}
- void reset () {countingBuf->reset();}
- void invalidate () {valid = false;}
-
- protected:
- StreamCounter (const StreamCounter &csf);
- StreamCounter operator = (const StreamCounter &csf);
-
- private:
- bool valid; ///< true if target stream is valid
- std::basic_ios<C,T> &targetStream;
- std::basic_streambuf<C,T> *targetBuf;
- CountingStreamBuf<C,T> *countingBuf;
-};
-
-#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/dvisvgm.cpp
deleted file mode 100644
index 0659e192418..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/dvisvgm.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/*************************************************************************
-** dvisvgm.cpp **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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 <cmath>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <time.h>
-#include "gzstream.h"
-#include "CommandLine.h"
-#include "DVIToSVG.h"
-#include "DVIToSVGActions.h"
-#include "FileSystem.h"
-#include "FontCache.h"
-#include "InputReader.h"
-#include "Message.h"
-#include "FileFinder.h"
-#include "PageSize.h"
-#include "SpecialManager.h"
-#include "StreamCounter.h"
-#include "SVGFontTraceEmitter.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#define EMAIL " <" PACKAGE_BUGREPORT ">"
-#else
-#define EMAIL "Martin Gieseking <martin.gieseking@uos.de>"
-#endif
-
-#if defined (HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#elif defined (HAVE_SYS_TIMEB_H)
-#include <sys/timeb.h>
-#endif
-
-using namespace std;
-
-
-/** Simple private auto pointer class to simplify pointer handling in main function. */
-template <typename T>
-class Pointer
-{
- public:
- Pointer (T *p=0, bool free=true) : _p(p), _free(free) {}
- Pointer (const Pointer &p) : _p(p._p), _free(p._free) {p._p = 0;}
- ~Pointer () {if (_free) delete _p;}
- T& operator * () {return *_p;}
- void operator = (const Pointer &p) {_p=p._p; _free=p._free; p._p=0;}
- void release () {
- if (_free) delete _p;
- _p=0;
- }
-
- private:
- mutable T *_p;
- bool _free; ///< delete pointer in destructor?
-};
-
-
-static void show_help (const CommandLine &cmd) {
- cout << PACKAGE_STRING "\n\n";
- cmd.help();
- cout << "\nCopyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> \n\n";
-}
-
-
-static string remove_path (string fname) {
- fname = FileSystem::adaptPathSeperators(fname);
- size_t slashpos = fname.rfind('/');
- if (slashpos == string::npos)
- return fname;
- return fname.substr(slashpos+1);
-}
-
-
-static string ensure_suffix (string fname, const string &suffix) {
- size_t dotpos = remove_path(fname).rfind('.');
- if (dotpos == string::npos) {
- dotpos = fname.length();
- fname += "."+suffix;
- }
- return fname;
-}
-
-
-static string remove_suffix (string fname) {
- size_t dotpos = fname.rfind('.');
- if (dotpos == string::npos)
- return fname;
- return fname.substr(0, dotpos);
-}
-
-
-/** Returns timestamp (wall time) in seconds. */
-static double get_time () {
-#if defined (HAVE_SYS_TIME_H)
- struct timeval tv;
- gettimeofday(&tv, NULL);
- return tv.tv_sec + tv.tv_usec/1000000.0;
-#elif defined (HAVE_SYS_TIMEB_H)
- struct timeb tb;
- ftime(&tb);
- return tb.time + tb.millitm/1000.0;
-#else
- time_t myclock = time((time_t*)NULL);
- return myclock;
-#endif
-}
-
-
-static void set_trans (DVIToSVG &dvisvg, const CommandLine &args) {
- ostringstream oss;
- if (args.rotate_given())
- oss << 'R' << args.rotate_arg() << ",w/2,h/2";
- if (args.translate_given())
- oss << 'T' << args.translate_arg();
- if (args.scale_given())
- oss << 'S' << args.scale_arg();
- if (args.transform_given())
- oss << args.transform_arg();
- dvisvg.setTransformation(oss.str());
-}
-
-
-static bool set_cache_dir (const CommandLine &args) {
- if (args.cache_given() && !args.cache_arg().empty()) {
- if (args.cache_arg() == "none")
- SVGFontTraceEmitter::CACHE_PATH = 0;
- else if (FileSystem::exists(args.cache_arg().c_str()))
- SVGFontTraceEmitter::CACHE_PATH = args.cache_arg().c_str();
- else
- Message::wstream(true) << "cache directory '" << args.cache_arg() << "' does not exist (caching disabled)" << endl;
- }
- else {
- const char *userdir = FileSystem::userdir();
- if (userdir) {
- static string path = userdir;
- path += "/.dvisvgm";
- path = FileSystem::adaptPathSeperators(path);
- if (!FileSystem::exists(path.c_str()))
- FileSystem::mkdir(path.c_str());
- SVGFontTraceEmitter::CACHE_PATH = path.c_str();
- }
- if (args.cache_given() && args.cache_arg().empty()) {
- cout << "cache directory: " << (SVGFontTraceEmitter::CACHE_PATH ? SVGFontTraceEmitter::CACHE_PATH : "(none)") << endl;
- FontCache::fontinfo(SVGFontTraceEmitter::CACHE_PATH, cout);
- return false;
- }
- }
- return true;
-}
-
-
-static bool check_bbox (const string &bboxstr) {
- const char *formats[] = {"none", "min", "dvi", 0};
- for (const char **p=formats; *p; ++p)
- if (bboxstr == *p)
- return true;
- if (isalpha(bboxstr[0])) {
- try {
- PageSize size(bboxstr);
- return true;
- }
- catch (const PageSizeException &e) {
- Message::estream(true) << "invalid bounding box format '" << bboxstr << "'\n";
- return false;
- }
- }
- try {
- BoundingBox bbox;
- bbox.set(bboxstr);
- return true;
- }
- catch (const MessageException &e) {
- Message::estream(true) << e.getMessage() << endl;
- return false;
- }
-}
-
-
-int main (int argc, char *argv[]) {
- CommandLine args;
- args.parse(argc, argv);
- if (args.error())
- return 1;
-
- if (args.version_given()) {
- cout << PACKAGE_STRING "\n";
- return 0;
- }
- if (args.list_specials_given()) {
- DVIToSVG dvisvg(cin, cout);
- if (const SpecialManager *sm = dvisvg.setProcessSpecials())
- sm->writeHandlerInfo(cout);
- return 0;
- }
-
- if (!set_cache_dir(args))
- return 0;
-
- if (argc == 1 || args.help_given()) {
- show_help(args);
- return 0;
- }
-
- if (argc > 1 && args.numFiles() < 1) {
- Message::estream(true) << "no input file given" << endl;
- return 1;
- }
-
- if (args.progress_given())
- DVIToSVGActions::PROGRESSBAR = args.progress_arg()+1;
-
- if (args.stdout_given() && args.zip_given()) {
- Message::estream(true) << "writing SVGZ files to stdout is not supported\n";
- return 1;
- }
- if (args.map_file_given())
- FileFinder::setUserFontMap(args.map_file_arg().c_str());
-
- if (!check_bbox(args.bbox_arg()))
- return 1;
-
- DVIToSVG::CREATE_STYLE = !args.no_styles_given();
- DVIToSVG::USE_FONTS = !args.no_fonts_given();
- SVGFontTraceEmitter::TRACE_ALL = args.trace_all_given();
- SVGFontTraceEmitter::METAFONT_MAG = args.mag_arg();
-
- double start_time = get_time();
-
- string dvifile = ensure_suffix(args.file(0), "dvi");
- string svgfile = args.output_given() ? args.output_arg() : remove_suffix(remove_path(dvifile));
- svgfile = ensure_suffix(svgfile, args.zip_given() ? "svgz" : "svg");
-
- ifstream ifs(dvifile.c_str(), ios_base::binary|ios_base::in);
- if (!ifs)
- Message::estream(true) << "can't open file '" << dvifile << "' for reading\n";
- else {
- Pointer<ostream> out;
- if (args.stdout_given())
- out = Pointer<ostream>(&cout, false);
- else if (args.zip_given())
- out = Pointer<ostream>(new ogzstream(svgfile.c_str(), args.zip_arg()));
- else
- out = Pointer<ostream>(new ofstream(svgfile.c_str(), ios_base::binary));
-
- if (!*out)
- Message::estream(true) << "can't open file '" << svgfile << "' for writing\n";
- else {
- StreamCounter<char> sc(*out);
- Message::level = args.verbosity_arg();
- DVIToSVG dvisvg(ifs, *out);
- const char *ignore_specials = args.no_specials_given() ? (args.no_specials_arg().empty() ? "*" : args.no_specials_arg().c_str()) : 0;
- dvisvg.setProcessSpecials(ignore_specials);
- set_trans(dvisvg, args);
- dvisvg.setPageSize(args.bbox_arg());
-
- try {
- FileFinder::init(argv[0], !args.no_mktexmf_given());
- if (int pages = dvisvg.convert(args.page_arg(), args.page_arg())) {
- if (!args.stdout_given())
- sc.invalidate(); // output buffer is no longer valid
- // valgrind issues an invalid conditional jump/move in the deflate function of libz here.
- // According to libz FAQ #36 this is not a bug but intended behavior.
- out.release(); // force writing
- const char *pstr = pages == 1 ? "" : "s";
- UInt64 nbytes = args.stdout_given() ? sc.count() : FileSystem::filesize(svgfile);
- Message::mstream() << "1 ";
- if (pages > 1)
- Message::mstream() << "of " << pages << " ";
- Message::mstream() << "page" << pstr << " written to "
- << (args.stdout_given() ? "<stdout>" : svgfile)
- << " (" << nbytes << " bytes";
- if (args.zip_given())
- Message::mstream() << " = " << floor(double(nbytes)/sc.count()*100.0+0.5) << "%";
- Message::mstream() << ") in " << (get_time()-start_time) << " seconds\n";
- }
- }
- catch (DVIException &e) {
- Message::estream() << "DVI error: " << e.getMessage() << endl;
- }
- catch (MessageException &e) {
- Message::estream(true) << e.getMessage() << endl;
- }
- }
- }
- return 0;
-}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/psdefs.psc
deleted file mode 100644
index 25a7d59c3fa..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/psdefs.psc
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
-** psdefs.psc **
-** **
-** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.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/>. **
-*************************************************************************/
-
-const char *PSInterpreter::PSDEFS =
-"3 dict dup begin/Install{matrix setmatrix}def/HWResolution[72.27 72.27]def/PageS"
-"ize[10000 10000]def end setpagedevice/:gsave systemdict/gsave get def/:grestore "
-"systemdict/grestore get def/@dodraw true store/prval{dup type/stringtype eq{prin"
-"t}{30 string cvs print}ifelse}def/prseq{-1 1{-1 roll prval( )print}for(\\n)print"
-"}def/prcmd{( )exch(\\ndvi.)3{print}repeat prseq}def/cvxall{{cvx}forall}def/sysex"
-"ec{systemdict exch get exec}def/defpr{[exch[/copy systemdict]cvxall 5 -1 roll du"
-"p 6 1 roll[/get/exec]cvxall 6 -1 roll dup 7 1 roll 4 -1 roll dup 5 1 roll dup le"
-"ngth string cvs/prcmd cvx]cvx def}def errordict begin/nocurrentpoint{pop false}d"
-"ef end/setpos{currentpoint dup type cvlit/booleantype eq{pop}{2(setpos)prcmd}ife"
-"lse}def/prpath{{2(moveto)prcmd}{2(lineto)prcmd}{6(curveto)prcmd}{0(closepath)prc"
-"md}pathforall}def/charpath{/@dodraw false store/charpath sysexec/@dodraw true st"
-"ore}def/show{@dodraw{true charpath eofill 0(show)prcmd}if}def/stroke{@dodraw{0(n"
-"ewpath)prcmd prpath 0(stroke)prcmd newpath}{/stroke sysexec}ifelse}def/fill{@dod"
-"raw{0(newpath)prcmd prpath 0(fill)prcmd newpath}{/fill sysexec}ifelse}def/eofill"
-"{@dodraw{0(newpath)prcmd prpath 0(eofill)prcmd newpath}{/eofill sysexec}ifelse}d"
-"ef/clip{/clip sysexec 0(newpath)prcmd prpath 0(clip)prcmd}def/eoclip{/eoclip sys"
-"exec 0(newpath)prcmd prpath 0(eoclip)prcmd}def/initclip 0 defpr/adddot{dup lengt"
-"h 1 add string dup 0 46 put dup 3 -1 roll 1 exch putinterval}def/setlinewidth 1 "
-"defpr/setlinecap 1 defpr/setlinejoin 1 defpr/setmiterlimit 1 defpr/setdash{mark "
-"3 1 roll 2 copy/setdash sysexec exch aload length 1 add -1 roll counttomark(setd"
-"ash)prcmd pop}def/gsave 0 defpr/grestore{:grestore currentlinewidth 1(setlinewid"
-"th)prcmd currentlinecap 1(setlinecap)prcmd currentlinejoin 1(setlinejoin)prcmd c"
-"urrentmiterlimit 1(setmiterlimit)prcmd currentrgbcolor 3(setrgbcolor)prcmd 6 arr"
-"ay currentmatrix aload pop 6(setmatrix)prcmd currentdash mark 3 1 roll exch aloa"
-"d length 1 add -1 roll counttomark(setdash)prcmd pop 0(grestore)prcmd}def/rotate"
-"{dup type/arraytype ne{dup 1(rotate)prcmd}if/rotate sysexec}def/scale{dup type/a"
-"rraytype ne{2 copy 2(scale)prcmd}if/scale sysexec}def/translate{dup type/arrayty"
-"pe ne{2 copy 2(translate)prcmd}if/translate sysexec}def/setmatrix{dup/setmatrix "
-"sysexec aload pop 6(setmatrix)prcmd}def/initmatrix{matrix setmatrix}def/concat{m"
-"atrix currentmatrix matrix concatmatrix setmatrix}def/setgray 1 defpr/setcmykcol"
-"or 4 defpr/sethsbcolor 3 defpr/setrgbcolor 3 defpr/.handleerror errordict/handle"
-"error get def errordict begin/handleerror{0(beginerror)prcmd .handleerror 0(ende"
-"rror)prcmd}.bind def end ";
-
-// vim: set syntax=cpp:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.am
deleted file mode 100644
index 51ab6f9aac1..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-## This file is part of dvisvgm
-## Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
-##
-## Process this file with automake.
-
-AM_CXXFLAGS = -I../src -I../../src -Wall
-
-TESTS =
-check_PROGRAMS =
-
-TESTS += CalculatorTest
-check_PROGRAMS += CalculatorTest
-CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += ColorSpecialTest
-check_PROGRAMS += ColorSpecialTest
-ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += CommandLineTest
-check_PROGRAMS += CommandLineTest
-CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += DirectoryTest
-check_PROGRAMS += DirectoryTest
-DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += FileFinderTest
-check_PROGRAMS += FileFinderTest
-FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += FontManagerTest
-check_PROGRAMS += FontManagerTest
-FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += FontMapTest
-check_PROGRAMS += FontMapTest
-FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += GraphicPathTest
-check_PROGRAMS += GraphicPathTest
-GraphicPathTest_SOURCES = GraphicPathTest.cpp
-GraphicPathTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += LengthTest
-check_PROGRAMS += LengthTest
-LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += MatrixTest
-check_PROGRAMS += MatrixTest
-MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += PageSizeTest
-check_PROGRAMS += PageSizeTest
-PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += SplittedCharInputBufferTest
-check_PROGRAMS += SplittedCharInputBufferTest
-SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += StreamCounterTest
-check_PROGRAMS += StreamCounterTest
-StreamCounterTest_SOURCES = StreamCounterTest.cpp
-StreamCounterTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += StreamInputBufferTest
-check_PROGRAMS += StreamInputBufferTest
-StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
-TESTS += VectorStreamTest
-check_PROGRAMS += VectorStreamTest
-VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/ChangeLog
index 345282b8087..5d530acde4c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/ChangeLog
@@ -1,3 +1,20 @@
+2010-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported release 1.0.1.
+
+ Removed patch-01-potracelib-warning, patch-02-libdvisvgm-warnings,
+ patch-03-libdvisvgm-uninitialized, patch-04-libdvisvgm-virtual,
+ patch-05-libdvisvgm-dlfcn, patch-06-libdvisvgm-HAVE_LIBGS,
+ patch-09-unistd, patch-10-TL-help, patch-20-gettimeofday-or-ftime,
+ now all included in the original source tree.
+
+ Added patch-01-isopen.
+ * src/GFGlyphTracer.h: Avoid recent C++ STL extensions.
+ From Martin Gieseking <martin.gieseking@uos.de>.
+
+ Added patch-02-newline-at-end-of-file.
+ * src/FontEncoding.cpp: Add newline at end of file.
+
2010-06-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Added patch-08-static-const-members, from vvv.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes
new file mode 100644
index 00000000000..0382ea45562
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/TL-Changes
@@ -0,0 +1,10 @@
+Changes applied to the dvisvgm-1.0 tree as obtained from:
+ http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.tar.gz
+
+Removed:
+ config.guess
+ config.sub
+ depcomp
+ install-sh
+ missing
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen
new file mode 100644
index 00000000000..666c01ecd9a
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-01-isopen
@@ -0,0 +1,11 @@
+diff -ur dvisvgm-1.0.1.orig/src/GFGlyphTracer.h dvisvgm-1.0.1/src/GFGlyphTracer.h
+--- dvisvgm-1.0.1.orig/src/GFGlyphTracer.h 2010-03-18 20:20:04.000000000 +0100
++++ dvisvgm-1.0.1/src/GFGlyphTracer.h 2010-06-12 15:56:17.189565656 +0200
+@@ -50,7 +50,6 @@
+ void endChar (UInt32 c);
+ void setGlyph (Glyph &glyph) {_glyph = &glyph;}
+ const Glyph& getGlyph () const {return *_glyph;}
+- bool opened () const {return _ifs.is_open();}
+
+ private:
+ std::ifstream _ifs;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file
new file mode 100644
index 00000000000..31c5b7f9943
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-02-newline-at-end-of-file
@@ -0,0 +1,10 @@
+diff -ur dvisvgm-1.0.1.orig/src/FontEncoding.cpp dvisvgm-1.0.1/src/FontEncoding.cpp
+--- dvisvgm-1.0.1.orig/src/FontEncoding.cpp 2010-04-20 19:07:42.000000000 +0200
++++ dvisvgm-1.0.1/src/FontEncoding.cpp 2010-06-12 15:59:17.947919039 +0200
+@@ -155,4 +155,4 @@
+ return enc;
+ }
+ return 0;
+-}
+\ No newline at end of file
++}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32 b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-07-libdvisvgm-uint32
index bc5753faf39..c5216203dd2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-07-libdvisvgm-uint32
@@ -1,7 +1,7 @@
-diff -ur dvisvgm-0.8.7.orig/src/FontEngine.cpp dvisvgm-0.8.7/src/FontEngine.cpp
---- dvisvgm-0.8.7.orig/src/FontEngine.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/FontEngine.cpp 2010-06-05 01:11:20.000000000 +0200
-@@ -58,7 +58,7 @@
+diff -ur dvisvgm-1.0.1.orig/src/FontEngine.cpp dvisvgm-1.0.1/src/FontEngine.cpp
+--- dvisvgm-1.0.1.orig/src/FontEngine.cpp 2010-03-24 19:45:38.000000000 +0100
++++ dvisvgm-1.0.1/src/FontEngine.cpp 2010-06-12 21:09:47.143615966 +0200
+@@ -66,7 +66,7 @@
* @param[in] face font face to be used
* @param[out] reverseMap the resulting map */
static void build_reverse_map (FT_Face face, map<UInt32, UInt32> &reverseMap) {
@@ -10,7 +10,7 @@ diff -ur dvisvgm-0.8.7.orig/src/FontEngine.cpp dvisvgm-0.8.7/src/FontEngine.cpp
UInt32 charcode = FT_Get_First_Char(face, &glyphIndex);
while (glyphIndex) {
// if (reverseMap.find(glyphIndex) == reverseMap.end())
-@@ -111,7 +111,7 @@
+@@ -127,7 +127,7 @@
build_reverse_map(_currentFace, reverseMap);
FT_Set_Charmap(_currentFace, unicodeMap);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members
new file mode 100644
index 00000000000..86bc6dbc51f
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-08-static-const-members
@@ -0,0 +1,23 @@
+diff -ur dvisvgm-1.0.1.orig/src/FontCache.cpp dvisvgm-1.0.1/src/FontCache.cpp
+--- dvisvgm-1.0.1.orig/src/FontCache.cpp 2010-03-24 19:45:38.000000000 +0100
++++ dvisvgm-1.0.1/src/FontCache.cpp 2010-06-12 21:31:51.080119555 +0200
+@@ -34,6 +34,7 @@
+
+ using namespace std;
+
++const UInt8 FontCache::VERSION;
+
+ static Pair32 read_pair (int bytes, StreamReader &sr) {
+ Int32 x = sr.readSigned(bytes);
+diff -ur dvisvgm-1.0.1.orig/src/gzstream.cpp dvisvgm-1.0.1/src/gzstream.cpp
+--- dvisvgm-1.0.1.orig/src/gzstream.cpp 2009-08-29 22:06:31.000000000 +0200
++++ dvisvgm-1.0.1/src/gzstream.cpp 2010-06-12 21:31:51.080119555 +0200
+@@ -34,6 +34,8 @@
+ namespace GZSTREAM_NAMESPACE {
+ #endif
+
++const int gzstreambuf::bufferSize;
++
+ // ----------------------------------------------------------------------------
+ // Internal classes to implement gzstream. See header file for user classes.
+ // ----------------------------------------------------------------------------
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-30-WIN32-warning b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-30-WIN32-warning
index 2ce14dbe623..ad436f81bbc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-30-WIN32-warning
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1-PATCHES/patch-30-WIN32-warning
@@ -1,8 +1,8 @@
Avoid compiler warning.
-diff -ur dvisvgm-0.8.7.orig/src/MetafontWrapper.cpp dvisvgm-0.8.7/src/MetafontWrapper.cpp
---- dvisvgm-0.8.7.orig/src/MetafontWrapper.cpp 2009-11-06 22:17:58.000000000 +0100
-+++ dvisvgm-0.8.7/src/MetafontWrapper.cpp 2010-02-23 13:49:35.706277518 +0100
+diff -ur dvisvgm-1.0.1.orig/src/MetafontWrapper.cpp dvisvgm-1.0.1/src/MetafontWrapper.cpp
+--- dvisvgm-1.0.1.orig/src/MetafontWrapper.cpp 2010-06-08 10:40:37.000000000 +0200
++++ dvisvgm-1.0.1/src/MetafontWrapper.cpp 2010-06-12 21:34:50.868358077 +0200
@@ -55,7 +55,7 @@
string cmdline = string("\"")+cmd+"\" "+params;
CreateProcess(NULL, (LPSTR)cmdline.c_str(), NULL, NULL, true, 0, NULL, NULL, &si, &pi);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/AUTHORS b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/AUTHORS
index 837e1e96bfb..837e1e96bfb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/AUTHORS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/AUTHORS
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/COPYING b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/COPYING
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/COPYING
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/INSTALL b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/INSTALL
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/INSTALL
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/LGPL-2.1.txt b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/LGPL-2.1.txt
index 602bfc94635..602bfc94635 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/LGPL-2.1.txt
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/LGPL-2.1.txt
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.am
index cba62ce145a..8b330e8e7c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.am
@@ -1,5 +1,5 @@
## This file is part of dvisvgm
-## Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
+## Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>
##
## Process this file with automake.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.in
index 7036f6d49cd..aaf403c1fe2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -128,7 +128,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_LIBS = @EXTRA_LIBS@
-FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -147,8 +148,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -275,7 +278,7 @@ distclean-hdr:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -300,7 +303,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -464,7 +467,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -508,17 +512,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/NEWS b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/NEWS
index dbf47e3477d..9115ef31300 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/NEWS
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/NEWS
@@ -1,3 +1,43 @@
+dvisvgm-1.0.1
+- fixed a memory issue in the PS handler that could lead to a segfault (SF bug #3013392)
+- fixed a recursion issue in the PS handler
+- suppress ANSI color code when terminating
+
+dvisvgm-1.0
+- conversion of multiple pages (must be enabled explicitly, see option --pages)
+- added transparency support to the PS handler
+- improved conversion results of the PS handler
+- added support for computation of local bounding boxes
+- optional colorization of dvisvgm messages (option --color)
+- improved progress indicator (option --progress)
+- a couple of improvements of the build system
+
+dvisvgm-0.9.1
+- CSS style definitions omit unnecessary fonts now
+- SVG validity was broken when using font elements
+- fixed two memory issues that could lead to segfaults
+
+dvisvgm-0.9
+- added option --exact and corresponding algorithms to compute the exact
+ bounding boxes of characters
+- added option --keep that prevents deleting temporary font files
+- extended option --trace-all by an optional boolean argument controlling
+ the re-tracing of glyphs
+- fixed bug in evaluation of embedded PS headers
+- several code refactorings
+
+dvisvgm-0.8.8
+- added option --libgs and evaluation of environment variable LIBGS
+ to overwrite the expected file name of the GS shared library
+ (only available if dvisvgm isn't linked against libgs and GS support
+ isn't completely disabled)
+- option --bbox can now be used to enlarge the minimal bounding box by
+ a given amount
+- fixed bug in evaluation of option --page
+- applied patches sent by Peter Breitenlohner to prepare the integration of
+ dvisvgm into TeX Live
+- some code refactorings
+
dvisvgm-0.8.7
- fixed a bounding box issue concerning italic corrections
- PS handler: zero-length paths are now drawn as dots
@@ -38,7 +78,7 @@ dvisvgm-0.8.3
dvisvgm-0.8.2
- changed license of dvisvgm to GPL version 3 or later
-- replaced getopt-based commandline parser by own implementation
+- replaced getopt-based command-line parser by own implementation
in order to simplify future internationalizations
- fixed memory bug in fontmap reader
@@ -61,7 +101,7 @@ dvisvgm-0.7.3
dvisvgm-0.7.2
- font caching has been added (speeds up embedding of bitmap fonts)
- added option --trace-all that enables tracing of all glyphs of all
- bitmap fonts used in the currect DVI file. Even glyphs that are currently
+ bitmap fonts used in the current DVI file. Even glyphs that are currently
not needed are considered. This avoids multiple calls of Metafont for the
same fonts. In combination with the new caching functionality this can
drastically increase the speed of successive dvisvgm calls.
@@ -137,4 +177,4 @@ Added a glyph tracing module that vectorizes Metafont's bitmap output
if no corresponding Type 1 font file is available.
dvisvgm-0.3:
-Inititial public release with basic conversion functionality.
+Initial public release with basic conversion functionality.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/README b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/README
index e1652b6d9e0..e83d7f09ff6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/README
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/README
@@ -101,7 +101,7 @@ ADDITIONAL INFORMATION
COPYRIGHT
- Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
+ Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/aclocal.m4 b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/aclocal.m4
index 9304f88b61c..721df62391d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/aclocal.m4
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,12 +13,168 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -34,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +206,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/config.h.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/config.h.in
index 60fceb830b8..b027999e9b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/config.h.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/config.h.in
@@ -6,6 +6,9 @@
/* Set to 1 if PostScript support should be disabled */
#undef DISABLE_GS
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
+#undef GWINSZ_IN_SYS_IOCTL
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -13,15 +16,18 @@
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
+/* Define to 1 if you have the `ftime' function. */
+#undef HAVE_FTIME
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
-/* Define to 1 if you have the `freetype' library (-lfreetype). */
-#undef HAVE_LIBFREETYPE
-
/* Define to 1 if you have the `gs' library (-lgs). */
#undef HAVE_LIBGS
@@ -89,6 +95,12 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#undef HAVE_SYS_TIMEB_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
@@ -120,6 +132,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/configure b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure
index 4ce796c07c4..4d1f6db566b 100755
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/configure
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for dvisvgm 0.8.7.
+# Generated by GNU Autoconf 2.65 for dvisvgm 1.0.1.
#
# Report bugs to <martin.gieseking@uos.de>.
#
+#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -46,7 +42,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -57,7 +59,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -96,15 +91,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -133,330 +132,300 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: martin.gieseking@uos.de about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-exitcode=0
-if as_func_success; then
- :
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
else
- exitcode=1
- echo as_func_success failed.
-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-if as_func_ret_success; then
- :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_expr=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf@gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -473,8 +442,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -484,29 +452,18 @@ test \$exitcode = 0") || {
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -536,7 +493,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -555,10 +512,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -572,8 +529,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -591,14 +548,14 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='dvisvgm'
PACKAGE_TARNAME='dvisvgm'
-PACKAGE_VERSION='0.8.7'
-PACKAGE_STRING='dvisvgm 0.8.7'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='dvisvgm 1.0.1'
PACKAGE_BUGREPORT='martin.gieseking@uos.de'
+PACKAGE_URL=''
ac_unique_file="src"
# Factoring default headers for most tests.
@@ -644,8 +601,10 @@ AM_LDFLAGS
AM_CPPFLAGS
EXTRA_LIBS
DATE
-FREETYPE_CONFIG
LIBOBJS
+FREETYPE_LIBS
+FREETYPE_CFLAGS
+PKG_CONFIG
EGREP
GREP
CPP
@@ -737,6 +696,7 @@ bindir
program_transform_name
prefix
exec_prefix
+PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -748,7 +708,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_dependency_tracking
-with_freetype
with_zlib
'
ac_precious_vars='build_alias
@@ -762,7 +721,10 @@ CPPFLAGS
CCC
CC
CFLAGS
-CPP'
+CPP
+PKG_CONFIG
+FREETYPE_CFLAGS
+FREETYPE_LIBS'
# Initialize some variables set by options.
@@ -871,8 +833,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -898,8 +859,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1103,8 +1063,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1120,8 +1079,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1151,17 +1109,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1178,15 +1136,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1209,8 +1165,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1240,11 +1195,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1283,13 +1236,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1315,7 +1266,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 0.8.7 to adapt to many kinds of systems.
+\`configure' configures dvisvgm 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1386,7 +1337,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisvgm 0.8.7:";;
+ short | recursive ) echo "Configuration of dvisvgm 1.0.1:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1351,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-freetype=DIR location of the FreeType2 library
--with-zlib=DIR location of the zlib library
Some influential environment variables:
@@ -1409,11 +1359,16 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ FREETYPE_CFLAGS
+ C compiler flags for FREETYPE, overriding pkg-config
+ FREETYPE_LIBS
+ linker flags for FREETYPE, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1481,22 +1436,471 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisvgm configure 0.8.7
-generated by GNU Autoconf 2.63
+dvisvgm configure 1.0.1
+generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## -------------------------------------- ##
+## Report this to martin.gieseking@uos.de ##
+## -------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvisvgm $as_me 0.8.7, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+It was created by dvisvgm $as_me 1.0.1, which was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1532,8 +1936,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1570,9 +1974,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1588,13 +1992,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1619,13 +2023,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1697,39 +2101,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
@@ -1747,8 +2153,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
@@ -1756,10 +2162,10 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1767,7 +2173,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1782,11 +2188,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
@@ -1796,17 +2202,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
@@ -1818,43 +2224,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -1863,30 +2246,22 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DATE="August 2009"
+DATE="May 2010"
ac_config_headers="$ac_config_headers config.h"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -1900,35 +2275,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -1944,28 +2311,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -1981,28 +2344,24 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then
+if test "${ac_cv_target+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -2040,10 +2399,10 @@ am__api_version='1.11'
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2051,11 +2410,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2092,7 +2451,7 @@ case $as_dir/ in
;;
esac
-done
+ done
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
@@ -2108,7 +2467,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2119,7 +2478,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
@@ -2130,15 +2489,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2160,11 +2515,8 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
fi
test "$2" = conftest.file
@@ -2173,13 +2525,10 @@ then
# Ok.
:
else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2207,7 +2556,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -2228,9 +2577,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2241,24 +2590,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2268,9 +2617,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2281,24 +2630,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2307,7 +2656,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -2320,10 +2669,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
+ if test "${ac_cv_path_mkdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2331,7 +2680,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
+ for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2343,11 +2692,12 @@ do
esac
done
done
-done
+ done
IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2355,11 +2705,10 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
@@ -2372,9 +2721,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2385,24 +2734,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
$as_echo "$AWK" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2410,11 +2759,11 @@ fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2432,11 +2781,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2456,9 +2805,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2474,7 +2821,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisvgm'
- VERSION='0.8.7'
+ VERSION='1.0.1'
cat >>confdefs.h <<_ACEOF
@@ -2516,7 +2863,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
cat >>confdefs.h <<_ACEOF
#define TARGET_SYSTEM "$target"
_ACEOF
@@ -2537,9 +2883,9 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -2550,24 +2896,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
$as_echo "$CXX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2581,9 +2927,9 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -2594,24 +2940,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
$as_echo "$ac_ct_CXX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2624,7 +2970,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -2635,48 +2981,31 @@ fi
fi
fi
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2692,8 +3021,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -2709,17 +3038,17 @@ do
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -2736,7 +3065,7 @@ do
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -2755,84 +3084,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C++ compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
- fi
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2847,32 +3134,83 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2884,17 +3222,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -2907,31 +3245,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2945,37 +3275,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
@@ -2984,20 +3293,16 @@ else
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
ac_cv_prog_cxx_g=no
CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3008,35 +3313,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3047,36 +3328,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3087,42 +3344,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
@@ -3156,7 +3388,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
@@ -3184,12 +3416,12 @@ if test "$am__include" = "#"; then
fi
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
@@ -3209,9 +3441,9 @@ fi
depcc="$CXX" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3319,7 +3551,7 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -3342,9 +3574,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3355,24 +3587,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3382,9 +3614,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3395,24 +3627,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3421,7 +3653,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3435,9 +3667,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3448,24 +3680,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3475,9 +3707,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3489,18 +3721,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -3519,10 +3751,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3534,9 +3766,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3547,24 +3779,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3578,9 +3810,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3591,24 +3823,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3621,7 +3853,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3632,62 +3864,42 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3701,37 +3913,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -3740,20 +3931,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3764,35 +3951,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3803,36 +3966,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_c_werror_flag=$ac_save_c_werror_flag
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3843,42 +3982,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -3895,18 +4009,14 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -3963,32 +4073,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -3999,17 +4086,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4019,9 +4108,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4129,7 +4218,7 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -4148,9 +4237,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -4161,24 +4250,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
$as_echo "$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4188,9 +4277,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -4201,24 +4290,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
$as_echo "$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4227,7 +4316,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4244,27 +4333,33 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Check whether MikTeX import libraries should be linked
-case $host in
- *-mingw32* | *-windows*)
- CPPFLAGS="$CPPFLAGS -DMIKTEX"
- EXTRA_LIBS="miktex-core.a miktex-kps.a"
- ;;
- *)
+
+for ac_func in ftime gettimeofday
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -4279,11 +4374,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -4292,78 +4383,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
@@ -4375,7 +4422,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -4386,11 +4433,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -4399,87 +4442,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -4489,9 +4485,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4502,7 +4498,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
+ for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -4522,7 +4518,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -4537,26 +4533,24 @@ esac
$ac_path_GREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4570,7 +4564,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
+ for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -4590,7 +4584,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4605,12 +4599,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4618,21 +4610,17 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -4647,48 +4635,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -4698,18 +4661,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -4719,14 +4678,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -4753,118 +4708,49 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_Header=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+done
+
+
+for ac_header in sys/time.h sys/timeb.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -4873,161 +4759,83 @@ fi
done
-
-if test "${ac_cv_header_kpathsea_kpathsea_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for kpathsea/kpathsea.h" >&5
-$as_echo_n "checking for kpathsea/kpathsea.h... " >&6; }
-if test "${ac_cv_header_kpathsea_kpathsea_h+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
+if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then :
$as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_kpathsea_h" >&5
-$as_echo "$ac_cv_header_kpathsea_kpathsea_h" >&6; }
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking kpathsea/kpathsea.h usability" >&5
-$as_echo_n "checking kpathsea/kpathsea.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-#include <kpathsea/kpathsea.h>
+#include <sys/types.h>
+#include <termios.h>
+#ifdef TIOCGWINSZ
+ yes
+#endif
+
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ ac_cv_sys_tiocgwinsz_in_termios_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
+ ac_cv_sys_tiocgwinsz_in_termios_h=no
fi
+rm -f conftest*
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking kpathsea/kpathsea.h presence" >&5
-$as_echo_n "checking kpathsea/kpathsea.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
+if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <kpathsea/kpathsea.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#ifdef TIOCGWINSZ
+ yes
+#endif
+
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no
+fi
+rm -f conftest*
- ac_header_preproc=no
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+ if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: kpathsea/kpathsea.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: kpathsea/kpathsea.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------- ##
-## Report this to martin.gieseking@uos.de ##
-## -------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for kpathsea/kpathsea.h" >&5
-$as_echo_n "checking for kpathsea/kpathsea.h... " >&6; }
-if test "${ac_cv_header_kpathsea_kpathsea_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_kpathsea_kpathsea_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_kpathsea_kpathsea_h" >&5
-$as_echo "$ac_cv_header_kpathsea_kpathsea_h" >&6; }
+$as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
+ fi
fi
-if test "x$ac_cv_header_kpathsea_kpathsea_h" = x""yes; then
- :
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "kpathsea/kpathsea.h" "ac_cv_header_kpathsea_kpathsea_h" "$ac_includes_default"
+if test "x$ac_cv_header_kpathsea_kpathsea_h" = x""yes; then :
+
else
- { { $as_echo "$as_me:$LINENO: error: please install the kpathsea development package" >&5
-$as_echo "$as_me: error: please install the kpathsea development package" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "please install the kpathsea development package" "$LINENO" 5
fi
-
-{ $as_echo "$as_me:$LINENO: checking for kpse_find_file in -lkpathsea" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kpse_find_file in -lkpathsea" >&5
$as_echo_n "checking for kpse_find_file in -lkpathsea... " >&6; }
-if test "${ac_cv_lib_kpathsea_kpse_find_file+set}" = set; then
+if test "${ac_cv_lib_kpathsea_kpse_find_file+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkpathsea $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5045,43 +4853,18 @@ return kpse_find_file ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_kpathsea_kpse_find_file=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_kpathsea_kpse_find_file=no
+ ac_cv_lib_kpathsea_kpse_find_file=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kpathsea_kpse_find_file" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kpathsea_kpse_find_file" >&5
$as_echo "$ac_cv_lib_kpathsea_kpse_find_file" >&6; }
-if test "x$ac_cv_lib_kpathsea_kpse_find_file" = x""yes; then
+if test "x$ac_cv_lib_kpathsea_kpse_find_file" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKPATHSEA 1
_ACEOF
@@ -5089,231 +4872,57 @@ _ACEOF
LIBS="-lkpathsea $LIBS"
else
- { { $as_echo "$as_me:$LINENO: error: libkpathsea not found, please install the corresponding package first" >&5
-$as_echo "$as_me: error: libkpathsea not found, please install the corresponding package first" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "libkpathsea not found, please install the corresponding package first" "$LINENO" 5
fi
- { $as_echo "$as_me:$LINENO: checking kpathsea version" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kpathsea version" >&5
$as_echo_n "checking kpathsea version... " >&6; }
- if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
kpseversion=unknown
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
- #include <kpathsea/kpathsea.h>
- extern char *kpathsea_version_string;
- int main() {
- FILE *f;
- f = fopen("conftestval", "w");
- if(!f) exit(1);
- fprintf(f, "%s\n", kpathsea_version_string);
- fclose(f);
- exit(0);
- }
+ #include <kpathsea/kpathsea.h>
+ int main() {
+ FILE *f;
+ f = fopen("kpseversion", "w");
+ if(!f) exit(1);
+ fprintf(f, "%s\n", KPSEVERSION);
+ fclose(f);
+ exit(0);
+ }
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- kpseversion=`cat conftestval`
+if ac_fn_c_try_run "$LINENO"; then :
+ kpseversion=`cat kpseversion|sed 's/kpathsea version //'`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-kpseversion=
+ kpseversion=
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
-# AC_RESTORE_FLAGS
- { $as_echo "$as_me:$LINENO: result: \"$kpseversion\"" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$kpseversion\"" >&5
$as_echo "\"$kpseversion\"" >&6; }
- if test -z "$kpseversion"; then
- { { $as_echo "$as_me:$LINENO: error: Could not compile a simple kpathsea program -- check your installation" >&5
-$as_echo "$as_me: error: Could not compile a simple kpathsea program -- check your installation" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ;;
-esac
+rm -f kpseversion
+if test -z "$kpseversion"; then
+ as_fn_error "Could not compile a simple kpathsea program -- check your installation" "$LINENO" 5
+fi
# Check how to link potracelib
HAVE_LIBPOTRACE=1
-if test "${ac_cv_header_potracelib_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for potracelib.h" >&5
-$as_echo_n "checking for potracelib.h... " >&6; }
-if test "${ac_cv_header_potracelib_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_potracelib_h" >&5
-$as_echo "$ac_cv_header_potracelib_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking potracelib.h usability" >&5
-$as_echo_n "checking potracelib.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <potracelib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking potracelib.h presence" >&5
-$as_echo_n "checking potracelib.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <potracelib.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: potracelib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: potracelib.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: potracelib.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: potracelib.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: potracelib.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: potracelib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: potracelib.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: potracelib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: potracelib.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------- ##
-## Report this to martin.gieseking@uos.de ##
-## -------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for potracelib.h" >&5
-$as_echo_n "checking for potracelib.h... " >&6; }
-if test "${ac_cv_header_potracelib_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_potracelib_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_potracelib_h" >&5
-$as_echo "$ac_cv_header_potracelib_h" >&6; }
-
-fi
-if test "x$ac_cv_header_potracelib_h" = x""yes; then
-
-{ $as_echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
+ac_fn_c_check_header_mongrel "$LINENO" "potracelib.h" "ac_cv_header_potracelib_h" "$ac_includes_default"
+if test "x$ac_cv_header_potracelib_h" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
$as_echo_n "checking for sqrt in -lm... " >&6; }
-if test "${ac_cv_lib_m_sqrt+set}" = set; then
+if test "${ac_cv_lib_m_sqrt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5331,43 +4940,18 @@ return sqrt ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_m_sqrt=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_m_sqrt=no
+ ac_cv_lib_m_sqrt=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = x""yes; then
+if test "x$ac_cv_lib_m_sqrt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -5376,19 +4960,14 @@ _ACEOF
fi
# required to pass potrace check
-
-{ $as_echo "$as_me:$LINENO: checking for potrace_trace in -lpotrace" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for potrace_trace in -lpotrace" >&5
$as_echo_n "checking for potrace_trace in -lpotrace... " >&6; }
-if test "${ac_cv_lib_potrace_potrace_trace+set}" = set; then
+if test "${ac_cv_lib_potrace_potrace_trace+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpotrace $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5406,43 +4985,18 @@ return potrace_trace ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_potrace_potrace_trace=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_potrace_potrace_trace=no
+ ac_cv_lib_potrace_potrace_trace=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_potrace_potrace_trace" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_potrace_potrace_trace" >&5
$as_echo "$ac_cv_lib_potrace_potrace_trace" >&6; }
-if test "x$ac_cv_lib_potrace_potrace_trace" = x""yes; then
+if test "x$ac_cv_lib_potrace_potrace_trace" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPOTRACE 1
_ACEOF
@@ -5462,159 +5016,23 @@ fi
if test "$HAVE_LIBPOTRACE" -eq 0; then
AM_CPPFLAGS="$AM_CXXFLAGS -I../potracelib -I../../potracelib"
EXTRA_LIBS="$EXTRA_LIBS ../potracelib/libpotrace.a "
- { $as_echo "$as_me:$LINENO: Using bundled potrace library" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using bundled potrace library" >&5
$as_echo "$as_me: Using bundled potrace library" >&6;}
fi
# Check how to link Ghostscript
HAVE_LIBGS=1
-if test "${ac_cv_header_ghostscript_iapi_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for ghostscript/iapi.h" >&5
-$as_echo_n "checking for ghostscript/iapi.h... " >&6; }
-if test "${ac_cv_header_ghostscript_iapi_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ghostscript_iapi_h" >&5
-$as_echo "$ac_cv_header_ghostscript_iapi_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ghostscript/iapi.h usability" >&5
-$as_echo_n "checking ghostscript/iapi.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <ghostscript/iapi.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ghostscript/iapi.h presence" >&5
-$as_echo_n "checking ghostscript/iapi.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ghostscript/iapi.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ghostscript/iapi.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------- ##
-## Report this to martin.gieseking@uos.de ##
-## -------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for ghostscript/iapi.h" >&5
-$as_echo_n "checking for ghostscript/iapi.h... " >&6; }
-if test "${ac_cv_header_ghostscript_iapi_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_ghostscript_iapi_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ghostscript_iapi_h" >&5
-$as_echo "$ac_cv_header_ghostscript_iapi_h" >&6; }
-
-fi
-if test "x$ac_cv_header_ghostscript_iapi_h" = x""yes; then
-
-{ $as_echo "$as_me:$LINENO: checking for gsapi_new_instance in -lgs" >&5
+ac_fn_c_check_header_mongrel "$LINENO" "ghostscript/iapi.h" "ac_cv_header_ghostscript_iapi_h" "$ac_includes_default"
+if test "x$ac_cv_header_ghostscript_iapi_h" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsapi_new_instance in -lgs" >&5
$as_echo_n "checking for gsapi_new_instance in -lgs... " >&6; }
-if test "${ac_cv_lib_gs_gsapi_new_instance+set}" = set; then
+if test "${ac_cv_lib_gs_gsapi_new_instance+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgs $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5632,43 +5050,18 @@ return gsapi_new_instance ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_gs_gsapi_new_instance=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_gs_gsapi_new_instance=no
+ ac_cv_lib_gs_gsapi_new_instance=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gs_gsapi_new_instance" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gs_gsapi_new_instance" >&5
$as_echo "$ac_cv_lib_gs_gsapi_new_instance" >&6; }
-if test "x$ac_cv_lib_gs_gsapi_new_instance" = x""yes; then
+if test "x$ac_cv_lib_gs_gsapi_new_instance" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGS 1
_ACEOF
@@ -5686,19 +5079,14 @@ fi
if test "$HAVE_LIBGS" -eq 0; then
-
-{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5716,43 +5104,18 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
@@ -5761,26 +5124,20 @@ _ACEOF
else
-cat >>confdefs.h <<\_ACEOF
-#define DISABLE_GS 1
-_ACEOF
+$as_echo "#define DISABLE_GS 1" >>confdefs.h
- { $as_echo "$as_me:$LINENO: WARNING: PostScript support disabled" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PostScript support disabled" >&5
$as_echo "$as_me: WARNING: PostScript support disabled" >&2;}
fi
else
# query Ghostscript version
- { $as_echo "$as_me:$LINENO: checking Ghostscript version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ghostscript version" >&5
$as_echo_n "checking Ghostscript version... " >&6; }
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
gsversion=unknown
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <ghostscript/iapi.h>
@@ -5790,159 +5147,252 @@ cat >>conftest.$ac_ext <<_ACEOF
FILE *f;
f = fopen("gsversion", "w");
if (!f) exit(1);
- fprintf(f, "%d\n", r.revision);
+ fprintf(f, "%ld\n", r.revision);
fclose(f);
exit(0);
}
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gsversion=`cat gsversion|cut -c1-3`
+if ac_fn_c_try_run "$LINENO"; then :
+ gsversion=`cat gsversion`
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gsversion=
+ gsversion=
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
- { $as_echo "$as_me:$LINENO: result: \"$gsversion\"" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$gsversion\"" >&5
$as_echo "\"$gsversion\"" >&6; }
- rm -f gsversion >/dev/null
+ rm -f gsversion
if test "$gsversion" -lt 831; then
# current Ghostscript API was introduced in version 8.31
# older versions are not supported
LIBS=`echo $LIBS | sed "s/-lgs //" $LIBS`
-cat >>confdefs.h <<\_ACEOF
-#define DISABLE_GS 1
-_ACEOF
+$as_echo "#define DISABLE_GS 1" >>confdefs.h
- { $as_echo "$as_me:$LINENO: WARNING: Ghostscript version < 8.31; PostScript support disabled" >&5
-$as_echo "$as_me: WARNING: Ghostscript version < 8.31; PostScript support disabled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ghostscript version < 8.31 found; PostScript support disabled" >&5
+$as_echo "$as_me: WARNING: Ghostscript version < 8.31 found; PostScript support disabled" >&2;}
fi
fi
-# Check for libraries.
+# Check for pkg-config
+
-{ $as_echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
-$as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
-if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfreetype $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char FT_Init_FreeType ();
-int
-main ()
-{
-return FT_Init_FreeType ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+ ;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_freetype_FT_Init_FreeType=yes
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
- ac_cv_lib_freetype_FT_Init_FreeType=no
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
-$as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
-if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBFREETYPE 1
-_ACEOF
- LIBS="-lfreetype $LIBS"
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+
+# Check for libraries.
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
+$as_echo_n "checking for FREETYPE... " >&6; }
+
+if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
else
- { { $as_echo "$as_me:$LINENO: error: freetype library not found, please install it first" >&5
-$as_echo "$as_me: error: freetype library not found, please install it first" >&2;}
- { (exit 1); exit 1; }; }
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1`
+ else
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FREETYPE_PKG_ERRORS" >&5
+ as_fn_error "Package requirements (freetype2) were not met:
+$FREETYPE_PKG_ERRORS
-{ $as_echo "$as_me:$LINENO: checking for gzopen in -lz" >&5
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables FREETYPE_CFLAGS
+and FREETYPE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables FREETYPE_CFLAGS
+and FREETYPE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
+ FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
+LDFLAGS="$LDFLAGS ${FREETYPE_LIBS}"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
$as_echo_n "checking for gzopen in -lz... " >&6; }
-if test "${ac_cv_lib_z_gzopen+set}" = set; then
+if test "${ac_cv_lib_z_gzopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -5960,43 +5410,18 @@ return gzopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_gzopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_z_gzopen=no
+ ac_cv_lib_z_gzopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzopen" >&5
$as_echo "$ac_cv_lib_z_gzopen" >&6; }
-if test "x$ac_cv_lib_z_gzopen" = x""yes; then
+if test "x$ac_cv_lib_z_gzopen" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
@@ -6005,27 +5430,17 @@ _ACEOF
fi
-#AC_CHECK_FUNC(getopt_long, , EXTRA_OBJS="$EXTRA_OBJS getopt.o getopt1.o")
# Check for header files.
-
-
-
-
-
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
@@ -6039,41 +5454,18 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_ac_Header
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
@@ -6084,17 +5476,13 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -6119,70 +5507,39 @@ for ac_lib in '' dir; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_opendir=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
else
ac_cv_search_opendir=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
else
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -6207,70 +5564,39 @@ for ac_lib in '' x; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_opendir=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
else
ac_cv_search_opendir=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -6285,48 +5611,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -6336,18 +5637,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -6357,14 +5654,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -6391,201 +5684,31 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-
-
-
-
-
for ac_header in libintl.h stdlib.h string.h strings.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------- ##
-## Report this to martin.gieseking@uos.de ##
-## -------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6596,16 +5719,12 @@ done
# Check for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if test "${ac_cv_header_stdbool_h+set}" = set; then
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdbool.h>
@@ -6685,131 +5804,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdbool_h=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdbool_h=no
+ ac_cv_header_stdbool_h=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
$as_echo "$ac_cv_header_stdbool_h" >&6; }
-{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5
-$as_echo_n "checking for _Bool... " >&6; }
-if test "${ac_cv_type__Bool+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type__Bool=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (_Bool))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((_Bool)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type__Bool=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-$as_echo "$ac_cv_type__Bool" >&6; }
-if test "x$ac_cv_type__Bool" = x""yes; then
+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
@@ -6820,22 +5825,16 @@ fi
if test $ac_cv_header_stdbool_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STDBOOL_H 1
-_ACEOF
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then
+if test "${ac_cv_c_const+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -6895,56 +5894,29 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
+if test "${ac_cv_c_inline+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -6953,41 +5925,17 @@ $ac_kw foo_t foo () {return 0; }
#endif
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_inline=$ac_kw
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
test "$ac_cv_c_inline" != no && break
done
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
$as_echo "$ac_cv_c_inline" >&6; }
-
case $ac_cv_c_inline in
inline | yes) ;;
*)
@@ -7003,102 +5951,9 @@ _ACEOF
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((size_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_size_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -7107,16 +5962,12 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
+if test "${ac_cv_struct_tm+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
@@ -7131,59 +5982,32 @@ struct tm tm;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_struct_tm=time.h
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
# Check for library functions.
-{ $as_echo "$as_me:$LINENO: checking whether closedir returns void" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
$as_echo_n "checking whether closedir returns void... " >&6; }
-if test "${ac_cv_func_closedir_void+set}" = set; then
+if test "${ac_cv_func_closedir_void+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_closedir_void=yes
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
#include <$ac_header_dirent>
@@ -7199,63 +6023,30 @@ return closedir (opendir (".")) != 0;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_closedir_void=no
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_closedir_void=yes
+ ac_cv_func_closedir_void=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
$as_echo "$ac_cv_func_closedir_void" >&6; }
if test $ac_cv_func_closedir_void = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define CLOSEDIR_VOID 1
-_ACEOF
+$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for error_at_line" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
$as_echo_n "checking for error_at_line... " >&6; }
-if test "${ac_cv_lib_error_at_line+set}" = set; then
+if test "${ac_cv_lib_error_at_line+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <error.h>
int
@@ -7266,40 +6057,15 @@ error_at_line (0, 0, "", 0, "an error occurred");
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_error_at_line=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_error_at_line=no
+ ac_cv_lib_error_at_line=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
$as_echo "$ac_cv_lib_error_at_line" >&6; }
if test $ac_cv_lib_error_at_line = no; then
case " $LIBOBJS " in
@@ -7310,170 +6076,27 @@ esac
fi
-
for ac_header in stdlib.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------- ##
-## Report this to martin.gieseking@uos.de ##
-## -------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDLIB_H 1
_ACEOF
fi
done
-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_malloc_0_nonnull=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
# include <stdlib.h>
@@ -7489,55 +6112,24 @@ return ! malloc (0);
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_malloc_0_nonnull=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_malloc_0_nonnull=no
+ ac_cv_func_malloc_0_nonnull=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC 1
-_ACEOF
+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
else
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC 0
-_ACEOF
+ $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
case " $LIBOBJS " in
*" malloc.$ac_objext "* ) ;;
@@ -7546,37 +6138,30 @@ _ACEOF
esac
-cat >>confdefs.h <<\_ACEOF
-#define malloc rpl_malloc
-_ACEOF
+$as_echo "#define malloc rpl_malloc" >>confdefs.h
fi
-
-{ $as_echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
-$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
$as_echo_n "(cached) " >&6
else
rm -f conftest.sym conftest.file
echo >conftest.file
if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_lstat_dereferences_slashed_symlink=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
struct stat sbuf;
- /* Linux will dereference the symlink and fail.
+ /* Linux will dereference the symlink and fail, as required by POSIX.
That is better in the sense that it means we will not
have to compile and use the lstat wrapper. */
return lstat ("conftest.sym/", &sbuf) == 0;
@@ -7584,42 +6169,15 @@ struct stat sbuf;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_lstat_dereferences_slashed_symlink=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_lstat_dereferences_slashed_symlink=no
+ ac_cv_func_lstat_dereferences_slashed_symlink=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
else
# If the `ln -s' command failed, then we probably don't even
# have an lstat function.
@@ -7628,7 +6186,7 @@ fi
rm -f conftest.sym conftest.file
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
@@ -7638,7 +6196,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
case " $LIBOBJS " in
*" lstat.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS lstat.$ac_objext"
@@ -7647,19 +6205,15 @@ esac
fi
-{ $as_echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
$as_echo_n "checking whether stat accepts an empty string... " >&6; }
-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
+if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_stat_empty_string_bug=yes
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -7671,44 +6225,17 @@ struct stat sbuf;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_stat_empty_string_bug=no
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_stat_empty_string_bug=yes
+ ac_cv_func_stat_empty_string_bug=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
if test $ac_cv_func_stat_empty_string_bug = yes; then
case " $LIBOBJS " in
@@ -7724,194 +6251,18 @@ _ACEOF
fi
-
for ac_func in vprintf
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_VPRINTF 1
_ACEOF
-{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
-$as_echo_n "checking for _doprnt... " >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func__doprnt=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func__doprnt=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-$as_echo "$ac_cv_func__doprnt" >&6; }
-if test "x$ac_cv_func__doprnt" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
fi
@@ -7919,102 +6270,12 @@ fi
done
-
-
-
for ac_func in memset strcasecmp strtol
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -8027,19 +6288,9 @@ done
# currently these libraries are mandatory; the --with-foo options
# are used to specify the locations explicitely
-# Check whether --with-freetype was given.
-if test "${with_freetype+set}" = set; then
- withval=$with_freetype; if test "$withval" != no; then
- if test "$withval" != yes; then
- FREETYPE_DIR=$withval
- fi
- fi
-fi
-
-
# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
+if test "${with_zlib+set}" = set; then :
withval=$with_zlib; if test "$withval" != no; then
if test "$withval" != yes; then
ZLIB_DIR=$withval
@@ -8049,103 +6300,6 @@ fi
if test "$withval" != no; then
- if test -n "$FREETYPE_DIR"; then
- # Extract the first word of "freetype-config", so it can be a program name with args.
-set dummy freetype-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $FREETYPE_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$FREETYPE_DIR/bin:$PATH"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
-if test -n "$FREETYPE_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5
-$as_echo "$FREETYPE_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- else
- # Extract the first word of "freetype-config", so it can be a program name with args.
-set dummy freetype-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $FREETYPE_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
-if test -n "$FREETYPE_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5
-$as_echo "$FREETYPE_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-
- if test -n "$FREETYPE_CONFIG"; then
- CPPFLAGS=`$CPPFLAGS $FREETYPE_CONFIG --cflags`
- if test -n "$FREETYPE_DIR"; then
- CPPFLAGS="$CPPFLAGS -I$FREETYPE_DIR/include"
- fi
- else
- if test -n "$FREETYPE_DIR"; then
- CPPFLAGS="$CPPFLAGS -I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
- LDFLAGS="$LDFLAGS -L$FREETYPE_DIR/lib"
- fi
- fi
-
if test -n "$ZLIB_DIR"; then
CPPFLAGS="$CPPFLAGS -I$ZLIB_DIR -I$ZLIB_DIR/include"
LDFLAGS="$LDFLAGS -L$ZLIB_DIR/lib"
@@ -8156,7 +6310,6 @@ fi
-
ac_config_files="$ac_config_files Makefile potracelib/Makefile src/Makefile tests/Makefile doc/dvisvgm.txt doc/Makefile"
cat >confcache <<\_ACEOF
@@ -8186,13 +6339,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -8200,8 +6353,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -8224,11 +6377,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
@@ -8248,8 +6401,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -8265,34 +6418,26 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -8302,17 +6447,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -8320,23 +6466,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -8344,7 +6482,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -8355,7 +6499,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -8378,13 +6522,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -8394,15 +6531,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -8414,12 +6551,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -8431,7 +6572,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -8445,8 +6668,12 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -8466,76 +6693,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -8564,8 +6740,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -8584,10 +6808,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -8602,13 +6826,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvisvgm $as_me 0.8.7, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+This file was extended by dvisvgm $as_me 1.0.1, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -8640,13 +6870,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -8665,16 +6897,17 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <martin.gieseking@uos.de>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvisvgm config.status 0.8.7
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+dvisvgm config.status 1.0.1
+configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -8710,6 +6943,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@ -8717,20 +6952,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
+ as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -8738,11 +6972,10 @@ Try \`$0 --help' for more information." >&2
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -8802,9 +7035,7 @@ do
"doc/dvisvgm.txt") CONFIG_FILES="$CONFIG_FILES doc/dvisvgm.txt" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -8831,7 +7062,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
@@ -8842,11 +7073,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -8854,10 +7081,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
-ac_cr=' '
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -8871,24 +7104,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -8910,7 +7137,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -8924,7 +7151,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -8977,9 +7204,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -9020,9 +7245,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -9107,9 +7330,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -9122,9 +7343,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -9152,12 +7371,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -9168,7 +7385,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
@@ -9181,9 +7398,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -9211,47 +7426,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
@@ -9308,7 +7483,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
ac_sed_dataroot='
/datarootdir/ {
p
@@ -9318,12 +7492,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -9333,7 +7506,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -9362,14 +7535,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
@@ -9379,9 +7550,7 @@ which seems to be undefined. Please make sure it is defined." >&2;}
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -9392,25 +7561,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -9448,7 +7611,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -9543,47 +7706,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
@@ -9595,15 +7718,12 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -9624,10 +7744,11 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure.ac
index a706c0191ea..2a5fde916eb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/configure.ac
@@ -1,11 +1,11 @@
# This file is part of dvisvgm
-# Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de>
+# Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>
#
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[0.8.7],[martin.gieseking@uos.de])
-DATE="August 2009"
+AC_INIT([dvisvgm],[1.0.1],[martin.gieseking@uos.de])
+DATE="May 2010"
AC_CONFIG_SRCDIR(src)
AC_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
@@ -24,39 +24,30 @@ AC_LANG(C)
AC_CHECK_FUNCS([ftime gettimeofday])
AC_CHECK_HEADERS([sys/time.h sys/timeb.h])
-
-# Check whether MikTeX import libraries should be linked
-case $host in
- *-mingw32* | *-windows*)
- CPPFLAGS="$CPPFLAGS -DMIKTEX"
- EXTRA_LIBS="miktex-core.a miktex-kps.a"
- ;;
- *)
- AC_CHECK_HEADER([kpathsea/kpathsea.h], ,
- [AC_MSG_ERROR([please install the kpathsea development package])])
- AC_CHECK_LIB(kpathsea, kpse_find_file, ,
- [AC_MSG_ERROR([libkpathsea not found, please install the corresponding package first])])
-
- AC_MSG_CHECKING([kpathsea version])
- AC_TRY_RUN([#include <stdio.h>
- #include <kpathsea/kpathsea.h>
- extern char *kpathsea_version_string;
- int main() {
- FILE *f;
- f = fopen("conftestval", "w");
- if(!f) exit(1);
- fprintf(f, "%s\n", kpathsea_version_string);
- fclose(f);
- exit(0);
- }],
- [kpseversion=`cat conftestval`], [kpseversion=], [kpseversion=unknown])
-# AC_RESTORE_FLAGS
- AC_MSG_RESULT("$kpseversion")
- if test -z "$kpseversion"; then
- AC_MSG_ERROR([Could not compile a simple kpathsea program -- check your installation])
- fi
- ;;
-esac
+AC_HEADER_TIOCGWINSZ
+
+AC_CHECK_HEADER([kpathsea/kpathsea.h], ,
+ [AC_MSG_ERROR([please install the kpathsea development package])])
+AC_CHECK_LIB(kpathsea, kpse_find_file, ,
+ [AC_MSG_ERROR([libkpathsea not found, please install the corresponding package first])])
+
+AC_MSG_CHECKING([kpathsea version])
+AC_RUN_IFELSE([#include <stdio.h>
+ #include <kpathsea/kpathsea.h>
+ int main() {
+ FILE *f;
+ f = fopen("kpseversion", "w");
+ if(!f) exit(1);
+ fprintf(f, "%s\n", KPSEVERSION);
+ fclose(f);
+ exit(0);
+ }],
+ [kpseversion=`cat kpseversion|sed 's/kpathsea version //'`], [kpseversion=], [kpseversion=unknown])
+AC_MSG_RESULT("$kpseversion")
+rm -f kpseversion
+if test -z "$kpseversion"; then
+ AC_MSG_ERROR([Could not compile a simple kpathsea program -- check your installation])
+fi
# Check how to link potracelib
@@ -79,12 +70,12 @@ AC_CHECK_HEADER([ghostscript/iapi.h],
if test "$HAVE_LIBGS" -eq 0; then
AC_CHECK_LIB(dl, dlopen, ,
- [AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])
+ [AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support is to be disabled])
AC_MSG_WARN(PostScript support disabled)])
else
# query Ghostscript version
AC_MSG_CHECKING([Ghostscript version])
- AC_TRY_RUN([#include <stdio.h>
+ AC_RUN_IFELSE([#include <stdio.h>
#include <ghostscript/iapi.h>
int main () {
gsapi_revision_t r;
@@ -92,29 +83,32 @@ else
FILE *f;
f = fopen("gsversion", "w");
if (!f) exit(1);
- fprintf(f, "%d\n", r.revision);
+ fprintf(f, "%ld\n", r.revision);
fclose(f);
exit(0);
}
}],
- [gsversion=`cat gsversion|cut -c1-3`], [gsversion=], [gsversion=unknown])
+ [gsversion=`cat gsversion`], [gsversion=], [gsversion=unknown])
AC_MSG_RESULT("$gsversion")
- rm -f gsversion >/dev/null
+ rm -f gsversion
if test "$gsversion" -lt 831; then
# current Ghostscript API was introduced in version 8.31
# older versions are not supported
LIBS=`echo $LIBS | sed "s/-lgs //" $LIBS`
AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])
- AC_MSG_WARN([Ghostscript version < 8.31; PostScript support disabled])
+ AC_MSG_WARN([Ghostscript version < 8.31 found; PostScript support disabled])
fi
fi
+# Check for pkg-config
+PKG_PROG_PKG_CONFIG
+
# Check for libraries.
-AC_CHECK_LIB(freetype, FT_Init_FreeType, ,
- [AC_MSG_ERROR([freetype library not found, please install it first])])
+PKG_CHECK_MODULES([FREETYPE], [freetype2])
+CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
+LDFLAGS="$LDFLAGS ${FREETYPE_LIBS}"
AC_CHECK_LIB(z, gzopen)
-#AC_CHECK_FUNC(getopt_long, , EXTRA_OBJS="$EXTRA_OBJS getopt.o getopt1.o")
# Check for header files.
AC_HEADER_DIRENT
@@ -139,12 +133,6 @@ AC_CHECK_FUNCS([memset strcasecmp strtol])
# add options for selection of "optional" library locations
# currently these libraries are mandatory; the --with-foo options
# are used to specify the locations explicitely
-AC_ARG_WITH(freetype,[ --with-freetype=DIR location of the FreeType2 library],
- [if test "$withval" != no; then
- if test "$withval" != yes; then
- FREETYPE_DIR=$withval
- fi
- fi])
AC_ARG_WITH(zlib,[ --with-zlib=DIR location of the zlib library],
[if test "$withval" != no; then
@@ -154,34 +142,16 @@ AC_ARG_WITH(zlib,[ --with-zlib=DIR location of the zlib library],
fi])
if test "$withval" != no; then
- if test -n "$FREETYPE_DIR"; then
- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config,,[$FREETYPE_DIR/bin:$PATH])
- else
- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config)
- fi
-
- if test -n "$FREETYPE_CONFIG"; then
- CPPFLAGS=`$CPPFLAGS $FREETYPE_CONFIG --cflags`
- if test -n "$FREETYPE_DIR"; then
- CPPFLAGS="$CPPFLAGS -I$FREETYPE_DIR/include"
- fi
- else
- if test -n "$FREETYPE_DIR"; then
- CPPFLAGS="$CPPFLAGS -I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
- LDFLAGS="$LDFLAGS -L$FREETYPE_DIR/lib"
- fi
- fi
-
if test -n "$ZLIB_DIR"; then
CPPFLAGS="$CPPFLAGS -I$ZLIB_DIR -I$ZLIB_DIR/include"
LDFLAGS="$LDFLAGS -L$ZLIB_DIR/lib"
fi
fi
-
AC_SUBST(DATE)
AC_SUBST(EXTRA_LIBS)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_CONFIG_FILES([Makefile potracelib/Makefile src/Makefile tests/Makefile doc/dvisvgm.txt doc/Makefile])
AC_OUTPUT
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.am
index 2291298f6b2..e9c79906fde 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.am
@@ -2,8 +2,9 @@ man_MANS = dvisvgm.1
EXTRA_DIST = $(man_MANS)
dvisvgm.1: dvisvgm.txt
- if test -f buildman; then \
- a2x -dmanpage -fmanpage -L $<; \
+ if [ `type -p a2x` ]; then \
+ a2x -dmanpage -fmanpage -L -a icons -a 'iconsdir=.' $<; \
+ rm -f dvisvgm.xml; \
fi
dvisvgm.pdf: dvisvgm.1
@@ -17,7 +18,7 @@ dvisvgm.dvi: dvisvgm.1
groff -Tdvi -mandoc ./$< >$@
dvisvgm.html: dvisvgm.txt
- asciidoc --unsafe -dmanpage $<
+ asciidoc -a icons -a 'iconsdir=.' -a badges -a 'revnumber=@VERSION@' --unsafe -dmanpage $<
html: dvisvgm.html
man: dvisvgm.1
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.in
index 0d12cbd77d0..d08fc354c5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -99,7 +99,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_LIBS = @EXTRA_LIBS@
-FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -118,8 +119,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -415,8 +418,9 @@ uninstall-man: uninstall-man1
dvisvgm.1: dvisvgm.txt
- if test -f buildman; then \
- a2x -dmanpage -fmanpage -L $<; \
+ if [ `type -p a2x` ]; then \
+ a2x -dmanpage -fmanpage -L -a icons -a 'iconsdir=.' $<; \
+ rm -f dvisvgm.xml; \
fi
dvisvgm.pdf: dvisvgm.1
@@ -430,7 +434,7 @@ dvisvgm.dvi: dvisvgm.1
groff -Tdvi -mandoc ./$< >$@
dvisvgm.html: dvisvgm.txt
- asciidoc --unsafe -dmanpage $<
+ asciidoc -a icons -a 'iconsdir=.' -a badges -a 'revnumber=@VERSION@' --unsafe -dmanpage $<
html: dvisvgm.html
man: dvisvgm.1
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/dvisvgm.1 b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.1
index 6f51f38e1fa..e3638af6267 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/dvisvgm.1
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.1
@@ -1,13 +1,13 @@
'\" t
.\" Title: dvisvgm
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\" Date: 11/09/2009
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\" Date: 06/11/2010
.\" Manual: dvisvgm Manual
-.\" Source: dvisvgm 0.8.7
+.\" Source: dvisvgm 1.0.1
.\" Language: English
.\"
-.TH "DVISVGM" "1" "11/09/2009" "dvisvgm 0\&.8\&.7" "dvisvgm Manual"
+.TH "DVISVGM" "1" "06/11/2010" "dvisvgm 1\&.0\&.1" "dvisvgm Manual"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -25,19 +25,27 @@ dvisvgm \- converts DVI files to the XML\-based SVG format
\fBdvisvgm\fR [ \fIoptions\fR ] \fIfile\fR [\&.dvi]
.SH "DESCRIPTION"
.sp
-The program \fBdvisvgm\fR generates an SVG file from a given DVI file\&. DVI is the device independent output format produced by TeX and some other typesetting systems\&. Output from groff can be converted to DVI using grodvi\&.
+The command\-line utility \fBdvisvgm\fR converts DVI files, as generated by TeX/LaTeX, to the XML\-based scalable vector graphics format SVG\&. Since the current SVG standard 1\&.1 doesn\(cqt specify multi\-page graphics, \fBdvisvgm\fR creates separate SVG files for each DVI page\&. Because of compatibility reasons, only the first page is converted by default\&. In order to select a different page or arbitrary page sequences, use option \fB\-p\fR which is described below\&.
.sp
-The recent version of \fBdvisvgm\fR provides advanced conversion functionality but currently only one page can be converted even if the DVI file is made up of multiple pages\&. You can select the page to be processed with option \fB\-p\fR\&. \fBdvisvgm\fR should properly convert all pages that are made up of fonts and rules only\&. Additionally, some sets of specials are understood as well\&. For a more detailed overview, see section \fBsupport of specials\fR below\&.
+\fBdvisvgm\fR should properly convert all pages that are made up of fonts and rules only\&. However, the utility also supports a couple of DVI extensions defined in terms of \fIDVI specials\fR\&. For a more detailed overview, see section \fBsupport of specials\fR below\&.
.sp
-Since SVG is a vector based graphics format, \fBdvisvgm\fR tries to convert the glyph outlines of all used fonts into scalable path descriptions\&. The fastest way to do that is to extract the path information from PFB (PostScript Type 1) files\&. So if \fBdvisvgm\fR is able to find a PFB file for a used font, it will read the necessary information from it\&.
+As SVG is a vector based graphics format, \fBdvisvgm\fR tries to convert the glyph outlines of all used fonts into scalable path descriptions\&. The fastest way to do that is to extract the path information from PFB (PostScript Type 1) files\&. So, if \fBdvisvgm\fR is able to find a PFB file for a required font, it will read the necessary information from it\&.
.sp
-TeX\(cqs main source for font descriptions is Metafont which produces bitmap output \&.That\(cqs why not all obtainable TeX fonts are available in PFB format\&. In these cases \fBdvisvgm\fR tries to vectorize Metafont\(cqs output by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB outlines but are nonetheless really nice in most cases\&.
+TeX\(cqs main source for font descriptions is Metafont though, which produces bitmap output\&. That\(cqs why not all obtainable TeX fonts are available in PFB format\&. In these cases \fBdvisvgm\fR tries to vectorize Metafont\(cqs output (GF fonts) by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB outlines but are nonetheless really nice in most cases\&.
.SH "OPTIONS"
.PP
-\fB\-a, \-\-trace\-all\fR
+\fB\-a, \-\-trace\-all\fR=[\fIretrace\fR]
.RS 4
This option forces dvisvgm to trace not just the actually needed glyphs but all glyphs of all bitmap fonts used in the DVI file\&. Since the tracing results are stored in the font cache, all following DVI conversions (without option
-\fB\-\-trace\-all\fR) where these fonts are involved will be much faster\&. By default, dvisvgm traces only the actually needed glyphs and adds them to the cache\&.
+\fB\-\-trace\-all\fR) where these fonts are involved will be much faster\&. By default, dvisvgm traces only the actually needed glyphs and adds them to the cache\&. The boolean option
+\fIretrace\fR
+determines how to handle glyphs that are already stored in the cache\&. By default, these glyphs are skipped\&. Setting argument
+\fIretrace\fR
+to
+\fIyes\fR
+or
+\fItrue\fR
+forces dvisvgm to trace the corresponding bitmaps again\&.
.if n \{\
.sp
.\}
@@ -69,6 +77,9 @@ takes either one of the format specifiers listed below or a sequence of four com
and
\fIy2\fR\&. The latter define two diagonal corners of the bounding box\&. Each length value consists of a floating point number and an optional length unit (pt, bp, cm, mm, in, or pc)\&. If the unit is omitted, TeX points (pt) are assumed\&.
.sp
+It\(cqs also possible to give only one length value
+\fIl\fR\&. In this case the minimal bounding box is computed and enlarged by adding (\-\fIl\fR,\-\fIl\fR) to the upper left and (\fIl\fR,\fIl\fR) to the lower right corner\&.
+.sp
Alternatively, the following format specifiers are supported:
.PP
\fBInternational DIN/ISO paper sizes\fR
@@ -172,6 +183,30 @@ to overwrite the default\&. Furthermore, it is also possible to disable the font
is omitted, dvisvgm prints the path of the default cache directory and some information about the stored fonts\&.
.RE
.PP
+\fB\-\-color\fR
+.RS 4
+Enables colorization of messages printed during the conversion process\&.
+.RE
+.PP
+\fB\-e, \-\-exact\fR
+.RS 4
+If this option is given, dvisvgm computes the precise bounding box of each character\&. By default, the values stored in the font\(cqs TFM file are used to determine a glyph\(cqs extent\&. As these values are intended to realize optimal character placements and are not designed to represent the exact dimensions, they don\(cqt necessarily correspond with the bounds of the visual glyphs\&. Thus, the width and/or height of some glyphs may be larger than the respective TFM values\&. As a result, this can lead to clipped characters at the bounds of the SVG graphic\&. With option
+\fB\-\-exact\fR, dvisvgm analyzes the actual shape of each character and derives a usually tight bounding box\&.
+.RE
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+Prints a short summary of all available command\-line options\&.
+.RE
+.PP
+\fB\-\-libgs=filename\fR
+.RS 4
+This option is only available if the Ghostscript library is not directly linked to dvisvgm and PostScript support was not completely disabled\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so (Linux) or gsdll32\&.dll (Windows)\&. Option
+\fB\-\-libgs\fR
+can be used to give a different name\&. Alternatively, the GS library name can also be set by the environment variable
+\fBLIBGS\fR\&. The latter has a less precedence than the command\-line option\&.
+.RE
+.PP
\fB\-l, \-\-list\-specials\fR
.RS 4
Prints a list of registered special handlers and exits\&. Each handler processes a set of special statements belonging to the same category\&. The categories are identified by the prefix of the special statements\&. It\(cqs usually a leading word separated from the rest of the statement by a colon or a blank, e\&.g\&.
@@ -180,6 +215,11 @@ or
\fIps\fR\&.
.RE
.PP
+\fB\-\-keep\fR
+.RS 4
+Disables the removal of temporary files as created by Metafont (usually \&.gf, \&.tfm, and \&.log files)\&.
+.RE
+.PP
\fB\-m, \-\-map\-file\fR=\fIfile\fR
.RS 4
Sets the map file that is used to look up font names and encodings\&.
@@ -245,23 +285,51 @@ Suppresses the generation of missing font files\&. If
can\(cqt find a font file through the kpathsea lookup mechanism, it calls the external tools mktextfm or mktexmf by default\&. This option disables these calls\&.
.RE
.PP
-\fB\-o, \-\-output\fR=\fIfile\fR
+\fB\-o, \-\-output\fR=\fIpattern\fR
.RS 4
-Sets the name of the output file\&.
-.RE
-.PP
-\fB\-p, \-\-page\fR=\fInumber\fR
-.RS 4
-With this option you can choose the page to be processed\&. Please consider that the parameter of this option don\(cqt refer to the page numbers printed on the page\&. Instead the physical page count is expected, where the first page always gets number 1\&. If this option is omitted, the first page will be selected\&.
+Sets the name pattern of the output file\&. The parameter
+\fIpattern\fR
+is a string that may contain the variables
+\fB%f\fR
+and
+\fB%p\fR\&.
+\fB%f\fR
+stands for the base name of the DVI file, i\&.e\&. the DVI filename without suffix, and
+\fB%p\fR
+is the current page number\&. By default, the pattern is
+\fB%f\-%p\&.svg\fR
+if the DVI file consists of more than one page, and
+\fB%f\&.svg\fR
+otherwise\&. That means, a DVI file
+\fIfoo\&.dvi\fR
+is converted to
+\fIfoo\&.svg\fR
+if
+\fIfoo\&.dvi\fR
+is a single\-page document\&. Otherwise, multiple SVG files
+\fIfoo\-01\&.svg\fR,
+\fIfoo\-02\&.svg\fR, etc\&. are produced\&. In Windows environments, the percent sign is used to get the value of environment variables, and must therefore be protected by a second percent sign, e\&.g\&.
+\fB\-\-output=%%f\-%%p\fR\&.
+.RE
+.PP
+\fB\-p, \-\-page\fR=\fIranges\fR
+.RS 4
+This option sets the pages to be processed\&. Parameter
+\fIranges\fR
+consists of a comma\-separated list of single page numbers and/or page ranges\&. A page range is a pair of numbers separated by a hyphen, e\&.g\&. 5\-12\&. Thus, a page sequence might look like this: 2\-4,6,9\-12,15\&. It doesn\(cqt matter if a page is given more than once or if page ranges overlap\&.
+\fBdvisvgm\fR
+always extracts the page numbers in ascending order and converts them only once\&. In order to stay compatible with previous versions, the default page sequence is 1\&. dvisvgm therefore converts only the first page and not the whole document in case option
+\fB\-\-page\fR
+is not given\&. Usually, page ranges consist of two numbers denoting the first and last page to be converted\&. If the conversion is to be started at page 1, or if it should continue up to the last DVI page, the first or second range number can be omitted, respectively\&. Example:
+\fB\-\-page=\-10\fR
+converts all pages up to page 10,
+\fB\-\-page=10\-\fR
+converts all pages starting with page 10\&. Please consider that the page values don\(cqt refer to the page numbers printed on the page\&. Instead, the physical page count is expected, where the first page always gets number 1\&.
.RE
.PP
-\fB\-P, \-\-progress\fR[=\fIskip\fR]
+\fB\-P, \-\-progress\fR[=\fIdelay\fR]
.RS 4
-Enables a simple progress indicator shown when DVI specials are processed, since this can be a time\-consuming operation, especially when PostScript specials are involved\&. The optional non\-negative parameter
-\fIskip\fR
-controls the indicator length: Every time a set of
-\fIskip\fR
-specials has been processed, an indicator character is printed\&. Therefore, smaller values lead to a longer, more frequently updated progress indicator\&.
+Enables a simple progress indicator shown when time\-consuming operations like PostScript specials are processed\&. The indicator doesn\(cqt appear before the given delay (in seconds)\&. The default delay value is 0\&.5 seconds\&.
.RE
.PP
\fB\-r, \-\-rotate\fR=\fIangle\fR
@@ -507,6 +575,22 @@ and
must be given as plain floating point numbers in TeX point units (1in = 72\&.27pt)\&.
.RE
.PP
+\fBdvisvgm:bbox\fR n[ew] \fIname\fR
+.RS 4
+Defines or resets a local bounding box called
+\fIname\fR\&. The name may consist of letters and digits\&. While processing a DVI page, dvisvgm continuously updates the (global) bounding box of the current page in order to determine the minimal rectangle containing all visible page components (characters, images, drawing elements etc\&.)\&. Additionally to the global bounding box, the user can request an arbitrary number of named local bounding boxes\&. Once defined, these boxes are updated together with the global bounding box starting with the first character that follows the definition\&. Thus, the local boxes can be used to compute the extent of parts of the page\&. This is useful for scenarios where the generated SVG file is post\-processed\&. In conjunction with special dvisvgm:raw, the macro
+\fB{?bbox \fR\fB\fIname\fR\fR\fB}\fR
+expands to the four values
+\fIx\fR,
+\fIy\fR,
+\fIw\fR, and
+\fIh\fR
+(separated by spaces) specifying the coordinates of the upper left corner, width, and height of the local box
+\fIname\fR\&. If box
+\fIname\fR
+wasn\(cqt previously defined, all four values equal zero\&.
+.RE
+.PP
\fBdvisvgm:bbox\fR \fIwidth\fR \fIheight\fR [\fIdepth\fR]
.RS 4
Updates the bounding box of the current page by embedding a virtual rectangle (\fIx\fR,
@@ -568,7 +652,7 @@ introduced its own set of specials in order to embed PostScript code into DVI fi
\fBdvisvgm\fR
is to completely evaluate the PostScript code and to convert a large amount of it to SVG\&. Since PostScript is a rather complex language,
\fBdvisvgm\fR
-does not try to implement its own PostScript interpreter but uses Ghostscript instead\&. The Ghostscript shared library (libgs\&.so on Linux systems, gsdll32\&.dll on Windows) is loaded dynamically during runtime\&. For this reason, it must be installed and reachable through the PATH environment variable\&. If the Ghostscript library cannot be found, the evaluation of PostScript specials is disabled\&. Use option
+does not try to implement its own PostScript interpreter but uses Ghostscript instead\&. If the Ghostscript library was not linked while building dvisvgm, it is looked up and dynamically loaded during runtime\&. In this case, dvisvgm looks for libgs\&.so on Linux systems, and gsdll32\&.dll on Windows\&. You can override these default file names with the environment variable LIBGS\&. The library must be installed and reachable through the PATH environment variable\&. If it cannot be found, the evaluation of PostScript specials is disabled\&. Use option
\fB\-\-list\-specials\fR
to check whether PS support is available, i\&.e\&. the entry
\fIps\fR
@@ -632,6 +716,8 @@ Converts first page of \fIfile\&.dvi\fR to \fIfile\&.svg\fR where three transfor
.sp
\fBdvisvgm\fR uses the \fBkpathsea\fR library for locating the files that it opens\&. Hence, the environment variables described in the library\(cqs documentation influence the converter\&.
.sp
+If dvisvgm was linked without the Ghostscript library and PostScript support has not been disabled, the shared Ghostscript library is looked up during runtime\&. The environment variable LIBGS can be used to specify the file name of library\&.
+.sp
The pre\-compiled Windows version of \fBdvisvgm\fR requires a working installation of MiKTeX 2\&.7 or above\&. To enable evaluation of PostScript specials, the original Ghostscript DLL must be present\&.
.SH "FILES"
.sp
@@ -733,4 +819,4 @@ http://sourceforge\&.net/projects/dvisvgm
Written by Martin Gieseking <martin\&.gieseking@uos\&.de>
.SH "COPYING"
.sp
-Copyright \(co 2005\-2009 by Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
+Copyright \(co 2005\-2010 by Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/dvisvgm.txt.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.txt.in
index 48690a5136a..3003fb44e16 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/doc/dvisvgm.txt.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/doc/dvisvgm.txt.in
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////
// This file is part of dvisvgm -- the DVI to SVG converter //
-// Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> //
+// Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> //
// //
// This program is free software; you can redistribute it and/or //
// modify it under the terms of the GNU General Public License as //
@@ -22,8 +22,6 @@ Martin Gieseking <@PACKAGE_BUGREPORT@>
:man source: dvisvgm
:man version: @VERSION@
:man manual: dvisvgm Manual
-:icons: 1
-:iconsdir: .
NAME
----
@@ -37,49 +35,56 @@ SYNOPSIS
DESCRIPTION
-----------
-The program *dvisvgm* generates an SVG file from a given DVI file.
-DVI is the device independent output format produced by TeX and some other
-typesetting systems. Output from groff can be converted to DVI using grodvi.
-
-The recent version of *dvisvgm* provides advanced conversion functionality but currently
-only one page can be converted even if the DVI file is made up of multiple pages.
-You can select the page to be processed with option *-p*. *dvisvgm* should properly convert
-all pages that are made up of fonts and rules only. Additionally, some
-sets of specials are understood as well. For a more detailed overview, see
-section *support of specials* below.
-
-Since SVG is a vector based graphics format, *dvisvgm* tries to convert the glyph
+The command-line utility *dvisvgm* converts DVI files, as generated by TeX/LaTeX, to the
+XML-based scalable vector graphics format SVG. Since the current SVG standard 1.1 doesn't
+specify multi-page graphics, *dvisvgm* creates separate SVG files for each DVI page.
+Because of compatibility reasons, only the first page is converted by default. In order
+to select a different page or arbitrary page sequences, use option *-p* which is described below.
+
+*dvisvgm* should properly convert all pages that are made up of fonts and rules only.
+However, the utility also supports a couple of DVI extensions defined in terms of 'DVI specials'.
+For a more detailed overview, see section *support of specials* below.
+
+As SVG is a vector based graphics format, *dvisvgm* tries to convert the glyph
outlines of all used fonts into scalable path descriptions. The fastest way to do that
-is to extract the path information from PFB (PostScript Type 1) files. So if *dvisvgm* is able
-to find a PFB file for a used font, it will read the necessary information from it.
+is to extract the path information from PFB (PostScript Type 1) files. So, if *dvisvgm* is able
+to find a PFB file for a required font, it will read the necessary information from it.
-TeX's main source for font descriptions is Metafont which produces bitmap output .That's why
+TeX's main source for font descriptions is Metafont though, which produces bitmap output. That's why
not all obtainable TeX fonts are available in PFB format. In these cases *dvisvgm* tries
-to vectorize Metafont's output by tracing the glyph bitmaps. The results are not as perfect
-as most (manually optimized) PFB outlines but are nonetheless really nice in most cases.
+to vectorize Metafont's output (GF fonts) by tracing the glyph bitmaps. The results are not
+as perfect as most (manually optimized) PFB outlines but are nonetheless really nice in most cases.
OPTIONS
-------
-*-a, --trace-all*::
+*-a, --trace-all*=['retrace']::
This option forces dvisvgm to trace not just the actually needed glyphs but all
glyphs of all bitmap fonts used in the DVI file. Since the tracing results are stored in
the font cache, all following DVI conversions (without option *--trace-all*) where these
fonts are involved will be much faster. By default, dvisvgm traces only the actually
-needed glyphs and adds them to the cache.
+needed glyphs and adds them to the cache.
+The boolean option 'retrace' determines how to handle glyphs that are already stored in the cache.
+By default, these glyphs are skipped. Setting argument 'retrace' to 'yes' or
+'true' forces dvisvgm to trace the corresponding bitmaps again.
+
[NOTE]
This option only takes affect if font caching is active. Thus, *--trace-all* cannot be
combined with option *--cache=none*.
+
+
*-b, --bbox*='fmt'::
Sets the bounding box of the generated graphic to the specified format. The parameter 'fmt'
takes either one of the format specifiers listed below or a sequence of four comma- or
-whitespace-separated length values 'x1', 'y1', 'x2' and 'y2'. The latter define two diagonal
-corners of the bounding box. Each length value consists of a floating point number and an optional
+whitespace-separated length values 'x1', 'y1', 'x2' and 'y2'. The latter define two diagonal
+corners of the bounding box. Each length value consists of a floating point number and an optional
length unit (pt, bp, cm, mm, in, or pc). If the unit is omitted, TeX points (pt) are assumed.
+
+It's also possible to give only one length value 'l'. In this case the minimal bounding box
+is computed and enlarged by adding (-'l',-'l') to the upper left and ('l','l') to the lower
+right corner.
++
Alternatively, the following format specifiers are supported:
*International DIN/ISO paper sizes*;;
@@ -125,6 +130,33 @@ to disable the font caching mechanism completely with option *--cache=none*. If
dvisvgm prints the path of the default cache directory and some information about the stored fonts.
+*--color*::
+Enables colorization of messages printed during the conversion process.
+
+
+*-e, --exact*::
+If this option is given, dvisvgm computes the precise bounding box of each character. By default,
+the values stored in the font's TFM file are used to determine a glyph's extent. As these values are
+intended to realize optimal character placements and are not designed to represent the exact dimensions,
+they don't necessarily correspond with the bounds of the visual glyphs. Thus, the width and/or height
+of some glyphs may be larger than the respective TFM values. As a result, this can lead to clipped
+characters at the bounds of the SVG graphic. With option *--exact*, dvisvgm analyzes the actual shape
+of each character and derives a usually tight bounding box.
+
+
+*-h, --help*::
+Prints a short summary of all available command-line options.
+
+
+*--libgs=filename*::
+This option is only available if the Ghostscript library is not directly linked to dvisvgm and
+PostScript support was not completely disabled. In this case, dvisvgm tries to load the shared
+GS library dynamically during runtime. By default, it expects the library's name to be libgs.so (Linux)
+or gsdll32.dll (Windows). Option *--libgs* can be used to give a different name. Alternatively,
+the GS library name can also be set by the environment variable *LIBGS*. The latter has a less
+precedence than the command-line option.
+
+
*-l, --list-specials*::
Prints a list of registered special handlers and exits. Each handler processes a set of special
statements belonging to the same category. The categories are identified by the
@@ -132,6 +164,10 @@ prefix of the special statements. It's usually a leading word
separated from the rest of the statement by a colon or a blank, e.g. 'color' or 'ps'.
+*--keep*::
+Disables the removal of temporary files as created by Metafont (usually .gf, .tfm, and .log files).
+
+
*-m, --map-file*='file'::
Sets the map file that is used to look up font names and encodings. *dvisvgm* does not provide
its own map file but tries to use available ones coming with *dvips* or *dvipdfm*. If
@@ -177,23 +213,38 @@ through the kpathsea lookup mechanism, it calls the external tools mktextfm or m
default. This option disables these calls.
-*-o, --output*='file'::
-Sets the name of the output file.
+*-o, --output*='pattern'::
+Sets the name pattern of the output file. The parameter 'pattern' is a string that may
+contain the variables *%f* and *%p*. *%f* stands for the base name of the DVI file, i.e.
+the DVI filename without suffix, and *%p* is the current page number.
+By default, the pattern is *%f-%p.svg* if the DVI file consists of more than one page, and
+*%f.svg* otherwise. That means, a DVI file 'foo.dvi' is converted to 'foo.svg' if 'foo.dvi'
+is a single-page document. Otherwise, multiple SVG files 'foo-01.svg', 'foo-02.svg', etc. are
+produced. In Windows environments, the percent sign is used to get the value of environment
+variables, and must therefore be protected by a second percent sign, e.g. *--output=%%f-%%p*.
+
+
+*-p, --page*='ranges'::
+This option sets the pages to be processed. Parameter 'ranges' consists of a comma-separated list
+of single page numbers and/or page ranges. A page range is a pair of numbers separated by a hyphen,
+e.g. 5-12. Thus, a page sequence might look like this: 2-4,6,9-12,15. It doesn't matter if a page
+is given more than once or if page ranges overlap. *dvisvgm* always extracts the page numbers in
+ascending order and converts them only once.
+In order to stay compatible with previous versions, the default page sequence is 1. dvisvgm
+therefore converts only the first page and not the whole document in case option *--page* is not given.
+Usually, page ranges consist of two numbers denoting the first and last page to be converted.
+If the conversion is to be started at page 1, or if it should continue up to the last DVI page, the
+first or second range number can be omitted, respectively. Example: *--page=-10* converts all
+pages up to page 10, *--page=10-* converts all pages starting with page 10.
+Please consider that the page values don't refer to the page numbers printed on the page.
+Instead, the physical page count is expected, where the first page always gets number 1.
-*-p, --page*='number'::
-With this option you can choose the page to be processed. Please consider that the parameter
-of this option don't refer to the page numbers printed on the page. Instead the physical page
-count is expected, where the first page always gets number 1.
-If this option is omitted, the first page will be selected.
+*-P, --progress*[='delay']::
+Enables a simple progress indicator shown when time-consuming operations like
+PostScript specials are processed. The indicator doesn't appear before the given
+delay (in seconds). The default delay value is 0.5 seconds.
-*-P, --progress*[='skip']::
-Enables a simple progress indicator shown when DVI specials are processed,
-since this can be a time-consuming operation, especially when PostScript specials are
-involved. The optional non-negative parameter 'skip' controls the indicator length:
-Every time a set of 'skip' specials has been processed, an indicator character
-is printed. Therefore, smaller values lead to a longer, more frequently updated
-progress indicator.
*-r, --rotate*='angle'::
Rotates page content clockwise by 'angle' degrees around the page center.
@@ -293,6 +344,11 @@ By adding these values you can combine the categories. The default level is 7, i
messages are printed.
+
+
+*-V, --version*::
+Prints the version number and exits.
+
+
*-z, --zip*[='level']::
Creates a compressed SVG file with suffix .svgz. The optional argument specifies the compression
level. Valid values are in the range of 1 to 9 (default is 9). Larger values cause better compression
@@ -332,6 +388,18 @@ exact syntax, see the documentation of *dvips*, for instance.
can be used here. However, *dvisvgm* does not check the file format or the file name suffix. The lengths 'width'
and 'height' must be given as plain floating point numbers in TeX point units (1in = 72.27pt).
+ *dvisvgm:bbox* n[ew] 'name';;
+ Defines or resets a local bounding box called 'name'. The name may consist of letters and digits.
+ While processing a DVI page, dvisvgm continuously updates the (global) bounding box of the current page in order to
+ determine the minimal rectangle containing all visible page components (characters, images, drawing elements etc.).
+ Additionally to the global bounding box, the user can request an arbitrary number of named local bounding boxes.
+ Once defined, these boxes are updated together with the global bounding box starting with the first character that
+ follows the definition. Thus, the local boxes can be used to compute the extent of parts of the page. This is useful
+ for scenarios where the generated SVG file is post-processed.
+ In conjunction with special dvisvgm:raw, the macro *{?bbox 'name'}* expands to the four values 'x', 'y', 'w', and 'h'
+ (separated by spaces) specifying the coordinates of the upper left corner, width, and height of the local box 'name'.
+ If box 'name' wasn't previously defined, all four values equal zero.
+
*dvisvgm:bbox* 'width' 'height' ['depth'];;
Updates the bounding box of the current page by embedding a virtual rectangle ('x', 'y', 'width', 'height')
where the lower left corner is located at the current DVI drawing position ('x','y'). If the optional parameter 'depth'
@@ -375,10 +443,12 @@ A description of the command syntax can be found in the DVI driver documentation
The famous DVI driver *dvips* introduced its own set of specials in order to embed PostScript code into DVI files,
which greatly improves the capabilities of DVI documents. One aim of *dvisvgm* is to completely evaluate the
PostScript code and to convert a large amount of it to SVG.
-Since PostScript is a rather complex language, *dvisvgm* does not try to implement its own PostScript interpreter but uses
-Ghostscript instead. The Ghostscript shared library (libgs.so on Linux systems, gsdll32.dll on Windows) is loaded dynamically
-during runtime. For this reason, it must be installed and reachable through the PATH environment variable. If the Ghostscript
-library cannot be found, the evaluation of PostScript specials is disabled. Use option *--list-specials* to check whether
+Since PostScript is a rather complex language, *dvisvgm* does not try to implement its own PostScript interpreter but uses
+Ghostscript instead. If the Ghostscript library was not linked while building dvisvgm, it is looked up and dynamically loaded
+during runtime. In this case, dvisvgm looks for libgs.so on Linux systems, and gsdll32.dll on Windows. You can override these
+default file names with the environment variable LIBGS.
+The library must be installed and reachable through the PATH environment variable. If it cannot
+be found, the evaluation of PostScript specials is disabled. Use option *--list-specials* to check whether
PS support is available, i.e. the entry 'ps' is present.
*tpic*::
@@ -416,6 +486,10 @@ ENVIRONMENT
files that it opens. Hence, the environment variables described in
the library's documentation influence the converter.
+If dvisvgm was linked without the Ghostscript library and PostScript support has not been disabled,
+the shared Ghostscript library is looked up during runtime. The environment variable LIBGS can be
+used to specify the file name of library.
+
The pre-compiled Windows version of *dvisvgm* requires a working installation of MiKTeX 2.7 or above.
To enable evaluation of PostScript specials, the original Ghostscript DLL must be present.
@@ -453,7 +527,7 @@ Written by {author} <{email}>
COPYING
-------
-Copyright (C) 2005-2009 by Martin Gieseking. Free use of this software is
+Copyright (C) 2005-2010 by Martin Gieseking. Free use of this software is
granted under the terms of the GNU General Public License (GPL) version 3
or, (at your option) any later version.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.am
index 97bf78f50f4..97bf78f50f4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.am
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.in
index 38a0077e9c7..01af70e8ac1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -92,7 +92,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_LIBS = @EXTRA_LIBS@
-FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -111,8 +112,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/auxiliary.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/auxiliary.h
index 7baab851cff..7baab851cff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/auxiliary.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/auxiliary.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/bitmap.h
index 2a172b1ad6a..2a172b1ad6a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/bitmap.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/curve.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.c
index 0dc1005b36e..0dc1005b36e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/curve.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/curve.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.h
index 45c0790bee3..45c0790bee3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/curve.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/curve.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/decompose.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.c
index f54df3b7e78..f54df3b7e78 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/decompose.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/decompose.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.h
index 512baf14d21..512baf14d21 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/decompose.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/decompose.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/lists.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/lists.h
index 931cbb04a73..931cbb04a73 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/lists.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/lists.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/potracelib.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.c
index 2b247b6a125..2b247b6a125 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/potracelib.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/potracelib.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.h
index 5791d1d73d6..5791d1d73d6 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/potracelib.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/potracelib.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/progress.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/progress.h
index 0e077430d7f..0e077430d7f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/progress.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/progress.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/trace.c b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.c
index bd193f57218..bd193f57218 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/trace.c
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.c
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/trace.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.h
index b1e05a649f5..b1e05a649f5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/potracelib/trace.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/potracelib/trace.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BgColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.cpp
index 2cd78531312..26806694edf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BgColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.cpp
@@ -2,9 +2,9 @@
** BgColorSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include "BgColorSpecialHandler.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BgColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.h
index 4c76c7f59ec..cecfb39339c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BgColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BgColorSpecialHandler.h
@@ -2,9 +2,9 @@
** BgColorSpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef BGCOLORSPECIALHANDLER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Bitmap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.cpp
index f6859e24083..7d2b0e9b338 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Bitmap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.cpp
@@ -2,9 +2,9 @@
** Bitmap.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cstdlib>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Bitmap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.h
index f67a017e1f4..9e108b236cf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Bitmap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Bitmap.h
@@ -2,9 +2,9 @@
** Bitmap.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef BITMAP_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BoundingBox.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.cpp
index 73afd92a016..83a84892f6d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BoundingBox.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.cpp
@@ -2,7 +2,7 @@
** BoundingBox.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -57,28 +57,68 @@ BoundingBox::BoundingBox (const Length &ulxx, const Length &ulyy, const Length &
}
-void BoundingBox::set (const string &boxstr) {
- Length coord[4];
+/** Removes leading and trailing whitespace from the given string. */
+static string& strip (string &str) {
+ size_t n=0;
+ while (n < str.length() && isspace(str[n]))
+ ++n;
+ str.erase(0, n);
+ n=str.length()-1;
+ while (n > 0 && isspace(str[n]))
+ --n;
+ str.erase(n+1);
+ return str;
+}
+
+
+/** Sets or modifies the bounding box. If 'boxstr' consists of 4 length values,
+ * they denote the absolute position of two diagonal corners of the box. In case
+ * of a single length value l the current box is enlarged by adding (-l,-l) the upper
+ * left and (l,l) to the lower right corner.
+ * @param[in] boxstr whitespace and/or comma separated string of lengths. */
+void BoundingBox::set (string boxstr) {
+ vector<Length> coord;
const size_t len = boxstr.length();
size_t l=0;
- for (int i=0; i < 4; i++) {
+ strip(boxstr);
+ string lenstr;
+ do {
while (l < len && isspace(boxstr[l]))
l++;
size_t r=l;
while (r < len && !isspace(boxstr[r]) && boxstr[r] != ',')
r++;
- string lenstr = boxstr.substr(l, r-l);
- coord[i].set(lenstr);
- if (boxstr[r] == ',')
- r++;
- l = r;
- if ((l == len && i < 3) || lenstr.empty())
- throw BoundingBoxException("four length parameters expected");
+ lenstr = boxstr.substr(l, r-l);
+ if (!lenstr.empty()) {
+ coord.push_back(Length(lenstr));
+ if (boxstr[r] == ',')
+ r++;
+ l = r;
+ }
+ } while (!lenstr.empty() && coord.size() < 4);
+
+ switch (coord.size()) {
+ case 1:
+ ulx -= coord[0].pt();
+ uly -= coord[0].pt();
+ lrx += coord[0].pt();
+ lry += coord[0].pt();
+ break;
+ case 2:
+ ulx -= coord[0].pt();
+ uly -= coord[1].pt();
+ lrx += coord[0].pt();
+ lry += coord[1].pt();
+ break;
+ case 4:
+ ulx = min(coord[0].pt(), coord[2].pt());
+ uly = min(coord[1].pt(), coord[3].pt());
+ lrx = max(coord[0].pt(), coord[2].pt());
+ lry = max(coord[1].pt(), coord[3].pt());
+ break;
+ default:
+ throw BoundingBoxException("1, 2 or 4 length parameters expected");
}
- ulx = min(coord[0].pt(), coord[2].pt());
- uly = min(coord[1].pt(), coord[3].pt());
- lrx = max(coord[0].pt(), coord[2].pt());
- lry = max(coord[1].pt(), coord[3].pt());
}
@@ -162,6 +202,18 @@ void BoundingBox::operator += (const BoundingBox &bb) {
}
+void BoundingBox::scale (double sx, double sy) {
+ if (!_locked) {
+ ulx *= sx;
+ lrx *= sx;
+ if (sx < 0) swap(ulx, lrx);
+ uly *= sy;
+ lry *= sy;
+ if (sy < 0) swap(uly, lry);
+ }
+}
+
+
void BoundingBox::transform (const Matrix &tm) {
if (!_locked) {
DPair ul = tm * DPair(lrx, lry);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BoundingBox.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.h
index 82dc527d163..b0e811b33a9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/BoundingBox.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/BoundingBox.h
@@ -2,7 +2,7 @@
** BoundingBox.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -35,7 +35,7 @@ class Matrix;
struct BoundingBoxException : MessageException
{
- BoundingBoxException (const string &msg) : MessageException(msg) {}
+ BoundingBoxException (const std::string &msg) : MessageException(msg) {}
};
@@ -46,12 +46,16 @@ class BoundingBox
BoundingBox (double ulxx, double ulyy, double lrxx, double lryy);
BoundingBox (const DPair &p1, const DPair &p2);
BoundingBox (const Length &ulxx, const Length &ulyy, const Length &lrxx, const Length &lryy);
- BoundingBox (const string &boxstr) {set(boxstr);}
- void set (const string &boxstr);
+ BoundingBox (const std::string &boxstr) {set(boxstr);}
+ void set (std::string boxstr);
void embed (double x, double y);
void embed (const BoundingBox &bb);
void embed (const DPair &p) {embed(p.x(), p.y());}
void embed (const DPair &c, double r);
+
+ template <typename T>
+ void embed (const Pair<T> &p) {embed(p.x(), p.y());}
+
void expand (double m);
bool intersect (const BoundingBox &bbox);
double minX () const {return ulx;}
@@ -63,6 +67,7 @@ class BoundingBox
void lock () {_locked = true;}
void unlock () {_locked = false;}
void operator += (const BoundingBox &bb);
+ void scale (double sx, double sy);
void transform (const Matrix &tm);
std::string toSVGViewBox () const;
std::ostream& write (std::ostream &os) const;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Calculator.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.cpp
index 6d9b603bee6..6ed489c8d24 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Calculator.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.cpp
@@ -2,9 +2,9 @@
** Calculator.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cmath>
@@ -33,7 +33,7 @@ const char NAME = 2;
#include <iostream>
-/** Evaluates a given arithmetic expressions and returns its value.
+/** Evaluates a given arithmetic expression and returns its value.
* The evaluator is implemented as a recursive descendent parser.
* @param[in] is reads expression from this stream
* @return expression value */
@@ -45,7 +45,7 @@ double Calculator::eval (istream &is) {
}
-/** Evaluates a given arithmetic expressions and returns its value.
+/** Evaluates a given arithmetic expression and returns its value.
* @param[in] expr expression to evaluate
* @return expression value */
double Calculator::eval (const string &expr) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Calculator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.h
index a8673a99c1f..5ae0ab6e9fb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Calculator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Calculator.h
@@ -2,9 +2,9 @@
** Calculator.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef CALCULATOR_H
@@ -26,34 +26,31 @@
#include <string>
#include "MessageException.h"
-using std::istream;
-using std::map;
-using std::string;
struct CalculatorException : public MessageException
{
- CalculatorException (const string &msg) : MessageException(msg) {}
+ CalculatorException (const std::string &msg) : MessageException(msg) {}
};
class Calculator
{
public:
- double eval (istream &is);
- double eval (const string &expr);
- void setVariable (const string &name, double value) {variables[name] = value;}
- double getVariable (const string &name) const;
+ double eval (std::istream &is);
+ double eval (const std::string &expr);
+ void setVariable (const std::string &name, double value) {variables[name] = value;}
+ double getVariable (const std::string &name) const;
protected:
- double expr (istream &is, bool skip);
- double term (istream &is, bool skip);
- double prim (istream &is, bool skip);
- char lex (istream &is);
- char lookAhead (istream &is);
+ double expr (std::istream &is, bool skip);
+ double term (std::istream &is, bool skip);
+ double prim (std::istream &is, bool skip);
+ char lex (std::istream &is);
+ char lookAhead (std::istream &is);
private:
- map<string,double> variables;
+ std::map<std::string,double> variables;
double numValue;
- string strValue;
+ std::string strValue;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CmdLineParserBase.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.cpp
index c1020748c4b..1519643dc28 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CmdLineParserBase.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.cpp
@@ -2,7 +2,7 @@
** CmdLineParserBase.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -58,7 +58,7 @@ void CmdLineParserBase::parse (int argc, char **argv, bool printErrors) {
(*opt->handler)(this, ir, *opt, true);
else if (!_error) {
if (printErrors)
- Message::estream(false) << "unknown option --" << longname << endl;
+ Message::estream(false) << "unknown option --" << longname << '\n';
_error = true;
}
}
@@ -86,7 +86,7 @@ void CmdLineParserBase::parse (int argc, char **argv, bool printErrors) {
}
else if (shortname > 0) {
if (printErrors)
- Message::estream(false) << "unknown option -" << shortname << endl;
+ Message::estream(false) << "unknown option -" << shortname << '\n';
_error = true;
}
}
@@ -108,7 +108,7 @@ void CmdLineParserBase::error (const Option &opt, bool longopt, const char *msg)
Message::estream(false) << "--" << opt.longname;
else
Message::estream(false) << '-' << opt.shortname;
- Message::estream(false) << ": " << msg << endl;
+ Message::estream(false) << ": " << msg << '\n';
}
_error = true;
}
@@ -127,10 +127,9 @@ void CmdLineParserBase::status () const {
* 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) */
const CmdLineParserBase::Option* CmdLineParserBase::option (char shortname) const {
- const Option *opts = options();
- for (int i=0; i < numOptions(); i++)
- if (opts[i].shortname == shortname)
- return &opts[i];
+ for (const Option *opts = options(); opts->longname; ++opts)
+ if (opts->shortname == shortname)
+ return opts;
return 0;
}
@@ -141,14 +140,13 @@ const CmdLineParserBase::Option* CmdLineParserBase::option (char shortname) cons
* Otherwise, the return value is 0.
* @param[in] longname long version of the option without leading hyphens (e.g. param, not --param) */
const CmdLineParserBase::Option* CmdLineParserBase::option (const string &longname) const {
- const Option *opts = options();
vector<const Option*> matches; // all matching options
size_t len = longname.length();
- for (int i=0; i < numOptions(); i++) {
- if (string(opts[i].longname, len) == longname) {
- if (len == strlen(opts[i].longname)) // exact match?
- return &opts[i];
- matches.push_back(&opts[i]);
+ for (const Option *opts = options(); opts->longname; ++opts) {
+ if (string(opts->longname, len) == longname) {
+ if (len == strlen(opts->longname)) // exact match?
+ return opts;
+ matches.push_back(opts);
}
}
switch (matches.size()) {
@@ -233,7 +231,7 @@ bool CmdLineParserBase::getUIntArg (InputReader &ir, const Option &opt, bool lon
}
-/** Gets a double (floating point) argument of a given option, e.g. -p=2.5 or --param=2.5.
+/** Gets a double (floating point) argument of a given option, e.g. -p2.5 or --param=2.5.
* @param[in] ir argument is read from this InputReader
* @param[in] opt scans argument of this option
* @param[in] longopt true if the long option name was given
@@ -267,3 +265,44 @@ bool CmdLineParserBase::getStringArg (InputReader &ir, const Option &opt, bool l
return false;
}
+
+/** Gets a boolean argument of a given option, e.g. -pyes or --param=yes.
+ * @param[in] ir argument is read from this InputReader
+ * @param[in] opt scans argument of this option
+ * @param[in] longopt true if the long option name was given
+ * @param[out] arg the scanned option argument
+ * @return true if argument could be scanned without errors */
+bool CmdLineParserBase::getBoolArg (InputReader &ir, const Option &opt, bool longopt, bool &arg) const {
+ if (checkArgPrefix(ir, opt, longopt)) {
+ string str;
+ while (!ir.eof())
+ str += ir.get();
+ if (str == "yes" || str == "y" || str == "true" || str == "1") {
+ arg = true;
+ return true;
+ }
+ else if (str == "no" || str == "n" || str == "false" || str == "0") {
+ arg = false;
+ return true;
+ }
+ error(opt, longopt, "boolean argument expected (yes, no, true, false, 0, 1)");
+ }
+ return false;
+}
+
+
+/** Gets a (single) character argument of a given option, e.g. -pc or --param=c.
+ * @param[in] ir argument is read from this InputReader
+ * @param[in] opt scans argument of this option
+ * @param[in] longopt true if the long option name was given
+ * @param[out] arg the scanned option argument
+ * @return true if argument could be scanned without errors */
+bool CmdLineParserBase::getCharArg (InputReader &ir, const Option &opt, bool longopt, char &arg) const {
+ if (checkArgPrefix(ir, opt, longopt)) {
+ arg = ir.get();
+ if (arg >= 0 && ir.eof())
+ return true;
+ error(opt, longopt, "character argument expected");
+ }
+ return false;
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CmdLineParserBase.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.h
index 2b76fb9dc94..3e36babf750 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CmdLineParserBase.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CmdLineParserBase.h
@@ -2,7 +2,7 @@
** CmdLineParserBase.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -32,6 +32,7 @@ class CmdLineParserBase
struct Option;
struct OptionHandler {
+ virtual ~OptionHandler () {}
virtual void operator () (CmdLineParserBase *obj, InputReader &ir, const Option &opt, bool longopt) const=0;
};
@@ -63,7 +64,6 @@ class CmdLineParserBase
public:
virtual void parse (int argc, char **argv, bool printErrors=true);
virtual void help () const {}
- virtual int numOptions () const {return 0;}
virtual int numFiles () const {return _files.size();}
virtual const char* file (size_t n) {return (n >= 0 && n < _files.size()) ? _files[n].c_str() : 0;}
virtual void status () const;
@@ -81,6 +81,8 @@ class CmdLineParserBase
bool getUIntArg (InputReader &ir, const Option &opt, bool longopt, unsigned &arg) const;
bool getDoubleArg (InputReader &ir, const Option &opt, bool longopt, double &arg) const;
bool getStringArg (InputReader &ir, const Option &opt, bool longopt, std::string &arg) const;
+ bool getBoolArg (InputReader &ir, const Option &opt, bool longopt, bool &arg) const;
+ bool getCharArg (InputReader &ir, const Option &opt, bool longopt, char &arg) const;
const Option* option (char shortname) const;
const Option* option (const std::string &longname) const;
virtual const Option* options () const {return 0;}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.cpp
index 3424ee7c17c..5848d0fc1ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Color.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.cpp
@@ -2,9 +2,9 @@
** Color.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cmath>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Color.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.h
index 51f8733c58b..64aa0f105bb 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Color.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Color.h
@@ -2,9 +2,9 @@
** Color.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef COLOR_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ColorSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.cpp
index 77349ef51b1..b9dc12d120a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ColorSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.cpp
@@ -2,9 +2,9 @@
** ColorSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <algorithm>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ColorSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.h
index 6ee202e479b..339271be38e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ColorSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ColorSpecialHandler.h
@@ -2,9 +2,9 @@
** ColorSpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef COLORSPECIALHANDLER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CommandLine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.cpp
index 49279eb71ce..35e51b1cf4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CommandLine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.cpp
@@ -2,7 +2,7 @@
// It is part of the dvisvgm package and published under the terms
// of the GNU General Public License version 3 or later.
// See file COPYING for further details.
-// (C) 2009 Martin Gieseking <martin.gieseking@uos.de>
+// (C) 2009-2010 Martin Gieseking <martin.gieseking@uos.de>
#include <cstdio>
#include <iostream>
@@ -15,7 +15,13 @@ using namespace std;
const CmdLineParserBase::Option CommandLine::_options[] = {
{'b', "bbox", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_bbox)},
{'C', "cache", 'o', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_cache)},
+ {'\0', "color", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_color)},
+ {'e', "exact", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_exact)},
{'h', "help", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_help)},
+ {'\0', "keep", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_keep)},
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ {'\0', "libgs", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_libgs)},
+#endif
{'l', "list-specials", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_list_specials)},
{'M', "mag", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_mag)},
{'m', "map-file", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_map_file)},
@@ -29,19 +35,26 @@ const CmdLineParserBase::Option CommandLine::_options[] = {
{'r', "rotate", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_rotate)},
{'c', "scale", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_scale)},
{'s', "stdout", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_stdout)},
- {'a', "trace-all", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_trace_all)},
+ {'a', "trace-all", 'o', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_trace_all)},
{'T', "transform", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_transform)},
{'t', "translate", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_translate)},
{'v', "verbosity", 'r', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_verbosity)},
{'V', "version", 0, new OptionHandlerImpl<CommandLine>(&CommandLine::handle_version)},
{'z', "zip", 'o', new OptionHandlerImpl<CommandLine>(&CommandLine::handle_zip)},
+ {0, 0, 0, 0}
};
void CommandLine::init () {
CmdLineParserBase::init();
_bbox_given = false;
_cache_given = false;
+ _color_given = false;
+ _exact_given = false;
_help_given = false;
+ _keep_given = false;
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ _libgs_given = false;
+#endif
_list_specials_given = false;
_mag_given = false;
_map_file_given = false;
@@ -64,14 +77,18 @@ void CommandLine::init () {
_bbox_arg = "min";
_cache_arg.clear();
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ _libgs_arg.clear();
+#endif
_mag_arg = 4;
_map_file_arg.clear();
_no_specials_arg.clear();
_output_arg.clear();
- _page_arg = 1;
- _progress_arg = 100;
+ _page_arg = "1";
+ _progress_arg = 0.5;
_rotate_arg = 0;
_scale_arg.clear();
+ _trace_all_arg = false;
_transform_arg.clear();
_translate_arg.clear();
_verbosity_arg = 7;
@@ -79,17 +96,17 @@ void CommandLine::init () {
}
void CommandLine::help () const {
- puts("This program converts DVI files, as created by TeX/LaTeX to\nthe XML-based scalable vector graphics format SVG.\n\nUsage: dvisvgm [options] dvifile\n");
+ puts("This program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.\n\nUsage: dvisvgm [options] dvifile\n");
puts("Input options:");
- puts(" -p, --page=number choose page to convert (default: 1)");
+ puts(" -p, --page=ranges choose pages to convert [1]");
puts(" -m, --map-file=[+]filename set [additional] font map file name");
puts("\nSVG output options:");
- puts(" -b, --bbox=fmt set format or size of bounding box (default: min)");
- puts(" -o, --output=filename set name of output file");
+ puts(" -b, --bbox=size set size of bounding box [min]");
+ puts(" -o, --output=pattern set name pattern of output files");
puts(" -s, --stdout write SVG output to stdout");
puts(" -n, --no-fonts draw glyphs by using path elements");
puts(" --no-styles don't use styles to reference fonts");
- puts(" -z, --zip[=level] create compressed .svgz file (default: 9)");
+ puts(" -z, --zip[=level] create compressed .svgz file [9]");
puts("\nSVG transformations:");
puts(" -r, --rotate=angle rotate page content clockwise");
puts(" -c, --scale=sx[,sy] scale page content");
@@ -97,15 +114,21 @@ void CommandLine::help () const {
puts(" -T, --transform=commands transform page content");
puts("\nProcessing options:");
puts(" -C, --cache[=dir] set/print path of cache directory");
- puts(" -M, --mag=factor magnification of Metafont output (default: 4)");
+ puts(" -e, --exact compute exact glyph boxes");
+ puts(" --keep keep temporary files");
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ puts(" --libgs=filename set name of Ghostscript shared library");
+#endif
+ puts(" -M, --mag=factor magnification of Metafont output [4]");
puts(" --no-mktexmf don't try to create missing fonts");
puts(" -S, --no-specials[=prefixes] don't process [selected] specials");
- puts(" -a, --trace-all trace all glyphs of used bitmap fonts");
+ puts(" -a, --trace-all[=retrace] trace all glyphs of bitmap fonts [no]");
puts("\nMessage options:");
+ puts(" --color colorize messages");
puts(" -h, --help print this help and exit");
puts(" -l, --list-specials print supported special sets and exit");
- puts(" -P, --progress[=skip] enable progess indicator (default: 100)");
- puts(" -v, --verbosity=level set verbosity level (0-7) (default: 7)");
+ puts(" -P, --progress[=delay] enable progess indicator [0.5]");
+ puts(" -v, --verbosity=level set verbosity level (0-7) [7]");
puts(" -V, --version print version and exit");
}
@@ -122,11 +145,34 @@ void CommandLine::handle_cache(InputReader &ir, const Option &opt, bool longopt)
}
+void CommandLine::handle_color(InputReader &ir, const Option &opt, bool longopt) {
+ _color_given = true;
+}
+
+
+void CommandLine::handle_exact(InputReader &ir, const Option &opt, bool longopt) {
+ _exact_given = true;
+}
+
+
void CommandLine::handle_help(InputReader &ir, const Option &opt, bool longopt) {
_help_given = true;
}
+void CommandLine::handle_keep(InputReader &ir, const Option &opt, bool longopt) {
+ _keep_given = true;
+}
+
+
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+void CommandLine::handle_libgs(InputReader &ir, const Option &opt, bool longopt) {
+ if (getStringArg(ir, opt, longopt, _libgs_arg))
+ _libgs_given = true;
+}
+#endif
+
+
void CommandLine::handle_list_specials(InputReader &ir, const Option &opt, bool longopt) {
_list_specials_given = true;
}
@@ -172,13 +218,13 @@ void CommandLine::handle_output(InputReader &ir, const Option &opt, bool longopt
void CommandLine::handle_page(InputReader &ir, const Option &opt, bool longopt) {
- if (getUIntArg(ir, opt, longopt, _page_arg))
+ if (getStringArg(ir, opt, longopt, _page_arg))
_page_given = true;
}
void CommandLine::handle_progress(InputReader &ir, const Option &opt, bool longopt) {
- if (ir.eof() || getUIntArg(ir, opt, longopt, _progress_arg))
+ if (ir.eof() || getDoubleArg(ir, opt, longopt, _progress_arg))
_progress_given = true;
}
@@ -201,7 +247,8 @@ void CommandLine::handle_stdout(InputReader &ir, const Option &opt, bool longopt
void CommandLine::handle_trace_all(InputReader &ir, const Option &opt, bool longopt) {
- _trace_all_given = true;
+ if (ir.eof() || getBoolArg(ir, opt, longopt, _trace_all_arg))
+ _trace_all_given = true;
}
@@ -237,7 +284,13 @@ void CommandLine::handle_zip(InputReader &ir, const Option &opt, bool longopt) {
void CommandLine::status () const {
cout << 'b'<< setw(20) << "bbox " << bbox_given() << setw(10) << bbox_arg() << endl;
cout << 'C'<< setw(20) << "cache " << cache_given() << setw(10) << cache_arg() << endl;
+ cout << ' '<< setw(20) << "color " << color_given() << endl;
+ cout << 'e'<< setw(20) << "exact " << exact_given() << endl;
cout << 'h'<< setw(20) << "help " << help_given() << endl;
+ cout << ' '<< setw(20) << "keep " << keep_given() << endl;
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ cout << ' '<< setw(20) << "libgs " << libgs_given() << setw(10) << libgs_arg() << endl;
+#endif
cout << 'l'<< setw(20) << "list-specials " << list_specials_given() << endl;
cout << 'M'<< setw(20) << "mag " << mag_given() << setw(10) << mag_arg() << endl;
cout << 'm'<< setw(20) << "map-file " << map_file_given() << setw(10) << map_file_arg() << endl;
@@ -251,7 +304,7 @@ void CommandLine::status () const {
cout << 'r'<< setw(20) << "rotate " << rotate_given() << setw(10) << rotate_arg() << endl;
cout << 'c'<< setw(20) << "scale " << scale_given() << setw(10) << scale_arg() << endl;
cout << 's'<< setw(20) << "stdout " << stdout_given() << endl;
- cout << 'a'<< setw(20) << "trace-all " << trace_all_given() << endl;
+ cout << 'a'<< setw(20) << "trace-all " << trace_all_given() << setw(10) << trace_all_arg() << endl;
cout << 'T'<< setw(20) << "transform " << transform_given() << setw(10) << transform_arg() << endl;
cout << 't'<< setw(20) << "translate " << translate_given() << setw(10) << translate_arg() << endl;
cout << 'v'<< setw(20) << "verbosity " << verbosity_given() << setw(10) << verbosity_arg() << endl;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CommandLine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.h
index f97f3dd71e0..1454c40687b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CommandLine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/CommandLine.h
@@ -2,11 +2,14 @@
// It is part of the dvisvgm package and published under the terms
// of the GNU General Public License version 3 or later.
// See file COPYING for further details.
-// (C) 2009 Martin Gieseking <martin.gieseking@uos.de>
+// (C) 2009-2010 Martin Gieseking <martin.gieseking@uos.de>
#ifndef COMMANDLINE_H
#define COMMANDLINE_H
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "CmdLineParserBase.h"
class CommandLine : public CmdLineParserBase
@@ -14,12 +17,10 @@ class CommandLine : public CmdLineParserBase
public:
CommandLine () {init();}
CommandLine (int argc, char **argv, bool printErrors) {parse(argc, argv, printErrors);}
- virtual ~CommandLine () {}
void help () const;
void status () const;
- int numOptions () const {return 22;}
bool page_given () const {return _page_given;}
- unsigned page_arg () const {return _page_arg;}
+ const std::string& page_arg () const {return _page_arg;}
bool map_file_given () const {return _map_file_given;}
const std::string& map_file_arg () const {return _map_file_arg;}
bool bbox_given () const {return _bbox_given;}
@@ -41,16 +42,24 @@ class CommandLine : public CmdLineParserBase
const std::string& transform_arg () const {return _transform_arg;}
bool cache_given () const {return _cache_given;}
const std::string& cache_arg () const {return _cache_arg;}
+ bool exact_given () const {return _exact_given;}
+ bool keep_given () const {return _keep_given;}
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ bool libgs_given () const {return _libgs_given;}
+ const std::string& libgs_arg () const {return _libgs_arg;}
+#endif
bool mag_given () const {return _mag_given;}
double mag_arg () const {return _mag_arg;}
bool no_mktexmf_given () const {return _no_mktexmf_given;}
bool no_specials_given () const {return _no_specials_given;}
const std::string& no_specials_arg () const {return _no_specials_arg;}
bool trace_all_given () const {return _trace_all_given;}
+ bool trace_all_arg () const {return _trace_all_arg;}
+ bool color_given () const {return _color_given;}
bool help_given () const {return _help_given;}
bool list_specials_given () const {return _list_specials_given;}
bool progress_given () const {return _progress_given;}
- unsigned progress_arg () const {return _progress_arg;}
+ double progress_arg () const {return _progress_arg;}
bool verbosity_given () const {return _verbosity_given;}
unsigned verbosity_arg () const {return _verbosity_arg;}
bool version_given () const {return _version_given;}
@@ -71,10 +80,16 @@ class CommandLine : public CmdLineParserBase
void handle_translate (InputReader &ir, const Option &opt, bool longopt);
void handle_transform (InputReader &ir, const Option &opt, bool longopt);
void handle_cache (InputReader &ir, const Option &opt, bool longopt);
+ void handle_exact (InputReader &ir, const Option &opt, bool longopt);
+ void handle_keep (InputReader &ir, const Option &opt, bool longopt);
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ void handle_libgs (InputReader &ir, const Option &opt, bool longopt);
+#endif
void handle_mag (InputReader &ir, const Option &opt, bool longopt);
void handle_no_mktexmf (InputReader &ir, const Option &opt, bool longopt);
void handle_no_specials (InputReader &ir, const Option &opt, bool longopt);
void handle_trace_all (InputReader &ir, const Option &opt, bool longopt);
+ void handle_color (InputReader &ir, const Option &opt, bool longopt);
void handle_help (InputReader &ir, const Option &opt, bool longopt);
void handle_list_specials (InputReader &ir, const Option &opt, bool longopt);
void handle_progress (InputReader &ir, const Option &opt, bool longopt);
@@ -84,7 +99,7 @@ class CommandLine : public CmdLineParserBase
private:
static const CmdLineParserBase::Option _options[];
bool _page_given;
- unsigned _page_arg;
+ std::string _page_arg;
bool _map_file_given;
std::string _map_file_arg;
bool _bbox_given;
@@ -106,16 +121,24 @@ class CommandLine : public CmdLineParserBase
std::string _transform_arg;
bool _cache_given;
std::string _cache_arg;
+ bool _exact_given;
+ bool _keep_given;
+#if !defined(HAVE_LIBGS) && !defined(DISABLE_GS)
+ bool _libgs_given;
+ std::string _libgs_arg;
+#endif
bool _mag_given;
double _mag_arg;
bool _no_mktexmf_given;
bool _no_specials_given;
std::string _no_specials_arg;
bool _trace_all_given;
+ bool _trace_all_arg;
+ bool _color_given;
bool _help_given;
bool _list_specials_given;
bool _progress_given;
- unsigned _progress_arg;
+ double _progress_arg;
bool _verbosity_given;
unsigned _verbosity_arg;
bool _version_given;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DLLoader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.cpp
index 4cde80af936..9e4325d5774 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DLLoader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.cpp
@@ -2,9 +2,9 @@
** DLLoader.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,11 +15,9 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-
-
#include "DLLoader.h"
@@ -54,4 +52,3 @@ void* DLLoader::loadFunction (const char *name) {
return 0;
}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DLLoader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.h
index 97af3d739d7..1810be99770 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DLLoader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DLLoader.h
@@ -2,9 +2,9 @@
** DLLoader.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,11 +15,9 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-
-
#ifndef DLLOADER_H
#define DLLOADER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.cpp
index 36345d7a4eb..bec202a126a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.cpp
@@ -2,9 +2,9 @@
** DVIActions.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include "DVIActions.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.h
index 15f0871a2ea..edc83dd89b4 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIActions.h
@@ -2,7 +2,7 @@
** DVIActions.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -25,7 +25,6 @@
#include "Message.h"
#include "types.h"
-
class BoundingBox;
class Font;
class SpecialManager;
@@ -47,10 +46,11 @@ struct DVIActions
virtual void special (const std::string &s) {}
virtual void preamble (const std::string &cmt) {}
virtual void postamble () {}
- virtual void beginPage (Int32 *c) {}
+ virtual void beginPage (unsigned n, Int32 *c) {}
virtual void endPage () {}
virtual BoundingBox& bbox () =0;
virtual const SpecialManager* setProcessSpecials (const char *ignorelist) {return 0;}
+ virtual void progress (size_t current, size_t total, const char *id=0) {}
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.cpp
index 3aff687cf1b..1c1343300b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.cpp
@@ -2,7 +2,7 @@
** DVIReader.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -26,20 +26,26 @@
#include "DVIActions.h"
#include "DVIReader.h"
#include "Font.h"
+#include "FontManager.h"
#include "Message.h"
#include "VectorStream.h"
#include "macros.h"
using namespace std;
+bool DVIReader::COMPUTE_PAGE_LENGTH = false;
-DVIReader::DVIReader (istream &is, DVIActions *a)
- : StreamReader(is), _actions(a)
+
+DVIReader::DVIReader (istream &is, DVIActions *a) : StreamReader(is), _actions(a)
{
_inPage = false;
_pageHeight = _pageWidth = 0;
_scaleFactor = 0.0;
_inPostamble = false;
+ _totalPages = 0; // we don't know the correct value yet
+ _currFontNum = 0;
+ _currPageNum = 0;
+ _pageLength = _pagePos = 0;
}
@@ -50,13 +56,16 @@ DVIActions* DVIReader::replaceActions (DVIActions *a) {
}
-/** Reads a single DVI command from the current position of the input stream and calls the
- * corresponding cmdFOO method.
- * @return opcode of the executed command */
-int DVIReader::executeCommand () {
+/** 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] 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) {
struct DVICommand {
- void (DVIReader::*method)(int);
- int numBytes;
+ CommandHandler handler;
+ int length; // number of parameter bytes
};
/* Each cmdFOO command reads the necessary number of bytes from the stream, so executeCommand
@@ -64,11 +73,11 @@ int DVIReader::executeCommand () {
DVI commands because they only differ in length of their parameters. */
static const DVICommand commands[] = {
{&DVIReader::cmdSetChar, 1}, {&DVIReader::cmdSetChar, 2}, {&DVIReader::cmdSetChar, 3}, {&DVIReader::cmdSetChar, 4}, // 128-131
- {&DVIReader::cmdSetRule, 0}, // 132
+ {&DVIReader::cmdSetRule, 8}, // 132
{&DVIReader::cmdPutChar, 1}, {&DVIReader::cmdPutChar, 2}, {&DVIReader::cmdPutChar, 3}, {&DVIReader::cmdPutChar, 4}, // 133-136
- {&DVIReader::cmdPutRule, 0}, // 137
+ {&DVIReader::cmdPutRule, 8}, // 137
{&DVIReader::cmdNop, 0}, // 138
- {&DVIReader::cmdBop, 0}, {&DVIReader::cmdEop, 0}, // 139-140
+ {&DVIReader::cmdBop, 44}, {&DVIReader::cmdEop, 0}, // 139-140
{&DVIReader::cmdPush, 0}, {&DVIReader::cmdPop, 0}, // 141-142
{&DVIReader::cmdRight, 1}, {&DVIReader::cmdRight, 2}, {&DVIReader::cmdRight, 3}, {&DVIReader::cmdRight, 4}, // 143-146
{&DVIReader::cmdW0, 0}, // 147
@@ -86,22 +95,77 @@ int DVIReader::executeCommand () {
{&DVIReader::cmdPre, 0}, {&DVIReader::cmdPost, 0}, {&DVIReader::cmdPostPost, 0} // 247-249
};
- int opcode = in().get();
+ const int opcode = in().get();
if (!in() || opcode < 0) // at end of file
throw InvalidDVIFileException("invalid file");
- if (opcode >= 0 && opcode <= 127)
- cmdSetChar0(opcode);
- else if (opcode >= 171 && opcode <= 234)
- cmdFontNum0(opcode-171);
+
+ param = -1;
+ if (opcode >= 0 && opcode <= 127) {
+ handler = &DVIReader::cmdSetChar0;
+ length = 0;
+ param = opcode;
+ }
+ else if (opcode >= 171 && opcode <= 234) {
+ handler = &DVIReader::cmdFontNum0;
+ length = 0;
+ param = opcode-171;
+ }
else if (opcode >= 250) {
ostringstream oss;
oss << "undefined DVI command (opcode " << opcode << ')';
throw DVIException(oss.str());
}
else {
- int offset = opcode <= 170 ? 128 : 235-(170-128+1);
- const DVICommand &cmd = commands[opcode-offset];
- (this->*cmd.method)(cmd.numBytes);
+ const int offset = opcode <= 170 ? 128 : 235-(170-128+1);
+ handler = commands[opcode-offset].handler;
+ if (!compute_size)
+ length = commands[opcode-offset].length;
+ else {
+ if (opcode >= 239 && opcode <= 242) { // specials
+ int len = opcode-238;
+ UInt32 bytes = readUnsigned(len);
+ in().seekg(-len, ios_base::cur);
+ length = len+bytes;
+ }
+ else if (opcode >= 243 && opcode <= 246) { // fontdefs
+ int len = opcode-242;
+ len += 12;
+ in().seekg(len, ios_base::cur); // skip fontnum, checksum, ssize, dsize
+ UInt32 bytes = readUnsigned(1); // length of font path
+ bytes += readUnsigned(1); // length of font name
+ in().seekg(-len-2, ios_base::cur);
+ length = len+bytes;
+ }
+ else
+ length = commands[opcode-offset].length;
+ }
+ }
+ if (param < 0)
+ param = length;
+ return opcode;
+}
+
+
+/** Reads a single DVI command from the current position of the input stream and calls the
+ * corresponding cmdFOO method.
+ * @return opcode of the executed command */
+int DVIReader::executeCommand () {
+ CommandHandler handler;
+ int len; // number of parameter bytes
+ int param; // parameter of handler
+ streampos pos = in().tellg();
+ int opcode = evalCommand(false, handler, len, param);
+ (this->*handler)(param);
+ if (COMPUTE_PAGE_LENGTH && _inPage && _actions) {
+ // ensure progress() is called at 0%
+ if (opcode == 139) // bop?
+ _actions->progress(0, _pageLength);
+ // ensure progress() is called at 100%
+ if (in().peek() == 140) // eop reached?
+ _pagePos = _pageLength;
+ else
+ _pagePos += in().tellg()-pos;
+ _actions->progress(_pagePos, _pageLength);
}
return opcode;
}
@@ -190,8 +254,8 @@ bool DVIReader::executePages (unsigned first, unsigned last) {
in().seekg(q, ios_base::beg); // now on begin of postamble
if (executeCommand() != 248) // execute postamble command but not the fontdefs
return false;
- first = max(1u, min(first, (unsigned)_totalPages));
- last = max(1u, min(last, (unsigned)_totalPages));
+ first = max(1u, min(first, _totalPages));
+ last = max(1u, min(last, _totalPages));
in().seekg(_prevBop, ios_base::beg); // now on last bop
_inPostamble = false; // we jumped out of the postamble
unsigned count = _totalPages;
@@ -323,9 +387,23 @@ void DVIReader::cmdBop (int) {
_posStack.pop();
_currFontNum = 0;
_inPage = true;
- beginPage(c);
+ _pageLength = _pagePos = 0;
+ if (COMPUTE_PAGE_LENGTH) {
+ // compute number of bytes in current page
+ int length, param;
+ CommandHandler handler;
+ // read all commands until eop is found
+ while (evalCommand(true, handler, length, param) != 140) {
+ in().seekg(length, ios_base::cur);
+ _pageLength += length+1; // parameter length + opcode length (1 byte)
+ }
+ ++_pageLength; // add length of eop command (1 byte)
+ in().seekg(-int(_pageLength), ios_base::cur); // go back to first command following bop
+ _pageLength += 45; // add length of bop command
+ }
+ beginPage(_currPageNum, c);
if (_actions)
- _actions->beginPage(c);
+ _actions->beginPage(_currPageNum, c);
}
@@ -371,15 +449,16 @@ void DVIReader::cmdPop (int) {
* @throw DVIException if method is called ouside a bop/eop pair */
void DVIReader::putChar (UInt32 c, bool moveCursor) {
if (_inPage) {
- Font *font = _fontManager.getFont(_currFontNum);
+ FontManager &fm = FontManager::instance();
+ Font *font = fm.getFont(_currFontNum);
if (VirtualFont *vf = dynamic_cast<VirtualFont*>(font)) { // is current font a virtual font?
vector<UInt8> *dvi = const_cast<vector<UInt8>*>(vf->getDVI(c)); // get DVI snippet that describes character c
if (dvi) {
DVIPosition pos = _currPos; // save current cursor position
_currPos.x = _currPos.y = _currPos.w = _currPos.z = 0;
int save_fontnum = _currFontNum; // save current font number
- _fontManager.enterVF(vf); // new font number context
- cmdFontNum0(_fontManager.vfFirstFontNum(vf));
+ fm.enterVF(vf); // new font number context
+ cmdFontNum0(fm.vfFirstFontNum(vf));
double save_scale = _scaleFactor;
_scaleFactor = vf->scaledSize()/(1 << 20);
@@ -393,7 +472,7 @@ void DVIReader::putChar (UInt32 c, bool moveCursor) {
}
replaceStream(is); // restore previous input stream
_scaleFactor = save_scale; // restore previous scale factor
- _fontManager.leaveVF(); // restore previous font number context
+ fm.leaveVF(); // restore previous font number context
cmdFontNum0(save_fontnum); // restore previous font number
_currPos = pos; // restore previous cursor position
}
@@ -505,10 +584,10 @@ void DVIReader::cmdXXX (int len) {
* @param[in] num font number
* @throw DVIException if font number is undefined */
void DVIReader::cmdFontNum0 (int num) {
- if (Font *font = _fontManager.getFont(num)) {
+ if (Font *font = FontManager::instance().getFont(num)) {
_currFontNum = num;
if (_actions && !dynamic_cast<VirtualFont*>(font))
- _actions->setFont(_fontManager.fontID(num), font); // all fonts get a recomputed ID
+ _actions->setFont(FontManager::instance().fontID(num), font); // all fonts get a recomputed ID
}
else {
ostringstream oss;
@@ -534,16 +613,17 @@ void DVIReader::cmdFontNum (int len) {
* @param[in] ds design size in TeX point units
* @param[in] ss scaled size in TeX point units */
void DVIReader::defineFont (UInt32 fontnum, const string &name, UInt32 cs, double ds, double ss) {
- int id = _fontManager.registerFont(fontnum, name, cs, ds, ss);
- Font *font = _fontManager.getFontById(id);
+ FontManager &fm = FontManager::instance();
+ int id = fm.registerFont(fontnum, name, cs, ds, ss);
+ Font *font = fm.getFontById(id);
if (VirtualFont *vf = dynamic_cast<VirtualFont*>(font)) {
// read vf file, register its font and character definitions
- _fontManager.enterVF(vf);
+ fm.enterVF(vf);
ifstream ifs(vf->path(), ios::binary);
VFReader vfReader(ifs);
vfReader.replaceActions(this);
vfReader.executeAll();
- _fontManager.leaveVF();
+ fm.leaveVF();
}
if (_actions)
_actions->defineFont(id, font);
@@ -573,7 +653,7 @@ void DVIReader::cmdFontDef (int len) {
* @param[in] dsize design size in TeX point units
* @param[in] ssize scaled size in TeX point units */
void DVIReader::defineVFFont (UInt32 fontnum, string path, string name, UInt32 checksum, double dsize, double ssize) {
- VirtualFont *vf = _fontManager.getVF();
+ VirtualFont *vf = FontManager::instance().getVF();
defineFont(fontnum, name, checksum, dsize, ssize * vf->scaleFactor());
}
@@ -582,5 +662,5 @@ void DVIReader::defineVFFont (UInt32 fontnum, string path, string name, UInt32 c
* @param[in] c character number
* @param[in] dvi DVI fragment describing the character */
void DVIReader::defineVFChar (UInt32 c, vector<UInt8> *dvi) {
- _fontManager.assignVfChar(c, dvi);
+ FontManager::instance().assignVfChar(c, dvi);
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.h
index 3fb5f2aff61..42e255140aa 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIReader.h
@@ -2,7 +2,7 @@
** DVIReader.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -24,7 +24,6 @@
#include <map>
#include <stack>
#include <string>
-#include "FontManager.h"
#include "MessageException.h"
#include "StreamReader.h"
#include "VFActions.h"
@@ -46,6 +45,8 @@ class FileFinder;
class DVIReader : public StreamReader, protected VFActions
{
+ typedef void (DVIReader::*CommandHandler)(int);
+
struct DVIPosition
{
double h, v;
@@ -55,7 +56,7 @@ class DVIReader : public StreamReader, protected VFActions
};
public:
- DVIReader (istream &is, DVIActions *a=0);
+ DVIReader (std::istream &is, DVIActions *a=0);
bool executeDocument ();
void executeAll ();
@@ -63,30 +64,30 @@ class DVIReader : public StreamReader, protected VFActions
void executePostamble ();
bool executePage (unsigned n);
bool executePages (unsigned first, unsigned last);
- bool isInPostamble () const {return _inPostamble;}
+ bool inPostamble () const {return _inPostamble;}
double getXPos () const;
double getYPos () const;
void setXPos (double x);
void setYPos (double y);
double getPageWidth () const;
double getPageHeight () const;
- int getCurrentFontNumber () const {return _currFontNum;}
- unsigned getCurrentPageNumber () const {return _currPageNum;}
- unsigned getTotalPages () const {return _totalPages;}
- DVIActions* getActions () const {return _actions;}
+ int getCurrentFontNumber () const {return _currFontNum;}
+ unsigned getCurrentPageNumber () const {return _currPageNum;}
+ unsigned getTotalPages () const {return _totalPages;}
+ DVIActions* getActions () const {return _actions;}
DVIActions* replaceActions (DVIActions *a);
- const FontManager& getFontManager () const {return _fontManager;}
protected:
int executeCommand ();
+ int evalCommand (bool compute_size, CommandHandler &handler, int &length, int &param);
void putChar (UInt32 c, bool moveCursor);
void defineFont (UInt32 fontnum, const std::string &name, UInt32 cs, double ds, double ss);
- virtual void beginPage (Int32 *c) {}
+ virtual void beginPage (unsigned n, Int32 *c) {}
virtual void endPage () {}
// VFAction methods
void defineVFFont (UInt32 fontnum, std::string path, std::string name, UInt32 checksum, double dsize, double ssize);
- void defineVFChar (UInt32 c, vector<UInt8> *dvi);
+ void defineVFChar (UInt32 c, std::vector<UInt8> *dvi);
// the following methods represent the DVI commands
// they are called by executeCommand and should not be used directly
@@ -119,19 +120,23 @@ class DVIReader : public StreamReader, protected VFActions
void cmdPostPost (int len);
private:
- DVIActions *_actions;
- bool _inPage; // true if between bop and eop
- 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
- 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
+ DVIActions *_actions; ///< actions to be performed on various DVI events
+ bool _inPage; ///< true if between bop and eop
+ 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
+ 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
DVIPosition _currPos;
std::stack<DVIPosition> _posStack;
- FontManager _fontManager;
+ size_t _pageLength; ///< number of bytes between current bop end eop
+ size_t _pagePos; ///< distance of current DVI command from bop (in bytes)
+
+ public:
+ static bool COMPUTE_PAGE_LENGTH; ///< if true, the bop handler computes the number of bytes of the current page
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.cpp
index 9366a6c11ff..ec35140fdc8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.cpp
@@ -2,7 +2,7 @@
** DVIToSVG.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -30,18 +30,18 @@
#include <fstream>
#include <sstream>
#include "Calculator.h"
-#include "CharmapTranslator.h"
#include "DVIToSVG.h"
#include "DVIToSVGActions.h"
#include "Font.h"
#include "FontManager.h"
#include "FileFinder.h"
+#include "GlyphTracerMessages.h"
+#include "InputBuffer.h"
#include "InputReader.h"
#include "Matrix.h"
#include "Message.h"
+#include "PageRanges.h"
#include "PageSize.h"
-#include "SVGFontEmitter.h"
-#include "SVGFontTraceEmitter.h"
#include "SVGTree.h"
#include "TFM.h"
#include "XMLDocument.h"
@@ -66,10 +66,6 @@
using namespace std;
-// static class variables
-bool DVIToSVG::CREATE_STYLE=true;
-bool DVIToSVG::USE_FONTS=true;
-
/** Returns time stamp of current date/time. */
static string datetime () {
@@ -81,14 +77,14 @@ static string datetime () {
return timestr;
}
-
class PSHeaderActions : public DVIActions
{
public :
PSHeaderActions (DVIToSVG &dvisvg) : _dvisvg(dvisvg) {}
void special (const std::string &s) {
- if (s.substr(0, 7) == "header=")
+ // execute PS headers only
+ if (!s.empty() && (s[0] == '!' || s.substr(0, 7) == "header="))
_dvisvg.specialManager().process(s, 0);
}
@@ -100,8 +96,13 @@ class PSHeaderActions : public DVIActions
};
-DVIToSVG::DVIToSVG (istream &is, ostream &os)
- : DVIReader(is), _out(os)
+/** 'a': trace all glyphs even if some of them are already cached
+ * 'm': trace missing glyphs, i.e. glyphs not yet cached
+ * 0 : only trace actually required glyphs */
+char DVIToSVG::TRACE_MODE = 0;
+
+
+DVIToSVG::DVIToSVG (istream &is, DVIToSVG::Output &out) : DVIReader(is), _out(out)
{
replaceActions(new DVIToSVGActions(*this, _svg));
}
@@ -113,18 +114,24 @@ DVIToSVG::~DVIToSVG () {
/** Starts the conversion process.
- * @return total number of pages in DVI file */
-int DVIToSVG::convert (unsigned firstPage, unsigned lastPage) {
- executePostamble(); // collect scaling and font information
- if (firstPage > getTotalPages()) {
+ * @param[in] first number of first page to convert
+ * @param[in] last number of last page to convert
+ * @param[out] pageinfo (number of converted pages, number of total pages) */
+void DVIToSVG::convert (unsigned first, unsigned last, pair<int,int> *pageinfo) {
+ if (getTotalPages() == 0)
+ executePostamble(); // collect scaling and font information
+ if (first > last)
+ swap(first, last);
+ if (first > getTotalPages()) {
ostringstream oss;
- oss << "file contains only " << getTotalPages() << " page(s)";
+ oss << "file contains only " << getTotalPages() << " page";
+ if (getTotalPages() > 1)
+ oss << 's';
throw DVIException(oss.str());
}
- if (firstPage < 0)
- firstPage = 1;
+ last = min(last, getTotalPages());
- if (firstPage > 1) {
+ if (first > 1) {
// ensure loading of PostScript prologues given at the beginning of the first page
// (prologue files are always referenced in first page)
PSHeaderActions headerActions(*this);
@@ -132,43 +139,48 @@ int DVIToSVG::convert (unsigned firstPage, unsigned lastPage) {
executePage(1);
replaceActions(save);
}
-
- if (CREATE_STYLE && USE_FONTS) {
- const vector<Font*> &fonts = getFontManager().getFonts();
- if (!fonts.empty()) {
- XMLElementNode *styleNode = new XMLElementNode("style");
- styleNode->addAttribute("type", "text/css");
- _svg.appendToRoot(styleNode);
- ostringstream style;
- FORALL(fonts, vector<Font*>::const_iterator, i) {
- if (!dynamic_cast<VirtualFont*>(*i)) { // skip virtual fonts
- style << "text.f" << getFontManager().fontID(*i) << ' '
- << "{font-family:" << (*i)->name()
- << ";font-size:" << (*i)->scaledSize() << "}\n";
- }
- }
- XMLCDataNode *cdata = new XMLCDataNode(style.str());
- styleNode->append(cdata);
- }
- }
-
- if (executePage(firstPage)) { // @@
- Message::mstream() << endl;
+ for (unsigned i=first; i <= last; ++i) {
+ executePage(i);
embedFonts(_svg.rootNode());
- _svg.write(_out);
+ _svg.write(_out.getPageStream(getCurrentPageNumber(), getTotalPages()));
+ string fname = _out.filename(i, getTotalPages());
+ Message::mstream(false, Terminal::GREEN) << "\npage written to " << (fname.empty() ? "<stdout>" : fname) << '\n';
_svg.reset();
+ static_cast<DVIToSVGActions*>(getActions())->reset();
+ }
+ if (pageinfo) {
+ pageinfo->first = last-first+1;
+ pageinfo->second = getTotalPages();
+ }
+}
+
+/** Convert DVI pages specified by a page range string.
+ * @param[in] rangestr string describing the pages to convert
+ * @param[out] pageinfo (number of converted pages, number of total pages) */
+void DVIToSVG::convert (const string &rangestr, pair<int,int> *pageinfo) {
+ if (getTotalPages() == 0)
+ executePostamble(); // collect scaling and font information
+ PageRanges ranges;
+ if (!ranges.parse(rangestr, getTotalPages()))
+ throw MessageException("invalid page range format");
+ FORALL(ranges, PageRanges::ConstIterator, it)
+ convert(it->first, it->second);
+ if (pageinfo) {
+ pageinfo->first = ranges.pages();
+ pageinfo->second = getTotalPages();
}
- return getTotalPages();
}
/** This template method is called by parent class DVIReader before
* executing the BOP actions.
* @param[in] c contains information about the page (page number etc.) */
-void DVIToSVG::beginPage (Int32 *c) {
+void DVIToSVG::beginPage (unsigned n, Int32 *c) {
if (dynamic_cast<DVIToSVGActions*>(getActions())) {
- Message::mstream() << '[' << c[0];
+ Message::mstream().indent(0);
+ Message::mstream(false, Terminal::BLUE, true) << "processing page " << n << " [" << c[0] << ']';
+ Message::mstream().indent(1);
_svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm "VERSION_STR" "));
_svg.appendToDoc(new XMLCommentNode(" " + datetime() + " "));
}
@@ -182,7 +194,6 @@ void DVIToSVG::endPage () {
return;
_specialManager.notifyEndPage();
- Message::mstream() << ']';
// set bounding box and apply page transformations
BoundingBox &bbox = getActions()->bbox();
if (!_transCmds.empty()) {
@@ -214,9 +225,9 @@ void DVIToSVG::endPage () {
bbox = BoundingBox(border, border, size.widthInPT()+border, size.heightInPT()+border);
}
}
- else {
+ else { // set/modify bounding box by explicitly given values
try {
- bbox = BoundingBox(_bboxString);
+ bbox.set(_bboxString);
}
catch (const MessageException &e) {
}
@@ -228,13 +239,17 @@ void DVIToSVG::endPage () {
double dy = (getPageHeight()-bbox.height())/2;
bbox += BoundingBox(-dx, -dy, dx, dy);
}
- if (_bboxString != "none" && bbox.width() > 0) {
- _svg.setBBox(bbox);
+ if (_bboxString != "none") {
+ if (bbox.width() == 0)
+ Message::mstream(false, Terminal::YELLOW) << "\npage is empty\n";
+ else {
+ _svg.setBBox(bbox);
- Message::mstream() << "\npage size: " << bbox.width() << "pt"
- " x " << bbox.height() << "pt"
- " (" << bbox.width()/72.27*25.4 << "mm"
- " x " << bbox.height()/72.27*25.4 << "mm)\n";
+ Message::mstream(false, Terminal::MAGENTA) << "\npage size: " << bbox.width() << "pt"
+ " x " << bbox.height() << "pt"
+ " (" << bbox.width()/72.27*25.4 << "mm"
+ " x " << bbox.height()/72.27*25.4 << "mm)\n";
+ }
}
}
@@ -264,45 +279,22 @@ void DVIToSVG::embedFonts (XMLElementNode *svgElement) {
collect_chars(usedChars);
+ GlyphTracerMessages messages;
FORALL(usedChars, UsedCharsMap::const_iterator, it) {
const Font *font = it->first;
if (const PhysicalFont *ph_font = dynamic_cast<const PhysicalFont*>(font)) {
- CharmapTranslator *cmt = svgActions->getCharmapTranslator(font);
- // If the same character is used in various sizes we don't want to embed the complete (lengthy) path
- // description multiple times because they would only differ by a scale factor. Thus it's better to
- // reference the already embedded path together with a transformation attribute and let the SVG renderer
- // scale the glyph properly. This is only necessary if we don't want to use font but path elements.
- if (font != font->uniqueFont()) {
- FORALL(it->second, set<int>::const_iterator, cit) {
- ostringstream oss;
- XMLElementNode *use = new XMLElementNode("use");
- oss << 'g' << getFontManager().fontID(font) << *cit;
- use->addAttribute("id", oss.str());
- oss.str("");
- oss << "#g" << getFontManager().fontID(font->uniqueFont()) << *cit;
- use->addAttribute("xlink:href", oss.str());
- oss.str("");
- oss << "scale(" << (font->scaledSize()/font->uniqueFont()->scaledSize()) << ')';
- use->addAttribute("transform", oss.str());
- _svg.appendToDefs(use);
- }
- }
- else {
- if (ph_font->type() == PhysicalFont::MF) {
- SVGFontTraceEmitter emitter(font, getFontManager(), *cmt, _svg, USE_FONTS);
- emitter.emitFont(it->second, font->name().c_str());
- }
- else if (font->path()) { // path to pfb/ttf file
- SVGFontEmitter emitter(font, getFontManager(), *cmt, _svg, USE_FONTS);
- emitter.emitFont(it->second, font->name().c_str());
- }
- else
- Message::wstream(true) << "can't embed font '" << font->name() << "'\n";
- }
+ if (TRACE_MODE)
+ ph_font->traceAllGlyphs(TRACE_MODE == 'a', &messages);
+
+ if (font->path()) // does font file exist?
+ _svg.append(*ph_font, it->second, &messages);
+ else
+ Message::wstream(true) << "can't embed font '" << font->name() << "'\n";
}
else
Message::wstream(true) << "can't embed font '" << font->name() << "'\n";
}
+ _svg.appendFontStyles(svgActions->getUsedFonts());
}
@@ -330,7 +322,7 @@ const SpecialManager* DVIToSVG::setProcessSpecials (const char *ignorelist) {
0
};
SpecialHandler **p = handlers;
-#if !DISABLE_GS
+#if !defined(DISABLE_GS)
if (Ghostscript().available())
*p = new PsSpecialHandler;
else
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.h
index f516b7ed00b..6008faccb66 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVG.h
@@ -2,7 +2,7 @@
** DVIToSVG.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -22,6 +22,8 @@
#define DVITOSVG_H
#include <iostream>
+#include <string>
+#include <utility>
#include "DVIReader.h"
#include "SpecialManager.h"
#include "SVGTree.h"
@@ -30,31 +32,39 @@
class DVIToSVG : public DVIReader
{
public:
- DVIToSVG (std::istream &is, std::ostream &os);
+ /** DVIToSVG uses this interface to get the output streams for the SVG files. */
+ struct Output {
+ virtual ~Output () {}
+ virtual std::ostream& getPageStream (int page, int numPages) const =0;
+ virtual std::string filename (int page, int numPages) const =0;
+ };
+
+ public:
+ DVIToSVG (std::istream &is, Output &out);
~DVIToSVG ();
- int convert (unsigned firstPage, unsigned lastPage);
+ void convert (unsigned firstPage, unsigned lastPage, std::pair<int,int> *pageinfo=0);
+ void convert (const std::string &range, std::pair<int,int> *pageinfo=0);
const SpecialManager* setProcessSpecials (const char *ignorelist=0);
const SpecialManager& specialManager () const {return _specialManager;}
- void setPageSize (const string &name) {_bboxString = name;}
+ void setPageSize (const std::string &name) {_bboxString = name;}
void setTransformation (const std::string &cmds) {_transCmds = cmds;}
+ public:
+ static char TRACE_MODE;
+
protected:
DVIToSVG (const DVIToSVG &);
DVIToSVG operator = (const DVIToSVG &);
- void beginPage (Int32 *c);
+ void beginPage (unsigned n, Int32 *c);
void endPage ();
void embedFonts (XMLElementNode *svgElement);
private:
SVGTree _svg;
- std::ostream &_out; ///< DVI output is written to this stream
+ Output &_out;
std::string _bboxString;
std::string _transCmds;
SpecialManager _specialManager;
-
- public:
- static bool CREATE_STYLE; ///< should <style>...</style> and class attributes be used to reference fonts?
- static bool USE_FONTS; ///< if true, create font references and don't draw paths directly
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVGActions.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.cpp
index b3f26173d94..d032a59b86f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVGActions.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.cpp
@@ -2,7 +2,7 @@
** DVIToSVGActions.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,30 +18,29 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <cstring>
+#include <ctime>
#include "BoundingBox.h"
-#include "CharmapTranslator.h"
#include "DVIToSVG.h"
#include "DVIToSVGActions.h"
#include "Font.h"
#include "FontManager.h"
#include "Ghostscript.h"
+#include "GlyphTracerMessages.h"
#include "SpecialManager.h"
+#include "System.h"
#include "XMLNode.h"
#include "XMLString.h"
using namespace std;
-unsigned DVIToSVGActions::PROGRESSBAR = 0;
+double DVIToSVGActions::PROGRESSBAR_DELAY=1000; // initial delay in seconds (values >= 1000 disable the progressbar)
+bool DVIToSVGActions::EXACT_BBOX = false;
DVIToSVGActions::DVIToSVGActions (DVIToSVG &dvisvg, SVGTree &svg)
- : _svg(svg), _dvisvg(dvisvg), _pageMatrix(0), _bgcolor(Color::WHITE)
+ : _svg(svg), _dvisvg(dvisvg), _pageMatrix(0), _bgcolor(Color::WHITE), _boxes(0)
{
_currentFontNum = -1;
_pageCount = 0;
@@ -50,8 +49,16 @@ DVIToSVGActions::DVIToSVGActions (DVIToSVG &dvisvg, SVGTree &svg)
DVIToSVGActions::~DVIToSVGActions () {
delete _pageMatrix;
- FORALL (_charmapTranslatorMap, CharmapTranslatorMap::iterator, i)
- delete i->second;
+ delete _boxes;
+}
+
+
+void DVIToSVGActions::reset() {
+ _usedChars.clear();
+ _usedFonts.clear();
+ _bbox = BoundingBox();
+ _currentFontNum = -1;
+ _bgcolor = Color::WHITE;
}
@@ -68,34 +75,50 @@ void DVIToSVGActions::setPageMatrix (const Matrix &matrix) {
* @param[in] c character code relative to the current font
* @param[in] font font to be used */
void DVIToSVGActions::setChar (double x, double y, unsigned c, const Font *font) {
-/* x *= BP;
- y *= BP; */
- if (DVIToSVG::USE_FONTS) {
- // If we use SVG fonts there is no need to record all font name/char/size combinations
- // because the SVG font mechanism handles this automatically. It's sufficient to
- // record font names and chars. The various font sizes can be ignored here.
- // For a given font object, Font::uniqueFont() returns the same unique font object for
- // all fonts with the same name.
- font = font->uniqueFont();
- }
- _usedCharsMap[font].insert(c);
+ // If we use SVG fonts there is no need to record all font name/char/size combinations
+ // because the SVG font mechanism handles this automatically. It's sufficient to
+ // record font names and chars. The various font sizes can be ignored here.
+ // For a given font object, Font::uniqueFont() returns the same unique font object for
+ // all fonts with the same name.
+ _usedChars[SVGTree::USE_FONTS ? font->uniqueFont() : font].insert(c);
- const CharmapTranslator *cmt = _charmapTranslatorMap[font->uniqueFont()];
- _svg.appendChar(c, x, y, _dvisvg.getFontManager(), *cmt);
+ // However, we record all required fonts
+ _usedFonts.insert(font);
+ _svg.appendChar(c, x, y, *font);
// update bounding box
- if (font) {
- /* x *= BP;
- y *= BP;*/
- double s = font->scaleFactor(); // * BP;
- double w = s*(font->charWidth(c) + font->italicCorr(c));
- double h = s*font->charHeight(c);
- double d = s*font->charDepth(c);
- BoundingBox charbox(x, y-h, x+w, y+d);
- if (!getMatrix().isIdentity())
- charbox.transform(getMatrix());
- _bbox.embed(charbox);
+ double wl=0, wr=0, h=0, d=0; // left/right width, height, and depth of character c
+ static string fontname;
+ GlyphTracerMessages callback(fontname != font->name(), false);
+ fontname = font->name();
+ BoundingBox charbox;
+ const PhysicalFont *ph_font = dynamic_cast<const PhysicalFont*>(font);
+ if (EXACT_BBOX && ph_font && ph_font->getGlyphBox(c, charbox, &callback)) {
+ if ((wl = charbox.minX()) > 0) wl=0;
+ if ((wr = charbox.maxX()) < 0) wr=0;
+ if ((h = charbox.maxY()) < 0) h=0;
+ if ((d = -charbox.minY()) < 0) d=0;
+ }
+ else {
+ double s = font->scaleFactor();
+ wr = s*(font->charWidth(c) + font->italicCorr(c));
+ h = s*font->charHeight(c);
+ d = s*font->charDepth(c);
}
+
+ BoundingBox bbox(x+wl, y-h, x+wr, y+d);
+/* XMLElementNode *rect = new XMLElementNode("rect");
+ rect->addAttribute("x", x+wl);
+ rect->addAttribute("y", y-h);
+ rect->addAttribute("width", (-wl+wr));
+ rect->addAttribute("height", (h+d));
+ rect->addAttribute("fill", "none");
+ rect->addAttribute("stroke", "red");
+ rect->addAttribute("stroke-width", "0.5");
+ _svg.appendToPage(rect);*/
+ if (!getMatrix().isIdentity())
+ bbox.transform(getMatrix());
+ embed(bbox);
}
@@ -126,14 +149,7 @@ void DVIToSVGActions::setRule (double x, double y, double height, double width)
BoundingBox bb(x, y+height, x+width, y);
if (!getMatrix().isIdentity())
bb.transform(getMatrix());
- _bbox.embed(bb);
-}
-
-
-void DVIToSVGActions::defineFont (int num, const Font *font) {
- font = font->uniqueFont();
- if (_charmapTranslatorMap.find(font) == _charmapTranslatorMap.end())
- _charmapTranslatorMap[font] = new CharmapTranslator(font);
+ embed(bb);
}
@@ -155,18 +171,12 @@ void DVIToSVGActions::special (const string &s) {
// @@ output message in case of unsupported specials?
}
catch (const SpecialException &e) {
- Message::estream(true) << "error in special '" << s << "': " << e.getMessage() << endl;
+ Message::estream(true) << "error in special '" << s << "': " << e.getMessage() << '\n';
}
}
void DVIToSVGActions::beginSpecial (const char *prefix) {
- static unsigned count = 0;
- if (PROGRESSBAR > 0 && ++count % PROGRESSBAR == 0) {
- if (count == PROGRESSBAR)
- Message::mstream(false) << ':';
- Message::mstream(false) << '=';
- }
}
@@ -187,19 +197,11 @@ 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
* current (printed) page number (may differ from page count) */
-void DVIToSVGActions::beginPage (Int32 *c) {
+void DVIToSVGActions::beginPage (unsigned n, Int32 *c) {
_svg.newPage(++_pageCount);
_bbox = BoundingBox(); // clear bounding box
-}
-
-
-CharmapTranslator* DVIToSVGActions::getCharmapTranslator (const Font *font) const {
- if (font) {
- CharmapTranslatorMap::const_iterator it = _charmapTranslatorMap.find(font->uniqueFont());
- if (it != _charmapTranslatorMap.end())
- return it->second;
- }
- return 0;
+ if (_boxes)
+ _boxes->clear();
}
@@ -223,3 +225,108 @@ void DVIToSVGActions::setBgColor (const Color &color) {
_bgcolor = color;
}
+
+void DVIToSVGActions::embed(const BoundingBox& bbox) {
+ _bbox.embed(bbox);
+ if (_boxes) {
+ FORALL(*_boxes, BoxMap::iterator, it)
+ it->second.embed(bbox);
+ }
+}
+
+
+void DVIToSVGActions::embed(const DPair& p, double r) {
+ if (r == 0)
+ _bbox.embed(p);
+ else
+ _bbox.embed(p, r);
+ if (_boxes)
+ FORALL(*_boxes, BoxMap::iterator, it)
+ it->second.embed(p, r);
+}
+
+
+BoundingBox& DVIToSVGActions::bbox(const string& name, bool reset) {
+ if (!_boxes)
+ _boxes = new BoxMap;
+ BoundingBox &box = (*_boxes)[name];
+ if (reset)
+ box = BoundingBox();
+ return box;
+}
+
+
+/** This method is called by subprocesses like the PS handler when
+ * a computation step has finished. Since the total number of steps
+ * can't be determined in advance, we don't show a percent value but
+ * a rotating dash. */
+void DVIToSVGActions::progress (const char *id) {
+ if (PROGRESSBAR_DELAY < 1000) {
+ static double time=0;
+ // slow down updating of the progress indicator to prevent flickering
+ if (System::time() - time > 0.1) {
+ progress(0, 0, id);
+ time = System::time();
+ }
+ }
+}
+
+
+/** Returns the number of digits of a given integer. */
+static int digits (int n) {
+ if (n == 0)
+ return 1;
+ if (n > 0)
+ return log10(double(n))+1;
+ return log10(double(-n))+2;
+}
+
+
+/** Draws a simple progress indicator.
+ * @param[in] current current iteration step (of 'total' steps)
+ * @param[in] total total number of iteration steps
+ * @param[in] id ID of the subprocess providing the information */
+void DVIToSVGActions::progress (size_t current, size_t total, const char *id) {
+ static double time=0;
+ static bool draw=false; // show progress indicator?
+ static int step = -1; // >=0: rotating dash
+ static size_t prev_current=0, prev_total=1;
+ static const char *prev_id=0;
+ const char *tips = "-\\|/";
+ if (current == 0 && total > 0) {
+ time = System::time();
+ draw = false;
+ Message::mstream() << '\n';
+ }
+ // don't show the progress indicator before the given time has elapsed
+ if (!draw && System::time()-time > PROGRESSBAR_DELAY)
+ draw = true;
+ if (draw && (System::time() - time > 0.1 || (total > 0 && current == total) || prev_id != id)) {
+ if (total == 0) {
+ current = prev_current;
+ total = prev_total;
+ step = (step+1) % 4;
+ }
+ else {
+ prev_current = current;
+ prev_total = total;
+ step = -1;
+ }
+ // adapt length of progress indicator to terminal width
+ int cols = Terminal::columns();
+ int width = (cols == 0 || cols > 60) ? 50 : 49-60+cols;
+ double factor = double(current)/total;
+ int length = width*factor;
+ Message::mstream(false, Terminal::MAGENTA)
+ << '[' << string(length, '=')
+ << (factor < 1.0 ? (step < 0 ? ' ' : tips[step]) : '=')
+ << string(width-length, ' ')
+ << "] " << string(3-digits(100*factor), ' ') << int(100*factor)
+ << "%\r";
+ // overprint indicator when finished
+ if (factor == 1.0)
+ Message::estream().clearline();
+ time = System::time();
+ prev_id = id;
+ }
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVGActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.h
index 39aace386a1..1589fdaa0d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVGActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DVIToSVGActions.h
@@ -2,7 +2,7 @@
** DVIToSVGActions.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -31,7 +31,6 @@
#include "SVGTree.h"
-class CharmapTranslator;
class DVIToSVG;
class FileFinder;
class Font;
@@ -39,12 +38,14 @@ class XMLNode;
class DVIToSVGActions : public DVIActions, public SpecialActions, public SpecialManager::Listener
{
- typedef std::map<const Font*, CharmapTranslator*> CharmapTranslatorMap;
- typedef std::map<const Font*, std::set<int> > UsedCharsMap;
+ typedef std::map<const Font*, std::set<int> > CharMap;
+ typedef std::set<const Font*> FontSet;
+ typedef std::map<std::string,BoundingBox> BoxMap;
public:
DVIToSVGActions (DVIToSVG &dvisvg, SVGTree &svg);
~DVIToSVGActions ();
+ void reset ();
void setChar (double x, double y, unsigned c, const Font *f);
void setRule (double x, double y, double height, double width);
void setBgColor (const Color &color);
@@ -56,26 +57,31 @@ class DVIToSVGActions : public DVIActions, public SpecialActions, public Special
void appendToDefs (XMLNode *node) {_svg.appendToDefs(node);}
void moveToX (double x) {_svg.setX(x);}
void moveToY (double y) {_svg.setY(y);}
- void defineFont (int num, const Font *font);
void setFont (int num, const Font *font);
- void special (const string &s);
- void preamble (const string &cmt);
+ void special (const std::string &s);
+ void preamble (const std::string &cmt);
void postamble ();
- void beginPage (Int32 *c);
+ void beginPage (unsigned n, Int32 *c);
void endPage ();
void beginSpecial (const char *prefix);
void endSpecial (const char *prefix);
- UsedCharsMap& getUsedChars () const {return _usedCharsMap;}
+ void progress (size_t current, size_t total, const char *id=0);
+ void progress (const char *id);
+ CharMap& getUsedChars () const {return _usedChars;}
+ const FontSet& getUsedFonts () const {return _usedFonts;}
void setPageMatrix (const Matrix &tm);
- CharmapTranslator* getCharmapTranslator (const Font *font) const;
double getX() const {return _dvisvg.getXPos();}
double getY() const {return _dvisvg.getYPos();}
void setX (double x) {_dvisvg.setXPos(x);}
void setY (double y) {_dvisvg.setYPos(y);}
BoundingBox& bbox () {return _bbox;}
+ BoundingBox& bbox (const std::string &name, bool reset=false);
+ void embed (const BoundingBox &bbox);
+ void embed (const DPair &p, double r=0);
public:
- static unsigned PROGRESSBAR; ///< disabled if 0, indicates skip value otherwise
+ static double PROGRESSBAR_DELAY; ///< progress bar doesn't appear before this time has elapsed (in sec)
+ static bool EXACT_BBOX;
private:
SVGTree &_svg;
@@ -83,10 +89,11 @@ class DVIToSVGActions : public DVIActions, public SpecialActions, public Special
BoundingBox _bbox;
int _pageCount;
int _currentFontNum;
- CharmapTranslatorMap _charmapTranslatorMap;
- mutable UsedCharsMap _usedCharsMap;
+ mutable CharMap _usedChars;
+ FontSet _usedFonts;
Matrix *_pageMatrix; // transformation of whole page
Color _bgcolor;
+ BoxMap *_boxes;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.cpp
index e8d80731f51..e811f471f38 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Directory.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.cpp
@@ -2,9 +2,9 @@
** Directory.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include "Directory.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Directory.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.h
index 024b5b31c78..5932bba25f2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Directory.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Directory.h
@@ -2,9 +2,9 @@
** Directory.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef DIRECTORY_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DvisvgmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.cpp
index dae575ce107..ea9bea79375 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DvisvgmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.cpp
@@ -2,7 +2,7 @@
** DvisvgmSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -44,6 +44,23 @@ static void expand_constants (string &str, SpecialActions *actions) {
{"nl", "\n"},
{0, ""}
};
+ bool repl_bbox = true;
+ while (repl_bbox) {
+ size_t pos = str.find(string("{?bbox "));
+ if (pos == string::npos)
+ repl_bbox = false;
+ else {
+ size_t endpos = pos+7;
+ while (endpos < str.length() && isalnum(str[endpos]))
+ ++endpos;
+ if (str[endpos] == '}') {
+ BoundingBox &box=actions->bbox(str.substr(pos+7, endpos-pos-7));
+ str.replace(pos, endpos-pos+1, box.toSVGViewBox());
+ }
+ else
+ repl_bbox = false;
+ }
+ }
for (const Constant *p=constants; p->name; p++) {
const string pattern = string("{?")+p->name+"}";
size_t pos = str.find(pattern);
@@ -63,8 +80,8 @@ static void expand_constants (string &str, SpecialActions *actions) {
static void update_bbox (double w, double h, double d, SpecialActions *actions) {
double x = actions->getX();
double y = actions->getY();
- actions->bbox().embed(BoundingBox(x, y, x+w, y-h));
- actions->bbox().embed(BoundingBox(x, y, x+w, y+d));
+ actions->embed(BoundingBox(x, y, x+w, y-h));
+ actions->embed(BoundingBox(x, y, x+w, y+d));
}
@@ -99,20 +116,30 @@ static void raw (InputReader &in, SpecialActions *actions, bool group=false) {
/** Evaluates the special dvisvgm:bbox.
* variant 1: dvisvgm:bbox [r[el]] <width> <height> [<depth>]
* variant 2: dvisvgm:bbox a[bs] <x1> <y1> <x2> <y2>
- * variant 3: dvisvgm:bbox f[ix] <x1> <y1> <x2> <y2> */
+ * variant 3: dvisvgm:bbox f[ix] <x1> <y1> <x2> <y2>
+ * variant 4: dvisvgm:bbox n[ew] <name> */
static void bbox (InputReader &in, SpecialActions *actions) {
in.skipSpace();
char c = in.peek();
if (isalpha(c)) {
while (!isspace(in.peek())) // skip trailing characters
in.get();
- if (c == 'a' || c == 'f') {
+ if (c == 'n') {
+ in.skipSpace();
+ string name;
+ while (isalnum(in.peek()))
+ name += in.get();
+ in.skipSpace();
+ if (!name.empty() && in.eof())
+ actions->bbox(name, true); // create new user box
+ }
+ else if (c == 'a' || c == 'f') {
double p[4];
for (int i=0; i < 4; i++)
p[i] = in.getDouble();
BoundingBox b(p[0], p[1], p[2], p[3]);
if (c == 'a')
- actions->bbox().embed(b);
+ actions->embed(b);
else {
actions->bbox() = b;
actions->bbox().lock();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DvisvgmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.h
index 8ecf780cf8f..7eccf473ce1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DvisvgmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/DvisvgmSpecialHandler.h
@@ -2,9 +2,9 @@
** DvisvgmSpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef DVISVGMSPECIALHANDLER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/EmSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.cpp
index 386a28eed3d..cbb1a15c7b3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/EmSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.cpp
@@ -2,9 +2,9 @@
** EmSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <sstream>
@@ -80,8 +80,8 @@ static void create_line (const DPair &p1, const DPair &p2, char c1, char c2, dou
node->addAttribute("stroke-width", lw);
node->addAttribute("stroke", actions->getColor().rgbString());
// update bounding box
- actions->bbox().embed(p1);
- actions->bbox().embed(p2);
+ actions->embed(p1);
+ actions->embed(p2);
}
else {
// draw polygon
@@ -99,10 +99,10 @@ static void create_line (const DPair &p1, const DPair &p2, char c1, char c2, dou
if (actions->getColor() != Color::BLACK)
node->addAttribute("fill", actions->getColor().rgbString());
// update bounding box
- actions->bbox().embed(q11);
- actions->bbox().embed(q12);
- actions->bbox().embed(q21);
- actions->bbox().embed(q22);
+ actions->embed(q11);
+ actions->embed(q12);
+ actions->embed(q21);
+ actions->embed(q22);
}
actions->appendToPage(node);
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/EmSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.h
index aaee7908b73..84e619abf79 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/EmSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/EmSpecialHandler.h
@@ -2,9 +2,9 @@
** EmSpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef EMSPECIALHANDLER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileFinder.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.cpp
index 5ae027e164f..77706bbbeef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileFinder.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.cpp
@@ -2,9 +2,9 @@
** FileFinder.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cstdlib>
@@ -26,6 +26,7 @@
#include "Message.h"
#include "macros.h"
+using namespace std;
#ifdef MIKTEX
#include "MessageException.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileFinder.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.h
index 775dfe3a516..da7cdb71393 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileFinder.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileFinder.h
@@ -2,9 +2,9 @@
** FileFinder.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef KPSFILEFINDER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.cpp
new file mode 100644
index 00000000000..d1dc1c216e6
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.cpp
@@ -0,0 +1,249 @@
+/***********************************************************************
+** FilePath.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 2 **
+** 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, write to the Free Software **
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, **
+** Boston, MA 02110-1301, USA. **
+***********************************************************************/
+
+#include <cctype>
+#include "FilePath.h"
+#include "FileSystem.h"
+#include "MessageException.h"
+#include "macros.h"
+
+using namespace std;
+
+
+static string& single_slashes (string &str) {
+ size_t pos=0;
+ while ((pos = str.find("//", pos)) != string::npos)
+ str.replace(pos, 2, "/");
+ return str;
+}
+
+
+#ifdef __WIN32__
+static char strip_drive_letter (string &path) {
+ char letter = 0;
+ if (path.length() >= 2 && path[1] == ':' && isalpha(path[0])) {
+ letter = tolower(path[0]);
+ path.erase(0, 2);
+ }
+ return letter;
+}
+
+
+static char adapt_current_path (string &path, char target_drive) {
+ if (char current_drive = strip_drive_letter(path)) {
+ if (target_drive != current_drive) {
+ if (target_drive == 0)
+ target_drive = current_drive;
+ if (path.empty() || path[0] != '/') {
+ if (FileSystem::chdir((string(1, target_drive) + ":").c_str())) {
+ path.insert(0, FileSystem::getcwd()+"/");
+ strip_drive_letter(path);
+ }
+ else
+ throw MessageException("drive " + string(1, target_drive) + ": not accessible");
+ }
+ }
+ }
+ return target_drive;
+}
+
+
+static void tolower (string &str) {
+ for (size_t i=0; i < str.length(); ++i)
+ str[i] = tolower(str[i]);
+}
+#endif
+
+
+FilePath::FilePath (const string &path) {
+ init(path, !FileSystem::isDirectory(path.c_str()), FileSystem::getcwd());
+}
+
+
+/** Constructs a FilePath object.
+ * @param[in] path absolute or relative path to a file or directory
+ * @param[in] isfile true if 'path' references a file, false if a directory is referenced
+ * @param[in] current_dir if 'path' is a relative path expression it will be related to 'current_dir' */
+FilePath::FilePath (const string &path, bool isfile, string current_dir) {
+ init(path, isfile, current_dir);
+}
+
+
+void FilePath::init (string path, bool isfile, string current_dir) {
+ single_slashes(path);
+ single_slashes(current_dir);
+#ifdef __WIN32__
+ tolower(path);
+ _drive = strip_drive_letter(path);
+#endif
+ if (isfile) {
+ size_t pos = path.rfind('/');
+ _fname = path.substr((pos == string::npos) ? 0 : pos+1);
+ if (pos != string::npos)
+ path.erase(pos);
+ else
+ path.clear();
+ }
+ if (current_dir.empty())
+ current_dir = FileSystem::getcwd();
+#ifdef __WIN32__
+ tolower(current_dir);
+ _drive = adapt_current_path(current_dir, _drive);
+#endif
+ if (!path.empty()) {
+ if (path[0] == '/')
+ current_dir.clear();
+ else if (current_dir[0] != '/')
+ current_dir = "/";
+ else {
+ FilePath curr(current_dir, false, "/");
+ current_dir = curr.absolute();
+#ifdef __WIN32__
+ adapt_current_path(current_dir, _drive);
+#endif
+ }
+ }
+ path.insert(0, current_dir + "/");
+ string elem;
+ FORALL (path, string::const_iterator, it) {
+ if (*it == '/') {
+ add(elem);
+ elem.clear();
+ }
+ else
+ elem += *it;
+ }
+ add(elem);
+}
+
+
+void FilePath::add (const string &dir) {
+ if (dir == ".." && !_dirs.empty())
+ _dirs.pop_back();
+ else if (dir.length() > 0 && dir != ".")
+ _dirs.push_back(dir);
+}
+
+
+/** Returns the suffix of the filename. If FilePath represents the
+ * location of a directory (and not of a file) an empty string
+ * is returned. */
+string FilePath::suffix () const {
+ size_t start = 0;
+ // ignore leading dots
+ while (start < _fname.length() && _fname[start] == '.')
+ start++;
+ string sub = _fname.substr(start);
+ size_t pos = sub.rfind('.');
+ if (pos != string::npos && pos < sub.length()-1)
+ return sub.substr(pos+1);
+ return "";
+}
+
+
+/** Changes the suffix of the filename. If FilePath represents the
+ * location of a directory (and not of a file) nothing happens.
+ * @param[in] s new suffix */
+void FilePath::suffix (const string &s) {
+ if (!_fname.empty()) {
+ string current_suffix = suffix();
+ if (!current_suffix.empty())
+ _fname.erase(_fname.length()-current_suffix.length()-1);
+ _fname += "."+s;
+ }
+}
+
+
+/** Returns the filename without suffix.
+ * Example: FilePath("/a/b/c.def", true) == "c" */
+string FilePath::basename () const {
+ if (!_fname.empty()) {
+ size_t len = suffix().length();
+ if (len > 0)
+ len++; // strip dot too
+ return _fname.substr(0, _fname.length()-len);
+ }
+ return "";
+}
+
+
+/** Returns the absolute path string of this FilePath.
+ * @param[in] with_filename if false, the filename is omitted
+ * @return the absolute path string */
+string FilePath::absolute (bool with_filename) const {
+ string path;
+ FORALL (_dirs, ConstIterator, it) {
+ path += "/" + *it;
+ }
+ if (path.empty())
+ path = "/";
+ if (with_filename && !_fname.empty())
+ path += "/"+_fname;
+#ifdef __WIN32__
+ if (_drive)
+ path.insert(0, string(1, _drive) + ":");
+#endif
+ return single_slashes(path);
+}
+
+
+/** Returns a path string of this FilePath relative to reldir. If we wanted to
+ * navigate from /a/b/c/d to /a/b/e/f using the shell command "cd", we could do that
+ * with the relative path argument: "cd ../../e/f". This function returns such a relative
+ * path. Example: FilePath("/a/b/e/f").relative("/a/b/c/d") => "../../e/f".
+ * @param[in] reldir absolute path to a directory
+ * @param[in] with_filename if false, the filename is omitted
+ * @return the relative path string */
+string FilePath::relative (string reldir, bool with_filename) const {
+ if (reldir.empty())
+ reldir = FileSystem::getcwd();
+#ifdef __WIN32__
+ adapt_current_path(reldir, _drive);
+#endif
+ if (reldir[0] != '/')
+ return absolute();
+ FilePath rel(reldir, false);
+ string path;
+#ifdef __WIN32__
+ if (rel._drive && rel._drive != _drive)
+ path += string(1, _drive) + ":";
+#endif
+ ConstIterator i = _dirs.begin();
+ ConstIterator j = rel._dirs.begin();
+ while (i != _dirs.end() && j != rel._dirs.end() && *i == *j)
+ ++i, ++j;
+ for (; j != rel._dirs.end(); ++j)
+ path += "../";
+ for (; i != _dirs.end(); ++i)
+ path += *i + "/";
+ if (!path.empty())
+ path.erase(path.length()-1, 1); // remove trailing slash
+ if (with_filename && !_fname.empty()) {
+ if (!path.empty() && path != "/")
+ path += "/";
+ path += _fname;
+ }
+ if (path.empty())
+ path = ".";
+ return single_slashes(path);
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.h
new file mode 100644
index 00000000000..c80a1925db7
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FilePath.h
@@ -0,0 +1,61 @@
+/***********************************************************************
+** FilePath.h **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 2 **
+** 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, write to the Free Software **
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, **
+** Boston, MA 02110-1301, USA. **
+***********************************************************************/
+
+#ifndef FILEPATH_H
+#define FILEPATH_H
+
+#include <string>
+#include <vector>
+
+class FilePath
+{
+ typedef std::vector<std::string> Directories;
+ typedef Directories::iterator Iterator;
+ typedef Directories::const_iterator ConstIterator;
+ public:
+ FilePath (const std::string &path);
+ FilePath (const std::string &path, bool isfile, std::string current_dir="");
+ std::string absolute (bool with_filename=true) const;
+ std::string relative (std::string reldir="", bool with_filename=true) const;
+ std::string basename () const;
+ std::string suffix () const;
+ void suffix (const std::string &s);
+ size_t depth () const {return _dirs.size();}
+ bool isFile () const {return !_fname.empty();}
+ bool empty () const {return _dirs.empty() && _fname.empty();}
+ const std::string& filename () const {return _fname;}
+ void filename (const std::string &fname) {_fname = fname;}
+
+ protected:
+ void init (std::string path, bool isfile, std::string current_dir);
+ void add (const std::string &elem);
+
+ private:
+ Directories _dirs;
+ std::string _fname;
+#ifdef __WIN32__
+ char _drive;
+#endif
+};
+
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileSystem.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.cpp
index 773e633baea..892b5ba47d2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileSystem.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.cpp
@@ -2,7 +2,7 @@
** FileSystem.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -23,7 +23,13 @@
#include <fstream>
#include "FileSystem.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
using namespace std;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileSystem.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.h
index 5efe814b392..086f0f6e500 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FileSystem.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FileSystem.h
@@ -2,7 +2,7 @@
** FileSystem.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.cpp
new file mode 100644
index 00000000000..415e0051dc1
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.cpp
@@ -0,0 +1,390 @@
+/*************************************************************************
+** Font.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <cstdlib>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include "FileSystem.h"
+#include "Font.h"
+#include "FontEngine.h"
+#include "FileFinder.h"
+#include "GFGlyphTracer.h"
+#include "Glyph.h"
+#include "Message.h"
+#include "MetafontWrapper.h"
+#include "TFM.h"
+#include "VFReader.h"
+#include "macros.h"
+#include "FileSystem.h"
+#include "SVGTree.h"
+
+using namespace std;
+
+
+/** Returns true if 'unicode' is a valid unicode value in XML documents.
+ * XML version 1.0 doesn't allow various unicode character references
+ * (&#1; for example). */
+static bool valid_unicode (UInt32 unicode) {
+ UInt32 ranges[] = {
+ 0x0000, 0x0020,
+ 0x007f, 0x0084,
+ 0x0086, 0x009f,
+ 0xfdd0, 0xfddf
+ };
+ for (int i=0; i < 4; i++)
+ if (unicode >= ranges[2*i] && unicode <= ranges[2*i+1])
+ return false;
+ return true;
+}
+
+
+UInt32 Font::unicode (UInt32 c) const {
+ // @@ this should be optimized :-)
+ return valid_unicode(c) ? c : 0x3400+c;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+
+TFMFont::TFMFont (string name, UInt32 cs, double ds, double ss)
+ : tfm(0), fontname(name), checksum(cs), dsize(ds), ssize(ss)
+{
+}
+
+
+TFMFont::~TFMFont () {
+ delete tfm;
+}
+
+
+/** Returns a font metrics object for the current font.
+ * @throw FontException if TFM file can't be found */
+const TFM* TFMFont::getTFM () const {
+ if (!tfm) {
+ tfm = TFM::createFromFile(fontname.c_str());
+ if (!tfm)
+ throw FontException("can't find "+fontname+".tfm");
+ }
+ return tfm;
+}
+
+
+double TFMFont::charWidth (int c) const {return getTFM()->getCharWidth(c);}
+double TFMFont::charDepth (int c) const {return getTFM()->getCharDepth(c);}
+double TFMFont::charHeight (int c) const {return getTFM()->getCharHeight(c);}
+double TFMFont::italicCorr (int c) const {return getTFM()->getItalicCorr(c);}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// static class variables
+bool PhysicalFont::KEEP_TEMP_FILES = false;
+const char *PhysicalFont::CACHE_PATH = 0;
+double PhysicalFont::METAFONT_MAG = 4;
+FontCache PhysicalFont::_cache;
+
+
+
+Font* PhysicalFont::create (string name, UInt32 checksum, double dsize, double ssize, PhysicalFont::Type type) {
+ return new PhysicalFontImpl(name, checksum, dsize, ssize, type);
+}
+
+
+const char* PhysicalFont::path () const {
+ string ext;
+ switch (type()) {
+ case PFB: ext = "pfb"; break;
+ case TTF: ext = "ttf"; break;
+ case MF : ext = "mf"; break;
+ }
+ return FileFinder::lookup(name()+"."+ext);
+}
+
+
+/** Returns the number of units per EM. The EM square is the virtual area a glyph is designed on.
+ * All coordinates used to specify portions of the glyph are relative to the origin (0,0) at the
+ * lower left corner of this square, while the upper right corner is located at (m,m), where m
+ * is an integer value defined with the font, and returned by this function. */
+int PhysicalFont::unitsPerEm() const {
+ if (type() == MF)
+ return 1000;
+ FontEngine::instance().setFont(*this);
+ return FontEngine::instance().getUnitsPerEM();
+}
+
+
+int PhysicalFont::hAdvance () const {
+ if (type() == MF)
+ return 0;
+ FontEngine::instance().setFont(*this);
+ return FontEngine::instance().getHAdvance();
+}
+
+
+double PhysicalFont::hAdvance (int c) const {
+ if (type() == MF)
+ return unitsPerEm()*charWidth(c)/designSize();
+ FontEngine::instance().setFont(*this);
+ if (FontEncoding *enc = encoding())
+ return FontEngine::instance().getHAdvance(enc->getEntry(c));
+ return FontEngine::instance().getHAdvance(c);
+}
+
+
+string PhysicalFont::glyphName (int c) const {
+ if (type() == MF)
+ return "";
+ FontEngine::instance().setFont(*this);
+ if (FontEncoding *enc = encoding())
+ return enc->getEntry(c);
+ return FontEngine::instance().getGlyphName(c);
+}
+
+
+int PhysicalFont::ascent () const {
+ if (type() == MF)
+ return 0;
+ FontEngine::instance().setFont(*this);
+ return FontEngine::instance().getAscender();
+}
+
+
+int PhysicalFont::descent () const {
+ if (type() == MF)
+ return 0;
+ FontEngine::instance().setFont(*this);
+ return FontEngine::instance().getDescender();
+}
+
+
+/** Extracts the glyph outlines of a given character.
+ * @param[in] c character code of requested glyph
+ * @param[out] glyph path segments of the glyph outline
+ * @param[in] cb optional callback object for tracer class
+ * @return true if outline could be computed */
+bool PhysicalFont::getGlyph (int c, GraphicPath<Int32> &glyph, GFGlyphTracer::Callback *cb) const {
+ if (type() == MF) {
+ const Glyph *cached_glyph=0;
+ if (CACHE_PATH) {
+ _cache.write(CACHE_PATH);
+ _cache.read(name().c_str(), CACHE_PATH);
+ cached_glyph = _cache.getGlyph(c);
+ }
+ if (cached_glyph) {
+ glyph = *cached_glyph;
+ return true;
+ }
+ else {
+ string gfname;
+ if (createGF(gfname)) {
+ try {
+ GFGlyphTracer tracer(gfname, unitsPerEm()/getTFM()->getDesignSize(), cb);
+ tracer.setGlyph(glyph);
+ tracer.executeChar(c);
+ glyph.closeOpenSubPaths();
+ if (CACHE_PATH)
+ _cache.setGlyph(c, glyph);
+ return true;
+ }
+ catch (GFException &e) {
+ // @@ print error message
+ }
+ }
+ else {
+ Message::wstream(true) << "failed creating " << name() << ".gf\n";
+ }
+ }
+ }
+ else { // PFB or TTF
+ bool ok=true;
+ FontEngine::instance().setFont(*this);
+ if (FontEncoding *enc = encoding()) {
+ if (const char *encname = enc->getEntry(c))
+ ok = FontEngine::instance().traceOutline(encname, glyph, false);
+ }
+ else
+ ok = FontEngine::instance().traceOutline((unsigned char)c, glyph, false);
+ glyph.closeOpenSubPaths();
+ return ok;
+ }
+ return false;
+}
+
+
+/** Creates a GF file for this font object.
+ * @param[out] gfname name of GF font file
+ * @return true on success */
+bool PhysicalFont::createGF (string &gfname) const {
+ gfname = name()+".gf";
+ MetafontWrapper mf(name());
+ mf.make("ljfour", METAFONT_MAG); // call Metafont if necessary
+ return mf.success() && getTFM();
+}
+
+
+/** Traces all glyphs of the current font and stores them in the cache. If caching is disabled, nothing happens.
+ * @param[in] includeCached if true, glyphs already cached are traced again
+ * @param[in] cb optional callback methods called by the tracer
+ * @return number of glyphs traced */
+int PhysicalFont::traceAllGlyphs (bool includeCached, GFGlyphTracer::Callback *cb) const {
+ int count = 0;
+ if (type() == MF && CACHE_PATH) {
+ if (const TFM *tfm = getTFM()) {
+ int fchar = tfm->firstChar();
+ int lchar = tfm->lastChar();
+ string gfname;
+ Glyph glyph;
+ if (createGF(gfname)) {
+ _cache.read(name().c_str(), CACHE_PATH);
+ GFGlyphTracer tracer(gfname, unitsPerEm()/getTFM()->getDesignSize(), cb);
+ tracer.setGlyph(glyph);
+ for (int i=fchar; i <= lchar; i++) {
+ if (includeCached || !_cache.getGlyph(i)) {
+ glyph.newpath();
+ tracer.executeChar(i);
+ glyph.closeOpenSubPaths();
+ _cache.setGlyph(i, glyph);
+ ++count;
+ }
+ }
+ _cache.write(CACHE_PATH);
+ }
+ }
+ }
+ return count;
+}
+
+
+/** 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
+ * @return true if the box could be computed successfully */
+bool PhysicalFont::getGlyphBox(int c, BoundingBox& bbox, GFGlyphTracer::Callback* cb) const {
+ Glyph glyph;
+ if (getGlyph(c, glyph, cb)) {
+ glyph.computeBBox(bbox);
+ double s = scaledSize()/unitsPerEm();
+ bbox.scale(s, s);
+ return true;
+ }
+ return false;
+}
+
+
+Font* VirtualFont::create (string name, UInt32 checksum, double dsize, double ssize) {
+ return new VirtualFontImpl(name, checksum, dsize, ssize);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+PhysicalFontImpl::PhysicalFontImpl (string name, UInt32 cs, double ds, double ss, PhysicalFont::Type type)
+ : TFMFont(name, cs, ds, ss), _filetype(type), _charmap(0)
+{
+}
+
+
+PhysicalFontImpl::~PhysicalFontImpl () {
+ if (CACHE_PATH)
+ _cache.write(CACHE_PATH);
+ if (!KEEP_TEMP_FILES)
+ tidy();
+ delete _charmap;
+}
+
+
+UInt32 PhysicalFontImpl::unicode (UInt32 c) const {
+ if (type() == MF)
+ return Font::unicode(c);
+
+ if (_charmap == 0) {
+ FontEngine &fe = FontEngine::instance();
+ if (fe.setFont(*this)) {
+ _charmap = new map<UInt32,UInt32>;
+ fe.buildTranslationMap(*_charmap);
+ }
+ }
+ typedef map<UInt32,UInt32>::const_iterator ConstIterator;
+ ConstIterator it = _charmap->find(c);
+ if (it != _charmap->end())
+ return it->second;
+
+ // No unicode equivalent found in font file.
+ // Now we should look for a smart alternative but at the moment
+ // it's sufficient to simply choose a valid unused unicode value...
+ map<UInt32,UInt32> reverse_map;
+ FORALL(*_charmap, ConstIterator, it)
+ reverse_map[it->second] = it->first;
+ // can we use charcode itself as unicode replacement?
+ if (valid_unicode(c) && (reverse_map.empty() || reverse_map.find(c) != reverse_map.end()))
+ return c;
+ return 0x3400+c;
+}
+
+
+void PhysicalFontImpl::tidy () const {
+ if (type() == MF) {
+ const char *ext[] = {"gf", "tfm", "log", 0};
+ for (const char **p=ext; *p; ++p) {
+ if (FileSystem::exists((name()+"."+(*p)).c_str()))
+ FileSystem::remove(name()+"."+(*p));
+ }
+ }
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+
+VirtualFontImpl::VirtualFontImpl (string name, UInt32 cs, double ds, double ss)
+ : TFMFont(name, cs, ds, ss)
+{
+}
+
+
+VirtualFontImpl::~VirtualFontImpl () {
+ // delete dvi vectors received by VFReaderAction
+ for (map<UInt32, DVIVector*>::iterator i=charDefs.begin(); i != charDefs.end(); ++i)
+ delete i->second;
+}
+
+
+const char* VirtualFontImpl::path () const {
+ return FileFinder::lookup(name()+".vf");
+}
+
+
+void VirtualFontImpl::assignChar (UInt32 c, DVIVector *dvi) {
+ if (dvi) {
+ if (charDefs.find(c) == charDefs.end())
+ charDefs[c] = dvi;
+ else
+ delete dvi;
+ }
+}
+
+
+const vector<UInt8>* VirtualFontImpl::getDVI (int c) const {
+ map<UInt32,DVIVector*>::const_iterator it = charDefs.find(c);
+ return (it == charDefs.end() ? 0 : it->second);
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.h
index bbd91780a55..854430334d3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Font.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Font.h
@@ -2,7 +2,7 @@
** Font.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -24,17 +24,16 @@
#include <map>
#include <string>
#include <vector>
+#include "FontCache.h"
+#include "FontEncoding.h"
+#include "GFGlyphTracer.h"
+#include "Glyph.h"
+#include "GraphicPath.h"
#include "MessageException.h"
#include "VFActions.h"
#include "VFReader.h"
#include "types.h"
-using std::map;
-using std::string;
-using std::vector;
-
-
-class FontEncoding;
class TFM;
@@ -44,7 +43,7 @@ struct Font
virtual ~Font () {}
virtual Font* clone (double ds, double sc) const =0;
virtual const Font* uniqueFont () const =0;
- virtual string name () const =0;
+ virtual std::string name () const =0;
virtual double designSize () const =0;
virtual double scaledSize () const =0;
virtual double scaleFactor () const {return scaledSize()/designSize();}
@@ -54,6 +53,10 @@ struct Font
virtual double italicCorr (int c) const =0;
virtual const TFM* getTFM () const =0;
virtual const char* path () const =0;
+ virtual FontEncoding* encoding () const {return FontEncoding::encoding(name());}
+ virtual bool getGlyph (int c, Glyph &glyph, GFGlyphTracer::Callback *cb=0) const =0;
+ virtual UInt32 unicode (UInt32 c) const;
+ virtual void tidy () const {}
};
@@ -63,30 +66,53 @@ struct Font
struct EmptyFont : public Font
{
public:
- EmptyFont (string name) : fontname(name) {}
- Font* clone (double ds, double sc) const {return new EmptyFont(*this);}
- const Font* uniqueFont () const {return this;}
- string name () const {return fontname;}
- double designSize () const {return 10;} // cmr10 design size in pt
- double scaledSize () const {return 10;} // cmr10 scaled size in pt
- double charWidth (int c) const {return 9.164;} // width of cmr10's 'M' in pt
- double charHeight (int c) const {return 6.833;} // height of cmr10's 'M' in pt
- double charDepth (int c) const {return 0;}
- double italicCorr (int c) const {return 0;}
- const TFM* getTFM () const {return 0;}
- const char* path () const {return 0;}
+ EmptyFont (std::string name) : fontname(name) {}
+ Font* clone (double ds, double sc) const {return new EmptyFont(*this);}
+ const Font* uniqueFont () const {return this;}
+ std::string name () const {return fontname;}
+ double designSize () const {return 10;} // cmr10 design size in pt
+ double scaledSize () const {return 10;} // cmr10 scaled size in pt
+ double charWidth (int c) const {return 9.164;} // width of cmr10's 'M' in pt
+ double charHeight (int c) const {return 6.833;} // height of cmr10's 'M' in pt
+ double charDepth (int c) const {return 0;}
+ double italicCorr (int c) const {return 0;}
+ const TFM* getTFM () const {return 0;}
+ const char* path () const {return 0;}
+ bool getGlyph (int c, Glyph &glyph, GFGlyphTracer::Callback *cb=0) const {return false;}
private:
- string fontname;
+ std::string fontname;
};
/** Interface for all physical fonts. */
-struct PhysicalFont : public virtual Font
+class PhysicalFont : public virtual Font
{
- enum Type {MF, PFB, TTF};
- static Font* create (string name, UInt32 checksum, double dsize, double ssize, PhysicalFont::Type type);
- virtual Type type () const =0;
+ public:
+ enum Type {MF, PFB, TTF};
+ static Font* create (std::string name, UInt32 checksum, double dsize, double ssize, PhysicalFont::Type type);
+ virtual Type type () const =0;
+ virtual bool getGlyph (int c, Glyph &glyph, GFGlyphTracer::Callback *cb=0) const;
+ virtual bool getGlyphBox (int c, BoundingBox &bbox, GFGlyphTracer::Callback *cb=0) const;
+ virtual int hAdvance () const;
+ virtual double hAdvance (int c) const;
+ std::string glyphName (int c) const;
+ virtual int unitsPerEm () const;
+ virtual int ascent () const;
+ virtual int descent () const;
+ virtual int traceAllGlyphs (bool includeCached, GFGlyphTracer::Callback *cb=0) const;
+ const char* path () const;
+
+ protected:
+ bool createGF (std::string &gfname) const;
+
+ public:
+ static bool KEEP_TEMP_FILES;
+ static const char *CACHE_PATH; ///< path to cache directory (0 if caching is disabled)
+ static double METAFONT_MAG; ///< magnification factor for Metafont calls
+
+ protected:
+ static FontCache _cache;
};
@@ -95,11 +121,12 @@ class VirtualFont : public virtual Font
{
friend class FontManager;
public:
- typedef vector<UInt8> DVIVector;
+ typedef std::vector<UInt8> DVIVector;
public:
- static Font* create (string name, UInt32 checksum, double dsize, double ssize);
+ static Font* create (std::string name, UInt32 checksum, double dsize, double ssize);
virtual const DVIVector* getDVI (int c) const =0;
+ bool getGlyph (int c, Glyph &glyph, GFGlyphTracer::Callback *cb=0) const {return false;}
protected:
virtual void assignChar (UInt32 c, DVIVector *dvi) =0;
@@ -109,10 +136,10 @@ class VirtualFont : public virtual Font
class TFMFont : public virtual Font
{
public:
- TFMFont (string name, UInt32 checksum, double dsize, double ssize);
+ TFMFont (std::string name, UInt32 checksum, double dsize, double ssize);
~TFMFont ();
const TFM* getTFM () const;
- string name () const {return fontname;}
+ std::string name () const {return fontname;}
double designSize () const {return dsize;}
double scaledSize () const {return ssize;}
double charWidth (int c) const;
@@ -122,7 +149,7 @@ class TFMFont : public virtual Font
private:
mutable TFM *tfm;
- string fontname;
+ std::string fontname;
UInt32 checksum; ///< cheksum to be compared with TFM checksum
double dsize; ///< design size in TeX point units
double ssize; ///< scaled size
@@ -133,18 +160,18 @@ class PhysicalFontProxy : public PhysicalFont
{
friend class PhysicalFontImpl;
public:
- Font* clone (double ds, double sc) const {return new PhysicalFontProxy(*this, ds, sc);}
- const Font* uniqueFont () const {return pf;}
- string name () const {return pf->name();}
- double designSize () const {return dsize;}
- double scaledSize () const {return ssize;}
- double charWidth (int c) const {return pf->charWidth(c);}
- double charDepth (int c) const {return pf->charDepth(c);}
- double charHeight (int c) const {return pf->charHeight(c);}
- double italicCorr (int c) const {return pf->italicCorr(c);}
- const TFM* getTFM () const {return pf->getTFM();}
- const char* path () const {return pf->path();}
- Type type () const {return pf->type();}
+ Font* clone (double ds, double sc) const {return new PhysicalFontProxy(*this, ds, sc);}
+ const Font* uniqueFont () const {return pf;}
+ std::string name () const {return pf->name();}
+ double designSize () const {return dsize;}
+ double scaledSize () const {return ssize;}
+ double charWidth (int c) const {return pf->charWidth(c);}
+ double charDepth (int c) const {return pf->charDepth(c);}
+ double charHeight (int c) const {return pf->charHeight(c);}
+ double italicCorr (int c) const {return pf->italicCorr(c);}
+ const TFM* getTFM () const {return pf->getTFM();}
+ Type type () const {return pf->type();}
+ UInt32 unicode (UInt32 c) const {return pf->unicode(c);}
protected:
PhysicalFontProxy (const PhysicalFont *font, double ds, double ss) : pf(font), dsize(ds), ssize(ss) {}
@@ -161,16 +188,19 @@ class PhysicalFontImpl : public PhysicalFont, public TFMFont
{
friend class PhysicalFont;
public:
+ ~PhysicalFontImpl();
Font* clone (double ds, double ss) const {return new PhysicalFontProxy(this, ds, ss);}
- const Font* uniqueFont () const {return this;}
- const char* path () const;
- Type type () const {return filetype;}
+ const Font* uniqueFont () const {return this;}
+ Type type () const {return _filetype;}
+ UInt32 unicode (UInt32 c) const;
+ void tidy () const;
protected:
- PhysicalFontImpl (string name, UInt32 checksum, double dsize, double ssize, PhysicalFont::Type type);
+ PhysicalFontImpl (std::string name, UInt32 checksum, double dsize, double ssize, PhysicalFont::Type type);
private:
- Type filetype;
+ Type _filetype;
+ mutable std::map<UInt32,UInt32> *_charmap;
};
@@ -180,7 +210,7 @@ class VirtualFontProxy : public VirtualFont
public:
Font* clone (double ds, double ss) const {return new VirtualFontProxy(*this, ds, ss);}
const Font* uniqueFont () const {return vf;}
- string name () const {return vf->name();}
+ std::string name () const {return vf->name();}
const DVIVector* getDVI (int c) const {return vf->getDVI(c);}
double designSize () const {return dsize;}
double scaledSize () const {return ssize;}
@@ -214,17 +244,17 @@ class VirtualFontImpl : public VirtualFont, public TFMFont
const char* path () const;
protected:
- VirtualFontImpl (string name, UInt32 checksum, double dsize, double ssize);
+ VirtualFontImpl (std::string name, UInt32 checksum, double dsize, double ssize);
void assignChar (UInt32 c, DVIVector *dvi);
private:
- map<UInt32, DVIVector*> charDefs; ///< dvi subroutines defining the characters
+ std::map<UInt32, DVIVector*> charDefs; ///< dvi subroutines defining the characters
};
struct FontException : public MessageException
{
- FontException (string msg) : MessageException(msg) {}
+ FontException (std::string msg) : MessageException(msg) {}
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontCache.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.cpp
index 01d5e8154c0..9cf3f018fa5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontCache.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.cpp
@@ -2,7 +2,7 @@
** FontCache.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -25,7 +25,10 @@
#include <sstream>
#include "FileSystem.h"
#include "FontCache.h"
-#include "FontGlyph.h"
+#include "Glyph.h"
+#include "Pair.h"
+#include "StreamReader.h"
+#include "StreamWriter.h"
//#include "gzstream.h"
#include "types.h"
@@ -33,41 +36,10 @@ using namespace std;
const UInt8 FontCache::VERSION;
-static UInt32 read_unsigned (int bytes, istream &is) {
- UInt32 ret = 0;
- for (bytes--; bytes >= 0 && !is.eof(); bytes--) {
- UInt32 b = is.get();
- ret |= b << (8*bytes);
- }
- return ret;
-}
-
-
-static Int32 read_signed (int bytes, istream &is) {
- Int32 ret = is.get();
- if (ret & 128) // negative value?
- ret |= 0xffffff00;
- for (bytes-=2; bytes >= 0 && !is.eof(); bytes--)
- ret = (ret << 8) | is.get();
- return ret;
-}
-
-
-static void write_unsigned (UInt32 value, int bytes, ostream &os) {
- for (bytes--; bytes >= 0; bytes--)
- os.put((value >> (8*bytes)) & 0xff);
-}
-
-
-static inline void write_signed (Int32 value, int bytes, ostream &os) {
- write_unsigned((UInt32)value, bytes, os);
-}
-
-
-static LPair read_pair (int bytes, istream &is) {
- long x = read_signed(bytes, is);
- long y = read_signed(bytes, is);
- return LPair(x, y);
+static Pair32 read_pair (int bytes, StreamReader &sr) {
+ Int32 x = sr.readSigned(bytes);
+ Int32 y = sr.readSigned(bytes);
+ return Pair32(x, y);
}
@@ -83,29 +55,17 @@ FontCache::~FontCache () {
/** Removes all data from the cache. This does not affect the cache files. */
void FontCache::clear () {
- FORALL(_glyphs, GlyphMap::iterator, it) {
- delete it->second;
- }
_glyphs.clear();
+ _fontname.clear();
}
/** Assigns glyph data to a character and adds it to the cache.
* @param[in] c character code
* @param[in] glyph font glyph data */
-void FontCache::setGlyph (int c, const Glyph *glyph) {
- if (!glyph || glyph->empty())
- delete glyph;
- else {
- GlyphMap::iterator it = _glyphs.find(c);
- if (it != _glyphs.end()) {
- delete it->second;
- it->second = glyph;
- }
- else
- _glyphs[c] = glyph;
- _changed = true;
- }
+void FontCache::setGlyph (int c, const Glyph &glyph) {
+ _glyphs[c] = glyph;
+ _changed = true;
}
@@ -114,7 +74,7 @@ void FontCache::setGlyph (int c, const Glyph *glyph) {
* @return font glyph data (0 if no matching data was found) */
const Glyph* FontCache::getGlyph (int c) const {
GlyphMap::const_iterator it = _glyphs.find(c);
- return (it != _glyphs.end()) ? it->second : 0;
+ return (it != _glyphs.end()) ? &it->second : 0;
}
@@ -140,6 +100,11 @@ bool FontCache::write (const char *fontname, const char *dir) const {
}
+bool FontCache::write (const char* dir) const {
+ return _fontname.empty() ? false : write(_fontname.c_str(), dir);
+}
+
+
/** Returns the minimal number of bytes needed to store the given value. */
static int max_int_size (Int32 value) {
Int32 limit = 0x7f;
@@ -154,11 +119,11 @@ static int max_int_size (Int32 value) {
/** Returns the minimal number of bytes needed to store the biggest
* pair component of the given vector. */
-static int max_int_size (const vector<LPair> &pairs) {
+static int max_int_size (const Pair<Int32> *pairs, size_t n) {
int ret=0;
- FORALL(pairs, vector<LPair>::const_iterator, it) {
- ret = max(ret, max_int_size(it->x()));
- ret = max(ret, max_int_size(it->y()));
+ for (size_t i=0; i < n; i++) {
+ ret = max(ret, max_int_size(pairs[i].x()));
+ ret = max(ret, max_int_size(pairs[i].y()));
}
return ret;
}
@@ -172,30 +137,36 @@ static int max_int_size (const vector<LPair> &pairs) {
bool FontCache::write (const char *fontname, ostream &os) const {
if (!_changed)
return true;
+ if (!os)
+ return false;
- if (os) {
- write_unsigned(VERSION, 1, os);
- for (const char *p=fontname; *p; p++)
- os.put(*p);
- os.put(0);
- write_unsigned(_glyphs.size(), 4, os);
- FORALL(_glyphs, GlyphMap::const_iterator, it) {
- write_unsigned(it->first, 4, os);
- write_unsigned(it->second->commands().size(), 2, os);
- FORALL(it->second->commands(), list<GlyphCommand*>::const_iterator, cit) {
- const vector<LPair> &params = (*cit)->params();
- int bytes = max_int_size(params);
- UInt8 cmdchar = (bytes << 5) | ((*cit)->getSVGPathCommand() - 'A');
- write_unsigned(cmdchar, 1, os);
- for (size_t i=0; i < params.size(); i++) {
- write_signed(params[i].x(), bytes, os);
- write_signed(params[i].y(), bytes, os);
- }
+ StreamWriter sw(os);
+
+ struct WriteActions : Glyph::Actions {
+ WriteActions (StreamWriter &sw) : _sw(sw) {}
+
+ void draw (char cmd, const Glyph::Point *points, int n) {
+ int bytes = max_int_size(points, n);
+ UInt8 cmdchar = (bytes << 5) | (cmd - 'A');
+ _sw.writeUnsigned(cmdchar, 1);
+ for (int i=0; i < n; i++) {
+ _sw.writeSigned(points[i].x(), bytes);
+ _sw.writeSigned(points[i].y(), bytes);
}
}
- return true;
+ StreamWriter &_sw;
+ } actions(sw);
+
+ sw.writeUnsigned(VERSION, 1);
+ sw.writeString(fontname, true);
+ sw.writeUnsigned(_glyphs.size(), 4);
+ FORALL(_glyphs, GlyphMap::const_iterator, it) {
+ const Glyph &glyph = it->second;
+ sw.writeUnsigned(it->first, 4);
+ sw.writeUnsigned(glyph.size(), 2);
+ glyph.iterate(actions, false);
}
- return false;
+ return true;
}
@@ -204,6 +175,8 @@ bool FontCache::write (const char *fontname, ostream &os) const {
* @param[in] dir directory where the cache files are located
* @return true if reading was successful */
bool FontCache::read (const char *fontname, const char *dir) {
+ if (_fontname == fontname)
+ return true;
clear();
if (fontname && strlen(fontname) > 0) {
if (dir == 0 || strlen(dir) == 0)
@@ -223,73 +196,58 @@ bool FontCache::read (const char *fontname, const char *dir) {
* @param[in] dir input stream
* @return true if reading was successful */
bool FontCache::read (const char *fontname, istream &is) {
+ if (_fontname == fontname)
+ return true;
clear();
- if (is) {
- if (read_unsigned(1, is) != VERSION)
- return false;
- string fname;
- while (!is.eof() && is.peek() != 0)
- fname += is.get();
- is.get(); // skip 0-byte
- if (fname != fontname)
- return false;
- UInt32 num_glyphs = read_unsigned(4, is);
- while (num_glyphs-- > 0) {
- UInt32 c = read_unsigned(4, is); // character code
- UInt16 s = read_unsigned(2, is); // number of path commands
- Glyph *glyph = new Glyph;
- while (s-- > 0) {
- UInt8 cmdval = read_unsigned(1, is);
- UInt8 cmdchar = (cmdval & 0x1f) + 'A';
- int bytes = cmdval >> 5;
- GlyphCommand *cmd=0;
- switch (cmdchar) {
- case 'C': {
- LPair p1 = read_pair(bytes, is);
- LPair p2 = read_pair(bytes, is);
- LPair p3 = read_pair(bytes, is);
- cmd = new GlyphCubicTo(p1, p2, p3);
- break;
- }
- case 'H':
- cmd = new GlyphHorizontalLineTo(read_pair(bytes, is));
- break;
- case 'L':
- cmd = new GlyphLineTo(read_pair(bytes, is));
- break;
- case 'M':
- cmd = new GlyphMoveTo(read_pair(bytes, is));
- break;
- case 'Q': {
- LPair p1 = read_pair(bytes, is);
- LPair p2 = read_pair(bytes, is);
- cmd = new GlyphConicTo(p1, p2);
- break;
- }
- case 'S': {
- LPair p1 = read_pair(bytes, is);
- LPair p2 = read_pair(bytes, is);
- cmd = new GlyphShortCubicTo(p1, p2);
- break;
- }
- case 'T':
- cmd = new GlyphShortConicTo(read_pair(bytes, is));
- break;
- case 'V':
- cmd = new GlyphVerticalLineTo(read_pair(bytes, is));
- break;
- case 'Z':
- cmd = new GlyphClosePath();
+ _fontname = fontname;
+ if (!is)
+ return false;
+
+ StreamReader sr(is);
+ if (sr.readUnsigned(1) != VERSION)
+ return false;
+ string fname;
+ while (!is.eof() && is.peek() != 0)
+ fname += is.get();
+ is.get(); // skip 0-byte
+ if (fname != fontname)
+ return false;
+ UInt32 num_glyphs = sr.readUnsigned(4);
+ while (num_glyphs-- > 0) {
+ UInt32 c = sr.readUnsigned(4); // character code
+ UInt16 s = sr.readUnsigned(2); // number of path commands
+ Glyph &glyph = _glyphs[c];
+ while (s-- > 0) {
+ UInt8 cmdval = sr.readUnsigned(1);
+ UInt8 cmdchar = (cmdval & 0x1f) + 'A';
+ int bytes = cmdval >> 5;
+ switch (cmdchar) {
+ case 'C': {
+ Pair32 p1 = read_pair(bytes, sr);
+ Pair32 p2 = read_pair(bytes, sr);
+ Pair32 p3 = read_pair(bytes, sr);
+ glyph.cubicto(p1, p2, p3);
+ break;
+ }
+ case 'L':
+ glyph.lineto(read_pair(bytes, sr));
+ break;
+ case 'M':
+ glyph.moveto(read_pair(bytes, sr));
+ break;
+ case 'Q': {
+ Pair32 p1 = read_pair(bytes, sr);
+ Pair32 p2 = read_pair(bytes, sr);
+ glyph.conicto(p1, p2);
+ break;
}
- if (cmd)
- glyph->addCommand(cmd);
+ case 'Z':
+ glyph.closepath();
}
- setGlyph(c, glyph);
}
- _changed = false;
- return true;
}
- return false;
+ _changed = false;
+ return true;
}
@@ -324,17 +282,18 @@ bool FontCache::fontinfo (std::istream &is, FontInfo &info) {
info.name.clear();
info.numchars = info.numbytes = info.numcmds = 0;
if (is) {
- if ((info.version = read_unsigned(1, is)) != VERSION)
+ StreamReader sr(is);
+ if ((info.version = sr.readUnsigned(1)) != VERSION)
return false;
while (!is.eof() && is.peek() != 0)
info.name += is.get();
is.get(); // skip 0-byte
- info.numchars = read_unsigned(4, is);
+ info.numchars = sr.readUnsigned(4);
for (UInt32 i=0; i < info.numchars; i++) {
- read_unsigned(4, is); // character code
- UInt16 s = read_unsigned(2, is); // number of path commands
+ sr.readUnsigned(4); // character code
+ UInt16 s = sr.readUnsigned(2); // number of path commands
while (s-- > 0) {
- UInt8 cmdval = read_unsigned(1, is);
+ UInt8 cmdval = sr.readUnsigned(1);
UInt8 cmdchar = (cmdval & 0x1f) + 'A';
int bytes = cmdval >> 5;
int bc = 0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontCache.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.h
index 6ce8528b533..8638fb6b3b2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontCache.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontCache.h
@@ -2,7 +2,7 @@
** FontCache.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -24,11 +24,17 @@
#include <iostream>
#include <string>
#include <map>
-#include "FontGlyph.h"
+#include "types.h"
+#include "Glyph.h"
+
+#ifdef VERSION
+#undef VERSION
+#endif
+
class FontCache
{
- typedef std::map<int, const Glyph*> GlyphMap;
+ typedef std::map<int, Glyph> GlyphMap;
public:
struct FontInfo
@@ -45,18 +51,21 @@ class FontCache
~FontCache ();
bool read (const char *fontname, const char *dir);
bool read (const char *fontname, std::istream &is);
+ bool write (const char *dir) const;
bool write (const char *fontname, const char *dir) const;
bool write (const char *fontname, std::ostream &os) const;
const Glyph* getGlyph (int c) const;
- void setGlyph (int c, const Glyph *glyph);
+ void setGlyph (int c, const Glyph &glyph);
void clear ();
+ const std::string& fontname () const {return _fontname;}
static bool fontinfo (const char *dirname, std::vector<FontInfo> &infos);
static bool fontinfo (std::istream &is, FontInfo &info);
- static void fontinfo (const char *dirname, ostream &os);
+ static void fontinfo (const char *dirname, std::ostream &os);
private:
- const static UInt8 VERSION = 3;
+ const static UInt8 VERSION = 4;
+ std::string _fontname;
GlyphMap _glyphs;
bool _changed;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEncoding.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.cpp
index 6ed681e84ea..31599ddc9b7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEncoding.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.cpp
@@ -2,7 +2,7 @@
** FontEncoding.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -19,6 +19,7 @@
*************************************************************************/
#include <fstream>
+#include "Font.h"
#include "FontEncoding.h"
#include "InputBuffer.h"
#include "InputReader.h"
@@ -42,7 +43,6 @@ const char* FontEncoding::path () const {
}
-
/** Search for suitable enc-file and read its encoding information.
* The file contents must be a valid PostScript vector with 256 entries. */
void FontEncoding::read () {
@@ -131,3 +131,28 @@ const char* FontEncoding::getEntry (int c) const {
return 0;
}
+
+struct EncodingMap : public map<string, FontEncoding*>
+{
+ ~EncodingMap () {
+ for (EncodingMap::iterator it=begin(); it != end(); ++it)
+ delete it->second;
+ }
+};
+
+
+/** Returns the encoding of a font.
+ * @param[in] fontname name of font whose encoding will be returned
+ * @return pointer to encoding object, or 0 if there is no encoding defined */
+FontEncoding* FontEncoding::encoding (const string &fontname) {
+ static EncodingMap encmap;
+ if (const char *encname = FileFinder::lookupEncName(fontname)) {
+ EncodingMap::const_iterator it = encmap.find(encname);
+ if (it != encmap.end())
+ return it->second;
+ FontEncoding *enc = new FontEncoding(encname);
+ encmap[encname] = enc;
+ return enc;
+ }
+ return 0;
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEncoding.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.h
index 89eb760c3ce..dfcd6822153 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEncoding.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEncoding.h
@@ -2,9 +2,9 @@
** FontEncoding.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,17 +15,19 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef FONTENCODING_H
#define FONTENCODING_H
#include <istream>
+#include <map>
#include <string>
#include <vector>
#include "types.h"
+
class FontEncoding
{
public:
@@ -36,6 +38,7 @@ class FontEncoding
std::string name () const {return _encname;}
const char* getEntry (int c) const;
const char* path () const;
+ static FontEncoding* encoding (const std::string &fontname);
private:
std::string _encname;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.cpp
index e6d712c0907..f8410535d5d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.cpp
@@ -2,7 +2,7 @@
** FontEngine.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -23,6 +23,7 @@
#include FT_GLYPH_H
#include FT_OUTLINE_H
#include FT_TRUETYPE_TABLES_H
+#include "Font.h"
#include "FontEngine.h"
#include "Message.h"
#include "macros.h"
@@ -48,6 +49,13 @@ FontEngine::~FontEngine () {
}
+/** Returns the singleton instance of this class. */
+FontEngine& FontEngine::instance () {
+ static FontEngine engine;
+ return engine;
+}
+
+
void FontEngine::setDeviceResolution (int x, int y) {
_horDeviceRes = x;
_vertDeviceRes = y;
@@ -74,7 +82,7 @@ static void build_reverse_map (FT_Face face, map<UInt32, UInt32> &reverseMap) {
* @return true on success */
bool FontEngine::setFont (const string &fname, int ptSize) {
if (FT_New_Face(_library, fname.c_str(), 0, &_currentFace)) {
- Message::estream(true) << "FontEngine: error reading file " << fname << endl;
+ Message::estream(true) << "FontEngine: error reading file " << fname << '\n';
return false;
}
if (ptSize && FT_Set_Char_Size(_currentFace, 0, ptSize*64, _horDeviceRes, _vertDeviceRes)) {
@@ -94,6 +102,14 @@ bool FontEngine::setFont (const string &fname, int ptSize) {
}
+bool FontEngine::setFont (const Font &font) {
+ if (fname != font.name()) {
+ fname = font.name();
+ return setFont(font.path());
+ }
+ return true;
+}
+
void FontEngine::buildTranslationMap (map<UInt32, UInt32> &translationMap) const {
FT_CharMap unicodeMap=0, customMap=0;
@@ -125,22 +141,27 @@ const char* FontEngine::getFamilyName () const {
return _currentFace ? _currentFace->family_name : 0;
}
+
const char* FontEngine::getStyleName () const {
return _currentFace ? _currentFace->style_name : 0;
}
+
int FontEngine::getUnitsPerEM () const {
return _currentFace ? _currentFace->units_per_EM : 0;
}
+
int FontEngine::getAscender () const {
return _currentFace ? _currentFace->ascender : 0;
}
+
int FontEngine::getDescender () const {
return _currentFace ? _currentFace->descender : 0;
}
+
int FontEngine::getHAdvance () const {
if (_currentFace) {
TT_OS2 *table = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(_currentFace, ft_sfnt_os2));
@@ -149,6 +170,7 @@ int FontEngine::getHAdvance () const {
return 0;
}
+
int FontEngine::getHAdvance (unsigned c) const {
if (_currentFace) {
int index = FT_Get_Char_Index(_currentFace, (FT_ULong)c);
@@ -248,29 +270,29 @@ bool FontEngine::setCharSize (int ptSize) {
// Callback functions used by traceOutline
static int moveto (FTVectorPtr to, void *user) {
- FEGlyphCommands *commands = static_cast<FEGlyphCommands*>(user);
- commands->moveTo(to->x, to->y);
+ Glyph *glyph = static_cast<Glyph*>(user);
+ glyph->moveto(to->x, to->y);
return 0;
}
static int lineto (FTVectorPtr to, void *user) {
- FEGlyphCommands *commands = static_cast<FEGlyphCommands*>(user);
- commands->lineTo(to->x, to->y);
+ Glyph *glyph = static_cast<Glyph*>(user);
+ glyph->lineto(to->x, to->y);
return 0;
}
static int conicto (FTVectorPtr control, FTVectorPtr to, void *user) {
- FEGlyphCommands *commands = static_cast<FEGlyphCommands*>(user);
- commands->conicTo(control->x, control->y, to->x, to->y);
+ Glyph *glyph = static_cast<Glyph*>(user);
+ glyph->conicto(control->x, control->y, to->x, to->y);
return 0;
}
static int cubicto (FTVectorPtr control1, FTVectorPtr control2, FTVectorPtr to, void *user) {
- FEGlyphCommands *commands = static_cast<FEGlyphCommands*>(user);
- commands->cubicTo(control1->x, control1->y, control2->x, control2->y, to->x, to->y);
+ Glyph *glyph = static_cast<Glyph*>(user);
+ glyph->cubicto(control1->x, control1->y, control2->x, control2->y, to->x, to->y);
return 0;
}
@@ -284,20 +306,20 @@ static int cubicto (FTVectorPtr control1, FTVectorPtr control2, FTVectorPtr to,
* @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.
* @return false on errors */
-static bool trace_outline (FT_Face face, int index, FEGlyphCommands &commands, bool scale) {
+static bool trace_outline (FT_Face face, int index, Glyph &glyph, bool scale) {
if (face) {
if (FT_Load_Glyph(face, index, scale ? FT_LOAD_DEFAULT : FT_LOAD_NO_SCALE)) {
- Message::estream(true) << "can't load glyph " << int(index) << endl;
+ Message::estream(true) << "can't load glyph " << int(index) << '\n';
return false;
}
if (face->glyph->format != FT_GLYPH_FORMAT_OUTLINE) {
- Message::estream(true) << "no outlines found in glyph " << int(index) << endl;
+ Message::estream(true) << "no outlines found in glyph " << int(index) << '\n';
return false;
}
FT_Outline outline = face->glyph->outline;
const FT_Outline_Funcs funcs = {moveto, lineto, conicto, cubicto, 0, 0};
- FT_Outline_Decompose(&outline, &funcs, &commands);
+ FT_Outline_Decompose(&outline, &funcs, &glyph);
return true;
}
Message::wstream(true) << "FontEngine: can't trace outline, no font face selected\n";
@@ -316,20 +338,20 @@ static bool trace_outline (FT_Face face, int index, FEGlyphCommands &commands, b
* @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 (unsigned char chr, FEGlyphCommands &commands, bool scale) const {
+bool FontEngine::traceOutline (unsigned char chr, Glyph &glyph, bool scale) const {
if (_currentFace) {
int index = FT_Get_Char_Index(_currentFace, chr);
- return trace_outline(_currentFace, index, commands, scale);
+ return trace_outline(_currentFace, index, glyph, scale);
}
Message::wstream(true) << "FontEngine: can't trace outline, no font face selected\n";
return false;
}
-bool FontEngine::traceOutline (const char *name, FEGlyphCommands &commands, bool scale) const {
+bool FontEngine::traceOutline (const char *name, Glyph &glyph, bool scale) const {
if (_currentFace) {
int index = FT_Get_Name_Index(_currentFace, (FT_String*)name);
- return trace_outline(_currentFace, index, commands, scale);
+ return trace_outline(_currentFace, index, glyph, scale);
}
Message::wstream(true) << "FontEngine: can't trace outline, no font face selected\n";
return false;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.h
index 7e2593dc1e5..a92e970d6db 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEngine.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontEngine.h
@@ -2,9 +2,9 @@
** FontEngine.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef FONTENGINE_H
@@ -27,35 +27,22 @@
#include <string>
#include <vector>
#include "types.h"
+#include "Glyph.h"
-using std::map;
-using std::string;
-using std::vector;
-
-
-struct FEGlyphCommands
-{
- virtual ~FEGlyphCommands () {}
- virtual void moveTo(long x, long y) {}
- virtual void lineTo(long x, long y) {}
- virtual void conicTo(long x1, long y1, long x2, long y2) {}
- virtual void cubicTo(long x1, long y1, long x2, long y2, long x3, long y3) {}
-};
-
+class Font;
/** This class provides methods to handle font files and font data.
* It's a wrapper for the Freetype font library. */
class FontEngine
{
public:
- FontEngine ();
~FontEngine ();
+ static FontEngine& instance ();
void setDeviceResolution (int x, int y);
- bool setFont (const string &fname, int ptSize=0);
+ bool setFont (const Font &font);
bool setCharSize (int ptSize);
- bool getGlyphMetrics (unsigned char chr, int &width, int &height, int &depth) const;
- bool traceOutline (unsigned char chr, FEGlyphCommands &commands, bool scale=true) const;
- bool traceOutline (const char *name, FEGlyphCommands &commands, bool scale) const;
+ bool traceOutline (unsigned char chr, Glyph &glyph, bool scale=true) const;
+ bool traceOutline (const char *name, Glyph &glyph, bool scale) const;
const char* getFamilyName () const;
const char* getStyleName () const;
int getUnitsPerEM () const;
@@ -64,21 +51,25 @@ class FontEngine
int getHAdvance () const;
int getHAdvance (unsigned int c) const;
int getHAdvance (const char *name) const;
-// int getVAdvance () const;
int getFirstChar () const;
int getNextChar () const;
int getCharSize () const {return _ptSize;}
- vector<int> getPanose () const;
- string getGlyphName (unsigned int c) const;
+ std::vector<int> getPanose () const;
+ std::string getGlyphName (unsigned int c) const;
int getCharByGlyphName (const char *name) const;
- void buildTranslationMap (map<UInt32,UInt32> &translationMap) const;
+ void buildTranslationMap (std::map<UInt32,UInt32> &translationMap) const;
+
+ protected:
+ FontEngine ();
+ bool setFont (const std::string &fname, int ptSize=0);
private:
int _horDeviceRes, _vertDeviceRes;
mutable unsigned int _currentChar, _currentGlyphIndex;
- FT_Face _currentFace;
- FT_Library _library;
- int _ptSize;
+ FT_Face _currentFace;
+ FT_Library _library;
+ int _ptSize;
+ std::string fname;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.cpp
index b87981badc8..c32d43c0bc3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.cpp
@@ -2,7 +2,7 @@
** FontManager.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -30,17 +30,16 @@
using namespace std;
-FontManager::FontManager ()
-{
-}
-
-
FontManager::~FontManager () {
FORALL(_fonts, vector<Font*>::iterator, i)
delete *i;
- typedef map<string,FontEncoding*>::iterator Iterator;
- FORALL(_encMap, Iterator, i)
- delete i->second;
+}
+
+
+/** Returns the singleton instance */
+FontManager& FontManager::instance () {
+ static FontManager fm;
+ return fm;
}
@@ -61,6 +60,11 @@ int FontManager::fontID (int n) const {
}
+/** Returns a unique ID that identifies the font. Not the font object but the
+ * font pointer is looked up to get the ID. Thus, two different pointers
+ * referencing different objects of the same font are mapped to different IDs.
+ * @param[in] font pointer to font object to be identified
+ * @return non-negative font ID if font was found, -1 otherwise */
int FontManager::fontID (const Font *font) const {
for (size_t i=0; i < _fonts.size(); i++)
if (_fonts[i] == font)
@@ -69,6 +73,9 @@ int FontManager::fontID (const Font *font) const {
}
+/** Returns a unique ID that identifies the font.
+ * @param[in] name name of font to be identified, e.g. cmr10
+ * @return non-negative font ID if font was found, -1 otherwise */
int FontManager::fontID (const string &name) const {
map<string,int>::const_iterator it = _name2id.find(name);
if (it == _name2id.end())
@@ -168,10 +175,6 @@ int FontManager::registerFont (UInt32 fontnum, string name, UInt32 checksum, dou
Message::wstream(true) << "font '" << name << "' not found\n";
}
_name2id[name] = newid;
-
- const char *encname = FileFinder::lookupEncName(name);
- if (encname && _encMap.find(encname) == _encMap.end())
- _encMap[encname] = new FontEncoding(encname);
}
_fonts.push_back(newfont);
if (_vfStack.empty()) // register font referenced in dvi file?
@@ -211,21 +214,6 @@ void FontManager::assignVfChar (int c, vector<UInt8> *dvi) {
}
-/** Returns the encoding of a given font.
- * @param[in] font font whose encoding will be returned
- * @return pointer to encoding object, or 0 if there is no encoding defined */
-FontEncoding* FontManager::encoding (const Font *font) const {
- if (font) {
- if (const char *encname = FileFinder::lookupEncName(font->name())) {
- map<string,FontEncoding*>::const_iterator it = _encMap.find(encname);
- if (it != _encMap.end())
- return it->second;
- }
- }
- return 0;
-}
-
-
ostream& FontManager::write (ostream &os, Font *font, int level) {
#if 0
if (font) {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.h
index b1ee735a097..d3d18156a91 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontManager.h
@@ -2,7 +2,7 @@
** FontManager.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -29,61 +29,54 @@
#include <vector>
#include "types.h"
-using std::map;
-using std::ostream;
-using std::set;
-using std::string;
-using std::stack;
-using std::vector;
class FileFinder;
class Font;
-class FontEncoding;
class TFM;
class VirtualFont;
-/** This class provides methods for an easy DVI font handling.
+/** This class provides methods for easy DVI font handling.
* DVI and VF files use local font numbers to reference fonts. For SVG output
* we need a single list with unique IDs of all physical fonts. Characters of
* virtual fonts are completely replaced by their DVI description so they don't
* appear anywhere in the output. */
class FontManager
{
- typedef map<UInt32,int> Num2IdMap;
- typedef map<string,int> Name2IdMap;
- typedef map<VirtualFont*,Num2IdMap> VfNum2IdMap;
- typedef map<VirtualFont*, UInt32> VfFirstFontMap;
- typedef map<string,FontEncoding*> EncodingMap;
- typedef stack<VirtualFont*> VfStack;
+ typedef std::map<UInt32,int> Num2IdMap;
+ typedef std::map<std::string,int> Name2IdMap;
+ typedef std::map<VirtualFont*,Num2IdMap> VfNum2IdMap;
+ typedef std::map<VirtualFont*, UInt32> VfFirstFontMap;
+ typedef std::stack<VirtualFont*> VfStack;
+
public:
- FontManager ();
~FontManager ();
- int registerFont (UInt32 fontnum, string fontname, UInt32 checksum, double dsize, double scale);
+ static FontManager& instance ();
+ int registerFont (UInt32 fontnum, std::string fontname, UInt32 checksum, double dsize, double scale);
Font* getFont (int n) const;
- Font* getFont (const string &name) const;
+ Font* getFont (const std::string &name) const;
Font* getFontById (int id) const;
VirtualFont* getVF () const;
int fontID (int n) const;
int fontID (const Font *font) const;
- int fontID (const string &name) const;
+ int fontID (const std::string &name) const;
int fontnum (int id) const;
int vfFirstFontNum (VirtualFont *vf) const;
- int decodeChar (int c) const;
void enterVF (VirtualFont *vf);
void leaveVF ();
- void assignVfChar (int c, vector<UInt8> *dvi);
- const vector<Font*>& getFonts () const {return _fonts;}
- FontEncoding* encoding (const Font *font) const;
- ostream& write (ostream &os, Font *font=0, int level=0);
+ void assignVfChar (int c, std::vector<UInt8> *dvi);
+ const std::vector<Font*>& getFonts () const {return _fonts;}
+ std::ostream& write (std::ostream &os, Font *font=0, int level=0);
+
+ protected:
+ FontManager () {}
private:
- vector<Font*> _fonts; ///< all registered Fonts (indexed by fontID)
+ std::vector<Font*> _fonts; ///< all registered Fonts
Num2IdMap _num2id; ///< DVI font number -> fontID
Name2IdMap _name2id; ///< fontname -> fontID
VfNum2IdMap _vfnum2id;
VfStack _vfStack; ///< stack of currently processed virtual fonts
VfFirstFontMap _vfFirstFontMap; ///< VF -> local font number of first font defined in VF
- EncodingMap _encMap; ///< encname -> encoding table
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.cpp
index 9d5ac6ee96f..1a67917f687 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.cpp
@@ -2,9 +2,9 @@
** FontMap.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <fstream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontMap.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.h
index 8ca075fb36b..d57153c9d4b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontMap.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/FontMap.h
@@ -2,9 +2,9 @@
** FontMap.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef FONTMAP_H
@@ -27,9 +27,6 @@
#include <ostream>
#include <string>
-using std::istream;
-using std::map;
-using std::ostream;
class FontMap
{
@@ -39,25 +36,25 @@ class FontMap
std::string encname; ///< name of font encoding
};
- typedef map<std::string,MapEntry>::const_iterator ConstIterator;
+ typedef std::map<std::string,MapEntry>::const_iterator ConstIterator;
public:
FontMap () {}
FontMap (const std::string &fname);
- FontMap (istream &is);
+ FontMap (std::istream &is);
bool read (const std::string &fname);
void readdir (const std::string &dirname);
void clear () {_fontMap.clear();}
- ostream& write (ostream &os) const;
+ std::ostream& write (std::ostream &os) const;
const char* lookup(const std::string &fontname) const;
const char* encoding (const std::string &fontname) const;
protected:
- void readPsMap (istream &is);
- void readPdfMap (istream &is);
+ void readPsMap (std::istream &is);
+ void readPdfMap (std::istream &is);
private:
- map<std::string,MapEntry> _fontMap;
+ std::map<std::string,MapEntry> _fontMap;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFGlyphTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.cpp
index 4707520ba38..41f73835352 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFGlyphTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.cpp
@@ -2,7 +2,7 @@
** GFGlyphTracer.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -23,64 +23,70 @@
using namespace std;
+GFGlyphTracer::GFGlyphTracer () : GFTracer(_ifs, 0), _glyph(0), _callback(0)
+{
+}
-
-GFGlyphTracer::GFGlyphTracer (istream &is, double upp) : GFTracer(is, upp)
+/** Constructs a new glyph tracer.
+ * @param[in] is GF input stream
+ * @param[in] upp target units per TeX point */
+GFGlyphTracer::GFGlyphTracer (string &fname, double upp, Callback *cb)
+ : GFTracer(_ifs, upp), _glyph(0), _callback(cb)
{
- _glyph = new Glyph;
- _transfered = false;
+ if (_callback)
+ _callback->setFont(fname);
+ _ifs.open(fname.c_str(), ios::binary);
+}
+
+
+void GFGlyphTracer::reset (string &fname, double upp) {
+ if (_callback)
+ _callback->setFont(fname);
+ if (_ifs.is_open())
+ _ifs.close();
+ unitsPerPoint(upp);
+ _ifs.open(fname.c_str(), ios::binary);
}
-GFGlyphTracer::~GFGlyphTracer () {
- if (!_transfered)
- delete _glyph;
+bool GFGlyphTracer::executeChar (UInt8 c) {
+ if (_glyph) {
+ if (_callback)
+ _callback->beginChar(c);
+ bool ok = GFTracer::executeChar(c);
+ if (_callback) {
+ if (ok)
+ _callback->endChar(c);
+ else
+ _callback->emptyChar(c);
+ return ok;
+ }
+ }
+ return false;
}
void GFGlyphTracer::moveTo (double x, double y) {
- LPair p(x, y);
- _glyph->addCommand(new GlyphMoveTo(p));
+ _glyph->moveto(x, y);
}
void GFGlyphTracer::lineTo (double x, double y) {
- LPair p(x, y);
- _glyph->addCommand(new GlyphLineTo(p));
+ _glyph->lineto(x, y);
}
void GFGlyphTracer::curveTo (double c1x, double c1y, double c2x, double c2y, double x, double y) {
- LPair p1(c1x, c1y);
- LPair p2(c2x, c2y);
- LPair p3(x, y);
- _glyph->addCommand(new GlyphCubicTo(p1, p2, p3));
+ _glyph->cubicto(c1x, c1y, c2x, c2y, x, y);
}
void GFGlyphTracer::closePath () {
- _glyph->addCommand(new GlyphClosePath());
+ _glyph->closepath();
}
void GFGlyphTracer::endChar (UInt32 c) {
- if (_transfered) {
- _glyph = new Glyph;
- _transfered = false;
- }
- else
- _glyph->clear();
+ _glyph->newpath();
GFTracer::endChar(c);
- _glyph->optimizeCommands();
-}
-
-
-/** Returns a pointer to the current glyph object and transfers its ownership. That means
- * the caller is responsible for deleting the object after its usage. GFGlyphTracer doesn't
- * care for it any longer. To just retrieve the glyph without transferring ownership, use
- * getGlyph(). */
-Glyph* GFGlyphTracer::transferGlyph () {
- _transfered = true;
- return _glyph;
}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFGlyphTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.h
index 7c63ac5b932..9a51703a003 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFGlyphTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFGlyphTracer.h
@@ -2,7 +2,7 @@
** GFGlyphTracer.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -21,25 +21,40 @@
#ifndef GFGLYPHTRACER_H
#define GFGLYPHTRACER_H
-#include "FontGlyph.h"
+#include <fstream>
+#include <string>
#include "GFTracer.h"
+#include "Glyph.h"
class GFGlyphTracer : public GFTracer
{
public:
- GFGlyphTracer (istream &is, double upp);
- ~GFGlyphTracer ();
+ struct Callback {
+ virtual ~Callback () {}
+ virtual void setFont (const std::string &fontname) {}
+ virtual void beginChar (UInt8 c) {}
+ virtual void endChar (UInt8 c) {}
+ virtual void emptyChar (UInt8 c) {}
+ };
+
+ public:
+ GFGlyphTracer ();
+ GFGlyphTracer (std::string &fname, double upp, Callback *cb=0);
+ void reset (std::string &fname, double upp);
+ void setCallback (Callback *cb) {_callback = cb;}
+ bool executeChar (UInt8 c);
void moveTo (double x, double y);
void lineTo (double x, double y);
void curveTo (double c1x, double c1y, double c2x, double c2y, double x, double y);
void closePath ();
void endChar (UInt32 c);
+ void setGlyph (Glyph &glyph) {_glyph = &glyph;}
const Glyph& getGlyph () const {return *_glyph;}
- Glyph* transferGlyph ();
private:
+ std::ifstream _ifs;
Glyph *_glyph;
- bool _transfered;
+ Callback *_callback;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.cpp
index 121b9e44b59..a146c14bf50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.cpp
@@ -2,7 +2,7 @@
** GFReader.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -19,8 +19,8 @@
*************************************************************************/
#include <iostream>
+#include <sstream>
#include "GFReader.h"
-#include "Message.h"
#include "macros.h"
using namespace std;
@@ -31,16 +31,6 @@ struct GFCommand
int numBytes;
};
-struct CharInfo
-{
- CharInfo (Int32 dxx, Int32 dyy, Int32 w, UInt32 p)
- : dx(dxx), dy(dyy), width(w), location(p) {}
-
- Int32 dx, dy;
- Int32 width; // 2^24 * (true width)/(design size)
- UInt32 location;
-};
-
static inline double fix2double (Int32 fix) {
return double(fix)/(1 << 20);
@@ -52,18 +42,12 @@ static inline double scaled2double (Int32 scaled) {
}
-GFReader::GFReader (istream &is) : in(is), valid(true)
+GFReader::GFReader (istream &is) : in(is)
{
minX = maxX = minY = maxY = x = y = 0;
}
-GFReader::~GFReader () {
- FORALL(charInfoMap, Iterator, i)
- delete i->second;
-}
-
-
UInt32 GFReader::readUnsigned (int bytes) {
UInt32 ret = 0;
for (int i=bytes-1; i >= 0 && !in.eof(); i--) {
@@ -85,14 +69,12 @@ Int32 GFReader::readSigned (int bytes) {
string GFReader::readString (int bytes) {
- char *buf = new char[bytes+1];
+ vector<char> buf(bytes+1);
if (bytes > 0)
- in.get(buf, bytes+1); // reads 'bytes' bytes (pos. bytes+1 is set to 0)
+ in.get(&buf[0], bytes+1); // reads 'bytes' bytes (pos. bytes+1 is set to 0)
else
- *buf = 0;
- string ret = buf;
- delete [] buf;
- return ret;
+ buf[0] = 0;
+ return &buf[0];
}
@@ -116,17 +98,17 @@ int GFReader::executeCommand () {
};
int opcode = in.get();
- if (opcode < 0) { // at end of file
- Message::estream(true) << "unexpected end of file\n";
- return 249; // postpost opcode => stop further reading
- }
+ if (opcode < 0) // at end of file?
+ throw GFException("unexpected end of file");
+
if (opcode >= 0 && opcode <= 63)
cmdPaint0(opcode);
else if (opcode >= 74 && opcode <= 238)
cmdNewRow(opcode-74);
else if (opcode >= 250) {
- Message::estream(true) << "undefined GF command (opcode " << opcode << ")\n";
- valid = false;
+ ostringstream oss;
+ oss << "undefined GF command (opcode " << opcode << ")";
+ throw GFException(oss.str());
}
else {
int offset = opcode <= 73 ? 64 : 239-(73-64+1);
@@ -141,13 +123,13 @@ int GFReader::executeCommand () {
bool GFReader::executeChar (UInt8 c) {
in.clear();
if (charInfoMap.empty())
- executePostamble(); // read character infos
+ executePostamble(); // read character info
in.clear();
Iterator it = charInfoMap.find(c);
- if (in && valid && it != charInfoMap.end()) {
- in.seekg(it->second->location, ios_base::beg);
- while (valid && executeCommand() != 69); // execute all commands until eoc is reached
- return valid;
+ if (in && it != charInfoMap.end()) {
+ in.seekg(it->second.location, ios_base::beg);
+ while (executeCommand() != 69); // execute all commands until eoc is reached
+ return true;
}
return false;
}
@@ -156,12 +138,12 @@ bool GFReader::executeChar (UInt8 c) {
bool GFReader::executeAllChars () {
in.clear();
if (charInfoMap.empty())
- executePostamble(); // read character infos
+ executePostamble(); // read character info
in.clear();
- if (in && valid) {
+ if (in) {
in.seekg(0);
- while (valid && executeCommand() != 248); // execute all commands until postamble is reached
- return valid;
+ while (executeCommand() != 248); // execute all commands until postamble is reached
+ return true;
}
return false;
}
@@ -176,9 +158,9 @@ bool GFReader::executePostamble () {
in.seekg(-1, ios_base::cur);
in.seekg(-4, ios_base::cur);
UInt32 q = readUnsigned(4); // pointer to begin of postamble
- in.seekg(q, ios_base::beg); // now on begin of postamble
- while (valid && executeCommand() != 249); // execute all commands until postpost is reached
- return valid;
+ in.seekg(q, ios_base::beg); // now on begin of postamble
+ while (executeCommand() != 249); // execute all commands until postpost is reached
+ return true;
}
@@ -200,7 +182,7 @@ double GFReader::getVPixelsPerPoint () const {
/** Returns the width of character c in TeX 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);
+ return it == charInfoMap.end() ? 0 : it->second.width*getDesignSize()/(1<<24);
}
///////////////////////
@@ -214,10 +196,8 @@ void GFReader::cmdPre (int) {
string s = readString(k);
preamble(s);
}
- else {
- Message::estream(true) << "invalid identification number in GF preamble\n";
- valid = false;
- }
+ else
+ throw GFException("invalid identification number in GF preamble");
}
@@ -239,10 +219,8 @@ void GFReader::cmdPostPost (int) {
UInt32 i = readUnsigned(1);
if (i == 131)
while (readUnsigned(1) == 223); // skip fill bytes
- else {
- Message::estream(true) << "invalid identification number in GF preamble\n";
- valid = false;
- }
+ else
+ throw GFException("invalid identification number in GF preamble");
}
@@ -356,7 +334,7 @@ void GFReader::cmdCharLoc0 (int) {
Int32 p = readSigned(4); // pointer to begin of (last) character data
Int32 dx = 65536*dm;
Int32 dy = 0;
- charInfoMap[c] = new CharInfo(dx, dy, w, p);
+ charInfoMap[c] = CharInfo(dx, dy, w, p);
}
@@ -367,6 +345,6 @@ void GFReader::cmdCharLoc (int) {
Int32 dy = readSigned(4); // vertical escapement (scaled pixel units)
Int32 w = readSigned(4); // (1<<24)*characterWidth/designSize
Int32 p = readSigned(4); // pointer to begin of (last) character data
- charInfoMap[c] = new CharInfo(dx, dy, w, p);
+ charInfoMap[c] = CharInfo(dx, dy, w, p);
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.h
index d647393359f..17b96a1503f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFReader.h
@@ -2,9 +2,9 @@
** GFReader.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef GFREADER_H
@@ -24,32 +24,45 @@
#include <istream>
#include <map>
#include <string>
-#include <vector>
#include "Bitmap.h"
+#include "MessageException.h"
#include "types.h"
-using std::istream;
-using std::map;
-using std::string;
-using std::vector;
class CharInfo;
+
+struct GFException : public MessageException
+{
+ GFException (const std::string &msg) : MessageException(msg) {}
+};
+
+
class GFReader
{
- typedef map<UInt8,CharInfo*>::iterator Iterator;
- typedef map<UInt8,CharInfo*>::const_iterator ConstIterator;
+ struct CharInfo
+ {
+ CharInfo () : dx(0), dy(0), width(0), location(0) {}
+ CharInfo (Int32 dxx, Int32 dyy, Int32 w, UInt32 p) : dx(dxx), dy(dyy), width(w), location(p) {}
+
+ Int32 dx, dy;
+ Int32 width; // 2^24 * (true width)/(design size)
+ UInt32 location;
+ };
+
+ typedef std::map<UInt8,CharInfo>::iterator Iterator;
+ typedef std::map<UInt8,CharInfo>::const_iterator ConstIterator;
public:
- GFReader (istream &is);
- virtual ~GFReader ();
+ GFReader (std::istream &is);
+ virtual ~GFReader () {}
bool executeChar (UInt8 c);
bool executeAllChars ();
bool executePostamble ();
- virtual void preamble (const string &str) {}
+ virtual void preamble (const std::string &str) {}
virtual void postamble () {}
virtual void beginChar (UInt32 c) {}
virtual void endChar (UInt32 c) {}
- virtual void special (string str) {}
+ virtual void special (std::string str) {}
virtual void numspecial (Int32 y) {}
const Bitmap& getBitmap () const {return bitmap;}
double getDesignSize () const;
@@ -61,9 +74,9 @@ class GFReader
protected:
Int32 readSigned (int bytes);
UInt32 readUnsigned (int bytes);
- string readString (int len);
+ std::string readString (int len);
int executeCommand ();
- istream& getInputStream () const {return in;}
+ std::istream& getInputStream () const {return in;}
void cmdPre (int);
void cmdPost (int);
@@ -82,7 +95,7 @@ class GFReader
void cmdCharLoc (int);
private:
- istream &in;
+ std::istream &in;
Int32 minX, maxX, minY, maxY;
Int32 x, y; // current pen location (pixel units)
Int32 currentChar;
@@ -90,9 +103,8 @@ class GFReader
FixWord designSize; // designSize
ScaledInt hppp, vppp; // horizontal and vertical pixel per point
UInt32 checksum;
- map<UInt8,CharInfo*> charInfoMap;
+ std::map<UInt8,CharInfo> charInfoMap;
bool penDown;
- bool valid;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFTracer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.cpp
index 4d494934c0d..8a3dd245a86 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFTracer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.cpp
@@ -2,7 +2,7 @@
** GFTracer.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -21,8 +21,8 @@
#include <iostream>
#include <fstream>
#include <sstream>
-#include "FontGlyph.h"
#include "GFTracer.h"
+#include "Glyph.h"
#include "Message.h"
#ifdef __MSVC__
@@ -100,4 +100,3 @@ void GFTracer::endChar (UInt32 c) {
}
potrace_state_free(state);
}
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFTracer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.h
index bfa21accad6..3a60e03c8ab 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GFTracer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GFTracer.h
@@ -2,9 +2,9 @@
** GFTracer.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef GFTRACER_H
@@ -37,6 +37,9 @@ class GFTracer : public GFReader
void beginChar (UInt32 c);
void endChar (UInt32 c);
+ protected:
+ void unitsPerPoint(double upp) {_unitsPerPoint = upp;}
+
private:
double _unitsPerPoint; ///< target units per TeX point
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.cpp
index 149661730cb..4b2550253ef 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.cpp
@@ -2,9 +2,9 @@
** Ghostscript.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include "Ghostscript.h"
@@ -33,11 +33,14 @@ using namespace std;
#endif
+string Ghostscript::LIBGS_NAME;
+
+
/** Loads the Ghostscript library but does not create an instance. This
* constructor should only be used to call available() and revision(). */
Ghostscript::Ghostscript ()
#if !defined(HAVE_LIBGS)
-: DLLoader(GS_DL_NAME)
+ : DLLoader(LIBGS_NAME.empty() ? GS_DL_NAME : LIBGS_NAME.c_str())
#endif
{
_inst = 0;
@@ -50,7 +53,7 @@ Ghostscript::Ghostscript ()
* @param[in] caller this parameter is passed to all callback functions */
Ghostscript::Ghostscript (int argc, const char **argv, void *caller)
#if !defined(HAVE_LIBGS)
- : DLLoader(GS_DL_NAME)
+ : DLLoader(LIBGS_NAME.empty() ? GS_DL_NAME : LIBGS_NAME.c_str())
#endif
{
int status = new_instance(&_inst, caller);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.h
index bf6acbee3f6..80f55d086e9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Ghostscript.h
@@ -2,9 +2,9 @@
** Ghostscript.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef GHOSTSCRIPT_H
@@ -26,6 +26,7 @@
#endif
#include <string>
+
#if defined(DISABLE_GS)
#include "iapi.h"
#elif defined(HAVE_LIBGS)
@@ -71,7 +72,7 @@ class Ghostscript
typedef int (GSDLLCALLPTR Stdout) (void *caller, const char *str, int len);
typedef int (GSDLLCALLPTR Stderr) (void *caller, const char *str, int len);
- public:
+ public:
Ghostscript ();
Ghostscript (int argc, const char **argv, void *caller=0);
~Ghostscript ();
@@ -84,6 +85,8 @@ class Ghostscript
int run_string_end (int user_errors, int *pexit_code);
int exit ();
+ static std::string LIBGS_NAME;
+
protected:
Ghostscript (const Ghostscript &gs) {}
int init_with_args (int argc, char **argv);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/StreamCounterTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Glyph.h
index 0760f356538..6edcfa1e6cc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/StreamCounterTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Glyph.h
@@ -1,8 +1,8 @@
/*************************************************************************
-** StreamCounterTest.cpp **
+** Glyph.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,22 +18,11 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#include <gtest/gtest.h>
-#include <sstream>
-#include "StreamCounter.h"
+#ifndef GLYPH_H
+#define GLYPH_H
+#include "GraphicPath.h"
-TEST(StreamCounterTest, count) {
- std::ostringstream ss;
- StreamCounter<char> sc(ss);
- EXPECT_EQ(sc.count(), unsigned(0));
+typedef GraphicPath<Int32> Glyph;
- ss << "0123456789";
- EXPECT_EQ(sc.count(), unsigned(10));
-
- ss << "0123456789";
- EXPECT_EQ(sc.count(), unsigned(20));
-
- sc.reset();
- EXPECT_EQ(sc.count(), unsigned(0));
-}
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GlyphTracerMessages.h
index b3dda8b91d5..ab8b71e4365 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGFontEmitter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GlyphTracerMessages.h
@@ -1,8 +1,8 @@
/*************************************************************************
-** SVGFontEmitter.h **
+** GlyphTracerMessages.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,39 +18,48 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#ifndef SVGFONTDEFEMITTER_H
-#define SVGFONTDEFEMITTER_H
+#ifndef GLYPHTRACERMESSAGES_H
+#define GLYPHTRACERMESSAGES_H
+#include <sstream>
+#include "GFGlyphTracer.h"
+#include "Message.h"
+#include "types.h"
-#include "FontEmitter.h"
-#include "FontEngine.h"
+class GlyphTracerMessages : public GFGlyphTracer::Callback
+{
+ public:
+ GlyphTracerMessages (bool sfmsg=true, bool autonl=true) : _sfmsg(sfmsg), _autonl(autonl) {}
+ ~GlyphTracerMessages () {
+ if (_autonl)
+ Message::mstream() << '\n';
+ }
-class CharmapTranslator;
-class FontManager;
-class SVGTree;
-class XMLElementNode;
+ void endChar (UInt8 c) {
+ std::ostringstream oss;
+ oss << '[';
+ if (isprint(c))
+ oss << c;
+ else
+ oss << '#' << unsigned(c);
+ oss << ']';
+ Message::mstream(false, Terminal::BLUE) << oss.str();
+ }
-class SVGFontEmitter : public FontEmitter
-{
- public:
- SVGFontEmitter (const Font *font, const FontManager &fm, const CharmapTranslator &cmt, SVGTree &svg, bool uf);
- int emitFont (const char *id);
- int emitFont (const std::set<int> &usedChars, const char *id);
- bool emitGlyph (int c);
- const XMLElementNode* getGlyphNode () const {return _glyphNode;}
-
- protected:
- int emitFont (const std::set<int> *usedCharsm, const char *id);
-
- private:
- const Font *_font;
- FontEngine _fontEngine;
- const FontManager &_fontManager;
- const CharmapTranslator &_charmapTranslator;
- SVGTree &_svg;
- mutable XMLElementNode *_glyphNode; // current <glyph ...>-node
- bool _useFonts; ///< create font elements or draw paths?
+ void setFont (const std::string &fname) {
+ if (_sfmsg && fname != _fname) {
+ if (!_fname.empty())
+ Message::mstream() << '\n';
+ Message::mstream(false, Terminal::CYAN) << "tracing glyphs of " << fname.substr(0, fname.length()-3) << '\n';
+ _fname = fname;
+ }
+ }
+
+ private:
+ std::string _fname;
+ bool _sfmsg, _autonl;
};
+
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GraphicPath.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GraphicPath.h
index e577821c0a7..f2c70e97b02 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/GraphicPath.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/GraphicPath.h
@@ -2,9 +2,9 @@
** GraphicPath.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef GRAPHICPATH_H
@@ -32,65 +32,68 @@
template <typename T>
class GraphicPath
{
- typedef Pair<T> Point;
+ public:
+ typedef Pair<T> Point;
- struct Command {
- enum Type {MOVETO, LINETO, CONICTO, CUBICTO, CLOSEPATH};
+ struct Command {
+ enum Type {MOVETO, LINETO, CONICTO, CUBICTO, CLOSEPATH};
- Command (Type t) : type(t) {}
+ Command (Type t) : type(t) {}
- Command (Type t, const Point &p) : type(t) {
- params[0] = p;
- }
+ Command (Type t, const Point &p) : type(t) {
+ params[0] = p;
+ }
- Command (Type t, const Point &p1, const Point &p2) : type(t) {
- params[0] = p1;
- params[1] = p2;
- }
+ Command (Type t, const Point &p1, const Point &p2) : type(t) {
+ params[0] = p1;
+ params[1] = p2;
+ }
- Command (Type t, const Point &p1, const Point &p2, const Point &p3) : type(t) {
- params[0] = p1;
- params[1] = p2;
- params[2] = p3;
- }
+ Command (Type t, const Point &p1, const Point &p2, const Point &p3) : type(t) {
+ params[0] = p1;
+ params[1] = p2;
+ params[2] = p3;
+ }
- int numParams () const {
- switch (type) {
- case CLOSEPATH : return 0;
- case MOVETO :
- case LINETO : return 1;
- case CONICTO : return 2;
- case CUBICTO : return 3;
+ int numParams () const {
+ switch (type) {
+ case CLOSEPATH : return 0;
+ case MOVETO :
+ case LINETO : return 1;
+ case CONICTO : return 2;
+ case CUBICTO : return 3;
+ }
+ return 0;
}
- return 0;
- }
- void transform (const Matrix &matrix) {
- for (int i=0; i < numParams(); i++)
- params[i] = matrix * params[i];
- }
+ void transform (const Matrix &matrix) {
+ for (int i=0; i < numParams(); i++)
+ params[i] = matrix * params[i];
+ }
- Type type;
- Point params[3];
- };
-
- struct Actions
- {
- virtual void moveto (const Point &p) {}
- virtual void lineto (const Point &p) {}
- virtual void hlineto (const T &y) {}
- virtual void vlineto (const T &x) {}
- virtual void sconicto (const Point &p) {}
- virtual void conicto (const Point &p1, const Point &p2) {}
- virtual void scubicto (const Point &p1, const Point &p2) {}
- virtual void cubicto (const Point &p1, const Point &p2, const Point &p3) {}
- virtual void closepath () {}
- virtual bool quit () {return false;}
- };
-
- typedef typename std::vector<Command>::iterator Iterator;
- typedef typename std::vector<Command>::const_iterator ConstIterator;
- typedef typename std::vector<Command>::const_reverse_iterator ConstRevIterator;
+ Type type;
+ Point params[3];
+ };
+
+ struct Actions
+ {
+ virtual ~Actions () {}
+ virtual void moveto (const Point &p) {}
+ virtual void lineto (const Point &p) {}
+ virtual void hlineto (const T &y) {}
+ virtual void vlineto (const T &x) {}
+ virtual void sconicto (const Point &p) {}
+ virtual void conicto (const Point &p1, const Point &p2) {}
+ virtual void scubicto (const Point &p1, const Point &p2) {}
+ virtual void cubicto (const Point &p1, const Point &p2, const Point &p3) {}
+ virtual void closepath () {}
+ virtual void draw (char cmd, const Point *points, int n) {}
+ virtual bool quit () {return false;}
+ };
+
+ typedef typename std::vector<Command>::iterator Iterator;
+ typedef typename std::vector<Command>::const_iterator ConstIterator;
+ typedef typename std::vector<Command>::const_reverse_iterator ConstRevIterator;
public:
void newpath () {
@@ -102,6 +105,10 @@ class GraphicPath
return _commands.empty();
}
+ size_t size () const {
+ return _commands.size();
+ }
+
void moveto (const T &x, const T &y) {
moveto(Point(x, y));
}
@@ -142,24 +149,55 @@ class GraphicPath
_commands.push_back(Command(Command::CLOSEPATH));
}
+
+ const std::vector<Command>& commands () const {
+ return _commands;
+ }
+
+
+ /** Detects all open subpaths and closes them by adding a closePath command.
+ * Most font formats only support closed outline paths so there are no explicit closePath statements
+ * in the glyph's outline description. All open paths are automatically closed by the renderer.
+ * This method detects all open paths and adds the missing closePath statement. */
+ void closeOpenSubPaths () {
+ Command *prevCommand = 0;
+ FORALL(_commands, Iterator, it) {
+ if (it->type == Command::MOVETO && prevCommand && prevCommand->type != Command::CLOSEPATH) {
+ prevCommand = &(*it);
+ it = _commands.insert(it, Command(Command::CLOSEPATH))+1;
+// ++it; // skip inserted closePath command in next iteration step
+ }
+ else
+ prevCommand = &(*it);
+ }
+ if (!_commands.empty() && _commands.back().type != Command::CLOSEPATH)
+ closepath();
+ }
+
+
void writeSVG (std::ostream &os, double sx=1.0, double sy=1.0) const {
struct WriteActions : Actions {
- WriteActions (std::ostream &os) : _os(os) {}
- void moveto (const Point &p) {write('M', p);}
- void lineto (const Point &p) {write('L', p);}
- void hlineto (const T &y) {_os << 'H' << y;}
- void vlineto (const T &x) {_os << 'V' << x;}
- void sconicto (const Point &p) {write('T', p); }
- void conicto (const Point &p1, const Point &p2) {write('Q', p1); write(' ', p2);}
- void scubicto (const Point &p1, const Point &p2) {write('S', p1); write(' ', p2);}
- void cubicto (const Point &p1, const Point &p2, const Point &p3) {write('C', p1); write(' ', p2); write(' ', p3);}
- void closepath () {_os << 'Z';}
- void write (char prefix, const Point &p) {_os << prefix << p.x() << ' ' << p.y();}
+ WriteActions (std::ostream &os, double sx, double sy) : _os(os), _sx(sx), _sy(sy) {}
+ void draw (char cmd, const Point *points, int n) {
+ _os << cmd;
+ switch (cmd) {
+ case 'H': _os << _sx*points->x(); break;
+ case 'V': _os << _sy*points->y(); break;
+ default :
+ for (int i=0; i < n; i++) {
+ if (i > 0)
+ _os << ' ';
+ _os << _sx*points[i].x() << ' ' << _sy*points[i].y();
+ }
+ }
+ }
std::ostream &_os;
- } actions(os);
+ double _sx, _sy;
+ } actions(os, sx, sy);
iterate(actions, true);
}
+
void computeBBox (BoundingBox &bbox) const {
struct BBoxActions : Actions {
BBoxActions (BoundingBox &bb) : bbox(bb) {}
@@ -200,6 +238,13 @@ class GraphicPath
};
+/** Iterates over all commands defining this path and calls the corresponding template methods.
+ * In the case of successive bezier curve sequences, control points or tangent slopes are often
+ * identical so that the path description contains redundant information. SVG provides shorthand
+ * curve commands that require less parameters. If 'optimize' is true, this method detects such
+ * command sequences.
+ * @param[in] actions template methods called by each iteration step
+ * @param[in] optimize if true, shorthand drawing commands (sconicto, scubicto,...) are considered */
template <typename T>
void GraphicPath<T>::iterate (Actions &actions, bool optimize) const {
ConstIterator prev; // pointer to preceding command
@@ -211,39 +256,57 @@ void GraphicPath<T>::iterate (Actions &actions, bool optimize) const {
switch (it->type) {
case Command::MOVETO:
actions.moveto(params[0]);
+ actions.draw('M', params, 1);
fp = params[0];
break;
case Command::LINETO:
if (optimize) {
- if (cp.x() == params[0].x())
+ if (cp.x() == params[0].x()) {
actions.vlineto(params[0].y());
- else if (cp.y() == params[0].y())
+ actions.draw('V', params, 1);
+ }
+ else if (cp.y() == params[0].y()) {
actions.hlineto(params[0].x());
- else
+ actions.draw('H', params, 1);
+ }
+ else {
actions.lineto(params[0]);
+ actions.draw('L', params, 1);
+ }
}
- else
+ else {
actions.lineto(params[0]);
+ actions.draw('L', params, 1);
+ }
break;
case Command::CONICTO:
- if (optimize && prev->type == Command::CONICTO && params[0] == pstore[1]*T(2)-pstore[0])
+ if (optimize && prev->type == Command::CONICTO && params[0] == pstore[1]*T(2)-pstore[0]) {
actions.sconicto(params[1]);
- else
+ actions.draw('T', params+1, 1);
+ }
+ else {
actions.conicto(params[0], params[1]);
+ actions.draw('Q', params, 2);
+ }
pstore[0] = params[0]; // store control point and
pstore[1] = params[1]; // curve endpoint
break;
case Command::CUBICTO:
// is first control point reflection of preceding second control point?
- if (optimize && prev->type == Command::CUBICTO && params[0] == pstore[1]*T(2)-pstore[0])
+ if (optimize && prev->type == Command::CUBICTO && params[0] == pstore[1]*T(2)-pstore[0]) {
actions.scubicto(params[1], params[2]);
- else
+ actions.draw('S', params+1, 2);
+ }
+ else {
actions.cubicto(params[0], params[1], params[2]);
+ actions.draw('C', params, 3);
+ }
pstore[0] = params[1]; // store second control point and
pstore[1] = params[2]; // curve endpoint
break;
case Command::CLOSEPATH:
actions.closepath();
+ actions.draw('Z', params, 0);
cp = fp;
}
// update current point
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputBuffer.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.cpp
index 17b95960e3f..cb1a393fb6f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputBuffer.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.cpp
@@ -2,9 +2,9 @@
** InputBuffer.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cmath>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputBuffer.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.h
index 936370a3fa7..72caff31f8d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputBuffer.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputBuffer.h
@@ -2,9 +2,9 @@
** InputBuffer.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef INPUTBUFFER_H
@@ -35,6 +35,7 @@ struct InputBuffer
virtual int peek () const =0;
virtual int peek (unsigned n) const =0;
virtual bool eof () const =0;
+ virtual void invalidate () =0;
};
@@ -46,7 +47,8 @@ class StreamInputBuffer : public InputBuffer
int get ();
int peek () const;
int peek (unsigned n) const;
- bool eof () const {return pos() == _size1 && _size2 == 0;}
+ bool eof () const {return pos() == _size1 && _size2 == 0;}
+ void invalidate () {_bufptr = _buf1+_size1; _size2 = 0;}
protected:
int fillBuffer (UInt8 *buf);
@@ -71,6 +73,7 @@ class StringInputBuffer : public InputBuffer
int peek () const {return _pos < _str.length() ? _str[_pos] : -1;}
int peek (unsigned n) const {return _pos+n < _str.length() ? _str[_pos+n] : -1;}
bool eof () const {return _pos >= _str.length();}
+ void invalidate () {_pos = _str.length();}
private:
std::string &_str;
@@ -102,6 +105,7 @@ class CharInputBuffer : public InputBuffer
int peek () const {return _size > 0 ? *_pos : -1;}
int peek (unsigned n) const {return _size >= n ? _pos[n] : -1;}
bool eof () const {return _size <= 0;}
+ void invalidate () {_size = 0;}
private:
const char *_pos;
@@ -116,8 +120,8 @@ class SplittedCharInputBuffer : public InputBuffer
int get ();
int peek () const;
int peek (unsigned n) const;
- bool eof () const {return _size[_index] == 0;}
-// bool check (const char *s, bool consume=true);
+ bool eof () const {return _size[_index] == 0;}
+ void invalidate () {_size[_index] = 0;}
private:
const char *_buf[2];
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.cpp
index 9700a03c367..7465c4f6f8f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.cpp
@@ -2,9 +2,9 @@
** InputReader.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cmath>
@@ -115,7 +115,7 @@ bool InputReader::parseUInt (unsigned &val) {
if (!isdigit(peek()))
return false;
while (isdigit(peek()))
- val += val*10 + (get()-'0');
+ val = val*10 + (get()-'0');
return true;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.h
index 0a9b8778738..ae7b4e9e594 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/InputReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/InputReader.h
@@ -2,9 +2,9 @@
** InputReader.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef INPUTREADER_H
@@ -29,6 +29,7 @@
struct InputReader
{
+ virtual ~InputReader() {}
virtual int get () =0;
virtual int peek () const =0;
virtual int peek (unsigned n) const =0;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Length.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.cpp
index da2fc767245..7edeb5c5f37 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Length.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.cpp
@@ -2,7 +2,7 @@
** Length.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Length.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.h
index 338975bf965..ba79dfa66f8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Length.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Length.h
@@ -2,7 +2,7 @@
** Length.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.am
new file mode 100644
index 00000000000..22a20250844
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.am
@@ -0,0 +1,49 @@
+## This file is part of dvisvgm
+## Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>
+##
+## Process this file with automake.
+
+bin_PROGRAMS = dvisvgm
+noinst_LIBRARIES = libdvisvgm.a
+
+dvisvgm_SOURCES = gzstream.h \
+ dvisvgm.cpp gzstream.cpp
+
+dvisvgm_LDADD = $(noinst_LIBRARIES) @EXTRA_LIBS@
+dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
+
+libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CmdLineParserBase.h Color.h \
+ ColorSpecialHandler.h CommandLine.h Directory.h DLLoader.h DVIActions.h DVIReader.h DvisvgmSpecialHandler.h DVIToSVG.h \
+ DVIToSVGActions.h EmSpecialHandler.h FileFinder.h FilePath.h FileSystem.h Font.h FontCache.h FontEncoding.h FontEngine.h \
+ FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h Glyph.h GlyphTracerMessages.h \
+ GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h PageRanges.h \
+ PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h \
+ StreamWriter.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h \
+ XMLDocument.h XMLNode.h XMLString.h \
+ BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CmdLineParserBase.cpp Color.cpp \
+ ColorSpecialHandler.cpp CommandLine.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp DvisvgmSpecialHandler.cpp \
+ DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FilePath.cpp FileSystem.cpp Font.cpp FontCache.cpp \
+ FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp \
+ InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PSInterpreter.cpp \
+ PsSpecialHandler.cpp SpecialManager.cpp StreamReader.cpp StreamWriter.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp \
+ TpicSpecialHandler.cpp VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
+
+EXTRA_DIST = options.xml psdefs.psc iapi.h ierrors.h
+
+AM_CXXFLAGS = -Wall -Wnon-virtual-dtor
+
+# the commandline parser is generated from options.xml by opt2cpp
+CommandLine.cpp: options.xml
+ if test -f opt2cpp.xsl; then \
+ rm -f $@ $*.h; \
+ xsltproc opt2cpp.xsl $<; \
+ fi
+
+# Create a C string definition containing the PostScript routines psdefs.ps needed by class PSInterpreter
+psdefs.psc: psdefs.ps
+ if test -f $<; then \
+ ps2c PSInterpreter::PSDEFS $< >$@; \
+ fi
+
+psdefs.ps: ;
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.in
index 0d4789c72d5..d394eba494e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -54,23 +54,24 @@ libdvisvgm_a_AR = $(AR) $(ARFLAGS)
libdvisvgm_a_LIBADD =
am_libdvisvgm_a_OBJECTS = BgColorSpecialHandler.$(OBJEXT) \
Bitmap.$(OBJEXT) BoundingBox.$(OBJEXT) Calculator.$(OBJEXT) \
- CharmapTranslator.$(OBJEXT) CmdLineParserBase.$(OBJEXT) \
- Color.$(OBJEXT) ColorSpecialHandler.$(OBJEXT) \
- CommandLine.$(OBJEXT) Directory.$(OBJEXT) DLLoader.$(OBJEXT) \
- DVIActions.$(OBJEXT) DVIReader.$(OBJEXT) \
- DvisvgmSpecialHandler.$(OBJEXT) DVIToSVG.$(OBJEXT) \
- DVIToSVGActions.$(OBJEXT) EmSpecialHandler.$(OBJEXT) \
- FileFinder.$(OBJEXT) FileSystem.$(OBJEXT) Font.$(OBJEXT) \
+ CmdLineParserBase.$(OBJEXT) Color.$(OBJEXT) \
+ ColorSpecialHandler.$(OBJEXT) CommandLine.$(OBJEXT) \
+ Directory.$(OBJEXT) DLLoader.$(OBJEXT) DVIActions.$(OBJEXT) \
+ DVIReader.$(OBJEXT) DvisvgmSpecialHandler.$(OBJEXT) \
+ DVIToSVG.$(OBJEXT) DVIToSVGActions.$(OBJEXT) \
+ EmSpecialHandler.$(OBJEXT) FileFinder.$(OBJEXT) \
+ FilePath.$(OBJEXT) FileSystem.$(OBJEXT) Font.$(OBJEXT) \
FontCache.$(OBJEXT) FontEncoding.$(OBJEXT) \
- FontEngine.$(OBJEXT) FontGlyph.$(OBJEXT) FontManager.$(OBJEXT) \
- FontMap.$(OBJEXT) GFReader.$(OBJEXT) GFGlyphTracer.$(OBJEXT) \
- GFTracer.$(OBJEXT) Ghostscript.$(OBJEXT) InputBuffer.$(OBJEXT) \
+ FontEngine.$(OBJEXT) FontManager.$(OBJEXT) FontMap.$(OBJEXT) \
+ GFReader.$(OBJEXT) GFGlyphTracer.$(OBJEXT) GFTracer.$(OBJEXT) \
+ Ghostscript.$(OBJEXT) InputBuffer.$(OBJEXT) \
InputReader.$(OBJEXT) Length.$(OBJEXT) Matrix.$(OBJEXT) \
- Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) PageSize.$(OBJEXT) \
+ Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) \
+ PageRanges.$(OBJEXT) PageSize.$(OBJEXT) \
PSInterpreter.$(OBJEXT) PsSpecialHandler.$(OBJEXT) \
SpecialManager.$(OBJEXT) StreamReader.$(OBJEXT) \
- SVGFontEmitter.$(OBJEXT) SVGFontTraceEmitter.$(OBJEXT) \
- SVGTree.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
+ StreamWriter.$(OBJEXT) SVGTree.$(OBJEXT) System.$(OBJEXT) \
+ Terminal.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
VFReader.$(OBJEXT) XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) \
XMLString.$(OBJEXT)
libdvisvgm_a_OBJECTS = $(am_libdvisvgm_a_OBJECTS)
@@ -122,7 +123,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_LIBS = @EXTRA_LIBS@
-FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -141,8 +143,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -204,32 +208,33 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libdvisvgm.a
-dvisvgm_SOURCES = gzstream.h StreamCounter.h \
+dvisvgm_SOURCES = gzstream.h \
dvisvgm.cpp gzstream.cpp
dvisvgm_LDADD = $(noinst_LIBRARIES) @EXTRA_LIBS@
dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) @EXTRA_LIBS@
-libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CharmapTranslator.h CmdLineParserBase.h Color.h \
+libdvisvgm_a_SOURCES = Bitmap.h BoundingBox.h BgColorSpecialHandler.h Calculator.h CmdLineParserBase.h Color.h \
ColorSpecialHandler.h CommandLine.h Directory.h DLLoader.h DVIActions.h DVIReader.h DvisvgmSpecialHandler.h DVIToSVG.h \
- DVIToSVGActions.h EmSpecialHandler.h FileFinder.h FileSystem.h Font.h FontCache.h FontEmitter.h FontEncoding.h FontEngine.h \
- FontGlyph.h FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h GraphicPath.h InputBuffer.h InputReader.h \
- Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h \
- SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h SVGFontEmitter.h SVGFontTraceEmitter.h SVGTree.h \
- TpicSpecialHandler.h TFM.h types.h VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h XMLDocument.h XMLNode.h XMLString.h \
- BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CharmapTranslator.cpp CmdLineParserBase.cpp Color.cpp \
+ DVIToSVGActions.h EmSpecialHandler.h FileFinder.h FilePath.h FileSystem.h Font.h FontCache.h FontEncoding.h FontEngine.h \
+ FontManager.h FontMap.h GFReader.h GFTracer.h GFGlyphTracer.h Ghostscript.h Glyph.h GlyphTracerMessages.h \
+ GraphicPath.h InputBuffer.h InputReader.h Length.h macros.h Matrix.h Message.h MessageException.h MetafontWrapper.h PageRanges.h \
+ PageSize.h Pair.h PSInterpreter.h PsSpecialHandler.h SpecialActions.h SpecialHandler.h SpecialManager.h StreamReader.h \
+ StreamWriter.h SVGTree.h System.h Terminal.h TpicSpecialHandler.h TFM.h types.h VectorStream.h VFActions.h VFReader.h XMLDocTypeNode.h \
+ XMLDocument.h XMLNode.h XMLString.h \
+ BgColorSpecialHandler.cpp Bitmap.cpp BoundingBox.cpp Calculator.cpp CmdLineParserBase.cpp Color.cpp \
ColorSpecialHandler.cpp CommandLine.cpp Directory.cpp DLLoader.cpp DVIActions.cpp DVIReader.cpp DvisvgmSpecialHandler.cpp \
- DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FileSystem.cpp Font.cpp FontCache.cpp FontEncoding.cpp \
- FontEngine.cpp FontGlyph.cpp FontManager.cpp FontMap.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp \
- InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp PageSize.cpp PSInterpreter.cpp \
- PsSpecialHandler.cpp SpecialManager.cpp StreamReader.cpp SVGFontEmitter.cpp SVGFontTraceEmitter.cpp SVGTree.cpp TFM.cpp \
+ DVIToSVG.cpp DVIToSVGActions.cpp EmSpecialHandler.cpp FileFinder.cpp FilePath.cpp FileSystem.cpp Font.cpp FontCache.cpp \
+ FontEncoding.cpp FontEngine.cpp FontManager.cpp FontMap.cpp GFReader.cpp GFGlyphTracer.cpp GFTracer.cpp Ghostscript.cpp \
+ InputBuffer.cpp InputReader.cpp Length.cpp Matrix.cpp Message.cpp MetafontWrapper.cpp PageRanges.cpp PageSize.cpp PSInterpreter.cpp \
+ PsSpecialHandler.cpp SpecialManager.cpp StreamReader.cpp StreamWriter.cpp SVGTree.cpp System.cpp Terminal.cpp TFM.cpp \
TpicSpecialHandler.cpp VFReader.cpp XMLDocument.cpp XMLNode.cpp XMLString.cpp
EXTRA_DIST = options.xml psdefs.psc iapi.h ierrors.h
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -Wnon-virtual-dtor
all: all-am
.SUFFIXES:
-.SUFFIXES: .a .cpp .def .o .obj
+.SUFFIXES: .cpp .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -318,7 +323,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bitmap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BoundingBox.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Calculator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CharmapTranslator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CmdLineParserBase.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Color.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ColorSpecialHandler.Po@am__quote@
@@ -332,12 +336,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DvisvgmSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EmSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileFinder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilePath.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileSystem.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Font.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontCache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontEncoding.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontEngine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontGlyph.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontMap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GFGlyphTracer.Po@am__quote@
@@ -351,14 +355,16 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Message.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetafontWrapper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSInterpreter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageRanges.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSize.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PsSpecialHandler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGFontEmitter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGFontTraceEmitter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGTree.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpecialManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamReader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamWriter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/System.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TFM.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Terminal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TpicSpecialHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VFReader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLDocument.Po@am__quote@
@@ -588,12 +594,6 @@ CommandLine.cpp: options.xml
xsltproc opt2cpp.xsl $<; \
fi
-# The required MikTeX functions are declared in .def files that reference a DLL.
-# It's necessary to create import libraries from these .def files. dlltool helps us
-# to do that.
-.def.a:
- dlltool -d $< -l $@ -U
-
# Create a C string definition containing the PostScript routines psdefs.ps needed by class PSInterpreter
psdefs.psc: psdefs.ps
if test -f $<; then \
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Matrix.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.cpp
index f971bf24cb5..08c4f1489c0 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Matrix.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.cpp
@@ -2,9 +2,9 @@
** Matrix.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cmath>
@@ -50,7 +50,8 @@ Matrix::Matrix (double d) {
/** Creates the matrix ((v0,v1,v2),(v3,v4,v5),(v6,v7,v8)).
* Expects that array v consists of 'size' elements. If size is less than 9, the
* remaining matrix components will be set to those of the identity matrix.
- * @param v array containing the matrix components */
+ * @param[in] v array containing the matrix components
+ * @param[in] size size of array v */
Matrix::Matrix (double v[], unsigned size) {
set(v, size);
}
@@ -59,7 +60,7 @@ Matrix::Matrix (double v[], unsigned size) {
/** Creates the matrix ((v0,v1,v2),(v3,v4,v5),(v6,v7,v8)).
* If vector v has less than 9 elements, the remaining matrix components will be set to
* those of the identity matrix.
- * @param v array containing the matrix components */
+ * @param[in] v array containing the matrix components */
Matrix::Matrix (const std::vector<double> &v) {
set(v);
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Matrix.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.h
index b9fb08ff39c..c6c8c854c0b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Matrix.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Matrix.h
@@ -2,9 +2,9 @@
** Matrix.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef MATRIX_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.cpp
new file mode 100644
index 00000000000..cc7a36dde11
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.cpp
@@ -0,0 +1,161 @@
+/*************************************************************************
+** Message.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <cstdarg>
+#include <cstring>
+#include <iostream>
+#include "Message.h"
+#include "Terminal.h"
+#include "macros.h"
+
+using namespace std;
+
+MessageStream::MessageStream (std::ostream &os)
+ : _os(&os), _nl(true), _col(1), _indent(0)
+{
+ Terminal::init(os);
+}
+
+
+MessageStream::~MessageStream () {
+ if (_os && Message::COLORIZE)
+ Terminal::finish(*_os);
+}
+
+
+void MessageStream::putchar (const char c, ostream &os) {
+ switch (c) {
+ case '\r':
+ os << '\r';
+ _nl = true;
+ _col = 1;
+ return;
+ case '\n':
+ if (!_nl) {
+ _col = 1;
+ _nl = true;
+ os << '\n';
+ }
+ return;
+ default:
+ if (_nl) {
+ os << string(_indent, ' ');
+ _col += _indent;
+ }
+ else {
+ const int cols = Terminal::columns();
+ if (cols > 0 && _col >= cols) {
+ os << '\n' << string(_indent, ' ');
+ _col = _indent+1;
+ }
+ else
+ _col++;
+ }
+ _nl = false;
+ if (!_nl || c != '\n')
+ os << c;
+ }
+}
+
+
+MessageStream& MessageStream::operator << (const char *str) {
+ if (_os) {
+ const int len = strlen(str);
+ const int cols = Terminal::columns();
+ if (cols > 0 && _col+len > cols && _indent+len <= cols)
+ putchar('\n', *_os);
+ for (const char *p=str; *p; ++p)
+ putchar(*p, *_os);
+ }
+ return *this;
+}
+
+
+MessageStream& MessageStream::operator << (const char &c) {
+ if (_os)
+ putchar(c, *_os);
+ return *this;
+}
+
+
+void MessageStream::indent (bool reset) {
+ if (reset)
+ _indent = 0;
+ _indent += 2;
+}
+
+
+void MessageStream::outdent (bool all) {
+ if (all)
+ _indent = 0;
+ else if (_indent > 0)
+ _indent -= 2;
+}
+
+
+void MessageStream::clearline () {
+ if (_os) {
+ int cols = Terminal::columns();
+ *_os << '\r' << string(cols ? cols-1 : 79, ' ') << '\r';
+ _nl = true;
+ _col = 1;
+ }
+}
+
+static MessageStream nullStream;
+static MessageStream messageStream(cerr);
+
+// maximal verbosity
+int Message::LEVEL = Message::MESSAGES | Message::WARNINGS | Message::ERRORS;
+bool Message::COLORIZE = false;
+
+
+/** Returns the stream for usual messages. */
+MessageStream& Message::mstream (bool prefix, int color, bool light) {
+ MessageStream *ms = (LEVEL & MESSAGES) ? &messageStream : &nullStream;
+ if (COLORIZE && ms && ms->os())
+ Terminal::color(color, light, *ms->os());
+ if (prefix)
+ *ms << "\nMESSAGE: ";
+ return *ms;
+}
+
+
+/** Returns the stream for warning messages. */
+MessageStream& Message::wstream (bool prefix) {
+ MessageStream *ms = (LEVEL & WARNINGS) ? &messageStream : &nullStream;
+ if (COLORIZE && ms && ms->os())
+ Terminal::color(Terminal::YELLOW, false, *ms->os());
+ if (prefix)
+ *ms << "\nWARNING: ";
+ return *ms;
+}
+
+
+/** Returns the stream for error messages. */
+MessageStream& Message::estream (bool prefix) {
+ MessageStream *ms = (LEVEL & ERRORS) ? &messageStream : &nullStream;
+ if (COLORIZE && ms && ms->os())
+ Terminal::color(Terminal::RED, true, *ms->os());
+ if (prefix)
+ *ms << "\nERROR: ";
+ return *ms;
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.h
new file mode 100644
index 00000000000..22677195e32
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Message.h
@@ -0,0 +1,80 @@
+/*************************************************************************
+** Message.h **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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/>. **
+*************************************************************************/
+
+#ifndef MESSAGE_H
+#define MESSAGE_H
+
+#include <algorithm>
+#include <string>
+#include <ostream>
+#include <sstream>
+#include "Terminal.h"
+
+class Message;
+
+class MessageStream
+{
+ friend class Message;
+ public:
+ MessageStream () : _os(0), _nl(false) {}
+ MessageStream (std::ostream &os);
+ ~MessageStream ();
+
+ template <typename T>
+ MessageStream& operator << (const T &obj) {
+ std::ostringstream oss;
+ oss << obj;
+ (*this) << oss.str();
+ return *this;
+ }
+
+ MessageStream& operator << (const char *str);
+ MessageStream& operator << (const char &c);
+ MessageStream& operator << (const std::string &str) {return (*this) << str.c_str();}
+
+ void indent (int level) {_indent = std::max(0, level*2); }
+ void indent (bool reset=false);
+ void outdent (bool all=false);
+ void clearline ();
+
+ protected:
+ void putchar (const char c, std::ostream &os);
+ std::ostream* os () {return _os;}
+
+ private:
+ std::ostream *_os;
+ bool _nl; ///< true if previous character was a newline
+ int _col; ///< current terminal column
+ int _indent; ///< indentation width
+};
+
+
+struct Message
+{
+ static MessageStream& mstream (bool prefix=false, int color=Terminal::DEFAULT, bool light=false);
+ static MessageStream& estream (bool prefix=false);
+ static MessageStream& wstream (bool prefix=false);
+
+ enum {ERRORS=1, WARNINGS=2, MESSAGES=4};
+ static int LEVEL;
+ static bool COLORIZE;
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MessageException.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MessageException.h
index 2a0dbe591e7..cf5d0d311b5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MessageException.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MessageException.h
@@ -2,9 +2,9 @@
** MessageException.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef MESSAGEEXCEPTION_H
@@ -23,16 +23,15 @@
#include <string>
-using std::string;
class MessageException
{
public:
- MessageException (const string &msg) : message(msg) {}
- const string& getMessage () const {return message;}
+ MessageException (const std::string &msg) : message(msg) {}
+ const std::string& getMessage () const {return message;}
private:
- string message;
+ std::string message;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MetafontWrapper.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.cpp
index 1f9f7c314f0..3113366aa17 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MetafontWrapper.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.cpp
@@ -2,7 +2,7 @@
** MetafontWrapper.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -94,7 +94,7 @@ int MetafontWrapper::call (const string &mode, double mag) {
"mag:=" << mag << ";"
"batchmode;"
"input " << _fontname << "\"";
- Message::mstream() << "running Metafont for " << _fontname << endl;
+ Message::mstream(false, Terminal::CYAN) << "\nrunning Metafont for " << _fontname << '\n';
int ret = execute(cmd, oss.str().c_str());
// try to read Metafont's logfile and get name of created GF file
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MetafontWrapper.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.h
index bae3af16587..9d0ea7b0d50 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/MetafontWrapper.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/MetafontWrapper.h
@@ -2,9 +2,9 @@
** MetafontWrapper.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef METAFONTWRAPPER_H
@@ -23,22 +23,21 @@
#include <string>
-using std::string;
class FileFinder;
class MetafontWrapper
{
public:
- MetafontWrapper (const string &fontname);
- int call (const string &mode, double mag);
- int make (const string &mode, double mag);
+ MetafontWrapper (const std::string &fontname);
+ int call (const std::string &mode, double mag);
+ int make (const std::string &mode, double mag);
bool success () const;
void removeOutputFiles (bool keepGF=false);
- static void removeOutputFiles (const string &fontname, bool keepGF=false);
+ static void removeOutputFiles (const std::string &fontname, bool keepGF=false);
private:
- string _fontname;
+ std::string _fontname;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PSInterpreter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.cpp
index 831bf5fd206..d511d52548e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PSInterpreter.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.cpp
@@ -2,7 +2,7 @@
** PSInterpreter.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -32,16 +32,19 @@ using namespace std;
const char *PSInterpreter::GSARGS[] = {
- "gs", // dummy name
- "-q", // be quiet, suppress gs banner
- "-dSAFER", // disallow writing of files
- "-dNODISPLAY", // we don't need a display device
- "-dNOPAUSE", // keep going
+ "gs", // dummy name
+ "-q", // be quiet, suppress gs banner
+ "-dSAFER", // disallow writing of files
+ "-dNODISPLAY", // we don't need a display device
+ "-dNOPAUSE", // keep going
+ "-dWRITESYSTEMDICT", // leave systemdict writable as some operators must be replaced
"-dNOPROMPT",
- "-dNOBIND",
+// "-dNOBIND",
};
+/** Constructs a new PSInterpreter object.
+ * @param[in] actions template methods to be executed after recognizing the corresponding PS operator. */
PSInterpreter::PSInterpreter (PSActions *actions)
: _gs(sizeof(GSARGS)/sizeof(char*), GSARGS, this), _mode(PS_NONE), _actions(actions), _inError(false)
{
@@ -50,6 +53,13 @@ PSInterpreter::PSInterpreter (PSActions *actions)
}
+PSActions* PSInterpreter::setActions (PSActions *actions) {
+ PSActions *old_actions = _actions;
+ _actions = actions;
+ return old_actions;
+}
+
+
/** Executes a chunk of PostScript code.
* @param[in] str buffer containing the code
* @param[in] len number of characters in buffer
@@ -95,6 +105,8 @@ void 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 */
void PSInterpreter::execute (istream &is) {
char buf[4096];
while (is && !is.eof()) {
@@ -201,33 +213,34 @@ void PSInterpreter::callActions (InputReader &in) {
int pcount; // number of parameters (< 0 : variable number of parameters)
void (PSActions::*op)(vector<double> &p); // operation handler
} operators [] = {
- {"clip", 0, &PSActions::clip},
- {"closepath", 0, &PSActions::closepath},
- {"curveto", 6, &PSActions::curveto},
- {"eoclip", 0, &PSActions::eoclip},
- {"eofill", 0, &PSActions::eofill},
- {"fill", 0, &PSActions::fill},
- {"grestore", 0, &PSActions::grestore},
- {"gsave", 0, &PSActions::gsave},
- {"initclip", 0, &PSActions::initclip},
- {"lineto", 2, &PSActions::lineto},
- {"moveto", 2, &PSActions::moveto},
- {"newpath", 0, &PSActions::newpath},
- {"rotate", 1, &PSActions::rotate},
- {"scale", 2, &PSActions::scale},
- {"setcmykcolor", 4, &PSActions::setcmykcolor},
- {"setdash", -1, &PSActions::setdash},
- {"setgray", 1, &PSActions::setgray},
- {"sethsbcolor", 3, &PSActions::sethsbcolor},
- {"setlinecap", 1, &PSActions::setlinecap},
- {"setlinejoin", 1, &PSActions::setlinejoin},
- {"setlinewidth", 1, &PSActions::setlinewidth},
- {"setmatrix", 6, &PSActions::setmatrix},
- {"setmiterlimit", 1, &PSActions::setmiterlimit},
- {"setpos", 2, &PSActions::setpos},
- {"setrgbcolor", 3, &PSActions::setrgbcolor},
- {"stroke", 0, &PSActions::stroke},
- {"translate", 2, &PSActions::translate},
+ {"clip", 0, &PSActions::clip},
+ {"closepath", 0, &PSActions::closepath},
+ {"curveto", 6, &PSActions::curveto},
+ {"eoclip", 0, &PSActions::eoclip},
+ {"eofill", 0, &PSActions::eofill},
+ {"fill", 0, &PSActions::fill},
+ {"grestore", 0, &PSActions::grestore},
+ {"gsave", 0, &PSActions::gsave},
+ {"initclip", 0, &PSActions::initclip},
+ {"lineto", 2, &PSActions::lineto},
+ {"moveto", 2, &PSActions::moveto},
+ {"newpath", 0, &PSActions::newpath},
+ {"rotate", 1, &PSActions::rotate},
+ {"scale", 2, &PSActions::scale},
+ {"setcmykcolor", 4, &PSActions::setcmykcolor},
+ {"setdash", -1, &PSActions::setdash},
+ {"setgray", 1, &PSActions::setgray},
+ {"sethsbcolor", 3, &PSActions::sethsbcolor},
+ {"setlinecap", 1, &PSActions::setlinecap},
+ {"setlinejoin", 1, &PSActions::setlinejoin},
+ {"setlinewidth", 1, &PSActions::setlinewidth},
+ {"setmatrix", 6, &PSActions::setmatrix},
+ {"setmiterlimit", 1, &PSActions::setmiterlimit},
+ {"setopacityalpha", 1, &PSActions::setopacityalpha},
+ {"setpos", 2, &PSActions::setpos},
+ {"setrgbcolor", 3, &PSActions::setrgbcolor},
+ {"stroke", 0, &PSActions::stroke},
+ {"translate", 2, &PSActions::translate},
};
if (_actions) {
in.skipSpace();
@@ -260,6 +273,7 @@ void PSInterpreter::callActions (InputReader &in) {
vector<double> v(params.size());
str2double(params, v);
(_actions->*operators[mid].op)(v);
+ _actions->executed();
}
}
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PSInterpreter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.h
index f37d16db2d6..b24ee2fa637 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PSInterpreter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PSInterpreter.h
@@ -2,7 +2,7 @@
** PSInterpreter.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -36,8 +36,11 @@ struct PSException : public MessageException
};
+/** This interface provides the template methods called by PSInterpreter when executing a PS snippet.
+ * Each method corresponds to a PostScript operator of the same name. */
struct PSActions
{
+ virtual ~PSActions () {}
virtual void clip (std::vector<double> &p) =0;
virtual void closepath (std::vector<double> &p) =0;
virtual void curveto (std::vector<double> &p) =0;
@@ -61,13 +64,17 @@ struct PSActions
virtual void setlinewidth (std::vector<double> &p) =0;
virtual void setmatrix (std::vector<double> &p) =0;
virtual void setmiterlimit (std::vector<double> &p) =0;
+ virtual void setopacityalpha (std::vector<double> &p) =0;
virtual void setpos (std::vector<double> &p) =0;
virtual void setrgbcolor (std::vector<double> &rgb) =0;
virtual void stroke (std::vector<double> &p) =0;
virtual void translate (std::vector<double> &p) =0;
+ virtual void executed () {} // triggered if one of the above PS operators has been executed
};
+/** This class provides methods to execute chunks of PostScript code and calls
+ * several template methods on invocation of selected PS operators (see PSActions). */
class PSInterpreter
{
enum Mode {PS_NONE, PS_RUNNING, PS_QUIT};
@@ -79,6 +86,7 @@ class PSInterpreter
void execute (const std::string &str) {execute(str.c_str());}
void execute (std::istream &is);
bool active () const {return _mode != PS_QUIT;}
+ PSActions* setActions (PSActions *actions);
protected:
// callback functions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.cpp
new file mode 100644
index 00000000000..85a124683c7
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.cpp
@@ -0,0 +1,135 @@
+/*************************************************************************
+** PageRanges.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <sstream>
+#include "InputBuffer.h"
+#include "InputReader.h"
+#include "PageRanges.h"
+
+#include "macros.h"
+
+using namespace std;
+
+
+/** Analyzes a string describing a range sequence.
+ * 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);
+ BufferInputReader ir(ib);
+ while (ir) {
+ int first=1;
+ int last=max_page;
+ ir.skipSpace();
+ if (!isdigit(ir.peek()) && ir.peek() != '-')
+ return false;
+
+ if (isdigit(ir.peek()))
+ first = ir.getInt();
+ ir.skipSpace();
+ if (ir.peek() == '-') {
+ while (ir.peek() == '-')
+ ir.get();
+ ir.skipSpace();
+ if (isdigit(ir.peek()))
+ last = ir.getInt();
+ }
+ else
+ last = first;
+ ir.skipSpace();
+ if (ir.peek() == ',') {
+ ir.get();
+ if (ir.eof())
+ return false;
+ }
+ else if (!ir.eof())
+ return false;
+ if (first > last)
+ swap(first, last);
+ first = max(1, first);
+ last = max(first, last);
+ if (max_page > 0) {
+ first = min(first, max_page);
+ last = min(last, max_page);
+ }
+ insert(first, last);
+ }
+ return true;
+}
+
+
+/** Adds a page range to the range collection.
+ * @param[in] first first page of new range
+ * @param[in] last last page of new range */
+void PageRanges::insert (int first, int last) {
+ if (first > last)
+ swap(first, last);
+ Container::iterator it = _ranges.begin();
+ while (it != _ranges.end() && first > it->first+1 && first > it->second+1)
+ ++it;
+ if (it == _ranges.end() || last < it->first-1 || first > it->second+1)
+ it = _ranges.insert(it, Range(first, last));
+ else if ((first < it->first && last >= it->first-1) || (first <= it->second+1 && last > it->second)) {
+ it->first = min(it->first, first);
+ it->second = max(it->second, last);
+ }
+ // merge adjacent ranges
+ if (it != _ranges.end()) {
+ Container::iterator l = it;
+ Container::iterator r = it;
+ if (l == _ranges.begin())
+ l = _ranges.end();
+ else
+ --l;
+ ++r;
+ bool l_modified = false;
+ bool r_modified = false;
+ if (l != _ranges.end() && l->second >= it->first-1) {
+ l->first = min(l->first, it->first);
+ l->second = max(l->second, it->second);
+ l_modified = true;
+ }
+ if (r != _ranges.end() && r->first <= it->second+1) {
+ r->first = min(r->first, it->first);
+ r->second = max(r->second, it->second);
+ r_modified = true;
+ }
+ if (l_modified || r_modified) {
+ _ranges.erase(it);
+ if (l_modified && r_modified && l->second >= r->first-1) {
+ l->first = min(l->first, r->first);
+ l->second = max(l->second, r->second);
+ _ranges.erase(r);
+ }
+ }
+ }
+}
+
+
+/** Returns the number of pages. */
+size_t PageRanges::pages () const {
+ size_t sum=0;
+ for (ConstIterator it=_ranges.begin(); it != _ranges.end(); ++it)
+ sum += it->second - it->first + 1;
+ return sum;
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.h
new file mode 100644
index 00000000000..a2a6fc28589
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageRanges.h
@@ -0,0 +1,50 @@
+/*************************************************************************
+** PageRanges.h **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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/>. **
+*************************************************************************/
+
+#ifndef PAGERANGES_H
+#define PAGERANGES_H
+
+#include <list>
+#include <string>
+#include <utility>
+
+class PageRanges
+{
+ public:
+ typedef std::pair<int,int> Range;
+ typedef std::list<Range> Container;
+ typedef Container::iterator Iterator;
+ typedef Container::const_iterator ConstIterator;
+
+ public:
+ bool parse (std::string str, int max_page=0);
+ void insert (int first, int last);
+ size_t pages () const;
+ size_t size () const {return _ranges.size();}
+ const Container& ranges () const {return _ranges;}
+ ConstIterator begin () const {return _ranges.begin();}
+ ConstIterator end () const {return _ranges.end();}
+
+ private:
+ Container _ranges;
+ int _max;
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PageSize.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.cpp
index c6e14e78c52..9b5e6b29b40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PageSize.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.cpp
@@ -2,9 +2,9 @@
** PageSize.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <algorithm>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PageSize.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.h
index b19e29c43b2..38cfd22e922 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PageSize.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PageSize.h
@@ -2,9 +2,9 @@
** PageSize.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,18 +15,17 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef PAGESIZE_H
#define PAGESIZE_H
-#include <string>
#include "MessageException.h"
struct PageSizeException : public MessageException
{
- PageSizeException (const string &msg) : MessageException(msg) {}
+ PageSizeException (const std::string &msg) : MessageException(msg) {}
};
class PageSize
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Pair.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Pair.h
index efa489ac7ed..495e79d2149 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Pair.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Pair.h
@@ -2,9 +2,9 @@
** Pair.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef PAIR_H
@@ -24,6 +24,7 @@
#include <cmath>
#include <ostream>
#include "macros.h"
+#include "types.h"
template <typename T>
class Pair
@@ -49,12 +50,12 @@ class Pair
};
-struct LPair : public Pair<long>
+struct Pair32 : public Pair<Int32>
{
- LPair (long x=0, long y=0) : Pair<long>(x, y) {}
- explicit LPair (double x, double y) : Pair<long>(long(x+0.5), long(y+0.5)) {}
- LPair (const Pair<long> &p) : Pair<long>(p) {}
- operator Pair<long> () {return *this;}
+ Pair32 (Int32 x=0, Int32 y=0) : Pair<Int32>(x, y) {}
+ explicit Pair32 (double x, double y) : Pair<Int32>(Int32(x+0.5), Int32(y+0.5)) {}
+ Pair32 (const Pair<Int32> &p) : Pair<Int32>(p) {}
+ operator Pair<Int32> () {return *this;}
};
typedef Pair<double> DPair;
@@ -74,5 +75,5 @@ IMPLEMENT_ARITHMETIC_OPERATOR2(Pair<T>, T, /)
template <typename T>
IMPLEMENT_OUTPUT_OPERATOR(Pair<T>)
-IMPLEMENT_ARITHMETIC_OPERATOR2(LPair, long, *)
+IMPLEMENT_ARITHMETIC_OPERATOR2(Pair32, Int32, *)
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PsSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.cpp
index bf04e49bfe7..00e4b90a130 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PsSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.cpp
@@ -2,7 +2,7 @@
** PsSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -45,6 +45,12 @@ PsSpecialHandler::PsSpecialHandler () : _psi(this), _actions(0), _initialized(fa
}
+PsSpecialHandler::~PsSpecialHandler () {
+ // ensure no further PS actions are performed
+ _psi.setActions(0);
+}
+
+
/** Initializes the PostScript handler. It's called by the first use of process(). The
* deferred initialization speeds up the conversion of DVI files that doesn't contain
* PS specials. */
@@ -55,6 +61,7 @@ void PsSpecialHandler::initialize (SpecialActions *actions) {
_linecap = _linejoin = 0;
_miterlimit = 4;
_xmlnode = 0;
+ _opacityalpha = 1; // fully opaque
// execute dvips prologue/header files
const char *headers[] = {"tex.pro", "texps.pro", "special.pro", /*"color.pro",*/ 0};
@@ -252,7 +259,7 @@ void PsSpecialHandler::psfile (const string &fname, const map<string,string> &at
// adapt bounding box
BoundingBox bbox(x, y, x+w, y+h);
bbox.transform(usertrans);
- _actions->bbox().embed(bbox);
+ _actions->embed(bbox);
}
}
@@ -339,6 +346,8 @@ void PsSpecialHandler::stroke (vector<double> &p) {
path->addAttribute("stroke-linecap", XMLString(_linecap == 1 ? "round" : "square"));
if (_linejoin > 0) // default value is "miter", no need to set it explicitely
path->addAttribute("stroke-linejoin", XMLString(_linecap == 1 ? "round" : "bevel"));
+ if (_opacityalpha < 1)
+ path->addAttribute("stroke-opacity", XMLString(_opacityalpha));
if (_dashpattern.size() > 0) {
ostringstream oss;
for (size_t i=0; i < _dashpattern.size(); i++) {
@@ -363,7 +372,7 @@ void PsSpecialHandler::stroke (vector<double> &p) {
_xmlnode->append(path);
else {
_actions->appendToPage(path);
- _actions->bbox().embed(bbox);
+ _actions->embed(bbox);
}
_path.newpath();
}
@@ -404,11 +413,13 @@ void PsSpecialHandler::fill (vector<double> &p, bool evenodd) {
}
if (evenodd) // SVG default fill rule is "nonzero" algorithm
path->addAttribute("fill-rule", "evenodd");
+ if (_opacityalpha < 1)
+ path->addAttribute("fill-opacity", XMLString(_opacityalpha));
if (_xmlnode)
_xmlnode->append(path);
else {
_actions->appendToPage(path);
- _actions->bbox().embed(bbox);
+ _actions->embed(bbox);
}
_path.newpath();
}
@@ -563,6 +574,12 @@ void PsSpecialHandler::setdash (vector<double> &p) {
}
+/** This method is called by the PSInterpreter if an PS operator has been executed. */
+void PsSpecialHandler::executed () {
+ if (_actions)
+ _actions->progress("ps");
+}
+
////////////////////////////////////////////
void PsSpecialHandler::ClippingStack::push () {
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PsSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.h
index 50d02b78f07..aa9cf171b46 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/PsSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/PsSpecialHandler.h
@@ -2,7 +2,7 @@
** PsSpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -52,6 +52,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
public:
PsSpecialHandler ();
+ ~PsSpecialHandler ();
const char* name () const {return "ps";}
const char* info () const;
const char** prefixes () const;
@@ -87,10 +88,12 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
void setlinewidth (std::vector<double> &p) {_linewidth = p[0] ? p[0]*1.00375 : 0.5;}
void setmatrix (std::vector<double> &p);
void setmiterlimit (std::vector<double> &p) {_miterlimit = p[0]*1.00375;}
+ void setopacityalpha (std::vector<double> &p){_opacityalpha = p[0];}
void setpos (std::vector<double> &p) {_currentpoint = DPair(p[0], p[1]);}
void setrgbcolor (std::vector<double> &rgb);
void stroke (std::vector<double> &p);
void translate (std::vector<double> &p);
+ void executed ();
private:
PSInterpreter _psi;
@@ -101,6 +104,7 @@ class PsSpecialHandler : public SpecialHandler, protected PSActions
DPair _currentpoint; ///< current PS position
float _linewidth; ///< current linewidth
float _miterlimit; ///< current miter limit
+ float _opacityalpha; ///< opacity level (0=fully transparent, ..., 1=opaque)
unsigned _linecap : 2; ///< current line cap (0=butt, 1=round, 2=projecting square)
unsigned _linejoin : 2; ///< current line join (0=miter, 1=round, 2=bevel)
int _dashoffset; ///< current dash offset
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGTree.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.cpp
index 757d5c32701..c1af13f4f3a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGTree.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.cpp
@@ -2,7 +2,7 @@
** SVGTree.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,8 +18,9 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#include <sstream>
+#include <string>
#include "BoundingBox.h"
-#include "CharmapTranslator.h"
#include "DVIToSVG.h"
#include "Font.h"
#include "FontManager.h"
@@ -32,6 +33,11 @@
using namespace std;
+// static class variables
+bool SVGTree::CREATE_STYLE=true;
+bool SVGTree::USE_FONTS=true;
+
+
SVGTree::SVGTree () : _font(0), _color(Color::BLACK), _matrix(1) {
_xchanged = _ychanged = false;
_fontnum = 0;
@@ -85,11 +91,10 @@ void SVGTree::appendToDefs (XMLNode *node) {
* @param[in] c character to be added
* @param[in] x x coordinate
* @param[in] y y coordinate
- * @param[in] fontManager the FontManager provides information about the fonts used in the document
- * @param[in] cmt the CharmapTranslator remaps the character codes */
-void SVGTree::appendChar (int c, double x, double y, const FontManager &fontManager, const CharmapTranslator &cmt) {
+ * @param[in] font font to be used */
+void SVGTree::appendChar (int c, double x, double y, const Font &font) {
XMLElementNode *node=_span;
- if (DVIToSVG::USE_FONTS) {
+ if (USE_FONTS) {
// changes of fonts and transformations require a new text element
if (!_text || _font.changed() || _matrix.changed()) {
newTextNode(x, y);
@@ -119,7 +124,7 @@ void SVGTree::appendChar (int c, double x, double y, const FontManager &fontMana
newTextNode(x, y);
node = _text;
}
- node->append(XMLString(cmt.unicode(c), false));
+ node->append(XMLString(font.unicode(c), false));
}
else {
if (_color.changed() || _matrix.changed()) {
@@ -143,7 +148,7 @@ void SVGTree::appendChar (int c, double x, double y, const FontManager &fontMana
if (!node)
node = _page;
ostringstream oss;
- oss << "#g" << fontManager.fontID(_font) << c;
+ oss << "#g" << FontManager::instance().fontID(_font) << c;
XMLElementNode *use = new XMLElementNode("use");
use->addAttribute("x", XMLString(x));
use->addAttribute("y", XMLString(y));
@@ -159,9 +164,9 @@ void SVGTree::appendChar (int c, double x, double y, const FontManager &fontMana
void SVGTree::newTextNode (double x, double y) {
_text = new XMLElementNode("text");
_span = 0; // no tspan in text element yet
- if (DVIToSVG::USE_FONTS) {
+ if (USE_FONTS) {
const Font *font = _font.get();
- if (DVIToSVG::CREATE_STYLE || !font)
+ if (CREATE_STYLE || !font)
_text->addAttribute("class", string("f")+XMLString(_fontnum));
else {
_text->addAttribute("font-family", font->name());
@@ -189,3 +194,122 @@ void SVGTree::setFont (int num, const Font *font) {
void SVGTree::transformPage (const Matrix &m) {
_page->addAttribute("transform", m.getSVG());
}
+
+
+/** Creates an SVG element for a single glyph.
+ * @param[in] c character number
+ * @param[in] font font to extract the glyph from
+ * @return pointer to element node if glyph exists, 0 otherwise */
+static XMLElementNode* createGlyphNode (int c, const PhysicalFont &font, GFGlyphTracer::Callback *cb) {
+ Glyph glyph;
+ if (!font.getGlyph(c, glyph, cb))
+ return 0;
+
+ double sx=1.0, sy=1.0;
+ double upem = font.unitsPerEm();
+ XMLElementNode *glyph_node=0;
+ if (SVGTree::USE_FONTS) {
+ glyph_node = new XMLElementNode("glyph");
+ glyph_node->addAttribute("unicode", XMLString(font.unicode(c), false));
+ glyph_node->addAttribute("horiz-adv-x", XMLString(font.hAdvance(c)));
+ string name = font.glyphName(c);
+ if (!name.empty())
+ glyph_node->addAttribute("glyph-name", name);
+ }
+ else {
+ ostringstream oss;
+ oss << 'g' << FontManager::instance().fontID(&font) << c;
+ glyph_node = new XMLElementNode("path");
+ glyph_node->addAttribute("id", oss.str());
+ sx = font.scaledSize()/upem;
+ sy = -sx;
+ }
+ ostringstream oss;
+ glyph.writeSVG(oss, sx, sy);
+ glyph_node->addAttribute("d", oss.str());
+ return glyph_node;
+}
+
+
+void SVGTree::appendFontStyles (const set<const Font*> &fonts) {
+ if (CREATE_STYLE && USE_FONTS && !fonts.empty() && _defs) {
+ XMLElementNode *styleNode = new XMLElementNode("style");
+ styleNode->addAttribute("type", "text/css");
+ _root->insertAfter(styleNode, _defs);
+ typedef map<int, const Font*> SortMap;
+ SortMap sortmap;
+ FORALL(fonts, set<const Font*>::const_iterator, it)
+ if (!dynamic_cast<const VirtualFont*>(*it)) // skip virtual fonts
+ sortmap[FontManager::instance().fontID(*it)] = *it;
+ ostringstream style;
+ // add font style definitions in ascending order
+ FORALL(sortmap, SortMap::const_iterator, it) {
+ style << "text.f" << it->first << ' '
+ << "{font-family:" << it->second->name()
+ << ";font-size:" << it->second->scaledSize() << "}\n";
+ }
+ XMLCDataNode *cdata = new XMLCDataNode(style.str());
+ styleNode->append(cdata);
+ }
+}
+
+
+/** 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 */
+void SVGTree::append (const PhysicalFont &font, const set<int> &chars, GFGlyphTracer::Callback *cb) {
+ if (chars.empty())
+ return;
+
+ if (USE_FONTS) {
+ XMLElementNode *fontNode = new XMLElementNode("font");
+ string fontname = font.name();
+ fontNode->addAttribute("id", fontname);
+ fontNode->addAttribute("horiz-adv-x", XMLString(font.hAdvance()));
+ appendToDefs(fontNode);
+
+ XMLElementNode *faceNode = new XMLElementNode("font-face");
+ faceNode->addAttribute("font-family", fontname);
+ faceNode->addAttribute("units-per-em", XMLString(font.unitsPerEm()));
+ if (font.type() != PhysicalFont::MF) {
+ faceNode->addAttribute("ascent", XMLString(font.ascent()));
+ faceNode->addAttribute("descent", XMLString(font.descent()));
+ }
+ fontNode->append(faceNode);
+
+ // add required missing-glyph element
+ XMLElementNode *missing = new XMLElementNode("missing-glyph");
+ missing->addAttribute("d", "");
+ fontNode->append(missing);
+ FORALL(chars, set<int>::const_iterator, i)
+ fontNode->append(createGlyphNode(*i, font, cb));
+ }
+ else if (&font != font.uniqueFont()) {
+ // If the same character is used in various sizes we don't want to embed the complete (lengthy) path
+ // description multiple times because they would only differ by a scale factor. Thus it's better to
+ // reference the already embedded path together with a transformation attribute and let the SVG renderer
+ // scale the glyph properly. This is only necessary if we don't want to use font but path elements.
+ FORALL(chars, set<int>::const_iterator, it) {
+ ostringstream oss;
+ XMLElementNode *use = new XMLElementNode("use");
+ oss << 'g' << FontManager::instance().fontID(&font) << *it;
+ use->addAttribute("id", oss.str());
+ oss.str("");
+ oss << "#g" << FontManager::instance().fontID(font.uniqueFont()) << *it;
+ use->addAttribute("xlink:href", oss.str());
+ double scale = font.scaledSize()/font.uniqueFont()->scaledSize();
+ if (scale != 1.0) {
+ oss.str("");
+ oss << "scale(" << scale << ')';
+ use->addAttribute("transform", oss.str());
+ }
+ appendToDefs(use);
+ }
+ }
+ else {
+ FORALL(chars, set<int>::const_iterator, i)
+ appendToDefs(createGlyphNode(*i, font, cb));
+ }
+}
+
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGTree.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.h
index b70327d48a4..de432609e8b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SVGTree.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SVGTree.h
@@ -2,7 +2,7 @@
** SVGTree.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -21,17 +21,19 @@
#ifndef SVGTREE_H
#define SVGTREE_H
+#include <map>
+#include <set>
#include "Color.h"
+#include "GFGlyphTracer.h"
#include "Matrix.h"
#include "XMLDocument.h"
#include "XMLNode.h"
class BoundingBox;
-class CharmapTranslator;
class Color;
class Font;
-class FontManager;
class Matrix;
+class PhysicalFont;
class SVGTree
{
@@ -60,14 +62,16 @@ class SVGTree
public:
SVGTree ();
void reset ();
- void write (ostream &os) const {_doc.write(os);}
+ void write (std::ostream &os) const {_doc.write(os);}
void newPage (int pageno);
void appendToDefs (XMLNode *node);
void appendToPage (XMLNode *node) {_page->append(node);}
void prependToPage (XMLNode *node){_page->prepend(node);}
void appendToDoc (XMLNode *node) {_doc.append(node);}
void appendToRoot (XMLNode *node) {_root->append(node);}
- void appendChar (int c, double x, double y, const FontManager &fm, const CharmapTranslator &cmt);
+ void appendChar (int c, double x, double y, const Font &font);
+ void appendFontStyles (const std::set<const Font*> &fonts);
+ void append (const PhysicalFont &font, const std::set<int> &chars, GFGlyphTracer::Callback *cb=0);
void setBBox (const BoundingBox &bbox);
void setFont (int id, const Font *font);
void setX (double x) {_xchanged = true;}
@@ -79,6 +83,10 @@ class SVGTree
const Matrix& getMatrix () const {return _matrix.get();}
XMLElementNode* rootNode () const {return _root;}
+ 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?
+
protected:
void newTextNode (double x, double y);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialActions.h
index 95ccd58e48b..8132ac3c510 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialActions.h
@@ -2,7 +2,7 @@
** SpecialActions.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -43,6 +43,10 @@ struct SpecialActions
virtual void appendToPage (XMLNode *node) =0;
virtual void appendToDefs (XMLNode *node) =0;
virtual BoundingBox& bbox () =0;
+ virtual BoundingBox& bbox (const std::string &name, bool reset=false) =0;
+ virtual void embed (const BoundingBox &bbox) =0;
+ virtual void embed (const DPair &p, double r=0) =0;
+ virtual void progress (const char *id) {}
};
@@ -61,6 +65,9 @@ class SpecialEmptyActions : public SpecialActions
void appendToPage (XMLNode *node) {}
void appendToDefs (XMLNode *node) {}
BoundingBox& bbox () {return _bbox;}
+ BoundingBox& bbox (const std::string &name, bool reset=false) {return _bbox;}
+ void embed (const BoundingBox &bbox) {}
+ void embed (const DPair &p, double r=0) {}
private:
BoundingBox _bbox;
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialHandler.h
index 4ad13852056..cf52c070d4d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialHandler.h
@@ -2,9 +2,9 @@
** SpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef SPECIALHANDLER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialManager.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.cpp
index f7c1fc74ccf..b115d49be2c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialManager.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.cpp
@@ -2,7 +2,7 @@
** SpecialManager.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialManager.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.h
index 26faf620e69..07d1f01e454 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/SpecialManager.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/SpecialManager.h
@@ -2,9 +2,9 @@
** SpecialManager.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef SPECIALMANAGER_H
@@ -34,6 +34,7 @@ class SpecialManager
public:
struct Listener
{
+ virtual ~Listener () {}
virtual void beginSpecial (const char *prefix)=0;
virtual void endSpecial (const char *prefix)=0;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.cpp
index ad4685f23b0..519fb726be7 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.cpp
@@ -2,9 +2,9 @@
** StreamReader.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include "StreamReader.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.h
index 65817e8d3ac..8f7986f2fe5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/StreamReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamReader.h
@@ -2,9 +2,9 @@
** StreamReader.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef STREAMREADER_H
@@ -27,33 +27,30 @@
#include "MessageException.h"
#include "types.h"
-using std::istream;
-using std::string;
-using std::vector;
class StreamReader
{
public:
- StreamReader (istream &s);
+ StreamReader (std::istream &s);
virtual ~StreamReader () {}
- istream& replaceStream (istream &s);
+ std::istream& replaceStream (std::istream &s);
UInt32 readUnsigned (int n);
Int32 readSigned (int n);
- string readString (int length);
- vector<UInt8>& readBytes (int n, vector<UInt8> &bytes);
+ std::string readString (int length);
+ std::vector<UInt8>& readBytes (int n, std::vector<UInt8> &bytes);
int readByte () {return is->get();}
protected:
- istream& in () {return *is;}
+ std::istream& in () {return *is;}
private:
- istream *is;
+ std::istream *is;
};
struct StreamReaderException : public MessageException
{
- StreamReaderException (const string &msg) : MessageException(msg) {}
+ StreamReaderException (const std::string &msg) : MessageException(msg) {}
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.cpp
new file mode 100644
index 00000000000..7512f89e3fa
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.cpp
@@ -0,0 +1,51 @@
+/*************************************************************************
+** StreamWriter.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 "StreamWriter.h"
+
+using namespace std;
+
+
+/** Writes an unsigned integer to the output stream.
+ * @param[in] val the value to write
+ * @param[in] n number of bytes to be considered */
+void StreamWriter::writeUnsigned (UInt32 val, int n) {
+ for (n--; n >= 0; n--)
+ _os.put((val >> (8*n)) & 0xff);
+}
+
+
+/** Writes a signed integer to the output stream.
+ * @param[in] val the value to write
+ * @param[in] n number of bytes to be considered */
+void StreamWriter::writeSigned (Int32 val, int n) {
+ writeUnsigned((UInt32)val, n);
+}
+
+
+/** Writes a signed integer to the output stream.
+ * @param[in] val the value to write
+ * @param[in] finalZero if true, a final 0-byte is appended */
+void StreamWriter::writeString (const string &str, bool finalZero) {
+ for (size_t i=0; i < str.length(); i++)
+ _os.put(str[i]);
+ if (finalZero)
+ _os.put(0);
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEmitter.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.h
index e39cf6c56ca..1fd01aae62a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/FontEmitter.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/StreamWriter.h
@@ -1,8 +1,8 @@
/*************************************************************************
-** FontEmitter.h **
+** StreamWriter.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,24 +18,24 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#ifndef FONTEMITTER_H
-#define FONTEMITTER_H
+#ifndef STREAMWRITER_H
+#define STREAMWRITER_H
-#include <set>
+#include <ostream>
+#include "types.h"
-struct FontEmitter
+class StreamWriter
{
- virtual ~FontEmitter () {}
-
- /** Emits all glyphs of the font. */
- virtual int emitFont (const char *id) =0;
-
- /** Emits selected glyphs of the font. */
- virtual int emitFont (const std::set<int> &usedChars, const char *id) =0;
-
- /** Emits a single glyph. */
- virtual bool emitGlyph (int c) =0;
+ public:
+ StreamWriter (std::ostream &os) : _os(os) {}
+ virtual ~StreamWriter () {}
+ void writeUnsigned (UInt32 val, int n);
+ void writeSigned (Int32 val, int n);
+ void writeString (const std::string &str, bool finalZero=false);
+
+ private:
+ std::ostream &_os;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.cpp
index 99cbfdeb702..4651b44fccc 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/CharmapTranslator.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.cpp
@@ -1,8 +1,8 @@
/*************************************************************************
-** CharmapTranslator.h **
+** System.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,33 +18,37 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#ifndef CHARMAPTRANSLATOR_H
-#define CHARMAPTRANSLATOR_H
-#include <map>
-#include <string>
-#include "types.h"
+#include <ctime>
+#include "System.h"
-using std::map;
-using std::string;
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if defined (HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#elif defined (HAVE_SYS_TIMEB_H)
+#include <sys/timeb.h>
+#endif
-class FileFinder;
-class Font;
-class FontEngine;
-class CharmapTranslator
-{
- typedef map<UInt32,UInt32>::iterator Iterator;
- typedef map<UInt32,UInt32>::const_iterator ConstIterator;
- public:
- CharmapTranslator () {}
- CharmapTranslator (const Font *font);
- CharmapTranslator (const FontEngine &fe);
- void setFont (const Font *font);
- UInt32 unicode (UInt32 customCode) const;
+using namespace std;
- private:
- map<UInt32,UInt32> translationMap;
-};
+/** Returns timestamp (wall time) in seconds. */
+double System::time () {
+#if defined (HAVE_SYS_TIME_H)
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return tv.tv_sec + tv.tv_usec/1000000.0;
+#elif defined (HAVE_SYS_TIMEB_H)
+ struct timeb tb;
+ ftime(&tb);
+ return tb.time + tb.millitm/1000.0;
+#else
+ clock_t myclock = clock();
+ return double(myclock)/CLOCKS_PER_SEC;
#endif
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.h
index 80a67412556..11c7f44078d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/System.h
@@ -1,8 +1,8 @@
/*************************************************************************
-** Message.h **
+** System.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -18,20 +18,12 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#ifndef MESSAGE_H
-#define MESSAGE_H
+#ifndef SYSTEM_H
+#define SYSTEM_H
-#include <string>
-#include <ostream>
-
-struct Message
+namespace System
{
- static std::ostream& mstream (bool prefix=false);
- static std::ostream& estream (bool prefix=false);
- static std::ostream& wstream (bool prefix=false);
-
- enum {ERRORS=1, WARNINGS=2, MESSAGES=4};
- static int level;
+ double time ();
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TFM.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.cpp
index 3683e642d22..528c65cbeb5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TFM.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.cpp
@@ -2,7 +2,7 @@
** TFM.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -24,24 +24,12 @@
#include "FileFinder.h"
#include "Message.h"
#include "MetafontWrapper.h"
+#include "StreamReader.h"
#include "TFM.h"
using namespace std;
-/** Reads a single unsigned integer value of given size (max. 4 bytes).
- * @param[in] is characters are read from this stream
- * @param[in] n number of bytes to be read */
-static UInt32 read_unsigned (istream &is, int n) {
- UInt32 ret = 0;
- for (int i=n-1; i >= 0 && !is.eof(); i--) {
- UInt32 b = is.get();
- ret |= b << (8*i);
- }
- return ret;
-}
-
-
/** Reads a sequence of n TFM words (4 Bytes each).
* @param[in] is reads from this stream
* @param[out] v the read words
@@ -49,11 +37,11 @@ static UInt32 read_unsigned (istream &is, int n) {
* @return dynamically allocated array containing the read words
* (must be deleted by the caller) */
template <typename T>
-static void read_words (istream &is, vector<T> &v, unsigned n) {
+static void read_words (StreamReader &sr, vector<T> &v, unsigned n) {
v.clear();
v.resize(n);
for (unsigned i=0; i < n; i++)
- v[i] = read_unsigned(is, 4);
+ v[i] = sr.readUnsigned(4);
}
@@ -84,28 +72,29 @@ TFM* TFM::createFromFile (const char *fontname) {
bool TFM::readFromStream (istream &is) {
+ StreamReader sr(is);
is.seekg(2, ios_base::beg); // skip file size
- UInt16 lh = read_unsigned(is, 2); // length of header in 4 byte words
- _firstChar= read_unsigned(is, 2); // smalles character code in font
- _lastChar = read_unsigned(is, 2); // largest character code in font
- UInt16 nw = read_unsigned(is, 2); // number of words in width table
- UInt16 nh = read_unsigned(is, 2); // number of words in height table
- UInt16 nd = read_unsigned(is, 2); // number of words in depth table
- UInt16 ni = read_unsigned(is, 2); // number of words in italic corr. table
-// UInt16 nl = read_unsigned(is, 2); // number of words in lig/kern table
-// UInt16 nk = read_unsigned(is, 2); // number of words in kern table
-// UInt16 ne = read_unsigned(is, 2); // number of words in ext. char table
-// UInt16 np = read_unsigned(is, 2); // number of font parameter words
+ UInt16 lh = sr.readUnsigned(2); // length of header in 4 byte words
+ _firstChar= sr.readUnsigned(2); // smalles character code in font
+ _lastChar = sr.readUnsigned(2); // largest character code in font
+ UInt16 nw = sr.readUnsigned(2); // number of words in width table
+ UInt16 nh = sr.readUnsigned(2); // number of words in height table
+ UInt16 nd = sr.readUnsigned(2); // number of words in depth table
+ UInt16 ni = sr.readUnsigned(2); // number of words in italic corr. table
+// UInt16 nl = sr.readUnsigned(2); // number of words in lig/kern table
+// UInt16 nk = sr.readUnsigned(2); // number of words in kern table
+// UInt16 ne = sr.readUnsigned(2); // number of words in ext. char table
+// UInt16 np = sr.readUnsigned(2); // number of font parameter words
is.seekg(8, ios_base::cur); // move to header (skip above commented bytes)
- _checksum = read_unsigned(is, 4);
- _designSize = read_unsigned(is, 4);
+ _checksum = sr.readUnsigned(4);
+ _designSize = sr.readUnsigned(4);
is.seekg(24+lh*4, ios_base::beg); // move to char info table
- read_words(is, _charInfoTable, _lastChar-_firstChar+1);
- read_words(is, _widthTable, nw);
- read_words(is, _heightTable, nh);
- read_words(is, _depthTable, nd);
- read_words(is, _italicTable, ni);
+ read_words(sr, _charInfoTable, _lastChar-_firstChar+1);
+ read_words(sr, _widthTable, nw);
+ read_words(sr, _heightTable, nh);
+ read_words(sr, _depthTable, nd);
+ read_words(sr, _italicTable, ni);
return true;
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TFM.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.h
index b8c44af5363..0001e289d3c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TFM.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TFM.h
@@ -2,9 +2,9 @@
** TFM.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef TFM_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.cpp
new file mode 100644
index 00000000000..17037ce68fe
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.cpp
@@ -0,0 +1,165 @@
+/*************************************************************************
+** Terminal.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 "Terminal.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+
+#ifdef GWINSZ_IN_SYS_IOCTL
+#include <sys/ioctl.h>
+#endif
+
+#ifdef __WIN32__
+#include <windows.h>
+#endif
+
+#include <cstdio>
+
+
+using namespace std;
+
+
+#ifdef __WIN32__
+int Terminal::_defaultColor;
+const int Terminal::RED = FOREGROUND_RED;
+const int Terminal::GREEN = FOREGROUND_GREEN;
+const int Terminal::BLUE = FOREGROUND_BLUE;
+#else
+const int Terminal::RED = 1;
+const int Terminal::GREEN = 2;
+const int Terminal::BLUE = 4;
+#endif
+
+const int Terminal::CYAN = GREEN|BLUE;
+const int Terminal::YELLOW = RED|GREEN;
+const int Terminal::MAGENTA = RED|BLUE;
+const int Terminal::WHITE = RED|GREEN|BLUE;
+const int Terminal::DEFAULT = -1;
+const int Terminal::BLACK = 0;
+
+
+
+void Terminal::init (ostream &os) {
+#ifdef __WIN32__
+ HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (h != INVALID_HANDLE_VALUE) {
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ GetConsoleScreenBufferInfo(h, &info);
+ _defaultColor = (info.wAttributes & 0xff);
+ }
+#endif
+}
+
+
+void Terminal::finish (ostream &os) {
+ color(DEFAULT, false, os);
+}
+
+
+/** Returns the number of terminal columns (number of characters per row).
+ * If it's not possible to retrieve information about the terminal size, 0 is returned. */
+int Terminal::columns () {
+#if defined(TIOCGWINSZ)
+ struct winsize ws;
+ if (ioctl(fileno(stderr), TIOCGWINSZ, &ws) < 0)
+ return 0;
+ return ws.ws_col;
+#elif defined(__WIN32__)
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &info))
+ return 0;
+ return info.dwSize.X;
+#else
+ return 0;
+#endif
+}
+
+
+/** Returns the number of terminal rows.
+ * If it's not possible to retrieve information about the terminal size, 0 is returned. */
+int Terminal::rows () {
+#if defined(TIOCGWINSZ)
+ struct winsize ws;
+ if (ioctl(fileno(stderr), TIOCGWINSZ, &ws) < 0)
+ return 0;
+ return ws.ws_row;
+#elif defined(__WIN32__)
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &info))
+ return 0;
+ return info.dwSize.Y;
+#else
+ return 0;
+#endif
+}
+
+
+void Terminal::color (int color, bool light, ostream &os) {
+#ifdef __WIN32__
+ HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (h != INVALID_HANDLE_VALUE) {
+ if (color == DEFAULT)
+ color = _defaultColor;
+ else {
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ GetConsoleScreenBufferInfo(h, &info);
+ color = (info.wAttributes & 0xf0) | (color & 0x07);
+ if (light)
+ color |= FOREGROUND_INTENSITY;
+ }
+ SetConsoleTextAttribute(h, (DWORD)color);
+ }
+#else
+ if (color == DEFAULT)
+ os << "\e[0m";
+ else
+ os << "\e[" << (light ? '1': '0') << ';' << (30+(color & 0x07)) << 'm';
+#endif
+}
+
+
+void Terminal::bgcolor (int color, bool light, ostream &os) {
+#ifdef __WIN32__
+ HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (h != INVALID_HANDLE_VALUE) {
+ if (color == DEFAULT)
+ color = _defaultColor;
+ else {
+ CONSOLE_SCREEN_BUFFER_INFO info;
+ GetConsoleScreenBufferInfo(h, &info);
+ color = (info.wAttributes & 0x0f) | ((color & 0x07) << 4);
+ if (light)
+ color |= BACKGROUND_INTENSITY;
+ }
+ SetConsoleTextAttribute(h, (DWORD)color);
+ }
+#else
+ if (color == DEFAULT)
+ os << "\e[0m";
+ else
+ os << "\e[" << (40+(color & 0x07)) << 'm';
+#endif
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.h
new file mode 100644
index 00000000000..a1a1c7e578d
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/Terminal.h
@@ -0,0 +1,53 @@
+/*************************************************************************
+** Terminal.h **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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/>. **
+*************************************************************************/
+
+#ifndef TERMINAL_H
+#define TERMINAL_H
+
+#include <ostream>
+
+class Terminal
+{
+ public:
+ static const int DEFAULT;
+ static const int BLACK;
+ static const int RED;
+ static const int GREEN;
+ static const int BLUE;
+ static const int CYAN;
+ static const int YELLOW;
+ static const int MAGENTA;
+ static const int WHITE;
+
+ public:
+ static void init (std::ostream &os);
+ static void finish (std::ostream &os);
+ static int columns ();
+ static int rows ();
+ static void color (int color, bool light, std::ostream &os);
+ static void bgcolor (int color, bool light, std::ostream &os);
+
+#ifdef __WIN32__
+ private:
+ static int _defaultColor;
+#endif
+};
+
+#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TpicSpecialHandler.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.cpp
index 2e89c5643f2..a2dc4627f46 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TpicSpecialHandler.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.cpp
@@ -2,9 +2,9 @@
** TpicSpecialHandler.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <cmath>
@@ -63,7 +63,7 @@ void TpicSpecialHandler::drawLines (bool fill, double ddist, SpecialActions *act
elem->addAttribute("cx", p.x()+actions->getX());
elem->addAttribute("cy", p.y()+actions->getY());
elem->addAttribute("r", _penwidth/2.0);
- actions->bbox().embed(p, _penwidth/2.0);
+ actions->embed(p, _penwidth/2.0);
}
else {
if (_points.size() == 2 || (!fill && _points.front() != _points.back())) {
@@ -88,7 +88,7 @@ void TpicSpecialHandler::drawLines (bool fill, double ddist, SpecialActions *act
double x = it->x()+actions->getX();
double y = it->y()+actions->getY();
oss << x << ',' << y;
- actions->bbox().embed(x, y);
+ actions->embed(DPair(x, y));
}
elem->addAttribute("points", oss.str());
elem->addAttribute("stroke", "black");
@@ -120,7 +120,7 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
oss << 'M' << x+_points[0].x() << ',' << y+_points[0].y();
DPair mid = p+_points[0]+(_points[1]-_points[0])/2.0;
oss << 'L' << mid.x() << ',' << mid.y();
- actions->bbox().embed(p+_points[0]);
+ actions->embed(p+_points[0]);
for (size_t i=1; i < size-1; i++) {
const DPair p0 = p+_points[i-1];
const DPair p1 = p+_points[i];
@@ -128,14 +128,14 @@ void TpicSpecialHandler::drawSplines (double ddist, SpecialActions *actions) {
mid = p1+(p2-p1)/2.0;
oss << 'Q' << p1.x() << ',' << p1.y()
<< ' ' << mid.x() << ',' << mid.y();
- actions->bbox().embed(mid);
- actions->bbox().embed((p0+p1*6.0+p2)/8.0, _penwidth);
+ actions->embed(mid);
+ actions->embed((p0+p1*6.0+p2)/8.0, _penwidth);
}
if (_points[0] == _points[size-1]) // closed path?
oss << 'Z';
else {
oss << 'L' << x+_points[size-1].x() << ',' << y+_points[size-1].y();
- actions->bbox().embed(p+_points[size-1]);
+ actions->embed(p+_points[size-1]);
}
Color color = actions->getColor();
@@ -221,7 +221,7 @@ void TpicSpecialHandler::drawArc (double cx, double cy, double rx, double ry, do
else
elem->addAttribute("fill", "none");
actions->appendToPage(elem);
- actions->bbox().embed(BoundingBox(cx-rx, cy-ry, cx+rx, cy+ry));
+ actions->embed(BoundingBox(cx-rx, cy-ry, cx+rx, cy+ry));
}
reset();
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TpicSpecialHandler.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.h
index 6856e5e9413..93f4c123c23 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/TpicSpecialHandler.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/TpicSpecialHandler.h
@@ -2,9 +2,9 @@
** TpicSpecialHandler.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef TPICSPECIALHANDLER_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFActions.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFActions.h
index 6b08064510d..34be50e5b70 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFActions.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFActions.h
@@ -2,9 +2,9 @@
** VFActions.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef VFACTIONS_H
@@ -25,17 +25,14 @@
#include <vector>
#include "types.h"
-using std::string;
-using std::vector;
-
struct VFActions
{
virtual ~VFActions () {}
- virtual void preamble (string comment, UInt32 checksum, double dsize) {}
+ virtual void preamble (std::string comment, UInt32 checksum, double dsize) {}
virtual void postamble () {}
- virtual void defineVFFont (UInt32 fontnum, string path, string name, UInt32 checksum, double dsize, double ssize) {}
- virtual void defineVFChar (UInt32 c, vector<UInt8> *dvi) {}
+ virtual void defineVFFont (UInt32 fontnum, std::string path, std::string name, UInt32 checksum, double dsize, double ssize) {}
+ virtual void defineVFChar (UInt32 c, std::vector<UInt8> *dvi) {}
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFReader.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.cpp
index 691e3f52598..21b468c247a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFReader.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.cpp
@@ -2,9 +2,9 @@
** VFReader.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <sstream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFReader.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.h
index c9b1df5518a..b60acccb32b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VFReader.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VFReader.h
@@ -2,9 +2,9 @@
** VFReader.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,32 +15,23 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef VFREADER_H
#define VFREADER_H
-#include <istream>
-#include <map>
-#include <stack>
-#include <string>
#include "MessageException.h"
#include "StreamReader.h"
#include "types.h"
-using std::istream;
-using std::map;
-using std::stack;
-using std::string;
struct VFException : public MessageException
{
- VFException (const string &msg) : MessageException(msg) {}
+ VFException (const std::string &msg) : MessageException(msg) {}
};
-class FontManager;
class VFActions;
@@ -48,7 +39,7 @@ class VFReader : public StreamReader
{
typedef bool (*ApproveAction)(int);
public:
- VFReader (istream &is);
+ VFReader (std::istream &is);
virtual ~VFReader ();
VFActions* replaceActions (VFActions *a);
bool executeAll ();
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VectorStream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VectorStream.h
index ea2bf42d968..e2221b3df7a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/VectorStream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/VectorStream.h
@@ -2,9 +2,9 @@
** VectorStream.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef VECTORSTREAM_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocTypeNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocTypeNode.h
index 368e33fd170..a45e10cfaba 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocTypeNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocTypeNode.h
@@ -2,9 +2,9 @@
** XMLDocTypeNode.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef XMLDOCTYPENODE_H
@@ -26,7 +26,7 @@
class XMLDocTypeNode : public XMLDeclarationNode
{
public:
- XMLDocTypeNode (const string &rootName, const string &type, const string &param)
+ XMLDocTypeNode (const std::string &rootName, const std::string &type, const std::string &param)
: XMLDeclarationNode("DOCTYPE", rootName + " " + type + " " + param) {}
};
@@ -34,7 +34,7 @@ class XMLDocTypeNode : public XMLDeclarationNode
class XMLEntityNode : public XMLDeclarationNode
{
public:
- XMLEntityNode (const string &n, const string &v)
+ XMLEntityNode (const std::string &n, const std::string &v)
: XMLDeclarationNode("ENTITY", n + " " + v) {}
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocument.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.cpp
index 03ef5b28c98..11f0ded7337 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocument.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.cpp
@@ -2,9 +2,9 @@
** XMLDocument.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include "macros.h"
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocument.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.h
index ce4cbef570f..8e2b4f75a9c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLDocument.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLDocument.h
@@ -2,9 +2,9 @@
** XMLDocument.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef XMLDOCUMENT_H
@@ -32,11 +32,11 @@ class XMLDocument
void append (XMLNode *node);
void setRootNode (XMLElementNode *root);
const XMLElementNode* getRootElement () const {return rootElement;}
- ostream& write (ostream &os) const;
- bool emit (ostream& os, XMLNode *stopNode);
+ std::ostream& write (std::ostream &os) const;
+ bool emit (std::ostream& os, XMLNode *stopNode);
private:
- list<XMLNode*> nodes;
+ std::list<XMLNode*> nodes;
XMLElementNode *rootElement;
bool emitted;
};
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLNode.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.cpp
index f3e79dc2f20..6b7d2747221 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLNode.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.cpp
@@ -2,7 +2,7 @@
** XMLNode.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -90,6 +90,42 @@ void XMLElementNode::prepend (XMLNode *child) {
}
+/** Inserts a new child node before a given child node already present. The latter
+ * will be the following sibling of the node to be inserted. If there's no such
+ * node present, nothing is inserted.
+ * @param[in] child node to be inserted
+ * @param[in] sibling following sibling of 'child'
+ * @return true on success */
+bool XMLElementNode::insertBefore (XMLNode *child, XMLNode *sibling) {
+ ElementList::iterator it = children.begin();
+ while (it != children.end() && *it != sibling)
+ ++it;
+ if (it != children.end()) {
+ children.insert(it, child);
+ return true;
+ }
+ return false;
+}
+
+
+/** Inserts a new child node after a given child node already present. The latter
+ * will be the preceding sibling of the node to be inserted. If there's no such
+ * node present, nothing is inserted.
+ * @param[in] child node to be inserted
+ * @param[in] sibling preceding sibling of 'child'
+ * @return true on success */
+bool XMLElementNode::insertAfter (XMLNode *child, XMLNode *sibling) {
+ ElementList::iterator it = children.begin();
+ while (it != children.end() && *it != sibling)
+ ++it;
+ if (it != children.end()) {
+ children.insert(++it, child);
+ return true;
+ }
+ return false;
+}
+
+
ostream& XMLElementNode::write (ostream &os) const {
os << '<' << name;
FORALL(attributes, AttribMap::const_iterator, i)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLNode.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.h
index b44726b65be..d46619b038a 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLNode.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLNode.h
@@ -2,7 +2,7 @@
** XMLNode.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -26,16 +26,12 @@
#include <ostream>
#include <string>
-using std::list;
-using std::map;
-using std::ostream;
-using std::string;
struct XMLNode
{
virtual ~XMLNode () {}
- virtual ostream& write (ostream &os) const =0;
- virtual bool emit (ostream &os, XMLNode *stopElement);
+ virtual std::ostream& write (std::ostream &os) const =0;
+ virtual bool emit (std::ostream &os, XMLNode *stopElement);
virtual void append (XMLNode *child) {}
virtual void prepend (XMLNode *child) {}
};
@@ -43,23 +39,25 @@ struct XMLNode
class XMLElementNode : public XMLNode
{
- typedef map<string,string> AttribMap;
- typedef list<XMLNode*> ElementList;
+ typedef std::map<std::string,std::string> AttribMap;
+ typedef std::list<XMLNode*> ElementList;
public:
- XMLElementNode (const string &name);
+ XMLElementNode (const std::string &name);
~XMLElementNode ();
- void addAttribute (const string &name, const string &value);
- void addAttribute (const string &name, double value);
+ void addAttribute (const std::string &name, const std::string &value);
+ void addAttribute (const std::string &name, double value);
void append (XMLNode *child);
- void append (const string &str);
+ void append (const std::string &str);
void prepend (XMLNode *child);
- bool hasAttribute (const string &name) const;
- ostream& write (ostream &os) const;
- bool emit (ostream &os, XMLNode *stopElement);
+ bool insertAfter (XMLNode *child, XMLNode *sibling);
+ bool insertBefore (XMLNode *child, XMLNode *sibling);
+ bool hasAttribute (const std::string &name) const;
+ std::ostream& write (std::ostream &os) const;
+ bool emit (std::ostream &os, XMLNode *stopElement);
bool empty () const {return children.empty();}
private:
- string name; // element name (<name a1="v1" .. an="vn">...</name>)
+ std::string name; // element name (<name a1="v1" .. an="vn">...</name>)
AttribMap attributes;
ElementList children; // child nodes
bool emitted; // true if node has been (partly) emitted
@@ -69,42 +67,42 @@ class XMLElementNode : public XMLNode
class XMLTextNode : public XMLNode
{
public:
- XMLTextNode (const string &str) : text(str) {}
+ XMLTextNode (const std::string &str) : text(str) {}
void append (XMLNode *node);
void append (XMLTextNode *node);
- void append (const string &str);
+ void append (const std::string &str);
void prepend (XMLNode *child);
- ostream& write (ostream &os) const {return os << text;}
+ std::ostream& write (std::ostream &os) const {return os << text;}
private:
- string text;
+ std::string text;
};
class XMLCommentNode : public XMLNode
{
public:
- XMLCommentNode (const string &str) : text(str) {}
- ostream& write (ostream &os) const {return os << "<!--" << text << "-->\n";}
+ XMLCommentNode (const std::string &str) : text(str) {}
+ std::ostream& write (std::ostream &os) const {return os << "<!--" << text << "-->\n";}
private:
- string text;
+ std::string text;
};
class XMLDeclarationNode : public XMLNode
{
public:
- XMLDeclarationNode (const string &n, const string &p);
+ XMLDeclarationNode (const std::string &n, const std::string &p);
~XMLDeclarationNode ();
void append (XMLDeclarationNode *child);
- ostream& write (ostream &os) const;
- bool emit (ostream &os, XMLNode *stopElement);
+ std::ostream& write (std::ostream &os) const;
+ bool emit (std::ostream &os, XMLNode *stopElement);
private:
- string name;
- string params;
- list<XMLDeclarationNode*> children;
+ std::string name;
+ std::string params;
+ std::list<XMLDeclarationNode*> children;
bool emitted;
};
@@ -112,11 +110,11 @@ class XMLDeclarationNode : public XMLNode
class XMLCDataNode : public XMLNode
{
public:
- XMLCDataNode (const string &d) : data(d) {}
- ostream& write (ostream &os) const;
+ XMLCDataNode (const std::string &d) : data(d) {}
+ std::ostream& write (std::ostream &os) const;
private:
- string data;
+ std::string data;
};
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLString.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.cpp
index 4c1cae32a38..c7cd33f7b1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLString.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.cpp
@@ -2,9 +2,9 @@
** XMLString.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <sstream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLString.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.h
index f634a473d96..acce6f966ad 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/XMLString.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/XMLString.h
@@ -2,9 +2,9 @@
** XMLString.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,33 +15,24 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef XMLSTRING_H
#define XMLSTRING_H
-#include <ostream>
#include <string>
-#include <sstream>
-#include "macros.h"
-using std::string;
-using std::ostream;
-using std::stringstream;
-class XMLString : public string
+class XMLString : public std::string
{
public:
- XMLString () : string() {}
+ XMLString () : std::string() {}
XMLString (const char *str, bool plain=false);
- XMLString (const string &str, bool plain=false);
+ XMLString (const std::string &str, bool plain=false);
XMLString (int n, bool cast=true);
XMLString (double x);
-// ostream& write (ostream &os) const;
};
-//IMPLEMENT_OUTPUT_OPERATOR(XMLString)
-
#endif
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/dvisvgm.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/dvisvgm.cpp
new file mode 100644
index 00000000000..55548803064
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/dvisvgm.cpp
@@ -0,0 +1,331 @@
+/*************************************************************************
+** dvisvgm.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <cmath>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include "gzstream.h"
+#include "CommandLine.h"
+#include "DVIToSVG.h"
+#include "DVIToSVGActions.h"
+#include "FilePath.h"
+#include "FileSystem.h"
+#include "Font.h"
+#include "FontCache.h"
+#include "Ghostscript.h"
+#include "InputReader.h"
+#include "Message.h"
+#include "FileFinder.h"
+#include "PageSize.h"
+#include "SpecialManager.h"
+#include "System.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+using namespace std;
+
+class SVGOutput : public DVIToSVG::Output
+{
+ public:
+ SVGOutput (const char *base=0, string pattern="", int zip_level=0)
+ : _path(base ? base : ""),
+ _pattern(pattern),
+ _stdout(base == 0),
+ _zipLevel(zip_level),
+ _page(-1),
+ _os(0) {}
+
+
+ ~SVGOutput () {
+ delete _os;
+ }
+
+
+ /** Returns an output stream for the given page.
+ * @param[in] page number of current page
+ * @param[in] numPages total number of pages in the DVI file
+ * @return output stream for the given page */
+ ostream& getPageStream (int page, int numPages) const {
+ string fname = filename(page, numPages);
+ if (fname.empty()) {
+ delete _os;
+ _os = 0;
+ return cout;
+ }
+ if (page == _page)
+ return *_os;
+
+ _page = page;
+ delete _os;
+
+ if (_zipLevel > 0)
+ _os = new ogzstream(fname.c_str(), _zipLevel);
+ else
+ _os = new ofstream(fname.c_str());
+ if (!_os || !*_os) {
+ delete _os;
+ _os = 0;
+ throw MessageException("can't open file "+fname+" for writing");
+ }
+ return *_os;
+ }
+
+
+ /** Returns the name of the SVG file containing the given page.
+ * @param[in] page number of page */
+ string filename (int page, int numPages) const {
+ if (_stdout)
+ return "";
+ string fname = _pattern;
+ if (fname.empty())
+ fname = numPages > 1 ? "%f-%p" : "%f";
+ else if (numPages > 1 && fname.find("%p") == string::npos)
+ fname += FileSystem::isDirectory(fname.c_str()) ? "/%f-%p" : "-%p";
+
+ // replace pattern variables by their actual values
+ // %f: basename of the DVI file
+ // %p: current page number
+ ostringstream oss;
+ oss << setfill('0') << setw(max(2, int(1+log10((double)numPages)))) << page;
+ size_t pos=0;
+ while ((pos = fname.find('%', pos)) != string::npos && pos < fname.length()-1) {
+ switch (fname[pos+1]) {
+ case 'f': fname.replace(pos, 2, _path.basename()); pos += _path.basename().length(); break;
+ case 'p': fname.replace(pos, 2, oss.str()); pos += oss.str().length(); break;
+ default : ++pos;
+ }
+ }
+ FilePath outpath(fname, true);
+ if (outpath.suffix().empty())
+ outpath.suffix(_zipLevel > 0 ? "svgz" : "svg");
+ string apath = outpath.absolute();
+ string rpath = outpath.relative();
+ return apath.length() < rpath.length() ? apath : rpath;
+ }
+
+ private:
+ FilePath _path;
+ string _pattern;
+ bool _stdout;
+ int _zipLevel;
+ mutable int _page; // number of current page being written
+ mutable ostream *_os;
+};
+
+
+static void show_help (const CommandLine &cmd) {
+ cout << PACKAGE_STRING "\n\n";
+ cmd.help();
+ cout << "\nCopyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> \n\n";
+}
+
+
+static string remove_path (string fname) {
+ fname = FileSystem::adaptPathSeperators(fname);
+ size_t slashpos = fname.rfind('/');
+ if (slashpos == string::npos)
+ return fname;
+ return fname.substr(slashpos+1);
+}
+
+
+static string ensure_suffix (string fname, const string &suffix) {
+ size_t dotpos = remove_path(fname).rfind('.');
+ if (dotpos == string::npos) {
+ dotpos = fname.length();
+ fname += "."+suffix;
+ }
+ return fname;
+}
+
+
+static void set_trans (DVIToSVG &dvisvg, const CommandLine &args) {
+ ostringstream oss;
+ if (args.rotate_given())
+ oss << 'R' << args.rotate_arg() << ",w/2,h/2";
+ if (args.translate_given())
+ oss << 'T' << args.translate_arg();
+ if (args.scale_given())
+ oss << 'S' << args.scale_arg();
+ if (args.transform_given())
+ oss << args.transform_arg();
+ dvisvg.setTransformation(oss.str());
+}
+
+
+static void set_libgs (CommandLine &args) {
+#if !defined(DISABLE_GS) && !defined(HAVE_LIBGS)
+ if (args.libgs_given())
+ Ghostscript::LIBGS_NAME = args.libgs_arg();
+ else if (getenv("LIBGS"))
+ Ghostscript::LIBGS_NAME = getenv("LIBGS");
+#endif
+}
+
+
+static bool set_cache_dir (const CommandLine &args) {
+ if (args.cache_given() && !args.cache_arg().empty()) {
+ if (args.cache_arg() == "none")
+ PhysicalFont::CACHE_PATH = 0;
+ else if (FileSystem::exists(args.cache_arg().c_str()))
+ PhysicalFont::CACHE_PATH = args.cache_arg().c_str();
+ else
+ Message::wstream(true) << "cache directory '" << args.cache_arg() << "' does not exist (caching disabled)\n";
+ }
+ else {
+ if (const char *userdir = FileSystem::userdir()) {
+ static string path = userdir;
+ path += "/.dvisvgm";
+ path = FileSystem::adaptPathSeperators(path);
+ if (!FileSystem::exists(path.c_str()))
+ FileSystem::mkdir(path.c_str());
+ PhysicalFont::CACHE_PATH = path.c_str();
+ }
+ if (args.cache_given() && args.cache_arg().empty()) {
+ cout << "cache directory: " << (PhysicalFont::CACHE_PATH ? PhysicalFont::CACHE_PATH : "(none)") << '\n';
+ FontCache::fontinfo(PhysicalFont::CACHE_PATH, cout);
+ return false;
+ }
+ }
+ return true;
+}
+
+
+static bool check_bbox (const string &bboxstr) {
+ const char *formats[] = {"none", "min", "dvi", 0};
+ for (const char **p=formats; *p; ++p)
+ if (bboxstr == *p)
+ return true;
+ if (isalpha(bboxstr[0])) {
+ try {
+ PageSize size(bboxstr);
+ return true;
+ }
+ catch (const PageSizeException &e) {
+ Message::estream(true) << "invalid bounding box format '" << bboxstr << "'\n";
+ return false;
+ }
+ }
+ try {
+ BoundingBox bbox;
+ bbox.set(bboxstr);
+ return true;
+ }
+ catch (const MessageException &e) {
+ Message::estream(true) << e.getMessage() << '\n';
+ return false;
+ }
+}
+
+
+int main (int argc, char *argv[]) {
+ CommandLine args;
+ args.parse(argc, argv);
+ if (args.error())
+ return 1;
+
+ Message::COLORIZE = args.color_given();
+
+ set_libgs(args);
+ if (args.version_given()) {
+ cout << PACKAGE_STRING "\n";
+ return 0;
+ }
+ if (args.list_specials_given()) {
+ SVGOutput out;
+ DVIToSVG dvisvg(cin, out);
+ if (const SpecialManager *sm = dvisvg.setProcessSpecials())
+ sm->writeHandlerInfo(cout);
+ return 0;
+ }
+
+ if (!set_cache_dir(args))
+ return 0;
+
+ if (argc == 1 || args.help_given()) {
+ show_help(args);
+ return 0;
+ }
+
+ if (argc > 1 && args.numFiles() < 1) {
+ Message::estream(true) << "no input file given\n";
+ return 1;
+ }
+
+ if (args.stdout_given() && args.zip_given()) {
+ Message::estream(true) << "writing SVGZ files to stdout is not supported\n";
+ return 1;
+ }
+ if (args.map_file_given())
+ FileFinder::setUserFontMap(args.map_file_arg().c_str());
+
+ if (!check_bbox(args.bbox_arg()))
+ return 1;
+
+ if (args.progress_given()) {
+ DVIReader::COMPUTE_PAGE_LENGTH = args.progress_given();
+ DVIToSVGActions::PROGRESSBAR_DELAY = args.progress_arg();
+ }
+ SVGTree::CREATE_STYLE = !args.no_styles_given();
+ SVGTree::USE_FONTS = !args.no_fonts_given();
+ DVIToSVGActions::EXACT_BBOX = args.exact_given();
+ DVIToSVG::TRACE_MODE = args.trace_all_given() ? (args.trace_all_arg() ? 'a' : 'm') : 0;
+ PhysicalFont::KEEP_TEMP_FILES = args.keep_given();
+ PhysicalFont::METAFONT_MAG = args.mag_arg();
+
+ double start_time = System::time();
+ string dvifile = ensure_suffix(args.file(0), "dvi");
+ ifstream ifs(dvifile.c_str(), ios_base::binary|ios_base::in);
+ if (!ifs)
+ Message::estream(true) << "can't open file '" << dvifile << "' for reading\n";
+ else {
+ SVGOutput out(args.stdout_given() ? 0 : dvifile.c_str(), args.output_arg(), args.zip_given() ? args.zip_arg() : 0);
+ Message::LEVEL = args.verbosity_arg();
+ DVIToSVG dvisvg(ifs, out);
+ const char *ignore_specials = args.no_specials_given() ? (args.no_specials_arg().empty() ? "*" : args.no_specials_arg().c_str()) : 0;
+ dvisvg.setProcessSpecials(ignore_specials);
+ set_trans(dvisvg, args);
+ dvisvg.setPageSize(args.bbox_arg());
+
+ try {
+ FileFinder::init(argv[0], !args.no_mktexmf_given());
+ pair<int,int> pageinfo;
+ dvisvg.convert(args.page_arg(), &pageinfo);
+ Message::mstream().indent(0);
+ Message::mstream(false, Terminal::BLUE, true) << "\n" << pageinfo.first << " of " << pageinfo.second << " page";
+ if (pageinfo.second > 1)
+ Message::mstream(false, Terminal::BLUE, true) << 's';
+ Message::mstream(false, Terminal::BLUE, true) << " converted in " << (System::time()-start_time) << " seconds\n";
+ }
+ catch (DVIException &e) {
+ Message::estream() << "\nDVI error: " << e.getMessage() << '\n';
+ }
+ catch (MessageException &e) {
+ Message::estream(true) << e.getMessage() << '\n';
+ }
+ }
+ return 0;
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/gzstream.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.cpp
index e738caa8229..e738caa8229 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/gzstream.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.cpp
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/gzstream.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.h
index bca84f1b4e8..bca84f1b4e8 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/gzstream.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/gzstream.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/iapi.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/iapi.h
index 8e29d938d03..8e29d938d03 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/iapi.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/iapi.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ierrors.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ierrors.h
index 3184341177e..3184341177e 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/ierrors.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/ierrors.h
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/macros.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/macros.h
index 9a276dd33d6..24d97419af2 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/macros.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/macros.h
@@ -2,9 +2,9 @@
** macros.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef MACROS_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/options.xml b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/options.xml
index 2445c49150b..1866977995b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/options.xml
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/options.xml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
-<!-- *********************************************************************
+<!-- *********************************************************************
** options.xml **
** **
** This file is part of dvisvgm - the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -18,18 +18,19 @@
** You should have received a copy of the GNU General Public License **
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
***********************************************************************-->
+<!DOCTYPE cmdline SYSTEM "options.dtd">
<cmdline class="CommandLine">
<program>
<name>dvisvgm</name>
<usage>[options] dvifile</usage>
- <description>This program converts DVI files, as created by TeX/LaTeX to\nthe XML-based scalable vector graphics format SVG.</description>
+ <description>This program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.</description>
</program>
<options>
<section title="Input options">
<option long="page" short="p">
- <arg type="unsigned" name="number" default="1"/>
- <description>choose page to convert</description>
+ <arg type="string" name="ranges" default="1"/>
+ <description>choose pages to convert</description>
</option>
<option long="map-file" short="m">
<arg type="string" name="[+]filename"/>
@@ -38,12 +39,12 @@
</section>
<section title="SVG output options">
<option long="bbox" short="b">
- <arg type="string" name="fmt" default="min"/>
- <description>set format or size of bounding box</description>
+ <arg type="string" name="size" default="min"/>
+ <description>set size of bounding box</description>
</option>
<option long="output" short="o">
- <arg type="string" name="filename"/>
- <description>set name of output file</description>
+ <arg type="string" name="pattern"/>
+ <description>set name pattern of output files</description>
</option>
<option long="stdout" short="s">
<description>write SVG output to stdout</description>
@@ -82,6 +83,16 @@
<arg type="string" name="dir" optional="yes"/>
<description>set/print path of cache directory</description>
</option>
+ <option long="exact" short="e">
+ <description>compute exact glyph boxes</description>
+ </option>
+ <option long="keep">
+ <description>keep temporary files</description>
+ </option>
+ <option long="libgs" if="!defined(HAVE_LIBGS) &amp;&amp; !defined(DISABLE_GS)">
+ <arg name="filename" type="string"/>
+ <description>set name of Ghostscript shared library</description>
+ </option>
<option long="mag" short="M">
<arg type="double" name="factor" default="4"/>
<description>magnification of Metafont output</description>
@@ -94,10 +105,14 @@
<description>don't process [selected] specials</description>
</option>
<option long="trace-all" short="a">
- <description>trace all glyphs of used bitmap fonts</description>
+ <arg name="retrace" type="bool" optional="yes" default="no"/>
+ <description>trace all glyphs of bitmap fonts</description>
</option>
</section>
<section title="Message options">
+ <option long="color">
+ <description>colorize messages</description>
+ </option>
<option long="help" short="h">
<description>print this help and exit</description>
</option>
@@ -105,7 +120,7 @@
<description>print supported special sets and exit</description>
</option>
<option long="progress" short="P">
- <arg type="unsigned" name="skip" default="100" optional="yes"/>
+ <arg name="delay" type="double" optional="yes" default="0.5"/>
<description>enable progess indicator</description>
</option>
<option long="verbosity" short="v">
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/psdefs.psc b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/psdefs.psc
new file mode 100644
index 00000000000..445d7973233
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/psdefs.psc
@@ -0,0 +1,60 @@
+/*************************************************************************
+** psdefs.psc **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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/>. **
+*************************************************************************/
+
+const char *PSInterpreter::PSDEFS =
+"3 dict dup begin/Install{matrix setmatrix}def/HWResolution[72.27 72.27]def/PageS"
+"ize[10000 10000]def end setpagedevice/@dodraw true store/@SD systemdict def true"
+" setglobal @SD/:gsave @SD/gsave get put @SD/:grestore @SD/grestore get put @SD/:"
+"stroke @SD/stroke get put @SD/:fill @SD/fill get put @SD/:eofill @SD/eofill get "
+"put @SD/:clip @SD/clip get put @SD/:eoclip @SD/eoclip get put @SD/:charpath @SD/"
+"charpath get put @SD/.setopacityalpha known not{@SD/.setopacityalpha{pop}put}if "
+"@SD/prval{dup type/stringtype eq{print}{30 string cvs print}ifelse}put @SD/prseq"
+"{-1 1{-1 roll prval( )print}for(\\n)print}put @SD/prcmd{( )exch(\\ndvi.)3{print}"
+"repeat prseq}put @SD/cvxall{{cvx}forall}put @SD/defpr{[exch[/copy @SD]cvxall 5 -"
+"1 roll dup 6 1 roll[/get/exec]cvxall 6 -1 roll dup 7 1 roll 4 -1 roll dup 5 1 ro"
+"ll dup length string cvs/prcmd cvx]cvx def}put @SD/setpos{currentpoint dup type "
+"cvlit/booleantype eq{pop}{2(setpos)prcmd}ifelse}put @SD/prpath{{2(moveto)prcmd}{"
+"2(lineto)prcmd}{6(curveto)prcmd}{0(closepath)prcmd}pathforall}put @SD/charpath{/"
+"@dodraw false store :charpath/@dodraw true store}put @SD/show{@dodraw{true charp"
+"ath eofill}if}put @SD/stroke{@dodraw{0(newpath)prcmd prpath 0(stroke)prcmd newpa"
+"th}{:stroke}ifelse}put @SD/fill{@dodraw{0(newpath)prcmd prpath 0(fill)prcmd newp"
+"ath}{:fill}ifelse}put @SD/eofill{@dodraw{0(newpath)prcmd prpath 0(eofill)prcmd n"
+"ewpath}{:eofill}ifelse}put @SD/clip{:clip 0(newpath)prcmd prpath 0(clip)prcmd}pu"
+"t @SD/eoclip{:eoclip 0(newpath)prcmd prpath 0(eoclip)prcmd}put false setglobal @"
+"SD readonly pop/initclip 0 defpr/sysexec{@SD exch get exec}def/adddot{dup length"
+" 1 add string dup 0 46 put dup 3 -1 roll 1 exch putinterval}def/setlinewidth 1 d"
+"efpr/setlinecap 1 defpr/setlinejoin 1 defpr/setmiterlimit 1 defpr/setdash{mark 3"
+" 1 roll 2 copy/setdash sysexec exch aload length 1 add -1 roll counttomark(setda"
+"sh)prcmd pop}def/gsave 0 defpr/grestore{:grestore currentlinewidth 1(setlinewidt"
+"h)prcmd currentlinecap 1(setlinecap)prcmd currentlinejoin 1(setlinejoin)prcmd cu"
+"rrentmiterlimit 1(setmiterlimit)prcmd currentrgbcolor 3(setrgbcolor)prcmd 6 arra"
+"y currentmatrix aload pop 6(setmatrix)prcmd currentdash mark 3 1 roll exch aload"
+" length 1 add -1 roll counttomark(setdash)prcmd pop 0(grestore)prcmd}def/rotate{"
+"dup type/arraytype ne{dup 1(rotate)prcmd}if/rotate sysexec}def/scale{dup type/ar"
+"raytype ne{2 copy 2(scale)prcmd}if/scale sysexec}def/translate{dup type/arraytyp"
+"e ne{2 copy 2(translate)prcmd}if/translate sysexec}def/setmatrix{dup/setmatrix s"
+"ysexec aload pop 6(setmatrix)prcmd}def/initmatrix{matrix setmatrix}def/concat{ma"
+"trix currentmatrix matrix concatmatrix setmatrix}def/setgray 1 defpr/setcmykcolo"
+"r 4 defpr/sethsbcolor 3 defpr/setrgbcolor 3 defpr/.setopacityalpha{dup/.setopaci"
+"tyalpha sysexec 1(setopacityalpha)prcmd}def/.handleerror errordict/handleerror g"
+"et def errordict begin/handleerror{0(beginerror)prcmd .handleerror 0(enderror)pr"
+"cmd}.bind def end ";
+
+// vim: set syntax=cpp:
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/types.h b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/types.h
index 1fc3e24359f..5eada8b24b1 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/types.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/src/types.h
@@ -2,9 +2,9 @@
** types.h **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#ifndef TYPES_H
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/BoundingBoxTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/BoundingBoxTest.cpp
new file mode 100644
index 00000000000..59b9ddbc7a5
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/BoundingBoxTest.cpp
@@ -0,0 +1,53 @@
+/*************************************************************************
+** BoundingBoxTest.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <gtest/gtest.h>
+#include "BoundingBox.h"
+
+TEST(BoundingBoxTest, set) {
+ BoundingBox bbox;
+ bbox.set("1pt 2pt 3pt 4pt");
+ EXPECT_EQ(bbox.minX(), 1);
+ EXPECT_EQ(bbox.minY(), 2);
+ EXPECT_EQ(bbox.maxX(), 3);
+ EXPECT_EQ(bbox.maxY(), 4);
+
+ bbox.set("4pt 3pt 2pt 1pt");
+ EXPECT_EQ(bbox.minX(), 2);
+ EXPECT_EQ(bbox.minY(), 1);
+ EXPECT_EQ(bbox.maxX(), 4);
+ EXPECT_EQ(bbox.maxY(), 3);
+
+ bbox.set("1pt");
+ EXPECT_EQ(bbox.minX(), 1);
+ EXPECT_EQ(bbox.minY(), 0);
+ EXPECT_EQ(bbox.maxX(), 5);
+ EXPECT_EQ(bbox.maxY(), 4);
+
+ bbox.set("2pt 3pt");
+ EXPECT_EQ(bbox.minX(), -1);
+ EXPECT_EQ(bbox.minY(), -3);
+ EXPECT_EQ(bbox.maxX(), 7);
+ EXPECT_EQ(bbox.maxY(), 7);
+
+ EXPECT_THROW(bbox.set(""), BoundingBoxException);
+ EXPECT_THROW(bbox.set("1pt 2pt 3pt"), BoundingBoxException);
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/CalculatorTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CalculatorTest.cpp
index 8ebb505ee86..14dc34d9e89 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/CalculatorTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CalculatorTest.cpp
@@ -2,7 +2,7 @@
** CalculatorTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/ColorSpecialTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/ColorSpecialTest.cpp
index 504dda3d0b8..b3a9d52d699 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/ColorSpecialTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/ColorSpecialTest.cpp
@@ -2,9 +2,9 @@
** ColorSpecialTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <gtest/gtest.h>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/CommandLineTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CommandLineTest.cpp
index da2dc5efd32..1fe5be9a47f 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/CommandLineTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/CommandLineTest.cpp
@@ -2,9 +2,9 @@
** CommandLineTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <gtest/gtest.h>
@@ -34,7 +34,7 @@ TEST(CommandLineTest, noarg_short) {
EXPECT_FALSE(cmd.list_specials_given());
EXPECT_FALSE(cmd.error());
EXPECT_EQ(cmd.numFiles(), 0);
-}
+}
TEST(CommandLineTest, noarg_long) {
@@ -54,12 +54,12 @@ TEST(CommandLineTest, noarg_long) {
TEST(CommandLineTest, arg_short) {
CommandLine cmd;
- const char *args[] = {"progname", "-p5", "-r45", "-omyfile.xyz"};
+ const char *args[] = {"progname", "-p5", "-r45", "-omyfile.xyz", "-ayes"};
char **argv = const_cast<char**>(args);
- cmd.parse(4, argv, false);
+ cmd.parse(5, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 5);
+ EXPECT_EQ(cmd.page_arg(), "5");
EXPECT_TRUE(cmd.rotate_given());
EXPECT_EQ(cmd.rotate_arg(), 45);
EXPECT_TRUE(cmd.output_given());
@@ -68,6 +68,8 @@ TEST(CommandLineTest, arg_short) {
EXPECT_EQ(cmd.bbox_arg(), "min");
EXPECT_FALSE(cmd.error());
EXPECT_EQ(cmd.numFiles(), 0);
+ EXPECT_TRUE(cmd.trace_all_given());
+ EXPECT_TRUE(cmd.trace_all_arg());
}
@@ -78,7 +80,7 @@ TEST(CommandLineTest, arg_combined) {
cmd.parse(4, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 5);
+ EXPECT_EQ(cmd.page_arg(), "5");
EXPECT_TRUE(cmd.list_specials_given());
EXPECT_TRUE(cmd.stdout_given());
EXPECT_TRUE(cmd.no_fonts_given());
@@ -88,27 +90,29 @@ TEST(CommandLineTest, arg_combined) {
TEST(CommandLineTest, arg_separated) {
CommandLine cmd;
- const char *args[] = {"progname", "-p", "5", "-r", "45", "myfile.xyz"};
+ const char *args[] = {"progname", "-p", "5", "-r", "45", "myfile.xyz", "-afalse"};
char **argv = const_cast<char**>(args);
- cmd.parse(6, argv, false);
+ cmd.parse(7, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 5);
+ EXPECT_EQ(cmd.page_arg(), "5");
EXPECT_TRUE(cmd.rotate_given());
EXPECT_EQ(cmd.rotate_arg(), 45);
EXPECT_FALSE(cmd.error());
EXPECT_EQ(cmd.numFiles(), 1);
+ EXPECT_TRUE(cmd.trace_all_given());
+ EXPECT_FALSE(cmd.trace_all_arg());
}
TEST(CommandLineTest, arg_long) {
CommandLine cmd;
- const char *args[] = {"progname", "--page=9", "--rotate=-45.5", "--output=myfile.zyx"};
+ const char *args[] = {"progname", "--page=9", "--rotate=-45.5", "--trace-all", "--output=myfile.zyx"};
char **argv = const_cast<char**>(args);
- cmd.parse(4, argv, false);
+ cmd.parse(5, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 9);
+ EXPECT_EQ(cmd.page_arg(), "9");
EXPECT_TRUE(cmd.rotate_given());
EXPECT_EQ(cmd.rotate_arg(), -45.5);
EXPECT_TRUE(cmd.output_given());
@@ -117,6 +121,8 @@ TEST(CommandLineTest, arg_long) {
EXPECT_EQ(cmd.bbox_arg(), "min");
EXPECT_FALSE(cmd.error());
EXPECT_EQ(cmd.numFiles(), 0);
+ EXPECT_TRUE(cmd.trace_all_given());
+ EXPECT_FALSE(cmd.trace_all_arg());
}
@@ -127,7 +133,7 @@ TEST(CommandLineTest, abbrev_long) {
cmd.parse(4, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 9);
+ EXPECT_EQ(cmd.page_arg(), "9");
EXPECT_TRUE(cmd.rotate_given());
EXPECT_EQ(cmd.rotate_arg(), -45.5);
EXPECT_TRUE(cmd.output_given());
@@ -142,11 +148,11 @@ TEST(CommandLineTest, abbrev_long) {
TEST(CommandLineTest, error) {
CommandLine cmd;
// error on wrong argument type
- const char *args1[] = {"progname", "--page=x"};
+ const char *args1[] = {"progname", "--rotate=x"};
char **argv = const_cast<char**>(args1);
cmd.parse(2, argv, false);
- EXPECT_FALSE(cmd.page_given());
+ EXPECT_FALSE(cmd.rotate_given());
EXPECT_TRUE(cmd.error());
// error on missing arguments
@@ -165,6 +171,13 @@ TEST(CommandLineTest, error) {
argv = const_cast<char**>(args3);
cmd.parse(2, argv, false);
EXPECT_TRUE(cmd.error());
+
+ // incorrect boolean value
+ const char *args4[] = {"progname", "--trace-all=nope"};
+ argv = const_cast<char**>(args4);
+ cmd.parse(2, argv, false);
+ EXPECT_FALSE(cmd.trace_all_given());
+ EXPECT_TRUE(cmd.error());
}
@@ -175,7 +188,7 @@ TEST(CommandLineTest, file) {
cmd.parse(6, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 3);
+ EXPECT_EQ(cmd.page_arg(), "3");
EXPECT_TRUE(cmd.zip_given());
EXPECT_EQ(cmd.zip_arg(), 5);
EXPECT_TRUE(cmd.list_specials_given());
@@ -193,7 +206,7 @@ TEST(CommandLineTest, files_only) {
cmd.parse(6, argv, false);
EXPECT_TRUE(cmd.page_given());
- EXPECT_EQ(cmd.page_arg(), 3);
+ EXPECT_EQ(cmd.page_arg(), "3");
EXPECT_TRUE(cmd.zip_given());
EXPECT_EQ(cmd.zip_arg(), 5);
EXPECT_EQ(cmd.numFiles(), 2);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/DirectoryTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/DirectoryTest.cpp
index 2492ccad1e1..8637efe9dcf 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/DirectoryTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/DirectoryTest.cpp
@@ -2,7 +2,7 @@
** DirectoryTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FileFinderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FileFinderTest.cpp
index 479f7e4540a..caf7781a8d9 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FileFinderTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FileFinderTest.cpp
@@ -2,7 +2,7 @@
** FileFinderTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -25,7 +25,16 @@
using std::ifstream;
-TEST(FileFinderTest, find_base_file) {
+class FileFinderTest : public ::testing::Test
+{
+ protected:
+ void SetUp () {
+ FileFinder::init("FileFinderTest", false);
+ }
+};
+
+
+TEST_F(FileFinderTest, find_base_file) {
const char *path = FileFinder::lookup("cmr10.tfm");
EXPECT_TRUE(path);
ifstream ifs(path);
@@ -33,7 +42,7 @@ TEST(FileFinderTest, find_base_file) {
}
-TEST(FileFinderTest, find_mapped_file) {
+TEST_F(FileFinderTest, find_mapped_file) {
// mapped base tfm file => should be resolved by kpathsea
// circle10.tfm is usually mapped to lcircle.tfm
if (const char *path = FileFinder::lookup("circle10.tfm")) {
@@ -54,7 +63,7 @@ TEST(FileFinderTest, find_mapped_file) {
}
-TEST(FileFinderTest, mktexmf) {
+TEST_F(FileFinderTest, mktexmf) {
// ensure availability of ec font => call mktexmf if necessary
if (const char *path = FileFinder::lookup("ecrm2000.mf")) {
ifstream ifs(path);
@@ -63,7 +72,7 @@ TEST(FileFinderTest, mktexmf) {
}
-TEST(FileFinderTest, find_unavailable_file) {
+TEST_F(FileFinderTest, find_unavailable_file) {
const char *path = FileFinder::lookup("not-available.xyz");
EXPECT_FALSE(path);
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FilePathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FilePathTest.cpp
new file mode 100644
index 00000000000..fc7ffe2eda7
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FilePathTest.cpp
@@ -0,0 +1,89 @@
+/*************************************************************************
+** FilePathTest.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <gtest/gtest.h>
+#include <string>
+#include "FilePath.h"
+#include "FileSystem.h"
+
+using namespace std;
+
+
+TEST(FilePathTest, dir1) {
+ FilePath fp("a/b/c/d", false, "/");
+ ASSERT_EQ(fp.absolute(), "/a/b/c/d");
+ ASSERT_EQ(fp.relative("/"), "a/b/c/d");
+ ASSERT_EQ(fp.relative("/a/b"), "c/d");
+ ASSERT_EQ(fp.relative("/a/b/c"), "d");
+ ASSERT_EQ(fp.relative("/a/b/c/d"), ".");
+ ASSERT_EQ(fp.relative("/a/b/x"), "../c/d");
+ ASSERT_EQ(fp.relative("/a/b/x/y"), "../../c/d");
+}
+
+
+TEST(FilePathTest, dir2) {
+ FilePath fp("a/b/c/d", false, "/x/y");
+ ASSERT_EQ(fp.absolute(), "/x/y/a/b/c/d");
+ ASSERT_EQ(fp.relative("/"), "x/y/a/b/c/d");
+ ASSERT_EQ(fp.relative("/x/y/a/b"), "c/d");
+ ASSERT_EQ(fp.relative("/x/y/a/b/c"), "d");
+ ASSERT_EQ(fp.relative("/x/y/a/b/c/d"), ".");
+ ASSERT_EQ(fp.relative("/x/y/a/b/x"), "../c/d");
+ ASSERT_EQ(fp.relative("/x/y/a/b/x/y"), "../../c/d");
+}
+
+
+TEST(FilePathTest, file1) {
+ FilePath fp("a/b/c/d/f.ext", true, "/");
+ ASSERT_EQ(fp.absolute(), "/a/b/c/d/f.ext");
+ ASSERT_EQ(fp.relative("/"), "a/b/c/d/f.ext");
+ ASSERT_EQ(fp.relative("/a/b"), "c/d/f.ext");
+ ASSERT_EQ(fp.relative("/a/b/c"), "d/f.ext");
+ ASSERT_EQ(fp.relative("/a/b/c/d"), "f.ext");
+ ASSERT_EQ(fp.relative("/a/b/x"), "../c/d/f.ext");
+ ASSERT_EQ(fp.relative("/a/b/x/y"), "../../c/d/f.ext");
+ ASSERT_EQ(fp.basename(), "f");
+ ASSERT_EQ(fp.suffix(), "ext");
+ fp.suffix("new");
+ ASSERT_EQ(fp.suffix(), "new");
+ ASSERT_EQ(fp.relative("/a/b/x/y"), "../../c/d/f.new");
+}
+
+
+TEST(FilePathTest, file2) {
+ FilePath fp("/f.ext", true, "/");
+ ASSERT_EQ(fp.absolute(), "/f.ext");
+ ASSERT_EQ(fp.relative("/a/b"), "../../f.ext");
+}
+
+
+TEST(FilePathTest, autodetect) {
+ FilePath fp1("FilePathTest.cpp");
+ ASSERT_TRUE(fp1.isFile());
+ ASSERT_FALSE(fp1.empty());
+ string cwd = FileSystem::getcwd();
+ ASSERT_EQ(fp1.absolute(), cwd + "/FilePathTest.cpp");
+
+ FilePath fp2("");
+ ASSERT_FALSE(fp2.isFile());
+ ASSERT_FALSE(fp2.empty());
+ ASSERT_EQ(fp2.absolute(), FileSystem::getcwd());
+}
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FontManagerTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontManagerTest.cpp
index ddf552f4efc..e0774119d00 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FontManagerTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontManagerTest.cpp
@@ -2,7 +2,7 @@
** FontManagerTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -27,9 +27,9 @@
class FontManagerTest : public ::testing::Test
{
protected:
- FontManager fm;
-
void SetUp () {
+ FileFinder::init("FontManagerTest", false);
+ FontManager &fm = FontManager::instance();
fm.registerFont(10, "cmr10", 1274110073, 10, 10);
fm.registerFont(11, "cmr10", 1274110073, 10, 12);
fm.registerFont( 9, "cmr10", 1274110073, 10, 14);
@@ -38,6 +38,7 @@ class FontManagerTest : public ::testing::Test
TEST_F(FontManagerTest, fontID1) {
+ FontManager &fm = FontManager::instance();
EXPECT_EQ(fm.fontID(10), 0);
EXPECT_EQ(fm.fontID(11), 1);
EXPECT_EQ(fm.fontID(9), 2);
@@ -46,11 +47,13 @@ TEST_F(FontManagerTest, fontID1) {
TEST_F(FontManagerTest, font_ID2) {
+ FontManager &fm = FontManager::instance();
EXPECT_EQ(fm.fontID("cmr10"), 0);
}
TEST_F(FontManagerTest, getFont) {
+ FontManager &fm = FontManager::instance();
const Font *f1 = fm.getFont(10);
EXPECT_TRUE(f1);
EXPECT_EQ(f1->name(), "cmr10");
@@ -66,6 +69,7 @@ TEST_F(FontManagerTest, getFont) {
TEST_F(FontManagerTest, getFontById) {
+ FontManager &fm = FontManager::instance();
EXPECT_EQ(fm.getFont(10), fm.getFontById(0));
EXPECT_EQ(fm.getFont("cmr10"), fm.getFontById(0));
}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FontMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontMapTest.cpp
index 9a769bf4d1a..af6b7dadd1d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/FontMapTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/FontMapTest.cpp
@@ -2,7 +2,7 @@
** FontMapTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/GraphicPathTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/GraphicPathTest.cpp
index 367c8461126..1cf92d53156 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/GraphicPathTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/GraphicPathTest.cpp
@@ -2,7 +2,7 @@
** GraphicPathTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
@@ -63,3 +63,20 @@ TEST(GraphicPathTest, transform) {
path.writeSVG(oss);
EXPECT_EQ(oss.str(), "M-100 10V12H-102V10Z");
}
+
+
+TEST(GraphicPathTest, closeOpenSubPaths) {
+ GraphicPath<double> path;
+ path.moveto(0,0);
+ path.lineto(1,0);
+ path.lineto(1,1);
+ path.lineto(0,1);
+ path.moveto(10,10);
+ path.lineto(11,10);
+ path.lineto(11,11);
+ path.lineto(10,11);
+ path.closeOpenSubPaths();
+ ostringstream oss;
+ path.writeSVG(oss);
+ EXPECT_EQ(oss.str(), "M0 0H1V1H0ZM10 10H11V11H10Z");
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/LengthTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/LengthTest.cpp
index 27c2e0bbb2a..7add99c2d55 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/LengthTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/LengthTest.cpp
@@ -2,7 +2,7 @@
** LengthTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.am
new file mode 100644
index 00000000000..abdc55d39f7
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.am
@@ -0,0 +1,100 @@
+## This file is part of dvisvgm
+## Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de>
+##
+## Process this file with automake.
+
+AM_CXXFLAGS = -I../src -I../../src -Wall
+
+TESTS =
+check_PROGRAMS =
+
+TESTS += BoundingBoxTest
+check_PROGRAMS += BoundingBoxTest
+BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += CalculatorTest
+check_PROGRAMS += CalculatorTest
+CalculatorTest_SOURCES = CalculatorTest.cpp
+CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += ColorSpecialTest
+check_PROGRAMS += ColorSpecialTest
+ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += CommandLineTest
+check_PROGRAMS += CommandLineTest
+CommandLineTest_SOURCES = CommandLineTest.cpp
+CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += DirectoryTest
+check_PROGRAMS += DirectoryTest
+DirectoryTest_SOURCES = DirectoryTest.cpp
+DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += FileFinderTest
+check_PROGRAMS += FileFinderTest
+FileFinderTest_SOURCES = FileFinderTest.cpp
+FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += FilePathTest
+check_PROGRAMS += FilePathTest
+FilePathTest_SOURCES = FilePathTest.cpp
+FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += FontManagerTest
+check_PROGRAMS += FontManagerTest
+FontManagerTest_SOURCES = FontManagerTest.cpp
+FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += FontMapTest
+check_PROGRAMS += FontMapTest
+FontMapTest_SOURCES = FontMapTest.cpp
+FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += GraphicPathTest
+check_PROGRAMS += GraphicPathTest
+GraphicPathTest_SOURCES = GraphicPathTest.cpp
+GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += LengthTest
+check_PROGRAMS += LengthTest
+LengthTest_SOURCES = LengthTest.cpp
+LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += MatrixTest
+check_PROGRAMS += MatrixTest
+MatrixTest_SOURCES = MatrixTest.cpp
+MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += PageRagesTest
+check_PROGRAMS += PageRagesTest
+PageRagesTest_SOURCES = PageRagesTest.cpp
+PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += PageSizeTest
+check_PROGRAMS += PageSizeTest
+PageSizeTest_SOURCES = PageSizeTest.cpp
+PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += SplittedCharInputBufferTest
+check_PROGRAMS += SplittedCharInputBufferTest
+SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += StreamInputBufferTest
+check_PROGRAMS += StreamInputBufferTest
+StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTS += VectorStreamTest
+check_PROGRAMS += VectorStreamTest
+VectorStreamTest_SOURCES = VectorStreamTest.cpp
+VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+
+TESTDATA =
+TESTDATA += frktest.dvi frktest-wf-cmp.svg frktest-nf-cmp.svg
+TESTDATA += sample.dvi sample-wf-cmp.svg sample-nf-cmp.svg
+EXTRA_DIST = check-conv normalize.xsl $(TESTDATA)
+TESTS += check-conv
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.in
index 1bc7dd547f4..feb5ed5a14c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,22 +34,23 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-TESTS = CalculatorTest$(EXEEXT) ColorSpecialTest$(EXEEXT) \
- CommandLineTest$(EXEEXT) DirectoryTest$(EXEEXT) \
- FileFinderTest$(EXEEXT) FontManagerTest$(EXEEXT) \
+TESTS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
+ ColorSpecialTest$(EXEEXT) CommandLineTest$(EXEEXT) \
+ DirectoryTest$(EXEEXT) FileFinderTest$(EXEEXT) \
+ FilePathTest$(EXEEXT) FontManagerTest$(EXEEXT) \
FontMapTest$(EXEEXT) GraphicPathTest$(EXEEXT) \
- LengthTest$(EXEEXT) MatrixTest$(EXEEXT) PageSizeTest$(EXEEXT) \
- SplittedCharInputBufferTest$(EXEEXT) \
- StreamCounterTest$(EXEEXT) StreamInputBufferTest$(EXEEXT) \
- VectorStreamTest$(EXEEXT)
-check_PROGRAMS = CalculatorTest$(EXEEXT) ColorSpecialTest$(EXEEXT) \
- CommandLineTest$(EXEEXT) DirectoryTest$(EXEEXT) \
- FileFinderTest$(EXEEXT) FontManagerTest$(EXEEXT) \
+ LengthTest$(EXEEXT) MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
+ PageSizeTest$(EXEEXT) SplittedCharInputBufferTest$(EXEEXT) \
+ StreamInputBufferTest$(EXEEXT) VectorStreamTest$(EXEEXT) \
+ check-conv
+check_PROGRAMS = BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
+ ColorSpecialTest$(EXEEXT) CommandLineTest$(EXEEXT) \
+ DirectoryTest$(EXEEXT) FileFinderTest$(EXEEXT) \
+ FilePathTest$(EXEEXT) FontManagerTest$(EXEEXT) \
FontMapTest$(EXEEXT) GraphicPathTest$(EXEEXT) \
- LengthTest$(EXEEXT) MatrixTest$(EXEEXT) PageSizeTest$(EXEEXT) \
- SplittedCharInputBufferTest$(EXEEXT) \
- StreamCounterTest$(EXEEXT) StreamInputBufferTest$(EXEEXT) \
- VectorStreamTest$(EXEEXT)
+ LengthTest$(EXEEXT) MatrixTest$(EXEEXT) PageRagesTest$(EXEEXT) \
+ PageSizeTest$(EXEEXT) SplittedCharInputBufferTest$(EXEEXT) \
+ StreamInputBufferTest$(EXEEXT) VectorStreamTest$(EXEEXT)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -60,53 +61,76 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+am_BoundingBoxTest_OBJECTS = BoundingBoxTest.$(OBJEXT)
+BoundingBoxTest_OBJECTS = $(am_BoundingBoxTest_OBJECTS)
+BoundingBoxTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_CalculatorTest_OBJECTS = CalculatorTest.$(OBJEXT)
CalculatorTest_OBJECTS = $(am_CalculatorTest_OBJECTS)
-CalculatorTest_DEPENDENCIES = ../src/libdvisvgm.a
+CalculatorTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_ColorSpecialTest_OBJECTS = ColorSpecialTest.$(OBJEXT)
ColorSpecialTest_OBJECTS = $(am_ColorSpecialTest_OBJECTS)
-ColorSpecialTest_DEPENDENCIES = ../src/libdvisvgm.a
+ColorSpecialTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_CommandLineTest_OBJECTS = CommandLineTest.$(OBJEXT)
CommandLineTest_OBJECTS = $(am_CommandLineTest_OBJECTS)
-CommandLineTest_DEPENDENCIES = ../src/libdvisvgm.a
+CommandLineTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_DirectoryTest_OBJECTS = DirectoryTest.$(OBJEXT)
DirectoryTest_OBJECTS = $(am_DirectoryTest_OBJECTS)
-DirectoryTest_DEPENDENCIES = ../src/libdvisvgm.a
+DirectoryTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_FileFinderTest_OBJECTS = FileFinderTest.$(OBJEXT)
FileFinderTest_OBJECTS = $(am_FileFinderTest_OBJECTS)
-FileFinderTest_DEPENDENCIES = ../src/libdvisvgm.a
+FileFinderTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
+am_FilePathTest_OBJECTS = FilePathTest.$(OBJEXT)
+FilePathTest_OBJECTS = $(am_FilePathTest_OBJECTS)
+FilePathTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_FontManagerTest_OBJECTS = FontManagerTest.$(OBJEXT)
FontManagerTest_OBJECTS = $(am_FontManagerTest_OBJECTS)
-FontManagerTest_DEPENDENCIES = ../src/libdvisvgm.a
+FontManagerTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_FontMapTest_OBJECTS = FontMapTest.$(OBJEXT)
FontMapTest_OBJECTS = $(am_FontMapTest_OBJECTS)
-FontMapTest_DEPENDENCIES = ../src/libdvisvgm.a
+FontMapTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_GraphicPathTest_OBJECTS = GraphicPathTest.$(OBJEXT)
GraphicPathTest_OBJECTS = $(am_GraphicPathTest_OBJECTS)
-GraphicPathTest_DEPENDENCIES = ../src/libdvisvgm.a
+GraphicPathTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_LengthTest_OBJECTS = LengthTest.$(OBJEXT)
LengthTest_OBJECTS = $(am_LengthTest_OBJECTS)
-LengthTest_DEPENDENCIES = ../src/libdvisvgm.a
+LengthTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_MatrixTest_OBJECTS = MatrixTest.$(OBJEXT)
MatrixTest_OBJECTS = $(am_MatrixTest_OBJECTS)
-MatrixTest_DEPENDENCIES = ../src/libdvisvgm.a
+MatrixTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
+am_PageRagesTest_OBJECTS = PageRagesTest.$(OBJEXT)
+PageRagesTest_OBJECTS = $(am_PageRagesTest_OBJECTS)
+PageRagesTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_PageSizeTest_OBJECTS = PageSizeTest.$(OBJEXT)
PageSizeTest_OBJECTS = $(am_PageSizeTest_OBJECTS)
-PageSizeTest_DEPENDENCIES = ../src/libdvisvgm.a
+PageSizeTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_SplittedCharInputBufferTest_OBJECTS = \
SplittedCharInputBufferTest.$(OBJEXT)
SplittedCharInputBufferTest_OBJECTS = \
$(am_SplittedCharInputBufferTest_OBJECTS)
-SplittedCharInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a
-am_StreamCounterTest_OBJECTS = StreamCounterTest.$(OBJEXT)
-StreamCounterTest_OBJECTS = $(am_StreamCounterTest_OBJECTS)
-StreamCounterTest_DEPENDENCIES = ../src/libdvisvgm.a
+SplittedCharInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_StreamInputBufferTest_OBJECTS = StreamInputBufferTest.$(OBJEXT)
StreamInputBufferTest_OBJECTS = $(am_StreamInputBufferTest_OBJECTS)
-StreamInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a
+StreamInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
am_VectorStreamTest_OBJECTS = VectorStreamTest.$(OBJEXT)
VectorStreamTest_OBJECTS = $(am_VectorStreamTest_OBJECTS)
-VectorStreamTest_DEPENDENCIES = ../src/libdvisvgm.a
+VectorStreamTest_DEPENDENCIES = ../src/libdvisvgm.a \
+ ../potracelib/libpotrace.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -116,22 +140,24 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
-SOURCES = $(CalculatorTest_SOURCES) $(ColorSpecialTest_SOURCES) \
- $(CommandLineTest_SOURCES) $(DirectoryTest_SOURCES) \
- $(FileFinderTest_SOURCES) $(FontManagerTest_SOURCES) \
+SOURCES = $(BoundingBoxTest_SOURCES) $(CalculatorTest_SOURCES) \
+ $(ColorSpecialTest_SOURCES) $(CommandLineTest_SOURCES) \
+ $(DirectoryTest_SOURCES) $(FileFinderTest_SOURCES) \
+ $(FilePathTest_SOURCES) $(FontManagerTest_SOURCES) \
$(FontMapTest_SOURCES) $(GraphicPathTest_SOURCES) \
$(LengthTest_SOURCES) $(MatrixTest_SOURCES) \
- $(PageSizeTest_SOURCES) $(SplittedCharInputBufferTest_SOURCES) \
- $(StreamCounterTest_SOURCES) $(StreamInputBufferTest_SOURCES) \
- $(VectorStreamTest_SOURCES)
-DIST_SOURCES = $(CalculatorTest_SOURCES) $(ColorSpecialTest_SOURCES) \
- $(CommandLineTest_SOURCES) $(DirectoryTest_SOURCES) \
- $(FileFinderTest_SOURCES) $(FontManagerTest_SOURCES) \
+ $(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
+ $(SplittedCharInputBufferTest_SOURCES) \
+ $(StreamInputBufferTest_SOURCES) $(VectorStreamTest_SOURCES)
+DIST_SOURCES = $(BoundingBoxTest_SOURCES) $(CalculatorTest_SOURCES) \
+ $(ColorSpecialTest_SOURCES) $(CommandLineTest_SOURCES) \
+ $(DirectoryTest_SOURCES) $(FileFinderTest_SOURCES) \
+ $(FilePathTest_SOURCES) $(FontManagerTest_SOURCES) \
$(FontMapTest_SOURCES) $(GraphicPathTest_SOURCES) \
$(LengthTest_SOURCES) $(MatrixTest_SOURCES) \
- $(PageSizeTest_SOURCES) $(SplittedCharInputBufferTest_SOURCES) \
- $(StreamCounterTest_SOURCES) $(StreamInputBufferTest_SOURCES) \
- $(VectorStreamTest_SOURCES)
+ $(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
+ $(SplittedCharInputBufferTest_SOURCES) \
+ $(StreamInputBufferTest_SOURCES) $(VectorStreamTest_SOURCES)
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
@@ -163,7 +189,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXTRA_LIBS = @EXTRA_LIBS@
-FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -182,8 +209,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -245,36 +274,43 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CXXFLAGS = -I../src -I../../src -Wall
+BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+CalculatorTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+CommandLineTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+DirectoryTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+FileFinderTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+FilePathTest_SOURCES = FilePathTest.cpp
+FilePathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+FontManagerTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+FontMapTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
GraphicPathTest_SOURCES = GraphicPathTest.cpp
-GraphicPathTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+GraphicPathTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+LengthTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+MatrixTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+PageRagesTest_SOURCES = PageRagesTest.cpp
+PageRagesTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+PageSizeTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
-StreamCounterTest_SOURCES = StreamCounterTest.cpp
-StreamCounterTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a -lgtest -lgtest_main
+VectorStreamTest_LDADD = ../src/libdvisvgm.a ../potracelib/libpotrace.a -lgtest -lgtest_main
+TESTDATA = frktest.dvi frktest-wf-cmp.svg frktest-nf-cmp.svg \
+ sample.dvi sample-wf-cmp.svg sample-nf-cmp.svg
+EXTRA_DIST = check-conv normalize.xsl $(TESTDATA)
all: all-am
.SUFFIXES:
@@ -312,6 +348,9 @@ $(am__aclocal_m4_deps):
clean-checkPROGRAMS:
-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+BoundingBoxTest$(EXEEXT): $(BoundingBoxTest_OBJECTS) $(BoundingBoxTest_DEPENDENCIES)
+ @rm -f BoundingBoxTest$(EXEEXT)
+ $(CXXLINK) $(BoundingBoxTest_OBJECTS) $(BoundingBoxTest_LDADD) $(LIBS)
CalculatorTest$(EXEEXT): $(CalculatorTest_OBJECTS) $(CalculatorTest_DEPENDENCIES)
@rm -f CalculatorTest$(EXEEXT)
$(CXXLINK) $(CalculatorTest_OBJECTS) $(CalculatorTest_LDADD) $(LIBS)
@@ -327,6 +366,9 @@ DirectoryTest$(EXEEXT): $(DirectoryTest_OBJECTS) $(DirectoryTest_DEPENDENCIES)
FileFinderTest$(EXEEXT): $(FileFinderTest_OBJECTS) $(FileFinderTest_DEPENDENCIES)
@rm -f FileFinderTest$(EXEEXT)
$(CXXLINK) $(FileFinderTest_OBJECTS) $(FileFinderTest_LDADD) $(LIBS)
+FilePathTest$(EXEEXT): $(FilePathTest_OBJECTS) $(FilePathTest_DEPENDENCIES)
+ @rm -f FilePathTest$(EXEEXT)
+ $(CXXLINK) $(FilePathTest_OBJECTS) $(FilePathTest_LDADD) $(LIBS)
FontManagerTest$(EXEEXT): $(FontManagerTest_OBJECTS) $(FontManagerTest_DEPENDENCIES)
@rm -f FontManagerTest$(EXEEXT)
$(CXXLINK) $(FontManagerTest_OBJECTS) $(FontManagerTest_LDADD) $(LIBS)
@@ -342,15 +384,15 @@ LengthTest$(EXEEXT): $(LengthTest_OBJECTS) $(LengthTest_DEPENDENCIES)
MatrixTest$(EXEEXT): $(MatrixTest_OBJECTS) $(MatrixTest_DEPENDENCIES)
@rm -f MatrixTest$(EXEEXT)
$(CXXLINK) $(MatrixTest_OBJECTS) $(MatrixTest_LDADD) $(LIBS)
+PageRagesTest$(EXEEXT): $(PageRagesTest_OBJECTS) $(PageRagesTest_DEPENDENCIES)
+ @rm -f PageRagesTest$(EXEEXT)
+ $(CXXLINK) $(PageRagesTest_OBJECTS) $(PageRagesTest_LDADD) $(LIBS)
PageSizeTest$(EXEEXT): $(PageSizeTest_OBJECTS) $(PageSizeTest_DEPENDENCIES)
@rm -f PageSizeTest$(EXEEXT)
$(CXXLINK) $(PageSizeTest_OBJECTS) $(PageSizeTest_LDADD) $(LIBS)
SplittedCharInputBufferTest$(EXEEXT): $(SplittedCharInputBufferTest_OBJECTS) $(SplittedCharInputBufferTest_DEPENDENCIES)
@rm -f SplittedCharInputBufferTest$(EXEEXT)
$(CXXLINK) $(SplittedCharInputBufferTest_OBJECTS) $(SplittedCharInputBufferTest_LDADD) $(LIBS)
-StreamCounterTest$(EXEEXT): $(StreamCounterTest_OBJECTS) $(StreamCounterTest_DEPENDENCIES)
- @rm -f StreamCounterTest$(EXEEXT)
- $(CXXLINK) $(StreamCounterTest_OBJECTS) $(StreamCounterTest_LDADD) $(LIBS)
StreamInputBufferTest$(EXEEXT): $(StreamInputBufferTest_OBJECTS) $(StreamInputBufferTest_DEPENDENCIES)
@rm -f StreamInputBufferTest$(EXEEXT)
$(CXXLINK) $(StreamInputBufferTest_OBJECTS) $(StreamInputBufferTest_LDADD) $(LIBS)
@@ -364,19 +406,21 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BoundingBoxTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CalculatorTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ColorSpecialTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CommandLineTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DirectoryTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileFinderTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilePathTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontManagerTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontMapTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GraphicPathTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LengthTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MatrixTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageRagesTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PageSizeTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplittedCharInputBufferTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamCounterTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StreamInputBufferTest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VectorStreamTest.Po@am__quote@
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/MatrixTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/MatrixTest.cpp
index a3e578b836c..d5cfa92cb40 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/MatrixTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/MatrixTest.cpp
@@ -2,7 +2,7 @@
** MatrixTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageRagesTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageRagesTest.cpp
new file mode 100644
index 00000000000..a5f28ba807b
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageRagesTest.cpp
@@ -0,0 +1,167 @@
+/*************************************************************************
+** PageRangesTest.cpp **
+** **
+** This file is part of dvisvgm -- the DVI to SVG converter **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.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 <gtest/gtest.h>
+#include <ostream>
+#include "PageRanges.h"
+
+using namespace std;
+
+static ostream& operator << (ostream &os, const PageRanges::Range &r) {
+ return os << '(' << r.first << ',' << r.second << ')';
+}
+
+
+struct Range
+{
+ int l, r;
+};
+
+
+static bool is_equal (const PageRanges &pr, const Range *r) {
+ int i=0;
+ for (PageRanges::ConstIterator it=pr.begin(); it != pr.end(); ++it) {
+ if (it->first != r[i].l || it->second != r[i].r)
+ return false;
+ ++i;
+ }
+ return true;
+}
+
+
+TEST(PageRangesTest, single) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("123"));
+ ASSERT_FALSE(pr.ranges().empty());
+ ASSERT_EQ(pr.ranges().front(), PageRanges::Range(123,123));
+ ASSERT_EQ(pr.pages(), 1);
+}
+
+
+TEST(PageRangesTest, single_range) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("3-19"));
+ ASSERT_FALSE(pr.ranges().empty());
+ ASSERT_EQ(pr.ranges().front(), PageRanges::Range(3,19));
+ ASSERT_EQ(pr.pages(), 17);
+}
+
+
+TEST(PageRangesTest, single_range_inv) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("19-3"));
+ ASSERT_FALSE(pr.ranges().empty());
+ ASSERT_EQ(pr.ranges().front(), PageRanges::Range(3,19));
+ ASSERT_EQ(pr.pages(), 17);
+}
+
+
+TEST(PageRangesTest, single_range_lopen) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("-19"));
+ ASSERT_FALSE(pr.ranges().empty());
+ ASSERT_EQ(pr.ranges().front(), PageRanges::Range(1,19));
+ ASSERT_EQ(pr.pages(), 19);
+}
+
+
+TEST(PageRangesTest, single_range_ropen) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("4-", 100));
+ ASSERT_FALSE(pr.ranges().empty());
+ ASSERT_EQ(pr.ranges().front(), PageRanges::Range(4,100));
+ ASSERT_EQ(pr.pages(), 97);
+}
+
+
+TEST(PageRangesTest, multiple1) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("11,6,9,1,75,6,3"));
+ ASSERT_EQ(pr.size(), 6);
+ Range cmp[] = {{1,1},{3,3},{6,6},{9,9},{11,11},{75,75}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+ ASSERT_EQ(pr.pages(), 6);
+}
+
+
+TEST(PageRangesTest, multiple2) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("2,6,9,1,75,6,3"));
+ ASSERT_EQ(pr.size(), 4);
+ Range cmp[] = {{1,3},{6,6},{9,9},{75,75}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+}
+
+
+TEST(PageRangesTest, multiple3) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("2,6,9-11,1,25-,19-13,6,3", 100));
+ ASSERT_EQ(pr.size(), 5);
+ Range cmp[] = {{1,3},{6,6},{9,11},{13,19},{25,100}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+}
+
+
+TEST(PageRangesTest, overlap1) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("5-11, 8-15"));
+ ASSERT_EQ(pr.size(), 1);
+ Range cmp[] = {{5,15}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+}
+
+
+TEST(PageRangesTest, overlap2) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("23-30, 5-11, 17-23, 12-19"));
+ ASSERT_EQ(pr.size(), 1);
+ Range cmp[] = {{5,30}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+}
+
+
+TEST(PageRangesTest, overlap3) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("22-30, 5-11, 21-23, 12-19"));
+ ASSERT_EQ(pr.size(), 2);
+ Range cmp[] = {{5,19},{21,30}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+}
+
+
+TEST(PageRangesTest, overlap4) {
+ PageRanges pr;
+ ASSERT_TRUE(pr.parse("-15, 20-, 8, 12-16, 18-19", 100));
+ ASSERT_EQ(pr.size(), 2);
+ Range cmp[] = {{1,16},{18,100}};
+ ASSERT_TRUE(is_equal(pr, cmp));
+ ASSERT_TRUE(pr.parse("17"));
+ ASSERT_EQ(pr.size(), 1);
+ ASSERT_EQ(pr.ranges().front(), PageRanges::Range(1,100));
+}
+
+
+TEST(PageRangesTest, error) {
+ PageRanges pr;
+ ASSERT_FALSE(pr.parse("x"));
+ ASSERT_FALSE(pr.parse("5-x"));
+ ASSERT_FALSE(pr.parse("5 6"));
+ ASSERT_FALSE(pr.parse("5,"));
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/PageSizeTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageSizeTest.cpp
index 6b02ac1e48a..65a990db73d 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/PageSizeTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/PageSizeTest.cpp
@@ -2,7 +2,7 @@
** PageSizeTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/SplittedCharInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/SplittedCharInputBufferTest.cpp
index 89c01aedc3f..dcb91728210 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/SplittedCharInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/SplittedCharInputBufferTest.cpp
@@ -2,7 +2,7 @@
** SplittedCharInputBufferTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/StreamInputBufferTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/StreamInputBufferTest.cpp
index 43e55a1a38b..08084563fce 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/StreamInputBufferTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/StreamInputBufferTest.cpp
@@ -2,9 +2,9 @@
** StreamInputBufferTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
-** This program is free software; you can redistribute it and/or **
+** 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. **
@@ -15,7 +15,7 @@
** 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/>. **
+** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
#include <gtest/gtest.h>
@@ -30,7 +30,7 @@ using std::map;
using std::string;
TEST(StreamInputBufferTest, get) {
- istringstream iss("abcdefghijklmnopqrstuvwxyz");
+ istringstream iss("abcdefghijklmnopqrstuvwxyz");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
bool ok=true;
@@ -43,20 +43,20 @@ TEST(StreamInputBufferTest, get) {
TEST(StreamInputBufferTest, peek) {
- istringstream iss("abcdefghijklmnopqrstuvwxyz");
+ istringstream iss("abcdefghijklmnopqrstuvwxyz");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
EXPECT_EQ(in.peek(), 'a');
- for (int i=0; i < 20; i++)
+ for (int i=0; i < 20; i++)
EXPECT_EQ(in.peek(i), 'a'+i);
// we can't look forward more than BUFSIZE characters (10 in this case)
- for (int i=21; i < 26; i++)
+ for (int i=21; i < 26; i++)
EXPECT_EQ(in.peek(i), -1);
}
TEST(StreamInputBufferTest, check) {
- istringstream iss("abcdefghijklmnopqrstuvwxyz");
+ istringstream iss("abcdefghijklmnopqrstuvwxyz");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
EXPECT_TRUE(in.check("abc", false));
@@ -71,7 +71,7 @@ TEST(StreamInputBufferTest, check) {
TEST(StreamInputBufferTest, skip) {
- istringstream iss("abcdefghijklmnopqrstuvwxyz");
+ istringstream iss("abcdefghijklmnopqrstuvwxyz");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
in.skip(3);
@@ -86,7 +86,7 @@ TEST(StreamInputBufferTest, skip) {
TEST(StreamInputBufferTest, parseInt) {
- istringstream iss("1234,-5,+6,10.-");
+ istringstream iss("1234,-5,+6,10.-");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
int n;
@@ -112,7 +112,7 @@ TEST(StreamInputBufferTest, parseInt) {
TEST(StreamInputBufferTest, parseInt_base) {
- istringstream iss("1234,-5,10,1abc,1234a");
+ istringstream iss("1234,-5,10,1abc,1234a");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
int n;
@@ -141,7 +141,7 @@ TEST(StreamInputBufferTest, parseInt_base) {
TEST(StreamInputBufferTest, parseDouble) {
- istringstream iss("1234,-5,6.12,-3.1415,-.1,12e2,10.-");
+ istringstream iss("1234,-5,6.12,-3.1415,-.1,12e2,10.-");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
double d;
@@ -179,7 +179,7 @@ TEST(StreamInputBufferTest, parseDouble) {
TEST(StreamInputBufferTest, attribs) {
- istringstream iss("aaa=1 bbb=2 ccc=3 d e");
+ istringstream iss("aaa=1 bbb=2 ccc=3 d e");
StreamInputBuffer buffer(iss, 10);
BufferInputReader in(buffer);
map<string,string> attr;
@@ -189,3 +189,15 @@ TEST(StreamInputBufferTest, attribs) {
EXPECT_EQ(attr["bbb"], "2");
EXPECT_EQ(attr["ccc"], "3");
}
+
+
+TEST(StreamInputBufferTest, invalidate) {
+ istringstream iss("aaa=1 bbb=2 ccc=3 d e");
+ StreamInputBuffer buffer(iss, 10);
+ EXPECT_EQ(buffer.get(), 'a');
+ EXPECT_EQ(buffer.get(), 'a');
+ EXPECT_EQ(buffer.get(), 'a');
+ EXPECT_EQ(buffer.get(), '=');
+ buffer.invalidate();
+ EXPECT_TRUE(buffer.eof());
+}
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/VectorStreamTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/VectorStreamTest.cpp
index 241d39129ac..e47e2046de3 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/tests/VectorStreamTest.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/VectorStreamTest.cpp
@@ -2,7 +2,7 @@
** VectorStreamTest.cpp **
** **
** This file is part of dvisvgm -- the DVI to SVG converter **
-** Copyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> **
+** Copyright (C) 2005-2010 Martin Gieseking <martin.gieseking@uos.de> **
** **
** This program is free software; you can redistribute it and/or **
** modify it under the terms of the GNU General Public License as **
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/check-conv b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/check-conv
new file mode 100755
index 00000000000..e1e6315d776
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/check-conv
@@ -0,0 +1,50 @@
+#!/bin/bash
+# This file is part of the dvisvgm package and published under the
+# terms of the GNU General Public License version 3 or later.
+# See file COPYING for further details.
+# (C) 2009-2010 Martin Gieseking <martin.gieseking@uos.de>
+
+
+files=(sample frktest)
+state=0
+
+BLUE="\E[0;34m"
+GREEN="\E[0;32m"
+RED="\E[0;31m"
+COLOR_OFF="\E[0m"
+
+if [ \! -e enable-check-conv ]; then
+ echo -e "${BLUE}conversion checks skipped${COLOR_OFF}"
+ exit 0
+fi
+
+for f in ${files[@]}; do
+ for m in "wf" "nf"; do
+ echo "converting $f.dvi (mode $m)"
+ infile=${srcdir}/$f
+ outfile=$f-$m.svg
+ cmpfile=${srcdir}/$f-$m-cmp.svg
+ if [ $m = "wf" ]; then
+ ../src/dvisvgm -v0 -o$outfile $infile
+ else
+ ../src/dvisvgm -v0 -n -o$outfile $infile
+ fi
+ xsltproc --novalid ${srcdir}/normalize.xsl $outfile | xmllint --format - >tmp1.svg
+ xsltproc --novalid ${srcdir}/normalize.xsl $cmpfile | xmllint --format - >tmp2.svg
+ mv tmp1.svg $outfile
+
+ diff $outfile tmp2.svg >$f-$m.diff #>/dev/null
+ if [ $? -ne 0 ]; then
+ echo -en "${RED}FAILED $COLOR_OFF"
+ state=1
+ else
+ echo -en "${GREEN}PASSED $COLOR_OFF"
+ rm $outfile
+ fi
+ if [ \! -s $f-$m.diff ]; then
+ rm $f-$m.diff
+ fi
+ rm tmp2.svg
+ done
+done
+exit $state
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-nf-cmp.svg
new file mode 100644
index 00000000000..4efb2993236
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-nf-cmp.svg
@@ -0,0 +1,1223 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="441.86" version="1.1" viewBox="-13.4527 54 398.339 441.86" width="398.339">
+ <defs>
+ <path id="g1" d="M0 -9.144C0.3744 -8.8704 0.7776 -8.5104 0.7776 -7.8912V-7.56V-2.1312C0.5472 -1.8144 0.3456 -1.4544 0.1584 -1.08C0.9648 -0.6336 1.6992 -0.1296 2.5488 0.2736L2.7072 0.216C3.1824 -0.0576 3.672 -0.3312 4.1328 -0.6192H4.1472L4.5072 -0.36C4.8528 -0.1584 5.1264 0.1152 5.5152 0.2736L5.6592 0.216C6.408 -0.2016 7.1424 -0.6192 7.848 -1.0656C7.8192 -1.1952 7.7616 -1.2816 7.7184 -1.3824C7.7184 -2.8224 7.704 -4.2768 7.7328 -5.688L7.8768 -6.0048L5.7456 -7.056C5.6016 -6.696 5.4 -6.3504 5.1264 -6.0624C5.0832 -6.0192 4.896 -5.8032 4.824 -5.8032C4.7664 -5.8032 4.7232 -5.8608 4.68 -5.904C4.5936 -5.976 3.2976 -7.128 3.2688 -7.128L1.9872 -5.616V-7.5888V-8.064C1.9872 -8.3088 2.0016 -8.5392 2.0736 -8.7696C2.16 -9.072 2.4192 -9.4464 2.8224 -9.4464C3.024 -9.4464 3.1392 -9.3312 3.1968 -9.1296C3.2544 -9.1728 3.3408 -9.2304 3.3408 -9.3312C3.3408 -9.5328 3.1104 -9.6336 2.9232 -9.6336C2.592 -9.6336 2.3472 -9.4608 2.1312 -9.3312L1.5696 -8.9712C1.4976 -8.928 1.1952 -8.6976 1.1232 -8.6976H1.1088C1.0224 -8.6976 0.936 -8.8128 0.864 -8.856L0.4032 -9.2304C0.36 -9.2736 0.288 -9.3456 0.216 -9.3456S0 -9.2016 0 -9.144ZM6.3936 -0.5616C5.9328 -0.8928 5.4144 -1.1664 4.9824 -1.5408L4.9536 -1.8144V-5.1408C5.1408 -5.3712 5.3568 -5.5728 5.616 -5.7456C5.9472 -5.6304 6.2208 -5.472 6.4944 -5.2992C6.4944 -5.2992 6.5088 -4.9968 6.5088 -4.9968C6.5088 -3.5424 6.5232 -2.0736 6.4944 -0.6624L6.3936 -0.5616ZM3.4272 -1.08C3.5568 -0.9936 3.5568 -0.9072 3.5568 -0.7632C3.5568 -0.6912 3.528 -0.6048 3.4416 -0.6048S3.096 -0.792 3.096 -0.792L2.3472 -1.224C2.2032 -1.3104 1.9872 -1.3536 1.9872 -1.5984V-1.7568V-4.824V-4.9536C1.9872 -5.2128 2.1456 -5.3136 2.2752 -5.4576L2.592 -5.8176C2.6208 -5.8608 2.6784 -5.9616 2.7504 -5.9616C2.8368 -5.9616 2.9088 -5.8608 2.9664 -5.8176L3.3984 -5.4288C3.4704 -5.3712 3.5424 -5.3136 3.5568 -5.2128V-1.8432C3.5568 -1.7424 3.5712 -1.6272 3.5712 -1.512C3.5712 -1.4544 3.5712 -1.4112 3.5568 -1.3536C3.528 -1.2528 3.456 -1.1808 3.4272 -1.08Z"/>
+ <path id="g2" d="M0.012 -4.488H0.432C0.432 -2.208 0.516 -0.984 0.732 1.236C0.768 1.524 0.828 1.824 0.84 2.124H1.092L1.176 0.876H1.188C1.392 1.356 1.98 1.728 2.532 1.728C2.748 1.728 2.952 1.68 3.144 1.584C3.888 1.212 4.236 0.216 4.236 -0.792C4.236 -0.996 4.224 -1.188 4.188 -1.38C4.044 -2.076 3.624 -2.724 3.036 -3.12C2.856 -3.252 2.652 -3.36 2.436 -3.432C2.76 -3.756 3.108 -4.14 3.108 -4.752C3.108 -5.304 2.832 -5.736 2.496 -6.048H2.484L1.824 -5.208L1.464 -4.728C1.428 -4.824 1.404 -4.932 1.368 -5.028S1.032 -5.832 1.032 -5.892C1.044 -5.94 1.068 -5.988 1.092 -6.024C1.272 -6.336 1.62 -6.612 2.04 -6.612C2.268 -6.612 2.472 -6.516 2.64 -6.444C2.676 -6.528 3.012 -7.332 3.012 -7.392C3.012 -7.5 2.892 -7.512 2.808 -7.524L2.784 -7.44C2.556 -7.548 2.328 -7.692 2.052 -7.692C1.704 -7.692 1.452 -7.464 1.296 -7.164C1.056 -6.648 0.852 -5.808 0.624 -5.34C0.48 -5.016 0.204 -4.776 0.012 -4.488ZM1.488 -2.904C1.512 -3.216 1.548 -3.54 1.548 -3.852C1.548 -3.936 1.536 -4.032 1.536 -4.116C1.536 -4.212 1.524 -4.296 1.512 -4.392C1.512 -4.416 1.512 -4.428 1.512 -4.452C1.512 -4.584 1.656 -4.632 1.776 -4.632C2.124 -4.632 2.316 -4.272 2.316 -3.996C2.316 -3.6 2.004 -3.312 1.716 -3.084C1.644 -3.024 1.572 -2.964 1.488 -2.904ZM2.88 1.092C2.688 1.272 2.424 1.38 2.16 1.38C1.596 1.38 1.236 0.78 1.236 0.216C1.236 0.096 1.428 -2.316 1.44 -2.376C1.452 -2.424 1.488 -2.448 1.536 -2.448C1.608 -2.448 1.692 -2.412 1.728 -2.4C2.676 -2.196 3.384 -1.212 3.384 -0.228C3.384 0.324 3.216 0.792 2.88 1.092Z"/>
+ <path id="g3" d="M0.012 -4.488H0.432C0.432 -2.232 0.564 -0.156 0.828 1.98C0.828 2.064 0.852 2.136 0.972 2.136C1.008 2.136 1.056 2.124 1.092 2.124C1.092 1.968 1.32 -0.84 1.416 -2.088C1.464 -2.652 1.548 -3.228 1.548 -3.792C1.548 -4.248 1.5 -4.704 1.332 -5.136C1.296 -5.22 1.044 -5.796 1.044 -5.88C1.044 -6 1.164 -6.144 1.212 -6.192C1.416 -6.432 1.728 -6.612 2.052 -6.612C2.232 -6.6 2.376 -6.528 2.544 -6.492C2.4 -6.06 2.256 -5.64 2.076 -5.244L1.512 -4.488H1.944C1.944 -4.416 1.932 -4.332 1.932 -4.26C1.932 -4.08 1.944 -3.912 1.944 -3.732C1.956 -2.472 2.004 -1.212 2.124 0.048C2.184 0.744 2.232 1.44 2.352 2.124H2.592C2.628 1.644 3.048 -3.696 3.048 -3.828C3.048 -4.284 3 -4.74 2.82 -5.16L2.604 -5.688C2.58 -5.748 2.544 -5.82 2.544 -5.88C2.544 -5.988 2.664 -6.132 2.7 -6.18C2.892 -6.42 3.216 -6.612 3.552 -6.612C3.768 -6.612 3.972 -6.504 4.152 -6.444L4.548 -7.44L4.32 -7.536L4.296 -7.44C4.056 -7.548 3.816 -7.692 3.54 -7.692C3.396 -7.692 3.276 -7.644 3.168 -7.584C3.12 -7.56 3.06 -7.488 3 -7.476C2.94 -7.476 2.868 -7.512 2.82 -7.536L2.784 -7.44C2.58 -7.548 2.304 -7.692 2.04 -7.692C1.344 -7.692 1.14 -6.756 0.96 -6.228C0.864 -5.928 0.756 -5.616 0.624 -5.328C0.48 -5.016 0.216 -4.764 0.012 -4.488Z"/>
+ <path id="g4" d="M0.012 -4.488H0.432C0.432 -2.376 0.516 -0.672 0.744 1.332C0.78 1.596 0.828 1.86 0.84 2.124H1.092C1.092 1.956 1.2 0.66 1.2 0.66L1.416 -2.112C1.464 -2.112 1.548 -3.804 1.548 -3.804S1.536 -4.488 1.5 -4.488H2.604V-5.088H1.488C1.452 -5.088 1.404 -5.088 1.356 -5.112C1.32 -5.136 1.308 -5.184 1.296 -5.22C1.236 -5.328 1.032 -5.844 1.032 -5.892C1.044 -5.952 1.08 -6.012 1.104 -6.06C1.296 -6.348 1.62 -6.612 2.052 -6.612C2.292 -6.612 2.46 -6.516 2.64 -6.444C2.772 -6.768 2.904 -7.104 3.036 -7.44L2.808 -7.524L2.784 -7.44C2.556 -7.548 2.328 -7.692 2.052 -7.692C1.32 -7.692 1.14 -6.756 0.948 -6.192C0.864 -5.904 0.744 -5.616 0.624 -5.34C0.48 -5.016 0.204 -4.776 0.012 -4.488Z"/>
+ <path id="g5" d="M0.012 -4.488H0.432C0.432 -2.4 0.516 -0.636 0.744 1.332C0.78 1.596 0.828 1.86 0.84 2.124H1.092C1.092 1.956 1.344 -1.236 1.428 -2.256C1.476 -2.256 1.536 -3.816 1.536 -3.816S1.524 -4.488 1.5 -4.488H1.932C1.932 -2.4 2.016 -0.636 2.244 1.332C2.28 1.596 2.328 1.86 2.34 2.124H2.592C2.592 1.956 2.844 -1.236 2.928 -2.256C2.976 -2.256 3.036 -3.816 3.036 -3.816S3.024 -4.488 3 -4.488H4.104V-5.088H2.976C2.94 -5.088 2.892 -5.088 2.856 -5.112S2.796 -5.196 2.784 -5.232C2.748 -5.34 2.532 -5.868 2.532 -5.88C2.532 -5.952 2.58 -6.012 2.616 -6.072C2.796 -6.336 3.12 -6.612 3.54 -6.612C3.78 -6.612 3.96 -6.516 4.14 -6.444L4.536 -7.44L4.308 -7.524L4.284 -7.44C4.044 -7.548 3.792 -7.692 3.516 -7.692C3.384 -7.692 3.264 -7.656 3.168 -7.596C3.108 -7.56 3.06 -7.488 2.988 -7.488C2.952 -7.488 2.808 -7.5 2.808 -7.524L2.784 -7.44C2.568 -7.536 2.316 -7.692 2.064 -7.692C1.332 -7.692 1.116 -6.744 0.948 -6.168C0.9 -6.024 0.828 -5.88 0.78 -5.736C0.72 -5.604 0.684 -5.46 0.624 -5.328C0.48 -5.004 0.204 -4.776 0.012 -4.488ZM2.544 -6.492C2.46 -6.24 2.376 -5.988 2.28 -5.736L2.136 -5.376C2.076 -5.244 2.028 -5.088 1.836 -5.088C1.788 -5.088 1.74 -5.088 1.704 -5.088H1.476C1.332 -5.088 1.308 -5.16 1.26 -5.292L1.104 -5.676C1.08 -5.736 1.032 -5.808 1.032 -5.88C1.032 -5.976 1.116 -6.072 1.164 -6.144C1.356 -6.396 1.656 -6.612 2.028 -6.612C2.256 -6.612 2.34 -6.552 2.544 -6.492Z"/>
+ <path id="g6" d="M0.012 -4.488H0.444C0.432 -4.44 0.432 -4.392 0.432 -4.344C0.432 -4.284 0.432 -4.236 0.432 -4.188C0.432 -4.02 0.432 -3.852 0.444 -3.684C0.444 -3.684 0.444 -3.072 0.444 -3.072C0.444 -2.208 0.624 0.036 0.66 0.444C0.708 1.008 0.756 1.572 0.852 2.124H1.092C1.116 1.596 1.176 1.08 1.212 0.552C1.272 -0.276 1.332 -1.092 1.404 -1.92C1.44 -2.328 1.548 -3.432 1.548 -3.792C1.548 -4.272 1.488 -4.728 1.308 -5.172C1.284 -5.22 1.044 -5.844 1.044 -5.892C1.044 -6 1.176 -6.156 1.212 -6.192C1.416 -6.456 1.728 -6.6 2.052 -6.6C2.304 -6.6 2.448 -6.504 2.652 -6.444C2.784 -6.768 2.916 -7.104 3.048 -7.44L2.82 -7.524L2.796 -7.44C2.568 -7.548 2.34 -7.692 2.064 -7.692C1.332 -7.692 1.128 -6.744 0.948 -6.18C0.864 -5.892 0.744 -5.616 0.624 -5.34C0.492 -5.016 0.216 -4.776 0.012 -4.488Z"/>
+ <path id="g7" d="M0.1152 -5.7312H0.72V-1.8864V-1.6704C0.72 -1.584 0.72 -1.512 0.6912 -1.4544C0.648 -1.3968 0.432 -1.1664 0.432 -1.08C0.4608 -0.9792 0.6336 -0.8064 0.6768 -0.7632L1.3104 -0.0144C1.3536 0.0288 1.512 0.2736 1.584 0.2736C1.6416 0.2736 1.7136 0.216 1.7712 0.1872L2.1744 -0.0432C2.304 -0.1152 3.6864 -0.9216 3.7584 -0.9504C3.7296 -1.0224 3.672 -1.1952 3.5568 -1.1952C3.528 -1.1952 3.4992 -1.1808 3.4704 -1.1664L2.4048 -0.5472C2.2464 -0.7488 2.088 -0.936 1.944 -1.152C1.9008 -2.6352 1.944 -4.2192 1.9296 -5.7312H3.1392V-6.6528H1.9296C1.9296 -7.2576 2.0016 -7.848 2.088 -8.4528L1.7856 -8.4384L1.6272 -8.2368L0.1152 -5.7312Z"/>
+ <path id="g8" d="M0.1584 -1.1088V-1.0944C0.72 -0.6768 1.2384 -0.2304 1.8144 0.1584L1.9728 0.0864C2.4624 -0.3024 2.9664 -0.6768 3.4272 -1.0944L3.456 -1.4112C3.2976 -1.296 3.024 -1.0944 2.7648 -1.0944C2.1888 -1.0944 2.1168 -1.7424 2.1024 -2.1888C2.1024 -2.2752 2.088 -2.3472 2.088 -2.4336V-4.3344V-8.1504C2.088 -8.2512 2.1024 -8.3376 2.1024 -8.4384C2.16 -8.9712 2.4336 -9.7344 3.1392 -9.7344V-10.0512C2.88 -9.9792 2.6208 -9.8928 2.3616 -9.8208L0.9216 -9.3744C0.7344 -9.3168 0.5616 -9.2736 0.3744 -9.216C0.2448 -9.1584 0.1584 -9.1872 0.1584 -8.9856C0.1584 -8.928 0.1584 -8.856 0.1872 -8.8272C0.2304 -8.7984 0.3024 -8.784 0.3456 -8.7552C0.6048 -8.64 0.72 -8.352 0.72 -8.0064V-7.8912V-2.9088V-2.6352C0.72 -2.0304 0.4608 -1.4688 0.1584 -1.1088Z"/>
+ <path id="g9" d="M0.1584 -1.5552V-0.7344H0.3744C0.432 -0.7344 0.5184 -0.7344 0.576 -0.72C0.7056 -0.6912 1.4688 -0.288 1.728 -0.144C1.8 -0.1008 2.2608 0.1728 2.3472 0.1728C2.4768 0.1728 2.6064 0.0144 2.664 -0.0288L3.1824 -0.3888L4.1184 -1.0368C4.608 -1.3968 5.2128 -1.8432 5.2128 -2.6496C5.2128 -3.1824 4.9248 -3.744 4.5216 -4.0752C4.2912 -4.2768 4.0032 -4.392 3.7152 -4.4784L5.112 -6.1488C5.0544 -6.2064 4.968 -6.3216 4.8816 -6.3216C4.8384 -6.3216 4.7952 -6.2928 4.7664 -6.2784C4.6656 -6.2064 4.536 -6.1488 4.3488 -6.1488C3.8592 -6.1488 3.4704 -6.4512 3.1968 -6.6528C3.1248 -6.696 2.9088 -6.8688 2.808 -6.8688C2.7216 -6.8688 2.2032 -6.4512 2.0304 -6.3216C1.4112 -5.832 0.1584 -5.1408 0.1584 -4.1184C0.1584 -4.0752 0.1584 -4.032 0.1728 -3.9888C0.2448 -3.5856 0.6336 -3.2688 0.9072 -2.9808C1.08 -2.7936 1.2672 -2.5632 1.2672 -2.2896C1.2672 -2.2032 1.2528 -2.1168 1.2096 -2.0448C1.008 -1.6272 0.576 -1.5552 0.1584 -1.5552ZM3.6288 -4.8816L2.7792 -3.8736C2.736 -3.816 2.52 -3.528 2.448 -3.528H2.4336C2.3904 -3.528 2.3472 -3.5712 2.304 -3.6C1.9008 -3.9024 1.1664 -4.2336 1.1664 -4.8528C1.1664 -5.2416 1.4688 -5.6448 1.9152 -5.6448C2.1312 -5.6448 2.3472 -5.5728 2.5344 -5.4864C2.7072 -5.4 3.4992 -4.9248 3.6288 -4.8816ZM1.512 -1.8432C1.7568 -2.1744 2.0304 -2.4768 2.304 -2.7936L2.5056 -3.0384C2.5632 -3.096 2.6208 -3.1824 2.736 -3.1824S3.24 -3.096 3.2544 -3.096C3.7584 -2.952 4.2912 -2.5488 4.3056 -1.9728C4.3056 -1.8432 4.2912 -1.7136 4.2192 -1.5984C4.0464 -1.3392 3.7296 -1.1376 3.312 -1.1376C2.8368 -1.1376 2.376 -1.3824 2.0592 -1.5552C1.8864 -1.656 1.6992 -1.7712 1.512 -1.8432Z"/>
+ <path id="g10" d="M0.1584 -5.1264H0.9648C1.0944 -2.4912 1.2816 0.0576 1.5552 2.5488H1.6416C1.6848 2.5488 1.728 2.5488 1.7568 2.52C1.7856 2.5056 1.8432 2.1888 1.8576 2.088C2.1456 0.3744 2.3904 -1.5408 2.5344 -3.312C2.5632 -3.6144 2.664 -4.8816 2.664 -5.1264H3.8448V-6.0336H2.9664H2.8368C2.6784 -6.0336 2.52 -6.048 2.376 -6.12C2.0736 -6.2784 1.8576 -6.8256 1.8576 -7.2288C1.8576 -7.5744 1.9872 -7.92 2.2896 -8.136C2.4048 -8.2224 2.5344 -8.2944 2.736 -8.2944C2.9664 -8.2944 3.168 -8.1936 3.384 -8.064C3.5568 -7.9488 3.7728 -7.7904 3.9744 -7.7904C4.1472 -7.7904 4.2192 -7.992 4.2912 -8.1072L4.7376 -8.7408C4.824 -8.856 4.9104 -8.9856 4.9824 -9.1152C4.9248 -9.1584 4.824 -9.2448 4.7376 -9.2448H4.7088C4.5792 -9.1872 4.5792 -8.9856 4.4208 -8.9856H4.3776C4.0176 -9.0576 3.8016 -9.4464 3.4128 -9.4608C1.9728 -9.4608 1.6416 -8.0928 1.2096 -7.1136C0.9648 -6.5232 0.7632 -6.0336 0.3168 -5.5872C0.2304 -5.5008 0.1584 -5.472 0.1584 -5.2704V-5.1264Z"/>
+ <path id="g11" d="M0.1584 -5.1264H0.9648C1.0944 -2.4912 1.2816 0.0576 1.5552 2.5488H1.6416C1.7568 2.5488 1.8 2.5056 1.8 2.376C2.1168 0.9648 2.4912 -2.6784 2.5632 -3.6576C2.592 -3.888 2.6784 -5.1408 2.6784 -5.3136C2.6784 -5.3856 2.6928 -5.4432 2.6928 -5.5152C2.6784 -5.616 2.6208 -5.688 2.5632 -5.76C2.2608 -6.1488 1.8576 -6.6672 1.8576 -7.2144S2.232 -8.2944 2.7504 -8.2944C2.9952 -8.2944 3.2256 -8.1648 3.4416 -8.0208C3.6 -7.9344 3.8016 -7.7904 3.9888 -7.7904H4.0176C4.1184 -7.8192 4.2624 -8.064 4.2912 -8.1072L4.7376 -8.7408C4.824 -8.856 4.9104 -8.9856 4.9824 -9.1152C4.9248 -9.1584 4.824 -9.2448 4.7376 -9.2448H4.7088C4.5792 -9.1872 4.5792 -8.9856 4.4208 -8.9856H4.3776C4.0176 -9.0576 3.8016 -9.4464 3.4128 -9.4608C1.9728 -9.4608 1.6416 -8.0928 1.2096 -7.1136C0.9648 -6.5232 0.7632 -6.0336 0.3168 -5.5872C0.2304 -5.5008 0.1584 -5.472 0.1584 -5.2704V-5.1264Z"/>
+ <path id="g12" d="M0.204 -0.696H0.468C0.48 -0.768 0.504 -0.828 0.552 -0.876L0.684 -0.924C0.684 -0.924 0.732 -0.924 0.732 -0.924C0.852 -0.912 0.96 -0.888 1.068 -0.84C1.428 -0.672 1.692 -0.372 1.992 -0.12C2.064 -0.06 2.304 0.144 2.412 0.144C2.472 0.144 2.544 0.108 2.592 0.072C3.216 -0.24 3.72 -0.744 4.056 -1.32C4.152 -1.488 4.26 -1.668 4.308 -1.86C4.26 -1.884 4.176 -1.932 4.104 -1.932S4.032 -1.872 4.008 -1.812C3.84 -1.416 3.696 -0.936 3.144 -0.936C2.952 -0.948 2.772 -1.032 2.616 -1.128C2.304 -1.344 1.788 -1.92 1.368 -1.98C1.812 -2.34 2.544 -2.592 2.544 -3.372C2.484 -4.632 1.176 -5.304 1.176 -6.492C1.176 -6.684 1.2 -6.852 1.26 -6.996C1.452 -7.524 1.932 -7.992 2.604 -7.992C3.156 -7.992 3.516 -7.548 3.516 -7.068C3.516 -6.468 2.976 -6.012 2.712 -5.496C2.628 -5.304 2.556 -5.112 2.556 -4.908C2.556 -4.788 2.58 -4.668 2.64 -4.548C2.796 -4.224 3.252 -3.816 3.6 -3.816C3.984 -3.816 4.14 -4.176 4.176 -4.512H3.9C3.9 -4.344 3.828 -4.092 3.6 -4.092C3.252 -4.092 3 -4.332 3 -4.644C3 -4.8 3.072 -4.944 3.18 -5.076C3.396 -5.328 3.696 -5.484 3.9 -5.748C4.008 -5.904 4.032 -6.048 4.032 -6.24C4.032 -6.504 3.972 -6.78 3.888 -7.032C3.672 -7.644 3.252 -8.46 2.388 -8.46C2.28 -8.46 2.16 -8.448 2.04 -8.424C1.26 -8.28 0.648 -7.704 0.372 -6.972C0.264 -6.708 0.204 -6.408 0.204 -6.108C0.204 -5.952 0.216 -5.784 0.264 -5.628C0.492 -4.656 1.584 -3.864 1.584 -2.844C1.584 -2.772 1.584 -2.688 1.56 -2.616C1.44 -2.256 1.032 -2.076 0.756 -1.848C0.42 -1.56 0.204 -1.14 0.204 -0.696Z"/>
+ <path id="g13" d="M0.204 -4.536H0.564V-1.692C0.564 -1.596 0.564 -1.5 0.564 -1.404C0.564 -1.032 0.492 -0.744 0.204 -0.564L0.384 -0.408C0.636 -0.312 0.864 -0.192 1.08 -0.06C1.176 0.012 1.26 0.084 1.38 0.132L1.5 0.024L2.604 -1.2V-1.212C2.556 -1.248 2.484 -1.32 2.424 -1.332C2.364 -1.332 2.316 -1.26 2.28 -1.224L2.076 -0.996C2.028 -0.948 1.992 -0.876 1.92 -0.876C1.872 -0.876 1.836 -0.912 1.8 -0.936C1.68 -1.008 1.536 -1.068 1.416 -1.152C1.368 -1.2 1.368 -1.26 1.368 -1.32C1.368 -1.344 1.368 -1.368 1.368 -1.392V-4.536H2.34V-5.148H1.38C1.416 -5.7 1.512 -6.18 1.608 -6.672L1.38 -6.66L1.284 -6.516L0.204 -4.536Z"/>
+ <path id="g14" d="M0.204 -4.536H0.564V-1.704C0.564 -1.596 0.576 -1.476 0.576 -1.356C0.576 -1.008 0.48 -0.732 0.204 -0.564C0.396 -0.36 0.672 -0.3 0.912 -0.168C1.032 -0.072 1.152 -0.06 1.152 0.156C1.176 0.252 1.2 0.336 1.236 0.42C1.428 0.84 1.824 1.188 2.412 1.188C2.556 1.188 2.688 1.176 2.82 1.14C3.612 0.924 4.116 0.096 4.116 -0.828C4.116 -1.692 3.684 -2.556 2.988 -3.072C2.784 -3.216 2.556 -3.36 2.304 -3.432V-3.444C2.436 -3.516 2.532 -3.66 2.628 -3.78C2.82 -4.044 2.988 -4.356 2.988 -4.764C2.988 -5.28 2.7 -5.832 2.352 -6.048C2.1 -5.712 1.884 -5.196 1.392 -5.148C1.392 -5.508 1.452 -5.88 1.524 -6.228C1.548 -6.372 1.596 -6.528 1.608 -6.672L1.38 -6.66L1.284 -6.516L0.204 -4.536ZM1.368 -2.904V-4.392C1.368 -4.56 1.464 -4.632 1.632 -4.632C2.004 -4.632 2.184 -4.272 2.184 -3.984C2.184 -3.492 1.704 -3.18 1.368 -2.904ZM1.368 -2.448C2.352 -2.316 3.036 -1.56 3.204 -0.684C3.24 -0.54 3.264 -0.396 3.264 -0.252C3.264 -0.036 3.204 0.168 3.072 0.36C2.856 0.624 2.52 0.852 2.1 0.852C1.92 0.852 1.74 0.792 1.608 0.648C1.524 0.552 1.404 0.324 1.404 0.192C1.404 0.18 1.404 0.18 1.404 0.168C1.428 0.072 1.596 -0.072 1.632 -0.12C1.716 -0.216 2.28 -0.792 2.28 -0.888C2.28 -0.936 2.172 -1.008 2.124 -1.008C2.052 -1.008 1.992 -0.888 1.956 -0.84C1.764 -0.948 1.56 -1.056 1.392 -1.188C1.32 -1.548 1.392 -2.04 1.368 -2.448Z"/>
+ <path id="g15" d="M0.216 -1.14V-1.116C0.504 -0.948 1.884 -0.096 2.088 0.048C2.124 0.084 2.172 0.132 2.232 0.132C2.232 0.132 2.244 0.132 2.244 0.132C2.28 0.12 2.868 -0.564 3.132 -0.984C3.624 -1.764 3.828 -2.712 3.828 -3.636C3.828 -4.488 3.66 -5.184 3.264 -5.808L1.176 -4.968L0.66 -4.752C0.54 -4.704 0.468 -4.716 0.468 -4.536C0.468 -4.488 0.468 -4.452 0.468 -4.416V-1.728C0.468 -1.704 0.468 -1.68 0.468 -1.656C0.468 -1.488 0.456 -1.332 0.324 -1.212L0.216 -1.14ZM2.712 -0.828C2.688 -0.792 2.652 -0.72 2.604 -0.72C2.568 -0.72 2.544 -0.732 2.52 -0.744C2.148 -0.984 2.028 -1.056 1.572 -1.332L1.38 -1.452C1.308 -1.5 1.26 -1.524 1.26 -1.644C1.26 -1.704 1.272 -1.764 1.272 -1.812V-3.936C1.272 -3.996 1.272 -4.68 1.272 -4.68C1.296 -4.776 1.44 -4.812 1.524 -4.836C1.776 -4.944 2.04 -5.04 2.292 -5.148C2.352 -5.172 2.448 -5.232 2.52 -5.232C2.556 -5.232 2.58 -5.22 2.604 -5.196C2.652 -5.112 2.688 -5.004 2.724 -4.908C2.988 -4.212 3.096 -3.312 3.096 -2.4C3.096 -1.824 2.976 -1.164 2.712 -0.828Z"/>
+ <path id="g16" d="M0.264 -7.02C0.252 -6.996 0.156 -6.612 0.156 -6.588C0.156 -6.48 0.264 -6.408 0.312 -6.348C0.468 -6.12 0.552 -5.868 0.552 -5.496C0.552 -5.352 0.54 -5.208 0.54 -5.064V-2.16C0.54 -2.076 0.54 -1.992 0.54 -1.908C0.54 -1.68 0.504 -1.524 0.372 -1.38C0.276 -1.284 0.204 -1.308 0.204 -1.104V-0.876C0.708 -0.792 1.212 -0.552 1.62 -0.264C1.704 -0.204 1.8 -0.144 1.86 -0.072C1.884 -0.036 1.872 -0 1.896 0.036C1.92 0.096 2.016 0.132 2.076 0.156C2.364 -0.336 2.712 -0.792 3 -1.284C3.432 -2.004 3.78 -2.844 3.78 -3.696C3.78 -4.524 3.456 -5.148 3.048 -5.592C3.024 -5.616 2.832 -5.808 2.808 -5.808L1.356 -4.68C1.356 -4.896 1.344 -5.112 1.344 -5.328C1.344 -5.856 1.392 -6.384 1.728 -6.828C1.944 -7.116 2.304 -7.38 2.772 -7.38V-7.74C2.016 -7.74 1.404 -7.296 0.924 -6.864C0.876 -6.816 0.816 -6.72 0.744 -6.72C0.744 -6.72 0.732 -6.72 0.732 -6.72C0.672 -6.72 0.384 -6.96 0.264 -7.02ZM2.604 -1.104C2.196 -1.344 1.776 -1.572 1.38 -1.824L1.356 -2.016C1.368 -2.82 1.32 -3.636 1.38 -4.356C1.632 -4.596 1.92 -4.812 2.196 -5.028C2.724 -4.572 3.072 -3.936 3.072 -3.024C3.072 -2.568 3 -2.124 2.892 -1.752C2.82 -1.524 2.7 -1.32 2.604 -1.104Z"/>
+ <path id="g17" d="M0.3312 -5.6448L0.504 -5.3712C0.5472 -4.0896 0.5184 -2.7072 0.504 -1.44C0.4176 -1.1952 0.3024 -0.9792 0.2016 -0.7488L2.0736 0.144L1.5696 0.7344L0.1008 2.3904H0.3168C0.576 2.3904 0.6192 2.2752 0.7632 2.1312C0.9504 1.944 1.1808 1.7568 1.4976 1.7568C1.7136 1.7568 1.9584 1.8144 2.1744 1.8432C2.664 1.9008 4.3776 2.1456 4.4352 2.1456C4.464 2.1456 4.4784 2.1456 4.5072 2.1312C4.6224 2.088 4.7376 1.9296 4.824 1.8432L6.0192 0.648C6.0768 0.5904 6.2064 0.4896 6.2064 0.4032C6.2064 0.3312 5.9472 -0.072 5.8752 -0.216L5.2128 -1.368C5.0976 -1.5552 4.8816 -1.8 4.8816 -2.088V-2.2608V-5.184C4.968 -5.1552 5.3136 -5.112 5.3856 -5.112C5.7024 -5.112 5.7888 -5.3568 5.904 -5.5728C6.048 -5.8608 6.2064 -6.1488 6.336 -6.4368L6.0768 -6.2928L5.76 -6.3072L2.952 -6.7104L3.0384 -6.84C2.9808 -6.8688 2.5632 -7.0992 2.5056 -7.0992C2.4192 -7.0992 2.3472 -6.9696 2.304 -6.9264C1.8432 -6.4656 1.4544 -6.1488 0.792 -5.832C0.648 -5.76 0.4896 -5.7168 0.3312 -5.6448ZM1.728 -5.6448L3.672 -5.3568V-1.9728C3.672 -1.9152 3.6864 -1.8432 3.6864 -1.7712C3.6864 -1.584 3.5856 -1.5264 3.4848 -1.4112L3.1392 -1.0224C3.0816 -0.9648 2.9952 -0.8208 2.8944 -0.8208C2.808 -0.8208 2.6928 -0.8928 2.6352 -0.9216L2.0016 -1.224C1.872 -1.3104 1.728 -1.3104 1.728 -1.5408V-1.7136V-5.6448ZM2.1168 0.6192L3.8448 -1.3104C4.2768 -0.5184 4.7376 0.2448 5.184 1.0224C4.1616 0.8928 3.168 0.72 2.1168 0.6192Z"/>
+ <path id="g18" d="M0.3744 -1.1664V-1.152C0.4608 -1.0656 0.576 -1.0224 0.6912 -0.9648L1.08 -0.792L2.5488 -0.144L3.0528 0.0864C3.1104 0.1152 3.1968 0.1584 3.2544 0.1584H3.2832C3.3984 0.1584 3.5136 0.0144 3.6 -0.0576L4.3632 -0.648C5.4576 -1.4688 6.7824 -2.6496 6.7824 -4.176C6.7824 -5.112 6.3504 -6.0048 5.5728 -6.5232C5.4432 -6.6096 4.9824 -6.8832 4.8096 -6.8832C4.7952 -6.8832 4.7664 -6.8688 4.752 -6.8688C4.6656 -6.8544 4.0896 -6.4368 4.0896 -6.4368L2.592 -5.3856C2.5056 -5.832 2.1312 -6.3504 1.8864 -6.5952C1.8288 -6.6528 1.6416 -6.8688 1.5264 -6.8688C1.44 -6.8544 1.3536 -6.768 1.296 -6.7248L0.792 -6.336L0.36 -6.0192C0.3168 -5.976 0.216 -5.9328 0.2016 -5.8752C0.2016 -5.832 0.2304 -5.8032 0.2592 -5.7888C0.3312 -5.7168 0.4176 -5.6592 0.4896 -5.5872C1.0224 -5.112 1.4976 -4.32 1.4976 -3.384C1.4976 -2.9088 1.368 -2.4336 1.1232 -2.016C0.936 -1.6848 0.6624 -1.4112 0.3744 -1.1664ZM1.8144 -2.1312C1.9152 -2.304 2.0736 -2.4624 2.1744 -2.6352C2.5056 -3.1536 2.7216 -3.8016 2.7216 -4.5648V-4.6944C2.7216 -4.7808 2.7072 -4.8672 2.6928 -4.9536V-5.0544C2.6928 -5.1552 2.7648 -5.1984 2.8224 -5.256C3.0384 -5.4288 3.2688 -5.6016 3.6288 -5.6016C3.7008 -5.6016 3.7872 -5.6016 3.8592 -5.5872C4.7952 -5.4432 5.4432 -4.4352 5.4432 -3.384C5.4432 -2.5344 5.0256 -1.7712 4.5648 -1.2528C4.5216 -1.1808 4.4352 -1.0368 4.32 -1.0368C4.2624 -1.0368 3.6432 -1.3248 3.6432 -1.3248C3.0384 -1.584 2.4336 -1.8864 1.8144 -2.1312Z"/>
+ <path id="g19" d="M0.468 -3.888H0.204C0.204 -3.384 0.432 -2.76 1.056 -2.76C1.236 -2.76 1.404 -2.808 1.512 -2.868C1.908 -3.084 2.22 -3.528 2.22 -4.116C2.22 -4.512 2.016 -4.788 1.8 -5.004C1.416 -5.388 0.492 -5.712 0.468 -6.396C0.468 -6.516 0.492 -6.648 0.528 -6.768C0.648 -7.212 0.948 -7.548 1.488 -7.548C1.812 -7.548 2.136 -7.44 2.4 -7.236C3.06 -6.792 3.3 -5.7 3.384 -4.8C3.444 -4.2 3.468 -3.6 3.468 -3C3.468 -1.944 3.468 -0.672 2.832 -0.252C2.64 -0.144 2.592 -0.144 2.328 -0.108C2.328 -0.108 2.1 -0.12 2.1 -0.144C1.74 -0.252 1.476 -0.612 1.476 -0.984C1.476 -1.236 1.584 -1.488 1.764 -1.656C1.86 -1.74 1.968 -1.8 2.076 -1.848L1.908 -2.052C1.584 -1.86 1.32 -1.68 0.816 -1.656C0.672 -1.656 0.516 -1.668 0.372 -1.68C0.432 -1.524 0.468 -1.368 0.468 -1.212C0.468 -0.984 0.396 -0.78 0.3 -0.624C0.276 -0.588 0.228 -0.54 0.228 -0.492C0.228 -0.42 0.324 -0.3 0.396 -0.3C0.432 -0.3 0.48 -0.324 0.504 -0.348C0.6 -0.396 0.708 -0.432 0.816 -0.432C1.236 -0.432 1.572 -0.096 1.932 0.072C2.064 0.132 2.22 0.156 2.364 0.156C2.724 0.156 3.096 -0 3.372 -0.216C4.152 -0.876 4.428 -2.148 4.428 -3.456C4.428 -3.6 4.416 -3.732 4.416 -3.864L4.38 -4.596C4.38 -4.692 4.356 -4.776 4.356 -4.872C4.368 -4.944 4.428 -4.968 4.488 -4.992C4.572 -5.04 4.692 -5.076 4.788 -5.076C4.824 -5.076 4.86 -5.076 4.896 -5.064C5.052 -5.016 5.064 -4.848 5.076 -4.704L5.4 -2.184C5.46 -1.296 5.736 -0.36 6.204 0.156C6.624 -0.42 7.068 -0.984 7.476 -1.584L7.248 -1.716C7.188 -1.62 7.104 -1.524 7.032 -1.428C6.996 -1.368 6.924 -1.272 6.828 -1.272C6.756 -1.272 6.684 -1.32 6.636 -1.368C6.312 -1.692 6.3 -2.268 6.24 -2.82C6.24 -2.82 5.964 -5.088 5.916 -5.388C5.916 -5.424 5.832 -5.736 5.832 -5.772S5.88 -5.832 5.916 -5.856L6.156 -6L6.6 -6.252C6.696 -6.312 6.804 -6.336 6.804 -6.48C6.804 -6.54 6.792 -6.6 6.792 -6.636C6.48 -6.684 6.564 -7.056 6.504 -7.332C6.456 -7.776 6.168 -8.148 5.844 -8.352C5.784 -8.388 5.724 -8.436 5.652 -8.436C5.652 -8.436 5.64 -8.436 5.64 -8.436C5.568 -8.436 5.532 -8.376 5.484 -8.34C5.388 -8.268 5.292 -8.208 5.184 -8.16C4.524 -7.836 4.212 -7.884 3.78 -7.248C3.492 -7.884 2.892 -8.46 2.004 -8.46C0.948 -8.46 0.324 -7.584 0.216 -6.696C0.204 -6.504 0.204 -6.312 0.204 -6.12V-5.352C0.204 -5.304 0.204 -5.244 0.204 -5.196C0.204 -5.04 0.216 -4.896 0.324 -4.764C0.528 -4.56 1.032 -4.452 1.272 -4.356C1.512 -4.272 1.68 -4.104 1.68 -3.804C1.68 -3.456 1.416 -3.024 1.032 -3.024C0.6 -3.024 0.468 -3.576 0.468 -3.888ZM4.32 -5.208C4.284 -5.616 4.2 -6.024 4.104 -6.408L3.996 -6.756C3.972 -6.756 3.948 -6.936 3.948 -6.936C4.02 -7.26 4.5 -7.548 4.788 -7.548C4.92 -7.548 5.04 -7.512 5.148 -7.416C5.412 -7.2 5.46 -6.78 5.52 -6.456C5.544 -6.348 5.604 -6.048 5.604 -6.012C5.604 -5.94 5.532 -5.916 5.484 -5.88L4.32 -5.208Z"/>
+ <path id="g20" d="M0.516 -5.796C0.504 -5.88 0.492 -5.964 0.492 -6.048C0.492 -6.9 0.876 -7.548 1.296 -8.028C1.344 -8.088 1.488 -8.196 1.488 -8.28C1.488 -8.34 1.44 -8.412 1.368 -8.412S1.224 -8.34 1.176 -8.292C0.648 -7.764 0.228 -7.02 0.228 -6.036C0.228 -5.772 0.276 -5.496 0.384 -5.256S0.72 -4.788 1.02 -4.788C1.176 -4.788 1.356 -4.836 1.488 -4.944C1.62 -5.064 1.68 -5.244 1.68 -5.424C1.68 -5.808 1.416 -6.072 1.032 -6.072C0.828 -6.072 0.612 -5.988 0.516 -5.796ZM2.856 -5.808C2.856 -5.904 2.844 -6.012 2.844 -6.108C2.88 -6.924 3.216 -7.596 3.708 -8.088C3.756 -8.136 3.852 -8.196 3.852 -8.28C3.852 -8.292 3.84 -8.304 3.84 -8.316C3.84 -8.364 3.756 -8.412 3.72 -8.412C3.66 -8.412 3.612 -8.376 3.564 -8.328C3.024 -7.824 2.58 -6.996 2.58 -6.084C2.58 -5.46 2.784 -4.788 3.396 -4.788C3.768 -4.788 4.032 -5.076 4.032 -5.424C4.032 -5.604 3.972 -5.772 3.852 -5.904C3.732 -6.012 3.564 -6.072 3.384 -6.072C3.132 -6.072 2.988 -5.952 2.856 -5.808Z"/>
+ <path id="g21" d="M0.6 -4.368C0.54 -4.332 0.432 -4.248 0.432 -4.176C0.432 -4.116 0.48 -4.068 0.516 -4.032C0.696 -3.804 1.008 -3.612 1.368 -3.612C1.92 -3.612 2.292 -4.104 2.292 -4.704S1.8 -5.64 1.416 -5.856C1.128 -6.012 0.492 -6.144 0.492 -6.6C0.492 -6.756 0.564 -6.912 0.624 -7.056C0.756 -7.344 0.924 -7.788 1.332 -7.788C1.68 -7.788 2.004 -7.572 2.184 -7.428C2.796 -6.876 3.24 -6.012 3.384 -5.088C3.42 -4.908 3.444 -4.704 3.444 -4.512C3.444 -3.804 3.144 -3.276 2.796 -2.844C2.7 -2.724 2.4 -2.316 2.232 -2.316C2.196 -2.316 2.148 -2.328 2.112 -2.328C2.088 -2.328 1.752 -2.34 1.752 -2.328C1.128 -2.292 0.564 -1.692 0.564 -1.008C0.564 -0.756 0.648 -0.588 0.768 -0.432C0.792 -0.396 0.84 -0.336 0.888 -0.336C0.888 -0.336 0.9 -0.336 0.9 -0.336C0.984 -0.336 1.056 -0.432 1.092 -0.492C0.948 -0.612 0.84 -0.804 0.84 -0.984C0.84 -1.296 1.164 -1.464 1.476 -1.464C1.56 -1.464 1.644 -1.464 1.716 -1.452C2.712 -1.332 3.552 -0.672 4.2 -0.072C4.236 -0.036 4.404 0.132 4.452 0.132C4.476 0.132 4.56 0.12 4.56 0.096L4.752 -0.012L5.532 -0.468C5.832 -0.636 6.168 -0.792 6.432 -1.02C6.792 -1.308 7.128 -1.8 7.128 -2.388C7.128 -2.904 6.828 -3.216 6.576 -3.504C6.264 -3.84 5.712 -4.272 5.712 -4.872C5.724 -5.076 5.892 -5.244 6.024 -5.388C6.336 -5.712 6.72 -6.012 7.128 -6.216C7.092 -6.288 7.068 -6.384 7.02 -6.432C6.972 -6.492 6.876 -6.492 6.816 -6.54C6.708 -6.612 6.612 -6.708 6.54 -6.828C6.192 -7.392 6.24 -8.46 5.376 -8.46C4.716 -8.46 4.224 -8.016 3.996 -7.596C3.912 -7.452 3.84 -7.296 3.804 -7.128L3.528 -7.56C3.192 -7.992 2.688 -8.46 1.968 -8.46C1.896 -8.46 1.824 -8.448 1.752 -8.448C0.828 -8.316 0.324 -7.332 0.228 -6.492C0.216 -6.384 0.204 -6.276 0.204 -6.168C0.204 -5.82 0.348 -5.58 0.456 -5.328C0.504 -5.148 0.66 -5.184 0.84 -5.136C1.2 -5.052 1.812 -4.92 1.812 -4.404C1.812 -4.152 1.656 -3.876 1.38 -3.876C1.02 -3.876 0.768 -4.128 0.6 -4.368ZM5.82 -5.556C5.472 -5.196 4.968 -4.836 4.968 -4.164C4.968 -4.08 4.968 -3.996 4.992 -3.912C5.136 -3.408 5.808 -3.084 6.12 -2.784C6.336 -2.568 6.48 -2.388 6.48 -2.028C6.48 -1.464 6.096 -0.864 5.448 -0.864C5.4 -0.864 5.352 -0.864 5.304 -0.876C4.824 -0.984 4.512 -1.428 4.176 -1.644C3.888 -1.848 3.564 -2.004 3.228 -2.124C3.06 -2.172 2.88 -2.208 2.712 -2.256C3.036 -2.484 3.36 -2.712 3.66 -2.964C4.056 -3.312 4.356 -3.672 4.356 -4.38C4.356 -5.196 4.248 -5.988 4.032 -6.6C4.008 -6.672 3.888 -6.924 3.888 -7.008C3.9 -7.092 3.948 -7.188 3.972 -7.272C4.116 -7.596 4.368 -7.86 4.74 -7.86C4.752 -7.86 4.752 -7.86 4.764 -7.86C5.112 -7.86 5.268 -7.56 5.316 -7.296C5.424 -6.72 5.244 -5.676 5.82 -5.556Z"/>
+ <path id="g22" d="M0.6048 -8.352C0.432 -8.0208 0.2016 -7.5312 0.2016 -7.1136C0.2016 -6.984 0.2448 -6.9408 0.3456 -6.912C0.6192 -6.7536 1.7856 -6.192 1.8288 -6.1776C1.584 -5.9328 1.3392 -5.7168 1.0944 -5.4864C0.9504 -5.3712 0.7776 -5.256 0.7776 -5.0112V-4.8672V-2.5056C0.7776 -2.4192 0.792 -1.656 0.7632 -1.656C0.7488 -1.584 0.4608 -1.1088 0.4608 -1.0944L1.9584 -0.0864C2.1456 0.0432 2.3184 0.1872 2.5488 0.2736L2.7648 0.1872L4.9104 -1.0512L4.7664 -1.3536C4.7232 -2.7648 4.752 -4.3056 4.7664 -5.7024L4.9104 -6.0048C3.5568 -6.6816 2.16 -7.3296 0.8352 -8.0352L0.6336 -8.352H0.6048ZM3.4272 -0.5616C2.9664 -0.8928 2.448 -1.1808 2.016 -1.5408L1.9872 -1.8C1.9872 -3.0816 1.9728 -4.3632 2.0016 -5.6016C2.0592 -5.7312 2.0736 -5.904 2.1888 -5.976C2.6496 -5.7744 3.096 -5.5584 3.5136 -5.3136L3.5424 -5.04C3.5424 -3.5712 3.5568 -2.088 3.528 -0.6624L3.4272 -0.5616Z"/>
+ <path id="g23" d="M0.6192 -8.3664C0.4176 -8.0352 0.2016 -7.56 0.2016 -7.1136C0.2016 -7.0704 0.2016 -7.0272 0.216 -6.9984C0.2736 -6.9264 0.6048 -6.7824 0.6336 -6.768L1.3968 -6.3936C1.5408 -6.3216 1.6848 -6.2352 1.8432 -6.1776C1.4976 -5.832 1.1232 -5.5296 0.792 -5.1696L0.7776 -4.9968V-1.6704L0.4752 -1.08C1.1808 -0.6336 1.8144 -0.144 2.5488 0.2736L2.7072 0.216C3.1824 -0.0576 3.672 -0.3312 4.1328 -0.6192H4.1472L4.5072 -0.36C4.8528 -0.1584 5.1264 0.1152 5.5152 0.2736L5.6592 0.216C6.408 -0.2016 7.1424 -0.6192 7.848 -1.0656C7.8192 -1.1952 7.7616 -1.2816 7.7184 -1.3824C7.7184 -2.8224 7.704 -4.2768 7.7328 -5.688L7.8768 -6.0048L5.7456 -7.056C5.5296 -6.5232 5.1984 -6.1056 4.7808 -5.7312L4.9248 -6.0048L3.744 -6.5808C2.7792 -7.0704 1.7856 -7.5312 0.8352 -8.0352L0.6192 -8.3664ZM3.4272 -1.08C3.5568 -0.9936 3.5568 -0.9072 3.5568 -0.7632C3.5568 -0.6768 3.5136 -0.6048 3.4272 -0.6048H3.4128C3.3552 -0.6048 3.024 -0.8352 3.024 -0.8352L2.3616 -1.2816C2.232 -1.3824 1.9872 -1.4544 1.9872 -1.6992V-1.7856V-4.9968V-5.2416C1.9872 -5.4144 1.9872 -5.5728 2.0304 -5.7312C2.0592 -5.8032 2.1024 -5.9616 2.2176 -5.9616C2.2464 -5.9616 2.2752 -5.9616 2.2896 -5.9472C2.3616 -5.9184 2.9952 -5.5872 3.2544 -5.472C3.4272 -5.3856 3.5712 -5.3856 3.5712 -5.1264C3.5712 -5.0544 3.5568 -4.9824 3.5568 -4.9104V-1.7136V-1.4688C3.5568 -1.2384 3.4992 -1.3104 3.4272 -1.08ZM6.3936 -0.5616C5.9328 -0.8928 5.4144 -1.1664 4.9824 -1.5408L4.9536 -1.8144V-5.1408C5.1408 -5.3712 5.3568 -5.5728 5.616 -5.7456C5.9472 -5.6304 6.2208 -5.472 6.4944 -5.2992C6.4944 -5.2992 6.5088 -4.9968 6.5088 -4.9968C6.5088 -3.5424 6.5232 -2.0736 6.4944 -0.6624L6.3936 -0.5616Z"/>
+ <path id="g24" d="M0.684 -4.692V-1.5C0.684 -1.44 0.684 -1.368 0.684 -1.296C0.684 -1.068 0.66 -0.816 0.42 -0.72V-0.468C0.6 -0.408 0.732 -0.264 0.828 -0.108C0.888 -0 0.912 0.168 1.092 0.168C1.128 0.168 1.176 0.156 1.212 0.156C1.284 -0.12 1.464 -0.384 1.752 -0.468C1.752 -0.504 1.752 -0.54 1.752 -0.576C1.752 -0.624 1.752 -0.66 1.74 -0.696C1.716 -0.756 1.632 -0.792 1.596 -0.84C1.524 -0.936 1.5 -1.056 1.488 -1.176C1.476 -1.176 1.488 -2.832 1.488 -4.152C1.488 -4.224 1.476 -4.68 1.512 -4.68C1.536 -4.728 1.584 -4.752 1.632 -4.788L1.884 -4.98C1.92 -5.004 2.1 -5.148 2.16 -5.148C2.232 -5.148 2.328 -5.052 2.352 -5.028L2.664 -4.812C2.748 -4.74 2.856 -4.716 2.856 -4.56C2.856 -4.512 2.844 -4.452 2.844 -4.416V-1.452C2.844 -1.404 2.844 -1.368 2.844 -1.32C2.844 -1.14 2.832 -0.972 2.664 -0.852C2.616 -0.816 2.568 -0.804 2.52 -0.78C2.64 -0.684 2.784 -0.612 2.916 -0.528L3.636 -0.084C3.684 -0.048 3.96 0.132 4.02 0.132C4.104 0.132 4.176 0.012 4.212 -0.024C4.368 -0.18 4.512 -0.348 4.668 -0.504C5.328 -1.224 6 -2.148 6 -3.24C6 -3.432 5.988 -3.636 5.952 -3.828C5.772 -4.608 5.22 -5.196 4.74 -5.808H4.728C4.368 -5.556 4.044 -5.244 3.66 -5.016L3.552 -5.064C3.228 -5.304 2.88 -5.532 2.58 -5.808C2.316 -5.628 2.064 -5.424 1.812 -5.232C1.704 -5.16 1.548 -4.98 1.404 -4.98C1.08 -4.98 0.84 -5.268 0.84 -5.52C0.84 -5.628 0.888 -5.7 0.984 -5.76C1.044 -5.784 1.164 -5.832 1.164 -5.916C1.164 -5.988 1.08 -6.048 1.044 -6.096C0.924 -6.036 0.816 -5.964 0.696 -5.904C0.48 -5.796 0.204 -5.688 0.204 -5.376C0.204 -5.04 0.42 -4.752 0.684 -4.692ZM4.176 -5.088C4.692 -4.536 5.328 -3.72 5.388 -2.88C5.388 -2.88 5.376 -2.34 5.364 -2.34C5.232 -1.74 5.028 -1.344 4.692 -0.912C4.644 -0.852 4.536 -0.696 4.452 -0.696C4.38 -0.708 4.32 -0.768 4.26 -0.804L3.852 -1.056C3.756 -1.116 3.648 -1.14 3.648 -1.296C3.648 -1.356 3.66 -1.416 3.66 -1.464V-4.392C3.66 -4.44 3.66 -4.476 3.66 -4.524C3.66 -4.704 3.708 -4.716 3.828 -4.812C3.948 -4.896 4.08 -4.98 4.176 -5.088Z"/>
+ <path id="g25" d="M0.732 -3.324C0.756 -3.252 0.804 -3.084 0.912 -3.084C0.936 -3.084 0.984 -3.096 1.008 -3.108C1.644 -3.228 2.124 -3.792 2.124 -4.44C2.124 -5.016 1.668 -5.352 1.308 -5.556C0.948 -5.772 0.468 -6.012 0.468 -6.492C0.468 -6.948 0.588 -7.632 1.188 -7.632C1.26 -7.632 1.344 -7.62 1.416 -7.608C1.884 -7.488 2.232 -7.092 2.4 -6.66C2.544 -6.288 2.58 -5.892 2.58 -5.496C2.58 -5.292 2.568 -5.076 2.568 -4.872V-1.956L1.956 -2.208C1.788 -1.668 1.644 -1.224 1.332 -0.78C1.296 -0.744 1.224 -0.648 1.224 -0.588S1.356 -0.456 1.416 -0.42C1.608 -0.672 1.884 -0.912 2.208 -0.912C2.22 -0.912 2.22 -0.912 2.232 -0.912C2.376 -0.912 2.58 -0.864 2.58 -0.672C2.58 -0.624 2.568 -0.564 2.568 -0.528C2.568 0.348 2.664 0.912 2.784 1.764C2.82 1.764 2.88 1.776 2.928 1.776C3.084 1.776 3.084 1.704 3.144 1.584C3.36 1.056 3.564 0.372 3.588 -0.252C3.888 -0.084 4.2 0.072 4.512 0.228C4.596 0.084 4.668 -0.06 4.74 -0.216C4.788 -0.324 4.836 -0.456 4.908 -0.552C4.968 -0.624 5.052 -0.672 5.124 -0.732C5.256 -0.84 5.4 -0.96 5.52 -1.092C6.072 -1.704 6.564 -2.484 6.564 -3.42C6.564 -4.728 5.76 -5.46 5.76 -6.756C5.76 -7.008 5.784 -7.272 5.844 -7.524C5.892 -7.728 5.976 -7.92 6.036 -8.124C5.22 -8.1 4.416 -7.692 3.984 -7.26C3.804 -7.08 3.612 -6.852 3.528 -6.612C3.468 -6.792 3.42 -6.984 3.348 -7.164C3.072 -7.824 2.544 -8.46 1.596 -8.46C1.488 -8.46 1.38 -8.436 1.284 -8.4C0.504 -8.148 0.192 -7.224 0.192 -6.42C0.192 -5.892 0.396 -5.22 0.636 -4.836C0.684 -4.752 0.72 -4.68 0.852 -4.68C0.9 -4.68 0.96 -4.68 0.996 -4.68C1.044 -4.68 1.08 -4.668 1.128 -4.668C1.392 -4.656 1.788 -4.572 1.788 -4.224C1.788 -3.66 1.272 -3.312 0.852 -3.312C0.804 -3.312 0.768 -3.324 0.732 -3.324ZM4.836 -7.536C4.8 -7.152 4.752 -6.768 4.752 -6.372C4.752 -5.28 5.268 -4.632 5.556 -3.768C5.64 -3.492 5.712 -3.192 5.712 -2.904C5.712 -2.88 5.712 -2.868 5.712 -2.844C5.712 -2.136 5.376 -1.416 4.956 -0.996C4.908 -0.948 4.848 -0.876 4.788 -0.852C4.764 -0.852 4.68 -0.852 4.68 -0.888C4.62 -0.912 4.56 -0.948 4.5 -0.984L3.912 -1.308C3.78 -1.38 3.612 -1.392 3.612 -1.584V-5.58C3.612 -5.772 3.612 -5.964 3.648 -6.156C3.78 -6.768 4.272 -7.284 4.836 -7.536Z"/>
+ <path id="g26" d="M0.7344 -8.6688L0.216 -9.3744C0.144 -9.3312 0.0144 -9.2592 0.0144 -9.1584C0.0144 -9.072 0.1152 -9 0.144 -8.9568C0.3744 -8.5824 0.432 -8.1936 0.432 -7.6032V-7.3872V-1.8576V-1.7568C0.432 -1.6128 0.3168 -1.5408 0.2304 -1.4688L-0.2016 -1.1088L0.216 -0.5904L0.9648 0.3024H0.9792L1.8864 -0.4608L1.3824 -1.0944H1.6416V-7.8768V-8.1072C1.6416 -8.1936 1.6416 -8.2656 1.656 -8.3376C1.7136 -8.8272 2.1456 -9.1728 2.6928 -9.216V-9.432C2.1888 -9.432 1.6992 -9.3024 1.2672 -9.0432C1.08 -8.9424 0.9216 -8.784 0.7344 -8.6688Z"/>
+ <path id="g27" d="M0.7632 -9.072L0.4176 -8.6544C0.1728 -8.2944 -0.0144 -7.848 -0.0144 -7.4016C-0.0144 -7.2144 0.0144 -7.0128 0.1152 -6.8256C0.288 -6.4656 0.7056 -6.2352 0.7776 -5.8176V-2.1312C0.6768 -2.0736 0.6192 -1.9296 0.5616 -1.8288C0.432 -1.584 0.2736 -1.3392 0.144 -1.0944C0.3024 -0.9936 2.448 0.2736 2.5344 0.2736H2.5632C2.664 0.2736 2.952 0.072 2.9664 0.0576L3.8592 -0.4464C3.9456 -0.4896 4.2048 -0.6768 4.3056 -0.6768C4.3632 -0.6768 4.6944 -0.432 4.6944 -0.432L5.3568 0.0288C5.4288 0.0864 5.6448 0.288 5.7456 0.288C5.8032 0.288 5.8464 0.2448 5.8896 0.216C6.0048 0.1584 7.272 -0.576 7.272 -0.576C7.3584 -0.6336 7.4304 -0.6624 7.4304 -0.8208C7.4304 -0.864 7.416 -0.9216 7.416 -0.9648C7.1712 -0.8496 6.8976 -0.648 6.6096 -0.648C6.3936 -0.648 6.0912 -0.9504 6.0192 -0.9936L5.544 -1.3248C5.4288 -1.3968 5.2704 -1.4544 5.2704 -1.656C5.2704 -1.7136 5.2848 -1.7712 5.2848 -1.8144V-2.3616V-2.5056C5.2848 -2.6784 5.328 -2.7504 5.4288 -2.8512L5.7024 -3.1824L6.768 -4.4352L7.4736 -5.256C7.5168 -5.3136 7.704 -5.5008 7.704 -5.5728C7.704 -5.6304 7.6464 -5.6736 7.6032 -5.7168L6.192 -7.128H6.1776C5.8176 -6.7824 5.4 -6.48 4.968 -6.2208C4.896 -6.1632 4.6224 -5.9904 4.5216 -5.9904C4.392 -5.9904 4.2768 -6.12 4.2048 -6.1632C3.9888 -6.3072 3.7728 -6.4944 3.5424 -6.6096C3.6288 -6.696 3.7152 -6.7968 3.7872 -6.8976L3.6144 -7.128C3.0528 -6.6384 2.5344 -6.12 1.9872 -5.616C1.9872 -6.2064 1.8432 -6.5376 1.5696 -6.9408C1.2816 -7.344 0.7776 -7.6464 0.7776 -8.28C0.7776 -8.5248 0.8784 -8.712 1.008 -8.8416L0.7632 -9.072ZM5.2992 -3.1824H5.2848V-5.4288C5.2848 -5.544 5.2704 -5.6736 5.2704 -5.7888C5.2704 -5.9472 5.2848 -6.1056 5.4288 -6.1056H5.4432C5.4864 -6.1056 5.5152 -6.0768 5.544 -6.048L6.3648 -5.2272C6.48 -5.112 6.5952 -4.9824 6.7248 -4.8816C6.2496 -4.3056 5.7456 -3.7728 5.2992 -3.1824ZM1.9872 -1.5984V-1.6992V-4.8816V-5.0112C1.9872 -5.184 2.0448 -5.2416 2.16 -5.328C2.232 -5.3856 2.5488 -5.7312 2.6352 -5.7456C2.7216 -5.7456 2.808 -5.6592 2.8656 -5.616L3.2832 -5.328C3.4128 -5.2272 3.5424 -5.2128 3.5424 -4.9824V-4.8672V-0.936V-0.792C3.5424 -0.7056 3.528 -0.6048 3.4416 -0.6048C3.3408 -0.6048 3.2112 -0.72 3.1392 -0.7632L2.3328 -1.224L2.1168 -1.3536C2.016 -1.3824 1.9872 -1.4688 1.9872 -1.5984Z"/>
+ <path id="g28" d="M0.7632 -9.072L0.4176 -8.6544C0.1728 -8.2944 -0.0144 -7.848 -0.0144 -7.4016C-0.0144 -7.2144 0.0144 -7.0128 0.1152 -6.8256C0.288 -6.4656 0.7056 -6.2352 0.7776 -5.8176V-2.1312C0.6768 -2.0736 0.6192 -1.9296 0.5616 -1.8288C0.432 -1.584 0.2736 -1.3392 0.144 -1.0944L1.872 -0.0864C2.088 0.0432 2.2896 0.1872 2.5488 0.2736L2.7648 0.1872L4.9104 -1.0512L4.7664 -1.3536C4.7232 -2.6496 4.7664 -4.0464 4.752 -5.3712L4.9104 -5.688C4.4496 -5.9904 4.0176 -6.3216 3.5424 -6.6096C3.6288 -6.696 3.7152 -6.7968 3.7872 -6.8976L3.6144 -7.128C3.0528 -6.6384 2.5344 -6.12 1.9872 -5.616C1.9872 -6.2064 1.8432 -6.5376 1.5696 -6.9408C1.2816 -7.344 0.7776 -7.6464 0.7776 -8.28C0.7776 -8.5248 0.8784 -8.712 1.008 -8.8416L0.7632 -9.072ZM1.9872 -1.5984V-1.6992V-4.8816V-5.0112C1.9872 -5.184 2.0448 -5.2416 2.16 -5.328C2.232 -5.3856 2.5488 -5.7312 2.6352 -5.7456C2.7216 -5.7456 2.808 -5.6592 2.8656 -5.616L3.2832 -5.328C3.4128 -5.2272 3.5424 -5.2128 3.5424 -4.9824V-4.8672V-0.936V-0.792C3.5424 -0.7056 3.528 -0.6048 3.4416 -0.6048C3.3408 -0.6048 3.2112 -0.72 3.1392 -0.7632L2.3328 -1.224L2.1168 -1.3536C2.016 -1.3824 1.9872 -1.4688 1.9872 -1.5984Z"/>
+ <path id="g29" d="M0.768 -6.804H0.756C0.648 -6.936 0.528 -7.068 0.408 -7.2L0.36 -6.984L0.48 -6.744L0.564 -6.36C0.564 -5.952 0.564 -5.544 0.552 -5.16C0.444 -4.944 0.324 -4.74 0.204 -4.536H0.564V-1.692C0.564 -1.596 0.564 -1.5 0.564 -1.404C0.564 -1.032 0.492 -0.744 0.204 -0.564L0.384 -0.408C0.636 -0.312 0.864 -0.192 1.08 -0.06C1.176 0.012 1.26 0.084 1.38 0.132L1.476 0.048L2.364 -0.936V-0.948L2.16 -1.092C2.124 -1.044 2.016 -0.876 1.932 -0.876C1.884 -0.876 1.836 -0.912 1.788 -0.936L1.5 -1.104C1.392 -1.164 1.368 -1.2 1.368 -1.368C1.368 -1.452 1.368 -1.536 1.368 -1.62V-4.536H2.604V-5.148H2.448C2.604 -5.532 2.784 -6.108 2.784 -6.552C2.784 -6.66 2.76 -6.768 2.688 -6.864C2.556 -7.032 2.34 -7.032 2.148 -7.068L1.368 -6.228C1.368 -6.348 1.356 -6.468 1.356 -6.6C1.356 -7.092 1.584 -7.452 2.16 -7.452C2.208 -7.452 2.268 -7.452 2.328 -7.452V-7.692C2.256 -7.692 2.196 -7.692 2.124 -7.692C2.028 -7.692 1.932 -7.692 1.836 -7.668C1.488 -7.56 1.224 -7.296 0.984 -7.032C0.912 -6.96 0.828 -6.888 0.768 -6.804ZM1.368 -5.148V-5.592C1.368 -5.64 1.368 -5.688 1.368 -5.748C1.368 -5.928 1.476 -5.976 1.572 -6.084L1.74 -6.252C1.764 -6.288 1.824 -6.36 1.896 -6.36C1.956 -6.36 2.04 -6.336 2.088 -6.3C2.256 -6.216 2.376 -6.108 2.376 -5.856C2.376 -5.676 2.292 -5.412 2.244 -5.256C2.22 -5.184 2.184 -5.136 2.076 -5.136C2.04 -5.136 1.992 -5.148 1.956 -5.148H1.368Z"/>
+ <path id="g30" d="M0.768 -6.804H0.756C0.66 -6.936 0.54 -7.104 0.408 -7.2C0.396 -7.128 0.36 -7.056 0.36 -6.984C0.372 -6.936 0.408 -6.888 0.432 -6.84C0.54 -6.684 0.564 -6.444 0.564 -6.204C0.564 -6.144 0.564 -6.072 0.564 -6.012V-1.536C0.564 -1.488 0.564 -1.428 0.564 -1.38C0.564 -1.02 0.492 -0.744 0.204 -0.564C0.252 -0.516 0.312 -0.444 0.384 -0.42C0.42 -0.42 0.564 -0.42 0.564 -0.444C0.624 -0.456 0.672 -0.456 0.72 -0.456C1.02 -0.456 1.164 -0.36 1.404 -0.24C1.368 -0.204 1.212 -0.06 1.212 -0C1.212 -0 1.212 -0 1.212 0.012C1.212 0.072 1.308 0.132 1.368 0.132C1.44 0.132 1.5 0.012 1.524 -0.012L1.74 -0.252C1.992 -0.528 2.232 -0.816 2.496 -1.08V-1.092L2.292 -1.236L1.956 -0.84C1.824 -0.924 1.692 -0.996 1.56 -1.068C1.452 -1.128 1.368 -1.152 1.368 -1.308C1.368 -1.344 1.368 -1.392 1.368 -1.428V-3.876C1.368 -3.924 1.368 -3.984 1.368 -4.032C1.368 -4.188 1.416 -4.224 1.512 -4.296L1.86 -4.596C1.908 -4.632 1.944 -4.668 1.98 -4.668C2.004 -4.668 2.028 -4.656 2.064 -4.632C2.256 -4.44 2.412 -4.188 2.544 -3.96C2.88 -3.372 3.048 -2.7 3.048 -2.028C3.048 -1.788 3.024 -1.548 2.988 -1.32C2.808 -0.396 2.376 0.396 1.896 1.056C1.824 1.164 1.74 1.26 1.668 1.368C1.632 1.404 1.572 1.452 1.572 1.512C1.572 1.596 1.752 1.692 1.776 1.704C2.712 0.492 3.864 -0.744 3.864 -2.808C3.864 -3.684 3.468 -4.548 2.988 -5.112C2.964 -5.136 2.808 -5.328 2.796 -5.352C2.796 -5.388 2.832 -5.424 2.856 -5.448S3.048 -5.604 3.048 -5.628C3.012 -5.676 2.952 -5.772 2.88 -5.772C2.88 -5.772 2.868 -5.772 2.868 -5.772C2.808 -5.76 2.424 -5.412 2.424 -5.412L1.368 -4.5V-6.588C1.368 -6.708 1.368 -6.828 1.392 -6.948C1.464 -7.26 1.752 -7.488 2.076 -7.5V-7.74C1.632 -7.74 1.32 -7.404 1.044 -7.104C0.948 -7.008 0.852 -6.912 0.768 -6.804Z"/>
+ <path id="g31" d="M0.768 -6.804H0.756L0.42 -7.212H0.408C0.396 -7.152 0.36 -7.08 0.36 -7.008S0.42 -6.864 0.444 -6.816C0.516 -6.672 0.552 -6.516 0.552 -6.312C0.552 -6.216 0.552 -6.12 0.552 -6.036V-1.512C0.552 -1.452 0.552 -1.404 0.552 -1.344C0.552 -1.008 0.492 -0.732 0.204 -0.564C0.384 -0.372 0.636 -0.312 0.864 -0.192C1.044 -0.084 1.2 0.06 1.38 0.156C1.596 -0.108 1.836 -0.348 2.052 -0.6C2.088 -0.636 2.268 -0.804 2.268 -0.876C2.268 -0.936 2.148 -0.996 2.124 -0.996C2.04 -0.996 2.004 -0.876 1.92 -0.876C1.872 -0.876 1.404 -1.14 1.368 -1.224C1.368 -1.224 1.368 -5.64 1.368 -5.64C1.368 -5.748 1.356 -6.864 1.38 -6.864C1.428 -7.26 1.848 -7.452 2.208 -7.452V-7.692C1.752 -7.692 1.368 -7.44 1.056 -7.128C0.948 -7.032 0.852 -6.924 0.768 -6.804Z"/>
+ <path id="g32" d="M0.7776 -9.072C0.36 -8.6544 -0.0288 -8.0208 -0.0288 -7.4016C-0.0288 -7.2 0.0144 -6.9984 0.1152 -6.8112C0.3024 -6.4656 0.7056 -6.2496 0.7776 -5.832V-2.1312C0.5328 -1.8144 0.3456 -1.44 0.1584 -1.08L1.8864 -0.0864C2.1024 0.0432 2.304 0.1872 2.5632 0.2736C2.9232 0.1008 3.2688 -0.1008 3.6144 -0.3024C3.7296 -0.36 3.888 -0.5328 4.0752 -0.432C4.4784 -0.1872 4.8816 0.0576 5.3136 0.2736L5.5296 0.1872L7.704 -1.0656L7.56 -1.368C7.5168 -2.6784 7.5456 -4.0896 7.56 -5.3712L7.704 -5.688L6.4944 -6.5232C6.3504 -6.6096 6.2208 -6.7248 6.048 -6.7824C5.6304 -6.4512 5.2992 -6.048 4.8672 -5.7456C4.4064 -6.0048 4.0176 -6.3504 3.5568 -6.6096C3.5856 -6.6528 3.8016 -6.8688 3.8016 -6.8976C3.8016 -6.984 3.6864 -7.0704 3.6288 -7.128H3.6144L1.9872 -5.616V-5.9472C1.9296 -6.2928 1.7856 -6.624 1.584 -6.912C1.3104 -7.3152 0.7776 -7.6464 0.7776 -8.2656C0.7776 -8.3808 0.8064 -8.496 0.8496 -8.5968C0.8784 -8.6832 1.008 -8.856 1.008 -8.856L0.7776 -9.072ZM3.4272 -1.9728C3.2544 -1.6848 3.0816 -1.3968 2.9376 -1.08L3.4416 -0.8064C3.4416 -1.1952 3.4416 -1.5984 3.4272 -1.9728ZM2.6352 -5.7888C2.8368 -5.6304 3.0528 -5.5008 3.2688 -5.3568C3.4128 -5.2416 3.5568 -5.2128 3.5568 -4.9824V-4.8672V-0.9504V-0.792C3.5568 -0.7056 3.5424 -0.6048 3.4416 -0.6048C3.3552 -0.6048 3.24 -0.6912 3.1824 -0.7344C2.9808 -0.8496 2.304 -1.2384 2.1312 -1.3536C2.016 -1.4112 1.9872 -1.4544 1.9872 -1.6128V-1.7424V-4.8384V-4.9968C1.9872 -5.0544 1.9872 -5.112 2.0016 -5.1552C2.0304 -5.2416 2.5056 -5.6304 2.6352 -5.7888ZM5.4144 -5.7888C5.616 -5.6304 5.832 -5.5008 6.048 -5.3568C6.192 -5.2416 6.336 -5.2128 6.336 -4.9824V-4.8672V-0.9504V-0.792C6.336 -0.7056 6.3216 -0.6048 6.2208 -0.6048C6.1344 -0.6048 6.0192 -0.6912 5.9616 -0.7344C5.76 -0.8496 5.0832 -1.2384 4.9104 -1.3536C4.7952 -1.4112 4.7664 -1.4544 4.7664 -1.6128V-1.7424V-4.8384V-4.9968C4.7664 -5.0544 4.7664 -5.112 4.7808 -5.1552C4.8096 -5.2416 5.2848 -5.6304 5.4144 -5.7888Z"/>
+ <path id="g33" d="M0.792 -4.284L1.5 -5.136C1.128 -5.436 0.912 -5.892 0.9 -6.372C0.9 -6.9 1.188 -7.5 1.716 -7.692C1.836 -7.728 1.956 -7.74 2.088 -7.74C2.412 -7.74 2.712 -7.56 2.964 -7.368C3.48 -6.936 3.996 -6.084 4.848 -6.084C5.52 -6.084 5.94 -6.696 5.94 -7.248C5.94 -7.416 5.868 -7.56 5.796 -7.716L5.556 -7.608C5.604 -7.488 5.664 -7.38 5.664 -7.26C5.664 -6.996 5.484 -6.792 5.22 -6.792C4.836 -6.792 4.596 -7.056 4.428 -7.26C4.068 -7.716 3.816 -8.46 3.036 -8.46C2.94 -8.46 2.856 -8.46 2.772 -8.448C1.656 -8.316 0.624 -7.56 0.312 -6.456C0.252 -6.264 0.204 -6.036 0.204 -5.832C0.204 -5.484 0.324 -5.28 0.456 -5.016C0.504 -4.92 0.552 -4.824 0.576 -4.716C0.6 -4.644 0.576 -4.548 0.6 -4.476C0.636 -4.392 0.72 -4.32 0.792 -4.284ZM0.744 1.536C0.804 1.512 0.96 1.476 0.96 1.392C0.936 1.248 0.864 1.092 0.864 0.936C0.864 0.696 1.068 0.588 1.32 0.588S1.776 0.708 1.968 0.864C2.292 1.14 2.556 1.548 2.988 1.656C3.072 1.668 3.144 1.668 3.228 1.668C3.984 1.668 4.572 1.02 4.92 0.552C5.376 -0.036 5.736 -0.78 5.736 -1.596C5.736 -1.776 5.724 -1.956 5.664 -2.136C5.46 -2.832 4.92 -3.36 4.608 -3.996C4.488 -4.248 4.38 -4.536 4.38 -4.824C4.38 -5.028 4.428 -5.22 4.524 -5.352C4.62 -5.448 4.68 -5.532 4.848 -5.532C4.992 -5.532 5.136 -5.436 5.244 -5.328C5.412 -5.136 5.472 -4.848 5.472 -4.596H5.736C5.736 -5.148 5.46 -5.796 4.788 -5.796C4.728 -5.796 4.656 -5.796 4.584 -5.784C3.96 -5.688 3.324 -5.22 3.324 -4.44C3.324 -4.08 3.444 -3.72 3.612 -3.408C4.104 -2.532 5.052 -1.836 5.052 -0.66C5.052 0.036 4.68 0.804 3.828 0.804C3.768 0.804 3.72 0.792 3.672 0.792C2.952 0.684 2.616 -0.156 1.896 -0.264C1.848 -0.264 1.8 -0.276 1.752 -0.276C1.056 -0.276 0.6 0.252 0.6 0.864C0.6 1.092 0.66 1.332 0.744 1.536Z"/>
+ <path id="g34" d="M0.864 -5.976C0.66 -5.664 0.36 -5.316 0.36 -4.872C0.36 -4.788 0.372 -4.716 0.408 -4.644C0.564 -4.38 0.924 -4.26 0.972 -3.936C0.984 -3.828 0.984 -3.732 0.984 -3.624V-1.584L0.708 -1.68L0.192 -0.852C0.468 -0.744 0.756 -0.648 1.02 -0.528L1.056 -0.312C1.116 0.552 1.188 1.404 1.26 2.256H1.512C1.584 1.404 1.644 0.552 1.716 -0.3L2.928 0.132C3 -0 3.084 -0.12 3.168 -0.252C3.648 -1.02 4.368 -2.016 4.368 -3.072C4.368 -4.056 3.876 -4.824 3.456 -5.352C3.42 -5.4 3.288 -5.604 3.204 -5.604C3.156 -5.604 3.108 -5.568 3.072 -5.544L2.808 -5.352C2.46 -5.124 2.148 -4.86 1.788 -4.644C1.776 -4.764 1.656 -4.812 1.56 -4.872C1.356 -4.98 1.104 -5.04 0.96 -5.22C0.9 -5.292 0.852 -5.376 0.852 -5.472C0.852 -5.64 1.02 -5.784 1.092 -5.868L0.864 -5.976ZM3.216 -0.768C2.76 -0.96 2.244 -1.092 1.812 -1.308L1.788 -1.512C1.8 -2.472 1.752 -3.456 1.812 -4.332C2.04 -4.524 2.304 -4.692 2.556 -4.86C2.64 -4.704 2.772 -4.572 2.88 -4.44C3.288 -3.912 3.708 -3.192 3.708 -2.376C3.708 -1.872 3.564 -1.452 3.384 -1.068C3.324 -0.972 3.264 -0.876 3.216 -0.768Z"/>
+ <path id="g35" d="M0.888 -6.396L1.092 -6.264C1.38 -6.708 1.908 -7.008 2.448 -7.008C2.568 -7.008 2.7 -6.996 2.82 -6.96C3.228 -6.84 3.636 -6.516 3.636 -6.024C3.636 -5.916 3.6 -5.808 3.552 -5.724C3.408 -5.472 3.12 -5.388 2.844 -5.388C2.436 -5.388 1.98 -5.568 1.74 -5.712C1.704 -5.736 1.656 -5.772 1.608 -5.772C1.548 -5.772 1.512 -5.688 1.476 -5.652C1.056 -5.064 0.612 -4.488 0.204 -3.888C0.648 -3.564 1.176 -3.024 1.176 -2.304C1.176 -1.92 0.996 -1.716 0.816 -1.476C0.612 -1.188 0.384 -0.9 0.204 -0.588C0.288 -0.516 0.36 -0.456 0.504 -0.456C0.552 -0.456 0.588 -0.456 0.624 -0.456C1.26 -0.456 1.8 -0.18 2.184 0.048C2.232 0.084 2.28 0.132 2.34 0.132C2.34 0.132 2.352 0.132 2.352 0.132C2.4 0.12 2.592 -0.06 2.592 -0.06L3.144 -0.564C3.624 -0.996 4.176 -1.56 4.176 -2.256C4.176 -2.868 3.792 -3.228 3.456 -3.492C3.336 -3.588 2.952 -3.864 2.844 -3.924C3.096 -4.26 3.324 -4.608 3.564 -4.944C3.72 -5.16 3.936 -5.388 3.996 -5.652C4.008 -5.652 4.02 -5.832 4.02 -5.832S4.008 -6.084 3.984 -6.084C3.96 -6.228 3.9 -6.36 3.828 -6.492C3.6 -6.948 2.988 -7.248 2.436 -7.248C1.8 -7.248 1.152 -6.876 0.888 -6.396ZM1.008 -4.584C1.104 -4.716 1.2 -4.86 1.32 -4.98C1.872 -4.824 2.352 -4.584 2.88 -4.404L1.908 -3.024C1.884 -3.156 1.86 -3.3 1.824 -3.432C1.716 -3.744 1.548 -4.032 1.344 -4.272C1.236 -4.38 1.14 -4.512 1.008 -4.584ZM0.912 -1.176L2.256 -3.096C2.364 -3.036 2.46 -2.964 2.568 -2.892C2.976 -2.64 3.492 -2.304 3.492 -1.764C3.492 -1.452 3.348 -1.2 3.216 -1.032C3.168 -0.972 2.868 -0.6 2.784 -0.6C2.736 -0.6 2.676 -0.66 2.628 -0.684C2.088 -0.984 1.74 -1.116 0.912 -1.176Z"/>
+ <path id="g36" d="M0.984 -6.06C1.008 -6.06 1.044 -6.06 1.08 -6.06C1.26 -6.06 1.308 -6.132 1.38 -6.252C1.5 -6.444 1.608 -6.672 1.608 -6.936C1.608 -7.116 1.476 -7.2 1.296 -7.2C1.056 -7.2 0.96 -7.008 0.96 -6.756C0.96 -6.708 0.96 -6.648 0.96 -6.6C0.96 -6.42 0.984 -6.24 0.984 -6.06ZM0.204 -4.704V-4.692L0.372 -4.536H0.384L0.636 -4.8V-1.548C0.636 -1.476 0.636 -1.416 0.636 -1.344C0.636 -1.236 0.636 -1.128 0.66 -1.032C0.744 -0.564 0.996 -0.156 1.356 0.156H1.368C1.632 -0.168 1.884 -0.492 2.124 -0.84C2.076 -0.876 2.004 -0.948 1.944 -0.948C1.896 -0.948 1.788 -0.9 1.788 -0.9C1.668 -0.9 1.56 -1.008 1.5 -1.104C1.44 -1.236 1.44 -1.392 1.44 -1.536V-3.696C1.44 -3.828 1.44 -3.96 1.44 -4.092C1.44 -4.62 1.56 -4.908 1.848 -5.196C1.644 -5.388 1.464 -5.604 1.236 -5.772L1.128 -5.712C0.828 -5.364 0.516 -5.04 0.204 -4.704Z"/>
+ <path id="g37" d="M1.044 -3.696L1.164 -3.456C1.44 -3.54 1.716 -3.672 1.968 -3.816C2.16 -3.912 2.412 -4.104 2.412 -4.368C2.412 -4.488 2.376 -4.596 2.34 -4.728C2.256 -5.052 2.22 -5.448 1.98 -5.7C1.872 -5.796 1.728 -5.82 1.596 -5.82C1.512 -5.82 1.416 -5.808 1.332 -5.808C1.032 -5.808 0.792 -5.904 0.792 -6.204C0.792 -6.24 0.804 -6.288 0.804 -6.324C0.876 -6.912 1.392 -7.416 2.088 -7.416C2.628 -7.416 2.988 -7.104 3.252 -6.744C3.6 -6.24 3.72 -5.592 3.768 -4.992C3.768 -4.956 3.768 -4.908 3.768 -4.872C3.768 -4.788 3.768 -4.704 3.768 -4.62C3.768 -4.512 3.78 -4.392 3.78 -4.272C3.78 -4.02 3.756 -3.744 3.636 -3.516C3.42 -3.096 2.928 -2.892 2.424 -2.844C2.256 -2.832 2.088 -2.844 1.92 -2.832C1.152 -2.76 0.204 -2.316 0.204 -1.392C0.204 -1.104 0.312 -0.804 0.576 -0.804C0.792 -0.804 0.876 -1.02 0.876 -1.188C0.876 -1.332 0.828 -1.488 0.768 -1.572C0.756 -1.596 0.612 -1.776 0.612 -1.8C0.624 -1.836 0.648 -1.872 0.672 -1.896C0.828 -2.052 1.008 -2.172 1.296 -2.172C1.56 -2.172 1.848 -2.064 2.064 -1.92C2.724 -1.5 3.072 -0.756 3.66 -0.264C3.876 -0.084 4.104 0.06 4.38 0.12C4.392 0.12 4.668 0.18 4.668 0.156C4.8 0.144 4.92 0.06 5.04 -0L5.772 -0.324C6.216 -0.516 6.684 -0.684 7.092 -0.936C7.848 -1.392 8.544 -2.184 8.544 -3.336C8.544 -4.38 7.968 -5.448 6.924 -5.748C6.744 -5.808 6.564 -5.832 6.372 -5.832V-5.844L7.644 -6.48L7.572 -6.648C7.536 -6.636 7.5 -6.624 7.464 -6.624C7.452 -6.624 7.452 -6.624 7.44 -6.624C7.296 -6.624 7.188 -6.768 7.116 -6.888C7.02 -7.044 6.996 -7.224 6.948 -7.404C6.792 -7.86 6.492 -8.292 5.916 -8.292C5.184 -8.292 4.764 -7.668 4.536 -7.164C4.488 -7.032 4.416 -6.9 4.392 -6.768C4.32 -6.936 4.248 -7.116 4.152 -7.284C3.816 -7.896 3.24 -8.46 2.316 -8.46C2.088 -8.46 1.944 -8.412 1.752 -8.352C0.936 -8.028 0.528 -7.056 0.528 -6.18C0.528 -5.688 0.66 -5.076 1.02 -4.896C1.224 -4.8 1.464 -4.824 1.68 -4.8C1.908 -4.764 2.16 -4.656 2.16 -4.368C2.16 -4.224 2.064 -4.116 1.944 -4.044C1.68 -3.876 1.344 -3.804 1.044 -3.696ZM6.168 -5.724L4.704 -4.992V-4.98C4.884 -4.98 5.076 -4.968 5.256 -4.944C6.324 -4.812 7.572 -4.236 7.692 -2.952C7.692 -2.808 7.692 -2.664 7.656 -2.52C7.548 -1.968 7.164 -1.536 6.78 -1.152C6.528 -0.9 6.216 -0.576 5.784 -0.576C5.736 -0.576 5.688 -0.588 5.64 -0.588C4.8 -0.696 4.248 -1.452 3.696 -2.004C3.564 -2.136 3.42 -2.268 3.276 -2.388C3.18 -2.46 3.072 -2.52 2.988 -2.604C3.216 -2.604 3.468 -2.664 3.684 -2.736C4.32 -2.952 4.704 -3.408 4.704 -4.26C4.704 -4.416 4.692 -4.572 4.692 -4.728C4.668 -5.256 4.68 -5.652 4.572 -6.144C4.548 -6.216 4.524 -6.3 4.524 -6.384C4.524 -6.396 4.524 -6.408 4.524 -6.42C4.524 -6.492 4.548 -6.552 4.572 -6.624C4.668 -6.96 4.884 -7.356 5.316 -7.356C5.472 -7.356 5.616 -7.296 5.724 -7.164C5.868 -6.996 5.904 -6.768 5.952 -6.564C6 -6.276 6.048 -6 6.168 -5.724Z"/>
+ <path id="g38" d="M1.044 -5.808C0.768 -5.46 0.48 -5.124 0.204 -4.764C0.264 -4.728 0.324 -4.692 0.384 -4.644C0.648 -4.392 0.648 -4.068 0.648 -3.732V-1.488C0.648 -1.08 0.612 -0.72 0.204 -0.564C0.252 -0.516 0.336 -0.42 0.408 -0.42C0.456 -0.42 0.516 -0.432 0.552 -0.444C0.648 -0.456 0.744 -0.468 0.84 -0.468C0.996 -0.444 1.128 -0.42 1.272 -0.36C1.344 -0.324 1.416 -0.276 1.488 -0.24C1.44 -0.192 1.296 -0.072 1.296 -0C1.296 0.06 1.38 0.132 1.44 0.132C1.524 0.132 1.56 0.036 1.596 -0L1.848 -0.276C2.136 -0.612 2.472 -0.924 2.736 -1.272C2.688 -1.308 2.616 -1.38 2.556 -1.38S2.436 -1.308 2.4 -1.26L2.16 -0.996C2.112 -0.948 2.076 -0.876 2.004 -0.876C1.956 -0.876 1.92 -0.912 1.884 -0.936C1.764 -1.008 1.608 -1.068 1.5 -1.152C1.452 -1.2 1.452 -1.248 1.452 -1.296C1.452 -1.32 1.452 -1.332 1.452 -1.356V-3.864C1.452 -3.888 1.452 -3.912 1.452 -3.948C1.452 -4.14 1.596 -4.176 1.716 -4.272C1.908 -4.428 2.136 -4.56 2.304 -4.74H2.316C2.412 -4.62 2.52 -4.512 2.616 -4.392C3.096 -3.828 3.456 -2.964 3.456 -2.04C3.456 -1.884 3.444 -1.728 3.42 -1.572C3.276 -0.588 2.7 0.264 2.184 0.936C2.1 1.032 1.764 1.452 1.716 1.536C1.776 1.572 1.86 1.68 1.932 1.68C1.98 1.68 2.028 1.596 2.064 1.56L2.364 1.2C2.76 0.72 3.156 0.216 3.48 -0.324C3.876 -0.984 4.272 -1.752 4.272 -2.712C4.272 -3.84 3.744 -4.728 3.108 -5.364C3.216 -5.448 3.348 -5.508 3.42 -5.628L3.3 -5.808L1.452 -4.38C1.452 -4.404 1.464 -4.92 1.452 -4.92C1.416 -5.244 1.284 -5.58 1.044 -5.808Z"/>
+ <path id="g39" d="M1.068 -5.808L0.204 -4.764C0.42 -4.668 0.588 -4.476 0.648 -4.236C0.672 -4.104 0.672 -3.972 0.672 -3.84V-2.076C0.672 -1.896 0.684 -1.716 0.684 -1.524C0.684 -1.272 0.672 -0.972 0.552 -0.828C0.492 -0.744 0.396 -0.756 0.396 -0.6C0.396 -0.564 0.408 -0.504 0.408 -0.468C0.6 -0.408 0.72 -0.264 0.816 -0.096C0.888 0.024 0.888 0.168 1.08 0.168C1.116 0.168 1.164 0.156 1.2 0.156C1.272 -0.12 1.452 -0.384 1.74 -0.468V-0.72C1.488 -0.828 1.476 -1.056 1.476 -1.392V-4.212C1.476 -4.248 1.476 -4.296 1.476 -4.332C1.476 -4.488 1.548 -4.524 1.656 -4.596S1.86 -4.74 1.968 -4.824C2.016 -4.86 2.076 -4.92 2.148 -4.92S2.304 -4.8 2.352 -4.74C2.484 -4.572 2.628 -4.416 2.76 -4.248C2.868 -4.14 2.964 -4.08 2.964 -3.876C2.964 -3.804 2.952 -3.72 2.952 -3.636V-1.704C2.952 -1.572 2.964 -1.416 2.964 -1.284C2.964 -1.068 2.952 -0.924 2.832 -0.804C2.772 -0.744 2.688 -0.732 2.688 -0.6C2.688 -0.564 2.7 -0.504 2.7 -0.468C2.88 -0.408 3 -0.276 3.096 -0.12L3.192 0.048C3.216 0.132 3.264 0.168 3.372 0.168C3.408 0.168 3.456 0.156 3.492 0.156C3.552 -0.12 3.756 -0.384 4.032 -0.468V-0.72C3.78 -0.816 3.768 -1.08 3.768 -1.32C3.768 -1.356 3.768 -1.392 3.768 -1.428V-4.104C3.768 -4.164 3.768 -4.248 3.768 -4.308C3.768 -4.476 3.792 -4.476 3.912 -4.572L4.284 -4.836C4.32 -4.872 4.38 -4.92 4.44 -4.92S4.536 -4.86 4.572 -4.824C4.632 -4.74 4.98 -4.332 5.088 -4.212C5.136 -4.152 5.208 -4.092 5.232 -4.02C5.244 -4.02 5.244 -3.936 5.244 -3.936V-1.152C5.244 -1.104 5.244 -1.032 5.244 -0.984C5.244 -0.816 5.268 -0.756 5.328 -0.636C5.364 -0.564 5.556 -0.204 5.556 -0.144C5.556 -0.048 5.472 -0.012 5.472 0.072C5.472 0.144 5.58 0.204 5.64 0.228L6.48 -1.02V-1.032L6.276 -1.176L6.18 -1.008C6.096 -1.092 6.06 -1.128 6.06 -1.308C6.06 -1.344 6.06 -1.38 6.06 -1.416V-4.548C6.06 -4.572 6.06 -4.608 6.06 -4.632C6.06 -4.812 6.168 -4.86 6.324 -4.884V-5.052C6.012 -5.052 5.724 -5.196 5.508 -5.412C5.436 -5.496 5.364 -5.58 5.292 -5.676C5.268 -5.712 5.244 -5.772 5.196 -5.772C5.184 -5.772 5.184 -5.772 5.172 -5.772C5.136 -5.772 5.112 -5.748 5.076 -5.724C4.848 -5.556 3.828 -4.812 3.792 -4.812C3.78 -4.812 3.78 -4.812 3.768 -4.812C3.744 -4.812 3.732 -4.824 3.708 -4.848C3.516 -5.1 3.3 -5.328 3.108 -5.568C3.06 -5.616 2.976 -5.772 2.892 -5.772C2.856 -5.772 2.832 -5.748 2.796 -5.736C2.712 -5.664 2.616 -5.604 2.532 -5.544C2.184 -5.292 1.836 -5.016 1.476 -4.776C1.476 -5.148 1.344 -5.544 1.068 -5.808Z"/>
+ <path id="g40" d="M1.1088 -8.6544H1.0944C1.0224 -8.7408 0.936 -8.7984 0.8496 -8.8704L0.4464 -9.1872C0.3888 -9.2448 0.3024 -9.3456 0.216 -9.3456H0.2016C0.1152 -9.3456 0.0288 -9.2304 -0.0288 -9.1584C0.4896 -8.8416 0.7776 -8.3376 0.7776 -7.5168V-7.0128V-2.1312C0.6768 -2.0736 0.6192 -1.9296 0.5616 -1.8288C0.432 -1.584 0.2736 -1.3392 0.144 -1.0944L1.872 -0.0864C2.088 0.0432 2.2896 0.1872 2.5488 0.2736L2.7648 0.1872L4.9104 -1.0512L4.7664 -1.3536C4.7232 -2.6496 4.7664 -4.0464 4.752 -5.3712L4.9104 -5.688L3.7296 -6.4944C3.5856 -6.5952 3.456 -6.7104 3.2688 -6.7824L3.1392 -6.696L1.9872 -5.616V-7.56V-8.0352C1.9872 -8.2656 2.0016 -8.496 2.0736 -8.7264C2.1744 -9.0432 2.448 -9.432 2.8512 -9.432C3.0384 -9.432 3.1392 -9.3168 3.1824 -9.1296C3.24 -9.1728 3.3408 -9.2448 3.3408 -9.3456C3.3408 -9.5328 3.0816 -9.6336 2.9088 -9.6336C2.4192 -9.6336 2.016 -9.2592 1.7424 -9.0864C1.5408 -8.9424 1.296 -8.8272 1.1088 -8.6544ZM1.9872 -1.5984V-1.6992V-4.8816V-5.0112C1.9872 -5.184 2.0448 -5.2416 2.16 -5.328C2.232 -5.3856 2.5488 -5.7312 2.6352 -5.7456C2.7216 -5.7456 2.808 -5.6592 2.8656 -5.616L3.2832 -5.328C3.4128 -5.2272 3.5424 -5.2128 3.5424 -4.9824V-4.8672V-0.936V-0.792C3.5424 -0.7056 3.528 -0.6048 3.4416 -0.6048C3.3408 -0.6048 3.2112 -0.72 3.1392 -0.7632L2.3328 -1.224L2.1168 -1.3536C2.016 -1.3824 1.9872 -1.4688 1.9872 -1.5984Z"/>
+ <path id="g41" d="M1.1664 -8.4096C1.5408 -8.4096 1.9296 -8.3664 2.2464 -8.3088C3.168 -8.1216 4.2336 -7.6032 4.4208 -6.5808C4.4352 -6.5808 4.4352 -6.1056 4.4352 -6.1056C4.4208 -5.8752 4.3632 -5.6448 4.2768 -5.4288C3.8016 -4.248 2.592 -3.6 1.3968 -3.2544C1.1232 -3.1824 0.288 -2.9952 0.1584 -2.952L0.2736 -2.6208C0.4896 -2.6496 0.6912 -2.7072 0.9072 -2.7504L1.9872 -2.9952C2.7072 -3.1536 3.4272 -3.2832 4.0896 -3.6432C4.6944 -3.9888 5.1408 -4.4352 5.544 -5.0112C5.6016 -5.1408 5.6304 -5.256 5.8176 -5.256C5.8896 -5.256 6.5664 -5.1696 6.84 -5.1264C8.1648 -4.896 9.9216 -4.2912 9.9216 -2.5488C9.9216 -2.1168 9.8064 -1.6848 9.5616 -1.3248C9.2592 -0.864 8.6256 -0.432 7.8912 -0.432C7.4592 -0.432 7.0416 -0.576 6.6528 -0.7632C5.8464 -1.1376 5.1408 -1.7136 4.4352 -2.2464L3.816 -2.6928C3.7152 -2.7648 3.5712 -2.9232 3.4272 -2.9232C3.3552 -2.9232 0.4176 -2.2608 0.4176 -2.2608C0.432 -2.1888 0.4608 -2.1024 0.4896 -2.0304C0.5328 -1.8864 0.6624 -1.9296 0.8496 -1.9008C1.6992 -1.8432 2.3184 -1.5696 2.9808 -1.2528C4.2048 -0.7056 5.4432 0.1872 7.0992 0.1872C7.3296 0.1872 7.56 0.1584 7.776 0.1152C8.5824 -0.1008 9.2592 -0.432 9.8208 -0.9216C10.5264 -1.5264 11.1888 -2.376 11.1888 -3.6C11.1888 -4.9248 10.3536 -6.2784 9.0864 -6.408V-6.4224L9.5328 -6.696C9.8784 -7.0128 10.3392 -7.2432 10.6128 -7.632L10.4544 -7.8336L8.3088 -10.0512H8.2944L5.976 -7.8048C5.688 -8.6688 4.9968 -9.3312 4.1904 -9.7344C4.0608 -9.792 3.5712 -10.0368 3.4272 -10.0368C3.312 -10.0224 3.1824 -9.9216 3.096 -9.864L2.3616 -9.4032L1.5408 -8.8848L1.3104 -8.7408C1.224 -8.6832 1.1664 -8.6544 1.1664 -8.5104V-8.4096ZM9.072 -6.8256C8.9136 -6.7392 8.7552 -6.6384 8.5968 -6.552C7.8336 -6.1056 6.8832 -5.8176 5.8608 -5.6592C6.0048 -6.0192 6.0768 -6.3936 6.1056 -6.7824V-7.1568C6.0912 -7.2 6.0912 -7.2432 6.0912 -7.2864C6.0912 -7.488 6.264 -7.5744 6.3648 -7.6608C6.5088 -7.7904 6.6384 -7.9344 6.7824 -8.064C6.8544 -8.1216 7.2432 -8.568 7.344 -8.568C7.416 -8.568 7.488 -8.4672 7.5168 -8.4384L9.072 -6.8256Z"/>
+ <path id="g42" d="M1.176 -5.808L0.204 -4.74C0.564 -4.668 0.768 -4.404 0.768 -3.96C0.768 -3.888 0.768 -3.816 0.768 -3.744V-1.728C0.768 -1.596 0.768 -1.452 0.768 -1.308C0.768 -1.236 0.768 -1.176 0.768 -1.104C0.744 -0.828 0.48 -0.576 0.204 -0.564C0.276 -0.468 0.36 -0.384 0.528 -0.384C0.804 -0.336 1.044 -0.216 1.248 -0.096C1.296 -0.072 1.524 0.132 1.572 0.132C1.644 0.132 1.692 0.048 1.728 0.012C1.812 -0.096 3.06 -1.476 3.06 -1.476V-1.488L2.88 -1.632H2.868C2.688 -1.452 2.532 -1.26 2.364 -1.068C2.304 -1.008 2.232 -0.888 2.148 -0.876C2.064 -0.876 1.956 -0.96 1.896 -0.996L1.704 -1.116C1.62 -1.14 1.584 -1.2 1.584 -1.308C1.584 -1.344 1.584 -1.392 1.584 -1.428V-4.176C1.584 -4.212 1.584 -4.248 1.584 -4.296C1.584 -4.476 1.668 -4.512 1.776 -4.62C1.896 -4.74 2.016 -4.872 2.148 -4.98C2.412 -4.62 2.688 -4.272 2.964 -3.924H2.976L3.588 -4.536V-4.548L2.964 -5.34C2.856 -5.484 2.712 -5.628 2.652 -5.808L1.584 -4.752C1.584 -5.136 1.44 -5.532 1.176 -5.808Z"/>
+ <path id="g43" d="M1.1808 -7.128L0.504 -6.552C0.4464 -6.5088 0.3024 -6.4368 0.3024 -6.3504V-6.336C0.3024 -6.264 0.3888 -6.192 0.432 -6.1488L0.7776 -5.7312H0.5184C0.504 -4.3776 0.5472 -2.9664 0.504 -1.656C0.3168 -1.4544 0.1008 -1.2816 -0.1152 -1.0944V-1.08L1.0512 0.3024H1.0656L1.7424 -0.2736C1.8 -0.3168 1.944 -0.3888 1.944 -0.4752V-0.4896C1.944 -0.5616 1.8576 -0.6336 1.8144 -0.6768L1.4688 -1.0944H1.728C1.7424 -2.3472 1.6992 -3.6576 1.7424 -4.8816C2.1888 -5.328 2.7072 -5.688 3.1824 -6.1056L3.4704 -5.7312H3.2256C3.2112 -4.3776 3.2544 -2.9664 3.2112 -1.656C3.024 -1.4544 2.808 -1.2816 2.592 -1.1088C2.9664 -0.6192 3.3696 -0.1584 3.7584 0.3024H3.7728L4.68 -0.4608C4.5216 -0.6768 4.3488 -0.8928 4.176 -1.0944H4.4352C4.464 -2.3472 4.3776 -3.7152 4.464 -4.896C4.896 -5.328 5.4 -5.688 5.8608 -6.1056H5.8752L6.1776 -5.7312H5.9184V-1.728C5.9184 -1.6272 5.8464 -1.5696 5.7744 -1.512L5.4864 -1.2672C5.4288 -1.224 5.328 -1.1664 5.328 -1.08C5.328 -1.008 5.4 -0.9504 5.4288 -0.9216L5.6448 -0.6624C5.9184 -0.3456 6.192 -0.0288 6.4512 0.3024H6.4656L7.1424 -0.2592C7.2 -0.3168 7.344 -0.3888 7.344 -0.4752V-0.4896C7.344 -0.5616 7.2576 -0.6336 7.2288 -0.6768L6.8688 -1.0944H7.128C7.1424 -2.448 7.0992 -3.8592 7.1424 -5.1696C7.3296 -5.3712 7.5456 -5.544 7.7616 -5.7168C7.3872 -6.2064 6.984 -6.6672 6.5952 -7.128H6.5808L4.4352 -5.328V-6.3504H4.536L3.9024 -7.128C3.1536 -6.552 2.4624 -5.9184 1.728 -5.3136V-6.3504H1.8288C1.6272 -6.624 1.4112 -6.8832 1.1808 -7.128Z"/>
+ <path id="g44" d="M1.1808 -7.128L0.504 -6.552C0.4464 -6.5088 0.3024 -6.4368 0.3024 -6.3504V-6.336C0.3024 -6.264 0.3888 -6.192 0.432 -6.1488L0.7776 -5.7312H0.5184C0.504 -4.3776 0.5472 -2.9664 0.504 -1.656C0.3168 -1.4544 0.1008 -1.2816 -0.1152 -1.0944V-1.08L1.0512 0.3024H1.0656L1.7424 -0.2736C1.8 -0.3168 1.944 -0.3888 1.944 -0.4752V-0.4896C1.944 -0.5616 1.8576 -0.6336 1.8144 -0.6768L1.4688 -1.0944H1.728C1.7424 -2.3472 1.6992 -3.6576 1.7424 -4.8816C2.1888 -5.328 2.7072 -5.688 3.1824 -6.1056L3.4704 -5.7312H3.2256C3.2112 -4.3776 3.2544 -2.9664 3.2112 -1.656C3.024 -1.4544 2.808 -1.2816 2.592 -1.1088C2.9664 -0.6192 3.3696 -0.1584 3.7584 0.3024H3.7728L4.68 -0.4608C4.5216 -0.6768 4.3488 -0.8928 4.176 -1.0944H4.4352V-4.6656V-4.968C4.4352 -5.1696 4.4496 -5.2128 4.5792 -5.3136L4.8816 -5.5728C4.9248 -5.616 5.0256 -5.6736 5.0256 -5.7456C5.0256 -5.8032 4.968 -5.8464 4.9392 -5.8896C4.68 -6.2064 4.0608 -6.912 3.9024 -7.128C3.1536 -6.552 2.4624 -5.9184 1.728 -5.3136V-6.3504H1.8288C1.6272 -6.624 1.4112 -6.8832 1.1808 -7.128Z"/>
+ <path id="g45" d="M1.1808 -7.128L0.504 -6.552C0.4464 -6.5088 0.3024 -6.4368 0.3024 -6.3504V-6.336C0.3024 -6.264 0.3888 -6.192 0.432 -6.1488L0.7776 -5.7312H0.5184C0.504 -4.3776 0.5472 -2.9664 0.504 -1.656C0.3168 -1.4544 0.1008 -1.2816 -0.1152 -1.0944V-1.08L1.0512 0.3024H1.0656L3.2256 -1.512C3.2256 -1.1088 3.2256 -0.7056 3.24 -0.3312C3.3984 -0.1008 3.5856 0.1008 3.7584 0.3024H3.7728L4.68 -0.4608C4.5216 -0.6768 4.3488 -0.8928 4.176 -1.0944H4.4352V-4.6656V-4.968C4.4352 -5.1696 4.4496 -5.2128 4.5792 -5.3136L4.8816 -5.5728C4.9248 -5.616 5.0256 -5.6736 5.0256 -5.7456C5.0256 -5.8032 4.968 -5.8464 4.9392 -5.8896C4.68 -6.2064 4.0608 -6.912 3.9024 -7.128C3.5856 -6.8832 3.2688 -6.624 2.9664 -6.3648L3.4704 -5.7312H3.2256C3.1968 -4.4784 3.2832 -3.1248 3.1968 -1.944C2.8512 -1.6272 2.4912 -1.3248 2.1312 -1.0224C2.016 -0.936 1.9296 -0.8208 1.7856 -0.7632C1.656 -0.8496 1.5696 -0.9792 1.4688 -1.0944H1.728C1.7424 -2.448 1.6992 -3.8592 1.7424 -5.1696C1.9296 -5.3712 2.1456 -5.544 2.3616 -5.7312V-5.7456L1.1808 -7.128Z"/>
+ <path id="g46" d="M1.1808 -7.128L0.504 -6.552C0.4464 -6.5088 0.3024 -6.4368 0.3024 -6.3504V-6.336C0.3024 -6.264 0.3888 -6.192 0.432 -6.1488L0.7776 -5.7312H0.5184V-1.5264C0.5184 -1.2096 0.5184 -0.9072 0.4608 -0.5904C0.3744 -0.0864 0.1872 0.432 0.1872 0.9504C0.1872 1.296 0.288 1.584 0.432 1.8432C0.6336 2.16 0.9648 2.4336 1.44 2.4336C1.9584 2.4336 2.4192 2.016 2.4192 1.4832C2.4192 1.1664 2.1888 0.8784 1.8288 0.8784C1.4832 0.8784 1.2096 1.1088 1.2096 1.4832C1.2096 1.6272 1.2528 1.7712 1.3536 1.8864C1.44 1.9872 1.5552 2.0304 1.6704 2.0736C1.5984 2.1024 1.512 2.1168 1.44 2.1168C0.8928 2.1168 0.5616 1.4976 0.5616 0.9072C0.5616 0.216 0.9792 -0.3744 1.4976 -0.648C1.7424 -0.7776 4.536 -1.656 4.536 -1.656C4.4784 -1.8576 4.4208 -1.9008 4.4208 -2.16C4.4208 -2.304 4.4352 -2.448 4.4352 -2.5776V-4.68V-4.9824C4.4352 -5.184 4.4496 -5.2128 4.5792 -5.3136L4.8816 -5.5728C4.9248 -5.616 5.0256 -5.6736 5.0256 -5.7456C5.0256 -5.8032 4.968 -5.8464 4.9392 -5.8896C4.68 -6.2064 4.0608 -6.912 3.9024 -7.128C3.1536 -6.552 2.4624 -5.9184 1.728 -5.3136V-6.3504H1.8288C1.6272 -6.624 1.4112 -6.8832 1.1808 -7.128ZM3.2256 -5.7312V-1.8864V-1.728C3.2256 -1.584 3.168 -1.5552 3.0528 -1.512C2.6928 -1.4112 1.9728 -1.1664 1.728 -1.08C1.7424 -2.3472 1.6992 -3.6576 1.7424 -4.8816C2.1888 -5.328 2.7072 -5.688 3.1824 -6.1056L3.4704 -5.7312H3.2256Z"/>
+ <path id="g47" d="M1.188 -5.808L0.204 -4.548V-4.536L0.384 -4.392H0.396C0.432 -4.44 0.588 -4.668 0.648 -4.668C0.744 -4.668 0.828 -4.488 0.852 -4.452C0.96 -4.248 0.972 -4.032 0.972 -3.804C0.972 -3.768 0.972 -3.72 0.972 -3.684V-1.368C0.972 -1.332 0.972 -1.284 0.972 -1.248C0.972 -0.936 0.744 -0.828 0.492 -0.756V-0.504C0.924 -0.504 1.296 -0.276 1.512 0.024C1.56 0.084 1.584 0.156 1.692 0.156C1.86 0.156 1.98 -0.036 2.088 -0.144L3.12 -1.176C3.24 -0.9 3.384 -0.624 3.516 -0.348C3.564 -0.252 3.648 -0.132 3.648 -0.024C3.648 -0 3.636 0.012 3.636 0.036L3.84 0.156L4.776 -1.344L4.56 -1.464C4.524 -1.404 4.38 -1.14 4.332 -1.128C4.296 -1.128 4.272 -1.14 4.248 -1.164C4.056 -1.308 3.936 -1.536 3.936 -1.848C3.936 -1.92 3.936 -1.992 3.936 -2.052V-3.888C3.936 -4.092 3.936 -4.308 3.936 -4.524C3.936 -4.728 3.924 -4.968 4.02 -5.088C4.044 -5.136 4.116 -5.16 4.128 -5.208C4.14 -5.208 4.14 -5.352 4.14 -5.352C3.9 -5.4 3.684 -5.568 3.612 -5.808C3.588 -5.808 3.564 -5.808 3.54 -5.808C3.444 -5.808 3.432 -5.76 3.396 -5.7C3.312 -5.52 3.096 -5.4 2.916 -5.352C2.916 -5.328 2.916 -5.304 2.916 -5.28C2.916 -5.16 3.024 -5.112 3.06 -5.052C3.12 -4.92 3.12 -4.764 3.12 -4.584C3.12 -4.416 3.12 -4.248 3.12 -4.092V-1.932C3.12 -1.848 3.132 -1.764 3.132 -1.68C3.132 -1.488 3.06 -1.464 2.94 -1.344L2.52 -0.924C2.472 -0.876 2.388 -0.756 2.316 -0.756C2.256 -0.756 2.208 -0.816 2.172 -0.84L1.932 -1.056C1.848 -1.116 1.788 -1.164 1.788 -1.308V-3.54C1.788 -4.056 1.776 -4.536 1.608 -5.028C1.536 -5.256 1.332 -5.664 1.188 -5.808Z"/>
+ <path id="g48" d="M1.1952 -7.6608L1.4688 -7.5168C1.4544 -7.56 1.4544 -7.6176 1.4544 -7.6752C1.4544 -7.848 1.512 -8.0352 1.584 -8.1936C1.7712 -8.6544 2.2896 -9.0144 2.8512 -9.0144C3.0384 -9.0144 3.2112 -8.9856 3.384 -8.9136C3.7728 -8.7552 4.104 -8.4528 4.536 -8.4528C5.112 -8.4528 5.472 -8.856 5.8176 -9.2016C5.6448 -8.9712 5.4144 -8.784 5.2128 -8.568C4.6944 -8.0208 4.2048 -7.4736 3.9168 -6.768C3.8448 -6.5808 3.7728 -6.3792 3.744 -6.1776C3.4848 -6.3504 3.168 -6.4512 2.8656 -6.4512C2.3616 -6.4512 1.8144 -6.1488 1.6272 -5.7168C2.16 -5.7168 2.6928 -5.5296 3.1104 -5.184C3.2256 -5.0832 3.5568 -4.8096 3.5568 -4.608C3.5568 -4.5504 3.5424 -4.4928 3.5424 -4.4352C3.3408 -4.536 3.1104 -4.5936 2.88 -4.5936C2.4336 -4.5936 1.9872 -4.392 1.7856 -3.9456C2.3328 -3.9456 2.8224 -3.6 3.024 -3.096C3.0816 -2.9664 3.1248 -2.808 3.1248 -2.664C3.1248 -2.5056 2.9952 -2.3472 2.9376 -2.2608C2.5488 -1.656 1.9728 -1.1376 1.3536 -0.7776C1.152 -0.6624 0.9216 -0.576 0.7056 -0.4752C0.5184 -0.3744 0.3312 -0.2592 0.144 -0.1728L0.2592 0.1296C0.4176 0.0576 0.576 -0.0288 0.7344 -0.1008C1.7568 -0.5904 3.0384 -0.9648 4.3776 -0.9648C5.7456 -0.9648 6.9408 -0.5184 7.8336 0.3024H7.848L9.5184 -1.944V-1.9584L9.2736 -2.1456H9.2592C8.9856 -1.8288 8.6976 -1.656 8.136 -1.656C7.6032 -1.656 7.1712 -1.7712 6.6672 -1.8C6.5808 -1.8 5.7168 -1.8288 5.7168 -1.8C5.5152 -1.7856 5.328 -1.7568 5.1264 -1.7568V-1.7712C5.4144 -1.944 5.6736 -2.232 5.8896 -2.4912C6.5088 -3.2544 6.8976 -4.2048 6.8976 -5.256C6.8976 -5.688 6.8544 -6.1344 6.8256 -6.552C6.8112 -6.552 6.7824 -7.1568 6.7968 -7.1568C6.8112 -7.5168 6.8688 -7.8624 7.0272 -8.1936C7.344 -8.856 8.0496 -9.1584 8.7552 -9.1584V-9.4032H8.5536C8.0064 -9.4032 7.4592 -9.3888 6.9552 -9.1872C6.8112 -9.1152 6.6816 -9.0432 6.552 -8.9568C5.5584 -8.1792 5.6304 -6.6528 5.5728 -5.2848V-4.8816C5.544 -4.0896 5.472 -3.2688 5.0688 -2.5632C4.8816 -2.2464 4.5504 -1.8432 4.248 -1.6704C4.1472 -1.5984 4.032 -1.5984 3.9168 -1.5696C3.744 -1.5408 3.5568 -1.4976 3.384 -1.4544V-1.4688C3.816 -1.6704 4.3344 -2.1744 4.5648 -2.5488C4.968 -3.1392 5.0976 -3.888 5.0976 -4.824V-5.4864C5.0976 -5.8032 5.0976 -6.1056 5.1408 -6.4224C5.2848 -7.3008 5.688 -7.9632 6.1056 -8.6256C6.264 -8.9136 6.5808 -9.5472 6.7824 -9.7488C6.8256 -9.792 6.912 -9.8496 6.912 -9.9216C6.912 -10.008 6.8256 -10.0944 6.7824 -10.1664C6.3792 -9.936 6.1344 -9.36 5.5296 -9.36C5.2848 -9.36 5.0688 -9.432 4.8384 -9.5472C4.3488 -9.792 3.9744 -10.1664 3.312 -10.1664C2.5056 -10.152 2.0592 -9.36 1.728 -8.7264C1.6416 -8.568 1.1952 -7.6752 1.1952 -7.6608ZM6.1344 -9.5616C6.1344 -9.5616 6.0624 -9.4752 6.0624 -9.4752S6.1344 -9.5616 6.1344 -9.5616ZM5.9472 -9.3456L6.048 -9.4608L5.9472 -9.3456ZM5.8176 -9.2016L5.9472 -9.3456L5.8176 -9.2016Z"/>
+ <path id="g49" d="M1.284 -6.78C1.2 -6.696 1.116 -6.6 1.02 -6.516C0.66 -6.18 0.204 -5.784 0.204 -5.256C0.204 -5.004 0.432 -4.872 0.6 -4.728C0.732 -4.62 0.84 -4.476 0.924 -4.32C1.152 -3.888 1.164 -3.408 1.164 -2.928V-1.632C1.164 -1.548 1.164 -1.464 1.164 -1.38C1.164 -1.056 1.068 -0.816 0.744 -0.756V-0.516C0.936 -0.576 1.116 -0.672 1.332 -0.672C1.836 -0.672 2.316 -0.336 2.46 0.156C2.496 0.156 2.544 0.168 2.58 0.168C2.628 0.168 2.664 0.156 2.7 0.132C2.772 0.096 2.94 -0.192 2.952 -0.216L3.48 -1.08C3.912 -1.776 4.308 -2.544 4.308 -3.372C4.308 -4.248 3.876 -4.932 3.432 -5.316C3.372 -5.376 3.3 -5.436 3.228 -5.472C3.24 -5.508 3.3 -5.508 3.3 -5.556L3.12 -5.724L1.788 -4.344C1.728 -4.62 1.488 -4.992 1.344 -5.148C1.176 -5.328 0.888 -5.496 0.888 -5.76C0.888 -5.796 0.888 -5.82 0.9 -5.856C0.9 -5.916 0.924 -5.964 0.948 -6.012C1.056 -6.228 1.32 -6.456 1.464 -6.6V-6.612L1.284 -6.78ZM3.084 -0.852C2.724 -1.044 2.544 -1.236 1.98 -1.236C1.98 -1.692 1.98 -2.148 1.98 -2.592C1.98 -2.82 1.98 -3.048 1.98 -3.276C1.98 -3.456 1.956 -3.636 1.932 -3.804C1.92 -3.864 1.884 -3.948 1.884 -4.008C1.884 -4.128 1.992 -4.188 2.052 -4.248L2.436 -4.644C2.484 -4.692 2.568 -4.824 2.64 -4.824S2.796 -4.704 2.844 -4.656C3.288 -4.176 3.636 -3.492 3.636 -2.664C3.636 -2.052 3.468 -1.584 3.24 -1.128C3.18 -1.032 3.12 -0.948 3.084 -0.852Z"/>
+ <path id="g50" d="M1.32 2.7C1.572 2.172 1.788 1.62 2.028 1.092L2.508 -0.012L2.76 -0.576C2.82 -0.684 2.868 -0.792 2.868 -0.924C2.868 -0.936 2.868 -0.948 2.868 -0.96C2.808 -1.332 2.532 -1.584 2.124 -1.584C1.932 -1.584 1.74 -1.524 1.596 -1.392C1.38 -1.2 1.356 -0.912 1.308 -0.54C1.176 0.12 0.72 2.268 0.72 2.292C0.72 2.4 0.804 2.4 0.888 2.46C1.032 2.544 1.176 2.628 1.32 2.7Z"/>
+ <path id="g51" d="M1.332 -1.728L0.204 -1.524C0.276 -0.96 0.348 -0.408 0.408 0.156C0.528 0.108 0.636 0.036 0.756 -0.012C1.14 -0.18 1.56 -0.252 2.088 -0.252C2.7 -0.36 2.904 -1.032 2.952 -1.596C2.964 -1.596 2.964 -2.352 2.952 -2.352C2.916 -3.156 2.784 -3.792 2.448 -4.38L3.072 -4.5C3.12 -4.26 3.564 -3.144 3.576 -3.108C4.104 -1.656 4.248 -1.14 5.076 0.156C5.58 -0.336 6.084 -0.816 6.552 -1.332L6.564 -1.584C6.348 -1.416 6.096 -1.248 5.772 -1.248C5.412 -1.248 5.268 -1.632 5.172 -1.86C5.076 -2.1 4.152 -4.584 4.152 -4.68C4.152 -4.728 4.188 -4.752 4.236 -4.752C4.32 -4.776 4.932 -4.896 5.148 -4.944C5.22 -4.956 5.388 -4.968 5.388 -5.064C5.388 -5.076 5.388 -5.088 5.388 -5.1C5.376 -5.16 5.364 -5.208 5.352 -5.268C5.304 -5.256 5.232 -5.232 5.172 -5.232S5.088 -5.292 5.088 -5.352C5.064 -5.436 5.04 -5.532 5.028 -5.616L4.884 -6.288C4.86 -6.408 4.824 -6.528 4.812 -6.648L5.016 -6.708C5.04 -6.792 5.004 -6.876 4.992 -6.96C4.644 -6.888 4.26 -6.852 3.9 -6.852C3.792 -6.852 3.696 -6.852 3.588 -6.852C3.408 -6.852 3.228 -6.84 3.048 -6.792C2.376 -6.588 1.98 -5.88 1.98 -5.016C1.74 -5.28 1.452 -5.652 1.452 -6.084C1.452 -6.18 1.464 -6.288 1.488 -6.372C1.632 -7.356 2.604 -8.124 3.756 -8.124C5.028 -8.124 6.132 -7.164 6.132 -5.88C6.132 -5.076 5.736 -4.572 5.28 -4.176V-4.164L5.472 -3.996C6 -4.38 6.396 -5.1 6.396 -5.88C6.396 -6.492 6.168 -7.116 5.736 -7.596C5.208 -8.172 4.488 -8.46 3.732 -8.46C3.588 -8.46 3.444 -8.448 3.3 -8.424C1.98 -8.22 1.02 -7.092 0.684 -5.844C0.612 -5.604 0.54 -5.088 0.54 -4.824C0.54 -4.764 0.54 -4.716 0.564 -4.668C0.672 -4.488 1.128 -4.02 1.2 -3.948L1.608 -3.516C2.088 -3.012 2.676 -2.364 2.676 -1.56C2.676 -1.116 2.46 -0.516 1.98 -0.516C1.464 -0.516 1.332 -1.272 1.332 -1.728ZM4.032 -4.98C3.888 -4.968 2.448 -4.644 2.448 -4.644C2.424 -4.644 2.388 -4.632 2.364 -4.632S2.328 -4.632 2.316 -4.644C2.244 -4.68 2.232 -5.028 2.232 -5.088C2.232 -5.172 2.244 -5.256 2.256 -5.352C2.328 -5.832 2.616 -6.42 3.216 -6.42C3.444 -6.42 3.612 -6.3 3.708 -6.144C3.876 -5.856 3.984 -5.316 4.032 -4.98Z"/>
+ <path id="g52" d="M1.368 -6.3648C0.9936 -6.048 0.4752 -5.472 0.4752 -4.824V-4.7952C0.4752 -4.032 1.0224 -3.4416 1.6704 -3.1104C2.16 -2.8656 2.6928 -2.7792 3.2112 -2.7792C3.4992 -2.7792 3.7728 -2.808 4.0464 -2.8368L3.8592 -2.1888C2.6496 -2.1888 1.4976 -2.1024 0.7488 -1.5264C0.4464 -1.3248 0.1872 -0.9648 0.1872 -0.4896C0.1872 -0.2304 0.2736 0.0288 0.432 0.2304C0.7344 0.6192 1.2528 0.792 1.9008 0.792C3.1968 0.792 4.4352 0.5184 5.3424 0.0576C5.4144 0.0144 5.7024 -0.1584 5.7888 -0.1584S6.3936 0.1728 6.552 0.3024H6.5664C7.1712 -0.3024 8.0352 -1.0656 8.568 -1.6848C9.2592 -2.5344 10.008 -3.6432 10.008 -5.0544C10.008 -5.5008 9.8928 -5.9328 9.6192 -6.2928C9.1872 -6.84 8.6256 -7.1424 7.6176 -7.1424H7.416C7.0848 -7.1424 5.8032 -7.0704 5.5728 -7.0272L6.4512 -10.08L6.1344 -10.1664L5.9328 -9.432C5.7168 -9.504 3.2544 -10.152 3.2112 -10.152C3.0528 -10.152 2.9376 -9.9792 2.8656 -9.9216C2.6064 -9.6912 1.4976 -8.7552 1.368 -8.6544L1.1088 -8.424C0.9936 -8.3376 0.9216 -8.2944 0.9216 -8.1072V-7.8192C0.9216 -7.4304 0.9936 -7.056 1.1664 -6.7104C1.224 -6.5952 1.368 -6.3648 1.368 -6.3648ZM5.5008 -8.0064V-7.9776C5.5008 -7.9056 5.472 -7.8192 5.4576 -7.7616C5.4144 -7.632 5.2848 -7.0848 5.1984 -7.0272C5.112 -6.9552 4.2336 -6.9552 4.2192 -6.9552H3.7584H3.5424C3.1536 -6.9552 2.7648 -6.9696 2.4048 -7.0992C2.0304 -7.2288 1.6992 -7.5312 1.6992 -8.0352C1.6992 -8.4672 1.9584 -8.7408 2.4768 -8.7408H2.5776C3.1824 -8.7408 4.1472 -8.4528 4.5216 -8.3376L5.2704 -8.1216C5.3424 -8.1072 5.5008 -8.0928 5.5008 -8.0064ZM4.5072 -4.4352C3.9456 -4.4208 3.96 -4.3776 3.3408 -4.3776C2.8944 -4.3776 2.3616 -4.4064 2.0304 -4.5072C1.6704 -4.6224 1.3248 -4.896 1.296 -5.2992C1.296 -5.688 1.4112 -5.7888 1.5696 -6.0912C1.9872 -5.7312 2.4192 -5.4144 3.1968 -5.4144C3.2832 -5.4144 3.3552 -5.4288 3.4416 -5.4288C3.9024 -5.4432 4.3488 -5.472 4.8096 -5.5008L4.5072 -4.4352ZM4.8384 -4.464L5.0544 -5.2128C5.0832 -5.2992 5.0976 -5.4576 5.1696 -5.5152C5.2128 -5.5584 5.2992 -5.5584 5.3856 -5.5584H5.5008C5.8752 -5.6016 8.0352 -5.8032 8.0352 -5.7024C8.3808 -5.6592 8.712 -5.5008 8.9568 -5.256S9.4464 -4.5504 9.4464 -4.104C9.4464 -3.4272 9.0144 -2.7792 8.6112 -2.2608C8.4528 -2.0592 7.7904 -1.2672 7.6608 -1.2672H7.632C7.5888 -1.2672 7.3152 -1.44 7.2144 -1.4832C7.3728 -1.728 7.488 -1.9728 7.6032 -2.232C7.8192 -2.6208 8.1792 -3.312 8.1792 -3.7296C8.1792 -3.9168 8.1216 -4.104 7.9776 -4.2768C7.7616 -4.5216 7.4304 -4.5648 7.1136 -4.5648C6.5376 -4.5648 5.1408 -4.5072 4.8384 -4.464ZM6.8544 -1.6704C6.0048 -2.0016 5.0976 -2.1888 4.1904 -2.1888C4.2192 -2.304 4.3488 -2.8224 4.4208 -2.88C4.4784 -2.9088 4.5648 -2.9088 4.6368 -2.9232L5.112 -3.0096C5.2416 -3.024 5.3712 -3.0528 5.5008 -3.0672C5.5728 -3.0816 6.6528 -3.2112 6.6528 -3.1392C6.9264 -3.0816 7.1856 -2.808 7.1856 -2.4768C7.1856 -2.1744 6.9696 -1.944 6.8544 -1.6704ZM5.4 -0.3456C5.256 -0.288 5.1264 -0.2016 4.9968 -0.144C4.1904 0.2592 3.024 0.4896 1.9152 0.4896C1.5408 0.4896 1.1376 0.3744 0.9792 -0.0144C0.936 -0.0864 0.9216 -0.1584 0.9216 -0.2448C0.9216 -0.8352 1.5696 -1.0224 2.0736 -1.0224C2.4768 -1.0224 2.8656 -0.936 3.2544 -0.864C3.9744 -0.7488 4.7232 -0.6336 5.4 -0.3456Z"/>
+ <path id="g53" d="M1.392 -6.204C1.452 -6.168 1.524 -6.096 1.596 -6.096C1.632 -6.096 1.668 -6.132 1.704 -6.156C2.04 -6.396 2.268 -6.936 2.268 -7.428C2.268 -7.656 2.112 -7.812 1.896 -7.812C1.8 -7.812 1.704 -7.776 1.62 -7.716C1.416 -7.536 1.476 -7.296 1.428 -6.96C1.416 -6.96 1.416 -6.792 1.416 -6.684C1.416 -6.564 1.428 -6.204 1.392 -6.204ZM3.144 -7.416C3.12 -7.416 3.108 -7.2 3.108 -7.02C3.108 -6.888 3.12 -6.552 3.108 -6.552C3.096 -6.48 3.096 -6.42 3.084 -6.348C3.084 -6.324 3.084 -6.3 3.084 -6.264C3.084 -6.156 3.18 -6.096 3.276 -6.096C3.312 -6.096 3.348 -6.132 3.384 -6.156C3.708 -6.396 3.948 -6.996 3.948 -7.428C3.948 -7.644 3.792 -7.812 3.576 -7.812C3.324 -7.812 3.18 -7.632 3.144 -7.416ZM0.216 -1.14V-1.116C0.504 -0.948 1.884 -0.096 2.088 0.048C2.124 0.084 2.172 0.132 2.232 0.132C2.232 0.132 2.244 0.132 2.244 0.132C2.28 0.12 2.868 -0.564 3.132 -0.984C3.624 -1.764 3.828 -2.712 3.828 -3.636C3.828 -4.488 3.66 -5.184 3.264 -5.808L1.176 -4.968L0.66 -4.752C0.54 -4.704 0.468 -4.716 0.468 -4.536C0.468 -4.488 0.468 -4.452 0.468 -4.416V-1.728C0.468 -1.704 0.468 -1.68 0.468 -1.656C0.468 -1.488 0.456 -1.332 0.324 -1.212L0.216 -1.14ZM2.712 -0.828C2.688 -0.792 2.652 -0.72 2.604 -0.72C2.568 -0.72 2.544 -0.732 2.52 -0.744C2.148 -0.984 2.028 -1.056 1.572 -1.332L1.38 -1.452C1.308 -1.5 1.26 -1.524 1.26 -1.644C1.26 -1.704 1.272 -1.764 1.272 -1.812V-3.936C1.272 -3.996 1.272 -4.68 1.272 -4.68C1.296 -4.776 1.44 -4.812 1.524 -4.836C1.776 -4.944 2.04 -5.04 2.292 -5.148C2.352 -5.172 2.448 -5.232 2.52 -5.232C2.556 -5.232 2.58 -5.22 2.604 -5.196C2.652 -5.112 2.688 -5.004 2.724 -4.908C2.988 -4.212 3.096 -3.312 3.096 -2.4C3.096 -1.824 2.976 -1.164 2.712 -0.828Z"/>
+ <path id="g54" d="M1.428 -5.808C1.14 -5.364 0.828 -4.944 0.552 -4.488L0.54 -4.248C0.66 -4.344 0.792 -4.452 0.96 -4.452C1.392 -4.452 1.704 -3.96 1.704 -3.6C1.704 -2.988 1.104 -2.724 0.78 -2.448C0.696 -2.388 0.648 -2.328 0.648 -2.208C0.648 -2.16 0.648 -2.124 0.648 -2.088L1.14 -2.004C1.044 -1.884 0.936 -1.788 0.852 -1.668C0.492 -1.224 0.204 -0.576 0.204 0.168C0.204 0.78 0.408 1.392 0.912 1.776C1.116 1.92 1.428 2.064 1.752 2.064C1.92 2.064 2.1 2.028 2.22 1.98C2.916 1.692 3.276 0.864 3.276 -0.036C3.276 -0.588 3.12 -1.152 2.868 -1.632C2.712 -1.92 2.52 -2.16 2.304 -2.4C2.544 -2.496 2.808 -2.544 3.096 -2.592C3.072 -2.664 3.012 -2.796 2.904 -2.796C2.856 -2.796 2.46 -2.724 2.316 -2.676C2.268 -2.652 2.184 -2.616 2.124 -2.616C2.112 -2.616 2.112 -2.616 2.1 -2.616C2.04 -2.628 1.776 -2.844 1.68 -2.892C1.764 -2.988 1.86 -3.072 1.956 -3.156C2.232 -3.444 2.496 -3.792 2.496 -4.32C2.496 -5.04 2.004 -5.592 1.428 -5.808ZM0.564 0.324C0.564 0.228 0.576 0.12 0.576 0.024C0.6 -0.468 0.78 -0.972 1.056 -1.38C1.104 -1.452 1.368 -1.812 1.452 -1.812C1.5 -1.8 1.548 -1.752 1.584 -1.728C2.124 -1.248 2.424 -0.336 2.424 0.54C2.424 0.744 2.388 0.936 2.304 1.116C2.16 1.428 1.812 1.716 1.404 1.716C1.248 1.716 1.092 1.668 0.96 1.548C0.624 1.248 0.612 0.744 0.564 0.324Z"/>
+ <path id="g55" d="M1.44 -7.128C1.224 -6.9264 0.9936 -6.7536 0.7632 -6.552C0.7056 -6.5088 0.5616 -6.4368 0.5616 -6.3504V-6.336C0.5616 -6.264 0.648 -6.192 0.6912 -6.1488L1.0368 -5.7312H0.7776V-1.9728L0.432 -2.1456L-0.1728 -1.0944C0.0432 -0.9792 0.2592 -0.864 0.4752 -0.7632C0.6336 -0.6912 0.7776 -0.6624 0.7776 -0.432V-0.3312V0.2304V0.5904C0.7776 1.0656 0.7632 1.5408 0.576 1.9872C0.4752 2.2032 0.3456 2.376 0.2016 2.5632L0.4896 2.7072L1.0944 1.8288C1.3824 2.0304 1.6848 2.2176 1.9728 2.4048C2.232 2.5776 2.52 2.808 2.9088 2.808C3.096 2.808 3.3408 2.6928 3.3408 2.52C3.3408 2.4192 3.24 2.3472 3.1824 2.304C3.1392 2.4912 3.0528 2.6064 2.8368 2.6064C2.5056 2.6064 2.2608 2.2896 2.16 2.1024C1.9872 1.7856 1.9872 1.4256 1.9872 1.08V0.0144C2.1744 0.1152 2.3472 0.216 2.5488 0.288C3.1536 -0.0144 3.7008 -0.3744 4.3056 -0.6912L4.4496 -0.6336C4.8816 -0.3312 5.2992 -0.0144 5.7456 0.2736L5.9184 0.2304C6.4224 -0.072 6.9696 -0.3312 7.4304 -0.6768L7.4592 -0.9648C7.2144 -0.8496 6.9408 -0.648 6.6672 -0.648H6.6096C6.4368 -0.6768 6.12 -0.9504 6.0336 -1.008L5.5728 -1.3248C5.4576 -1.4112 5.2992 -1.44 5.2992 -1.6416C5.2992 -1.6992 5.3136 -1.7568 5.3136 -1.8V-2.3616V-2.5056C5.3136 -2.736 5.4144 -2.7936 5.544 -2.9376L6.0336 -3.5136L7.776 -5.5728V-5.5872L6.2352 -7.128H6.2208C5.832 -6.7824 5.4288 -6.4656 4.9824 -6.2064C4.968 -6.2064 4.5072 -5.9184 4.5072 -5.976C4.4064 -6.0048 4.3056 -6.1056 4.2192 -6.1632L3.816 -6.4368C3.7296 -6.4944 3.6432 -6.5664 3.5424 -6.6096C3.6288 -6.696 3.7152 -6.7968 3.7872 -6.8976L3.6144 -7.128L3.1968 -6.7536C2.9232 -6.5232 2.7216 -6.2208 2.3904 -6.048L2.2896 -6.1344C2.0016 -6.4656 1.7424 -6.8112 1.44 -7.128ZM2.6064 -5.76C2.7504 -5.7456 3.2832 -5.3136 3.2976 -5.3136C3.4272 -5.2416 3.5424 -5.1984 3.5424 -4.9824V-4.8384V-0.9648C3.5424 -0.9216 3.5568 -0.864 3.5568 -0.792S3.5424 -0.648 3.4848 -0.6192C3.456 -0.6192 3.3552 -0.6192 3.3552 -0.648C3.2832 -0.6768 2.5776 -1.0512 2.304 -1.1808C2.1456 -1.2528 1.9872 -1.2816 1.9872 -1.5264V-1.656V-4.8384V-4.9968C1.9872 -5.2128 2.0592 -5.256 2.1888 -5.3568C2.3328 -5.4864 2.4768 -5.6016 2.6208 -5.7168L2.6064 -5.76ZM5.3136 -3.1824V-5.7888V-5.9184C5.3136 -6.0336 5.3712 -6.1056 5.472 -6.1056C5.5296 -6.1056 5.5728 -6.0624 5.6016 -6.0336L6.408 -5.2272C6.5232 -5.112 6.6384 -4.9824 6.768 -4.8816L5.3136 -3.1824Z"/>
+ <path id="g56" d="M1.44 -7.128C1.224 -6.9264 0.9936 -6.7536 0.7632 -6.552C0.7056 -6.5088 0.5616 -6.4368 0.5616 -6.3504V-6.336C0.5616 -6.264 0.648 -6.192 0.6912 -6.1488L1.0368 -5.7312H0.7776V-1.9728L0.432 -2.1456L-0.1728 -1.0944C0.0432 -0.9792 0.2592 -0.864 0.4752 -0.7632C0.6336 -0.6912 0.7776 -0.6624 0.7776 -0.432V-0.3312V0.2304V0.5904C0.7776 1.0656 0.7632 1.5408 0.576 1.9872C0.4752 2.2032 0.3456 2.376 0.2016 2.5632L0.4896 2.7072L1.0944 1.8288C1.3824 2.0304 1.6848 2.2176 1.9728 2.4048C2.232 2.5776 2.52 2.808 2.9088 2.808C3.096 2.808 3.3408 2.6928 3.3408 2.52C3.3408 2.4192 3.24 2.3472 3.1824 2.304C3.1392 2.4912 3.0528 2.6064 2.8368 2.6064C2.5056 2.6064 2.2608 2.2896 2.16 2.1024C1.9872 1.7856 1.9872 1.4256 1.9872 1.08V0.0144C2.1744 0.1152 2.3472 0.216 2.5488 0.288C3.3696 -0.1296 4.1184 -0.6192 4.9104 -1.0512L4.7664 -1.3536C4.7232 -2.6496 4.7664 -4.0464 4.752 -5.3712L4.9104 -5.688C4.4496 -5.9904 4.0176 -6.3216 3.5424 -6.6096C3.6288 -6.696 3.7152 -6.7968 3.7872 -6.8976L3.6144 -7.128L3.1968 -6.7536C2.9232 -6.5232 2.7216 -6.2208 2.3904 -6.048L2.2896 -6.1344C2.0016 -6.4656 1.7424 -6.8112 1.44 -7.128ZM2.6064 -5.76C2.7504 -5.7456 3.2832 -5.3136 3.2976 -5.3136C3.4272 -5.2416 3.5424 -5.1984 3.5424 -4.9824V-4.8384V-0.9648C3.5424 -0.9216 3.5568 -0.864 3.5568 -0.792S3.5424 -0.648 3.4848 -0.6192C3.456 -0.6192 3.3552 -0.6192 3.3552 -0.648C3.2832 -0.6768 2.5776 -1.0512 2.304 -1.1808C2.1456 -1.2528 1.9872 -1.2816 1.9872 -1.5264V-1.656V-4.8384V-4.9968C1.9872 -5.2128 2.0592 -5.256 2.1888 -5.3568C2.3328 -5.4864 2.4768 -5.6016 2.6208 -5.7168L2.6064 -5.76Z"/>
+ <path id="g57" d="M1.44 -7.128L0.5328 -6.3648L1.0368 -5.7312H0.7776V-1.9728L0.432 -2.1456C0.2304 -1.8 0.0288 -1.4544 -0.1584 -1.08C0.0576 -0.9792 0.2736 -0.864 0.4896 -0.7488C0.6336 -0.6768 0.7776 -0.6624 0.7776 -0.4608V-0.36V0.216V0.6912C0.7776 1.1232 0.7632 1.5408 0.5904 1.944C0.4896 2.1744 0.3456 2.3616 0.2016 2.5632L0.4896 2.7072L1.0944 1.8288C1.4256 2.0304 1.7424 2.2608 2.0736 2.4624C2.2896 2.6064 2.5632 2.808 2.8944 2.808C3.1104 2.808 3.3552 2.7216 3.3552 2.52C3.3552 2.4048 3.2544 2.3472 3.1968 2.304C3.1536 2.4912 3.0672 2.6064 2.8656 2.6064C2.5344 2.6064 2.2752 2.3184 2.1744 2.1168C1.9872 1.8 1.9872 1.4256 1.9872 1.08V0.0144C2.1744 0.1008 2.3616 0.2016 2.5488 0.288C3.1248 0.0288 3.6144 -0.3168 4.1328 -0.6192H4.1472L4.5072 -0.36C4.8528 -0.1584 5.1264 0.1152 5.5152 0.2736L5.6592 0.216C6.408 -0.2016 7.1424 -0.6192 7.848 -1.0656C7.8192 -1.1952 7.7616 -1.2816 7.7184 -1.3824C7.7184 -2.8224 7.704 -4.2768 7.7328 -5.688L7.8768 -6.0048L5.7456 -7.056C5.6016 -6.6816 5.3856 -6.3216 5.0976 -6.0336C5.04 -5.976 4.896 -5.7888 4.7952 -5.7888C4.7088 -5.8176 4.464 -6.0048 4.4352 -6.0192L3.888 -6.3936C3.7728 -6.4656 3.6576 -6.552 3.5424 -6.624V-6.6384C3.6288 -6.7248 3.744 -6.7824 3.8016 -6.912L3.6288 -7.128H3.6144L2.7216 -6.3072C2.6208 -6.2208 2.5344 -6.1056 2.3904 -6.048L2.2896 -6.1344C2.016 -6.48 1.728 -6.8112 1.44 -7.128ZM2.6496 -5.7888C2.9376 -5.5728 3.24 -5.3712 3.528 -5.1408L3.5568 -4.824V-1.3536L3.4272 -1.08C3.5568 -1.008 3.5568 -0.9216 3.5568 -0.7776C3.5568 -0.7056 3.5424 -0.6192 3.456 -0.6192C3.3984 -0.6192 3.3552 -0.648 3.312 -0.6768C3.1104 -0.7632 2.3328 -1.1664 2.3184 -1.1808C2.1888 -1.2528 1.9872 -1.2816 1.9872 -1.512V-1.6704V-4.9104V-5.0112C1.9872 -5.2128 2.088 -5.2704 2.2032 -5.3712C2.3328 -5.4864 2.4768 -5.6016 2.6208 -5.7168C2.6352 -5.7312 2.6064 -5.7888 2.6496 -5.7888ZM6.3936 -0.5616C5.9328 -0.8928 5.4144 -1.1664 4.9824 -1.5408L4.9536 -1.8144V-5.1408C5.1408 -5.3712 5.3568 -5.5728 5.616 -5.7456C5.9472 -5.6304 6.2208 -5.472 6.4944 -5.2992C6.4944 -5.2992 6.5088 -4.9968 6.5088 -4.9968C6.5088 -3.5424 6.5232 -2.0736 6.4944 -0.6624L6.3936 -0.5616Z"/>
+ <path id="g58" d="M1.44 -7.128L0.5328 -6.3648L1.0368 -5.7312H0.7776V-1.9728L0.432 -2.1456C0.2304 -1.8 0.0288 -1.4544 -0.1584 -1.08C0.0576 -0.9792 0.2736 -0.864 0.4896 -0.7488C0.6336 -0.6768 0.7776 -0.6624 0.7776 -0.4608V-0.36V0.216V0.6912C0.7776 1.1232 0.7632 1.5408 0.5904 1.944C0.4896 2.1744 0.3456 2.3616 0.2016 2.5632L0.4896 2.7072L1.0944 1.8288C1.4256 2.0304 1.7424 2.2608 2.0736 2.4624C2.2896 2.6064 2.5632 2.808 2.8944 2.808C3.1104 2.808 3.3552 2.7216 3.3552 2.52C3.3552 2.4048 3.2544 2.3472 3.1968 2.304C3.1536 2.4912 3.0672 2.6064 2.8656 2.6064C2.5344 2.6064 2.2752 2.3184 2.1744 2.1168C1.9872 1.8 1.9872 1.4256 1.9872 1.08V0.0144C2.1744 0.1008 2.3616 0.2016 2.5488 0.288L2.6928 0.2304C3.1104 -0.0288 3.5424 -0.2592 3.96 -0.5184H3.9744C4.1904 -0.2448 4.4064 0.0288 4.6512 0.2736L4.7952 0.216C5.328 -0.1152 5.832 -0.4896 6.408 -0.792L6.5088 -0.72L7.3728 0.3024H7.3872L8.2944 -0.4608L7.7904 -1.0944H8.0496C8.064 -2.6496 8.0208 -4.2912 8.064 -5.76C8.1936 -5.9184 8.352 -6.048 8.496 -6.1776C7.9344 -6.48 7.4448 -6.84 6.8544 -7.0992L6.6816 -7.0128C6.0624 -6.5952 5.4576 -6.1632 4.8672 -5.7168H4.8528L3.5424 -6.624V-6.6384C3.6288 -6.7248 3.744 -6.7824 3.8016 -6.912L3.6288 -7.128H3.6144L2.7216 -6.3072C2.6208 -6.2208 2.5344 -6.1056 2.3904 -6.048L2.2896 -6.1344C2.016 -6.48 1.728 -6.8112 1.44 -7.128ZM2.6352 -5.7888H2.6496C2.8224 -5.616 3.0672 -5.4864 3.2688 -5.3424C3.4128 -5.2416 3.5568 -5.2272 3.5568 -4.9824V-4.8384V-1.4112V-1.3248C3.5568 -1.2528 3.5424 -1.1808 3.4848 -1.1088C3.5424 -0.9936 3.5568 -0.8928 3.5568 -0.7632C3.5568 -0.6912 3.5424 -0.6192 3.456 -0.6192C3.4128 -0.6192 3.1968 -0.7344 3.1248 -0.7632L2.3328 -1.1664C2.2032 -1.2528 1.9872 -1.2672 1.9872 -1.512V-1.6704V-4.9104V-5.0112C1.9872 -5.2128 2.088 -5.2704 2.2032 -5.3712C2.3328 -5.4864 2.4768 -5.6016 2.6208 -5.7168L2.6352 -5.7888ZM6.84 -3.312C6.6528 -3.312 6.4512 -3.2976 6.2496 -3.2976C5.7024 -3.2976 5.328 -3.4128 4.9824 -3.6864C4.8816 -3.7584 4.7664 -3.8448 4.7664 -4.032V-4.1472V-4.9968V-5.0832C4.7664 -5.2416 4.896 -5.328 4.9824 -5.4C5.1984 -5.5872 5.9184 -6.1488 6.1632 -6.1488C6.336 -6.1488 6.4656 -6.0192 6.5664 -5.9472C6.696 -5.8752 6.84 -5.8176 6.84 -5.616V-5.5296V-3.312ZM4.7664 -3.168V-3.4416L5.0544 -3.24L4.7664 -3.168ZM6.2064 -1.1088L6.2208 -1.0656C5.976 -0.9216 5.76 -0.7632 5.4864 -0.648C5.3136 -0.7632 5.1984 -0.936 5.0688 -1.0944H5.328V-2.2608C5.328 -2.6352 5.472 -2.9952 5.9328 -2.9952H6.0624H6.84C6.84 -2.5344 6.8544 -2.0592 6.8112 -1.6416C6.624 -1.44 6.408 -1.2816 6.2064 -1.1088Z"/>
+ <path id="g59" d="M1.4544 -3.24L0.2016 -2.9088L0.504 -2.2896C0.5184 -2.0592 0.5184 -1.8432 0.4896 -1.6272C0.3024 -1.44 0.0864 -1.2672 -0.1152 -1.0944V-1.08C0.288 -0.6336 0.6192 -0.1296 1.0512 0.2736L1.1952 0.216C1.728 -0.1152 2.232 -0.4896 2.808 -0.792L2.9088 -0.72L3.7728 0.3024H3.7872L4.6944 -0.4608L4.1904 -1.0944H4.4496C4.464 -2.6496 4.4208 -4.2912 4.464 -5.76C4.608 -5.904 4.7664 -6.0336 4.9104 -6.1776C4.608 -6.336 3.3408 -7.0992 3.2544 -7.0992C3.1248 -7.0992 2.9664 -6.9264 2.9088 -6.8976L2.2032 -6.408C1.8288 -6.1344 1.4112 -5.8896 1.08 -5.5584C0.792 -5.2704 0.6048 -5.04 0.6048 -4.4784C0.6048 -3.8592 1.0944 -3.4848 1.4544 -3.24ZM3.24 -3.312C3.0528 -3.312 2.8656 -3.2976 2.6784 -3.2976C2.4624 -3.2976 2.2464 -3.312 2.0304 -3.3696C1.4688 -3.5136 0.9072 -3.96 0.9072 -4.608C0.9072 -4.7376 0.936 -4.8672 1.008 -4.9968C1.1808 -5.2848 1.4976 -5.5152 1.7712 -5.7024C1.9152 -5.8176 2.3616 -6.1488 2.5632 -6.1488C2.736 -6.1488 2.8656 -6.0192 2.9808 -5.9472C3.0816 -5.8608 3.24 -5.832 3.24 -5.6448V-5.5584V-3.312ZM2.6064 -1.1088L2.6208 -1.0656C2.376 -0.9216 2.16 -0.7632 1.8864 -0.648C1.7136 -0.7632 1.5984 -0.936 1.4688 -1.0944H1.728V-1.9584V-2.2032C1.728 -2.664 1.8576 -2.9952 2.3472 -2.9952H2.4768H3.24C3.24 -2.5344 3.2544 -2.0592 3.2112 -1.6416C3.024 -1.44 2.808 -1.2816 2.6064 -1.1088Z"/>
+ <path id="g60" d="M1.4976 -6.8976L0.1584 -5.6448V-5.6304C0.4464 -5.3136 0.7488 -4.9968 1.008 -4.6512L1.0224 -4.464V0.1872L1.9872 -0.2448L2.2464 -0.36C2.3472 -0.3888 2.3904 -0.432 2.3904 -0.576V-0.72V-4.8528V-5.0112C2.3904 -5.0544 2.3904 -5.112 2.4192 -5.1552C2.4624 -5.2128 2.9664 -5.5152 3.1248 -5.6304C3.1968 -5.6736 3.2832 -5.76 3.3696 -5.76H3.384C3.4704 -5.7456 3.816 -5.4144 3.816 -5.4144C3.9024 -5.3424 4.0896 -5.2416 4.1184 -5.112C4.1328 -5.0544 4.1328 -4.9824 4.1328 -4.9248C4.1328 -4.7952 4.1184 -4.6656 4.1184 -4.536V0.1728C4.896 -0.3312 5.688 -0.8208 6.408 -1.3824L6.4224 -1.6848C6.336 -1.656 6.264 -1.6128 6.1776 -1.6128C5.8464 -1.6128 5.6016 -1.9296 5.5296 -2.2176C5.4864 -2.376 5.4864 -2.5344 5.4864 -2.6928V-3.0816V-4.608C5.4864 -4.9104 5.5872 -5.2416 5.8608 -5.3424C5.976 -5.3856 6.0192 -5.3856 6.0192 -5.544V-5.6448C6.0048 -5.7312 5.9184 -5.7888 5.8464 -5.8464C5.7024 -5.976 5.0256 -6.5376 4.8384 -6.696C4.7664 -6.7536 4.6656 -6.8688 4.5792 -6.8688C4.5072 -6.8688 4.464 -6.8112 4.4064 -6.7824C3.7296 -6.3216 3.0672 -5.9616 2.3904 -5.472C2.3904 -5.6304 2.3904 -5.7888 2.376 -5.9328C2.1024 -6.2784 1.8 -6.5808 1.4976 -6.8976Z"/>
+ <path id="g61" d="M1.4976 -6.8976L0.1584 -5.6448V-5.6304C0.4464 -5.3136 0.7488 -5.0112 1.008 -4.6656C1.0512 -3.7152 1.0368 -2.6208 0.9936 -1.7136C0.7344 -1.4976 0.4464 -1.3104 0.1728 -1.1088V-1.08L1.656 -0.1584L2.0304 0.0864C2.088 0.1152 2.1312 0.1584 2.1888 0.1584C2.3184 0.1584 2.448 0.0144 2.52 -0.0288L3.9312 -1.008C3.9888 -1.0512 4.1184 -1.1088 4.1184 -1.1952C4.1184 -1.296 4.032 -1.3968 3.96 -1.3968C3.8736 -1.3968 3.7872 -1.3104 3.744 -1.2816L3.4128 -1.0512C3.3552 -1.008 3.2832 -0.936 3.2112 -0.936C3.1536 -0.936 3.0816 -0.9792 3.0384 -1.008L2.7072 -1.224C2.6064 -1.2816 2.4336 -1.3536 2.3904 -1.4688V-4.7664C2.3904 -4.8528 2.376 -4.9536 2.376 -5.0544C2.376 -5.256 2.448 -5.2992 2.592 -5.3856L3.0816 -5.7312C3.1392 -5.7744 3.2112 -5.8464 3.2976 -5.8464C3.3984 -5.8464 3.4848 -5.7024 3.5424 -5.6448L4.1184 -5.0688H4.1328L4.7664 -5.7024C4.8672 -5.8032 4.968 -5.8752 4.968 -6.0192S4.8384 -6.2496 4.752 -6.336L4.1904 -6.8976H4.176L2.3904 -5.6448L2.376 -5.9328C2.1024 -6.2784 1.8 -6.5808 1.4976 -6.8976Z"/>
+ <path id="g62" d="M1.4976 -6.8976L0.1584 -5.6448V-5.6304C0.4464 -5.328 0.7344 -5.0112 0.9936 -4.68L1.0224 -4.4496C1.0224 -3.6144 1.0368 -2.7792 1.008 -1.9872C0.8064 -1.8144 0.5904 -1.656 0.3888 -1.4976L0.8352 -1.3104C0.9648 -1.2384 1.0224 -1.2672 1.0224 -1.0512V0.36C1.0368 1.08 1.2672 1.8144 1.6416 2.4336C1.7856 2.232 1.8864 1.9584 1.9872 1.728C2.2896 0.9648 2.3904 0.1728 2.3904 -0.648C2.4912 -0.6048 3.8592 -0.0288 3.888 -0.0288C3.9888 -0.0432 4.104 -0.1584 4.176 -0.216L4.824 -0.6912C5.1552 -0.936 5.4864 -1.1664 5.7744 -1.4832C6.336 -2.1312 6.6672 -3.0096 6.6672 -3.8736C6.6672 -3.9888 6.6672 -4.1184 6.6528 -4.2336C6.5088 -5.328 5.6016 -6.1632 4.8672 -6.8976H4.8528L2.3904 -4.4352C2.376 -4.9248 2.4048 -5.4576 2.376 -5.9184C2.1168 -6.2784 1.8144 -6.5952 1.4976 -6.8976ZM3.9168 -5.5152C4.4496 -4.9824 5.0256 -4.3344 5.2272 -3.5856C5.3136 -3.2688 5.328 -2.9232 5.328 -2.5776V-2.3328C5.328 -2.0016 5.3136 -1.6416 5.1264 -1.3536C5.0832 -1.2672 4.968 -1.0944 4.8384 -1.0944C4.7664 -1.0944 4.6512 -1.152 4.5936 -1.1952L2.5632 -2.0448C2.4624 -2.1168 2.3904 -2.088 2.3904 -2.2752V-3.8016C2.3904 -3.8592 2.3904 -3.9168 2.4048 -3.96C2.448 -4.0608 2.8224 -4.4064 2.8368 -4.4208C3.1968 -4.7952 3.5712 -5.1264 3.9168 -5.5152Z"/>
+ <path id="g63" d="M1.524 -5.196V-5.172C1.272 -5.04 1.056 -4.836 0.816 -4.68C0.756 -4.644 0.588 -4.524 0.552 -4.476C0.54 -4.476 0.54 -4.392 0.54 -4.392V-1.848C0.54 -1.776 0.552 -1.704 0.552 -1.644C0.552 -1.38 0.42 -1.248 0.204 -1.188C0.204 -1.152 0.192 -1.116 0.192 -1.068C0.192 -1.032 0.204 -0.984 0.228 -0.96C0.252 -0.912 0.336 -0.912 0.384 -0.888C0.888 -0.744 1.428 -0.468 1.812 -0.228C2.004 -0.108 2.172 0.036 2.364 0.156L2.796 -0.528C3.276 -1.296 3.756 -2.088 3.756 -3.252C3.756 -4.188 3.384 -4.98 2.856 -5.4C2.472 -5.736 2.004 -5.844 1.536 -5.988C1.068 -6.12 0.456 -6.312 0.456 -6.924C0.456 -7.164 0.612 -7.476 0.948 -7.476V-7.716C0.324 -7.716 -0.132 -7.212 -0.132 -6.624C-0.132 -5.904 0.576 -5.592 1.056 -5.388C1.212 -5.316 1.368 -5.244 1.524 -5.196ZM1.356 -1.176V-4.08C1.356 -4.176 1.344 -4.284 1.344 -4.392C1.344 -4.644 1.44 -4.812 1.596 -4.932C1.644 -4.98 1.716 -5.052 1.788 -5.052C1.872 -5.052 1.992 -4.98 2.052 -4.944C2.724 -4.584 3.348 -3.864 3.348 -2.892C3.348 -2.244 3.144 -1.656 2.916 -1.188C2.88 -1.128 2.82 -0.96 2.712 -0.96C2.688 -0.96 2.664 -0.96 2.652 -0.972L2.388 -1.008C2.04 -1.068 1.704 -1.128 1.356 -1.176Z"/>
+ <path id="g64" d="M1.5552 -9.3888L1.656 -7.3152L1.7856 -7.56C2.016 -8.1792 2.2752 -8.784 2.52 -9.3888H1.5552ZM1.656 -7.128L0.9792 -6.552C0.9216 -6.5088 0.7776 -6.4368 0.7776 -6.3504V-6.336C0.7776 -6.264 0.864 -6.192 0.9072 -6.1488L1.2528 -5.7312H0.9936C0.9792 -4.3776 1.0224 -2.9664 0.9792 -1.656C0.792 -1.4544 0.576 -1.2816 0.36 -1.0944V-1.08L1.5264 0.3024H1.5408L2.2176 -0.2736C2.2752 -0.3168 2.4192 -0.3888 2.4192 -0.4752V-0.4896C2.4192 -0.5616 2.3328 -0.6336 2.2896 -0.6768L1.944 -1.0944H2.2032C2.2176 -2.448 2.1744 -3.8592 2.2176 -5.1696C2.4048 -5.3712 2.6208 -5.544 2.8368 -5.7312V-5.7456L1.656 -7.128Z"/>
+ <path id="g65" d="M1.692 -7.428C1.656 -7.428 1.656 -7.164 1.656 -6.96C1.656 -6.84 1.668 -6.564 1.656 -6.564C1.656 -6.492 1.644 -6.42 1.632 -6.348C1.632 -6.324 1.632 -6.3 1.632 -6.264C1.632 -6.252 1.632 -6.228 1.632 -6.216C1.668 -6.168 1.752 -6.096 1.824 -6.096C1.92 -6.096 2.124 -6.348 2.136 -6.372C2.376 -6.66 2.496 -7.056 2.496 -7.428C2.496 -7.644 2.34 -7.812 2.124 -7.812C1.872 -7.812 1.728 -7.632 1.692 -7.428ZM3.288 -6.204C3.348 -6.168 3.42 -6.096 3.492 -6.096C3.528 -6.096 3.564 -6.132 3.6 -6.156C3.936 -6.396 4.164 -6.936 4.164 -7.428C4.164 -7.668 3.996 -7.812 3.78 -7.812C3.384 -7.812 3.324 -7.368 3.324 -6.972C3.312 -6.708 3.336 -6.456 3.288 -6.204ZM1.944 -5.808L1.62 -5.472C1.356 -5.208 1.092 -4.944 0.888 -4.632C0.456 -3.972 0.204 -3.048 0.204 -2.028C0.204 -1.896 0.216 -1.776 0.228 -1.644C0.312 -0.948 0.78 -0.3 1.356 -0.012L1.164 0.156L1.536 0.144C2.004 -0.192 2.4 -0.588 2.844 -0.936C2.88 -0.732 2.94 -0.528 3.012 -0.336C3.036 -0.3 3.156 -0.048 3.156 -0.024C3.156 0.036 3.084 0.108 3.048 0.156L3.348 0.144C3.6 -0.12 3.84 -0.396 4.056 -0.696L4.068 -1.044C4.044 -1.02 3.996 -0.984 3.948 -0.984C3.816 -0.984 3.696 -1.14 3.648 -1.236C3.624 -1.308 3.624 -1.392 3.624 -1.476V-3.048C3.624 -3.192 3.612 -3.348 3.612 -3.504C3.612 -3.936 3.708 -4.248 3.924 -4.512C3.96 -4.572 4.032 -4.62 4.032 -4.68C4.032 -4.764 3.9 -4.884 3.888 -4.908C3.78 -5.052 3.744 -5.064 3.504 -5.1C3.012 -5.232 2.688 -5.352 2.268 -5.592C2.16 -5.664 2.052 -5.748 1.944 -5.808ZM1.452 -4.968C1.608 -4.896 2.4 -4.416 2.424 -4.404L2.664 -4.26C2.76 -4.212 2.808 -4.164 2.808 -4.032C2.808 -3.996 2.808 -3.96 2.808 -3.936V-1.488C2.808 -1.452 2.808 -1.416 2.808 -1.368C2.808 -1.332 2.808 -1.296 2.796 -1.26C2.736 -1.092 2.304 -0.972 2.124 -0.972C1.644 -0.972 1.284 -1.392 1.164 -1.836C1.092 -2.076 1.08 -2.316 1.08 -2.556C1.08 -2.7 1.092 -2.856 1.092 -3C1.104 -3.552 1.092 -4.14 1.296 -4.668C1.332 -4.776 1.404 -4.872 1.452 -4.968Z"/>
+ <path id="g66" d="M1.848 -7.8C1.8 -7.8 1.752 -7.788 1.716 -7.764C1.464 -7.656 1.452 -7.344 1.452 -7.092C1.452 -7.056 1.452 -7.008 1.452 -6.972V-6.792C1.452 -6.708 1.44 -6.624 1.44 -6.54C1.44 -6.48 1.44 -6.408 1.428 -6.348C1.428 -6.324 1.428 -6.3 1.428 -6.264C1.428 -6.252 1.428 -6.228 1.428 -6.216C1.464 -6.168 1.548 -6.096 1.62 -6.096C1.656 -6.096 1.692 -6.132 1.728 -6.156C2.04 -6.42 2.28 -6.924 2.28 -7.392C2.28 -7.644 2.172 -7.812 1.92 -7.812C1.896 -7.812 1.872 -7.8 1.848 -7.8ZM3.084 -6.204C3.144 -6.168 3.216 -6.096 3.288 -6.096C3.336 -6.096 3.384 -6.144 3.408 -6.156C3.732 -6.48 3.96 -6.828 3.96 -7.428C3.96 -7.668 3.792 -7.812 3.576 -7.812C3.336 -7.812 3.204 -7.632 3.156 -7.428C3.108 -7.176 3.108 -6.36 3.084 -6.204ZM1.188 -5.808L0.204 -4.548V-4.536L0.384 -4.392H0.396C0.432 -4.44 0.588 -4.668 0.648 -4.668C0.744 -4.668 0.828 -4.488 0.852 -4.452C0.96 -4.248 0.972 -4.032 0.972 -3.804C0.972 -3.768 0.972 -3.72 0.972 -3.684V-1.368C0.972 -1.332 0.972 -1.284 0.972 -1.248C0.972 -0.936 0.744 -0.828 0.492 -0.756V-0.504C0.924 -0.504 1.296 -0.276 1.512 0.024C1.56 0.084 1.584 0.156 1.692 0.156C1.86 0.156 1.98 -0.036 2.088 -0.144L3.12 -1.176C3.24 -0.9 3.384 -0.624 3.516 -0.348C3.564 -0.252 3.648 -0.132 3.648 -0.024C3.648 -0 3.636 0.012 3.636 0.036L3.84 0.156L4.776 -1.344L4.56 -1.464C4.524 -1.404 4.38 -1.14 4.332 -1.128C4.296 -1.128 4.272 -1.14 4.248 -1.164C4.056 -1.308 3.936 -1.536 3.936 -1.848C3.936 -1.92 3.936 -1.992 3.936 -2.052V-3.888C3.936 -4.092 3.936 -4.308 3.936 -4.524C3.936 -4.728 3.924 -4.968 4.02 -5.088C4.044 -5.136 4.116 -5.16 4.128 -5.208C4.14 -5.208 4.14 -5.352 4.14 -5.352C3.9 -5.4 3.684 -5.568 3.612 -5.808C3.588 -5.808 3.564 -5.808 3.54 -5.808C3.444 -5.808 3.432 -5.76 3.396 -5.7C3.312 -5.52 3.096 -5.4 2.916 -5.352C2.916 -5.328 2.916 -5.304 2.916 -5.28C2.916 -5.16 3.024 -5.112 3.06 -5.052C3.12 -4.92 3.12 -4.764 3.12 -4.584C3.12 -4.416 3.12 -4.248 3.12 -4.092V-1.932C3.12 -1.848 3.132 -1.764 3.132 -1.68C3.132 -1.488 3.06 -1.464 2.94 -1.344L2.52 -0.924C2.472 -0.876 2.388 -0.756 2.316 -0.756C2.256 -0.756 2.208 -0.816 2.172 -0.84L1.932 -1.056C1.848 -1.116 1.788 -1.164 1.788 -1.308V-3.54C1.788 -4.056 1.776 -4.536 1.608 -5.028C1.536 -5.256 1.332 -5.664 1.188 -5.808Z"/>
+ <path id="g67" d="M1.872 -5.808L1.152 -5.088C1.068 -5.004 0.972 -4.92 0.912 -4.812L0.972 -4.716L1.872 -3.816H1.884L2.604 -4.536C2.688 -4.62 2.784 -4.704 2.844 -4.812L2.784 -4.908L1.872 -5.808ZM0.888 1.812L1.104 1.92L2.712 -0.588C2.76 -0.648 2.844 -0.744 2.844 -0.816C2.844 -0.876 2.772 -0.936 2.736 -0.972L2.052 -1.656C2.004 -1.704 1.944 -1.788 1.884 -1.8C1.848 -1.8 1.812 -1.776 1.788 -1.752C1.728 -1.704 1.128 -1.092 1.128 -1.092C1.068 -1.032 0.948 -0.948 0.924 -0.864C0.912 -0.864 0.912 -0.828 0.912 -0.828S0.936 -0.756 0.948 -0.756L1.092 -0.576C1.26 -0.312 1.344 -0 1.344 0.36C1.344 0.708 1.26 1.056 1.116 1.368C1.044 1.524 0.948 1.656 0.888 1.812Z"/>
+ <path id="g68" d="M1.872 0.156H1.884L2.868 -0.828C2.784 -0.924 2.688 -1.02 2.604 -1.104L2.16 -1.548C2.124 -1.584 1.92 -1.8 1.872 -1.8C1.8 -1.8 1.716 -1.68 1.668 -1.632L1.104 -1.068C1.068 -1.032 0.912 -0.912 0.912 -0.828C0.924 -0.792 0.96 -0.756 0.984 -0.732L1.872 0.156Z"/>
+ <path id="g69" d="M1.944 -5.808L1.62 -5.472C1.356 -5.208 1.092 -4.944 0.888 -4.632C0.456 -3.972 0.204 -3.048 0.204 -2.028C0.204 -1.896 0.216 -1.776 0.228 -1.644C0.312 -0.948 0.78 -0.3 1.356 -0.012L1.164 0.156L1.536 0.144C2.004 -0.192 2.4 -0.588 2.844 -0.936C2.88 -0.732 2.94 -0.528 3.012 -0.336C3.036 -0.3 3.156 -0.048 3.156 -0.024C3.156 0.036 3.084 0.108 3.048 0.156L3.348 0.144C3.6 -0.12 3.84 -0.396 4.056 -0.696L4.068 -1.044C4.044 -1.02 3.996 -0.984 3.948 -0.984C3.816 -0.984 3.696 -1.14 3.648 -1.236C3.624 -1.308 3.624 -1.392 3.624 -1.476V-3.048C3.624 -3.192 3.612 -3.348 3.612 -3.504C3.612 -3.936 3.708 -4.248 3.924 -4.512C3.96 -4.572 4.032 -4.62 4.032 -4.68C4.032 -4.764 3.9 -4.884 3.888 -4.908C3.78 -5.052 3.744 -5.064 3.504 -5.1C3.012 -5.232 2.688 -5.352 2.268 -5.592C2.16 -5.664 2.052 -5.748 1.944 -5.808ZM1.452 -4.968C1.608 -4.896 2.4 -4.416 2.424 -4.404L2.664 -4.26C2.76 -4.212 2.808 -4.164 2.808 -4.032C2.808 -3.996 2.808 -3.96 2.808 -3.936V-1.488C2.808 -1.452 2.808 -1.416 2.808 -1.368C2.808 -1.332 2.808 -1.296 2.796 -1.26C2.736 -1.092 2.304 -0.972 2.124 -0.972C1.644 -0.972 1.284 -1.392 1.164 -1.836C1.092 -2.076 1.08 -2.316 1.08 -2.556C1.08 -2.7 1.092 -2.856 1.092 -3C1.104 -3.552 1.092 -4.14 1.296 -4.668C1.332 -4.776 1.404 -4.872 1.452 -4.968Z"/>
+ <path id="g70" d="M1.9872 -7.128L1.1376 -6.2784V-6.264L1.9872 -5.4144H2.0016L2.8512 -6.264V-6.2784L1.9872 -7.128ZM1.9872 -1.4112L1.1376 -0.5616V-0.5472L1.9872 0.3024H2.0016L2.8512 -0.5472V-0.5616L1.9872 -1.4112Z"/>
+ <path id="g71" d="M17.489 -47.7353C17.0715 -47.5497 16.8396 -47.0858 16.886 -46.4364C16.9787 -45.4622 17.3035 -44.6736 17.9065 -44.0705C18.3704 -43.6066 18.8807 -43.3283 19.4374 -43.2819L19.623 -43.2355L19.4374 -43.1891C18.4168 -42.6788 17.489 -42.6788 16.3757 -43.1427C15.6334 -43.421 14.5665 -43.9777 13.4067 -44.72L12.8036 -45.0911V-45.2766C12.8036 -45.7405 12.3861 -46.0189 11.9686 -45.8333L11.8294 -45.7405L11.0872 -46.1117C10.345 -46.4828 9.60273 -46.7611 8.90688 -46.9003C6.81933 -47.3178 4.639 -46.7611 2.87618 -45.2766C1.80921 -44.3952 0.83502 -43.0035 0.37112 -41.6582C0.27834 -41.4263 0.27834 -41.4263 0.13917 -41.3799C-0.09278 -41.3335 -0.32473 -41.1015 -0.32473 -40.8232C-0.37112 -40.5912 -0.27834 -40.4057 -0.13917 -40.2665L0 -40.1737L-0.04639 -39.8954C-0.04639 -39.7098 -0.09278 -39.4315 -0.09278 -39.2459C-0.13917 -38.8748 -0.13917 -38.8748 -0.23195 -38.8284C-0.41751 -38.7356 -0.4639 -38.5965 -0.51029 -38.4573C-0.51029 -38.2254 -0.41751 -37.9934 -0.23195 -37.9006C-0.09278 -37.8542 -0.09278 -37.8078 -0.04639 -37.5759C-0.04639 -37.1584 0.09278 -36.4161 0.23195 -35.9522C0.55668 -34.6997 1.25253 -33.4472 2.08755 -32.4266L2.45867 -32.0555L2.3195 -31.9627C1.71643 -31.4988 1.29892 -30.9885 1.06697 -30.2927L0.9278 -29.9215V-29.3185C0.9278 -28.7154 0.9278 -28.669 1.02058 -28.3907C1.34531 -27.5557 1.8556 -27.0918 2.55145 -27.0454C2.69062 -27.0454 2.92257 -27.0454 3.01535 -27.0918C3.61842 -27.1845 4.1751 -27.6948 4.31427 -28.3443C4.49983 -28.9937 4.26788 -29.4576 3.61842 -29.6432C3.01535 -29.8288 2.41228 -29.6432 2.18033 -29.2257C1.99477 -28.8082 2.22672 -28.3907 2.64423 -28.3907C3.15452 -28.3907 3.34008 -28.9937 2.96896 -29.3185C2.87618 -29.3649 2.87618 -29.3649 2.96896 -29.4113C2.96896 -29.4113 3.15452 -29.4113 3.29369 -29.4113C3.57203 -29.4113 3.85037 -29.2721 3.98954 -29.0865S4.12871 -28.6226 4.03593 -28.3443C3.89676 -27.9268 3.61842 -27.602 3.2473 -27.4165C3.06174 -27.3701 2.96896 -27.3237 2.69062 -27.3237C2.22672 -27.3237 2.04116 -27.4165 1.76282 -27.6948C1.3917 -28.0659 1.20614 -28.6226 1.20614 -29.3185C1.20614 -30.2927 1.62365 -31.0813 2.41228 -31.6844L2.64423 -31.8699L2.92257 -31.5916C3.57203 -30.9885 4.49983 -30.3854 5.28846 -30.0143C7.56157 -28.9474 10.0202 -28.8546 12.4789 -29.6896C13.7778 -30.1535 14.8448 -30.7102 17.489 -32.3802C18.8807 -33.2616 20.1333 -34.0039 20.0405 -33.8647C19.9941 -33.8647 19.7621 -33.6327 19.4374 -33.4008C17.6746 -31.8699 15.7262 -29.9679 12.8964 -26.8598L12.7109 -26.6279L12.5717 -26.6742C12.2933 -26.767 12.1078 -26.9526 11.9686 -27.4629C11.8294 -27.8804 11.7367 -28.0196 11.5511 -28.1123S11.18 -28.2051 10.9944 -28.0659C10.8553 -27.9268 10.7161 -27.6948 10.4841 -27.0918C10.113 -26.0248 9.69551 -25.3289 9.23161 -24.865C8.53576 -24.2156 7.60796 -23.9836 6.9585 -24.4011C6.68016 -24.5403 6.26265 -25.0506 6.07709 -25.4217C5.79875 -25.8856 5.75236 -26.5351 5.89153 -26.9062L5.93792 -26.999L6.0307 -26.9526C6.21626 -26.767 6.40182 -26.7206 6.63377 -26.8598C6.9585 -27.0454 6.9585 -27.5093 6.63377 -27.7412C6.30904 -27.9268 5.93792 -27.6948 5.70597 -27.1381C5.5668 -26.9062 5.5668 -26.8598 5.5668 -26.4887C5.52041 -25.7001 5.79875 -25.0506 6.44821 -24.4475C6.9585 -23.8908 7.60796 -23.7517 8.39659 -24.03C9.46356 -24.4011 10.345 -25.4681 10.7625 -27.0454C10.948 -27.602 11.0408 -27.7876 11.18 -27.834C11.3655 -27.9732 11.6439 -27.834 11.7367 -27.6484C11.8294 -27.5093 11.7831 -27.3701 11.6903 -26.9526C11.5975 -26.4887 11.5975 -26.3495 11.7367 -26.2103C11.8294 -26.0712 11.9222 -26.0712 12.1542 -26.164L12.3397 -26.2103L12.247 -26.1176C12.2006 -26.0712 11.6439 -25.4217 11.0408 -24.7259C10.0202 -23.6125 9.88107 -23.4733 9.78829 -23.4733C9.78829 -23.5197 9.64912 -23.5197 9.55634 -23.5197C9.09244 -23.5197 8.8141 -23.0558 8.99966 -22.6383L9.04605 -22.4991L8.39659 -21.8497C7.79352 -21.2466 7.09767 -20.6435 7.00489 -20.6435C7.00489 -20.6435 6.91211 -20.6899 6.86572 -20.7827C6.40182 -21.525 5.42763 -22.128 4.59261 -22.2208H4.31427L4.45344 -22.3136C4.96373 -22.4991 5.33485 -23.0094 5.42763 -23.6125C5.52041 -24.1228 5.33485 -24.7259 4.91734 -25.1434C4.22149 -25.7928 3.20091 -25.932 2.3195 -25.4217C2.08755 -25.2362 1.71643 -24.865 1.53087 -24.5867C1.25253 -24.03 1.06697 -23.3342 1.15975 -22.6847C1.25253 -22.128 1.48448 -21.525 1.76282 -21.1074C1.76282 -21.0611 1.76282 -21.0147 1.62365 -20.8291C1.15975 -20.0405 1.02058 -18.9735 1.34531 -18.1849C1.48448 -17.9065 1.71643 -17.5354 1.8556 -17.3962C2.50506 -16.7932 3.43286 -16.7468 3.98954 -17.2571C4.26788 -17.489 4.36066 -17.721 4.36066 -18.0457C4.36066 -18.2777 4.36066 -18.3704 4.26788 -18.5096C4.08232 -18.8807 3.7112 -19.0663 3.29369 -19.0199C2.64423 -18.9735 2.22672 -18.4632 2.45867 -17.9993S3.34008 -17.6282 3.43286 -18.1849C3.47925 -18.324 3.34008 -18.6024 3.20091 -18.6488C3.10813 -18.6952 3.20091 -18.7416 3.38647 -18.7416C3.75759 -18.7416 4.03593 -18.5096 4.08232 -18.1849C4.12871 -17.8138 3.94315 -17.489 3.57203 -17.3035C3.38647 -17.2107 3.29369 -17.2107 3.06174 -17.2107C2.7834 -17.2107 2.73701 -17.2107 2.45867 -17.3499C1.62365 -17.7674 1.25253 -18.9271 1.57726 -19.9941C1.71643 -20.3188 1.90199 -20.7363 1.94838 -20.7827C1.99477 -20.7827 2.08755 -20.6899 2.22672 -20.5508C3.29369 -19.5766 4.87095 -19.2982 6.21626 -19.8549C6.35543 -19.9477 6.58738 -20.0405 6.68016 -20.0869C6.81933 -20.1796 6.91211 -20.226 6.91211 -20.1796C6.9585 -20.1333 7.14406 -19.5766 7.19045 -19.2982C7.28323 -18.8807 7.32962 -18.1385 7.23684 -17.6746C7.05128 -16.7468 6.54099 -15.7726 5.75236 -14.7984C5.61319 -14.6128 5.38124 -14.4273 5.33485 -14.3809C4.31427 -13.7314 3.85037 -13.4067 3.2473 -12.8036C1.94838 -11.5511 1.11336 -10.0202 0.78863 -8.39659C0.69585 -8.11825 0.69585 -8.07186 0.60307 -8.07186C0.4639 -8.02547 0.27834 -7.8863 0.23195 -7.79352C0.04639 -7.46879 0.18556 -7.00489 0.4639 -6.86572C0.60307 -6.81933 0.60307 -6.81933 0.60307 -6.4946C0.64946 -5.65958 0.74224 -5.14929 0.97419 -4.49983C1.11336 -3.98954 1.48448 -3.2473 1.71643 -2.87618C3.01535 -0.88141 5.1029 0.18556 7.32962 0.09278C7.8863 0.09278 8.25742 -0 8.76771 -0.09278C10.0666 -0.51029 11.2264 -1.43809 11.8294 -2.55145C12.5253 -3.89676 12.5717 -5.47402 11.9222 -6.72655L11.7367 -7.09767L12.015 -7.00489C12.6181 -6.77294 12.85 -6.77294 13.685 -6.77294C14.4273 -6.77294 14.4737 -6.77294 14.8912 -6.86572L15.3551 -7.00489L15.4943 -6.86572C15.5406 -6.81933 15.819 -6.58738 16.0509 -6.35543C18.0457 -4.54622 20.4116 -3.15452 22.4528 -2.69062C22.6383 -2.64423 22.8239 -2.59784 22.8239 -2.59784C22.8703 -2.55145 22.2672 -1.80921 21.9425 -1.48448C21.293 -0.83502 20.4116 -0.37112 19.6694 -0.23195C19.5302 -0.23195 19.391 -0.18556 19.3446 -0.18556C19.2518 -0.13917 19.2518 -0.18556 19.391 -0.32473C19.5766 -0.51029 19.6694 -0.74224 19.6694 -1.02058C19.6694 -1.76282 19.0199 -2.27311 18.324 -2.04116C18.0457 -1.99477 17.721 -1.67004 17.6282 -1.3917C17.489 -1.02058 17.5818 -0.64946 17.8601 -0.32473L17.9993 -0.18556L17.7674 -0.23195C16.7004 -0.4639 15.819 -1.15975 15.3551 -2.04116C15.1231 -2.50506 14.984 -3.2473 15.0767 -3.61842V-3.75759L15.1695 -3.61842C15.3551 -3.43286 15.587 -3.38647 15.819 -3.52564C16.0045 -3.61842 16.0973 -3.75759 16.0973 -3.98954C16.0973 -4.26788 15.8654 -4.49983 15.587 -4.49983C15.2159 -4.49983 14.9376 -4.26788 14.7984 -3.85037C14.6592 -3.2473 14.8912 -2.22672 15.3551 -1.48448C15.8654 -0.74224 16.8396 -0.13917 17.7674 0.04639C18.1849 0.13917 19.1127 0.13917 19.5766 0.04639C20.226 -0.04639 20.8291 -0.32473 21.4322 -0.69585C21.8961 -1.02058 22.6383 -1.76282 22.9167 -2.18033L23.1486 -2.50506L23.5661 -2.45867C23.8908 -2.41228 24.262 -2.36589 24.865 -2.36589H25.7001L25.7928 -2.18033C26.1176 -1.53087 26.767 -0.9278 27.4629 -0.64946C27.9268 -0.4639 28.1587 -0.41751 28.669 -0.37112C29.0401 -0.37112 29.1329 -0.41751 29.2721 -0.4639C29.8752 -0.74224 30.0143 -1.34531 29.5504 -1.62365C29.4576 -1.71643 29.4113 -1.71643 29.2257 -1.71643C29.0865 -1.67004 29.0401 -1.67004 28.901 -1.53087C28.8082 -1.43809 28.8082 -1.3917 28.8082 -1.20614C28.8082 -0.97419 28.8082 -0.9278 28.901 -0.83502C28.9474 -0.78863 29.0401 -0.69585 29.0401 -0.69585C29.0401 -0.64946 28.4371 -0.64946 28.1587 -0.69585C27.5557 -0.83502 27.0454 -1.11336 26.5815 -1.57726C26.3031 -1.8556 26.0248 -2.27311 26.0248 -2.36589C26.0248 -2.41228 26.1176 -2.41228 26.2567 -2.45867C26.3495 -2.45867 26.6742 -2.50506 26.9062 -2.55145C28.3443 -2.82979 29.736 -3.43286 31.1741 -4.40705L31.638 -4.68539L31.6844 -4.49983C31.8235 -3.89676 32.241 -3.06174 32.6586 -2.45867C33.0297 -1.99477 33.6327 -1.43809 34.0966 -1.06697C34.6997 -0.64946 35.5347 -0.27834 36.277 -0.09278C36.9264 0.04639 37.2976 0.09278 38.0862 0.09278C38.7356 0.09278 38.8748 0.09278 39.2923 -0C40.2665 -0.13917 41.1015 -0.55668 41.8902 -1.15975C42.0293 -1.25253 42.1685 -1.34531 42.1685 -1.34531C42.2149 -1.34531 42.3077 -1.20614 42.4005 -1.06697C42.8644 -0.51029 43.4674 -0.09278 44.1633 0.04639C44.3952 0.09278 44.5808 0.13917 44.9055 0.13917C45.4158 0.13917 45.7405 0.04639 46.1117 -0.09278C46.4364 -0.23195 46.7611 -0.60307 46.9003 -0.88141C46.9931 -1.06697 46.9931 -1.11336 46.9931 -1.43809S46.9931 -1.80921 46.9003 -1.99477S46.5756 -2.41228 46.39 -2.45867C46.158 -2.55145 45.6941 -2.50506 45.4622 -2.41228C45.2766 -2.3195 45.0447 -2.08755 44.9519 -1.94838C44.8591 -1.67004 44.9519 -1.34531 45.1839 -1.15975C45.323 -1.06697 45.6478 -1.06697 45.7869 -1.15975C46.0653 -1.34531 46.158 -1.67004 46.0189 -1.90199C45.9725 -1.99477 45.8797 -2.08755 45.8333 -2.08755C45.7405 -2.18033 45.7869 -2.22672 46.0189 -2.22672S46.2972 -2.18033 46.39 -2.13394C46.7611 -1.90199 46.8539 -1.3917 46.6219 -0.9278C46.4828 -0.69585 46.2044 -0.4639 45.9725 -0.32473C45.323 -0.04639 44.488 -0.04639 43.7922 -0.37112C43.3283 -0.55668 42.818 -0.97419 42.5396 -1.34531L42.4005 -1.57726L42.6788 -1.8556C43.5602 -2.7834 44.1633 -3.98954 44.488 -5.28846C44.5808 -5.75236 44.5808 -5.75236 44.6736 -5.75236C44.9055 -5.79875 45.1839 -6.21626 45.0911 -6.44821C45.0447 -6.68016 44.8591 -6.91211 44.72 -6.9585C44.6272 -7.00489 44.6272 -7.00489 44.6272 -7.23684C44.6272 -7.8863 44.4416 -8.8141 44.2097 -9.60273C43.8849 -10.4377 43.3283 -11.4583 42.7252 -12.1542C42.586 -12.3397 42.4932 -12.4325 42.4932 -12.4789C42.4932 -12.4789 42.6324 -12.4325 42.7716 -12.4325C43.2819 -12.3861 44.0241 -12.5253 44.488 -12.7572C45.4158 -13.2211 46.0189 -14.1489 45.9725 -15.0304C45.8797 -15.6798 45.6014 -16.2365 45.0911 -16.5612C44.3024 -17.0715 43.3746 -17.0251 42.7716 -16.4221C42.4932 -16.1901 42.3541 -16.0045 42.2613 -15.6798C42.0293 -14.8912 42.4932 -13.9634 43.2819 -13.7778C43.6994 -13.6387 44.3024 -13.7314 44.6272 -14.0098C44.8591 -14.2417 44.9055 -14.6592 44.7663 -14.8448C44.488 -15.2623 44.0241 -15.2623 43.7922 -14.8448C43.6066 -14.6128 43.6994 -14.2417 43.9313 -14.1026C44.0705 -14.0098 43.9777 -13.9634 43.653 -14.0098C43.2819 -14.0098 43.0499 -14.1026 42.818 -14.3809S42.5396 -14.7984 42.5396 -15.2159C42.5396 -15.5406 42.5396 -15.587 42.6324 -15.819C43.0963 -16.7004 44.3024 -16.886 45.0911 -16.1901C45.4622 -15.819 45.6478 -15.4479 45.6478 -14.8912C45.6478 -14.6128 45.6478 -14.5201 45.555 -14.3345C45.323 -13.5923 44.6736 -13.0356 43.8385 -12.8036C43.5138 -12.7109 42.7716 -12.6645 42.4468 -12.7572C42.1685 -12.8036 42.1685 -12.8036 41.8438 -13.082C41.4727 -13.4531 40.9624 -13.8242 40.4985 -14.1026C40.3129 -14.2417 40.1273 -14.3345 40.1273 -14.3809C40.081 -14.3809 40.2201 -14.6128 40.3593 -14.9376C41.3335 -16.7932 42.0293 -18.7416 42.4005 -20.5972C42.4932 -20.9219 42.5396 -21.2002 42.5396 -21.2466C42.5396 -21.2466 42.6788 -21.293 42.7716 -21.3394C44.6736 -21.9425 46.0653 -23.9372 46.4364 -26.5815C46.4828 -27.1381 46.4828 -28.1587 46.4364 -28.6226C46.1117 -30.7102 44.8591 -32.241 43.2819 -32.5658C42.9107 -32.6586 42.1685 -32.6586 41.5654 -32.5658C41.1943 -32.5194 41.1015 -32.5194 41.1015 -32.5658C41.0088 -32.8441 40.2665 -34.143 39.849 -34.7925L39.6171 -35.1636L39.9882 -35.7203C40.8232 -37.112 41.3799 -38.3645 41.6118 -39.5243C41.7046 -40.0346 41.751 -40.7768 41.7046 -41.1015V-41.4263L41.9829 -41.3799C43.2355 -41.2871 44.3952 -40.7768 45.2766 -39.9418C46.2508 -39.014 46.7147 -37.947 46.8075 -36.7409C46.8539 -35.5811 46.4828 -34.6069 45.7405 -33.9111C45.4622 -33.6327 45.1375 -33.4472 44.72 -33.308C44.3488 -33.1688 43.6994 -33.1225 43.3283 -33.2152C42.4932 -33.4472 41.8438 -33.9575 41.4727 -34.7461C41.3799 -34.8853 41.3335 -34.9781 41.3335 -35.0244C41.3335 -35.0244 41.4263 -35.0244 41.4727 -34.9781C41.6582 -34.8853 42.0293 -34.8853 42.2613 -35.0244C42.4468 -35.1636 42.586 -35.3956 42.586 -35.6275C42.6324 -35.9986 42.4468 -36.277 42.1685 -36.4161C41.8438 -36.5553 41.4727 -36.5089 41.2407 -36.2306L41.1015 -36.1378L41.1479 -36.3234C41.2407 -37.1584 41.6582 -37.8078 42.2613 -38.0862C42.4932 -38.2254 42.5396 -38.2254 42.9107 -38.2254C43.2355 -38.2254 43.2819 -38.2254 43.5138 -38.0862C43.9313 -37.9006 44.2097 -37.4831 44.3024 -36.9728L44.3488 -36.7409H44.488C44.6272 -36.7409 44.6272 -36.7409 44.6272 -36.8337C44.6272 -37.0192 44.5344 -37.4367 44.3952 -37.6223C43.8385 -38.6893 42.4468 -38.8284 41.6118 -37.947C40.2665 -36.6017 40.8232 -34.0503 42.6324 -33.1688C43.0499 -32.9833 43.421 -32.8905 43.8849 -32.8905C44.488 -32.8905 44.9983 -33.0297 45.4622 -33.3544C46.7611 -34.143 47.3642 -35.9059 46.9467 -37.5759C46.5292 -39.3851 45.1375 -40.8696 43.3283 -41.4263C43.1891 -41.4727 43.0963 -41.519 43.0963 -41.519S43.1891 -41.5654 43.3283 -41.5654C43.653 -41.6118 44.4416 -41.8438 44.8127 -41.9829C46.39 -42.586 47.3178 -43.5602 47.5034 -44.8591C47.6889 -45.9725 47.1322 -46.8539 46.39 -46.6683C45.8333 -46.4828 45.7405 -45.7869 46.158 -45.4158C46.2508 -45.3694 46.3436 -45.323 46.5292 -45.323S46.7611 -45.323 46.9003 -45.4158C46.9931 -45.4622 47.1322 -45.555 47.1322 -45.6014L47.225 -45.7405L47.2714 -45.555C47.2714 -45.323 47.2714 -44.8591 47.1786 -44.5808C47.0858 -44.2561 46.8075 -43.7458 46.6219 -43.4674C46.158 -42.9107 45.3694 -42.4468 44.4416 -42.1221C43.7458 -41.9366 42.9571 -41.7974 42.0293 -41.7046H41.6582V-41.8902C41.519 -42.6788 41.1015 -43.6066 40.5912 -44.2561C40.1737 -44.7663 39.5243 -45.1839 38.8748 -45.3694C38.4573 -45.4622 37.8078 -45.4622 37.3903 -45.3694C36.7873 -45.1839 36.2306 -44.9055 35.6739 -44.4416C35.0708 -43.8849 34.6533 -43.653 34.0039 -43.4674C33.7719 -43.3746 33.5864 -43.3746 33.2152 -43.3283C32.9369 -43.3283 32.7513 -43.3283 32.7513 -43.3283S32.7977 -43.421 32.8441 -43.4674C33.0297 -43.653 33.0761 -43.8385 32.9833 -44.0705C32.7513 -44.5344 32.0555 -44.4416 31.9627 -43.9313C31.9163 -43.653 32.1019 -43.3283 32.4266 -43.1427C32.7977 -43.0035 33.54 -43.0035 34.1894 -43.1891C34.4678 -43.2819 35.0244 -43.5602 35.1172 -43.6066C35.1636 -43.6994 35.21 -43.653 35.21 -43.3746C35.2564 -42.4468 36.1378 -41.7974 37.112 -41.9829C37.7151 -42.1221 38.0398 -42.4932 37.9934 -42.9571C37.9934 -43.2819 37.7615 -43.5138 37.3903 -43.5138C36.7409 -43.5138 36.5089 -42.6788 37.0656 -42.3541L37.1584 -42.3077L36.9728 -42.2613C36.2306 -42.1221 35.4883 -42.6788 35.4883 -43.421C35.4883 -43.7458 35.5347 -43.8849 35.8131 -44.1633C36.5553 -44.8591 37.6223 -45.2766 38.5037 -45.1375C39.7098 -44.9519 40.684 -44.0241 41.1479 -42.6324C41.2407 -42.3541 41.3799 -41.8902 41.3799 -41.751C41.3799 -41.7046 41.2407 -41.7046 40.9624 -41.7046C40.081 -41.6582 39.1068 -41.4263 38.3181 -41.1479S36.4625 -40.3129 35.7667 -39.7098L35.442 -39.4779L34.8853 -39.849C32.3338 -41.519 29.6896 -42.4468 26.6742 -42.6324C25.7001 -42.7252 24.7259 -42.6788 23.6125 -42.5396C21.2466 -42.2149 19.1127 -41.3799 13.8706 -38.6893C11.6439 -37.5295 10.9016 -37.2512 9.69551 -37.112C7.60796 -36.88 5.5668 -37.7151 4.639 -39.1995L4.49983 -39.4779L4.59261 -39.6171C4.77817 -39.849 5.14929 -40.2201 5.38124 -40.3593C5.61319 -40.5449 6.0307 -40.7304 6.35543 -40.8232C6.72655 -40.916 7.28323 -40.916 7.65435 -40.8232C8.62854 -40.5912 9.32439 -39.6634 9.09244 -38.8284C8.99966 -38.3181 8.62854 -37.947 8.16464 -37.947C7.93269 -37.9934 7.70074 -38.0398 7.56157 -38.2254C7.37601 -38.4109 7.28323 -38.782 7.32962 -39.0604V-39.1995L7.46879 -39.0604C7.83991 -38.6893 8.48937 -39.0604 8.3502 -39.5707C8.30381 -39.7562 8.07186 -39.9882 7.8863 -39.9882C7.56157 -39.9882 7.28323 -39.7562 7.14406 -39.4315C7.05128 -39.2459 7.05128 -39.1995 7.05128 -38.9212S7.05128 -38.5501 7.14406 -38.3645C7.32962 -37.947 7.70074 -37.7151 8.11825 -37.7151C8.39659 -37.7151 8.58215 -37.7615 8.76771 -37.9006C9.37078 -38.3181 9.55634 -39.2459 9.18522 -39.9882C9.04605 -40.2665 8.58215 -40.7304 8.25742 -40.8696C7.60796 -41.2407 6.81933 -41.2871 6.0307 -41.0088C5.47402 -40.8232 4.91734 -40.4521 4.54622 -39.9882L4.36066 -39.8026L4.31427 -39.9882C4.08232 -40.684 4.1751 -41.6118 4.49983 -42.2613C5.1029 -43.4674 6.4946 -44.1169 7.70074 -43.6994C8.3502 -43.4674 8.76771 -43.0963 9.37078 -42.1685C10.0202 -41.2407 10.345 -40.916 10.948 -40.7304C11.2264 -40.684 11.6903 -40.684 11.9686 -40.7304C12.6645 -40.916 13.2675 -41.519 13.4067 -42.1685C13.4067 -42.3077 13.4531 -42.4005 13.4995 -42.4005C13.5923 -42.4005 13.8242 -42.5396 13.917 -42.6788C14.4273 -43.2819 13.8242 -44.1633 13.082 -43.9313C12.6181 -43.7922 12.3861 -43.2819 12.5717 -42.8644C12.6645 -42.6788 12.85 -42.4932 12.9892 -42.4468C13.082 -42.4005 13.082 -42.4005 13.0356 -42.3077C13.0356 -42.2613 12.9428 -42.2149 12.85 -42.1685C12.4325 -41.9366 11.8758 -42.0757 11.4583 -42.5396C11.2264 -42.7716 11.1336 -42.9571 10.7625 -43.6066C10.3914 -44.3024 10.2058 -44.5808 9.92746 -44.8127C9.69551 -45.0911 9.46356 -45.2302 9.13883 -45.3694C8.76771 -45.555 8.48937 -45.6014 8.07186 -45.6478C7.00489 -45.6941 5.89153 -45.2302 5.05651 -44.3024C4.22149 -43.4674 3.75759 -42.4005 3.66481 -41.0551C3.61842 -40.4985 3.66481 -39.8954 3.75759 -39.2923L3.85037 -38.9212L3.75759 -38.5501C3.57203 -38.0862 3.57203 -37.8078 3.57203 -37.2512C3.57203 -35.5811 4.45344 -33.9575 6.07709 -32.8441L6.26265 -32.7049L6.07709 -32.7513C5.93792 -32.7513 5.52041 -32.7513 5.14929 -32.7513C4.54622 -32.7513 4.36066 -32.7513 4.08232 -32.6586C3.66481 -32.5658 3.15452 -32.4266 2.87618 -32.2874L2.73701 -32.1947L2.50506 -32.473C1.29892 -33.7719 0.4639 -35.5347 0.23195 -37.3439C0.13917 -37.8542 0.13917 -37.8542 0.27834 -37.947C0.41751 -37.9934 0.51029 -38.2717 0.51029 -38.4573C0.4639 -38.6429 0.37112 -38.7356 0.23195 -38.8284S0.09278 -38.9212 0.18556 -39.6171C0.23195 -39.8954 0.23195 -40.1273 0.27834 -40.1273C0.27834 -40.1273 0.37112 -40.1273 0.41751 -40.1273C0.41751 -40.1273 0.55668 -40.2201 0.60307 -40.2665C0.78863 -40.3593 0.88141 -40.5912 0.88141 -40.7768S0.78863 -41.1479 0.64946 -41.2871L0.55668 -41.3335L0.69585 -41.751C2.08755 -45.1839 5.28846 -47.225 8.53576 -46.6683C9.37078 -46.5292 10.0202 -46.3436 10.9944 -45.8333L11.6903 -45.5086L11.6439 -45.3694C11.6439 -45.1839 11.7367 -44.9055 11.9222 -44.8127C12.1078 -44.6736 12.2933 -44.6736 12.4789 -44.7663L12.6645 -44.8591L13.2211 -44.488C14.8912 -43.4674 16.1437 -42.8644 17.0715 -42.586C17.4426 -42.4932 18.0457 -42.4932 18.4632 -42.5396C19.1591 -42.6788 19.7621 -42.9571 21.1074 -43.7458C22.7775 -44.72 23.6589 -45.0447 24.6795 -45.1375C25.1434 -45.1839 25.4217 -45.1375 25.7464 -44.9983C26.0712 -44.8127 26.3031 -44.6272 26.9062 -44.0705S27.6948 -43.3746 28.0196 -43.1891C28.2979 -43.0499 28.3443 -43.0499 28.7154 -43.0499C29.1329 -43.0499 29.4113 -43.0963 29.7824 -43.2819C30.4318 -43.6066 30.8957 -44.2561 31.0349 -45.0447C31.0813 -45.6941 30.8493 -46.3436 30.3854 -46.5292C29.736 -46.8075 29.1793 -46.0653 29.6432 -45.5086C29.736 -45.3694 29.8752 -45.323 30.1071 -45.323S30.4782 -45.3694 30.6174 -45.555L30.7102 -45.6941L30.7566 -45.4622C30.7566 -45.2302 30.7102 -44.8591 30.6174 -44.5808C30.3854 -44.0241 29.7824 -43.5138 29.1793 -43.3746C29.0865 -43.3283 28.8546 -43.3283 28.669 -43.3283C28.3443 -43.3283 28.2979 -43.3746 28.0196 -43.4674C27.6948 -43.653 27.5093 -43.7922 26.9062 -44.3488S26.0712 -45.1375 25.7464 -45.2766S25.1434 -45.4622 24.6795 -45.4158C23.5661 -45.323 22.6383 -44.9519 20.8755 -43.9313C20.4116 -43.653 20.1796 -43.5602 19.7621 -43.5602C18.4632 -43.5602 17.3035 -44.8127 17.1643 -46.39C17.1643 -46.5292 17.1643 -46.7147 17.2107 -46.8075V-46.9931L17.3499 -46.8539C17.721 -46.39 18.4632 -46.7611 18.324 -47.3642C18.2313 -47.7353 17.8138 -47.9209 17.489 -47.7353ZM41.4263 -41.1943C41.4727 -40.916 41.4263 -40.2201 41.3335 -39.7562C41.1943 -38.782 40.7768 -37.6687 40.1737 -36.6017C39.9882 -36.2306 39.5243 -35.4883 39.4779 -35.442C39.4315 -35.442 39.2923 -35.5811 39.1532 -35.7667C38.2254 -37.0192 37.2512 -38.0398 35.8131 -39.1532L35.6739 -39.2923L35.8131 -39.4315C36.0914 -39.6171 36.6481 -40.0346 37.0656 -40.2665C38.2717 -40.9624 39.8026 -41.3799 41.1015 -41.4263H41.4263ZM4.54622 -37.2976C5.28846 -36.045 6.44821 -35.0244 7.83991 -34.3286C8.67493 -33.9111 9.50995 -33.6791 10.4377 -33.4936C10.948 -33.4472 12.5253 -33.4008 13.0356 -33.4936C14.0098 -33.6327 14.984 -33.9111 15.9118 -34.2358C16.654 -34.5605 17.1643 -34.7925 18.6952 -35.5347C21.1074 -36.6945 22.0816 -37.0656 23.2878 -37.3903C24.1692 -37.5759 24.6331 -37.6223 25.7928 -37.6223C26.7206 -37.6223 26.9526 -37.6223 27.3701 -37.5759C28.6226 -37.3439 29.736 -37.0192 30.8957 -36.4161C31.406 -36.1842 32.2874 -35.6275 32.4266 -35.5347C32.4266 -35.4883 32.4266 -35.3492 32.1947 -34.9317C32.0555 -34.6533 31.9163 -34.2822 31.8699 -34.1894L31.7771 -34.0039L31.406 -34.2358C30.2463 -35.0244 28.8546 -35.5347 27.4165 -35.7667C26.9062 -35.8595 25.6073 -35.8595 25.0506 -35.8131C24.5867 -35.7667 23.7981 -35.6275 23.3806 -35.5347L23.1022 -35.442L22.963 -35.5811C22.7311 -35.7667 22.4528 -35.7203 22.2208 -35.4883C22.1744 -35.442 22.128 -35.3492 22.0816 -35.2564C22.0816 -35.1636 22.0816 -35.1172 21.8961 -35.0708C21.4322 -34.9317 20.0869 -34.375 18.5096 -33.6791C17.6282 -33.2616 16.6076 -32.8441 16.2829 -32.7049C14.752 -32.1019 13.3139 -31.7308 12.247 -31.638L11.9686 -31.5916L11.8294 -31.7771C11.5975 -32.0555 11.1336 -32.0091 10.948 -31.638C10.9016 -31.5916 10.9016 -31.5916 10.3914 -31.638C8.39659 -31.7771 6.54099 -32.6122 5.33485 -33.8647C4.54622 -34.6533 4.08232 -35.4883 3.89676 -36.4625C3.80398 -36.9264 3.85037 -37.8078 3.94315 -38.179L3.98954 -38.4573L4.1751 -38.0398C4.26788 -37.8542 4.45344 -37.4831 4.54622 -37.2976ZM27.1381 -35.4883C28.669 -35.3028 30.0607 -34.7925 31.3596 -33.9575L31.6844 -33.7255L31.5916 -33.4936C31.1741 -32.4266 30.5246 -30.0607 30.3854 -29.0401C30.3391 -28.9474 30.3391 -28.901 30.2927 -28.901C29.6432 -29.1793 29.0865 -29.3649 28.4835 -29.4113C28.2979 -29.4576 27.7876 -29.4576 27.2773 -29.4576C24.7723 -29.4576 23.5197 -29.736 22.963 -30.4782C22.7775 -30.7102 22.7311 -30.9885 22.7311 -31.3596C22.7775 -32.1483 23.3806 -32.7049 24.1228 -32.6122H24.3084L24.2156 -32.5194C23.9836 -32.3802 23.8908 -32.0091 24.0764 -31.7771C24.2156 -31.5452 24.5867 -31.4988 24.8186 -31.6844C25.097 -31.9163 25.0506 -32.4266 24.7723 -32.6586C24.0764 -33.1688 23.0558 -32.8905 22.6847 -32.1483C22.4991 -31.8235 22.4528 -31.5916 22.4528 -31.3132C22.4528 -30.4782 22.9167 -29.8752 23.8908 -29.5504C24.262 -29.4113 24.9578 -29.2721 25.5145 -29.2257C25.7928 -29.2257 26.1176 -29.1793 26.2103 -29.1793H26.3495L26.0248 -28.9937C25.2362 -28.6226 24.5867 -27.9732 24.262 -27.3701C24.2156 -27.2309 24.1692 -27.1381 24.1692 -27.1381S23.8445 -27.4165 23.4269 -27.7412C22.0352 -28.8082 21.7105 -29.2721 21.5713 -30.0607C21.4322 -31.0349 21.9425 -32.1483 23.0558 -33.308C23.6125 -33.9111 24.2156 -34.2822 24.9114 -34.5142C25.1898 -34.6069 25.2825 -34.6069 25.7001 -34.6069C26.2567 -34.6069 26.3959 -34.5605 26.767 -34.375C27.2309 -34.1894 27.5093 -33.7719 27.5557 -33.308L27.602 -33.0761L27.0918 -32.2874C26.5815 -31.4988 26.4423 -31.3132 26.2567 -31.2669C26.164 -31.2669 25.9784 -31.3132 25.9784 -31.406C25.9784 -31.406 25.932 -31.4524 25.8392 -31.4524C25.7001 -31.4524 25.7001 -31.4524 25.7001 -31.3132C25.7001 -30.9885 26.0712 -30.4782 26.4887 -30.2927C27.5093 -29.8288 28.7618 -30.2927 29.2721 -31.3596C29.5968 -32.0555 29.5968 -32.7513 29.2257 -33.4936C28.9474 -34.0966 28.2979 -34.5605 27.5557 -34.7925C27.1845 -34.8853 26.2567 -34.8853 25.7464 -34.8389C24.7723 -34.6997 23.6589 -34.3286 22.5919 -33.7255C20.7827 -32.7049 19.7157 -31.7771 19.1591 -30.6638C18.8343 -30.0143 18.6952 -29.5504 18.6952 -28.8082C18.6952 -27.9732 18.8807 -27.3701 19.2982 -26.5351C19.7621 -25.5145 20.3652 -24.6331 21.7569 -23.0558C22.6383 -22.0352 23.0558 -21.4786 23.4269 -21.0147C24.3084 -19.8549 24.865 -18.8343 25.097 -17.8138C25.1898 -17.4426 25.2825 -16.7468 25.2362 -16.7004C25.2362 -16.7004 25.097 -16.7468 24.9578 -16.8396C24.03 -17.2107 23.0558 -17.8601 22.0352 -18.6488C21.293 -19.2518 21.293 -19.2982 21.1538 -19.623C21.0147 -20.0405 20.5972 -20.8755 20.3652 -21.2466C20.226 -21.4322 19.9941 -21.8033 19.7621 -22.0352C19.1127 -22.9167 18.7416 -23.5197 18.6488 -23.9836L18.556 -24.2156L18.1385 -23.7517C17.9065 -23.5197 17.6746 -23.3342 17.6746 -23.3342C17.6282 -23.3342 17.3499 -24.0764 17.2571 -24.6331C17.1643 -25.097 17.1643 -26.8598 17.2571 -27.5093C17.5818 -29.8752 18.4168 -31.8235 19.6694 -33.1225C20.1333 -33.5864 21.1074 -34.2822 21.8033 -34.6533L22.1744 -34.8389L22.2672 -34.7925C22.5455 -34.5142 23.0094 -34.6533 23.1486 -35.0244C23.195 -35.1636 23.195 -35.1636 23.3806 -35.21C23.6589 -35.3028 24.4939 -35.442 24.865 -35.4883C25.4217 -35.5811 26.6279 -35.5811 27.1381 -35.4883ZM33.1225 -34.9781C34.2822 -34.0503 35.3956 -32.8905 36.2306 -31.638L36.5553 -31.2205L36.045 -30.4782C35.7667 -30.0607 35.5347 -29.736 35.5347 -29.6896C35.4883 -29.6896 35.3956 -29.8288 35.2564 -30.0607C34.7461 -30.9885 34.0503 -31.9163 33.3544 -32.6122C32.9833 -33.0297 32.3802 -33.54 32.1019 -33.7255L32.0091 -33.8183L32.1483 -34.1894C32.241 -34.375 32.3802 -34.6997 32.5194 -34.9317C32.6586 -35.2564 32.7049 -35.3028 32.7513 -35.2564C32.7513 -35.2564 32.9369 -35.1172 33.1225 -34.9781ZM32.3802 -33.1688C32.8441 -32.7977 33.4936 -32.1019 33.8647 -31.5916C34.375 -30.9885 35.3028 -29.5504 35.3028 -29.4113C35.3028 -29.3649 35.2564 -29.2257 35.1636 -29.0865C34.6533 -28.3443 33.8647 -26.9526 33.4472 -26.1176L33.1688 -25.6537L32.9833 -26.0248C32.6586 -26.7206 32.2874 -27.2309 31.7308 -27.7876C31.4988 -28.0659 30.8957 -28.5298 30.6638 -28.669C30.6174 -28.7154 30.6174 -28.7154 30.6638 -29.1329C30.8957 -30.3391 31.2205 -31.5452 31.5916 -32.6122C31.9163 -33.6327 31.9163 -33.54 31.9627 -33.4936S32.1947 -33.308 32.3802 -33.1688ZM18.556 -33.4008C18.5096 -33.3544 16.7932 -32.2874 16.1437 -31.8235C13.685 -30.3391 11.9686 -29.6432 10.1594 -29.4576C9.23161 -29.3649 7.97908 -29.4576 7.05128 -29.6896C5.61319 -30.0607 4.22149 -30.803 3.15452 -31.7771L2.92257 -32.0091L3.2473 -32.1483C3.89676 -32.3802 4.40705 -32.473 5.19568 -32.473C6.07709 -32.473 6.77294 -32.3338 7.60796 -32.0091C8.16464 -31.7771 8.76771 -31.5916 9.278 -31.4988C9.69551 -31.406 10.4841 -31.3132 10.7625 -31.3132C10.9016 -31.3132 10.9016 -31.2669 10.9944 -31.1741C11.0872 -30.9885 11.2264 -30.9421 11.4583 -30.9421C11.6439 -30.9421 11.8294 -31.0349 11.9222 -31.2205C11.9686 -31.3132 11.9686 -31.3132 12.1078 -31.3132C12.1542 -31.3132 12.3861 -31.3596 12.6181 -31.406C14.1489 -31.5916 15.587 -32.1019 17.9065 -33.1225C18.5096 -33.4008 18.556 -33.4008 18.556 -33.4008ZM18.4168 -31.8699C17.4426 -30.2463 16.886 -28.1123 16.886 -25.9784C16.886 -24.865 17.0251 -24.03 17.3499 -23.3342C17.3962 -23.195 17.4426 -23.1022 17.4426 -23.1022C17.4426 -23.0558 16.7004 -22.4528 16.2365 -22.128C15.4015 -21.4786 14.1026 -20.6899 13.2675 -20.226C13.082 -20.0869 12.8964 -19.9941 12.8964 -19.9941C12.9428 -19.9941 13.0356 -20.0405 13.1284 -20.0405C14.2417 -20.3188 15.587 -20.1333 16.654 -19.5766S18.7416 -17.9993 19.2518 -16.886C19.6694 -16.0509 19.9013 -14.9376 19.9013 -14.0562V-13.8706L19.5766 -14.1026C18.9271 -14.4737 18.1849 -14.8912 17.3962 -15.1695C17.2107 -15.2623 17.2107 -15.2623 17.2107 -15.4015C17.2571 -15.6334 17.3035 -16.4684 17.2571 -16.654C17.1179 -17.2107 16.7468 -17.6746 16.1437 -17.9529C14.9376 -18.556 13.4067 -18.4168 11.7367 -17.5354C10.9944 -17.1643 10.113 -16.5612 9.7419 -16.0973C9.64912 -15.9582 9.60273 -15.9118 9.46356 -15.9118C8.67493 -15.7726 6.9585 -15.2159 6.26265 -14.8448L6.12348 -14.7984L6.21626 -14.9376C7.05128 -16.0509 7.46879 -16.9787 7.56157 -18.0457C7.65435 -18.7879 7.51518 -19.5302 7.19045 -20.226L7.14406 -20.3652L7.4224 -20.5972C7.60796 -20.6899 8.07186 -21.1538 8.48937 -21.5713C9.23161 -22.2672 9.278 -22.3136 9.37078 -22.3136C9.41717 -22.2672 9.50995 -22.2672 9.60273 -22.2672H9.7419V-22.0352C9.78829 -21.4786 10.2058 -20.9683 10.9016 -20.5508C11.3655 -20.2724 12.0614 -20.1333 12.5717 -20.1796C13.1748 -20.2724 13.8242 -20.7363 13.8242 -21.1074C13.8242 -21.3858 13.4995 -21.6641 13.2211 -21.6177C12.8036 -21.525 12.6645 -20.9683 12.9892 -20.6899C13.082 -20.6435 13.082 -20.6435 12.9892 -20.5972C12.9428 -20.5972 12.8036 -20.5508 12.7109 -20.5044C12.1542 -20.3652 11.3655 -20.5508 10.7625 -20.9683C10.2522 -21.3394 10.0666 -21.6641 10.0202 -22.1744C10.0202 -22.4064 10.0202 -22.4528 10.113 -22.5455C10.1594 -22.6383 10.1594 -22.7311 10.2058 -22.8703C10.2522 -23.195 10.3914 -23.4733 10.7625 -23.8445S11.5975 -24.5403 12.2006 -24.8186C12.4325 -24.9578 12.85 -25.1434 13.082 -25.2362C13.685 -25.5609 13.8706 -25.7928 13.7314 -26.164C13.6387 -26.3495 13.5459 -26.4423 13.2675 -26.4887C13.2211 -26.5351 13.1284 -26.5351 13.1284 -26.5815C13.082 -26.5815 13.2675 -26.767 13.4531 -27.0454C14.984 -28.669 16.3293 -30.0607 17.1643 -30.9421C17.5818 -31.3132 18.6488 -32.3338 18.6952 -32.3338C18.6952 -32.3338 18.556 -32.1483 18.4168 -31.8699ZM43.2355 -32.2874C43.8385 -32.1483 44.4416 -31.8235 44.8591 -31.3596C45.4158 -30.803 45.7869 -30.0607 46.0189 -29.1793C46.158 -28.669 46.2044 -28.2979 46.2044 -27.602C46.2044 -26.3495 45.9261 -25.1434 45.4158 -24.1228C44.7663 -22.8703 43.9313 -22.0816 42.818 -21.6641L42.586 -21.5713L42.6324 -21.6641C42.6324 -21.8497 42.7252 -22.5455 42.7716 -23.1022C42.8644 -23.7053 42.8644 -25.5609 42.7716 -26.2103C42.6788 -27.2309 42.4932 -28.4835 42.2613 -29.3649L42.1685 -29.6432H42.2613C42.4005 -29.6432 42.818 -29.5504 43.0963 -29.4576C44.0705 -29.1329 44.5808 -28.4835 44.5808 -27.6948C44.5808 -27.4629 44.5344 -27.3701 44.488 -27.5093C44.4416 -27.6948 43.9777 -27.7412 43.7922 -27.602C43.5602 -27.4629 43.4674 -27.1381 43.6066 -26.9062C43.7922 -26.6279 44.0705 -26.5815 44.3952 -26.7206C44.9055 -26.999 45.0447 -27.8804 44.6736 -28.5762C44.488 -28.901 44.0705 -29.3185 43.6994 -29.504S42.8644 -29.8288 42.4468 -29.9215C42.2613 -29.9215 42.0757 -29.9679 42.0757 -29.9679S42.0293 -30.1535 41.9366 -30.4318C41.7974 -30.8493 41.3799 -31.9163 41.2871 -32.1019L41.2407 -32.241L41.4727 -32.2874C41.8902 -32.3338 41.9366 -32.3338 42.4468 -32.3338C42.818 -32.3338 43.0963 -32.3338 43.2355 -32.2874ZM36.8337 -30.7102C37.0656 -30.3391 37.112 -30.3854 36.7409 -30.0143C36.5553 -29.8288 36.277 -29.5504 36.1378 -29.3649S35.9059 -29.0401 35.9059 -28.9937C35.8595 -28.9937 35.8131 -29.0401 35.7667 -29.1793L35.6739 -29.3649L35.7667 -29.504C35.9986 -29.8752 36.6945 -30.9421 36.6945 -30.9421S36.7873 -30.8493 36.8337 -30.7102ZM37.5759 -29.3649C38.3645 -27.8804 39.014 -26.0712 39.3387 -24.4475L39.4315 -23.9372L39.1995 -24.03C39.0604 -24.0764 38.8748 -24.1228 38.7356 -24.1228C38.5501 -24.1228 38.5037 -24.1228 38.4109 -23.9836C38.2254 -23.8445 38.179 -23.6589 38.179 -23.1486C38.1326 -22.7775 38.179 -22.7311 38.2254 -22.5455C38.3181 -22.4528 38.4573 -22.2208 38.6429 -22.0352C39.014 -21.6641 39.1068 -21.4786 39.1068 -21.293C39.1068 -21.1538 38.9676 -20.9219 38.8284 -20.8755C38.6893 -20.7827 38.5501 -20.8291 38.0862 -21.3394C37.6687 -21.7569 37.6687 -21.7569 37.6687 -21.9425S37.5759 -22.963 37.5295 -23.3806C37.2512 -25.1434 36.7873 -26.8598 36.1378 -28.3443L35.9986 -28.669L36.1378 -28.8546C36.3234 -29.1329 36.6945 -29.5504 36.9728 -29.8288C37.1584 -30.1071 37.2048 -30.1071 37.2512 -30.0607C37.2512 -30.0143 37.4367 -29.736 37.5759 -29.3649ZM28.4835 -29.1329C28.901 -29.0865 29.1793 -28.9937 29.5968 -28.8546C29.8288 -28.7618 30.2463 -28.6226 30.2927 -28.5762C30.2927 -28.5762 30.2463 -28.3907 30.1999 -28.1587C30.1535 -27.8804 30.1071 -27.4165 30.0607 -27.0454C30.0143 -26.7206 29.9679 -26.3959 29.9679 -26.3959C29.9215 -26.3959 29.8288 -26.4423 29.6896 -26.5351C29.2721 -26.8134 28.4835 -27.0454 27.9268 -27.0454H27.6948V-26.9062V-26.767L28.0196 -26.7206C28.669 -26.7206 29.2257 -26.4887 29.6896 -26.164L29.9215 -26.0248V-25.8392C29.8752 -25.4681 29.7824 -24.4011 29.736 -23.6125C29.736 -23.1022 29.6896 -22.5455 29.6896 -22.3136L29.6432 -21.9425L29.4576 -21.8497C29.2721 -21.7569 29.1329 -21.7569 28.8082 -21.7105C28.4371 -21.7105 27.834 -21.7569 27.6948 -21.8033C27.6948 -21.8497 27.5557 -22.0352 27.4629 -22.3136C26.8598 -23.8908 25.932 -25.3289 24.7723 -26.5351L24.4011 -26.9526L24.4939 -27.1381C24.7723 -27.7412 25.4217 -28.3907 26.1176 -28.7154C26.8134 -29.0865 27.6484 -29.2257 28.4835 -29.1329ZM35.5811 -28.901L35.6739 -28.7154L35.442 -28.3443C34.6997 -27.0918 34.0966 -25.4217 33.8647 -24.03C33.8183 -23.8445 33.8183 -23.7053 33.8183 -23.7053C33.8183 -23.7517 33.7255 -23.9372 33.6791 -24.2156C33.5864 -24.4939 33.4936 -24.8186 33.4472 -25.0042L33.3544 -25.2825L33.4936 -25.6537C33.8183 -26.2103 34.2358 -26.999 34.8853 -28.0659C35.21 -28.6226 35.4883 -29.0401 35.4883 -29.0401S35.5347 -28.9937 35.5811 -28.901ZM31.0349 -28.0659C31.5916 -27.602 32.1019 -26.999 32.5194 -26.3495C32.7049 -25.9784 32.9833 -25.4217 32.9833 -25.3289C32.9833 -25.2825 32.8905 -25.0042 32.7513 -24.7259C32.2874 -23.8445 31.4988 -21.8033 31.4988 -21.6641C31.4988 -21.6177 31.4524 -21.6177 31.3596 -21.6177C31.3132 -21.6641 30.9421 -21.6641 30.6174 -21.6641C30.2927 -21.7105 29.9679 -21.7105 29.9679 -21.7569C29.9679 -21.7569 30.0143 -21.8033 30.0607 -21.8033C30.1999 -21.9425 30.5246 -22.3136 30.6638 -22.5455C31.2669 -23.5661 31.1741 -24.9578 30.4318 -25.8856C30.2463 -26.1176 30.2463 -26.164 30.2463 -26.3031C30.2927 -26.6279 30.4782 -27.9268 30.5246 -28.1587L30.571 -28.3907L30.6638 -28.3443C30.7102 -28.2979 30.8957 -28.2051 31.0349 -28.0659ZM35.9986 -27.9732C36.6481 -26.3959 37.0656 -24.6795 37.2976 -22.7775C37.3903 -21.8961 37.3903 -21.8497 37.2512 -21.8033C37.1584 -21.7569 36.9728 -21.5713 36.7873 -21.3858C36.4161 -20.9683 36.2306 -20.8291 36.0914 -20.8291C35.9059 -20.8291 35.6739 -21.1538 35.7203 -21.3394S35.8595 -21.6177 36.1378 -21.9889C36.3234 -22.1744 36.5089 -22.4064 36.5553 -22.4991C36.6481 -22.6383 36.6481 -22.6847 36.6481 -23.1022C36.6481 -23.8445 36.5089 -24.1228 36.0914 -24.1228S35.3028 -23.9372 35.0244 -23.6589C34.8389 -23.4269 34.7461 -23.2878 34.7461 -23.0094C34.7461 -22.7775 34.7925 -22.6383 34.9781 -22.4991C35.1636 -22.4064 35.442 -22.4064 35.6275 -22.4991C36.0914 -22.7311 35.9986 -23.4733 35.442 -23.5661H35.3492L35.5347 -23.7053C35.6739 -23.7517 35.8131 -23.7981 35.9986 -23.7981L36.2306 -23.8445L36.3234 -23.7053C36.3698 -23.5661 36.3698 -23.4269 36.3698 -23.1022C36.3698 -22.5919 36.3698 -22.5455 35.9059 -22.0816C35.7203 -21.8961 35.5811 -21.6641 35.5347 -21.5713C35.442 -21.3394 35.442 -21.1074 35.5347 -20.9683C35.7667 -20.6435 35.9986 -20.5972 36.6481 -20.7827C36.88 -20.8755 37.1584 -20.9219 37.2512 -20.9683H37.3903V-20.226C37.3903 -18.7879 37.2048 -17.1643 36.88 -15.819C36.8337 -15.4943 36.7873 -15.4943 36.6945 -15.4943C36.6481 -15.4943 36.4161 -15.5406 36.1378 -15.5406C34.4678 -15.6798 32.6122 -15.3551 30.7566 -14.5665C30.0607 -14.2417 28.7154 -13.5459 28.1123 -13.1284C28.0196 -13.082 28.0659 -13.1748 28.2979 -13.4995C28.5298 -13.8706 28.669 -14.1489 29.3185 -15.4479L29.5504 -15.9582L29.9679 -16.0973C30.7566 -16.3757 31.4524 -16.7932 32.1019 -17.3962C32.473 -17.7674 32.8905 -18.324 33.0761 -18.6488C33.1688 -18.8343 33.2152 -18.8343 33.4008 -18.8807C34.4678 -19.2518 35.5347 -18.9271 35.7667 -18.2313C35.8131 -18.0457 35.8131 -17.7674 35.7667 -17.5818C35.6275 -17.3035 35.3028 -17.1643 35.0244 -17.2107H34.8389L34.9781 -17.3035C35.21 -17.5354 35.21 -17.9065 34.9781 -18.0921C34.7461 -18.324 34.4214 -18.2777 34.2358 -18.0457C33.7255 -17.489 34.6069 -16.7004 35.3956 -16.9323C35.6739 -17.0251 35.9522 -17.3035 36.045 -17.5818C36.277 -18.3704 35.7203 -19.1127 34.7461 -19.2982C34.375 -19.3446 33.7719 -19.2982 33.4008 -19.1591C33.3544 -19.1591 33.3544 -19.2055 33.4472 -19.391C33.7719 -20.0869 33.9575 -21.0611 33.9575 -22.0352C33.9575 -23.4733 34.2822 -25.1434 34.8389 -26.4887C35.1172 -27.2309 35.7667 -28.3907 35.8131 -28.3443C35.8131 -28.3443 35.9059 -28.1587 35.9986 -27.9732ZM13.3139 -26.3031C13.3603 -26.3031 13.4067 -26.2103 13.4531 -26.164C13.5923 -25.7928 13.3603 -25.6073 12.6645 -25.3753C12.2933 -25.2362 11.9686 -25.097 11.6903 -24.9114C11.4583 -24.8186 11.4583 -24.8186 12.1542 -25.5609C12.5253 -25.9784 12.8964 -26.3495 12.9428 -26.3959C13.0356 -26.4423 13.2211 -26.3959 13.3139 -26.3031ZM30.4782 -25.2362C30.7102 -24.865 30.7566 -24.5403 30.7566 -24.03C30.7566 -23.5661 30.7102 -23.2878 30.5246 -22.9167C30.4318 -22.6383 30.1535 -22.2672 30.0143 -22.1744C29.9679 -22.1744 29.9679 -22.1744 29.9679 -22.5919C30.0143 -23.5661 30.0607 -24.5403 30.1071 -25.097C30.1535 -25.4217 30.1999 -25.7001 30.1999 -25.7001C30.1999 -25.7928 30.3854 -25.5145 30.4782 -25.2362ZM3.89676 -25.3753C4.36066 -25.2825 4.82456 -24.9114 5.01012 -24.4939C5.33485 -23.7517 5.1029 -22.9167 4.45344 -22.5919C4.08232 -22.4528 3.66481 -22.4528 3.43286 -22.6847C3.34008 -22.7775 3.34008 -22.7775 3.34008 -23.0094V-23.2414L3.43286 -23.1486C3.66481 -22.8239 4.12871 -22.8703 4.31427 -23.195S4.26788 -23.9836 3.85037 -23.9836C3.61842 -23.9836 3.47925 -23.8908 3.29369 -23.7053C3.10813 -23.4733 3.06174 -23.2414 3.06174 -22.963C3.06174 -22.5919 3.15452 -22.4528 3.52564 -22.2672L3.7112 -22.2208L3.52564 -22.1744C3.06174 -22.0816 2.55145 -21.8033 2.18033 -21.4786C1.94838 -21.2466 1.99477 -21.2466 1.76282 -21.7105S1.43809 -22.5455 1.43809 -23.0558S1.53087 -23.9372 1.71643 -24.3547C1.90199 -24.6795 2.3195 -25.097 2.59784 -25.2362C3.01535 -25.4217 3.47925 -25.5145 3.89676 -25.3753ZM33.3544 -24.2156C33.5864 -23.4269 33.6327 -22.7775 33.6791 -21.9889C33.6791 -21.5713 33.6327 -21.2002 33.6327 -21.1074L33.5864 -20.9219L33.4936 -21.0147C33.2152 -21.2466 32.6586 -21.4322 32.1019 -21.525C31.9163 -21.5713 31.7771 -21.6177 31.7771 -21.6177C31.7771 -21.7569 32.5194 -23.6589 32.9369 -24.4939L33.1688 -24.9578L33.2152 -24.8186C33.2152 -24.7259 33.308 -24.4475 33.3544 -24.2156ZM39.1532 -23.7517C39.2923 -23.7053 39.3851 -23.6589 39.4315 -23.6125C39.5243 -23.5661 39.5243 -23.5661 39.3851 -23.5661C39.1532 -23.5661 38.9212 -23.2878 38.9212 -23.0094C38.9212 -22.6383 39.1068 -22.4528 39.4779 -22.4064C39.6634 -22.4064 39.6634 -22.4064 39.7098 -22.2672C39.8026 -21.5713 39.849 -19.5302 39.7562 -18.6024C39.7098 -17.8138 39.5707 -17.0715 39.4315 -16.4221C39.3387 -15.819 39.1068 -14.984 39.0604 -14.8912C39.0604 -14.8912 38.9676 -14.8912 38.782 -14.984C38.4109 -15.1231 37.8078 -15.2623 37.3903 -15.3551C37.2512 -15.4015 37.112 -15.4479 37.112 -15.4479C37.112 -15.4943 37.1584 -15.7726 37.2512 -16.0973C37.5295 -17.489 37.6687 -18.5096 37.6687 -19.9013C37.7151 -20.5972 37.7151 -20.9219 37.7615 -20.9219C37.7615 -20.9219 37.947 -20.8755 38.1326 -20.8291C38.782 -20.5972 39.0604 -20.6435 39.2923 -20.9219C39.3387 -21.0147 39.3851 -21.1074 39.3851 -21.2466C39.3851 -21.525 39.2923 -21.6641 38.9212 -22.0816C38.4573 -22.5455 38.4573 -22.6383 38.4573 -23.1486C38.4573 -23.7053 38.5501 -23.7981 38.7356 -23.7981C38.8284 -23.7981 39.014 -23.7981 39.1532 -23.7517ZM4.77817 -21.8961C5.19568 -21.8033 5.65958 -21.6177 6.07709 -21.2466C6.26265 -21.1074 6.72655 -20.5508 6.72655 -20.458C6.72655 -20.4116 6.07709 -20.0869 5.75236 -19.9941C5.01012 -19.7621 4.08232 -19.8085 3.34008 -20.1333C3.01535 -20.3188 2.59784 -20.5972 2.36589 -20.8291L2.18033 -21.0147L2.27311 -21.1538C2.3195 -21.2002 2.41228 -21.293 2.55145 -21.3858C3.20091 -21.8961 3.94315 -22.0352 4.77817 -21.8961ZM28.8082 -21.4322H29.6896V-20.7827C29.6896 -19.2982 29.504 -17.3962 29.2257 -16.5148L29.1793 -16.2829L28.9474 -16.2365C28.8082 -16.1901 28.6226 -16.1437 28.2515 -16.1437C27.7876 -16.0973 27.7412 -16.0973 27.7876 -16.1901C28.2051 -17.6746 28.2979 -18.9271 28.0659 -20.2724C27.9732 -20.6899 27.834 -21.293 27.7876 -21.4322C27.7412 -21.525 27.7412 -21.525 27.834 -21.4786C27.9268 -21.4786 28.3443 -21.4786 28.8082 -21.4322ZM31.3132 -21.3394C31.3596 -21.293 31.1277 -20.6435 30.571 -19.1127C30.1999 -18.1385 29.6432 -16.7468 29.5968 -16.7932C29.5968 -16.7932 29.5968 -16.886 29.6432 -16.9787C29.7824 -17.6746 29.9215 -19.0663 29.9679 -20.3652V-21.4322L30.6174 -21.3858C30.9885 -21.3858 31.3132 -21.3394 31.3132 -21.3394ZM32.3802 -21.1538C32.7977 -21.0611 33.0761 -20.9683 33.308 -20.7827C33.4472 -20.6899 33.4936 -20.6899 33.54 -20.7363C33.7255 -21.0147 33.3544 -19.7621 33.0761 -19.2055C32.9369 -18.9735 32.8905 -18.9271 32.7049 -18.8343C32.3802 -18.6024 32.0555 -18.3704 31.2669 -17.721C30.6174 -17.1643 30.0143 -16.654 29.8752 -16.654C29.8752 -16.6076 29.8288 -16.654 29.8752 -16.654C30.3391 -17.7674 31.1741 -19.9477 31.5452 -21.0147L31.638 -21.293H31.8235C31.9627 -21.2466 32.1947 -21.2002 32.3802 -21.1538ZM22.0816 -18.2313C23.0558 -17.489 24.1692 -16.8396 25.097 -16.4684L25.2825 -16.3757L25.2362 -15.9582C25.1898 -14.5665 24.5403 -12.9892 23.3806 -11.5511C23.0558 -11.18 22.7775 -10.9016 22.7775 -10.948C22.7775 -10.948 22.6383 -11.0872 22.5455 -11.2264C22.2208 -11.6903 21.8033 -12.247 21.3394 -12.6645L20.9219 -13.082L21.0611 -13.4067C21.525 -14.752 21.7569 -16.2829 21.6177 -17.5354C21.5713 -17.9529 21.4786 -18.6488 21.4322 -18.7879C21.3858 -18.8343 21.4786 -18.7416 21.6177 -18.6488S21.9425 -18.3704 22.0816 -18.2313ZM32.6586 -18.5096C32.6586 -18.4632 32.5194 -18.324 32.3802 -18.1849C31.8235 -17.4426 30.9885 -16.7932 30.1535 -16.4684C30.0143 -16.4221 30.0607 -16.4684 30.4318 -16.7468C30.571 -16.8396 30.8957 -17.1179 31.1741 -17.3499C31.9163 -17.9993 32.0091 -18.0921 32.3338 -18.324S32.7049 -18.556 32.6586 -18.5096ZM14.5201 -17.489C15.2159 -17.3035 15.6334 -16.886 15.6798 -16.3293C15.6798 -16.1437 15.6798 -16.0973 15.587 -16.0045C15.4479 -15.819 15.4015 -15.819 15.1231 -15.8654C14.6128 -15.9582 13.6387 -16.0973 12.9428 -16.1437C12.2006 -16.1901 11.0872 -16.1437 10.4841 -16.0509C10.345 -16.0509 10.2058 -16.0045 10.2058 -16.0045C10.2058 -16.0509 10.6233 -16.4221 10.948 -16.6076C11.6439 -17.0715 12.5717 -17.3962 13.4531 -17.5354C13.685 -17.5818 14.2881 -17.5354 14.5201 -17.489ZM29.0401 -15.7262C28.8546 -15.1695 28.6226 -14.6592 28.1123 -13.8706C27.7876 -13.4067 27.4629 -12.9892 27.1845 -12.6645C26.999 -12.4325 26.8134 -12.2933 25.9784 -11.6439C25.6537 -11.4119 25.0506 -10.948 24.6795 -10.6697C24.3084 -10.345 23.9836 -10.0666 23.9372 -10.0202C23.7981 -9.92746 23.3806 -9.7419 23.3806 -9.78829C23.3806 -9.78829 23.3342 -9.88107 23.2414 -10.0202L23.1486 -10.2522L23.6125 -10.6697C25.5145 -12.247 26.8134 -13.7778 27.5093 -15.4943L27.6484 -15.819H28.3443C28.7154 -15.8654 29.0401 -15.8654 29.0401 -15.8654C29.0865 -15.9118 29.0865 -15.9118 29.0401 -15.7262ZM13.685 -15.7726C13.9634 -15.7726 14.2417 -15.7262 14.3345 -15.7262L14.5665 -15.6798L14.2881 -15.5406C13.8242 -15.3087 13.5923 -14.8912 13.5923 -14.3809S13.8242 -13.4531 14.2881 -13.2211C14.4737 -13.082 14.5665 -13.082 14.8448 -13.082C15.4479 -13.0356 15.8654 -13.2211 16.3293 -13.685C16.654 -13.9634 16.8396 -14.2881 17.0251 -14.7056L17.1179 -14.984L17.6746 -14.752C18.4168 -14.4273 19.2518 -13.9634 19.7157 -13.6387C19.8549 -13.5459 19.9013 -13.4995 19.9013 -13.3603C19.9013 -12.9428 19.6694 -11.9222 19.391 -11.2728C19.2518 -10.948 18.9735 -10.2986 18.9271 -10.2522C18.9271 -10.2522 18.7416 -10.345 18.5096 -10.5305C16.9323 -11.7367 15.2159 -12.5717 13.4531 -12.9428C11.9686 -13.2675 10.2522 -13.2675 8.90688 -12.8964C8.53576 -12.8036 8.53576 -12.7572 8.62854 -13.2675C8.8141 -14.1026 9.23161 -14.984 9.7419 -15.4943L9.88107 -15.6798L10.345 -15.7262C10.5769 -15.7726 10.9944 -15.819 11.2264 -15.819C11.7831 -15.8654 13.1284 -15.8654 13.685 -15.7726ZM9.32439 -15.5406C9.278 -15.4943 9.23161 -15.4015 9.13883 -15.2623C8.72132 -14.5665 8.39659 -13.7314 8.30381 -12.9428L8.25742 -12.7109L7.93269 -12.5717C7.46879 -12.4325 6.77294 -12.0614 6.35543 -11.7831C4.77817 -10.7625 3.75759 -9.278 3.38647 -7.65435C3.29369 -7.14406 3.29369 -6.26265 3.34008 -5.75236C3.57203 -4.1751 4.54622 -2.87618 5.79875 -2.27311C6.44821 -1.99477 7.32962 -1.90199 7.97908 -2.04116C8.67493 -2.18033 9.23161 -2.45867 9.69551 -2.92257C10.6697 -3.89676 10.9016 -5.28846 10.2522 -5.98431C9.97385 -6.30904 9.50995 -6.44821 8.90688 -6.40182C8.3502 -6.35543 7.83991 -6.4946 7.65435 -6.77294S7.56157 -7.4224 7.83991 -7.51518C7.93269 -7.56157 7.97908 -7.60796 7.97908 -7.70074V-7.83991H7.79352C7.00489 -7.74713 6.54099 -6.86572 6.86572 -6.12348C7.09767 -5.65958 7.46879 -5.38124 8.16464 -5.1029C8.8141 -4.87095 8.95327 -4.73178 9.13883 -4.31427C9.23161 -4.12871 9.23161 -3.61842 9.13883 -3.38647C8.90688 -2.92257 8.48937 -2.55145 7.93269 -2.36589C7.65435 -2.27311 7.56157 -2.27311 7.09767 -2.27311C6.54099 -2.27311 6.21626 -2.36589 5.70597 -2.59784C4.73178 -3.06174 4.03593 -3.94315 3.7112 -5.1029C3.61842 -5.42763 3.61842 -5.47402 3.61842 -6.16987C3.61842 -6.81933 3.61842 -6.86572 3.7112 -7.28323C3.98954 -8.21103 4.54622 -9.09244 5.24207 -9.69551C5.98431 -10.345 6.81933 -10.7161 7.79352 -10.9016C8.30381 -10.9944 8.44298 -10.9944 8.44298 -10.9016C8.44298 -10.8553 8.48937 -10.6697 8.53576 -10.4841C8.67493 -10.0666 8.95327 -9.50995 9.13883 -9.23161C9.23161 -9.09244 9.278 -8.99966 9.278 -8.99966S9.18522 -8.99966 9.04605 -9.04605C7.05128 -9.55634 5.05651 -8.53576 4.68539 -6.86572C4.54622 -6.26265 4.68539 -5.5668 4.96373 -5.05651C5.14929 -4.73178 5.61319 -4.31427 5.98431 -4.12871C6.30904 -3.98954 6.72655 -3.85037 7.00489 -3.85037H7.14406V-3.98954V-4.12871H7.00489C6.58738 -4.12871 6.0307 -4.36066 5.65958 -4.68539C5.42763 -4.91734 5.14929 -5.33485 5.05651 -5.61319C4.91734 -5.93792 4.91734 -6.54099 4.96373 -6.81933C5.19568 -7.79352 6.0307 -8.53576 7.09767 -8.8141C7.60796 -8.90688 8.39659 -8.90688 8.90688 -8.76771C9.37078 -8.67493 9.64912 -8.53576 9.78829 -8.39659C9.92746 -8.21103 10.5769 -7.70074 10.9016 -7.51518S11.3655 -7.14406 11.5975 -6.72655C12.1078 -5.75236 12.247 -4.45344 11.8758 -3.34008C11.4119 -1.99477 10.2522 -0.88141 8.76771 -0.37112C8.25742 -0.23195 7.8863 -0.13917 7.32962 -0.13917C5.61319 -0.04639 4.03593 -0.69585 2.7834 -1.99477C1.67004 -3.15452 1.02058 -4.68539 0.88141 -6.44821V-6.77294L1.02058 -6.86572C1.48448 -7.05128 1.53087 -7.70074 1.11336 -7.97908C1.02058 -8.02547 1.02058 -8.07186 1.02058 -8.11825C1.06697 -8.44298 1.25253 -9.18522 1.3917 -9.50995C1.94838 -10.9944 2.96896 -12.3397 4.31427 -13.3603L4.49983 -13.4995L4.36066 -13.3139C4.26788 -13.2675 4.1751 -13.1748 4.1751 -13.1284C4.1751 -13.1284 4.22149 -13.082 4.26788 -13.0356L4.36066 -12.9428L5.01012 -13.5923C5.75236 -14.2881 5.79875 -14.3345 6.68016 -14.752C7.37601 -15.0304 8.30381 -15.3551 9.23161 -15.5406C9.278 -15.587 9.32439 -15.587 9.32439 -15.587S9.32439 -15.5406 9.32439 -15.5406ZM36.5089 -15.2159C36.6017 -15.2159 36.6945 -15.1695 36.6945 -15.1695C36.7409 -15.1695 36.3698 -14.1026 36.1378 -13.4995C35.9059 -12.85 35.4883 -12.0614 35.1636 -11.4583L34.8853 -10.9944L34.5142 -10.8089C33.4008 -10.2522 32.6122 -9.46356 32.1019 -8.39659C31.9627 -8.11825 31.8699 -7.93269 31.8699 -7.8863C31.8699 -7.74713 30.4318 -6.9585 29.6432 -6.68016L29.2721 -6.4946V-6.40182C29.3185 -6.30904 29.3649 -6.26265 29.3649 -6.26265C29.5504 -6.26265 30.7566 -6.81933 31.3132 -7.14406C31.5452 -7.28323 31.6844 -7.37601 31.6844 -7.37601S31.6844 -7.19045 31.638 -7.00489S31.5452 -6.4946 31.5452 -6.07709L31.4988 -5.52041L31.1741 -5.38124C29.4113 -4.639 27.6948 -4.49983 25.9784 -4.91734C25.5609 -5.01012 25.1434 -5.19568 24.6331 -5.61319L24.1692 -5.93792L24.1228 -6.44821C24.0764 -7.32962 23.9372 -8.16464 23.7053 -8.95327L23.5661 -9.32439L23.7517 -9.46356C23.8908 -9.64912 23.9836 -9.64912 24.3084 -9.78829C25.1898 -10.0202 25.8392 -10.113 26.7206 -10.113C27.1381 -10.113 27.5093 -10.0666 27.834 -10.0202C29.3185 -9.78829 29.9679 -9.278 29.9215 -8.3502V-8.21103L29.8288 -8.30381C29.6432 -8.53576 29.3649 -8.58215 29.1329 -8.44298C28.669 -8.11825 28.901 -7.46879 29.4113 -7.46879C30.0607 -7.46879 30.4318 -8.3502 30.1071 -9.09244C29.8752 -9.60273 29.2257 -9.97385 28.4371 -10.2058C27.4165 -10.4841 25.8856 -10.4841 24.8186 -10.2058C24.6795 -10.2058 24.5867 -10.1594 24.5867 -10.1594C24.5867 -10.2058 25.5609 -10.9944 26.164 -11.4583C26.9526 -12.0614 27.602 -12.4789 27.9268 -12.6645C28.5298 -12.9892 29.5504 -13.3139 30.2927 -13.4067C30.6638 -13.4531 31.3132 -13.4531 31.5916 -13.3603C32.1483 -13.2211 32.6122 -12.8964 32.7977 -12.4789C32.8905 -12.247 32.8905 -11.8294 32.7977 -11.5975C32.7049 -11.4119 32.473 -11.18 32.2874 -11.1336C32.1483 -11.0408 31.638 -11.0408 31.638 -11.0872S31.6844 -11.18 31.7308 -11.18C31.8235 -11.2728 31.9627 -11.5047 31.9627 -11.6903S31.8699 -12.015 31.7308 -12.1542C31.3132 -12.5253 30.6638 -12.247 30.6638 -11.6903C30.7102 -11.3655 30.8957 -11.0872 31.2669 -10.9016C31.5452 -10.7625 32.0555 -10.7161 32.3338 -10.8089C32.9833 -11.0408 33.3544 -11.8294 33.0761 -12.5253C32.7977 -13.2675 31.6844 -13.7778 30.5246 -13.7314C30.1999 -13.685 29.6896 -13.6387 29.4576 -13.5923C29.4113 -13.5459 29.6432 -13.685 30.0143 -13.8706C31.5452 -14.6592 33.0761 -15.1231 34.5605 -15.2623C34.7925 -15.3087 36.277 -15.2623 36.5089 -15.2159ZM37.4367 -15.0767C37.9934 -14.9376 38.9676 -14.6128 38.9676 -14.5665C38.9676 -14.4737 38.6429 -13.5459 38.4109 -13.0356C38.2254 -12.5717 37.6223 -11.3655 37.5759 -11.3192C37.5295 -11.3192 37.3439 -11.3192 37.1584 -11.3192C36.6945 -11.3655 36.0914 -11.3192 35.6275 -11.2264C35.442 -11.18 35.3028 -11.1336 35.3028 -11.1336C35.3028 -11.18 35.3956 -11.2728 35.4883 -11.4583C35.9986 -12.3397 36.5089 -13.4995 36.88 -14.7056C36.9728 -14.9376 37.0192 -15.1695 37.0192 -15.1695S37.2512 -15.1231 37.4367 -15.0767ZM40.2201 -13.9634C40.3593 -13.8706 40.4057 -13.8242 40.4057 -13.7778C40.4057 -13.685 40.7768 -13.3139 41.0551 -13.082C41.751 -12.5717 42.4005 -11.4119 42.6324 -10.2522C42.7252 -9.78829 42.7716 -8.8141 42.7252 -8.3502C42.6788 -7.97908 42.4932 -7.09767 42.4005 -6.91211L42.3541 -6.81933L42.2613 -6.86572C42.1221 -6.9585 41.8902 -7.05128 41.3799 -7.14406C41.1479 -7.19045 40.8232 -7.23684 40.7304 -7.23684C40.5449 -7.32962 40.5449 -7.32962 40.5912 -7.4224C40.6376 -7.65435 40.5912 -8.48937 40.5449 -8.72132C40.3129 -9.46356 39.849 -10.1594 39.1532 -10.6233C38.9212 -10.8089 38.3181 -11.0872 38.1326 -11.1336C38.0862 -11.1336 38.0398 -11.18 38.0398 -11.18S38.179 -11.4119 38.3645 -11.6439C38.7356 -12.1542 39.3387 -13.082 39.6634 -13.685C39.8026 -13.917 39.9418 -14.1026 39.9418 -14.1026C39.9882 -14.1026 40.081 -14.0562 40.2201 -13.9634ZM21.7569 -11.7831C22.0816 -11.4119 22.5455 -10.7161 22.5455 -10.6697C22.5455 -10.5769 20.5972 -8.90688 20.5044 -8.90688C20.458 -8.90688 19.2982 -9.92746 19.2982 -9.92746C19.2518 -9.97385 19.391 -10.113 19.4838 -10.2986C19.9477 -10.948 20.5508 -12.015 20.7827 -12.6181L20.8291 -12.7572L21.1538 -12.4789C21.3394 -12.2933 21.6177 -11.9686 21.7569 -11.7831ZM42.3541 -12.1542C43.5602 -10.8089 44.2561 -9.09244 44.3488 -7.4224V-7.00489L44.2097 -6.9585C43.7458 -6.72655 43.7458 -6.07709 44.1633 -5.84514C44.2097 -5.79875 44.2561 -5.75236 44.2561 -5.75236C44.2561 -5.70597 44.2097 -5.52041 44.1633 -5.28846C43.8849 -4.03593 43.3283 -3.01535 42.4468 -2.04116L42.2613 -1.80921L42.1221 -2.08755C42.0757 -2.22672 42.0293 -2.45867 41.9829 -2.55145L41.9366 -2.73701L42.1221 -2.92257C42.4932 -3.2473 42.586 -3.52564 42.4468 -3.80398C42.4005 -3.98954 42.1221 -4.22149 42.0293 -4.22149S41.9366 -4.31427 41.9829 -4.639C42.1221 -5.19568 42.2613 -5.75236 42.3541 -5.84514C42.4932 -5.98431 42.5396 -6.16987 42.5396 -6.30904S42.586 -6.72655 42.6788 -7.00489C43.1891 -8.58215 43.1891 -9.7419 42.7716 -11.0408C42.586 -11.5047 42.4005 -11.9222 42.1685 -12.2933C42.0757 -12.4325 41.9829 -12.5717 42.0293 -12.5717C42.0293 -12.5717 42.1685 -12.3861 42.3541 -12.1542ZM37.3439 -10.9944C37.3903 -10.9944 36.88 -10.2522 36.5089 -9.7419C35.5347 -8.44298 34.2822 -7.23684 33.0297 -6.35543C32.7049 -6.16987 31.8699 -5.70597 31.8235 -5.70597C31.8235 -5.70597 31.8235 -5.84514 31.8235 -6.16987C31.8235 -6.68016 31.9627 -7.28323 32.0555 -7.56157C32.1019 -7.60796 32.241 -7.79352 32.5194 -7.97908C33.308 -8.58215 34.1894 -9.50995 34.7925 -10.3914L35.0244 -10.7625L35.3028 -10.8089C35.5811 -10.9016 35.9986 -10.9944 36.3234 -11.0408C36.4625 -11.0872 37.3439 -11.0408 37.3439 -10.9944ZM9.55634 -10.9016C10.6697 -10.7161 11.9222 -9.97385 13.6387 -8.58215C14.1489 -8.11825 15.0767 -7.28323 15.1231 -7.23684C15.1231 -7.23684 15.0304 -7.19045 14.8912 -7.14406C14.4273 -7.05128 14.0562 -7.00489 13.4531 -7.05128C12.7572 -7.05128 12.3861 -7.14406 11.7831 -7.37601C11.4583 -7.51518 11.4119 -7.51518 11.1336 -7.83991C10.7625 -8.21103 10.5305 -8.39659 10.113 -8.62854C9.88107 -8.76771 9.7419 -8.86049 9.64912 -8.99966C9.278 -9.46356 8.90688 -10.1594 8.76771 -10.6697C8.72132 -10.7625 8.72132 -10.9016 8.67493 -10.9016C8.67493 -10.9944 9.18522 -10.9944 9.55634 -10.9016ZM38.2717 -10.7625C38.8284 -10.5769 39.2923 -10.2522 39.6634 -9.78829C39.9418 -9.50995 40.2201 -8.95327 40.2665 -8.58215C40.3129 -8.30381 40.3593 -7.79352 40.3129 -7.60796L40.2665 -7.46879L40.1737 -7.60796C40.081 -7.65435 39.8954 -7.8863 39.7562 -8.07186C39.2923 -8.62854 39.1068 -8.76771 38.7356 -8.76771C38.5037 -8.72132 38.3181 -8.58215 38.179 -8.3502C38.0862 -8.16464 38.0862 -8.07186 38.0862 -7.79352C38.0862 -7.60796 38.1326 -7.32962 38.1326 -7.14406C38.2717 -6.54099 38.2254 -5.98431 38.0398 -5.93792C37.9006 -5.89153 37.7151 -5.65958 37.6687 -5.52041L37.6223 -5.33485L37.4367 -5.38124C37.0192 -5.42763 36.4625 -5.65958 36.277 -5.89153L36.1842 -5.98431L36.3234 -5.93792C36.6017 -5.89153 36.9728 -6.12348 37.0656 -6.44821C37.1584 -6.68016 37.112 -6.9585 36.9728 -7.14406C36.6017 -7.56157 35.9986 -7.51518 35.7203 -7.05128C35.6739 -6.9585 35.6275 -6.91211 35.5811 -6.91211S35.5347 -6.86572 35.5347 -6.58738C35.5811 -6.0307 35.7203 -5.70597 36.045 -5.28846C36.277 -5.05651 36.7409 -4.73178 36.9264 -4.68539C37.0656 -4.639 37.3903 -4.73178 37.5759 -4.87095L37.7151 -5.01012L37.8542 -4.82456C38.2717 -4.40705 39.014 -4.68539 39.014 -5.28846C39.014 -5.42763 39.0604 -5.42763 39.2923 -5.5668C39.5707 -5.75236 39.9418 -6.07709 40.1273 -6.40182C40.2665 -6.58738 40.2665 -6.58738 40.4057 -6.58738C40.4521 -6.58738 40.7768 -6.63377 41.0551 -6.72655C41.7046 -6.91211 41.9366 -6.91211 42.0757 -6.77294C42.2613 -6.63377 42.2613 -6.4946 42.1685 -6.21626C42.0757 -5.84514 41.9366 -5.75236 41.1479 -5.47402C40.5449 -5.28846 40.3593 -5.19568 40.1273 -4.96373C39.9418 -4.77817 39.6634 -4.1751 39.5707 -3.85037C39.5243 -3.57203 39.5243 -3.29369 39.6634 -3.10813C39.7562 -2.96896 40.2201 -2.73701 40.5912 -2.64423C40.7768 -2.55145 41.1943 -2.55145 41.5654 -2.59784C41.6582 -2.59784 41.6582 -2.59784 41.751 -2.36589C41.7974 -2.22672 41.8438 -1.99477 41.9366 -1.8556L42.0293 -1.62365L41.8902 -1.48448C41.6582 -1.29892 41.1015 -0.9278 40.684 -0.74224C39.4315 -0.13917 38.0862 -0 36.6017 -0.27834C34.7461 -0.69585 33.1688 -1.8556 32.3802 -3.47925C32.1947 -3.85037 31.9627 -4.49983 31.9163 -4.73178V-4.91734L32.1483 -5.05651C32.7977 -5.5668 33.5864 -6.21626 34.6069 -7.23684C35.7203 -8.3502 36.6017 -9.37078 37.4831 -10.4841C37.8078 -10.8553 37.8542 -10.9016 37.9006 -10.9016S38.1326 -10.8553 38.2717 -10.7625ZM34.4214 -10.345C33.8647 -9.60273 33.0297 -8.76771 32.3802 -8.25742C32.2874 -8.16464 32.2874 -8.16464 32.4266 -8.44298C32.8441 -9.18522 33.54 -9.92746 34.2822 -10.345C34.375 -10.4377 34.5142 -10.4841 34.5142 -10.4841S34.4678 -10.4377 34.4214 -10.345ZM23.0558 -9.69551C23.1022 -9.64912 23.0558 -9.60273 22.7775 -9.46356C22.4064 -9.278 21.8033 -8.86049 21.4322 -8.58215C21.293 -8.44298 21.1538 -8.3502 21.1538 -8.3502C21.1074 -8.3502 21.0611 -8.44298 20.9683 -8.48937L20.7827 -8.62854L21.4322 -9.04605C21.7569 -9.278 22.2208 -9.60273 22.4528 -9.78829L22.9167 -10.113L22.963 -9.92746C23.0094 -9.83468 23.0558 -9.7419 23.0558 -9.69551ZM22.8703 -9.13883C22.8239 -9.04605 22.4991 -8.76771 22.1744 -8.48937C21.5713 -8.02547 21.5713 -8.02547 21.4786 -8.07186C21.4322 -8.07186 21.3858 -8.11825 21.3858 -8.11825C21.3858 -8.16464 21.8497 -8.53576 22.1744 -8.76771C22.4064 -8.90688 22.963 -9.23161 23.0094 -9.23161C23.0094 -9.23161 22.963 -9.18522 22.8703 -9.13883ZM23.4269 -8.76771C23.6589 -8.11825 23.7981 -7.32962 23.8445 -6.54099C23.8445 -6.21626 23.8445 -6.12348 23.7981 -6.16987C23.7053 -6.26265 21.9425 -7.65435 21.8961 -7.74713L21.7569 -7.79352L21.8497 -7.8863C21.9425 -7.93269 22.2672 -8.21103 22.6383 -8.53576S23.2878 -9.09244 23.3342 -9.09244C23.3342 -9.09244 23.3806 -8.95327 23.4269 -8.76771ZM39.1532 -8.48937C39.3387 -8.3502 39.4315 -8.16464 39.5707 -7.56157C39.7098 -7.00489 39.8026 -6.77294 39.8954 -6.68016C39.9418 -6.68016 39.9418 -6.63377 39.849 -6.4946C39.7098 -6.26265 39.3851 -5.98431 39.1532 -5.79875L38.9676 -5.70597L38.8284 -5.79875C38.7356 -5.89153 38.6429 -5.93792 38.5501 -5.98431C38.4109 -6.0307 38.4109 -6.0307 38.4573 -6.16987S38.4573 -6.68016 38.4109 -7.14406C38.3181 -7.56157 38.3181 -8.02547 38.4109 -8.21103C38.4573 -8.3502 38.5037 -8.39659 38.6893 -8.44298C38.9212 -8.53576 39.014 -8.58215 39.1532 -8.48937ZM36.3698 -5.47402C36.5553 -5.33485 36.7873 -5.24207 37.112 -5.14929L37.4367 -5.05651L37.2976 -5.01012C37.0192 -4.91734 36.9264 -4.96373 36.5553 -5.24207C36.2306 -5.47402 36.0914 -5.65958 36.3698 -5.47402ZM41.8438 -5.01012C41.751 -4.73178 41.7046 -4.45344 41.7046 -4.40705C41.6582 -4.36066 41.6582 -4.31427 41.519 -4.26788C41.1479 -4.1751 40.916 -3.75759 41.0088 -3.38647C41.0551 -3.20091 41.2871 -2.96896 41.3799 -2.92257S41.4727 -2.87618 41.3799 -2.87618C41.1015 -2.73701 40.1737 -2.96896 39.8954 -3.29369C39.8026 -3.38647 39.8026 -3.38647 39.8026 -3.61842C39.8026 -3.80398 39.849 -3.89676 39.9882 -4.22149C40.3593 -4.87095 40.5449 -5.05651 41.3799 -5.33485C41.6118 -5.38124 41.8438 -5.47402 41.8902 -5.52041C41.8902 -5.52041 41.9366 -5.52041 41.9366 -5.52041S41.8902 -5.28846 41.8438 -5.01012ZM45.1375 -19.8549C44.6736 -19.7157 44.4416 -19.1591 44.72 -18.7879C44.8591 -18.6024 45.0911 -18.4632 45.2766 -18.4632S45.6941 -18.6024 45.8333 -18.7879S46.0189 -19.2055 45.8797 -19.4374C45.7869 -19.7621 45.4622 -19.9013 45.1375 -19.8549ZM32.0555 -31.406C31.8699 -31.3596 31.6844 -31.1277 31.6844 -30.8957C31.6844 -30.5246 32.0555 -30.2463 32.4266 -30.4318C33.0297 -30.7102 32.7049 -31.5916 32.0555 -31.406ZM25.7928 -8.30381C25.3289 -8.07186 25.2825 -7.4224 25.7001 -7.14406C25.932 -7.00489 26.2567 -7.00489 26.4423 -7.14406C26.6742 -7.28323 26.767 -7.4224 26.767 -7.70074C26.767 -7.8863 26.767 -7.97908 26.6742 -8.07186C26.4887 -8.39659 26.0712 -8.48937 25.7928 -8.30381Z"/>
+ <path id="g72" d="M2.016 -6.192C1.4976 -5.7456 0.9504 -5.328 0.4608 -4.8528C0.4464 -4.464 0.4464 -4.0608 0.4464 -3.6576C0.9792 -4.0896 1.512 -4.5072 2.0016 -4.9824C2.0448 -5.3568 2.0304 -5.8032 2.016 -6.192ZM2.016 -3.168C1.4976 -2.7216 0.9504 -2.304 0.4608 -1.8288C0.4464 -1.44 0.4464 -1.0368 0.4464 -0.6336C0.9792 -1.0656 1.512 -1.4832 2.0016 -1.9584C2.0448 -2.3328 2.0304 -2.7792 2.016 -3.168Z"/>
+ <path id="g73" d="M2.052 -4.356L2.112 -4.524C1.572 -4.776 1.02 -5.076 0.768 -5.64C0.696 -5.796 0.66 -5.964 0.66 -6.132C0.66 -6.624 0.936 -7.104 1.32 -7.404C1.572 -7.584 1.956 -7.74 2.28 -7.74C2.508 -7.74 2.712 -7.608 2.916 -7.5C3.216 -7.332 3.504 -7.14 3.78 -6.936C3.924 -6.84 4.056 -6.732 4.2 -6.648V-6.636C3.756 -6.444 3.264 -6.204 2.94 -5.832C2.736 -5.592 2.676 -5.328 2.676 -5.04C2.676 -4.548 2.832 -3.984 2.952 -3.636C3.312 -2.688 4.116 -1.248 4.116 -0.06C4.116 0.768 3.732 1.464 3.108 1.692C2.976 1.728 2.844 1.74 2.7 1.74C1.92 1.74 1.14 1.14 1.14 0.252C1.14 -0.504 1.668 -1.164 1.908 -1.764C2.004 -2.004 2.076 -2.28 2.076 -2.544C2.076 -3.252 1.584 -3.78 0.936 -3.78C0.468 -3.78 0.312 -3.216 0.204 -2.916L0.456 -2.82C0.54 -3.06 0.612 -3.516 0.948 -3.516C1.14 -3.516 1.344 -3.372 1.404 -3.192C1.416 -3.192 1.428 -3.048 1.428 -3.048S1.416 -2.904 1.416 -2.904C1.392 -2.676 1.332 -2.448 1.236 -2.232C0.96 -1.548 0.408 -0.852 0.408 -0.036C0.408 1.32 1.656 2.004 2.76 2.004C3.564 2.004 4.116 1.668 4.536 1.236C4.896 0.876 5.148 0.3 5.148 -0.372C5.148 -1.284 4.776 -2.16 4.524 -2.796C4.38 -3.144 4.224 -3.492 4.104 -3.852C4.08 -3.912 3.984 -4.164 3.984 -4.212C3.984 -4.224 3.984 -4.224 3.984 -4.236C4.008 -4.296 4.524 -4.776 4.572 -4.776C4.584 -4.776 4.584 -4.776 4.596 -4.776C4.656 -4.74 4.92 -4.452 4.92 -4.452C4.956 -4.416 5.004 -4.332 5.064 -4.332C5.136 -4.332 5.208 -4.428 5.256 -4.476C5.4 -4.62 5.556 -4.764 5.712 -4.896C5.676 -4.968 5.616 -5.028 5.556 -5.088L5.232 -5.436C5.196 -5.484 5.124 -5.592 5.052 -5.592C5.052 -5.592 5.04 -5.592 5.04 -5.592C4.992 -5.58 4.764 -5.364 4.692 -5.292C4.428 -5.04 4.164 -4.776 3.876 -4.536C3.792 -5.064 3.768 -4.836 3.72 -5.52C3.72 -5.58 3.708 -5.64 3.708 -5.7C3.732 -6.048 3.9 -6.312 4.116 -6.504C4.152 -6.54 4.188 -6.576 4.236 -6.576C4.236 -6.576 4.248 -6.576 4.248 -6.576C4.308 -6.576 4.38 -6.504 4.428 -6.468L4.836 -6.168C4.884 -6.132 4.968 -6.036 5.04 -6.036C5.1 -6.036 5.124 -6.096 5.148 -6.12C5.208 -6.192 5.928 -7.116 5.928 -7.116C5.892 -7.152 5.808 -7.26 5.736 -7.26C5.724 -7.26 5.712 -7.248 5.7 -7.248C5.616 -7.212 5.58 -7.056 5.496 -7.056C5.472 -7.056 5.46 -7.068 5.436 -7.08C5.292 -7.164 4.14 -8.052 4.14 -8.052L3.792 -8.316C3.684 -8.4 3.624 -8.46 3.432 -8.46C2.856 -8.46 2.136 -8.244 1.776 -8.076C1.068 -7.74 0.408 -7.116 0.408 -6.144C0.408 -5.916 0.456 -5.7 0.564 -5.496C0.852 -4.944 1.476 -4.572 2.052 -4.356Z"/>
+ <path id="g74" d="M2.1888 -5.5008C2.088 -5.472 2.0016 -5.4144 1.9008 -5.3712C1.2528 -4.9968 0.6912 -4.6224 0.3456 -3.9168C0.216 -3.6144 0.1584 -3.2976 0.1584 -2.9664C0.1584 -2.8944 0.1728 -2.808 0.1728 -2.736C0.288 -1.4688 1.1232 -0.4032 2.2176 0.0576C2.3184 0.1008 2.5056 0.1728 2.6208 0.1728C2.7216 0.1728 3.4416 -0.1584 3.7008 -0.2736C4.1616 -0.4608 4.6512 -0.6192 5.0256 -0.9504C5.6304 -1.4976 5.904 -2.4336 5.904 -3.2832C5.904 -3.456 5.8896 -3.6288 5.8608 -3.8016C5.6448 -4.8528 4.752 -5.6304 3.8736 -6.1632C3.2832 -6.5088 2.2032 -6.8832 2.2032 -7.8192C2.2032 -8.208 2.4048 -8.568 2.6352 -8.7984C2.7504 -8.8848 2.808 -8.9136 2.808 -9.1008V-9.2592C2.016 -9.2592 1.08 -8.8992 0.792 -8.1072C0.72 -7.92 0.7056 -7.7184 0.7056 -7.5168C0.7056 -6.7536 1.296 -6.1776 1.6992 -5.8608C1.8576 -5.7312 2.0304 -5.6304 2.1888 -5.5008ZM1.3968 -3.4416V-3.5856C1.3968 -4.1184 1.6848 -4.608 2.088 -4.9536C2.1744 -5.0256 2.4192 -5.256 2.5488 -5.256C2.6352 -5.2416 2.7072 -5.1696 2.7792 -5.1408C3.7008 -4.5216 4.8672 -3.8304 4.8672 -2.4048C4.8672 -2.2752 4.8672 -2.1456 4.8528 -2.0304C4.824 -1.6416 4.7952 -1.152 4.4064 -0.936C4.3632 -0.9216 4.3344 -0.9072 4.3056 -0.9072C4.248 -0.9072 3.9888 -0.9936 3.9168 -0.9936C3.7728 -1.0224 3.6144 -1.008 3.4704 -1.0368C3.1392 -1.08 2.8224 -1.224 2.5344 -1.4112C1.8432 -1.872 1.4832 -2.6352 1.3968 -3.4416Z"/>
+ <path id="g75" d="M2.1888 -7.128C2.088 -6.7392 1.8864 -6.336 1.6128 -6.0336C1.224 -5.616 0.72 -5.328 0.2016 -5.0976C0.3024 -4.9104 0.4176 -4.7376 0.504 -4.536C0.5472 -3.6144 0.5184 -2.5776 0.504 -1.656C0.4176 -1.4544 0.3024 -1.2816 0.2016 -1.0944C1.0224 -0.648 1.7856 -0.144 2.6208 0.288L2.7648 0.2304L3.9456 -0.4608C3.9168 -0.5328 3.8592 -0.7056 3.7584 -0.7056C3.672 -0.7056 3.6144 -0.6336 3.5424 -0.6048C3.4992 -0.6048 3.456 -0.6192 3.4128 -0.648C3.0528 -0.8352 2.6928 -1.0656 2.3328 -1.2672L1.9728 -1.4688C1.8576 -1.5552 1.728 -1.5552 1.728 -1.7856V-1.872V-5.4144V-5.5008C1.728 -5.6304 1.7424 -5.7312 1.8576 -5.8464C1.872 -5.8608 1.9008 -5.8608 1.9152 -5.8608C2.0016 -5.8608 2.088 -5.7744 2.16 -5.7456C2.3472 -5.6304 2.5488 -5.5296 2.736 -5.4144C2.808 -5.3712 2.9088 -5.2848 2.9952 -5.2848S3.1392 -5.4432 3.1824 -5.5152C3.3264 -5.7744 3.4992 -6.0336 3.6288 -6.3072L2.1888 -7.128Z"/>
+ <path id="g76" d="M2.1888 -9.2736C1.4688 -9.2736 1.1952 -8.4672 1.0656 -7.992C1.0368 -7.92 0.936 -7.5024 0.936 -7.4304V-7.4016C0.9792 -7.344 1.0944 -7.2288 1.1808 -7.2288C1.2384 -7.2288 1.296 -7.272 1.3392 -7.3008C1.8288 -7.632 2.4768 -7.8768 2.736 -8.424C2.7936 -8.5392 2.8368 -8.6832 2.8368 -8.8128C2.8368 -9.1296 2.5488 -9.2736 2.2752 -9.2736H2.1888ZM1.3392 -6.8976C0.9504 -6.4656 0.5472 -6.048 0.1728 -5.616L0.1584 -5.4576C0.5328 -5.4288 0.6624 -4.9968 0.6624 -4.68V-1.9152V-1.728C0.6624 -1.368 0.4608 -1.1232 0.1584 -1.0944L0.1872 -0.7776C0.6624 -0.4464 1.1232 -0.1152 1.656 0.1584C2.2608 -0.2016 2.7648 -0.6768 3.312 -1.0944L3.3408 -1.4112C3.1104 -1.2672 2.808 -1.0944 2.4912 -1.0944C2.1312 -1.0944 2.016 -1.4688 2.016 -1.8288C2.016 -1.9728 2.0304 -2.1168 2.0304 -2.232V-4.6512C2.0304 -4.9824 2.1456 -5.4144 2.5344 -5.4576L2.52 -5.616C2.1456 -6.0624 1.728 -6.4656 1.3392 -6.8976Z"/>
+ <path id="g77" d="M2.2176 -6.7536C2.1024 -6.5088 1.9728 -6.264 1.8 -6.0624C1.4112 -5.6304 0.8784 -5.3424 0.36 -5.0976C0.4608 -4.9104 0.576 -4.7376 0.6624 -4.536C0.7056 -3.6144 0.6768 -2.5776 0.6624 -1.656C0.576 -1.4544 0.4608 -1.2816 0.36 -1.0944C1.1808 -0.648 1.944 -0.144 2.7792 0.288L2.9232 0.2304L4.104 -0.4608L3.96 -0.7344L3.6432 -0.6048L3.4992 -0.6768C2.9808 -1.008 2.4048 -1.2672 1.9152 -1.6272L1.8864 -1.944C1.8864 -3.1968 1.872 -4.464 1.9008 -5.6736L2.0448 -5.904C2.4192 -5.688 2.808 -5.4576 3.1968 -5.256C3.3984 -5.6016 3.6 -5.9472 3.7872 -6.3072L2.8512 -6.84L2.5776 -6.9984C2.52 -7.0416 2.448 -7.0992 2.3472 -7.0992C2.16 -7.0848 2.1168 -7.0128 1.8864 -7.0128C1.3536 -7.0128 0.9792 -7.3584 0.8352 -7.848C0.8208 -7.848 0.8064 -8.0928 0.8064 -8.0928S0.8064 -8.2368 0.8208 -8.2368C0.936 -9.1296 1.7856 -9.5904 2.664 -9.5904C3.6 -9.5904 4.4352 -9.0432 4.9824 -8.4384C5.0544 -8.352 5.112 -8.2656 5.1984 -8.1936V-8.1792C4.6656 -7.3872 4.2048 -6.5376 3.7008 -5.7312H4.3056V-1.8864C4.3056 -1.8144 4.32 -1.7424 4.32 -1.6704C4.32 -1.584 4.3056 -1.512 4.2768 -1.4544C4.2336 -1.3968 4.0176 -1.1664 4.0176 -1.08C4.0464 -0.9792 4.2192 -0.8064 4.2624 -0.7632L4.896 -0.0144C4.9392 0.0288 5.0976 0.2736 5.1696 0.2736C5.2272 0.2736 5.2992 0.216 5.3568 0.1872L5.76 -0.0432C6.3072 -0.3312 6.7968 -0.648 7.344 -0.9504L7.2 -1.224C6.7824 -1.0224 6.3936 -0.7776 5.9904 -0.5472C5.832 -0.7488 5.6736 -0.936 5.5296 -1.152C5.4864 -2.6352 5.5296 -4.2192 5.5152 -5.7312H6.7248V-6.6528H5.5152C5.5152 -7.2576 5.5872 -7.848 5.6736 -8.4528H5.5296C5.472 -8.4528 5.4288 -8.4528 5.3856 -8.4672C5.2992 -8.5104 5.0832 -8.7984 5.0688 -8.8128C4.536 -9.3888 3.6576 -9.9072 2.6928 -9.9072C1.5408 -9.9072 0.504 -9.1872 0.504 -8.0928C0.504 -7.4304 0.9648 -6.7104 1.7856 -6.7104C1.9296 -6.7104 2.0736 -6.7248 2.2176 -6.7536Z"/>
+ <path id="g78" d="M2.376 -7.2L2.328 -6.984C2.412 -6.852 2.472 -6.672 2.52 -6.504C2.532 -6.048 2.532 -5.58 2.52 -5.124H2.508L2.244 -5.796C2.088 -5.76 1.944 -5.64 1.812 -5.568L0.984 -5.088C0.888 -5.028 0.792 -4.98 0.696 -4.92C0.516 -4.824 0.528 -4.74 0.444 -4.512C0.3 -4.032 0.204 -3.42 0.204 -2.82C0.204 -2.712 0.204 -2.616 0.204 -2.508C0.204 -1.836 0.252 -1.128 0.744 -0.612C0.936 -0.42 1.236 -0.216 1.548 -0.168L1.38 0.048L1.584 0.132L1.68 0.06L2.436 -0.744H2.448C2.604 -0.48 2.832 -0.24 3.072 -0.048C3.12 -0.012 3.264 0.132 3.336 0.132C3.396 0.132 3.552 -0.072 3.552 -0.072L4.116 -0.696C4.164 -0.756 4.308 -0.864 4.308 -0.96C4.296 -0.996 4.212 -1.056 4.152 -1.056C4.14 -1.056 4.14 -1.056 4.128 -1.056C4.044 -1.032 3.996 -0.876 3.9 -0.876C3.852 -0.876 3.576 -1.044 3.48 -1.104C3.396 -1.164 3.336 -1.164 3.336 -1.308C3.336 -1.368 3.348 -1.428 3.348 -1.476V-4.536H4.572V-5.148H4.428C4.548 -5.508 4.764 -6.108 4.764 -6.54C4.764 -6.588 4.764 -6.624 4.752 -6.672C4.728 -6.9 4.464 -7.068 4.212 -7.068C4.056 -7.068 3.96 -6.888 3.888 -6.816C3.708 -6.624 3.54 -6.432 3.348 -6.24V-6.672C3.348 -6.72 3.348 -6.756 3.348 -6.804C3.348 -7.236 3.72 -7.452 4.128 -7.452C4.188 -7.452 4.248 -7.452 4.296 -7.452V-7.692C4.224 -7.692 4.164 -7.692 4.104 -7.692C3.492 -7.692 3.204 -7.284 2.892 -6.972C2.856 -6.936 2.796 -6.84 2.736 -6.84C2.688 -6.84 2.652 -6.9 2.628 -6.936C2.544 -7.02 2.472 -7.14 2.376 -7.2ZM4.188 -5.148H3.348V-5.652C3.348 -5.676 3.348 -5.712 3.348 -5.736C3.348 -5.796 3.348 -5.844 3.384 -5.892C3.456 -6.012 3.576 -6.12 3.672 -6.216C3.732 -6.276 3.768 -6.36 3.876 -6.36C4.164 -6.36 4.356 -6.084 4.356 -5.856C4.356 -5.616 4.224 -5.388 4.188 -5.148ZM1.62 -5.172L1.932 -4.392L2.208 -4.524L2.532 -4.536V-1.428C2.532 -1.392 2.532 -1.356 2.532 -1.32C2.532 -1.128 2.424 -1.068 2.316 -0.96S2.112 -0.684 1.896 -0.684C1.728 -0.684 1.56 -0.804 1.452 -0.924C1.188 -1.224 1.128 -1.608 1.08 -1.992C1.056 -2.184 1.032 -2.364 1.02 -2.556C1.032 -2.952 0.984 -3.3 0.984 -3.696C0.984 -4.32 1.14 -4.872 1.62 -5.172Z"/>
+ <path id="g79" d="M2.4336 -8.4816L0.1584 -5.4288H1.08C1.0656 -4.1616 1.1088 -2.8512 1.0656 -1.6272C0.8784 -1.4688 0.6768 -1.3248 0.4752 -1.1808L2.088 -0.1584C2.2752 -0.0432 2.4336 0.0864 2.664 0.1584L2.8512 0.0576L4.6656 -1.2096L4.4928 -1.4832C4.2912 -1.368 4.1184 -1.224 3.9312 -1.0944C3.8592 -1.0512 3.744 -0.936 3.6576 -0.936C3.5568 -0.936 3.4416 -1.0368 3.3696 -1.08L2.7072 -1.4976C2.5632 -1.5696 2.4336 -1.6272 2.4336 -1.8432C2.4336 -1.9152 2.448 -1.9872 2.448 -2.0592V-5.4288H4.6656V-6.5664H2.448C2.4336 -7.2 2.4624 -7.8768 2.4336 -8.4816Z"/>
+ <path id="g80" d="M2.448 -4.9968H3.168C3.2112 -4.9968 3.2688 -5.0112 3.3264 -5.0112C3.4704 -5.0112 3.528 -4.9392 3.5856 -4.8384C3.6288 -4.752 3.6864 -4.68 3.744 -4.5936C4.7088 -3.2256 5.904 -2.0016 5.904 0.2592C5.904 0.6912 5.832 1.1376 5.5872 1.512C5.3712 1.8576 5.0256 2.1744 4.4928 2.1744C3.312 2.1744 2.7648 0.8784 2.52 0.0144C2.448 -0.2448 2.3616 -0.5184 2.3328 -0.792H0.1584V-0.5472C0.6336 -0.5184 0.7776 0.0864 0.9504 0.432C1.3824 1.4688 2.448 2.1888 3.5136 2.4192C3.816 2.4912 4.1328 2.5344 4.4352 2.5344S5.0256 2.4912 5.3136 2.4048C6.6672 1.9728 7.416 0.4464 7.416 -1.0512C7.416 -2.1024 7.0128 -3.096 6.5664 -3.8592C6.336 -4.2624 6.0624 -4.6224 5.7888 -4.9968C6.2928 -5.0256 6.8832 -4.9536 7.3296 -5.0256C7.5744 -5.3568 7.6896 -5.8176 7.8768 -6.2064H5.1984H5.0688C4.8672 -6.2064 4.8816 -6.2784 4.7808 -6.408C4.4784 -6.8832 4.1472 -7.6032 4.1472 -8.2944S4.5936 -9.6624 5.328 -9.6624C5.4864 -9.6624 5.6304 -9.6192 5.7744 -9.5328C6.192 -9.2448 6.3936 -8.6544 6.3936 -7.9776H8.0784V-9.6768C7.8336 -9.72 7.5744 -9.8208 7.3296 -9.864C6.8112 -9.9792 6.1632 -10.0512 5.616 -10.0512C4.9392 -10.0512 4.4208 -9.8064 4.0176 -9.432C3.3984 -8.856 2.9376 -7.9056 2.9376 -6.8112V-6.624C2.952 -6.48 3.0384 -5.9328 3.0384 -5.9328C3.0096 -5.7744 2.7072 -5.472 2.6496 -5.4144C2.5488 -5.3136 2.448 -5.2704 2.448 -5.0832V-4.9968Z"/>
+ <path id="g81" d="M2.448 -7.0416C2.1744 -6.264 1.512 -5.5872 0.72 -5.2704C0.5904 -5.2128 0.4464 -5.2272 0.4464 -5.0256C0.4464 -4.968 0.4608 -4.896 0.4608 -4.8528V-1.944V-1.8C0.4608 -1.7568 0.4608 -1.6992 0.4464 -1.656C0.432 -1.584 0.144 -1.1088 0.144 -1.0944L1.6416 -0.0864C1.8288 0.0432 2.0016 0.1872 2.232 0.2736L2.448 0.1872L4.5936 -1.0512L4.4496 -1.3536C4.4064 -2.7648 4.4352 -4.3056 4.4496 -5.7024L4.5936 -6.0048C3.888 -6.3504 3.1824 -6.7104 2.448 -7.0416ZM3.1104 -0.5616C2.6496 -0.8928 2.1312 -1.1808 1.6992 -1.5408L1.6704 -1.8288V-5.1264C1.8576 -5.3568 2.0736 -5.5728 2.3328 -5.7456C2.6496 -5.616 2.9376 -5.472 3.2112 -5.2992C3.2112 -5.2992 3.2256 -4.9968 3.2256 -4.9968C3.2256 -3.5424 3.24 -2.0736 3.2112 -0.6624L3.1104 -0.5616Z"/>
+ <path id="g82" d="M2.52 -7.0272C2.2032 -6.2928 1.5552 -5.616 0.792 -5.2848C0.6912 -5.2416 0.5328 -5.2128 0.5328 -5.0688V-4.9968V-1.9152V-1.7424V-1.6704C0.4896 -1.4544 0.288 -1.296 0.2304 -1.08L0.8352 -0.6768C1.3392 -0.3744 1.7712 -0 2.3184 0.2736C2.664 0.1152 2.9808 -0.0864 3.312 -0.2736V1.008V1.1952C3.312 1.7568 3.1824 2.2464 2.7936 2.4768C2.736 2.52 2.664 2.5488 2.6064 2.5488C2.4624 2.5488 2.4336 2.4336 2.3904 2.304C2.3328 2.3472 2.232 2.4192 2.232 2.52C2.232 2.7072 2.4768 2.8368 2.6784 2.8368C3.0672 2.8368 3.3264 2.6352 3.5568 2.448S4.0176 2.0592 4.1904 1.8288H4.2048C4.3344 2.016 4.4928 2.1744 4.6512 2.3472C4.6944 2.4048 4.7664 2.52 4.8384 2.52C4.9248 2.52 5.0112 2.4048 5.0688 2.3472V2.3328C4.5648 1.9152 4.5216 1.2672 4.5216 0.648V0.1584V-5.184V-5.3136C4.5216 -5.3568 4.5216 -5.3856 4.536 -5.4288C4.5504 -5.5008 4.7808 -5.8752 4.8384 -6.0048C4.0608 -6.336 3.312 -6.696 2.52 -7.0272ZM1.7424 -1.6992V-1.8144V-4.8816V-5.0112C1.7424 -5.184 1.8 -5.2416 1.9152 -5.328C1.9872 -5.4 2.3184 -5.7456 2.4192 -5.7456C2.4768 -5.7456 3.0528 -5.472 3.168 -5.4288C3.2544 -5.3712 3.312 -5.3568 3.312 -5.2128V-5.0688V-0.9504V-0.792C3.312 -0.6912 3.2832 -0.6048 3.1968 -0.6048C3.096 -0.6048 2.9664 -0.72 2.8944 -0.7632L2.1024 -1.296C1.944 -1.3824 1.7424 -1.4544 1.7424 -1.6992Z"/>
+ <path id="g83" d="M2.6208 -7.128C1.9152 -6.48 1.0944 -5.9328 0.1008 -5.6016C0.144 -5.5152 0.2448 -5.3856 0.3456 -5.3856C0.4032 -5.3856 0.4608 -5.4144 0.5184 -5.4432C0.504 -4.1472 0.5472 -2.808 0.504 -1.5552C0.4176 -1.3968 0.3024 -1.2528 0.2016 -1.1088V-1.0944L1.656 -0.072C1.8288 0.0576 1.9872 0.1872 2.2032 0.2736C2.7792 -0 3.2976 -0.3456 3.8304 -0.6624L3.8592 -0.9648C3.6288 -0.8496 3.3552 -0.648 3.0816 -0.648H3.024C2.8512 -0.6768 2.52 -0.9504 2.448 -0.9936L1.9872 -1.3248C1.872 -1.4256 1.728 -1.44 1.728 -1.656V-1.8144V-2.3616V-2.5056C1.728 -2.6928 1.7856 -2.7648 1.8864 -2.8656L2.16 -3.1968L3.2112 -4.4352L3.9168 -5.256C3.96 -5.3136 4.1472 -5.5008 4.1472 -5.5728C4.1472 -5.6304 4.0896 -5.6736 4.0464 -5.7168L3.0528 -6.7104C2.9088 -6.8544 2.7792 -6.9984 2.6208 -7.128ZM1.728 -3.1824V-5.8464V-5.904C1.728 -5.9904 1.7712 -6.1056 1.8864 -6.1056C1.9728 -6.1056 2.0592 -5.9904 2.1312 -5.9184L2.88 -5.1696C2.9376 -5.112 3.1248 -4.9536 3.1248 -4.8672C3.1248 -4.8096 3.0672 -4.7664 3.0384 -4.7232L1.728 -3.1824Z"/>
+ <path id="g84" d="M2.7216 -9.5616C2.6352 -9.4032 2.52 -9.2736 2.4048 -9.1296C1.9872 -8.6256 1.5552 -8.28 1.008 -7.9344C0.8784 -7.848 0.7488 -7.848 0.7488 -7.6176C0.7488 -7.5456 0.7632 -7.4592 0.7632 -7.4016V-6.5664C0.7632 -6.4512 0.7776 -6.336 0.7776 -6.2208C0.7776 -6.1344 0.7632 -6.048 0.7488 -5.9616C0.7344 -5.8464 0.5184 -5.1984 0.4464 -4.9968H0.7632V2.0304L0.9072 2.0016L1.0224 1.8432C1.3248 1.224 1.6704 0.6336 1.9584 -0.0144C2.0448 -2.6784 1.9152 -5.6016 1.9872 -8.2224L2.1888 -8.4528H2.2032C2.4624 -8.2224 2.736 -7.992 3.0096 -7.776L3.4416 -8.5104C3.4848 -8.5824 3.5856 -8.6976 3.5856 -8.7984S3.4416 -8.9712 3.384 -9.0288L2.9808 -9.36C2.8944 -9.432 2.8224 -9.504 2.7216 -9.5616ZM2.52 -5.7312H3.1248V-1.8576C3.1248 -1.7856 3.1392 -1.728 3.1392 -1.656S3.1248 -1.512 3.096 -1.4544C3.096 -1.4544 2.7648 -1.08 2.8368 -1.08C2.8368 -1.0368 3.024 -0.8352 3.0672 -0.7632L3.7008 -0.0144C3.7296 0.0288 3.9168 0.2736 3.9888 0.2736C4.0464 0.2736 4.1184 0.216 4.176 0.1872L4.5792 -0.0432C5.0976 -0.3456 5.6304 -0.6336 6.1488 -0.9504L6.0048 -1.224C5.6016 -1.0224 5.256 -0.7632 4.824 -0.5904C4.608 -0.72 4.5072 -0.9648 4.3488 -1.1376L4.3344 -1.368V-5.7312H5.544V-6.6528H4.3344C4.3488 -7.2864 4.3776 -7.9056 4.4784 -8.4528L4.1904 -8.4384L4.0464 -8.2512L2.9952 -6.5376L2.52 -5.7312Z"/>
+ <path id="g85" d="M2.724 -6.804C2.64 -6.948 2.508 -7.092 2.388 -7.2L2.34 -6.984C2.424 -6.84 2.484 -6.66 2.532 -6.48V-5.088H2.52L2.244 -5.808C2.112 -5.748 0.732 -4.944 0.732 -4.944C0.54 -4.824 0.528 -4.788 0.456 -4.524C0.3 -4.056 0.204 -3.408 0.204 -2.832C0.204 -2.736 0.204 -2.64 0.204 -2.556C0.204 -1.872 0.24 -1.116 0.756 -0.6C0.936 -0.42 1.272 -0.216 1.548 -0.168L1.38 0.048L1.584 0.132C1.908 -0.12 2.136 -0.468 2.46 -0.72C2.784 -0.576 3.048 -0.372 3.36 -0.228L3.156 -0V0.012L3.36 0.156L4.476 -1.092V-1.104C4.428 -1.14 4.356 -1.212 4.296 -1.212C4.248 -1.212 4.212 -1.176 4.188 -1.14C4.152 -1.104 3.96 -0.876 3.912 -0.876S3.816 -0.912 3.768 -0.936L3.516 -1.08C3.432 -1.128 3.348 -1.176 3.348 -1.308C3.348 -1.332 3.348 -1.356 3.348 -1.38V-3.924C3.348 -3.96 3.348 -3.996 3.348 -4.032C3.348 -4.212 3.432 -4.248 3.54 -4.332C3.684 -4.452 3.852 -4.572 3.972 -4.716H3.984C4.08 -4.572 4.212 -4.44 4.32 -4.296C4.716 -3.708 5.04 -2.916 5.04 -2.004C5.016 -0.828 4.5 0.204 3.912 1.008C3.78 1.188 3.636 1.344 3.516 1.524L3.732 1.704H3.744C3.984 1.44 4.2 1.152 4.416 0.864C5.172 -0.144 5.856 -1.356 5.856 -2.652C5.856 -3.876 5.352 -4.74 4.74 -5.376L5.04 -5.616V-5.628L4.884 -5.808H4.872L3.348 -4.5V-6.648C3.348 -6.78 3.348 -6.9 3.384 -7.02C3.456 -7.224 3.624 -7.392 3.816 -7.464C3.888 -7.488 3.972 -7.5 4.056 -7.512V-7.752C3.696 -7.74 3.396 -7.524 3.156 -7.26C3.012 -7.104 2.892 -6.936 2.724 -6.804ZM1.632 -5.172C1.728 -4.908 1.836 -4.644 1.944 -4.392L2.532 -4.716V-1.428C2.532 -1.392 2.532 -1.344 2.532 -1.308C2.532 -1.116 2.436 -1.08 2.328 -0.972C2.208 -0.852 2.112 -0.684 1.896 -0.684C1.704 -0.684 1.512 -0.852 1.404 -0.996C1.056 -1.44 1.044 -2.208 1.02 -2.892C1.02 -3.024 1.008 -3.156 0.996 -3.288V-3.492C0.984 -3.576 0.984 -3.66 0.984 -3.744C0.984 -4.284 1.14 -4.908 1.632 -5.172Z"/>
+ <path id="g86" d="M2.76 -1.272C2.532 -1.128 2.448 -1.008 2.04 -1.008C1.704 -1.008 1.464 -1.164 1.296 -1.332C1.056 -1.596 1.008 -1.944 1.008 -2.292C1.008 -2.772 1.044 -3.24 1.044 -3.72C1.056 -4.008 0.984 -4.272 0.984 -4.548C0.984 -4.656 1.02 -4.824 1.128 -4.884C1.152 -4.884 1.272 -4.884 1.272 -4.86L1.548 -4.752C1.728 -4.668 2.52 -4.344 2.652 -4.308C2.82 -4.608 3 -4.92 3.156 -5.232C2.808 -5.364 2.46 -5.508 2.112 -5.652L1.848 -5.76C1.824 -5.772 1.776 -5.784 1.74 -5.784C1.68 -5.784 1.632 -5.736 1.596 -5.7C1.164 -5.34 0.924 -5.256 0.636 -4.644C0.348 -4.092 0.204 -3.456 0.204 -2.784C0.204 -1.86 0.288 -1.08 0.792 -0.504C0.984 -0.264 1.248 -0.072 1.536 0.048C1.608 0.084 1.716 0.144 1.8 0.144C1.812 0.144 1.824 0.144 1.836 0.144C1.896 0.132 2.1 -0.096 2.1 -0.096C2.172 -0.168 2.952 -0.948 2.964 -0.996C2.964 -1.08 2.772 -1.26 2.76 -1.272Z"/>
+ <path id="g87" d="M2.7792 -6.552C2.6208 -6.5808 2.4624 -6.6096 2.3184 -6.6096C2.0304 -6.6096 1.7424 -6.5376 1.4688 -6.4224C1.4112 -6.3936 1.0656 -6.2064 1.0656 -6.1488C1.1664 -6.1632 1.2672 -6.1632 1.3536 -6.1632C1.4544 -6.1632 1.5552 -6.1632 1.656 -6.1344C2.16 -6.0192 2.5776 -5.616 2.7216 -5.1264C2.6208 -5.1408 2.5344 -5.1408 2.4336 -5.1408C2.1024 -5.1408 1.7712 -5.0688 1.4688 -4.9248C1.4112 -4.896 1.0512 -4.68 1.0512 -4.6368C1.584 -4.6368 2.1024 -4.4064 2.4768 -4.0176C2.6352 -3.8592 2.7504 -3.672 2.88 -3.4848C2.7072 -3.4848 2.5344 -3.4848 2.3616 -3.456C1.8864 -3.3552 1.44 -3.0528 1.2096 -2.6208C1.4976 -2.7648 1.8432 -2.88 2.1888 -2.88C2.5056 -2.88 2.808 -2.7792 3.0528 -2.52C3.2112 -2.3328 3.2544 -2.16 3.2544 -1.8288C3.2112 -1.3536 2.8944 -0.9936 2.592 -0.7632C2.5056 -0.7056 2.4336 -0.6192 2.3328 -0.576S2.1168 -0.5184 2.016 -0.4896C1.0368 -0.2448 0.2016 0.576 0.2016 1.584H0.5184C0.5184 1.4976 0.5328 1.3968 0.5616 1.3104C0.72 0.9216 1.1808 0.864 1.5984 0.864C1.5984 0.864 2.6064 0.8928 2.6064 0.9072C2.6784 0.9072 3.3408 0.9504 3.3408 0.8928C4.4496 0.648 4.9248 -0.576 5.0112 -1.6848V-3.9312C5.0112 -3.9744 5.0112 -4.032 5.04 -4.0608C5.0688 -4.1472 5.4 -4.2336 5.4432 -4.248C5.7744 -4.3488 6.1344 -4.4064 6.48 -4.4064C7.0128 -4.4064 7.3872 -4.2624 7.8192 -4.1184C7.776 -3.9456 7.7616 -3.7584 7.7328 -3.5856C7.416 -2.1312 6.8976 -0.9504 6.1776 0.1584C6.048 0.3744 5.8752 0.576 5.76 0.792L6.0048 0.9648H6.0192C6.1632 0.792 6.3216 0.6192 6.4944 0.4752C6.8976 0.1728 7.4304 -0.0144 7.9488 -0.0144C8.28 -0.0144 8.6112 0.0576 8.856 0.1584C8.9136 0.1872 9.0864 0.2736 9.1584 0.2736C9.2016 0.2592 9.4896 -0.2448 9.4896 -0.2448C9.792 -0.7632 10.1232 -1.2672 10.4112 -1.7856L10.1376 -1.944L9.864 -1.4688C9.6336 -1.5408 9.4464 -1.5984 9.1584 -1.5984C8.6976 -1.5984 8.2512 -1.4544 7.848 -1.2384C7.6896 -1.152 7.5456 -1.0368 7.4016 -0.9504C7.6752 -1.2816 7.8912 -1.6704 8.1072 -2.0448C8.7696 -3.1392 9.3168 -4.4352 9.3168 -5.8752C9.3168 -6.2496 9.2736 -6.624 9.144 -6.984C8.8416 -7.8624 8.208 -8.5824 7.5024 -9.1584C7.2 -9.4176 6.8688 -9.6336 6.5376 -9.864C6.4656 -9.9072 6.1056 -10.1376 6.0336 -10.1376S5.904 -10.0944 5.8464 -10.0512L2.9952 -8.352C2.9376 -8.3088 2.8224 -8.28 2.7936 -8.208C2.7792 -8.208 2.7792 -8.1216 2.7792 -8.1216C2.7936 -7.8192 2.7792 -6.624 2.7792 -6.552ZM5.0112 -8.4816C6.1632 -8.3664 7.1424 -7.632 7.6176 -6.5664C7.1568 -6.3504 6.9264 -6.1488 6.2496 -6.1488C5.8608 -6.1488 5.4864 -6.2496 5.1984 -6.3792C5.0976 -6.4224 5.0112 -6.4656 5.0112 -6.6096V-6.6816V-8.4816ZM7.848 -4.4208C7.4304 -4.6224 6.9552 -4.7232 6.48 -4.7232C5.9184 -4.7232 5.4288 -4.5936 5.0112 -4.4064V-6.1632C5.3568 -5.9328 5.8032 -5.832 6.2352 -5.832C6.8832 -5.832 7.2864 -6.048 7.7184 -6.3216C7.8048 -6.0048 7.8768 -5.7024 7.8912 -5.3712C7.8912 -5.3712 7.8768 -4.4208 7.848 -4.4208ZM3.3696 -0.6624V-0.6768C3.7728 -0.864 4.104 -1.2528 4.1904 -1.6848C4.2192 -1.6848 4.2336 -2.1024 4.2336 -2.1024C4.2048 -3.4128 4.2192 -7.7472 4.2192 -8.2656V-8.3232C4.2192 -8.424 4.2768 -8.4672 4.3776 -8.4672C4.4784 -8.4816 4.5936 -8.4816 4.6944 -8.496V-2.4912V-2.088C4.6944 -1.9584 4.6944 -1.8144 4.6656 -1.6992C4.5072 -1.1088 3.9312 -0.7776 3.3696 -0.6624Z"/>
+ <path id="g88" d="M2.784 -7.44C2.568 -7.548 2.328 -7.692 2.052 -7.692C1.344 -7.692 1.128 -6.78 0.96 -6.204C0.9 -6.036 0.672 -5.448 0.624 -5.328C0.48 -5.004 0.204 -4.776 0.012 -4.488H0.432C0.432 -2.16 0.552 -0.24 0.828 1.98C0.828 2.064 0.852 2.136 0.972 2.136C1.008 2.136 1.056 2.124 1.092 2.124C1.092 1.752 1.152 1.368 1.176 0.996C1.248 -0.036 1.332 -1.056 1.416 -2.088C1.464 -2.664 1.536 -3.24 1.548 -3.816C1.548 -4.272 1.488 -4.728 1.32 -5.148L1.104 -5.676C1.08 -5.736 1.044 -5.808 1.044 -5.88C1.044 -6.024 1.2 -6.192 1.26 -6.252C1.464 -6.468 1.74 -6.6 2.04 -6.6C2.268 -6.6 2.472 -6.516 2.64 -6.444C2.772 -6.708 2.868 -6.996 2.976 -7.272C3.048 -7.428 3.096 -7.704 3.312 -7.704C3.42 -7.704 3.48 -7.584 3.48 -7.476C3.48 -7.152 3.288 -6.804 3.192 -6.636L2.436 -5.256C2.304 -5.016 2.16 -4.788 2.052 -4.536H2.412V-1.704C2.412 -1.596 2.424 -1.476 2.424 -1.356C2.424 -1.008 2.328 -0.732 2.052 -0.564C2.184 -0.42 2.34 -0.36 2.52 -0.288C2.664 -0.216 2.808 -0.144 2.94 -0.048C2.94 -0.048 3.24 0.204 3.24 0.12C3.276 0.108 3.312 0.072 3.336 0.036L3.516 -0.168C3.732 -0.408 4.152 -0.852 4.344 -1.092C4.38 -1.116 4.428 -1.164 4.428 -1.212S4.308 -1.368 4.26 -1.368C4.2 -1.296 3.864 -0.888 3.78 -0.876C3.744 -0.876 3.528 -0.996 3.456 -1.044C3.324 -1.116 3.204 -1.14 3.204 -1.344C3.204 -1.416 3.216 -1.476 3.216 -1.536V-4.536H4.044V-5.148H3.228C3.264 -5.316 3.264 -5.496 3.276 -5.676C3.312 -5.976 3.372 -6.276 3.432 -6.564C3.456 -6.672 3.516 -6.768 3.552 -6.876C3.612 -7.032 3.66 -7.212 3.66 -7.368C3.66 -7.68 3.528 -7.944 3.252 -7.944S2.856 -7.632 2.784 -7.44Z"/>
+ <path id="g89" d="M2.7936 -9.5616C2.7072 -9.4032 2.592 -9.2736 2.4768 -9.1296C2.0592 -8.6256 1.6272 -8.28 1.08 -7.9344C0.9504 -7.848 0.8208 -7.848 0.8208 -7.6176C0.8208 -7.5456 0.8352 -7.4592 0.8352 -7.4016V-6.5664C0.8352 -6.4512 0.8496 -6.336 0.8496 -6.2208C0.8496 -6.1344 0.8352 -6.048 0.8208 -5.9616C0.8064 -5.8464 0.5904 -5.1984 0.5184 -4.9968H0.8352V-1.6848C0.8352 -1.5408 0.8208 -1.4544 0.72 -1.3392C0.6624 -1.2816 0.5472 -1.1808 0.5472 -1.0944C0.5472 -0.9936 0.792 -0.7632 0.792 -0.7632L1.4256 -0.0144C1.4688 0.0288 1.6272 0.2736 1.6992 0.2736C1.7568 0.2736 1.8288 0.216 1.8864 0.1872L2.2896 -0.0432C2.4192 -0.1152 3.8016 -0.9216 3.8736 -0.9504C3.8448 -1.0224 3.7872 -1.1952 3.672 -1.1952C3.6432 -1.1952 3.6144 -1.1808 3.5856 -1.1664L2.52 -0.5472C2.3616 -0.7488 2.2032 -0.936 2.0592 -1.152C2.0592 -1.152 2.0448 -1.3392 2.0448 -1.3392C2.0448 -3.6432 2.016 -6.0048 2.0592 -8.2224L2.2608 -8.4528H2.2752L3.096 -7.7616L3.7008 -8.8272C3.3984 -9.072 3.1104 -9.3312 2.7936 -9.5616Z"/>
+ <path id="g90" d="M2.856 -0.648V-0.636C2.508 -0.372 2.22 -0.072 1.632 -0.072C1.332 -0.072 1.032 -0.168 0.792 -0.36C0.624 -0.492 0.468 -0.732 0.468 -0.96C0.468 -1.212 0.636 -1.356 0.864 -1.404C0.816 -1.32 0.792 -1.236 0.792 -1.152C0.792 -0.9 1.032 -0.672 1.296 -0.672C1.524 -0.672 1.68 -0.888 1.68 -1.116C1.68 -1.5 1.38 -1.74 1.008 -1.74C0.6 -1.74 0.204 -1.452 0.204 -0.972C0.204 -0.876 0.216 -0.78 0.24 -0.696C0.384 -0.204 0.9 0.156 1.512 0.156C2.052 0.156 2.508 -0.108 2.856 -0.384C2.904 -0.42 2.964 -0.492 3.036 -0.504C3.096 -0.504 3.18 -0.432 3.24 -0.396C3.732 -0.108 4.56 0.156 5.22 0.156C5.268 0.156 5.316 0.156 5.364 0.144C5.424 0.12 5.844 -0.336 5.844 -0.336L6.876 -1.404C6.936 -1.464 7.152 -1.644 7.152 -1.728C7.152 -1.8 7.068 -1.896 7.008 -1.896C6.924 -1.896 6.852 -1.776 6.816 -1.74C6.456 -1.38 5.976 -0.96 5.292 -0.96C4.944 -0.96 4.584 -1.044 4.284 -1.152L3.888 -1.332C3.96 -1.428 4.056 -1.512 4.14 -1.596C4.572 -2.028 5.028 -2.712 5.028 -3.396C5.028 -3.444 5.028 -3.48 5.028 -3.528C4.956 -4.296 4.44 -4.908 4.212 -5.628C4.152 -5.808 4.116 -6 4.116 -6.192C4.116 -6.696 4.44 -7.104 4.824 -7.272C4.872 -7.272 4.884 -6.84 4.884 -6.84S4.872 -6.444 4.836 -6.444C4.812 -6.348 4.776 -6.264 4.74 -6.18C4.728 -6.18 4.716 -6.036 4.728 -6.036C4.752 -6 4.848 -5.928 4.896 -5.928C4.932 -5.928 4.956 -5.976 4.98 -6.012C5.1 -6.228 5.196 -6.468 5.196 -6.792C5.196 -7.056 5.136 -7.152 5.088 -7.392L5.424 -7.464L5.82 -6.048L7.2 -6.444L7.128 -6.696L6.924 -6.648C6.804 -7.056 6.696 -7.452 6.588 -7.872L5.424 -7.728C5.328 -7.716 5.052 -7.656 5.016 -7.656C4.908 -7.656 4.86 -7.788 4.8 -7.848C4.512 -8.208 4.02 -8.46 3.444 -8.46C1.992 -8.46 1.308 -7.044 1.08 -5.976C0.984 -5.496 0.924 -4.992 0.924 -4.488C0.924 -4.32 0.936 -4.14 0.948 -3.96C1.044 -3.012 1.428 -2.1 2.052 -1.38C2.28 -1.104 2.556 -0.84 2.856 -0.648ZM3.612 -1.512C2.4 -2.34 1.86 -3.828 1.86 -5.244C1.86 -5.784 1.932 -6.288 2.076 -6.72C2.292 -7.392 2.748 -8.124 3.624 -8.124C4.104 -8.124 4.452 -7.86 4.692 -7.548C4.452 -7.5 4.2 -7.332 4.008 -7.176C3.624 -6.852 3.288 -6.42 3.288 -5.736C3.3 -4.608 4.092 -3.768 4.092 -2.736C4.092 -2.424 3.984 -2.124 3.84 -1.86C3.768 -1.74 3.684 -1.632 3.612 -1.512Z"/>
+ <path id="g91" d="M2.868 -4.668C1.992 -4.032 1.08 -3.444 0.216 -2.796C0.204 -2.676 0.204 -2.532 0.204 -2.4L0.492 -2.592C1.272 -3.156 2.1 -3.672 2.856 -4.272C2.892 -4.38 2.868 -4.536 2.868 -4.668ZM2.868 -3.456C1.992 -2.82 1.08 -2.22 0.216 -1.572C0.204 -1.452 0.204 -1.308 0.204 -1.176C1.092 -1.8 1.992 -2.4 2.856 -3.048C2.892 -3.168 2.88 -3.312 2.868 -3.456Z"/>
+ <path id="g92" d="M2.892 -5.808L1.476 -4.776C1.476 -5.052 1.392 -5.328 1.248 -5.568C1.224 -5.628 1.14 -5.772 1.056 -5.772C0.996 -5.748 0.828 -5.52 0.816 -5.508C0.612 -5.268 0.384 -5.028 0.204 -4.764C0.504 -4.62 0.66 -4.38 0.66 -3.984C0.66 -3.912 0.66 -3.84 0.66 -3.78V-2.004C0.66 -1.932 0.66 -1.092 0.66 -1.092C0.648 -0.996 0.612 -0.888 0.552 -0.816C0.492 -0.756 0.396 -0.732 0.396 -0.6C0.396 -0.564 0.408 -0.504 0.408 -0.468C0.576 -0.408 0.696 -0.288 0.792 -0.144L0.888 0.024C0.912 0.108 0.948 0.168 1.08 0.168C1.176 0.168 1.2 0.132 1.224 0.048C1.32 -0.192 1.512 -0.408 1.74 -0.468V-0.72C1.5 -0.804 1.464 -1.044 1.464 -1.284C1.464 -1.38 1.476 -1.488 1.476 -1.572V-4.152C1.476 -4.2 1.464 -4.26 1.464 -4.32C1.464 -4.488 1.56 -4.536 1.68 -4.608C1.836 -4.728 2.016 -4.824 2.148 -4.968H2.16C2.424 -4.656 2.688 -4.344 2.94 -4.008C2.988 -2.952 2.916 -1.812 2.964 -0.78L3.264 -0.144L3.144 0.096L3.324 0.228H3.336L4.176 -1.02V-1.032L3.996 -1.176H3.984L3.876 -1.008C3.804 -1.08 3.756 -1.14 3.756 -1.284C3.756 -1.32 3.756 -1.356 3.756 -1.392V-4.536C3.756 -4.56 3.756 -4.596 3.756 -4.632C3.756 -4.812 3.852 -4.86 4.02 -4.884V-5.052C3.696 -5.052 3.396 -5.22 3.18 -5.448C3.072 -5.556 3 -5.7 2.892 -5.808Z"/>
+ <path id="g93" d="M2.94 -0.912C2.976 -0.744 3.012 -0.576 3.06 -0.42C3.192 0.012 3.432 0.48 3.432 0.936C3.432 1.092 3.408 1.236 3.336 1.392C3.216 1.74 2.784 2.028 2.388 2.028C1.656 2.028 1.152 1.56 0.78 1.224C0.744 1.188 0.696 1.128 0.636 1.128C0.636 1.128 0.624 1.128 0.624 1.128C0.564 1.128 0.504 1.188 0.444 1.212C0.576 1.38 0.756 1.524 0.924 1.668C1.38 2.028 1.92 2.304 2.508 2.304C2.772 2.304 2.964 2.244 3.18 2.184C3.828 1.932 4.404 1.284 4.404 0.456C4.404 0.336 4.344 0.3 4.284 0.216C3.924 -0.288 3.768 -0.744 3.768 -1.644C3.768 -1.764 3.768 -1.884 3.768 -2.004C3.768 -2.964 3.9 -3.948 4.104 -4.764C3.828 -4.86 4.056 -4.8 3.684 -4.86C3.276 -4.92 2.892 -5.196 2.616 -5.352C2.52 -5.412 2.184 -5.616 2.076 -5.616S1.884 -5.448 1.848 -5.4L1.392 -4.86C0.816 -4.164 0.456 -3.264 0.456 -2.364C0.456 -1.524 0.792 -0.78 1.212 -0.3C1.26 -0.24 1.416 -0.036 1.512 -0.036C1.548 -0.036 1.884 -0.252 1.884 -0.252L2.94 -0.912ZM1.572 -4.716C1.884 -4.548 2.232 -4.428 2.556 -4.284L2.82 -4.176C2.892 -4.152 2.952 -4.104 2.952 -4.008C2.952 -3.96 2.94 -3.9 2.94 -3.852V-3.156C2.94 -2.712 2.928 -2.256 2.928 -1.812V-1.452C2.928 -1.416 2.94 -1.272 2.904 -1.272C2.88 -1.224 2.436 -0.96 2.436 -0.96C2.376 -0.924 2.136 -0.756 2.076 -0.744C1.992 -0.744 1.92 -0.864 1.872 -0.924C1.512 -1.368 1.26 -1.944 1.188 -2.628C1.176 -2.628 1.176 -3.276 1.188 -3.276C1.2 -3.588 1.2 -3.912 1.308 -4.212C1.416 -4.5 1.404 -4.428 1.572 -4.716Z"/>
+ <path id="g94" d="M2.964 -5.532C2.94 -5.58 2.892 -5.784 2.832 -5.784S2.7 -5.748 2.652 -5.724L2.268 -5.556C1.824 -5.364 1.368 -5.196 0.936 -4.956C0.816 -4.896 0.456 -4.74 0.42 -4.62C0.276 -4.248 0.204 -3.108 0.204 -2.82C0.204 -1.632 0.624 -0.792 1.188 -0.12C1.236 -0.06 1.356 0.132 1.464 0.132C1.5 0.132 1.776 -0.06 1.776 -0.06C1.884 -0.132 2.844 -0.756 2.88 -0.816C2.892 -0.828 2.88 -0.888 2.868 -0.888C2.832 -0.936 2.784 -1.032 2.724 -1.032C2.724 -1.032 2.712 -1.032 2.712 -1.032C2.496 -0.984 2.628 -0.936 2.328 -0.936C2.28 -0.936 2.244 -0.948 2.196 -0.948C1.452 -1.08 1.056 -1.884 1.02 -2.568C1.02 -2.604 1.008 -2.652 1.008 -2.7S1.02 -2.784 1.044 -2.82C1.08 -2.856 1.512 -3.036 1.512 -3.036L2.688 -3.528L3.06 -3.684C3.132 -3.72 3.192 -3.72 3.192 -3.804C3.192 -3.84 3.192 -3.876 3.18 -3.9C3.18 -3.9 2.928 -5.388 2.928 -5.448C2.928 -5.472 2.94 -5.508 2.964 -5.532ZM1.008 -3.144C1.008 -3.792 1.032 -4.452 1.416 -4.812C1.548 -4.932 1.704 -5.004 1.872 -5.064C1.968 -5.112 2.064 -5.16 2.16 -5.184L2.352 -3.696L1.008 -3.144Z"/>
+ <path id="g95" d="M27.6484 -48.1528C27.1845 -48.06 26.9062 -47.8281 26.767 -47.5034C26.6742 -47.2714 26.6742 -46.7147 26.767 -46.4364C26.8134 -46.2508 26.9062 -46.158 27.4165 -45.6478C28.0196 -45.0911 28.0196 -45.0447 28.0196 -44.9519C27.9732 -44.8591 27.9268 -44.7663 27.8804 -44.72C27.7876 -44.5808 27.6484 -44.6272 27.3237 -44.8591C27.1845 -44.9519 27.0454 -45.0447 26.9526 -45.0911C26.9062 -45.0911 26.8134 -45.2302 26.6742 -45.4622C26.3495 -45.9725 25.2825 -47.5961 25.1898 -47.7353C25.1434 -47.7353 25.0042 -47.6889 24.9578 -47.6889C24.9114 -47.6425 25.0042 -47.5034 25.2825 -47.0858L25.6537 -46.4828L25.4681 -46.6219C25.2362 -46.8539 25.0042 -46.9003 24.7723 -46.9003C24.3084 -46.8539 23.6589 -46.3436 23.4269 -45.9261C23.195 -45.4622 23.3342 -44.9055 23.6589 -44.8127C24.03 -44.7663 24.3084 -45.2302 24.03 -45.5086C23.9372 -45.6014 23.8908 -45.6014 23.7517 -45.6014H23.6125L23.6589 -45.7405C23.7981 -46.1117 24.4939 -46.6219 24.8186 -46.6219C25.1898 -46.6219 25.5609 -46.2508 25.7001 -45.7869C25.7464 -45.555 25.7464 -45.6014 25.6073 -44.6272C25.5609 -44.2097 25.6073 -44.0241 25.7464 -43.8385C25.7928 -43.7922 25.932 -43.6994 25.9784 -43.6994C26.1176 -43.653 26.3495 -43.7922 26.5815 -43.9777C26.8598 -44.2097 26.999 -44.3024 26.999 -44.3024C27.1845 -44.1633 28.901 -40.7768 28.901 -40.6376C28.901 -40.5912 28.7618 -40.4985 28.6226 -40.4057L28.3443 -40.2201L28.2515 -40.3593C26.999 -41.8902 25.7928 -43.0499 24.262 -43.9777C22.4991 -45.0447 20.5044 -45.7405 18.4632 -45.9261C17.5354 -46.0653 16.1437 -46.0189 15.1695 -45.8797C13.2675 -45.6478 11.2728 -44.8591 9.7419 -43.7458L9.41717 -43.5138V-43.8849C9.37078 -44.3024 9.278 -44.72 9.09244 -45.1375C8.95327 -45.4158 8.67493 -45.8797 8.62854 -45.8797S8.53576 -45.8797 8.48937 -45.8333L8.39659 -45.7405L8.48937 -45.6478C8.76771 -45.1839 8.90688 -44.72 8.90688 -44.3952C8.86049 -44.1169 8.8141 -43.9777 8.58215 -43.8849C8.30381 -43.7458 8.02547 -43.8849 7.4224 -44.4416C7.00489 -44.8591 6.68016 -45.0911 6.30904 -45.2302C5.01012 -45.7405 3.34008 -45.1375 2.3195 -43.7922C2.08755 -43.421 1.76282 -42.8644 1.62365 -42.4468C1.57726 -42.3077 1.53087 -42.1685 1.53087 -42.1685C1.48448 -42.1685 1.20614 -42.586 1.11336 -42.7716C0.78863 -43.5138 0.88141 -44.5808 1.43809 -45.323C1.57726 -45.555 1.99477 -45.9261 2.22672 -46.0189C2.55145 -46.2044 2.87618 -46.2508 3.15452 -46.2044C3.38647 -46.158 3.61842 -46.0189 3.75759 -45.9261C3.80398 -45.8797 3.80398 -45.9261 3.98954 -46.1117L4.12871 -46.2972L4.03593 -46.39C3.89676 -46.4828 3.61842 -46.6219 3.38647 -46.6683C2.36589 -46.8539 1.20614 -46.0189 0.78863 -44.8127C0.4639 -43.7458 0.64946 -42.7252 1.29892 -41.9829L1.48448 -41.7974L1.43809 -41.5654C1.29892 -40.6376 1.3917 -39.6171 1.71643 -38.5965C2.08755 -37.5295 2.73701 -36.5089 3.61842 -35.7203C3.94315 -35.442 4.54622 -35.0244 4.77817 -34.8853L4.87095 -34.8389L4.91734 -34.2358C4.91734 -33.54 4.96373 -33.1225 5.05651 -32.5194C5.38124 -30.6174 6.16987 -28.8082 7.23684 -27.3701C7.32962 -27.2309 7.4224 -27.1381 7.4224 -27.0918S6.44821 -26.5351 5.84514 -26.2103C4.22149 -25.3753 3.10813 -25.1898 2.59784 -25.6537C2.55145 -25.7464 2.41228 -25.8392 2.41228 -25.932C2.27311 -26.164 2.22672 -26.5815 2.27311 -26.999L2.3195 -27.1381L2.41228 -26.999C2.50506 -26.767 2.7834 -26.6279 3.06174 -26.6279C3.29369 -26.6279 3.57203 -26.8134 3.7112 -26.999C3.80398 -27.1381 3.80398 -27.1845 3.80398 -27.4165C3.80398 -27.6948 3.80398 -27.7412 3.7112 -27.8804C3.43286 -28.2979 2.82979 -28.3443 2.41228 -27.9732C2.04116 -27.5557 1.8556 -26.6742 2.04116 -26.0248C2.18033 -25.7001 2.45867 -25.4217 2.7834 -25.3289C3.52564 -25.097 4.82456 -25.4217 6.40182 -26.2103L6.77294 -26.3959L6.54099 -26.1176C6.30904 -25.7928 5.93792 -25.2825 5.75236 -24.9114C5.42763 -24.3547 4.639 -23.4269 4.08232 -23.0558C3.75759 -22.8239 3.38647 -22.6383 3.06174 -22.5919C2.82979 -22.4991 2.22672 -22.4991 2.18033 -22.5455C2.18033 -22.5455 2.22672 -22.5919 2.27311 -22.6847C2.50506 -22.963 2.22672 -23.4733 1.8556 -23.3342C1.48448 -23.2414 1.43809 -22.8239 1.71643 -22.4991C1.80921 -22.36 2.04116 -22.2672 2.22672 -22.2672C2.36589 -22.2208 2.36589 -22.2208 2.36589 -22.3136S2.36589 -22.4064 2.41228 -22.3136C2.50506 -22.2672 2.55145 -22.2672 2.7834 -22.2672C3.15452 -22.3136 3.43286 -22.4064 3.80398 -22.5919S4.54622 -23.0094 4.96373 -23.4733L5.28846 -23.7981L5.19568 -23.5197C4.91734 -22.1744 5.1029 -20.7827 5.79875 -19.6694C6.0307 -19.2982 6.58738 -18.7416 6.91211 -18.5096C7.05128 -18.4168 7.14406 -18.324 7.14406 -18.324S7.14406 -18.1849 7.09767 -17.9993C7.00489 -17.4426 7.00489 -16.7004 7.09767 -15.9118L7.14406 -15.7262L6.81933 -15.4943C6.63377 -15.3551 6.30904 -15.0767 6.07709 -14.8448C4.12871 -12.9428 3.06174 -10.4377 3.06174 -7.79352C3.06174 -6.58738 3.2473 -5.52041 3.66481 -4.49983C4.12871 -3.38647 5.01012 -2.27311 5.79875 -1.71643C5.93792 -1.57726 6.0307 -1.48448 6.0307 -1.48448C6.0307 -1.34531 5.47402 -0.74224 5.1029 -0.55668C4.59261 -0.23195 3.89676 -0.04639 3.38647 -0.13917L3.2473 -0.18556L3.38647 -0.27834C3.75759 -0.51029 3.80398 -1.06697 3.52564 -1.3917C3.29369 -1.57726 2.92257 -1.67004 2.64423 -1.53087C2.22672 -1.34531 2.08755 -0.78863 2.36589 -0.41751C2.50506 -0.23195 2.73701 -0.04639 3.06174 -0C3.34008 0.13917 4.03593 0.13917 4.45344 0.04639C5.1029 -0.09278 5.70597 -0.4639 6.12348 -1.02058C6.26265 -1.15975 6.35543 -1.29892 6.35543 -1.29892C6.40182 -1.29892 6.4946 -1.25253 6.63377 -1.15975C8.02547 -0.4639 9.69551 -0.37112 10.9016 -0.97419C11.6903 -1.34531 12.247 -1.94838 12.4789 -2.69062C12.6181 -3.06174 12.6181 -3.61842 12.5253 -3.89676L12.4325 -4.12871L12.7109 -4.36066C12.85 -4.49983 13.2211 -4.96373 13.4995 -5.33485S14.1026 -6.07709 14.1953 -6.16987C14.752 -6.68016 15.6798 -6.68016 16.0973 -6.16987C16.2829 -5.98431 16.3293 -5.79875 16.3293 -5.47402S16.3293 -5.1029 16.1901 -5.28846C16.0973 -5.42763 15.819 -5.5668 15.587 -5.5668C15.4015 -5.5668 15.2159 -5.47402 15.0767 -5.33485C14.752 -4.96373 14.8448 -4.40705 15.2623 -4.1751C15.4015 -4.08232 15.4479 -4.08232 15.6798 -4.08232C15.9582 -4.12871 16.1437 -4.22149 16.3293 -4.49983C16.7004 -4.96373 16.7468 -5.89153 16.4221 -6.58738C16.1901 -7.23684 15.6334 -7.79352 14.984 -8.07186L14.7984 -8.11825L15.0304 -8.16464C15.4015 -8.21103 16.0973 -8.3502 16.6076 -8.53576L17.1179 -8.72132L17.3499 -8.30381C17.8601 -7.37601 18.0921 -6.54099 18.0921 -5.52041C18.0921 -3.43286 16.886 -1.76282 15.1695 -1.48448C14.8912 -1.43809 14.4737 -1.43809 14.3345 -1.48448C14.2417 -1.48448 14.2417 -1.48448 14.3345 -1.57726C14.5201 -1.67004 14.6128 -1.8556 14.6128 -2.08755C14.6128 -2.7834 13.6387 -2.96896 13.4067 -2.3195C13.2211 -1.90199 13.4995 -1.48448 14.0098 -1.25253C14.3345 -1.15975 15.0767 -1.15975 15.4943 -1.25253C16.9323 -1.67004 17.9993 -2.87618 18.324 -4.54622C18.4168 -4.96373 18.4168 -6.12348 18.324 -6.4946C18.2777 -6.68016 18.2777 -6.77294 18.2777 -6.77294C18.2777 -6.81933 18.3704 -6.68016 18.5096 -6.4946C19.1591 -5.5668 20.0405 -4.639 21.0147 -3.89676C23.0558 -2.22672 25.4217 -1.25253 28.0659 -0.9278C28.5762 -0.88141 30.1999 -0.88141 30.7102 -0.9278C32.1947 -1.11336 33.8183 -1.53087 35.1636 -2.04116C35.3956 -2.13394 35.5811 -2.22672 35.6275 -2.22672C35.6275 -2.22672 35.6739 -2.18033 35.7203 -2.18033C35.8131 -2.04116 36.045 -1.94838 36.2306 -1.94838C36.6017 -1.94838 36.8337 -2.22672 36.88 -2.59784L36.9264 -2.7834L37.3903 -3.01535C39.014 -3.7112 40.7304 -4.36066 41.8438 -4.639C42.818 -4.87095 43.3746 -4.91734 44.1633 -4.91734C44.5808 -4.91734 44.8591 -4.87095 44.9983 -4.82456C45.2302 -4.77817 45.6941 -4.54622 45.8333 -4.45344L45.9261 -4.40705L45.6941 -4.31427C45.1375 -4.03593 44.4416 -3.89676 43.5138 -3.85037C42.8644 -3.80398 42.6788 -3.75759 42.3541 -3.52564C41.9829 -3.2473 41.7046 -2.82979 41.6118 -2.41228C41.5654 -2.22672 41.6118 -1.71643 41.6582 -1.53087C41.6582 -1.43809 41.6582 -1.48448 41.3335 -1.62365C40.916 -1.8556 40.4985 -2.04116 40.081 -2.13394C39.8026 -2.22672 39.6634 -2.22672 39.2459 -2.22672C38.6893 -2.22672 38.4573 -2.18033 38.179 -1.99477S37.8078 -1.62365 37.7615 -1.34531C37.7615 -0.88141 38.0398 -0.60307 38.4573 -0.60307C39.1532 -0.60307 39.3851 -1.48448 38.782 -1.8556L38.6893 -1.90199L38.8748 -1.94838C39.2923 -1.99477 40.1273 -1.90199 40.6376 -1.67004C41.0088 -1.53087 41.4727 -1.25253 41.8438 -1.02058C43.4674 -0 43.8385 0.13917 44.488 0.13917C45.2302 0.13917 45.7405 -0.04639 46.2972 -0.55668C46.5292 -0.83502 46.6219 -0.97419 46.7611 -1.20614C46.9931 -1.67004 47.0395 -1.94838 46.9931 -2.45867C46.9931 -3.15452 46.8075 -3.61842 46.4828 -4.08232C46.39 -4.22149 46.3436 -4.31427 46.3436 -4.31427C46.8075 -4.68539 47.1322 -4.96373 47.3178 -5.38124C47.8281 -6.40182 47.457 -7.65435 46.6219 -7.65435C46.3436 -7.65435 46.1117 -7.46879 46.0189 -7.19045C45.8797 -6.81933 46.2044 -6.35543 46.6219 -6.35543C46.8075 -6.35543 47.0395 -6.4946 47.1322 -6.63377L47.225 -6.77294V-6.54099C47.2714 -6.30904 47.225 -5.89153 47.1322 -5.65958C46.9931 -5.28846 46.7147 -4.91734 46.2972 -4.639L46.1117 -4.49983L45.8797 -4.639C44.9519 -5.24207 43.421 -5.24207 41.2871 -4.68539C40.8696 -4.59261 39.5707 -4.1751 39.1995 -4.03593C39.1532 -4.03593 39.3851 -4.1751 39.6634 -4.40705C40.9624 -5.24207 41.8902 -6.0307 42.9571 -7.09767C44.7663 -8.86049 45.8797 -10.4841 46.8075 -12.5717L46.9931 -13.0356H47.1786C47.4106 -13.082 47.5497 -13.1284 47.6889 -13.3139C47.8745 -13.4995 47.9209 -13.6387 47.9209 -13.8706C47.8745 -14.1489 47.7817 -14.3809 47.5961 -14.4737L47.5034 -14.5665L47.5497 -14.7984C48.06 -16.7004 48.1992 -19.3446 47.9673 -21.3394C47.8281 -22.6847 47.4106 -24.3084 46.9467 -25.4217L46.8539 -25.6073H46.9467C46.9931 -25.6073 47.1322 -25.6537 47.2714 -25.6537C47.6889 -25.7464 47.8745 -25.8856 47.9209 -26.164C47.9209 -26.3495 47.8281 -26.5815 47.6425 -26.7206C47.5497 -26.767 47.3178 -26.9062 47.0858 -26.9526C46.8075 -27.0918 46.6219 -27.1845 46.5292 -27.2773C46.3436 -27.4165 46.158 -27.834 46.1117 -28.0659C46.1117 -28.2979 46.158 -28.3443 46.4364 -28.4371C46.6683 -28.5298 47.1786 -28.5762 47.1786 -28.5298C47.1786 -28.5298 47.1322 -28.4835 47.0858 -28.3907C46.8075 -27.9732 47.1786 -27.4629 47.6425 -27.5557C48.06 -27.6948 48.1528 -28.1587 47.7817 -28.5298C47.5961 -28.7154 47.3178 -28.8082 46.9467 -28.8082C46.39 -28.8082 45.9261 -28.6226 45.8797 -28.2979C45.8333 -28.1123 45.8797 -27.7876 46.0189 -27.5093C46.2044 -27.1381 46.3436 -26.999 46.9003 -26.767C47.225 -26.6742 47.4106 -26.5351 47.5034 -26.4887C47.5961 -26.3495 47.6425 -26.3495 47.6425 -26.164C47.6425 -25.7928 47.457 -25.7001 46.9467 -25.9784L46.6683 -26.0712L46.4364 -26.5815C45.8333 -27.7412 45.1375 -28.7154 44.3024 -29.6432L43.9777 -29.9679H44.4416C44.9519 -29.9679 45.1839 -30.0607 45.6014 -30.2927C46.4828 -30.8957 46.7147 -32.1483 46.2044 -33.1688C46.0189 -33.54 45.5086 -34.0503 45.1375 -34.2358C44.1633 -34.7925 43.0499 -34.9317 41.8438 -34.6533C40.7768 -34.375 39.8026 -33.8183 39.014 -33.0297L38.782 -32.8441L38.4573 -32.8905C38.2254 -32.9369 37.8078 -32.9369 37.4367 -32.9369C36.7409 -32.9369 36.3234 -32.8905 35.7203 -32.7049C35.5347 -32.6586 35.3492 -32.6586 35.3492 -32.6586S35.3492 -32.7513 35.3956 -32.8441C35.3956 -32.9369 35.3956 -33.0297 35.3956 -33.0297C35.3492 -33.0297 35.1636 -33.0761 34.9781 -33.1225C34.6533 -33.1688 34.6069 -33.2152 34.6069 -33.2616C34.6069 -33.2616 34.6533 -33.4936 34.6997 -33.7255C34.6997 -33.9575 34.7461 -34.143 34.7925 -34.143C34.7925 -34.143 35.0708 -34.0503 35.3028 -33.9111C35.7203 -33.6791 35.8595 -33.6327 35.9986 -33.6327C36.3234 -33.6327 36.5089 -33.8647 36.5089 -34.2358C36.5089 -34.4214 36.4625 -34.5142 36.2306 -34.9781S35.9986 -35.5347 35.9986 -35.7203C35.9986 -36.1378 36.2306 -36.6017 36.5553 -36.6945C36.6481 -36.6945 36.7409 -36.6945 36.9264 -36.6481C37.2048 -36.6017 37.5295 -36.4161 37.7151 -36.277L37.8542 -36.1842L37.6687 -36.0914C37.4367 -36.045 37.3439 -35.9522 37.2976 -35.7203C37.2048 -35.3956 37.4367 -35.0708 37.8078 -35.0708C38.1326 -35.0708 38.3181 -35.3028 38.3181 -35.7203C38.2717 -35.8595 38.2717 -35.9986 38.2717 -35.9986S38.4109 -35.9059 38.5965 -35.8131C40.2665 -34.7925 42.7252 -34.9317 44.72 -36.1378C45.3694 -36.5553 46.158 -37.2976 46.5292 -37.8542C47.1322 -38.7356 47.3642 -39.6171 47.3178 -40.6376C47.3178 -41.3335 47.225 -41.751 46.9003 -42.3541C46.3436 -43.4674 45.4158 -44.1633 44.2561 -44.3488C42.818 -44.5344 41.519 -43.7458 41.1943 -42.4932C40.8696 -41.1943 41.7974 -39.9882 43.0963 -40.081C43.7922 -40.1737 44.2561 -40.3593 44.5344 -40.684C44.9519 -41.1015 44.9519 -41.6118 44.5808 -42.0293C44.2097 -42.4005 43.6066 -42.4468 43.2355 -42.1221C43.0499 -41.9829 42.9107 -41.7046 42.8644 -41.4727C42.818 -41.1479 43.0035 -40.7304 43.3283 -40.5449C43.5138 -40.4521 43.5138 -40.4057 43.0963 -40.4057C42.6324 -40.3593 42.2149 -40.4985 41.8902 -40.8232C41.2871 -41.4263 41.2407 -42.4005 41.7974 -43.1427C42.4468 -44.0241 43.653 -44.3024 44.8127 -43.8849C45.7405 -43.5602 46.4828 -42.6324 46.8075 -41.519C46.8539 -41.1943 46.9003 -41.1015 46.9003 -40.5449C46.9003 -39.9418 46.8539 -39.849 46.8075 -39.5243C46.6219 -38.8748 46.2972 -38.3181 45.8333 -37.8542C45.5086 -37.4831 45.0911 -37.2512 44.6736 -37.112C44.3952 -37.0192 44.3024 -36.9728 43.9313 -36.9728C43.3746 -36.9728 43.0963 -37.0192 42.6788 -37.2048C42.0757 -37.4831 41.9366 -37.6223 40.4985 -39.1532C39.1532 -40.5449 37.9934 -41.7974 37.6223 -42.1685L37.3903 -42.4005L37.6687 -42.818C38.3645 -43.8849 39.1995 -44.72 40.081 -45.2766C40.7304 -45.6478 41.4263 -45.9261 42.2149 -46.1117C42.6324 -46.2044 42.7252 -46.2044 43.5138 -46.2044S44.488 -46.2044 45.2302 -46.1117C45.8797 -46.0189 46.158 -45.9725 46.7147 -45.9725C47.457 -45.9725 47.6425 -46.0189 48.06 -46.2508C48.7095 -46.6219 48.7559 -47.457 48.1528 -47.8281C48.0136 -47.9209 47.9209 -47.9209 47.7353 -47.9209C47.5034 -47.9209 47.457 -47.9209 47.2714 -47.8281C46.9003 -47.5961 46.7611 -47.1322 46.9467 -46.7147C47.0395 -46.6219 47.1322 -46.4828 47.225 -46.39L47.3642 -46.2972L47.225 -46.2508C46.9931 -46.2044 45.9261 -46.2972 45.1839 -46.39C44.3024 -46.4828 43.2355 -46.5292 42.7252 -46.4828C41.1479 -46.2972 39.849 -45.6478 38.6893 -44.488C38.2254 -44.0241 37.9006 -43.653 37.4831 -43.0499L37.2048 -42.6324L37.0656 -42.6788C36.8337 -42.818 36.2306 -43.0035 35.8595 -43.0963C35.3956 -43.1891 34.5605 -43.1891 34.0966 -43.0963C32.7049 -42.8644 31.3132 -42.2613 29.6896 -41.1479L29.1793 -40.8232L29.1329 -41.1015C28.901 -42.4005 28.8082 -43.7458 28.9474 -44.6272C29.0865 -45.8797 29.6432 -46.9931 30.4318 -47.5034C30.7566 -47.7353 31.0349 -47.8281 31.4524 -47.8281C32.1019 -47.8745 32.473 -47.7353 32.9369 -47.2714C33.2616 -46.9467 33.4008 -46.7147 33.5864 -46.2508C33.7255 -46.0189 33.7255 -45.9261 33.7255 -45.6941C33.7255 -45.5086 33.7255 -45.4158 33.5864 -45.1839C33.3544 -44.6736 32.7977 -44.3024 32.2874 -44.2561C31.7308 -44.2561 31.4988 -44.488 31.5916 -44.9983V-45.2302L31.638 -45.0911C31.8235 -44.8127 32.241 -44.6736 32.5658 -44.8591C33.2152 -45.1839 32.9833 -46.158 32.241 -46.158C31.7771 -46.158 31.406 -45.6941 31.3132 -45.0447C31.2205 -44.6736 31.2669 -44.488 31.4988 -44.3024C31.9627 -43.8385 32.8905 -43.9777 33.54 -44.5808C33.7719 -44.8127 34.0039 -45.1839 34.0039 -45.3694C34.0039 -45.4622 34.0039 -45.4622 34.143 -45.323C34.9781 -44.5808 36.2306 -44.8127 36.3234 -45.7405C36.3698 -45.9725 36.3234 -46.39 36.1842 -46.6219C35.9059 -47.1786 35.3492 -47.4106 34.9317 -47.0395C34.7461 -46.9003 34.6997 -46.7611 34.6997 -46.5292S34.7461 -46.158 34.9317 -46.0189C35.2564 -45.7405 35.7203 -45.7869 35.9522 -46.158L36.045 -46.2508V-46.0653C36.045 -45.9261 36.045 -45.7869 36.045 -45.7405C35.9986 -45.2766 35.442 -44.9983 34.9317 -45.1375C34.5142 -45.2766 34.1894 -45.6014 33.9575 -46.1117C33.6327 -46.8075 33.4472 -47.1786 33.0297 -47.5497C32.7513 -47.8281 32.4266 -48.0136 32.0555 -48.06C31.7771 -48.1528 31.2669 -48.1528 30.9885 -48.06C29.8288 -47.7817 28.9474 -46.4828 28.669 -44.72C28.5762 -44.3024 28.5762 -42.7252 28.669 -42.1685C28.7154 -41.9366 28.7154 -41.7046 28.7154 -41.7046S28.5298 -42.1221 28.2515 -42.6324S27.6484 -43.7458 27.5557 -43.9777L27.2773 -44.3952L27.602 -44.4416C27.9732 -44.488 28.1123 -44.5344 28.2515 -44.72C28.3907 -44.9519 28.2515 -45.2302 27.8804 -45.6014C27.0918 -46.2972 26.999 -46.4364 26.9526 -46.9467C26.9526 -47.1786 26.9526 -47.225 27.0454 -47.4106C27.1381 -47.5497 27.2309 -47.6425 27.2773 -47.6889C27.602 -47.9209 28.2515 -48.0136 28.5762 -47.8745C28.7154 -47.8281 28.7154 -47.8281 28.6226 -47.7353C28.5298 -47.6889 28.4371 -47.5034 28.4371 -47.4106S28.5762 -47.1322 28.669 -47.0858C28.901 -46.9467 29.1793 -47.0858 29.2721 -47.3178C29.3185 -47.5961 28.9937 -48.06 28.6226 -48.1528C28.3907 -48.1992 27.9268 -48.1992 27.6484 -48.1528ZM26.2567 -45.555C26.4887 -45.2302 26.5815 -44.9983 26.5815 -44.9519S26.5351 -44.72 26.5351 -44.5344C26.4423 -44.1169 26.3959 -43.9777 26.2567 -43.9313C26.164 -43.8849 25.9784 -43.9777 25.8856 -44.0705C25.8392 -44.1633 25.8392 -44.3024 25.932 -44.9519C26.0248 -45.4622 26.0248 -45.8333 25.8856 -46.1117C25.8392 -46.2508 25.932 -46.1117 26.2567 -45.555ZM17.6746 -45.6941C19.623 -45.6014 21.2466 -45.1839 22.963 -44.3488C24.03 -43.8385 24.9114 -43.2819 25.7928 -42.4932C26.5351 -41.8902 27.3701 -41.0088 27.9268 -40.3129L28.1123 -40.0346L27.5557 -39.5707C27.2309 -39.3387 26.9062 -39.1068 26.8598 -39.0604L26.7206 -38.9212L26.6742 -39.014C26.4887 -39.3387 25.8392 -40.081 25.3753 -40.5449C24.4475 -41.519 23.4733 -42.1685 22.36 -42.7252C19.9013 -43.9313 17.3499 -44.0241 14.984 -43.0035C13.9634 -42.5396 13.082 -41.9366 11.0872 -40.4057C10.0202 -39.5707 9.55634 -39.1995 8.99966 -38.8284C7.79352 -38.0862 7.00489 -37.7151 6.0307 -37.5759C5.5668 -37.4831 5.5668 -37.4831 5.61319 -37.7151C6.0307 -39.014 6.77294 -40.4057 7.70074 -41.519C8.02547 -41.8438 8.02547 -41.8438 8.21103 -41.8902C8.62854 -41.9366 9.09244 -42.3541 9.278 -42.8644C9.37078 -43.0963 9.50995 -43.2355 10.1594 -43.653C12.015 -44.9055 14.1026 -45.6014 16.3757 -45.6941C16.654 -45.7405 16.9323 -45.7405 16.9787 -45.7405C16.9787 -45.7405 17.3035 -45.7405 17.6746 -45.6941ZM5.93792 -42.2149L6.77294 -41.9829L6.35543 -41.8438C5.84514 -41.5654 5.33485 -41.3799 4.87095 -41.2871C4.31427 -41.1479 3.57203 -41.1479 3.06174 -41.2871C2.87618 -41.3335 2.64423 -41.4263 2.50506 -41.4727C2.3195 -41.5654 2.3195 -41.5654 2.36589 -41.6582C2.59784 -41.8902 3.15452 -42.1685 3.57203 -42.3077C4.26788 -42.4932 4.77817 -42.4468 5.93792 -42.2149ZM7.51518 -41.8902L7.65435 -41.8438L7.32962 -41.519C6.4946 -40.4521 5.84514 -39.2459 5.42763 -37.9934C5.33485 -37.7151 5.24207 -37.5295 5.24207 -37.4831C5.19568 -37.4831 5.01012 -37.4831 4.77817 -37.5295C4.22149 -37.5759 3.75759 -37.6687 3.2473 -37.947C2.50506 -38.2717 2.04116 -38.782 1.8556 -39.4779C1.71643 -39.849 1.71643 -40.3593 1.8556 -40.7304C1.94838 -41.1015 2.08755 -41.3335 2.18033 -41.2871C2.22672 -41.2871 2.36589 -41.2407 2.55145 -41.1479C3.06174 -40.9624 3.38647 -40.916 3.94315 -40.916C4.77817 -40.916 5.5668 -41.1015 6.58738 -41.6118C7.14406 -41.8902 7.23684 -41.9366 7.51518 -41.8902ZM32.7513 -40.4521C33.6791 -40.3129 34.5142 -39.849 35.2564 -39.1532L35.5811 -38.8748L35.442 -38.4109C35.2564 -37.7615 34.9317 -36.3698 34.7461 -35.5811C34.6997 -35.2564 34.6069 -34.9781 34.6069 -34.9781S34.4678 -34.8389 34.3286 -34.6997C33.8183 -34.3286 33.6327 -34.2358 33.4936 -34.4214C33.2152 -34.6997 33.308 -34.9317 33.8647 -35.3956C34.0503 -35.5811 34.2358 -35.7667 34.2822 -35.8595C34.6069 -36.3234 34.4678 -37.2512 34.0503 -37.5295C33.8647 -37.6687 33.6327 -37.7151 33.2152 -37.7151C32.6122 -37.7151 32.1947 -37.5295 32.0091 -37.1584C31.7771 -36.7409 31.9163 -36.3234 32.3338 -36.277C32.8905 -36.1842 33.1688 -36.9728 32.7049 -37.2048C32.6122 -37.2512 32.5658 -37.2976 32.5658 -37.2976C32.5658 -37.3439 32.8905 -37.3903 33.1688 -37.3903C33.7255 -37.3903 33.9575 -37.2976 34.0966 -37.0192C34.143 -36.9264 34.1894 -36.8337 34.1894 -36.5553C34.1894 -36.0914 34.0966 -35.9986 33.6327 -35.5347C33.0761 -35.0708 32.9369 -34.7925 33.1225 -34.4678C33.2616 -34.1894 33.3544 -34.1894 33.9575 -34.1894H34.4678V-34.0966C34.4678 -34.0503 34.4214 -33.8647 34.375 -33.6327C34.3286 -33.4472 34.3286 -33.2616 34.3286 -33.2616S34.143 -33.2616 33.9575 -33.308C33.7255 -33.3544 33.54 -33.4008 33.54 -33.4008C33.54 -33.3544 33.308 -32.0091 33.308 -31.9627C33.308 -31.9627 33.3544 -31.9627 33.4472 -31.9163C33.7719 -31.8699 33.7719 -31.8699 33.4472 -31.638C33.0761 -31.3596 32.6586 -30.9885 32.3802 -30.7102L32.1947 -30.4782V-31.0813L32.1483 -31.6844H31.7771H31.3596V-32.1483C31.2205 -34.375 30.6638 -36.88 29.6896 -39.3851C29.5968 -39.6634 29.504 -39.9418 29.504 -39.9418C29.4576 -40.0346 30.2927 -40.3129 30.9421 -40.4521C31.406 -40.5449 32.2874 -40.5449 32.7513 -40.4521ZM29.2721 -39.1995C29.3649 -38.8284 29.4576 -38.5501 29.4576 -38.5037C29.504 -38.4573 29.4113 -38.6429 29.2721 -38.8284C29.1329 -39.0604 28.9474 -39.3387 28.901 -39.4315S28.7618 -39.6171 28.7618 -39.6171C28.7154 -39.6634 29.0401 -39.8954 29.0865 -39.849S29.1793 -39.5243 29.2721 -39.1995ZM28.669 -39.1995C29.4113 -38.0398 29.9679 -36.9264 30.2927 -35.8131C30.7102 -34.2822 30.9885 -33.0297 31.0813 -31.9627V-31.6844H30.7102H30.3391V-30.8957V-30.1071H30.7102H31.0813V-29.6432C31.0349 -29.0401 30.9421 -28.1123 30.8957 -27.7412C30.8493 -27.602 30.803 -27.2309 30.7566 -26.999C30.6638 -26.4423 30.5246 -25.7001 30.3391 -25.0042C29.504 -21.9889 28.0659 -19.0663 26.0248 -16.4221L25.7001 -15.9582L25.5609 -16.0973L25.3753 -16.2829L24.8186 -15.7262L24.2156 -15.1695L24.4011 -14.984L24.6331 -14.752L24.5403 -14.6592C24.4475 -14.4737 23.1486 -13.2211 22.6383 -12.7572L22.128 -12.2933L21.6641 -12.7572L21.2466 -13.1748L22.2208 -14.1953C23.195 -15.1231 23.6589 -15.6334 24.262 -16.3757C26.9526 -19.7157 28.6226 -23.4269 29.1793 -27.2773C29.3185 -28.3443 29.3649 -28.7618 29.3649 -30.0607C29.3649 -31.406 29.3185 -31.8699 29.1329 -32.9369C28.8082 -34.9317 28.0196 -37.0192 27.0454 -38.5501L26.9526 -38.6429L27.1845 -38.782C27.4629 -38.9676 28.4371 -39.5243 28.4371 -39.5243C28.4835 -39.5243 28.5762 -39.3851 28.669 -39.1995ZM36.3698 -37.947C36.6017 -37.6687 36.9264 -37.2976 37.0656 -37.112L37.3439 -36.8337L37.112 -36.9264C36.7873 -37.0192 36.5089 -37.0192 36.3234 -36.9264S35.9522 -36.6017 35.8131 -36.3234C35.7203 -36.1378 35.7203 -36.0914 35.7203 -35.8131V-35.4883L35.9986 -34.9317C36.1842 -34.5142 36.2306 -34.3286 36.2306 -34.2358C36.2306 -34.0503 36.1378 -33.9111 35.9986 -33.8647C35.7667 -33.7255 35.6275 -33.8647 35.3028 -34.5605C35.21 -34.7461 35.0708 -34.9317 35.0244 -34.9781L34.9317 -35.0244L35.0708 -35.7667C35.21 -36.4625 35.5811 -37.9006 35.7203 -38.3645C35.7667 -38.5501 35.8131 -38.5965 35.8595 -38.5501C35.8595 -38.5501 36.0914 -38.2717 36.3698 -37.947ZM18.556 -37.5759C19.4838 -37.3903 20.5044 -36.9728 21.3858 -36.3698C24.1228 -34.5142 25.7928 -31.2669 26.164 -27.3237C26.2567 -26.5351 26.2567 -25.0506 26.164 -24.262C25.8392 -20.7363 24.4011 -17.3499 22.0352 -14.5665C21.3394 -13.7778 21.3394 -13.7778 22.0816 -15.3087C23.195 -17.5354 23.8445 -19.1591 24.3084 -20.8755C25.3289 -24.6331 25.1434 -28.2051 23.7053 -30.8957C23.1486 -32.0091 22.5455 -32.7513 21.4786 -33.6791C21.2002 -33.9111 20.9683 -34.143 20.8755 -34.2358C20.7363 -34.4214 20.6435 -34.6533 20.6435 -34.7925C20.6435 -34.8389 20.5972 -34.8853 20.5508 -34.8853C20.3652 -34.9317 20.3188 -34.9317 20.226 -34.6997C20.0869 -34.5142 19.623 -33.9111 19.5302 -33.8647C19.4838 -33.8183 19.3446 -33.9575 19.2055 -34.0966C18.4632 -34.6997 17.6746 -35.1172 16.7932 -35.2564C13.917 -35.7203 11.3192 -33.4472 11.3192 -30.4782C11.3192 -29.8752 11.3192 -29.6896 11.5047 -29.2721C11.5975 -29.1329 11.6903 -28.9937 11.8294 -28.8546L12.015 -28.7154L11.7831 -28.669C11.6903 -28.669 11.4583 -28.669 11.3192 -28.6226C10.2522 -28.5762 9.13883 -28.1587 8.11825 -27.5557C7.93269 -27.4165 7.70074 -27.2773 7.70074 -27.2773C7.65435 -27.2773 7.09767 -28.0196 6.86572 -28.4371C6.58738 -28.9474 6.30904 -29.4576 6.07709 -30.0143C5.89153 -30.4782 5.70597 -30.9885 5.75236 -31.0349C5.75236 -31.0349 5.79875 -30.9421 5.89153 -30.8493C6.16987 -30.3854 6.72655 -29.9679 7.19045 -29.8288C7.51518 -29.6896 8.16464 -29.6896 8.44298 -29.7824C8.90688 -29.8752 9.23161 -30.1999 9.23161 -30.571C9.23161 -31.0813 8.8141 -31.3596 8.39659 -31.2205C7.93269 -31.0349 7.83991 -30.4782 8.21103 -30.1535C8.25742 -30.1071 8.30381 -30.0143 8.30381 -30.0143C8.30381 -29.9679 7.60796 -30.0143 7.4224 -30.0607C6.30904 -30.3391 5.52041 -31.5452 5.28846 -33.3544C5.19568 -33.7719 5.14929 -34.6533 5.19568 -34.6533C5.19568 -34.6533 5.33485 -34.6069 5.52041 -34.5142C7.09767 -33.8647 8.95327 -33.8183 10.5769 -34.4214C11.3192 -34.6997 11.7367 -34.9781 13.1748 -35.8595C13.685 -36.1842 14.2881 -36.5553 14.4737 -36.6945C15.4015 -37.2048 16.2365 -37.5295 17.0715 -37.6223C17.4426 -37.6687 18.1385 -37.6223 18.556 -37.5759ZM16.654 -34.9781C17.5354 -34.8389 18.5096 -34.375 19.0663 -33.7719C19.2518 -33.6327 19.2518 -33.6327 19.1591 -33.54C19.0199 -33.4008 18.2313 -32.7977 17.7674 -32.5194C17.2107 -32.1947 16.0973 -31.5916 15.3551 -31.2669C15.1231 -31.1741 14.8912 -31.0813 14.8912 -31.0349C14.8912 -31.0349 14.8912 -30.9885 14.8912 -30.8957L14.9376 -30.7566L15.2159 -30.803C15.587 -30.803 16.3293 -30.7566 16.7468 -30.6638C17.721 -30.4318 18.7416 -29.9215 19.5302 -29.3185C19.6694 -29.2257 19.9013 -28.9937 20.0869 -28.8082L20.3652 -28.5298L20.2724 -28.2515C20.0869 -27.602 19.5766 -26.767 19.0199 -26.2103L18.7416 -25.8856L18.4632 -26.164C17.1179 -27.4629 15.2159 -28.3443 13.2211 -28.6226C12.9892 -28.6226 12.8036 -28.669 12.8036 -28.669S12.8036 -28.7154 12.85 -28.7154S13.1748 -28.9474 13.2675 -29.1329S13.3603 -29.6896 13.2675 -29.8752S12.9428 -30.2463 12.7572 -30.2927C12.6181 -30.3854 12.2933 -30.3854 12.1078 -30.2927C11.9686 -30.2463 11.7367 -30.0143 11.6439 -29.8752C11.5975 -29.7824 11.5511 -30.2927 11.5975 -30.7102C11.7367 -32.4266 12.7572 -33.9575 14.2417 -34.6533L14.5201 -34.7461L14.4737 -34.6069C14.1953 -34.0503 14.5665 -33.4472 15.1695 -33.4472C15.6334 -33.4472 15.9582 -33.7719 15.9582 -34.2358C15.9582 -34.5142 15.8654 -34.6997 15.6334 -34.8853C15.4943 -34.9781 15.4943 -34.9781 15.5406 -34.9781C15.7262 -35.0244 16.3757 -35.0244 16.654 -34.9781ZM44.1169 -34.5142C45.0447 -34.3286 45.8333 -33.6791 46.0653 -32.8441C46.158 -32.5658 46.2044 -31.9627 46.158 -31.6844C45.9725 -30.8493 45.2766 -30.2463 44.4416 -30.2463C44.2097 -30.2463 43.7922 -30.2927 43.9313 -30.3391C44.0705 -30.3391 44.3488 -30.6174 44.3952 -30.7566C44.6272 -31.3596 44.2097 -31.9627 43.6066 -31.9627C43.1891 -31.9627 42.8644 -31.638 42.7716 -31.2205L42.7252 -31.0349L42.4468 -31.2669C41.9829 -31.5916 41.1015 -32.1019 40.6376 -32.2874C40.5449 -32.3338 40.4985 -32.3802 40.4985 -32.3802C40.4985 -32.4266 40.5449 -32.5194 40.5912 -32.6586C41.1943 -34.0039 42.7252 -34.8389 44.1169 -34.5142ZM38.1326 -32.7049C38.3645 -32.7049 38.5501 -32.6586 38.5501 -32.6586C38.5965 -32.6122 38.5037 -32.473 38.3645 -32.2874C37.5759 -31.2669 37.112 -30.0607 36.9264 -28.669C36.88 -28.4371 36.88 -28.1587 36.88 -28.0659V-27.834H36.3234C35.9059 -27.834 35.6739 -27.834 35.4883 -27.7876C34.4678 -27.5557 33.7255 -26.9062 33.4936 -25.932C33.4008 -25.6537 33.4008 -25.0506 33.4472 -24.7723C33.6791 -23.9836 34.2358 -23.4269 34.8853 -23.3342C35.6739 -23.195 36.3234 -23.6125 36.3234 -24.1692C36.3234 -24.3547 36.1842 -24.5867 36.045 -24.6331C35.8131 -24.8186 35.5347 -24.7723 35.3028 -24.5867C35.0708 -24.3084 35.1172 -23.9836 35.3492 -23.7517L35.4883 -23.6125H35.3028C35.21 -23.5661 35.0244 -23.5661 34.9317 -23.6125C33.6791 -23.7981 33.2152 -25.6073 34.143 -26.767C34.6533 -27.3237 35.5347 -27.6484 36.5089 -27.5557L36.8337 -27.5093V-27.3701C36.9264 -26.2103 37.1584 -25.2362 37.6223 -24.1228C37.9006 -23.5197 38.2717 -22.8239 38.9676 -21.525C39.2923 -21.0147 39.5243 -20.5044 39.5243 -20.5044C39.5243 -20.4116 38.8748 -19.7621 38.5501 -19.5302C38.0862 -19.2518 37.4367 -18.9735 37.0192 -18.8807H36.9264L36.88 -19.391C36.88 -20.0405 36.7873 -20.3652 36.5553 -20.8291C36.1842 -21.6177 35.5347 -22.1744 34.7925 -22.4528C34.375 -22.5919 33.9111 -22.6383 33.6327 -22.4991C33.4008 -22.4064 33.1688 -22.1744 33.1688 -21.9889C33.0761 -21.6641 33.2152 -21.1074 33.4472 -20.8291C33.6791 -20.5044 34.0966 -20.3652 34.4214 -20.5508C34.8853 -20.7363 34.9317 -21.4322 34.5142 -21.7105C34.1894 -21.8961 33.7719 -21.8497 33.54 -21.5713C33.4472 -21.3858 33.4472 -21.4322 33.4472 -21.7569C33.4472 -22.128 33.5864 -22.3136 34.0039 -22.3136C34.4678 -22.36 35.1636 -22.0352 35.6739 -21.4786C36.1378 -21.0147 36.4161 -20.5044 36.5553 -19.9013C36.6017 -19.623 36.6481 -18.8807 36.6017 -18.7879C36.6017 -18.7879 36.277 -18.7879 35.9522 -18.7879C35.2564 -18.7879 34.9781 -18.8343 34.4678 -19.0663C33.4936 -19.4838 32.5658 -20.4116 31.9627 -21.5713L31.7308 -21.9889L31.9163 -22.4991C32.9369 -25.0506 33.7255 -27.9268 34.2822 -31.1741C34.3286 -31.4524 34.375 -31.7308 34.375 -31.7308S34.5142 -31.7308 34.6997 -31.6844S35.0708 -31.638 35.1172 -31.638C35.1172 -31.638 35.1636 -31.8235 35.21 -32.0091L35.2564 -32.3802L35.5811 -32.473C36.4161 -32.7049 37.2512 -32.7977 38.1326 -32.7049ZM40.8232 -31.9163C41.6582 -31.5452 42.5396 -30.9421 42.9571 -30.571C43.0499 -30.4318 43.2355 -30.2927 43.3283 -30.2463C43.5602 -30.0607 44.3024 -29.3185 44.6736 -28.8546C45.2302 -28.1587 45.6478 -27.5093 46.0189 -26.7206L46.2972 -26.2567H46.158C45.9261 -26.3031 45.8333 -26.2103 45.6941 -25.7001S45.4622 -25.0506 45.323 -25.0042C45.2302 -24.9114 45.0447 -24.9578 44.9055 -25.1434C44.7663 -25.2825 44.7663 -25.5145 44.9055 -25.932C45.0447 -26.4423 44.9983 -26.5815 44.8591 -26.8598C44.6272 -27.3237 44.2561 -27.602 43.9777 -27.602C43.7922 -27.602 43.421 -27.4165 43.1891 -27.1845C42.818 -26.8598 42.7252 -26.4423 42.9107 -26.0712C43.0499 -25.7464 43.3746 -25.6537 43.653 -25.7928C44.1169 -26.0712 43.9313 -26.8134 43.3746 -26.767C43.2819 -26.767 43.2355 -26.767 43.2355 -26.767C43.2355 -26.8598 43.5138 -27.0918 43.6994 -27.2309C44.0705 -27.4165 44.2561 -27.3237 44.5344 -26.8598C44.7663 -26.5351 44.7663 -26.3959 44.6272 -25.932C44.5344 -25.4681 44.5344 -25.2362 44.6272 -25.0042C44.72 -24.865 44.9519 -24.7259 45.0911 -24.7259S45.555 -24.865 45.8797 -25.1434C46.158 -25.3753 46.4828 -25.5609 46.5756 -25.5609C46.5756 -25.5609 46.6219 -25.5145 46.6219 -25.5145C47.3642 -23.6589 47.6425 -22.2208 47.7817 -20.2724C47.8745 -18.6488 47.6889 -16.654 47.3178 -15.0304C47.225 -14.6592 47.225 -14.6592 47.1322 -14.6592C46.6683 -14.6592 46.2508 -14.1953 46.3436 -13.7314C46.39 -13.5459 46.5292 -13.3139 46.6219 -13.2211L46.7147 -13.1284L46.6219 -12.8036C46.2508 -12.015 45.7405 -11.0408 45.1839 -10.2058C43.3283 -7.4224 40.6376 -5.1029 37.3439 -3.34008L36.7873 -3.06174L36.6945 -3.10813C36.6017 -3.2473 36.3698 -3.34008 36.2306 -3.34008C36.045 -3.34008 35.8595 -3.2473 35.7667 -3.15452C35.5811 -3.01535 35.5347 -2.92257 35.5347 -2.69062L35.4883 -2.50506L35.21 -2.36589C34.2822 -1.99477 32.8441 -1.57726 31.8699 -1.3917C28.9937 -0.88141 26.2103 -1.25253 23.6589 -2.50506C21.2466 -3.7112 19.2055 -5.65958 17.8138 -8.11825C17.6746 -8.39659 17.489 -8.62854 17.4426 -8.72132L17.3962 -8.8141L17.721 -8.99966L18.0921 -9.13883L18.1849 -9.04605C18.2313 -8.95327 18.556 -8.58215 18.8807 -8.21103C20.1796 -6.68016 20.7827 -6.07709 21.4786 -5.5668C24.4475 -3.34008 28.3443 -2.69062 32.5658 -3.7112C35.3492 -4.40705 37.947 -5.75236 40.1737 -7.60796C40.7304 -8.02547 41.9366 -9.278 42.3541 -9.78829C43.5138 -11.1336 44.3488 -12.6181 44.8127 -14.1026C45.6941 -16.7932 45.5086 -19.4374 44.2561 -21.8961C43.9313 -22.5919 43.6066 -23.0558 42.7716 -24.4011C41.8902 -25.7464 41.7046 -25.9784 41.3799 -26.6279C40.4521 -28.2515 40.081 -29.6896 40.1737 -31.0813C40.2201 -31.5452 40.3593 -32.1483 40.4057 -32.1483C40.4057 -32.1483 40.6376 -32.0555 40.8232 -31.9163ZM33.9575 -31.1277C33.4472 -28.0659 32.6586 -25.1434 31.7308 -22.7775L31.5452 -22.36L31.4524 -22.6383C31.1277 -23.6589 30.9885 -24.5403 30.9421 -25.7001C30.9421 -26.3959 30.9885 -26.4887 31.0813 -27.1381C31.2205 -28.0659 31.2669 -28.2979 31.4524 -28.7618C31.8235 -29.6896 32.3802 -30.4782 33.1225 -31.1277C33.4008 -31.3596 34.0503 -31.8235 34.0503 -31.7771C34.0966 -31.7771 34.0503 -31.4988 33.9575 -31.1277ZM31.8235 -29.9215C31.7308 -29.8288 31.5916 -29.6432 31.4988 -29.4576L31.3132 -29.1329L31.3596 -29.3649C31.3596 -29.504 31.3596 -29.736 31.3596 -29.8752V-30.1071H31.638H31.9163ZM12.6645 -28.3907C13.8242 -28.2979 14.8912 -28.0196 16.0045 -27.4629C16.8396 -27.0454 17.6282 -26.5351 18.2313 -25.9784L18.5096 -25.7001L18.4168 -25.6073C18.1385 -25.4217 17.489 -25.0042 17.1179 -24.8186C16.5148 -24.4939 15.8654 -24.3084 15.1695 -24.2156L14.8912 -24.1692L15.0304 -24.3084C15.3087 -24.6331 15.2623 -25.1434 14.8912 -25.3753S14.1026 -25.4681 13.917 -25.097C13.7778 -24.865 13.8706 -24.4475 14.1489 -24.262L14.2417 -24.1692L14.0562 -24.1228C13.7314 -24.0764 12.85 -24.1692 12.1542 -24.3547C11.0408 -24.6331 9.97385 -25.1898 8.99966 -25.932C8.67493 -26.2103 7.93269 -26.9526 7.93269 -26.999C7.93269 -27.0918 8.39659 -27.4165 8.86049 -27.6484C9.83468 -28.1123 10.7161 -28.3443 12.015 -28.3907C12.0614 -28.3907 12.3861 -28.3907 12.6645 -28.3907ZM20.8291 -27.9268C21.8497 -26.5815 22.4528 -24.9114 22.7311 -22.9167C22.8239 -22.2208 22.8239 -20.7363 22.7311 -19.9941C22.4991 -18.1849 22.0352 -16.4684 21.2466 -14.6128C20.8291 -13.685 20.7827 -13.5459 20.7363 -13.5923C20.7363 -13.5923 20.5508 -13.7314 20.4116 -13.8242C20.226 -13.9634 19.9013 -14.1489 19.6694 -14.2881S19.2518 -14.5665 19.2518 -14.5665S19.391 -14.752 19.5302 -14.984C19.8549 -15.5406 20.4116 -16.7004 20.5972 -17.1643C21.4322 -19.4374 21.3394 -21.5713 20.3188 -23.6589C20.0405 -24.262 19.6694 -24.8186 19.2518 -25.3289L18.9271 -25.7001L19.2055 -25.9784C19.5302 -26.3495 19.8549 -26.7206 20.0869 -27.1381C20.2724 -27.4629 20.5044 -27.9268 20.5508 -28.1123C20.5508 -28.2051 20.5972 -28.2051 20.5972 -28.2051S20.7363 -28.1123 20.8291 -27.9268ZM8.86049 -25.7001C10.5769 -24.3084 12.7109 -23.6589 14.752 -23.8445C16.1437 -23.9836 17.5818 -24.5867 18.5096 -25.3289C18.6024 -25.4217 18.6952 -25.4681 18.6952 -25.4681C18.7879 -25.4681 19.391 -24.6795 19.7157 -24.2156C20.8291 -22.4064 21.1538 -20.3652 20.6435 -18.324C20.458 -17.6282 20.2724 -17.0251 19.9013 -16.2829L19.7157 -15.8654L19.0663 -16.1901C17.8138 -16.7932 16.886 -17.1179 15.819 -17.3962C13.4531 -17.9529 11.1336 -17.7674 8.95327 -16.7932C8.58215 -16.6076 7.83991 -16.2365 7.51518 -16.0045C7.46879 -15.9582 7.4224 -15.9582 7.4224 -15.9582C7.37601 -16.0509 7.28323 -16.886 7.32962 -17.2107C7.32962 -17.5354 7.46879 -18.0921 7.51518 -18.1385C7.51518 -18.1849 7.60796 -18.1385 7.70074 -18.1385C8.76771 -17.7674 9.97385 -18.0457 10.8089 -18.7879C11.4119 -19.2982 11.7367 -19.9941 11.8294 -20.8291C11.8294 -21.0147 11.8758 -21.1538 11.8758 -21.2002C11.9222 -21.2002 12.6181 -21.3394 13.0356 -21.3858C14.1953 -21.4786 15.4015 -21.293 16.2365 -20.8291C16.9787 -20.458 17.4426 -19.9013 17.6282 -19.2055C17.6746 -18.9271 17.721 -18.4168 17.6282 -18.2777C17.6282 -18.2313 17.6282 -18.2313 17.5818 -18.324S17.3499 -18.556 17.1643 -18.6024C16.6076 -18.7416 16.1437 -18.1849 16.3757 -17.6746C16.4684 -17.4426 16.7468 -17.2571 17.0251 -17.2571C17.1643 -17.2571 17.3962 -17.3499 17.5354 -17.489C17.9529 -17.9065 18.0921 -18.6952 17.8601 -19.623C17.721 -20.0405 17.4426 -20.6435 17.1643 -21.0147C16.4684 -21.9425 15.3087 -22.6383 14.0098 -22.8239C13.3139 -22.963 12.2933 -22.9167 11.6439 -22.7775L11.4583 -22.7311L11.3192 -22.9167C11.1336 -23.195 10.6697 -23.5661 10.3914 -23.7517C10.0202 -23.9836 9.64912 -24.0764 9.18522 -24.1228C8.76771 -24.1228 8.58215 -24.0764 8.25742 -23.9836C8.02547 -23.8908 7.74713 -23.6589 7.65435 -23.4733C7.37601 -22.963 7.70074 -22.36 8.30381 -22.36C8.67493 -22.36 9.04605 -22.6847 9.04605 -23.1022C9.04605 -23.3342 8.90688 -23.5661 8.67493 -23.7053L8.58215 -23.7981H8.72132C9.18522 -23.8908 9.83468 -23.7517 10.2522 -23.4733C10.5305 -23.3342 10.8553 -23.0094 11.0408 -22.7775L11.1336 -22.6383L11.0408 -22.5919C10.948 -22.5455 10.8553 -22.4991 10.8089 -22.4991S10.5305 -22.4064 10.345 -22.2672C8.95327 -21.5713 7.83991 -20.3652 7.37601 -18.9735C7.32962 -18.7879 7.23684 -18.6488 7.23684 -18.6488S6.86572 -18.8807 6.63377 -19.0663C6.21626 -19.4838 5.70597 -20.3188 5.52041 -20.9219C5.24207 -21.9889 5.28846 -23.1486 5.70597 -24.2156C5.84514 -24.4939 5.93792 -24.6795 6.21626 -25.0506C6.77294 -25.8392 7.05128 -26.164 7.37601 -26.4887L7.65435 -26.8134L8.11825 -26.3495C8.3502 -26.1176 8.67493 -25.8392 8.86049 -25.7001ZM30.7566 -24.5867C30.8493 -23.7517 30.9885 -23.1022 31.2669 -22.36L31.406 -21.9889L31.2669 -21.6641C30.3391 -19.4838 29.1329 -17.489 27.834 -15.819C27.3701 -15.2623 26.8598 -14.7056 26.8598 -14.7056C26.8598 -14.752 26.6279 -14.984 26.3495 -15.2623C25.9784 -15.6798 25.8856 -15.7726 25.932 -15.819C25.932 -15.819 26.164 -16.1437 26.3959 -16.4684C28.2979 -18.9271 29.7824 -21.8961 30.5246 -24.7259C30.6174 -24.9578 30.6638 -25.1434 30.6638 -25.097C30.6638 -25.097 30.7102 -24.865 30.7566 -24.5867ZM32.1483 -20.6435C32.4266 -20.226 33.0297 -19.623 33.4472 -19.2982C33.5864 -19.2055 33.9111 -19.0199 34.0966 -18.9271C34.7925 -18.556 35.3028 -18.4632 36.0914 -18.4632C36.4161 -18.5096 36.5553 -18.4632 36.5553 -18.4632C36.4625 -18.1385 36.3698 -17.8601 36.2306 -17.6282C36.0914 -17.3499 35.7667 -16.886 35.5811 -16.7004L35.442 -16.6076L35.1636 -16.7932C33.9111 -17.6282 32.2874 -17.9065 30.8493 -17.6282C30.2463 -17.489 29.5504 -17.2107 29.0865 -16.9323L28.901 -16.7932L29.1329 -17.1179C29.7824 -18.0921 30.3854 -19.1591 30.9421 -20.3188C31.1741 -20.7363 31.406 -21.2466 31.4524 -21.3858L31.5452 -21.6177L31.7771 -21.2466C31.8699 -21.0611 32.0555 -20.7827 32.1483 -20.6435ZM11.5511 -20.9219C11.4583 -19.7157 10.7161 -18.7879 9.60273 -18.4168C9.278 -18.2777 9.23161 -18.2777 8.72132 -18.2777C8.25742 -18.2777 8.16464 -18.2777 7.93269 -18.3704C7.74713 -18.4168 7.65435 -18.4632 7.65435 -18.4632S7.74713 -18.6488 7.83991 -18.8343C8.44298 -19.7621 9.60273 -20.5044 11.0872 -20.9683C11.3192 -21.0611 11.5047 -21.1074 11.5047 -21.1074C11.5511 -21.1074 11.5511 -21.0611 11.5511 -20.9219ZM40.0346 -19.623C40.7304 -18.1849 41.1015 -16.9787 41.2871 -15.4479C41.3799 -14.8912 41.3799 -13.3139 41.3335 -12.7109C40.9624 -9.78829 39.5243 -7.4224 37.2048 -6.07709C34.7461 -4.54622 31.5916 -4.49983 28.669 -5.93792C27.4165 -6.54099 26.4887 -7.23684 25.4681 -8.21103C24.865 -8.76771 24.4475 -9.278 23.7981 -10.1594L23.2414 -10.8553L23.6125 -11.1336C24.9114 -12.015 25.7928 -12.5253 26.4423 -12.6181C26.9526 -12.7109 27.2773 -12.5253 27.4165 -12.1078C27.5093 -11.9222 27.5557 -11.4583 27.5093 -11.2728V-11.1336L27.4165 -11.2264C27.1845 -11.5047 26.7206 -11.5047 26.5351 -11.18C26.3495 -10.8089 26.6279 -10.3914 27.0454 -10.3914C27.5093 -10.3914 27.8804 -10.9016 27.834 -11.5975C27.7876 -12.1542 27.6484 -12.4789 27.3237 -12.6645C27.1845 -12.7109 27.0918 -12.7572 26.8598 -12.7572C26.3031 -12.8036 25.7464 -12.6181 24.8186 -12.1078C24.5867 -12.015 24.4011 -11.8758 24.4011 -11.9222C24.8186 -12.247 25.2362 -12.6645 25.5609 -12.9428C25.7464 -13.1284 25.932 -13.3139 25.932 -13.3139C25.9784 -13.3139 26.0248 -13.2211 26.1176 -13.1748C26.164 -13.082 26.2103 -13.0356 26.2567 -13.0356S27.4165 -14.1026 27.4165 -14.1026S27.3237 -14.1953 27.2309 -14.3345L27.0454 -14.5201L27.2773 -14.752C27.4165 -14.8912 27.6948 -15.2159 27.8804 -15.4479C28.2515 -15.9118 28.6226 -16.2365 29.0401 -16.5612C30.4782 -17.489 32.241 -17.721 33.8647 -17.1179C34.375 -16.9323 35.21 -16.4684 35.21 -16.3757C35.21 -16.3293 34.7925 -16.0045 34.4678 -15.819C33.5864 -15.3551 32.7049 -15.1231 31.4988 -15.0304C31.0813 -15.0304 30.8493 -14.984 30.6638 -14.9376C29.3185 -14.4737 28.5298 -12.7572 28.901 -11.0408C29.0865 -10.0666 29.504 -9.278 30.1999 -8.58215C30.571 -8.21103 31.0349 -7.8863 31.4988 -7.65435L31.7771 -7.56157L31.5452 -7.32962C31.1741 -7.00489 30.9885 -6.58738 31.0349 -6.12348C31.0349 -5.79875 31.0813 -5.5668 31.2669 -5.33485C31.406 -5.14929 31.5916 -5.05651 31.8235 -5.05651C32.4266 -5.05651 32.5658 -5.84514 32.0091 -6.07709C31.8699 -6.12348 31.8235 -6.12348 31.6844 -6.07709C31.5916 -6.07709 31.4988 -5.98431 31.4524 -5.93792S31.3132 -5.84514 31.3132 -5.84514S31.3132 -5.98431 31.3132 -6.12348C31.3132 -6.54099 31.4988 -6.9585 31.8235 -7.19045C32.0555 -7.4224 32.1019 -7.4224 32.4266 -7.37601C32.8441 -7.28323 33.54 -7.28323 33.9575 -7.32962C36.277 -7.74713 37.9006 -10.113 37.6687 -12.6181C37.5295 -13.9634 36.9264 -15.1695 35.9986 -16.0973L35.6739 -16.4221L35.8595 -16.6076C36.277 -17.0715 36.6481 -17.7674 36.7873 -18.324C36.8337 -18.5096 36.8337 -18.556 36.9264 -18.556C37.9934 -18.7879 38.9676 -19.3446 39.5243 -19.9941C39.6171 -20.0869 39.7098 -20.1796 39.7098 -20.1796C39.7562 -20.1796 39.849 -19.9013 40.0346 -19.623ZM14.2417 -17.3499C15.7726 -17.2107 17.1643 -16.7932 18.8807 -15.9582L19.5766 -15.6334L19.391 -15.3551C19.0199 -14.752 19.0199 -14.6592 18.9735 -14.7056C18.9271 -14.7056 18.6952 -14.7984 18.4168 -14.9376C15.1231 -16.3293 11.2264 -15.9118 8.48937 -13.917C8.3502 -13.8242 8.21103 -13.7314 8.21103 -13.7314C8.16464 -13.7314 7.8863 -14.3809 7.74713 -14.7056C7.70074 -14.8448 7.60796 -15.1231 7.56157 -15.3087L7.46879 -15.6334L7.74713 -15.819C9.09244 -16.7004 10.8089 -17.2571 12.4325 -17.3962C12.8964 -17.4426 13.8242 -17.4426 14.2417 -17.3499ZM35.8595 -15.8654C36.6017 -15.0767 37.0656 -14.1953 37.2976 -13.1284C37.4367 -12.5717 37.4367 -11.6903 37.2976 -11.1336C37.112 -10.1594 36.6945 -9.41717 36.045 -8.76771C35.5347 -8.25742 34.8853 -7.8863 34.2358 -7.70074C33.7719 -7.60796 33.5864 -7.56157 33.4008 -7.65435C33.0761 -7.79352 32.7513 -7.83991 32.4266 -7.79352S32.1019 -7.74713 31.8699 -7.83991C30.6638 -8.30381 29.6896 -9.32439 29.3185 -10.6233C28.9937 -11.6439 29.0401 -12.6645 29.4576 -13.4995C29.736 -13.9634 30.1071 -14.3809 30.5246 -14.5665C30.8493 -14.7056 31.0813 -14.752 31.5452 -14.752C32.8441 -14.752 33.7719 -14.3345 34.0503 -13.685C34.0966 -13.4995 34.143 -13.4067 34.0966 -13.2211C34.0966 -12.8964 34.0503 -12.7572 33.8647 -12.5717C33.54 -12.2933 33.2616 -12.2933 32.6586 -12.6181C32.241 -12.8036 32.1947 -12.8036 31.9627 -12.8036C31.4988 -12.8036 31.1741 -12.6181 30.8957 -12.247C30.7102 -11.9222 30.6174 -11.5975 30.6174 -11.18C30.6174 -10.6697 30.803 -10.1594 31.1277 -9.69551L31.3132 -9.46356L31.406 -9.55634L31.4988 -9.64912L31.3596 -9.88107C31.1741 -10.2058 31.0813 -10.345 31.1277 -10.5769S31.406 -11.0872 31.638 -11.1336C31.9627 -11.2264 32.1483 -11.18 32.7513 -10.8553L33.3544 -10.5305H33.6791C33.9111 -10.5305 34.0039 -10.5769 34.143 -10.6233C34.6533 -10.8553 34.9317 -11.3655 34.9317 -12.0614S34.6069 -13.4067 34.0503 -13.9634C33.7255 -14.2881 33.4008 -14.4737 32.9833 -14.7056L32.6122 -14.8912L32.8441 -14.9376C33.6327 -15.0767 34.6533 -15.5406 35.2564 -16.0509C35.3492 -16.1437 35.442 -16.1901 35.4883 -16.1901C35.4883 -16.1901 35.6739 -16.0509 35.8595 -15.8654ZM7.28323 -15.1695C7.37601 -14.7984 7.56157 -14.3345 7.79352 -13.917L7.97908 -13.5459L7.60796 -13.2211C6.54099 -12.2006 5.84514 -10.948 5.5668 -9.50995C5.47402 -9.09244 5.47402 -8.99966 5.47402 -8.25742C5.42763 -7.60796 5.47402 -7.4224 5.52041 -7.14406C5.70597 -6.21626 6.0307 -5.5668 6.54099 -4.87095L6.77294 -4.54622V-4.08232C6.77294 -3.34008 6.63377 -2.73701 6.35543 -2.04116L6.26265 -1.76282L6.12348 -1.90199C5.19568 -2.55145 4.40705 -3.61842 3.89676 -4.82456C3.20091 -6.4946 3.15452 -8.58215 3.7112 -10.5305C4.1751 -11.9686 5.01012 -13.3603 6.07709 -14.4737C6.4946 -14.8912 7.19045 -15.4479 7.19045 -15.4015C7.23684 -15.4015 7.23684 -15.2623 7.28323 -15.1695ZM25.2825 -14.0098L25.7464 -13.5459L25.5609 -13.3603C25.1898 -12.9892 23.6589 -11.6439 23.195 -11.2728L23.0558 -11.1336L22.6847 -11.5975L22.3136 -12.0614L22.7775 -12.4789C23.0558 -12.7109 23.6125 -13.2675 24.03 -13.685C24.4475 -14.1489 24.8186 -14.4737 24.865 -14.4737C24.865 -14.4737 25.0506 -14.2881 25.2825 -14.0098ZM11.6903 -13.3603C12.5253 -13.3139 13.2675 -13.082 14.0562 -12.7109S15.4943 -11.8294 16.3757 -11.0408L16.7932 -10.6697L16.7004 -10.6233C16.6076 -10.5769 16.4684 -10.5305 16.3293 -10.4841L16.0509 -10.4377L15.7262 -10.7625C14.8448 -11.4583 13.8242 -11.9686 12.7572 -12.247C12.3861 -12.3397 11.8294 -12.3861 11.2728 -12.3861C10.6697 -12.3861 10.345 -12.3861 9.83468 -12.247L9.46356 -12.1542L9.37078 -12.247C9.23161 -12.3861 8.8141 -12.85 8.8141 -12.8964S9.37078 -13.1284 9.83468 -13.2675C10.4841 -13.4067 11.0408 -13.4531 11.6903 -13.3603ZM8.95327 -12.2933C9.04605 -12.1542 9.13883 -12.015 9.13883 -12.015C9.09244 -12.015 8.95327 -11.9222 8.8141 -11.8758C7.74713 -11.3192 7.05128 -10.5305 6.81933 -9.50995C6.77294 -9.278 6.77294 -9.13883 6.77294 -8.76771C6.77294 -8.48937 6.81933 -8.25742 6.86572 -8.16464C6.91211 -8.02547 6.91211 -7.97908 6.81933 -7.65435C6.77294 -7.37601 6.72655 -6.68016 6.68016 -6.21626V-6.0307L6.4946 -6.26265C6.12348 -6.72655 5.84514 -7.37601 5.75236 -7.97908C5.65958 -8.62854 5.75236 -9.55634 6.0307 -10.2058C6.40182 -11.18 7.19045 -12.0614 8.21103 -12.6181L8.48937 -12.8036L8.58215 -12.6645C8.62854 -12.5717 8.8141 -12.4325 8.95327 -12.2933ZM12.4789 -12.015C13.3139 -11.8294 14.1026 -11.5047 14.7984 -11.0408C15.1695 -10.8089 15.6334 -10.4377 15.6334 -10.3914S14.9376 -10.2522 14.3345 -10.2522C13.1748 -10.2522 12.0614 -10.5305 11.0408 -11.0408C10.7161 -11.2264 10.0202 -11.6439 9.83468 -11.8294L9.7419 -11.9222L9.97385 -11.9686C10.5305 -12.1078 10.6697 -12.1078 11.4119 -12.1078C11.9686 -12.1078 12.2006 -12.0614 12.4789 -12.015ZM9.64912 -11.5975C10.345 -11.0408 11.4583 -10.4841 12.4325 -10.2058C13.4531 -9.92746 14.6592 -9.88107 15.6798 -10.0666L15.9582 -10.113L16.0509 -10.0202C16.1901 -9.92746 16.6076 -9.41717 16.7932 -9.13883L16.9323 -8.95327L16.7932 -8.90688C16.1437 -8.62854 15.2159 -8.44298 14.5201 -8.39659C14.1489 -8.39659 14.1026 -8.39659 14.1026 -8.30381C14.1026 -8.25742 14.0562 -8.25742 13.8242 -8.25742C12.8964 -8.16464 12.1542 -7.70074 11.0872 -6.58738C10.5305 -5.98431 10.0202 -5.52041 9.7419 -5.38124C9.41717 -5.24207 8.99966 -5.14929 8.67493 -5.14929C8.11825 -5.14929 7.65435 -5.28846 7.19045 -5.61319L6.9585 -5.75236V-6.0307C6.91211 -6.44821 7.00489 -7.65435 7.05128 -7.65435C7.05128 -7.65435 7.09767 -7.56157 7.19045 -7.46879C7.28323 -7.28323 7.56157 -7.05128 7.79352 -6.91211C8.48937 -6.4946 9.37078 -6.68016 9.83468 -7.37601C10.345 -8.11825 10.113 -9.18522 9.32439 -9.60273C8.48937 -10.0202 7.65435 -9.7419 7.19045 -8.8141L7.05128 -8.53576V-8.86049C7.05128 -9.88107 7.60796 -10.7625 8.58215 -11.4119C8.86049 -11.5975 9.278 -11.7831 9.37078 -11.7831C9.41717 -11.7831 9.55634 -11.6903 9.64912 -11.5975ZM17.4426 -9.88107L17.9065 -9.37078L17.6282 -9.278C17.2107 -9.04605 17.2571 -9.04605 16.9787 -9.41717C16.8396 -9.55634 16.654 -9.83468 16.5148 -9.97385L16.2829 -10.2058L16.5148 -10.2522C16.6076 -10.2986 16.7468 -10.345 16.7932 -10.345S16.9323 -10.3914 16.9787 -10.3914S17.2107 -10.1594 17.4426 -9.88107ZM8.07186 -9.32439C7.79352 -9.04605 7.79352 -8.67493 8.07186 -8.39659C8.30381 -8.21103 8.62854 -8.21103 8.86049 -8.44298S9.09244 -8.99966 8.86049 -9.23161L8.72132 -9.41717H8.86049C9.04605 -9.46356 9.278 -9.32439 9.50995 -9.09244C9.7419 -8.8141 9.83468 -8.67493 9.83468 -8.21103C9.83468 -7.8863 9.83468 -7.83991 9.69551 -7.65435C9.46356 -7.23684 9.13883 -7.00489 8.67493 -7.00489C8.30381 -6.9585 8.07186 -7.05128 7.79352 -7.23684C7.60796 -7.37601 7.32962 -7.74713 7.23684 -7.97908C7.14406 -8.11825 7.14406 -8.16464 7.23684 -8.3502C7.37601 -8.8141 7.70074 -9.23161 7.97908 -9.41717C8.16464 -9.50995 8.21103 -9.50995 8.07186 -9.32439ZM7.79352 -3.75759C9.09244 -2.92257 10.8089 -2.96896 12.0614 -3.85037L12.247 -3.94315L12.2933 -3.80398C12.3397 -3.75759 12.3397 -3.52564 12.3397 -3.34008C12.3861 -2.73701 12.1542 -2.27311 11.6439 -1.76282C10.948 -1.11336 10.113 -0.83502 8.99966 -0.88141C8.16464 -0.9278 7.65435 -1.06697 6.91211 -1.3917L6.54099 -1.57726L6.63377 -1.80921C6.91211 -2.36589 7.09767 -3.20091 7.09767 -3.85037V-4.22149L7.32962 -4.03593C7.46879 -3.94315 7.70074 -3.80398 7.79352 -3.75759ZM46.2972 -3.94315C46.5756 -3.47925 46.7611 -2.82979 46.7147 -2.27311C46.6683 -1.34531 46.0653 -0.55668 45.1839 -0.23195C44.8591 -0.09278 44.2561 -0.09278 43.9313 -0.18556S43.0499 -0.55668 42.586 -0.88141C42.1685 -1.15975 42.1685 -1.15975 42.0293 -1.3917S41.8902 -1.67004 41.8902 -2.04116C41.8902 -2.36589 41.8902 -2.41228 42.0293 -2.64423C42.3077 -3.2473 42.7716 -3.57203 43.4674 -3.57203C43.8849 -3.57203 43.8849 -3.52564 43.7458 -3.38647C43.5602 -3.29369 43.421 -2.96896 43.421 -2.7834C43.421 -2.55145 43.4674 -2.36589 43.653 -2.22672C43.9313 -1.94838 44.2097 -1.90199 44.5808 -2.04116C45.1375 -2.36589 45.1375 -3.20091 44.5344 -3.57203L44.3952 -3.61842L44.72 -3.7112C45.0911 -3.75759 45.555 -3.94315 45.8333 -4.03593C45.9725 -4.12871 46.0653 -4.1751 46.1117 -4.1751S46.2508 -4.03593 46.2972 -3.94315ZM19.6694 -3.06174C18.9271 -2.73701 19.1591 -1.62365 19.9477 -1.62365C20.3652 -1.62365 20.6899 -1.99477 20.7363 -2.36589C20.7363 -2.50506 20.5972 -2.7834 20.5044 -2.87618C20.3188 -3.10813 19.9477 -3.20091 19.6694 -3.06174Z"/>
+ <path id="g96" d="M3.036 -7.464C2.916 -7.524 2.82 -7.608 2.7 -7.668C2.448 -7.8 2.136 -7.872 1.848 -7.872C1.14 -7.872 0.492 -7.524 0.276 -6.9C0.204 -6.696 0.204 -6.492 0.204 -6.288C0.204 -6.192 0.192 -6.084 0.192 -5.988C0.192 -5.688 0.192 -5.376 0.312 -5.088C0.48 -4.704 0.864 -4.572 1.212 -4.392C1.44 -4.284 1.68 -4.116 1.692 -3.84C1.692 -3.54 1.548 -3.288 1.26 -3.288C1.14 -3.288 1.02 -3.324 0.912 -3.396C0.828 -3.444 0.768 -3.528 0.684 -3.576C0.648 -3.516 0.576 -3.432 0.576 -3.36C0.588 -3.3 0.66 -3.252 0.708 -3.216C0.864 -3.084 1.056 -3.012 1.272 -3.012C1.788 -3.012 2.268 -3.336 2.268 -3.96C2.268 -4.56 1.956 -5.052 1.608 -5.34C1.26 -5.616 0.468 -5.904 0.468 -6.492C0.468 -6.924 0.828 -7.308 1.284 -7.308C1.368 -7.308 1.452 -7.296 1.536 -7.284C2.268 -7.164 2.736 -6.564 2.976 -5.904C3.288 -5.004 3.36 -3.924 3.36 -2.928C3.36 -2.184 3.168 -1.74 2.844 -1.236C2.748 -1.104 2.628 -0.984 2.544 -0.84H2.532C2.256 -1.092 1.968 -1.332 1.68 -1.56L0.708 -0.396V-0.384L0.9 -0.216H0.912L1.032 -0.372C1.26 -0.228 1.5 -0.108 1.74 0.012L1.908 0.108C1.932 0.12 1.956 0.132 1.98 0.132C1.992 0.132 1.992 0.132 2.004 0.132C2.052 0.132 2.088 0.084 2.112 0.048C2.964 -0.936 4.2 -2.064 4.272 -3.648C4.272 -3.648 4.272 -4.152 4.26 -4.152C4.212 -5.34 3.936 -6.468 3.324 -7.164C3.3 -7.2 3.228 -7.26 3.228 -7.308S3.252 -7.416 3.264 -7.452C3.36 -7.668 3.516 -7.896 3.828 -7.896C3.96 -7.896 4.092 -7.848 4.212 -7.812C4.824 -7.608 5.184 -7.008 5.364 -6.42C5.472 -6.048 5.52 -5.664 5.544 -5.268C5.556 -5.04 5.544 -4.8 5.556 -4.572C5.592 -4.056 5.652 -3.528 5.652 -3C5.652 -2.316 5.532 -1.632 5.208 -1.164C5.148 -1.068 5.076 -0.996 5.016 -0.9L4.164 -1.608L3.072 -0.288C3.12 -0.252 3.204 -0.156 3.276 -0.156C3.336 -0.156 3.372 -0.228 3.396 -0.276C3.588 -0.204 4.2 0.072 4.38 0.132C4.38 0.132 4.404 0.132 4.404 0.132C4.464 0.12 4.5 0.06 4.536 0.024L4.8 -0.264C5.532 -1.068 6.156 -1.8 6.456 -3.036C6.528 -3.384 6.54 -3.72 6.54 -4.068C6.54 -4.836 6.492 -5.544 6.348 -6.228C6.276 -6.612 6.228 -6.636 6.12 -7.032C6.312 -7.116 6.444 -7.212 6.696 -7.212C7.116 -7.212 7.548 -6.972 7.776 -6.624C7.944 -6.372 8.028 -6.084 8.1 -5.796C8.124 -5.664 8.232 -5.268 8.232 -5.208C8.232 -5.196 8.232 -5.196 8.232 -5.184C8.232 -5.148 8.196 -5.136 8.172 -5.124C7.992 -5.04 7.464 -4.86 7.356 -4.824C7.296 -4.8 7.164 -4.776 7.128 -4.704S7.092 -4.5 7.092 -4.416C7.032 -3.9 6.996 -3.348 6.996 -2.796C6.996 -2.76 6.984 -2.22 6.996 -2.22C7.032 -1.788 7.152 -1.38 7.248 -0.96C7.284 -0.768 7.368 -0.348 7.368 -0.168C7.368 -0.12 7.368 -0.072 7.38 -0.036S7.512 0.156 7.56 0.156L9.036 -1.272C9.084 -1.32 9.204 -1.392 9.204 -1.464C9.204 -1.548 9.096 -1.608 9.048 -1.656H9.036C8.976 -1.596 8.604 -1.212 8.544 -1.212C8.544 -1.212 8.532 -1.212 8.532 -1.212C8.448 -1.212 8.364 -1.32 8.328 -1.38C7.92 -1.848 7.956 -2.52 7.932 -3.312C7.932 -3.528 7.896 -3.756 7.896 -3.972C7.896 -4.224 7.932 -4.476 8.112 -4.692C8.184 -4.776 8.268 -4.836 8.352 -4.896L8.496 -4.608C8.712 -4.8 8.844 -5.076 9.036 -5.292C9.084 -5.352 9.192 -5.484 9.216 -5.556C9.216 -5.628 9.132 -5.724 9.096 -5.784C9.012 -5.94 8.952 -6.096 8.88 -6.264C8.58 -6.984 8.352 -7.752 7.548 -8.052C7.536 -8.052 7.152 -8.124 7.152 -8.1C6.864 -8.076 6.684 -7.884 6.504 -7.68C6.348 -7.512 6.204 -7.344 6.048 -7.188C5.904 -7.5 5.724 -7.812 5.46 -8.04C5.172 -8.292 4.752 -8.46 4.344 -8.46C4.116 -8.46 3.9 -8.412 3.708 -8.292C3.444 -8.136 3.132 -7.752 3.036 -7.464ZM2.616 -0.78C2.616 -0.78 2.568 -0.828 2.568 -0.828S2.616 -0.78 2.616 -0.78Z"/>
+ <path id="g97" d="M3.192 -0.276C3.192 -0.168 3.192 -0.06 3.192 0.048C3.192 0.9 2.784 1.56 2.34 2.004C2.292 2.052 2.196 2.112 2.196 2.196C2.196 2.208 2.208 2.22 2.208 2.232C2.208 2.28 2.292 2.328 2.328 2.328C2.388 2.328 2.436 2.292 2.484 2.244C3.024 1.74 3.468 0.912 3.468 -0C3.468 -0.624 3.264 -1.296 2.652 -1.296C2.268 -1.296 2.016 -1.008 2.016 -0.648C2.016 -0.276 2.28 -0.012 2.652 -0.012C2.916 -0.012 3.06 -0.12 3.192 -0.276ZM5.544 -0.276C5.544 -0.168 5.544 -0.06 5.544 0.048C5.544 0.9 5.136 1.56 4.692 2.004C4.644 2.052 4.548 2.112 4.548 2.196C4.548 2.208 4.56 2.22 4.56 2.232C4.56 2.28 4.644 2.328 4.68 2.328C4.74 2.328 4.788 2.292 4.836 2.244C5.4 1.716 5.808 0.912 5.808 -0.072C5.808 -0.252 5.796 -0.432 5.748 -0.612C5.628 -0.96 5.448 -1.296 4.992 -1.296C4.608 -1.296 4.368 -0.996 4.368 -0.648C4.368 -0.48 4.428 -0.312 4.536 -0.192C4.656 -0.072 4.836 -0.012 5.004 -0.012C5.268 -0.012 5.412 -0.12 5.544 -0.276Z"/>
+ <path id="g98" d="M3.252 -8.46C3.252 -8.016 2.916 -7.692 2.604 -7.416C2.328 -7.176 2.052 -6.936 1.8 -6.684C1.524 -6.408 1.212 -6.048 1.212 -5.568C1.212 -5.544 1.212 -5.532 1.212 -5.508C1.212 -4.932 1.692 -4.512 2.016 -4.092C2.208 -3.84 2.388 -3.54 2.388 -3.216C2.388 -2.856 2.052 -2.604 1.788 -2.424C1.608 -2.292 1.416 -2.172 1.224 -2.064C1.104 -2.004 0.972 -1.968 0.852 -1.884C0.504 -1.68 0.204 -1.284 0.204 -0.768C0.204 -0.552 0.252 -0.336 0.372 -0.156C0.42 -0.084 0.576 0.132 0.672 0.132C0.672 0.132 0.684 0.132 0.684 0.132C0.768 0.132 0.84 0.036 0.876 -0.024C0.648 -0.168 0.468 -0.456 0.468 -0.732C0.468 -1.02 0.672 -1.236 0.936 -1.284C1.152 -1.284 1.74 -1.02 1.812 -0.984C2.46 -0.696 3.648 -0.096 4.344 0.072C4.428 0.108 4.548 0.144 4.632 0.144C4.644 0.144 4.656 0.144 4.668 0.144C4.728 0.144 4.776 0.108 4.824 0.084C5.76 -0.42 6.612 -1.08 7.308 -1.884C7.8 -2.448 8.28 -3.144 8.28 -4.08C8.28 -4.884 8.004 -5.7 7.692 -6.216C7.26 -6.924 6.54 -7.572 5.556 -7.692C5.124 -7.74 4.68 -7.692 4.248 -7.788C3.96 -7.848 3.588 -8.004 3.492 -8.292C3.444 -8.388 3.456 -8.46 3.324 -8.46C3.3 -8.46 3.276 -8.46 3.252 -8.46ZM1.644 -2.124C2.256 -2.472 3.24 -2.676 3.372 -3.504C3.372 -3.504 3.372 -3.828 3.36 -3.828C3.324 -4.128 3.168 -4.392 2.988 -4.632C2.676 -5.028 2.1 -5.592 2.1 -6.216C2.1 -6.36 2.136 -6.516 2.232 -6.66C2.268 -6.708 2.352 -6.864 2.424 -6.864C2.448 -6.864 2.484 -6.84 2.508 -6.828C2.784 -6.648 3.132 -6.516 3.528 -6.516C3.9 -6.516 4.248 -6.6 4.62 -6.612C4.668 -6.612 4.704 -6.612 4.752 -6.612C5.328 -6.612 5.892 -6.468 6.372 -6.12C7.056 -5.628 7.596 -4.812 7.596 -3.708C7.596 -3.012 7.356 -2.304 6.864 -1.812C6.504 -1.452 5.976 -1.212 5.292 -1.212C4.44 -1.212 3.672 -1.512 2.988 -1.764C2.544 -1.92 2.124 -2.124 1.644 -2.124Z"/>
+ <path id="g99" d="M3.252 -8.46C3.252 -8.016 2.916 -7.692 2.604 -7.416C2.388 -7.236 2.184 -7.044 1.98 -6.852C1.632 -6.528 1.212 -6.144 1.212 -5.532C1.224 -4.908 1.74 -4.488 2.076 -4.02C2.244 -3.78 2.388 -3.516 2.388 -3.216C2.388 -2.856 2.052 -2.604 1.788 -2.424C1.608 -2.292 1.416 -2.172 1.224 -2.064C1.104 -2.004 0.972 -1.968 0.852 -1.884C0.504 -1.68 0.204 -1.284 0.204 -0.768C0.204 -0.552 0.252 -0.336 0.372 -0.156C0.42 -0.084 0.576 0.132 0.672 0.132C0.672 0.132 0.684 0.132 0.684 0.132C0.768 0.132 0.84 0.036 0.876 -0.024C0.636 -0.18 0.468 -0.456 0.468 -0.756C0.468 -1.008 0.684 -1.272 0.948 -1.284C1.068 -1.284 1.176 -1.236 1.284 -1.2C2.148 -0.864 2.964 -0.42 3.828 -0.096C3.96 -0.048 4.476 0.144 4.632 0.144C4.632 0.144 4.644 0.144 4.656 0.144C4.716 0.144 4.776 0.108 4.824 0.084C5.364 -0.216 5.868 -0.492 6.348 -0.864C6.528 -0.468 6.876 -0.168 7.272 0.024C7.44 0.084 7.488 0.096 7.692 0.144C7.692 0.144 7.716 0.144 7.716 0.144C7.788 0.132 7.86 0.06 7.92 0.012C8.316 -0.288 8.724 -0.612 9.072 -0.96C9.12 -0.996 9.288 -1.128 9.288 -1.2S9.18 -1.344 9.132 -1.392C8.952 -1.248 8.796 -1.08 8.628 -0.936C8.556 -0.876 8.46 -0.756 8.352 -0.756S8.124 -0.828 8.052 -0.864C7.812 -0.984 7.608 -1.188 7.476 -1.428C7.44 -1.5 7.392 -1.596 7.392 -1.692C7.392 -1.776 7.476 -1.836 7.536 -1.896C7.692 -2.052 7.836 -2.22 7.968 -2.4C8.34 -2.904 8.592 -3.372 8.64 -4.152C8.64 -4.212 8.628 -4.26 8.628 -4.32C8.616 -4.524 8.604 -4.716 8.556 -4.908C8.304 -6.168 7.368 -7.224 6.12 -7.584C5.832 -7.668 5.52 -7.704 5.22 -7.716C4.44 -7.74 3.78 -7.716 3.48 -8.304C3.456 -8.388 3.444 -8.46 3.336 -8.46C3.312 -8.46 3.276 -8.46 3.252 -8.46ZM1.644 -2.124C2.256 -2.472 3.24 -2.676 3.372 -3.504C3.372 -3.504 3.372 -3.828 3.36 -3.828C3.24 -4.632 2.424 -5.088 2.16 -5.832C2.112 -5.952 2.1 -6.072 2.1 -6.204C2.1 -6.36 2.136 -6.504 2.22 -6.648C2.268 -6.708 2.34 -6.852 2.424 -6.852C2.46 -6.852 2.484 -6.828 2.52 -6.816C2.808 -6.624 3.228 -6.516 3.648 -6.516C3.972 -6.516 4.308 -6.6 4.632 -6.612C4.668 -6.612 4.716 -6.612 4.752 -6.612C5.556 -6.612 6.336 -6.384 6.96 -5.88C7.512 -5.448 7.944 -4.788 7.944 -3.924C7.944 -3.864 7.944 -3.816 7.944 -3.756C7.872 -2.316 6.876 -1.2 5.34 -1.2C4.62 -1.2 3.888 -1.44 3.216 -1.68C2.712 -1.86 2.196 -2.124 1.644 -2.124Z"/>
+ <path id="g100" d="M3.3264 -7.128L2.1744 -5.112H2.16C2.16 -5.4864 2.16 -5.8752 2.1456 -6.2352C1.9728 -6.4512 1.8432 -6.696 1.5984 -6.84C1.2816 -6.6096 0.9936 -6.3504 0.6912 -6.1056L1.2096 -5.472H0.9504C0.936 -4.3344 0.9792 -3.1536 0.936 -2.0448L0.3168 -1.1088V-1.0944C1.008 -0.648 1.656 -0.1584 2.3616 0.2736L2.5056 0.2304C2.9376 -0.0144 3.3984 -0.2448 3.7872 -0.5328C3.816 -0.648 3.8304 -0.7776 3.8304 -0.9072C3.6432 -0.8352 3.4272 -0.6768 3.2256 -0.6768C3.0816 -0.6768 3.0096 -0.7344 2.9232 -0.792C2.7648 -0.9072 2.448 -1.1088 2.304 -1.2096C2.2176 -1.296 2.1456 -1.296 2.1456 -1.4832C2.1456 -1.5552 2.16 -1.6272 2.16 -1.6848V-4.2912V-4.4208C2.16 -4.464 2.16 -4.4928 2.1744 -4.536C2.2176 -4.7088 2.592 -5.2704 2.6208 -5.3136C2.8224 -4.7232 3.0528 -4.1472 3.2688 -3.5712C3.5712 -4.0464 3.8592 -4.5216 4.1184 -5.04C3.8736 -5.76 3.5856 -6.4368 3.3264 -7.128Z"/>
+ <path id="g101" d="M3.3984 -6.8112C2.7792 -6.3072 1.9584 -5.9904 1.3392 -5.4864C0.6624 -4.9536 0.1584 -4.1616 0.1584 -3.2832V-3.1536C0.2448 -2.0016 1.1664 -1.1808 1.9728 -0.4608C2.1168 -0.3456 2.2608 -0.216 2.3904 -0.0864S2.6208 0.2016 2.8656 0.2016S3.168 0.0288 3.312 -0.1008C3.5424 -0.3024 3.8016 -0.504 4.0464 -0.6912C5.0256 -1.4256 6.4224 -2.2752 6.4224 -3.7584C6.4224 -3.888 6.408 -4.0176 6.3936 -4.1472C6.2496 -5.2128 5.3856 -6.0048 4.5504 -6.5808C4.4496 -6.6384 3.8304 -7.0704 3.7152 -7.0704C3.6576 -7.0704 3.456 -6.8688 3.3984 -6.8112ZM1.152 -4.248C1.152 -4.8672 1.5984 -5.472 2.1456 -5.616C2.2464 -5.6304 2.3328 -5.6304 2.4336 -5.6304C2.6784 -5.6304 2.9088 -5.5872 3.1392 -5.5296C4.3056 -5.1984 5.256 -4.1472 5.256 -2.8224C5.256 -2.664 5.2416 -2.5056 5.1984 -2.3472C5.04 -1.7568 4.536 -1.2672 3.8448 -1.2672C3.4848 -1.2672 3.1248 -1.368 2.808 -1.5264C2.1024 -1.872 1.584 -2.52 1.3392 -3.2544C1.2528 -3.4992 1.152 -3.9888 1.152 -4.248Z"/>
+ <path id="g102" d="M3.48 -6.84C3.372 -6.78 3.24 -6.732 3.156 -6.648C3.06 -6.552 3.108 -6.348 2.916 -6.348C2.82 -6.348 2.7 -6.396 2.628 -6.432C2.82 -6.66 3.06 -6.864 3.264 -7.08C3.3 -7.116 3.516 -7.32 3.516 -7.368C3.516 -7.548 3.144 -7.656 3.036 -7.656C2.82 -7.656 2.7 -7.572 2.532 -7.476C2.268 -7.32 1.992 -7.176 1.992 -6.756C1.992 -6.72 1.992 -6.672 2.004 -6.624C2.076 -6.348 2.316 -6.036 2.604 -6.036C2.844 -6.036 3.084 -6.192 3.276 -6.324C3.396 -6.396 3.528 -6.54 3.528 -6.696C3.528 -6.708 3.528 -6.708 3.528 -6.72C3.528 -6.768 3.504 -6.804 3.48 -6.84ZM2.46 -6.6C2.424 -6.696 2.412 -6.792 2.412 -6.888C2.412 -7.08 2.532 -7.344 2.736 -7.344C2.856 -7.344 2.976 -7.284 3.096 -7.236L2.46 -6.6ZM0.216 -1.14V-1.116C0.504 -0.948 1.884 -0.096 2.088 0.048C2.124 0.084 2.172 0.132 2.232 0.132C2.232 0.132 2.244 0.132 2.244 0.132C2.28 0.12 2.868 -0.564 3.132 -0.984C3.624 -1.764 3.828 -2.712 3.828 -3.636C3.828 -4.488 3.66 -5.184 3.264 -5.808L1.176 -4.968L0.66 -4.752C0.54 -4.704 0.468 -4.716 0.468 -4.536C0.468 -4.488 0.468 -4.452 0.468 -4.416V-1.728C0.468 -1.704 0.468 -1.68 0.468 -1.656C0.468 -1.488 0.456 -1.332 0.324 -1.212L0.216 -1.14ZM2.712 -0.828C2.688 -0.792 2.652 -0.72 2.604 -0.72C2.568 -0.72 2.544 -0.732 2.52 -0.744C2.148 -0.984 2.028 -1.056 1.572 -1.332L1.38 -1.452C1.308 -1.5 1.26 -1.524 1.26 -1.644C1.26 -1.704 1.272 -1.764 1.272 -1.812V-3.936C1.272 -3.996 1.272 -4.68 1.272 -4.68C1.296 -4.776 1.44 -4.812 1.524 -4.836C1.776 -4.944 2.04 -5.04 2.292 -5.148C2.352 -5.172 2.448 -5.232 2.52 -5.232C2.556 -5.232 2.58 -5.22 2.604 -5.196C2.652 -5.112 2.688 -5.004 2.724 -4.908C2.988 -4.212 3.096 -3.312 3.096 -2.4C3.096 -1.824 2.976 -1.164 2.712 -0.828Z"/>
+ <path id="g103" d="M3.504 -6.84C3.444 -6.804 3.192 -6.672 3.156 -6.624C3.072 -6.528 3.132 -6.348 2.928 -6.348C2.832 -6.348 2.724 -6.396 2.64 -6.432C2.832 -6.66 3.072 -6.864 3.276 -7.08C3.324 -7.128 3.528 -7.308 3.528 -7.38C3.528 -7.44 3.468 -7.488 3.432 -7.524C3.312 -7.62 3.168 -7.656 3.024 -7.656C2.832 -7.656 2.688 -7.56 2.568 -7.488C2.304 -7.344 2.016 -7.164 2.016 -6.768C2.016 -6.444 2.256 -6.036 2.64 -6.036C2.856 -6.036 3.048 -6.18 3.24 -6.288C3.384 -6.372 3.552 -6.516 3.552 -6.696C3.552 -6.756 3.516 -6.816 3.504 -6.84ZM2.472 -6.612C2.448 -6.708 2.436 -6.804 2.436 -6.888C2.436 -7.08 2.544 -7.356 2.76 -7.356C2.88 -7.356 3.012 -7.296 3.108 -7.236L2.472 -6.612ZM1.188 -5.808L0.204 -4.548V-4.536L0.384 -4.392H0.396C0.432 -4.44 0.588 -4.668 0.648 -4.668C0.744 -4.668 0.828 -4.488 0.852 -4.452C0.96 -4.248 0.972 -4.032 0.972 -3.804C0.972 -3.768 0.972 -3.72 0.972 -3.684V-1.368C0.972 -1.332 0.972 -1.284 0.972 -1.248C0.972 -0.936 0.744 -0.828 0.492 -0.756V-0.504C0.924 -0.504 1.296 -0.276 1.512 0.024C1.56 0.084 1.584 0.156 1.692 0.156C1.86 0.156 1.98 -0.036 2.088 -0.144L3.12 -1.176C3.24 -0.9 3.384 -0.624 3.516 -0.348C3.564 -0.252 3.648 -0.132 3.648 -0.024C3.648 -0 3.636 0.012 3.636 0.036L3.84 0.156L4.776 -1.344L4.56 -1.464C4.524 -1.404 4.38 -1.14 4.332 -1.128C4.296 -1.128 4.272 -1.14 4.248 -1.164C4.056 -1.308 3.936 -1.536 3.936 -1.848C3.936 -1.92 3.936 -1.992 3.936 -2.052V-3.888C3.936 -4.092 3.936 -4.308 3.936 -4.524C3.936 -4.728 3.924 -4.968 4.02 -5.088C4.044 -5.136 4.116 -5.16 4.128 -5.208C4.14 -5.208 4.14 -5.352 4.14 -5.352C3.9 -5.4 3.684 -5.568 3.612 -5.808C3.588 -5.808 3.564 -5.808 3.54 -5.808C3.444 -5.808 3.432 -5.76 3.396 -5.7C3.312 -5.52 3.096 -5.4 2.916 -5.352C2.916 -5.328 2.916 -5.304 2.916 -5.28C2.916 -5.16 3.024 -5.112 3.06 -5.052C3.12 -4.92 3.12 -4.764 3.12 -4.584C3.12 -4.416 3.12 -4.248 3.12 -4.092V-1.932C3.12 -1.848 3.132 -1.764 3.132 -1.68C3.132 -1.488 3.06 -1.464 2.94 -1.344L2.52 -0.924C2.472 -0.876 2.388 -0.756 2.316 -0.756C2.256 -0.756 2.208 -0.816 2.172 -0.84L1.932 -1.056C1.848 -1.116 1.788 -1.164 1.788 -1.308V-3.54C1.788 -4.056 1.776 -4.536 1.608 -5.028C1.536 -5.256 1.332 -5.664 1.188 -5.808Z"/>
+ <path id="g104" d="M3.708 -6.84C3.636 -6.816 3.396 -6.672 3.36 -6.624C3.276 -6.528 3.324 -6.348 3.132 -6.348C3.024 -6.348 2.928 -6.408 2.844 -6.432C3.036 -6.66 3.276 -6.864 3.48 -7.08C3.528 -7.128 3.732 -7.308 3.732 -7.38C3.732 -7.572 3.324 -7.656 3.228 -7.656C3.048 -7.656 2.892 -7.548 2.772 -7.488C2.508 -7.32 2.22 -7.188 2.22 -6.768C2.22 -6.456 2.46 -6.036 2.832 -6.036C3.036 -6.036 3.228 -6.168 3.42 -6.276C3.564 -6.36 3.744 -6.504 3.744 -6.684C3.744 -6.696 3.744 -6.708 3.744 -6.72C3.744 -6.768 3.72 -6.804 3.708 -6.84ZM2.676 -6.612C2.652 -6.708 2.64 -6.804 2.64 -6.888C2.64 -7.092 2.748 -7.344 2.964 -7.344C3.084 -7.344 3.204 -7.296 3.312 -7.236L2.676 -6.612ZM1.944 -5.808L1.62 -5.472C1.356 -5.208 1.092 -4.944 0.888 -4.632C0.456 -3.972 0.204 -3.048 0.204 -2.028C0.204 -1.896 0.216 -1.776 0.228 -1.644C0.312 -0.948 0.78 -0.3 1.356 -0.012L1.164 0.156L1.536 0.144C2.004 -0.192 2.4 -0.588 2.844 -0.936C2.88 -0.732 2.94 -0.528 3.012 -0.336C3.036 -0.3 3.156 -0.048 3.156 -0.024C3.156 0.036 3.084 0.108 3.048 0.156L3.348 0.144C3.6 -0.12 3.84 -0.396 4.056 -0.696L4.068 -1.044C4.044 -1.02 3.996 -0.984 3.948 -0.984C3.816 -0.984 3.696 -1.14 3.648 -1.236C3.624 -1.308 3.624 -1.392 3.624 -1.476V-3.048C3.624 -3.192 3.612 -3.348 3.612 -3.504C3.612 -3.936 3.708 -4.248 3.924 -4.512C3.96 -4.572 4.032 -4.62 4.032 -4.68C4.032 -4.764 3.9 -4.884 3.888 -4.908C3.78 -5.052 3.744 -5.064 3.504 -5.1C3.012 -5.232 2.688 -5.352 2.268 -5.592C2.16 -5.664 2.052 -5.748 1.944 -5.808ZM1.452 -4.968C1.608 -4.896 2.4 -4.416 2.424 -4.404L2.664 -4.26C2.76 -4.212 2.808 -4.164 2.808 -4.032C2.808 -3.996 2.808 -3.96 2.808 -3.936V-1.488C2.808 -1.452 2.808 -1.416 2.808 -1.368C2.808 -1.332 2.808 -1.296 2.796 -1.26C2.736 -1.092 2.304 -0.972 2.124 -0.972C1.644 -0.972 1.284 -1.392 1.164 -1.836C1.092 -2.076 1.08 -2.316 1.08 -2.556C1.08 -2.7 1.092 -2.856 1.092 -3C1.104 -3.552 1.092 -4.14 1.296 -4.668C1.332 -4.776 1.404 -4.872 1.452 -4.968Z"/>
+ <path id="g105" d="M3.96 -6.0048C3.8448 -6.0768 2.6208 -6.8688 2.5344 -6.8688H2.52C2.4192 -6.8688 2.3184 -6.768 2.2464 -6.7104C2.016 -6.5664 1.8 -6.408 1.5696 -6.2496C1.2816 -6.0624 1.0224 -5.8608 0.8208 -5.5872C0.36 -4.9536 0.1584 -4.0896 0.1584 -3.1392C0.1584 -1.7712 0.7632 -0.6768 1.6128 0.0144C1.6848 0.0576 1.7712 0.1584 1.8576 0.1584C1.9728 0.1584 2.232 -0.0576 2.2608 -0.072L3.2256 -0.6912C3.2976 -0.7344 3.5136 -0.9072 3.6 -0.9072C3.6576 -0.9072 3.7008 -0.864 3.744 -0.8352C3.9888 -0.6336 5.0832 0.1728 5.0976 0.1872C5.6304 -0.2448 6.192 -0.648 6.696 -1.0944L6.7104 -1.3968C6.4512 -1.2816 6.3936 -1.0944 5.9904 -1.0944C5.5728 -1.0944 5.4288 -1.5264 5.3712 -1.8432C5.3424 -2.0304 5.328 -2.9088 5.328 -3.024V-3.7152V-4.2336V-4.3632C5.328 -4.5648 5.4432 -4.6224 5.5296 -4.7376L5.8752 -5.1408C5.9184 -5.1984 6.0336 -5.3712 6.1056 -5.3712S6.2352 -5.3136 6.2784 -5.2704L6.7536 -4.8672C7.4592 -4.2624 8.1648 -3.528 8.1648 -2.4336C8.1648 -0.432 6.264 1.2816 5.112 2.4336V2.448L5.328 2.664H5.3424C6.7824 1.224 8.9568 -0.2016 9.3888 -2.3328C9.4464 -2.592 9.4608 -2.8656 9.4608 -3.1248C9.4608 -4.6224 8.28 -5.7168 7.5744 -6.3504C7.5168 -6.408 6.9408 -6.8976 6.9264 -6.8976C6.3936 -6.264 5.8464 -5.6592 5.3424 -4.9968H5.328V-7.272C5.328 -7.488 5.3136 -7.704 5.3136 -7.92C5.3136 -8.1648 5.328 -8.4096 5.3856 -8.6544C5.4864 -9.1296 5.76 -9.7344 6.3792 -9.7344V-10.0512L4.1472 -9.3744L3.6 -9.2016C3.4992 -9.1728 3.3984 -9.1584 3.3984 -9.0144V-8.928C3.3984 -8.8416 3.456 -8.8128 3.5136 -8.784C3.5712 -8.7696 3.6288 -8.7408 3.6864 -8.6976C3.9024 -8.5392 3.96 -8.3664 3.96 -8.0064V-6.0048ZM3.4416 -4.8384L3.9456 -5.5296C3.96 -5.4432 3.9744 -5.3568 3.9744 -5.2704C3.9744 -5.1552 3.96 -5.04 3.96 -4.9248V-2.9376V-2.6784C3.96 -2.2464 3.8016 -1.5696 3.5856 -1.3968C3.4416 -1.2528 2.952 -1.1952 2.7216 -1.1952C2.5056 -1.1952 2.2896 -1.2384 2.1168 -1.3536C1.6128 -1.7136 1.4688 -2.6064 1.4688 -3.384C1.4688 -3.4416 1.4976 -4.3776 1.4688 -4.3776C1.4544 -4.5216 1.368 -5.256 1.368 -5.3136C1.368 -5.5584 1.4256 -5.8608 1.6272 -5.9184C1.6848 -5.9184 1.7424 -5.8896 1.7856 -5.8608L2.1168 -5.6448L2.9664 -5.112C3.1248 -5.0256 3.2688 -4.896 3.4416 -4.8384Z"/>
+ <path id="g106" d="M4.0032 -1.6272C3.5856 -1.4688 3.4416 -1.2816 2.8512 -1.2816C2.5632 -1.2816 2.2896 -1.368 2.0736 -1.584C1.8576 -1.8288 1.7712 -2.0592 1.6848 -2.4336C1.6704 -2.4912 1.5552 -3.1968 1.6272 -3.1968C1.6704 -3.2688 1.7712 -3.312 1.8432 -3.3696C2.016 -3.4848 4.176 -4.8816 4.2768 -4.9392C3.8736 -5.6016 3.4416 -6.2496 3.024 -6.8976C2.8656 -6.84 1.7568 -6.2928 1.3536 -6.0912C1.08 -5.9472 0.7632 -5.8464 0.5616 -5.5872C0.2736 -5.1984 0.216 -4.6512 0.1872 -4.176C0.1728 -3.888 0.144 -3.5712 0.144 -3.2832C0.144 -1.8864 0.5904 -0.936 1.2528 -0.1296C1.3536 -0.0288 1.44 0.1152 1.584 0.1584C1.584 0.1584 1.7424 0.1152 1.7424 0.0864C1.9008 -0 3.4704 -0.9504 3.4704 -0.9504L3.8304 -1.1664C3.9312 -1.2384 4.0032 -1.2528 4.0032 -1.4544V-1.6272ZM1.584 -3.5856C1.5696 -3.7728 1.5696 -3.9744 1.5696 -4.1616C1.5696 -4.8672 1.7568 -5.3712 2.1168 -5.7888L2.5776 -5.0688L2.9664 -4.4928L1.584 -3.5856Z"/>
+ <path id="g107" d="M4.1904 -1.3392L4.032 -1.584C3.8736 -1.5408 3.744 -1.44 3.5856 -1.368C3.312 -1.2528 3.0096 -1.1952 2.7072 -1.1952H2.5488C1.5552 -1.296 1.4688 -2.6928 1.4688 -3.7008V-4.1328C1.4832 -4.536 1.3536 -4.9248 1.3536 -5.3424C1.3536 -5.544 1.4256 -5.8464 1.6272 -5.9184C1.6848 -5.9184 1.728 -5.8896 1.7712 -5.8608C1.8576 -5.8032 2.9664 -5.112 2.9664 -5.112C3.024 -5.0832 3.3264 -4.8672 3.384 -4.8672H3.3984C3.4992 -4.8672 3.5712 -5.0112 3.6144 -5.0832C3.8016 -5.3424 4.0176 -5.5872 4.1904 -5.8608C3.7872 -6.0912 3.3984 -6.3504 2.9952 -6.6096L2.6784 -6.7968C2.6352 -6.8256 2.5776 -6.8688 2.52 -6.8688C2.4192 -6.8688 2.304 -6.768 2.232 -6.7104C1.7424 -6.3504 1.1232 -6.0336 0.7776 -5.5584C0.36 -4.9536 0.1584 -4.0608 0.1584 -3.1392C0.1584 -1.8432 0.6768 -0.8352 1.4256 -0.144C1.4832 -0.0864 1.7568 0.1584 1.8576 0.1584C1.9296 0.1584 2.3472 -0.1296 2.4912 -0.216C2.6352 -0.3168 4.1904 -1.2816 4.1904 -1.3392Z"/>
+ <path id="g108" d="M4.248 -6.888C4.116 -7.032 4.02 -7.224 3.9 -7.368C3.504 -7.8 2.988 -8.112 2.268 -8.112C1.224 -8.112 0.204 -7.404 0.204 -6.156C0.204 -5.208 0.696 -4.416 1.38 -4.152C1.812 -3.996 2.616 -4.092 2.616 -3.54C2.616 -3.156 2.412 -2.772 2.04 -2.772C1.788 -2.772 1.536 -2.952 1.404 -3.168C1.344 -3.288 1.308 -3.42 1.308 -3.564C1.236 -3.528 1.068 -3.516 1.068 -3.396C1.068 -3.36 1.08 -3.312 1.08 -3.276C1.2 -2.856 1.56 -2.508 2.052 -2.508C2.604 -2.508 2.892 -3.06 2.892 -3.588C2.892 -3.924 2.796 -4.308 2.664 -4.536C2.472 -4.884 2.208 -5.004 1.8 -5.136C1.296 -5.328 0.48 -5.52 0.48 -6.24C0.48 -6.948 1.224 -7.344 1.884 -7.344C3.792 -7.344 4.02 -4.788 4.02 -3.036C4.02 -2.736 3.996 -1.932 3.948 -1.692C3.876 -1.056 3.66 -0.12 2.796 -0.12C2.436 -0.12 2.064 -0.336 2.064 -0.768C2.064 -0.828 2.076 -0.888 2.088 -0.936C2.112 -0.936 2.136 -1.08 2.136 -1.08C2.136 -1.14 2.04 -1.236 1.968 -1.236C1.872 -1.236 1.776 -1.176 1.692 -1.152C1.62 -1.128 1.536 -1.128 1.464 -1.128C1.344 -1.128 1.224 -1.152 1.092 -1.176C1.08 -1.14 1.068 -1.116 1.068 -1.08C1.068 -0.996 1.116 -0.9 1.128 -0.816C1.14 -0.816 1.14 -0.384 1.14 -0.384C1.116 -0.384 1.092 -0.132 1.092 -0.132C1.092 -0.072 1.176 0.048 1.26 0.048C1.32 0.048 1.38 -0.024 1.428 -0.048C1.5 -0.084 1.572 -0.108 1.644 -0.108C1.68 -0.108 1.716 -0.096 1.752 -0.096C2.112 -0.036 2.376 0.156 2.796 0.156C3.252 0.156 3.708 -0.048 4.02 -0.348C4.692 -1.008 4.956 -1.956 5.004 -2.868C5.004 -2.868 5.004 -3.588 4.992 -3.588C4.968 -4.536 4.812 -5.388 4.56 -6.18L4.452 -6.456C4.428 -6.516 4.392 -6.564 4.38 -6.624C4.38 -6.732 4.428 -6.864 4.464 -6.96C4.608 -7.344 4.932 -7.8 5.472 -7.8C5.844 -7.8 6.108 -7.524 6.276 -7.2C6.552 -6.648 6.576 -5.94 7.032 -5.484C7.152 -5.364 7.308 -5.232 7.476 -5.184V-5.172C6.984 -5.064 6.468 -4.92 6.108 -4.548C5.76 -4.176 5.712 -3.648 5.712 -3.06C5.712 -2.016 6.012 -0.936 6.396 -0.204C6.444 -0.12 6.492 -0.048 6.528 0.036C6.576 0.108 6.588 0.156 6.72 0.156C6.744 0.156 6.864 0.168 6.864 0.144C6.936 0.108 6.996 -0.036 7.044 -0.108L7.632 -1.044C7.656 -1.08 7.824 -1.356 7.824 -1.38C7.824 -1.488 7.68 -1.524 7.62 -1.548C7.56 -1.476 7.488 -1.368 7.368 -1.368C7.236 -1.368 7.116 -1.512 7.056 -1.632C6.84 -1.98 6.78 -2.412 6.744 -2.808C6.732 -2.988 6.744 -3.156 6.732 -3.336C6.72 -3.492 6.708 -3.648 6.708 -3.816C6.708 -4.032 6.732 -4.248 6.852 -4.428C7.068 -4.764 7.476 -4.896 7.884 -5.004C7.968 -5.028 8.028 -5.04 8.028 -5.16V-6.048C7.752 -6.06 7.644 -6.3 7.56 -6.528L7.38 -7.044C7.14 -7.656 6.78 -8.388 6.048 -8.46C5.976 -8.46 5.652 -8.472 5.652 -8.436C5.496 -8.4 5.352 -8.352 5.22 -8.28C4.776 -8.052 4.32 -7.44 4.248 -6.888Z"/>
+ <path id="g109" d="M4.512 -6.012L4.632 -6.252C4.248 -6.468 3.804 -6.696 3.36 -6.696C3.312 -6.696 3.276 -6.684 3.228 -6.684C2.52 -6.624 2.136 -5.868 2.136 -5.148C2.136 -5.088 2.136 -5.04 2.148 -4.98C2.232 -4.392 2.748 -4.044 3.228 -3.768C3.24 -3.756 3.732 -3.48 3.732 -3.54C3.828 -3.552 3.936 -3.624 4.032 -3.66L4.608 -3.924C5.136 -4.14 5.64 -4.464 6.348 -4.464C7.188 -4.464 8.1 -3.972 8.1 -3C8.1 -2.568 7.932 -2.136 7.656 -1.824C7.14 -1.2 6.312 -0.84 5.328 -0.84C4.236 -0.84 3.156 -1.308 2.4 -2.064C1.656 -2.808 1.188 -3.888 1.188 -4.944C1.188 -5.892 1.608 -6.792 2.268 -7.296C2.496 -7.476 2.784 -7.668 3.108 -7.668C3.468 -7.668 3.816 -7.476 4.116 -7.32L5.208 -6.756C5.544 -6.6 5.988 -6.372 6.3 -6.204C6.384 -6.156 6.504 -6.072 6.612 -6.072C6.684 -6.072 7.668 -6.516 8.04 -6.696C8.196 -6.756 8.364 -6.816 8.484 -6.936C8.736 -7.176 8.808 -7.548 8.808 -7.884L8.448 -7.74C8.448 -7.56 8.436 -7.368 8.34 -7.212C8.22 -7.032 7.992 -6.96 7.728 -6.96C7.296 -6.96 6.852 -7.236 6.576 -7.392L5.232 -8.076C5.076 -8.148 4.92 -8.22 4.776 -8.304C4.692 -8.34 4.548 -8.448 4.44 -8.448C4.356 -8.448 4.248 -8.412 4.164 -8.388C3.516 -8.196 2.844 -7.968 2.304 -7.668C1.176 -7.032 0.204 -5.832 0.204 -4.164C0.204 -3.444 0.396 -2.82 0.648 -2.34C1.356 -0.984 2.772 -0.108 4.26 0.096C4.5 0.132 4.752 0.156 4.992 0.156C5.496 0.156 6 0.072 6.468 -0.144C7.488 -0.612 8.364 -1.644 8.364 -3.012C8.364 -3.3 8.328 -3.6 8.232 -3.876C7.92 -4.764 7.212 -5.424 6.444 -5.88C6.432 -5.892 6.084 -6.096 6.084 -6.048C6.012 -6.036 5.412 -5.76 5.412 -5.76L3.936 -5.1C3.756 -5.028 3.612 -4.944 3.396 -4.944C3.024 -4.944 2.7 -5.268 2.7 -5.688C2.7 -6.096 2.952 -6.444 3.384 -6.444C3.804 -6.444 4.152 -6.168 4.512 -6.012Z"/>
+ <path id="g110" d="M4.6224 0.1872L5.4144 -0.6048C5.4576 -0.648 5.6736 -0.8352 5.6736 -0.9072S5.4864 -1.1664 5.472 -1.1808C5.04 -1.6848 4.5504 -2.3472 4.5504 -3.2256C4.5504 -3.5424 4.5792 -4.0608 4.6656 -4.248C4.7376 -4.392 5.6304 -5.4144 5.7024 -5.5296C5.2272 -5.8464 4.7808 -6.192 4.32 -6.5232L3.9744 -6.7824C3.9312 -6.8112 3.8592 -6.8688 3.8016 -6.8688C3.7152 -6.8688 3.4272 -6.6384 3.4272 -6.6384L2.4912 -5.976C1.4112 -5.2272 0.2592 -4.2192 0.1584 -2.808C0.1584 -2.808 0.1728 -2.1168 0.2016 -2.1168C0.2592 -1.8432 0.3312 -1.5696 0.4608 -1.3248C0.7632 -0.7056 1.2528 -0.1872 1.8864 0.1296C1.8864 0.1296 2.0592 0.1872 2.0592 0.144C2.1888 0.072 2.2896 -0.072 2.3904 -0.1728L3.0528 -0.8352C3.096 -0.8784 3.3552 -1.1664 3.4272 -1.1664C3.4704 -1.1664 3.4992 -1.1232 3.528 -1.0944C3.7296 -0.8496 4.5792 0.1872 4.6224 0.1872ZM4.4208 -4.5504C4.3344 -4.3344 3.7728 -2.3904 3.7008 -2.16C3.6432 -1.8 3.4848 -1.728 3.2544 -1.4976L2.8656 -1.1088C2.808 -1.0512 2.7504 -0.9792 2.6784 -0.9504C2.5776 -0.9504 2.3904 -1.0944 2.3472 -1.1232C1.7568 -1.5696 1.2528 -2.3184 1.2528 -3.2544C1.2528 -4.3056 1.9296 -5.0976 2.5056 -5.5584C2.5632 -5.6016 2.6496 -5.7024 2.736 -5.7024C2.7936 -5.7024 2.8512 -5.6448 2.8944 -5.616L3.2112 -5.3856C3.4704 -5.2128 3.7296 -5.0256 3.9888 -4.8384C4.1328 -4.7376 4.2624 -4.6224 4.4208 -4.5504Z"/>
+ <path id="g111" d="M4.6368 -5.832C4.392 -6.0048 4.1328 -6.1632 3.888 -6.3216C3.5856 -6.5232 3.312 -6.6384 3.312 -7.1136H3.2976C3.168 -6.8544 3.0096 -6.6096 2.808 -6.408C2.2752 -5.8896 1.4832 -5.7312 0.7632 -5.7312C0.7488 -5.112 0.792 -4.4352 0.7488 -3.8448C0.5472 -3.6 0.3456 -3.3696 0.1296 -3.1392V-3.1248L1.2096 -2.0592V-2.0448C0.9936 -1.872 0.8064 -1.6272 0.6192 -1.4112C0.1584 -0.9072 -0.4464 -0.288 -0.4464 0.4176C-0.4464 0.5472 -0.432 0.6768 -0.3888 0.8064L0.1296 0.3024V0.288C0.0576 0.216 0 0.1152 0 -0.0144C0 -0.216 0.144 -0.3888 0.2592 -0.5328C0.3024 -0.6048 0.4032 -0.7488 0.4896 -0.7488H0.504C0.5472 -0.7488 0.7488 -0.576 0.8208 -0.5184L1.5264 0.072C1.5984 0.144 1.7136 0.2736 1.8144 0.2736C1.9008 0.2736 2.5056 -0.1008 2.7216 -0.216C3.2256 -0.5184 4.824 -1.4256 5.0976 -1.5984L4.9104 -1.8576C4.896 -2.1168 4.896 -2.3904 4.896 -2.664C4.9968 -2.7072 5.0544 -2.8512 5.0976 -2.952C5.2416 -3.1968 5.4144 -3.4416 5.5296 -3.7008L4.0176 -4.68C4.2912 -4.9968 4.5936 -5.3136 4.8816 -5.6304C5.2416 -6.048 5.3856 -6.2064 5.3856 -6.9696V-7.1136C5.3856 -7.3008 5.3136 -7.4448 5.1264 -7.4448C5.0112 -7.4448 4.896 -7.3296 4.896 -7.2144C4.9248 -6.984 5.04 -6.7536 5.04 -6.5088C5.0256 -6.2064 4.7808 -6.0624 4.6368 -5.832ZM2.0304 -2.952L1.8432 -3.1248H1.9728V-5.5872L2.4912 -5.76L2.6352 -5.688C3.0096 -5.4288 3.4128 -5.184 3.8016 -4.9392L3.312 -4.392L2.0304 -2.952ZM1.3536 -1.6992C1.3536 -1.7568 1.4256 -1.8144 1.4544 -1.8576C1.5696 -1.9728 2.7504 -3.2832 2.7504 -3.2832L3.024 -3.5856C3.0672 -3.6288 3.1248 -3.744 3.1968 -3.744C3.2544 -3.744 3.312 -3.7008 3.3408 -3.672C3.456 -3.6 3.672 -3.5136 3.6864 -3.3552V-1.3248V-1.2672C3.6864 -1.2096 3.6864 -1.1664 3.6432 -1.1376C3.5856 -1.08 2.7504 -0.5904 2.664 -0.5904C2.5632 -0.5904 2.448 -0.7488 2.4048 -0.7776L1.9008 -1.1952C1.7568 -1.3248 1.6272 -1.44 1.4832 -1.5552C1.44 -1.584 1.3536 -1.6416 1.3536 -1.6992Z"/>
+ <path id="g112" d="M4.8528 -6.8976C4.752 -6.7824 4.2624 -6.1056 4.176 -6.048C4.1184 -6.0192 4.0464 -6.0192 3.9888 -6.0192H2.3616C2.1312 -6.0192 2.1312 -6.0768 2.0016 -6.2352L1.6704 -6.6672C1.6272 -6.7248 1.5552 -6.8544 1.4832 -6.8544C1.4256 -6.8544 1.3824 -6.7824 1.3536 -6.7392C1.296 -6.6528 1.008 -6.2928 0.936 -6.192C0.8496 -6.1056 0.7776 -6.0048 0.7776 -5.8464C0.7776 -5.7744 0.792 -5.7024 0.792 -5.6304V-2.0016V-1.8144C0.792 -1.7568 0.792 -1.6992 0.8064 -1.6416C0.8208 -1.5696 1.0224 -1.2096 1.0944 -1.08C1.2816 -0.72 1.4544 -0.36 1.656 -0.0144C1.8864 -0.1152 2.1168 -0.2448 2.3328 -0.3744C2.4624 -0.432 4.1184 -1.3248 4.1616 -1.3248C4.248 -1.296 4.3344 -1.152 4.3776 -1.08C4.7088 -0.6336 4.968 -0 4.968 0.72C4.968 1.5984 4.032 2.0448 3.3552 2.0448C2.6208 2.0448 2.088 1.6272 1.5984 1.1952C1.4832 1.0944 1.0512 0.6912 0.936 0.648C0.6912 0.9792 0.4176 1.2672 0.1584 1.584C0.0432 1.728 -0.1296 1.8144 -0.1296 2.0736C-0.1296 2.3184 0.0576 2.3184 0.2448 2.4048C0.9072 2.6784 1.7136 2.88 2.6064 2.88C2.7648 2.88 2.9088 2.8656 3.0528 2.8368C3.7728 2.6784 4.392 2.2032 4.9104 1.6992C5.472 1.152 6.12 0.4176 6.12 -0.6048C6.12 -1.1088 5.9472 -1.5264 5.7168 -1.8576C5.6448 -1.9728 5.544 -2.0304 5.544 -2.2176V-2.4048V-4.6512C5.7744 -4.6512 6.0192 -4.6368 6.2208 -4.68L6.2928 -4.7952C6.408 -5.2128 6.552 -5.616 6.6816 -6.0192C6.2928 -6.0192 5.8896 -6.0048 5.544 -6.048C5.2992 -6.3072 5.0832 -6.6096 4.8528 -6.8976ZM2.16 -4.6512H4.176V-1.9872V-1.8864C4.176 -1.6992 4.104 -1.656 3.9456 -1.5984C3.7728 -1.4976 3.6144 -1.4112 3.4416 -1.3248L2.808 -0.9936C2.7648 -0.9648 2.6784 -0.8928 2.6208 -0.8928C2.5056 -0.8928 2.4624 -1.08 2.4336 -1.1376C2.3328 -1.3248 2.16 -1.5696 2.16 -1.8432V-4.6512Z"/>
+ <path id="g113" d="M4.896 -8.2944C4.8096 -8.2512 4.4352 -8.0496 4.3776 -7.992C4.2912 -7.9056 4.3344 -7.7472 4.1472 -7.7472C4.0608 -7.7472 3.96 -7.8192 3.8736 -7.848C4.0176 -7.992 4.9248 -8.8704 4.9392 -8.9568C4.9392 -9.1728 4.4928 -9.3024 4.3488 -9.3024C4.0896 -9.3024 3.8736 -9.1584 3.7008 -9.0432C3.3552 -8.856 2.9952 -8.6688 2.9952 -8.1648C2.9952 -7.9488 3.0672 -7.8336 3.1536 -7.6896C3.2688 -7.488 3.456 -7.2864 3.7584 -7.2864C4.0464 -7.2864 4.2912 -7.4736 4.536 -7.6176C4.7088 -7.7184 4.9536 -7.8912 4.9536 -8.1216V-8.136C4.9536 -8.1936 4.9248 -8.2512 4.896 -8.2944ZM3.6576 -8.0928C3.6432 -8.1936 3.6288 -8.2944 3.6288 -8.3808C3.6288 -8.5824 3.7152 -8.8416 3.9312 -8.8416C4.0608 -8.8416 4.1904 -8.784 4.2912 -8.7264L3.6576 -8.0928ZM0.1584 -5.6016C0.2592 -5.6448 0.3456 -5.688 0.4608 -5.7024C0.6768 -5.7024 0.9072 -5.5584 0.9792 -5.3424C1.008 -5.256 1.008 -5.1552 1.008 -5.0544V-1.872V-1.728C1.008 -1.5552 0.9504 -1.5264 0.8352 -1.44C0.72 -1.368 0.5904 -1.2816 0.4896 -1.1952C1.0944 -0.7632 1.6272 -0.2448 2.2608 0.1584L2.448 0.072L4.4784 -1.3536C4.4784 -0.8928 4.6368 -0.4608 4.9392 -0.1152C4.9968 -0.0432 5.1984 0.1584 5.3136 0.1584C5.3568 0.144 5.4 0.1152 5.4288 0.0864L5.6304 -0.1152C5.7168 -0.1872 6.4224 -0.8064 6.4224 -0.864C6.0192 -1.2816 5.832 -1.7568 5.832 -2.4912C5.832 -2.7072 5.8464 -2.9232 5.8464 -3.1392V-6.8976C5.5152 -6.768 5.1984 -6.6096 4.8672 -6.4656L4.6224 -6.3648C4.5216 -6.2928 4.464 -6.2928 4.464 -6.1344C4.464 -6.0768 4.4784 -6.0192 4.4784 -5.976V-2.088C4.4784 -2.0304 4.4928 -1.9584 4.4928 -1.9008C4.4928 -1.7136 4.3632 -1.656 4.2336 -1.584L3.7008 -1.2096C3.6288 -1.1664 3.528 -1.0512 3.4416 -1.0512S3.2544 -1.1808 3.1824 -1.2384L2.6208 -1.6704C2.4912 -1.7712 2.3616 -1.8144 2.3616 -2.0448C2.3616 -2.1168 2.376 -2.1888 2.376 -2.2464V-4.5504V-4.968C2.376 -5.1696 2.376 -5.3712 2.3472 -5.5728C2.2752 -6.0048 2.088 -6.4368 1.7856 -6.768C1.7568 -6.8112 1.7136 -6.8688 1.656 -6.8688S1.3248 -6.6816 1.224 -6.624L0.4896 -6.1344C0.3456 -6.048 0.144 -5.9904 0.144 -5.76C0.144 -5.7024 0.1584 -5.6448 0.1584 -5.6016Z"/>
+ <path id="g114" d="M5.22 -7.788C5.004 -7.944 4.824 -8.076 4.476 -8.076C4.08 -8.076 3.684 -7.836 3.54 -7.512C3.18 -7.896 2.82 -8.352 2.268 -8.436C2.268 -8.436 2.052 -8.46 2.052 -8.46S1.8 -8.448 1.8 -8.436C0.816 -8.292 0.204 -7.32 0.204 -6.372C0.204 -5.748 0.456 -5.184 0.888 -4.98C1.056 -4.908 1.224 -4.92 1.392 -4.884C1.596 -4.836 1.812 -4.632 1.812 -4.38C1.812 -4.104 1.62 -3.768 1.296 -3.768C1.044 -3.768 0.828 -3.924 0.696 -4.056C0.672 -4.092 0.6 -4.2 0.54 -4.2S0.36 -4.128 0.36 -4.068C0.36 -4.032 0.384 -4.008 0.396 -3.984C0.6 -3.72 0.936 -3.492 1.356 -3.492C1.992 -3.588 2.256 -4.128 2.256 -4.764C2.256 -4.788 2.256 -4.824 2.256 -4.848C2.232 -5.28 1.98 -5.76 1.548 -5.904C1.392 -5.952 1.236 -5.94 1.08 -5.964C0.804 -6.012 0.528 -6.18 0.456 -6.468C0.444 -6.468 0.444 -6.792 0.456 -6.792C0.516 -7.2 0.732 -7.74 1.272 -7.74C1.92 -7.74 2.352 -7.116 2.616 -6.792C2.76 -6.624 2.904 -6.456 3.012 -6.264C3.324 -5.7 3.348 -5.028 3.348 -4.392C3.348 -4.272 3.348 -4.152 3.348 -4.02C3.348 -3.288 3.084 -2.76 2.748 -2.352C2.688 -2.292 2.556 -2.112 2.46 -2.112C2.412 -2.112 2.376 -2.136 2.328 -2.148C2.244 -2.172 2.16 -2.184 2.076 -2.184C1.26 -2.184 0.588 -1.56 0.588 -0.804C0.588 -0.396 0.768 -0.144 0.984 0.084H0.996L1.176 -0.096V-0.108C0.996 -0.276 0.84 -0.468 0.84 -0.768C0.84 -1.056 1.032 -1.368 1.344 -1.368C1.344 -1.368 1.356 -1.368 1.356 -1.368C2.232 -1.308 2.76 -0.444 3.36 -0C3.42 0.048 3.516 0.132 3.6 0.132C3.636 0.132 3.672 0.108 3.708 0.084L3.972 -0.132C4.332 -0.444 4.752 -0.696 5.088 -1.032L5.556 -0.708L6.348 -0.18C6.42 -0.132 6.78 0.132 6.852 0.132C6.864 0.132 6.864 0.132 6.876 0.132C6.948 0.132 7.044 0.072 7.116 0.036C7.572 -0.192 8.256 -0.504 8.604 -0.804C9.06 -1.212 9.348 -1.788 9.444 -2.388C9.468 -2.532 9.492 -2.688 9.492 -2.844C9.492 -2.88 9.492 -2.904 9.492 -2.94C9.432 -3.504 8.88 -3.756 8.496 -4.092C8.304 -4.26 8.124 -4.476 8.088 -4.74C8.088 -4.824 8.088 -4.908 8.1 -4.992C8.16 -5.256 8.292 -5.496 8.472 -5.64L8.556 -5.472C8.64 -5.52 8.7 -5.592 8.76 -5.664L9.132 -6.06C9.192 -6.132 9.3 -6.204 9.3 -6.3C9.3 -6.3 9.3 -6.312 9.3 -6.312L9.492 -6.432L9.36 -6.672C9.312 -6.648 9.24 -6.576 9.192 -6.576C9.132 -6.576 9.096 -6.66 9.084 -6.696L8.904 -6.996C8.532 -7.608 7.992 -8.46 7.056 -8.46C6.384 -8.46 5.988 -8.052 5.652 -7.692C5.736 -8.016 5.832 -8.328 5.94 -8.628C5.904 -8.628 5.856 -8.64 5.808 -8.64C5.628 -8.64 5.604 -8.52 5.532 -8.4C5.412 -8.208 5.292 -8.004 5.22 -7.788ZM2.772 -1.932C3.144 -2.124 3.468 -2.376 3.828 -2.58L4.104 -2.748C4.188 -2.808 4.248 -2.844 4.248 -2.988C4.248 -3.036 4.248 -3.084 4.248 -3.12C4.248 -3.324 4.272 -3.516 4.272 -3.72C4.284 -3.984 4.308 -4.236 4.32 -4.5C4.332 -4.5 4.332 -5.004 4.332 -5.004S4.32 -5.94 4.26 -5.94C4.188 -6.384 4.044 -6.792 3.828 -7.14C3.792 -7.188 3.732 -7.248 3.732 -7.32C3.732 -7.404 3.816 -7.476 3.864 -7.536C4.032 -7.704 4.26 -7.812 4.488 -7.812C4.596 -7.812 4.704 -7.788 4.812 -7.74C4.896 -7.692 5.088 -7.608 5.088 -7.488C5.088 -7.44 5.064 -7.392 5.04 -7.344C4.86 -6.804 4.752 -6.264 4.752 -5.568C4.752 -5.508 4.752 -5.46 4.752 -5.412C4.86 -4.536 5.616 -3.888 5.7 -3C5.7 -3 5.676 -2.496 5.652 -2.496C5.568 -2.04 5.34 -1.632 5.004 -1.308C4.824 -1.128 4.584 -0.96 4.308 -0.96C3.948 -0.96 3.648 -1.224 3.432 -1.392L2.772 -1.932ZM5.82 -1.872C6.108 -2.34 6.312 -2.844 6.504 -3.36C6.528 -3.432 6.672 -3.816 6.672 -3.9C6.672 -3.996 6.516 -4.188 6.504 -4.212L6.18 -4.74C5.832 -5.316 5.532 -5.94 5.532 -6.684C5.532 -6.78 5.544 -6.876 5.556 -6.972C5.556 -7.044 5.556 -7.116 5.592 -7.188C5.772 -7.5 6.048 -7.932 6.456 -7.932C7.236 -7.932 7.68 -7.176 7.932 -6.708L8.22 -6.12C8.256 -6.06 8.316 -5.976 8.316 -5.916C8.316 -5.832 8.184 -5.772 8.16 -5.748C7.764 -5.352 7.32 -4.824 7.32 -4.14C7.32 -3.732 7.512 -3.528 7.764 -3.312C8.148 -3 8.868 -2.7 8.868 -2.04C8.868 -1.5 8.532 -1.092 8.22 -0.852C8.148 -0.804 7.86 -0.6 7.764 -0.6C7.752 -0.6 7.752 -0.6 7.74 -0.6C7.68 -0.612 7.32 -0.864 7.2 -0.948L6.264 -1.584C6.12 -1.68 5.976 -1.788 5.82 -1.872Z"/>
+ <path id="g115" d="M5.4288 -10.0512L5.328 -9.7056L6.048 -9.504C6.0192 -9.3168 5.9472 -9.1296 5.8752 -8.9424C5.1696 -6.984 3.312 -5.7024 1.728 -4.752C1.3824 -4.5504 0.4896 -4.0464 0.1584 -3.888C0.4176 -3.4128 0.7776 -2.7936 1.0368 -2.3616C1.0512 -2.3184 1.08 -2.2608 1.1376 -2.232C1.152 -2.232 1.2672 -2.2176 1.2672 -2.2464C2.7072 -2.7216 4.3632 -3.3264 6.0768 -3.3264C6.4944 -3.3264 6.768 -3.2256 7.0272 -2.9952C7.5024 -2.592 7.6896 -1.9872 7.6896 -1.3824C7.6896 -1.2528 7.6752 -1.1088 7.6608 -0.9648C7.4736 0.216 6.6384 1.296 5.4432 1.584C5.2416 1.6272 5.0256 1.656 4.824 1.656C4.3776 1.6416 3.7728 1.368 3.7728 0.8064C3.7872 0.6192 3.888 0.4752 4.0176 0.3456C4.248 0.1152 4.5936 -0.0864 4.5936 -0.4464C4.5936 -0.4752 4.5792 -0.5184 4.5792 -0.5472C4.5792 -0.6192 4.5504 -0.6912 4.5216 -0.7632C4.3776 -1.0512 4.0752 -1.224 3.7728 -1.224C3.1248 -1.224 2.8368 -0.5616 2.8368 -0C2.8368 0.144 2.8512 0.2736 2.88 0.4032C3.1104 1.5408 4.392 2.2464 5.7168 2.2464C6.1488 2.2464 6.5664 2.1744 6.9696 2.0448C8.1648 1.6272 9.1152 0.6048 9.4032 -0.6336C9.4752 -0.9072 9.504 -1.2096 9.504 -1.4976C9.504 -2.7792 8.928 -3.816 8.2656 -4.4784C8.1792 -4.5648 7.8048 -4.9392 7.6752 -4.9392C7.5312 -4.9392 7.2432 -4.7952 7.1856 -4.7664L6.192 -4.4064L3.9168 -3.5568C3.4992 -3.3984 3.0816 -3.2112 2.6496 -3.0816C2.4048 -3.5568 2.1312 -3.9888 1.8864 -4.4496C2.3184 -4.536 3.1968 -4.9248 3.4704 -5.0256C5.328 -5.832 7.0416 -6.9696 8.1936 -8.5968C8.3232 -8.7696 8.4672 -8.9568 8.5536 -9.1584L5.4288 -10.0512Z"/>
+ <path id="g116" d="M5.916 -1.38C5.424 -1.104 5.076 -0.876 4.296 -0.876C3.984 -0.876 3.66 -0.924 3.384 -1.008C2.268 -1.344 1.428 -2.292 1.14 -3.408C1.056 -3.72 1.032 -4.044 1.032 -4.356C1.032 -4.716 1.068 -5.328 1.104 -5.604L1.176 -6.048C1.32 -6.78 1.62 -7.68 2.376 -7.992C2.472 -8.028 2.568 -8.052 2.664 -8.076C2.676 -8.076 3.096 -8.124 3.096 -8.1C3.276 -8.076 3.444 -8.016 3.6 -7.944C3.696 -7.896 3.768 -7.836 3.864 -7.788V-7.764C3.672 -7.692 3.264 -7.428 3.144 -7.356C2.772 -7.08 2.292 -6.708 2.292 -6.096C2.292 -5.604 2.676 -5.244 2.976 -4.884C3.168 -4.668 3.324 -4.404 3.336 -4.104C3.336 -3.816 3.168 -3.456 2.856 -3.456C2.844 -3.456 2.832 -3.456 2.82 -3.456C2.712 -3.456 2.592 -3.528 2.532 -3.588C2.256 -3.828 2.22 -4.248 2.1 -4.572L1.848 -4.5C1.872 -4.368 1.92 -4.248 1.968 -4.128C2.172 -3.66 2.496 -3.084 3.156 -3.084C3.756 -3.084 4.188 -3.576 4.188 -4.188C4.188 -4.392 4.14 -4.596 4.056 -4.788C4.02 -4.836 3.888 -5.064 3.888 -5.124C3.888 -5.208 4.056 -5.268 4.116 -5.268C4.116 -5.268 4.128 -5.268 4.128 -5.268C4.164 -5.268 4.308 -5.124 4.356 -5.076L4.86 -4.596C4.908 -4.548 5.004 -4.428 5.076 -4.428C5.136 -4.428 5.184 -4.512 5.22 -4.548L5.592 -4.944C5.652 -5.016 5.724 -5.1 5.796 -5.172C5.832 -5.208 5.88 -5.244 5.88 -5.292C5.88 -5.292 5.88 -5.304 5.88 -5.304C5.88 -5.376 5.784 -5.448 5.736 -5.496L5.268 -6C5.22 -6.06 5.148 -6.168 5.064 -6.168C5.064 -6.168 5.052 -6.168 5.052 -6.168C5.004 -6.168 4.74 -6 4.74 -6C4.668 -5.964 3.756 -5.4 3.732 -5.388C3.696 -5.388 3.672 -5.436 3.648 -5.46C3.444 -5.748 3.156 -6.228 3.156 -6.6C3.156 -7.08 3.528 -7.308 3.828 -7.476C3.888 -7.5 3.984 -7.584 4.068 -7.584C4.164 -7.584 4.284 -7.452 4.32 -7.428L4.716 -7.128C4.788 -7.08 4.884 -6.972 4.968 -6.972C5.004 -6.972 5.04 -6.984 5.076 -7.008C5.136 -7.044 5.688 -7.356 5.904 -7.452V-7.476L5.112 -8.076C5.064 -8.124 4.884 -8.268 4.8 -8.268C4.74 -8.268 4.68 -8.22 4.632 -8.196C4.56 -8.16 4.188 -7.932 4.116 -7.932S3.972 -8.004 3.912 -8.052C3.636 -8.256 3.348 -8.46 2.88 -8.46C2.604 -8.46 2.316 -8.388 2.076 -8.28C1.26 -7.908 0.804 -7.092 0.528 -6.276C0.336 -5.676 0.24 -5.04 0.216 -4.416C0.204 -4.416 0.204 -3.624 0.216 -3.624C0.372 -1.896 1.44 -0.24 3.108 0.096C3.156 0.108 3.756 0.192 3.756 0.144C3.888 0.12 4.02 0.012 4.14 -0.06L4.884 -0.504L5.616 -0.936C5.748 -1.008 5.928 -1.044 5.928 -1.248C5.928 -1.296 5.916 -1.344 5.916 -1.38Z"/>
+ <path id="g117" d="M6.168 -8.46C6.168 -8.448 6.168 -8.448 6.168 -8.436C6.168 -8.376 6.12 -8.352 6.072 -8.316L5.736 -8.1L4.656 -7.404C4.536 -7.296 4.368 -7.248 4.272 -7.116V-1.824C4.272 -1.788 4.272 -1.752 4.272 -1.716C4.272 -1.596 4.188 -1.584 4.104 -1.548C3.948 -1.476 3.804 -1.392 3.648 -1.32L3 -1.008C2.964 -0.996 2.76 -0.888 2.724 -0.888C2.688 -0.9 2.652 -0.936 2.628 -0.96C2.568 -1.02 1.752 -1.908 1.752 -1.908C2.784 -2.244 3.84 -3.036 3.84 -4.416C3.84 -4.512 3.84 -4.608 3.84 -4.716C3.852 -4.716 3.864 -5.46 3.864 -5.46S3.852 -5.94 3.84 -5.94C3.804 -6.312 3.708 -6.696 3.504 -7.02C3.204 -7.476 2.664 -7.872 2.04 -7.872C1.044 -7.872 0.204 -7.128 0.204 -6.24C0.204 -5.784 0.36 -5.4 0.624 -5.196C1.044 -4.86 1.884 -5.112 1.884 -4.38C1.884 -4.068 1.728 -3.732 1.44 -3.732C1.224 -3.732 0.984 -3.924 0.744 -3.924C0.552 -3.924 0.372 -3.78 0.372 -3.552C0.372 -3.204 0.804 -3.048 1.152 -3.048C1.176 -3.048 1.2 -3.048 1.224 -3.048C1.884 -3.156 2.148 -3.78 2.148 -4.44C2.148 -4.956 2.028 -5.388 1.74 -5.628C1.536 -5.808 1.224 -5.784 0.984 -5.82C0.756 -5.844 0.528 -5.964 0.528 -6.252C0.528 -6.78 1.044 -7.128 1.452 -7.128C1.608 -7.128 1.764 -7.08 1.884 -7.032C2.76 -6.636 2.952 -5.592 2.952 -4.584C2.952 -4.5 2.952 -4.428 2.952 -4.344C2.952 -4.152 2.952 -3.96 2.904 -3.768C2.724 -3 2.208 -2.316 1.452 -2.052C1.056 -1.92 0.624 -1.908 0.204 -1.908C0.204 -1.86 0.192 -1.8 0.192 -1.752C0.192 -1.572 0.336 -1.5 0.444 -1.416L0.732 -1.14C0.9 -0.996 1.068 -0.852 1.068 -0.576C1.068 -0.48 1.056 -0.384 1.032 -0.3C1.02 -0.228 0.972 -0.132 0.972 -0.06C0.972 -0.024 0.984 -0 1.008 0.024C1.068 0.06 1.152 0.132 1.224 0.144C1.296 0.144 2.1 -0.264 2.328 -0.384L4.284 -1.332C4.32 -1.224 4.38 -1.128 4.428 -1.032C4.5 -0.888 4.704 -0.54 4.74 -0.396C4.752 -0.396 4.752 -0.288 4.752 -0.288S4.752 -0.18 4.74 -0.18C4.716 -0.18 4.668 -0.036 4.68 -0.036C4.68 0.036 4.764 0.108 4.812 0.156H4.824L6.06 -0.84L6.408 -1.128C6.456 -1.164 6.564 -1.224 6.564 -1.284C6.564 -1.356 6.468 -1.452 6.432 -1.488C6.276 -1.416 6.168 -1.32 5.964 -1.32C5.616 -1.32 5.352 -1.56 5.352 -1.956C5.352 -2.04 5.352 -2.112 5.352 -2.196V-6.756C5.352 -6.84 5.352 -6.936 5.352 -7.02C5.352 -7.656 5.772 -7.764 6.156 -8.052C6.168 -7.968 6.24 -7.92 6.312 -7.92C6.42 -7.92 6.528 -8.016 6.528 -8.136C6.528 -8.316 6.36 -8.46 6.168 -8.46Z"/>
+ <path id="g118" d="M7.5168 -10.0512L5.5296 -7.9344V-10.0512C5.4 -10.008 5.2704 -9.936 5.1408 -9.8784L4.4784 -9.5616C3.6864 -9.2016 2.9088 -8.8416 2.2032 -8.3232C1.1376 -7.56 0.1584 -6.4656 0.1584 -4.8816C0.1584 -4.5648 0.1872 -4.2336 0.2448 -3.9312C0.5328 -2.4048 1.4976 -0.9936 2.9088 -0.288C3.4848 -0.0288 4.1472 0.2016 4.9248 0.2016C5.2272 0.2016 5.4576 0.144 5.7312 0.0864C6.7536 -0.216 7.5456 -1.0224 8.2368 -1.8C8.9136 -2.592 9.7776 -3.4992 10.0512 -4.536C10.1232 -4.7808 10.1664 -5.04 10.1664 -5.2992C10.1664 -5.3712 10.1664 -5.4576 10.152 -5.5296C10.0656 -6.0768 9.7488 -6.5808 9.4608 -7.0416C9.1728 -7.5168 8.8704 -7.9632 8.5392 -8.4096C8.1648 -8.9424 7.776 -9.4464 7.5168 -10.0512ZM3.8448 -8.8704V-5.688C3.8448 -5.4144 3.8592 -5.1264 3.8592 -4.8384C3.8592 -4.0464 3.744 -3.4128 3.4272 -2.8512C3.3408 -2.664 3.2256 -2.5056 3.1248 -2.3184C2.9808 -2.4048 2.8656 -2.5344 2.7504 -2.664C2.088 -3.3264 1.5552 -4.4928 1.5552 -5.5584C1.5552 -6.8832 2.3184 -7.8336 3.1248 -8.424C3.3552 -8.5968 3.6 -8.7264 3.8448 -8.8704ZM3.4416 -2.0448L5.5152 -4.464C5.5728 -5.4 5.4864 -6.4368 5.544 -7.3584C5.7744 -7.6608 6.0336 -7.9344 6.2928 -8.2224C6.624 -7.8912 6.8976 -7.5168 7.1712 -7.1424C7.5456 -6.624 8.3232 -5.544 8.5968 -4.9968C8.712 -4.7808 8.784 -4.6656 8.784 -4.3632C8.784 -4.176 8.7408 -3.9744 8.7264 -3.8016C8.568 -2.304 7.5456 -1.224 6.0192 -1.224C5.1408 -1.224 4.4064 -1.512 3.7296 -1.872C3.6288 -1.9296 3.5424 -2.0016 3.4416 -2.0448Z"/>
+ <path id="g119" d="M7.5312 -10.0512C7.0128 -9.7632 6.4512 -9.648 5.8896 -9.648C5.4864 -9.648 5.1408 -9.7056 4.8096 -9.7776C4.7232 -9.792 4.608 -9.8352 4.5072 -9.8352S4.3056 -9.7632 4.2336 -9.7344L3.7872 -9.504C3.384 -9.3024 2.5632 -8.9136 2.232 -8.6688C0.8928 -7.7328 0.1584 -6.0768 0.1584 -4.4352C0.1584 -2.6784 0.9936 -1.3536 2.0736 -0.576C2.6928 -0.1296 3.5424 0.2016 4.5216 0.2016C6.3936 0.2016 8.2656 -0.9216 8.2656 -2.7216C8.1504 -2.6352 8.0496 -2.52 7.9344 -2.4192C7.2432 -1.8288 6.2208 -1.368 5.1264 -1.368C4.3776 -1.368 3.7296 -1.5984 3.2112 -1.9008C3.0672 -1.9872 2.9376 -2.1024 2.7936 -2.1744V-2.2032C3.3552 -2.5632 3.9168 -2.9376 4.4496 -3.3264L4.4784 -3.7152V-8.1648C5.0256 -8.0496 5.9328 -7.8912 6.4944 -7.8912C6.696 -7.8912 6.912 -7.92 7.0848 -8.064C7.4304 -8.352 7.488 -8.8848 7.5168 -9.3024C7.5312 -9.4752 7.5456 -9.6336 7.5456 -9.8064C7.5456 -9.8928 7.5456 -9.9792 7.5312 -10.0512ZM2.7936 -8.5824V-3.2976V-3.0672C2.7936 -2.7504 2.6784 -2.6208 2.52 -2.4336C1.8 -3.1536 1.2384 -4.1328 1.2384 -5.4432C1.2384 -6.8256 1.872 -8.0928 2.7936 -8.5824Z"/>
+ <use id="g120" transform="scale(1.2)" xlink:href="#g2"/>
+ <use id="g121" transform="scale(1.2)" xlink:href="#g50"/>
+ <use id="g122" transform="scale(1.2)" xlink:href="#g68"/>
+ <use id="g123" transform="scale(1.2)" xlink:href="#g67"/>
+ <use id="g124" transform="scale(1.2)" xlink:href="#g117"/>
+ <use id="g125" transform="scale(1.2)" xlink:href="#g37"/>
+ <use id="g126" transform="scale(1.2)" xlink:href="#g90"/>
+ <use id="g127" transform="scale(1.2)" xlink:href="#g116"/>
+ <use id="g128" transform="scale(1.2)" xlink:href="#g109"/>
+ <use id="g129" transform="scale(1.2)" xlink:href="#g21"/>
+ <use id="g130" transform="scale(1.2)" xlink:href="#g69"/>
+ <use id="g131" transform="scale(1.2)" xlink:href="#g16"/>
+ <use id="g132" transform="scale(1.2)" xlink:href="#g86"/>
+ <use id="g133" transform="scale(1.2)" xlink:href="#g63"/>
+ <use id="g134" transform="scale(1.2)" xlink:href="#g94"/>
+ <use id="g135" transform="scale(1.2)" xlink:href="#g4"/>
+ <use id="g136" transform="scale(1.2)" xlink:href="#g93"/>
+ <use id="g137" transform="scale(1.2)" xlink:href="#g30"/>
+ <use id="g138" transform="scale(1.2)" xlink:href="#g36"/>
+ <use id="g139" transform="scale(1.2)" xlink:href="#g29"/>
+ <use id="g140" transform="scale(1.2)" xlink:href="#g31"/>
+ <use id="g141" transform="scale(1.2)" xlink:href="#g39"/>
+ <use id="g142" transform="scale(1.2)" xlink:href="#g92"/>
+ <use id="g143" transform="scale(1.2)" xlink:href="#g15"/>
+ <use id="g144" transform="scale(1.2)" xlink:href="#g34"/>
+ <use id="g145" transform="scale(1.2)" xlink:href="#g42"/>
+ <use id="g146" transform="scale(1.2)" xlink:href="#g6"/>
+ <use id="g147" transform="scale(1.2)" xlink:href="#g13"/>
+ <use id="g148" transform="scale(1.2)" xlink:href="#g47"/>
+ <use id="g149" transform="scale(1.2)" xlink:href="#g49"/>
+ <use id="g150" transform="scale(1.2)" xlink:href="#g24"/>
+ <use id="g151" transform="scale(1.2)" xlink:href="#g38"/>
+ <use id="g152" transform="scale(1.2)" xlink:href="#g54"/>
+ <use id="g153" transform="scale(1.2)" xlink:href="#g3"/>
+ <use id="g154" transform="scale(1.2)" xlink:href="#g88"/>
+ <use id="g155" transform="scale(1.2)" xlink:href="#g85"/>
+ <use id="g156" transform="scale(1.2)" xlink:href="#g104"/>
+ <use id="g157" transform="scale(1.2)" xlink:href="#g14"/>
+ <use id="g158" transform="scale(1.2)" xlink:href="#g35"/>
+ <use id="g159" transform="scale(1.2)" xlink:href="#g102"/>
+ <use id="g160" transform="scale(1.2)" xlink:href="#g103"/>
+ <use id="g161" transform="scale(1.20026)" xlink:href="#g71"/>
+ </defs>
+ <g id="page1">
+ <use x="-13.4527" xlink:href="#g87" y="63.84"/>
+ <use x="-2.82872" xlink:href="#g81" y="63.84"/>
+ <use x="2.30009" xlink:href="#g44" y="63.84"/>
+ <use x="7.26012" xlink:href="#g45" y="63.84"/>
+ <use x="12.2201" xlink:href="#g43" y="63.84"/>
+ <use x="19.8201" xlink:href="#g43" y="63.84"/>
+ <use x="27.4202" xlink:href="#g46" y="63.84"/>
+ <use x="36.7806" xlink:href="#g89" y="63.84"/>
+ <use x="39.8918" xlink:href="#g64" y="63.84"/>
+ <use x="42.523" xlink:href="#g22" y="63.84"/>
+ <use x="52.2923" xlink:href="#g89" y="63.84"/>
+ <use x="56.2035" xlink:href="#g83" y="63.84"/>
+ <use x="60.6082" xlink:href="#g43" y="63.84"/>
+ <use x="68.2083" xlink:href="#g55" y="63.84"/>
+ <use x="76.217" xlink:href="#g100" y="63.84"/>
+ <use x="85.0487" xlink:href="#g59" y="63.84"/>
+ <use x="90.2311" xlink:href="#g26" y="63.84"/>
+ <use x="93.2535" xlink:href="#g64" y="63.84"/>
+ <use x="95.8847" xlink:href="#g83" y="63.84"/>
+ <use x="100.289" xlink:href="#g44" y="63.84"/>
+ <use x="105.25" xlink:href="#g59" y="63.84"/>
+ <use x="114.912" xlink:href="#g59" y="63.84"/>
+ <use x="120.095" xlink:href="#g45" y="63.84"/>
+ <use x="125.055" xlink:href="#g22" y="63.84"/>
+ <use x="130.344" xlink:href="#g64" y="63.84"/>
+ <use x="132.975" xlink:href="#g7" y="63.84"/>
+ <use x="136.286" xlink:href="#g81" y="63.84"/>
+ <use x="141.415" xlink:href="#g100" y="63.84"/>
+ <use x="145.766" xlink:href="#g45" y="63.84"/>
+ <use x="150.726" xlink:href="#g43" y="63.84"/>
+ <use x="162.806" xlink:href="#g26" y="63.84"/>
+ <use x="165.829" xlink:href="#g81" y="63.84"/>
+ <use x="170.958" xlink:href="#g100" y="63.84"/>
+ <use x="175.309" xlink:href="#g83" y="63.84"/>
+ <use x="179.714" xlink:href="#g43" y="63.84"/>
+ <use x="191.794" xlink:href="#g64" y="63.84"/>
+ <use x="194.425" xlink:href="#g56" y="63.84"/>
+ <use x="199.714" xlink:href="#g89" y="63.84"/>
+ <use x="203.625" xlink:href="#g45" y="63.84"/>
+ <use x="208.585" xlink:href="#g43" y="63.84"/>
+ <use x="220.666" xlink:href="#g82" y="63.84"/>
+ <use x="225.715" xlink:href="#g45" y="63.84"/>
+ <use x="230.675" xlink:href="#g81" y="63.84"/>
+ <use x="235.803" xlink:href="#g22" y="63.84"/>
+ <use x="245.573" xlink:href="#g81" y="63.84"/>
+ <use x="250.701" xlink:href="#g43" y="63.84"/>
+ <use x="258.301" xlink:href="#g44" y="63.84"/>
+ <use x="263.262" xlink:href="#g64" y="63.84"/>
+ <use x="265.893" xlink:href="#g59" y="63.84"/>
+ <use x="-13.4527" xlink:href="#g89" y="77.6107"/>
+ <use x="-9.54154" xlink:href="#g45" y="77.6107"/>
+ <use x="-4.58152" xlink:href="#g44" y="77.6107"/>
+ <use x="0.378502" xlink:href="#g7" y="77.6107"/>
+ <use x="9.1006" xlink:href="#g55" y="77.6107"/>
+ <use x="17.1094" xlink:href="#g75" y="77.6107"/>
+ <use x="20.9542" xlink:href="#g75" y="77.6107"/>
+ <use x="24.799" xlink:href="#g59" y="77.6107"/>
+ <use x="29.9814" xlink:href="#g7" y="77.6107"/>
+ <use x="33.2926" xlink:href="#g81" y="77.6107"/>
+ <use x="38.4214" xlink:href="#g100" y="77.6107"/>
+ <use x="42.7726" xlink:href="#g83" y="77.6107"/>
+ <use x="47.1774" xlink:href="#g111" y="77.6107"/>
+ <use x="52.5374" xlink:href="#g70" y="77.6107"/>
+ <use x="61.9483" xlink:href="#g48" y="77.6107"/>
+ <use x="71.3643" xlink:href="#g81" y="77.6107"/>
+ <use x="76.4931" xlink:href="#g100" y="77.6107"/>
+ <use x="80.8443" xlink:href="#g83" y="77.6107"/>
+ <use x="85.2491" xlink:href="#g43" y="77.6107"/>
+ <use x="98.26" xlink:href="#g64" y="77.6107"/>
+ <use x="100.891" xlink:href="#g56" y="77.6107"/>
+ <use x="106.18" xlink:href="#g89" y="77.6107"/>
+ <use x="110.091" xlink:href="#g45" y="77.6107"/>
+ <use x="115.051" xlink:href="#g43" y="77.6107"/>
+ <use x="128.062" xlink:href="#g23" y="77.6107"/>
+ <use x="136.551" xlink:href="#g26" y="77.6107"/>
+ <use x="139.573" xlink:href="#g81" y="77.6107"/>
+ <use x="144.702" xlink:href="#g100" y="77.6107"/>
+ <use x="154.464" xlink:href="#g89" y="77.6107"/>
+ <use x="157.576" xlink:href="#g64" y="77.6107"/>
+ <use x="160.207" xlink:href="#g7" y="77.6107"/>
+ <use x="168.929" xlink:href="#g59" y="77.6107"/>
+ <use x="174.111" xlink:href="#g43" y="77.6107"/>
+ <use x="181.711" xlink:href="#g83" y="77.6107"/>
+ <use x="186.116" xlink:href="#g7" y="77.6107"/>
+ <use x="194.838" xlink:href="#g75" y="77.6107"/>
+ <use x="198.683" xlink:href="#g81" y="77.6107"/>
+ <use x="203.812" xlink:href="#g44" y="77.6107"/>
+ <use x="214.183" xlink:href="#g89" y="77.6107"/>
+ <use x="218.094" xlink:href="#g83" y="77.6107"/>
+ <use x="222.499" xlink:href="#g77" y="77.6107"/>
+ <use x="228.89" xlink:href="#g83" y="77.6107"/>
+ <use x="233.295" xlink:href="#g7" y="77.6107"/>
+ <use x="236.606" xlink:href="#g45" y="77.6107"/>
+ <use x="241.566" xlink:href="#g83" y="77.6107"/>
+ <use x="245.971" xlink:href="#g100" y="77.6107"/>
+ <use x="255.733" xlink:href="#g59" y="77.6107"/>
+ <use x="260.915" xlink:href="#g22" y="77.6107"/>
+ <use x="266.204" xlink:href="#g64" y="77.6107"/>
+ <use x="268.835" xlink:href="#g72" y="77.6107"/>
+ <use x="-13.4527" xlink:href="#g56" y="91.3815"/>
+ <use x="-8.16395" xlink:href="#g64" y="91.3815"/>
+ <use x="-5.53273" xlink:href="#g89" y="91.3815"/>
+ <use x="-1.62153" xlink:href="#g75" y="91.3815"/>
+ <use x="2.22327" xlink:href="#g64" y="91.3815"/>
+ <use x="4.8545" xlink:href="#g44" y="91.3815"/>
+ <use x="9.81452" xlink:href="#g17" y="91.3815"/>
+ <use x="20.5198" xlink:href="#g83" y="91.3815"/>
+ <use x="24.9246" xlink:href="#g26" y="91.3815"/>
+ <use x="27.947" xlink:href="#g64" y="91.3815"/>
+ <use x="30.5783" xlink:href="#g7" y="91.3815"/>
+ <use x="33.8895" xlink:href="#g70" y="91.3815"/>
+ <use x="42.39" xlink:href="#g52" y="91.3815"/>
+ <use x="52.614" xlink:href="#g83" y="91.3815"/>
+ <use x="57.0188" xlink:href="#g22" y="91.3815"/>
+ <use x="66.8081" xlink:href="#g22" y="91.3815"/>
+ <use x="72.0969" xlink:href="#g64" y="91.3815"/>
+ <use x="74.7281" xlink:href="#g59" y="91.3815"/>
+ <use x="79.9105" xlink:href="#g43" y="91.3815"/>
+ <use x="92.0111" xlink:href="#g7" y="91.3815"/>
+ <use x="95.3223" xlink:href="#g83" y="91.3815"/>
+ <use x="99.727" xlink:href="#g43" y="91.3815"/>
+ <use x="107.327" xlink:href="#g57" y="91.3815"/>
+ <use x="115.816" xlink:href="#g100" y="91.3815"/>
+ <use x="124.668" xlink:href="#g64" y="91.3815"/>
+ <use x="127.299" xlink:href="#g44" y="91.3815"/>
+ <use x="132.259" xlink:href="#g75" y="91.3815"/>
+ <use x="136.104" xlink:href="#g64" y="91.3815"/>
+ <use x="138.735" xlink:href="#g22" y="91.3815"/>
+ <use x="144.024" xlink:href="#g45" y="91.3815"/>
+ <use x="148.984" xlink:href="#g44" y="91.3815"/>
+ <use x="153.944" xlink:href="#g7" y="91.3815"/>
+ <use x="161.755" xlink:href="#g45" y="91.3815"/>
+ <use x="166.715" xlink:href="#g7" y="91.3815"/>
+ <use x="174.527" xlink:href="#g26" y="91.3815"/>
+ <use x="177.55" xlink:href="#g59" y="91.3815"/>
+ <use x="182.732" xlink:href="#g1" y="91.3815"/>
+ <use x="190.981" xlink:href="#g100" y="91.3815"/>
+ <use x="195.332" xlink:href="#g83" y="91.3815"/>
+ <use x="204.237" xlink:href="#g83" y="91.3815"/>
+ <use x="208.642" xlink:href="#g7" y="91.3815"/>
+ <use x="216.454" xlink:href="#g23" y="91.3815"/>
+ <use x="224.943" xlink:href="#g26" y="91.3815"/>
+ <use x="227.965" xlink:href="#g81" y="91.3815"/>
+ <use x="233.094" xlink:href="#g100" y="91.3815"/>
+ <use x="241.946" xlink:href="#g43" y="91.3815"/>
+ <use x="249.546" xlink:href="#g59" y="91.3815"/>
+ <use x="254.728" xlink:href="#g17" y="91.3815"/>
+ <use x="260.933" xlink:href="#g44" y="91.3815"/>
+ <use x="265.893" xlink:href="#g59" y="91.3815"/>
+ <use x="-13.4527" xlink:href="#g59" y="105.043"/>
+ <use x="-8.27034" xlink:href="#g26" y="105.043"/>
+ <use x="-5.24794" xlink:href="#g64" y="105.043"/>
+ <use x="-2.61671" xlink:href="#g82" y="105.043"/>
+ <use x="2.43208" xlink:href="#g45" y="105.043"/>
+ <use x="7.3921" xlink:href="#g59" y="105.043"/>
+ <use x="12.5745" xlink:href="#g43" y="105.043"/>
+ <use x="24.7919" xlink:href="#g83" y="105.043"/>
+ <use x="29.1967" xlink:href="#g100" y="105.043"/>
+ <use x="33.5479" xlink:href="#g59" y="105.043"/>
+ <use x="38.7303" xlink:href="#g7" y="105.043"/>
+ <use x="46.6589" xlink:href="#g28" y="105.043"/>
+ <use x="51.9477" xlink:href="#g81" y="105.043"/>
+ <use x="57.0765" xlink:href="#g26" y="105.043"/>
+ <use x="60.0989" xlink:href="#g45" y="105.043"/>
+ <use x="65.0589" xlink:href="#g58" y="105.043"/>
+ <use x="73.8677" xlink:href="#g7" y="105.043"/>
+ <use x="81.7963" xlink:href="#g45" y="105.043"/>
+ <use x="86.7563" xlink:href="#g7" y="105.043"/>
+ <use x="94.6849" xlink:href="#g32" y="105.043"/>
+ <use x="103.005" xlink:href="#g64" y="105.043"/>
+ <use x="105.636" xlink:href="#g89" y="105.043"/>
+ <use x="108.747" xlink:href="#g64" y="105.043"/>
+ <use x="115.996" xlink:href="#g83" y="105.043"/>
+ <use x="120.401" xlink:href="#g44" y="105.043"/>
+ <use x="125.361" xlink:href="#g64" y="105.043"/>
+ <use x="127.992" xlink:href="#g43" y="105.043"/>
+ <use x="140.209" xlink:href="#g59" y="105.043"/>
+ <use x="145.392" xlink:href="#g22" y="105.043"/>
+ <use x="155.298" xlink:href="#g43" y="105.043"/>
+ <use x="162.898" xlink:href="#g64" y="105.043"/>
+ <use x="165.529" xlink:href="#g44" y="105.043"/>
+ <use x="170.489" xlink:href="#g64" y="105.043"/>
+ <use x="173.12" xlink:href="#g43" y="105.043"/>
+ <use x="185.338" xlink:href="#g27" y="105.043"/>
+ <use x="193.347" xlink:href="#g44" y="105.043"/>
+ <use x="198.307" xlink:href="#g64" y="105.043"/>
+ <use x="200.938" xlink:href="#g59" y="105.043"/>
+ <use x="206.12" xlink:href="#g43" y="105.043"/>
+ <use x="218.338" xlink:href="#g82" y="105.043"/>
+ <use x="223.386" xlink:href="#g45" y="105.043"/>
+ <use x="228.346" xlink:href="#g64" y="105.043"/>
+ <use x="230.978" xlink:href="#g111" y="105.043"/>
+ <use x="240.955" xlink:href="#g44" y="105.043"/>
+ <use x="245.915" xlink:href="#g81" y="105.043"/>
+ <use x="251.044" xlink:href="#g84" y="105.043"/>
+ <use x="256.475" xlink:href="#g100" y="105.043"/>
+ <use x="260.826" xlink:href="#g45" y="105.043"/>
+ <use x="265.786" xlink:href="#g22" y="105.043"/>
+ <use x="-13.4527" xlink:href="#g81" y="118.705"/>
+ <use x="-8.32393" xlink:href="#g40" y="118.705"/>
+ <use x="-3.03514" xlink:href="#g26" y="118.705"/>
+ <use x="-0.0127346" xlink:href="#g59" y="118.705"/>
+ <use x="5.16967" xlink:href="#g7" y="118.705"/>
+ <use x="8.48086" xlink:href="#g64" y="118.705"/>
+ <use x="11.1121" xlink:href="#g81" y="118.705"/>
+ <use x="16.2409" xlink:href="#g44" y="118.705"/>
+ <use x="21.2009" xlink:href="#g83" y="118.705"/>
+ <use x="25.6057" xlink:href="#g43" y="118.705"/>
+ <use x="38.0057" xlink:href="#g75" y="118.705"/>
+ <use x="41.8505" xlink:href="#g81" y="118.705"/>
+ <use x="46.9793" xlink:href="#g100" y="118.705"/>
+ <use x="51.3305" xlink:href="#g57" y="118.705"/>
+ <use x="59.8193" xlink:href="#g100" y="118.705"/>
+ <use x="64.1705" xlink:href="#g83" y="118.705"/>
+ <use x="68.5753" xlink:href="#g43" y="118.705"/>
+ <use x="76.1753" xlink:href="#g82" y="118.705"/>
+ <use x="81.2241" xlink:href="#g45" y="118.705"/>
+ <use x="86.1842" xlink:href="#g83" y="118.705"/>
+ <use x="95.3889" xlink:href="#g89" y="118.705"/>
+ <use x="99.3001" xlink:href="#g45" y="118.705"/>
+ <use x="104.26" xlink:href="#g89" y="118.705"/>
+ <use x="108.171" xlink:href="#g75" y="118.705"/>
+ <use x="112.016" xlink:href="#g64" y="118.705"/>
+ <use x="114.647" xlink:href="#g56" y="118.705"/>
+ <use x="119.936" xlink:href="#g64" y="118.705"/>
+ <use x="122.567" xlink:href="#g7" y="118.705"/>
+ <use x="130.679" xlink:href="#g26" y="118.705"/>
+ <use x="133.701" xlink:href="#g59" y="118.705"/>
+ <use x="138.883" xlink:href="#g1" y="118.705"/>
+ <use x="147.132" xlink:href="#g100" y="118.705"/>
+ <use x="151.483" xlink:href="#g64" y="118.705"/>
+ <use x="154.115" xlink:href="#g111" y="118.705"/>
+ <use x="-13.4527" xlink:href="#g161" y="249.832"/>
+ <use x="47.1072" xlink:href="#g138" y="203.607"/>
+ <use x="50.0585" xlink:href="#g134" y="203.607"/>
+ <use x="59.8848" xlink:href="#g118" y="203.607"/>
+ <use x="70.3073" xlink:href="#g61" y="203.607"/>
+ <use x="75.5377" xlink:href="#g112" y="203.607"/>
+ <use x="82.4801" xlink:href="#g106" y="203.607"/>
+ <use x="87.0161" xlink:href="#g8" y="203.607"/>
+ <use x="90.7353" xlink:href="#g121" y="203.607"/>
+ <use x="100.968" xlink:href="#g133" y="203.607"/>
+ <use x="105.852" xlink:href="#g134" y="203.607"/>
+ <use x="110.086" xlink:href="#g145" y="203.607"/>
+ <use x="120.362" xlink:href="#g80" y="203.607"/>
+ <use x="128.702" xlink:href="#g8" y="203.607"/>
+ <use x="132.422" xlink:href="#g113" y="203.607"/>
+ <use x="139.101" xlink:href="#g112" y="203.607"/>
+ <use x="146.043" xlink:href="#g106" y="203.607"/>
+ <use x="150.579" xlink:href="#g8" y="203.607"/>
+ <use x="154.298" xlink:href="#g121" y="203.607"/>
+ <use x="164.531" xlink:href="#g133" y="203.607"/>
+ <use x="169.415" xlink:href="#g130" y="203.607"/>
+ <use x="174.677" xlink:href="#g158" y="203.607"/>
+ <use x="185.621" xlink:href="#g80" y="203.607"/>
+ <use x="193.961" xlink:href="#g101" y="203.607"/>
+ <use x="200.64" xlink:href="#g61" y="203.607"/>
+ <use x="205.871" xlink:href="#g79" y="203.607"/>
+ <use x="210.799" xlink:href="#g106" y="203.607"/>
+ <use x="215.335" xlink:href="#g62" y="203.607"/>
+ <use x="222.256" xlink:href="#g76" y="203.607"/>
+ <use x="225.856" xlink:href="#g110" y="203.607"/>
+ <use x="231.81" xlink:href="#g60" y="203.607"/>
+ <use x="238.55" xlink:href="#g101" y="203.607"/>
+ <use x="250.822" xlink:href="#g148" y="203.607"/>
+ <use x="256.911" xlink:href="#g142" y="203.607"/>
+ <use x="262.489" xlink:href="#g133" y="203.607"/>
+ <use x="272.965" xlink:href="#g133" y="203.607"/>
+ <use x="277.849" xlink:href="#g130" y="203.607"/>
+ <use x="283.112" xlink:href="#g158" y="203.607"/>
+ <use x="294.055" xlink:href="#g119" y="203.607"/>
+ <use x="302.576" xlink:href="#g8" y="203.607"/>
+ <use x="306.295" xlink:href="#g110" y="203.607"/>
+ <use x="312.25" xlink:href="#g18" y="203.607"/>
+ <use x="319.291" xlink:href="#g76" y="203.607"/>
+ <use x="322.892" xlink:href="#g107" y="203.607"/>
+ <use x="327.337" xlink:href="#g101" y="203.607"/>
+ <use x="334.016" xlink:href="#g61" y="203.607"/>
+ <use x="339.247" xlink:href="#g74" y="203.607"/>
+ <use x="351.006" xlink:href="#g146" y="203.607"/>
+ <use x="353.811" xlink:href="#g138" y="203.607"/>
+ <use x="356.763" xlink:href="#g142" y="203.607"/>
+ <use x="362.34" xlink:href="#g133" y="203.607"/>
+ <use x="372.817" xlink:href="#g133" y="203.607"/>
+ <use x="377.701" xlink:href="#g138" y="203.607"/>
+ <use x="380.652" xlink:href="#g134" y="203.607"/>
+ <use x="47.1072" xlink:href="#g136" y="219.015"/>
+ <use x="52.7516" xlink:href="#g134" y="219.015"/>
+ <use x="56.9855" xlink:href="#g131" y="219.015"/>
+ <use x="61.892" xlink:href="#g145" y="219.015"/>
+ <use x="66.576" xlink:href="#g156" y="219.015"/>
+ <use x="71.8383" xlink:href="#g148" y="219.015"/>
+ <use x="77.9274" xlink:href="#g155" y="219.015"/>
+ <use x="85.2962" xlink:href="#g140" y="219.015"/>
+ <use x="88.3362" xlink:href="#g138" y="219.015"/>
+ <use x="91.2875" xlink:href="#g155" y="219.015"/>
+ <use x="98.6563" xlink:href="#g154" y="219.015"/>
+ <use x="104.256" xlink:href="#g134" y="219.015"/>
+ <use x="108.49" xlink:href="#g142" y="219.015"/>
+ <use x="118.515" xlink:href="#g126" y="219.015"/>
+ <use x="127.48" xlink:href="#g140" y="219.015"/>
+ <use x="130.52" xlink:href="#g130" y="219.015"/>
+ <use x="135.782" xlink:href="#g149" y="219.015"/>
+ <use x="141.311" xlink:href="#g138" y="219.015"/>
+ <use x="144.262" xlink:href="#g134" y="219.015"/>
+ <use x="148.496" xlink:href="#g145" y="219.015"/>
+ <use x="153.18" xlink:href="#g138" y="219.015"/>
+ <use x="156.131" xlink:href="#g142" y="219.015"/>
+ <use x="161.709" xlink:href="#g154" y="219.015"/>
+ <use x="167.309" xlink:href="#g145" y="219.015"/>
+ <use x="171.993" xlink:href="#g148" y="219.015"/>
+ <use x="178.082" xlink:href="#g141" y="219.015"/>
+ <use x="186.388" xlink:href="#g134" y="219.015"/>
+ <use x="190.622" xlink:href="#g142" y="219.015"/>
+ <use x="196.2" xlink:href="#g147" y="219.015"/>
+ <use x="199.355" xlink:href="#g134" y="219.015"/>
+ <use x="208.036" xlink:href="#g152" y="219.015"/>
+ <use x="212.342" xlink:href="#g148" y="219.015"/>
+ <use x="218.431" xlink:href="#g141" y="219.015"/>
+ <use x="231.184" xlink:href="#g124" y="219.015"/>
+ <use x="239.441" xlink:href="#g132" y="219.015"/>
+ <use x="243.415" xlink:href="#g132" y="219.015"/>
+ <use x="247.388" xlink:href="#g143" y="219.015"/>
+ <use x="252.362" xlink:href="#g141" y="219.015"/>
+ <use x="260.668" xlink:href="#g144" y="219.015"/>
+ <use x="266.286" xlink:href="#g130" y="219.015"/>
+ <use x="271.548" xlink:href="#g136" y="219.015"/>
+ <use x="277.193" xlink:href="#g142" y="219.015"/>
+ <use x="282.771" xlink:href="#g134" y="219.015"/>
+ <use x="287.004" xlink:href="#g141" y="219.015"/>
+ <use x="295.31" xlink:href="#g134" y="219.015"/>
+ <use x="299.544" xlink:href="#g142" y="219.015"/>
+ <use x="305.122" xlink:href="#g147" y="219.015"/>
+ <use x="308.277" xlink:href="#g122" y="219.015"/>
+ <use x="317.364" xlink:href="#g127" y="219.015"/>
+ <use x="324.811" xlink:href="#g158" y="219.015"/>
+ <use x="334.609" xlink:href="#g138" y="219.015"/>
+ <use x="337.56" xlink:href="#g154" y="219.015"/>
+ <use x="347.607" xlink:href="#g128" y="219.015"/>
+ <use x="358.497" xlink:href="#g155" y="219.015"/>
+ <use x="365.866" xlink:href="#g130" y="219.015"/>
+ <use x="371.128" xlink:href="#g133" y="219.015"/>
+ <use x="376.012" xlink:href="#g134" y="219.015"/>
+ <use x="380.246" xlink:href="#g121" y="219.015"/>
+ <use x="47.1072" xlink:href="#g133" y="234.424"/>
+ <use x="51.9913" xlink:href="#g130" y="234.424"/>
+ <use x="57.2536" xlink:href="#g120" y="234.424"/>
+ <use x="68.1032" xlink:href="#g133" y="234.424"/>
+ <use x="72.9873" xlink:href="#g138" y="234.424"/>
+ <use x="75.9385" xlink:href="#g134" y="234.424"/>
+ <use x="85.8667" xlink:href="#g146" y="234.424"/>
+ <use x="88.3523" xlink:href="#g155" y="234.424"/>
+ <use x="95.7212" xlink:href="#g159" y="234.424"/>
+ <use x="100.695" xlink:href="#g142" y="234.424"/>
+ <use x="106.272" xlink:href="#g134" y="234.424"/>
+ <use x="116.201" xlink:href="#g127" y="234.424"/>
+ <use x="123.647" xlink:href="#g145" y="234.424"/>
+ <use x="128.331" xlink:href="#g135" y="234.424"/>
+ <use x="131.682" xlink:href="#g138" y="234.424"/>
+ <use x="134.634" xlink:href="#g142" y="234.424"/>
+ <use x="140.211" xlink:href="#g133" y="234.424"/>
+ <use x="145.095" xlink:href="#g148" y="234.424"/>
+ <use x="151.185" xlink:href="#g142" y="234.424"/>
+ <use x="156.762" xlink:href="#g136" y="234.424"/>
+ <use x="168.101" xlink:href="#g133" y="234.424"/>
+ <use x="172.985" xlink:href="#g134" y="234.424"/>
+ <use x="177.219" xlink:href="#g158" y="234.424"/>
+ <use x="188.265" xlink:href="#g115" y="234.424"/>
+ <use x="198.053" xlink:href="#g101" y="234.424"/>
+ <use x="204.733" xlink:href="#g8" y="234.424"/>
+ <use x="207.772" xlink:href="#g10" y="234.424"/>
+ <use x="212.106" xlink:href="#g106" y="234.424"/>
+ <use x="216.642" xlink:href="#g8" y="234.424"/>
+ <use x="220.361" xlink:href="#g74" y="234.424"/>
+ <use x="226.528" xlink:href="#g76" y="234.424"/>
+ <use x="230.128" xlink:href="#g11" y="234.424"/>
+ <use x="233.494" xlink:href="#g105" y="234.424"/>
+ <use x="243.208" xlink:href="#g106" y="234.424"/>
+ <use x="247.744" xlink:href="#g60" y="234.424"/>
+ <use x="260.178" xlink:href="#g41" y="234.424"/>
+ <use x="271.627" xlink:href="#g101" y="234.424"/>
+ <use x="278.306" xlink:href="#g112" y="234.424"/>
+ <use x="285.249" xlink:href="#g106" y="234.424"/>
+ <use x="289.785" xlink:href="#g60" y="234.424"/>
+ <use x="296.525" xlink:href="#g107" y="234.424"/>
+ <use x="300.971" xlink:href="#g8" y="234.424"/>
+ <use x="304.69" xlink:href="#g110" y="234.424"/>
+ <use x="310.644" xlink:href="#g18" y="234.424"/>
+ <use x="317.686" xlink:href="#g76" y="234.424"/>
+ <use x="321.286" xlink:href="#g106" y="234.424"/>
+ <use x="325.822" xlink:href="#g61" y="234.424"/>
+ <use x="331.052" xlink:href="#g9" y="234.424"/>
+ <use x="342.219" xlink:href="#g142" y="234.424"/>
+ <use x="347.796" xlink:href="#g143" y="234.424"/>
+ <use x="352.77" xlink:href="#g155" y="234.424"/>
+ <use x="365.833" xlink:href="#g142" y="234.424"/>
+ <use x="371.411" xlink:href="#g138" y="234.424"/>
+ <use x="374.362" xlink:href="#g155" y="234.424"/>
+ <use x="381.731" xlink:href="#g147" y="234.424"/>
+ <use x="47.1072" xlink:href="#g136" y="249.832"/>
+ <use x="52.7516" xlink:href="#g134" y="249.832"/>
+ <use x="56.9855" xlink:href="#g141" y="249.832"/>
+ <use x="65.2916" xlink:href="#g134" y="249.832"/>
+ <use x="69.5254" xlink:href="#g138" y="249.832"/>
+ <use x="72.4767" xlink:href="#g142" y="249.832"/>
+ <use x="78.0545" xlink:href="#g142" y="249.832"/>
+ <use x="83.6324" xlink:href="#g160" y="249.832"/>
+ <use x="89.7215" xlink:href="#g157" y="249.832"/>
+ <use x="94.9615" xlink:href="#g138" y="249.832"/>
+ <use x="97.9127" xlink:href="#g136" y="249.832"/>
+ <use x="110.524" xlink:href="#g136" y="249.832"/>
+ <use x="116.169" xlink:href="#g134" y="249.832"/>
+ <use x="120.403" xlink:href="#g150" y="249.832"/>
+ <use x="127.869" xlink:href="#g143" y="249.832"/>
+ <use x="132.843" xlink:href="#g145" y="249.832"/>
+ <use x="137.527" xlink:href="#g133" y="249.832"/>
+ <use x="142.411" xlink:href="#g134" y="249.832"/>
+ <use x="146.645" xlink:href="#g142" y="249.832"/>
+ <use x="159.19" xlink:href="#g138" y="249.832"/>
+ <use x="162.141" xlink:href="#g154" y="249.832"/>
+ <use x="167.741" xlink:href="#g123" y="249.832"/>
+ <use x="179.348" xlink:href="#g141" y="249.832"/>
+ <use x="187.654" xlink:href="#g130" y="249.832"/>
+ <use x="192.917" xlink:href="#g142" y="249.832"/>
+ <use x="205.462" xlink:href="#g139" y="249.832"/>
+ <use x="209.191" xlink:href="#g130" y="249.832"/>
+ <use x="214.453" xlink:href="#g142" y="249.832"/>
+ <use x="220.031" xlink:href="#g142" y="249.832"/>
+ <use x="232.576" xlink:href="#g133" y="249.832"/>
+ <use x="237.46" xlink:href="#g130" y="249.832"/>
+ <use x="242.722" xlink:href="#g137" y="249.832"/>
+ <use x="247.74" xlink:href="#g134" y="249.832"/>
+ <use x="251.974" xlink:href="#g145" y="249.832"/>
+ <use x="256.658" xlink:href="#g143" y="249.832"/>
+ <use x="268.599" xlink:href="#g133" y="249.832"/>
+ <use x="273.483" xlink:href="#g134" y="249.832"/>
+ <use x="277.717" xlink:href="#g153" y="249.832"/>
+ <use x="282.113" xlink:href="#g134" y="249.832"/>
+ <use x="286.347" xlink:href="#g142" y="249.832"/>
+ <use x="298.893" xlink:href="#g131" y="249.832"/>
+ <use x="303.799" xlink:href="#g134" y="249.832"/>
+ <use x="308.033" xlink:href="#g146" y="249.832"/>
+ <use x="310.519" xlink:href="#g143" y="249.832"/>
+ <use x="315.492" xlink:href="#g142" y="249.832"/>
+ <use x="321.07" xlink:href="#g133" y="249.832"/>
+ <use x="325.954" xlink:href="#g134" y="249.832"/>
+ <use x="330.188" xlink:href="#g145" y="249.832"/>
+ <use x="334.872" xlink:href="#g134" y="249.832"/>
+ <use x="346.073" xlink:href="#g129" y="249.832"/>
+ <use x="354.955" xlink:href="#g143" y="249.832"/>
+ <use x="359.929" xlink:href="#g145" y="249.832"/>
+ <use x="364.613" xlink:href="#g152" y="249.832"/>
+ <use x="368.919" xlink:href="#g160" y="249.832"/>
+ <use x="375.008" xlink:href="#g136" y="249.832"/>
+ <use x="380.652" xlink:href="#g134" y="249.832"/>
+ <use x="-13.4527" xlink:href="#g137" y="265.24"/>
+ <use x="-8.43511" xlink:href="#g138" y="265.24"/>
+ <use x="-5.48388" xlink:href="#g134" y="265.24"/>
+ <use x="-1.25" xlink:href="#g145" y="265.24"/>
+ <use x="3.43402" xlink:href="#g138" y="265.24"/>
+ <use x="6.38525" xlink:href="#g142" y="265.24"/>
+ <use x="11.9631" xlink:href="#g142" y="265.24"/>
+ <use x="17.541" xlink:href="#g134" y="265.24"/>
+ <use x="21.7749" xlink:href="#g142" y="265.24"/>
+ <use x="32.856" xlink:href="#g142" y="265.24"/>
+ <use x="38.4339" xlink:href="#g143" y="265.24"/>
+ <use x="43.4073" xlink:href="#g155" y="265.24"/>
+ <use x="56.2794" xlink:href="#g142" y="265.24"/>
+ <use x="61.8573" xlink:href="#g138" y="265.24"/>
+ <use x="64.8085" xlink:href="#g155" y="265.24"/>
+ <use x="72.1774" xlink:href="#g147" y="265.24"/>
+ <use x="80.8359" xlink:href="#g136" y="265.24"/>
+ <use x="86.4803" xlink:href="#g134" y="265.24"/>
+ <use x="90.7142" xlink:href="#g142" y="265.24"/>
+ <use x="96.2921" xlink:href="#g130" y="265.24"/>
+ <use x="101.554" xlink:href="#g148" y="265.24"/>
+ <use x="113.147" xlink:href="#g131" y="265.24"/>
+ <use x="118.053" xlink:href="#g134" y="265.24"/>
+ <use x="122.287" xlink:href="#g154" y="265.24"/>
+ <use x="127.887" xlink:href="#g138" y="265.24"/>
+ <use x="130.838" xlink:href="#g141" y="265.24"/>
+ <use x="139.144" xlink:href="#g141" y="265.24"/>
+ <use x="147.45" xlink:href="#g134" y="265.24"/>
+ <use x="151.684" xlink:href="#g142" y="265.24"/>
+ <use x="157.262" xlink:href="#g122" y="265.24"/>
+ <use x="167.406" xlink:href="#g127" y="265.24"/>
+ <use x="174.852" xlink:href="#g158" y="265.24"/>
+ <use x="185.707" xlink:href="#g138" y="265.24"/>
+ <use x="188.658" xlink:href="#g154" y="265.24"/>
+ <use x="199.761" xlink:href="#g136" y="265.24"/>
+ <use x="205.406" xlink:href="#g134" y="265.24"/>
+ <use x="209.639" xlink:href="#g150" y="265.24"/>
+ <use x="217.106" xlink:href="#g138" y="265.24"/>
+ <use x="220.057" xlink:href="#g120" y="265.24"/>
+ <use x="230.716" xlink:href="#g152" y="265.24"/>
+ <use x="235.022" xlink:href="#g148" y="265.24"/>
+ <use x="246.614" xlink:href="#g136" y="265.24"/>
+ <use x="252.259" xlink:href="#g140" y="265.24"/>
+ <use x="255.299" xlink:href="#g130" y="265.24"/>
+ <use x="260.561" xlink:href="#g148" y="265.24"/>
+ <use x="266.65" xlink:href="#g131" y="265.24"/>
+ <use x="271.557" xlink:href="#g134" y="265.24"/>
+ <use x="275.791" xlink:href="#g142" y="265.24"/>
+ <use x="281.368" xlink:href="#g121" y="265.24"/>
+ <use x="291.512" xlink:href="#g133" y="265.24"/>
+ <use x="296.396" xlink:href="#g130" y="265.24"/>
+ <use x="301.658" xlink:href="#g120" y="265.24"/>
+ <use x="312.317" xlink:href="#g134" y="265.24"/>
+ <use x="316.551" xlink:href="#g158" y="265.24"/>
+ <use x="327.405" xlink:href="#g146" y="265.24"/>
+ <use x="330.211" xlink:href="#g138" y="265.24"/>
+ <use x="333.162" xlink:href="#g155" y="265.24"/>
+ <use x="346.034" xlink:href="#g130" y="265.24"/>
+ <use x="351.296" xlink:href="#g148" y="265.24"/>
+ <use x="357.385" xlink:href="#g155" y="265.24"/>
+ <use x="370.258" xlink:href="#g131" y="265.24"/>
+ <use x="375.164" xlink:href="#g134" y="265.24"/>
+ <use x="379.398" xlink:href="#g151" y="265.24"/>
+ <use x="-13.4527" xlink:href="#g133" y="280.648"/>
+ <use x="-8.56866" xlink:href="#g134" y="280.648"/>
+ <use x="-4.33478" xlink:href="#g145" y="280.648"/>
+ <use x="5.14924" xlink:href="#g125" y="280.648"/>
+ <use x="15.7213" xlink:href="#g134" y="280.648"/>
+ <use x="19.9552" xlink:href="#g136" y="280.648"/>
+ <use x="25.5995" xlink:href="#g140" y="280.648"/>
+ <use x="28.6396" xlink:href="#g134" y="280.648"/>
+ <use x="32.8734" xlink:href="#g138" y="280.648"/>
+ <use x="35.8247" xlink:href="#g147" y="280.648"/>
+ <use x="38.9799" xlink:href="#g148" y="280.648"/>
+ <use x="45.069" xlink:href="#g142" y="280.648"/>
+ <use x="50.6468" xlink:href="#g136" y="280.648"/>
+ <use x="61.0912" xlink:href="#g136" y="280.648"/>
+ <use x="66.7356" xlink:href="#g148" y="280.648"/>
+ <use x="72.8246" xlink:href="#g147" y="280.648"/>
+ <use x="80.7799" xlink:href="#g130" y="280.648"/>
+ <use x="86.0422" xlink:href="#g148" y="280.648"/>
+ <use x="92.1312" xlink:href="#g158" y="280.648"/>
+ <use x="97.4825" xlink:href="#g142" y="280.648"/>
+ <use x="103.06" xlink:href="#g134" y="280.648"/>
+ <use x="107.294" xlink:href="#g137" y="280.648"/>
+ <use x="112.312" xlink:href="#g141" y="280.648"/>
+ <use x="120.618" xlink:href="#g134" y="280.648"/>
+ <use x="124.852" xlink:href="#g142" y="280.648"/>
+ <use x="135.23" xlink:href="#g150" y="280.648"/>
+ <use x="142.696" xlink:href="#g134" y="280.648"/>
+ <use x="146.93" xlink:href="#g145" y="280.648"/>
+ <use x="151.614" xlink:href="#g133" y="280.648"/>
+ <use x="156.498" xlink:href="#g134" y="280.648"/>
+ <use x="160.732" xlink:href="#g122" y="280.648"/>
+ <use x="-13.4527" xlink:href="#g95" y="416.504"/>
+ <use x="38.0278" xlink:href="#g15" y="377.984"/>
+ <use x="42.1722" xlink:href="#g92" y="377.984"/>
+ <use x="51.1086" xlink:href="#g63" y="377.984"/>
+ <use x="55.1787" xlink:href="#g94" y="377.984"/>
+ <use x="58.7069" xlink:href="#g39" y="377.984"/>
+ <use x="69.9168" xlink:href="#g88" y="377.984"/>
+ <use x="74.5835" xlink:href="#g69" y="377.984"/>
+ <use x="78.9687" xlink:href="#g13" y="377.984"/>
+ <use x="81.5981" xlink:href="#g13" y="377.984"/>
+ <use x="84.2275" xlink:href="#g31" y="377.984"/>
+ <use x="86.7608" xlink:href="#g36" y="377.984"/>
+ <use x="89.2202" xlink:href="#g85" y="377.984"/>
+ <use x="95.3609" xlink:href="#g94" y="377.984"/>
+ <use x="98.8891" xlink:href="#g92" y="377.984"/>
+ <use x="107.825" xlink:href="#g98" y="377.984"/>
+ <use x="116.366" xlink:href="#g42" y="377.984"/>
+ <use x="120.269" xlink:href="#g13" y="377.984"/>
+ <use x="122.898" xlink:href="#g94" y="377.984"/>
+ <use x="130.715" xlink:href="#g51" y="377.984"/>
+ <use x="137.567" xlink:href="#g36" y="377.984"/>
+ <use x="140.026" xlink:href="#g42" y="377.984"/>
+ <use x="143.929" xlink:href="#g85" y="377.984"/>
+ <use x="150.07" xlink:href="#g94" y="377.984"/>
+ <use x="153.598" xlink:href="#g30" y="377.984"/>
+ <use x="157.78" xlink:href="#g42" y="377.984"/>
+ <use x="161.683" xlink:href="#g94" y="377.984"/>
+ <use x="165.211" xlink:href="#g92" y="377.984"/>
+ <use x="169.859" xlink:href="#g16" y="377.984"/>
+ <use x="173.948" xlink:href="#g69" y="377.984"/>
+ <use x="178.333" xlink:href="#g85" y="377.984"/>
+ <use x="188.762" xlink:href="#g36" y="377.984"/>
+ <use x="191.222" xlink:href="#g92" y="377.984"/>
+ <use x="200.158" xlink:href="#g63" y="377.984"/>
+ <use x="204.228" xlink:href="#g94" y="377.984"/>
+ <use x="207.756" xlink:href="#g42" y="377.984"/>
+ <use x="215.948" xlink:href="#g73" y="377.984"/>
+ <use x="221.957" xlink:href="#g42" y="377.984"/>
+ <use x="225.86" xlink:href="#g65" y="377.984"/>
+ <use x="230.245" xlink:href="#g92" y="377.984"/>
+ <use x="234.893" xlink:href="#g29" y="377.984"/>
+ <use x="238.001" xlink:href="#g36" y="377.984"/>
+ <use x="240.46" xlink:href="#g6" y="377.984"/>
+ <use x="242.531" xlink:href="#g85" y="377.984"/>
+ <use x="248.672" xlink:href="#g94" y="377.984"/>
+ <use x="252.2" xlink:href="#g92" y="377.984"/>
+ <use x="38.0278" xlink:href="#g109" y="390.824"/>
+ <use x="47.1032" xlink:href="#g85" y="390.824"/>
+ <use x="53.2439" xlink:href="#g24" y="390.824"/>
+ <use x="59.466" xlink:href="#g94" y="390.824"/>
+ <use x="62.9942" xlink:href="#g36" y="390.824"/>
+ <use x="65.4536" xlink:href="#g54" y="390.824"/>
+ <use x="72.1763" xlink:href="#g4" y="390.824"/>
+ <use x="74.969" xlink:href="#g66" y="390.824"/>
+ <use x="80.0433" xlink:href="#g30" y="390.824"/>
+ <use x="84.2246" xlink:href="#g42" y="390.824"/>
+ <use x="88.128" xlink:href="#g13" y="390.824"/>
+ <use x="93.8915" xlink:href="#g94" y="390.824"/>
+ <use x="97.4198" xlink:href="#g36" y="390.824"/>
+ <use x="99.8791" xlink:href="#g92" y="390.824"/>
+ <use x="107.662" xlink:href="#g94" y="390.824"/>
+ <use x="111.19" xlink:href="#g36" y="390.824"/>
+ <use x="113.649" xlink:href="#g92" y="390.824"/>
+ <use x="118.297" xlink:href="#g6" y="390.824"/>
+ <use x="120.369" xlink:href="#g69" y="390.824"/>
+ <use x="124.754" xlink:href="#g39" y="390.824"/>
+ <use x="131.676" xlink:href="#g94" y="390.824"/>
+ <use x="135.204" xlink:href="#g35" y="390.824"/>
+ <use x="142.798" xlink:href="#g109" y="390.824"/>
+ <use x="151.873" xlink:href="#g13" y="390.824"/>
+ <use x="154.502" xlink:href="#g42" y="390.824"/>
+ <use x="158.406" xlink:href="#g65" y="390.824"/>
+ <use x="162.791" xlink:href="#g2" y="390.824"/>
+ <use x="167.087" xlink:href="#g85" y="390.824"/>
+ <use x="173.228" xlink:href="#g94" y="390.824"/>
+ <use x="176.756" xlink:href="#g92" y="390.824"/>
+ <use x="181.404" xlink:href="#g50" y="390.824"/>
+ <use x="188.405" xlink:href="#g69" y="390.824"/>
+ <use x="192.79" xlink:href="#g92" y="390.824"/>
+ <use x="200.573" xlink:href="#g63" y="390.824"/>
+ <use x="204.643" xlink:href="#g94" y="390.824"/>
+ <use x="208.171" xlink:href="#g42" y="390.824"/>
+ <use x="215.209" xlink:href="#g88" y="390.824"/>
+ <use x="219.875" xlink:href="#g94" y="390.824"/>
+ <use x="223.403" xlink:href="#g36" y="390.824"/>
+ <use x="225.863" xlink:href="#g31" y="390.824"/>
+ <use x="231.53" xlink:href="#g69" y="390.824"/>
+ <use x="235.916" xlink:href="#g16" y="390.824"/>
+ <use x="240.004" xlink:href="#g88" y="390.824"/>
+ <use x="244.671" xlink:href="#g66" y="390.824"/>
+ <use x="249.745" xlink:href="#g42" y="390.824"/>
+ <use x="253.649" xlink:href="#g91" y="390.824"/>
+ <use x="38.0278" xlink:href="#g54" y="403.664"/>
+ <use x="41.6163" xlink:href="#g94" y="403.664"/>
+ <use x="45.1445" xlink:href="#g92" y="403.664"/>
+ <use x="49.7928" xlink:href="#g63" y="403.664"/>
+ <use x="53.8628" xlink:href="#g94" y="403.664"/>
+ <use x="57.3911" xlink:href="#g92" y="403.664"/>
+ <use x="65.2089" xlink:href="#g37" y="403.664"/>
+ <use x="74.0189" xlink:href="#g42" y="403.664"/>
+ <use x="77.9223" xlink:href="#g94" y="403.664"/>
+ <use x="81.4505" xlink:href="#g36" y="403.664"/>
+ <use x="83.9099" xlink:href="#g13" y="403.664"/>
+ <use x="86.5392" xlink:href="#g6" y="403.664"/>
+ <use x="88.6106" xlink:href="#g94" y="403.664"/>
+ <use x="92.1388" xlink:href="#g36" y="403.664"/>
+ <use x="94.5982" xlink:href="#g13" y="403.664"/>
+ <use x="97.2275" xlink:href="#g94" y="403.664"/>
+ <use x="103.925" xlink:href="#g63" y="403.664"/>
+ <use x="107.995" xlink:href="#g94" y="403.664"/>
+ <use x="111.524" xlink:href="#g42" y="403.664"/>
+ <use x="118.597" xlink:href="#g116" y="403.664"/>
+ <use x="124.802" xlink:href="#g30" y="403.664"/>
+ <use x="128.983" xlink:href="#g42" y="403.664"/>
+ <use x="132.887" xlink:href="#g94" y="403.664"/>
+ <use x="136.415" xlink:href="#g92" y="403.664"/>
+ <use x="141.063" xlink:href="#g16" y="403.664"/>
+ <use x="145.152" xlink:href="#g66" y="403.664"/>
+ <use x="150.226" xlink:href="#g42" y="403.664"/>
+ <use x="154.13" xlink:href="#g93" y="403.664"/>
+ <use x="162.003" xlink:href="#g49" y="403.664"/>
+ <use x="166.61" xlink:href="#g15" y="403.664"/>
+ <use x="170.754" xlink:href="#g42" y="403.664"/>
+ <use x="174.658" xlink:href="#g66" y="403.664"/>
+ <use x="179.732" xlink:href="#g16" y="403.664"/>
+ <use x="183.821" xlink:href="#g94" y="403.664"/>
+ <use x="187.349" xlink:href="#g42" y="403.664"/>
+ <use x="191.252" xlink:href="#g50" y="403.664"/>
+ <use x="198.289" xlink:href="#g93" y="403.664"/>
+ <use x="202.992" xlink:href="#g94" y="403.664"/>
+ <use x="206.52" xlink:href="#g92" y="403.664"/>
+ <use x="214.338" xlink:href="#g12" y="403.664"/>
+ <use x="218.959" xlink:href="#g94" y="403.664"/>
+ <use x="222.487" xlink:href="#g47" y="403.664"/>
+ <use x="227.561" xlink:href="#g13" y="403.664"/>
+ <use x="230.191" xlink:href="#g94" y="403.664"/>
+ <use x="233.719" xlink:href="#g92" y="403.664"/>
+ <use x="238.367" xlink:href="#g16" y="403.664"/>
+ <use x="242.456" xlink:href="#g69" y="403.664"/>
+ <use x="246.841" xlink:href="#g85" y="403.664"/>
+ <use x="252.982" xlink:href="#g68" y="403.664"/>
+ <use x="38.0278" xlink:href="#g33" y="416.504"/>
+ <use x="44.2551" xlink:href="#g92" y="416.504"/>
+ <use x="51.6451" xlink:href="#g94" y="416.504"/>
+ <use x="55.1734" xlink:href="#g36" y="416.504"/>
+ <use x="57.6327" xlink:href="#g92" y="416.504"/>
+ <use x="62.281" xlink:href="#g94" y="416.504"/>
+ <use x="65.8092" xlink:href="#g42" y="416.504"/>
+ <use x="72.4543" xlink:href="#g30" y="416.504"/>
+ <use x="76.6357" xlink:href="#g69" y="416.504"/>
+ <use x="81.021" xlink:href="#g31" y="416.504"/>
+ <use x="83.5543" xlink:href="#g16" y="416.504"/>
+ <use x="87.6431" xlink:href="#g94" y="416.504"/>
+ <use x="91.1713" xlink:href="#g92" y="416.504"/>
+ <use x="98.5613" xlink:href="#g109" y="416.504"/>
+ <use x="107.637" xlink:href="#g13" y="416.504"/>
+ <use x="110.266" xlink:href="#g47" y="416.504"/>
+ <use x="115.34" xlink:href="#g92" y="416.504"/>
+ <use x="119.988" xlink:href="#g63" y="416.504"/>
+ <use x="124.059" xlink:href="#g94" y="416.504"/>
+ <use x="130.329" xlink:href="#g36" y="416.504"/>
+ <use x="132.788" xlink:href="#g88" y="416.504"/>
+ <use x="140.196" xlink:href="#g63" y="416.504"/>
+ <use x="144.266" xlink:href="#g69" y="416.504"/>
+ <use x="148.652" xlink:href="#g35" y="416.504"/>
+ <use x="155.853" xlink:href="#g6" y="416.504"/>
+ <use x="157.924" xlink:href="#g85" y="416.504"/>
+ <use x="164.065" xlink:href="#g39" y="416.504"/>
+ <use x="170.987" xlink:href="#g47" y="416.504"/>
+ <use x="176.061" xlink:href="#g78" y="416.504"/>
+ <use x="181.128" xlink:href="#g94" y="416.504"/>
+ <use x="187.398" xlink:href="#g25" y="416.504"/>
+ <use x="194.252" xlink:href="#g4" y="416.504"/>
+ <use x="197.045" xlink:href="#g69" y="416.504"/>
+ <use x="201.43" xlink:href="#g42" y="416.504"/>
+ <use x="205.334" xlink:href="#g42" y="416.504"/>
+ <use x="209.237" xlink:href="#g63" y="416.504"/>
+ <use x="213.307" xlink:href="#g15" y="416.504"/>
+ <use x="217.452" xlink:href="#g42" y="416.504"/>
+ <use x="221.355" xlink:href="#g4" y="416.504"/>
+ <use x="226.889" xlink:href="#g94" y="416.504"/>
+ <use x="230.418" xlink:href="#g42" y="416.504"/>
+ <use x="234.321" xlink:href="#g42" y="416.504"/>
+ <use x="238.224" xlink:href="#g94" y="416.504"/>
+ <use x="241.753" xlink:href="#g36" y="416.504"/>
+ <use x="244.212" xlink:href="#g85" y="416.504"/>
+ <use x="250.353" xlink:href="#g13" y="416.504"/>
+ <use x="252.982" xlink:href="#g68" y="416.504"/>
+ <use x="-13.4527" xlink:href="#g109" y="429.344"/>
+ <use x="-4.37736" xlink:href="#g66" y="429.344"/>
+ <use x="0.696857" xlink:href="#g63" y="429.344"/>
+ <use x="4.76693" xlink:href="#g53" y="429.344"/>
+ <use x="8.9114" xlink:href="#g88" y="429.344"/>
+ <use x="13.5781" xlink:href="#g31" y="429.344"/>
+ <use x="16.1115" xlink:href="#g36" y="429.344"/>
+ <use x="18.5708" xlink:href="#g85" y="429.344"/>
+ <use x="29.0311" xlink:href="#g63" y="429.344"/>
+ <use x="33.1012" xlink:href="#g94" y="429.344"/>
+ <use x="36.6294" xlink:href="#g35" y="429.344"/>
+ <use x="41.0888" xlink:href="#g6" y="429.344"/>
+ <use x="43.1601" xlink:href="#g94" y="429.344"/>
+ <use x="46.6884" xlink:href="#g31" y="429.344"/>
+ <use x="49.2217" xlink:href="#g16" y="429.344"/>
+ <use x="53.3105" xlink:href="#g94" y="429.344"/>
+ <use x="56.8387" xlink:href="#g92" y="429.344"/>
+ <use x="61.4869" xlink:href="#g50" y="429.344"/>
+ <use x="69.6732" xlink:href="#g29" y="429.344"/>
+ <use x="72.7806" xlink:href="#g69" y="429.344"/>
+ <use x="77.1658" xlink:href="#g47" y="429.344"/>
+ <use x="82.24" xlink:href="#g39" y="429.344"/>
+ <use x="93.4813" xlink:href="#g94" y="429.344"/>
+ <use x="97.0096" xlink:href="#g36" y="429.344"/>
+ <use x="99.4689" xlink:href="#g92" y="429.344"/>
+ <use x="104.117" xlink:href="#g94" y="429.344"/>
+ <use x="111.965" xlink:href="#g21" y="429.344"/>
+ <use x="119.367" xlink:href="#g36" y="429.344"/>
+ <use x="121.826" xlink:href="#g94" y="429.344"/>
+ <use x="125.355" xlink:href="#g42" y="429.344"/>
+ <use x="129.258" xlink:href="#g13" y="429.344"/>
+ <use x="131.887" xlink:href="#g94" y="429.344"/>
+ <use x="135.416" xlink:href="#g31" y="429.344"/>
+ <use x="137.949" xlink:href="#g88" y="429.344"/>
+ <use x="142.616" xlink:href="#g47" y="429.344"/>
+ <use x="147.69" xlink:href="#g92" y="429.344"/>
+ <use x="152.338" xlink:href="#g63" y="429.344"/>
+ <use x="156.408" xlink:href="#g94" y="429.344"/>
+ <use x="164.256" xlink:href="#g94" y="429.344"/>
+ <use x="167.784" xlink:href="#g92" y="429.344"/>
+ <use x="172.432" xlink:href="#g13" y="429.344"/>
+ <use x="175.062" xlink:href="#g4" y="429.344"/>
+ <use x="177.854" xlink:href="#g94" y="429.344"/>
+ <use x="181.383" xlink:href="#g42" y="429.344"/>
+ <use x="185.286" xlink:href="#g92" y="429.344"/>
+ <use x="189.934" xlink:href="#g13" y="429.344"/>
+ <use x="192.564" xlink:href="#g50" y="429.344"/>
+ <use x="200.75" xlink:href="#g13" y="429.344"/>
+ <use x="203.379" xlink:href="#g42" y="429.344"/>
+ <use x="207.283" xlink:href="#g94" y="429.344"/>
+ <use x="210.811" xlink:href="#g5" y="429.344"/>
+ <use x="215.196" xlink:href="#g94" y="429.344"/>
+ <use x="218.724" xlink:href="#g92" y="429.344"/>
+ <use x="227.692" xlink:href="#g24" y="429.344"/>
+ <use x="233.914" xlink:href="#g36" y="429.344"/>
+ <use x="236.374" xlink:href="#g42" y="429.344"/>
+ <use x="244.597" xlink:href="#g69" y="429.344"/>
+ <use x="248.982" xlink:href="#g47" y="429.344"/>
+ <use x="254.056" xlink:href="#g4" y="429.344"/>
+ <use x="-13.4527" xlink:href="#g63" y="442.184"/>
+ <use x="-9.38268" xlink:href="#g94" y="442.184"/>
+ <use x="-5.85444" xlink:href="#g39" y="442.184"/>
+ <use x="5.37513" xlink:href="#g114" y="442.184"/>
+ <use x="15.1165" xlink:href="#g94" y="442.184"/>
+ <use x="18.6447" xlink:href="#g93" y="442.184"/>
+ <use x="23.3484" xlink:href="#g94" y="442.184"/>
+ <use x="31.1845" xlink:href="#g92" y="442.184"/>
+ <use x="35.8327" xlink:href="#g69" y="442.184"/>
+ <use x="40.2179" xlink:href="#g85" y="442.184"/>
+ <use x="50.6665" xlink:href="#g98" y="442.184"/>
+ <use x="59.2066" xlink:href="#g42" y="442.184"/>
+ <use x="63.1099" xlink:href="#g13" y="442.184"/>
+ <use x="65.7393" xlink:href="#g6" y="442.184"/>
+ <use x="67.8106" xlink:href="#g34" y="442.184"/>
+ <use x="72.4925" xlink:href="#g36" y="442.184"/>
+ <use x="74.9518" xlink:href="#g14" y="442.184"/>
+ <use x="83.6264" xlink:href="#g36" y="442.184"/>
+ <use x="86.0857" xlink:href="#g92" y="442.184"/>
+ <use x="95.0418" xlink:href="#g94" y="442.184"/>
+ <use x="98.57" xlink:href="#g36" y="442.184"/>
+ <use x="101.029" xlink:href="#g92" y="442.184"/>
+ <use x="105.678" xlink:href="#g94" y="442.184"/>
+ <use x="109.206" xlink:href="#g39" y="442.184"/>
+ <use x="120.435" xlink:href="#g109" y="442.184"/>
+ <use x="129.511" xlink:href="#g94" y="442.184"/>
+ <use x="133.039" xlink:href="#g36" y="442.184"/>
+ <use x="135.498" xlink:href="#g13" y="442.184"/>
+ <use x="138.128" xlink:href="#g94" y="442.184"/>
+ <use x="141.656" xlink:href="#g92" y="442.184"/>
+ <use x="146.304" xlink:href="#g13" y="442.184"/>
+ <use x="148.934" xlink:href="#g65" y="442.184"/>
+ <use x="153.319" xlink:href="#g31" y="442.184"/>
+ <use x="155.852" xlink:href="#g85" y="442.184"/>
+ <use x="161.993" xlink:href="#g94" y="442.184"/>
+ <use x="165.521" xlink:href="#g92" y="442.184"/>
+ <use x="174.477" xlink:href="#g49" y="442.184"/>
+ <use x="179.084" xlink:href="#g15" y="442.184"/>
+ <use x="183.229" xlink:href="#g92" y="442.184"/>
+ <use x="192.185" xlink:href="#g47" y="442.184"/>
+ <use x="197.259" xlink:href="#g92" y="442.184"/>
+ <use x="201.907" xlink:href="#g16" y="442.184"/>
+ <use x="205.996" xlink:href="#g94" y="442.184"/>
+ <use x="209.524" xlink:href="#g42" y="442.184"/>
+ <use x="213.428" xlink:href="#g66" y="442.184"/>
+ <use x="218.502" xlink:href="#g30" y="442.184"/>
+ <use x="222.683" xlink:href="#g42" y="442.184"/>
+ <use x="226.587" xlink:href="#g13" y="442.184"/>
+ <use x="229.216" xlink:href="#g94" y="442.184"/>
+ <use x="232.744" xlink:href="#g42" y="442.184"/>
+ <use x="240.955" xlink:href="#g108" y="442.184"/>
+ <use x="249.263" xlink:href="#g69" y="442.184"/>
+ <use x="253.649" xlink:href="#g91" y="442.184"/>
+ <use x="-13.4527" xlink:href="#g13" y="455.025"/>
+ <use x="-10.8234" xlink:href="#g47" y="455.025"/>
+ <use x="-5.74916" xlink:href="#g42" y="455.025"/>
+ <use x="-1.84581" xlink:href="#g6" y="455.025"/>
+ <use x="0.225544" xlink:href="#g85" y="455.025"/>
+ <use x="6.36626" xlink:href="#g53" y="455.025"/>
+ <use x="10.5107" xlink:href="#g92" y="455.025"/>
+ <use x="15.159" xlink:href="#g30" y="455.025"/>
+ <use x="19.3403" xlink:href="#g94" y="455.025"/>
+ <use x="22.8686" xlink:href="#g36" y="455.025"/>
+ <use x="25.3279" xlink:href="#g13" y="455.025"/>
+ <use x="32.2841" xlink:href="#g63" y="455.025"/>
+ <use x="36.3541" xlink:href="#g69" y="455.025"/>
+ <use x="40.7394" xlink:href="#g35" y="455.025"/>
+ <use x="49.5255" xlink:href="#g47" y="455.025"/>
+ <use x="54.5998" xlink:href="#g42" y="455.025"/>
+ <use x="58.5031" xlink:href="#g69" y="455.025"/>
+ <use x="62.8884" xlink:href="#g31" y="455.025"/>
+ <use x="65.4217" xlink:href="#g13" y="455.025"/>
+ <use x="68.0511" xlink:href="#g94" y="455.025"/>
+ <use x="71.5793" xlink:href="#g50" y="455.025"/>
+ <use x="79.7728" xlink:href="#g94" y="455.025"/>
+ <use x="83.301" xlink:href="#g36" y="455.025"/>
+ <use x="85.7604" xlink:href="#g92" y="455.025"/>
+ <use x="90.4086" xlink:href="#g6" y="455.025"/>
+ <use x="92.4799" xlink:href="#g69" y="455.025"/>
+ <use x="96.8652" xlink:href="#g39" y="455.025"/>
+ <use x="103.787" xlink:href="#g94" y="455.025"/>
+ <use x="111.642" xlink:href="#g51" y="455.025"/>
+ <use x="118.494" xlink:href="#g36" y="455.025"/>
+ <use x="120.953" xlink:href="#g42" y="455.025"/>
+ <use x="124.857" xlink:href="#g85" y="455.025"/>
+ <use x="130.997" xlink:href="#g31" y="455.025"/>
+ <use x="133.531" xlink:href="#g94" y="455.025"/>
+ <use x="137.059" xlink:href="#g36" y="455.025"/>
+ <use x="139.518" xlink:href="#g92" y="455.025"/>
+ <use x="148.493" xlink:href="#g97" y="455.025"/>
+ <use x="154.493" xlink:href="#g109" y="455.025"/>
+ <use x="163.569" xlink:href="#g69" y="455.025"/>
+ <use x="167.954" xlink:href="#g92" y="455.025"/>
+ <use x="172.602" xlink:href="#g29" y="455.025"/>
+ <use x="175.71" xlink:href="#g13" y="455.025"/>
+ <use x="182.666" xlink:href="#g96" y="455.025"/>
+ <use x="192.154" xlink:href="#g15" y="455.025"/>
+ <use x="196.298" xlink:href="#g42" y="455.025"/>
+ <use x="200.202" xlink:href="#g36" y="455.025"/>
+ <use x="202.661" xlink:href="#g14" y="455.025"/>
+ <use x="207.028" xlink:href="#g20" y="455.025"/>
+ <use x="217.354" xlink:href="#g39" y="455.025"/>
+ <use x="224.276" xlink:href="#g36" y="455.025"/>
+ <use x="226.736" xlink:href="#g13" y="455.025"/>
+ <use x="233.692" xlink:href="#g6" y="455.025"/>
+ <use x="235.763" xlink:href="#g94" y="455.025"/>
+ <use x="239.291" xlink:href="#g36" y="455.025"/>
+ <use x="241.751" xlink:href="#g92" y="455.025"/>
+ <use x="246.399" xlink:href="#g94" y="455.025"/>
+ <use x="249.927" xlink:href="#g39" y="455.025"/>
+ <use x="-13.4527" xlink:href="#g88" y="467.865"/>
+ <use x="-8.78605" xlink:href="#g36" y="467.865"/>
+ <use x="-6.32669" xlink:href="#g31" y="467.865"/>
+ <use x="-3.79333" xlink:href="#g31" y="467.865"/>
+ <use x="-1.25998" xlink:href="#g94" y="467.865"/>
+ <use x="2.26826" xlink:href="#g92" y="467.865"/>
+ <use x="10.893" xlink:href="#g73" y="467.865"/>
+ <use x="16.9016" xlink:href="#g42" y="467.865"/>
+ <use x="20.805" xlink:href="#g36" y="467.865"/>
+ <use x="23.2644" xlink:href="#g94" y="467.865"/>
+ <use x="26.7926" xlink:href="#g63" y="467.865"/>
+ <use x="30.8627" xlink:href="#g30" y="467.865"/>
+ <use x="35.044" xlink:href="#g15" y="467.865"/>
+ <use x="39.1885" xlink:href="#g4" y="467.865"/>
+ <use x="41.9812" xlink:href="#g94" y="467.865"/>
+ <use x="45.5094" xlink:href="#g68" y="467.865"/>
+ <use x="53.3526" xlink:href="#g33" y="467.865"/>
+ <use x="59.58" xlink:href="#g92" y="467.865"/>
+ <use x="68.2047" xlink:href="#g63" y="467.865"/>
+ <use x="72.2747" xlink:href="#g94" y="467.865"/>
+ <use x="75.803" xlink:href="#g42" y="467.865"/>
+ <use x="83.6828" xlink:href="#g108" y="467.865"/>
+ <use x="91.9908" xlink:href="#g65" y="467.865"/>
+ <use x="96.3761" xlink:href="#g30" y="467.865"/>
+ <use x="100.557" xlink:href="#g94" y="467.865"/>
+ <use x="108.062" xlink:href="#g63" y="467.865"/>
+ <use x="112.132" xlink:href="#g94" y="467.865"/>
+ <use x="115.66" xlink:href="#g35" y="467.865"/>
+ <use x="124.096" xlink:href="#g51" y="467.865"/>
+ <use x="130.948" xlink:href="#g36" y="467.865"/>
+ <use x="133.408" xlink:href="#g42" y="467.865"/>
+ <use x="137.311" xlink:href="#g85" y="467.865"/>
+ <use x="143.452" xlink:href="#g31" y="467.865"/>
+ <use x="145.985" xlink:href="#g94" y="467.865"/>
+ <use x="149.513" xlink:href="#g36" y="467.865"/>
+ <use x="151.973" xlink:href="#g92" y="467.865"/>
+ <use x="156.621" xlink:href="#g35" y="467.865"/>
+ <use x="165.057" xlink:href="#g88" y="467.865"/>
+ <use x="169.723" xlink:href="#g94" y="467.865"/>
+ <use x="173.252" xlink:href="#g30" y="467.865"/>
+ <use x="177.433" xlink:href="#g13" y="467.865"/>
+ <use x="184.039" xlink:href="#g94" y="467.865"/>
+ <use x="187.567" xlink:href="#g36" y="467.865"/>
+ <use x="190.026" xlink:href="#g92" y="467.865"/>
+ <use x="198.651" xlink:href="#g92" y="467.865"/>
+ <use x="203.299" xlink:href="#g36" y="467.865"/>
+ <use x="205.759" xlink:href="#g94" y="467.865"/>
+ <use x="209.287" xlink:href="#g63" y="467.865"/>
+ <use x="213.357" xlink:href="#g42" y="467.865"/>
+ <use x="217.26" xlink:href="#g36" y="467.865"/>
+ <use x="219.72" xlink:href="#g93" y="467.865"/>
+ <use x="224.423" xlink:href="#g94" y="467.865"/>
+ <use x="227.952" xlink:href="#g35" y="467.865"/>
+ <use x="232.411" xlink:href="#g50" y="467.865"/>
+ <use x="240.254" xlink:href="#g66" y="467.865"/>
+ <use x="245.328" xlink:href="#g16" y="467.865"/>
+ <use x="249.417" xlink:href="#g94" y="467.865"/>
+ <use x="252.945" xlink:href="#g42" y="467.865"/>
+ <use x="-13.4527" xlink:href="#g94" y="480.705"/>
+ <use x="-9.92451" xlink:href="#g36" y="480.705"/>
+ <use x="-7.46515" xlink:href="#g92" y="480.705"/>
+ <use x="-2.81693" xlink:href="#g94" y="480.705"/>
+ <use x="3.96369" xlink:href="#g99" y="480.705"/>
+ <use x="13.5364" xlink:href="#g47" y="480.705"/>
+ <use x="18.6106" xlink:href="#g94" y="480.705"/>
+ <use x="22.1389" xlink:href="#g31" y="480.705"/>
+ <use x="24.6722" xlink:href="#g31" y="480.705"/>
+ <use x="27.2056" xlink:href="#g94" y="480.705"/>
+ <use x="33.9862" xlink:href="#g94" y="480.705"/>
+ <use x="37.5144" xlink:href="#g42" y="480.705"/>
+ <use x="41.4178" xlink:href="#g16" y="480.705"/>
+ <use x="45.5065" xlink:href="#g69" y="480.705"/>
+ <use x="49.8918" xlink:href="#g47" y="480.705"/>
+ <use x="54.966" xlink:href="#g13" y="480.705"/>
+ <use x="57.5954" xlink:href="#g94" y="480.705"/>
+ <use x="61.1236" xlink:href="#g35" y="480.705"/>
+ <use x="68.8353" xlink:href="#g73" y="480.705"/>
+ <use x="74.844" xlink:href="#g94" y="480.705"/>
+ <use x="78.3723" xlink:href="#g31" y="480.705"/>
+ <use x="80.9056" xlink:href="#g63" y="480.705"/>
+ <use x="84.9757" xlink:href="#g29" y="480.705"/>
+ <use x="88.0831" xlink:href="#g69" y="480.705"/>
+ <use x="92.4683" xlink:href="#g34" y="480.705"/>
+ <use x="97.1502" xlink:href="#g94" y="480.705"/>
+ <use x="100.678" xlink:href="#g31" y="480.705"/>
+ <use x="103.212" xlink:href="#g31" y="480.705"/>
+ <use x="105.745" xlink:href="#g85" y="480.705"/>
+ <use x="111.886" xlink:href="#g94" y="480.705"/>
+ <use x="115.414" xlink:href="#g92" y="480.705"/>
+ <use x="123.315" xlink:href="#g39" y="480.705"/>
+ <use x="130.236" xlink:href="#g36" y="480.705"/>
+ <use x="132.696" xlink:href="#g13" y="480.705"/>
+ <use x="138.577" xlink:href="#g63" y="480.705"/>
+ <use x="142.648" xlink:href="#g94" y="480.705"/>
+ <use x="146.176" xlink:href="#g42" y="480.705"/>
+ <use x="153.332" xlink:href="#g109" y="480.705"/>
+ <use x="162.407" xlink:href="#g13" y="480.705"/>
+ <use x="165.036" xlink:href="#g69" y="480.705"/>
+ <use x="169.421" xlink:href="#g13" y="480.705"/>
+ <use x="172.051" xlink:href="#g47" y="480.705"/>
+ <use x="177.125" xlink:href="#g94" y="480.705"/>
+ <use x="183.906" xlink:href="#g63" y="480.705"/>
+ <use x="187.976" xlink:href="#g94" y="480.705"/>
+ <use x="191.504" xlink:href="#g35" y="480.705"/>
+ <use x="199.216" xlink:href="#g30" y="480.705"/>
+ <use x="203.397" xlink:href="#g31" y="480.705"/>
+ <use x="205.93" xlink:href="#g68" y="480.705"/>
+ <use x="213.05" xlink:href="#g96" y="480.705"/>
+ <use x="222.538" xlink:href="#g69" y="480.705"/>
+ <use x="226.923" xlink:href="#g47" y="480.705"/>
+ <use x="231.997" xlink:href="#g42" y="480.705"/>
+ <use x="235.9" xlink:href="#g36" y="480.705"/>
+ <use x="238.36" xlink:href="#g13" y="480.705"/>
+ <use x="240.989" xlink:href="#g36" y="480.705"/>
+ <use x="243.448" xlink:href="#g47" y="480.705"/>
+ <use x="248.523" xlink:href="#g35" y="480.705"/>
+ <use x="252.982" xlink:href="#g50" y="480.705"/>
+ <use x="-13.4527" xlink:href="#g63" y="493.545"/>
+ <use x="-9.38268" xlink:href="#g69" y="493.545"/>
+ <use x="-4.99743" xlink:href="#g42" y="493.545"/>
+ <use x="-1.09407" xlink:href="#g93" y="493.545"/>
+ <use x="3.60957" xlink:href="#g94" y="493.545"/>
+ <use x="7.13781" xlink:href="#g88" y="493.545"/>
+ <use x="11.8045" xlink:href="#g94" y="493.545"/>
+ <use x="15.3327" xlink:href="#g31" y="493.545"/>
+ <use x="17.8661" xlink:href="#g31" y="493.545"/>
+ <use x="20.3995" xlink:href="#g13" y="493.545"/>
+ <use x="27.0288" xlink:href="#g69" y="493.545"/>
+ <use x="31.4141" xlink:href="#g31" y="493.545"/>
+ <use x="33.9474" xlink:href="#g35" y="493.545"/>
+ <use x="42.4068" xlink:href="#g19" y="493.545"/>
+ <use x="50.1355" xlink:href="#g36" y="493.545"/>
+ <use x="52.5948" xlink:href="#g13" y="493.545"/>
+ <use x="55.2242" xlink:href="#g13" y="493.545"/>
+ <use x="57.8536" xlink:href="#g94" y="493.545"/>
+ <use x="61.3818" xlink:href="#g42" y="493.545"/>
+ <use x="69.2852" xlink:href="#g36" y="493.545"/>
+ <use x="71.7445" xlink:href="#g92" y="493.545"/>
+ <use x="80.3927" xlink:href="#g49" y="493.545"/>
+ <use x="84.9999" xlink:href="#g15" y="493.545"/>
+ <use x="89.1443" xlink:href="#g31" y="493.545"/>
+ <use x="91.6777" xlink:href="#g31" y="493.545"/>
+ <use x="94.211" xlink:href="#g94" y="493.545"/>
+ <use x="97.7393" xlink:href="#g42" y="493.545"/>
+ <use x="105.643" xlink:href="#g114" y="493.545"/>
+ <use x="115.384" xlink:href="#g94" y="493.545"/>
+ <use x="118.912" xlink:href="#g30" y="493.545"/>
+ <use x="123.094" xlink:href="#g42" y="493.545"/>
+ <use x="126.997" xlink:href="#g68" y="493.545"/>
+ </g>
+</svg>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-wf-cmp.svg
new file mode 100644
index 00000000000..78e67a13116
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/frktest-wf-cmp.svg
@@ -0,0 +1,353 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- This file was generated by dvisvgm 0.9.1dev (x86_64-unknown-linux-gnu) -->
+<!-- Thu Apr 22 17:27:50 2010 -->
+<svg height='441.86' version='1.1' viewBox='-13.4527 54 398.339 441.86' width='398.339' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'>
+<defs>
+<font horiz-adv-x='0' id='yswab'>
+<font-face ascent='751' descent='-249' font-family='yswab' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M81 584C107 584 134 581 156 577C220 564 294 528 307 457C308 457 308 424 308 424C307 408 303 392 297 377C264 295 180 250 97 226C78 221 20 208 11 205L19 182C34 184 48 188 63 191L138 208C188 219 238 228 284 253C326 277 357 308 385 348C389 357 391 365 404 365C409 365 456 359 475 356C567 340 689 298 689 177C689 147 681 117 664 92C643 60 599 30 548 30C518 30 489 40 462 53C406 79 357 119 308 156L265 187C258 192 248 203 238 203C233 203 29 157 29 157C30 152 32 146 34 141C37 131 46 134 59 132C118 128 161 109 207 87C292 49 378 -13 493 -13C509 -13 525 -11 540 -8C596 7 643 30 682 64C731 106 777 165 777 250C777 342 719 436 631 445V446L662 465C686 487 718 503 737 530L726 544L577 698H576L415 542C395 602 347 648 291 676C282 680 248 697 238 697C230 696 221 689 215 685L164 653L107 617L91 607C85 603 81 601 81 591V584ZM630 474C619 468 608 461 597 455C544 424 478 404 407 393C417 418 422 444 424 471V497C423 500 423 503 423 506C423 520 435 526 442 532C452 541 461 551 471 560C476 564 503 595 510 595C515 595 520 588 522 586L630 474Z' glyph-name='B' horiz-adv-x='795' unicode='B'/>
+<glyph d='M523 698C487 678 448 670 409 670C381 670 357 674 334 679C328 680 320 683 313 683S299 678 294 676L263 660C235 646 178 619 155 602C62 537 11 422 11 308C11 186 69 94 144 40C187 9 246 -14 314 -14C444 -14 574 64 574 189C566 183 559 175 551 168C503 127 432 95 356 95C304 95 259 111 223 132C213 138 204 146 194 151V153C233 178 272 204 309 231L311 258V567C349 559 412 548 451 548C465 548 480 550 492 560C516 580 520 617 522 646C523 658 524 669 524 681C524 687 524 693 523 698ZM194 596V229V213C194 191 186 182 175 169C125 219 86 287 86 378C86 474 130 562 194 596Z' glyph-name='C' horiz-adv-x='592' unicode='C'/>
+<glyph d='M170 347H220C223 347 227 348 231 348C241 348 245 343 249 336C252 330 256 325 260 319C327 224 410 139 410 -18C410 -48 405 -79 388 -105C373 -129 349 -151 312 -151C230 -151 192 -61 175 -1C170 17 164 36 162 55H11V38C44 36 54 -6 66 -30C96 -102 170 -152 244 -168C265 -173 287 -176 308 -176S349 -173 369 -167C463 -137 515 -31 515 73C515 146 487 215 456 268C440 296 421 321 402 347C437 349 478 344 509 349C526 372 534 404 547 431H361H352C338 431 339 436 332 445C311 478 288 528 288 576S319 671 370 671C381 671 391 668 401 662C430 642 444 601 444 554H561V672C544 675 526 682 509 685C473 693 428 698 390 698C343 698 307 681 279 655C236 615 204 549 204 473V460C205 450 211 412 211 412C209 401 188 380 184 376C177 369 170 366 170 353V347Z' glyph-name='F' horiz-adv-x='579' unicode='F'/>
+<glyph d='M377 698L370 674L420 660C418 647 413 634 408 621C359 485 230 396 120 330C96 316 34 281 11 270C29 237 54 194 72 164C73 161 75 157 79 155C80 155 88 154 88 156C188 189 303 231 422 231C451 231 470 224 488 208C521 180 534 138 534 96C534 87 533 77 532 67C519 -15 461 -90 378 -110C364 -113 349 -115 335 -115C304 -114 262 -95 262 -56C263 -43 270 -33 279 -24C295 -8 319 6 319 31C319 33 318 36 318 38C318 43 316 48 314 53C304 73 283 85 262 85C217 85 197 39 197 0C197 -10 198 -19 200 -28C216 -107 305 -156 397 -156C427 -156 456 -151 484 -142C567 -113 633 -42 653 44C658 63 660 84 660 104C660 193 620 265 574 311C568 317 542 343 533 343C523 343 503 333 499 331L430 306L272 247C243 236 214 223 184 214C167 247 148 277 131 309C161 315 222 342 241 349C370 405 489 484 569 597C578 609 588 622 594 636L377 698Z' glyph-name='H' horiz-adv-x='680' unicode='H'/>
+<glyph d='M522 698L384 551V698C375 695 366 690 357 686L311 664C256 639 202 614 153 578C79 525 11 449 11 339C11 317 13 294 17 273C37 167 104 69 202 20C242 2 288 -14 342 -14C363 -14 379 -10 398 -6C469 15 524 71 572 125C619 180 679 243 698 315C703 332 706 350 706 368C706 373 706 379 705 384C699 422 677 457 657 489C637 522 616 553 593 584C567 621 540 656 522 698ZM267 616V395C267 376 268 356 268 336C268 281 260 237 238 198C232 185 224 174 217 161C207 167 199 176 191 185C145 231 108 312 108 386C108 478 161 544 217 585C233 597 250 606 267 616ZM239 142L383 310C387 375 381 447 385 511C401 532 419 551 437 571C460 548 479 522 498 496C524 460 578 385 597 347C605 332 610 324 610 303C610 290 607 276 606 264C595 160 524 85 418 85C357 85 306 105 259 130C252 134 246 139 239 142Z' glyph-name='O' horiz-adv-x='724' unicode='O'/>
+<glyph d='M321 -13L376 42C379 45 394 58 394 63S381 81 380 82C350 117 316 163 316 224C316 246 318 282 324 295C329 305 391 376 396 384C363 406 332 430 300 453L276 471C273 473 268 477 264 477C258 477 238 461 238 461L173 415C98 363 18 293 11 195C11 195 12 147 14 147C18 128 23 109 32 92C53 49 87 13 131 -9C131 -9 143 -13 143 -10C152 -5 159 5 166 12L212 58C215 61 233 81 238 81C241 81 243 78 245 76C259 59 318 -13 321 -13ZM307 316C301 301 262 166 257 150C253 125 242 120 226 104L199 77C195 73 191 68 186 66C179 66 166 76 163 78C122 109 87 161 87 226C87 299 134 354 174 386C178 389 184 396 190 396C194 396 198 392 201 390L223 374C241 362 259 349 277 336C287 329 296 321 307 316Z' glyph-name='a' horiz-adv-x='414' unicode='a'/>
+<glyph d='M291 93L280 110C269 107 260 100 249 95C230 87 209 83 188 83H177C108 90 102 187 102 257V287C103 315 94 342 94 371C94 385 99 406 113 411C117 411 120 409 123 407C129 403 206 355 206 355C210 353 231 338 235 338H236C243 338 248 348 251 353C264 371 279 388 291 407C263 423 236 441 208 459L186 472C183 474 179 477 175 477C168 477 160 470 155 466C121 441 78 419 54 386C25 344 11 282 11 218C11 128 47 58 99 10C103 6 122 -11 129 -11C134 -11 163 9 173 15C183 22 291 89 291 93Z' glyph-name='c' horiz-adv-x='309' unicode='c'/>
+<glyph d='M152 382C145 380 139 376 132 373C87 347 48 321 24 272C15 251 11 229 11 206C11 201 12 195 12 190C20 102 78 28 154 -4C161 -7 174 -12 182 -12C189 -12 239 11 257 19C289 32 323 43 349 66C391 104 410 169 410 228C410 240 409 252 407 264C392 337 330 391 269 428C228 452 153 478 153 543C153 570 167 595 183 611C191 617 195 619 195 632V643C140 643 75 618 55 563C50 550 49 536 49 522C49 469 90 429 118 407C129 398 141 391 152 382ZM97 239V249C97 286 117 320 145 344C151 349 168 365 177 365C183 364 188 359 193 357C257 314 338 266 338 167C338 158 338 149 337 141C335 114 333 80 306 65C303 64 301 63 299 63C295 63 277 69 272 69C262 71 251 70 241 72C218 75 196 85 176 98C128 130 103 183 97 239Z' glyph-name='d' horiz-adv-x='428' unicode='d'/>
+<glyph d='M278 113C249 102 239 89 198 89C178 89 159 95 144 110C129 127 123 143 117 169C116 173 108 222 113 222C116 227 123 230 128 234C140 242 290 339 297 343C269 389 239 434 210 479C199 475 122 437 94 423C75 413 53 406 39 388C19 361 15 323 13 290C12 270 10 248 10 228C10 131 41 65 87 9C94 2 100 -8 110 -11C110 -11 121 -8 121 -6C132 0 241 66 241 66L266 81C273 86 278 87 278 101V113ZM110 249C109 262 109 276 109 289C109 338 122 373 147 402L179 352L206 312L110 249Z' glyph-name='e' horiz-adv-x='315' unicode='e'/>
+<glyph d='M11 356H67C76 173 89 -4 108 -177H114C117 -177 120 -177 122 -175C124 -174 128 -152 129 -145C149 -26 166 107 176 230C178 251 185 339 185 356H267V419H206H197C186 419 175 420 165 425C144 436 129 474 129 502C129 526 138 550 159 565C167 571 176 576 190 576C206 576 220 569 235 560C247 552 262 541 276 541C288 541 293 555 298 563L329 607C335 615 341 624 346 633C342 636 335 642 329 642H327C318 638 318 624 307 624H304C279 629 264 656 237 657C137 657 114 562 84 494C67 453 53 419 22 388C16 382 11 380 11 366V356Z' glyph-name='f' horiz-adv-x='301' unicode='f'/>
+<glyph d='M337 479C330 471 296 424 290 420C286 418 281 418 277 418H164C148 418 148 422 139 433L116 463C113 467 108 476 103 476C99 476 96 471 94 468C90 462 70 437 65 430C59 424 54 417 54 406C54 401 55 396 55 391V139V126C55 122 55 118 56 114C57 109 71 84 76 75C89 50 101 25 115 1C131 8 147 17 162 26C171 30 286 92 289 92C295 90 301 80 304 75C327 44 345 0 345 -50C345 -111 280 -142 233 -142C182 -142 145 -113 111 -83C103 -76 73 -48 65 -45C48 -68 29 -88 11 -110C3 -120 -9 -126 -9 -144C-9 -161 4 -161 17 -167C63 -186 119 -200 181 -200C192 -200 202 -199 212 -197C262 -186 305 -153 341 -118C380 -80 425 -29 425 42C425 77 413 106 397 129C392 137 385 141 385 154V167V323C401 323 418 322 432 325L437 333C445 362 455 390 464 418C437 418 409 417 385 420C368 438 353 459 337 479ZM150 323H290V138V131C290 118 285 115 274 111C262 104 251 98 239 92L195 69C192 67 186 62 182 62C174 62 171 75 169 79C162 92 150 109 150 128V323Z' glyph-name='g' horiz-adv-x='482' unicode='g'/>
+<glyph d='M152 644C102 644 83 588 74 555C72 550 65 521 65 516V514C68 510 76 502 82 502C86 502 90 505 93 507C127 530 172 547 190 585C194 593 197 603 197 612C197 634 177 644 158 644H152ZM93 479C66 449 38 420 12 390L11 379C37 377 46 347 46 325V133V120C46 95 32 78 11 76L13 54C46 31 78 8 115 -11C157 14 192 47 230 76L232 98C216 88 195 76 173 76C148 76 140 102 140 127C140 137 141 147 141 155V323C141 346 149 376 176 379L175 390C149 421 120 449 93 479Z' glyph-name='i' horiz-adv-x='250' unicode='i'/>
+<glyph d='M11 77V76C50 47 86 16 126 -11L137 -6C171 21 206 47 238 76L240 98C229 90 210 76 192 76C152 76 147 121 146 152C146 158 145 163 145 169V301V566C145 573 146 579 146 586C150 623 169 676 218 676V698C200 693 182 687 164 682L64 651C51 647 39 644 26 640C17 636 11 638 11 624C11 620 11 615 13 613C16 611 21 610 24 608C42 600 50 580 50 556V548V202V183C50 141 32 102 11 77Z' glyph-name='l' horiz-adv-x='258' unicode='l'/>
+<glyph d='M104 479L11 392V391C31 369 52 347 70 323L71 310V-13L138 17L156 25C163 27 166 30 166 40V50V337V348C166 351 166 355 168 358C171 362 206 383 217 391C222 394 228 400 234 400H235C241 399 265 376 265 376C271 371 284 364 286 355C287 351 287 346 287 342C287 333 286 324 286 315V-12C340 23 395 57 445 96L446 117C440 115 435 112 429 112C406 112 389 134 384 154C381 165 381 176 381 187V214V320C381 341 388 364 407 371C415 374 418 374 418 385V392C417 398 411 402 406 406C396 415 349 454 336 465C331 469 324 477 318 477C313 477 310 473 306 471C259 439 213 414 166 380C166 391 166 402 165 412C146 436 125 457 104 479Z' glyph-name='n' horiz-adv-x='468' unicode='n'/>
+<glyph d='M236 473C193 438 136 416 93 381C46 344 11 289 11 228V219C17 139 81 82 137 32C147 24 157 15 166 6S182 -14 199 -14S220 -2 230 7C246 21 264 35 281 48C349 99 446 158 446 261C446 270 445 279 444 288C434 362 374 417 316 457C309 461 266 491 258 491C254 491 240 477 236 473ZM80 295C80 338 111 380 149 390C156 391 162 391 169 391C186 391 202 388 218 384C299 361 365 288 365 196C365 185 364 174 361 163C350 122 315 88 267 88C242 88 217 95 195 106C146 130 110 175 93 226C87 243 80 277 80 295Z' glyph-name='o' horiz-adv-x='464' unicode='o'/>
+<glyph d='M104 479L11 392V391C31 370 51 348 69 325L71 309C71 251 72 193 70 138C56 126 41 115 27 104L58 91C67 86 71 88 71 73V-25C72 -75 88 -126 114 -169C124 -155 131 -136 138 -120C159 -67 166 -12 166 45C173 42 268 2 270 2C277 3 285 11 290 15L335 48C358 65 381 81 401 103C440 148 463 209 463 269C463 277 463 286 462 294C452 370 389 428 338 479H337L166 308C165 342 167 379 165 411C147 436 126 458 104 479ZM272 383C309 346 349 301 363 249C369 227 370 203 370 179V162C370 139 369 114 356 94C353 88 345 76 336 76C331 76 323 80 319 83L178 142C171 147 166 145 166 158V264C166 268 166 272 167 275C170 282 196 306 197 307C222 333 248 356 272 383Z' glyph-name='p' horiz-adv-x='481' unicode='p'/>
+<glyph d='M104 479L11 392V391C31 369 52 348 70 324C73 258 72 182 69 119C51 104 31 91 12 77V75L115 11L141 -6C145 -8 148 -11 152 -11C161 -11 170 -1 175 2L273 70C277 73 286 77 286 83C286 90 280 97 275 97C269 97 263 91 260 89L237 73C233 70 228 65 223 65C219 65 214 68 211 70L188 85C181 89 169 94 166 102V331C166 337 165 344 165 351C165 365 170 368 180 374L214 398C218 401 223 406 229 406C236 406 242 396 246 392L286 352H287L331 396C338 403 345 408 345 418S336 434 330 440L291 479H290L166 392L165 412C146 436 125 457 104 479Z' glyph-name='r' horiz-adv-x='363' unicode='r'/>
+<glyph d='M11 356H67C76 173 89 -4 108 -177H114C122 -177 125 -174 125 -165C147 -67 173 186 178 254C180 270 186 357 186 369C186 374 187 378 187 383C186 390 182 395 178 400C157 427 129 463 129 501S155 576 191 576C208 576 224 567 239 557C250 551 264 541 277 541H279C286 543 296 560 298 563L329 607C335 615 341 624 346 633C342 636 335 642 329 642H327C318 638 318 624 307 624H304C279 629 264 656 237 657C137 657 114 562 84 494C67 453 53 419 22 388C16 382 11 380 11 366V356Z' glyph-name='s' horiz-adv-x='234' unicode='s'/>
+<glyph d='M169 589L11 377H75C74 289 77 198 74 113C61 102 47 92 33 82L145 11C158 3 169 -6 185 -11L198 -4L324 84L312 103C298 95 286 85 273 76C268 73 260 65 254 65C247 65 239 72 234 75L188 104C178 109 169 113 169 128C169 133 170 138 170 143V377H324V456H170C169 500 171 547 169 589Z' glyph-name='t' horiz-adv-x='342' unicode='t'/>
+<glyph d='M26 81V80C32 74 40 71 48 67L75 55L177 10L212 -6C216 -8 222 -11 226 -11H228C236 -11 244 -1 250 4L303 45C379 102 471 184 471 290C471 355 441 417 387 453C378 459 346 478 334 478C333 478 331 477 330 477C324 476 284 447 284 447L180 374C174 405 148 441 131 458C127 462 114 477 106 477C100 476 94 470 90 467L55 440L25 418C22 415 15 412 14 408C14 405 16 403 18 402C23 397 29 393 34 388C71 355 104 300 104 235C104 202 95 169 78 140C65 117 46 98 26 81ZM126 148C133 160 144 171 151 183C174 219 189 264 189 317V326C189 332 188 338 187 344V351C187 358 192 361 196 365C211 377 227 389 252 389C257 389 263 389 268 388C333 378 378 308 378 235C378 176 349 123 317 87C314 82 308 72 300 72C296 72 253 92 253 92C211 110 169 131 126 148Z' glyph-name='v' horiz-adv-x='489' unicode='v'/>
+<glyph d='M275 417C267 422 182 477 176 477H175C168 477 161 470 156 466C140 456 125 445 109 434C89 421 71 407 57 388C25 344 11 284 11 218C11 123 53 47 112 -1C117 -4 123 -11 129 -11C137 -11 155 4 157 5L224 48C229 51 244 63 250 63C254 63 257 60 260 58C277 44 353 -12 354 -13C391 17 430 45 465 76L466 97C448 89 444 76 416 76C387 76 377 106 373 128C371 141 370 202 370 210V258V294V303C370 317 378 321 384 329L408 357C411 361 419 373 424 373S433 369 436 366L469 338C518 296 567 245 567 169C567 30 435 -89 355 -169V-170L370 -185H371C471 -85 622 14 652 162C656 180 657 199 657 217C657 321 575 397 526 441C522 445 482 479 481 479C444 435 406 393 371 347H370V505C370 520 369 535 369 550C369 567 370 584 374 601C381 634 400 676 443 676V698L288 651L250 639C243 637 236 636 236 626V620C236 614 240 612 244 610C248 609 252 607 256 604C271 593 275 581 275 556V417ZM239 336L274 384C275 378 276 372 276 366C276 358 275 350 275 342V204V186C275 156 264 109 249 97C239 87 205 83 189 83C174 83 159 86 147 94C112 119 102 181 102 235C102 239 104 304 102 304C101 314 95 365 95 369C95 386 99 407 113 411C117 411 121 409 124 407L147 392L206 355C217 349 227 340 239 336Z' glyph-name='Ecaron' horiz-adv-x='675' unicode='&#282;'/>
+<glyph d='M11 108V51H26C30 51 36 51 40 50C49 48 102 20 120 10C125 7 157 -12 163 -12C172 -12 181 -1 185 2L221 27L286 72C320 97 362 128 362 184C362 221 342 260 314 283C298 297 278 305 258 311L355 427C351 431 345 439 339 439C336 439 333 437 331 436C324 431 315 427 302 427C268 427 241 448 222 462C217 465 202 477 195 477C189 477 153 448 141 439C98 405 11 357 11 286C11 283 11 280 12 277C17 249 44 227 63 207C75 194 88 178 88 159C88 153 87 147 84 142C70 113 40 108 11 108ZM252 339L193 269C190 265 175 245 170 245H169C166 245 163 248 160 250C132 271 81 294 81 337C81 364 102 392 133 392C148 392 163 387 176 381C188 375 243 342 252 339ZM105 128C122 151 141 172 160 194L174 211C178 215 182 221 190 221S225 215 226 215C261 205 298 177 299 137C299 128 298 119 293 111C281 93 259 79 230 79C197 79 165 96 143 108C131 115 118 123 105 128Z' glyph-name='Eng' horiz-adv-x='380' unicode='&#330;'/>
+<glyph d='M340 576C334 573 308 559 304 555C298 549 301 538 288 538C282 538 275 543 269 545C279 555 342 616 343 622C343 637 312 646 302 646C284 646 269 636 257 628C233 615 208 602 208 567C208 552 213 544 219 534C227 520 240 506 261 506C281 506 298 519 315 529C327 536 344 548 344 564V565C344 569 342 573 340 576ZM254 562C253 569 252 576 252 582C252 596 258 614 273 614C282 614 291 610 298 606L254 562ZM11 389C18 392 24 395 32 396C47 396 63 386 68 371C70 365 70 358 70 351V130V120C70 108 66 106 58 100C50 95 41 89 34 83C76 53 113 17 157 -11L170 -5L311 94C311 62 322 32 343 8C347 3 361 -11 369 -11C372 -10 375 -8 377 -6L391 8C397 13 446 56 446 60C418 89 405 122 405 173C405 188 406 203 406 218V479C383 470 361 459 338 449L321 442C314 437 310 437 310 426C310 422 311 418 311 415V145C311 141 312 136 312 132C312 119 303 115 294 110L257 84C252 81 245 73 239 73S226 82 221 86L182 116C173 123 164 126 164 142C164 147 165 152 165 156V316V345C165 359 165 373 163 387C158 417 145 447 124 470C122 473 119 477 115 477S92 464 85 460L34 426C24 420 10 416 10 400C10 396 11 392 11 389Z' glyph-name='dcroat' horiz-adv-x='464' unicode='&#273;'/>
+</font>
+<font horiz-adv-x='0' id='yinitas'>
+<font-face font-family='yinitas' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M377 1029C368 1025 363 1015 364 1001C366 980 373 963 386 950C396 940 407 934 419 933L423 932L419 931C397 920 377 920 353 930C337 936 314 948 289 964L276 972V976C276 986 267 992 258 988L255 986L239 994C223 1002 207 1008 192 1011C147 1020 100 1008 62 976C39 957 18 927 8 898C6 893 6 893 3 892C-2 891 -7 886 -7 880C-8 875 -6 871 -3 868L0 866L-1 860C-1 856 -2 850 -2 846C-3 838 -3 838 -5 837C-9 835 -10 832 -11 829C-11 824 -9 819 -5 817C-2 816 -2 815 -1 810C-1 801 2 785 5 775C12 748 27 721 45 699L53 691L50 689C37 679 28 668 23 653L20 645V632C20 619 20 618 22 612C29 594 40 584 55 583C58 583 63 583 65 584C78 586 90 597 93 611C97 625 92 635 78 639C65 643 52 639 47 630C43 621 48 612 57 612C68 612 72 625 64 632C62 633 62 633 64 634C64 634 68 634 71 634C77 634 83 631 86 627S89 617 87 611C84 602 78 595 70 591C66 590 64 589 58 589C48 589 44 591 38 597C30 605 26 617 26 632C26 653 35 670 52 683L57 687L63 681C77 668 97 655 114 647C163 624 216 622 269 640C297 650 320 662 377 698C407 717 434 733 432 730C431 730 426 725 419 720C381 687 339 646 278 579L274 574L271 575C265 577 261 581 258 592C255 601 253 604 249 606S241 608 237 605C234 602 231 597 226 584C218 561 209 546 199 536C184 522 164 517 150 526C144 529 135 540 131 548C125 558 124 572 127 580L128 582L130 581C134 577 138 576 143 579C150 583 150 593 143 598C136 602 128 597 123 585C120 580 120 579 120 571C119 554 125 540 139 527C150 515 164 512 181 518C204 526 223 549 232 583C236 595 238 599 241 600C245 603 251 600 253 596C255 593 254 590 252 581C250 571 250 568 253 565C255 562 257 562 262 564L266 565L264 563C263 562 251 548 238 533C216 509 213 506 211 506C211 507 208 507 206 507C196 507 190 497 194 488L195 485L181 471C168 458 153 445 151 445C151 445 149 446 148 448C138 464 117 477 99 479H93L96 481C107 485 115 496 117 509C119 520 115 533 106 542C91 556 69 559 50 548C45 544 37 536 33 530C27 518 23 503 25 489C27 477 32 464 38 455C38 454 38 453 35 449C25 432 22 409 29 392C32 386 37 378 40 375C54 362 74 361 86 372C92 377 94 382 94 389C94 394 94 396 92 399C88 407 80 411 71 410C57 409 48 398 53 388S72 380 74 392C75 395 72 401 69 402C67 403 69 404 73 404C81 404 87 399 88 392C89 384 85 377 77 373C73 371 71 371 66 371C60 371 59 371 53 374C35 383 27 408 34 431C37 438 41 447 42 448C43 448 45 446 48 443C71 422 105 416 134 428C137 430 142 432 144 433C147 435 149 436 149 435C150 434 154 422 155 416C157 407 158 391 156 381C152 361 141 340 124 319C121 315 116 311 115 310C93 296 83 289 70 276C42 249 24 216 17 181C15 175 15 174 13 174C10 173 6 170 5 168C1 161 4 151 10 148C13 147 13 147 13 140C14 122 16 111 21 97C24 86 32 70 37 62C65 19 110 -4 158 -2C170 -2 178 0 189 2C217 11 242 31 255 55C270 84 271 118 257 145L253 153L259 151C272 146 277 146 295 146C311 146 312 146 321 148L331 151L334 148C335 147 341 142 346 137C389 98 440 68 484 58C488 57 492 56 492 56C493 55 480 39 473 32C459 18 440 8 424 5C421 5 418 4 417 4C415 3 415 4 418 7C422 11 424 16 424 22C424 38 410 49 395 44C389 43 382 36 380 30C377 22 379 14 385 7L388 4L383 5C360 10 341 25 331 44C326 54 323 70 325 78V81L327 78C331 74 336 73 341 76C345 78 347 81 347 86C347 92 342 97 336 97C328 97 322 92 319 83C316 70 321 48 331 32C342 16 363 3 383 -1C392 -3 412 -3 422 -1C436 1 449 7 462 15C472 22 488 38 494 47L499 54L508 53C515 52 523 51 536 51H554L556 47C563 33 577 20 592 14C602 10 607 9 618 8C626 8 628 9 631 10C644 16 647 29 637 35C635 37 634 37 630 37C627 36 626 36 623 33C621 31 621 30 621 26C621 21 621 20 623 18C624 17 626 15 626 15C626 14 613 14 607 15C594 18 583 24 573 34C567 40 561 49 561 51C561 52 563 52 566 53C568 53 575 54 580 55C611 61 641 74 672 95L682 101L683 97C686 84 695 66 704 53C712 43 725 31 735 23C748 14 766 6 782 2C796 -1 804 -2 821 -2C835 -2 838 -2 847 0C868 3 886 12 903 25C906 27 909 29 909 29C910 29 912 26 914 23C924 11 937 2 952 -1C957 -2 961 -3 968 -3C979 -3 986 -1 994 2C1001 5 1008 13 1011 19C1013 23 1013 24 1013 31S1013 39 1011 43S1004 52 1000 53C995 55 985 54 980 52C976 50 971 45 969 42C967 36 969 29 974 25C977 23 984 23 987 25C993 29 995 36 992 41C991 43 989 45 988 45C986 47 987 48 992 48S998 47 1000 46C1008 41 1010 30 1005 20C1002 15 996 10 991 7C977 1 959 1 944 8C934 12 923 21 917 29L914 34L920 40C939 60 952 86 959 114C961 124 961 124 963 124C968 125 974 134 972 139C971 144 967 149 964 150C962 151 962 151 962 156C962 170 958 190 953 207C946 225 934 247 921 262C918 266 916 268 916 269C916 269 919 268 922 268C933 267 949 270 959 275C979 285 992 305 991 324C989 338 983 350 972 357C955 368 935 367 922 354C916 349 913 345 911 338C906 321 916 301 933 297C942 294 955 296 962 302C967 307 968 316 965 320C959 329 949 329 944 320C940 315 942 307 947 304C950 302 948 301 941 302C933 302 928 304 923 310S917 319 917 328C917 335 917 336 919 341C929 360 955 364 972 349C980 341 984 333 984 321C984 315 984 313 982 309C977 293 963 281 945 276C938 274 922 273 915 275C909 276 909 276 902 282C894 290 883 298 873 304C869 307 865 309 865 310C864 310 867 315 870 322C891 362 906 404 914 444C916 451 917 457 917 458C917 458 920 459 922 460C963 473 993 516 1001 573C1002 585 1002 607 1001 617C994 662 967 695 933 702C925 704 909 704 896 702C888 701 886 701 886 702C884 708 868 736 859 750L854 758L862 770C880 800 892 827 897 852C899 863 900 879 899 886V893L905 892C932 890 957 879 976 861C997 841 1007 818 1009 792C1010 767 1002 746 986 731C980 725 973 721 964 718C956 715 942 714 934 716C916 721 902 732 894 749C892 752 891 754 891 755C891 755 893 755 894 754C898 752 906 752 911 755C915 758 918 763 918 768C919 776 915 782 909 785C902 788 894 787 889 781L886 779L887 783C889 801 898 815 911 821C916 824 917 824 925 824C932 824 933 824 938 821C947 817 953 808 955 797L956 792H959C962 792 962 792 962 794C962 798 960 807 957 811C945 834 915 837 897 818C868 789 880 734 919 715C928 711 936 709 946 709C959 709 970 712 980 719C1008 736 1021 774 1012 810C1003 849 973 881 934 893C931 894 929 895 929 895S931 896 934 896C941 897 958 902 966 905C1000 918 1020 939 1024 967C1028 991 1016 1010 1000 1006C988 1002 986 987 995 979C997 978 999 977 1003 977S1008 977 1011 979C1013 980 1016 982 1016 983L1018 986L1019 982C1019 977 1019 967 1017 961C1015 954 1009 943 1005 937C995 925 978 915 958 908C943 904 926 901 906 899H898V903C895 920 886 940 875 954C866 965 852 974 838 978C829 980 815 980 806 978C793 974 781 968 769 958C756 946 747 941 733 937C728 935 724 935 716 934C710 934 706 934 706 934S707 936 708 937C712 941 713 945 711 950C706 960 691 958 689 947C688 941 692 934 699 930C707 927 723 927 737 931C743 933 755 939 757 940C758 942 759 941 759 935C760 915 779 901 800 905C813 908 820 916 819 926C819 933 814 938 806 938C792 938 787 920 799 913L801 912L797 911C781 908 765 920 765 936C765 943 766 946 772 952C788 967 811 976 830 973C856 969 877 949 887 919C889 913 892 903 892 900C892 899 889 899 883 899C864 898 843 893 826 887S786 869 771 856L764 851L752 859C697 895 640 915 575 919C554 921 533 920 509 917C458 910 412 892 299 834C251 809 235 803 209 800C164 795 120 813 100 845L97 851L99 854C103 859 111 867 116 870C121 874 130 878 137 880C145 882 157 882 165 880C186 875 201 855 196 837C194 826 186 818 176 818C171 819 166 820 163 824C159 828 157 836 158 842V845L161 842C169 834 183 842 180 853C179 857 174 862 170 862C163 862 157 857 154 850C152 846 152 845 152 839S152 831 154 827C158 818 166 813 175 813C181 813 185 814 189 817C202 826 206 846 198 862C195 868 185 878 178 881C164 889 147 890 130 884C118 880 106 872 98 862L94 858L93 862C88 877 90 897 97 911C110 937 140 951 166 942C180 937 189 929 202 909C216 889 223 882 236 878C242 877 252 877 258 878C273 882 286 895 289 909C289 912 290 914 291 914C293 914 298 917 300 920C311 933 298 952 282 947C272 944 267 933 271 924C273 920 277 916 280 915C282 914 282 914 281 912C281 911 279 910 277 909C268 904 256 907 247 917C242 922 240 926 232 940C224 955 220 961 214 966C209 972 204 975 197 978C189 982 183 983 174 984C151 985 127 975 109 955C91 937 81 914 79 885C78 873 79 860 81 847L83 839L81 831C77 821 77 815 77 803C77 767 96 732 131 708L135 705L131 706C128 706 119 706 111 706C98 706 94 706 88 704C79 702 68 699 62 696L59 694L54 700C28 728 10 766 5 805C3 816 3 816 6 818C9 819 11 825 11 829C10 833 8 835 5 837S2 839 4 854C5 860 5 865 6 865C6 865 8 865 9 865C9 865 12 867 13 868C17 870 19 875 19 879S17 887 14 890L12 891L15 900C45 974 114 1018 184 1006C202 1003 216 999 237 988L252 981L251 978C251 974 253 968 257 966C261 963 265 963 269 965L273 967L285 959C321 937 348 924 368 918C376 916 389 916 398 917C413 920 426 926 455 943C491 964 510 971 532 973C542 974 548 973 555 970C562 966 567 962 580 950S597 935 604 931C610 928 611 928 619 928C628 928 634 929 642 933C656 940 666 954 669 971C670 985 665 999 655 1003C641 1009 629 993 639 981C641 978 644 977 649 977S657 978 660 982L662 985L663 980C663 975 662 967 660 961C655 949 642 938 629 935C627 934 622 934 618 934C611 934 610 935 604 937C597 941 593 944 580 956S562 973 555 976S542 980 532 979C508 977 488 969 450 947C440 941 435 939 426 939C398 939 373 966 370 1000C370 1003 370 1007 371 1009V1013L374 1010C382 1000 398 1008 395 1021C393 1029 384 1033 377 1029ZM893 888C894 882 893 867 891 857C888 836 879 812 866 789C862 781 852 765 851 764C850 764 847 767 844 771C824 798 803 820 772 844L769 847L772 850C778 854 790 863 799 868C825 883 858 892 886 893H893ZM98 804C114 777 139 755 169 740C187 731 205 726 225 722C236 721 270 720 281 722C302 725 323 731 343 738C359 745 370 750 403 766C455 791 476 799 502 806C521 810 531 811 556 811C576 811 581 811 590 810C617 805 641 798 666 785C677 780 696 768 699 766C699 765 699 762 694 753C691 747 688 739 687 737L685 733L677 738C652 755 622 766 591 771C580 773 552 773 540 772C530 771 513 768 504 766L498 764L495 767C490 771 484 770 479 765C478 764 477 762 476 760C476 758 476 757 472 756C462 753 433 741 399 726C380 717 358 708 351 705C318 692 287 684 264 682L258 681L255 685C250 691 240 690 236 682C235 681 235 681 224 682C181 685 141 703 115 730C98 747 88 765 84 786C82 796 83 815 85 823L86 829L90 820C92 816 96 808 98 804ZM585 765C618 761 648 750 676 732L683 727L681 722C672 699 658 648 655 626C654 624 654 623 653 623C639 629 627 633 614 634C610 635 599 635 588 635C534 635 507 641 495 657C491 662 490 668 490 676C491 693 504 705 520 703H524L522 701C517 698 515 690 519 685C522 680 530 679 535 683C541 688 540 699 534 704C519 715 497 709 489 693C485 686 484 681 484 675C484 657 494 644 515 637C523 634 538 631 550 630C556 630 563 629 565 629H568L561 625C544 617 530 603 523 590C522 587 521 585 521 585S514 591 505 598C475 621 468 631 465 648C462 669 473 693 497 718C509 731 522 739 537 744C543 746 545 746 554 746C566 746 569 745 577 741C587 737 593 728 594 718L595 713L584 696C573 679 570 675 566 674C564 674 560 675 560 677C560 677 559 678 557 678C554 678 554 678 554 675C554 668 562 657 571 653C593 643 620 653 631 676C638 691 638 706 630 722C624 735 610 745 594 750C586 752 566 752 555 751C534 748 510 740 487 727C448 705 425 685 413 661C406 647 403 637 403 621C403 603 407 590 416 572C426 550 439 531 469 497C488 475 497 463 505 453C524 428 536 406 541 384C543 376 545 361 544 360C544 360 541 361 538 363C518 371 497 385 475 402C459 415 459 416 456 423C453 432 444 450 439 458C436 462 431 470 426 475C412 494 404 507 402 517L400 522L391 512C386 507 381 503 381 503C380 503 374 519 372 531C370 541 370 579 372 593C379 644 397 686 424 714C434 724 455 739 470 747L478 751L480 750C486 744 496 747 499 755C500 758 500 758 504 759C510 761 528 764 536 765C548 767 574 767 585 765ZM714 754C739 734 763 709 781 682L788 673L777 657C771 648 766 641 766 640C765 640 763 643 760 648C749 668 734 688 719 703C711 712 698 723 692 727L690 729L693 737C695 741 698 748 701 753C704 760 705 761 706 760C706 760 710 757 714 754ZM698 715C708 707 722 692 730 681C741 668 761 637 761 634C761 633 760 630 758 627C747 611 730 581 721 563L715 553L711 561C704 576 696 587 684 599C679 605 666 615 661 618C660 619 660 619 661 628C666 654 673 680 681 703C688 725 688 723 689 722S694 718 698 715ZM400 720C399 719 362 696 348 686C295 654 258 639 219 635C199 633 172 635 152 640C121 648 91 664 68 685L63 690L70 693C84 698 95 700 112 700C131 700 146 697 164 690C176 685 189 681 200 679C209 677 226 675 232 675C235 675 235 674 237 672C239 668 242 667 247 667C251 667 255 669 257 673C258 675 258 675 261 675C262 675 267 676 272 677C305 681 336 692 386 714C399 720 400 720 400 720ZM397 687C376 652 364 606 364 560C364 536 367 518 374 503C375 500 376 498 376 498C376 497 360 484 350 477C332 463 304 446 286 436C282 433 278 431 278 431C279 431 281 432 283 432C307 438 336 434 359 422S404 388 415 364C424 346 429 322 429 303V299L422 304C408 312 392 321 375 327C371 329 371 329 371 332C372 337 373 355 372 359C369 371 361 381 348 387C322 400 289 397 253 378C237 370 218 357 210 347C208 344 207 343 204 343C187 340 150 328 135 320L132 319L134 322C152 346 161 366 163 389C165 405 162 421 155 436L154 439L160 444C164 446 174 456 183 465C199 480 200 481 202 481C203 480 205 480 207 480H210V475C211 463 220 452 235 443C245 437 260 434 271 435C284 437 298 447 298 455C298 461 291 467 285 466C276 464 273 452 280 446C282 445 282 445 280 444C279 444 276 443 274 442C262 439 245 443 232 452C221 460 217 467 216 478C216 483 216 484 218 486C219 488 219 490 220 493C221 500 224 506 232 514S250 529 263 535C268 538 277 542 282 544C295 551 299 556 296 564C294 568 292 570 286 571C285 572 283 572 283 573C282 573 286 577 290 583C323 618 352 648 370 667C379 675 402 697 403 697C403 697 400 693 397 687ZM932 696C945 693 958 686 967 676C979 664 987 648 992 629C995 618 996 610 996 595C996 568 990 542 979 520C965 493 947 476 923 467L918 465L919 467C919 471 921 486 922 498C924 511 924 551 922 565C920 587 916 614 911 633L909 639H911C914 639 923 637 929 635C950 628 961 614 961 597C961 592 960 590 959 593C958 597 948 598 944 595C939 592 937 585 940 580C944 574 950 573 957 576C968 582 971 601 963 616C959 623 950 632 942 636S924 643 915 645C911 645 907 646 907 646S906 650 904 656C901 665 892 688 890 692L889 695L894 696C903 697 904 697 915 697C923 697 929 697 932 696ZM794 662C799 654 800 655 792 647C788 643 782 637 779 633S774 626 774 625C773 625 772 626 771 629L769 633L771 636C776 644 791 667 791 667S793 665 794 662ZM810 633C827 601 841 562 848 527L850 516L845 518C842 519 838 520 835 520C831 520 830 520 828 517C824 514 823 510 823 499C822 491 823 490 824 486C826 484 829 479 833 475C841 467 843 463 843 459C843 456 840 451 837 450C834 448 831 449 821 460C812 469 812 469 812 473S810 495 809 504C803 542 793 579 779 611L776 618L779 622C783 628 791 637 797 643C801 649 802 649 803 648C803 647 807 641 810 633ZM614 628C623 627 629 625 638 622C643 620 652 617 653 616C653 616 652 612 651 607C650 601 649 591 648 583C647 576 646 569 646 569C645 569 643 570 640 572C631 578 614 583 602 583H597V580V577L604 576C618 576 630 571 640 564L645 561V557C644 549 642 526 641 509C641 498 640 486 640 481L639 473L635 471C631 469 628 469 621 468C613 468 600 469 597 470C597 471 594 475 592 481C579 515 559 546 534 572L526 581L528 585C534 598 548 612 563 619C578 627 596 630 614 628ZM767 623L769 619L764 611C748 584 735 548 730 518C729 514 729 511 729 511C729 512 727 516 726 522C724 528 722 535 721 539L719 545L722 553C729 565 738 582 752 605C759 617 765 626 765 626S766 625 767 623ZM669 605C681 595 692 582 701 568C705 560 711 548 711 546C711 545 709 539 706 533C696 514 679 470 679 467C679 466 678 466 676 466C675 467 667 467 660 467C653 468 646 468 646 469C646 469 647 470 648 470C651 473 658 481 661 486C674 508 672 538 656 558C652 563 652 564 652 567C653 574 657 602 658 607L659 612L661 611C662 610 666 608 669 605ZM776 603C790 569 799 532 804 491C806 472 806 471 803 470C801 469 797 465 793 461C785 452 781 449 778 449C774 449 769 456 770 460S773 466 779 474C783 478 787 483 788 485C790 488 790 489 790 498C790 514 787 520 778 520S761 516 755 510C751 505 749 502 749 496C749 491 750 488 754 485C758 483 764 483 768 485C778 490 776 506 764 508H762L766 511C769 512 772 513 776 513L781 514L783 511C784 508 784 505 784 498C784 487 784 486 774 476C770 472 767 467 766 465C764 460 764 455 766 452C771 445 776 444 790 448C795 450 801 451 803 452H806V436C806 405 802 370 795 341C794 334 793 334 791 334C790 334 785 335 779 335C743 338 703 331 663 314C648 307 619 292 606 283C604 282 605 284 610 291C615 299 618 305 632 333L637 344L646 347C663 353 678 362 692 375C700 383 709 395 713 402C715 406 716 406 720 407C743 415 766 408 771 393C772 389 772 383 771 379C768 373 761 370 755 371H751L754 373C759 378 759 386 754 390C749 395 742 394 738 389C727 377 746 360 763 365C769 367 775 373 777 379C782 396 770 412 749 416C741 417 728 416 720 413C719 413 719 414 721 418C728 433 732 454 732 475C732 506 739 542 751 571C757 587 771 612 772 611C772 611 774 607 776 603ZM287 567C288 567 289 565 290 564C293 556 288 552 273 547C265 544 258 541 252 537C247 535 247 535 262 551C270 560 278 568 279 569C281 570 285 569 287 567ZM657 544C662 536 663 529 663 518C663 508 662 502 658 494C656 488 650 480 647 478C646 478 646 478 646 487C647 508 648 529 649 541C650 548 651 554 651 554C651 556 655 550 657 544ZM84 547C94 545 104 537 108 528C115 512 110 494 96 487C88 484 79 484 74 489C72 491 72 491 72 496V501L74 499C79 492 89 493 93 500S92 517 83 517C78 517 75 515 71 511C67 506 66 501 66 495C66 487 68 484 76 480L80 479L76 478C66 476 55 470 47 463C42 458 43 458 38 468S31 486 31 497S33 516 37 525C41 532 50 541 56 544C65 548 75 550 84 547ZM719 522C724 505 725 491 726 474C726 465 725 457 725 455L724 451L722 453C716 458 704 462 692 464C688 465 685 466 685 466C685 469 701 510 710 528L715 538L716 535C716 533 718 527 719 522ZM844 512C847 511 849 510 850 509C852 508 852 508 849 508C844 508 839 502 839 496C839 488 843 484 851 483C855 483 855 483 856 480C858 465 859 421 857 401C856 384 853 368 850 354C848 341 843 323 842 321C842 321 840 321 836 323C828 326 815 329 806 331C803 332 800 333 800 333C800 334 801 340 803 347C809 377 812 399 812 429C813 444 813 451 814 451C814 451 818 450 822 449C836 444 842 445 847 451C848 453 849 455 849 458C849 464 847 467 839 476C829 486 829 488 829 499C829 511 831 513 835 513C837 513 841 513 844 512ZM103 472C112 470 122 466 131 458C135 455 145 443 145 441C145 440 131 433 124 431C108 426 88 427 72 434C65 438 56 444 51 449L47 453L49 456C50 457 52 459 55 461C69 472 85 475 103 472ZM621 462H640V448C640 416 636 375 630 356L629 351L624 350C621 349 617 348 609 348C599 347 598 347 599 349C608 381 610 408 605 437C603 446 600 459 599 462C598 464 598 464 600 463C602 463 611 463 621 462ZM675 460C676 459 671 445 659 412C651 391 639 361 638 362C638 362 638 364 639 366C642 381 645 411 646 439V462L660 461C668 461 675 460 675 460ZM698 456C707 454 713 452 718 448C721 446 722 446 723 447C727 453 719 426 713 414C710 409 709 408 705 406C698 401 691 396 674 382C660 370 647 359 644 359C644 358 643 359 644 359C654 383 672 430 680 453L682 459H686C689 458 694 457 698 456ZM476 393C497 377 521 363 541 355L545 353L544 344C543 314 529 280 504 249C497 241 491 235 491 236C491 236 488 239 486 242C479 252 470 264 460 273L451 282L454 289C464 318 469 351 466 378C465 387 463 402 462 405C461 406 463 404 466 402S473 396 476 393ZM704 399C704 398 701 395 698 392C686 376 668 362 650 355C647 354 648 355 656 361C659 363 666 369 672 374C688 388 690 390 697 395S705 400 704 399ZM313 377C328 373 337 364 338 352C338 348 338 347 336 345C333 341 332 341 326 342C315 344 294 347 279 348C263 349 239 348 226 346C223 346 220 345 220 345C220 346 229 354 236 358C251 368 271 375 290 378C295 379 308 378 313 377ZM626 339C622 327 617 316 606 299C599 289 592 280 586 273C582 268 578 265 560 251C553 246 540 236 532 230C524 223 517 217 516 216C513 214 504 210 504 211C504 211 503 213 501 216L499 221L509 230C550 264 578 297 593 334L596 341H611C619 342 626 342 626 342C627 343 627 343 626 339ZM295 340C301 340 307 339 309 339L314 338L308 335C298 330 293 321 293 310S298 290 308 285C312 282 314 282 320 282C333 281 342 285 352 295C359 301 363 308 367 317L369 323L381 318C397 311 415 301 425 294C428 292 429 291 429 288C429 279 424 257 418 243C415 236 409 222 408 221C408 221 404 223 399 227C365 253 328 271 290 279C258 286 221 286 192 278C184 276 184 275 186 286C190 304 199 323 210 334L213 338L223 339C228 340 237 341 242 341C254 342 283 342 295 340ZM201 335C200 334 199 332 197 329C188 314 181 296 179 279L178 274L171 271C161 268 146 260 137 254C103 232 81 200 73 165C71 154 71 135 72 124C77 90 98 62 125 49C139 43 158 41 172 44C187 47 199 53 209 63C230 84 235 114 221 129C215 136 205 139 192 138C180 137 169 140 165 146S163 160 169 162C171 163 172 164 172 166V169H168C151 167 141 148 148 132C153 122 161 116 176 110C190 105 193 102 197 93C199 89 199 78 197 73C192 63 183 55 171 51C165 49 163 49 153 49C141 49 134 51 123 56C102 66 87 85 80 110C78 117 78 118 78 133C78 147 78 148 80 157C86 177 98 196 113 209C129 223 147 231 168 235C179 237 182 237 182 235C182 234 183 230 184 226C187 217 193 205 197 199C199 196 200 194 200 194S198 194 195 195C152 206 109 184 101 148C98 135 101 120 107 109C111 102 121 93 129 89C136 86 145 83 151 83H154V86V89H151C142 89 130 94 122 101C117 106 111 115 109 121C106 128 106 141 107 147C112 168 130 184 153 190C164 192 181 192 192 189C202 187 208 184 211 181C214 177 228 166 235 162S245 154 250 145C261 124 264 96 256 72C246 43 221 19 189 8C178 5 170 3 158 3C121 1 87 15 60 43C36 68 22 101 19 139V146L22 148C32 152 33 166 24 172C22 173 22 174 22 175C23 182 27 198 30 205C42 237 64 266 93 288L97 291L94 287C92 286 90 284 90 283C90 283 91 282 92 281L94 279L108 293C124 308 125 309 144 318C159 324 179 331 199 335C200 336 201 336 201 336S201 335 201 335ZM787 328C789 328 791 327 791 327C792 327 784 304 779 291C774 277 765 260 758 247L752 237L744 233C720 221 703 204 692 181C689 175 687 171 687 170C687 167 656 150 639 144L631 140V138C632 136 633 135 633 135C637 135 663 147 675 154C680 157 683 159 683 159S683 155 682 151S680 140 680 131L679 119L672 116C634 100 597 97 560 106C551 108 542 112 531 121L521 128L520 139C519 158 516 176 511 193L508 201L512 204C515 208 517 208 524 211C543 216 557 218 576 218C585 218 593 217 600 216C632 211 646 200 645 180V177L643 179C639 184 633 185 628 182C618 175 623 161 634 161C648 161 656 180 649 196C644 207 630 215 613 220C591 226 558 226 535 220C532 220 530 219 530 219C530 220 551 237 564 247C581 260 595 269 602 273C615 280 637 287 653 289C661 290 675 290 681 288C693 285 703 278 707 269C709 264 709 255 707 250C705 246 700 241 696 240C693 238 682 238 682 239S683 241 684 241C686 243 689 248 689 252S687 259 684 262C675 270 661 264 661 252C662 245 666 239 674 235C680 232 691 231 697 233C711 238 719 255 713 270C707 286 683 297 658 296C651 295 640 294 635 293C634 292 639 295 647 299C680 316 713 326 745 329C750 330 782 329 787 328ZM807 325C819 322 840 315 840 314C840 312 833 292 828 281C824 271 811 245 810 244C809 244 805 244 801 244C791 245 778 244 768 242C764 241 761 240 761 240C761 241 763 243 765 247C776 266 787 291 795 317C797 322 798 327 798 327S803 326 807 325ZM867 301C870 299 871 298 871 297C871 295 879 287 885 282C900 271 914 246 919 221C921 211 922 190 921 180C920 172 916 153 914 149L913 147L911 148C908 150 903 152 892 154C887 155 880 156 878 156C874 158 874 158 875 160C876 165 875 183 874 188C869 204 859 219 844 229C839 233 826 239 822 240C821 240 820 241 820 241S823 246 827 251C835 262 848 282 855 295C858 300 861 304 861 304C862 304 864 303 867 301ZM469 254C476 246 486 231 486 230C486 228 444 192 442 192C441 192 416 214 416 214C415 215 418 218 420 222C430 236 443 259 448 272L449 275L456 269C460 265 466 258 469 254ZM913 262C939 233 954 196 956 160V151L953 150C943 145 943 131 952 126C953 125 954 124 954 124C954 123 953 119 952 114C946 87 934 65 915 44L911 39L908 45C907 48 906 53 905 55L904 59L908 63C916 70 918 76 915 82C914 86 908 91 906 91S904 93 905 100C908 112 911 124 913 126C916 129 917 133 917 136S918 145 920 151C931 185 931 210 922 238C918 248 914 257 909 265C907 268 905 271 906 271C906 271 909 267 913 262ZM805 237C806 237 795 221 787 210C766 182 739 156 712 137C705 133 687 123 686 123C686 123 686 126 686 133C686 144 689 157 691 163C692 164 695 168 701 172C718 185 737 205 750 224L755 232L761 233C767 235 776 237 783 238C786 239 805 238 805 237ZM206 235C230 231 257 215 294 185C305 175 325 157 326 156C326 156 324 155 321 154C311 152 303 151 290 152C275 152 267 154 254 159C247 162 246 162 240 169C232 177 227 181 218 186C213 189 210 191 208 194C200 204 192 219 189 230C188 232 188 235 187 235C187 237 198 237 206 235ZM825 232C837 228 847 221 855 211C861 205 867 193 868 185C869 179 870 168 869 164L868 161L866 164C864 165 860 170 857 174C847 186 843 189 835 189C830 188 826 185 823 180C821 176 821 174 821 168C821 164 822 158 822 154C825 141 824 129 820 128C817 127 813 122 812 119L811 115L807 116C798 117 786 122 782 127L780 129L783 128C789 127 797 132 799 139C801 144 800 150 797 154C789 163 776 162 770 152C769 150 768 149 767 149S766 148 766 142C767 130 770 123 777 114C782 109 792 102 796 101C799 100 806 102 810 105L813 108L816 104C825 95 841 101 841 114C841 117 842 117 847 120C853 124 861 131 865 138C868 142 868 142 871 142C872 142 879 143 885 145C899 149 904 149 907 146C911 143 911 140 909 134C907 126 904 124 887 118C874 114 870 112 865 107C861 103 855 90 853 83C852 77 852 71 855 67C857 64 867 59 875 57C879 55 888 55 896 56C898 56 898 56 900 51C901 48 902 43 904 40L906 35L903 32C898 28 886 20 877 16C850 3 821 0 789 6C749 15 715 40 698 75C694 83 689 97 688 102V106L693 109C707 120 724 134 746 156C770 180 789 202 808 226C815 234 816 235 817 235S822 234 825 232ZM742 223C730 207 712 189 698 178C696 176 696 176 699 182C708 198 723 214 739 223C741 225 744 226 744 226S743 225 742 223ZM497 209C498 208 497 207 491 204C483 200 470 191 462 185C459 182 456 180 456 180C455 180 454 182 452 183L448 186L462 195C469 200 479 207 484 211L494 218L495 214C496 212 497 210 497 209ZM493 197C492 195 485 189 478 183C465 173 465 173 463 174C462 174 461 175 461 175C461 176 471 184 478 189C483 192 495 199 496 199C496 199 495 198 493 197ZM505 189C510 175 513 158 514 141C514 134 514 132 513 133C511 135 473 165 472 167L469 168L471 170C473 171 480 177 488 184S502 196 503 196C503 196 504 193 505 189ZM844 183C848 180 850 176 853 163C856 151 858 146 860 144C861 144 861 143 859 140C856 135 849 129 844 125L840 123L837 125C835 127 833 128 831 129C828 130 828 130 829 133S829 144 828 154C826 163 826 173 828 177C829 180 830 181 834 182C839 184 841 185 844 183ZM784 118C788 115 793 113 800 111L807 109L804 108C798 106 796 107 788 113C781 118 778 122 784 118ZM902 108C900 102 899 96 899 95C898 94 898 93 895 92C887 90 882 81 884 73C885 69 890 64 892 63S894 62 892 62C886 59 866 64 860 71C858 73 858 73 858 78C858 82 859 84 862 91C870 105 874 109 892 115C897 116 902 118 903 119C903 119 904 119 904 119S903 114 902 108ZM973 428C963 425 958 413 964 405C967 401 972 398 976 398S985 401 988 405S992 414 989 419C987 426 980 429 973 428ZM691 677C687 676 683 671 683 666C683 658 691 652 699 656C712 662 705 681 691 677ZM556 179C546 174 545 160 554 154C559 151 566 151 570 154C575 157 577 160 577 166C577 170 577 172 575 174C571 181 562 183 556 179Z' horiz-adv-x='1022.99' unicode='D'/>
+<glyph d='M596 1038C586 1036 580 1031 577 1024C575 1019 575 1007 577 1001C578 997 580 995 591 984C604 972 604 971 604 969C603 967 602 965 601 964C599 961 596 962 589 967C586 969 583 971 581 972C580 972 578 975 575 980C568 991 545 1026 543 1029C542 1029 539 1028 538 1028C537 1027 539 1024 545 1015L553 1002L549 1005C544 1010 539 1011 534 1011C524 1010 510 999 505 990C500 980 503 968 510 966C518 965 524 975 518 981C516 983 515 983 512 983H509L510 986C513 994 528 1005 535 1005C543 1005 551 997 554 987C555 982 555 983 552 962C551 953 552 949 555 945C556 944 559 942 560 942C563 941 568 944 573 948C579 953 582 955 582 955C586 952 623 879 623 876C623 875 620 873 617 871L611 867L609 870C582 903 556 928 523 948C485 971 442 986 398 990C378 993 348 992 327 989C286 984 243 967 210 943L203 938V946C202 955 200 964 196 973C193 979 187 989 186 989S184 989 183 988L181 986L183 984C189 974 192 964 192 957C191 951 190 948 185 946C179 943 173 946 160 958C151 967 144 972 136 975C108 986 72 973 50 944C45 936 38 924 35 915C34 912 33 909 33 909C32 909 26 918 24 922C17 938 19 961 31 977C34 982 43 990 48 992C55 996 62 997 68 996C73 995 78 992 81 990C82 989 82 990 86 994L89 998L87 1000C84 1002 78 1005 73 1006C51 1010 26 992 17 966C10 943 14 921 28 905L32 901L31 896C28 876 30 854 37 832C45 809 59 787 78 770C85 764 98 755 103 752L105 751L106 738C106 723 107 714 109 701C116 660 133 621 156 590C158 587 160 585 160 584S139 572 126 565C91 547 67 543 56 553C55 555 52 557 52 559C49 564 48 573 49 582L50 585L52 582C54 577 60 574 66 574C71 574 77 578 80 582C82 585 82 586 82 591C82 597 82 598 80 601C74 610 61 611 52 603C44 594 40 575 44 561C47 554 53 548 60 546C76 541 104 548 138 565L146 569L141 563C136 556 128 545 124 537C117 525 100 505 88 497C81 492 73 488 66 487C61 485 48 485 47 486C47 486 48 487 49 489C54 495 48 506 40 503C32 501 31 492 37 485C39 482 44 480 48 480C51 479 51 479 51 481S51 483 52 481C54 480 55 480 60 480C68 481 74 483 82 487S98 496 107 506L114 513L112 507C106 478 110 448 125 424C130 416 142 404 149 399C152 397 154 395 154 395S154 392 153 388C151 376 151 360 153 343L154 339L147 334C143 331 136 325 131 320C89 279 66 225 66 168C66 142 70 119 79 97C89 73 108 49 125 37C128 34 130 32 130 32C130 29 118 16 110 12C99 5 84 1 73 3L70 4L73 6C81 11 82 23 76 30C71 34 63 36 57 33C48 29 45 17 51 9C54 5 59 1 66 0C72 -3 87 -3 96 -1C110 2 123 10 132 22C135 25 137 28 137 28C138 28 140 27 143 25C173 10 209 8 235 21C252 29 264 42 269 58C272 66 272 78 270 84L268 89L274 94C277 97 285 107 291 115S304 131 306 133C318 144 338 144 347 133C351 129 352 125 352 118S352 110 349 114C347 117 341 120 336 120C332 120 328 118 325 115C318 107 320 95 329 90C332 88 333 88 338 88C344 89 348 91 352 97C360 107 361 127 354 142C349 156 337 168 323 174L319 175L324 176C332 177 347 180 358 184L369 188L374 179C385 159 390 141 390 119C390 74 364 38 327 32C321 31 312 31 309 32C307 32 307 32 309 34C313 36 315 40 315 45C315 60 294 64 289 50C285 41 291 32 302 27C309 25 325 25 334 27C365 36 388 62 395 98C397 107 397 132 395 140C394 144 394 146 394 146C394 147 396 144 399 140C413 120 432 100 453 84C497 48 548 27 605 20C616 19 651 19 662 20C694 24 729 33 758 44C763 46 767 48 768 48C768 48 769 47 770 47C772 44 777 42 781 42C789 42 794 48 795 56L796 60L806 65C841 80 878 94 902 100C923 105 935 106 952 106C961 106 967 105 970 104C975 103 985 98 988 96L990 95L985 93C973 87 958 84 938 83C924 82 920 81 913 76C905 70 899 61 897 52C896 48 897 37 898 33C898 31 898 32 891 35C882 40 873 44 864 46C858 48 855 48 846 48C834 48 829 47 823 43S815 35 814 29C814 19 820 13 829 13C844 13 849 32 836 40L834 41L838 42C847 43 865 41 876 36C884 33 894 27 902 22C937 0 945 -3 959 -3C975 -3 986 1 998 12C1003 18 1005 21 1008 26C1013 36 1014 42 1013 53C1013 68 1009 78 1002 88C1000 91 999 93 999 93C1009 101 1016 107 1020 116C1031 138 1023 165 1005 165C999 165 994 161 992 155C989 147 996 137 1005 137C1009 137 1014 140 1016 143L1018 146V141C1019 136 1018 127 1016 122C1013 114 1007 106 998 100L994 97L989 100C969 113 936 113 890 101C881 99 853 90 845 87C844 87 849 90 855 95C883 113 903 130 926 153C965 191 989 226 1009 271L1013 281H1017C1022 282 1025 283 1028 287C1032 291 1033 294 1033 299C1032 305 1030 310 1026 312L1024 314L1025 319C1036 360 1039 417 1034 460C1031 489 1022 524 1012 548L1010 552H1012C1013 552 1016 553 1019 553C1028 555 1032 558 1033 564C1033 568 1031 573 1027 576C1025 577 1020 580 1015 581C1009 584 1005 586 1003 588C999 591 995 600 994 605C994 610 995 611 1001 613C1006 615 1017 616 1017 615C1017 615 1016 614 1015 612C1009 603 1017 592 1027 594C1036 597 1038 607 1030 615C1026 619 1020 621 1012 621C1000 621 990 617 989 610C988 606 989 599 992 593C996 585 999 582 1011 577C1018 575 1022 572 1024 571C1026 568 1027 568 1027 564C1027 556 1023 554 1012 560L1006 562L1001 573C988 598 973 619 955 639L948 646H958C969 646 974 648 983 653C1002 666 1007 693 996 715C992 723 981 734 973 738C952 750 928 753 902 747C879 741 858 729 841 712L836 708L829 709C824 710 815 710 807 710C792 710 783 709 770 705C766 704 762 704 762 704S762 706 763 708C763 710 763 712 763 712C762 712 758 713 754 714C747 715 746 716 746 717C746 717 747 722 748 727C748 732 749 736 750 736C750 736 756 734 761 731C770 726 773 725 776 725C783 725 787 730 787 738C787 742 786 744 781 754S776 766 776 770C776 779 781 789 788 791C790 791 792 791 796 790C802 789 809 785 813 782L816 780L812 778C807 777 805 775 804 770C802 763 807 756 815 756C822 756 826 761 826 770C825 773 825 776 825 776S828 774 832 772C868 750 921 753 964 779C978 788 995 804 1003 816C1016 835 1021 854 1020 876C1020 891 1018 900 1011 913C999 937 979 952 954 956C923 960 895 943 888 916C881 888 901 862 929 864C944 866 954 870 960 877C969 886 969 897 961 906C953 914 940 915 932 908C928 905 925 899 924 894C923 887 927 878 934 874C938 872 938 871 929 871C919 870 910 873 903 880C890 893 889 914 901 930C915 949 941 955 966 946C986 939 1002 919 1009 895C1010 888 1011 886 1011 874C1011 861 1010 859 1009 852C1005 838 998 826 988 816C981 808 972 803 963 800C957 798 955 797 947 797C935 797 929 798 920 802C907 808 904 811 873 844C844 874 819 901 811 909L806 914L812 923C827 946 845 964 864 976C878 984 893 990 910 994C919 996 921 996 938 996S959 996 975 994C989 992 995 991 1007 991C1023 991 1027 992 1036 997C1050 1005 1051 1023 1038 1031C1035 1033 1033 1033 1029 1033C1024 1033 1023 1033 1019 1031C1011 1026 1008 1016 1012 1007C1014 1005 1016 1002 1018 1000L1021 998L1018 997C1013 996 990 998 974 1000C955 1002 932 1003 921 1002C887 998 859 984 834 959C824 949 817 941 808 928L802 919L799 920C794 923 781 927 773 929C763 931 745 931 735 929C705 924 675 911 640 887L629 880L628 886C623 914 621 943 624 962C627 989 639 1013 656 1024C663 1029 669 1031 678 1031C692 1032 700 1029 710 1019C717 1012 720 1007 724 997C727 992 727 990 727 985C727 981 727 979 724 974C719 963 707 955 696 954C684 954 679 959 681 970V975L682 972C686 966 695 963 702 967C716 974 711 995 695 995C685 995 677 985 675 971C673 963 674 959 679 955C689 945 709 948 723 961C728 966 733 974 733 978C733 980 733 980 736 977C754 961 781 966 783 986C784 991 783 1000 780 1005C774 1017 762 1022 753 1014C749 1011 748 1008 748 1003S749 995 753 992C760 986 770 987 775 995L777 997V993C777 990 777 987 777 986C776 976 764 970 753 973C744 976 737 983 732 994C725 1009 721 1017 712 1025C706 1031 699 1035 691 1036C685 1038 674 1038 668 1036C643 1030 624 1002 618 964C616 955 616 921 618 909C619 904 619 899 619 899S615 908 609 919S596 943 594 948L588 957L595 958C603 959 606 960 609 964C612 969 609 975 601 983C584 998 582 1001 581 1012C581 1017 581 1018 583 1022C585 1025 587 1027 588 1028C595 1033 609 1035 616 1032C619 1031 619 1031 617 1029C615 1028 613 1024 613 1022S616 1016 618 1015C623 1012 629 1015 631 1020C632 1026 625 1036 617 1038C612 1039 602 1039 596 1038ZM566 982C571 975 573 970 573 969S572 964 572 960C570 951 569 948 566 947C564 946 560 948 558 950C557 952 557 955 559 969C561 980 561 988 558 994C557 997 559 994 566 982ZM381 985C423 983 458 974 495 956C518 945 537 933 556 916C572 903 590 884 602 869L606 863L594 853C587 848 580 843 579 842L576 839L575 841C571 848 557 864 547 874C527 895 506 909 482 921C429 947 374 949 323 927C301 917 282 904 239 871C216 853 206 845 194 837C168 821 151 813 130 810C120 808 120 808 121 813C130 841 146 871 166 895C173 902 173 902 177 903C186 904 196 913 200 924C202 929 205 932 219 941C259 968 304 983 353 985C359 986 365 986 366 986C366 986 373 986 381 985ZM128 910L146 905L137 902C126 896 115 892 105 890C93 887 77 887 66 890C62 891 57 893 54 894C50 896 50 896 51 898C56 903 68 909 77 912C92 916 103 915 128 910ZM162 903L165 902L158 895C140 872 126 846 117 819C115 813 113 809 113 808C112 808 108 808 103 809C91 810 81 812 70 818C54 825 44 836 40 851C37 859 37 870 40 878C42 886 45 891 47 890C48 890 51 889 55 887C66 883 73 882 85 882C103 882 120 886 142 897C154 903 156 904 162 903ZM706 872C726 869 744 859 760 844L767 838L764 828C760 814 753 784 749 767C748 760 746 754 746 754S743 751 740 748C729 740 725 738 722 742C716 748 718 753 730 763C734 767 738 771 739 773C746 783 743 803 734 809C730 812 725 813 716 813C703 813 694 809 690 801C685 792 688 783 697 782C709 780 715 797 705 802C703 803 702 804 702 804C702 805 709 806 715 806C727 806 732 804 735 798C736 796 737 794 737 788C737 778 735 776 725 766C713 756 710 750 714 743C717 737 719 737 732 737H743V735C743 734 742 730 741 725C740 721 740 717 740 717S736 717 732 718C727 719 723 720 723 720C723 719 718 690 718 689C718 689 719 689 721 688C728 687 728 687 721 682C713 676 704 668 698 662L694 657V670L693 683H685H676V693C673 741 661 795 640 849C638 855 636 861 636 861C635 863 653 869 667 872C677 874 696 874 706 872ZM631 845C633 837 635 831 635 830C636 829 634 833 631 837C628 842 624 848 623 850S620 854 620 854C619 855 626 860 627 859S629 852 631 845ZM618 845C634 820 646 796 653 772C662 739 668 712 670 689V683H662H654V666V649H662H670V639C669 626 667 606 666 598C665 595 664 587 663 582C661 570 658 554 654 539C636 474 605 411 561 354L554 344L551 347L547 351L535 339L522 327L526 323L531 318L529 316C527 312 499 285 488 275L477 265L467 275L458 284L479 306C500 326 510 337 523 353C581 425 617 505 629 588C632 611 633 620 633 648C633 677 632 687 628 710C621 753 604 798 583 831L581 833L586 836C592 840 613 852 613 852C614 852 616 849 618 845ZM784 818C789 812 796 804 799 800L805 794L800 796C793 798 787 798 783 796S775 789 772 783C770 779 770 778 770 772V765L776 753C780 744 781 740 781 738C781 734 779 731 776 730C771 727 768 730 761 745C759 749 756 753 755 754L753 755L756 771C759 786 767 817 770 827C771 831 772 832 773 831C773 831 778 825 784 818ZM400 810C420 806 442 797 461 784C520 744 556 674 564 589C566 572 566 540 564 523C557 447 526 374 475 314C460 297 460 297 476 330C500 378 514 413 524 450C546 531 542 608 511 666C499 690 486 706 463 726C457 731 452 736 450 738C447 742 445 747 445 750C445 751 444 752 443 752C439 753 438 753 436 748C433 744 423 731 421 730C420 729 417 732 414 735C398 748 381 757 362 760C300 770 244 721 244 657C244 644 244 640 248 631C250 628 252 625 255 622L259 619L254 618C252 618 247 618 244 617C221 616 197 607 175 594C171 591 166 588 166 588C165 588 153 604 148 613C142 624 136 635 131 647C127 657 123 668 124 669C124 669 125 667 127 665C133 655 145 646 155 643C162 640 176 640 182 642C192 644 199 651 199 659C199 670 190 676 181 673C171 669 169 657 177 650C178 649 179 647 179 647C179 646 164 647 160 648C136 654 119 680 114 719C112 728 111 747 112 747C112 747 115 746 119 744C153 730 193 729 228 742C244 748 253 754 284 773C295 780 308 788 312 791C332 802 350 809 368 811C376 812 391 811 400 810ZM359 754C378 751 399 741 411 728C415 725 415 725 413 723C410 720 393 707 383 701C371 694 347 681 331 674C326 672 321 670 321 669C321 669 321 668 321 666L322 663L328 664C336 664 352 663 361 661C382 656 404 645 421 632C424 630 429 625 433 621L439 615L437 609C433 595 422 577 410 565L404 558L398 564C369 592 328 611 285 617C280 617 276 618 276 618S276 619 277 619S284 624 286 628S288 640 286 644S279 652 275 653C272 655 265 655 261 653C258 652 253 647 251 644C250 642 249 653 250 662C253 699 275 732 307 747L313 749L312 746C306 734 314 721 327 721C337 721 344 728 344 738C344 744 342 748 337 752C334 754 334 754 335 754C339 755 353 755 359 754ZM951 744C971 740 988 726 993 708C995 702 996 689 995 683C991 665 976 652 958 652C953 652 944 653 947 654C950 654 956 660 957 663C962 676 953 689 940 689C931 689 924 682 922 673L921 669L915 674C905 681 886 692 876 696C874 697 873 698 873 698C873 699 874 701 875 704C888 733 921 751 951 744ZM822 705C827 705 831 704 831 704C832 703 830 700 827 696C810 674 800 648 796 618C795 613 795 607 795 605V600H783C774 600 769 600 765 599C743 594 727 580 722 559C720 553 720 540 721 534C726 517 738 505 752 503C769 500 783 509 783 521C783 525 780 530 777 531C772 535 766 534 761 530C756 524 757 517 762 512L765 509H761C759 508 755 508 753 509C726 513 716 552 736 577C747 589 766 596 787 594L794 593V590C796 565 801 544 811 520C817 507 825 492 840 464C847 453 852 442 852 442C852 440 838 426 831 421C821 415 807 409 798 407H796L795 418C795 432 793 439 788 449C780 466 766 478 750 484C741 487 731 488 725 485C720 483 715 478 715 474C713 467 716 455 721 449C726 442 735 439 742 443C752 447 753 462 744 468C737 472 728 471 723 465C721 461 721 462 721 469C721 477 724 481 733 481C743 482 758 475 769 463C779 453 785 442 788 429C789 423 790 407 789 405C789 405 782 405 775 405C760 405 754 406 743 411C722 420 702 440 689 465L684 474L688 485C710 540 727 602 739 672C740 678 741 684 741 684S744 684 748 683S756 682 757 682C757 682 758 686 759 690L760 698L767 700C785 705 803 707 822 705ZM880 688C898 680 917 667 926 659C928 656 932 653 934 652C939 648 955 632 963 622C975 607 984 593 992 576L998 566H995C990 567 988 565 985 554S980 540 977 539C975 537 971 538 968 542C965 545 965 550 968 559C971 570 970 573 967 579C962 589 954 595 948 595C944 595 936 591 931 586C923 579 921 570 925 562C928 555 935 553 941 556C951 562 947 578 935 577C933 577 932 577 932 577C932 579 938 584 942 587C950 591 954 589 960 579C965 572 965 569 962 559C960 549 960 544 962 539C964 536 969 533 972 533S982 536 989 542C995 547 1002 551 1004 551C1004 551 1005 550 1005 550C1021 510 1027 479 1030 437C1032 402 1028 359 1020 324C1018 316 1018 316 1016 316C1006 316 997 306 999 296C1000 292 1003 287 1005 285L1007 283L1005 276C997 259 986 238 974 220C934 160 876 110 805 72L793 66L791 67C789 70 784 72 781 72C777 72 773 70 771 68C767 65 766 63 766 58L765 54L759 51C739 43 708 34 687 30C625 19 565 27 510 54C458 80 414 122 384 175C381 181 377 186 376 188L375 190L382 194L390 197L392 195C393 193 400 185 407 177C435 144 448 131 463 120C527 72 611 58 702 80C762 95 818 124 866 164C878 173 904 200 913 211C938 240 956 272 966 304C985 362 981 419 954 472C947 487 940 497 922 526C903 555 899 560 892 574C872 609 864 640 866 670C867 680 870 693 871 693C871 693 876 691 880 688ZM732 671C721 605 704 542 684 491L680 482L678 488C671 510 668 529 667 554C667 569 668 571 670 585C673 605 674 610 678 620C686 640 698 657 714 671C720 676 734 686 734 685C735 685 734 679 732 671ZM686 645C684 643 681 639 679 635L675 628L676 633C676 636 676 641 676 644V649H682H688ZM273 612C298 610 321 604 345 592C363 583 380 572 393 560L399 554L397 552C391 548 377 539 369 535C356 528 342 524 327 522L321 521L324 524C330 531 329 542 321 547S304 549 300 541C297 536 299 527 305 523L307 521L303 520C296 519 277 521 262 525C238 531 215 543 194 559C187 565 171 581 171 582C171 584 181 591 191 596C212 606 231 611 259 612C260 612 267 612 273 612ZM449 602C471 573 484 537 490 494C492 479 492 447 490 431C485 392 475 355 458 315C449 295 448 292 447 293C447 293 443 296 440 298C436 301 429 305 424 308S415 314 415 314S418 318 421 323C428 335 440 360 444 370C462 419 460 465 438 510C432 523 424 535 415 546L408 554L414 560C421 568 428 576 433 585C437 592 442 602 443 606C443 608 444 608 444 608S447 606 449 602ZM191 554C228 524 274 510 318 514C348 517 379 530 399 546C401 548 403 549 403 549C405 549 418 532 425 522C449 483 456 439 445 395C441 380 437 367 429 351L425 342L411 349C384 362 364 369 341 375C290 387 240 383 193 362C185 358 169 350 162 345C161 344 160 344 160 344C159 346 157 364 158 371C158 378 161 390 162 391C162 392 164 391 166 391C189 383 215 389 233 405C246 416 253 431 255 449C255 453 256 456 256 457C257 457 272 460 281 461C306 463 332 459 350 449C366 441 376 429 380 414C381 408 382 397 380 394C380 393 380 393 379 395S374 400 370 401C358 404 348 392 353 381C355 376 361 372 367 372C370 372 375 374 378 377C387 386 390 403 385 423C382 432 376 445 370 453C355 473 330 488 302 492C287 495 265 494 251 491L247 490L244 494C240 500 230 508 224 512C216 517 208 519 198 520C189 520 185 519 178 517C173 515 167 510 165 506C159 495 166 482 179 482C187 482 195 489 195 498C195 503 192 508 187 511L185 513H188C198 515 212 512 221 506C227 503 234 496 238 491L240 488L238 487C236 486 234 485 233 485S227 483 223 480C193 465 169 439 159 409C158 405 156 402 156 402S148 407 143 411C134 420 123 438 119 451C113 474 114 499 123 522C126 528 128 532 134 540C146 557 152 564 159 571L165 578L175 568C180 563 187 557 191 554ZM663 530C665 512 668 498 674 482L677 474L674 467C654 420 628 377 600 341C590 329 579 317 579 317C579 318 574 323 568 329C560 338 558 340 559 341C559 341 564 348 569 355C610 408 642 472 658 533C660 538 661 542 661 541C661 541 662 536 663 530ZM693 445C699 436 712 423 721 416C724 414 731 410 735 408C750 400 761 398 778 398C785 399 788 398 788 398C786 391 784 385 781 380C778 374 771 364 767 360L764 358L758 362C731 380 696 386 665 380C652 377 637 371 627 365L623 362L628 369C642 390 655 413 667 438C672 447 677 458 678 461L680 466L685 458C687 454 691 448 693 445ZM249 451C247 425 231 405 207 397C200 394 199 394 188 394C178 394 176 394 171 396C167 397 165 398 165 398S167 402 169 406C182 426 207 442 239 452C244 454 248 455 248 455C249 455 249 454 249 451ZM863 423C878 392 886 366 890 333C892 321 892 287 891 274C883 211 852 160 802 131C749 98 681 97 618 128C591 141 571 156 549 177C536 189 527 200 513 219L501 234L509 240C537 259 556 270 570 272C581 274 588 270 591 261C593 257 594 247 593 243V240L591 242C586 248 576 248 572 241C568 233 574 224 583 224C593 224 601 235 600 250C599 262 596 269 589 273C586 274 584 275 579 275C567 276 555 272 535 261C530 259 526 256 526 257C535 264 544 273 551 279C555 283 559 287 559 287C560 287 561 285 563 284C564 282 565 281 566 281S591 304 591 304S589 306 587 309L583 313L588 318C591 321 597 328 601 333C609 343 617 350 626 357C657 377 695 382 730 369C741 365 759 355 759 353C759 352 750 345 743 341C724 331 705 326 679 324C670 324 665 323 661 322C632 312 615 275 623 238C627 217 636 200 651 185C659 177 669 170 679 165L685 163L680 158C672 151 668 142 669 132C669 125 670 120 674 115C677 111 681 109 686 109C699 109 702 126 690 131C687 132 686 132 683 131C681 131 679 129 678 128S675 126 675 126S675 129 675 132C675 141 679 150 686 155C691 160 692 160 699 159C708 157 723 157 732 158C782 167 817 218 812 272C809 301 796 327 776 347L769 354L773 358C782 368 790 383 793 395C794 399 794 400 796 400C819 405 840 417 852 431C854 433 856 435 856 435C857 435 859 429 863 423ZM307 374C340 371 370 362 407 344L422 337L418 331C410 318 410 316 409 317C408 317 403 319 397 322C326 352 242 343 183 300C180 298 177 296 177 296C176 296 170 310 167 317C166 320 164 326 163 330L161 337L167 341C196 360 233 372 268 375C278 376 298 376 307 374ZM773 342C789 325 799 306 804 283C807 271 807 252 804 240C800 219 791 203 777 189C766 178 752 170 738 166C728 164 724 163 720 165C713 168 706 169 699 168S692 167 687 169C661 179 640 201 632 229C625 251 626 273 635 291C641 301 649 310 658 314C665 317 670 318 680 318C708 318 728 309 734 295C735 291 736 289 735 285C735 278 734 275 730 271C723 265 717 265 704 272C695 276 694 276 689 276C679 276 672 272 666 264C662 257 660 250 660 241C660 230 664 219 671 209L675 204L677 206L679 208L676 213C672 220 670 223 671 228S677 239 682 240C689 242 693 241 706 234L719 227H726C731 227 733 228 736 229C747 234 753 245 753 260S746 289 734 301C727 308 720 312 711 317L703 321L708 322C725 325 747 335 760 346C762 348 764 349 765 349C765 349 769 346 773 342ZM157 327C159 319 163 309 168 300L172 292L164 285C141 263 126 236 120 205C118 196 118 194 118 178C117 164 118 160 119 154C123 134 130 120 141 105L146 98V88C146 72 143 59 137 44L135 38L132 41C112 55 95 78 84 104C69 140 68 185 80 227C90 258 108 288 131 312C140 321 155 333 155 332C156 332 156 329 157 327ZM545 302L555 292L551 288C543 280 510 251 500 243L497 240L489 250L481 260L491 269C497 274 509 286 518 295C527 305 535 312 536 312C536 312 540 308 545 302ZM252 288C270 287 286 282 303 274S334 255 353 238L362 230L360 229C358 228 355 227 352 226L346 225L339 232C320 247 298 258 275 264C267 266 255 267 243 267C230 267 223 267 212 264L204 262L202 264C199 267 190 277 190 278S202 283 212 286C226 289 238 290 252 288ZM193 265C195 262 197 259 197 259C196 259 193 257 190 256C167 244 152 227 147 205C146 200 146 197 146 189C146 183 147 178 148 176C149 173 149 172 147 165C146 159 145 144 144 134V130L140 135C132 145 126 159 124 172C122 186 124 206 130 220C138 241 155 260 177 272L183 276L185 273C186 271 190 268 193 265ZM269 259C287 255 304 248 319 238C327 233 337 225 337 224S322 221 309 221C284 221 260 227 238 238C231 242 216 251 212 255L210 257L215 258C227 261 230 261 246 261C258 261 263 260 269 259ZM208 250C223 238 247 226 268 220C290 214 316 213 338 217L344 218L346 216C349 214 358 203 362 197L365 193L362 192C348 186 328 182 313 181C305 181 304 181 304 179C304 178 303 178 298 178C278 176 262 166 239 142C227 129 216 119 210 116C203 113 194 111 187 111C175 111 165 114 155 121L150 124V130C149 139 151 165 152 165C152 165 153 163 155 161C157 157 163 152 168 149C183 140 202 144 212 159C223 175 218 198 201 207C183 216 165 210 155 190L152 184V191C152 213 164 232 185 246C191 250 200 254 202 254C203 254 206 252 208 250ZM376 213L386 202L380 200C371 195 372 195 366 203C363 206 359 212 356 215L351 220L356 221C358 222 361 223 362 223S365 224 366 224S371 219 376 213ZM174 201C168 195 168 187 174 181C179 177 186 177 191 182S196 194 191 199L188 203H191C195 204 200 201 205 196C210 190 212 187 212 177C212 170 212 169 209 165C204 156 197 151 187 151C179 150 174 152 168 156C164 159 158 167 156 172C154 175 154 176 156 180C159 190 166 199 172 203C176 205 177 205 174 201ZM168 81C196 63 233 64 260 83L264 85L265 82C266 81 266 76 266 72C267 59 262 49 251 38C236 24 218 18 194 19C176 20 165 23 149 30L141 34L143 39C149 51 153 69 153 83V91L158 87C161 85 166 82 168 81ZM998 85C1004 75 1008 61 1007 49C1006 29 993 12 974 5C967 2 954 2 947 4S928 12 918 19C909 25 909 25 906 30S903 36 903 44C903 51 903 52 906 57C912 70 922 77 937 77C946 77 946 76 943 73C939 71 936 64 936 60C936 55 937 51 941 48C947 42 953 41 961 44C973 51 973 69 960 77L957 78L964 80C972 81 982 85 988 87C991 89 993 90 994 90S997 87 998 85ZM424 66C408 59 413 35 430 35C439 35 446 43 447 51C447 54 444 60 442 62C438 67 430 69 424 66Z' horiz-adv-x='1045.06' unicode='V'/>
+</font>
+<font horiz-adv-x='0' id='yfrak'>
+<font-face ascent='759' descent='-252' font-family='yfrak' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M1 374H36C36 184 43 82 61 -103C64 -127 69 -152 70 -177H91L98 -73H99C116 -113 165 -144 211 -144C229 -144 246 -140 262 -132C324 -101 353 -18 353 66C353 83 352 99 349 115C337 173 302 227 253 260C238 271 221 280 203 286C230 313 259 345 259 396C259 442 236 478 208 504H207L152 434L122 394C119 402 117 411 114 419S86 486 86 491C87 495 89 499 91 502C106 528 135 551 170 551C189 551 206 543 220 537C223 544 251 611 251 616C251 625 241 626 234 627L232 620C213 629 194 641 171 641C142 641 121 622 108 597C88 554 71 484 52 445C40 418 17 398 1 374ZM124 242C126 268 129 295 129 321C129 328 128 336 128 343C128 351 127 358 126 366C126 368 126 369 126 371C126 382 138 386 148 386C177 386 193 356 193 333C193 300 167 276 143 257C137 252 131 247 124 242ZM240 -91C224 -106 202 -115 180 -115C133 -115 103 -65 103 -18C103 -8 119 193 120 198C121 202 124 204 128 204C134 204 141 201 144 200C223 183 282 101 282 19C282 -27 268 -66 240 -91Z' glyph-name='dotlessj' horiz-adv-x='358' unicode='&#63166;'/>
+<glyph d='M43 483C42 490 41 497 41 504C41 575 73 629 108 669C112 674 124 683 124 690C124 695 120 701 114 701S102 695 98 691C54 647 19 585 19 503C19 481 23 458 32 438S60 399 85 399C98 399 113 403 124 412C135 422 140 437 140 452C140 484 118 506 86 506C69 506 51 499 43 483ZM238 484C238 492 237 501 237 509C240 577 268 633 309 674C313 678 321 683 321 690C321 691 320 692 320 693C320 697 313 701 310 701C305 701 301 698 297 694C252 652 215 583 215 507C215 455 232 399 283 399C314 399 336 423 336 452C336 467 331 481 321 492C311 501 297 506 282 506C261 506 249 496 238 484Z' glyph-name='quotedbl' horiz-adv-x='500' unicode='&quot;'/>
+<glyph d='M110 -225C131 -181 149 -135 169 -91L209 1L230 48C235 57 239 66 239 77C239 78 239 79 239 80C234 111 211 132 177 132C161 132 145 127 133 116C115 100 113 76 109 45C98 -10 60 -189 60 -191C60 -200 67 -200 74 -205C86 -212 98 -219 110 -225Z' glyph-name='comma' horiz-adv-x='322' unicode=','/>
+<glyph d='M239 389C166 336 90 287 18 233C17 223 17 211 17 200L41 216C106 263 175 306 238 356C241 365 239 378 239 389ZM239 288C166 235 90 185 18 131C17 121 17 109 17 98C91 150 166 200 238 254C241 264 240 276 239 288Z' glyph-name='hyphen' horiz-adv-x='267' unicode='-'/>
+<glyph d='M156 -13H157L239 69C232 77 224 85 217 92L180 129C177 132 160 150 156 150C150 150 143 140 139 136L92 89C89 86 76 76 76 69C77 66 80 63 82 61L156 -13Z' glyph-name='period' horiz-adv-x='322' unicode='.'/>
+<glyph d='M156 484L96 424C89 417 81 410 76 401L81 393L156 318H157L217 378C224 385 232 392 237 401L232 409L156 484ZM74 -151L92 -160L226 49C230 54 237 62 237 68C237 73 231 78 228 81L171 138C167 142 162 149 157 150C154 150 151 148 149 146C144 142 94 91 94 91C89 86 79 79 77 72C76 72 76 69 76 69S78 63 79 63L91 48C105 26 112 0 112 -30C112 -59 105 -88 93 -114C87 -127 79 -138 74 -151Z' glyph-name='semicolon' horiz-adv-x='322' unicode=';'/>
+<glyph d='M514 705C514 704 514 704 514 703C514 698 510 696 506 693L478 675L388 617C378 608 364 604 356 593V152C356 149 356 146 356 143C356 133 349 132 342 129C329 123 317 116 304 110L250 84C247 83 230 74 227 74C224 75 221 78 219 80C214 85 146 159 146 159C232 187 320 253 320 368C320 376 320 384 320 393C321 393 322 455 322 455S321 495 320 495C317 526 309 558 292 585C267 623 222 656 170 656C87 656 17 594 17 520C17 482 30 450 52 433C87 405 157 426 157 365C157 339 144 311 120 311C102 311 82 327 62 327C46 327 31 315 31 296C31 267 67 254 96 254C98 254 100 254 102 254C157 263 179 315 179 370C179 413 169 449 145 469C128 484 102 482 82 485C63 487 44 497 44 521C44 565 87 594 121 594C134 594 147 590 157 586C230 553 246 466 246 382C246 375 246 369 246 362C246 346 246 330 242 314C227 250 184 193 121 171C88 160 52 159 17 159C17 155 16 150 16 146C16 131 28 125 37 118L61 95C75 83 89 71 89 48C89 40 88 32 86 25C85 19 81 11 81 5C81 2 82 0 84 -2C89 -5 96 -11 102 -12C108 -12 175 22 194 32L357 111C360 102 365 94 369 86C375 74 392 45 395 33C396 33 396 24 396 24S396 15 395 15C393 15 389 3 390 3C390 -3 397 -9 401 -13H402L505 70L534 94C538 97 547 102 547 107C547 113 539 121 536 124C523 118 514 110 497 110C468 110 446 130 446 163C446 170 446 176 446 183V563C446 570 446 578 446 585C446 638 481 647 513 671C514 664 520 660 526 660C535 660 544 668 544 678C544 693 530 705 514 705Z' glyph-name='A' horiz-adv-x='573' unicode='A'/>
+<glyph d='M87 308L97 288C120 295 143 306 164 318C180 326 201 342 201 364C201 374 198 383 195 394C188 421 185 454 165 475C156 483 144 485 133 485C126 485 118 484 111 484C86 484 66 492 66 517C66 520 67 524 67 527C73 576 116 618 174 618C219 618 249 592 271 562C300 520 310 466 314 416C314 413 314 409 314 406C314 399 314 392 314 385C314 376 315 366 315 356C315 335 313 312 303 293C285 258 244 241 202 237C188 236 174 237 160 236C96 230 17 193 17 116C17 92 26 67 48 67C66 67 73 85 73 99C73 111 69 124 64 131C63 133 51 148 51 150C52 153 54 156 56 158C69 171 84 181 108 181C130 181 154 172 172 160C227 125 256 63 305 22C323 7 342 -5 365 -10C366 -10 389 -15 389 -13C400 -12 410 -5 420 0L481 27C518 43 557 57 591 78C654 116 712 182 712 278C712 365 664 454 577 479C562 484 547 486 531 486V487L637 540L631 554C628 553 625 552 622 552C621 552 621 552 620 552C608 552 599 564 593 574C585 587 583 602 579 617C566 655 541 691 493 691C432 691 397 639 378 597C374 586 368 575 366 564C360 578 354 593 346 607C318 658 270 705 193 705C174 705 162 701 146 696C78 669 44 588 44 515C44 474 55 423 85 408C102 400 122 402 140 400C159 397 180 388 180 364C180 352 172 343 162 337C140 323 112 317 87 308ZM514 477L392 416V415C407 415 423 414 438 412C527 401 631 353 641 246C641 234 641 222 638 210C629 164 597 128 565 96C544 75 518 48 482 48C478 48 474 49 470 49C400 58 354 121 308 167C297 178 285 189 273 199C265 205 256 210 249 217C268 217 289 222 307 228C360 246 392 284 392 355C392 368 391 381 391 394C389 438 390 471 381 512C379 518 377 525 377 532C377 533 377 534 377 535C377 541 379 546 381 552C389 580 407 613 443 613C456 613 468 608 477 597C489 583 492 564 496 547C500 523 504 500 514 477Z' glyph-name='B' horiz-adv-x='734' unicode='B'/>
+<glyph d='M238 54V53C209 31 185 6 136 6C111 6 86 14 66 30C52 41 39 61 39 80C39 101 53 113 72 117C68 110 66 103 66 96C66 75 86 56 108 56C127 56 140 74 140 93C140 125 115 145 84 145C50 145 17 121 17 81C17 73 18 65 20 58C32 17 75 -13 126 -13C171 -13 209 9 238 32C242 35 247 41 253 42C258 42 265 36 270 33C311 9 380 -13 435 -13C439 -13 443 -13 447 -12C452 -10 487 28 487 28L573 117C578 122 596 137 596 144C596 150 589 158 584 158C577 158 571 148 568 145C538 115 498 80 441 80C412 80 382 87 357 96L324 111C330 119 338 126 345 133C381 169 419 226 419 283C419 287 419 290 419 294C413 358 370 409 351 469C346 484 343 500 343 516C343 558 370 592 402 606C406 606 407 570 407 570S406 537 403 537C401 529 398 522 395 515C394 515 393 503 394 503C396 500 404 494 408 494C411 494 413 498 415 501C425 519 433 539 433 566C433 588 428 596 424 616L452 622L485 504L600 537L594 558L577 554C567 588 558 621 549 656L452 644C444 643 421 638 418 638C409 638 405 649 400 654C376 684 335 705 287 705C166 705 109 587 90 498C82 458 77 416 77 374C77 360 78 345 79 330C87 251 119 175 171 115C190 92 213 70 238 54ZM301 126C200 195 155 319 155 437C155 482 161 524 173 560C191 616 229 677 302 677C342 677 371 655 391 629C371 625 350 611 334 598C302 571 274 535 274 478C275 384 341 314 341 228C341 202 332 177 320 155C314 145 307 136 301 126Z' glyph-name='C' horiz-adv-x='623' unicode='C'/>
+<glyph d='M493 115C452 92 423 73 358 73C332 73 305 77 282 84C189 112 119 191 95 284C88 310 86 337 86 363C86 393 89 444 92 467L98 504C110 565 135 640 198 666C206 669 214 671 222 673C223 673 258 677 258 675C273 673 287 668 300 662C308 658 314 653 322 649V647C306 641 272 619 262 613C231 590 191 559 191 508C191 467 223 437 248 407C264 389 277 367 278 342C278 318 264 288 238 288C237 288 236 288 235 288C226 288 216 294 211 299C188 319 185 354 175 381L154 375C156 364 160 354 164 344C181 305 208 257 263 257C313 257 349 298 349 349C349 366 345 383 338 399C335 403 324 422 324 427C324 434 338 439 343 439C343 439 344 439 344 439C347 439 359 427 363 423L405 383C409 379 417 369 423 369C428 369 432 376 435 379L466 412C471 418 477 425 483 431C486 434 490 437 490 441C490 441 490 442 490 442C490 448 482 454 478 458L439 500C435 505 429 514 422 514C422 514 421 514 421 514C417 514 395 500 395 500C389 497 313 450 311 449C308 449 306 453 304 455C287 479 263 519 263 550C263 590 294 609 319 623C324 625 332 632 339 632C347 632 357 621 360 619L393 594C399 590 407 581 414 581C417 581 420 582 423 584C428 587 474 613 492 621V623L426 673C422 677 407 689 400 689C395 689 390 685 386 683C380 680 349 661 343 661S331 667 326 671C303 688 279 705 240 705C217 705 193 699 173 690C105 659 67 591 44 523C28 473 20 420 18 368C17 368 17 302 18 302C31 158 120 20 259 -8C263 -9 313 -16 313 -12C324 -10 335 -1 345 5L407 42L468 78C479 84 494 87 494 104C494 108 493 112 493 115Z' glyph-name='E' horiz-adv-x='517' unicode='E'/>
+<glyph d='M171 363L176 377C131 398 85 423 64 470C58 483 55 497 55 511C55 552 78 592 110 617C131 632 163 645 190 645C209 645 226 634 243 625C268 611 292 595 315 578C327 570 338 561 350 554V553C313 537 272 517 245 486C228 466 223 444 223 420C223 379 236 332 246 303C276 224 343 104 343 5C343 -64 311 -122 259 -141C248 -144 237 -145 225 -145C160 -145 95 -95 95 -21C95 42 139 97 159 147C167 167 173 190 173 212C173 271 132 315 78 315C39 315 26 268 17 243L38 235C45 255 51 293 79 293C95 293 112 281 117 266C118 266 119 254 119 254S118 242 118 242C116 223 111 204 103 186C80 129 34 71 34 3C34 -110 138 -167 230 -167C297 -167 343 -139 378 -103C408 -73 429 -25 429 31C429 107 398 180 377 233C365 262 352 291 342 321C340 326 332 347 332 351C332 352 332 352 332 353C334 358 377 398 381 398C382 398 382 398 383 398C388 395 410 371 410 371C413 368 417 361 422 361C428 361 434 369 438 373C450 385 463 397 476 408C473 414 468 419 463 424L436 453C433 457 427 466 421 466C421 466 420 466 420 466C416 465 397 447 391 441C369 420 347 398 323 378C316 422 314 403 310 460C310 465 309 470 309 475C311 504 325 526 343 542C346 545 349 548 353 548C353 548 354 548 354 548C359 548 365 542 369 539L403 514C407 511 414 503 420 503C425 503 427 508 429 510C434 516 494 593 494 593C491 596 484 605 478 605C477 605 476 604 475 604C468 601 465 588 458 588C456 588 455 589 453 590C441 597 345 671 345 671L316 693C307 700 302 705 286 705C238 705 178 687 148 673C89 645 34 593 34 512C34 493 38 475 47 458C71 412 123 381 171 363Z' glyph-name='F' horiz-adv-x='501' unicode='F'/>
+<glyph d='M66 357L125 428C94 453 76 491 75 531C75 575 99 625 143 641C153 644 163 645 174 645C201 645 226 630 247 614C290 578 333 507 404 507C460 507 495 558 495 604C495 618 489 630 483 643L463 634C467 624 472 615 472 605C472 583 457 566 435 566C403 566 383 588 369 605C339 643 318 705 253 705C245 705 238 705 231 704C138 693 52 630 26 538C21 522 17 503 17 486C17 457 27 440 38 418C42 410 46 402 48 393C50 387 48 379 50 373C53 366 60 360 66 357ZM62 -128C67 -126 80 -123 80 -116C78 -104 72 -91 72 -78C72 -58 89 -49 110 -49S148 -59 164 -72C191 -95 213 -129 249 -138C256 -139 262 -139 269 -139C332 -139 381 -85 410 -46C448 3 478 65 478 133C478 148 477 163 472 178C455 236 410 280 384 333C374 354 365 378 365 402C365 419 369 435 377 446C385 454 390 461 404 461C416 461 428 453 437 444C451 428 456 404 456 383H478C478 429 455 483 399 483C394 483 388 483 382 482C330 474 277 435 277 370C277 340 287 310 301 284C342 211 421 153 421 55C421 -3 390 -67 319 -67C314 -67 310 -66 306 -66C246 -57 218 13 158 22C154 22 150 23 146 23C88 23 50 -21 50 -72C50 -91 55 -111 62 -128Z' glyph-name='I' horiz-adv-x='519' unicode='I'/>
+<glyph d='M111 144L17 127C23 80 29 34 34 -13C44 -9 53 -3 63 1C95 15 130 21 174 21C225 30 242 86 246 133C247 133 247 196 246 196C243 263 232 316 204 365L256 375C260 355 297 262 298 259C342 138 354 95 423 -13C465 28 507 68 546 111L547 132C529 118 508 104 481 104C451 104 439 136 431 155C423 175 346 382 346 390C346 394 349 396 353 396C360 398 411 408 429 412C435 413 449 414 449 422C449 423 449 424 449 425C448 430 447 434 446 439C442 438 436 436 431 436S424 441 424 446C422 453 420 461 419 468L407 524C405 534 402 544 401 554L418 559C420 566 417 573 416 580C387 574 355 571 325 571C316 571 308 571 299 571C284 571 269 570 254 566C198 549 165 490 165 418C145 440 121 471 121 507C121 515 122 524 124 531C136 613 217 677 313 677C419 677 511 597 511 490C511 423 478 381 440 348V347L456 333C500 365 533 425 533 490C533 541 514 593 478 633C434 681 374 705 311 705C299 705 287 704 275 702C165 685 85 591 57 487C51 467 45 424 45 402C45 397 45 393 47 389C56 374 94 335 100 329L134 293C174 251 223 197 223 130C223 93 205 43 165 43C122 43 111 106 111 144ZM336 415C324 414 204 387 204 387C202 387 199 386 197 386S194 386 193 387C187 390 186 419 186 424C186 431 187 438 188 446C194 486 218 535 268 535C287 535 301 525 309 512C323 488 332 443 336 415Z' glyph-name='K' horiz-adv-x='571' unicode='K'/>
+<glyph d='M17 58H39C40 64 42 69 46 73L57 77C57 77 61 77 61 77C71 76 80 74 89 70C119 56 141 31 166 10C172 5 192 -12 201 -12C206 -12 212 -9 216 -6C268 20 310 62 338 110C346 124 355 139 359 155C355 157 348 161 342 161S336 156 334 151C320 118 308 78 262 78C246 79 231 86 218 94C192 112 149 160 114 165C151 195 212 216 212 281C207 386 98 442 98 541C98 557 100 571 105 583C121 627 161 666 217 666C263 666 293 629 293 589C293 539 248 501 226 458C219 442 213 426 213 409C213 399 215 389 220 379C233 352 271 318 300 318C332 318 345 348 348 376H325C325 362 319 341 300 341C271 341 250 361 250 387C250 400 256 412 265 423C283 444 308 457 325 479C334 492 336 504 336 520C336 542 331 565 324 586C306 637 271 705 199 705C190 705 180 704 170 702C105 690 54 642 31 581C22 559 17 534 17 509C17 496 18 482 22 469C41 388 132 322 132 237C132 231 132 224 130 218C120 188 86 173 63 154C35 130 17 95 17 58Z' glyph-name='L' horiz-adv-x='385' unicode='L'/>
+<glyph d='M253 622C243 627 235 634 225 639C204 650 178 656 154 656C95 656 41 627 23 575C17 558 17 541 17 524C17 516 16 507 16 499C16 474 16 448 26 424C40 392 72 381 101 366C120 357 140 343 141 320C141 295 129 274 105 274C95 274 85 277 76 283C69 287 64 294 57 298C54 293 48 286 48 280C49 275 55 271 59 268C72 257 88 251 106 251C149 251 189 278 189 330C189 380 163 421 134 445C105 468 39 492 39 541C39 577 69 609 107 609C114 609 121 608 128 607C189 597 228 547 248 492C274 417 280 327 280 244C280 182 264 145 237 103C229 92 219 82 212 70H211C188 91 164 111 140 130L59 33V32L75 18H76L86 31C105 19 125 9 145 -1L159 -9C161 -10 163 -11 165 -11C166 -11 166 -11 167 -11C171 -11 174 -7 176 -4C247 78 350 172 356 304C356 304 356 346 355 346C351 445 328 539 277 597C275 600 269 605 269 609S271 618 272 621C280 639 293 658 319 658C330 658 341 654 351 651C402 634 432 584 447 535C456 504 460 472 462 439C463 420 462 400 463 381C466 338 471 294 471 250C471 193 461 136 434 97C429 89 423 83 418 75L347 134L256 24C260 21 267 13 273 13C278 13 281 19 283 23C299 17 350 -6 365 -11C365 -11 367 -11 367 -11C372 -10 375 -5 378 -2L400 22C461 89 513 150 538 253C544 282 545 310 545 339C545 403 541 462 529 519C523 551 519 553 510 586C526 593 537 601 558 601C593 601 629 581 648 552C662 531 669 507 675 483C677 472 686 439 686 434C686 433 686 433 686 432C686 429 683 428 681 427C666 420 622 405 613 402C608 400 597 398 594 392S591 375 591 368C586 325 583 279 583 233C583 230 582 185 583 185C586 149 596 115 604 80C607 64 614 29 614 14C614 10 614 6 615 3S626 -13 630 -13L753 106C757 110 767 116 767 122C767 129 758 134 754 138H753C748 133 717 101 712 101C712 101 711 101 711 101C704 101 697 110 694 115C660 154 663 210 661 276C661 294 658 313 658 331C658 352 661 373 676 391C682 398 689 403 696 408L708 384C726 400 737 423 753 441C757 446 766 457 768 463C768 469 761 477 758 482C751 495 746 508 740 522C715 582 696 646 629 671C628 671 596 677 596 675C572 673 557 657 542 640C529 626 517 612 504 599C492 625 477 651 455 670C431 691 396 705 362 705C343 705 325 701 309 691C287 678 261 646 253 622ZM218 65C218 65 214 69 214 69S218 65 218 65Z' glyph-name='M' horiz-adv-x='791' unicode='M'/>
+<glyph d='M354 574C343 586 335 602 325 614C292 650 249 676 189 676C102 676 17 617 17 513C17 434 58 368 115 346C151 333 218 341 218 295C218 263 201 231 170 231C149 231 128 246 117 264C112 274 109 285 109 297C103 294 89 293 89 283C89 280 90 276 90 273C100 238 130 209 171 209C217 209 241 255 241 299C241 327 233 359 222 378C206 407 184 417 150 428C108 444 40 460 40 520C40 579 102 612 157 612C316 612 335 399 335 253C335 228 333 161 329 141C323 88 305 10 233 10C203 10 172 28 172 64C172 69 173 74 174 78C176 78 178 90 178 90C178 95 170 103 164 103C156 103 148 98 141 96C135 94 128 94 122 94C112 94 102 96 91 98C90 95 89 93 89 90C89 83 93 75 94 68C95 68 95 32 95 32C93 32 91 11 91 11C91 6 98 -4 105 -4C110 -4 115 2 119 4C125 7 131 9 137 9C140 9 143 8 146 8C176 3 198 -13 233 -13C271 -13 309 4 335 29C391 84 413 163 417 239C417 239 417 299 416 299C414 378 401 449 380 515L371 538C369 543 366 547 365 552C365 561 369 572 372 580C384 612 411 650 456 650C487 650 509 627 523 600C546 554 548 495 586 457C596 447 609 436 623 432V431C582 422 539 410 509 379C480 348 476 304 476 255C476 168 501 78 533 17C537 10 541 4 544 -3C548 -9 549 -13 560 -13C562 -13 572 -14 572 -12C578 -9 583 3 587 9L636 87C638 90 652 113 652 115C652 124 640 127 635 129C630 123 624 114 614 114C603 114 593 126 588 136C570 165 565 201 562 234C561 249 562 263 561 278C560 291 559 304 559 318C559 336 561 354 571 369C589 397 623 408 657 417C664 419 669 420 669 430V504C646 505 637 525 630 544L615 587C595 638 565 699 504 705C498 705 471 706 471 703C458 700 446 696 435 690C398 671 360 620 354 574Z' glyph-name='N' horiz-adv-x='692' unicode='N'/>
+<glyph d='M271 705C271 668 243 641 217 618C194 598 171 578 150 557C127 534 101 504 101 464C101 462 101 461 101 459C101 411 141 376 168 341C184 320 199 295 199 268C199 238 171 217 149 202C134 191 118 181 102 172C92 167 81 164 71 157C42 140 17 107 17 64C17 46 21 28 31 13C35 7 48 -11 56 -11C56 -11 57 -11 57 -11C64 -11 70 -3 73 2C54 14 39 38 39 61C39 85 56 103 78 107C96 107 145 85 151 82C205 58 304 8 362 -6C369 -9 379 -12 386 -12C387 -12 388 -12 389 -12C394 -12 398 -9 402 -7C480 35 551 90 609 157C650 204 690 262 690 340C690 407 667 475 641 518C605 577 545 631 463 641C427 645 390 641 354 649C330 654 299 667 291 691C287 699 288 705 277 705C275 705 273 705 271 705ZM137 177C188 206 270 223 281 292C281 292 281 319 280 319C277 344 264 366 249 386C223 419 175 466 175 518C175 530 178 543 186 555C189 559 196 572 202 572C204 572 207 570 209 569C232 554 261 543 294 543C325 543 354 550 385 551C389 551 392 551 396 551C444 551 491 539 531 510C588 469 633 401 633 309C633 251 613 192 572 151C542 121 498 101 441 101C370 101 306 126 249 147C212 160 177 177 137 177Z' glyph-name='O' horiz-adv-x='712' unicode='O'/>
+<glyph d='M61 277C63 271 67 257 76 257C78 257 82 258 84 259C137 269 177 316 177 370C177 418 139 446 109 463C79 481 39 501 39 541C39 579 49 636 99 636C105 636 112 635 118 634C157 624 186 591 200 555C212 524 215 491 215 458C215 441 214 423 214 406V163L163 184C149 139 137 102 111 65C108 62 102 54 102 49S113 38 118 35C134 56 157 76 184 76C185 76 185 76 186 76C198 76 215 72 215 56C215 52 214 47 214 44C214 -29 222 -76 232 -147C235 -147 240 -148 244 -148C257 -148 257 -142 262 -132C280 -88 297 -31 299 21C324 7 350 -6 376 -19C383 -7 389 5 395 18C399 27 403 38 409 46C414 52 421 56 427 61C438 70 450 80 460 91C506 142 547 207 547 285C547 394 480 455 480 563C480 584 482 606 487 627C491 644 498 660 503 677C435 675 368 641 332 605C317 590 301 571 294 551C289 566 285 582 279 597C256 652 212 705 133 705C124 705 115 703 107 700C42 679 16 602 16 535C16 491 33 435 53 403C57 396 60 390 71 390C75 390 80 390 83 390C87 390 90 389 94 389C116 388 149 381 149 352C149 305 106 276 71 276C67 276 64 277 61 277ZM403 628C400 596 396 564 396 531C396 440 439 386 463 314C470 291 476 266 476 242C476 240 476 239 476 237C476 178 448 118 413 83C409 79 404 73 399 71C397 71 390 71 390 74C385 76 380 79 375 82L326 109C315 115 301 116 301 132V465C301 481 301 497 304 513C315 564 356 607 403 628Z' glyph-name='P' horiz-adv-x='571' unicode='P'/>
+<glyph d='M271 705C271 668 243 641 217 618C199 603 182 587 165 571C136 544 101 512 101 461C102 409 145 374 173 335C187 315 199 293 199 268C199 238 171 217 149 202C134 191 118 181 102 172C92 167 81 164 71 157C42 140 17 107 17 64C17 46 21 28 31 13C35 7 48 -11 56 -11C56 -11 57 -11 57 -11C64 -11 70 -3 73 2C53 15 39 38 39 63C39 84 57 106 79 107C89 107 98 103 107 100C179 72 247 35 319 8C330 4 373 -12 386 -12C386 -12 387 -12 388 -12C393 -12 398 -9 402 -7C447 18 489 41 529 72C544 39 573 14 606 -2C620 -7 624 -8 641 -12C641 -12 643 -12 643 -12C649 -11 655 -5 660 -1C693 24 727 51 756 80C760 83 774 94 774 100S765 112 761 116C746 104 733 90 719 78C713 73 705 63 696 63S677 69 671 72C651 82 634 99 623 119C620 125 616 133 616 141C616 148 623 153 628 158C641 171 653 185 664 200C695 242 716 281 720 346C720 351 719 355 719 360C718 377 717 393 713 409C692 514 614 602 510 632C486 639 460 642 435 643C370 645 315 643 290 692C288 699 287 705 278 705C276 705 273 705 271 705ZM137 177C188 206 270 223 281 292C281 292 281 319 280 319C270 386 202 424 180 486C176 496 175 506 175 517C175 530 178 542 185 554C189 559 195 571 202 571C205 571 207 569 210 568C234 552 269 543 304 543C331 543 359 550 386 551C389 551 393 551 396 551C463 551 528 532 580 490C626 454 662 399 662 327C662 322 662 318 662 313C656 193 573 100 445 100C385 100 324 120 268 140C226 155 183 177 137 177Z' glyph-name='Q' horiz-adv-x='798' unicode='Q'/>
+<glyph d='M39 324H17C17 282 36 230 88 230C103 230 117 234 126 239C159 257 185 294 185 343C185 376 168 399 150 417C118 449 41 476 39 533C39 543 41 554 44 564C54 601 79 629 124 629C151 629 178 620 200 603C255 566 275 475 282 400C287 350 289 300 289 250C289 162 289 56 236 21C220 12 216 12 194 9C194 9 175 10 175 12C145 21 123 51 123 82C123 103 132 124 147 138C155 145 164 150 173 154L159 171C132 155 110 140 68 138C56 138 43 139 31 140C36 127 39 114 39 101C39 82 33 65 25 52C23 49 19 45 19 41C19 35 27 25 33 25C36 25 40 27 42 29C50 33 59 36 68 36C103 36 131 8 161 -6C172 -11 185 -13 197 -13C227 -13 258 0 281 18C346 73 369 179 369 288C369 300 368 311 368 322L365 383C365 391 363 398 363 406C364 412 369 414 374 416C381 420 391 423 399 423C402 423 405 423 408 422C421 418 422 404 423 392L450 182C455 108 478 30 517 -13C552 35 589 82 623 132L604 143C599 135 592 127 586 119C583 114 577 106 569 106C563 106 557 110 553 114C526 141 525 189 520 235C520 235 497 424 493 449C493 452 486 478 486 481S490 486 493 488L513 500L550 521C558 526 567 528 567 540C567 545 566 550 566 553C540 557 547 588 542 611C538 648 514 679 487 696C482 699 477 703 471 703C471 703 470 703 470 703C464 703 461 698 457 695C449 689 441 684 432 680C377 653 351 657 315 604C291 657 241 705 167 705C79 705 27 632 18 558C17 542 17 526 17 510V446C17 442 17 437 17 433C17 420 18 408 27 397C44 380 86 371 106 363C126 356 140 342 140 317C140 288 118 252 86 252C50 252 39 298 39 324ZM360 434C357 468 350 502 342 534L333 563C331 563 329 578 329 578C335 605 375 629 399 629C410 629 420 626 429 618C451 600 455 565 460 538C462 529 467 504 467 501C467 495 461 493 457 490L360 434Z' glyph-name='R' horiz-adv-x='644' unicode='R'/>
+<glyph d='M376 501L386 521C354 539 317 558 280 558C276 558 273 557 269 557C210 552 178 489 178 429C178 424 178 420 179 415C186 366 229 337 269 314C270 313 311 290 311 295C319 296 328 302 336 305L384 327C428 345 470 372 529 372C599 372 675 331 675 250C675 214 661 178 638 152C595 100 526 70 444 70C353 70 263 109 200 172C138 234 99 324 99 412C99 491 134 566 189 608C208 623 232 639 259 639C289 639 318 623 343 610L434 563C462 550 499 531 525 517C532 513 542 506 551 506C557 506 639 543 670 558C683 563 697 568 707 578C728 598 734 629 734 657L704 645C704 630 703 614 695 601C685 586 666 580 644 580C608 580 571 603 548 616L436 673C423 679 410 685 398 692C391 695 379 704 370 704C363 704 354 701 347 699C293 683 237 664 192 639C98 586 17 486 17 347C17 287 33 235 54 195C113 82 231 9 355 -8C375 -11 396 -13 416 -13C458 -13 500 -6 539 12C624 51 697 137 697 251C697 275 694 300 686 323C660 397 601 452 537 490C536 491 507 508 507 504C501 503 451 480 451 480L328 425C313 419 301 412 283 412C252 412 225 439 225 474C225 508 246 537 282 537C317 537 346 514 376 501Z' glyph-name='S' horiz-adv-x='756' unicode='S'/>
+<glyph d='M50 364C45 361 36 354 36 348C36 343 40 339 43 336C58 317 84 301 114 301C160 301 191 342 191 392S150 470 118 488C94 501 41 512 41 550C41 563 47 576 52 588C63 612 77 649 111 649C140 649 167 631 182 619C233 573 270 501 282 424C285 409 287 392 287 376C287 317 262 273 233 237C225 227 200 193 186 193C183 193 179 194 176 194C174 194 146 195 146 194C94 191 47 141 47 84C47 63 54 49 64 36C66 33 70 28 74 28C74 28 75 28 75 28C82 28 88 36 91 41C79 51 70 67 70 82C70 108 97 122 123 122C130 122 137 122 143 121C226 111 296 56 350 6C353 3 367 -11 371 -11C373 -11 380 -10 380 -8L396 1L461 39C486 53 514 66 536 85C566 109 594 150 594 199C594 242 569 268 548 292C522 320 476 356 476 406C477 423 491 437 502 449C528 476 560 501 594 518C591 524 589 532 585 536C581 541 573 541 568 545C559 551 551 559 545 569C516 616 520 705 448 705C393 705 352 668 333 633C326 621 320 608 317 594L294 630C266 666 224 705 164 705C158 705 152 704 146 704C69 693 27 611 19 541C18 532 17 523 17 514C17 485 29 465 38 444C42 429 55 432 70 428C100 421 151 410 151 367C151 346 138 323 115 323C85 323 64 344 50 364ZM485 463C456 433 414 403 414 347C414 340 414 333 416 326C428 284 484 257 510 232C528 214 540 199 540 169C540 122 508 72 454 72C450 72 446 72 442 73C402 82 376 119 348 137C324 154 297 167 269 177C255 181 240 184 226 188C253 207 280 226 305 247C338 276 363 306 363 365C363 433 354 499 336 550C334 556 324 577 324 584C325 591 329 599 331 606C343 633 364 655 395 655C396 655 396 655 397 655C426 655 439 630 443 608C452 560 437 473 485 463Z' glyph-name='V' horiz-adv-x='617' unicode='V'/>
+<glyph d='M435 649C417 662 402 673 373 673C340 673 307 653 295 626C265 658 235 696 189 703C189 703 171 705 171 705S150 704 150 703C68 691 17 610 17 531C17 479 38 432 74 415C88 409 102 410 116 407C133 403 151 386 151 365C151 342 135 314 108 314C87 314 69 327 58 338C56 341 50 350 45 350S30 344 30 339C30 336 32 334 33 332C50 310 78 291 113 291C166 299 188 344 188 397C188 399 188 402 188 404C186 440 165 480 129 492C116 496 103 495 90 497C67 501 44 515 38 539C37 539 37 566 38 566C43 600 61 645 106 645C160 645 196 593 218 566C230 552 242 538 251 522C277 475 279 419 279 366C279 356 279 346 279 335C279 274 257 230 229 196C224 191 213 176 205 176C201 176 198 178 194 179C187 181 180 182 173 182C105 182 49 130 49 67C49 33 64 12 82 -7H83L98 8V9C83 23 70 39 70 64C70 88 86 114 112 114C112 114 113 114 113 114C186 109 230 37 280 0C285 -4 293 -11 300 -11C303 -11 306 -9 309 -7L331 11C361 37 396 58 424 86L463 59L529 15C535 11 565 -11 571 -11C572 -11 572 -11 573 -11C579 -11 587 -6 593 -3C631 16 688 42 717 67C755 101 779 149 787 199C789 211 791 224 791 237C791 240 791 242 791 245C786 292 740 313 708 341C692 355 677 373 674 395C674 402 674 409 675 416C680 438 691 458 706 470L713 456C720 460 725 466 730 472L761 505C766 511 775 517 775 525C775 525 775 526 775 526L791 536L780 556C776 554 770 548 766 548C761 548 758 555 757 558L742 583C711 634 666 705 588 705C532 705 499 671 471 641C478 668 486 694 495 719C492 719 488 720 484 720C469 720 467 710 461 700C451 684 441 667 435 649ZM231 161C262 177 289 198 319 215L342 229C349 234 354 237 354 249C354 253 354 257 354 260C354 277 356 293 356 310C357 332 359 353 360 375C361 375 361 417 361 417S360 495 355 495C349 532 337 566 319 595C316 599 311 604 311 610C311 617 318 623 322 628C336 642 355 651 374 651C383 651 392 649 401 645C408 641 424 634 424 624C424 620 422 616 420 612C405 567 396 522 396 464C396 459 396 455 396 451C405 378 468 324 475 250C475 250 473 208 471 208C464 170 445 136 417 109C402 94 382 80 359 80C329 80 304 102 286 116L231 161ZM485 156C509 195 526 237 542 280C544 286 556 318 556 325C556 333 543 349 542 351L515 395C486 443 461 495 461 557C461 565 462 573 463 581C463 587 463 593 466 599C481 625 504 661 538 661C603 661 640 598 661 559L685 510C688 505 693 498 693 493C693 486 682 481 680 479C647 446 610 402 610 345C610 311 626 294 647 276C679 250 739 225 739 170C739 125 711 91 685 71C679 67 655 50 647 50C646 50 646 50 645 50C640 51 610 72 600 79L522 132C510 140 498 149 485 156Z' glyph-name='W' horiz-adv-x='812' unicode='W'/>
+<glyph d='M266 23C266 14 266 5 266 -4C266 -75 232 -130 195 -167C191 -171 183 -176 183 -183C183 -184 184 -185 184 -186C184 -190 191 -194 194 -194C199 -194 203 -191 207 -187C252 -145 289 -76 289 0C289 52 272 108 221 108C189 108 168 84 168 54C168 23 190 1 221 1C243 1 255 10 266 23ZM462 23C462 14 462 5 462 -4C462 -75 428 -130 391 -167C387 -171 379 -176 379 -183C379 -184 380 -185 380 -186C380 -190 387 -194 390 -194C395 -194 399 -191 403 -187C450 -143 484 -76 484 6C484 21 483 36 479 51C469 80 454 108 416 108C384 108 364 83 364 54C364 40 369 26 378 16C388 6 403 1 417 1C439 1 451 10 462 23Z' glyph-name='backslash' horiz-adv-x='500' unicode='\'/>
+<glyph d='M162 484L135 456C113 434 91 412 74 386C38 331 17 254 17 169C17 158 18 148 19 137C26 79 65 25 113 1L97 -13L128 -12C167 16 200 49 237 78C240 61 245 44 251 28C253 25 263 4 263 2C263 -3 257 -9 254 -13L279 -12C300 10 320 33 338 58L339 87C337 85 333 82 329 82C318 82 308 95 304 103C302 109 302 116 302 123V254C302 266 301 279 301 292C301 328 309 354 327 376C330 381 336 385 336 390C336 397 325 407 324 409C315 421 312 422 292 425C251 436 224 446 189 466C180 472 171 479 162 484ZM121 414C134 408 200 368 202 367L222 355C230 351 234 347 234 336C234 333 234 330 234 328V124C234 121 234 118 234 114C234 111 234 108 233 105C228 91 192 81 177 81C137 81 107 116 97 153C91 173 90 193 90 213C90 225 91 238 91 250C92 296 91 345 108 389C111 398 117 406 121 414Z' glyph-name='a' horiz-adv-x='365' unicode='a'/>
+<glyph d='M22 585C21 583 13 551 13 549C13 540 22 534 26 529C39 510 46 489 46 458C46 446 45 434 45 422V180C45 173 45 166 45 159C45 140 42 127 31 115C23 107 17 109 17 92V73C59 66 101 46 135 22C142 17 150 12 155 6C157 3 156 0 158 -3C160 -8 168 -11 173 -13C197 28 226 66 250 107C286 167 315 237 315 308C315 377 288 429 254 466C252 468 236 484 234 484L113 390C113 408 112 426 112 444C112 488 116 532 144 569C162 593 192 615 231 615V645C168 645 117 608 77 572C73 568 68 560 62 560C62 560 61 560 61 560C56 560 32 580 22 585ZM217 92C183 112 148 131 115 152L113 168C114 235 110 303 115 363C136 383 160 401 183 419C227 381 256 328 256 252C256 214 250 177 241 146C235 127 225 110 217 92Z' glyph-name='b' horiz-adv-x='341' unicode='b'/>
+<glyph d='M230 106C211 94 204 84 170 84C142 84 122 97 108 111C88 133 84 162 84 191C84 231 87 270 87 310C88 334 82 356 82 379C82 388 85 402 94 407C96 407 106 407 106 405L129 396C144 389 210 362 221 359C235 384 250 410 263 436C234 447 205 459 176 471L154 480C152 481 148 482 145 482C140 482 136 478 133 475C97 445 77 438 53 387C29 341 17 288 17 232C17 155 24 90 66 42C82 22 104 6 128 -4C134 -7 143 -12 150 -12C151 -12 152 -12 153 -12C158 -11 175 8 175 8C181 14 246 79 247 83C247 90 231 105 230 106Z' glyph-name='c' horiz-adv-x='276' unicode='c'/>
+<glyph d='M127 433V431C106 420 88 403 68 390C63 387 49 377 46 373C45 373 45 366 45 366V154C45 148 46 142 46 137C46 115 35 104 17 99C17 96 16 93 16 89C16 86 17 82 19 80C21 76 28 76 32 74C74 62 119 39 151 19C167 9 181 -3 197 -13L233 44C273 108 313 174 313 271C313 349 282 415 238 450C206 478 167 487 128 499C89 510 38 526 38 577C38 597 51 623 79 623V643C27 643 -11 601 -11 552C-11 492 48 466 88 449C101 443 114 437 127 433ZM113 98V340C113 348 112 357 112 366C112 387 120 401 133 411C137 415 143 421 149 421C156 421 166 415 171 412C227 382 279 322 279 241C279 187 262 138 243 99C240 94 235 80 226 80C224 80 222 80 221 81L199 84C170 89 142 94 113 98Z' glyph-name='d' horiz-adv-x='339' unicode='d'/>
+<glyph d='M247 461C245 465 241 482 236 482S225 479 221 477L189 463C152 447 114 433 78 413C68 408 38 395 35 385C23 354 17 259 17 235C17 136 52 66 99 10C103 5 113 -11 122 -11C125 -11 148 5 148 5C157 11 237 63 240 68C241 69 240 74 239 74C236 78 232 86 227 86C227 86 226 86 226 86C208 82 219 78 194 78C190 78 187 79 183 79C121 90 88 157 85 214C85 217 84 221 84 225S85 232 87 235C90 238 126 253 126 253L224 294L255 307C261 310 266 310 266 317C266 320 266 323 265 325C265 325 244 449 244 454C244 456 245 459 247 461ZM84 262C84 316 86 371 118 401C129 411 142 417 156 422C164 426 172 430 180 432L196 308L84 262Z' glyph-name='e' horiz-adv-x='294' unicode='e'/>
+<glyph d='M1 374H36C36 198 43 56 62 -111C65 -133 69 -155 70 -177H91C91 -163 100 -55 100 -55L118 176C122 176 129 317 129 317S128 374 125 374H217V424H124C121 424 117 424 113 426C110 428 109 432 108 435C103 444 86 487 86 491C87 496 90 501 92 505C108 529 135 551 171 551C191 551 205 543 220 537C231 564 242 592 253 620L234 627L232 620C213 629 194 641 171 641C110 641 95 563 79 516C72 492 62 468 52 445C40 418 17 398 1 374Z' glyph-name='f' horiz-adv-x='233' unicode='f'/>
+<glyph d='M245 76C248 62 251 48 255 35C266 -1 286 -40 286 -78C286 -91 284 -103 278 -116C268 -145 232 -169 199 -169C138 -169 96 -130 65 -102C62 -99 58 -94 53 -94C53 -94 52 -94 52 -94C47 -94 42 -99 37 -101C48 -115 63 -127 77 -139C115 -169 160 -192 209 -192C231 -192 247 -187 265 -182C319 -161 367 -107 367 -38C367 -28 362 -25 357 -18C327 24 314 62 314 137C314 147 314 157 314 167C314 247 325 329 342 397C319 405 338 400 307 405C273 410 241 433 218 446C210 451 182 468 173 468S157 454 154 450L116 405C68 347 38 272 38 197C38 127 66 65 101 25C105 20 118 3 126 3C129 3 157 21 157 21L245 76ZM131 393C157 379 186 369 213 357L235 348C241 346 246 342 246 334C246 330 245 325 245 321V263C245 226 244 188 244 151V121C244 118 245 106 242 106C240 102 203 80 203 80C198 77 178 63 173 62C166 62 160 72 156 77C126 114 105 162 99 219C98 219 98 273 99 273C100 299 100 326 109 351C118 375 117 369 131 393Z' glyph-name='g' horiz-adv-x='392' unicode='g'/>
+<glyph d='M64 567H63C55 578 45 592 34 600C33 594 30 588 30 582C31 578 34 574 36 570C45 557 47 537 47 517C47 512 47 506 47 501V128C47 124 47 119 47 115C47 85 41 62 17 47C21 43 26 37 32 35C35 35 47 35 47 37C52 38 56 38 60 38C85 38 97 30 117 20C114 17 101 5 101 0C101 0 101 0 101 -1C101 -6 109 -11 114 -11C120 -11 125 -1 127 1L145 21C166 44 186 68 208 90V91L191 103L163 70C152 77 141 83 130 89C121 94 114 96 114 109C114 112 114 116 114 119V323C114 327 114 332 114 336C114 349 118 352 126 358L155 383C159 386 162 389 165 389C167 389 169 388 172 386C188 370 201 349 212 330C240 281 254 225 254 169C254 149 252 129 249 110C234 33 198 -33 158 -88C152 -97 145 -105 139 -114C136 -117 131 -121 131 -126C131 -133 146 -141 148 -142C226 -41 322 62 322 234C322 307 289 379 249 426C247 428 234 444 233 446C233 449 236 452 238 454S254 467 254 469C251 473 246 481 240 481C240 481 239 481 239 481C234 480 202 451 202 451L114 375V549C114 559 114 569 116 579C122 605 146 624 173 625V645C136 645 110 617 87 592C79 584 71 576 64 567Z' glyph-name='h' horiz-adv-x='348' unicode='h'/>
+<glyph d='M82 505C84 505 87 505 90 505C105 505 109 511 115 521C125 537 134 556 134 578C134 593 123 600 108 600C88 600 80 584 80 563C80 559 80 554 80 550C80 535 82 520 82 505ZM17 392V391L31 378H32L53 400V129C53 123 53 118 53 112C53 103 53 94 55 86C62 47 83 13 113 -13H114C136 14 157 41 177 70C173 73 167 79 162 79C158 79 149 75 149 75C139 75 130 84 125 92C120 103 120 116 120 128V308C120 319 120 330 120 341C120 385 130 409 154 433C137 449 122 467 103 481L94 476C69 447 43 420 17 392Z' glyph-name='i' horiz-adv-x='205' unicode='i'/>
+<glyph d='M64 567H63C54 578 44 589 34 600L30 582L40 562L47 530C47 496 47 462 46 430C37 412 27 395 17 378H47V141C47 133 47 125 47 117C47 86 41 62 17 47L32 34C53 26 72 16 90 5C98 -1 105 -7 115 -11L123 -4L197 78V79L180 91C177 87 168 73 161 73C157 73 153 76 149 78L125 92C116 97 114 100 114 114C114 121 114 128 114 135V378H217V429H204C217 461 232 509 232 546C232 555 230 564 224 572C213 586 195 586 179 589L114 519C114 529 113 539 113 550C113 591 132 621 180 621C184 621 189 621 194 621V641C188 641 183 641 177 641C169 641 161 641 153 639C124 630 102 608 82 586C76 580 69 574 64 567ZM114 429V466C114 470 114 474 114 479C114 494 123 498 131 507L145 521C147 524 152 530 158 530C163 530 170 528 174 525C188 518 198 509 198 488C198 473 191 451 187 438C185 432 182 428 173 428C170 428 166 429 163 429H114Z' glyph-name='k' horiz-adv-x='259' unicode='k'/>
+<glyph d='M64 567H63L35 601H34C33 596 30 590 30 584S35 572 37 568C43 556 46 543 46 526C46 518 46 510 46 503V126C46 121 46 117 46 112C46 84 41 61 17 47C32 31 53 26 72 16C87 7 100 -5 115 -13C133 9 153 29 171 50C174 53 189 67 189 73C189 78 179 83 177 83C170 83 167 73 160 73C156 73 117 95 114 102C114 102 114 470 114 470C114 479 113 572 115 572C119 605 154 621 184 621V641C146 641 114 620 88 594C79 586 71 577 64 567Z' glyph-name='l' horiz-adv-x='211' unicode='l'/>
+<glyph d='M89 484L17 397C35 389 49 373 54 353C56 342 56 331 56 320V173C56 158 57 143 57 127C57 106 56 81 46 69C41 62 33 63 33 50C33 47 34 42 34 39C50 34 60 22 68 8C74 -2 74 -14 90 -14C93 -14 97 -13 100 -13C106 10 121 32 145 39V60C124 69 123 88 123 116V351C123 354 123 358 123 361C123 374 129 377 138 383S155 395 164 402C168 405 173 410 179 410S192 400 196 395C207 381 219 368 230 354C239 345 247 340 247 323C247 317 246 310 246 303V142C246 131 247 118 247 107C247 89 246 77 236 67C231 62 224 61 224 50C224 47 225 42 225 39C240 34 250 23 258 10L266 -4C268 -11 272 -14 281 -14C284 -14 288 -13 291 -13C296 10 313 32 336 39V60C315 68 314 90 314 110C314 113 314 116 314 119V342C314 347 314 354 314 359C314 373 316 373 326 381L357 403C360 406 365 410 370 410S378 405 381 402C386 395 415 361 424 351C428 346 434 341 436 335C437 335 437 328 437 328V96C437 92 437 86 437 82C437 68 439 63 444 53C447 47 463 17 463 12C463 4 456 1 456 -6C456 -12 465 -17 470 -19L540 85V86L523 98L515 84C508 91 505 94 505 109C505 112 505 115 505 118V379C505 381 505 384 505 386C505 401 514 405 527 407V421C501 421 477 433 459 451C453 458 447 465 441 473C439 476 437 481 433 481C432 481 432 481 431 481C428 481 426 479 423 477C404 463 319 401 316 401C315 401 315 401 314 401C312 401 311 402 309 404C293 425 275 444 259 464C255 468 248 481 241 481C238 481 236 479 233 478C226 472 218 467 211 462C182 441 153 418 123 398C123 429 112 462 89 484Z' glyph-name='m' horiz-adv-x='577' unicode='m'/>
+<glyph d='M241 484L123 398C123 421 116 444 104 464C102 469 95 481 88 481C83 479 69 460 68 459C51 439 32 419 17 397C42 385 55 365 55 332C55 326 55 320 55 315V167C55 161 55 91 55 91C54 83 51 74 46 68C41 63 33 61 33 50C33 47 34 42 34 39C48 34 58 24 66 12L74 -2C76 -9 79 -14 90 -14C98 -14 100 -11 102 -4C110 16 126 34 145 39V60C125 67 122 87 122 107C122 115 123 124 123 131V346C123 350 122 355 122 360C122 374 130 378 140 384C153 394 168 402 179 414H180C202 388 224 362 245 334C249 246 243 151 247 65L272 12L262 -8L277 -19H278L348 85V86L333 98H332L323 84C317 90 313 95 313 107C313 110 313 113 313 116V378C313 380 313 383 313 386C313 401 321 405 335 407V421C308 421 283 435 265 454C256 463 250 475 241 484Z' glyph-name='n' horiz-adv-x='387' unicode='n'/>
+<glyph d='M18 95V93C42 79 157 8 174 -4C177 -7 181 -11 186 -11C186 -11 187 -11 187 -11C190 -10 239 47 261 82C302 147 319 226 319 303C319 374 305 432 272 484L98 414L55 396C45 392 39 393 39 378C39 374 39 371 39 368V144C39 142 39 140 39 138C39 124 38 111 27 101L18 95ZM226 69C224 66 221 60 217 60C214 60 212 61 210 62C179 82 169 88 131 111L115 121C109 125 105 127 105 137C105 142 106 147 106 151V328C106 333 106 390 106 390C108 398 120 401 127 403C148 412 170 420 191 429C196 431 204 436 210 436C213 436 215 435 217 433C221 426 224 417 227 409C249 351 258 276 258 200C258 152 248 97 226 69Z' glyph-name='o' horiz-adv-x='345' unicode='o'/>
+<glyph d='M72 498C55 472 30 443 30 406C30 399 31 393 34 387C47 365 77 355 81 328C82 319 82 311 82 302V132L59 140L16 71C39 62 63 54 85 44L88 26C93 -46 99 -117 105 -188H126C132 -117 137 -46 143 25L244 -11C250 0 257 10 264 21C304 85 364 168 364 256C364 338 323 402 288 446C285 450 274 467 267 467C263 467 259 464 256 462L234 446C205 427 179 405 149 387C148 397 138 401 130 406C113 415 92 420 80 435C75 441 71 448 71 456C71 470 85 482 91 489L72 498ZM268 64C230 80 187 91 151 109L149 126C150 206 146 288 151 361C170 377 192 391 213 405C220 392 231 381 240 370C274 326 309 266 309 198C309 156 297 121 282 89C277 81 272 73 268 64Z' glyph-name='p' horiz-adv-x='390' unicode='p'/>
+<glyph d='M98 484L17 395C47 389 64 367 64 330C64 324 64 318 64 312V144C64 133 64 121 64 109C64 103 64 98 64 92C62 69 40 48 17 47C23 39 30 32 44 32C67 28 87 18 104 8C108 6 127 -11 131 -11C137 -11 141 -4 144 -1C151 8 255 123 255 123V124L240 136H239C224 121 211 105 197 89C192 84 186 74 179 73C172 73 163 80 158 83L142 93C135 95 132 100 132 109C132 112 132 116 132 119V348C132 351 132 354 132 358C132 373 139 376 148 385C158 395 168 406 179 415C201 385 224 356 247 327H248L299 378V379L247 445C238 457 226 469 221 484L132 396C132 428 120 461 98 484Z' glyph-name='r' horiz-adv-x='325' unicode='r'/>
+<glyph d='M1 374H37C36 370 36 366 36 362C36 357 36 353 36 349C36 335 36 321 37 307C37 307 37 256 37 256C37 184 52 -3 55 -37C59 -84 63 -131 71 -177H91C93 -133 98 -90 101 -46C106 23 111 91 117 160C120 194 129 286 129 316C129 356 124 394 109 431C107 435 87 487 87 491C87 500 98 513 101 516C118 538 144 550 171 550C192 550 204 542 221 537C232 564 243 592 254 620L235 627L233 620C214 629 195 641 172 641C111 641 94 562 79 515C72 491 62 468 52 445C41 418 18 398 1 374Z' glyph-name='s' horiz-adv-x='173' unicode='s'/>
+<glyph d='M17 378H47V141C47 133 47 125 47 117C47 86 41 62 17 47L32 34C53 26 72 16 90 5C98 -1 105 -7 115 -11L125 -2L217 100V101C213 104 207 110 202 111C197 111 193 105 190 102L173 83C169 79 166 73 160 73C156 73 153 76 150 78C140 84 128 89 118 96C114 100 114 105 114 110C114 112 114 114 114 116V378H195V429H115C118 475 126 515 134 556L115 555L107 543L17 378Z' glyph-name='t' horiz-adv-x='219' unicode='t'/>
+<glyph d='M99 484L17 379V378L32 366H33C36 370 49 389 54 389C62 389 69 374 71 371C80 354 81 336 81 317C81 314 81 310 81 307V114C81 111 81 107 81 104C81 78 62 69 41 63V42C77 42 108 23 126 -2C130 -7 132 -13 141 -13C155 -13 165 3 174 12L260 98C270 75 282 52 293 29C297 21 304 11 304 2C304 0 303 -1 303 -3L320 -13L398 112L380 122C377 117 365 95 361 94C358 94 356 95 354 97C338 109 328 128 328 154C328 160 328 166 328 171V324C328 341 328 359 328 377C328 394 327 414 335 424C337 428 343 430 344 434C345 434 345 446 345 446C325 450 307 464 301 484C299 484 297 484 295 484C287 484 286 480 283 475C276 460 258 450 243 446C243 444 243 442 243 440C243 430 252 426 255 421C260 410 260 397 260 382C260 368 260 354 260 341V161C260 154 261 147 261 140C261 124 255 122 245 112L210 77C206 73 199 63 193 63C188 63 184 68 181 70L161 88C154 93 149 97 149 109V295C149 338 148 378 134 419C128 438 111 472 99 484Z' glyph-name='u' horiz-adv-x='423' unicode='u'/>
+<glyph d='M107 565C100 558 93 550 85 543C55 515 17 482 17 438C17 417 36 406 50 394C61 385 70 373 77 360C96 324 97 284 97 244V136C97 129 97 122 97 115C97 88 89 68 62 63V43C78 48 93 56 111 56C153 56 193 28 205 -13C208 -13 212 -14 215 -14C219 -14 222 -13 225 -11C231 -8 245 16 246 18L290 90C326 148 359 212 359 281C359 354 323 411 286 443C281 448 275 453 269 456C270 459 275 459 275 463L260 477L149 362C144 385 124 416 112 429C98 444 74 458 74 480C74 483 74 485 75 488C75 493 77 497 79 501C88 519 110 538 122 550V551L107 565ZM257 71C227 87 212 103 165 103C165 141 165 179 165 216C165 235 165 254 165 273C165 288 163 303 161 317C160 322 157 329 157 334C157 344 166 349 171 354L203 387C207 391 214 402 220 402S233 392 237 388C274 348 303 291 303 222C303 171 289 132 270 94C265 86 260 79 257 71Z' glyph-name='v' horiz-adv-x='384' unicode='v'/>
+<glyph d='M57 391V125C57 120 57 114 57 108C57 89 55 68 35 60V39C50 34 61 22 69 9C74 0 76 -14 91 -14C94 -14 98 -13 101 -13C107 10 122 32 146 39C146 42 146 45 146 48C146 52 146 55 145 58C143 63 136 66 133 70C127 78 125 88 124 98C123 98 124 236 124 346C124 352 123 390 126 390C128 394 132 396 136 399L157 415C160 417 175 429 180 429C186 429 194 421 196 419L222 401C229 395 238 393 238 380C238 376 237 371 237 368V121C237 117 237 114 237 110C237 95 236 81 222 71C218 68 214 67 210 65C220 57 232 51 243 44L303 7C307 4 330 -11 335 -11C342 -11 348 -1 351 2C364 15 376 29 389 42C444 102 500 179 500 270C500 286 499 303 496 319C481 384 435 433 395 484H394C364 463 337 437 305 418L296 422C269 442 240 461 215 484C193 469 172 452 151 436C142 430 129 415 117 415C90 415 70 439 70 460C70 469 74 475 82 480C87 482 97 486 97 493C97 499 90 504 87 508C77 503 68 497 58 492C40 483 17 474 17 448C17 420 35 396 57 391ZM348 424C391 378 444 310 449 240C449 240 448 195 447 195C436 145 419 112 391 76C387 71 378 58 371 58C365 59 360 64 355 67L321 88C313 93 304 95 304 108C304 113 305 118 305 122V366C305 370 305 373 305 377C305 392 309 393 319 401C329 408 340 415 348 424Z' glyph-name='w' horiz-adv-x='519' unicode='w'/>
+<glyph d='M87 484C64 455 40 427 17 397C22 394 27 391 32 387C54 366 54 339 54 311V124C54 90 51 60 17 47C21 43 28 35 34 35C38 35 43 36 46 37C54 38 62 39 70 39C83 37 94 35 106 30C112 27 118 23 124 20C120 16 108 6 108 0C108 -5 115 -11 120 -11C127 -11 130 -3 133 0L154 23C178 51 206 77 228 106C224 109 218 115 213 115S203 109 200 105L180 83C176 79 173 73 167 73C163 73 160 76 157 78C147 84 134 89 125 96C121 100 121 104 121 108C121 110 121 111 121 113V322C121 324 121 326 121 329C121 345 133 348 143 356C159 369 178 380 192 395H193C201 385 210 376 218 366C258 319 288 247 288 170C288 157 287 144 285 131C273 49 225 -22 182 -78C175 -86 147 -121 143 -128C148 -131 155 -140 161 -140C165 -140 169 -133 172 -130L197 -100C230 -60 263 -18 290 27C323 82 356 146 356 226C356 320 312 394 259 447C268 454 279 459 285 469L275 484L121 365C121 367 122 410 121 410C118 437 107 465 87 484Z' glyph-name='y' horiz-adv-x='381' unicode='y'/>
+<glyph d='M119 484C95 447 69 412 46 374L45 354C55 362 66 371 80 371C116 371 142 330 142 300C142 249 92 227 65 204C58 199 54 194 54 184C54 180 54 177 54 174L95 167C87 157 78 149 71 139C41 102 17 48 17 -14C17 -65 34 -116 76 -148C93 -160 119 -172 146 -172C160 -172 175 -169 185 -165C243 -141 273 -72 273 3C273 49 260 96 239 136C226 160 210 180 192 200C212 208 234 212 258 216C256 222 251 233 242 233C238 233 205 227 193 223C189 221 182 218 177 218C176 218 176 218 175 218C170 219 148 237 140 241C147 249 155 256 163 263C186 287 208 316 208 360C208 420 167 466 119 484ZM47 -27C47 -19 48 -10 48 -2C50 39 65 81 88 115C92 121 114 151 121 151C125 150 129 146 132 144C177 104 202 28 202 -45C202 -62 199 -78 192 -93C180 -119 151 -143 117 -143C104 -143 91 -139 80 -129C52 -104 51 -62 47 -27Z' glyph-name='z' horiz-adv-x='299' unicode='z'/>
+<glyph d='M1 374H36C36 186 47 13 69 -165C69 -172 71 -178 81 -178C84 -178 88 -177 91 -177C91 -164 110 70 118 174C122 221 129 269 129 316C129 354 125 392 111 428C108 435 87 483 87 490C87 500 97 512 101 516C118 536 144 551 171 551C186 550 198 544 212 541C200 505 188 470 173 437L126 374H162C162 368 161 361 161 355C161 340 162 326 162 311C163 206 167 101 177 -4C182 -62 186 -120 196 -177H216C219 -137 254 308 254 319C254 357 250 395 235 430L217 474C215 479 212 485 212 490C212 499 222 511 225 515C241 535 268 551 296 551C314 551 331 542 346 537L379 620L360 628L358 620C338 629 318 641 295 641C283 641 273 637 264 632C260 630 255 624 250 623C245 623 239 626 235 628L232 620C215 629 192 641 170 641C112 641 95 563 80 519C72 494 63 468 52 444C40 418 18 397 1 374Z' glyph-name='Aogonek' horiz-adv-x='305' unicode='&#260;'/>
+<glyph d='M232 620C214 629 194 641 171 641C112 641 94 565 80 517C75 503 56 454 52 444C40 417 17 398 1 374H36C36 180 46 20 69 -165C69 -172 71 -178 81 -178C84 -178 88 -177 91 -177C91 -146 96 -114 98 -83C104 3 111 88 118 174C122 222 128 270 129 318C129 356 124 394 110 429L92 473C90 478 87 484 87 490C87 502 100 516 105 521C122 539 145 550 170 550C189 550 206 543 220 537C231 559 239 583 248 606C254 619 258 642 276 642C285 642 290 632 290 623C290 596 274 567 266 553L203 438C192 418 180 399 171 378H201V142C201 133 202 123 202 113C202 84 194 61 171 47C182 35 195 30 210 24C222 18 234 12 245 4C245 4 270 -17 270 -10C273 -9 276 -6 278 -3L293 14C311 34 346 71 362 91C365 93 369 97 369 101S359 114 355 114C350 108 322 74 315 73C312 73 294 83 288 87C277 93 267 95 267 112C267 118 268 123 268 128V378H337V429H269C272 443 272 458 273 473C276 498 281 523 286 547C288 556 293 564 296 573C301 586 305 601 305 614C305 640 294 662 271 662S238 636 232 620Z' glyph-name='Cacute' horiz-adv-x='389' unicode='&#262;'/>
+<glyph d='M1 374H36C36 200 43 53 62 -111C65 -133 69 -155 70 -177H91C91 -163 112 103 119 188C123 188 128 318 128 318S127 374 125 374H161C161 200 168 53 187 -111C190 -133 194 -155 195 -177H216C216 -163 237 103 244 188C248 188 253 318 253 318S252 374 250 374H342V424H248C245 424 241 424 238 426S233 433 232 436C229 445 211 489 211 490C211 496 215 501 218 506C233 528 260 551 295 551C315 551 330 543 345 537L378 620L359 627L357 620C337 629 316 641 293 641C282 641 272 638 264 633C259 630 255 624 249 624C246 624 234 625 234 627L232 620C214 628 193 641 172 641C111 641 93 562 79 514C75 502 69 490 65 478C60 467 57 455 52 444C40 417 17 398 1 374ZM212 541C205 520 198 499 190 478L178 448C173 437 169 424 153 424C149 424 145 424 142 424H123C111 424 109 430 105 441L92 473C90 478 86 484 86 490C86 498 93 506 97 512C113 533 138 551 169 551C188 551 195 546 212 541Z' glyph-name='Dcaron' horiz-adv-x='365' unicode='&#270;'/>
+<glyph d='M227 567C220 579 209 591 199 600L195 582C202 570 207 555 211 540V424H210L187 484C176 479 61 412 61 412C45 402 44 399 38 377C25 338 17 284 17 236C17 228 17 220 17 213C17 156 20 93 63 50C78 35 106 18 129 14L115 -4L132 -11C159 10 178 39 205 60C232 48 254 31 280 19L263 0V-1L280 -13L373 91V92C369 95 363 101 358 101C354 101 351 98 349 95C346 92 330 73 326 73S318 76 314 78L293 90C286 94 279 98 279 109C279 111 279 113 279 115V327C279 330 279 333 279 336C279 351 286 354 295 361C307 371 321 381 331 393H332C340 381 351 370 360 358C393 309 420 243 420 167C418 69 375 -17 326 -84C315 -99 303 -112 293 -127L311 -142H312C332 -120 350 -96 368 -72C431 12 488 113 488 221C488 323 446 395 395 448L420 468V469L407 484H406L279 375V554C279 565 279 575 282 585C288 602 302 616 318 622C324 624 331 625 338 626V646C308 645 283 627 263 605C251 592 241 578 227 567ZM136 431C144 409 153 387 162 366L211 393V119C211 116 211 112 211 109C211 93 203 90 194 81C184 71 176 57 158 57C142 57 126 71 117 83C88 120 87 184 85 241C85 252 84 263 83 274V291C82 298 82 305 82 312C82 357 95 409 136 431Z' glyph-name='Ecaron' horiz-adv-x='512' unicode='&#282;'/>
+<glyph d='M198 600L194 582C201 571 206 556 210 542C211 504 211 465 210 427H209L187 483C174 480 162 470 151 464L82 424C74 419 66 415 58 410C43 402 44 395 37 376C25 336 17 285 17 235C17 226 17 218 17 209C17 153 21 94 62 51C78 35 103 18 129 14L115 -4L132 -11L140 -5L203 62H204C217 40 236 20 256 4C260 1 272 -11 278 -11C283 -11 296 6 296 6L343 58C347 63 359 72 359 80C358 83 351 88 346 88C345 88 345 88 344 88C337 86 333 73 325 73C321 73 298 87 290 92C283 97 278 97 278 109C278 114 279 119 279 123V378H381V429H369C379 459 397 509 397 545C397 549 397 552 396 556C394 575 372 589 351 589C338 589 330 574 324 568C309 552 295 536 279 520V556C279 560 279 563 279 567C279 603 310 621 344 621C349 621 354 621 358 621V641C352 641 347 641 342 641C291 641 267 607 241 581C238 578 233 570 228 570C224 570 221 575 219 578C212 585 206 595 198 600ZM349 429H279V471C279 473 279 476 279 478C279 483 279 487 282 491C288 501 298 510 306 518C311 523 314 530 323 530C347 530 363 507 363 488C363 468 352 449 349 429ZM135 431L161 366L184 377L211 378V119C211 116 211 113 211 110C211 94 202 89 193 80S176 57 158 57C144 57 130 67 121 77C99 102 94 134 90 166C88 182 86 197 85 213C86 246 82 275 82 308C82 360 95 406 135 431Z' glyph-name='Eogonek' horiz-adv-x='422' unicode='&#280;'/>
+<glyph d='M309 570C303 568 283 556 280 552C273 544 277 529 261 529C252 529 244 534 237 536C253 555 273 572 290 590C294 594 311 609 311 615C311 631 277 638 269 638C254 638 241 629 231 624C209 610 185 599 185 564C185 538 205 503 236 503C253 503 269 514 285 523C297 530 312 542 312 557C312 558 312 559 312 560C312 564 310 567 309 570ZM223 551C221 559 220 567 220 574C220 591 229 612 247 612C257 612 267 608 276 603L223 551ZM162 484L135 456C113 434 91 412 74 386C38 331 17 254 17 169C17 158 18 148 19 137C26 79 65 25 113 1L97 -13L128 -12C167 16 200 49 237 78C240 61 245 44 251 28C253 25 263 4 263 2C263 -3 257 -9 254 -13L279 -12C300 10 320 33 338 58L339 87C337 85 333 82 329 82C318 82 308 95 304 103C302 109 302 116 302 123V254C302 266 301 279 301 292C301 328 309 354 327 376C330 381 336 385 336 390C336 397 325 407 324 409C315 421 312 422 292 425C251 436 224 446 189 466C180 472 171 479 162 484ZM121 414C134 408 200 368 202 367L222 355C230 351 234 347 234 336C234 333 234 330 234 328V124C234 121 234 118 234 114C234 111 234 108 233 105C228 91 192 81 177 81C137 81 107 116 97 153C91 173 90 193 90 213C90 225 91 238 91 250C92 296 91 345 108 389C111 398 117 406 121 414Z' glyph-name='Lcaron' horiz-adv-x='365' unicode='&#317;'/>
+<glyph d='M141 619C138 619 138 597 138 580C138 570 139 547 138 547C138 541 137 535 136 529C136 527 136 525 136 522C136 521 136 519 136 518C139 514 146 508 152 508C160 508 177 529 178 531C198 555 208 588 208 619C208 637 195 651 177 651C156 651 144 636 141 619ZM274 517C279 514 285 508 291 508C294 508 297 511 300 513C328 533 347 578 347 619C347 639 333 651 315 651C282 651 277 614 277 581C276 559 278 538 274 517ZM162 484L135 456C113 434 91 412 74 386C38 331 17 254 17 169C17 158 18 148 19 137C26 79 65 25 113 1L97 -13L128 -12C167 16 200 49 237 78C240 61 245 44 251 28C253 25 263 4 263 2C263 -3 257 -9 254 -13L279 -12C300 10 320 33 338 58L339 87C337 85 333 82 329 82C318 82 308 95 304 103C302 109 302 116 302 123V254C302 266 301 279 301 292C301 328 309 354 327 376C330 381 336 385 336 390C336 397 325 407 324 409C315 421 312 422 292 425C251 436 224 446 189 466C180 472 171 479 162 484ZM121 414C134 408 200 368 202 367L222 355C230 351 234 347 234 336C234 333 234 330 234 328V124C234 121 234 118 234 114C234 111 234 108 233 105C228 91 192 81 177 81C137 81 107 116 97 153C91 173 90 193 90 213C90 225 91 238 91 250C92 296 91 345 108 389C111 398 117 406 121 414Z' glyph-name='Lslash' horiz-adv-x='365' unicode='&#321;'/>
+<glyph d='M17 378H47V142C47 133 48 123 48 113C48 84 40 61 17 47C33 30 56 25 76 14C86 6 96 5 96 -13C98 -21 100 -28 103 -35C119 -70 152 -99 201 -99C213 -99 224 -98 235 -95C301 -77 343 -8 343 69C343 141 307 213 249 256C232 268 213 280 192 286V287C203 293 211 305 219 315C235 337 249 363 249 397C249 440 225 486 196 504C175 476 157 433 116 429C116 459 121 490 127 519C129 531 133 544 134 556L115 555L107 543L17 378ZM114 242V366C114 380 122 386 136 386C167 386 182 356 182 332C182 291 142 265 114 242ZM114 204C196 193 253 130 267 57C270 45 272 33 272 21C272 3 267 -14 256 -30C238 -52 210 -71 175 -71C160 -71 145 -66 134 -54C127 -46 117 -27 117 -16C117 -15 117 -15 117 -14C119 -6 133 6 136 10C143 18 190 66 190 74C190 78 181 84 177 84C171 84 166 74 163 70C147 79 130 88 116 99C110 129 116 170 114 204Z' glyph-name='Nacute' horiz-adv-x='364' unicode='&#323;'/>
+<glyph d='M74 533L91 522C115 559 159 584 204 584C214 584 225 583 235 580C269 570 303 543 303 502C303 493 300 484 296 477C284 456 260 449 237 449C203 449 165 464 145 476C142 478 138 481 134 481C129 481 126 474 123 471C88 422 51 374 17 324C54 297 98 252 98 192C98 160 83 143 68 123C51 99 32 75 17 49C24 43 30 38 42 38C46 38 49 38 52 38C105 38 150 15 182 -4C186 -7 190 -11 195 -11C195 -11 196 -11 196 -11C200 -10 216 5 216 5L262 47C302 83 348 130 348 188C348 239 316 269 288 291C278 299 246 322 237 327C258 355 277 384 297 412C310 430 328 449 333 471C334 471 335 486 335 486S334 507 332 507C330 519 325 530 319 541C300 579 249 604 203 604C150 604 96 573 74 533ZM84 382C92 393 100 405 110 415C156 402 196 382 240 367L159 252C157 263 155 275 152 286C143 312 129 336 112 356C103 365 95 376 84 382ZM76 98L188 258C197 253 205 247 214 241C248 220 291 192 291 147C291 121 279 100 268 86C264 81 239 50 232 50C228 50 223 55 219 57C174 82 145 93 76 98Z' glyph-name='Eng' horiz-adv-x='372' unicode='&#330;'/>
+<glyph d='M290 570C281 565 270 561 263 554C255 546 259 529 243 529C235 529 225 533 219 536C235 555 255 572 272 590C275 593 293 610 293 614C293 629 262 638 253 638C235 638 225 631 211 623C189 610 166 598 166 563C166 560 166 556 167 552C173 529 193 503 217 503C237 503 257 516 273 527C283 533 294 545 294 558C294 559 294 559 294 560C294 564 292 567 290 570ZM205 550C202 558 201 566 201 574C201 590 211 612 228 612C238 612 248 607 258 603L205 550ZM18 95V93C42 79 157 8 174 -4C177 -7 181 -11 186 -11C186 -11 187 -11 187 -11C190 -10 239 47 261 82C302 147 319 226 319 303C319 374 305 432 272 484L98 414L55 396C45 392 39 393 39 378C39 374 39 371 39 368V144C39 142 39 140 39 138C39 124 38 111 27 101L18 95ZM226 69C224 66 221 60 217 60C214 60 212 61 210 62C179 82 169 88 131 111L115 121C109 125 105 127 105 137C105 142 106 147 106 151V328C106 333 106 390 106 390C108 398 120 401 127 403C148 412 170 420 191 429C196 431 204 436 210 436C213 436 215 435 217 433C221 426 224 417 227 409C249 351 258 276 258 200C258 152 248 97 226 69Z' glyph-name='Zacute' horiz-adv-x='345' unicode='&#377;'/>
+<glyph d='M116 517C121 514 127 508 133 508C136 508 139 511 142 513C170 533 189 578 189 619C189 638 176 651 158 651C150 651 142 648 135 643C118 628 123 608 119 580C118 580 118 566 118 557C118 547 119 517 116 517ZM262 618C260 618 259 600 259 585C259 574 260 546 259 546C258 540 258 535 257 529C257 527 257 525 257 522C257 513 265 508 273 508C276 508 279 511 282 513C309 533 329 583 329 619C329 637 316 651 298 651C277 651 265 636 262 618ZM18 95V93C42 79 157 8 174 -4C177 -7 181 -11 186 -11C186 -11 187 -11 187 -11C190 -10 239 47 261 82C302 147 319 226 319 303C319 374 305 432 272 484L98 414L55 396C45 392 39 393 39 378C39 374 39 371 39 368V144C39 142 39 140 39 138C39 124 38 111 27 101L18 95ZM226 69C224 66 221 60 217 60C214 60 212 61 210 62C179 82 169 88 131 111L115 121C109 125 105 127 105 137C105 142 106 147 106 151V328C106 333 106 390 106 390C108 398 120 401 127 403C148 412 170 420 191 429C196 431 204 436 210 436C213 436 215 435 217 433C221 426 224 417 227 409C249 351 258 276 258 200C258 152 248 97 226 69Z' glyph-name='Zcaron' horiz-adv-x='345' unicode='&#381;'/>
+<glyph d='M292 570C287 567 266 556 263 552C256 544 261 529 244 529C236 529 227 533 220 536C236 555 256 572 273 590C277 594 294 609 294 615C294 620 289 624 286 627C276 635 264 638 252 638C236 638 224 630 214 624C192 612 168 597 168 564C168 537 188 503 220 503C238 503 254 515 270 524C282 531 296 543 296 558C296 563 293 568 292 570ZM206 551C204 559 203 567 203 574C203 590 212 613 230 613C240 613 251 608 259 603L206 551ZM99 484L17 379V378L32 366H33C36 370 49 389 54 389C62 389 69 374 71 371C80 354 81 336 81 317C81 314 81 310 81 307V114C81 111 81 107 81 104C81 78 62 69 41 63V42C77 42 108 23 126 -2C130 -7 132 -13 141 -13C155 -13 165 3 174 12L260 98C270 75 282 52 293 29C297 21 304 11 304 2C304 0 303 -1 303 -3L320 -13L398 112L380 122C377 117 365 95 361 94C358 94 356 95 354 97C338 109 328 128 328 154C328 160 328 166 328 171V324C328 341 328 359 328 377C328 394 327 414 335 424C337 428 343 430 344 434C345 434 345 446 345 446C325 450 307 464 301 484C299 484 297 484 295 484C287 484 286 480 283 475C276 460 258 450 243 446C243 444 243 442 243 440C243 430 252 426 255 421C260 410 260 397 260 382C260 368 260 354 260 341V161C260 154 261 147 261 140C261 124 255 122 245 112L210 77C206 73 199 63 193 63C188 63 184 68 181 70L161 88C154 93 149 97 149 109V295C149 338 148 378 134 419C128 438 111 472 99 484Z' glyph-name='dcroat' horiz-adv-x='423' unicode='&#273;'/>
+<glyph d='M154 650C150 650 146 649 143 647C122 638 121 612 121 591C121 588 121 584 121 581V566C121 559 120 552 120 545C120 540 120 534 119 529C119 527 119 525 119 522C119 521 119 519 119 518C122 514 129 508 135 508C138 508 141 511 144 513C170 535 190 577 190 616C190 637 181 651 160 651C158 651 156 650 154 650ZM257 517C262 514 268 508 274 508C278 508 282 512 284 513C311 540 330 569 330 619C330 639 316 651 298 651C278 651 267 636 263 619C259 598 259 530 257 517ZM99 484L17 379V378L32 366H33C36 370 49 389 54 389C62 389 69 374 71 371C80 354 81 336 81 317C81 314 81 310 81 307V114C81 111 81 107 81 104C81 78 62 69 41 63V42C77 42 108 23 126 -2C130 -7 132 -13 141 -13C155 -13 165 3 174 12L260 98C270 75 282 52 293 29C297 21 304 11 304 2C304 0 303 -1 303 -3L320 -13L398 112L380 122C377 117 365 95 361 94C358 94 356 95 354 97C338 109 328 128 328 154C328 160 328 166 328 171V324C328 341 328 359 328 377C328 394 327 414 335 424C337 428 343 430 344 434C345 434 345 446 345 446C325 450 307 464 301 484C299 484 297 484 295 484C287 484 286 480 283 475C276 460 258 450 243 446C243 444 243 442 243 440C243 430 252 426 255 421C260 410 260 397 260 382C260 368 260 354 260 341V161C260 154 261 147 261 140C261 124 255 122 245 112L210 77C206 73 199 63 193 63C188 63 184 68 181 70L161 88C154 93 149 97 149 109V295C149 338 148 378 134 419C128 438 111 472 99 484Z' glyph-name='section' horiz-adv-x='423' unicode='&#167;'/>
+</font>
+<font horiz-adv-x='0' id='ygoth'>
+<font-face ascent='751' descent='-249' font-family='ygoth' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M0 635C26 616 54 591 54 548V525V148C38 126 24 101 11 75C67 44 118 9 177 -19L188 -15C221 4 255 23 287 43H288L313 25C337 11 356 -8 383 -19L393 -15C445 14 496 43 545 74C543 83 539 89 536 96C536 196 535 297 537 395L547 417L399 490C389 465 375 441 356 421C353 418 340 403 335 403C331 403 328 407 325 410C319 415 229 495 227 495L138 390V527V560C138 577 139 593 144 609C150 630 168 656 196 656C210 656 218 648 222 634C226 637 232 641 232 648C232 662 216 669 203 669C180 669 163 657 148 648L109 623C104 620 83 604 78 604H77C71 604 65 612 60 615L28 641C25 644 20 649 15 649S0 639 0 635ZM444 39C412 62 376 81 346 107L344 126V357C357 373 372 387 390 399C413 391 432 380 451 368C451 368 452 347 452 347C452 246 453 144 451 46L444 39ZM238 75C247 69 247 63 247 53C247 48 245 42 239 42S215 55 215 55L163 85C153 91 138 94 138 111V122V335V344C138 362 149 369 158 379L180 404C182 407 186 414 191 414C197 414 202 407 206 404L236 377C241 373 246 369 247 362V128C247 121 248 113 248 105C248 101 248 98 247 94C245 87 240 82 238 75Z' glyph-name='circumflex' horiz-adv-x='573' unicode='&#710;'/>
+<glyph d='M154 469C146 452 137 435 125 421C98 391 61 371 25 354C32 341 40 329 46 315C49 251 47 179 46 115C40 101 32 89 25 76C82 45 135 10 193 -20L203 -16L285 32L275 51L253 42L243 47C207 70 167 88 133 113L131 135C131 222 130 310 132 394L142 410C168 395 195 379 222 365C236 389 250 413 263 438L198 475L179 486C175 489 170 493 163 493C150 492 147 487 131 487C94 487 68 511 58 545C57 545 56 562 56 562S56 572 57 572C65 634 124 666 185 666C250 666 308 628 346 586C351 580 355 574 361 569V568C324 513 292 454 257 398H299V131C299 126 300 121 300 116C300 110 299 105 297 101C294 97 279 81 279 75C281 68 293 56 296 53L340 1C343 -2 354 -19 359 -19C363 -19 368 -15 372 -13L400 3C438 23 472 45 510 66L500 85C471 71 444 54 416 38C405 52 394 65 384 80C381 183 384 293 383 398H467V462H383C383 504 388 545 394 587H384C380 587 377 587 374 588C368 591 353 611 352 612C315 652 254 688 187 688C107 688 35 638 35 562C35 516 67 466 124 466C134 466 144 467 154 469Z' glyph-name='hungarumlaut' horiz-adv-x='444' unicode='&#733;'/>
+<glyph d='M43 581C29 558 14 525 14 494C14 491 14 488 15 486C19 481 42 471 44 470L97 444C107 439 117 433 128 429C104 405 78 384 55 359L54 347V116L33 75C82 44 126 10 177 -19L188 -15C221 4 255 23 287 43H288L313 25C337 11 356 -8 383 -19L393 -15C445 14 496 43 545 74C543 83 539 89 536 96C536 196 535 297 537 395L547 417L399 490C384 453 361 424 332 398L342 417L260 457C193 491 124 523 58 558L43 581ZM238 75C247 69 247 63 247 53C247 47 244 42 238 42H237C233 42 210 58 210 58L164 89C155 96 138 101 138 118V124V347V364C138 376 138 387 141 398C143 403 146 414 154 414C156 414 158 414 159 413C164 411 208 388 226 380C238 374 248 374 248 356C248 351 247 346 247 341V119V102C247 86 243 91 238 75ZM444 39C412 62 376 81 346 107L344 126V357C357 373 372 387 390 399C413 391 432 380 451 368C451 368 452 347 452 347C452 246 453 144 451 46L444 39Z' glyph-name='breve' horiz-adv-x='590' unicode='&#728;'/>
+<glyph d='M100 495L37 442L72 398H54V137L30 149C16 125 2 101 -11 75C4 68 19 60 34 52C44 47 54 46 54 32V25V-15V-48C54 -78 53 -107 41 -135C34 -151 24 -164 14 -178L34 -188L76 -127C99 -141 121 -157 144 -171C159 -181 178 -195 201 -195C216 -195 233 -189 233 -175C233 -167 226 -163 222 -160C219 -173 213 -181 199 -181C176 -181 158 -161 151 -147C138 -125 138 -99 138 -75V-1C151 -7 164 -14 177 -20L187 -16C216 2 246 18 275 36H276C291 17 306 -2 323 -19L333 -15C370 8 405 34 445 55L452 50L512 -21H513L576 32L541 76H559C560 184 557 298 560 400C569 411 580 420 590 429C551 450 517 475 476 493L464 487C421 458 379 428 338 397H337L246 460V461C252 467 260 471 264 480L252 495H251L189 438C182 432 176 424 166 420L159 426C140 450 120 473 100 495ZM183 402H184C196 390 213 381 227 371C237 364 247 363 247 346V336V98V92C247 87 246 82 242 77C246 69 247 62 247 53C247 48 246 43 240 43C237 43 222 51 217 53L162 81C153 87 138 88 138 105V116V341V348C138 362 145 366 153 373C162 381 172 389 182 397L183 402ZM475 230C462 230 448 229 434 229C396 229 370 237 346 256C339 261 331 267 331 280V288V347V353C331 364 340 370 346 375C361 388 411 427 428 427C440 427 449 418 456 413C465 408 475 404 475 390V384V230ZM331 220V239L351 225L331 220ZM431 77L432 74C415 64 400 53 381 45C369 53 361 65 352 76H370V157C370 183 380 208 412 208H421H475C475 176 476 143 473 114C460 100 445 89 431 77Z' glyph-name='guillemotleft' horiz-adv-x='612' unicode='&#171;'/>
+<glyph d='M100 495C85 481 69 469 53 455C49 452 39 447 39 441V440C39 435 45 430 48 427L72 398H54V137L30 149L-12 76C3 68 18 60 33 53C44 48 54 46 54 30V23V-16V-41C54 -74 53 -107 40 -138C33 -153 24 -165 14 -178L34 -188L76 -127C96 -141 117 -154 137 -167C155 -179 175 -195 202 -195C215 -195 232 -187 232 -175C232 -168 225 -163 221 -160C218 -173 212 -181 197 -181C174 -181 157 -159 150 -146C138 -124 138 -99 138 -75V-1C151 -8 163 -15 177 -20C219 1 257 26 299 48L309 44C339 23 368 1 399 -19L411 -16C446 5 484 23 516 47L518 67C501 59 482 45 463 45H459C447 47 425 66 419 70L387 92C379 98 368 100 368 114C368 118 369 122 369 125V164V174C369 190 376 194 385 204L419 244L540 387V388L433 495H432C405 471 377 449 346 431C345 431 313 411 313 415C306 417 299 424 293 428L265 447C259 451 253 456 246 459C252 465 258 472 263 479L251 495L222 469C203 453 189 432 166 420L159 426C139 449 121 473 100 495ZM181 400C191 399 228 369 229 369C238 364 246 361 246 346V336V67C246 64 247 60 247 55S246 45 242 43C240 43 233 43 233 45C228 47 179 73 160 82C149 87 138 89 138 106V115V336V347C138 362 143 365 152 372C162 381 172 389 182 397L181 400ZM369 221V402V411C369 419 373 424 380 424C384 424 387 421 389 419L445 363C453 355 461 346 470 339L369 221Z' glyph-name='guillemotright' horiz-adv-x='556' unicode='&#187;'/>
+<glyph d='M100 495L37 442L72 398H54V137L30 149C16 125 2 101 -11 75C4 68 19 60 34 52C44 47 54 46 54 32V25V-15V-48C54 -78 53 -107 41 -135C34 -151 24 -164 14 -178L34 -188L76 -127C99 -141 121 -157 144 -171C159 -181 178 -195 201 -195C216 -195 233 -189 233 -175C233 -167 226 -163 222 -160C219 -173 213 -181 199 -181C176 -181 158 -161 151 -147C138 -125 138 -99 138 -75V-1C151 -7 164 -14 177 -20C217 -2 251 22 287 43H288L313 25C337 11 356 -8 383 -19L393 -15C445 14 496 43 545 74C543 83 539 89 536 96C536 196 535 297 537 395L547 417L399 490C389 464 374 439 354 419C350 415 340 402 333 402C327 404 310 417 308 418L270 444C262 449 254 455 246 460V461C252 467 260 471 264 480L252 495H251L189 438C182 432 176 424 166 420L159 426C140 450 120 473 100 495ZM184 402C204 387 225 373 245 357L247 335V94L238 75C247 70 247 64 247 54C247 49 246 43 240 43C236 43 233 45 230 47C216 53 162 81 161 82C152 87 138 89 138 105V116V341V348C138 362 145 366 153 373C162 381 172 389 182 397C183 398 181 402 184 402ZM444 39C412 62 376 81 346 107L344 126V357C357 373 372 387 390 399C413 391 432 380 451 368C451 368 452 347 452 347C452 246 453 144 451 46L444 39Z' glyph-name='endash' horiz-adv-x='590' unicode='&#8211;'/>
+<glyph d='M53 630L29 601C12 576 -1 545 -1 514C-1 501 1 487 8 474C20 449 49 433 54 404V148C47 144 43 134 39 127C30 110 19 93 10 76C21 69 170 -19 176 -19H178C185 -19 205 -5 206 -4L268 31C274 34 292 47 299 47C303 47 326 30 326 30L372 -2C377 -6 392 -20 399 -20C403 -20 406 -17 409 -15C417 -11 505 40 505 40C511 44 516 46 516 57C516 60 515 64 515 67C498 59 479 45 459 45C444 45 423 66 418 69L385 92C377 97 366 101 366 115C366 119 367 123 367 126V164V174C367 186 370 191 377 198L396 221L470 308L519 365C522 369 535 382 535 387C535 391 531 394 528 397L430 495H429C404 471 375 450 345 432C340 428 321 416 314 416C305 416 297 425 292 428C277 438 262 451 246 459C252 465 258 472 263 479L251 495C212 461 176 425 138 390C138 431 128 454 109 482C89 510 54 531 54 575C54 592 61 605 70 614L53 630ZM368 221H367V377C367 385 366 394 366 402C366 413 367 424 377 424H378C381 424 383 422 385 420L442 363C450 355 458 346 467 339C434 299 399 262 368 221ZM138 111V118V339V348C138 360 142 364 150 370C155 374 177 398 183 399C189 399 195 393 199 390L228 370C237 363 246 362 246 346V338V65V55C246 49 245 42 239 42C232 42 223 50 218 53L162 85L147 94C140 96 138 102 138 111Z' glyph-name='ffi' horiz-adv-x='556' unicode='&#64259;'/>
+<glyph d='M140 430C104 399 66 370 32 337C31 310 31 282 31 254C68 284 105 313 139 346C142 372 141 403 140 430ZM140 220C104 189 66 160 32 127C31 100 31 72 31 44C68 74 105 103 139 136C142 162 141 193 140 220Z' glyph-name='hyphen' horiz-adv-x='156' unicode='-'/>
+<glyph d='M138 495L79 436V435L138 376H139L198 435V436L138 495ZM138 98L79 39V38L138 -21H139L198 38V39L138 98Z' glyph-name='colon' horiz-adv-x='278' unicode=':'/>
+<glyph d='M189 664C183 653 175 644 167 634C138 599 108 575 70 551C61 545 52 545 52 529C52 524 53 518 53 514V456C53 448 54 440 54 432C54 426 53 420 52 414C51 406 36 361 31 347H53V-141L63 -139L71 -128C92 -85 116 -44 136 1C142 186 133 389 138 571L152 587H153C171 571 190 555 209 540L239 591C242 596 249 604 249 611S239 623 235 627L207 650C201 655 196 660 189 664ZM175 398H217V129C217 124 218 120 218 115S217 105 215 101C215 101 192 75 197 75C197 72 210 58 213 53L257 1C259 -2 272 -19 277 -19C281 -19 286 -15 290 -13L318 3C354 24 391 44 427 66L417 85C389 71 365 53 335 41C320 50 313 67 302 79L301 95V398H385V462H301C302 506 304 549 311 587L291 586L281 573L208 454L175 398Z' glyph-name='less' horiz-adv-x='377' unicode='&lt;'/>
+<glyph d='M83 532L102 522C101 525 101 529 101 533C101 545 105 558 110 569C123 601 159 626 198 626C211 626 223 624 235 619C262 608 285 587 315 587C355 587 380 615 404 639C392 623 376 610 362 595C326 557 292 519 272 470C267 457 262 443 260 429C242 441 220 448 199 448C164 448 126 427 113 397C150 397 187 384 216 360C224 353 247 334 247 320C247 316 246 312 246 308C232 315 216 319 200 319C169 319 138 305 124 274C162 274 196 250 210 215C214 206 217 195 217 185C217 174 208 163 204 157C177 115 137 79 94 54C80 46 64 40 49 33C36 26 23 18 10 12L18 -9C29 -4 40 2 51 7C122 41 211 67 304 67C399 67 482 36 544 -21H545L661 135V136L644 149H643C624 127 604 115 565 115C528 115 498 123 463 125C457 125 397 127 397 125C383 124 370 122 356 122V123C376 135 394 155 409 173C452 226 479 292 479 365C479 395 476 426 474 455C473 455 471 497 472 497C473 522 477 546 488 569C510 615 559 636 608 636V653H594C556 653 518 652 483 638C473 633 464 628 455 622C386 568 391 462 387 367V339C385 284 380 227 352 178C339 156 316 128 295 116C288 111 280 111 272 109C260 107 247 104 235 101V102C265 116 301 151 317 177C345 218 354 270 354 335V381C354 403 354 424 357 446C367 507 395 553 424 599C435 619 457 663 471 677C474 680 480 684 480 689C480 695 474 701 471 706C443 690 426 650 384 650C367 650 352 655 336 663C302 680 276 706 230 706C174 705 143 650 120 606C114 595 83 533 83 532ZM426 664C426 664 421 658 421 658S426 664 426 664ZM413 649L420 657L413 649ZM404 639L413 649L404 639Z' glyph-name='L' horiz-adv-x='654' unicode='L'/>
+<glyph d='M193 455C182 457 171 459 161 459C141 459 121 454 102 446C98 444 74 431 74 427C81 428 88 428 94 428C101 428 108 428 115 426C150 418 179 390 189 356C182 357 176 357 169 357C146 357 123 352 102 342C98 340 73 325 73 322C110 322 146 306 172 279C183 268 191 255 200 242C188 242 176 242 164 240C131 233 100 212 84 182C104 192 128 200 152 200C174 200 195 193 212 175C223 162 226 150 226 127C223 94 201 69 180 53C174 49 169 43 162 40S147 36 140 34C72 17 14 -40 14 -110H36C36 -104 37 -97 39 -91C50 -64 82 -60 111 -60C111 -60 181 -62 181 -63C186 -63 232 -66 232 -62C309 -45 342 40 348 117V273C348 276 348 280 350 282C352 288 375 294 378 295C401 302 426 306 450 306C487 306 513 296 543 286C540 274 539 261 537 249C515 148 479 66 429 -11C420 -26 408 -40 400 -55L417 -67H418C428 -55 439 -43 451 -33C479 -12 516 1 552 1C575 1 598 -4 615 -11C619 -13 631 -19 636 -19C639 -18 659 17 659 17C680 53 703 88 723 124L704 135L685 102C669 107 656 111 636 111C604 111 573 101 545 86C534 80 524 72 514 66C533 89 548 116 563 142C609 218 647 308 647 408C647 434 644 460 635 485C614 546 570 596 521 636C500 654 477 669 454 685C449 688 424 704 419 704S410 701 406 698L208 580C204 577 196 575 194 570C193 570 193 564 193 564C194 543 193 460 193 455ZM348 589C428 581 496 530 529 456C497 441 481 427 434 427C407 427 381 434 361 443C354 446 348 449 348 459V464V589ZM545 307C516 321 483 328 450 328C411 328 377 319 348 306V428C372 412 403 405 433 405C478 405 506 420 536 439C542 417 547 396 548 373C548 373 547 307 545 307ZM234 46V47C262 60 285 87 291 117C293 117 294 146 294 146C292 237 293 538 293 574V578C293 585 297 588 304 588C311 589 319 589 326 590V173V145C326 136 326 126 324 118C313 77 273 54 234 46Z' glyph-name='N' horiz-adv-x='738' unicode='N'/>
+<glyph d='M95 442C69 420 33 380 33 335V333C33 280 71 239 116 216C150 199 187 193 223 193C243 193 262 195 281 197L268 152C184 152 104 146 52 106C31 92 13 67 13 34C13 16 19 -2 30 -16C51 -43 87 -55 132 -55C222 -55 308 -36 371 -4C376 -1 396 11 402 11S444 -12 455 -21H456C498 21 558 74 595 117C643 176 695 253 695 351C695 382 687 412 668 437C638 475 599 496 529 496H515C492 496 403 491 387 488L448 700L426 706L412 655C397 660 226 705 223 705C212 705 204 693 199 689C181 673 104 608 95 601L77 585C69 579 64 576 64 563V543C64 516 69 490 81 466C85 458 95 442 95 442ZM382 556V554C382 549 380 543 379 539C376 530 367 492 361 488C355 483 294 483 293 483H261H246C219 483 192 484 167 493C141 502 118 523 118 558C118 588 136 607 172 607H179C221 607 288 587 314 579L366 564C371 563 382 562 382 556ZM313 308C274 307 275 304 232 304C201 304 164 306 141 313C116 321 92 340 90 368C90 395 98 402 109 423C138 398 168 376 222 376C228 376 233 377 239 377C271 378 302 380 334 382L313 308ZM336 310L351 362C353 368 354 379 359 383C362 386 368 386 374 386H382C408 389 558 403 558 396C582 393 605 382 622 365S656 316 656 285C656 238 626 193 598 157C587 143 541 88 532 88H530C527 88 508 100 501 103C512 120 520 137 528 155C543 182 568 230 568 259C568 272 564 285 554 297C539 314 516 317 494 317C454 317 357 313 336 310ZM476 116C417 139 354 152 291 152C293 160 302 196 307 200C311 202 317 202 322 203L355 209C364 210 373 212 382 213C387 214 462 223 462 218C481 214 499 195 499 172C499 151 484 135 476 116ZM375 24C365 20 356 14 347 10C291 -18 210 -34 133 -34C107 -34 79 -26 68 1C65 6 64 11 64 17C64 58 109 71 144 71C172 71 199 65 226 60C276 52 328 44 375 24Z' glyph-name='S' horiz-adv-x='710' unicode='S'/>
+<glyph d='M322 405C305 417 287 428 270 439C249 453 230 461 230 494H229C220 476 209 459 195 445C158 409 103 398 53 398C52 355 55 308 52 267C38 250 24 234 9 218V217L84 143V142C69 130 56 113 43 98C11 63 -31 20 -31 -29C-31 -38 -30 -47 -27 -56L9 -21V-20C4 -15 0 -8 0 1C0 15 10 27 18 37C21 42 28 52 34 52H35C38 52 52 40 57 36L106 -5C111 -10 119 -19 126 -19C132 -19 174 7 189 15C224 36 335 99 354 111L341 129C340 147 340 166 340 185C347 188 351 198 354 205C364 222 376 239 384 257L279 325C298 347 319 369 339 391C364 420 374 431 374 484V494C374 507 369 517 356 517C348 517 340 509 340 501C342 485 350 469 350 452C349 431 332 421 322 405ZM141 205L128 217H137V388L173 400L183 395C209 377 237 360 264 343L230 305L141 205ZM94 118C94 122 99 126 101 129C109 137 191 228 191 228L210 249C213 252 217 260 222 260C226 260 230 257 232 255C240 250 255 244 256 233V92V88C256 84 256 81 253 79C249 75 191 41 185 41C178 41 170 52 167 54L132 83C122 92 113 100 103 108C100 110 94 114 94 118Z' glyph-name='quoteleft' horiz-adv-x='372' unicode='&#8216;'/>
+<glyph d='M101 225L14 202L35 159C36 143 36 128 34 113C21 100 6 88 -8 76V75C20 44 43 9 73 -19L83 -15C120 8 155 34 195 55L202 50L262 -21H263L326 32L291 76H309C310 184 307 298 310 400C320 410 331 419 341 429C320 440 232 493 226 493C217 493 206 481 202 479L153 445C127 426 98 409 75 386C55 366 42 350 42 311C42 268 76 242 101 225ZM225 230C212 230 199 229 186 229C171 229 156 230 141 234C102 244 63 275 63 320C63 329 65 338 70 347C82 367 104 383 123 396C133 404 164 427 178 427C190 427 199 418 207 413C214 407 225 405 225 392V386V230ZM181 77L182 74C165 64 150 53 131 45C119 53 111 65 102 76H120V136V153C120 185 129 208 163 208H172H225C225 176 226 143 223 114C210 100 195 89 181 77Z' glyph-name='a' horiz-adv-x='360' unicode='a'/>
+<glyph d='M77 601H76C71 607 65 611 59 616L31 638C27 642 21 649 15 649H14C8 649 2 641 -2 636C34 614 54 579 54 522V487V148C47 144 43 134 39 127C30 110 19 93 10 76L130 6C145 -3 159 -13 177 -19L192 -13L341 73L331 94C328 184 331 281 330 373L341 395L259 451C249 458 240 466 227 471L218 465L138 390V525V558C138 574 139 590 144 606C151 628 170 655 198 655C211 655 218 647 221 634C225 637 232 642 232 649C232 662 214 669 202 669C168 669 140 643 121 631C107 621 90 613 77 601ZM138 111V118V339V348C138 360 142 364 150 370C155 374 177 398 183 399C189 399 195 393 199 390L228 370C237 363 246 362 246 346V338V65V55C246 49 245 42 239 42C232 42 223 50 218 53L162 85L147 94C140 96 138 102 138 111Z' glyph-name='b' horiz-adv-x='367' unicode='b'/>
+<glyph d='M152 495C145 468 131 440 112 419C85 390 50 370 14 354C21 341 29 329 35 315C38 251 36 179 35 115C29 101 21 89 14 76C71 45 124 10 182 -20L192 -16L274 32C272 37 268 49 261 49C255 49 251 44 246 42C243 42 240 43 237 45C212 58 187 74 162 88L137 102C129 108 120 108 120 124V130V376V382C120 391 121 398 129 406C130 407 132 407 133 407C139 407 145 401 150 399C163 391 177 384 190 376C195 373 202 367 208 367S218 378 221 383C231 401 243 419 252 438L152 495Z' glyph-name='c' horiz-adv-x='267' unicode='c'/>
+<glyph d='M42 580C30 557 14 523 14 494C14 485 17 482 24 480C43 469 124 430 127 429C110 412 93 397 76 381C66 373 54 365 54 348V338V174C54 168 55 115 53 115C52 110 32 77 32 76L136 6C149 -3 161 -13 177 -19L192 -13L341 73L331 94C328 192 330 299 331 396L341 417C247 464 150 509 58 558L44 580H42ZM238 39C206 62 170 82 140 107L138 125C138 214 137 303 139 389C143 398 144 410 152 415C184 401 215 386 244 369L246 350C246 248 247 145 245 46L238 39Z' glyph-name='d' horiz-adv-x='367' unicode='d'/>
+<glyph d='M182 495C133 450 76 412 7 389C10 383 17 374 24 374C28 374 32 376 36 378C35 288 38 195 35 108C29 97 21 87 14 77V76L115 5C127 -4 138 -13 153 -19C193 0 229 24 266 46L268 67C252 59 233 45 214 45H210C198 47 175 66 170 69L138 92C130 99 120 100 120 115V126V164V174C120 187 124 192 131 199L150 222L223 308L272 365C275 369 288 382 288 387C288 391 284 394 281 397L212 466C202 476 193 486 182 495ZM120 221V406V410C120 416 123 424 131 424C137 424 143 416 148 411L200 359C204 355 217 344 217 338C217 334 213 331 211 328L120 221Z' glyph-name='e' horiz-adv-x='306' unicode='e'/>
+<glyph d='M23 392L35 373C38 284 36 188 35 100C29 83 21 68 14 52L144 -10L109 -51L7 -166H22C40 -166 43 -158 53 -148C66 -135 82 -122 104 -122C119 -122 136 -126 151 -128C185 -132 304 -149 308 -149C310 -149 311 -149 313 -148C321 -145 329 -134 335 -128L418 -45C422 -41 431 -34 431 -28C431 -23 413 5 408 15L362 95C354 108 339 125 339 145V157V360C345 358 369 355 374 355C396 355 402 372 410 387C420 407 431 427 440 447L422 437L400 438L205 466L211 475C207 477 178 493 174 493C168 493 163 484 160 481C128 449 101 427 55 405C45 400 34 397 23 392ZM120 392L255 372V137C255 133 256 128 256 123C256 110 249 106 242 98L218 71C214 67 208 57 201 57C195 57 187 62 183 64L139 85C130 91 120 91 120 107V119V392ZM147 -43L267 91C297 36 329 -17 360 -71C289 -62 220 -50 147 -43Z' glyph-name='g' horiz-adv-x='431' unicode='g'/>
+<glyph d='M108 652L115 508L124 525C140 568 158 610 175 652H108ZM115 495L68 455C64 452 54 447 54 441V440C54 435 60 430 63 427L87 398H69C68 304 71 206 68 115C55 101 40 89 25 76V75L106 -21H107L154 19C158 22 168 27 168 33V34C168 39 162 44 159 47L135 76H153C154 170 151 268 154 359C167 373 182 385 197 398V399L115 495Z' glyph-name='i' horiz-adv-x='183' unicode='i'/>
+<glyph d='M51 602L15 651C10 648 1 643 1 636C1 630 8 625 10 622C26 596 30 569 30 528V513V129V122C30 112 22 107 16 102L-14 77L15 41L67 -21H68L131 32L96 76H114V547V563C114 569 114 574 115 579C119 613 149 637 187 640V655C152 655 118 646 88 628C75 621 64 610 51 602Z' glyph-name='l' horiz-adv-x='210' unicode='l'/>
+<glyph d='M82 495L35 455C31 452 21 447 21 441V440C21 435 27 430 30 427L54 398H36C35 304 38 206 35 115C22 101 7 89 -8 76V75L73 -21H74L121 19C125 22 135 27 135 33V34C135 39 129 44 126 47L102 76H120C121 163 118 254 121 339C152 370 188 395 221 424L241 398H224C223 304 226 206 223 115C210 101 195 89 180 77C206 43 234 11 261 -21H262L325 32C314 47 302 62 290 76H308C310 163 304 258 310 340C340 370 375 395 407 424H408L429 398H411V120C411 113 406 109 401 105L381 88C377 85 370 81 370 75C370 70 375 66 377 64L392 46C411 24 430 2 448 -21H449L496 18C500 22 510 27 510 33V34C510 39 504 44 502 47L477 76H495C496 170 493 268 496 359C509 373 524 385 539 397C513 431 485 463 458 495H457L308 370V441H315L271 495C219 455 171 411 120 369V441H127C113 460 98 478 82 495Z' glyph-name='m' horiz-adv-x='528' unicode='m'/>
+<glyph d='M82 495L35 455C31 452 21 447 21 441V440C21 435 27 430 30 427L54 398H36C35 304 38 206 35 115C22 101 7 89 -8 76V75L73 -21H74L121 19C125 22 135 27 135 33V34C135 39 129 44 126 47L102 76H120C121 163 118 254 121 339C152 370 188 395 221 424L241 398H224C223 304 226 206 223 115C210 101 195 89 180 77C206 43 234 11 261 -21H262L325 32C314 47 302 62 290 76H308V324V345C308 359 309 362 318 369L339 387C342 390 349 394 349 399C349 403 345 406 343 409C325 431 282 480 271 495C219 455 171 411 120 369V441H127C113 460 98 478 82 495Z' glyph-name='n' horiz-adv-x='344' unicode='n'/>
+<glyph d='M170 489C151 435 105 388 50 366C41 362 31 363 31 349C31 345 32 340 32 337V135V125C32 122 32 118 31 115C30 110 10 77 10 76L114 6C127 -3 139 -13 155 -19L170 -13L319 73L309 94C306 192 308 299 309 396L319 417C270 441 221 466 170 489ZM216 39C184 62 148 82 118 107L116 127V356C129 372 144 387 162 399C184 390 204 380 223 368C223 368 224 347 224 347C224 246 225 144 223 46L216 39Z' glyph-name='o' horiz-adv-x='356' unicode='o'/>
+<glyph d='M100 495C85 481 69 469 53 455C49 452 39 447 39 441V440C39 435 45 430 48 427L72 398H54V137L30 149L-12 76C3 68 18 60 33 53C44 48 54 46 54 30V23V-16V-41C54 -74 53 -107 40 -138C33 -153 24 -165 14 -178L34 -188L76 -127C96 -141 117 -154 137 -167C155 -179 175 -195 202 -195C215 -195 232 -187 232 -175C232 -168 225 -163 221 -160C218 -173 212 -181 197 -181C174 -181 157 -159 150 -146C138 -124 138 -99 138 -75V-1C151 -8 163 -15 177 -20C234 9 286 43 341 73L331 94C328 184 331 281 330 373L341 395C309 416 279 439 246 459C252 465 258 472 263 479L251 495L222 469C203 453 189 432 166 420L159 426C139 449 121 473 100 495ZM181 400C191 399 228 369 229 369C238 364 246 361 246 346V336V67C246 64 247 60 247 55S246 45 242 43C240 43 233 43 233 45C228 47 179 73 160 82C149 87 138 89 138 106V115V336V347C138 362 143 365 152 372C162 381 172 389 182 397L181 400Z' glyph-name='p' horiz-adv-x='367' unicode='p'/>
+<glyph d='M175 488C153 437 108 390 55 367C48 364 37 362 37 352V347V133V121V116C34 101 20 90 16 75L58 47C93 26 123 0 161 -19C185 -8 207 6 230 19V-70V-83C230 -122 221 -156 194 -172C190 -175 185 -177 181 -177C171 -177 169 -169 166 -160C162 -163 155 -168 155 -175C155 -188 172 -197 186 -197C213 -197 231 -183 247 -170S279 -143 291 -127H292C301 -140 312 -151 323 -163C326 -167 331 -175 336 -175C342 -175 348 -167 352 -163V-162C317 -133 314 -88 314 -45V-11V360V369C314 372 314 374 315 377C316 382 332 408 336 417C282 440 230 465 175 488ZM121 118V126V339V348C121 360 125 364 133 370C138 375 161 399 168 399C172 399 212 380 220 377C226 373 230 372 230 362V352V66V55C230 48 228 42 222 42C215 42 206 50 201 53L146 90C135 96 121 101 121 118Z' glyph-name='q' horiz-adv-x='351' unicode='q'/>
+<glyph d='M231 495L151 355H150C150 381 150 408 149 433C137 448 128 465 111 475C89 459 69 441 48 424L84 380H66C65 301 68 219 65 142L22 77V76C70 45 115 11 164 -19L174 -16C204 1 236 17 263 37C265 45 266 54 266 63C253 58 238 47 224 47C214 47 209 51 203 55C192 63 170 77 160 84C154 90 149 90 149 103C149 108 150 113 150 117V298V307C150 310 150 312 151 315C154 327 180 366 182 369C196 328 212 288 227 248C248 281 268 314 286 350C269 400 249 447 231 495Z' glyph-name='r' horiz-adv-x='302' unicode='r'/>
+<glyph d='M194 664C188 653 180 644 172 634C143 599 113 575 75 551C66 545 57 545 57 529C57 524 58 518 58 514V456C58 448 59 440 59 432C59 426 58 420 57 414C56 406 41 361 36 347H58V117C58 107 57 101 50 93C46 89 38 82 38 76C38 69 55 53 55 53L99 1C102 -2 113 -19 118 -19C122 -19 127 -15 131 -13L159 3C168 8 264 64 269 66C267 71 263 83 255 83C253 83 251 82 249 81L175 38C164 52 153 65 143 80C143 80 142 93 142 93C142 253 140 417 143 571L157 587H158L215 539L257 613C236 630 216 648 194 664Z' glyph-name='s' horiz-adv-x='272' unicode='s'/>
+<glyph d='M8 398H50V131V116C50 110 50 105 48 101C45 97 30 81 30 75C32 68 44 56 47 53L91 1C94 -2 105 -19 110 -19C114 -19 119 -15 123 -13L151 3C160 8 256 64 261 66C259 71 255 83 247 83C245 83 243 82 241 81L167 38C156 52 145 65 135 80C132 183 135 293 134 398H218V462H134C134 504 139 545 145 587L124 586L113 572L8 398Z' glyph-name='t' horiz-adv-x='230' unicode='t'/>
+<glyph d='M82 495L35 455C31 452 21 447 21 441V440C21 435 27 430 30 427L54 398H36C35 304 38 206 35 115C22 101 7 89 -8 76V75L73 -21H74L224 105C224 77 224 49 225 23C236 7 249 -7 261 -21H262L325 32C314 47 302 62 290 76H308V324V345C308 359 309 362 318 369L339 387C342 390 349 394 349 399C349 403 345 406 343 409C325 431 282 480 271 495C249 478 227 460 206 442L241 398H224C222 311 228 217 222 135C198 113 173 92 148 71C140 65 134 57 124 53C115 59 109 68 102 76H120C121 170 118 268 121 359C134 373 149 385 164 398V399L82 495Z' glyph-name='u' horiz-adv-x='344' unicode='u'/>
+<glyph d='M53 630L29 601C12 576 -1 545 -1 514C-1 501 1 487 8 474C20 449 49 433 54 404V148C47 144 43 134 39 127C30 110 19 93 10 76L130 6C145 -3 159 -13 177 -19L192 -13L341 73L331 94C328 184 331 281 330 373L341 395C309 416 279 439 246 459C252 465 258 472 263 479L251 495C212 461 176 425 138 390C138 431 128 454 109 482C89 510 54 531 54 575C54 592 61 605 70 614L53 630ZM138 111V118V339V348C138 360 142 364 150 370C155 374 177 398 183 399C189 399 195 393 199 390L228 370C237 363 246 362 246 346V338V65V55C246 49 245 42 239 42C232 42 223 50 218 53L162 85L147 94C140 96 138 102 138 111Z' glyph-name='v' horiz-adv-x='367' unicode='v'/>
+<glyph d='M54 630C25 601 -2 557 -2 514C-2 500 1 486 8 473C21 449 49 434 54 405V148C37 126 24 100 11 75L131 6C146 -3 160 -13 178 -19C203 -7 227 7 251 21C259 25 270 37 283 30C311 13 339 -4 369 -19L384 -13L535 74L525 95C522 186 524 284 525 373L535 395L451 453C441 459 432 467 420 471C391 448 368 420 338 399C306 417 279 441 247 459C249 462 264 477 264 479C264 485 256 491 252 495H251L138 390V413C134 437 124 460 110 480C91 508 54 531 54 574C54 582 56 590 59 597C61 603 70 615 70 615L54 630ZM238 137C226 117 214 97 204 75L239 56C239 83 239 111 238 137ZM183 402C197 391 212 382 227 372C237 364 247 362 247 346V338V66V55C247 49 246 42 239 42C233 42 225 48 221 51C207 59 160 86 148 94C140 98 138 101 138 112V121V336V347C138 351 138 355 139 358C141 364 174 391 183 402ZM376 402C390 391 405 382 420 372C430 364 440 362 440 346V338V66V55C440 49 439 42 432 42C426 42 418 48 414 51C400 59 353 86 341 94C333 98 331 101 331 112V121V336V347C331 351 331 355 332 358C334 364 367 391 376 402Z' glyph-name='w' horiz-adv-x='578' unicode='w'/>
+<glyph d='M82 495L35 455C31 452 21 447 21 441V440C21 435 27 430 30 427L54 398H36V106C36 84 36 63 32 41C26 6 13 -30 13 -66C13 -90 20 -110 30 -128C44 -150 67 -169 100 -169C136 -169 168 -140 168 -103C168 -81 152 -61 127 -61C103 -61 84 -77 84 -103C84 -113 87 -123 94 -131C100 -138 108 -141 116 -144C111 -146 105 -147 100 -147C62 -147 39 -104 39 -63C39 -15 68 26 104 45C121 54 315 115 315 115C311 129 307 132 307 150C307 160 308 170 308 179V325V346C308 360 309 362 318 369L339 387C342 390 349 394 349 399C349 403 345 406 343 409C325 431 282 480 271 495C219 455 171 411 120 369V441H127C113 460 98 478 82 495ZM224 398V131V120C224 110 220 108 212 105C187 98 137 81 120 75C121 163 118 254 121 339C152 370 188 395 221 424L241 398H224Z' glyph-name='y' horiz-adv-x='339' unicode='y'/>
+</font>
+</defs>
+<style type='text/css'><![CDATA[
+text.f0 {font-family:yinitas;font-size:46.39}
+text.f1 {font-family:yfrak;font-size:12}
+text.f2 {font-family:yswab;font-size:14.4}
+text.f3 {font-family:yinitas;font-size:55.68}
+text.f4 {font-family:yfrak;font-size:14.4}
+text.f5 {font-family:ygoth;font-size:14.4}
+]]>
+</style>
+<g id='page1'>
+<text class='f5' x='-13.4527' y='63.84'>Nonummy<tspan x='36.7806'>s</tspan>
+<tspan x='39.8918'>id</tspan>
+<tspan x='52.2923'>sem&#187;r</tspan>
+<tspan x='85.0487'>aliena</tspan>
+<tspan x='114.912'>auditorum</tspan>
+<tspan x='162.806'>lorem</tspan>
+<tspan x='191.794'>ipsum</tspan>
+<tspan x='220.666'>quod</tspan>
+<tspan x='245.573'>omnia</tspan>
+<tspan x='-13.4527' y='77.6107'>sunt</tspan>
+<tspan x='9.1006'>&#187;ccatore&#8216;:</tspan>
+<tspan x='61.9483'>Lorem</tspan>
+<tspan x='98.26'>ipsum</tspan>
+<tspan x='128.062'>&#728;lor</tspan>
+<tspan x='154.464'>s</tspan>
+<tspan x='157.576'>it</tspan>
+<tspan x='168.929'>amet</tspan>
+<tspan x='194.838'>con</tspan>
+<tspan x='214.183'>se&#733;etuer</tspan>
+<tspan x='255.733'>adi-</tspan>
+<tspan x='-13.4527' y='91.3815'>piscing</tspan>
+<tspan x='20.5198'>elit:</tspan>
+<tspan x='42.39'>Sed</tspan>
+<tspan x='66.8081'>diam</tspan>
+<tspan x='92.0111'>tem&#8211;r</tspan>
+<tspan x='124.668'>incidunt</tspan>
+<tspan x='161.755'>ut</tspan>
+<tspan x='174.527'>la&#710;re</tspan>
+<tspan x='204.237'>et</tspan>
+<tspan x='216.454'>&#728;lor</tspan>
+<tspan x='241.946'>magna</tspan>
+<tspan x='-13.4527' y='105.043'>aliquam</tspan>
+<tspan x='24.7919'>erat</tspan>
+<tspan x='46.6589'>volu&#171;t</tspan>
+<tspan x='81.7963'>ut</tspan>
+<tspan x='94.6849'>wis</tspan>
+<tspan x='108.747'>i</tspan>
+<tspan x='115.996'>enim</tspan>
+<tspan x='140.209'>ad</tspan>
+<tspan x='155.298'>minim</tspan>
+<tspan x='185.338'>&#64259;niam</tspan>
+<tspan x='218.338'>qui&#8216;</tspan>
+<tspan x='240.955'>no&lt;rud</tspan>
+<tspan x='-13.4527' y='118.705'>oblationem</tspan>
+<tspan x='38.0057'>cor&#8211;remque</tspan>
+<tspan x='95.3889'>suscipit</tspan>
+<tspan x='130.679'>la&#710;ri&#8216;</tspan>
+</text>
+<text class='f3' x='-13.4527' y='249.832'>D</text>
+<text class='f4' x='47.1072' y='203.607'>ie</text>
+<text class='f2' x='59.8848' y='203.607'>Orgel</text>
+<text class='f4' x='90.7353' y='203.607'>,<tspan x='100.968'>der</tspan>
+</text>
+<text class='f2' x='120.362' y='203.607'>Fl&#273;gel</text>
+<text class='f4' x='154.298' y='203.607'>,<tspan x='164.531'>da&#330;</tspan>
+</text>
+<text class='f2' x='185.621' y='203.607'>Fortepiano</text>
+<text class='f4' x='250.822' y='203.607'>und<tspan x='272.965'>da&#330;</tspan>
+</text>
+<text class='f2' x='294.055' y='203.607'>Clavicord</text>
+<text class='f4' x='351.006' y='203.607'>s<tspan x='353.811'>ind</tspan>
+<tspan x='372.817'>die</tspan>
+<tspan x='47.1072' y='219.015'>gebr&#317;u&#282;li&#282;&#262;en</tspan>
+<tspan x='118.515'>Clavierin&#262;rumente</tspan>
+<tspan x='208.036'>zum</tspan>
+<tspan x='231.184'>Accompagnement.</tspan>
+<tspan x='317.364'>E&#330;</tspan>
+<tspan x='334.609'>i&#262;</tspan>
+<tspan x='347.607'>S&#282;ade,</tspan>
+<tspan x='47.1072' y='234.424'>da&#63166;</tspan>
+<tspan x='68.1032'>die</tspan>
+<tspan x='85.8667'>s&#282;&#377;ne</tspan>
+<tspan x='116.201'>Erfindung</tspan>
+<tspan x='168.101'>de&#330;</tspan>
+</text>
+<text class='f2' x='188.265' y='234.424'>Hol<tspan x='207.772'>feldis&#282;en</tspan>
+<tspan x='260.178'>Bogenclavier&#330;</tspan>
+</text>
+<text class='f4' x='342.219' y='234.424'>no&#282;<tspan x='365.833'>ni&#282;t</tspan>
+<tspan x='47.1072' y='249.832'>gemeinn&#273;&#323;ig</tspan>
+<tspan x='110.524'>geworden</tspan>
+<tspan x='159.19'>i&#262;;</tspan>
+<tspan x='179.348'>man</tspan>
+<tspan x='205.462'>kann</tspan>
+<tspan x='232.576'>dahero</tspan>
+<tspan x='268.599'>de&#260;en</tspan>
+<tspan x='298.893'>besondere</tspan>
+<tspan x='346.073'>Vorz&#273;ge</tspan>
+<tspan x='-13.4527' y='265.24'>hierinnen</tspan>
+<tspan x='32.856'>no&#282;</tspan>
+<tspan x='56.2794'>ni&#282;t</tspan>
+<tspan x='80.8359'>genau</tspan>
+<tspan x='113.147'>be&#262;immen.</tspan>
+<tspan x='167.406'>E&#330;</tspan>
+<tspan x='185.707'>i&#262;</tspan>
+<tspan x='199.761'>gewi&#63166;</tspan>
+<tspan x='230.716'>zu</tspan>
+<tspan x='246.614'>glauben,</tspan>
+<tspan x='291.512'>da&#63166;</tspan>
+<tspan x='312.317'>e&#330;</tspan>
+<tspan x='327.405'>s</tspan>
+<tspan x='330.211'>i&#282;</tspan>
+<tspan x='346.034'>au&#282;</tspan>
+<tspan x='370.258'>bey</tspan>
+<tspan x='-13.4527' y='280.648'>der</tspan>
+<tspan x='5.14924'>Begleitung</tspan>
+<tspan x='61.0912'>gut</tspan>
+<tspan x='80.7799'>au&#330;nehmen</tspan>
+<tspan x='135.23'>werde.</tspan>
+</text>
+<text class='f0' x='-13.4527' y='416.504'>V</text>
+<text class='f1' x='38.0278' y='377.984'>on<tspan x='51.1086'>dem</tspan>
+<tspan x='69.9168'>&#262;attli&#282;en</tspan>
+<tspan x='107.825'>Orte</tspan>
+<tspan x='130.715'>Kir&#282;ehrenba&#282;</tspan>
+<tspan x='188.762'>in</tspan>
+<tspan x='200.158'>der</tspan>
+<tspan x='215.948'>Fr&#321;nkis&#282;en</tspan>
+<tspan x='38.0278' y='390.824'>S&#282;weiz</tspan>
+<tspan x='72.1763'>f&#167;hrt</tspan>
+<tspan x='93.8915'>ein</tspan>
+<tspan x='107.662'>einsame&#330;</tspan>
+<tspan x='142.798'>Str&#321;&#63166;&#282;en,</tspan>
+<tspan x='188.405'>an</tspan>
+<tspan x='200.573'>der</tspan>
+<tspan x='215.209'>&#262;eil</tspan>
+<tspan x='231.53'>ab&#262;&#167;r-</tspan>
+<tspan x='38.0278' y='403.664'>zenden</tspan>
+<tspan x='65.2089'>Breitseite</tspan>
+<tspan x='103.925'>der</tspan>
+<tspan x='118.597'>Ehrenb&#167;rg</tspan>
+<tspan x='162.003'>vor&#167;ber,</tspan>
+<tspan x='198.289'>gen</tspan>
+<tspan x='214.338'>Leutenba&#282;.</tspan>
+<tspan x='38.0278' y='416.504'>In</tspan>
+<tspan x='51.6451'>einer</tspan>
+<tspan x='72.4543'>halben</tspan>
+<tspan x='98.5613'>Stunde</tspan>
+<tspan x='130.329'>i&#262;</tspan>
+<tspan x='140.196'>da&#330;</tspan>
+<tspan x='155.853'>s&#282;mu&#280;e</tspan>
+<tspan x='187.398'>Pfarrdorf</tspan>
+<tspan x='226.889'>errei&#282;t.</tspan>
+<tspan x='-13.4527' y='429.344'>S&#167;d&#381;&#262;li&#282;</tspan>
+<tspan x='29.0311'>de&#330;selben,</tspan>
+<tspan x='69.6732'>kaum</tspan>
+<tspan x='93.4813'>eine</tspan>
+<tspan x='111.965'>Viertel&#262;unde</tspan>
+<tspan x='164.256'>entfernt,</tspan>
+<tspan x='200.75'>tre&#270;en</tspan>
+<tspan x='227.692'>wir</tspan>
+<tspan x='244.597'>auf</tspan>
+<tspan x='-13.4527' y='442.184'>dem</tspan>
+<tspan x='5.37513'>Wege</tspan>
+<tspan x='31.1845'>na&#282;</tspan>
+<tspan x='50.6665'>Ortspi&#323;</tspan>
+<tspan x='83.6264'>in</tspan>
+<tspan x='95.0418'>einem</tspan>
+<tspan x='120.435'>Seitent&#321;l&#282;en</tspan>
+<tspan x='174.477'>von</tspan>
+<tspan x='192.185'>unber&#167;hrter</tspan>
+<tspan x='240.955'>Na-</tspan>
+<tspan x='-13.4527' y='455.025'>turs&#282;&#381;nheit</tspan>
+<tspan x='32.2841'>da&#330;</tspan>
+<tspan x='49.5255'>uralte,</tspan>
+<tspan x='79.7728'>einsame</tspan>
+<tspan x='111.642'>Kir&#282;lein</tspan>
+<tspan x='148.493'>\Sankt</tspan>
+<tspan x='182.666'>Mori&#323;&quot;</tspan>
+<tspan x='217.354'>mit</tspan>
+<tspan x='233.692'>seinem</tspan>
+<tspan x='-13.4527' y='467.865'>&#262;illen</tspan>
+<tspan x='10.893'>Friedhofe.</tspan>
+<tspan x='53.3526'>In</tspan>
+<tspan x='68.2047'>der</tspan>
+<tspan x='83.6828'>N&#321;he</tspan>
+<tspan x='108.062'>de&#330;</tspan>
+<tspan x='124.096'>Kir&#282;lein&#330;</tspan>
+<tspan x='165.057'>&#262;eht</tspan>
+<tspan x='184.039'>ein</tspan>
+<tspan x='198.651'>niedrige&#330;,</tspan>
+<tspan x='240.254'>&#167;ber</tspan>
+<tspan x='-13.4527' y='480.705'>eine</tspan>
+<tspan x='3.96369'>Quelle</tspan>
+<tspan x='33.9862'>erbaute&#330;</tspan>
+<tspan x='68.8353'>Feldkapell&#282;en</tspan>
+<tspan x='123.315'>mit</tspan>
+<tspan x='138.577'>der</tspan>
+<tspan x='153.332'>Statue</tspan>
+<tspan x='183.906'>de&#330;</tspan>
+<tspan x='199.216'>hl.</tspan>
+<tspan x='213.05'>Mauritiu&#330;,</tspan>
+<tspan x='-13.4527' y='493.545'>darge&#262;ellt</tspan>
+<tspan x='27.0288'>al&#330;</tspan>
+<tspan x='42.4068'>Ritter</tspan>
+<tspan x='69.2852'>in</tspan>
+<tspan x='80.3927'>voller</tspan>
+<tspan x='105.643'>Wehr.</tspan>
+</text>
+</g>
+</svg>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/normalize.xsl b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/normalize.xsl
new file mode 100644
index 00000000000..5a6ba2f62d6
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/normalize.xsl
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!-- *********************************************************************
+** Stylesheet to rearrange font-/path-elements in an SVG file. **
+** It's part of the dvisvgm package. **
+** (C) 2009-2010 Martin Gieseking <martin.gieseking@uos.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/>. **
+** **
+** The code generated by this script is also licensed under the terms **
+** of the GNU general public license version 3 or later. **
+***********************************************************************-->
+<xsl:stylesheet version="1.0"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:exsl="http://exslt.org/common"
+ xmlns:str="http://exslt.org/strings"
+ xmlns:mg="my-namespace"
+ extension-element-prefixes="exsl str"
+ exclude-result-prefixes="svg xlink exsl str mg">
+
+ <xsl:key name="path-by-id" match="/svg:defs/svg:path" use="@id"/>
+
+
+ <xsl:variable name="styles-rtf">
+ <xsl:for-each select="str:tokenize(/*/svg:style[@type='text/css'], '&#10;')">
+ <xsl:sort select="substring-after(., ' ')"/>
+ <mg:style new-id="f{position()}" id="{substring-before(substring-after(., '.'), ' ')}">
+ <xsl:value-of select="substring-after(., ' ')"/>
+ </mg:style>
+ </xsl:for-each>
+ </xsl:variable>
+
+ <xsl:variable name="styles" select="exsl:node-set($styles-rtf)/mg:style"/>
+
+ <xsl:variable name="num-paths" select="count(/*/svg:defs/svg:path)"/>
+
+ <xsl:variable name="defs-rtf">
+ <xsl:for-each select="/*/svg:defs/svg:path">
+ <xsl:sort select="@d"/>
+ <mg:path id="{@id}" new-id="g{position()}"/>
+ </xsl:for-each>
+ <xsl:for-each select="/*/svg:defs/svg:use">
+ <xsl:sort select="concat(key('path-by-id', substring(@xlink:href, 2))/@d, @transform)"/>
+ <mg:use id="{@id}" new-id="g{position()+$num-paths}"/>
+ </xsl:for-each>
+ </xsl:variable>
+
+ <xsl:variable name="defs" select="exsl:node-set($defs-rtf)"/>
+
+
+ <xsl:template match="*|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="svg:defs[svg:path]">
+ <xsl:copy>
+ <xsl:apply-templates select="svg:path">
+ <xsl:sort select="@d"/>
+ </xsl:apply-templates>
+ <xsl:apply-templates select="svg:use">
+ <xsl:sort select="$defs/mg:use[@id=current()/@id]/@new-id"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="svg:defs[svg:font]">
+ <xsl:copy>
+ <xsl:apply-templates>
+ <xsl:sort select="@id"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="svg:defs/svg:path">
+ <path id="{$defs/mg:path[@id=current()/@id]/@new-id}" d="{@d}"/>
+ </xsl:template>
+
+
+ <xsl:template match="svg:defs/text()"/>
+
+
+ <xsl:template match="svg:use">
+ <xsl:variable name="href" select="substring(@xlink:href, 2)"/>
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:if test="ancestor::svg:defs">
+ <xsl:attribute name="id">
+ <xsl:value-of select="$defs/mg:use[@id=current()/@id]/@new-id"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="xlink:href">
+ <xsl:value-of select="concat('#', $defs/*[@id=$href]/@new-id)"/>
+ </xsl:attribute>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="svg:style[@type='text/css']">
+ <style type="text/css">
+ <xsl:for-each select="$styles">
+ <xsl:value-of select="concat('text.f', position(), ' ', ., '&#10;')"/>
+ </xsl:for-each>
+ </style>
+ </xsl:template>
+
+
+ <xsl:template match="svg:text">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:attribute name="class">
+ <xsl:value-of select="$styles[@id=current()/@class]/@new-id"/>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-nf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-nf-cmp.svg
new file mode 100644
index 00000000000..c115ae96c29
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-nf-cmp.svg
@@ -0,0 +1,204 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="576.887" version="1.1" viewBox="77 56.1128 276.69 576.887" width="276.69">
+ <defs>
+ <path id="g1" d="M0.18 -4.14V-4H0.35C0.71 -4 0.86 -3.92 0.96 -3.67C1 -3.59 1.35 -2.74 1.75 -1.76L2.47 -0L2.28 0.45C2.03 1.08 1.88 1.36 1.7 1.54C1.47 1.78 1.25 1.86 0.98 1.82C0.91 1.81 0.81 1.77 0.75 1.74L0.65 1.68L0.78 1.61C0.95 1.53 1.03 1.39 1.01 1.19C0.98 0.83 0.54 0.69 0.28 0.96C0.2 1.04 0.19 1.07 0.19 1.25C0.19 1.49 0.26 1.64 0.44 1.81S0.81 2.06 1.09 2.06C1.31 2.06 1.36 2.05 1.54 1.96C1.78 1.84 2.04 1.58 2.21 1.26C2.28 1.13 2.75 0.03 3.25 -1.18C3.75 -2.41 4.19 -3.47 4.23 -3.54C4.37 -3.79 4.61 -3.95 4.91 -3.99L5.05 -4.01V-4.15V-4.29H4.24H3.43V-4.15C3.43 -4.01 3.43 -4.01 3.56 -3.98C3.74 -3.93 3.85 -3.8 3.87 -3.62C3.88 -3.48 3.84 -3.37 3.36 -2.19C3.08 -1.48 2.83 -0.91 2.82 -0.92C2.79 -0.95 1.72 -3.58 1.69 -3.68C1.68 -3.72 1.69 -3.78 1.7 -3.82C1.72 -3.9 1.93 -4 2.1 -4H2.22V-4.14V-4.29H1.2H0.18Z"/>
+ <path id="g2" d="M0.33 -6.65V-6.51L0.71 -6.49C1.13 -6.47 1.24 -6.44 1.31 -6.31C1.37 -6.19 1.37 -0.61 1.31 -0.48C1.24 -0.35 1.13 -0.32 0.71 -0.3L0.33 -0.29V-0.15V-0.01H1.92H3.52V-0.15V-0.29L3.04 -0.3C2.51 -0.32 2.36 -0.36 2.29 -0.51C2.26 -0.56 2.25 -0.91 2.25 -1.92V-3.25L2.91 -3.24C3.65 -3.22 3.74 -3.2 3.93 -3.02C4.07 -2.87 4.12 -2.73 4.14 -2.35L4.16 -2.07H4.29H4.42V-3.4V-4.72H4.29H4.16L4.14 -4.44C4.12 -4.07 4.07 -3.92 3.93 -3.77C3.74 -3.59 3.65 -3.57 2.91 -3.56L2.25 -3.54V-4.91C2.25 -5.71 2.27 -6.32 2.28 -6.36C2.33 -6.49 2.45 -6.51 3.52 -6.49C4.55 -6.48 4.72 -6.46 5 -6.31C5.47 -6.08 5.66 -5.69 5.79 -4.69L5.81 -4.54H5.95H6.08L6.07 -4.65C6.06 -4.72 6 -5.17 5.94 -5.67S5.83 -6.63 5.82 -6.69L5.8 -6.8H3.06H0.33Z"/>
+ <path id="g3" d="M0.42 -5V-4.87H0.6C0.88 -4.87 1.04 -4.82 1.1 -4.72C1.16 -4.59 1.16 -0.55 1.1 -0.42C1.04 -0.32 0.88 -0.27 0.6 -0.27H0.42V-0.13V-0H2.46H4.51L4.52 -0.14C4.53 -0.22 4.57 -0.59 4.6 -0.97C4.64 -1.35 4.67 -1.73 4.68 -1.81L4.7 -1.95H4.56H4.43L4.41 -1.78C4.34 -1.15 4.2 -0.81 3.93 -0.58C3.79 -0.46 3.5 -0.33 3.28 -0.3C3.17 -0.28 2.84 -0.27 2.55 -0.27C2.02 -0.27 2.01 -0.27 1.94 -0.34L1.86 -0.41V-2.52C1.86 -4.15 1.87 -4.63 1.9 -4.69C1.96 -4.81 2.08 -4.85 2.44 -4.87L2.77 -4.88V-5.01V-5.13H1.59H0.42Z"/>
+ <path id="g4" d="M0.45 -5.01V-4.87H0.63C0.91 -4.87 1.07 -4.82 1.13 -4.72C1.19 -4.59 1.19 -0.55 1.13 -0.42C1.07 -0.32 0.91 -0.27 0.63 -0.27H0.45V-0.14V-0.01H1.53H2.61V-0.14V-0.27H2.43C2.33 -0.27 2.19 -0.28 2.11 -0.3C1.89 -0.36 1.89 -0.36 1.89 -1.42V-2.34H2.7C3.41 -2.34 3.54 -2.35 3.75 -2.4C4.82 -2.68 5.33 -3.62 4.81 -4.38C4.61 -4.68 4.2 -4.95 3.77 -5.07C3.61 -5.12 3.41 -5.13 2.02 -5.14L0.45 -5.15ZM3.32 -4.84C3.56 -4.8 3.74 -4.71 3.89 -4.57C4.09 -4.39 4.14 -4.23 4.14 -3.73C4.14 -3.22 4.09 -3.07 3.89 -2.89C3.62 -2.64 3.39 -2.58 2.5 -2.58H1.86V-3.66V-4.73L1.94 -4.8C2.01 -4.87 2.01 -4.87 2.58 -4.87C2.89 -4.87 3.22 -4.86 3.32 -4.84Z"/>
+ <path id="g5" d="M0.48 -5.01V-4.87H0.66C0.94 -4.87 1.1 -4.82 1.16 -4.72C1.19 -4.65 1.2 -4.34 1.2 -2.71C1.2 -0.56 1.2 -0.59 1 -0.42C0.89 -0.33 0.7 -0.27 0.55 -0.27C0.48 -0.27 0.48 -0.26 0.48 -0.14V-0.01H1.35H2.22V-0.14C2.22 -0.26 2.22 -0.27 2.15 -0.27C2 -0.27 1.81 -0.33 1.7 -0.42C1.5 -0.59 1.5 -0.56 1.51 -2.76L1.52 -4.73L2.45 -2.41C2.96 -1.13 3.39 -0.06 3.42 -0.04C3.47 -0 3.57 0.01 3.64 -0.02C3.66 -0.04 4.11 -1.12 4.64 -2.44L5.59 -4.83V-2.67C5.6 -0.83 5.59 -0.49 5.55 -0.42C5.5 -0.32 5.33 -0.27 5.06 -0.27H4.87V-0.14V-0.01H5.91H6.95V-0.14V-0.27H6.77C6.49 -0.27 6.32 -0.32 6.27 -0.42C6.21 -0.55 6.21 -4.59 6.27 -4.72C6.32 -4.82 6.49 -4.87 6.77 -4.87H6.95V-5.01V-5.14H6.23C5.51 -5.14 5.51 -5.14 5.46 -5.08C5.44 -5.04 5.04 -4.05 4.57 -2.89C4.11 -1.72 3.72 -0.76 3.72 -0.76C3.71 -0.75 3.32 -1.72 2.85 -2.91C2.37 -4.1 1.96 -5.09 1.95 -5.11C1.92 -5.13 1.7 -5.14 1.19 -5.14H0.48Z"/>
+ <path id="g6" d="M0.72 -6.38V-5.93H1.17H1.62V-6.38V-6.83H1.17H0.72ZM0.81 -2.22V-0H1.18H1.56V-2.22V-4.45H1.18H0.81Z"/>
+ <path id="g7" d="M0.93 -4.36C0.62 -4.33 0.35 -4.3 0.32 -4.3C0.28 -4.3 0.27 -4.27 0.27 -4.15V-4.01L0.52 -3.99C0.82 -3.97 0.93 -3.93 1 -3.79C1.04 -3.69 1.05 -3.55 1.05 -2.11C1.05 -0.3 1.06 -0.38 0.81 -0.33C0.72 -0.31 0.57 -0.3 0.46 -0.3H0.27V-0.15V-0.01H1.47H2.68V-0.15V-0.29L2.32 -0.3C1.93 -0.32 1.81 -0.36 1.75 -0.48C1.69 -0.59 1.7 -2.48 1.76 -2.85C1.89 -3.65 2.25 -4.12 2.79 -4.17C2.96 -4.19 2.96 -4.19 2.89 -4.13C2.85 -4.11 2.8 -4.04 2.78 -3.98C2.7 -3.79 2.74 -3.61 2.9 -3.46C2.97 -3.39 3.01 -3.38 3.17 -3.38S3.37 -3.39 3.44 -3.46C3.67 -3.67 3.66 -3.98 3.41 -4.21C3.24 -4.37 3.13 -4.41 2.86 -4.41C2.63 -4.41 2.58 -4.4 2.4 -4.31C2.14 -4.18 1.93 -3.95 1.77 -3.63L1.65 -3.38V-3.9V-4.42H1.57C1.52 -4.42 1.23 -4.39 0.93 -4.36Z"/>
+ <path id="g8" d="M0.96 -6.89C0.64 -6.86 0.35 -6.83 0.32 -6.83C0.28 -6.83 0.27 -6.8 0.27 -6.68V-6.54L0.52 -6.52C0.82 -6.5 0.93 -6.46 1 -6.32C1.05 -6.22 1.05 -6 1.05 -3.1V-0H1.18H1.32L1.43 -0.2C1.49 -0.31 1.57 -0.45 1.6 -0.5L1.66 -0.6L1.78 -0.46C2.21 0.03 2.72 0.2 3.39 0.07C4.04 -0.05 4.62 -0.51 4.93 -1.13C5.08 -1.43 5.14 -1.66 5.16 -2C5.21 -2.68 4.97 -3.33 4.5 -3.8C3.75 -4.56 2.62 -4.62 1.9 -3.96L1.71 -3.78V-5.37V-6.95H1.63C1.58 -6.94 1.28 -6.92 0.96 -6.89ZM3.51 -4.06C3.88 -3.88 4.12 -3.54 4.25 -3.05C4.31 -2.81 4.31 -2.71 4.31 -2.15C4.31 -1.6 4.3 -1.48 4.25 -1.28C4.08 -0.67 3.73 -0.29 3.22 -0.16C2.68 -0.02 2.13 -0.27 1.84 -0.78L1.74 -0.94V-2.17V-3.39L1.83 -3.52C2.21 -4.1 2.95 -4.33 3.51 -4.06Z"/>
+ <path id="g9" d="M0.97 -4.36C0.66 -4.33 0.38 -4.3 0.35 -4.3C0.31 -4.3 0.3 -4.27 0.3 -4.15V-4.01L0.55 -3.99C0.85 -3.97 0.96 -3.93 1.03 -3.79C1.07 -3.69 1.08 -3.55 1.08 -2.11C1.08 -0.3 1.09 -0.38 0.84 -0.33C0.75 -0.31 0.6 -0.3 0.49 -0.3H0.3V-0.15V-0.01H1.43H2.55V-0.15V-0.3H2.36C2.05 -0.3 1.87 -0.35 1.82 -0.45C1.75 -0.57 1.75 -2.71 1.82 -3.02C1.88 -3.3 2.01 -3.57 2.2 -3.77C2.6 -4.22 3.32 -4.31 3.62 -3.96C3.83 -3.72 3.83 -3.71 3.84 -2.04C3.85 -0.31 3.86 -0.38 3.61 -0.33C3.52 -0.31 3.37 -0.3 3.26 -0.3H3.07V-0.15V-0.01H4.2H5.32V-0.15V-0.3H5.13C4.85 -0.3 4.64 -0.35 4.59 -0.43C4.57 -0.48 4.55 -0.88 4.54 -1.98C4.53 -3.41 4.52 -3.48 4.46 -3.64C4.28 -4.13 3.92 -4.38 3.33 -4.41C3 -4.43 2.75 -4.39 2.48 -4.25C2.22 -4.11 1.94 -3.84 1.81 -3.59L1.71 -3.41V-3.92V-4.42H1.63C1.58 -4.42 1.29 -4.39 0.97 -4.36Z"/>
+ <path id="g10" d="M1 -4.36C0.67 -4.33 0.38 -4.3 0.35 -4.3C0.31 -4.3 0.3 -4.27 0.3 -4.15V-4H0.48C0.75 -3.99 0.93 -3.94 1 -3.84C1.06 -3.76 1.06 -3.72 1.08 -2.29C1.1 -0.84 1.1 -0.82 1.16 -0.65C1.31 -0.29 1.55 -0.08 1.93 0.03C2.11 0.09 2.22 0.1 2.54 0.1C2.92 0.1 2.94 0.1 3.13 -0C3.38 -0.1 3.6 -0.3 3.76 -0.55L3.88 -0.73V-0.3C3.88 -0.07 3.89 0.12 3.9 0.11C3.91 0.11 4.23 0.09 4.6 0.06C4.97 0.02 5.29 -0 5.3 -0S5.32 -0.06 5.32 -0.14V-0.29L5.07 -0.3C4.77 -0.32 4.66 -0.37 4.59 -0.51C4.55 -0.6 4.54 -0.76 4.54 -2.52C4.54 -3.56 4.54 -4.42 4.53 -4.42C4.53 -4.42 4.21 -4.39 3.82 -4.36S3.1 -4.3 3.09 -4.3S3.07 -4.24 3.07 -4.15V-4.01L3.32 -3.99C3.62 -3.97 3.73 -3.93 3.8 -3.79C3.84 -3.69 3.85 -3.57 3.85 -2.55C3.85 -1.29 3.83 -1.15 3.66 -0.79C3.53 -0.53 3.33 -0.33 3.1 -0.21C2.95 -0.14 2.9 -0.13 2.61 -0.13S2.28 -0.14 2.12 -0.22C1.92 -0.32 1.85 -0.42 1.8 -0.69C1.78 -0.78 1.77 -1.55 1.77 -2.63V-4.42H1.69C1.64 -4.42 1.34 -4.39 1 -4.36Z"/>
+ <path id="g11" d="M1 -4.36C0.69 -4.33 0.41 -4.3 0.38 -4.3C0.34 -4.3 0.33 -4.27 0.33 -4.15V-4.01L0.58 -3.99C0.88 -3.97 0.99 -3.93 1.06 -3.79C1.1 -3.69 1.11 -3.55 1.11 -2.11C1.11 -0.3 1.12 -0.38 0.87 -0.33C0.78 -0.31 0.63 -0.3 0.52 -0.3H0.33V-0.15V-0.01H1.46H2.58V-0.15V-0.3H2.39C2.08 -0.3 1.9 -0.35 1.85 -0.45C1.78 -0.57 1.78 -2.71 1.85 -3.02C1.91 -3.3 2.04 -3.57 2.23 -3.77C2.63 -4.22 3.35 -4.31 3.65 -3.96C3.86 -3.72 3.86 -3.71 3.87 -2.04C3.88 -0.31 3.89 -0.38 3.64 -0.33C3.55 -0.31 3.4 -0.3 3.29 -0.3H3.1V-0.15V-0.01H4.23H5.36V-0.15V-0.3H5.16C4.85 -0.3 4.67 -0.35 4.62 -0.45C4.55 -0.57 4.55 -2.71 4.62 -3.02C4.68 -3.3 4.81 -3.57 5 -3.77C5.41 -4.22 6.12 -4.31 6.42 -3.96C6.63 -3.72 6.63 -3.71 6.64 -2.04C6.65 -0.31 6.66 -0.38 6.41 -0.33C6.32 -0.31 6.17 -0.3 6.06 -0.3H5.87V-0.15V-0.01H7H8.13V-0.15V-0.3H7.93C7.65 -0.3 7.44 -0.35 7.39 -0.43C7.37 -0.48 7.35 -0.88 7.34 -1.98C7.33 -3.41 7.32 -3.48 7.26 -3.64C7.13 -4 6.91 -4.22 6.57 -4.34C6.35 -4.41 5.93 -4.44 5.68 -4.39C5.28 -4.32 4.84 -3.99 4.64 -3.63C4.56 -3.5 4.54 -3.49 4.53 -3.53C4.38 -3.99 4.18 -4.2 3.8 -4.34C3.58 -4.41 3.16 -4.44 2.91 -4.39C2.5 -4.31 2.05 -3.98 1.84 -3.59L1.74 -3.41V-3.92V-4.42H1.66C1.61 -4.42 1.32 -4.39 1 -4.36Z"/>
+ <path id="g12" d="M1.02 -6.89C0.7 -6.86 0.41 -6.83 0.39 -6.83S0.36 -6.78 0.36 -6.68V-6.54L0.59 -6.52C0.88 -6.5 0.99 -6.46 1.06 -6.32C1.11 -6.22 1.11 -6.02 1.11 -3.37C1.11 -0.15 1.13 -0.38 0.87 -0.33C0.78 -0.31 0.63 -0.3 0.54 -0.3H0.36V-0.15V-0.01H1.44H2.52V-0.15V-0.3H2.35C2.05 -0.3 1.87 -0.35 1.82 -0.45C1.78 -0.52 1.77 -0.97 1.77 -3.74V-6.95H1.69C1.64 -6.94 1.34 -6.92 1.02 -6.89Z"/>
+ <path id="g13" d="M1.04 21.77C1.36 21.75 1.53 21.53 1.53 21.28C1.53 20.95 1.28 20.79 1.05 20.79C0.81 20.79 0.56 20.94 0.56 21.29C0.56 21.8 1.06 22.22 1.67 22.22C3.19 22.22 3.76 19.88 4.47 16.98C5.24 13.82 5.89 10.63 6.43 7.42C6.8 5.29 7.17 3.29 7.51 2C7.63 1.51 7.97 0.22 8.36 0.22C8.67 0.22 8.92 0.41 8.96 0.45C8.63 0.47 8.46 0.69 8.46 0.94C8.46 1.27 8.71 1.43 8.94 1.43C9.18 1.43 9.43 1.28 9.43 0.93C9.43 0.39 8.89 -0 8.34 -0C7.58 -0 7.02 1.09 6.47 3.13C6.44 3.24 5.08 8.26 3.98 14.8C3.72 16.33 3.43 18 3.1 19.39C2.92 20.12 2.46 22 1.65 22C1.29 22 1.04 21.77 1.04 21.77Z"/>
+ <path id="g14" d="M1.15 -1.01C0.81 -0.85 0.73 -0.4 1.01 -0.14C1.21 0.04 1.51 0.05 1.7 -0.12L1.77 -0.19V-0.01C1.77 0.56 1.56 1.12 1.17 1.58C1.07 1.7 0.99 1.81 0.99 1.83C0.99 1.88 1.11 1.96 1.15 1.94C1.26 1.9 1.57 1.47 1.73 1.15C1.92 0.76 1.98 0.53 2 0.13C2.04 -0.55 1.81 -1.01 1.4 -1.04C1.31 -1.05 1.21 -1.03 1.15 -1.01Z"/>
+ <path id="g15" d="M1.15 -4.25C1.02 -4.18 0.96 -4.12 0.9 -3.99C0.77 -3.74 0.87 -3.44 1.15 -3.3C1.57 -3.09 2.05 -3.57 1.84 -3.99C1.7 -4.26 1.39 -4.38 1.15 -4.25ZM1.15 -1C1.02 -0.93 0.96 -0.87 0.9 -0.74C0.77 -0.49 0.87 -0.19 1.15 -0.05C1.57 0.16 2.05 -0.32 1.84 -0.74C1.7 -1.01 1.39 -1.12 1.15 -1Z"/>
+ <path id="g16" d="M1.2 -6.9C0.84 -6.88 0.51 -6.86 0.45 -6.86H0.36V-6.62V-6.39L0.62 -6.37C0.93 -6.35 0.98 -6.33 1.02 -6.24C1.04 -6.19 1.05 -4.89 1.05 -3.08V-0H1.29H1.52L1.74 -0.24C1.87 -0.38 1.98 -0.5 1.99 -0.52S2.05 -0.51 2.11 -0.46C2.28 -0.3 2.58 -0.12 2.83 -0.03C3.06 0.03 3.11 0.04 3.52 0.04C3.88 0.03 4 0.02 4.24 -0.03C4.92 -0.21 5.41 -0.58 5.69 -1.11C5.88 -1.49 5.94 -1.75 5.94 -2.24S5.9 -2.91 5.7 -3.33C5.43 -3.89 4.96 -4.25 4.25 -4.44C4.09 -4.48 3.94 -4.49 3.59 -4.49C3.18 -4.49 3.12 -4.48 2.89 -4.41C2.6 -4.31 2.45 -4.24 2.26 -4.11L2.13 -4.03V-5.49V-6.95H1.99C1.91 -6.94 1.56 -6.92 1.2 -6.9ZM3.97 -4.04C4.28 -3.9 4.49 -3.63 4.59 -3.24C4.65 -2.99 4.68 -1.94 4.64 -1.55C4.56 -0.93 4.32 -0.56 3.85 -0.38C3.72 -0.33 3.62 -0.31 3.37 -0.31C3.06 -0.31 3.04 -0.31 2.82 -0.42C2.64 -0.51 2.54 -0.59 2.39 -0.75L2.19 -0.97V-2.23V-3.49L2.27 -3.6C2.45 -3.83 2.83 -4.05 3.17 -4.12C3.4 -4.17 3.76 -4.14 3.97 -4.04Z"/>
+ <path id="g17" d="M1.32 -6.9C0.96 -6.88 0.63 -6.86 0.57 -6.86H0.48V-6.62V-6.39L0.74 -6.37C1.05 -6.35 1.1 -6.33 1.14 -6.24C1.16 -6.19 1.17 -4.99 1.17 -3.32V-0.48H0.82H0.48V-0.24V-0.01H1.71H2.95V-0.24V-0.48H2.6H2.25V-3.71V-6.95H2.11C2.03 -6.94 1.68 -6.92 1.32 -6.9Z"/>
+ <path id="g18" d="M1.42 -5.81C1.33 -4.93 0.9 -4.33 0.32 -4.25C0.18 -4.23 0.18 -4.23 0.18 -4.12V-4H0.6H1.02V-2.51C1.02 -1.64 1.03 -0.96 1.05 -0.87C1.14 -0.37 1.49 -0.01 1.98 0.08C2.57 0.21 3 -0.03 3.22 -0.64C3.27 -0.79 3.29 -0.91 3.3 -1.31L3.31 -1.8H3.18H3.04L3.03 -1.33C3.01 -0.81 2.98 -0.64 2.83 -0.41C2.64 -0.11 2.24 -0.06 1.98 -0.31C1.73 -0.55 1.71 -0.68 1.71 -2.49V-4H2.42H3.13V-4.15V-4.3H2.42H1.71V-5.22V-6.14H1.58H1.45Z"/>
+ <path id="g19" d="M1.48 -4.45C1.11 -4.39 0.76 -4.2 0.59 -3.99C0.54 -3.93 0.47 -3.8 0.42 -3.71C0.31 -3.47 0.31 -3.07 0.41 -2.84C0.51 -2.63 0.66 -2.46 0.87 -2.32C1.12 -2.15 1.32 -2.08 1.9 -1.97C2.45 -1.85 2.65 -1.78 2.84 -1.6C3.06 -1.38 3.13 -1.12 3.07 -0.8C3 -0.47 2.75 -0.24 2.36 -0.16C1.46 0.02 0.9 -0.37 0.65 -1.38C0.58 -1.66 0.57 -1.67 0.49 -1.68C0.44 -1.68 0.38 -1.67 0.36 -1.64C0.33 -1.61 0.33 -1.37 0.33 -0.74L0.34 0.1L0.42 0.11C0.48 0.12 0.53 0.08 0.68 -0.1L0.88 -0.33L0.99 -0.22C1.27 0.02 1.65 0.14 2.13 0.11C2.48 0.08 2.76 -0 2.99 -0.14C3.21 -0.28 3.31 -0.39 3.43 -0.63C3.69 -1.14 3.6 -1.74 3.21 -2.15C2.91 -2.47 2.69 -2.57 1.94 -2.72C1.37 -2.84 1.17 -2.92 0.99 -3.09C0.79 -3.29 0.76 -3.57 0.9 -3.85C1.02 -4.09 1.33 -4.24 1.79 -4.26C2.55 -4.31 2.98 -3.95 3.06 -3.19L3.08 -2.99H3.2H3.32V-3.73V-4.47L3.25 -4.48C3.2 -4.48 3.14 -4.45 3.02 -4.33L2.87 -4.18L2.75 -4.26C2.54 -4.4 2.33 -4.46 1.97 -4.47C1.79 -4.47 1.56 -4.47 1.48 -4.45Z"/>
+ <path id="g20" d="M1.51 -4.6C0.96 -4.5 0.58 -4.23 0.41 -3.8C0.36 -3.66 0.34 -3.56 0.34 -3.32C0.34 -3.06 0.35 -3 0.42 -2.85C0.58 -2.52 0.95 -2.2 1.33 -2.08C1.43 -2.04 1.69 -1.98 1.91 -1.94C2.48 -1.82 2.68 -1.71 2.8 -1.46C2.95 -1.13 2.8 -0.78 2.46 -0.62C2.32 -0.56 2.26 -0.55 1.91 -0.55C1.6 -0.56 1.46 -0.57 1.26 -0.62C0.99 -0.7 0.63 -0.85 0.48 -0.96L0.39 -1.02L0.36 -0.86C0.33 -0.7 0.27 -0.35 0.27 -0.34C0.27 -0.31 0.64 -0.14 0.87 -0.06C1.25 0.06 1.5 0.1 1.97 0.1C2.29 0.1 2.43 0.09 2.57 0.04C3.12 -0.11 3.45 -0.46 3.55 -0.98C3.64 -1.45 3.5 -1.88 3.15 -2.22C2.87 -2.48 2.63 -2.59 2.01 -2.72C1.73 -2.77 1.46 -2.85 1.39 -2.88C0.95 -3.1 0.94 -3.7 1.37 -3.91C1.5 -3.98 1.55 -3.98 1.97 -3.98C2.47 -3.98 2.7 -3.94 3.09 -3.76C3.23 -3.7 3.29 -3.68 3.31 -3.7C3.32 -3.72 3.35 -3.84 3.37 -3.97C3.39 -4.09 3.41 -4.22 3.42 -4.26C3.43 -4.31 3.4 -4.33 3.23 -4.4C2.87 -4.55 2.57 -4.6 2.1 -4.62C1.86 -4.62 1.6 -4.62 1.51 -4.6Z"/>
+ <path id="g21" d="M1.58 -4.37C1.33 -4.25 1.15 -3.99 1 -3.55C0.85 -3.13 0.79 -2.86 0.84 -2.81C0.88 -2.76 1.03 -2.75 1.07 -2.8C1.09 -2.82 1.13 -2.95 1.17 -3.08C1.36 -3.82 1.54 -4.14 1.79 -4.17C2.02 -4.2 2.12 -4 2.07 -3.58C2.05 -3.46 1.86 -2.63 1.63 -1.74C1.41 -0.84 1.24 -0.08 1.25 -0.05C1.27 0.02 1.41 0.12 1.51 0.12C1.64 0.12 1.8 0.01 1.85 -0.1C1.87 -0.15 2.04 -0.8 2.22 -1.54C2.59 -3 2.62 -3.09 2.97 -3.54C3.28 -3.95 3.65 -4.16 4.07 -4.16C4.3 -4.17 4.31 -4.16 4.41 -4.06C4.53 -3.92 4.59 -3.68 4.56 -3.37C4.55 -3.25 4.37 -2.47 4.16 -1.64C3.96 -0.82 3.79 -0.12 3.79 -0.1C3.79 -0.01 3.96 0.12 4.07 0.12C4.2 0.12 4.36 0.01 4.41 -0.1C4.43 -0.16 4.6 -0.8 4.78 -1.53C4.99 -2.35 5.14 -2.92 5.19 -3.01C5.44 -3.5 5.78 -3.89 6.09 -4.04C6.3 -4.14 6.59 -4.2 6.74 -4.17C6.99 -4.12 7.12 -3.84 7.09 -3.41C7.07 -3.09 6.88 -2.36 6.63 -1.67C6.3 -0.73 6.29 -0.55 6.48 -0.23C6.65 0.04 7.02 0.18 7.33 0.09C7.74 -0.03 8.13 -0.54 8.34 -1.22C8.41 -1.47 8.39 -1.53 8.25 -1.53C8.14 -1.53 8.1 -1.49 8.03 -1.23C7.85 -0.57 7.49 -0.12 7.14 -0.12C6.98 -0.12 6.92 -0.2 6.92 -0.41C6.92 -0.61 6.98 -0.82 7.27 -1.64C7.38 -1.95 7.52 -2.39 7.58 -2.61C7.67 -2.97 7.69 -3.06 7.69 -3.37C7.69 -3.67 7.68 -3.74 7.62 -3.87C7.53 -4.06 7.34 -4.25 7.14 -4.34C6.93 -4.44 6.44 -4.43 6.16 -4.34C5.84 -4.23 5.53 -3.98 5.26 -3.64L5.18 -3.54L5.16 -3.63C5.11 -3.85 5.03 -3.99 4.89 -4.14C4.39 -4.64 3.39 -4.46 2.81 -3.76L2.68 -3.61L2.66 -3.71C2.61 -3.98 2.43 -4.22 2.21 -4.34C2.03 -4.43 1.73 -4.44 1.58 -4.37Z"/>
+ <path id="g22" d="M1.58 -4.37C1.33 -4.25 1.15 -3.99 1 -3.55C0.85 -3.13 0.79 -2.86 0.84 -2.81C0.88 -2.76 1.03 -2.75 1.07 -2.8C1.09 -2.82 1.13 -2.95 1.17 -3.08C1.36 -3.82 1.54 -4.14 1.79 -4.17C2.02 -4.2 2.13 -3.98 2.07 -3.59C2.03 -3.33 0.85 1.4 0.79 1.5C0.74 1.6 0.6 1.65 0.35 1.65C0.19 1.65 0.17 1.66 0.14 1.72C0.12 1.76 0.12 1.83 0.13 1.87L0.14 1.94H1.15H2.16L2.2 1.85C2.26 1.7 2.21 1.67 1.86 1.65C1.64 1.63 1.54 1.62 1.51 1.58C1.46 1.53 1.47 1.46 1.68 0.63C1.8 0.14 1.91 -0.3 1.93 -0.35L1.96 -0.45L2.02 -0.35C2.11 -0.2 2.28 -0.03 2.42 0.04C2.6 0.13 3.01 0.13 3.27 0.02C4 -0.27 4.61 -0.97 4.9 -1.85C5.28 -2.97 5.05 -3.96 4.33 -4.31C4.16 -4.4 4.11 -4.41 3.88 -4.41C3.64 -4.41 3.6 -4.4 3.38 -4.29C3.22 -4.21 3.08 -4.1 2.91 -3.95C2.78 -3.82 2.67 -3.73 2.67 -3.73C2.66 -3.74 2.64 -3.8 2.61 -3.87C2.56 -4.04 2.37 -4.25 2.21 -4.34C2.03 -4.43 1.73 -4.44 1.58 -4.37ZM4.04 -4.14C4.18 -4.08 4.28 -3.93 4.35 -3.72C4.39 -3.57 4.4 -3.46 4.38 -3.17C4.36 -2.57 4.02 -1.34 3.76 -0.88C3.52 -0.48 3.17 -0.17 2.9 -0.13C2.51 -0.07 2.21 -0.37 2.12 -0.93C2.1 -1.01 2.17 -1.32 2.37 -2.13C2.63 -3.15 2.65 -3.23 2.77 -3.4C3.16 -3.98 3.69 -4.29 4.04 -4.14Z"/>
+ <path id="g23" d="M1.67 -4.36C1.32 -4.33 1.04 -4.3 1.03 -4.29C1.02 -4.29 1.01 -4.22 1 -4.15L0.98 -4.01L1.22 -3.99C1.36 -3.98 1.5 -3.96 1.55 -3.94C1.72 -3.86 1.72 -3.85 1.43 -2.14C1.29 -1.27 1.15 -0.52 1.13 -0.48C1.08 -0.36 0.95 -0.32 0.64 -0.3C0.48 -0.29 0.36 -0.28 0.36 -0.27C0.35 -0.26 0.34 -0.2 0.33 -0.13L0.31 -0.01H1.43H2.55L2.57 -0.12C2.58 -0.17 2.58 -0.24 2.58 -0.25C2.58 -0.27 2.48 -0.29 2.31 -0.3C2.15 -0.31 2.01 -0.33 1.98 -0.34C1.85 -0.39 1.85 -0.47 2.05 -1.67C2.16 -2.3 2.28 -2.89 2.31 -2.99C2.52 -3.58 3.05 -4.06 3.61 -4.16C4.14 -4.25 4.39 -4.05 4.39 -3.52C4.39 -3.25 3.97 -0.62 3.9 -0.48C3.85 -0.36 3.72 -0.32 3.41 -0.3C3.25 -0.29 3.13 -0.28 3.13 -0.27C3.12 -0.26 3.11 -0.2 3.1 -0.13L3.08 -0.01H4.2H5.32L5.34 -0.12C5.35 -0.17 5.35 -0.24 5.35 -0.25C5.35 -0.27 5.25 -0.29 5.08 -0.3C4.92 -0.31 4.78 -0.33 4.75 -0.34C4.62 -0.39 4.62 -0.45 4.86 -1.87C5.05 -2.99 5.09 -3.27 5.08 -3.47C5.05 -4.07 4.7 -4.38 4.03 -4.41C3.68 -4.43 3.42 -4.38 3.12 -4.22C2.88 -4.09 2.52 -3.77 2.37 -3.55C2.3 -3.45 2.28 -3.43 2.3 -3.49C2.33 -3.64 2.43 -4.29 2.43 -4.36S2.51 -4.43 1.67 -4.36Z"/>
+ <path id="g24" d="M1.71 -5.26C1.46 -5.21 1.15 -5.04 0.94 -4.84C0.35 -4.24 0.36 -3.37 0.98 -2.8C1.24 -2.55 1.44 -2.46 2.2 -2.29C2.56 -2.2 2.91 -2.11 2.98 -2.07C3.15 -1.98 3.32 -1.81 3.42 -1.6C3.49 -1.45 3.5 -1.39 3.5 -1.15C3.5 -0.92 3.49 -0.86 3.42 -0.71C3.18 -0.23 2.72 -0.04 2.07 -0.15C1.27 -0.3 0.86 -0.72 0.78 -1.46C0.76 -1.66 0.76 -1.67 0.67 -1.68C0.62 -1.68 0.56 -1.67 0.54 -1.64S0.51 -1.36 0.51 -0.73L0.52 0.13H0.6C0.65 0.13 0.71 0.08 0.82 -0.06C0.9 -0.16 0.97 -0.27 0.99 -0.29C1.01 -0.33 1.04 -0.31 1.16 -0.23C1.46 -0.01 1.83 0.11 2.29 0.14C2.82 0.17 3.2 0.04 3.55 -0.3C4.19 -0.93 4.18 -1.94 3.53 -2.55C3.25 -2.81 3.06 -2.89 2.3 -3.07C1.86 -3.17 1.59 -3.24 1.51 -3.29C1.11 -3.53 0.93 -3.96 1.07 -4.38C1.11 -4.52 1.16 -4.6 1.3 -4.74C1.46 -4.9 1.52 -4.94 1.69 -4.99C2.18 -5.14 2.72 -5.01 3.07 -4.66C3.29 -4.44 3.43 -4.15 3.51 -3.76L3.57 -3.47H3.69H3.8V-4.38V-5.28H3.73C3.67 -5.28 3.62 -5.23 3.51 -5.08C3.43 -4.98 3.35 -4.87 3.34 -4.85C3.32 -4.81 3.28 -4.83 3.16 -4.93C2.78 -5.23 2.22 -5.36 1.71 -5.26Z"/>
+ <path id="g25" d="M1.73 -4.43C1.13 -4.3 0.73 -3.94 0.7 -3.47C0.68 -3.32 0.69 -3.28 0.75 -3.19C0.87 -3.02 0.97 -2.96 1.15 -2.96C1.71 -2.96 1.8 -3.73 1.26 -3.87L1.16 -3.9L1.27 -3.98C1.54 -4.19 2.16 -4.3 2.47 -4.2C2.79 -4.09 3.03 -3.85 3.16 -3.52C3.21 -3.39 3.23 -3.27 3.24 -2.99L3.25 -2.62L3.02 -2.6C2.3 -2.55 1.8 -2.43 1.37 -2.23C0.91 -2.01 0.59 -1.68 0.47 -1.28C0.29 -0.68 0.59 -0.2 1.3 0.01C1.6 0.11 2.04 0.14 2.29 0.09C2.66 0.01 3.11 -0.31 3.27 -0.61L3.33 -0.73L3.36 -0.58C3.42 -0.37 3.5 -0.22 3.64 -0.1C4.01 0.2 4.54 0.06 4.8 -0.39C4.88 -0.55 4.89 -0.57 4.9 -1L4.91 -1.44H4.77H4.63V-1.06C4.63 -0.85 4.62 -0.62 4.6 -0.55C4.51 -0.22 4.17 -0.16 4.01 -0.46C3.96 -0.54 3.95 -0.69 3.94 -1.94L3.92 -3.32L3.81 -3.55C3.48 -4.25 2.61 -4.62 1.73 -4.43ZM3.24 -1.7C3.23 -0.88 3.2 -0.79 2.89 -0.47C2.63 -0.21 2.44 -0.13 2.07 -0.13C1.85 -0.13 1.79 -0.15 1.66 -0.21C0.94 -0.59 1.1 -1.66 1.95 -2.09C2.25 -2.24 2.77 -2.36 3.11 -2.37H3.25Z"/>
+ <path id="g26" d="M1.743 -0.742C1.673 -0.504 1.442 -0.126 1.085 -0.126C1.064 -0.126 0.854 -0.126 0.707 -0.224C0.994 -0.315 1.015 -0.567 1.015 -0.609C1.015 -0.763 0.896 -0.868 0.735 -0.868C0.539 -0.868 0.336 -0.7 0.336 -0.441C0.336 -0.091 0.728 0.07 1.071 0.07C1.393 0.07 1.68 -0.133 1.855 -0.427C2.023 -0.056 2.408 0.07 2.688 0.07C3.493 0.07 3.92 -0.805 3.92 -1.001C3.92 -1.092 3.829 -1.092 3.808 -1.092C3.71 -1.092 3.703 -1.057 3.675 -0.973C3.528 -0.49 3.108 -0.126 2.716 -0.126C2.436 -0.126 2.289 -0.315 2.289 -0.581C2.289 -0.763 2.457 -1.4 2.653 -2.177C2.793 -2.716 3.108 -2.891 3.339 -2.891C3.353 -2.891 3.57 -2.891 3.717 -2.793C3.493 -2.73 3.409 -2.534 3.409 -2.408C3.409 -2.254 3.528 -2.149 3.689 -2.149S4.081 -2.282 4.081 -2.576C4.081 -2.968 3.633 -3.087 3.353 -3.087C3.003 -3.087 2.723 -2.856 2.569 -2.59C2.443 -2.877 2.121 -3.087 1.729 -3.087C0.945 -3.087 0.497 -2.226 0.497 -2.016C0.497 -1.925 0.595 -1.925 0.616 -1.925C0.707 -1.925 0.714 -1.953 0.749 -2.044C0.924 -2.59 1.365 -2.891 1.708 -2.891C1.939 -2.891 2.128 -2.765 2.128 -2.429C2.128 -2.289 2.044 -1.939 1.981 -1.701L1.743 -0.742Z"/>
+ <path id="g27" d="M1.92 -6.65C1.92 -6.98 1.65 -7.16 1.39 -7.16S0.86 -6.98 0.86 -6.65L1.25 -2.1C1.26 -1.95 1.27 -1.87 1.39 -1.87C1.49 -1.87 1.52 -1.92 1.53 -2.09L1.92 -6.65ZM1.92 -0.53C1.92 -0.82 1.68 -1.06 1.39 -1.06S0.86 -0.82 0.86 -0.53S1.1 -0 1.39 -0S1.92 -0.24 1.92 -0.53Z"/>
+ <path id="g28" d="M1.94 -4.61C1.76 -4.59 1.42 -4.5 1.25 -4.43C1.01 -4.33 0.75 -4.18 0.75 -4.14C0.75 -4.05 0.81 -3.54 0.82 -3.53S0.88 -3.55 0.95 -3.59C1.34 -3.86 1.77 -4 2.24 -4.01C2.59 -4.01 2.71 -3.97 2.91 -3.74C3.11 -3.52 3.16 -3.33 3.18 -2.87L3.19 -2.47L2.85 -2.45C1.84 -2.39 1.07 -2.13 0.71 -1.74C0.49 -1.51 0.43 -1.33 0.46 -1.03C0.5 -0.5 0.82 -0.04 1.24 0.07C1.67 0.2 2.55 0.04 3.05 -0.25L3.22 -0.35V-0.17V-0H3.59H3.97V-1.57C3.97 -3.3 3.96 -3.34 3.78 -3.73C3.66 -3.98 3.31 -4.35 3.07 -4.46C2.75 -4.61 2.36 -4.66 1.94 -4.61ZM3.19 -1.52C3.19 -1.2 3.17 -1.1 3.13 -1C2.93 -0.56 2.05 -0.36 1.51 -0.64C1.37 -0.71 1.21 -0.91 1.18 -1.03C1.13 -1.29 1.25 -1.48 1.53 -1.62C1.86 -1.79 2.46 -1.91 2.94 -1.92H3.19Z"/>
+ <path id="g29" d="M1.96 -4.59C1.37 -4.45 0.8 -3.94 0.54 -3.31C0.38 -2.93 0.34 -2.73 0.34 -2.27C0.34 -1.76 0.39 -1.56 0.6 -1.11C0.73 -0.84 0.79 -0.76 1.03 -0.52C1.33 -0.22 1.56 -0.07 1.91 0.02C2.5 0.21 3.29 0.09 3.88 -0.26L4.08 -0.38L4.07 -0.53C4.07 -0.61 4.06 -0.76 4.05 -0.86L4.03 -1.04L3.81 -0.91C3.28 -0.56 2.59 -0.42 2.14 -0.56C1.88 -0.64 1.72 -0.75 1.51 -0.97C1.25 -1.25 1.1 -1.59 1.03 -2.05L1.02 -2.19H2.57H4.12V-2.35C4.12 -2.77 3.99 -3.39 3.85 -3.68C3.55 -4.27 3.05 -4.6 2.42 -4.62C2.26 -4.63 2.07 -4.61 1.96 -4.59ZM2.84 -3.88C3.06 -3.77 3.24 -3.59 3.36 -3.35C3.44 -3.2 3.55 -2.86 3.55 -2.78C3.55 -2.77 2.99 -2.77 2.31 -2.77H1.07L1.1 -2.83C1.27 -3.41 1.62 -3.82 2.05 -3.96C2.26 -4.03 2.61 -3.99 2.84 -3.88Z"/>
+ <path id="g30" d="M12.66 14L13.87 10.8H13.62C13.23 11.84 12.17 12.52 11.02 12.82C10.81 12.87 9.83 13.13 7.91 13.13H1.88L6.97 7.16C7.04 7.08 7.06 7.05 7.06 7C7.06 6.98 7.06 6.95 6.99 6.85L2.33 0.48H7.81C9.15 0.48 10.06 0.62 10.15 0.64C10.69 0.72 11.56 0.89 12.35 1.39C12.6 1.55 13.28 2 13.62 2.81H13.87L12.66 -0H0.84C0.61 -0 0.6 0.01 0.57 0.07C0.56 0.1 0.56 0.29 0.56 0.4L5.85 7.64L0.67 13.71C0.57 13.83 0.57 13.88 0.57 13.89C0.57 14 0.66 14 0.84 14H12.66Z"/>
+ <path id="g31" d="M2.04 -4.46C1.88 -4.43 1.57 -4.32 1.39 -4.22C1 -4.01 0.6 -3.54 0.43 -3.08C-0.13 -1.57 0.84 0.02 2.37 0.11C3.13 0.15 3.83 -0.29 4.09 -0.98C4.17 -1.2 4.15 -1.29 4.02 -1.29C3.92 -1.29 3.91 -1.28 3.84 -1.08C3.66 -0.62 3.32 -0.31 2.87 -0.19C2.28 -0.03 1.64 -0.35 1.35 -0.94C1.2 -1.24 1.14 -1.5 1.12 -1.96L1.1 -2.31H2.61C4.29 -2.31 4.15 -2.29 4.15 -2.54C4.15 -2.97 4.02 -3.44 3.8 -3.77C3.63 -4.02 3.47 -4.16 3.2 -4.29C2.87 -4.45 2.39 -4.52 2.04 -4.46ZM2.76 -4.14C3.17 -3.93 3.4 -3.47 3.45 -2.82L3.47 -2.55H2.29H1.11L1.12 -2.62C1.13 -2.66 1.14 -2.77 1.16 -2.87C1.22 -3.42 1.51 -3.92 1.89 -4.12C2.16 -4.26 2.5 -4.27 2.76 -4.14Z"/>
+ <path id="g32" d="M2.05 -4.44C0.97 -4.19 0.21 -3.16 0.28 -2.01C0.3 -1.64 0.35 -1.43 0.53 -1.09C1.11 0.08 2.6 0.47 3.7 -0.25C4.12 -0.53 4.49 -1.05 4.62 -1.55C4.7 -1.84 4.71 -2.26 4.65 -2.57C4.44 -3.66 3.59 -4.44 2.55 -4.47C2.35 -4.48 2.17 -4.47 2.05 -4.44ZM2.95 -4.15C3.43 -3.96 3.74 -3.52 3.82 -2.89C3.86 -2.56 3.86 -1.8 3.81 -1.49C3.71 -0.87 3.48 -0.5 3.05 -0.28C2.48 -0 1.77 -0.18 1.42 -0.71C1.18 -1.08 1.09 -1.56 1.12 -2.42C1.14 -3.01 1.17 -3.2 1.33 -3.52C1.49 -3.85 1.82 -4.12 2.18 -4.21C2.37 -4.26 2.76 -4.23 2.95 -4.15Z"/>
+ <path id="g33" d="M2.06 -4H3C3.2 -4 3.3 -4 3.3 -4.2C3.3 -4.31 3.2 -4.31 3.02 -4.31H2.14C2.5 -5.73 2.55 -5.93 2.55 -5.99C2.55 -6.16 2.43 -6.26 2.26 -6.26C2.23 -6.26 1.95 -6.25 1.86 -5.9L1.47 -4.31H0.53C0.33 -4.31 0.23 -4.31 0.23 -4.12C0.23 -4 0.31 -4 0.51 -4H1.39C0.67 -1.16 0.63 -0.99 0.63 -0.81C0.63 -0.27 1.01 0.11 1.55 0.11C2.57 0.11 3.14 -1.35 3.14 -1.43C3.14 -1.53 3.06 -1.53 3.02 -1.53C2.93 -1.53 2.92 -1.5 2.87 -1.39C2.44 -0.35 1.91 -0.11 1.57 -0.11C1.36 -0.11 1.26 -0.24 1.26 -0.57C1.26 -0.81 1.28 -0.88 1.32 -1.05L2.06 -4Z"/>
+ <path id="g34" d="M2.08 -1.94C2.3 -1.9 3.12 -1.74 3.12 -1.02C3.12 -0.51 2.77 -0.11 1.99 -0.11C1.15 -0.11 0.79 -0.68 0.6 -1.53C0.57 -1.66 0.56 -1.7 0.46 -1.7C0.33 -1.7 0.33 -1.63 0.33 -1.45V-0.13C0.33 0.04 0.33 0.11 0.44 0.11C0.49 0.11 0.5 0.1 0.69 -0.09C0.71 -0.11 0.71 -0.13 0.89 -0.32C1.33 0.1 1.78 0.11 1.99 0.11C3.14 0.11 3.6 -0.56 3.6 -1.28C3.6 -1.81 3.3 -2.11 3.18 -2.23C2.85 -2.55 2.46 -2.63 2.04 -2.71C1.48 -2.82 0.81 -2.95 0.81 -3.53C0.81 -3.88 1.07 -4.29 1.93 -4.29C3.03 -4.29 3.08 -3.39 3.1 -3.08C3.11 -2.99 3.2 -2.99 3.22 -2.99C3.35 -2.99 3.35 -3.04 3.35 -3.23V-4.24C3.35 -4.41 3.35 -4.48 3.24 -4.48C3.19 -4.48 3.17 -4.48 3.04 -4.36C3.01 -4.32 2.91 -4.23 2.87 -4.2C2.49 -4.48 2.08 -4.48 1.93 -4.48C0.71 -4.48 0.33 -3.81 0.33 -3.25C0.33 -2.9 0.49 -2.62 0.76 -2.4C1.08 -2.14 1.36 -2.08 2.08 -1.94Z"/>
+ <path id="g35" d="M2.12 -6.89C1.78 -6.86 1.49 -6.83 1.48 -6.82C1.48 -6.82 1.47 -6.75 1.46 -6.68L1.43 -6.54L1.68 -6.52C1.96 -6.5 2.08 -6.45 2.12 -6.34C2.16 -6.21 1.22 -0.53 1.13 -0.43C1.07 -0.35 0.86 -0.3 0.58 -0.3C0.4 -0.3 0.39 -0.3 0.38 -0.2C0.33 -0 0.24 -0.01 1.46 -0.01C2.45 -0.01 2.55 -0.01 2.55 -0.06C2.55 -0.09 2.56 -0.15 2.57 -0.2L2.59 -0.29L2.31 -0.3C2.15 -0.31 2.01 -0.33 1.98 -0.34C1.84 -0.39 1.84 -0.35 2.39 -3.67C2.68 -5.41 2.92 -6.86 2.92 -6.89C2.92 -6.96 2.97 -6.96 2.12 -6.89Z"/>
+ <path id="g36" d="M2.19 -6.89C1.87 -6.85 1.59 -6.81 1.57 -6.79C1.54 -6.77 1.53 -6.72 1.54 -6.65L1.55 -6.54L1.83 -6.53C2.17 -6.5 2.25 -6.47 2.25 -6.36C2.25 -6.32 1.91 -4.91 1.49 -3.22C1.06 -1.53 0.72 -0.12 0.72 -0.1C0.72 -0.01 0.89 0.12 0.99 0.12C1.13 0.12 1.28 0.02 1.34 -0.09C1.36 -0.15 1.53 -0.79 1.71 -1.53C1.92 -2.34 2.07 -2.92 2.12 -3.02C2.36 -3.5 2.71 -3.89 3.02 -4.04C3.23 -4.14 3.52 -4.2 3.67 -4.17C3.92 -4.12 4.05 -3.84 4.02 -3.41C4 -3.09 3.81 -2.36 3.56 -1.67C3.45 -1.35 3.34 -1.01 3.32 -0.91C3.12 -0.1 3.93 0.42 4.58 -0.08C4.86 -0.3 5.12 -0.73 5.27 -1.22C5.34 -1.47 5.32 -1.53 5.17 -1.53C5.06 -1.53 5.03 -1.49 4.96 -1.23C4.78 -0.57 4.42 -0.12 4.07 -0.12C3.91 -0.12 3.85 -0.2 3.85 -0.41C3.85 -0.61 3.91 -0.82 4.19 -1.64C4.3 -1.95 4.44 -2.39 4.51 -2.61C4.6 -2.97 4.62 -3.06 4.62 -3.37C4.62 -3.67 4.61 -3.74 4.55 -3.87C4.46 -4.06 4.26 -4.25 4.07 -4.34C3.86 -4.44 3.37 -4.43 3.09 -4.34C2.87 -4.26 2.61 -4.09 2.41 -3.9C2.34 -3.83 2.28 -3.79 2.28 -3.8S2.45 -4.5 2.66 -5.34C3.07 -6.99 3.07 -6.95 2.87 -6.95C2.82 -6.95 2.52 -6.92 2.19 -6.89Z"/>
+ <path id="g37" d="M2.191 -4.648C2.198 -4.662 2.219 -4.753 2.219 -4.76C2.219 -4.795 2.191 -4.858 2.107 -4.858C1.967 -4.858 1.386 -4.802 1.211 -4.788C1.155 -4.781 1.057 -4.774 1.057 -4.627C1.057 -4.529 1.155 -4.529 1.239 -4.529C1.575 -4.529 1.575 -4.48 1.575 -4.424C1.575 -4.375 1.561 -4.333 1.547 -4.27L0.56 -0.308C0.525 -0.182 0.525 -0.168 0.525 -0.154C0.525 -0.049 0.609 0.07 0.763 0.07C0.952 0.07 1.043 -0.07 1.085 -0.224C1.099 -0.252 1.4 -1.484 1.428 -1.582C1.925 -1.533 2.324 -1.372 2.324 -1.008C2.324 -0.973 2.324 -0.938 2.31 -0.868C2.282 -0.763 2.282 -0.728 2.282 -0.651C2.282 -0.154 2.688 0.07 3.024 0.07C3.703 0.07 3.913 -0.994 3.913 -1.001C3.913 -1.092 3.822 -1.092 3.801 -1.092C3.703 -1.092 3.696 -1.057 3.661 -0.924C3.577 -0.623 3.388 -0.126 3.045 -0.126C2.856 -0.126 2.8 -0.301 2.8 -0.49C2.8 -0.609 2.8 -0.623 2.842 -0.805C2.849 -0.826 2.877 -0.945 2.877 -1.022C2.877 -1.645 2.037 -1.743 1.743 -1.764C1.946 -1.89 2.205 -2.121 2.324 -2.226C2.681 -2.562 3.031 -2.891 3.423 -2.891C3.507 -2.891 3.598 -2.87 3.654 -2.8C3.353 -2.751 3.29 -2.513 3.29 -2.408C3.29 -2.254 3.409 -2.149 3.57 -2.149C3.759 -2.149 3.969 -2.303 3.969 -2.597C3.969 -2.828 3.801 -3.087 3.43 -3.087C3.031 -3.087 2.667 -2.8 2.31 -2.471C2.016 -2.191 1.785 -1.974 1.498 -1.855L2.191 -4.648Z"/>
+ <path id="g38" d="M2.23 -7.29C1.81 -7.18 1.42 -6.84 1.2 -6.41C1.02 -6.04 0.99 -5.84 0.99 -5.09V-4.45H0.61H0.24V-4.15V-3.85H0.61H0.99V-1.92V-0H1.37H1.74V-1.92V-3.85H2.28H2.83V-4.15V-4.45H2.27H1.71L1.72 -5.29C1.73 -6.04 1.73 -6.13 1.78 -6.24C1.98 -6.64 2.48 -6.8 3.05 -6.65C3.18 -6.62 3.32 -6.58 3.36 -6.57C3.43 -6.55 3.43 -6.55 3.43 -6.89V-7.22L3.3 -7.25C2.94 -7.35 2.5 -7.37 2.23 -7.29Z"/>
+ <path id="g39" d="M2.27 -4.46C1.44 -4.35 0.87 -3.78 0.87 -3.09C0.87 -2.9 0.88 -2.84 0.96 -2.68C1.15 -2.31 1.47 -2.13 2.24 -1.96C2.91 -1.82 3.06 -1.74 3.2 -1.46C3.29 -1.27 3.3 -1.12 3.22 -0.86C3.07 -0.4 2.61 -0.12 1.98 -0.12C1.3 -0.11 0.95 -0.52 0.88 -1.36C0.87 -1.5 0.85 -1.62 0.83 -1.64C0.8 -1.69 0.64 -1.69 0.62 -1.66C0.58 -1.6 0.32 0.03 0.34 0.07C0.38 0.17 0.49 0.12 0.72 -0.1L0.94 -0.32L1.1 -0.18C1.35 0.05 1.52 0.1 2.01 0.1C2.37 0.1 2.45 0.08 2.66 0.02C3.26 -0.17 3.65 -0.6 3.78 -1.21C3.86 -1.6 3.77 -1.93 3.5 -2.22C3.26 -2.48 3.03 -2.59 2.4 -2.72C1.86 -2.83 1.65 -2.91 1.52 -3.06C1.37 -3.25 1.35 -3.45 1.47 -3.71C1.62 -4.05 2.07 -4.27 2.63 -4.27C3.01 -4.27 3.3 -4.15 3.45 -3.93C3.55 -3.78 3.62 -3.48 3.6 -3.25C3.59 -3.13 3.59 -3.04 3.61 -3.02C3.65 -2.97 3.81 -2.96 3.83 -3C3.86 -3.05 4.06 -4.31 4.05 -4.39C4.04 -4.52 3.94 -4.5 3.75 -4.35C3.58 -4.21 3.51 -4.18 3.47 -4.24C3.44 -4.3 3.18 -4.41 3.01 -4.45C2.86 -4.48 2.46 -4.49 2.27 -4.46Z"/>
+ <path id="g40" d="M2.33 -7C1.59 -6.83 1.02 -6.32 0.8 -5.64C0.71 -5.34 0.71 -4.82 0.8 -4.54C0.97 -4.07 1.35 -3.63 1.81 -3.4C2.01 -3.3 2.21 -3.24 2.94 -3.07C3.48 -2.94 3.88 -2.83 3.99 -2.77C4.09 -2.73 4.24 -2.61 4.34 -2.52C4.89 -1.97 4.89 -1.06 4.33 -0.5C4.01 -0.19 3.67 -0.07 3.14 -0.1C2.73 -0.12 2.38 -0.2 2.04 -0.36C1.84 -0.46 1.74 -0.53 1.54 -0.73C1.19 -1.08 1.05 -1.42 1 -1.99L0.97 -2.24L0.88 -2.25C0.83 -2.25 0.77 -2.24 0.75 -2.21S0.72 -1.86 0.72 -0.99L0.73 0.19L0.81 0.2C0.88 0.21 0.91 0.17 1.12 -0.14L1.34 -0.51L1.46 -0.41C1.9 -0.03 2.45 0.16 3.16 0.2C3.48 0.21 3.57 0.21 3.79 0.15C4.19 0.05 4.46 -0.09 4.76 -0.39C4.97 -0.6 5.04 -0.69 5.16 -0.93C5.46 -1.56 5.46 -2.17 5.16 -2.79C5.04 -3.03 4.97 -3.13 4.77 -3.32C4.39 -3.7 4.17 -3.8 3.11 -4.05C2.18 -4.26 1.98 -4.34 1.75 -4.57C1.22 -5.08 1.22 -5.87 1.76 -6.38C2.06 -6.66 2.44 -6.79 2.9 -6.76C3.45 -6.73 3.81 -6.58 4.15 -6.23C4.5 -5.89 4.67 -5.52 4.78 -4.88L4.83 -4.59H4.95H5.07V-5.81V-7.03L4.99 -7.04C4.92 -7.04 4.89 -7.01 4.69 -6.69C4.57 -6.49 4.47 -6.33 4.47 -6.33C4.46 -6.32 4.39 -6.39 4.3 -6.47C4 -6.75 3.61 -6.94 3.18 -7.01C2.93 -7.05 2.55 -7.05 2.33 -7Z"/>
+ <path id="g41" d="M2.34 -4.38C2.14 -4.31 1.96 -4.18 1.81 -4.01C1.63 -3.82 1.45 -3.46 1.43 -3.31C1.43 -3.2 1.43 -3.2 1.55 -3.19C1.68 -3.18 1.68 -3.19 1.74 -3.31C1.86 -3.6 2.13 -3.77 2.48 -3.77C2.67 -3.77 2.72 -3.76 3 -3.63C3.18 -3.55 3.4 -3.46 3.5 -3.44L3.68 -3.4L2.57 -2.29C1.45 -1.18 1.1 -0.78 0.77 -0.28C0.57 0.02 0.56 0.1 0.72 0.11C0.83 0.12 0.84 0.11 0.98 -0.09C1.3 -0.56 1.62 -0.73 1.88 -0.57C1.93 -0.54 2.03 -0.45 2.09 -0.37C2.42 0.04 2.56 0.13 2.84 0.11C3.42 0.06 3.99 -0.47 4.24 -1.22C4.32 -1.45 4.3 -1.5 4.15 -1.5C4.05 -1.5 4.02 -1.49 4 -1.42C3.82 -0.99 3.63 -0.77 3.31 -0.62C3.14 -0.54 3.08 -0.52 2.89 -0.52C2.69 -0.52 2.63 -0.54 2.42 -0.64C2.08 -0.8 1.87 -0.87 1.7 -0.87H1.56L1.62 -0.96C1.66 -1.01 2.19 -1.56 2.81 -2.17C3.63 -2.99 3.99 -3.38 4.17 -3.61C4.45 -3.99 4.64 -4.3 4.63 -4.36C4.62 -4.39 4.57 -4.41 4.49 -4.42C4.37 -4.42 4.37 -4.42 4.26 -4.23C4.08 -3.93 3.95 -3.77 3.84 -3.72C3.63 -3.62 3.46 -3.68 3.26 -3.93C2.89 -4.4 2.68 -4.5 2.34 -4.38Z"/>
+ <path id="g42" d="M2.345 -4.452C2.345 -4.641 2.331 -4.648 2.135 -4.648C1.687 -4.207 1.05 -4.2 0.763 -4.2V-3.948C0.931 -3.948 1.393 -3.948 1.778 -4.144V-0.574C1.778 -0.343 1.778 -0.252 1.078 -0.252H0.812V-0C0.938 -0.007 1.799 -0.028 2.058 -0.028C2.275 -0.028 3.157 -0.007 3.311 -0V-0.252H3.045C2.345 -0.252 2.345 -0.343 2.345 -0.574V-4.452Z"/>
+ <path id="g43" d="M2.35 -4.51C2.07 -4.47 1.64 -4.32 1.41 -4.19C1.3 -4.13 1.1 -3.97 0.97 -3.83C0.76 -3.63 0.7 -3.54 0.59 -3.3C0.39 -2.89 0.34 -2.68 0.34 -2.19C0.34 -1.86 0.36 -1.74 0.41 -1.55C0.6 -0.89 1.05 -0.39 1.69 -0.14C2.09 -0 2.31 0.04 2.86 0.04C3.4 0.04 3.62 -0 4.02 -0.14C4.66 -0.39 5.11 -0.89 5.3 -1.55C5.36 -1.74 5.37 -1.86 5.37 -2.19C5.37 -2.68 5.32 -2.89 5.12 -3.3C5.01 -3.54 4.95 -3.63 4.74 -3.83C4.61 -3.97 4.41 -4.13 4.3 -4.19C3.8 -4.48 3.03 -4.6 2.35 -4.51ZM3.16 -4.15C3.39 -4.1 3.64 -3.96 3.77 -3.82C4.01 -3.55 4.06 -3.34 4.08 -2.49C4.1 -1.82 4.07 -1.36 3.98 -1.08C3.89 -0.77 3.67 -0.54 3.34 -0.41C3.2 -0.36 3.11 -0.34 2.86 -0.34C2.6 -0.34 2.51 -0.36 2.37 -0.41C1.75 -0.66 1.59 -1.1 1.63 -2.49C1.65 -3.34 1.7 -3.55 1.94 -3.82C2.2 -4.11 2.71 -4.24 3.16 -4.15Z"/>
+ <path id="g44" d="M2.4 -5.87C2.18 -4.98 1.63 -4.32 1.02 -4.25C0.89 -4.23 0.87 -4.22 0.87 -4.16C0.87 -4.13 0.86 -4.07 0.85 -4.05C0.83 -4.01 0.88 -4 1.26 -4C1.49 -4 1.68 -3.99 1.68 -3.98S1.57 -3.31 1.44 -2.52C1.16 -0.86 1.15 -0.71 1.3 -0.41C1.47 -0.06 1.78 0.09 2.25 0.1C2.51 0.1 2.56 0.09 2.71 0.02C3 -0.12 3.3 -0.49 3.43 -0.88C3.46 -0.98 3.51 -1.19 3.53 -1.35C3.56 -1.51 3.59 -1.67 3.6 -1.72C3.61 -1.8 3.61 -1.8 3.48 -1.8C3.4 -1.8 3.34 -1.8 3.34 -1.79S3.3 -1.59 3.26 -1.36C3.11 -0.53 2.76 -0.09 2.3 -0.16C2.14 -0.18 2.04 -0.26 1.96 -0.42C1.84 -0.66 1.86 -0.85 2.13 -2.5L2.38 -4H3.09H3.79L3.8 -4.07C3.81 -4.1 3.82 -4.17 3.83 -4.22L3.85 -4.3H3.14C2.75 -4.3 2.43 -4.31 2.43 -4.32C2.43 -4.34 2.7 -5.95 2.72 -6.06C2.74 -6.14 2.74 -6.14 2.61 -6.14H2.47Z"/>
+ <path id="g45" d="M2.46 -4.43C1.91 -4.32 1.51 -4.04 1.33 -3.66C1.19 -3.35 1.27 -3.07 1.52 -2.98C1.84 -2.87 2.19 -3.14 2.19 -3.49C2.19 -3.61 2.18 -3.66 2.1 -3.74C2.05 -3.79 1.97 -3.85 1.92 -3.87L1.82 -3.9L1.94 -3.98C2.1 -4.09 2.49 -4.21 2.77 -4.23C3.1 -4.26 3.31 -4.19 3.5 -3.99C3.76 -3.73 3.82 -3.38 3.72 -2.84L3.68 -2.63L3.5 -2.61C3.4 -2.6 3.18 -2.57 3 -2.56C2.5 -2.5 2.03 -2.37 1.63 -2.18C1.34 -2.04 1.25 -1.97 1.05 -1.78C0.75 -1.48 0.6 -1.19 0.57 -0.87C0.56 -0.68 0.57 -0.64 0.64 -0.49C0.82 -0.13 1.24 0.07 1.85 0.11C2.2 0.13 2.43 0.08 2.73 -0.06C2.94 -0.17 3.23 -0.42 3.37 -0.61L3.46 -0.73V-0.62C3.46 -0.33 3.64 -0.04 3.87 0.03C4.13 0.11 4.53 -0.01 4.75 -0.25C4.92 -0.44 5.01 -0.64 5.07 -0.99C5.09 -1.15 5.12 -1.31 5.13 -1.36C5.15 -1.44 5.15 -1.44 5.01 -1.44C4.86 -1.44 4.88 -1.48 4.8 -0.99C4.77 -0.83 4.72 -0.63 4.68 -0.55C4.56 -0.29 4.32 -0.19 4.17 -0.34C4.03 -0.47 4.04 -0.55 4.25 -1.86C4.49 -3.24 4.5 -3.4 4.35 -3.7C4.18 -4.05 3.78 -4.34 3.35 -4.44C3.09 -4.49 2.72 -4.49 2.46 -4.43ZM3.64 -2.37C3.64 -2.36 3.59 -2.08 3.53 -1.75C3.41 -1.01 3.34 -0.84 3.05 -0.55C2.73 -0.23 2.27 -0.06 1.9 -0.14C1.67 -0.19 1.52 -0.3 1.42 -0.5C1.35 -0.64 1.34 -0.69 1.36 -0.85C1.41 -1.48 1.93 -2.01 2.71 -2.23C3.02 -2.32 3.64 -2.41 3.64 -2.37Z"/>
+ <path id="g46" d="M2.57 -4.52C2.27 -4.45 2.02 -4.31 1.76 -4.06L1.53 -3.83V-4.17V-4.51H1.17H0.81V-2.25V-0H1.2H1.59L1.6 -1.45C1.61 -2.66 1.62 -2.93 1.66 -3.06C1.83 -3.61 2.1 -3.9 2.5 -3.93C2.86 -3.97 3.24 -3.83 3.38 -3.61C3.54 -3.37 3.55 -3.28 3.55 -1.57V-0H3.94H4.33V-1.63C4.33 -3.39 4.32 -3.57 4.17 -3.89C3.97 -4.33 3.53 -4.58 2.95 -4.57C2.84 -4.57 2.67 -4.55 2.57 -4.52Z"/>
+ <path id="g47" d="M2.59 -6.53C2.42 -6.37 2.03 -6.18 1.75 -6.11C1.62 -6.07 1.38 -6.04 1.21 -6.03L0.9 -6.01V-5.86V-5.72H1.09C1.42 -5.72 1.79 -5.8 2.14 -5.94C2.19 -5.96 2.19 -5.82 2.19 -3.27C2.19 -1.19 2.18 -0.57 2.15 -0.51C2.08 -0.36 1.94 -0.32 1.43 -0.3L0.96 -0.29V-0.15V-0.01H2.57H4.18V-0.15V-0.29L3.71 -0.3C3.2 -0.32 3.06 -0.36 2.98 -0.51C2.96 -0.57 2.95 -1.25 2.95 -3.57C2.95 -5.21 2.94 -6.58 2.93 -6.6C2.89 -6.69 2.73 -6.66 2.59 -6.53Z"/>
+ <path id="g48" d="M2.66 -4.44C2.23 -4.34 1.84 -4.13 1.5 -3.8C1.12 -3.43 0.85 -3 0.7 -2.5C0.63 -2.27 0.62 -2.19 0.62 -1.82C0.62 -1.44 0.62 -1.37 0.7 -1.15C0.91 -0.52 1.43 -0.05 2.06 0.07C2.94 0.26 3.84 -0.18 4.29 -1.03C4.36 -1.17 4.37 -1.2 4.33 -1.24C4.31 -1.27 4.25 -1.29 4.21 -1.29C4.14 -1.29 4.11 -1.27 4.05 -1.15C3.81 -0.67 3.38 -0.32 2.89 -0.19C2.39 -0.06 1.87 -0.25 1.63 -0.66C1.5 -0.88 1.44 -1.07 1.42 -1.38C1.4 -1.6 1.44 -2.04 1.49 -2.25L1.51 -2.31H3.01H4.51L4.55 -2.38C4.57 -2.43 4.58 -2.6 4.59 -2.89C4.59 -3.26 4.58 -3.35 4.52 -3.54C4.39 -3.95 4.09 -4.25 3.67 -4.39C3.42 -4.48 2.92 -4.5 2.66 -4.44ZM3.47 -4.14C3.66 -4.03 3.76 -3.91 3.84 -3.69C3.93 -3.44 3.95 -3.16 3.93 -2.81L3.9 -2.55H2.73C2.09 -2.55 1.56 -2.56 1.56 -2.57C1.56 -2.63 1.66 -2.96 1.73 -3.13C1.94 -3.66 2.4 -4.1 2.83 -4.21C3.01 -4.26 3.33 -4.22 3.47 -4.14Z"/>
+ <path id="g49" d="M2.72 -4.39C2.15 -4.27 1.67 -3.78 1.54 -3.16C1.49 -2.89 1.52 -2.69 1.64 -2.46C1.8 -2.17 1.99 -2.06 2.55 -1.93C2.99 -1.83 3.16 -1.74 3.27 -1.53C3.44 -1.2 3.28 -0.67 2.9 -0.38C2.66 -0.2 2.42 -0.13 2.03 -0.13C1.62 -0.13 1.41 -0.2 1.21 -0.4C1.08 -0.54 1.02 -0.66 1.1 -0.66C1.13 -0.66 1.21 -0.69 1.28 -0.72C1.5 -0.83 1.63 -1.14 1.53 -1.32C1.46 -1.46 1.19 -1.51 1.02 -1.43C0.72 -1.27 0.63 -0.85 0.81 -0.48C1.02 -0.06 1.49 0.14 2.14 0.11C2.86 0.07 3.42 -0.26 3.71 -0.85C3.99 -1.41 3.96 -1.89 3.63 -2.28C3.47 -2.45 3.16 -2.6 2.74 -2.69C2.33 -2.78 2.22 -2.84 2.13 -3.03C1.96 -3.37 2.21 -3.91 2.62 -4.09C2.75 -4.15 2.83 -4.16 3.07 -4.16C3.33 -4.17 3.37 -4.16 3.51 -4.08C3.67 -3.99 3.76 -3.89 3.8 -3.77C3.82 -3.71 3.81 -3.7 3.73 -3.68C3.68 -3.67 3.59 -3.61 3.53 -3.55C3.45 -3.45 3.43 -3.4 3.43 -3.29S3.44 -3.15 3.52 -3.08C3.69 -2.94 3.94 -3.01 4.07 -3.25C4.16 -3.4 4.16 -3.73 4.07 -3.89C3.98 -4.07 3.8 -4.23 3.6 -4.32C3.45 -4.38 3.36 -4.4 3.14 -4.41C2.99 -4.41 2.8 -4.4 2.72 -4.39Z"/>
+ <path id="g50" d="M2.72 -6.55C2.59 -6.49 2.44 -6.31 2.42 -6.18C2.39 -6.04 2.46 -5.89 2.59 -5.82C2.8 -5.71 3.08 -5.85 3.19 -6.1C3.25 -6.22 3.25 -6.25 3.22 -6.35C3.16 -6.56 2.94 -6.64 2.72 -6.55ZM1.83 -4.38C1.42 -4.24 1.05 -3.74 0.86 -3.09C0.79 -2.83 0.81 -2.77 0.96 -2.77C1.07 -2.77 1.09 -2.79 1.18 -3.11C1.4 -3.82 1.7 -4.18 2.07 -4.18C2.18 -4.18 2.22 -4.14 2.25 -4.02C2.31 -3.78 2.26 -3.63 1.67 -2.01C1.32 -1.08 1.28 -0.95 1.27 -0.73C1.26 -0.53 1.26 -0.46 1.32 -0.33C1.4 -0.15 1.6 0.03 1.77 0.08C2.34 0.25 2.91 -0.24 3.2 -1.18C3.29 -1.47 3.28 -1.53 3.13 -1.53C3.02 -1.53 2.98 -1.49 2.91 -1.23C2.82 -0.89 2.6 -0.46 2.45 -0.31C2.28 -0.14 2.03 -0.07 1.89 -0.15C1.81 -0.19 1.79 -0.39 1.84 -0.64C1.87 -0.76 2.09 -1.42 2.34 -2.1C2.85 -3.48 2.88 -3.61 2.78 -3.9C2.65 -4.3 2.22 -4.52 1.83 -4.38Z"/>
+ <path id="g51" d="M2.74 -4.51C2.31 -4.4 1.95 -4.17 1.67 -3.83L1.52 -3.64L1.51 -4.08L1.5 -4.51H1.15H0.81V-2.25V-0H1.18H1.56L1.57 -1.27L1.58 -2.54L1.66 -2.74C1.83 -3.18 2.09 -3.5 2.45 -3.69C2.64 -3.79 2.95 -3.88 3.12 -3.88H3.22V-4.23V-4.57H3.09C3.02 -4.57 2.86 -4.54 2.74 -4.51Z"/>
+ <path id="g52" d="M2.87 -6.83C2.87 -6.84 2.87 -6.94 2.74 -6.94C2.51 -6.94 1.78 -6.86 1.52 -6.84C1.44 -6.83 1.33 -6.82 1.33 -6.64C1.33 -6.52 1.42 -6.52 1.57 -6.52C2.05 -6.52 2.07 -6.45 2.07 -6.35L2.04 -6.15L0.59 -0.39C0.55 -0.25 0.55 -0.23 0.55 -0.17C0.55 0.06 0.75 0.11 0.84 0.11C0.97 0.11 1.12 0.02 1.18 -0.1C1.23 -0.19 1.68 -2.04 1.74 -2.29C2.08 -2.26 2.9 -2.1 2.9 -1.44C2.9 -1.37 2.9 -1.33 2.87 -1.23C2.85 -1.11 2.83 -0.99 2.83 -0.88C2.83 -0.29 3.23 0.11 3.75 0.11C4.05 0.11 4.32 -0.05 4.54 -0.42C4.79 -0.86 4.9 -1.41 4.9 -1.43C4.9 -1.53 4.81 -1.53 4.78 -1.53C4.68 -1.53 4.67 -1.49 4.64 -1.35C4.44 -0.62 4.21 -0.11 3.77 -0.11C3.58 -0.11 3.45 -0.22 3.45 -0.58C3.45 -0.75 3.49 -0.98 3.53 -1.14C3.57 -1.31 3.57 -1.35 3.57 -1.45C3.57 -2.1 2.94 -2.39 2.09 -2.5C2.4 -2.68 2.72 -3 2.95 -3.24C3.43 -3.77 3.89 -4.2 4.38 -4.2C4.44 -4.2 4.45 -4.2 4.47 -4.19C4.59 -4.17 4.6 -4.17 4.68 -4.11C4.7 -4.1 4.7 -4.09 4.72 -4.07C4.24 -4.04 4.15 -3.65 4.15 -3.53C4.15 -3.37 4.26 -3.18 4.53 -3.18C4.79 -3.18 5.08 -3.4 5.08 -3.79C5.08 -4.09 4.85 -4.42 4.4 -4.42C4.12 -4.42 3.66 -4.34 2.94 -3.54C2.6 -3.16 2.21 -2.76 1.83 -2.61L2.87 -6.83Z"/>
+ <path id="g53" d="M2.89 -2.5C2.89 -3.28 2.78 -4.49 2.23 -5.62C1.63 -6.85 0.77 -7.5 0.67 -7.5C0.61 -7.5 0.57 -7.46 0.57 -7.4C0.57 -7.37 0.57 -7.35 0.76 -7.17C1.74 -6.18 2.31 -4.59 2.31 -2.5C2.31 -0.79 1.94 0.97 0.7 2.23C0.57 2.35 0.57 2.37 0.57 2.4C0.57 2.46 0.61 2.5 0.67 2.5C0.77 2.5 1.67 1.82 2.26 0.55C2.77 -0.55 2.89 -1.66 2.89 -2.5Z"/>
+ <path id="g54" d="M2.91 -5.27C2.88 -5.24 2.49 -4.24 2.03 -3.05S1.16 -0.82 1.12 -0.74C0.97 -0.48 0.65 -0.27 0.4 -0.27C0.33 -0.27 0.33 -0.25 0.33 -0.14V-0.01H1.11H1.89V-0.14C1.89 -0.24 1.88 -0.27 1.84 -0.27C1.75 -0.27 1.58 -0.37 1.53 -0.46C1.43 -0.62 1.45 -0.78 1.63 -1.25L1.79 -1.68L2.83 -1.67H3.86L4.07 -1.14C4.18 -0.85 4.27 -0.58 4.27 -0.54C4.27 -0.37 4.11 -0.27 3.86 -0.27C3.76 -0.27 3.76 -0.26 3.76 -0.14V-0.01H4.77H5.78V-0.13V-0.26L5.53 -0.27C5.25 -0.29 5.17 -0.34 5.06 -0.52C5.03 -0.59 4.6 -1.67 4.12 -2.93S3.22 -5.24 3.19 -5.27C3.17 -5.3 3.11 -5.32 3.05 -5.32C3 -5.32 2.94 -5.3 2.91 -5.27ZM3.3 -3.14L3.75 -1.95H2.82H1.89L1.95 -2.1C1.98 -2.17 2.19 -2.71 2.41 -3.28C2.63 -3.86 2.82 -4.33 2.83 -4.33C2.83 -4.33 3.05 -3.79 3.3 -3.14Z"/>
+ <path id="g55" d="M2.94 -6.4C2.94 -6.64 2.94 -6.66 2.71 -6.66C2.09 -6.02 1.21 -6.02 0.89 -6.02V-5.71C1.09 -5.71 1.68 -5.71 2.2 -5.97V-0.79C2.2 -0.43 2.17 -0.31 1.27 -0.31H0.95V-0C1.3 -0.03 2.17 -0.03 2.57 -0.03S3.84 -0.03 4.19 -0V-0.31H3.87C2.97 -0.31 2.94 -0.42 2.94 -0.79V-6.4Z"/>
+ <path id="g56" d="M3.01 -4.37C2.65 -4.28 2.33 -4.07 2 -3.72C1.4 -3.11 1.05 -2.25 1.05 -1.43C1.05 -0.88 1.19 -0.49 1.5 -0.19C1.75 0.03 1.9 0.1 2.24 0.1C2.5 0.1 2.53 0.09 2.74 -0C2.9 -0.08 3.05 -0.19 3.22 -0.35C3.42 -0.54 3.46 -0.56 3.48 -0.52C3.59 -0.15 3.85 0.07 4.19 0.11C4.7 0.16 5.01 -0.22 5.26 -1.2C5.34 -1.48 5.32 -1.53 5.17 -1.53C5.06 -1.53 5.02 -1.47 4.92 -1.07C4.81 -0.66 4.63 -0.28 4.48 -0.18C4.2 -0 4 -0.21 4.04 -0.64C4.06 -0.74 4.24 -1.53 4.45 -2.38C4.67 -3.24 4.84 -3.96 4.84 -3.99C4.84 -4.01 4.8 -4.07 4.76 -4.12C4.59 -4.29 4.3 -4.2 4.21 -3.95L4.16 -3.82L4.09 -3.96C3.89 -4.34 3.48 -4.5 3.01 -4.37ZM3.57 -4.12C3.76 -4.03 3.88 -3.86 3.97 -3.5L4.03 -3.27L3.76 -2.19C3.61 -1.59 3.47 -1.07 3.44 -1.02C3.37 -0.88 3.07 -0.53 2.92 -0.41C2.18 0.19 1.62 -0.2 1.74 -1.26C1.79 -1.65 2.08 -2.77 2.2 -3.07C2.57 -3.91 3.11 -4.33 3.57 -4.12Z"/>
+ <path id="g57" d="M3.241 -1.582H5.383C5.474 -1.582 5.642 -1.582 5.642 -1.75C5.642 -1.925 5.481 -1.925 5.383 -1.925H3.241V-4.074C3.241 -4.165 3.241 -4.333 3.073 -4.333C2.898 -4.333 2.898 -4.172 2.898 -4.074V-1.925H0.749C0.658 -1.925 0.49 -1.925 0.49 -1.757C0.49 -1.582 0.651 -1.582 0.749 -1.582H2.898V0.567C2.898 0.658 2.898 0.826 3.066 0.826C3.241 0.826 3.241 0.665 3.241 0.567V-1.582Z"/>
+ <path id="g58" d="M3.25 -4.39C2.74 -4.28 2.27 -4.02 1.88 -3.6C1.37 -3.07 1.14 -2.52 1.12 -1.74C1.1 -1.39 1.11 -1.29 1.17 -1.08C1.37 -0.26 1.9 0.15 2.66 0.11C3 0.08 3.26 0.02 3.57 -0.12C3.9 -0.27 4.13 -0.43 4.38 -0.69C4.66 -0.98 4.68 -1.02 4.6 -1.12C4.57 -1.16 4.52 -1.2 4.5 -1.2S4.39 -1.11 4.3 -1.01C3.93 -0.57 3.45 -0.27 2.92 -0.16C2.51 -0.07 2.28 -0.12 2.08 -0.31C1.78 -0.61 1.72 -1.24 1.91 -2.08L1.96 -2.28H2.14C2.46 -2.28 3.13 -2.34 3.36 -2.39C4 -2.52 4.4 -2.83 4.55 -3.28C4.61 -3.5 4.62 -3.61 4.56 -3.81C4.45 -4.17 4.1 -4.4 3.64 -4.41C3.5 -4.41 3.32 -4.41 3.25 -4.39ZM3.81 -4.15C4.09 -4.08 4.27 -3.78 4.23 -3.48C4.14 -2.91 3.67 -2.63 2.62 -2.55C2.38 -2.53 2.14 -2.52 2.1 -2.53L2.01 -2.54L2.11 -2.83C2.25 -3.23 2.41 -3.5 2.64 -3.73C3.02 -4.1 3.42 -4.24 3.81 -4.15Z"/>
+ <path id="g59" d="M3.31 2.4C3.31 2.37 3.31 2.35 3.14 2.18C1.89 0.92 1.57 -0.97 1.57 -2.5C1.57 -4.24 1.95 -5.98 3.18 -7.23C3.31 -7.35 3.31 -7.37 3.31 -7.4C3.31 -7.47 3.27 -7.5 3.21 -7.5C3.11 -7.5 2.21 -6.82 1.62 -5.55C1.11 -4.45 0.99 -3.34 0.99 -2.5C0.99 -1.72 1.1 -0.51 1.65 0.62C2.25 1.85 3.11 2.5 3.21 2.5C3.27 2.5 3.31 2.47 3.31 2.4Z"/>
+ <path id="g60" d="M3.34 -3.02C3.4 -3.28 3.63 -4.2 4.33 -4.2C4.38 -4.2 4.62 -4.2 4.83 -4.07C4.55 -4.02 4.35 -3.77 4.35 -3.53C4.35 -3.37 4.46 -3.18 4.73 -3.18C4.95 -3.18 5.27 -3.36 5.27 -3.76C5.27 -4.28 4.68 -4.42 4.34 -4.42C3.76 -4.42 3.41 -3.89 3.29 -3.66C3.04 -4.32 2.5 -4.42 2.21 -4.42C1.17 -4.42 0.6 -3.13 0.6 -2.88C0.6 -2.78 0.7 -2.78 0.72 -2.78C0.8 -2.78 0.83 -2.8 0.85 -2.89C1.19 -3.95 1.85 -4.2 2.19 -4.2C2.38 -4.2 2.73 -4.11 2.73 -3.53C2.73 -3.22 2.56 -2.55 2.19 -1.15C2.03 -0.53 1.68 -0.11 1.24 -0.11C1.18 -0.11 0.95 -0.11 0.74 -0.24C0.99 -0.29 1.21 -0.5 1.21 -0.78C1.21 -1.05 0.99 -1.13 0.84 -1.13C0.54 -1.13 0.29 -0.87 0.29 -0.55C0.29 -0.09 0.79 0.11 1.23 0.11C1.89 0.11 2.25 -0.59 2.28 -0.65C2.4 -0.28 2.76 0.11 3.36 0.11C4.39 0.11 4.96 -1.18 4.96 -1.43C4.96 -1.53 4.87 -1.53 4.84 -1.53C4.75 -1.53 4.73 -1.49 4.71 -1.42C4.38 -0.35 3.7 -0.11 3.38 -0.11C2.99 -0.11 2.83 -0.43 2.83 -0.77C2.83 -0.99 2.89 -1.21 3 -1.65L3.34 -3.02Z"/>
+ <path id="g61" d="M3.535 -1.274H3.297C3.276 -1.12 3.206 -0.707 3.115 -0.637C3.059 -0.595 2.52 -0.595 2.422 -0.595H1.134C1.869 -1.246 2.114 -1.442 2.534 -1.771C3.052 -2.184 3.535 -2.618 3.535 -3.283C3.535 -4.13 2.793 -4.648 1.897 -4.648C1.029 -4.648 0.441 -4.039 0.441 -3.395C0.441 -3.038 0.742 -3.003 0.812 -3.003C0.98 -3.003 1.183 -3.122 1.183 -3.374C1.183 -3.5 1.134 -3.745 0.77 -3.745C0.987 -4.242 1.463 -4.396 1.792 -4.396C2.492 -4.396 2.856 -3.85 2.856 -3.283C2.856 -2.674 2.422 -2.191 2.198 -1.939L0.511 -0.273C0.441 -0.21 0.441 -0.196 0.441 -0H3.325L3.535 -1.274Z"/>
+ <path id="g62" d="M3.56 -7.01C3.3 -6.97 2.88 -6.84 2.62 -6.72C2.11 -6.49 1.55 -6.02 1.22 -5.56C0.43 -4.45 0.32 -2.95 0.94 -1.73C1.13 -1.37 1.32 -1.11 1.62 -0.81C2.6 0.16 4.08 0.48 5.15 -0.04C5.8 -0.37 6.27 -0.91 6.5 -1.57C6.6 -1.85 6.66 -2.19 6.64 -2.38L6.63 -2.51H6.51H6.39V-2.37C6.32 -1.3 5.7 -0.46 4.75 -0.17C4.43 -0.07 3.88 -0.07 3.53 -0.17C2.5 -0.46 1.86 -1.24 1.63 -2.47C1.56 -2.87 1.56 -3.96 1.63 -4.36C1.85 -5.53 2.44 -6.29 3.36 -6.6C4.5 -6.99 5.51 -6.52 6.05 -5.37C6.18 -5.08 6.25 -4.87 6.32 -4.48L6.37 -4.2H6.5H6.63V-5.61V-7.03L6.56 -7.04C6.49 -7.04 6.45 -7 6.18 -6.61L5.89 -6.17L5.7 -6.35C5.45 -6.58 5.29 -6.69 4.98 -6.83C4.57 -7.02 4.09 -7.08 3.56 -7.01Z"/>
+ <path id="g63" d="M3.59 -3.86C3.18 -3.83 3.12 -3.53 3.12 -3.4C3.12 -3.14 3.3 -2.94 3.58 -2.94C3.84 -2.94 4.04 -3.11 4.04 -3.41C4.04 -4.09 3.28 -4.48 2.51 -4.48C1.26 -4.48 0.34 -3.4 0.34 -2.16C0.34 -0.88 1.33 0.11 2.49 0.11C3.83 0.11 4.15 -1.09 4.15 -1.19S4.05 -1.29 4.02 -1.29C3.93 -1.29 3.91 -1.25 3.89 -1.19C3.6 -0.26 2.95 -0.14 2.58 -0.14C2.05 -0.14 1.17 -0.57 1.17 -2.18C1.17 -3.81 1.99 -4.23 2.52 -4.23C2.61 -4.23 3.24 -4.22 3.59 -3.86Z"/>
+ <path id="g64" d="M3.612 -2.233C3.612 -3.003 3.521 -3.556 3.199 -4.046C2.982 -4.368 2.548 -4.648 1.988 -4.648C0.364 -4.648 0.364 -2.737 0.364 -2.233S0.364 0.14 1.988 0.14S3.612 -1.729 3.612 -2.233ZM1.988 -0.056C1.666 -0.056 1.239 -0.245 1.099 -0.819C1.001 -1.232 1.001 -1.806 1.001 -2.324C1.001 -2.835 1.001 -3.367 1.106 -3.752C1.253 -4.305 1.701 -4.452 1.988 -4.452C2.366 -4.452 2.73 -4.221 2.856 -3.815C2.968 -3.437 2.975 -2.933 2.975 -2.324C2.975 -1.806 2.975 -1.288 2.884 -0.847C2.744 -0.21 2.268 -0.056 1.988 -0.056Z"/>
+ <path id="g65" d="M3.7 -6.89C3.38 -6.86 3.09 -6.83 3.06 -6.83C3.02 -6.83 3.01 -6.8 3.01 -6.68V-6.54L3.26 -6.52C3.56 -6.5 3.67 -6.46 3.74 -6.32C3.78 -6.22 3.79 -6.1 3.79 -5.01V-3.81L3.66 -3.94C3.38 -4.22 3.02 -4.39 2.63 -4.41C1.79 -4.47 0.93 -3.94 0.56 -3.15C0.42 -2.85 0.36 -2.63 0.34 -2.29C0.27 -1.36 0.77 -0.47 1.57 -0.08C2.3 0.26 3.04 0.16 3.6 -0.37L3.76 -0.52V-0.2C3.76 -0.02 3.76 0.12 3.77 0.12C3.77 0.12 4.09 0.09 4.48 0.06C4.87 0.02 5.2 -0 5.21 -0S5.23 -0.06 5.23 -0.14V-0.29L4.98 -0.3C4.68 -0.32 4.57 -0.37 4.5 -0.51C4.46 -0.61 4.45 -0.82 4.45 -3.78V-6.95H4.37C4.32 -6.94 4.02 -6.92 3.7 -6.89ZM2.9 -4.13C3.22 -4.05 3.48 -3.85 3.67 -3.56L3.76 -3.42V-2.19V-0.97L3.64 -0.79C3.16 -0.04 2.23 0.09 1.66 -0.48C1.46 -0.67 1.34 -0.92 1.25 -1.25C1.19 -1.48 1.19 -1.59 1.19 -2.15C1.19 -2.84 1.23 -3.06 1.4 -3.41C1.68 -3.99 2.31 -4.29 2.9 -4.13Z"/>
+ <path id="g66" d="M3.83 -7C2.87 -6.84 2 -6.32 1.43 -5.55C1.21 -5.26 0.96 -4.74 0.86 -4.39C0.61 -3.52 0.69 -2.68 1.09 -1.85C1.7 -0.6 3 0.21 4.39 0.21C5.73 0.21 6.89 -0.75 7.1 -2.05C7.12 -2.17 7.13 -2.32 7.13 -2.39C7.12 -2.51 7.11 -2.51 7 -2.51H6.88L6.85 -2.27C6.8 -1.66 6.58 -1.19 6.17 -0.78C5.92 -0.52 5.67 -0.37 5.36 -0.25C4.69 -0 3.98 -0.04 3.29 -0.39C2.48 -0.79 2 -1.48 1.81 -2.54C1.74 -2.92 1.74 -3.91 1.81 -4.29C2.02 -5.42 2.58 -6.18 3.49 -6.54C3.85 -6.68 4.07 -6.72 4.5 -6.72C4.84 -6.72 4.92 -6.71 5.13 -6.64C5.46 -6.53 5.72 -6.37 5.97 -6.12C6.42 -5.69 6.69 -5.13 6.81 -4.41L6.85 -4.2H6.98H7.12V-5.61V-7.03L7.04 -7.04C6.97 -7.04 6.93 -6.99 6.65 -6.59L6.34 -6.13L6.16 -6.31C5.84 -6.61 5.46 -6.83 5.05 -6.95C4.77 -7.03 4.18 -7.06 3.83 -7Z"/>
+ <path id="g67" d="M3.98 -4.47C3.78 -4.42 3.57 -4.32 3.4 -4.18C3.27 -4.08 3.25 -4.07 3.2 -4.11C3.09 -4.19 2.72 -4.35 2.56 -4.39C1.73 -4.56 0.84 -4.06 0.64 -3.29C0.53 -2.86 0.65 -2.39 0.95 -2.07L1.06 -1.96L0.95 -1.78C0.71 -1.4 0.68 -0.95 0.86 -0.59C0.92 -0.48 1 -0.35 1.06 -0.31L1.16 -0.22L0.95 -0.12C0.7 -0 0.46 0.21 0.35 0.43C0.24 0.66 0.25 0.98 0.37 1.2C0.56 1.54 1.03 1.85 1.61 2C1.88 2.08 1.95 2.08 2.48 2.08C3 2.08 3.08 2.08 3.35 2C3.93 1.85 4.4 1.54 4.58 1.2C4.86 0.68 4.57 -0.1 3.98 -0.4C3.58 -0.6 3.18 -0.66 2.22 -0.66C1.63 -0.66 1.53 -0.67 1.42 -0.72C1.2 -0.82 1.07 -1.04 1.07 -1.34C1.07 -1.52 1.17 -1.82 1.23 -1.79C1.41 -1.69 1.73 -1.56 1.86 -1.53C2.39 -1.42 2.97 -1.58 3.35 -1.96C3.76 -2.34 3.9 -2.8 3.77 -3.29C3.72 -3.49 3.59 -3.75 3.49 -3.83C3.46 -3.86 3.43 -3.9 3.43 -3.91C3.43 -3.96 3.7 -4.13 3.86 -4.18C3.95 -4.21 4.09 -4.25 4.18 -4.26L4.34 -4.28L4.28 -4.2C4.2 -4.1 4.19 -4 4.26 -3.88C4.31 -3.77 4.39 -3.73 4.51 -3.73C4.56 -3.73 4.63 -3.74 4.66 -3.76C4.74 -3.8 4.81 -3.94 4.81 -4.04C4.81 -4.16 4.71 -4.35 4.6 -4.43C4.48 -4.51 4.21 -4.53 3.98 -4.47ZM2.56 -4.1C2.7 -4.03 2.87 -3.88 2.94 -3.75C3.11 -3.42 3.11 -2.5 2.94 -2.17C2.69 -1.71 2 -1.61 1.62 -1.99C1.41 -2.2 1.33 -2.54 1.36 -3.09C1.38 -3.61 1.48 -3.86 1.73 -4.03C1.96 -4.19 2.3 -4.21 2.56 -4.1ZM3.11 -0.02C3.62 0.04 3.91 0.19 4.06 0.45C4.17 0.65 4.17 0.95 4.04 1.17C3.89 1.44 3.55 1.66 3.09 1.79C2.82 1.87 2.14 1.87 1.86 1.79C1.4 1.66 1.06 1.44 0.91 1.17C0.84 1.03 0.82 0.97 0.82 0.79C0.82 0.41 1.03 0.11 1.39 -0C1.52 -0.04 1.65 -0.05 2.21 -0.05C2.58 -0.05 2.99 -0.04 3.11 -0.02Z"/>
+ <path id="g68" d="M4.039 -1.918C3.696 -2.338 3.08 -3.087 2.044 -3.087C1.162 -3.087 0.546 -2.345 0.546 -1.505C0.546 -0.686 1.148 0.07 2.016 0.07C3.017 0.07 3.64 -0.728 3.927 -1.099C4.27 -0.679 4.886 0.07 5.922 0.07C6.804 0.07 7.42 -0.672 7.42 -1.512C7.42 -2.331 6.818 -3.087 5.95 -3.087C4.949 -3.087 4.326 -2.289 4.039 -1.918ZM4.27 -1.659C4.697 -2.338 5.32 -2.821 6.006 -2.821C6.727 -2.821 7.224 -2.191 7.224 -1.512C7.224 -0.812 6.65 -0.315 6.041 -0.315C5.383 -0.315 4.921 -0.875 4.27 -1.659ZM3.696 -1.358C3.269 -0.679 2.646 -0.196 1.96 -0.196C1.239 -0.196 0.742 -0.826 0.742 -1.505C0.742 -2.205 1.316 -2.702 1.925 -2.702C2.583 -2.702 3.045 -2.142 3.696 -1.358Z"/>
+ <path id="g69" d="M4.09 -2.3H6.88C7.02 -2.3 7.21 -2.3 7.21 -2.5S7.02 -2.7 6.88 -2.7H4.09V-5.5C4.09 -5.64 4.09 -5.83 3.89 -5.83S3.69 -5.64 3.69 -5.5V-2.7H0.89C0.75 -2.7 0.56 -2.7 0.56 -2.5S0.75 -2.3 0.89 -2.3H3.69V0.5C3.69 0.64 3.69 0.83 3.89 0.83S4.09 0.64 4.09 0.5V-2.3Z"/>
+ <path id="g70" d="M4.36 -6.9C4.01 -6.88 3.67 -6.86 3.62 -6.86H3.52V-6.62V-6.39L3.78 -6.37C4.09 -6.35 4.15 -6.33 4.18 -6.24C4.2 -6.2 4.21 -5.69 4.21 -5.11V-4.06L4.11 -4.13C3.97 -4.24 3.74 -4.35 3.49 -4.43C3.29 -4.49 3.2 -4.5 2.83 -4.49C2.35 -4.49 2.13 -4.45 1.78 -4.31C1.46 -4.18 1.23 -4.03 1 -3.81C0.35 -3.14 0.2 -2.03 0.64 -1.12C0.9 -0.59 1.34 -0.23 2 -0.04C2.23 0.02 2.32 0.03 2.71 0.04C3.09 0.04 3.17 0.03 3.37 -0.02C3.62 -0.1 3.83 -0.2 4.02 -0.33L4.15 -0.42V-0.17V0.06L4.62 0.04C4.89 0.03 5.3 0.02 5.54 0.01L5.99 -0V-0.24V-0.47L5.72 -0.48C5.41 -0.5 5.36 -0.52 5.32 -0.62C5.31 -0.66 5.29 -1.98 5.29 -3.82V-6.95H5.15C5.07 -6.94 4.72 -6.92 4.36 -6.9ZM3.32 -4.11C3.58 -4.04 3.78 -3.92 3.98 -3.73L4.15 -3.55V-2.29V-1.03L4.03 -0.88C3.41 -0.1 2.26 -0.11 1.86 -0.89C1.72 -1.17 1.7 -1.37 1.7 -2.21C1.7 -2.86 1.71 -3.02 1.75 -3.18C1.89 -3.69 2.17 -3.98 2.62 -4.1C2.83 -4.16 3.1 -4.16 3.32 -4.11Z"/>
+ <path id="g71" d="M4.49 -1.74H4.24C4.19 -1.44 4.12 -1 4.02 -0.85C3.95 -0.77 3.29 -0.77 3.07 -0.77H1.27L2.33 -1.8C3.89 -3.18 4.49 -3.72 4.49 -4.72C4.49 -5.86 3.59 -6.66 2.37 -6.66C1.24 -6.66 0.5 -5.74 0.5 -4.85C0.5 -4.29 1 -4.29 1.03 -4.29C1.2 -4.29 1.55 -4.41 1.55 -4.82C1.55 -5.08 1.37 -5.34 1.02 -5.34C0.94 -5.34 0.92 -5.34 0.89 -5.33C1.12 -5.98 1.66 -6.35 2.24 -6.35C3.15 -6.35 3.58 -5.54 3.58 -4.72C3.58 -3.92 3.08 -3.13 2.53 -2.51L0.61 -0.37C0.5 -0.26 0.5 -0.24 0.5 -0H4.21L4.49 -1.74Z"/>
+ <path id="g72" d="M4.71 -2.14C4.71 -3.42 3.71 -4.48 2.5 -4.48C1.25 -4.48 0.28 -3.39 0.28 -2.14C0.28 -0.85 1.32 0.11 2.49 0.11C3.7 0.11 4.71 -0.87 4.71 -2.14ZM2.5 -0.14C2.07 -0.14 1.63 -0.35 1.36 -0.81C1.11 -1.25 1.11 -1.86 1.11 -2.22C1.11 -2.61 1.11 -3.15 1.35 -3.59C1.62 -4.05 2.09 -4.26 2.49 -4.26C2.93 -4.26 3.36 -4.04 3.62 -3.61S3.88 -2.6 3.88 -2.22C3.88 -1.86 3.88 -1.32 3.66 -0.88C3.44 -0.43 3 -0.14 2.5 -0.14Z"/>
+ <path id="g73" d="M4.72 -6.89C4.4 -6.85 4.12 -6.81 4.1 -6.79C4.07 -6.77 4.06 -6.72 4.07 -6.65L4.08 -6.54L4.36 -6.53C4.69 -6.5 4.78 -6.47 4.78 -6.37C4.78 -6.33 4.65 -5.75 4.48 -5.06L4.17 -3.82L4.09 -3.97C3.71 -4.62 2.86 -4.55 2.08 -3.81C1.44 -3.2 1.05 -2.29 1.05 -1.43C1.05 -0.88 1.19 -0.49 1.5 -0.19C1.75 0.03 1.9 0.1 2.24 0.1C2.5 0.1 2.53 0.09 2.74 -0C2.9 -0.08 3.05 -0.19 3.22 -0.35C3.42 -0.54 3.46 -0.56 3.48 -0.52C3.59 -0.15 3.85 0.07 4.19 0.11C4.7 0.16 5.01 -0.22 5.26 -1.2C5.34 -1.48 5.32 -1.53 5.17 -1.53C5.06 -1.53 5.02 -1.47 4.92 -1.07C4.81 -0.66 4.63 -0.28 4.48 -0.18C4.2 -0 4 -0.21 4.04 -0.64C4.06 -0.74 4.4 -2.18 4.82 -3.83C5.34 -5.91 5.56 -6.86 5.54 -6.89C5.5 -6.95 5.39 -6.95 4.72 -6.89ZM3.57 -4.12C3.76 -4.03 3.88 -3.86 3.97 -3.5L4.03 -3.27L3.76 -2.19C3.61 -1.59 3.47 -1.07 3.44 -1.02C3.37 -0.88 3.07 -0.53 2.92 -0.41C2.18 0.19 1.62 -0.2 1.74 -1.26C1.79 -1.65 2.08 -2.77 2.2 -3.07C2.57 -3.91 3.11 -4.33 3.57 -4.12Z"/>
+ <path id="g74" d="M4.8 -6.89C4.46 -6.86 4.17 -6.83 4.16 -6.82C4.16 -6.82 4.14 -6.75 4.13 -6.67L4.11 -6.54L4.35 -6.52C4.49 -6.51 4.63 -6.49 4.68 -6.46C4.84 -6.39 4.84 -6.35 4.64 -5.1C4.53 -4.47 4.44 -3.93 4.43 -3.89C4.42 -3.83 4.4 -3.84 4.26 -3.99C3.85 -4.42 3.25 -4.54 2.55 -4.3C2.1 -4.15 1.86 -4 1.49 -3.62C1.05 -3.18 0.81 -2.77 0.7 -2.25C0.56 -1.52 0.74 -0.85 1.2 -0.39C1.86 0.27 2.86 0.28 3.65 -0.35L3.84 -0.5L3.79 -0.19C3.76 -0.03 3.74 0.1 3.74 0.11C3.75 0.12 5.21 -0 5.22 -0C5.23 -0.01 5.24 -0.07 5.25 -0.15L5.27 -0.3H5.1C4.87 -0.3 4.67 -0.35 4.62 -0.43C4.59 -0.46 4.57 -0.53 4.57 -0.59C4.57 -0.64 4.8 -2.07 5.08 -3.76C5.37 -5.45 5.6 -6.86 5.6 -6.89C5.6 -6.96 5.65 -6.96 4.8 -6.89ZM3.65 -4.12C3.89 -4.04 4.1 -3.86 4.23 -3.62L4.33 -3.44L4.12 -2.22L3.92 -1L3.81 -0.84C3.37 -0.24 2.6 0.02 2.06 -0.21C1.53 -0.46 1.35 -1.07 1.53 -2.1C1.63 -2.72 1.75 -3.07 1.97 -3.4C2.37 -4.01 3.06 -4.3 3.65 -4.12Z"/>
+ <path id="g75" d="M5.376 -2.352C5.481 -2.352 5.642 -2.352 5.642 -2.527C5.642 -2.695 5.474 -2.695 5.383 -2.695H0.749C0.658 -2.695 0.49 -2.695 0.49 -2.527C0.49 -2.352 0.651 -2.352 0.756 -2.352H5.376ZM5.383 -0.812C5.474 -0.812 5.642 -0.812 5.642 -0.98C5.642 -1.155 5.481 -1.155 5.376 -1.155H0.756C0.651 -1.155 0.49 -1.155 0.49 -0.98C0.49 -0.812 0.658 -0.812 0.749 -0.812H5.383Z"/>
+ <path id="g76" d="M6.61 -2.3C6.75 -2.3 6.94 -2.3 6.94 -2.5S6.75 -2.7 6.61 -2.7H1.16C1.02 -2.7 0.83 -2.7 0.83 -2.5S1.02 -2.3 1.16 -2.3H6.61Z"/>
+ <path id="g77" d="M6.87 -3.27C7.02 -3.27 7.21 -3.27 7.21 -3.47S7.02 -3.67 6.88 -3.67H0.89C0.75 -3.67 0.56 -3.67 0.56 -3.47S0.75 -3.27 0.9 -3.27H6.87ZM6.88 -1.33C7.02 -1.33 7.21 -1.33 7.21 -1.53S7.02 -1.73 6.87 -1.73H0.9C0.75 -1.73 0.56 -1.73 0.56 -1.53S0.75 -1.33 0.89 -1.33H6.88Z"/>
+ </defs>
+ <g id="page1">
+ <use x="77" xlink:href="#g62" y="63"/>
+ <use x="84.2205" xlink:href="#g32" y="63"/>
+ <use x="89.2192" xlink:href="#g12" y="63"/>
+ <use x="91.9963" xlink:href="#g32" y="63"/>
+ <use x="96.9951" xlink:href="#g7" y="63"/>
+ <use x="104.243" xlink:href="#g18" y="63"/>
+ <use x="108.131" xlink:href="#g31" y="63"/>
+ <use x="112.575" xlink:href="#g19" y="63"/>
+ <use x="116.518" xlink:href="#g18" y="63"/>
+ <use x="120.406" xlink:href="#g15" y="63"/>
+ <g fill="#ff0000">
+ <use x="127.627" xlink:href="#g7" y="63"/>
+ <use x="131.542" xlink:href="#g31" y="63"/>
+ <use x="135.986" xlink:href="#g65" y="63"/>
+ </g>
+ <use x="141.54" xlink:href="#g14" y="63"/>
+ <g fill="#0000ff">
+ <use x="147.649" xlink:href="#g8" y="63"/>
+ <use x="153.204" xlink:href="#g12" y="63"/>
+ <use x="155.981" xlink:href="#g10" y="63"/>
+ <use x="161.535" xlink:href="#g31" y="63"/>
+ </g>
+ <use x="165.978" xlink:href="#g14" y="63"/>
+ <g fill="#ff00ff">
+ <use x="172.088" xlink:href="#g11" y="63"/>
+ <use x="180.419" xlink:href="#g25" y="63"/>
+ <use x="185.418" xlink:href="#g67" y="63"/>
+ <use x="190.417" xlink:href="#g31" y="63"/>
+ <use x="194.86" xlink:href="#g9" y="63"/>
+ <use x="200.137" xlink:href="#g18" y="63"/>
+ <use x="204.025" xlink:href="#g25" y="63"/>
+ </g>
+ <use x="164.374" xlink:href="#g13" y="78.8467"/>
+ <use x="174.374" xlink:href="#g26" y="81.3189"/>
+ <use x="169.929" xlink:href="#g64" y="101.569"/>
+ <use x="181.075" xlink:href="#g63" y="92.4579"/>
+ <use x="185.519" xlink:href="#g72" y="92.4579"/>
+ <use x="190.519" xlink:href="#g34" y="92.4579"/>
+ <use x="196.131" xlink:href="#g33" y="92.4579"/>
+ <use x="201.408" xlink:href="#g65" y="92.4579"/>
+ <use x="206.962" xlink:href="#g33" y="92.4579"/>
+ <use x="213.351" xlink:href="#g77" y="92.4579"/>
+ <use x="227.193" xlink:href="#g68" y="79.9579"/>
+ <use x="223.957" xlink:href="#g30" y="82.9578"/>
+ <use x="223.907" xlink:href="#g37" y="104.486"/>
+ <use x="228.327" xlink:href="#g75" y="104.486"/>
+ <use x="234.466" xlink:href="#g64" y="104.486"/>
+ <use x="238.452" xlink:href="#g59" y="92.4579"/>
+ <use x="242.341" xlink:href="#g76" y="92.4579"/>
+ <use x="250.119" xlink:href="#g55" y="92.4579"/>
+ <use x="255.119" xlink:href="#g53" y="92.4579"/>
+ <use x="259.008" xlink:href="#g37" y="88.329"/>
+ <use x="271.904" xlink:href="#g60" y="85.6928"/>
+ <use x="277.619" xlink:href="#g61" y="82.0639"/>
+ <use x="281.605" xlink:href="#g37" y="82.0639"/>
+ <use x="286.025" xlink:href="#g57" y="82.0639"/>
+ <use x="292.164" xlink:href="#g42" y="82.0639"/>
+ <rect height="0.399979" width="38.2986" x="265.128" y="89.7579"/>
+ <use x="265.128" xlink:href="#g59" y="99.3174"/>
+ <use x="269.017" xlink:href="#g71" y="99.3174"/>
+ <use x="274.017" xlink:href="#g52" y="99.3174"/>
+ <use x="281.76" xlink:href="#g69" y="99.3174"/>
+ <use x="291.76" xlink:href="#g55" y="99.3174"/>
+ <use x="296.76" xlink:href="#g53" y="99.3174"/>
+ <use x="300.649" xlink:href="#g27" y="99.3174"/>
+ <use x="77" xlink:href="#g2" y="123.706"/>
+ <use x="82.6931" xlink:href="#g32" y="123.706"/>
+ <use x="87.6918" xlink:href="#g9" y="123.706"/>
+ <use x="92.9683" xlink:href="#g18" y="123.706"/>
+ <use x="100.189" xlink:href="#g19" y="123.706"/>
+ <use x="104.132" xlink:href="#g18" y="123.706"/>
+ <use x="107.742" xlink:href="#g1" y="123.706"/>
+ <use x="113.019" xlink:href="#g12" y="123.706"/>
+ <use x="115.796" xlink:href="#g31" y="123.706"/>
+ <use x="120.239" xlink:href="#g19" y="123.706"/>
+ <use x="124.183" xlink:href="#g15" y="123.706"/>
+ <use x="131.403" xlink:href="#g16" y="123.706"/>
+ <use x="138.11" xlink:href="#g43" y="123.706"/>
+ <use x="143.859" xlink:href="#g17" y="123.706"/>
+ <use x="147.052" xlink:href="#g70" y="123.706"/>
+ <use x="153.44" xlink:href="#g14" y="123.706"/>
+ <use x="159.549" xlink:href="#g58" y="123.706"/>
+ <use x="164.148" xlink:href="#g21" y="123.706"/>
+ <use x="172.324" xlink:href="#g22" y="123.706"/>
+ <use x="177.434" xlink:href="#g36" y="123.706"/>
+ <use x="182.544" xlink:href="#g56" y="123.706"/>
+ <use x="187.654" xlink:href="#g49" y="123.706"/>
+ <use x="191.741" xlink:href="#g50" y="123.706"/>
+ <use x="194.807" xlink:href="#g41" y="123.706"/>
+ <use x="198.895" xlink:href="#g58" y="123.706"/>
+ <use x="202.983" xlink:href="#g73" y="123.706"/>
+ <use x="208.093" xlink:href="#g14" y="123.706"/>
+ <use x="214.203" xlink:href="#g20" y="123.706"/>
+ <use x="218.035" xlink:href="#g28" y="123.706"/>
+ <use x="222.839" xlink:href="#g46" y="123.706"/>
+ <use x="228.005" xlink:href="#g20" y="123.706"/>
+ <use x="235.17" xlink:href="#g20" y="123.706"/>
+ <use x="239.002" xlink:href="#g29" y="123.706"/>
+ <use x="243.445" xlink:href="#g51" y="123.706"/>
+ <use x="246.861" xlink:href="#g6" y="123.706"/>
+ <use x="249.25" xlink:href="#g38" y="123.706"/>
+ <use x="252.304" xlink:href="#g14" y="123.706"/>
+ <use x="258.414" xlink:href="#g40" y="123.706"/>
+ <use x="264.524" xlink:href="#g5" y="123.706"/>
+ <use x="271.988" xlink:href="#g54" y="123.706"/>
+ <use x="278.12" xlink:href="#g3" y="123.706"/>
+ <use x="283.252" xlink:href="#g3" y="123.706"/>
+ <use x="292.161" xlink:href="#g66" y="123.706"/>
+ <use x="300.021" xlink:href="#g54" y="123.706"/>
+ <use x="306.152" xlink:href="#g4" y="123.706"/>
+ <use x="311.729" xlink:href="#g24" y="123.706"/>
+ <use x="316.305" xlink:href="#g14" y="123.706"/>
+ <use x="322.415" xlink:href="#g39" y="123.706"/>
+ <use x="326.359" xlink:href="#g35" y="123.706"/>
+ <use x="329.136" xlink:href="#g45" y="123.706"/>
+ <use x="334.134" xlink:href="#g23" y="123.706"/>
+ <use x="339.411" xlink:href="#g44" y="123.706"/>
+ <use x="343.299" xlink:href="#g48" y="123.706"/>
+ <use x="347.742" xlink:href="#g74" y="123.706"/>
+ <use x="232.001" xlink:href="#g47" y="633"/>
+ </g>
+</svg>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-wf-cmp.svg b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-wf-cmp.svg
new file mode 100644
index 00000000000..84c3de4ba3c
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.1/tests/sample-wf-cmp.svg
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- This file was generated by dvisvgm 0.9.1dev (x86_64-unknown-linux-gnu) -->
+<!-- Thu Apr 22 17:27:43 2010 -->
+<svg height='576.887' version='1.1' viewBox='77 56.1128 276.69 576.887' width='276.69' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'>
+<defs>
+<font horiz-adv-x='0' id='ecss1000'>
+<font-face font-family='ecss1000' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M194 461C176 459 142 450 125 443C101 433 75 418 75 414C75 405 81 354 82 353S88 355 95 359C134 386 177 400 224 401C259 401 271 397 291 374C311 352 316 333 318 287L319 247L285 245C184 239 107 213 71 174C49 151 43 133 46 103C50 50 82 4 124 -7C167 -20 255 -4 305 25L322 35V17V0H359H397V157C397 330 396 334 378 373C366 398 331 435 307 446C275 461 236 466 194 461ZM319 152C319 120 317 110 313 100C293 56 205 36 151 64C137 71 121 91 118 103C113 129 125 148 153 162C186 179 246 191 294 192H319Z' horiz-adv-x='480.438' unicode='a'/>
+<glyph d='M196 459C137 445 80 394 54 331C38 293 34 273 34 227C34 176 39 156 60 111C73 84 79 76 103 52C133 22 156 7 191 -2C250 -21 329 -9 388 26L408 38L407 53C407 61 406 76 405 86L403 104L381 91C328 56 259 42 214 56C188 64 172 75 151 97C125 125 110 159 103 205L102 219H257H412V235C412 277 399 339 385 368C355 427 305 460 242 462C226 463 207 461 196 459ZM284 388C306 377 324 359 336 335C344 320 355 286 355 278C355 277 299 277 231 277H107L110 283C127 341 162 382 205 396C226 403 261 399 284 388Z' horiz-adv-x='444.336' unicode='e'/>
+<glyph d='M223 729C181 718 142 684 120 641C102 604 99 584 99 509V445H61H24V415V385H61H99V192V0H137H174V192V385H228H283V415V445H227H171L172 529C173 604 173 613 178 624C198 664 248 680 305 665C318 662 332 658 336 657C343 655 343 655 343 689V722L330 725C294 735 250 737 223 729Z' horiz-adv-x='305.481' unicode='f'/>
+<glyph d='M72 638V593H117H162V638V683H117H72ZM81 222V0H118H156V222V445H118H81Z' horiz-adv-x='238.831' unicode='i'/>
+<glyph d='M257 452C227 445 202 431 176 406L153 383V417V451H117H81V225V0H120H159L160 145C161 266 162 293 166 306C183 361 210 390 250 393C286 397 324 383 338 361C354 337 355 328 355 157V0H394H433V163C433 339 432 357 417 389C397 433 353 458 295 457C284 457 267 455 257 452Z' horiz-adv-x='516.541' unicode='n'/>
+<glyph d='M274 451C231 440 195 417 167 383L152 364L151 408L150 451H115H81V225V0H118H156L157 127L158 254L166 274C183 318 209 350 245 369C264 379 295 388 312 388H322V423V457H309C302 457 286 454 274 451Z' horiz-adv-x='341.583' unicode='r'/>
+<glyph d='M151 460C96 450 58 423 41 380C36 366 34 356 34 332C34 306 35 300 42 285C58 252 95 220 133 208C143 204 169 198 191 194C248 182 268 171 280 146C295 113 280 78 246 62C232 56 226 55 191 55C160 56 146 57 126 62C99 70 63 85 48 96L39 102L36 86C33 70 27 35 27 34C27 31 64 14 87 6C125 -6 150 -10 197 -10C229 -10 243 -9 257 -4C312 11 345 46 355 98C364 145 350 188 315 222C287 248 263 259 201 272C173 277 146 285 139 288C95 310 94 370 137 391C150 398 155 398 197 398C247 398 270 394 309 376C323 370 329 368 331 370C332 372 335 384 337 397C339 409 341 422 342 426C343 431 340 433 323 440C287 455 257 460 210 462C186 462 160 462 151 460Z' horiz-adv-x='383.24' unicode='s'/>
+</font>
+<font horiz-adv-x='0' id='ecsl1000'>
+<font-face font-family='ecsl1000' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M246 443C191 432 151 404 133 366C119 335 127 307 152 298C184 287 219 314 219 349C219 361 218 366 210 374C205 379 197 385 192 387L182 390L194 398C210 409 249 421 277 423C310 426 331 419 350 399C376 373 382 338 372 284L368 263L350 261C340 260 318 257 300 256C250 250 203 237 163 218C134 204 125 197 105 178C75 148 60 119 57 87C56 68 57 64 64 49C82 13 124 -7 185 -11C220 -13 243 -8 273 6C294 17 323 42 337 61L346 73V62C346 33 364 4 387 -3C413 -11 453 1 475 25C492 44 501 64 507 99C509 115 512 131 513 136C515 144 515 144 501 144C486 144 488 148 480 99C477 83 472 63 468 55C456 29 432 19 417 34C403 47 404 55 425 186C449 324 450 340 435 370C418 405 378 434 335 444C309 449 272 449 246 443ZM364 237C364 236 359 208 353 175C341 101 334 84 305 55C273 23 227 6 190 14C167 19 152 30 142 50C135 64 134 69 136 85C141 148 193 201 271 223C302 232 364 241 364 237Z' horiz-adv-x='499.878' unicode='a'/>
+<glyph d='M480 689C446 686 417 683 416 682C416 682 414 675 413 667L411 654L435 652C449 651 463 649 468 646C484 639 484 635 464 510C453 447 444 393 443 389C442 383 440 384 426 399C385 442 325 454 255 430C210 415 186 400 149 362C105 318 81 277 70 225C56 152 74 85 120 39C186 -27 286 -28 365 35L384 50L379 19C376 3 374 -10 374 -11C375 -12 521 0 522 0C523 1 524 7 525 15L527 30H510C487 30 467 35 462 43C459 46 457 53 457 59C457 64 480 207 508 376C537 545 560 686 560 689C560 696 565 696 480 689ZM365 412C389 404 410 386 423 362L433 344L412 222L392 100L381 84C337 24 260 -2 206 21C153 46 135 107 153 210C163 272 175 307 197 340C237 401 306 430 365 412Z' horiz-adv-x='555.42' unicode='d'/>
+<glyph d='M266 444C223 434 184 413 150 380C112 343 85 300 70 250C63 227 62 219 62 182C62 144 62 137 70 115C91 52 143 5 206 -7C294 -26 384 18 429 103C436 117 437 120 433 124C431 127 425 129 421 129C414 129 411 127 405 115C381 67 338 32 289 19C239 6 187 25 163 66C150 88 144 107 142 138C140 160 144 204 149 225L151 231H301H451L455 238C457 243 458 260 459 289C459 326 458 335 452 354C439 395 409 425 367 439C342 448 292 450 266 444ZM347 414C366 403 376 391 384 369C393 344 395 316 393 281L390 255H273C209 255 156 256 156 257C156 263 166 296 173 313C194 366 240 410 283 421C301 426 333 422 347 414Z' horiz-adv-x='444.336' unicode='e'/>
+<glyph d='M212 689C178 686 149 683 148 682C148 682 147 675 146 668L143 654L168 652C196 650 208 645 212 634C216 621 122 53 113 43C107 35 86 30 58 30C40 30 39 30 38 20C33 0 24 1 146 1C245 1 255 1 255 6C255 9 256 15 257 20L259 29L231 30C215 31 201 33 198 34C184 39 184 35 239 367C268 541 292 686 292 689C292 696 297 696 212 689Z' horiz-adv-x='277.71' unicode='l'/>
+<glyph d='M167 436C132 433 104 430 103 429C102 429 101 422 100 415L98 401L122 399C136 398 150 396 155 394C172 386 172 385 143 214C129 127 115 52 113 48C108 36 95 32 64 30C48 29 36 28 36 27C35 26 34 20 33 13L31 1H143H255L257 12C258 17 258 24 258 25C258 27 248 29 231 30C215 31 201 33 198 34C185 39 185 47 205 167C216 230 228 289 231 299C252 358 305 406 361 416C414 425 439 405 439 352C439 325 397 62 390 48C385 36 372 32 341 30C325 29 313 28 313 27C312 26 311 20 310 13L308 1H420H532L534 12C535 17 535 24 535 25C535 27 525 29 508 30C492 31 478 33 475 34C462 39 462 45 486 187C505 299 509 327 508 347C505 407 470 438 403 441C368 443 342 438 312 422C288 409 252 377 237 355C230 345 228 343 230 349C233 364 243 429 243 436S251 443 167 436Z' horiz-adv-x='555.42' unicode='n'/>
+<glyph d='M227 446C144 435 87 378 87 309C87 290 88 284 96 268C115 231 147 213 224 196C291 182 306 174 320 146C329 127 330 112 322 86C307 40 261 12 198 12C130 11 95 52 88 136C87 150 85 162 83 164C80 169 64 169 62 166C58 160 32 -3 34 -7C38 -17 49 -12 72 10L94 32L110 18C135 -5 152 -10 201 -10C237 -10 245 -8 266 -2C326 17 365 60 378 121C386 160 377 193 350 222C326 248 303 259 240 272C186 283 165 291 152 306C137 325 135 345 147 371C162 405 207 427 263 427C301 427 330 415 345 393C355 378 362 348 360 325C359 313 359 304 361 302C365 297 381 296 383 300C386 305 406 431 405 439C404 452 394 450 375 435C358 421 351 418 347 424C344 430 318 441 301 445C286 448 246 449 227 446Z' horiz-adv-x='394.348' unicode='s'/>
+<glyph d='M240 587C218 498 163 432 102 425C89 423 87 422 87 416C87 413 86 407 85 405C83 401 88 400 126 400C149 400 168 399 168 398S157 331 144 252C116 86 115 71 130 41C147 6 178 -9 225 -10C251 -10 256 -9 271 -2C300 12 330 49 343 88C346 98 351 119 353 135C356 151 359 167 360 172C361 180 361 180 348 180C340 180 334 180 334 179S330 159 326 136C311 53 276 9 230 16C214 18 204 26 196 42C184 66 186 85 213 250L238 400H309H379L380 407C381 410 382 417 383 422L385 430H314C275 430 243 431 243 432C243 434 270 595 272 606C274 614 274 614 261 614H247Z' horiz-adv-x='388.794' unicode='t'/>
+</font>
+<font horiz-adv-x='0' id='eccc1000'>
+<font-face font-family='eccc1000' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M383 700C287 684 200 632 143 555C121 526 96 474 86 439C61 352 69 268 109 185C170 60 300 -21 439 -21C573 -21 689 75 710 205C712 217 713 232 713 239C712 251 711 251 700 251H688L685 227C680 166 658 119 617 78C592 52 567 37 536 25C469 0 398 4 329 39C248 79 200 148 181 254C174 292 174 391 181 429C202 542 258 618 349 654C385 668 407 672 450 672C484 672 492 671 513 664C546 653 572 637 597 612C642 569 669 513 681 441L685 420H698H712V561V703L704 704C697 704 693 699 665 659L634 613L616 631C584 661 546 683 505 695C477 703 418 706 383 700Z' horiz-adv-x='785.919' unicode='C'/>
+<glyph d='M233 700C159 683 102 632 80 564C71 534 71 482 80 454C97 407 135 363 181 340C201 330 221 324 294 307C348 294 388 283 399 277C409 273 424 261 434 252C489 197 489 106 433 50C401 19 367 7 314 10C273 12 238 20 204 36C184 46 174 53 154 73C119 108 105 142 100 199L97 224L88 225C83 225 77 224 75 221S72 186 72 99L73 -19L81 -20C88 -21 91 -17 112 14L134 51L146 41C190 3 245 -16 316 -20C348 -21 357 -21 379 -15C419 -5 446 9 476 39C497 60 504 69 516 93C546 156 546 217 516 279C504 303 497 313 477 332C439 370 417 380 311 405C218 426 198 434 175 457C122 508 122 587 176 638C206 666 244 679 290 676C345 673 381 658 415 623C450 589 467 552 478 488L483 459H495H507V581V703L499 704C492 704 489 701 469 669C457 649 447 633 447 633C446 632 439 639 430 647C400 675 361 694 318 701C293 705 255 705 233 700Z' horiz-adv-x='610.962' unicode='S'/>
+<glyph d='M291 527C288 524 249 424 203 305S116 82 112 74C97 48 65 27 40 27C33 27 33 25 33 14V1H111H189V14C189 24 188 27 184 27C175 27 158 37 153 46C143 62 145 78 163 125L179 168L283 167H386L407 114C418 85 427 58 427 54C427 37 411 27 386 27C376 27 376 26 376 14V1H477H578V13V26L553 27C525 29 517 34 506 52C503 59 460 167 412 293S322 524 319 527C317 530 311 532 305 532C300 532 294 530 291 527ZM330 314L375 195H282H189L195 210C198 217 219 271 241 328C263 386 282 433 283 433C283 433 305 379 330 314Z' horiz-adv-x='613.184' unicode='a'/>
+<glyph d='M42 500V487H60C88 487 104 482 110 472C116 459 116 55 110 42C104 32 88 27 60 27H42V13V0H246H451L452 14C453 22 457 59 460 97C464 135 467 173 468 181L470 195H456H443L441 178C434 115 420 81 393 58C379 46 350 33 328 30C317 28 284 27 255 27C202 27 201 27 194 34L186 41V252C186 415 187 463 190 469C196 481 208 485 244 487L277 488V501V513H159H42Z' horiz-adv-x='513.208' unicode='l'/>
+<glyph d='M48 501V487H66C94 487 110 482 116 472C119 465 120 434 120 271C120 56 120 59 100 42C89 33 70 27 55 27C48 27 48 26 48 14V1H135H222V14C222 26 222 27 215 27C200 27 181 33 170 42C150 59 150 56 151 276L152 473L245 241C296 113 339 6 342 4C347 0 357 -1 364 2C366 4 411 112 464 244L559 483V267C560 83 559 49 555 42C550 32 533 27 506 27H487V14V1H591H695V14V27H677C649 27 632 32 627 42C621 55 621 459 627 472C632 482 649 487 677 487H695V501V514H623C551 514 551 514 546 508C544 504 504 405 457 289C411 172 372 76 372 76C371 75 332 172 285 291C237 410 196 509 195 511C192 513 170 514 119 514H48Z' horiz-adv-x='746.485' unicode='m'/>
+<glyph d='M45 501V487H63C91 487 107 482 113 472C119 459 119 55 113 42C107 32 91 27 63 27H45V14V1H153H261V14V27H243C233 27 219 28 211 30C189 36 189 36 189 142V234H270C341 234 354 235 375 240C482 268 533 362 481 438C461 468 420 495 377 507C361 512 341 513 202 514L45 515ZM332 484C356 480 374 471 389 457C409 439 414 423 414 373C414 322 409 307 389 289C362 264 339 258 250 258H186V366V473L194 480C201 487 201 487 258 487C289 487 322 486 332 484Z' horiz-adv-x='557.642' unicode='p'/>
+<glyph d='M171 526C146 521 115 504 94 484C35 424 36 337 98 280C124 255 144 246 220 229C256 220 291 211 298 207C315 198 332 181 342 160C349 145 350 139 350 115C350 92 349 86 342 71C318 23 272 4 207 15C127 30 86 72 78 146C76 166 76 167 67 168C62 168 56 167 54 164S51 136 51 73L52 -13H60C65 -13 71 -8 82 6C90 16 97 27 99 29C101 33 104 31 116 23C146 1 183 -11 229 -14C282 -17 320 -4 355 30C419 93 418 194 353 255C325 281 306 289 230 307C186 317 159 324 151 329C111 353 93 396 107 438C111 452 116 460 130 474C146 490 152 494 169 499C218 514 272 501 307 466C329 444 343 415 351 376L357 347H369H380V438V528H373C367 528 362 523 351 508C343 498 335 487 334 485C332 481 328 483 316 493C278 523 222 536 171 526Z' horiz-adv-x='457.666' unicode='s'/>
+</font>
+<font horiz-adv-x='0' id='ecti1000'>
+<font-face font-family='ecti1000' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M301 437C265 428 233 407 200 372C140 311 105 225 105 143C105 88 119 49 150 19C175 -3 190 -10 224 -10C250 -10 253 -9 274 0C290 8 305 19 322 35C342 54 346 56 348 52C359 15 385 -7 419 -11C470 -16 501 22 526 120C534 148 532 153 517 153C506 153 502 147 492 107C481 66 463 28 448 18C420 0 400 21 404 64C406 74 424 153 445 238C467 324 484 396 484 399C484 401 480 407 476 412C459 429 430 420 421 395L416 382L409 396C389 434 348 450 301 437ZM357 412C376 403 388 386 397 350L403 327L376 219C361 159 347 107 344 102C337 88 307 53 292 41C218 -19 162 20 174 126C179 165 208 277 220 307C257 391 311 433 357 412Z' horiz-adv-x='510.986' unicode='a'/>
+<glyph d='M472 689C440 685 412 681 410 679C407 677 406 672 407 665L408 654L436 653C469 650 478 647 478 637C478 633 465 575 448 506L417 382L409 397C371 462 286 455 208 381C144 320 105 229 105 143C105 88 119 49 150 19C175 -3 190 -10 224 -10C250 -10 253 -9 274 0C290 8 305 19 322 35C342 54 346 56 348 52C359 15 385 -7 419 -11C470 -16 501 22 526 120C534 148 532 153 517 153C506 153 502 147 492 107C481 66 463 28 448 18C420 0 400 21 404 64C406 74 440 218 482 383C534 591 556 686 554 689C550 695 539 695 472 689ZM357 412C376 403 388 386 397 350L403 327L376 219C361 159 347 107 344 102C337 88 307 53 292 41C218 -19 162 20 174 126C179 165 208 277 220 307C257 391 311 433 357 412Z' horiz-adv-x='510.986' unicode='d'/>
+<glyph d='M325 439C274 428 227 402 188 360C137 307 114 252 112 174C110 139 111 129 117 108C137 26 190 -15 266 -11C300 -8 326 -2 357 12C390 27 413 43 438 69C466 98 468 102 460 112C457 116 452 120 450 120S439 111 430 101C393 57 345 27 292 16C251 7 228 12 208 31C178 61 172 124 191 208L196 228H214C246 228 313 234 336 239C400 252 440 283 455 328C461 350 462 361 456 381C445 417 410 440 364 441C350 441 332 441 325 439ZM381 415C409 408 427 378 423 348C414 291 367 263 262 255C238 253 214 252 210 253L201 254L211 283C225 323 241 350 264 373C302 410 342 424 381 415Z' horiz-adv-x='459.888' unicode='e'/>
+<glyph d='M219 689C187 685 159 681 157 679C154 677 153 672 154 665L155 654L183 653C217 650 225 647 225 636C225 632 191 491 149 322C106 153 72 12 72 10C72 1 89 -12 99 -12C113 -12 128 -2 134 9C136 15 153 79 171 153C192 234 207 292 212 302C236 350 271 389 302 404C323 414 352 420 367 417C392 412 405 384 402 341C400 309 381 236 356 167C345 135 334 101 332 91C312 10 393 -42 458 8C486 30 512 73 527 122C534 147 532 153 517 153C506 153 503 149 496 123C478 57 442 12 407 12C391 12 385 20 385 41C385 61 391 82 419 164C430 195 444 239 451 261C460 297 462 306 462 337C462 367 461 374 455 387C446 406 426 425 407 434C386 444 337 443 309 434C287 426 261 409 241 390C234 383 228 379 228 380S245 450 266 534C307 699 307 695 287 695C282 695 252 692 219 689Z' horiz-adv-x='510.986' unicode='h'/>
+<glyph d='M272 655C259 649 244 631 242 618C239 604 246 589 259 582C280 571 308 585 319 610C325 622 325 625 322 635C316 656 294 664 272 655ZM183 438C142 424 105 374 86 309C79 283 81 277 96 277C107 277 109 279 118 311C140 382 170 418 207 418C218 418 222 414 225 402C231 378 226 363 167 201C132 108 128 95 127 73C126 53 126 46 132 33C140 15 160 -3 177 -8C234 -25 291 24 320 118C329 147 328 153 313 153C302 153 298 149 291 123C282 89 260 46 245 31C228 14 203 7 189 15C181 19 179 39 184 64C187 76 209 142 234 210C285 348 288 361 278 390C265 430 222 452 183 438Z' horiz-adv-x='306.592' unicode='i'/>
+<glyph d='M158 437C133 425 115 399 100 355C85 313 79 286 84 281C88 276 103 275 107 280C109 282 113 295 117 308C136 382 154 414 179 417C202 420 212 400 207 358C205 346 186 263 163 174C141 84 124 8 125 5C127 -2 141 -12 151 -12C164 -12 180 -1 185 10C187 15 204 80 222 154C259 300 262 309 297 354C328 395 365 416 407 416C430 417 431 416 441 406C453 392 459 368 456 337C455 325 437 247 416 164C396 82 379 12 379 10C379 1 396 -12 407 -12C420 -12 436 -1 441 10C443 16 460 80 478 153C499 235 514 292 519 301C544 350 578 389 609 404C630 414 659 420 674 417C699 412 712 384 709 341C707 309 688 236 663 167C630 73 629 55 648 23C665 -4 702 -18 733 -9C774 3 813 54 834 122C841 147 839 153 825 153C814 153 810 149 803 123C785 57 749 12 714 12C698 12 692 20 692 41C692 61 698 82 727 164C738 195 752 239 758 261C767 297 769 306 769 337C769 367 768 374 762 387C753 406 734 425 714 434C693 444 644 443 616 434C584 423 553 398 526 364L518 354L516 363C511 385 503 399 489 414C439 464 339 446 281 376L268 361L266 371C261 398 243 422 221 434C203 443 173 444 158 437Z' horiz-adv-x='817.578' unicode='m'/>
+<glyph d='M158 437C133 425 115 399 100 355C85 313 79 286 84 281C88 276 103 275 107 280C109 282 113 295 117 308C136 382 154 414 179 417C202 420 213 398 207 359C203 333 85 -140 79 -150C74 -160 60 -165 35 -165C19 -165 17 -166 14 -172C12 -176 12 -183 13 -187L14 -194H115H216L220 -185C226 -170 221 -167 186 -165C164 -163 154 -162 151 -158C146 -153 147 -146 168 -63C180 -14 191 30 193 35L196 45L202 35C211 20 228 3 242 -4C260 -13 301 -13 327 -2C400 27 461 97 490 185C528 297 505 396 433 431C416 440 411 441 388 441C364 441 360 440 338 429C322 421 308 410 291 395C278 382 267 373 267 373C266 374 264 380 261 387C256 404 237 425 221 434C203 443 173 444 158 437ZM404 414C418 408 428 393 435 372C439 357 440 346 438 317C436 257 402 134 376 88C352 48 317 17 290 13C251 7 221 37 212 93C210 101 217 132 237 213C263 315 265 323 277 340C316 398 369 429 404 414Z' horiz-adv-x='510.986' unicode='p'/>
+<glyph d='M272 439C215 427 167 378 154 316C149 289 152 269 164 246C180 217 199 206 255 193C299 183 316 174 327 153C344 120 328 67 290 38C266 20 242 13 203 13C162 13 141 20 121 40C108 54 102 66 110 66C113 66 121 69 128 72C150 83 163 114 153 132C146 146 119 151 102 143C72 127 63 85 81 48C102 6 149 -14 214 -11C286 -7 342 26 371 85C399 141 396 189 363 228C347 245 316 260 274 269C233 278 222 284 213 303C196 337 221 391 262 409C275 415 283 416 307 416C333 417 337 416 351 408C367 399 376 389 380 377C382 371 381 370 373 368C368 367 359 361 353 355C345 345 343 340 343 329S344 315 352 308C369 294 394 301 407 325C416 340 416 373 407 389C398 407 380 423 360 432C345 438 336 440 314 441C299 441 280 440 272 439Z' horiz-adv-x='408.789' unicode='s'/>
+<glyph d='M234 438C214 431 196 418 181 401C163 382 145 346 143 331C143 320 143 320 155 319C168 318 168 319 174 331C186 360 213 377 248 377C267 377 272 376 300 363C318 355 340 346 350 344L368 340L257 229C145 118 110 78 77 28C57 -2 56 -10 72 -11C83 -12 84 -11 98 9C130 56 162 73 188 57C193 54 203 45 209 37C242 -4 256 -13 284 -11C342 -6 399 47 424 122C432 145 430 150 415 150C405 150 402 149 400 142C382 99 363 77 331 62C314 54 308 52 289 52C269 52 263 54 242 64C208 80 187 87 170 87H156L162 96C166 101 219 156 281 217C363 299 399 338 417 361C445 399 464 430 463 436C462 439 457 441 449 442C437 442 437 442 426 423C408 393 395 377 384 372C363 362 346 368 326 393C289 440 268 450 234 438Z' horiz-adv-x='408.789' unicode='z'/>
+</font>
+<font horiz-adv-x='0' id='ecbx1000'>
+<font-face font-family='ecbx1000' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M120 690C84 688 51 686 45 686H36V662V639L62 637C93 635 98 633 102 624C104 619 105 489 105 308V0H129H152L174 24C187 38 198 50 199 52S205 51 211 46C228 30 258 12 283 3C306 -3 311 -4 352 -4C388 -3 400 -2 424 3C492 21 541 58 569 111C588 149 594 175 594 224S590 291 570 333C543 389 496 425 425 444C409 448 394 449 359 449C318 449 312 448 289 441C260 431 245 424 226 411L213 403V549V695H199C191 694 156 692 120 690ZM397 404C428 390 449 363 459 324C465 299 468 194 464 155C456 93 432 56 385 38C372 33 362 31 337 31C306 31 304 31 282 42C264 51 254 59 239 75L219 97V223V349L227 360C245 383 283 405 317 412C340 417 376 414 397 404Z' horiz-adv-x='638.733' unicode='b'/>
+<glyph d='M436 690C401 688 367 686 362 686H352V662V639L378 637C409 635 415 633 418 624C420 620 421 569 421 511V406L411 413C397 424 374 435 349 443C329 449 320 450 283 449C235 449 213 445 178 431C146 418 123 403 100 381C35 314 20 203 64 112C90 59 134 23 200 4C223 -2 232 -3 271 -4C309 -4 317 -3 337 2C362 10 383 20 402 33L415 42V17V-6L462 -4C489 -3 530 -2 554 -1L599 0V24V47L572 48C541 50 536 52 532 62C531 66 529 198 529 382V695H515C507 694 472 692 436 690ZM332 411C358 404 378 392 398 373L415 355V229V103L403 88C341 10 226 11 186 89C172 117 170 137 170 221C170 286 171 302 175 318C189 369 217 398 262 410C283 416 310 416 332 411Z' horiz-adv-x='638.733' unicode='d'/>
+<glyph d='M132 690C96 688 63 686 57 686H48V662V639L74 637C105 635 110 633 114 624C116 619 117 499 117 332V48H82H48V24V1H171H295V24V48H260H225V371V695H211C203 694 168 692 132 690Z' horiz-adv-x='319.366' unicode='l'/>
+<glyph d='M235 451C207 447 164 432 141 419C130 413 110 397 97 383C76 363 70 354 59 330C39 289 34 268 34 219C34 186 36 174 41 155C60 89 105 39 169 14C209 0 231 -4 286 -4C340 -4 362 0 402 14C466 39 511 89 530 155C536 174 537 186 537 219C537 268 532 289 512 330C501 354 495 363 474 383C461 397 441 413 430 419C380 448 303 460 235 451ZM316 415C339 410 364 396 377 382C401 355 406 334 408 249C410 182 407 136 398 108C389 77 367 54 334 41C320 36 311 34 286 34C260 34 251 36 237 41C175 66 159 110 163 249C165 334 170 355 194 382C220 411 271 424 316 415Z' horiz-adv-x='574.86' unicode='o'/>
+</font>
+<font horiz-adv-x='0' id='cmmi7'>
+<font-face ascent='750' descent='-250' font-family='cmmi7' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M313 664C314 666 317 679 317 680C317 685 313 694 301 694C281 694 198 686 173 684C165 683 151 682 151 661C151 647 165 647 177 647C225 647 225 640 225 632C225 625 223 619 221 610L80 44C75 26 75 24 75 22C75 7 87 -10 109 -10C136 -10 149 10 155 32C157 36 200 212 204 226C275 219 332 196 332 144C332 139 332 134 330 124C326 109 326 104 326 93C326 22 384 -10 432 -10C529 -10 559 142 559 143C559 156 546 156 543 156C529 156 528 151 523 132C511 89 484 18 435 18C408 18 400 43 400 70C400 87 400 89 406 115C407 118 411 135 411 146C411 235 291 249 249 252C278 270 315 303 332 318C383 366 433 413 489 413C501 413 514 410 522 400C479 393 470 359 470 344C470 322 487 307 510 307C537 307 567 329 567 371C567 404 543 441 490 441C433 441 381 400 330 353C288 313 255 282 214 265L313 664Z' glyph-name='k' horiz-adv-x='607' unicode='k'/>
+<glyph d='M249 106C239 72 206 18 155 18C152 18 122 18 101 32C142 45 145 81 145 87C145 109 128 124 105 124C77 124 48 100 48 63C48 13 104 -10 153 -10C199 -10 240 19 265 61C289 8 344 -10 384 -10C499 -10 560 115 560 143C560 156 547 156 544 156C530 156 529 151 525 139C504 70 444 18 388 18C348 18 327 45 327 83C327 109 351 200 379 311C399 388 444 413 477 413C479 413 510 413 531 399C499 390 487 362 487 344C487 322 504 307 527 307S583 326 583 368C583 424 519 441 479 441C429 441 389 408 367 370C349 411 303 441 247 441C135 441 71 318 71 288C71 275 85 275 88 275C101 275 102 279 107 292C132 370 195 413 244 413C277 413 304 395 304 347C304 327 292 277 283 243L249 106Z' glyph-name='x' horiz-adv-x='648' unicode='x'/>
+</font>
+<font horiz-adv-x='0' id='ecrm1000'>
+<font-face font-family='ecrm1000' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M115 101C81 85 73 40 101 14C121 -4 151 -5 170 12L177 19V1C177 -56 156 -112 117 -158C107 -170 99 -181 99 -183C99 -188 111 -196 115 -194C126 -190 157 -147 173 -115C192 -76 198 -53 200 -13C204 55 181 101 140 104C131 105 121 103 115 101Z' horiz-adv-x='277.71' unicode=','/>
+<glyph d='M259 653C242 637 203 618 175 611C162 607 138 604 121 603L90 601V586V572H109C142 572 179 580 214 594C219 596 219 582 219 327C219 119 218 57 215 51C208 36 194 32 143 30L96 29V15V1H257H418V15V29L371 30C320 32 306 36 298 51C296 57 295 125 295 357C295 521 294 658 293 660C289 669 273 666 259 653Z' horiz-adv-x='499.878' unicode='1'/>
+<glyph d='M115 425C102 418 96 412 90 399C77 374 87 344 115 330C157 309 205 357 184 399C170 426 139 438 115 425ZM115 100C102 93 96 87 90 74C77 49 87 19 115 5C157 -16 205 32 184 74C170 101 139 112 115 100Z' horiz-adv-x='277.71' unicode=':'/>
+<glyph d='M356 701C330 697 288 684 262 672C211 649 155 602 122 556C43 445 32 295 94 173C113 137 132 111 162 81C260 -16 408 -48 515 4C580 37 627 91 650 157C660 185 666 219 664 238L663 251H651H639V237C632 130 570 46 475 17C443 7 388 7 353 17C250 46 186 124 163 247C156 287 156 396 163 436C185 553 244 629 336 660C450 699 551 652 605 537C618 508 625 487 632 448L637 420H650H663V561V703L656 704C649 704 645 700 618 661L589 617L570 635C545 658 529 669 498 683C457 702 409 708 356 701Z' horiz-adv-x='722.046' unicode='C'/>
+<glyph d='M33 665V651L71 649C113 647 124 644 131 631C137 619 137 61 131 48C124 35 113 32 71 30L33 29V15V1H192H352V15V29L304 30C251 32 236 36 229 51C226 56 225 91 225 192V325L291 324C365 322 374 320 393 302C407 287 412 273 414 235L416 207H429H442V340V472H429H416L414 444C412 407 407 392 393 377C374 359 365 357 291 356L225 354V491C225 571 227 632 228 636C233 649 245 651 352 649C455 648 472 646 500 631C547 608 566 569 579 469L581 454H595H608L607 465C606 472 600 517 594 567S583 663 582 669L580 680H306H33Z' horiz-adv-x='652.618' unicode='F'/>
+<glyph d='M173 443C113 430 73 394 70 347C68 332 69 328 75 319C87 302 97 296 115 296C171 296 180 373 126 387L116 390L127 398C154 419 216 430 247 420C279 409 303 385 316 352C321 339 323 327 324 299L325 262L302 260C230 255 180 243 137 223C91 201 59 168 47 128C29 68 59 20 130 -1C160 -11 204 -14 229 -9C266 -1 311 31 327 61L333 73L336 58C342 37 350 22 364 10C401 -20 454 -6 480 39C488 55 489 57 490 100L491 144H477H463V106C463 85 462 62 460 55C451 22 417 16 401 46C396 54 395 69 394 194L392 332L381 355C348 425 261 462 173 443ZM324 170C323 88 320 79 289 47C263 21 244 13 207 13C185 13 179 15 166 21C94 59 110 166 195 209C225 224 277 236 311 237H325Z' horiz-adv-x='499.878' unicode='a'/>
+<glyph d='M96 689C64 686 35 683 32 683C28 683 27 680 27 668V654L52 652C82 650 93 646 100 632C105 622 105 600 105 310V0H118H132L143 20C149 31 157 45 160 50L166 60L178 46C221 -3 272 -20 339 -7C404 5 462 51 493 113C508 143 514 166 516 200C521 268 497 333 450 380C375 456 262 462 190 396L171 378V537V695H163C158 694 128 692 96 689ZM351 406C388 388 412 354 425 305C431 281 431 271 431 215C431 160 430 148 425 128C408 67 373 29 322 16C268 2 213 27 184 78L174 94V217V339L183 352C221 410 295 433 351 406Z' horiz-adv-x='555.42' unicode='b'/>
+<glyph d='M370 689C338 686 309 683 306 683C302 683 301 680 301 668V654L326 652C356 650 367 646 374 632C378 622 379 610 379 501V381L366 394C338 422 302 439 263 441C179 447 93 394 56 315C42 285 36 263 34 229C27 136 77 47 157 8C230 -26 304 -16 360 37L376 52V20C376 2 376 -12 377 -12C377 -12 409 -9 448 -6C487 -2 520 0 521 0S523 6 523 14V29L498 30C468 32 457 37 450 51C446 61 445 82 445 378V695H437C432 694 402 692 370 689ZM290 413C322 405 348 385 367 356L376 342V219V97L364 79C316 4 223 -9 166 48C146 67 134 92 125 125C119 148 119 159 119 215C119 284 123 306 140 341C168 399 231 429 290 413Z' horiz-adv-x='555.42' unicode='d'/>
+<glyph d='M204 446C188 443 157 432 139 422C100 401 60 354 43 308C-13 157 84 -2 237 -11C313 -15 383 29 409 98C417 120 415 129 402 129C392 129 391 128 384 108C366 62 332 31 287 19C228 3 164 35 135 94C120 124 114 150 112 196L110 231H261C429 231 415 229 415 254C415 297 402 344 380 377C363 402 347 416 320 429C287 445 239 452 204 446ZM276 414C317 393 340 347 345 282L347 255H229H111L112 262C113 266 114 277 116 287C122 342 151 392 189 412C216 426 250 427 276 414Z' horiz-adv-x='444.336' unicode='e'/>
+<glyph d='M398 447C378 442 357 432 340 418C327 408 325 407 320 411C309 419 272 435 256 439C173 456 84 406 64 329C53 286 65 239 95 207L106 196L95 178C71 140 68 95 86 59C92 48 100 35 106 31L116 22L95 12C70 0 46 -21 35 -43C24 -66 25 -98 37 -120C56 -154 103 -185 161 -200C188 -208 195 -208 248 -208C300 -208 308 -208 335 -200C393 -185 440 -154 458 -120C486 -68 457 10 398 40C358 60 318 66 222 66C163 66 153 67 142 72C120 82 107 104 107 134C107 152 117 182 123 179C141 169 173 156 186 153C239 142 297 158 335 196C376 234 390 280 377 329C372 349 359 375 349 383C346 386 343 390 343 391C343 396 370 413 386 418C395 421 409 425 418 426L434 428L428 420C420 410 419 400 426 388C431 377 439 373 451 373C456 373 463 374 466 376C474 380 481 394 481 404C481 416 471 435 460 443C448 451 421 453 398 447ZM256 410C270 403 287 388 294 375C311 342 311 250 294 217C269 171 200 161 162 199C141 220 133 254 136 309C138 361 148 386 173 403C196 419 230 421 256 410ZM311 2C362 -4 391 -19 406 -45C417 -65 417 -95 404 -117C389 -144 355 -166 309 -179C282 -187 214 -187 186 -179C140 -166 106 -144 91 -117C84 -103 82 -97 82 -79C82 -41 103 -11 139 0C152 4 165 5 221 5C258 5 299 4 311 2Z' horiz-adv-x='499.878' unicode='g'/>
+<glyph d='M102 689C70 686 41 683 39 683S36 678 36 668V654L59 652C88 650 99 646 106 632C111 622 111 602 111 337C111 15 113 38 87 33C78 31 63 30 54 30H36V15V1H144H252V15V30H235C205 30 187 35 182 45C178 52 177 97 177 374V695H169C164 694 134 692 102 689Z' horiz-adv-x='277.71' unicode='l'/>
+<glyph d='M100 436C69 433 41 430 38 430C34 430 33 427 33 415V401L58 399C88 397 99 393 106 379C110 369 111 355 111 211C111 30 112 38 87 33C78 31 63 30 52 30H33V15V1H146H258V15V30H239C208 30 190 35 185 45C178 57 178 271 185 302C191 330 204 357 223 377C263 422 335 431 365 396C386 372 386 371 387 204C388 31 389 38 364 33C355 31 340 30 329 30H310V15V1H423H536V15V30H516C485 30 467 35 462 45C455 57 455 271 462 302C468 330 481 357 500 377C541 422 612 431 642 396C663 372 663 371 664 204C665 31 666 38 641 33C632 31 617 30 606 30H587V15V1H700H813V15V30H793C765 30 744 35 739 43C737 48 735 88 734 198C733 341 732 348 726 364C713 400 691 422 657 434C635 441 593 444 568 439C528 432 484 399 464 363C456 350 454 349 453 353C438 399 418 420 380 434C358 441 316 444 291 439C250 431 205 398 184 359L174 341V392V442H166C161 442 132 439 100 436Z' horiz-adv-x='833.13' unicode='m'/>
+<glyph d='M97 436C66 433 38 430 35 430C31 430 30 427 30 415V401L55 399C85 397 96 393 103 379C107 369 108 355 108 211C108 30 109 38 84 33C75 31 60 30 49 30H30V15V1H143H255V15V30H236C205 30 187 35 182 45C175 57 175 271 182 302C188 330 201 357 220 377C260 422 332 431 362 396C383 372 383 371 384 204C385 31 386 38 361 33C352 31 337 30 326 30H307V15V1H420H532V15V30H513C485 30 464 35 459 43C457 48 455 88 454 198C453 341 452 348 446 364C428 413 392 438 333 441C300 443 275 439 248 425C222 411 194 384 181 359L171 341V392V442H163C158 442 129 439 97 436Z' horiz-adv-x='555.42' unicode='n'/>
+<glyph d='M205 444C97 419 21 316 28 201C30 164 35 143 53 109C111 -8 260 -47 370 25C412 53 449 105 462 155C470 184 471 226 465 257C444 366 359 444 255 447C235 448 217 447 205 444ZM295 415C343 396 374 352 382 289C386 256 386 180 381 149C371 87 348 50 305 28C248 0 177 18 142 71C118 108 109 156 112 242C114 301 117 320 133 352C149 385 182 412 218 421C237 426 276 423 295 415Z' horiz-adv-x='499.878' unicode='o'/>
+<glyph d='M93 436C62 433 35 430 32 430C28 430 27 427 27 415V401L52 399C82 397 93 393 100 379C104 369 105 355 105 211C105 30 106 38 81 33C72 31 57 30 46 30H27V15V1H147H268V15V29L232 30C193 32 181 36 175 48C169 59 170 248 176 285C189 365 225 412 279 417C296 419 296 419 289 413C285 411 280 404 278 398C270 379 274 361 290 346C297 339 301 338 317 338S337 339 344 346C367 367 366 398 341 421C324 437 313 441 286 441C263 441 258 440 240 431C214 418 193 395 177 363L165 338V390V442H157C152 442 123 439 93 436Z' horiz-adv-x='391.571' unicode='r'/>
+<glyph d='M148 445C111 439 76 420 59 399C54 393 47 380 42 371C31 347 31 307 41 284C51 263 66 246 87 232C112 215 132 208 190 197C245 185 265 178 284 160C306 138 313 112 307 80C300 47 275 24 236 16C146 -2 90 37 65 138C58 166 57 167 49 168C44 168 38 167 36 164C33 161 33 137 33 74L34 -10L42 -11C48 -12 53 -8 68 10L88 33L99 22C127 -2 165 -14 213 -11C248 -8 276 0 299 14C321 28 331 39 343 63C369 114 360 174 321 215C291 247 269 257 194 272C137 284 117 292 99 309C79 329 76 357 90 385C102 409 133 424 179 426C255 431 298 395 306 319L308 299H320H332V373V447L325 448C320 448 314 445 302 433L287 418L275 426C254 440 233 446 197 447C179 447 156 447 148 445Z' horiz-adv-x='394.348' unicode='s'/>
+<glyph d='M142 581C133 493 90 433 32 425C18 423 18 423 18 412V400H60H102V251C102 164 103 96 105 87C114 37 149 1 198 -8C257 -21 300 3 322 64C327 79 329 91 330 131L331 180H318H304L303 133C301 81 298 64 283 41C264 11 224 6 198 31C173 55 171 68 171 249V400H242H313V415V430H242H171V522V614H158H145Z' horiz-adv-x='388.794' unicode='t'/>
+<glyph d='M100 436C67 433 38 430 35 430C31 430 30 427 30 415V400H48C75 399 93 394 100 384C106 376 106 372 108 229C110 84 110 82 116 65C131 29 155 8 193 -3C211 -9 222 -10 254 -10C292 -10 294 -10 313 0C338 10 360 30 376 55L388 73V30C388 7 389 -12 390 -11C391 -11 423 -9 460 -6C497 -2 529 0 530 0S532 6 532 14V29L507 30C477 32 466 37 459 51C455 60 454 76 454 252C454 356 454 442 453 442C453 442 421 439 382 436S310 430 309 430S307 424 307 415V401L332 399C362 397 373 393 380 379C384 369 385 357 385 255C385 129 383 115 366 79C353 53 333 33 310 21C295 14 290 13 261 13S228 14 212 22C192 32 185 42 180 69C178 78 177 155 177 263V442H169C164 442 134 439 100 436Z' horiz-adv-x='555.42' unicode='u'/>
+<glyph d='M18 414V400H35C71 400 86 392 96 367C100 359 135 274 175 176L247 0L228 -45C203 -108 188 -136 170 -154C147 -178 125 -186 98 -182C91 -181 81 -177 75 -174L65 -168L78 -161C95 -153 103 -139 101 -119C98 -83 54 -69 28 -96C20 -104 19 -107 19 -125C19 -149 26 -164 44 -181S81 -206 109 -206C131 -206 136 -205 154 -196C178 -184 204 -158 221 -126C228 -113 275 -3 325 118C375 241 419 347 423 354C437 379 461 395 491 399L505 401V415V429H424H343V415C343 401 343 401 356 398C374 393 385 380 387 362C388 348 384 337 336 219C308 148 283 91 282 92C279 95 172 358 169 368C168 372 169 378 170 382C172 390 193 400 210 400H222V414V429H120H18Z' horiz-adv-x='527.649' unicode='y'/>
+</font>
+<font horiz-adv-x='0' id='cmsy10'>
+<font-face ascent='775' descent='-960' font-family='cmsy10' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M661 230C675 230 694 230 694 250S675 270 661 270H116C102 270 83 270 83 250S102 230 116 230H661Z' glyph-name='minus' horiz-adv-x='778' unicode='&#13312;'/>
+</font>
+<font horiz-adv-x='0' id='cmsy7'>
+<font-face ascent='782' descent='-951' font-family='cmsy7' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M577 274C528 334 440 441 292 441C166 441 78 335 78 215C78 98 164 -10 288 -10C431 -10 520 104 561 157C610 97 698 -10 846 -10C972 -10 1060 96 1060 216C1060 333 974 441 850 441C707 441 618 327 577 274ZM610 237C671 334 760 403 858 403C961 403 1032 313 1032 216C1032 116 950 45 863 45C769 45 703 125 610 237ZM528 194C467 97 378 28 280 28C177 28 106 118 106 215C106 315 188 386 275 386C369 386 435 306 528 194Z' glyph-name='infinity' horiz-adv-x='1139' unicode='&#8734;'/>
+</font>
+<font horiz-adv-x='0' id='cmmi10'>
+<font-face ascent='750' descent='-250' font-family='cmmi10' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M287 683C287 684 287 694 274 694C251 694 178 686 152 684C144 683 133 682 133 664C133 652 142 652 157 652C205 652 207 645 207 635L204 615L59 39C55 25 55 23 55 17C55 -6 75 -11 84 -11C97 -11 112 -2 118 10C123 19 168 204 174 229C208 226 290 210 290 144C290 137 290 133 287 123C285 111 283 99 283 88C283 29 323 -11 375 -11C405 -11 432 5 454 42C479 86 490 141 490 143C490 153 481 153 478 153C468 153 467 149 464 135C444 62 421 11 377 11C358 11 345 22 345 58C345 75 349 98 353 114C357 131 357 135 357 145C357 210 294 239 209 250C240 268 272 300 295 324C343 377 389 420 438 420C444 420 445 420 447 419C459 417 460 417 468 411C470 410 470 409 472 407C424 404 415 365 415 353C415 337 426 318 453 318C479 318 508 340 508 379C508 409 485 442 440 442C412 442 366 434 294 354C260 316 221 276 183 261L287 683Z' glyph-name='k' horiz-adv-x='521' unicode='k'/>
+<glyph d='M206 400H300C320 400 330 400 330 420C330 431 320 431 302 431H214C250 573 255 593 255 599C255 616 243 626 226 626C223 626 195 625 186 590L147 431H53C33 431 23 431 23 412C23 400 31 400 51 400H139C67 116 63 99 63 81C63 27 101 -11 155 -11C257 -11 314 135 314 143C314 153 306 153 302 153C293 153 292 150 287 139C244 35 191 11 157 11C136 11 126 24 126 57C126 81 128 88 132 105L206 400Z' glyph-name='t' horiz-adv-x='361' unicode='t'/>
+<glyph d='M334 302C340 328 363 420 433 420C438 420 462 420 483 407C455 402 435 377 435 353C435 337 446 318 473 318C495 318 527 336 527 376C527 428 468 442 434 442C376 442 341 389 329 366C304 432 250 442 221 442C117 442 60 313 60 288C60 278 70 278 72 278C80 278 83 280 85 289C119 395 185 420 219 420C238 420 273 411 273 353C273 322 256 255 219 115C203 53 168 11 124 11C118 11 95 11 74 24C99 29 121 50 121 78C121 105 99 113 84 113C54 113 29 87 29 55C29 9 79 -11 123 -11C189 -11 225 59 228 65C240 28 276 -11 336 -11C439 -11 496 118 496 143C496 153 487 153 484 153C475 153 473 149 471 142C438 35 370 11 338 11C299 11 283 43 283 77C283 99 289 121 300 165L334 302Z' glyph-name='x' horiz-adv-x='572' unicode='x'/>
+</font>
+<font horiz-adv-x='0' id='cmr10'>
+<font-face ascent='969' descent='-250' font-family='cmr10' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M192 665C192 698 165 716 139 716S86 698 86 665L125 210C126 195 127 187 139 187C149 187 152 192 153 209L192 665ZM192 53C192 82 168 106 139 106S86 82 86 53S110 0 139 0S192 24 192 53Z' glyph-name='exclam' horiz-adv-x='278' unicode='!'/>
+<glyph d='M331 -240C331 -237 331 -235 314 -218C189 -92 157 97 157 250C157 424 195 598 318 723C331 735 331 737 331 740C331 747 327 750 321 750C311 750 221 682 162 555C111 445 99 334 99 250C99 172 110 51 165 -62C225 -185 311 -250 321 -250C327 -250 331 -247 331 -240Z' glyph-name='parenleft' horiz-adv-x='389' unicode='('/>
+<glyph d='M289 250C289 328 278 449 223 562C163 685 77 750 67 750C61 750 57 746 57 740C57 737 57 735 76 717C174 618 231 459 231 250C231 79 194 -97 70 -223C57 -235 57 -237 57 -240C57 -246 61 -250 67 -250C77 -250 167 -182 226 -55C277 55 289 166 289 250Z' glyph-name='parenright' horiz-adv-x='389' unicode=')'/>
+<glyph d='M409 230H688C702 230 721 230 721 250S702 270 688 270H409V550C409 564 409 583 389 583S369 564 369 550V270H89C75 270 56 270 56 250S75 230 89 230H369V-50C369 -64 369 -83 389 -83S409 -64 409 -50V230Z' glyph-name='plus' horiz-adv-x='778' unicode='+'/>
+<glyph d='M294 640C294 664 294 666 271 666C209 602 121 602 89 602V571C109 571 168 571 220 597V79C220 43 217 31 127 31H95V0C130 3 217 3 257 3S384 3 419 0V31H387C297 31 294 42 294 79V640Z' glyph-name='one' horiz-adv-x='500' unicode='1'/>
+<glyph d='M449 174H424C419 144 412 100 402 85C395 77 329 77 307 77H127L233 180C389 318 449 372 449 472C449 586 359 666 237 666C124 666 50 574 50 485C50 429 100 429 103 429C120 429 155 441 155 482C155 508 137 534 102 534C94 534 92 534 89 533C112 598 166 635 224 635C315 635 358 554 358 472C358 392 308 313 253 251L61 37C50 26 50 24 50 0H421L449 174Z' glyph-name='two' horiz-adv-x='500' unicode='2'/>
+<glyph d='M687 327C702 327 721 327 721 347S702 367 688 367H89C75 367 56 367 56 347S75 327 90 327H687ZM688 133C702 133 721 133 721 153S702 173 687 173H90C75 173 56 173 56 153S75 133 89 133H688Z' glyph-name='equal' horiz-adv-x='778' unicode='='/>
+<glyph d='M359 386C318 383 312 353 312 340C312 314 330 294 358 294C384 294 404 311 404 341C404 409 328 448 251 448C126 448 34 340 34 216C34 88 133 -11 249 -11C383 -11 415 109 415 119S405 129 402 129C393 129 391 125 389 119C360 26 295 14 258 14C205 14 117 57 117 218C117 381 199 423 252 423C261 423 324 422 359 386Z' glyph-name='c' horiz-adv-x='444' unicode='c'/>
+<glyph d='M471 214C471 342 371 448 250 448C125 448 28 339 28 214C28 85 132 -11 249 -11C370 -11 471 87 471 214ZM250 14C207 14 163 35 136 81C111 125 111 186 111 222C111 261 111 315 135 359C162 405 209 426 249 426C293 426 336 404 362 361S388 260 388 222C388 186 388 132 366 88C344 43 300 14 250 14Z' glyph-name='o' horiz-adv-x='500' unicode='o'/>
+<glyph d='M208 194C230 190 312 174 312 102C312 51 277 11 199 11C115 11 79 68 60 153C57 166 56 170 46 170C33 170 33 163 33 145V13C33 -4 33 -11 44 -11C49 -11 50 -10 69 9C71 11 71 13 89 32C133 -10 178 -11 199 -11C314 -11 360 56 360 128C360 181 330 211 318 223C285 255 246 263 204 271C148 282 81 295 81 353C81 388 107 429 193 429C303 429 308 339 310 308C311 299 320 299 322 299C335 299 335 304 335 323V424C335 441 335 448 324 448C319 448 317 448 304 436C301 432 291 423 287 420C249 448 208 448 193 448C71 448 33 381 33 325C33 290 49 262 76 240C108 214 136 208 208 194Z' glyph-name='s' horiz-adv-x='394' unicode='s'/>
+</font>
+<font horiz-adv-x='0' id='cmr7'>
+<font-face ascent='750' descent='-250' font-family='cmr7' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M463 226H769C782 226 806 226 806 250C806 275 783 275 769 275H463V582C463 595 463 619 439 619C414 619 414 596 414 582V275H107C94 275 70 275 70 251C70 226 93 226 107 226H414V-81C414 -94 414 -118 438 -118C463 -118 463 -95 463 -81V226Z' glyph-name='plus' horiz-adv-x='877' unicode='+'/>
+<glyph d='M516 319C516 429 503 508 457 578C426 624 364 664 284 664C52 664 52 391 52 319S52 -20 284 -20S516 247 516 319ZM284 8C238 8 177 35 157 117C143 176 143 258 143 332C143 405 143 481 158 536C179 615 243 636 284 636C338 636 390 603 408 545C424 491 425 419 425 332C425 258 425 184 412 121C392 30 324 8 284 8Z' glyph-name='zero' horiz-adv-x='569' unicode='0'/>
+<glyph d='M335 636C335 663 333 664 305 664C241 601 150 600 109 600V564C133 564 199 564 254 592V82C254 49 254 36 154 36H116V0C134 1 257 4 294 4C325 4 451 1 473 0V36H435C335 36 335 49 335 82V636Z' glyph-name='one' horiz-adv-x='569' unicode='1'/>
+<glyph d='M505 182H471C468 160 458 101 445 91C437 85 360 85 346 85H162C267 178 302 206 362 253C436 312 505 374 505 469C505 590 399 664 271 664C147 664 63 577 63 485C63 434 106 429 116 429C140 429 169 446 169 482C169 500 162 535 110 535C141 606 209 628 256 628C356 628 408 550 408 469C408 382 346 313 314 277L73 39C63 30 63 28 63 0H475L505 182Z' glyph-name='two' horiz-adv-x='569' unicode='2'/>
+<glyph d='M768 336C783 336 806 336 806 361C806 385 782 385 769 385H107C94 385 70 385 70 361C70 336 93 336 108 336H768ZM769 116C782 116 806 116 806 140C806 165 783 165 768 165H108C93 165 70 165 70 140C70 116 94 116 107 116H769Z' glyph-name='equal' horiz-adv-x='877' unicode='='/>
+</font>
+<font horiz-adv-x='0' id='cmex10'>
+<font-face ascent='772' descent='-2960' font-family='cmex10' units-per-em='1000'/>
+<missing-glyph d=''/>
+<glyph d='M1266 -1400L1387 -1080H1362C1323 -1184 1217 -1252 1102 -1282C1081 -1287 983 -1313 791 -1313H188L697 -716C704 -708 706 -705 706 -700C706 -698 706 -695 699 -685L233 -48H781C915 -48 1006 -62 1015 -64C1069 -72 1156 -89 1235 -139C1260 -155 1328 -200 1362 -281H1387L1266 0H84C61 0 60 -1 57 -7C56 -10 56 -29 56 -40L585 -764L67 -1371C57 -1383 57 -1388 57 -1389C57 -1400 66 -1400 84 -1400H1266Z' glyph-name='summationdisplay' horiz-adv-x='1444' unicode='&#13400;'/>
+<glyph d='M104 -2177C136 -2175 153 -2153 153 -2128C153 -2095 128 -2079 105 -2079C81 -2079 56 -2094 56 -2129C56 -2180 106 -2222 167 -2222C319 -2222 376 -1988 447 -1698C524 -1382 589 -1063 643 -742C680 -529 717 -329 751 -200C763 -151 797 -22 836 -22C867 -22 892 -41 896 -45C863 -47 846 -69 846 -94C846 -127 871 -143 894 -143C918 -143 943 -128 943 -93C943 -39 889 0 834 0C758 0 702 -109 647 -313C644 -324 508 -826 398 -1480C372 -1633 343 -1800 310 -1939C292 -2012 246 -2200 165 -2200C129 -2200 104 -2177 104 -2177Z' glyph-name='integraldisplay' horiz-adv-x='556' unicode='&#13402;'/>
+</font>
+</defs>
+<style type='text/css'><![CDATA[
+text.f0 {font-family:ecsl1000;font-size:10}
+text.f1 {font-family:eccc1000;font-size:10}
+text.f2 {font-family:ecss1000;font-size:10}
+text.f3 {font-family:ecti1000;font-size:10}
+text.f4 {font-family:ecbx1000;font-size:10}
+text.f5 {font-family:ecrm1000;font-size:10}
+text.f6 {font-family:cmsy10;font-size:10}
+text.f7 {font-family:cmsy7;font-size:7}
+text.f8 {font-family:cmmi10;font-size:10}
+text.f9 {font-family:cmmi7;font-size:7}
+text.f10 {font-family:cmr10;font-size:10}
+text.f11 {font-family:cmr7;font-size:7}
+text.f12 {font-family:cmex10;font-size:10}
+]]>
+</style>
+<g id='page1'>
+<text class='f5' x='77' y='63'>Color<tspan x='104.243'>test:</tspan>
+<tspan fill='#ff0000' x='127.627'>red,</tspan>
+<tspan fill='#0000ff' x='147.649'>blue,</tspan>
+<tspan fill='#ff00ff' x='172.088'>magen</tspan>
+<tspan fill='#ff00ff' x='200.137'>ta</tspan>
+</text>
+<text class='f12' x='164.374' y='78.8467'>&#13402;</text>
+<text class='f9' x='174.374' y='81.3189'>x</text>
+<text class='f11' x='169.929' y='101.569'>0</text>
+<text class='f10' x='181.075' y='92.4579'>cos</text>
+<text class='f8' x='196.131' y='92.4579'>t</text>
+<text class='f5' x='201.408' y='92.4579'>d</text>
+<text class='f8' x='206.962' y='92.4579'>t</text>
+<text class='f10' x='213.351' y='92.4579'>=</text>
+<text class='f7' x='227.193' y='79.9579'>&#8734;</text>
+<text class='f12' x='223.957' y='82.9578'>&#13400;</text>
+<text class='f9' x='223.907' y='104.486'>k</text>
+<text class='f11' x='228.327' y='104.486'>=0</text>
+<text class='f10' x='238.452' y='92.4579'>(</text>
+<text class='f6' x='242.341' y='92.4579'>&#13312;</text>
+<text class='f10' x='250.119' y='92.4579'>1)</text>
+<text class='f9' x='259.008' y='88.329'>k</text>
+<text class='f8' x='271.904' y='85.6928'>x</text>
+<text class='f11' x='277.619' y='82.0639'>2</text>
+<text class='f9' x='281.605' y='82.0639'>k</text>
+<text class='f11' x='286.025' y='82.0639'>+1</text>
+<rect height='0.399979' width='38.2986' x='265.128' y='89.7579'/>
+<text class='f10' x='265.128' y='99.3174'>(2</text>
+<text class='f8' x='274.017' y='99.3174'>k</text>
+<text class='f10' x='281.76' y='99.3174'>+<tspan x='291.76'>1)!</tspan>
+</text>
+<text class='f5' x='77' y='123.706'>F<tspan x='82.6931'>on</tspan>
+<tspan x='92.9683'>t</tspan>
+<tspan x='100.189'>st</tspan>
+<tspan x='107.742'>yles:</tspan>
+</text>
+<text class='f4' x='131.403' y='123.706'>b<tspan x='138.11'>old</tspan>
+</text>
+<text class='f5' x='153.44' y='123.706'>,</text>
+<text class='f3' x='159.549' y='123.706'>emphasize<tspan x='202.983'>d</tspan>
+</text>
+<text class='f5' x='208.093' y='123.706'>,</text>
+<text class='f2' x='214.203' y='123.706'>sans<tspan x='235.17'>serif</tspan>
+</text>
+<text class='f5' x='252.304' y='123.706'>,</text>
+<text class='f1' x='258.414' y='123.706'>Small<tspan x='292.161'>Caps</tspan>
+</text>
+<text class='f5' x='316.305' y='123.706'>,</text>
+<text class='f0' x='322.415' y='123.706'>slan<tspan x='339.411'>ted</tspan>
+</text>
+<text class='f5' x='232.001' y='633'>1</text>
+</g>
+</svg>