diff options
Diffstat (limited to 'dviware/dvisvgm/tests')
68 files changed, 216 insertions, 123 deletions
diff --git a/dviware/dvisvgm/tests/BezierTest.cpp b/dviware/dvisvgm/tests/BezierTest.cpp index 058342ca4d..5a4724c642 100644 --- a/dviware/dvisvgm/tests/BezierTest.cpp +++ b/dviware/dvisvgm/tests/BezierTest.cpp @@ -2,7 +2,7 @@ ** BezierTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** @@ -34,60 +34,66 @@ const double EPS = 0.001; TEST(BezierTest, construct) { // quadratic Bézier curve - Bezier bezier1(DPair(0,0), DPair(12,12), DPair(24,6)); + QuadBezier bezier1(DPair(0,0), DPair(12,12), DPair(24,6)); EXPECT_EQ(bezier1.point(0), DPair(0,0)); - EXPECT_EQ(bezier1.point(1), DPair(8,8)); - EXPECT_EQ(bezier1.point(2), DPair(16,10)); - EXPECT_EQ(bezier1.point(3), DPair(24,6)); + EXPECT_EQ(bezier1.point(1), DPair(12,12)); + EXPECT_EQ(bezier1.point(2), DPair(24,6)); - // cubic Bézier curve - Bezier bezier2(DPair(0,0), DPair(12,12), DPair(24,6), DPair(19,-4)); + // cubic from quadratic (elevate degree) + CubicBezier bezier2(bezier1); EXPECT_EQ(bezier2.point(0), DPair(0,0)); - EXPECT_EQ(bezier2.point(1), DPair(12,12)); - EXPECT_EQ(bezier2.point(2), DPair(24,6)); - EXPECT_EQ(bezier2.point(3), DPair(19,-4)); + EXPECT_EQ(bezier2.point(1), DPair(8,8)); + EXPECT_EQ(bezier2.point(2), DPair(16,10)); + EXPECT_EQ(bezier2.point(3), DPair(24,6)); + + // cubic Bézier curve + CubicBezier bezier3(DPair(0,0), DPair(12,12), DPair(24,6), DPair(19,-4)); + EXPECT_EQ(bezier3.point(0), DPair(0,0)); + EXPECT_EQ(bezier3.point(1), DPair(12,12)); + EXPECT_EQ(bezier3.point(2), DPair(24,6)); + EXPECT_EQ(bezier3.point(3), DPair(19,-4)); } TEST(BezierTest, subcurve) { - Bezier bezier1(DPair(0,0), DPair(12,12), DPair(24,6), DPair(19,-4)); + CubicBezier bezier1(DPair(0,0), DPair(12,12), DPair(24,6), DPair(19,-4)); { - Bezier subcurve(bezier1, 0, 1); + CubicBezier subcurve(bezier1, 0, 1); EXPECT_EQ(subcurve.point(0), DPair(0,0)); EXPECT_EQ(subcurve.point(1), DPair(12,12)); EXPECT_EQ(subcurve.point(2), DPair(24,6)); EXPECT_EQ(subcurve.point(3), DPair(19,-4)); } { - Bezier subcurve(bezier1, 0, 0.5); + CubicBezier subcurve(bezier1, 0, 0.5); EXPECT_EQ(subcurve.point(0), DPair(0,0)); EXPECT_EQ(subcurve.point(1), DPair(6,6)); EXPECT_EQ(subcurve.point(2), DPair(12,7.5)); EXPECT_EQ(subcurve.point(3), DPair(15.875,6.25)); } { - Bezier subcurve(bezier1, 1, 0.5); + CubicBezier subcurve(bezier1, 1, 0.5); EXPECT_EQ(subcurve.point(0), DPair(15.875,6.25)); EXPECT_EQ(subcurve.point(1), DPair(19.75,5)); EXPECT_EQ(subcurve.point(2), DPair(21.5,1)); EXPECT_EQ(subcurve.point(3), DPair(19,-4)); } { - Bezier subcurve(bezier1, 0.2, 0.8); + CubicBezier subcurve(bezier1, 0.2, 0.8); EXPECT_PAIR_NEAR(subcurve.point(0), DPair(7.064,5.152)); EXPECT_PAIR_NEAR(subcurve.point(1), DPair(13.856,8.368)); EXPECT_PAIR_NEAR(subcurve.point(2), DPair(19.424,6.112)); EXPECT_PAIR_NEAR(subcurve.point(3), DPair(20.096,1.408)); } { - Bezier subcurve(bezier1, 0, 0); + CubicBezier subcurve(bezier1, 0, 0); EXPECT_EQ(subcurve.point(0), DPair(0,0)); EXPECT_EQ(subcurve.point(1), DPair(0,0)); EXPECT_EQ(subcurve.point(2), DPair(0,0)); EXPECT_EQ(subcurve.point(3), DPair(0,0)); } { - Bezier subcurve(bezier1, 1, 1); + CubicBezier subcurve(bezier1, 1, 1); EXPECT_EQ(subcurve.point(0), DPair(19,-4)); EXPECT_EQ(subcurve.point(1), DPair(19,-4)); EXPECT_EQ(subcurve.point(2), DPair(19,-4)); @@ -97,7 +103,7 @@ TEST(BezierTest, subcurve) { TEST(BezierTest, reverse) { - Bezier bezier(DPair(0,0), DPair(12,12), DPair(24,6), DPair(19,-4)); + CubicBezier bezier(DPair(0,0), DPair(12,12), DPair(24,6), DPair(19,-4)); bezier.reverse(); EXPECT_EQ(bezier.point(0), DPair(19,-4)); EXPECT_EQ(bezier.point(1), DPair(24,6)); @@ -107,7 +113,7 @@ TEST(BezierTest, reverse) { TEST(BezierTest, bbox) { - Bezier bezier(DPair(0,0), DPair(12,12), DPair(24,6), DPair(30,-5)); + CubicBezier bezier(DPair(0,0), DPair(12,12), DPair(24,6), DPair(30,-5)); EXPECT_BBOX_NEAR(bezier.getBBox(), BoundingBox(0, -5, 30, 6.598)); } @@ -115,7 +121,7 @@ TEST(BezierTest, bbox) { TEST(BezierTest, approximate) { vector<DPair> points; vector<double> times; - Bezier bezier(DPair(0,0), DPair(12,12), DPair(24,6), DPair(30,-5)); + CubicBezier bezier(DPair(0,0), DPair(12,12), DPair(24,6), DPair(30,-5)); size_t size = bezier.approximate(0.1, points, ×); double t[] = {0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 1}; DPair p[] = { @@ -134,7 +140,7 @@ TEST(BezierTest, approximate) { TEST(BezierTest, reduceDegree) { vector<DPair> points; - Bezier bezier(DPair(0,0), DPair(5,10), DPair(10,5)); + CubicBezier bezier(QuadBezier(DPair(0,0), DPair(5,10), DPair(10,5))); int degree = bezier.reduceDegree(0.1, points); EXPECT_EQ(degree, 2); EXPECT_EQ(points[0], DPair(0,0)); diff --git a/dviware/dvisvgm/tests/BitmapTest.cpp b/dviware/dvisvgm/tests/BitmapTest.cpp index 7fdb51073a..eacc8530dd 100644 --- a/dviware/dvisvgm/tests/BitmapTest.cpp +++ b/dviware/dvisvgm/tests/BitmapTest.cpp @@ -2,7 +2,7 @@ ** BitmapTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/BoundingBoxTest.cpp b/dviware/dvisvgm/tests/BoundingBoxTest.cpp index 3810983958..6916dac08d 100644 --- a/dviware/dvisvgm/tests/BoundingBoxTest.cpp +++ b/dviware/dvisvgm/tests/BoundingBoxTest.cpp @@ -2,7 +2,7 @@ ** BoundingBoxTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/CMapManagerTest.cpp b/dviware/dvisvgm/tests/CMapManagerTest.cpp index 3b1fbbcf7c..185186b5f3 100644 --- a/dviware/dvisvgm/tests/CMapManagerTest.cpp +++ b/dviware/dvisvgm/tests/CMapManagerTest.cpp @@ -2,7 +2,7 @@ ** CMapManagerTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/CMapReaderTest.cpp b/dviware/dvisvgm/tests/CMapReaderTest.cpp index 7507910da5..c3387b3041 100644 --- a/dviware/dvisvgm/tests/CMapReaderTest.cpp +++ b/dviware/dvisvgm/tests/CMapReaderTest.cpp @@ -2,7 +2,7 @@ ** CMapReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/CMapTest.cpp b/dviware/dvisvgm/tests/CMapTest.cpp index bbbf3ad0db..10de080cf2 100644 --- a/dviware/dvisvgm/tests/CMapTest.cpp +++ b/dviware/dvisvgm/tests/CMapTest.cpp @@ -2,7 +2,7 @@ ** CMapTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/CalculatorTest.cpp b/dviware/dvisvgm/tests/CalculatorTest.cpp index 600a4f136d..9e0119371f 100644 --- a/dviware/dvisvgm/tests/CalculatorTest.cpp +++ b/dviware/dvisvgm/tests/CalculatorTest.cpp @@ -2,7 +2,7 @@ ** CalculatorTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/ColorSpecialTest.cpp b/dviware/dvisvgm/tests/ColorSpecialTest.cpp index 7211ba0753..cdbdb6b8f9 100644 --- a/dviware/dvisvgm/tests/ColorSpecialTest.cpp +++ b/dviware/dvisvgm/tests/ColorSpecialTest.cpp @@ -2,7 +2,7 @@ ** ColorSpecialTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/ColorTest.cpp b/dviware/dvisvgm/tests/ColorTest.cpp index aa5b18b716..ed41fb253c 100644 --- a/dviware/dvisvgm/tests/ColorTest.cpp +++ b/dviware/dvisvgm/tests/ColorTest.cpp @@ -2,7 +2,7 @@ ** ColorTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/CommandLineTest.cpp b/dviware/dvisvgm/tests/CommandLineTest.cpp index 7e28c334cf..06a4d08078 100644 --- a/dviware/dvisvgm/tests/CommandLineTest.cpp +++ b/dviware/dvisvgm/tests/CommandLineTest.cpp @@ -2,7 +2,7 @@ ** CommandLineTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/DVIReaderTest.cpp b/dviware/dvisvgm/tests/DVIReaderTest.cpp index 6473513876..47711a77c8 100644 --- a/dviware/dvisvgm/tests/DVIReaderTest.cpp +++ b/dviware/dvisvgm/tests/DVIReaderTest.cpp @@ -2,7 +2,7 @@ ** DVIReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/DependencyGraphTest.cpp b/dviware/dvisvgm/tests/DependencyGraphTest.cpp index 2f73c00bb1..fd8ee29fd1 100644 --- a/dviware/dvisvgm/tests/DependencyGraphTest.cpp +++ b/dviware/dvisvgm/tests/DependencyGraphTest.cpp @@ -2,7 +2,7 @@ ** DependencyGraphTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/DirectoryTest.cpp b/dviware/dvisvgm/tests/DirectoryTest.cpp index 2df574b06a..ff7b276457 100644 --- a/dviware/dvisvgm/tests/DirectoryTest.cpp +++ b/dviware/dvisvgm/tests/DirectoryTest.cpp @@ -2,7 +2,7 @@ ** DirectoryTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp b/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp index abc8535221..873453ebb1 100644 --- a/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp +++ b/dviware/dvisvgm/tests/DvisvgmSpecialTest.cpp @@ -2,7 +2,7 @@ ** DvisvgmSpecialTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.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,15 +30,20 @@ using namespace std; class MyDvisvgmSpecialHandler : public DvisvgmSpecialHandler { public: + explicit MyDvisvgmSpecialHandler (EmptySpecialActions &actions) : _actions(actions) {} void finishPreprocessing () {dviPreprocessingFinished();} + void beginPage () {dviBeginPage(0, _actions);} void finishPage () {dviEndPage(0, _actions);} protected: - EmptySpecialActions _actions; + EmptySpecialActions &_actions; }; class DvisvgmSpecialTest : public ::testing::Test { + public: + DvisvgmSpecialTest () : handler(recorder) {} + protected: class ActionsRecorder : public EmptySpecialActions { public: @@ -59,7 +64,7 @@ class DvisvgmSpecialTest : public ::testing::Test { } protected: - string toString (const XMLNode *node) const { + static string toString (const XMLNode *node) { ostringstream oss; if (node) node->write(oss); @@ -72,12 +77,13 @@ class DvisvgmSpecialTest : public ::testing::Test { void SetUp () override { recorder.clear(); + handler.beginPage(); XMLElement::WRITE_NEWLINES = false; } protected: - MyDvisvgmSpecialHandler handler; ActionsRecorder recorder; + MyDvisvgmSpecialHandler handler; }; diff --git a/dviware/dvisvgm/tests/EllipticalArcTest.cpp b/dviware/dvisvgm/tests/EllipticalArcTest.cpp index babddde215..7edd7666f6 100644 --- a/dviware/dvisvgm/tests/EllipticalArcTest.cpp +++ b/dviware/dvisvgm/tests/EllipticalArcTest.cpp @@ -2,7 +2,7 @@ ** EllipticalArcTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/EmSpecialTest.cpp b/dviware/dvisvgm/tests/EmSpecialTest.cpp index 60aef9ba2a..a2c12daeae 100644 --- a/dviware/dvisvgm/tests/EmSpecialTest.cpp +++ b/dviware/dvisvgm/tests/EmSpecialTest.cpp @@ -2,7 +2,7 @@ ** EmSpecialTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/FileFinderTest.cpp b/dviware/dvisvgm/tests/FileFinderTest.cpp index 07e4071d55..95145fbb25 100644 --- a/dviware/dvisvgm/tests/FileFinderTest.cpp +++ b/dviware/dvisvgm/tests/FileFinderTest.cpp @@ -2,7 +2,7 @@ ** FileFinderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/FilePathTest.cpp b/dviware/dvisvgm/tests/FilePathTest.cpp index 75d7166a66..96ac6c85f8 100644 --- a/dviware/dvisvgm/tests/FilePathTest.cpp +++ b/dviware/dvisvgm/tests/FilePathTest.cpp @@ -2,7 +2,7 @@ ** FilePathTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/FileSystemTest.cpp b/dviware/dvisvgm/tests/FileSystemTest.cpp index b0a392db3e..5e4f5059d6 100644 --- a/dviware/dvisvgm/tests/FileSystemTest.cpp +++ b/dviware/dvisvgm/tests/FileSystemTest.cpp @@ -2,7 +2,7 @@ ** FileSystemTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/FontCacheTest.cpp b/dviware/dvisvgm/tests/FontCacheTest.cpp index 56853ca73e..c53aed2841 100644 --- a/dviware/dvisvgm/tests/FontCacheTest.cpp +++ b/dviware/dvisvgm/tests/FontCacheTest.cpp @@ -2,7 +2,7 @@ ** FontCacheTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/FontManagerTest.cpp b/dviware/dvisvgm/tests/FontManagerTest.cpp index 1d14478a4f..c754f6be11 100644 --- a/dviware/dvisvgm/tests/FontManagerTest.cpp +++ b/dviware/dvisvgm/tests/FontManagerTest.cpp @@ -2,7 +2,7 @@ ** FontManagerTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/FontMapTest.cpp b/dviware/dvisvgm/tests/FontMapTest.cpp index 9f88d4d129..2ce66ac94c 100644 --- a/dviware/dvisvgm/tests/FontMapTest.cpp +++ b/dviware/dvisvgm/tests/FontMapTest.cpp @@ -2,7 +2,7 @@ ** FontMapTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp b/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp index 4ec071c174..5cf923bf19 100644 --- a/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp +++ b/dviware/dvisvgm/tests/GFGlyphTracerTest.cpp @@ -2,7 +2,7 @@ ** GFGlyphTracerTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/GFReaderTest.cpp b/dviware/dvisvgm/tests/GFReaderTest.cpp index eb5246e175..7baee9eed3 100644 --- a/dviware/dvisvgm/tests/GFReaderTest.cpp +++ b/dviware/dvisvgm/tests/GFReaderTest.cpp @@ -2,7 +2,7 @@ ** GFReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/GhostscriptTest.cpp b/dviware/dvisvgm/tests/GhostscriptTest.cpp index b01c08f52a..2ae3991b60 100644 --- a/dviware/dvisvgm/tests/GhostscriptTest.cpp +++ b/dviware/dvisvgm/tests/GhostscriptTest.cpp @@ -2,7 +2,7 @@ ** GhostscriptTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp b/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp index 15298c299f..7de23c9374 100644 --- a/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp +++ b/dviware/dvisvgm/tests/GraphicsPathParserTest.cpp @@ -2,7 +2,7 @@ ** GraphicsPathParserTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/GraphicsPathTest.cpp b/dviware/dvisvgm/tests/GraphicsPathTest.cpp index feabb61dcb..973542984b 100644 --- a/dviware/dvisvgm/tests/GraphicsPathTest.cpp +++ b/dviware/dvisvgm/tests/GraphicsPathTest.cpp @@ -2,7 +2,7 @@ ** GraphicsPathTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/HashFunctionTest.cpp b/dviware/dvisvgm/tests/HashFunctionTest.cpp index 26d6cf542c..7c2704c86c 100644 --- a/dviware/dvisvgm/tests/HashFunctionTest.cpp +++ b/dviware/dvisvgm/tests/HashFunctionTest.cpp @@ -2,7 +2,7 @@ ** HashFunctionTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/JFMReaderTest.cpp b/dviware/dvisvgm/tests/JFMReaderTest.cpp index 65f807ef4b..6ca10c7a83 100644 --- a/dviware/dvisvgm/tests/JFMReaderTest.cpp +++ b/dviware/dvisvgm/tests/JFMReaderTest.cpp @@ -2,7 +2,7 @@ ** JFMReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/LengthTest.cpp b/dviware/dvisvgm/tests/LengthTest.cpp index 7c5edcc8ff..c0f4f76041 100644 --- a/dviware/dvisvgm/tests/LengthTest.cpp +++ b/dviware/dvisvgm/tests/LengthTest.cpp @@ -2,7 +2,7 @@ ** LengthTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/Makefile.am b/dviware/dvisvgm/tests/Makefile.am index 2faaacf353..3197481f7a 100644 --- a/dviware/dvisvgm/tests/Makefile.am +++ b/dviware/dvisvgm/tests/Makefile.am @@ -1,5 +1,5 @@ ## This file is part of dvisvgm -## Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> +## Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ## ## Process this file with automake. @@ -53,9 +53,6 @@ hashcheck.cpp: genhashcheck.py $(dvisvgm_srcdir)/src/AGLTable.hpp $(dvisvgm_srcd python $^ >$@ TESTLIBS = libgtest.la ../src/libdvisvgm.la $(LIBS_LIBS) -lfreetype -if ENABLE_WOFF -TESTLIBS += ../libs/ff-woff/libfontforge.a -endif TESTLIBS += $(CODE_COVERAGE_LDFLAGS) TESTS += BezierTest @@ -421,6 +418,4 @@ XMLStringTest_LDADD = $(TESTLIBS) EXTRA_DIST += check-conv genhashcheck.py normalize.xsl TESTS += check-conv -@CODE_COVERAGE_RULES@ - CLEANFILES = *.gcda *.gcno hashcheck.cpp diff --git a/dviware/dvisvgm/tests/Makefile.in b/dviware/dvisvgm/tests/Makefile.in index f6359bad6c..05fd5a87b9 100644 --- a/dviware/dvisvgm/tests/Makefile.in +++ b/dviware/dvisvgm/tests/Makefile.in @@ -87,7 +87,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ @HAVE_BROTLI_FALSE@am__append_1 = -I$(dvisvgm_srcdir)/libs/brotli/include @HAVE_BROTLI_FALSE@am__append_2 = ../libs/brotli/libbrotli.a @HAVE_WOFF2_FALSE@am__append_3 = -I$(dvisvgm_srcdir)/libs/woff2/include @@ -158,10 +157,20 @@ check_PROGRAMS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) \ UtilityTest$(EXEEXT) VectorIteratorTest$(EXEEXT) \ VectorStreamTest$(EXEEXT) XMLNodeTest$(EXEEXT) \ XMLStringTest$(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)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_ac_append_to_file.m4 \ + $(top_srcdir)/m4/ax_ac_print_to_file.m4 \ + $(top_srcdir)/m4/ax_add_am_macro_static.m4 \ + $(top_srcdir)/m4/ax_am_macros_static.m4 \ + $(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/ax_file_escapes.m4 \ + $(top_srcdir)/m4/ax_gcc_builtin.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__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -192,7 +201,7 @@ am__DEPENDENCIES_4 = am__DEPENDENCIES_6 = $(POTRACE_LIBS) $(XXHASH_LIBS) \ $(am__DEPENDENCIES_3) $(am__append_7) $(am__DEPENDENCIES_5) am__DEPENDENCIES_7 = libgtest.la ../src/libdvisvgm.la \ - $(am__DEPENDENCIES_6) $(am__append_10) $(am__DEPENDENCIES_4) + $(am__DEPENDENCIES_6) BezierTest_DEPENDENCIES = $(am__DEPENDENCIES_7) am_BitmapTest_OBJECTS = BitmapTest-BitmapTest.$(OBJEXT) BitmapTest_OBJECTS = $(am_BitmapTest_OBJECTS) @@ -872,7 +881,6 @@ CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ -CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -988,6 +996,8 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +ifGNUmake = @ifGNUmake@ +ifnGNUmake = @ifnGNUmake@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -1007,11 +1017,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -1043,7 +1049,7 @@ nodist_hashcheck_SOURCES = hashcheck.cpp hashcheck_CPPFLAGS = $(LIBS_CFLAGS) hashcheck_LDADD = $(LIBS_LIBS) TESTLIBS = libgtest.la ../src/libdvisvgm.la $(LIBS_LIBS) -lfreetype \ - $(am__append_10) $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) BezierTest_SOURCES = BezierTest.cpp testutil.hpp BezierTest_CPPFLAGS = -I$(dvisvgm_srcdir)/tests/gtest/include $(LIBS_CFLAGS) BezierTest_LDADD = $(TESTLIBS) @@ -1238,9 +1244,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../libs/defs.am $(am__co exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile + $(AUTOMAKE) --foreign tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -3544,8 +3550,6 @@ uninstall-am: hashcheck.cpp: genhashcheck.py $(dvisvgm_srcdir)/src/AGLTable.hpp $(dvisvgm_srcdir)/libs/xxHash/xxhash.h python $^ >$@ -@CODE_COVERAGE_RULES@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/dviware/dvisvgm/tests/MapLineTest.cpp b/dviware/dvisvgm/tests/MapLineTest.cpp index e49ba3bd95..b38f274281 100644 --- a/dviware/dvisvgm/tests/MapLineTest.cpp +++ b/dviware/dvisvgm/tests/MapLineTest.cpp @@ -2,7 +2,7 @@ ** MapLineTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/MatrixTest.cpp b/dviware/dvisvgm/tests/MatrixTest.cpp index 18d6ae0855..3ff8257b43 100644 --- a/dviware/dvisvgm/tests/MatrixTest.cpp +++ b/dviware/dvisvgm/tests/MatrixTest.cpp @@ -2,7 +2,7 @@ ** MatrixTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/MessageExceptionTest.cpp b/dviware/dvisvgm/tests/MessageExceptionTest.cpp index 13ab01f155..4de260b272 100644 --- a/dviware/dvisvgm/tests/MessageExceptionTest.cpp +++ b/dviware/dvisvgm/tests/MessageExceptionTest.cpp @@ -2,7 +2,7 @@ ** MessageExceptionTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/PDFParserTest.cpp b/dviware/dvisvgm/tests/PDFParserTest.cpp index 292d1df177..555ced406d 100644 --- a/dviware/dvisvgm/tests/PDFParserTest.cpp +++ b/dviware/dvisvgm/tests/PDFParserTest.cpp @@ -2,7 +2,7 @@ ** PDFParserTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/PSInterpreterTest.cpp b/dviware/dvisvgm/tests/PSInterpreterTest.cpp index 74eed6959f..76f27af3a9 100644 --- a/dviware/dvisvgm/tests/PSInterpreterTest.cpp +++ b/dviware/dvisvgm/tests/PSInterpreterTest.cpp @@ -2,7 +2,7 @@ ** PSInterpreterTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/PageRagesTest.cpp b/dviware/dvisvgm/tests/PageRagesTest.cpp index 6b0e00878b..465c806a48 100644 --- a/dviware/dvisvgm/tests/PageRagesTest.cpp +++ b/dviware/dvisvgm/tests/PageRagesTest.cpp @@ -2,7 +2,7 @@ ** PageRagesTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** @@ -154,10 +154,43 @@ TEST(PageRangesTest, overlap4) { } +TEST(PageRangesTest, even1) { + PageRanges pr; + ASSERT_TRUE(pr.parse("3-7, 1, 6-9:even")); + EXPECT_EQ(pr.size(), 3u); + Range cmp[] = {{4,4},{6,6},{8,8}}; + EXPECT_TRUE(is_equal(pr, cmp)); +} + + +TEST(PageRangesTest, even2) { + PageRanges pr; + ASSERT_TRUE(pr.parse("1,3,5:even")); + EXPECT_EQ(pr.size(), 0u); +} + + +TEST(PageRangesTest, odd1) { + PageRanges pr; + ASSERT_TRUE(pr.parse("3-7, 1, 6-9:odd")); + EXPECT_EQ(pr.size(), 5u); + Range cmp[] = {{1,1},{3,3},{5,5},{7,7},{9,9}}; + EXPECT_TRUE(is_equal(pr, cmp)); +} + + +TEST(PageRangesTest, odd2) { + PageRanges pr; + ASSERT_TRUE(pr.parse("2,8,10:odd")); + EXPECT_EQ(pr.size(), 0u); +} + + 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,")); + EXPECT_FALSE(pr.parse("x")); + EXPECT_FALSE(pr.parse("5-x")); + EXPECT_FALSE(pr.parse("5 6")); + EXPECT_FALSE(pr.parse("5,")); + EXPECT_FALSE(pr.parse("1-9:dummy")); } diff --git a/dviware/dvisvgm/tests/PageSizeTest.cpp b/dviware/dvisvgm/tests/PageSizeTest.cpp index eb562e38bf..cb69f76a28 100644 --- a/dviware/dvisvgm/tests/PageSizeTest.cpp +++ b/dviware/dvisvgm/tests/PageSizeTest.cpp @@ -2,7 +2,7 @@ ** PageSizeTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/PairTest.cpp b/dviware/dvisvgm/tests/PairTest.cpp index c53b270c6f..a5c9b8f896 100644 --- a/dviware/dvisvgm/tests/PairTest.cpp +++ b/dviware/dvisvgm/tests/PairTest.cpp @@ -2,7 +2,7 @@ ** PairTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp b/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp index 536f6ff0a8..9f49f935be 100644 --- a/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp +++ b/dviware/dvisvgm/tests/PapersizeSpecialTest.cpp @@ -2,7 +2,7 @@ ** PapersizeSpecialTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/RangeMapTest.cpp b/dviware/dvisvgm/tests/RangeMapTest.cpp index 34ee95ebe6..25701fcd6f 100644 --- a/dviware/dvisvgm/tests/RangeMapTest.cpp +++ b/dviware/dvisvgm/tests/RangeMapTest.cpp @@ -2,7 +2,7 @@ ** RangeMapTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/SVGOutputTest.cpp b/dviware/dvisvgm/tests/SVGOutputTest.cpp index 5544c7bfe2..9ea39e6311 100644 --- a/dviware/dvisvgm/tests/SVGOutputTest.cpp +++ b/dviware/dvisvgm/tests/SVGOutputTest.cpp @@ -2,7 +2,7 @@ ** SVGOutputTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/ShadingPatchTest.cpp b/dviware/dvisvgm/tests/ShadingPatchTest.cpp index 066617c029..8d79ba5a4f 100644 --- a/dviware/dvisvgm/tests/ShadingPatchTest.cpp +++ b/dviware/dvisvgm/tests/ShadingPatchTest.cpp @@ -2,7 +2,7 @@ ** ShadingPatchTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/SpecialManagerTest.cpp b/dviware/dvisvgm/tests/SpecialManagerTest.cpp index e3da75a417..a425029c74 100644 --- a/dviware/dvisvgm/tests/SpecialManagerTest.cpp +++ b/dviware/dvisvgm/tests/SpecialManagerTest.cpp @@ -2,7 +2,7 @@ ** SpecialManagerTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp b/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp index df5ec5d1d6..de393100e2 100644 --- a/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp +++ b/dviware/dvisvgm/tests/SplittedCharInputBufferTest.cpp @@ -2,7 +2,7 @@ ** SplittedCharInputBufferTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/StreamInputBufferTest.cpp b/dviware/dvisvgm/tests/StreamInputBufferTest.cpp index 1d9e7e31ce..428c50f945 100644 --- a/dviware/dvisvgm/tests/StreamInputBufferTest.cpp +++ b/dviware/dvisvgm/tests/StreamInputBufferTest.cpp @@ -2,7 +2,7 @@ ** StreamInputBufferTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/StreamReaderTest.cpp b/dviware/dvisvgm/tests/StreamReaderTest.cpp index 56d21d4da2..c1ed3b60bc 100644 --- a/dviware/dvisvgm/tests/StreamReaderTest.cpp +++ b/dviware/dvisvgm/tests/StreamReaderTest.cpp @@ -2,7 +2,7 @@ ** StreamReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/StreamWriterTest.cpp b/dviware/dvisvgm/tests/StreamWriterTest.cpp index a84d5cfb70..931ca04095 100644 --- a/dviware/dvisvgm/tests/StreamWriterTest.cpp +++ b/dviware/dvisvgm/tests/StreamWriterTest.cpp @@ -2,7 +2,7 @@ ** StreamWriterTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/StringMatcherTest.cpp b/dviware/dvisvgm/tests/StringMatcherTest.cpp index e8979424d7..5383595fc5 100644 --- a/dviware/dvisvgm/tests/StringMatcherTest.cpp +++ b/dviware/dvisvgm/tests/StringMatcherTest.cpp @@ -2,7 +2,7 @@ ** StringMatcherTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/SubfontTest.cpp b/dviware/dvisvgm/tests/SubfontTest.cpp index adac8d1648..1a43465cfb 100644 --- a/dviware/dvisvgm/tests/SubfontTest.cpp +++ b/dviware/dvisvgm/tests/SubfontTest.cpp @@ -2,7 +2,7 @@ ** SubfontTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/TFMReaderTest.cpp b/dviware/dvisvgm/tests/TFMReaderTest.cpp index 9123ceb9e9..40d40e2967 100644 --- a/dviware/dvisvgm/tests/TFMReaderTest.cpp +++ b/dviware/dvisvgm/tests/TFMReaderTest.cpp @@ -2,7 +2,7 @@ ** TFMReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/TensorProductPatchTest.cpp b/dviware/dvisvgm/tests/TensorProductPatchTest.cpp index 0453cb2835..3381d46d7f 100644 --- a/dviware/dvisvgm/tests/TensorProductPatchTest.cpp +++ b/dviware/dvisvgm/tests/TensorProductPatchTest.cpp @@ -2,7 +2,7 @@ ** TensorProductPatchTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** @@ -78,7 +78,7 @@ class TensorProductPatchTest : public ::testing::Test { _patch.setColors(colors, 0, 0); } - void checkBezierPoints (const Bezier &b, const DPair &p1, const DPair &p2, const DPair &p3, const DPair &p4) const { + void checkBezierPoints (const CubicBezier &b, const DPair &p1, const DPair &p2, const DPair &p3, const DPair &p4) const { EXPECT_EQ(b.point(0), p1); EXPECT_EQ(b.point(1), p2); EXPECT_EQ(b.point(2), p3); @@ -184,7 +184,7 @@ TEST_F(TensorProductPatchTest, vertices) { TEST_F(TensorProductPatchTest, curves) { - Bezier bezier; + CubicBezier bezier; _patch.horizontalCurve(0, bezier); CHECK_BEZIER_POINTS("A", bezier, DPair(10, 10), DPair(20, 0), DPair(50, 30), DPair(70, 20)); _patch.horizontalCurve(1, bezier); diff --git a/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp b/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp index 5cfa366bd9..2cc49e2b3e 100644 --- a/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp +++ b/dviware/dvisvgm/tests/ToUnicodeMapTest.cpp @@ -2,7 +2,7 @@ ** ToUnicodeMapTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/TpicSpecialTest.cpp b/dviware/dvisvgm/tests/TpicSpecialTest.cpp index fc98e02017..04f112792a 100644 --- a/dviware/dvisvgm/tests/TpicSpecialTest.cpp +++ b/dviware/dvisvgm/tests/TpicSpecialTest.cpp @@ -2,7 +2,7 @@ ** TpicSpecialTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/TriangularPatchTest.cpp b/dviware/dvisvgm/tests/TriangularPatchTest.cpp index 780fba77e0..068a280681 100644 --- a/dviware/dvisvgm/tests/TriangularPatchTest.cpp +++ b/dviware/dvisvgm/tests/TriangularPatchTest.cpp @@ -2,7 +2,7 @@ ** TriangularPatchTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/UnicodeTest.cpp b/dviware/dvisvgm/tests/UnicodeTest.cpp index 2cb8753e0b..c5429810f4 100644 --- a/dviware/dvisvgm/tests/UnicodeTest.cpp +++ b/dviware/dvisvgm/tests/UnicodeTest.cpp @@ -2,7 +2,7 @@ ** UnicodeTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/UtilityTest.cpp b/dviware/dvisvgm/tests/UtilityTest.cpp index b0f0320f69..4c920e417c 100644 --- a/dviware/dvisvgm/tests/UtilityTest.cpp +++ b/dviware/dvisvgm/tests/UtilityTest.cpp @@ -2,7 +2,7 @@ ** UtilityTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** @@ -146,3 +146,45 @@ TEST(UtilityTest, base64_copy) { ASSERT_EQ(base64("abcd"), "YWJjZA=="); ASSERT_EQ(base64("aBcDe\nFgHiJ\n"), "YUJjRGUKRmdIaUoK"); } + + +TEST(UtilityTest, count_leading_zeros) { + EXPECT_EQ(count_leading_zeros(int8_t(0)), 8); + EXPECT_EQ(count_leading_zeros(int16_t(0)), 16); + EXPECT_EQ(count_leading_zeros(int32_t(0)), 32); + for (int i=0; i < 8; i++) { + EXPECT_EQ(count_leading_zeros(uint8_t(1 << i)), 7-i); + EXPECT_EQ(count_leading_zeros(uint8_t((1 << i) | 1)), 7-i); + EXPECT_EQ(count_leading_zeros(uint8_t(0xff >> i)), i); + } + for (int i=0; i < 16; i++) { + EXPECT_EQ(count_leading_zeros(uint16_t(1 << i)), 15-i); + EXPECT_EQ(count_leading_zeros(uint16_t((1 << i) | 1)), 15-i); + EXPECT_EQ(count_leading_zeros(uint16_t(0xffff >> i)), i); + } + for (int i=0; i < 32; i++) { + EXPECT_EQ(count_leading_zeros(uint32_t(1 << i)), 31-i); + EXPECT_EQ(count_leading_zeros(uint32_t((1 << i) | 1)), 31-i); + EXPECT_EQ(count_leading_zeros(uint32_t(0xffffffff >> i)), i); + } +} + + +TEST(UtilityTest, ilog2) { + EXPECT_EQ(ilog2(0), -1); + for (int i=0; i < 8; i++) { + EXPECT_EQ(ilog2(uint8_t(1 << i)), i); + EXPECT_EQ(ilog2(uint8_t((1 << i)|1)), i); + EXPECT_EQ(ilog2(uint8_t(0xff >> i)), 7-i); + } + for (int i=0; i < 16; i++) { + EXPECT_EQ(ilog2(uint16_t(1 << i)), i); + EXPECT_EQ(ilog2(uint16_t((1 << i)|1)), i); + EXPECT_EQ(ilog2(uint16_t(0xffff >> i)), 15-i); + } + for (int i=0; i < 32; i++) { + EXPECT_EQ(ilog2(uint32_t(1 << i)), i); + EXPECT_EQ(ilog2(uint32_t((1 << i)|1)), i); + EXPECT_EQ(ilog2(uint32_t(0xffffffff >> i)), 31-i); + } +} diff --git a/dviware/dvisvgm/tests/VectorIteratorTest.cpp b/dviware/dvisvgm/tests/VectorIteratorTest.cpp index 13d17de2a3..45d54e245d 100644 --- a/dviware/dvisvgm/tests/VectorIteratorTest.cpp +++ b/dviware/dvisvgm/tests/VectorIteratorTest.cpp @@ -2,7 +2,7 @@ ** VectorIteratorTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/VectorStreamTest.cpp b/dviware/dvisvgm/tests/VectorStreamTest.cpp index e67dbfcbbe..497b3266eb 100644 --- a/dviware/dvisvgm/tests/VectorStreamTest.cpp +++ b/dviware/dvisvgm/tests/VectorStreamTest.cpp @@ -2,7 +2,7 @@ ** VectorStreamTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/XMLNodeTest.cpp b/dviware/dvisvgm/tests/XMLNodeTest.cpp index 413a3a64da..bc65c681b0 100644 --- a/dviware/dvisvgm/tests/XMLNodeTest.cpp +++ b/dviware/dvisvgm/tests/XMLNodeTest.cpp @@ -2,7 +2,7 @@ ** XMLNodeTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/XMLStringTest.cpp b/dviware/dvisvgm/tests/XMLStringTest.cpp index 7896bd0ac1..65944573f7 100644 --- a/dviware/dvisvgm/tests/XMLStringTest.cpp +++ b/dviware/dvisvgm/tests/XMLStringTest.cpp @@ -2,7 +2,7 @@ ** XMLStringTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/check-conv b/dviware/dvisvgm/tests/check-conv index 2ab0f1199c..89ba4fd9b5 100755 --- a/dviware/dvisvgm/tests/check-conv +++ b/dviware/dvisvgm/tests/check-conv @@ -2,7 +2,7 @@ # This file is part of the dvisvgm package and published under the # terms of the GNU General Public License version 3 or later. # See file COPYING for further details. -# Copyright (C) 2009-2022 Martin Gieseking <martin.gieseking@uos.de> +# Copyright (C) 2009-2023 Martin Gieseking <martin.gieseking@uos.de> files=(sample frktest) diff --git a/dviware/dvisvgm/tests/data/Makefile.am b/dviware/dvisvgm/tests/data/Makefile.am index 62ab94c498..52caa64fef 100644 --- a/dviware/dvisvgm/tests/data/Makefile.am +++ b/dviware/dvisvgm/tests/data/Makefile.am @@ -1,5 +1,5 @@ ## This file is part of dvisvgm -## Copyright (C) 2016-2022 Martin Gieseking <martin.gieseking@uos.de> +## Copyright (C) 2016-2023 Martin Gieseking <martin.gieseking@uos.de> ## ## Process this file with automake. diff --git a/dviware/dvisvgm/tests/data/Makefile.in b/dviware/dvisvgm/tests/data/Makefile.in index 631a6a51ac..944d237691 100644 --- a/dviware/dvisvgm/tests/data/Makefile.in +++ b/dviware/dvisvgm/tests/data/Makefile.in @@ -87,10 +87,20 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ subdir = tests/data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_ac_append_to_file.m4 \ + $(top_srcdir)/m4/ax_ac_print_to_file.m4 \ + $(top_srcdir)/m4/ax_add_am_macro_static.m4 \ + $(top_srcdir)/m4/ax_am_macros_static.m4 \ + $(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/ax_file_escapes.m4 \ + $(top_srcdir)/m4/ax_gcc_builtin.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__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -140,7 +150,6 @@ CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ -CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -256,6 +265,8 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ +ifGNUmake = @ifGNUmake@ +ifnGNUmake = @ifnGNUmake@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,11 +286,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -314,9 +321,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/data/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/data/Makefile + $(AUTOMAKE) --foreign tests/data/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/dviware/dvisvgm/tests/genhashcheck.py b/dviware/dvisvgm/tests/genhashcheck.py index a145857a42..efa1f1ef48 100755 --- a/dviware/dvisvgm/tests/genhashcheck.py +++ b/dviware/dvisvgm/tests/genhashcheck.py @@ -2,7 +2,7 @@ # This file is part of the dvisvgm package and published under the # terms of the GNU General Public License version 3 or later. # See file COPYING for further details. -# Copyright (C) 2016-2022 Martin Gieseking <martin.gieseking@uos.de> +# Copyright (C) 2016-2023 Martin Gieseking <martin.gieseking@uos.de> import re import sys diff --git a/dviware/dvisvgm/tests/normalize.xsl b/dviware/dvisvgm/tests/normalize.xsl index ca9d2c639d..89df7ea746 100644 --- a/dviware/dvisvgm/tests/normalize.xsl +++ b/dviware/dvisvgm/tests/normalize.xsl @@ -2,7 +2,7 @@ <!-- ********************************************************************* ** Stylesheet to rearrange font-/path-elements in an SVG file. ** ** It's part of the dvisvgm package. ** -** Copyright (C) 2009-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2009-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** diff --git a/dviware/dvisvgm/tests/testmain.cpp b/dviware/dvisvgm/tests/testmain.cpp index 9003c19eaa..4c73ce4cf8 100644 --- a/dviware/dvisvgm/tests/testmain.cpp +++ b/dviware/dvisvgm/tests/testmain.cpp @@ -2,7 +2,7 @@ ** testmain.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** |