summaryrefslogtreecommitdiff
path: root/dviware/dvisvgm/src
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-22 03:01:37 +0000
committerNorbert Preining <norbert@preining.info>2023-02-22 03:01:37 +0000
commit470678475288a244fd8a9af69f9abc9b46b2860f (patch)
treeb39e9f327aaf2a4b10bada3897e374878369fccc /dviware/dvisvgm/src
parentb05164a5b679570a7040f2b28bbf156a0479c429 (diff)
CTAN sync 202302220301
Diffstat (limited to 'dviware/dvisvgm/src')
-rw-r--r--dviware/dvisvgm/src/BasicDVIReader.hpp2
-rw-r--r--dviware/dvisvgm/src/Bitmap.hpp1
-rw-r--r--dviware/dvisvgm/src/CMap.hpp1
-rw-r--r--dviware/dvisvgm/src/Color.hpp1
-rw-r--r--dviware/dvisvgm/src/DVIReader.hpp1
-rw-r--r--dviware/dvisvgm/src/FileSystem.hpp1
-rw-r--r--dviware/dvisvgm/src/InputBuffer.hpp1
-rw-r--r--dviware/dvisvgm/src/RangeMap.hpp1
-rw-r--r--dviware/dvisvgm/src/SVGTree.cpp4
-rw-r--r--dviware/dvisvgm/src/Unicode.hpp1
-rw-r--r--dviware/dvisvgm/src/ttf/TTFTable.hpp1
11 files changed, 13 insertions, 2 deletions
diff --git a/dviware/dvisvgm/src/BasicDVIReader.hpp b/dviware/dvisvgm/src/BasicDVIReader.hpp
index 1a63c4f320..1c2c414725 100644
--- a/dviware/dvisvgm/src/BasicDVIReader.hpp
+++ b/dviware/dvisvgm/src/BasicDVIReader.hpp
@@ -21,6 +21,8 @@
#ifndef BASICDVIREADER_HPP
#define BASICDVIREADER_HPP
+#include <cstdint>
+
#include "Matrix.hpp"
#include "MessageException.hpp"
#include "StreamReader.hpp"
diff --git a/dviware/dvisvgm/src/Bitmap.hpp b/dviware/dvisvgm/src/Bitmap.hpp
index a065ba1790..c12c98c8eb 100644
--- a/dviware/dvisvgm/src/Bitmap.hpp
+++ b/dviware/dvisvgm/src/Bitmap.hpp
@@ -21,6 +21,7 @@
#ifndef BITMAP_HPP
#define BITMAP_HPP
+#include <cstdint>
#include <ostream>
#include <vector>
diff --git a/dviware/dvisvgm/src/CMap.hpp b/dviware/dvisvgm/src/CMap.hpp
index af7f109625..0b8ef89a11 100644
--- a/dviware/dvisvgm/src/CMap.hpp
+++ b/dviware/dvisvgm/src/CMap.hpp
@@ -22,6 +22,7 @@
#define CMAP_HPP
#include <algorithm>
+#include <cstdint>
#include <ostream>
#include <vector>
#include "FontEncoding.hpp"
diff --git a/dviware/dvisvgm/src/Color.hpp b/dviware/dvisvgm/src/Color.hpp
index 0edb9e9886..e133db7436 100644
--- a/dviware/dvisvgm/src/Color.hpp
+++ b/dviware/dvisvgm/src/Color.hpp
@@ -21,6 +21,7 @@
#ifndef COLOR_HPP
#define COLOR_HPP
+#include <cstdint>
#include <string>
#include <valarray>
#include <vector>
diff --git a/dviware/dvisvgm/src/DVIReader.hpp b/dviware/dvisvgm/src/DVIReader.hpp
index 2e8958850f..d8da02f0c2 100644
--- a/dviware/dvisvgm/src/DVIReader.hpp
+++ b/dviware/dvisvgm/src/DVIReader.hpp
@@ -21,6 +21,7 @@
#ifndef DVIREADER_HPP
#define DVIREADER_HPP
+#include <cstdint>
#include <limits>
#include <map>
#include <stack>
diff --git a/dviware/dvisvgm/src/FileSystem.hpp b/dviware/dvisvgm/src/FileSystem.hpp
index 376ab85927..1a9565ee7f 100644
--- a/dviware/dvisvgm/src/FileSystem.hpp
+++ b/dviware/dvisvgm/src/FileSystem.hpp
@@ -21,6 +21,7 @@
#ifndef FILESYSTEM_HPP
#define FILESYSTEM_HPP
+#include <cstdint>
#include <string>
#include <vector>
diff --git a/dviware/dvisvgm/src/InputBuffer.hpp b/dviware/dvisvgm/src/InputBuffer.hpp
index 20523d37dd..ea6ce17a70 100644
--- a/dviware/dvisvgm/src/InputBuffer.hpp
+++ b/dviware/dvisvgm/src/InputBuffer.hpp
@@ -22,6 +22,7 @@
#define INPUTBUFFER_HPP
#include <algorithm>
+#include <cstdint>
#include <cstring>
#include <istream>
#include <string>
diff --git a/dviware/dvisvgm/src/RangeMap.hpp b/dviware/dvisvgm/src/RangeMap.hpp
index 7ddcd3b9ba..be708b7180 100644
--- a/dviware/dvisvgm/src/RangeMap.hpp
+++ b/dviware/dvisvgm/src/RangeMap.hpp
@@ -22,6 +22,7 @@
#define RANGEMAP_HPP
#include <algorithm>
+#include <cstdint>
#include <ostream>
#include <vector>
diff --git a/dviware/dvisvgm/src/SVGTree.cpp b/dviware/dvisvgm/src/SVGTree.cpp
index edfb926d0c..74b6913b20 100644
--- a/dviware/dvisvgm/src/SVGTree.cpp
+++ b/dviware/dvisvgm/src/SVGTree.cpp
@@ -330,11 +330,11 @@ void SVGTree::pushPageContext (unique_ptr<SVGElement> node) {
}
-/** Pops the current context element and restored the previous one. */
+/** Pops the current context element and restores the previous one. */
void SVGTree::popPageContext () {
if (!_pageContextStack.empty())
_pageContextStack.pop();
- _charHandler->setInitialContextNode(_page);
+ _charHandler->setInitialContextNode(_pageContextStack.empty() ? _page : _pageContextStack.top());
}
diff --git a/dviware/dvisvgm/src/Unicode.hpp b/dviware/dvisvgm/src/Unicode.hpp
index 1211887bb6..fb30b56fee 100644
--- a/dviware/dvisvgm/src/Unicode.hpp
+++ b/dviware/dvisvgm/src/Unicode.hpp
@@ -21,6 +21,7 @@
#ifndef UNICODE_HPP
#define UNICODE_HPP
+#include <cstdint>
#include <string>
struct Unicode {
diff --git a/dviware/dvisvgm/src/ttf/TTFTable.hpp b/dviware/dvisvgm/src/ttf/TTFTable.hpp
index c47610ec7c..7ebbdbbb78 100644
--- a/dviware/dvisvgm/src/ttf/TTFTable.hpp
+++ b/dviware/dvisvgm/src/ttf/TTFTable.hpp
@@ -19,6 +19,7 @@
*************************************************************************/
#pragma once
+#include <cstdint>
#include <ostream>
#include <sstream>
#include <vector>