• R/O
  • SSH

wp2latex: Commit

WP2LaTeX sources.


Commit MetaInfo

Revision89db5eb7d09bb1c4fb6707ddbb671afa06faf818 (tree)
Zeit2023-12-03 21:00:37
AutorFojtik
CommiterFojtik

Log Message

Update WP2LaTeX documentation.

Ändern Zusammenfassung

Diff

diff -r 31ae28c356b3 -r 89db5eb7d09b trunk/doc/wp2latex.man
--- a/trunk/doc/wp2latex.man Tue Nov 28 01:06:18 2023 +0100
+++ b/trunk/doc/wp2latex.man Sun Dec 03 13:00:37 2023 +0100
@@ -1,4 +1,4 @@
1-.TH Wp2LaTeX 1 "26 Nov 2023"
1+.TH Wp2LaTeX 1 "27 Nov 2023"
22 .SH NAME
33 wp2latex \- Converter from MAC WP1.x, WP2,3,4.x, PC WP4.x, WP5.x, WP6.x .. 11.x to LaTeX
44 .SH SYNOPSIS
@@ -163,6 +163,9 @@
163163 Disable checking features - faster conversion. But if your document is corrupted
164164 the conversion results will be wrong.
165165 .TP
166+\fB-no-shrink-images\fP
167+Turn off oversized image shrink.
168+.TP
166169 \fB-notexchars\fP
167170 All chars 32-128 will be converted to Tex sequencies (Default)
168171 .TP
@@ -198,6 +201,10 @@
198201 Check safely consistency of each object and try to fix all
199202 incorrect things. Good for corrupted WP files.
200203 .TP
204+\fB-shrink-images\fP
205+Attempt to shrink oversized vector images. EPS processed by LaTeX has
206+fixed internal size limit.
207+.TP
201208 \fB-texchars\fP
202209 Do not interpret tex macros (all chars 32-128 will not be converted
203210 to Tex sequences)
diff -r 31ae28c356b3 -r 89db5eb7d09b trunk/doc/wp2latex.tex
--- a/trunk/doc/wp2latex.tex Tue Nov 28 01:06:18 2023 +0100
+++ b/trunk/doc/wp2latex.tex Sun Dec 03 13:00:37 2023 +0100
@@ -1728,7 +1728,7 @@
17281728
17291729 ./configure --without-libintl
17301730 mingw32-make
1731-\begin{verbatim}
1731+\end{verbatim}
17321732
17331733 libintl library defines {\it printf} to be {\it __printf__} and it clashes with object's
17341734 method in another namespace named {\it printf}.
@@ -1747,6 +1747,19 @@
17471747 to foreign languages.
17481748
17491749
1750+\subsubsection{Solaris}
1751+
1752+Solaris seems not to have default {\it make}, you must use {\it gmake} instead.
1753+Everything else should work as for Linux.
1754+
1755+\begin{verbatim}
1756+MAKE=gmake; export MAKE
1757+./configure
1758+gmake
1759+\end{verbatim}
1760+
1761+
1762+
17501763 ==============================================================
17511764
17521765 %How to build WP2LaTeX for multiple Mac OS X soft- and hardware
diff -r 31ae28c356b3 -r 89db5eb7d09b trunk/sources.cc/atoms/dbllist.cc
--- a/trunk/sources.cc/atoms/dbllist.cc Tue Nov 28 01:06:18 2023 +0100
+++ b/trunk/sources.cc/atoms/dbllist.cc Sun Dec 03 13:00:37 2023 +0100
@@ -1,5 +1,5 @@
11 /*****************************************************************
2-* unit: doublelists release 0.6 *
2+* unit: doublelists release 0.7 *
33 * purpose: general manipulation with array of couples of strings *
44 * Licency: GPL or LGPL *
55 * Copyright: (c) 1998-2023 Jaroslav Fojtik *
diff -r 31ae28c356b3 -r 89db5eb7d09b trunk/sources.cc/atoms/include/dbllist.h
--- a/trunk/sources.cc/atoms/include/dbllist.h Tue Nov 28 01:06:18 2023 +0100
+++ b/trunk/sources.cc/atoms/include/dbllist.h Sun Dec 03 13:00:37 2023 +0100
@@ -1,5 +1,5 @@
11 /*****************************************************************
2-* unit: doublelists release 0.6 *
2+* unit: doublelists release 0.7 *
33 * purpose: general manipulation with array of couples of strings *
44 * Licency: GPL or LGPL *
55 * Copyright: (c) 1998-2023 Jaroslav Fojtik *
diff -r 31ae28c356b3 -r 89db5eb7d09b trunk/sources.cc/pass1svg.cc
--- a/trunk/sources.cc/pass1svg.cc Tue Nov 28 01:06:18 2023 +0100
+++ b/trunk/sources.cc/pass1svg.cc Sun Dec 03 13:00:37 2023 +0100
@@ -224,7 +224,7 @@
224224 LoadPictureSVG,
225225 NULL);
226226
227-#define SVGVersion "0.7"
227+#define SVGVersion "0.8"
228228
229229
230230 void TconvertedPass1_SVG::EraseObjCache(void)
@@ -1375,9 +1375,14 @@
13751375 VectListIn.Swap(VectList);
13761376 while(*StrMovements != 0)
13771377 {
1378- while(isspace(*StrMovements)) StrMovements++;
1379- if(*StrMovements==0) break;
1380- switch((isdigit(*StrMovements) || *StrMovements=='.' || *StrMovements=='-') ? LastCommand : *StrMovements++)
1378+ char ch = *StrMovements;
1379+ if(ch==0) break;
1380+ if(isspace(ch)) {StrMovements++;continue;}
1381+ if(ch==',') {StrMovements++;continue;} // Need to gobble whitespaces after comma.
1382+
1383+ if(!(isdigit(ch) || ch=='.' || ch=='-'))
1384+ LastCommand = *StrMovements++;
1385+ switch(LastCommand)
13811386 {
13821387 case 'M': //move to.
13831388 if(n>0) SegmentCount++;
@@ -1488,7 +1493,7 @@
14881493 PositionX += val;
14891494 Points[2*n-2] = PositionX;
14901495 Points[2*n-1] = PositionY;
1491- break;
1496+ break;
14921497
14931498 case 'V': //vertical line to.
14941499 LastCommand = 'V';
@@ -1814,12 +1819,12 @@
18141819 break;
18151820
18161821 default:
1817- if(isdigit(*StrMovements) || *StrMovements=='.' || *StrMovements=='-')
1818- StrMovements++; // Not incremented in switch argument.
1822+ if(isdigit(ch) || ch=='.' || ch=='-')
1823+ StrMovements++;
18191824 else
18201825 {
18211826 if(err!=NULL)
1822- fprintf(err,_("\nError: Unsupported command '%c' in SVG path!"),*(StrMovements-1));
1827+ fprintf(err,_("\nError: Unsupported path command '%c' in SVG path!"),ch);
18231828 }
18241829 break;
18251830
diff -r 31ae28c356b3 -r 89db5eb7d09b trunk/sources.cc/wp2latex.h
--- a/trunk/sources.cc/wp2latex.h Tue Nov 28 01:06:18 2023 +0100
+++ b/trunk/sources.cc/wp2latex.h Sun Dec 03 13:00:37 2023 +0100
@@ -17,8 +17,8 @@
1717
1818 #define LineLength 80 /* Split lines after more than LineLength charcters */
1919
20-#define VersionWP2L "4.4"
21-#define VersionDate "26 Nov 2023" /* day (space) month (space) full year */
20+#define VersionWP2L "4.pre5"
21+#define VersionDate "1 Dec 2023" /* day (space) month (space) full year */
2222
2323
2424 /** Constants for a flag InputPS */
Show on old repository browser