Update of /cvsroot/monetdb/buildtools/Mx
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14265/Mx
Modified Files:
.cvsignore Code.c Def.c Display.c Form.c Io.c Makefile.am
Makefile.msc MonetDB.sln Mx.c Mx.h Mx.vcproj MxFcnDef.h
Print.c Sys.c configure.ac install.lst
Removed Files:
Index.c Tex2Html.c epstogif.in idxmx.c idxmx.vcproj
prefixMxFile.c prefixMxFile.vcproj
Log Message:
propagated changes of Sunday Feb 03 2008 - Friday Feb 08 2008
from the MonetDB_1-22 branch to the development trunk
--- Index.c DELETED ---
Index: Display.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Display.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Display.c 11 Jan 2008 10:33:49 -0000 1.7
+++ Display.c 8 Feb 2008 22:33:27 -0000 1.8
@@ -26,9 +26,6 @@
extern int pr_env;
-#define TEXMODE (textmode==M_TEX)
-#define TEXIMODE (textmode==M_TEXI)
-#define WWWMODE (textmode==M_WWW )
/* Printing modes
* Formatted text Plain/Math.
* Math is used for special symbols.
@@ -45,19 +42,19 @@
switch (c) {
case T_BOLD:
- PrCmd(TEXMODE ? "{\\bf " : TEXIMODE ? "@b{" : WWWMODE ? "<B>" :
"\\fB");
+ PrCmd("@b{");
PrText(s);
- PrCmd(TEXMODE ? "}" : TEXIMODE ? "}" : WWWMODE ? "</B>" :
"\\fP");
+ PrCmd("}");
break;
case T_ITALIC:
- PrCmd(TEXMODE ? "{\\it " : TEXIMODE ? "@i{" : WWWMODE ? "<I>" :
"\\fI");
+ PrCmd("@i{");
PrText(s);
- PrCmd(TEXMODE ? "}" : TEXIMODE ? "}" : WWWMODE ? "</I>" :
"\\fP");
+ PrCmd("}");
break;
case T_CODE:
- PrCmd(TEXMODE ? "{\\tt " : TEXIMODE ? "@i{" : WWWMODE ? "<TT>"
: "\\fB");
+ PrCmd("@i{");
PrText(s);
- PrCmd(TEXMODE ? "}" : TEXIMODE ? "}" : WWWMODE ? "</TT>" :
"\\fP");
+ PrCmd("}");
break;
}
PrEnv(env);
@@ -131,60 +128,14 @@
{
if (Hide())
return;
- if TEXMODE {
- if (tail) {
- strcpy(strchr(filename, '.') + 1, tail);
- ofile_printf("\n\n");
- if (opt_column == 2) {
- if (bodymode == 0)
-
ofile_printf("\\noindent\\rule{\\linewidth}{1pt}\\newline\\vspace{-10pt}\n");
- }
- if (bodymode == 0)
-
ofile_printf("\\noindent\\makebox[\\linewidth][r]{\\small\\tt ");
- PrTxt(FileName(filename));
- if (bodymode == 0)
- ofile_printf("}\n\\noindent");
- } else if (opt_column == 2) {
- if (bodymode == 0)
-
ofile_printf("\\vspace{-1em}\\noindent\\rule{\\linewidth}{1pt}\n");
- }
- } else if TEXIMODE {
- if (tail) {
+ if TEXIMODE
+ if (tail)
ofile_printf("\n\n");
- }
- } else if WWWMODE {
- if (somethingPrinted && bodymode == 0) {
- ofile_printf("\n<hr size=1 noshade>");
- }
- if (tail) {
- strcpy(strchr(filename, '.') + 1, tail);
- ofile_printf("<table width=\"100%%\"><tr>");
- ofile_printf("<td align=right valign=top>");
- ofile_printf("<font size=\"-1\"><i>%s",
FileName(filename));
- ofile_printf("</i></font></td></tr></table>\n");
- }
- } else {
- if (somethingPrinted && bodymode == 0) {
- ofile_printf(".br\n.sp -0.5v\n");
- ofile_printf("\\l'\\n(.lu-\\n(.iu'\n");
- ofile_printf(".ps -1\n.vs -1\n.br\n");
- ofile_printf(".nf\n.na\n");
- }
- if (tail) {
- strcpy(strchr(filename, '.') + 1, tail);
- ofile_printf("\\h'\\n(.lu-\\w'\\fI%s\\fP'u'", filename);
- ofile_printf("\\v'-2u'");
- ofile_printf("\\fI%s\\fP", FileName(filename));
- ofile_printf("\\v'+2u'\\h'|0c'");
- }
- }
somethingPrinted = 0;
}
extern char *bname;
-static int preludeDone = 0;
-
void
PrPrelude(char *file)
{
@@ -206,96 +157,8 @@
*t = 0;
- if (TEXIMODE && bodymode == 0)
+ if (bodymode == 0)
ofile_printf("\\input texinfo\n");
- if (TEXMODE) {
- if (bodymode == 0) {
- if (texDocStyle != NULL)
- ofile_printf("\\documentclass%s\n",
texDocStyle);
- else {
-
ofile_printf("\\documentclass[twoside,titlepage]{article}\n");
- ofile_printf("\\usepackage{epsf}\n");
- ofile_printf("\\pagestyle{myheadings}\n");
- ofile_printf("\\textheight= 9.5 in\n");
- ofile_printf("\\textwidth= 6.5 in\n");
- ofile_printf("\\topmargin=-0.5 in\n");
- ofile_printf("\\oddsidemargin=-0.25 in\n");
- ofile_printf("\\evensidemargin=-0.25 in\n");
- ofile_printf("\\parindent=0 in\n");
- }
-
-
- if (opt_column == 2) {
- if (TEXIMODE)
- ofile_printf("@[EMAIL PROTECTED] in\n");
- else
- ofile_printf("\\columnsep=0.5 in\n");
- }
- ofile_printf("\\newcommand{\\codesize}{\n");
- ofile_printf(" %s}\n", opt_column == 1 ? "\\small" :
"\\footnotesize");
- ofile_printf("\\newcommand{\\eq}[1]{\n");
- ofile_printf(" ${\\ \\equiv\\ }$}\n");
- if (TEXIMODE)
- ofile_printf("@end [EMAIL PROTECTED] iftex\n");
- }
-
-/*
- Starting ...
- */
- if (bodymode == 0) {
- if (TEXIMODE)
- ofile_printf("@[EMAIL PROTECTED]@end [EMAIL
PROTECTED] iftex\n");
- else
- ofile_printf("\\begin{document}\n");
- }
- if (opt_column == 2) {
- if (TEXIMODE)
- ofile_printf("@[EMAIL PROTECTED]@end [EMAIL
PROTECTED] iftex\n");
- else
- ofile_printf(",\\twocolumn\n");
- }
- } else if WWWMODE {
- extern char *outputdir;
-
- /* install the extra HTML filenames */
- snprintf(filename_index, sizeof(filename_index),
- "%s%c%s", outputdir, DIR_SEP, s);
- snprintf(filename_body, sizeof(filename_body),
- "%s%c%s", outputdir, DIR_SEP, s);
-
- strncat(filename_index, ".index.html",
- sizeof(filename_index) - strlen(filename_index) - 1);
- ofile_index = fopen(filename_index, "w+");
- if (disclaimer)
- insertDisclaimer(ofile_index, filename_index);
-
- strncat(filename_body, ".body.html",
- sizeof(filename_body) - strlen(filename_body) - 1);
- ofile_body = fopen(filename_body, "w+");
- if (disclaimer)
- insertDisclaimer(ofile_body, filename_body);
-
- mx_out = 7;
- if (bodymode == 0) {
- ofile_printf("<HTML>\n<HEAD>\n");
- ofile_printf("<LINK REL=STYLESHEET
HREF=/MonetDB.css>\n");
- mx_out = 4;
- ofile_printf("\n<BASE target=\"_parent\">\n");
- mx_out = 7;
- ofile_printf("<TITLE>Module %s.mx</TITLE>\n</HEAD>\n",
s);
- mx_out = 1;
- ofile_printf("<FRAMESET border=1
ROWS=\"85%%,15%%\">\n");
- ofile_printf("\t<FRAME name=\"a\"
src=\"%s.body.html\">\n", s);
- ofile_printf("\t<FRAME src=\"%s.index.html\">\n", s);
- ofile_printf("</FRAMESET>\n\n<NOFRAMES>\n");
- mx_out = 7;
- ofile_printf("<BODY bgcolor=\"#FFFFFF\" text=\""
text_color "\" vlink=\"" vlnk_color "\" link=\"" link_color "\">\n");
- }
- mx_out = 5;
- } else {
- if (opt_column == 2)
- ofile_printf(".2C\n");
- }
PrEnv(E_CMD);
}
@@ -303,19 +166,6 @@
PrPostlude(void)
{
PrEnv(E_CMD);
- if (TEXMODE) {
- if (bodymode == 0)
- ofile_printf("\\end{document}\n");
- } else if TEXIMODE {
- if (preludeDone)
- if (bodymode == 0)
- ofile_printf("@bye\n");
- } else if WWWMODE {
- mx_out = 7;
- if (bodymode == 0)
- ofile_printf("</BODY>\n</HTML>\n");
- mx_out = 5;
- }
- if (TEXIMODE && bodymode == 0)
+ if (TEXIMODE && bodymode == 0)
ofile_printf("@bye\n");
}
Index: Print.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Print.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Print.c 11 Jan 2008 10:33:49 -0000 1.6
+++ Print.c 8 Feb 2008 22:33:28 -0000 1.7
@@ -22,11 +22,6 @@
#include "Mx.h"
#include "MxFcnDef.h"
-#define TEXMODE (textmode==M_TEX)
-#define TEXIMODE (textmode==M_TEXI)
-#define WWWMODE (textmode==M_WWW)
-
-
int pr_hide = 0;
int pr_hide_text = 0;
int pr_env = 0;
@@ -44,40 +39,20 @@
}
switch (pr_env) {
- case E_TEXT:
- if TEXMODE
- if (bodymode == 0)
- ofile_printf("}");
- break;
case E_CODE:
- if TEXMODE {
- if (bodymode == 0)
- ofile_printf("\\end{verbatim}\\normalsize}\n");
- } else if TEXIMODE {
- ofile_printf("@end example\n");
- } else if WWWMODE
- ofile_printf("</font></pre>\n");
+ ofile_printf("@end example\n");
break;
+ case E_TEXT:
case E_CMD:
break;
}
pr_env = env;
pr_pos = 0;
switch (pr_env) {
- case E_TEXT:
- if TEXMODE
- if (bodymode == 0)
- ofile_printf("{");
- break;
case E_CODE:
- if TEXMODE {
- if (bodymode == 0)
- ofile_printf("{\\codesize\\begin{verbatim}\n");
- } else if TEXIMODE {
- ofile_printf("@example\n");
- } else if WWWMODE
- ofile_printf("<pre><font size=\"-1\" color=\"%s\">",
code_color);
+ ofile_printf("@example\n");
break;
+ case E_TEXT:
case E_CMD:
break;
}
@@ -134,27 +109,15 @@
ofile_printf("{%c}", c);
break;
case '@':
- if TEXIMODE {
- ofile_puts("@@");
- break;
- }
- MathOff();
- ofile_printf("@");
+ ofile_puts("@@");
break;
case '#':
- if TEXIMODE {
- ofile_puts("\\#");
- break;
- }
- MathOff();
- ofile_printf("\\%c", c);
+ ofile_puts("\\#");
break;
case '{':
case '}':
- if TEXIMODE {
- ofile_printf("@%c", c);
- break;
- }
+ ofile_printf("@%c", c);
+ break;
case '&':
case '%':
case '$':
@@ -204,18 +167,8 @@
extern int codeline;
void
-PrCodeline(void)
-{
- if (WWWMODE && (pr_pos < 8)) {
- ofile_printf("<font color=\"8FBC8F\" size=\"-2\">%6d </font>",
codeline);
- pr_pos = 8;
- }
-}
-
-void
PrChr(char c)
{
- extern int opt_column;
size_t start_pos = pr_pos;
if (Hide())
@@ -224,9 +177,7 @@
/* administer pr_pos and codeline */
switch (c) {
case '\t':
- do {
- pr_pos++;
- } while ((pr_pos % (8 / opt_column)) != 0);
+ pr_pos++;
break;
case '\n':
codeline++;
@@ -236,114 +187,25 @@
pr_pos++;
}
- if (TEXIMODE) {
- switch (c) {
- case '{':
- case '}':
- case '$':
- case '#':
- default:
- ofile_putc(c);
- }
- return;
- }
- if (WWWMODE || (pr_env & E_TEXT) == E_TEXT) {
- switch (c) {
- case '\n':
- case '\t':
- case ' ':
- MathOff();
- ofile_putc(c);
- break;
- case '~':
- MathOff();
- if TEXMODE
- ofile_printf("\\~\\,");
- else
- ofile_printf("%c", c);
- break;
- case '[':
- case ']':
- MathOff();
- if TEXMODE
- ofile_printf("{%c}", c);
- else
- ofile_printf("%c", c);
- break;
- case '&':
- if WWWMODE {
- ofile_puts("&");
- break;
- }
- case '#':
- case '{':
- case '}':
- case '_':
- case '%':
- case '$':
- MathOff();
- if TEXMODE
- ofile_printf("\\%c", c);
- else
- ofile_printf("%c", c);
- break;
- case '\\':
- MathOn();
- if TEXMODE
- ofile_printf("\\backslash");
- else if WWWMODE
- ofile_putc('\\');
- else
- ofile_printf("\\e");
- break;
- case '<':
- if WWWMODE {
- ofile_puts("<");
- break;
- }
- case '>':
- if WWWMODE {
- ofile_puts(">");
- break;
- }
- case '/':
- case '|':
- case '-':
- case '+':
- case '*':
- case '=':
- MathOn();
- ofile_putc(c);
- break;
- case '@':
- if TEXIMODE {
- ofile_puts("@@");
- }
- MathOff();
- ofile_putc(c);
- break;
- case '"':
- if WWWMODE {
- ofile_puts(""");
- break;
- }
- default:
- MathOff();
- ofile_putc(c);
- break;
- }
+ if ((pr_env & E_TEXT) == E_TEXT) {
+ ofile_putc(c);
return;
}
if ((pr_env & E_CODE) == E_CODE) {
- PrCodeline();
switch (c) {
case '\t':
while (start_pos++ < pr_pos)
ofile_putc(' ');
break;
+ /* now idea how to translate backslashes savely */
case '\\':
- ofile_puts(TEXMODE ? "\\" : TEXIMODE ? "\\" : "\\e");
+ ofile_putc(' ');
+ break;
+ case '{':
+ case '}':
+ case '@':
+ ofile_printf("@%c", c);
break;
default:
ofile_putc(c);
@@ -363,18 +225,12 @@
void
MathOn(void)
{
- if TEXMODE
- if (pr_math == 0)
- ofile_printf("${\\scriptstyle");
pr_math = 1;
}
void
MathOff(void)
{
- if TEXMODE
- if (pr_math == 1)
- ofile_printf("}$");
pr_math = 0;
}
Index: configure.ac
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.ac 26 Dec 2006 14:03:34 -0000 1.6
+++ configure.ac 8 Feb 2008 22:33:28 -0000 1.7
@@ -48,5 +48,5 @@
AC_DEFINE(MX_CXX_SUFFIX, "cc", [Suffix for C++ files])
# Produce output files
-AC_CONFIG_FILES([Makefile epstogif])
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT
--- prefixMxFile.c DELETED ---
Index: install.lst
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/install.lst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install.lst 12 Dec 2007 10:59:16 -0000 1.3
+++ install.lst 8 Feb 2008 22:33:29 -0000 1.4
@@ -1,5 +1,2 @@
Mx/
bin/Mx
- bin/epstogif#NOT_WIN32
- bin/idxmx
- bin/prefixMxFile
--- idxmx.c DELETED ---
--- idxmx.vcproj DELETED ---
Index: Io.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Io.c 11 Jan 2008 10:33:49 -0000 1.8
+++ Io.c 8 Feb 2008 22:33:27 -0000 1.9
@@ -58,7 +58,6 @@
FILE **fptop = fpstack;
FILE *ofile = 0;
FILE *ofile_body = 0;
-FILE *ofile_index = 0;
char *outputdir;
char *inputdir;
@@ -222,7 +221,7 @@
File *f;
if (ofile) {
- if (texihdr)
+ if (TEXIMODE && bodymode == 0)
ofile_printf("@bye\n");
fclose(ofile);
}
@@ -311,21 +310,6 @@
ofile = NULL;
for (f = files; f < files + nfile; f++) {
- if (ofile_index) {
- KillLines(ofile_index, "+</font></td>", 1);
- KillLines(ofile_body, "+</font></td>", 1);
- KillLines(ofile_body, "<BASE target=\"_parent\">", 0);
- fclose(ofile_body);
- ofile_body = NULL;
- fclose(ofile_index);
- ofile_index = NULL;
- if (!itable_done) {
- /* now use the body file as the output file */
- unlink(filename_index);
- unlink(f->f_tmp);
- rename(filename_body, f->f_tmp);
- }
- }
status = CompareFiles(f->f_tmp, f->f_name);
switch (status) {
case 0: /* identical files, remove temporary file */
Index: Makefile.am
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am 9 Mar 2006 10:47:54 -0000 1.3
+++ Makefile.am 8 Feb 2008 22:33:27 -0000 1.4
@@ -1,7 +1,4 @@
-bin_PROGRAMS = Mx prefixMxFile idxmx
-bin_SCRIPTS = epstogif
-Mx_SOURCES = Mx.c Index.c Def.c Form.c Tok.c Code.c Display.c Print.c Io.c \
- Sys.c disclaimer.c Tex2Html.c Mx.h MxFcnDef.h
-prefixMxFile_SOURCES = prefixMxFile.c disclaimer.c
-idxmx_SOURCES = idxmx.c
+bin_PROGRAMS = Mx
+Mx_SOURCES = Mx.c Def.c Form.c Tok.c Code.c Display.c Print.c Io.c \
+ Sys.c disclaimer.c Mx.h MxFcnDef.h
EXTRA_DIST = warning.gif
Index: Code.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Code.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Code.c 11 Jan 2008 10:33:49 -0000 1.9
+++ Code.c 8 Feb 2008 22:33:26 -0000 1.10
@@ -64,8 +64,6 @@
case Subsection:
case Paragraph:
case Continue:
- case Qtex:
- case Qtexi:
case Qcode:
break;
case Cdef:
@@ -98,7 +96,6 @@
case Swig:
case CCyacc:
case CClex:
- case BibTeX:
if (!extract(d->d_dir))
break;
IoWriteFile(fname, d->d_dir);
@@ -120,14 +117,14 @@
break;
case InHide:
HideOn();
- if (bak >= Qtex) {
+ if (bak >= Qcode) {
d->d_dir = bak;
goto again;
}
break;
case OutHide:
HideOff();
- if (bak >= Qtex) {
+ if (bak >= Qcode) {
d->d_dir = bak;
goto again;
}
@@ -354,10 +351,8 @@
UnRef(char *ref)
{
Error("Unresolved reference:%s", ref);
- if (mode & M_CODE && (textmode == M_TEX || textmode == M_TEXI))
+ if (mode & M_CODE && (textmode == M_TEXI))
ofile_printf("/* Unresolved Reference :%s */", ref);
- if (mode & M_CODE && textmode == M_MS)
- ofile_printf("/* %s */", ref);
/* should text for actual source format */
}
@@ -375,7 +370,6 @@
case DTD:
case XSL:
case Swig:
- case BibTeX:
case Cyacc:
case Clex:
case CCyacc:
Index: Form.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Form.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Form.c 11 Jan 2008 10:33:49 -0000 1.6
+++ Form.c 8 Feb 2008 22:33:27 -0000 1.7
@@ -25,10 +25,7 @@
#include "Mx.h"
#include "MxFcnDef.h"
-#define TEXMODE (textmode==M_TEX)
-#define TEXIMODE (textmode==M_TEXI)
-#define WWWMODE (textmode==M_WWW )
-#define Newline if WWWMODE { PrCmd("<br>"); } else if TEXMODE {
PrCmd("\n"); } else if TEXIMODE {PrCmd("\n");} else { PrCmd(".LP\n"); }
+#define Newline if TEXIMODE {PrCmd("\n");}
extern int pr_env;
extern int opt_hide;
@@ -53,7 +50,6 @@
int env;
char *getlogin();
char *dstbak = NULL;
- extern char bibtexfile[256];
for (d = defs; d < defs + ndef && (d->d_dir != Bfile); dirbak =
d->d_dir, d++) ;
for (; d < defs + ndef; dirbak = d->d_dir, d++) {
@@ -71,12 +67,7 @@
FormTitle();
break;
case Efile:
- PrIndex();
PrPostlude();
- if (*bibtexfile) {
- PrCmd("<hr size=5 noshade><br><br>");
- bib_print();
- }
UpdateFiles();
break;
case Ofile:
@@ -98,7 +89,7 @@
FormBlk(d);
break;
case Paragraph:
- if (dirbak >= Qtex)
+ if (dirbak >= Qcode)
PrRule(0);
FormPar(d->d_cmd);
PrEnv(E_TEXT);
@@ -107,7 +98,7 @@
case Ifdef:
case Ifndef:
case Endif:
- if (dirbak >= Qtex)
+ if (dirbak >= Qcode)
PrRule(0);
env = pr_env;
PrEnv(E_TEXT);
@@ -116,61 +107,19 @@
PrEnv(env);
break;
case Continue:
- if (dirbak >= Qtex)
+ if (dirbak >= Qcode)
PrRule(0);
FormBlk(d);
Newline;
break;
- case Qtexi:
- case Qtex:
- if (dirbak >= Qtex)
- PrRule(0);
- if WWWMODE {
- if (!Hide())
- latex2html(d->d_blk, dirbak != Qtex,
d[1].d_dir != Qtex);
- } else {
- /* was:
- PrCmd(d->d_blk);
- Newline;
- seems incorrect, as @[ @$ and the like still
should be processed
- */
- env = pr_env;
- PrEnv(E_CMD);
- FormBlk(d);
- PrEnv(env);
- }
- break;
case Mxmacro:
PrEnv(E_TEXT);
PrRule(0);
- if (WWWMODE) {
- int env = pr_env;
-
- PrCmd("<a name=\"");
- PrCmd(d->d_cmd);
- PrCmd("\"></a><b>");
- PrCmd(d->d_cmd);
- PrCmd(" ::=</b>");
- PrEnv(env);
- } else if (TEXIMODE) {
- PrCode(d->d_cmd);
- PrCode(" ::=\n");
- if (!Hide())
- IndexEntry(IFRAG, d->d_cmd, d->d_mod,
d->d_sec);
- PrEnv(E_CODE);
- FormBlk(d);
- PrEnv(E_TEXT);
- break;
- } else {
- PrCode(d->d_cmd);
- PrCode(" ::=\n");
- }
- if (!Hide())
- IndexEntry(IFRAG, d->d_cmd, d->d_mod, d->d_sec);
+ PrCode(d->d_cmd);
+ PrCode(" ::=\n");
PrEnv(E_CODE);
FormBlk(d);
PrEnv(E_TEXT);
- PrRule(0);
break;
case Index0:
case Index1:
@@ -185,14 +134,14 @@
break;
case InHide:
HideOn();
- if (dirbak >= Qtex) {
+ if (dirbak >= Qcode) {
d->d_dir = dirbak; /* dirbak=0; */
goto again;
}
break;
case OutHide:
HideOff();
- if (dirbak >= Qtex) {
+ if (dirbak >= Qcode) {
d->d_dir = dirbak; /* dirbak=0; */
goto again;
}
@@ -297,11 +246,6 @@
case CClex:
PrCodeDisplay(d, "ll");
break;
- case BibTeX: /* writes out a .bib file;
- NOTE: this is unrelated to
the magic *bibtexfile that seems
- only of importance in
Tex2Html -- CHECK!!!
- */
- break;
default:
Fatal("GenForm", "Non directive:%s
[%s:%d]", dir2str(d->d_dir), d->d_file, d->d_line);
}
@@ -323,35 +267,18 @@
void
FormIf(Def * d)
{
- if (TEXMODE || TEXIMODE)
- switch (d->d_dir) {
- case Ifdef:
-/*
- PrCmd("\\framebox[\\linewidth]{ Variant ");
- PrStr(d->d_cmd);
- PrCmd("}\n");
- */
- break;
-
- case Ifndef:
- if (TEXMODE)
- PrCmd("\\framebox[\\linewidth]{ Variant not(");
- PrTxt(d->d_cmd);
- if (TEXMODE)
- PrCmd(")}\n");
- break;
-
- case Endif:
-/*
- PrCmd("\\framebox[\\linewidth]{ End variant ");
- PrTxt(d->d_cmd);
- PrCmd("}\n");
- */
- break;
- default:
- /* shut up compiler */
- break;
- }
+ switch (d->d_dir) {
+ case Ifdef:
+ break;
+ case Ifndef:
+ PrTxt(d->d_cmd);
+ break;
+ case Endif:
+ break;
+ default:
+ /* shut up compiler */
+ break;
+ }
}
void
@@ -361,9 +288,6 @@
int i;
for (t = FstTok(d->d_blk); t; t = NxtTok(t)) {
- if (WWWMODE && (pr_env & E_CODE)) {
- PrCodeline();
- }
switch (t->t_dir) {
case T_BOLD:
case T_ITALIC:
@@ -376,8 +300,6 @@
break;
case T_INDEX:
i = t->t_ext - '0';
- if (!Hide())
- IndexEntry(i, t->t_str, d->d_mod, d->d_sec);
PrStr(t->t_str);
break;
case T_SGML:
@@ -392,8 +314,6 @@
}
if (!sgml)
PrChr(*p);
- else if (WWWMODE)
- ofile_putc(*p);
if (*p == '"') {
instr = !instr;
} else if (!instr && sgml) {
@@ -434,36 +354,31 @@
void
FormTitle(void)
{
- if (bodymode == 0)
+ if (bodymode)
return;
+
if (!(mx_author && mx_title))
return;
-
+ PrCmd("@titlepage\n");
if (*mx_title) {
- PrCmd(TEXMODE ? "\\title{" : TEXIMODE ? "@[EMAIL PROTECTED] " :
WWWMODE ? "<center><h1>" : ".TL\n\\s+2");
+ PrCmd("@title ");
PrText(mx_title);
if (mx_version && *mx_version) {
- PrCmd(TEXMODE ? "\\\\\nVersion\\ " : TEXIMODE ?
"Version " : WWWMODE ? "</h1><h2>" : "\n.sp\n\\fIVersion ");
+ PrCmd("Version ");
PrText(mx_version);
}
- PrCmd(TEXMODE ? "}\n" : TEXIMODE ? "\n" : WWWMODE ?
"</h2></center>\n" : "\\s-2\n");
+ PrCmd("\n");
}
if (*mx_author) {
- PrCmd(TEXMODE ? "\\author{" : TEXIMODE ? "@author " : WWWMODE ?
"<center><h3>" : ".AU\n\\s+1");
+ PrCmd("@author ");
PrText(mx_author);
- PrCmd(TEXMODE ? "}\n" : TEXIMODE ? "\n" : WWWMODE ?
"</h3></center>" : "\\s-1\n");
+ PrCmd("\n");
}
if (mx_date && *mx_date) {
- PrCmd(TEXMODE ? "\\date{" : TEXIMODE ? "" : WWWMODE ?
"<center><h3>" : "\n\\fBDate\\fP");
PrText(mx_date);
- PrCmd(TEXMODE ? "}\n" : TEXIMODE ? "\n" : WWWMODE ?
"<p></font></h3></center>" : "\n");
+ PrCmd("\n");
}
- PrCmd(TEXMODE ? "\\maketitle\n" : TEXIMODE ? "@end titlepage\n" : "");
-
- if (textmode == M_MS)
- PrCmd(".sp 2\n");
- if (texDocStyle == (char *) 0)
- PrCont();
+ PrCmd("@end titlepage\n");
}
void
@@ -474,34 +389,13 @@
int env = pr_env;
char *p = (char *) strchr(str, '(');
- if (textmode == M_MS)
- PrCmd("\\fI");
-
if ((d = GetDef(argv[0])) != 0)
if (p)
*p = 0;
- if (WWWMODE) {
- if (env == E_CODE) {
- PrCodeline();
- pr_env = E_CMD;
- }
- if (d) {
- PrCmd("<a href=\"#");
- PrCmd(d->d_cmd);
- PrCmd("\">");
- }
- PrCmd("<i>");
- PrStr(str);
-
- PrCmd("</i>");
- if (d)
- PrCmd("</a>");
- } else {
- PrStr(str);
+ PrStr(str);
+ PrRef(d ? d->d_mod : 0, d ? d->d_sec : 0);
- PrRef(d ? d->d_mod : 0, d ? d->d_sec : 0);
- }
if (d && p) {
char *backup = d->d_blk;
@@ -510,150 +404,43 @@
FormBlk(d);
d->d_blk = backup;
}
- if (textmode == M_MS)
- PrCmd("\\fI");
- else if (WWWMODE && (env == E_CODE))
- pr_env = E_CODE;
PrEnv(env);
}
-int wwwmod = 0, wwwsec = 0, wwwpar = 0;
-
/* handling a form module */
void
FormMod(char *str, int mod)
{
mx_title = str;
- if (TEXMODE || TEXIMODE)
- FormHeader();
- if (TEXMODE) {
- if (bodymode == 0)
- PrCmd("\\vfill\\clearpage");
- PrCmd("\\section{");
- } else if TEXIMODE {
- PrCmd("[EMAIL PROTECTED] ");
- } else if WWWMODE {
- if (bodymode == 0)
- PrCmd("<hr size=1 noshade><hr size=1 noshade><br><br>");
- PrCmd("<a name=\"mod_");
- PrNum(wwwmod = mod);
- PrCmd("_0_0\"></a>\n<h2>");
- if (bodymode == 0) {
- PrNum(mod);
- PrChr(' ');
- }
- wwwpar = 1;
- } else {
- PrCmd(".ps+2\n.SH\n");
- PrNum(mod);
- PrStr(" ");
- }
+ FormHeader();
+ PrCmd("[EMAIL PROTECTED] ");
PrEnv(E_TEXT);
PrStr(str);
-
- if TEXMODE {
- PrCmd("}\n");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("</h2>\n");
- } else
- PrCmd("\n.ps -2\n.LP\n");
+ PrCmd("\n");
}
void
FormSec(char *str, int mod, int sec)
{
- if TEXMODE {
- PrCmd("\\subsection{");
- } else if TEXIMODE {
- PrCmd("[EMAIL PROTECTED] ");
- } else if WWWMODE {
- if (bodymode == 0)
- PrCmd("<hr size=1 noshade>");
- PrCmd("<br><a name=\"mod_");
- PrNum(wwwmod = mod);
- PrChr('_');
- PrNum(wwwsec = sec);
- PrCmd("_0\"></a>\n<h4>");
- wwwpar = 1;
- if (bodymode == 0) {
- PrNum(mod);
- PrChr('.');
- PrNum(sec);
- PrChr(' ');
- }
- } else {
- PrCmd(".SH\n");
- PrNum(mod);
- PrChr('.');
- PrNum(sec);
- PrChr(' ');
- }
+ PrCmd("[EMAIL PROTECTED] ");
+
PrEnv(E_TEXT);
PrStr(str);
- if TEXMODE {
- PrCmd("}\n");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("</h4>");
- } else
- PrCmd("\n.LP\n");
+ PrCmd("\n");
}
void
FormSubSec(char *str)
{
if (str &&(strlen(str) > 0)) {
- if TEXMODE {
- PrCmd("\\subsubsection{");
- } else if TEXIMODE {
- PrCmd("[EMAIL PROTECTED] ");
- } else if WWWMODE {
- PrCmd("<br><a name=\"mod_");
- PrNum(wwwmod);
- PrChr('_');
- PrNum(wwwsec);
- PrChr('_');
- PrNum(wwwpar);
- PrCmd("\"></a>\n<h5><b>");
- if (bodymode == 0) {
- PrNum(wwwmod);
- PrChr('.');
- PrNum(wwwsec);
- PrChr('.');
- PrNum(wwwpar++);
- PrChr(' ');
- }
- } else {
- PrCmd("\n.LP\n");
- }
+ PrCmd("[EMAIL PROTECTED] ");
PrEnv(E_TEXT);
PrStr(str);
-
- if TEXMODE {
- PrCmd("}\n");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("</b></h5>\n");
- } else {
- PrCmd("\n.LP\n");
- }
+ PrCmd("\n");
} else {
- if TEXMODE {
- if (bodymode == 0)
- PrCmd("\\smallskip\n\\noindent");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("<p>");
- } else {
- PrCmd("\n.LP\n");
- }
+ PrCmd("\n");
}
}
@@ -661,98 +448,27 @@
FormPar(char *str)
{
if (str &&(strlen(str) > 0)) {
- if TEXMODE {
- PrCmd("\\paragraph{");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("<br><h5>");
- } else {
- PrCmd("\n.LP\n");
- }
+ PrCmd("\n");
PrEnv(E_TEXT);
PrStr(str);
-
- if TEXMODE {
- PrCmd("}\n");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("</h5>\n");
- } else {
- PrCmd("\n.LP\n");
- }
+ PrCmd("\n");
} else {
- if TEXMODE {
- if (bodymode == 0)
- PrCmd("\\smallskip\n\\noindent");
- } else if TEXIMODE {
- PrCmd("\n");
- } else if WWWMODE {
- PrCmd("<p>");
- } else {
- PrCmd("\n.LP\n");
- }
+ PrCmd("\n");
}
}
void
FormHeader(void)
{
- extern char *texDocStyle;
-
+ /* disabled ?? */
if TEXIMODE
return;
- if TEXMODE
- if (texDocStyle != NULL)
- return;
-
- if TEXMODE
- PrCmd("\\markboth{ \\ \\ ");
- else if TEXIMODE
- PrCmd("@settitle ");
- else if WWWMODE
- PrCmd("<p><h1 align=center>");
- else
- PrCmd(".TL\n");
-
PrText(mx_title);
-
- if TEXMODE
- PrCmd("\\hfill ");
- else if TEXIMODE
- PrCmd("[EMAIL PROTECTED] ");
- else if WWWMODE
- PrCmd("</h1>\n\n<h2 align=center>");
- else
- PrCmd(".AU\n");
-
+ PrCmd("[EMAIL PROTECTED] ");
PrText(mx_author);
-
- if TEXMODE
- PrCmd("}{\\ \\ ");
- else if TEXIMODE
- PrCmd("[EMAIL PROTECTED] ");
- else if WWWMODE
- PrCmd("</h2>\n\n<h3 align=center>");
- else
- PrCmd("\\sp 2\n\\fBVersion \\fP");
-
+ PrCmd("[EMAIL PROTECTED] ");
PrText(mx_version);
-
- if TEXMODE
- PrCmd("\\hfill ");
- else if WWWMODE
- PrCmd("</h3>\n\n<h4 align=center>");
- else
- PrCmd("\n");
-
+ PrCmd("\n");
PrText(mx_date);
-
- if TEXMODE
- PrCmd("}\n");
- else if TEXIMODE
- PrCmd("\n");
- else if WWWMODE
- PrCmd("</h4>\n\n");
+ PrCmd("\n");
}
Index: .cvsignore
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- .cvsignore 25 Oct 2007 19:24:24 -0000 1.7
+++ .cvsignore 8 Feb 2008 22:33:24 -0000 1.8
@@ -13,19 +13,10 @@
config.status
configure
depcomp
-epstogif
-idxmx
-idxmx.exe.manifest
-idxmx.ilk
-idxmx.pdb
install-sh
missing
mx_config.h
mx_config.h.in
-prefixMxFile
-prefixMxFile.exe.manifest
-prefixMxFile.ilk
-prefixMxFile.pdb
stamp-h1
vc70.pdb
vc80.pdb
Index: MxFcnDef.h
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/MxFcnDef.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MxFcnDef.h 11 Jan 2008 10:33:49 -0000 1.5
+++ MxFcnDef.h 8 Feb 2008 22:33:28 -0000 1.6
@@ -91,16 +91,6 @@
extern void FormPar(char *);
extern void FormIf(Def *);
-/* Index.c
- */
-extern void InitIndex(void);
-extern void IndexTable(int, char *);
-extern void IndexEntry(int, char *, int, int);
-extern void SortIndex(void);
-extern void PrCont(void);
-extern void PrIndex(void);
-extern void PrItable(int);
-
/* Io.c
*/
extern char *FileName(char *);
@@ -176,8 +166,3 @@
extern void addextension(char *);
-/* TeX2Html
- */
-
-extern void bib_print(void);
-extern void latex2html(char *, int, int);
Index: Sys.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Sys.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Sys.c 11 Jan 2008 10:33:49 -0000 1.6
+++ Sys.c 8 Feb 2008 22:33:28 -0000 1.7
@@ -41,8 +41,6 @@
if (mx_out & 1)
vfprintf(ofile, format, ap);
va_start(ap, format);
- if (ofile_index && (mx_out & 2))
- vfprintf(ofile_index, format, ap);
va_start(ap, format);
if (ofile_body && (mx_out & 4))
vfprintf(ofile_body, format, ap);
@@ -55,8 +53,6 @@
{
if (mx_out & 1)
fputs(s, ofile);
- if (ofile_index && (mx_out & 2))
- fputs(s, ofile_index);
if (ofile_body && (mx_out & 4))
fputs(s, ofile_body);
somethingPrinted++;
@@ -67,8 +63,6 @@
{
if (mx_out & 1)
fputc(c, ofile);
- if (ofile_index && (mx_out & 2))
- fputc(c, ofile_index);
if (ofile_body && (mx_out & 4))
fputc(c, ofile_body);
somethingPrinted++;
Index: Def.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Def.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Def.c 11 Jan 2008 10:33:49 -0000 1.6
+++ Def.c 8 Feb 2008 22:33:27 -0000 1.7
@@ -180,7 +180,6 @@
case Index8:
case Index9:
if (allTrue()) {
- IndexTable(dir, cmd);
d = NwDef(dir, mod, sec, lino);
d->d_cmd = cmd;
d->d_blk = blk;
@@ -238,8 +237,6 @@
d = NwDef(dir, mod, sec, lino);
d->d_cmd = cmd;
d->d_blk = blk;
- if (!Hide())
- IndexEntry(0, d->d_cmd, d->d_mod,
d->d_sec);
lastdir = Continue;
}
break;
@@ -250,8 +247,6 @@
d = NwDef(dir, mod, sec, lino);
d->d_cmd = cmd;
d->d_blk = blk;
- if (!Hide())
- IndexEntry(0, d->d_cmd, d->d_mod,
d->d_sec);
lastdir = Continue;
}
break;
@@ -264,8 +259,6 @@
lastdir = Continue;
}
break;
- case Qtex:
- case Qtexi:
case Qcode:
case Continue:
if (allTrue()) {
@@ -326,7 +319,6 @@
case Swig:
case CCyacc:
case CClex:
- case BibTeX:
if (allTrue()) {
d = NwDef(dir, mod, sec, lino);
d->d_cmd = cmd;
@@ -386,19 +378,10 @@
Directive *d = str2dir;
if (dir == Bfile) {
- if (textmode == M_WWW) {
- if (bodymode)
- return "bdy.html";
- return "html";
- } else {
- if (textmode == M_TEXI) {
- if (bodymode)
- return "bdy.texi";
- return "texi";
- }
+ if (textmode == M_TEXI) {
if (bodymode)
- return "bdy.tex";
- return "tex";
+ return "bdy.texi";
+ return "texi";
}
}
--- prefixMxFile.vcproj DELETED ---
Index: Mx.vcproj
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Mx.vcproj 14 Jun 2005 15:05:37 -0000 1.1
+++ Mx.vcproj 8 Feb 2008 22:33:28 -0000 1.2
@@ -218,26 +218,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="Index.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="Io.c">
<FileConfiguration
Name="Debug|Win32">
@@ -318,26 +298,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="Tex2Html.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="Tok.c">
<FileConfiguration
Name="Debug|Win32">
Index: Makefile.msc
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Makefile.msc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.msc 11 Jan 2008 10:33:49 -0000 1.12
+++ Makefile.msc 8 Feb 2008 22:33:27 -0000 1.13
@@ -29,32 +29,22 @@
MKDIR=mkdir
MT=mt -nologo
-all: Mx.exe prefixMxFile.exe idxmx.exe
+all: Mx.exe
install: all
if not exist "$(bindir)" $(MKDIR) "$(bindir)"
$(COPY) Mx.exe "$(bindir)"
- $(COPY) prefixMxFile.exe "$(bindir)"
- $(COPY) idxmx.exe "$(bindir)"
clean:
del *.exe *.obj mx_config.h
-MX_OBJS = Mx.obj Index.obj Def.obj Form.obj Tok.obj Code.obj Display.obj \
- Print.obj Io.obj Sys.obj disclaimer.obj Tex2Html.obj getopt.obj
+MX_OBJS = Mx.obj Def.obj Form.obj Tok.obj Code.obj Display.obj \
+ Print.obj Io.obj Sys.obj disclaimer.obj getopt.obj
Mx.exe: $(MX_OBJS)
$(CC) $(CFLAGS) /FeMx.exe $(MX_OBJS) /link /subsystem:console
/NODEFAULTLIB:LIBC
if exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL PROTECTED]
-outputresource:$@;1
-PREFIXMXFILE_OBJS = prefixMxFile.obj disclaimer.obj getopt.obj
-prefixMxFile.exe: $(PREFIXMXFILE_OBJS)
- $(CC) $(CFLAGS) /FeprefixMxFile.exe $(PREFIXMXFILE_OBJS) /link
/subsystem:console /NODEFAULTLIB:LIBC
-
-IDXMX_OBJS = idxmx.obj
-idxmx.exe: $(IDXMX_OBJS)
- $(CC) $(CFLAGS) /Feidxmx.exe $(IDXMX_OBJS) /link /subsystem:console
/NODEFAULTLIB:LIBC
-
-$(MX_OBJS) $(PREFIXMXFILE_OBJS) $(IDXMX_OBJS): mx_config.h
+$(MX_OBJS): mx_config.h
mx_config.h: winconfig.h
$(COPY) winconfig.h mx_config.h
Index: MonetDB.sln
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/MonetDB.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MonetDB.sln 9 Mar 2006 10:47:54 -0000 1.2
+++ MonetDB.sln 8 Feb 2008 22:33:28 -0000 1.3
@@ -14,17 +14,6 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idxmx", "idxmx.vcproj",
"{B6441D66-A219-41B6-8671-DC63BC15D8E8}"
- ProjectSection(ProjectDependencies) = postProject
- {E7B3561F-5153-405A-83CA-3AD0C0CA80DD} =
{E7B3561F-5153-405A-83CA-3AD0C0CA80DD}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefixMxFile",
"prefixMxFile.vcproj", "{7E7B0548-B66C-4561-B875-0F9F2FF981AE}"
- ProjectSection(ProjectDependencies) = postProject
- {408E0201-215B-424F-AECB-02668D827ADB} =
{408E0201-215B-424F-AECB-02668D827ADB}
- {E7B3561F-5153-405A-83CA-3AD0C0CA80DD} =
{E7B3561F-5153-405A-83CA-3AD0C0CA80DD}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Index: Mx.h
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Mx.h 11 Jan 2008 10:33:49 -0000 1.7
+++ Mx.h 8 Feb 2008 22:33:28 -0000 1.8
@@ -67,12 +67,12 @@
Index0, Index1, Index2, Index3, Index4, Index5, Index6, Index7, Index8,
Index9,
Bfile, Efile, Ofile, Mxmacro, Ifdef, Ifndef, Endif,
Title, Author, Version, Date, InHide, OutHide, Comment,
- Module, Section, Subsection, Paragraph, Qtex, Qtexi, Qcode, Continue,
+ Module, Section, Subsection, Paragraph, Qcode, Continue,
Pspec, Pimpl, Cdef, Csrc, CCsrc, ODLspec, SQL,
OQLspec, Cyacc, Clex, Prolog, Haskell, Monet, MALcode, MILcode,
Qnap, HTML, Java,
Tcl, ProC, Shell, fGrammar, Macro, XML, DTD, XSL, Config, Swig,
- CCyacc, CClex, BibTeX
+ CCyacc, CClex
} CmdCode;
@@ -127,11 +127,10 @@
#define M_DRAFT 0x1000
#define M_BOOK 0x2000
-#define M_WWW 0x00f0
-#define M_MS 0x0f00
-#define M_TEX 0xf000
#define M_TEXI 0xf0000
+#define TEXIMODE (textmode==M_TEXI)
+
extern int mode;
/*
@@ -158,14 +157,12 @@
/* Mx Options
*/
-extern int opt_column;
extern int opt_hide;
extern char *opt_code; /* extract code of interest only */
extern int textmode; /* either T_TEX or T_MS */
extern int bodymode; /* either 0= all 1= for inclusion */
extern int noline;
extern int notouch;
-extern int texihdr;
#define NO_HIDE -1
@@ -222,43 +219,3 @@
char *t_nxt;
char t_chr;
} Tok;
-
-/* MX Index
- */
-#define M_ITABLE 12
-#define M_IENTRY 1000
-
-#define ICONT 0
-#define IFRAG 10
-#define IMACRO 11
-
-typedef struct {
- char *ie_name;
- int ie_sec;
- int ie_mod;
-} Ientry;
-
-typedef struct {
- char *it_name;
- int it_nentry;
- Ientry *it_entrys;
-} Itable;
-
-extern Itable *itable;
-extern int itable_done;
-
-#define link_color "#6666ff"
-#define vlnk_color "#871F78"
-#define text_color "#000000"
-#define code_color "#505050"
-#define line_color "#A0A0A0"
-
-/* Footnotes
- * They contain however tex commands ??
- */
-#define PNOTE "\
-The work reported in this document was conducted as part of the PRISMA
project,\n\
-a joint effort with Philips Research Eindhoven,\n\
-partially supported by the Dutch Stimuleringsprojectteam Informaticaonderzoek
(SPIN).\n"
-#define MNOTE "\
-This document was produced with the {\\bf mx} programmer's tool.\n"
--- Tex2Html.c DELETED ---
--- epstogif.in DELETED ---
Index: Mx.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Mx.c 11 Jan 2008 10:33:49 -0000 1.7
+++ Mx.c 8 Feb 2008 22:33:28 -0000 1.8
@@ -32,13 +32,11 @@
unsigned int db_flag = 0x00;
int archived; /* set for archived portions */
int mode = M_TEXT;
-int opt_column = 1;
int opt_hide = NO_HIDE;
-int textmode = M_TEX;
+int textmode = M_TEXT;
int bodymode = 0; /* all should be shown */
char *opt_code;
char *defHideText = 0;
-int texihdr = 0;
int mx_err = 0;
char *mx_file = 0;
@@ -54,18 +52,12 @@
usage(void)
{
Message("Usage: Mx <flags> <file>.mx");
- Message("\t-t\t\tProduce LaTeX document (default)");
- Message("\t-i\t\tProduce texi document ");
+ Message("\t-i\t\tProduce texi document (default)");
Message("\t-c\t\tExtract code");
Message("\t-R <dir>\tSet target directory to <dir>)");
- Message("\t-S <style>\tSet LaTeX documentstyle to 'style'");
- Message("\t-s\t\tProduce nroff -ms document");
- Message("\t-1\t\tSingle column (default) ");
- Message("\t-2\t\tDouble column");
Message("\t-H <n>\t\tSet hide level to 'n' (-H0 default)");
Message("\t-d\t\tProduce a draft document");
Message("\t-x <extension>\tExtract <extension> labelled code");
- Message("\t-w\t\tExtract HTML code");
Message("\t-D <id>\t\tDefine macro 'id'");
Message("\t-T <string>\tDefine default hide text <string>");
Message("\t-l\t\tNo #line and alike statements");
@@ -86,18 +78,11 @@
}
InitDef();
OutputDir(".");
- InitIndex();
/* Preprocess the arguments.
*/
- while ((i = getopt(argc, argv, "sticC:x:Bwdg:D:R:S:H:12T:ln+")) != EOF)
{
+ while ((i = getopt(argc, argv, "icC:x:Bdg:D:R:H:T:ln+")) != EOF) {
switch (i) {
- case 's':
- textmode = M_MS;
- break;
- case 't':
- textmode = M_TEX;
- break;
case 'i':
textmode = M_TEXI;
break;
@@ -115,9 +100,6 @@
case 'B':
bodymode = 1; /* use for inclusion */
break;
- case 'w':
- textmode = M_WWW;
- break;
case 'd':
mode = M_DRAFT;
break;
@@ -135,18 +117,9 @@
case 'R':
OutputDir(optarg);
break;
- case 'S':
- texDocStyle = StrDup(optarg);
- break;
case 'H':
sscanf(optarg, "%d", &opt_hide);
break;
- case '1':
- opt_column = 1;
- break;
- case '2':
- opt_column = 2;
- break;
case 'T':
defHideText = optarg;
break;
@@ -208,8 +181,6 @@
{"+", Section, "",},
{"-", Subsection, "",},
{".", Paragraph, "",},
- {"T", Qtex, "",},
- {"texi", Qtexi, "",},
{"C", CCsrc, MX_CXX_SUFFIX,},
{"i", Pimpl, "impl",},
{"s", Pspec, "spec",},
@@ -240,7 +211,6 @@
{"swig", Swig, "i",},
{"Y", CCyacc, "yy",},
{"L", CClex, "ll",},
- {"bib", BibTeX, "bib",},
{"{", InHide, "",},
{"}", OutHide, "",},
{"/", Comment, "",},
-------------------------------------------------------------------------
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
