dvi2tty: allow disdvi to handle DVI files with pTeX and XeTeX extensions

git-svn-id: svn://tug.org/texlive/trunk@20110 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 210 insertions, 7 deletions

diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 3aedae95cfa..c3e8a2cc299 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Add two disdvi command line options to handle .dvi files as
+	created by pTeX and .xdv files as created by XeTeX.
+
+	* commands.h: Define DVI opcodes for pTeX and XeTeX extensions.
+	* disdvi.c: Add command line options `-p' or `--ptex' and `-x'
+	or `--xetex'; handle DVI opcodes for pTeX and XeTeX extensions.
+
+2010-10-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* commands.h: Correct typo (description of FONT_63).
+	* disdvi.c: Print invalid DVI command bytes.
+
 2010-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dvi2tty.c (readable_file) [WIN32]: Remove unused variable err.
diff --git a/Build/source/texk/dvi2tty/commands.h b/Build/source/texk/dvi2tty/commands.h
index 4c9702deae5..9624713ea1f 100644
--- a/Build/source/texk/dvi2tty/commands.h
+++ b/Build/source/texk/dvi2tty/commands.h
@@ -45,7 +45,7 @@
 #define  Z3             169     /* ??? */
 #define  Z4             170     /* ??? */
 #define  FONT_00        171     /* set current font to 0 */
-#define  FONT_63        234     /* set current font to 0 */
+#define  FONT_63        234     /* set current font to 63 */
 #define  FNT1           235     /* set current font */
 #define  FNT2           236     /* Same as FNT1, except that arg is 2 bytes */
 #define  FNT3           237     /* Same as FNT1, except that arg is 3 bytes */
@@ -65,3 +65,12 @@
 #define  TRAILER        223     /* trailer bytes in dvi file */
 
         /*  undefined_commands           250,251,252,253,254,255 */
+
+/* additional DVI commands for XeTeX extensions */
+#define  PIC_FILE       251
+#define  NAT_FNT        252     /* define a native font */
+#define  SET_GL_AR      253
+#define  SET_GL_ST      254
+
+/* additional DVI command for pTeX extensions */
+#define  DVI_DIR        255     /* set direction */
diff --git a/Build/source/texk/dvi2tty/disdvi.c b/Build/source/texk/dvi2tty/disdvi.c
index b65c3ed514b..39032587ca8 100644
--- a/Build/source/texk/dvi2tty/disdvi.c
+++ b/Build/source/texk/dvi2tty/disdvi.c
@@ -54,8 +54,11 @@ FILE * dvifp;
 char * dvi_name;
 long   pc = 0;
 
+int is_ptex = 0;
+int is_xetex = 0;
+const char * dvi_ext = ".dvi";
+
 #ifdef KPATHSEA
-extern int main(int argc,char **argv );
 extern void bop(void);
 extern void postamble(void);
 extern void preamble(void);
@@ -66,6 +69,11 @@ extern const char *fontname(long fntnum);
 extern void printnonprint(int ch);
 extern unsigned long num(int size);
 extern long snum(int size);
+extern void picfile(int opcode);
+extern void natfontdef(int opcode);
+extern void glyphs(int opcode);
+extern void dvidir(int opcode);
+extern void invalid(int opcode);
 #else
 char *          malloc          ();
 
@@ -80,6 +88,11 @@ void            special         ();
 void            printnonprint   ();
 unsigned long   num             ();
 long            snum            ();
+void            picfile         ();
+void            natfontdef      ();
+void            glyphs          ();
+void            dvidir          ();
+void            invalid         ();
 #endif
 
 
@@ -91,26 +104,43 @@ int main(int argc, char **argv)
     register int opcode;                /* dvi opcode                        */
     register int i;
     int fontnum;
+    char * progname;
+
+    progname = *argv;
+
+    if ((argc > 1) && (argv[1][0] == '-')) {
+        if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "--ptex")) {
+            is_ptex = 1;
+        } else if (!strcmp(argv[1], "-x") || !strcmp(argv[1], "--xetex")) {
+            is_xetex = 1;
+            dvi_ext = ".xdv";
+        } else {
+            fprintf(stderr, "Invalid option `%s'\n", argv[1]);
+            fprintf(stderr, "Usage: %s [-p|--ptex|-x|--xetex] [dvi-file]\n", progname);
+            exit(3);
+        }
+        argv++;
+        argc--;
+    }
 
     if (argc > 2) {
         fprintf(stderr, "To many arguments\n");
-        fprintf(stderr, "Usage: %s [dvi-file]\n", *argv);
+        fprintf(stderr, "Usage: %s [-p|--ptex|-x|--xetex] [dvi-file]\n", progname);
         exit(1);
     }
 
     if (argc == 2) {
         if ((i = strlen(argv[1])) == 0) {
             fprintf(stderr, "Illegal empty filename\n");
-            fprintf(stderr, "Usage: %s [dvi-file]\n", *argv);
+            fprintf(stderr, "Usage: %s [-p|--ptex|-x|--xetex] [dvi-file]\n", progname);
             exit(2);
         }
-        if ((i >= 5) && (argv[1][i-4] == '.') && (argv[1][i-3] == 'd') &&
-              (argv[1][i-2] == 'v') && (argv[1][i-1] == 'i'))
+        if ((i >= 5) && !strcmp(argv[1]+(i-4), dvi_ext))
             dvi_name = argv[1];
         else {
             dvi_name = malloc((i+5) * sizeof(char));
             strcpy(dvi_name, argv[1]);
-            strcat(dvi_name, ".dvi");
+            strcat(dvi_name, dvi_ext);
         }
         if ((dvifp = fopen(dvi_name, "r")) == NULL) {
             perror(dvi_name);
@@ -227,6 +257,12 @@ int main(int argc, char **argv)
                 case PRE      : preamble();                     break;
                 case POST     : postamble();                    break;
                 case POST_POST: postpostamble();                break;
+                case PIC_FILE : picfile(opcode);                break;
+                case NAT_FNT  : natfontdef(opcode);             break;
+                case SET_GL_AR:
+                case SET_GL_ST: glyphs(opcode);                 break;
+                case DVI_DIR  : dvidir(opcode);                 break;
+                default       : invalid(opcode);
             }
     }
 
@@ -487,3 +523,147 @@ long snum(register int size)
 
 
 
+void picfile(int opcode)
+{
+    int i;
+
+    if (!is_xetex) {
+        invalid(opcode);
+        return;
+    }
+
+    printf("PIC_FILE  flags            : %ld\n", get1());
+    printf("%06ld:           trans :", pc);
+    for (i=0; i<6; i++)
+        printf(" %ld", sget4());
+    printf("\n%06ld: ", pc);
+    printf("          page              : %ld\n", get2());
+    printf("%06ld: ", pc);
+    i = (int) get1();
+    printf("          path name (%3d)   :", i);
+    while (i-- > 0)
+        putchar((int) get1());
+    putchar('\n');
+} /* picfile */
+
+
+
+void natfontdef(int opcode)
+{
+    register int i;
+    char * name;
+    font * fnt;
+    int flags, namelen, famlen, stylen;
+    long fntnum;
+    int new = 0;
+
+    if (!is_xetex) {
+        invalid(opcode);
+        return;
+    }
+
+    fntnum = num(4);
+    printf("NAT_FNT:  %ld\n", fntnum);
+    printf("%06ld: ", pc);
+    printf("          scale            : %ld\n", get4());
+    printf("%06ld: ", pc);
+    flags = get2();
+    printf("          flags            : %d\n", flags);
+    printf("%06ld: ", pc);
+    printf("          name             : ");
+    namelen = (int) get1();
+    famlen = (int) get1();
+    stylen = (int) get1();
+    fnt = fonts;
+    while (fnt != NULL && fnt->num != fntnum)
+        fnt = fnt->next;
+    if (fnt == NULL) {
+        if ((fnt = (font *) malloc(sizeof(font))) == NULL) {
+            perror("fontdef");
+            exit(1);
+        }
+        fnt->num = fntnum;
+        new = 1;
+    }
+    else
+        free(fnt->name);    /* free old name */
+    if ((name = (char *) malloc((namelen+1) * sizeof(char))) == NULL) {
+        perror("fontdef");
+        exit(1);
+    }
+    
+    for (i = 0; i < namelen; i++)
+        name[i] = get1();
+    name[namelen] = '\0';
+    fnt->name = name;
+    if (new) {
+        fnt->next = fonts;
+        fonts = fnt;
+    }
+
+    printf("%s\n", name);
+
+    if (famlen) {
+        printf("                  family           : ");
+        while (famlen-- > 0)
+            putchar((int) get1());
+        putchar('\n');
+    }
+
+    if (stylen) {
+        printf("                  style            : ");
+        while (stylen-- > 0)
+            putchar((int) get1());
+        putchar('\n');
+    }
+} /* fontdef */
+
+
+
+void glyphs(int opcode)
+{
+    long width;
+    int x, n, i, j;
+    long * xy;
+
+    if (!is_xetex) {
+        invalid(opcode);
+        return;
+    }
+
+    x = SET_GL_ST - opcode + 1;
+    width = sget4();
+    n = get2();
+    printf("GLYPH_%s width            : %ld\n", x == 2 ? "ARR" : "STR", width);
+    if ((xy = (long *) malloc(n * x * sizeof(long))) == NULL) {
+        perror("glyphs");
+        exit(1);
+    }
+    for (j=0; j < n * x; j++)
+        xy[j] = sget4();
+    for (i=0, j=0; i < n; i++) {
+        printf("           x: %ld", xy[j++]);
+        if (x == 2)
+            printf("    y: %ld", xy[j++]);
+        printf("    g: %ld\n", get2());
+    }
+} /* glyphs */
+
+
+
+void dvidir(int opcode)
+{
+    if (!is_ptex) {
+        invalid(opcode);
+        return;
+    }
+
+    printf("DVI_DIR:  %ld\n", get1());
+} /* dvidir */
+
+
+
+void invalid(int opcode)
+{
+    printf("INVALID   %d\n", opcode);
+} /* invalid */