Update of /cvsroot/monetdb/buildtools/Mx
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17127
Modified Files:
Tag: MonetDB_1-22
Display.c Form.c Io.c Mx.c Mx.h Print.c
Log Message:
No idea how texi want \ escaped so for now we simply change them into spaces ;-)
fixed output for document mode (ie without -B (body mode))
Index: Display.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Display.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Display.c 5 Feb 2008 22:32:34 -0000 1.7.2.1
+++ Display.c 6 Feb 2008 12:57:30 -0000 1.7.2.2
@@ -137,8 +137,6 @@
extern char *bname;
-static int preludeDone = 0;
-
void
PrPrelude(char *file)
{
@@ -160,13 +158,8 @@
*t = 0;
- if (TEXIMODE && bodymode == 0)
+ if (bodymode == 0)
ofile_printf("\\input texinfo\n");
-
- if (bodymode == 0) {
- if (TEXIMODE)
- ofile_printf("@[EMAIL PROTECTED]@end [EMAIL PROTECTED]
iftex\n");
- }
PrEnv(E_CMD);
}
@@ -174,10 +167,6 @@
PrPostlude(void)
{
PrEnv(E_CMD);
- if TEXIMODE
- if (preludeDone)
- if (bodymode == 0)
- ofile_printf("@bye\n");
- if (TEXIMODE && bodymode == 0)
+ if (bodymode == 0)
ofile_printf("@bye\n");
}
Index: Print.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Print.c,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- Print.c 5 Feb 2008 23:27:42 -0000 1.6.2.3
+++ Print.c 6 Feb 2008 12:57:30 -0000 1.6.2.4
@@ -198,17 +198,15 @@
while (start_pos++ < pr_pos)
ofile_putc(' ');
break;
+ /* now idea how to translate backslashes savely */
case '\\':
- ofile_puts("\\");
+ ofile_putc(' ');
break;
case '{':
case '}':
case '@':
ofile_printf("@%c", c);
break;
- case '#':
- ofile_printf("\\#");
- break;
default:
ofile_putc(c);
}
Index: Io.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Io.c,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- Io.c 5 Feb 2008 22:32:34 -0000 1.8.2.1
+++ Io.c 6 Feb 2008 12:57:30 -0000 1.8.2.2
@@ -221,7 +221,7 @@
File *f;
if (ofile) {
- if (texihdr)
+ if (bodymode == 0)
ofile_printf("@bye\n");
fclose(ofile);
}
Index: Mx.h
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Mx.h 5 Feb 2008 22:32:35 -0000 1.7.2.1
+++ Mx.h 6 Feb 2008 12:57:30 -0000 1.7.2.2
@@ -161,7 +161,6 @@
extern int bodymode; /* either 0= all 1= for inclusion */
extern int noline;
extern int notouch;
-extern int texihdr;
#define NO_HIDE -1
Index: Form.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Form.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- Form.c 5 Feb 2008 22:32:34 -0000 1.6.2.1
+++ Form.c 6 Feb 2008 12:57:30 -0000 1.6.2.2
@@ -355,11 +355,11 @@
void
FormTitle(void)
{
- if (bodymode == 0)
+ if (bodymode)
return;
+
if (!(mx_author && mx_title))
return;
-
PrCmd("@titlepage\n");
if (*mx_title) {
PrCmd("@title ");
Index: Mx.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- Mx.c 5 Feb 2008 22:32:35 -0000 1.7.2.1
+++ Mx.c 6 Feb 2008 12:57:30 -0000 1.7.2.2
@@ -37,7 +37,6 @@
int bodymode = 0; /* all should be shown */
char *opt_code;
char *defHideText = 0;
-int texihdr = 0; /* todo add option for this */
int mx_err = 0;
char *mx_file = 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
