1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
Include <config.h> always first.
diff -ur dvisvgm-1.4.orig/src/CommandLine.cpp dvisvgm-1.4/src/CommandLine.cpp
--- dvisvgm-1.4.orig/src/CommandLine.cpp 2013-07-16 18:12:56.000000000 +0200
+++ dvisvgm-1.4/src/CommandLine.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -4,11 +4,11 @@
// See file COPYING for further details.
// (C) 2009-2013 Martin Gieseking <martin.gieseking@uos.de>
+#include "CommandLine.h"
#include <cstdio>
#include <iostream>
#include <iomanip>
#include "InputReader.h"
-#include "CommandLine.h"
using namespace std;
diff -ur dvisvgm-1.4.orig/src/EPSToSVG.cpp dvisvgm-1.4/src/EPSToSVG.cpp
--- dvisvgm-1.4.orig/src/EPSToSVG.cpp 2013-08-02 15:04:11.000000000 +0200
+++ dvisvgm-1.4/src/EPSToSVG.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -18,16 +18,6 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#include <fstream>
-#include <istream>
-#include <sstream>
-#include "EPSFile.h"
-#include "EPSToSVG.h"
-#include "Message.h"
-#include "MessageException.h"
-#include "PsSpecialHandler.h"
-#include "SVGOutputBase.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#ifdef TARGET_SYSTEM
@@ -39,6 +29,16 @@
#define VERSION_STR ""
#endif
+#include <fstream>
+#include <istream>
+#include <sstream>
+#include "EPSFile.h"
+#include "EPSToSVG.h"
+#include "Message.h"
+#include "MessageException.h"
+#include "PsSpecialHandler.h"
+#include "SVGOutputBase.h"
+
using namespace std;
diff -ur dvisvgm-1.4.orig/src/FileSystem.cpp dvisvgm-1.4/src/FileSystem.cpp
--- dvisvgm-1.4.orig/src/FileSystem.cpp 2013-01-21 16:53:23.000000000 +0100
+++ dvisvgm-1.4/src/FileSystem.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -18,16 +18,16 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <cstdlib>
#include <cstring>
#include <fstream>
#include "FileSystem.h"
#include "macros.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff -ur dvisvgm-1.4.orig/src/PSInterpreter.cpp dvisvgm-1.4/src/PSInterpreter.cpp
--- dvisvgm-1.4.orig/src/PSInterpreter.cpp 2013-08-02 15:04:11.000000000 +0200
+++ dvisvgm-1.4/src/PSInterpreter.cpp 2013-08-08 13:24:11.386995185 +0200
@@ -18,6 +18,7 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#include "PSInterpreter.h"
#include <cstring>
#include <fstream>
#include <iostream>
@@ -26,7 +27,6 @@
#include "InputReader.h"
#include "Message.h"
#include "PSFilter.h"
-#include "PSInterpreter.h"
#include "SignalHandler.h"
using namespace std;
diff -ur dvisvgm-1.4.orig/src/PSInterpreter.h dvisvgm-1.4/src/PSInterpreter.h
--- dvisvgm-1.4.orig/src/PSInterpreter.h 2013-08-02 15:04:11.000000000 +0200
+++ dvisvgm-1.4/src/PSInterpreter.h 2013-08-08 13:24:11.000000000 +0200
@@ -21,11 +21,11 @@
#ifndef PSINTERPRETER_H
#define PSINTERPRETER_H
+#include "Ghostscript.h"
#include <cstring>
#include <istream>
#include <string>
#include <vector>
-#include "Ghostscript.h"
#include "InputReader.h"
#include "MessageException.h"
diff -ur dvisvgm-1.4.orig/src/PsSpecialHandler.cpp dvisvgm-1.4/src/PsSpecialHandler.cpp
--- dvisvgm-1.4.orig/src/PsSpecialHandler.cpp 2013-08-02 15:04:11.000000000 +0200
+++ dvisvgm-1.4/src/PsSpecialHandler.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -18,13 +18,13 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#include "Ghostscript.h"
#include <cmath>
#include <fstream>
#include <iostream>
#include <sstream>
#include "EPSFile.h"
#include "FileFinder.h"
-#include "Ghostscript.h"
#include "Message.h"
#include "PSPattern.h"
#include "PSPreviewFilter.h"
diff -ur dvisvgm-1.4.orig/src/System.cpp dvisvgm-1.4/src/System.cpp
--- dvisvgm-1.4.orig/src/System.cpp 2013-01-21 16:53:23.000000000 +0100
+++ dvisvgm-1.4/src/System.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -18,13 +18,13 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#include <ctime>
-#include "System.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <ctime>
+#include "System.h"
+
#if defined (HAVE_SYS_TIME_H)
#include <sys/time.h>
#elif defined (HAVE_SYS_TIMEB_H)
diff -ur dvisvgm-1.4.orig/src/Terminal.cpp dvisvgm-1.4/src/Terminal.cpp
--- dvisvgm-1.4.orig/src/Terminal.cpp 2013-05-08 19:29:03.000000000 +0200
+++ dvisvgm-1.4/src/Terminal.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -18,12 +18,12 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
-#include "Terminal.h"
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "Terminal.h"
+
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
diff -ur dvisvgm-1.4.orig/src/dvisvgm.cpp dvisvgm-1.4/src/dvisvgm.cpp
--- dvisvgm-1.4.orig/src/dvisvgm.cpp 2013-08-02 15:04:11.000000000 +0200
+++ dvisvgm-1.4/src/dvisvgm.cpp 2013-08-08 13:24:11.000000000 +0200
@@ -18,6 +18,14 @@
** along with this program; if not, see <http://www.gnu.org/licenses/>. **
*************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#include "PSInterpreter.h"
+#endif
+#ifndef TARGET_SYSTEM
+#define TARGET_SYSTEM ""
+#endif
+
#include <cmath>
#include <fstream>
#include <iomanip>
@@ -46,14 +54,6 @@
#include "SVGOutputBase.h"
#include "System.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "PSInterpreter.h"
-#endif
-#ifndef TARGET_SYSTEM
-#define TARGET_SYSTEM ""
-#endif
-
#ifdef __MSVC__
#include <potracelib.h>
#else
|