CTAN sync 202208140300

5 files changed, 255 insertions, 55 deletions

diff --git a/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp b/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
index ebd2020b82..abc8535221 100644
--- a/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
+++ b/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp
@@ -189,21 +189,21 @@ TEST_F(DvisvgmSpecialTest, rawPI) {
 
 TEST_F(DvisvgmSpecialTest, rawPageFail) {
 	istringstream iss("raw <elem attr1='1' attr2='20'");
-	EXPECT_THROW({handler.process("", iss, recorder); handler.finishPage();}, SpecialException);  // incomplete opening tag
+	EXPECT_THROW({handler.process("", iss, recorder); handler.finishPage();}, XMLParserException);  // incomplete opening tag
 	iss.clear(); iss.str("raw </elem>");
-	EXPECT_THROW(handler.process("", iss, recorder), SpecialException);  // spurious closing tag
+	EXPECT_THROW(handler.process("", iss, recorder), XMLParserException);  // spurious closing tag
 	iss.clear(); iss.str("raw <open>text</close>");
-	EXPECT_THROW(handler.process("", iss, recorder), SpecialException);  // mismatching tags
+	EXPECT_THROW(handler.process("", iss, recorder), XMLParserException);  // mismatching tags
 }
 
 
 TEST_F(DvisvgmSpecialTest, rawDefsFail) {
 	istringstream iss("rawdef <elem attr1='1' attr2='20'");
-	EXPECT_THROW({handler.process("", iss, recorder); handler.finishPage();}, SpecialException);  // incomplete opening tag
+	EXPECT_THROW({handler.process("", iss, recorder); handler.finishPage();}, XMLParserException);  // incomplete opening tag
 	iss.clear(); iss.str("rawdef </elem>");
-	EXPECT_THROW(handler.process("", iss, recorder), SpecialException);  // spurious closing tag
+	EXPECT_THROW(handler.process("", iss, recorder), XMLParserException);  // spurious closing tag
 	iss.clear(); iss.str("rawdef <open>text</close>");
-	EXPECT_THROW(handler.process("", iss, recorder), SpecialException);  // mismatching tags
+	EXPECT_THROW(handler.process("", iss, recorder), XMLParserException);  // mismatching tags
 }
 
 
diff --git a/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp b/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp
new file mode 100644
index 0000000000..15298c299f
--- /dev/null
+++ b/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp
@@ -0,0 +1,163 @@
+/*************************************************************************
+** GraphicsPathParserTest.cpp                                           **
+**                                                                      **
+** This file is part of dvisvgm -- a fast DVI to SVG converter          **
+** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.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 <sstream>
+#include "GraphicsPathParser.hpp"
+
+using namespace std;
+
+TEST(GraphicsPathParserTest, empty) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("");
+	EXPECT_TRUE(path.empty());
+	path = parser.parse("   \n\t \r ");
+	EXPECT_TRUE(path.empty());
+}
+
+
+TEST(GraphicsPathParserTest, moveto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("M10 10 20 20 ,30 0 -10 10");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "M10 10L20 20L30 0L-10 10");
+	oss.str("");
+	path = parser.parse("m10 -10 20, 20 ,30 0 -10 10");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "M10-10L30 10H60L50 20");
+}
+
+
+TEST(GraphicsPathParserTest, lineto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("L10 10 20 20 ,30 0 -10 10");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "L10 10L20 20L30 0L-10 10");
+	oss.str("");
+	path = parser.parse("l10 -10 20, 20 ,30 0 -10 10");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "L10-10L30 10H60L50 20");
+}
+
+
+TEST(GraphicsPathParserTest, hvlineto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("H 10 20 V10 20");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "H10H20V10V20");
+	oss.str("");
+	path = parser.parse("h 10 20 v10 20");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "H10H30V10V30");
+}
+
+
+TEST(GraphicsPathParserTest, cubicto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("C 10 20 30 40 50 60 -100 -200 -300 -400 -500 -600");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "C10 20 30 40 50 60C-100-200-300-400-500-600");
+	oss.str("");
+	path = parser.parse("c 10 20 30 40 50 60 -100 -200 -300 -400 -500 -600");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "C10 20 30 40 50 60C-50-140-250-340-450-540");
+}
+
+
+TEST(GraphicsPathParserTest, quadto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("Q 10 20 30 40 -100 -200 -300 -400");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "Q10 20 30 40Q-100-200-300-400");
+	oss.str("");
+	path = parser.parse("q 10 20 30 40 -100 -200 -300 -400");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "Q10 20 30 40Q-70-160-270-360");
+}
+
+
+TEST(GraphicsPathParserTest, scubicto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("S 10 20 30 40 -100 -200 -300 -400");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "C0 0 10 20 30 40S-100-200-300-400");
+	oss.str("");
+	path = parser.parse("s 10 20 30 40 -100 -200 -300 -400");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "C0 0 10 20 30 40S-70-160-270-360");
+}
+
+
+TEST(GraphicsPathParserTest, squadto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("T 10 20 -100 -200");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "Q0 0 10 20T-100-200");
+	oss.str("");
+	path = parser.parse("t 10 20 -100 -200");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "Q0 0 10 20T-90-180");
+}
+
+
+TEST(GraphicsPathParserTest, arcto) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("A 10 20 90 1 0 100 200, -10 -20 45 0 1 -100 -200");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "A10 20 90 1 0 100 200A10 20 45 0 1-100-200");
+	oss.str("");
+	path = parser.parse("a 10 20 90 1 0 100 200, -10 -20 45 0 1 -100 -200");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "A10 20 90 1 0 100 200A10 20 45 0 1 0 0");
+}
+
+
+TEST(GraphicsPathParserTest, combined) {
+	GraphicsPathParser<int> parser;
+	auto path = parser.parse("M10 10L20 50Q 100 100 -10 -10 Z C 10 20 30 40 50 60Z");
+	ostringstream oss;
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "M10 10L20 50Q100 100-10-10ZC10 20 30 40 50 60Z");
+	oss.str("");
+	path = parser.parse("m10 10l20 50q 100 100 -10 -10 z c 10 20 30 40 50 60 z");
+	path.writeSVG(oss, false);
+	EXPECT_EQ(oss.str(), "M10 10L30 60Q130 160 20 50ZC20 30 40 50 60 70Z");
+}
+
+
+TEST(GraphicsPathParserTest, error) {
+	GraphicsPathParser<int> parser;
+	EXPECT_THROW(parser.parse("10 20"), GraphicsPathParserException);  // missing command
+	EXPECT_THROW(parser.parse("M10 "), GraphicsPathParserException);  // missing y-coordinate
+	EXPECT_THROW(parser.parse("M10 20.5"), GraphicsPathParserException); // invalid number type
+	EXPECT_THROW(parser.parse("J 10 20.5"), GraphicsPathParserException); // unknown command
+	EXPECT_THROW(parser.parse("M,10 20"), GraphicsPathParserException); // invalid comma
+	EXPECT_THROW(parser.parse("M10 20,"), GraphicsPathParserException); // missing parameters
+	EXPECT_THROW(parser.parse("A 10 20 45 2 0 100 100"), GraphicsPathParserException); // invalid large-arc-flag
+	EXPECT_THROW(parser.parse("A 10 20 45 0 5 100 100"), GraphicsPathParserException); // invalid sweep-flag
+}
diff --git a/dviware/dvisvgm/tests/Makefile.am b/dviware/dvisvgm/tests/Makefile.am
index 5582eaf412..2faaacf353 100644
--- a/dviware/dvisvgm/tests/Makefile.am
+++ b/dviware/dvisvgm/tests/Makefile.am
@@ -208,6 +208,12 @@ GhostscriptTest_SOURCES = GhostscriptTest.cpp testutil.hpp
 GhostscriptTest_CPPFLAGS = -I$(dvisvgm_srcdir)/tests/gtest/include $(LIBS_CFLAGS)
 GhostscriptTest_LDADD = $(TESTLIBS)
 
+TESTS += GraphicsPathParserTest
+check_PROGRAMS += GraphicsPathParserTest
+GraphicsPathParserTest_SOURCES = GraphicsPathParserTest.cpp testutil.hpp
+GraphicsPathParserTest_CPPFLAGS = -I$(dvisvgm_srcdir)/tests/gtest/include $(LIBS_CFLAGS)
+GraphicsPathParserTest_LDADD = $(TESTLIBS)
+
 TESTS += GraphicsPathTest
 check_PROGRAMS += GraphicsPathTest
 GraphicsPathTest_SOURCES = GraphicsPathTest.cpp testutil.hpp
diff --git a/dviware/dvisvgm/tests/Makefile.in b/dviware/dvisvgm/tests/Makefile.in
index d6007f031b..f6359bad6c 100644
--- a/dviware/dvisvgm/tests/Makefile.in
+++ b/dviware/dvisvgm/tests/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -109,9 +109,9 @@ TESTS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) BitmapTest$(EXEEXT) \
 	FontCacheTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFGlyphTracerTest$(EXEEXT) \
 	GFReaderTest$(EXEEXT) GhostscriptTest$(EXEEXT) \
-	GraphicsPathTest$(EXEEXT) HashFunctionTest$(EXEEXT) \
-	JFMReaderTest$(EXEEXT) LengthTest$(EXEEXT) \
-	MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
+	GraphicsPathParserTest$(EXEEXT) GraphicsPathTest$(EXEEXT) \
+	HashFunctionTest$(EXEEXT) JFMReaderTest$(EXEEXT) \
+	LengthTest$(EXEEXT) MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
 	MessageExceptionTest$(EXEEXT) PageRagesTest$(EXEEXT) \
 	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
 	PapersizeSpecialTest$(EXEEXT) PDFParserTest$(EXEEXT) \
@@ -140,9 +140,9 @@ check_PROGRAMS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) \
 	FontCacheTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFGlyphTracerTest$(EXEEXT) \
 	GFReaderTest$(EXEEXT) GhostscriptTest$(EXEEXT) \
-	GraphicsPathTest$(EXEEXT) HashFunctionTest$(EXEEXT) \
-	JFMReaderTest$(EXEEXT) LengthTest$(EXEEXT) \
-	MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
+	GraphicsPathParserTest$(EXEEXT) GraphicsPathTest$(EXEEXT) \
+	HashFunctionTest$(EXEEXT) JFMReaderTest$(EXEEXT) \
+	LengthTest$(EXEEXT) MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
 	MessageExceptionTest$(EXEEXT) PageRagesTest$(EXEEXT) \
 	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
 	PapersizeSpecialTest$(EXEEXT) PDFParserTest$(EXEEXT) \
@@ -161,12 +161,7 @@ check_PROGRAMS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) \
 @ENABLE_WOFF_TRUE@am__append_10 = ../libs/ff-woff/libfontforge.a
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_code_coverage.m4 \
-	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -281,6 +276,10 @@ am_GhostscriptTest_OBJECTS =  \
 	GhostscriptTest-GhostscriptTest.$(OBJEXT)
 GhostscriptTest_OBJECTS = $(am_GhostscriptTest_OBJECTS)
 GhostscriptTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+am_GraphicsPathParserTest_OBJECTS =  \
+	GraphicsPathParserTest-GraphicsPathParserTest.$(OBJEXT)
+GraphicsPathParserTest_OBJECTS = $(am_GraphicsPathParserTest_OBJECTS)
+GraphicsPathParserTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
 am_GraphicsPathTest_OBJECTS =  \
 	GraphicsPathTest-GraphicsPathTest.$(OBJEXT)
 GraphicsPathTest_OBJECTS = $(am_GraphicsPathTest_OBJECTS)
@@ -444,6 +443,7 @@ am__depfiles_remade = ./$(DEPDIR)/BezierTest-BezierTest.Po \
 	./$(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po \
 	./$(DEPDIR)/GFReaderTest-GFReaderTest.Po \
 	./$(DEPDIR)/GhostscriptTest-GhostscriptTest.Po \
+	./$(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Po \
 	./$(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po \
 	./$(DEPDIR)/HashFunctionTest-HashFunctionTest.Po \
 	./$(DEPDIR)/JFMReaderTest-JFMReaderTest.Po \
@@ -531,15 +531,15 @@ SOURCES = $(libgtest_la_SOURCES) $(BezierTest_SOURCES) \
 	$(FontCacheTest_SOURCES) $(FontManagerTest_SOURCES) \
 	$(FontMapTest_SOURCES) $(GFGlyphTracerTest_SOURCES) \
 	$(GFReaderTest_SOURCES) $(GhostscriptTest_SOURCES) \
-	$(GraphicsPathTest_SOURCES) $(HashFunctionTest_SOURCES) \
-	$(JFMReaderTest_SOURCES) $(LengthTest_SOURCES) \
-	$(MapLineTest_SOURCES) $(MatrixTest_SOURCES) \
-	$(MessageExceptionTest_SOURCES) $(PDFParserTest_SOURCES) \
-	$(PSInterpreterTest_SOURCES) $(PageRagesTest_SOURCES) \
-	$(PageSizeTest_SOURCES) $(PairTest_SOURCES) \
-	$(PapersizeSpecialTest_SOURCES) $(RangeMapTest_SOURCES) \
-	$(SVGOutputTest_SOURCES) $(ShadingPatchTest_SOURCES) \
-	$(SpecialManagerTest_SOURCES) \
+	$(GraphicsPathParserTest_SOURCES) $(GraphicsPathTest_SOURCES) \
+	$(HashFunctionTest_SOURCES) $(JFMReaderTest_SOURCES) \
+	$(LengthTest_SOURCES) $(MapLineTest_SOURCES) \
+	$(MatrixTest_SOURCES) $(MessageExceptionTest_SOURCES) \
+	$(PDFParserTest_SOURCES) $(PSInterpreterTest_SOURCES) \
+	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
+	$(PairTest_SOURCES) $(PapersizeSpecialTest_SOURCES) \
+	$(RangeMapTest_SOURCES) $(SVGOutputTest_SOURCES) \
+	$(ShadingPatchTest_SOURCES) $(SpecialManagerTest_SOURCES) \
 	$(SplittedCharInputBufferTest_SOURCES) \
 	$(StreamInputBufferTest_SOURCES) $(StreamReaderTest_SOURCES) \
 	$(StreamWriterTest_SOURCES) $(StringMatcherTest_SOURCES) \
@@ -563,15 +563,15 @@ DIST_SOURCES = $(libgtest_la_SOURCES) $(BezierTest_SOURCES) \
 	$(FontCacheTest_SOURCES) $(FontManagerTest_SOURCES) \
 	$(FontMapTest_SOURCES) $(GFGlyphTracerTest_SOURCES) \
 	$(GFReaderTest_SOURCES) $(GhostscriptTest_SOURCES) \
-	$(GraphicsPathTest_SOURCES) $(HashFunctionTest_SOURCES) \
-	$(JFMReaderTest_SOURCES) $(LengthTest_SOURCES) \
-	$(MapLineTest_SOURCES) $(MatrixTest_SOURCES) \
-	$(MessageExceptionTest_SOURCES) $(PDFParserTest_SOURCES) \
-	$(PSInterpreterTest_SOURCES) $(PageRagesTest_SOURCES) \
-	$(PageSizeTest_SOURCES) $(PairTest_SOURCES) \
-	$(PapersizeSpecialTest_SOURCES) $(RangeMapTest_SOURCES) \
-	$(SVGOutputTest_SOURCES) $(ShadingPatchTest_SOURCES) \
-	$(SpecialManagerTest_SOURCES) \
+	$(GraphicsPathParserTest_SOURCES) $(GraphicsPathTest_SOURCES) \
+	$(HashFunctionTest_SOURCES) $(JFMReaderTest_SOURCES) \
+	$(LengthTest_SOURCES) $(MapLineTest_SOURCES) \
+	$(MatrixTest_SOURCES) $(MessageExceptionTest_SOURCES) \
+	$(PDFParserTest_SOURCES) $(PSInterpreterTest_SOURCES) \
+	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
+	$(PairTest_SOURCES) $(PapersizeSpecialTest_SOURCES) \
+	$(RangeMapTest_SOURCES) $(SVGOutputTest_SOURCES) \
+	$(ShadingPatchTest_SOURCES) $(SpecialManagerTest_SOURCES) \
 	$(SplittedCharInputBufferTest_SOURCES) \
 	$(StreamInputBufferTest_SOURCES) $(StreamReaderTest_SOURCES) \
 	$(StreamWriterTest_SOURCES) $(StringMatcherTest_SOURCES) \
@@ -619,8 +619,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
@@ -803,6 +801,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
@@ -877,6 +876,8 @@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -892,8 +893,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GCOV = @GCOV@
@@ -1116,6 +1119,9 @@ GFReaderTest_LDADD = $(TESTLIBS)
 GhostscriptTest_SOURCES = GhostscriptTest.cpp testutil.hpp
 GhostscriptTest_CPPFLAGS = -I$(dvisvgm_srcdir)/tests/gtest/include $(LIBS_CFLAGS)
 GhostscriptTest_LDADD = $(TESTLIBS)
+GraphicsPathParserTest_SOURCES = GraphicsPathParserTest.cpp testutil.hpp
+GraphicsPathParserTest_CPPFLAGS = -I$(dvisvgm_srcdir)/tests/gtest/include $(LIBS_CFLAGS)
+GraphicsPathParserTest_LDADD = $(TESTLIBS)
 GraphicsPathTest_SOURCES = GraphicsPathTest.cpp testutil.hpp
 GraphicsPathTest_CPPFLAGS = -I$(dvisvgm_srcdir)/tests/gtest/include $(LIBS_CFLAGS)
 GraphicsPathTest_LDADD = $(TESTLIBS)
@@ -1232,9 +1238,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../libs/defs.am $(am__co
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign tests/Makefile
+	  $(AUTOMAKE) --gnu tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1385,6 +1391,10 @@ GhostscriptTest$(EXEEXT): $(GhostscriptTest_OBJECTS) $(GhostscriptTest_DEPENDENC
 	@rm -f GhostscriptTest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(GhostscriptTest_OBJECTS) $(GhostscriptTest_LDADD) $(LIBS)
 
+GraphicsPathParserTest$(EXEEXT): $(GraphicsPathParserTest_OBJECTS) $(GraphicsPathParserTest_DEPENDENCIES) $(EXTRA_GraphicsPathParserTest_DEPENDENCIES) 
+	@rm -f GraphicsPathParserTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(GraphicsPathParserTest_OBJECTS) $(GraphicsPathParserTest_LDADD) $(LIBS)
+
 GraphicsPathTest$(EXEEXT): $(GraphicsPathTest_OBJECTS) $(GraphicsPathTest_DEPENDENCIES) $(EXTRA_GraphicsPathTest_DEPENDENCIES) 
 	@rm -f GraphicsPathTest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(GraphicsPathTest_OBJECTS) $(GraphicsPathTest_LDADD) $(LIBS)
@@ -1558,6 +1568,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GFReaderTest-GFReaderTest.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GhostscriptTest-GhostscriptTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HashFunctionTest-HashFunctionTest.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JFMReaderTest-JFMReaderTest.Po@am__quote@ # am--include-marker
@@ -1990,6 +2001,20 @@ GhostscriptTest-GhostscriptTest.obj: GhostscriptTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GhostscriptTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GhostscriptTest-GhostscriptTest.obj `if test -f 'GhostscriptTest.cpp'; then $(CYGPATH_W) 'GhostscriptTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GhostscriptTest.cpp'; fi`
 
+GraphicsPathParserTest-GraphicsPathParserTest.o: GraphicsPathParserTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GraphicsPathParserTest-GraphicsPathParserTest.o -MD -MP -MF $(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Tpo -c -o GraphicsPathParserTest-GraphicsPathParserTest.o `test -f 'GraphicsPathParserTest.cpp' || echo '$(srcdir)/'`GraphicsPathParserTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Tpo $(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GraphicsPathParserTest.cpp' object='GraphicsPathParserTest-GraphicsPathParserTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GraphicsPathParserTest-GraphicsPathParserTest.o `test -f 'GraphicsPathParserTest.cpp' || echo '$(srcdir)/'`GraphicsPathParserTest.cpp
+
+GraphicsPathParserTest-GraphicsPathParserTest.obj: GraphicsPathParserTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GraphicsPathParserTest-GraphicsPathParserTest.obj -MD -MP -MF $(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Tpo -c -o GraphicsPathParserTest-GraphicsPathParserTest.obj `if test -f 'GraphicsPathParserTest.cpp'; then $(CYGPATH_W) 'GraphicsPathParserTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GraphicsPathParserTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Tpo $(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GraphicsPathParserTest.cpp' object='GraphicsPathParserTest-GraphicsPathParserTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathParserTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GraphicsPathParserTest-GraphicsPathParserTest.obj `if test -f 'GraphicsPathParserTest.cpp'; then $(CYGPATH_W) 'GraphicsPathParserTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GraphicsPathParserTest.cpp'; fi`
+
 GraphicsPathTest-GraphicsPathTest.o: GraphicsPathTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GraphicsPathTest-GraphicsPathTest.o -MD -MP -MF $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Tpo -c -o GraphicsPathTest-GraphicsPathTest.o `test -f 'GraphicsPathTest.cpp' || echo '$(srcdir)/'`GraphicsPathTest.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Tpo $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po
@@ -2717,7 +2742,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -2933,6 +2958,13 @@ GhostscriptTest.log: GhostscriptTest$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+GraphicsPathParserTest.log: GraphicsPathParserTest$(EXEEXT)
+	@p='GraphicsPathParserTest$(EXEEXT)'; \
+	b='GraphicsPathParserTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 GraphicsPathTest.log: GraphicsPathTest$(EXEEXT)
 	@p='GraphicsPathTest$(EXEEXT)'; \
 	b='GraphicsPathTest'; \
@@ -3192,7 +3224,6 @@ check-conv.log: check-conv
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -3325,6 +3356,7 @@ distclean: distclean-recursive
 	-rm -f ./$(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po
 	-rm -f ./$(DEPDIR)/GFReaderTest-GFReaderTest.Po
 	-rm -f ./$(DEPDIR)/GhostscriptTest-GhostscriptTest.Po
+	-rm -f ./$(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Po
 	-rm -f ./$(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po
 	-rm -f ./$(DEPDIR)/HashFunctionTest-HashFunctionTest.Po
 	-rm -f ./$(DEPDIR)/JFMReaderTest-JFMReaderTest.Po
@@ -3432,6 +3464,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f ./$(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po
 	-rm -f ./$(DEPDIR)/GFReaderTest-GFReaderTest.Po
 	-rm -f ./$(DEPDIR)/GhostscriptTest-GhostscriptTest.Po
+	-rm -f ./$(DEPDIR)/GraphicsPathParserTest-GraphicsPathParserTest.Po
 	-rm -f ./$(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po
 	-rm -f ./$(DEPDIR)/HashFunctionTest-HashFunctionTest.Po
 	-rm -f ./$(DEPDIR)/JFMReaderTest-JFMReaderTest.Po
diff --git a/dviware/dvisvgm/tests/data/Makefile.in b/dviware/dvisvgm/tests/data/Makefile.in
index 3b44c55df0..631a6a51ac 100644
--- a/dviware/dvisvgm/tests/data/Makefile.in
+++ b/dviware/dvisvgm/tests/data/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,12 +90,7 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = tests/data
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_code_coverage.m4 \
-	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +144,8 @@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
 CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -164,8 +161,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GCOV = @GCOV@
@@ -315,9 +314,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/data/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/data/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign tests/data/Makefile
+	  $(AUTOMAKE) --gnu tests/data/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -347,7 +346,6 @@ ctags CTAGS:
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am