• R/O
  • SSH

wp2latex: Commit

WP2LaTeX sources.


Commit MetaInfo

Revision5a41d15760ae8da576919b6146de0bf373ffabd2 (tree)
Zeit2022-07-05 18:13:31
AutorFojtik
CommiterFojtik

Log Message

3.108

Ändern Zusammenfassung

Diff

diff -r beb3762f9f88 -r 5a41d15760ae trunk/doc/wp2latex.man
--- a/trunk/doc/wp2latex.man Sun Jul 03 23:14:44 2022 +0200
+++ b/trunk/doc/wp2latex.man Tue Jul 05 11:13:31 2022 +0200
@@ -1,4 +1,4 @@
1-.TH Wp2LaTeX 1 "21 Apr 2022"
1+.TH Wp2LaTeX 1 "5 Jul 2022"
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
diff -r beb3762f9f88 -r 5a41d15760ae trunk/instaler/WP2LaTeX.iss
--- a/trunk/instaler/WP2LaTeX.iss Sun Jul 03 23:14:44 2022 +0200
+++ b/trunk/instaler/WP2LaTeX.iss Tue Jul 05 11:13:31 2022 +0200
@@ -1,7 +1,7 @@
11 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
22
33 #define MyAppName "WP2LaTeX"
4-#define MyAppVersion "3.107"
4+#define MyAppVersion "3.108"
55 #define MyAppPublisher "F&T Soft"
66 #define MyAppURL "http://www.penguin.cz/~fojtik/wp2latex/"
77
diff -r beb3762f9f88 -r 5a41d15760ae trunk/sources.cc/images.cc
--- a/trunk/sources.cc/images.cc Sun Jul 03 23:14:44 2022 +0200
+++ b/trunk/sources.cc/images.cc Tue Jul 05 11:13:31 2022 +0200
@@ -2845,7 +2845,7 @@
28452845 cq1_new->recursion = cq->recursion+1;
28462846 static const int Value1 = 1;
28472847 cq1_new->Dispatch(DISP_NOCONVERTIMAGE,&Value1);
2848- i = cq1_new->Convert_first_pass();
2848+ cq1_new->Convert_first_pass(); // failure check to add >=1
28492849 if(Verbosing >= 1) printf(_("\n[continuing] "));
28502850 if(cq->log!=NULL) fputs(_("\n--End or nested file.--\n"),cq->log);
28512851 cq->perc.displayed = false;
diff -r beb3762f9f88 -r 5a41d15760ae trunk/sources.cc/images/vecimage.cc
--- a/trunk/sources.cc/images/vecimage.cc Sun Jul 03 23:14:44 2022 +0200
+++ b/trunk/sources.cc/images/vecimage.cc Tue Jul 05 11:13:31 2022 +0200
@@ -1445,7 +1445,7 @@
14451445 FixPsAccent(Text[i]->contents,"\\\"{","(\\310)"); // umlaut
14461446 FixPsAccent2(Text[i]->contents,"\\accent39","( \\47)"); //insert space before apostrophe \\47
14471447
1448- if(i>0) AppendShow(str,strLine,TextAllign,MixMode==2);
1448+ if(i>0) AppendShow(str,strLine,TextAllign,Override);
14491449
14501450 if(PSS!=NULL)
14511451 {
diff -r beb3762f9f88 -r 5a41d15760ae trunk/sources.cc/pass1602.cc
--- a/trunk/sources.cc/pass1602.cc Sun Jul 03 23:14:44 2022 +0200
+++ b/trunk/sources.cc/pass1602.cc Tue Jul 05 11:13:31 2022 +0200
@@ -19,7 +19,7 @@
1919 #include "cp_lib/cptran.h"
2020
2121
22-#define T602Version "0.03"
22+#define T602Version "0.04"
2323
2424
2525 class TconvertedPass1_602: public TconvertedPass1
@@ -35,8 +35,10 @@
3535
3636 virtual int Convert_first_pass(void);
3737
38+ void ChangeEncoding(void);
3839 void ProcessKey602(void);
3940 void HeaderFooter602(const string &args, char He_Fo=0);
41+ void Image602(void);
4042 };
4143
4244
@@ -64,7 +66,7 @@
6466 #define COLOR_SIZE 6
6567
6668
67-static void ChangeEncoding(TconvertedPass1_602 *cq)
69+void TconvertedPass1_602::ChangeEncoding(void)
6870 {
6971 #ifdef DEBUG
7072 fprintf(cq->log,"\n#ChangeEncoding() ");fflush(cq->log);
@@ -72,19 +74,19 @@
7274 long value;
7375 string translator;
7476
75- cq->args.trim();
76- value=atol(cq->args());
77+ args.trim();
78+ value = atol(args());
7779 switch(value)
7880 {
7981 case 0:translator="kam";break; //"895"
8082 case 1:translator="cp852";break; //latin2
8183 case 2:translator="koi8cs";break; //koi8cs
82- default:cq->ConvertCpg = NULL;
84+ default:ConvertCpg = NULL;
8385 }
8486 if(!translator.isEmpty())
8587 {
8688 translator+="TOinternal";
87- cq->ConvertCpg = GetTranslator(translator);
89+ ConvertCpg = GetTranslator(translator);
8890 }
8991 }
9092
@@ -128,7 +130,7 @@
128130
129131 InitHeaderFooter(this,He_Fo,1);
130132
131- envir='!'; //Ignore enviroments after header/footer
133+ envir = '!'; //Ignore enviroments after header/footer
132134 NewLine(this);
133135
134136 attr.InitAttr(); //Turn all attributes in the header/footer off
@@ -167,17 +169,17 @@
167169 }
168170
169171
170-static void Image602(TconvertedPass1_602 *cq)
172+void TconvertedPass1_602::Image602(void)
171173 {
172174 #ifdef DEBUG
173- fprintf(cq->log,"\n#Image602() ");fflush(cq->log);
175+ fprintf(cq->log,"\n#TconvertedPass1_602::Image602() ");fflush(cq->log);
174176 #endif
175177 TBox Box;
176178 char *str,ch;
177179 char CommaCount;
178180
179181 CommaCount=0;
180- str = cq->args();
182+ str = args();
181183 if(str==NULL) return;
182184 initBox(Box);
183185
@@ -199,12 +201,12 @@
199201 str++;
200202 }
201203 skip:
202- Box.Image_type=0; //Image on disk
204+ Box.Image_type = 0; //Image on disk
203205 Box.Contents = 3;
204206 Box.HorizontalPos=3; //Full
205207
206- ImageWP(cq,cq->args,Box);
207- *str=ch;
208+ ImageWP(this,this->args,Box);
209+ *str = ch;
208210 }
209211
210212
@@ -232,7 +234,7 @@
232234 }
233235 fGets2(wpd, args);
234236 char_on_line=0;
235- if(cmd=="CT") ChangeEncoding(this);
237+ if(cmd=="CT") ChangeEncoding();
236238 if(cmd=="FO") HeaderFooter602(args,2);
237239 if(cmd=="HE") HeaderFooter602(args,1);
238240 if(cmd=="PA") HardPage(this);
@@ -313,7 +315,7 @@
313315 cmd += c;
314316 }
315317 fGets2(wpd, args);
316- if(cmd=="PI") Image602(this);
318+ if(cmd=="PI") Image602();
317319 else {
318320 fprintf(strip,"%% .%s %s",cmd(),args());
319321 }
diff -r beb3762f9f88 -r 5a41d15760ae trunk/sources.cc/wp2latex.h
--- a/trunk/sources.cc/wp2latex.h Sun Jul 03 23:14:44 2022 +0200
+++ b/trunk/sources.cc/wp2latex.h Tue Jul 05 11:13:31 2022 +0200
@@ -17,8 +17,8 @@
1717
1818 #define LineLength 80 /* Split lines after more than LineLength charcters */
1919
20-#define VersionWP2L "3.pre108"
21-#define VersionDate "2 Jul 2022" /* day (space) month (space) full year */
20+#define VersionWP2L "3.108"
21+#define VersionDate "5 Jul 2022" /* day (space) month (space) full year */
2222
2323
2424 /* Constants for a flag InputPS */
Show on old repository browser