Diff for /loncom/cgi/mimeTeX/mimetex.h between versions 1.2 and 1.3

version 1.2, 2006/03/24 23:08:33 version 1.3, 2007/10/09 21:41:41
Line 66  check for compilation by parts (not supp Line 66  check for compilation by parts (not supp
 #endif  #endif
 /* --- declare global symbol --- */  /* --- declare global symbol --- */
 #ifdef INITVALS  #ifdef INITVALS
   #define GLOBAL(type,variable,value) STATIC type variable = (value)    #define GLOBAL(type,variable,value) STATIC type variable = value
     /* #define GLOBAL(type,variable,value) STATIC type variable = (value) */
   /* #define SHARED(type,variable,value) type variable = (value) */    /* #define SHARED(type,variable,value) type variable = (value) */
 #else  #else
   #define GLOBAL(type,variable,value) STATIC type variable    #define GLOBAL(type,variable,value) STATIC type variable
Line 150  raster Line 151  raster
 /* ---  /* ---
  * associated raster constants and macros   * associated raster constants and macros
  * -------------------------------------- */   * -------------------------------------- */
 #define maxraster 99999 /* max #pixels for raster pixmap */  #define maxraster 1048576 /*99999*/ /* max #pixels for raster pixmap */
 /* --- #bytes in pixmap raster needed to contain width x height pixels --- */  /* --- #bytes in pixmap raster needed to contain width x height pixels --- */
 #define bitmapsz(width,height) (((width)*(height)+7)/8) /*#bytes if a bitmap*/  #define bitmapsz(width,height) (((width)*(height)+7)/8) /*#bytes if a bitmap*/
 #define pixmapsz(rp) (((rp)->pixsz)*bitmapsz((rp)->width,(rp)->height))  #define pixmapsz(rp) (((rp)->pixsz)*bitmapsz((rp)->width,(rp)->height))
Line 260  mathchardef Line 261  mathchardef
 #define PUNCTION (6) /* e.g., , (punctuation) */  #define PUNCTION (6) /* e.g., , (punctuation) */
 #define VARIABLE (7) /* e.g., x    */  #define VARIABLE (7) /* e.g., x    */
 #define DISPOPER (8) /* e.g., Bigint (displaymath opers)*/  #define DISPOPER (8) /* e.g., Bigint (displaymath opers)*/
 #define MAXCLASS (8) /* just for index checks */  #define SPACEOPER (9) /* e.g., \hspace{} */
   #define MAXCLASS (9) /* just for index checks */
 #define UPPERBIG DISPOPER /*how to interpret Bigxxx operators*/  #define UPPERBIG DISPOPER /*how to interpret Bigxxx operators*/
 #define LOWERBIG DISPOPER /*how to interpret bigxxx operators*/  #define LOWERBIG DISPOPER /*how to interpret bigxxx operators*/
 /* --- class aliases --- */  /* --- class aliases --- */
Line 274  mathchardef Line 276  mathchardef
 #define RSFS10 (6) /* rsfs \scrA ... \scrZ */  #define RSFS10 (6) /* rsfs \scrA ... \scrZ */
 #define BBOLD10 (7) /* blackboard bold \mathbb A ... */  #define BBOLD10 (7) /* blackboard bold \mathbb A ... */
 #define STMARY10 (8) /* stmaryrd math symbols */  #define STMARY10 (8) /* stmaryrd math symbols */
   #define CYR10 (9) /* cyrillic (wncyr10.mf) */
 #define NOTACHAR (99) /* e.g., \frac */  #define NOTACHAR (99) /* e.g., \frac */
 /* --- dummy argument value for handlers --- */  /* --- dummy argument value for handlers --- */
 #define NOVALUE (-989898) /*charnum,family,class used as args*/  #define NOVALUE (-989898) /*charnum,family,class used as args*/
Line 283  mathchardef Line 286  mathchardef
  * ----------------------- */   * ----------------------- */
 STATIC int  nfontinfo /* legal font#'s are 1...nfontinfo */  STATIC int  nfontinfo /* legal font#'s are 1...nfontinfo */
 #ifdef INITVALS  #ifdef INITVALS
   = 7    = 8
 #endif  #endif
   ;    ;
 STATIC struct {char *name; int family; int istext; int class;}  STATIC struct {char *name; int family; int istext; int class;}
Line 299  STATIC struct {char *name; int family; i Line 302  STATIC struct {char *name; int family; i
     { "\\mathbb",  BBOLD10, 0, -1 }, /*(5) \bb,\mathbb{abc}-->{\mathbb~abc}*/      { "\\mathbb",  BBOLD10, 0, -1 }, /*(5) \bb,\mathbb{abc}-->{\mathbb~abc}*/
     { "\\mathbf",  CMMIB10, 0, -1 }, /*(6) \bf,\mathbf{abc}-->{\mathbf~abc}*/      { "\\mathbf",  CMMIB10, 0, -1 }, /*(6) \bf,\mathbf{abc}-->{\mathbf~abc}*/
     { "\\mathrm",  CMR10,   0, -1 }, /*(7) \mathrm */      { "\\mathrm",  CMR10,   0, -1 }, /*(7) \mathrm */
       { "\\cyr",     CYR10,   1, -1 }, /*(8) \cyr (defaults as text mode) */
     {  NULL,   0,       0,  0 } }      {  NULL,   0,       0,  0 } }
 #endif  #endif
   ; /* --- end-of-fonts[] --- */    ; /* --- end-of-fonts[] --- */
Line 332  aspect ratio is width/height of the disp Line 336  aspect ratio is width/height of the disp
 /* ---  /* ---
  * space between adjacent symbols, e.g., symspace[RELATION][VARIABLE]   * space between adjacent symbols, e.g., symspace[RELATION][VARIABLE]
  * ------------------------------------------------------------------ */   * ------------------------------------------------------------------ */
 STATIC int symspace[10][10]  STATIC int symspace[11][11]
 #ifdef INITVALS  #ifdef INITVALS
  =   =
  { /* ---------------------------------------------------------------   { /* -----------------------------------------------------------------------
          Right... ORD OPER  BIN  REL OPEN CLOS PUNC  VAR DISP unused           Right... ORD OPER  BIN  REL OPEN CLOS PUNC  VAR DISP SPACE unused
     Left... ------------------------------------------------------ */      Left... -------------------------------------------------------------- */
   /*ORDINARY*/ {  2,   3,   3,   5,   3,   2,   2,   2,   3,   0 },    /*ORDINARY*/ {  2,   3,   3,   5,   3,   2,   2,   2,   3,   0,    0 },
   /*OPERATOR*/ {  3,   1,   1,   5,   3,   2,   2,   2,   3,   0 },    /*OPERATOR*/ {  3,   1,   1,   5,   3,   2,   2,   2,   3,   0,    0 },
   /*BINARYOP*/ {  2,   1,   1,   5,   3,   2,   2,   2,   3,   0 },    /*BINARYOP*/ {  2,   1,   1,   5,   3,   2,   2,   2,   3,   0,    0 },
   /*RELATION*/ {  5,   5,   5,   5,   5,   5,   5,   5,   5,   0 },    /*RELATION*/ {  5,   5,   5,   2,   5,   5,   2,   5,   5,   0,    0 },
    /*OPENING*/ {  2,   2,   2,   5,   2,   4,   2,   2,   3,   0 },     /*OPENING*/ {  2,   2,   2,   5,   2,   4,   2,   2,   3,   0,    0 },
    /*CLOSING*/ {  2,   3,   3,   5,   4,   2,   1,   2,   3,   0 },     /*CLOSING*/ {  2,   3,   3,   5,   4,   2,   1,   2,   3,   0,    0 },
   /*PUNCTION*/ {  2,   2,   2,   5,   2,   2,   1,   2,   2,   0 },    /*PUNCTION*/ {  2,   2,   2,   5,   2,   2,   1,   2,   2,   0,    0 },
   /*VARIABLE*/ {  2,   2,   2,   5,   2,   2,   1,   2,   2,   0 },    /*VARIABLE*/ {  2,   2,   2,   5,   2,   2,   1,   2,   2,   0,    0 },
   /*DISPOPER*/ {  2,   3,   3,   5,   2,   3,   2,   2,   2,   0 },    /*DISPOPER*/ {  2,   3,   3,   5,   2,   3,   2,   2,   2,   0,    0 },
     /*unused*/ {  0,   0,   0,   0,   0,   0,   0,   0,   0,   0 }   /*SPACEOPER*/ {  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0 },
       /*unused*/ {  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0 }
  }   }
 #endif  #endif
  ; /* --- end-of-symspace[][] --- */   ; /* --- end-of-symspace[][] --- */
Line 375  subraster Line 380  subraster
 #define CHARASTER (1) /* character */  #define CHARASTER (1) /* character */
 #define STRINGRASTER (2) /* string of characters */  #define STRINGRASTER (2) /* string of characters */
 #define IMAGERASTER (3) /* image */  #define IMAGERASTER (3) /* image */
 #define ASCIISTRING (4) /* ascii string (not a raster) */  #define FRACRASTER (4) /* image of \frac{}{} */
   #define ASCIISTRING (5) /* ascii string (not a raster) */
   
 /* ---  /* ---
  * issue rasterize() call end extract embedded raster from returned subraster   * issue rasterize() call end extract embedded raster from returned subraster
Line 432  STATIC fontfamily aafonttable[] Line 438  STATIC fontfamily aafonttable[]
   {  RSFS10,{  rsfs83,  rsfs100,  rsfs118,  rsfs131,  rsfs160,  rsfs180,  rsfs210,  rsfs250}},    {  RSFS10,{  rsfs83,  rsfs100,  rsfs118,  rsfs131,  rsfs160,  rsfs180,  rsfs210,  rsfs250}},
   { BBOLD10,{ bbold83, bbold100, bbold118, bbold131, bbold160, bbold180, bbold210, bbold250}},    { BBOLD10,{ bbold83, bbold100, bbold118, bbold131, bbold160, bbold180, bbold210, bbold250}},
   {STMARY10,{stmary83,stmary100,stmary118,stmary131,stmary160,stmary180,stmary210,stmary250}},    {STMARY10,{stmary83,stmary100,stmary118,stmary131,stmary160,stmary180,stmary210,stmary250}},
     {   CYR10,{ wncyr83, wncyr100, wncyr118, wncyr131, wncyr160, wncyr180, wncyr210, wncyr250}},
   {    -999,{    NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL}}    {    -999,{    NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL}}
  }   }
 #endif  #endif
Line 453  STATIC fontfamily aafonttable[] Line 460  STATIC fontfamily aafonttable[]
    { RSFS10,{ rsfs250,  rsfs100,  rsfs118,  rsfs131,  rsfs160,  rsfs180,  rsfs210,  rsfs250}},     { RSFS10,{ rsfs250,  rsfs100,  rsfs118,  rsfs131,  rsfs160,  rsfs180,  rsfs210,  rsfs250}},
   { BBOLD10,{bbold250, bbold100, bbold118, bbold131, bbold160, bbold180, bbold210, bbold250}},    { BBOLD10,{bbold250, bbold100, bbold118, bbold131, bbold160, bbold180, bbold210, bbold250}},
  {STMARY10,{stmary250,stmary100,stmary118,stmary131,stmary160,stmary180,stmary210,stmary250}},   {STMARY10,{stmary250,stmary100,stmary118,stmary131,stmary160,stmary180,stmary210,stmary250}},
     {   CYR10,{ wncyr83, wncyr100, wncyr118, wncyr131, wncyr160, wncyr180, wncyr210, wncyr250}},
    {   -999,{    NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL}}     {   -999,{    NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL,     NULL}}
   }    }
  #endif   #endif
Line 517  subraster *rastmiddle();  /* handle \lef Line 525  subraster *rastmiddle();  /* handle \lef
 subraster *rastarray(); /* handle \array{...} */  subraster *rastarray(); /* handle \array{...} */
 subraster *rastpicture(); /* handle \picture(,){...} */  subraster *rastpicture(); /* handle \picture(,){...} */
 subraster *rastline(); /* handle \line(xinc,yinc){xlen} */  subraster *rastline(); /* handle \line(xinc,yinc){xlen} */
   subraster *rastrule(); /* handle \rule[lift]{width}{height}*/
 subraster *rastcircle(); /* handle \circle(xdiam[,ydiam]) */  subraster *rastcircle(); /* handle \circle(xdiam[,ydiam]) */
 subraster *rastbezier(); /*handle\bezier(c0,r0)(c1,r1)(ct,rt)*/  subraster *rastbezier(); /*handle\bezier(c0,r0)(c1,r1)(ct,rt)*/
 subraster *rastraise(); /* handle \raisebox{lift}{expr} */  subraster *rastraise(); /* handle \raisebox{lift}{expr} */
 subraster *rastrotate(); /* handle \rotatebox{degs}{expr} */  subraster *rastrotate(); /* handle \rotatebox{degs}{expr} */
   subraster *rastreflect(); /* handle \reflectbox[axis]{expr} */
 subraster *rastfbox(); /* handle \fbox{expr} */  subraster *rastfbox(); /* handle \fbox{expr} */
 subraster *rastinput(); /* handle \input{filename} */  subraster *rastinput(); /* handle \input{filename} */
 subraster *rastcounter(); /* handle \counter{filename} */  subraster *rastcounter(); /* handle \counter{filename} */
Line 553  subraster *rastnoop();   /* handle \esca Line 563  subraster *rastnoop();   /* handle \esca
 #define ISADJACENTWT (63) /* set anti-aliasing adjacent weight*/  #define ISADJACENTWT (63) /* set anti-aliasing adjacent weight*/
 #define ISCORNERWT (64) /* set anti-aliasing adjacent weight*/  #define ISCORNERWT (64) /* set anti-aliasing adjacent weight*/
 #define PNMPARAMS (65) /* set fgalias,fgonly,bgalias,bgonly*/  #define PNMPARAMS (65) /* set fgalias,fgonly,bgalias,bgonly*/
   #define ISGAMMA (66) /* set gamma correction */
 #define ISSHRINK (7) /* set supersampling shrinkfactor */  #define ISSHRINK (7) /* set supersampling shrinkfactor */
 #define UNITLENGTH (8) /* set unitlength */  #define UNITLENGTH (8) /* set unitlength */
 #define ISCOLOR (9) /* set color */  #define ISCOLOR (9) /* set color */
 #define ISREVERSE (10) /* set reverse video colors */  #define ISREVERSE (10) /* set reverse video colors */
 #define ISSTRING (11) /* set ascii string mode */  #define ISSTRING (11) /* set ascii string mode */
 #define ISSMASH (12) /* set (minimum) "smash" margin */  #define ISSMASH (12) /* set (minimum) "smash" margin */
   #define ISCONTENTTYPE (13) /*enable/disable Content-type lines*/
   
 /* ---  /* ---
  * mathchardefs for symbols recognized by mimetex   * mathchardefs for symbols recognized by mimetex
Line 596  STATIC mathchardef symtable[] Line 608  STATIC mathchardef symtable[]
     { "\\tabular",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastarray) },      { "\\tabular",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastarray) },
     { "\\picture",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastpicture) },      { "\\picture",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastpicture) },
     { "\\line", NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastline) },      { "\\line", NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastline) },
       { "\\rule", NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastrule) },
     { "\\circle", NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastcircle) },      { "\\circle", NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastcircle) },
     { "\\bezier", NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastbezier) },      { "\\bezier", NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastbezier) },
     { "\\qbezier",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastbezier) },      { "\\qbezier",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastbezier) },
     { "\\raisebox",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastraise) },      { "\\raisebox",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastraise) },
     { "\\rotatebox",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastrotate) },      { "\\rotatebox",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastrotate) },
       { "\\reflectbox",NOVALUE,NOVALUE,NOVALUE,(HANDLER)(rastreflect) },
     { "\\fbox", NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastfbox) },      { "\\fbox", NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastfbox) },
     { "\\input",NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastinput) },      { "\\input",NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rastinput) },
     { "\\today",NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rasttoday) },      { "\\today",NOVALUE,NOVALUE,NOVALUE,  (HANDLER)(rasttoday) },
Line 618  STATIC mathchardef symtable[] Line 632  STATIC mathchardef symtable[]
     { "~", 5, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },      { "~", 5, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
     { "\\ ", 5, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },      { "\\ ", 5, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
     { " ", 5, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },      { " ", 5, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
       { "\\!", -2, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
       /*{ "\\!*", -2,     99,NOVALUE,  (HANDLER)(rastspace) },*/
     { "\\quad", 6, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },      { "\\quad", 6, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
     { "\\qquad",10, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },      { "\\qquad",10, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
     { "\\hspace",0, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },      { "\\hspace",0, NOVALUE,NOVALUE,  (HANDLER)(rastspace) },
       { "\\hspace*",0,     99,NOVALUE,  (HANDLER)(rastspace) },
     { "\\vspace",0, NOVALUE,      1,  (HANDLER)(rastspace) },      { "\\vspace",0, NOVALUE,      1,  (HANDLER)(rastspace) },
     { "\\hfill",0,      1,NOVALUE,  (HANDLER)(rastspace) },      { "\\hfill",0,      1,NOVALUE,  (HANDLER)(rastspace) },
     /* --- newline --- */      /* --- newline --- */
Line 649  STATIC mathchardef symtable[] Line 666  STATIC mathchardef symtable[]
     { "\\text",  3, NOVALUE,NOVALUE, (HANDLER)(rastfont) },      { "\\text",  3, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
     { "\\textrm",  3, NOVALUE,NOVALUE, (HANDLER)(rastfont) },      { "\\textrm",  3, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
     { "\\mathrm",  7, NOVALUE,NOVALUE, (HANDLER)(rastfont) },      { "\\mathrm",  7, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
       { "\\cyr",  8, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
     { "\\mathbf",  6, NOVALUE,NOVALUE, (HANDLER)(rastfont) },      { "\\mathbf",  6, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
     { "\\bf",  6, NOVALUE,NOVALUE, (HANDLER)(rastfont) },      { "\\bf",  6, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
     { "\\mathtt",  3, NOVALUE,NOVALUE, (HANDLER)(rastfont) },      { "\\mathtt",  3, NOVALUE,NOVALUE, (HANDLER)(rastfont) },
Line 700  STATIC mathchardef symtable[] Line 718  STATIC mathchardef symtable[]
     { "\\lowpass",    ISSUPER,         0,NOVALUE, (HANDLER)(rastflags) },      { "\\lowpass",    ISSUPER,         0,NOVALUE, (HANDLER)(rastflags) },
     { "\\aaalg",ISAAALGORITHM,   NOVALUE,NOVALUE, (HANDLER)(rastflags) },      { "\\aaalg",ISAAALGORITHM,   NOVALUE,NOVALUE, (HANDLER)(rastflags) },
     { "\\pnmparams",PNMPARAMS,   NOVALUE,NOVALUE, (HANDLER)(rastflags) },      { "\\pnmparams",PNMPARAMS,   NOVALUE,NOVALUE, (HANDLER)(rastflags) },
       { "\\gammacorrection",ISGAMMA,NOVALUE,NOVALUE,(HANDLER)(rastflags) },
       { "\\nocontenttype",ISCONTENTTYPE, 0,NOVALUE, (HANDLER)(rastflags) },
     { "\\opaque",    ISOPAQUE,         0,NOVALUE, (HANDLER)(rastflags) },      { "\\opaque",    ISOPAQUE,         0,NOVALUE, (HANDLER)(rastflags) },
       { "\\transparent",ISOPAQUE,        1,NOVALUE, (HANDLER)(rastflags) },
     { "\\squash",    ISSMASH,          3,1,       (HANDLER)(rastflags) },      { "\\squash",    ISSMASH,          3,1,       (HANDLER)(rastflags) },
     { "\\smash",     ISSMASH,          3,1,       (HANDLER)(rastflags) },      { "\\smash",     ISSMASH,          3,1,       (HANDLER)(rastflags) },
     { "\\nosquash",  ISSMASH,          0,NOVALUE, (HANDLER)(rastflags) },      { "\\nosquash",  ISSMASH,          0,NOVALUE, (HANDLER)(rastflags) },
Line 770  STATIC mathchardef symtable[] Line 791  STATIC mathchardef symtable[]
     { "\\bigskip",   0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },      { "\\bigskip",   0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },
     { "\\phantom",   1, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },      { "\\phantom",   1, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },
     { "\\nocaching", 0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },      { "\\nocaching", 0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },
       { "\\noconten",  0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },
     { "\\nonumber",  0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },      { "\\nonumber",  0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },
     { "\\!",         0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },      /* { "\\!",      0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) }, */
       { "\\cydot",     0, NOVALUE,NOVALUE,  (HANDLER)(rastnoop) },
     /* --------------------- C M M I --------------------------      /* --------------------- C M M I --------------------------
           symbol     charnum    family    class    function            symbol     charnum    family    class    function
     -------------------------------------------------------- */      -------------------------------------------------------- */
Line 915  STATIC mathchardef symtable[] Line 938  STATIC mathchardef symtable[]
     { "y", 121, CMMI10,   VARIABLE, NULL },      { "y", 121, CMMI10,   VARIABLE, NULL },
     { "z", 122, CMMI10,   VARIABLE, NULL },      { "z", 122, CMMI10,   VARIABLE, NULL },
     /* --- miscellaneous symbols and relations --- */      /* --- miscellaneous symbols and relations --- */
     { "\\imath", 123, CMMI10,   ORDINARY, NULL },      { "\\imath", 123, CMMI10,   VARIABLE, NULL },
     { "\\jmath", 124, CMMI10,   ORDINARY, NULL },      { "\\jmath", 124, CMMI10,   VARIABLE, NULL },
     { "\\wp", 125, CMMI10,   ORDINARY, NULL },      { "\\wp", 125, CMMI10,   ORDINARY, NULL },
     { "\\vec", 126, CMMI10,   ORDINARY, NULL },      { "\\vec", 126, CMMI10,   ORDINARY, NULL },
     /* --------------------- C M M I B ------------------------      /* --------------------- C M M I B ------------------------
Line 1060  STATIC mathchardef symtable[] Line 1083  STATIC mathchardef symtable[]
     { "y", 121, CMMIB10,  VARIABLE, NULL },      { "y", 121, CMMIB10,  VARIABLE, NULL },
     { "z", 122, CMMIB10,  VARIABLE, NULL },      { "z", 122, CMMIB10,  VARIABLE, NULL },
     /* --- miscellaneous symbols and relations --- */      /* --- miscellaneous symbols and relations --- */
     { "\\imath", 123, CMMIB10,  ORDINARY, NULL },      { "\\imath", 123, CMMIB10,  VARIABLE, NULL },
     { "\\jmath", 124, CMMIB10,  ORDINARY, NULL },      { "\\jmath", 124, CMMIB10,  VARIABLE, NULL },
     { "\\wp", 125, CMMIB10,  ORDINARY, NULL },      { "\\wp", 125, CMMIB10,  ORDINARY, NULL },
     { "\\bfvec", 126, CMMIB10,  ORDINARY, NULL },      { "\\bfvec", 126, CMMIB10,  ORDINARY, NULL },
     /* --------------------- C M S Y --------------------------      /* --------------------- C M S Y --------------------------
Line 1314  STATIC mathchardef symtable[] Line 1337  STATIC mathchardef symtable[]
     { "*", 42, CMR10,   BINARYOP, NULL },      { "*", 42, CMR10,   BINARYOP, NULL },
     { "+", 43, CMR10,   BINARYOP, NULL },      { "+", 43, CMR10,   BINARYOP, NULL },
     { "/", 47, CMR10,   BINARYOP, NULL },      { "/", 47, CMR10,   BINARYOP, NULL },
     { ":", 58, CMR10,   BINARYOP, NULL },      { ":", 58, CMR10,   ORDINARY, NULL },
     { ";", 59, CMR10,   BINARYOP, NULL },      { ";", 59, CMR10,   ORDINARY, NULL },
     { "=", 61, CMR10,   RELATION, NULL },      { "=", 61, CMR10,   RELATION, NULL },
     { "?", 63, CMR10,   BINARYOP, NULL },      { "?", 63, CMR10,   BINARYOP, NULL },
     { "@", 64, CMR10,   BINARYOP, NULL },      { "@", 64, CMR10,   BINARYOP, NULL },
Line 1747  STATIC mathchardef symtable[] Line 1770  STATIC mathchardef symtable[]
     { "-", 45,    BBOLD10,   BINARYOP, NULL },      { "-", 45,    BBOLD10,   BINARYOP, NULL },
     { ".", 46,    BBOLD10,   PUNCTION, NULL },      { ".", 46,    BBOLD10,   PUNCTION, NULL },
     { "/", 47,    BBOLD10,   BINARYOP, NULL },      { "/", 47,    BBOLD10,   BINARYOP, NULL },
     { ":", 58,    BBOLD10,   BINARYOP, NULL },      { ":", 58,    BBOLD10,   ORDINARY, NULL },
     { ";", 59,    BBOLD10,   BINARYOP, NULL },      { ";", 59,    BBOLD10,   ORDINARY, NULL },
     { "<", 60,    BBOLD10,   RELATION, NULL },      { "<", 60,    BBOLD10,   RELATION, NULL },
     { "\\<", 60,    BBOLD10,   RELATION, NULL },      { "\\<", 60,    BBOLD10,   RELATION, NULL },
     { "\\cdot", 61,    BBOLD10,   BINARYOP, NULL },      { "\\cdot", 61,    BBOLD10,   BINARYOP, NULL },
Line 1800  STATIC mathchardef symtable[] Line 1823  STATIC mathchardef symtable[]
     { "\\boxcircle",   29, STMARY10,  BINARYOP, NULL },      { "\\boxcircle",   29, STMARY10,  BINARYOP, NULL },
     { "\\boxbox",   30, STMARY10,  BINARYOP, NULL },      { "\\boxbox",   30, STMARY10,  BINARYOP, NULL },
     { "\\boxempty",   31, STMARY10,  BINARYOP, NULL },      { "\\boxempty",   31, STMARY10,  BINARYOP, NULL },
       { "\\qed",   31, STMARY10,  BINARYOP, NULL },
     { "\\lightning",   32, STMARY10,  ORDINARY, NULL },      { "\\lightning",   32, STMARY10,  ORDINARY, NULL },
     { "\\merge",   33, STMARY10,  BINARYOP, NULL },      { "\\merge",   33, STMARY10,  BINARYOP, NULL },
     { "\\vartimes",   34, STMARY10,  BINARYOP, NULL },      { "\\vartimes",   34, STMARY10,  BINARYOP, NULL },
Line 1874  STATIC mathchardef symtable[] Line 1898  STATIC mathchardef symtable[]
     { "\\bigparallel",  102, STMARY10,  OPERATOR, NULL },      { "\\bigparallel",  102, STMARY10,  OPERATOR, NULL },
     { "\\biginterleave",  103, STMARY10,  OPERATOR, NULL },      { "\\biginterleave",  103, STMARY10,  OPERATOR, NULL },
     { "\\bignplus",  112, STMARY10,  OPERATOR, NULL },      { "\\bignplus",  112, STMARY10,  OPERATOR, NULL },
       /* ---------------------- C Y R ---------------------------
             symbol     charnum    family    class    function
       -------------------------------------------------------- */
       /* ---
        * undefined: 20,21,28,29,33-59,61,63,64,91,92,93,96,123,124
        * ---------------------------------------------------------- */
       /* --- special characters --- */
       { "\\cyddot", 32, CYR10,   VARIABLE, NULL },
       /* ---See amsfndoc.dvi Figure 1 Input Conventions for AMS cyrillic--- */
       { "A", 65, CYR10,   VARIABLE, NULL },
       { "a", 97, CYR10,   VARIABLE, NULL },
       { "B", 66, CYR10,   VARIABLE, NULL },
       { "b", 98, CYR10,   VARIABLE, NULL },
       { "V", 86, CYR10,   VARIABLE, NULL },
       { "v", 118, CYR10,   VARIABLE, NULL },
       { "G", 71, CYR10,   VARIABLE, NULL },
       { "g", 103, CYR10,   VARIABLE, NULL },
       { "D", 68, CYR10,   VARIABLE, NULL },
       { "d", 100, CYR10,   VARIABLE, NULL },
       { "Dj", 6, CYR10,   VARIABLE, NULL },
       { "DJ", 6, CYR10,   VARIABLE, NULL },
       { "dj", 14, CYR10,   VARIABLE, NULL },
       { "E", 69, CYR10,   VARIABLE, NULL },
       { "e", 101, CYR10,   VARIABLE, NULL },
       { "\\\"E", 19, CYR10,   VARIABLE, NULL },
       { "\\\"e", 27, CYR10,   VARIABLE, NULL },
       { "\\=E", 5, CYR10,   VARIABLE, NULL },
       { "\\=e", 13, CYR10,   VARIABLE, NULL },
       { "Zh", 17, CYR10,   VARIABLE, NULL },
       { "ZH", 17, CYR10,   VARIABLE, NULL },
       { "zh", 25, CYR10,   VARIABLE, NULL },
       { "Z", 90, CYR10,   VARIABLE, NULL },
       { "z", 122, CYR10,   VARIABLE, NULL },
       { "I", 73, CYR10,   VARIABLE, NULL },
       { "i", 105, CYR10,   VARIABLE, NULL },
       { "\\=I", 4, CYR10,   VARIABLE, NULL },
       { "\\=\\i", 12, CYR10,   VARIABLE, NULL },
       { "J", 74, CYR10,   VARIABLE, NULL },
       { "j", 106, CYR10,   VARIABLE, NULL },
       { "\\u I", 18, CYR10,   VARIABLE, NULL },
       { "\\u\\i", 26, CYR10,   VARIABLE, NULL },
       { "K", 75, CYR10,   VARIABLE, NULL },
       { "k", 107, CYR10,   VARIABLE, NULL },
       { "L", 76, CYR10,   VARIABLE, NULL },
       { "l", 108, CYR10,   VARIABLE, NULL },
       { "Lj", 1, CYR10,   VARIABLE, NULL },
       { "LJ", 1, CYR10,   VARIABLE, NULL },
       { "lj", 9, CYR10,   VARIABLE, NULL },
       { "M", 77, CYR10,   VARIABLE, NULL },
       { "m", 109, CYR10,   VARIABLE, NULL },
       { "N", 78, CYR10,   VARIABLE, NULL },
       { "n", 110, CYR10,   VARIABLE, NULL },
       { "Nj", 0, CYR10,   VARIABLE, NULL },
       { "NJ", 0, CYR10,   VARIABLE, NULL },
       { "nj", 8, CYR10,   VARIABLE, NULL },
       { "O", 79, CYR10,   VARIABLE, NULL },
       { "o", 111, CYR10,   VARIABLE, NULL },
       { "P", 80, CYR10,   VARIABLE, NULL },
       { "p", 112, CYR10,   VARIABLE, NULL },
       { "R", 82, CYR10,   VARIABLE, NULL },
       { "r", 114, CYR10,   VARIABLE, NULL },
       { "S", 83, CYR10,   VARIABLE, NULL },
       { "s", 115, CYR10,   VARIABLE, NULL },
       { "T", 84, CYR10,   VARIABLE, NULL },
       { "t", 116, CYR10,   VARIABLE, NULL },
       { "\\\'C", 7, CYR10,   VARIABLE, NULL },
       { "\\\'c", 15, CYR10,   VARIABLE, NULL },
       { "U", 85, CYR10,   VARIABLE, NULL },
       { "u", 117, CYR10,   VARIABLE, NULL },
       { "F", 70, CYR10,   VARIABLE, NULL },
       { "f", 102, CYR10,   VARIABLE, NULL },
       { "Kh", 72, CYR10,   VARIABLE, NULL },
       { "KH", 72, CYR10,   VARIABLE, NULL },
       { "kh", 104, CYR10,   VARIABLE, NULL },
       { "Ts", 67, CYR10,   VARIABLE, NULL },
       { "TS", 67, CYR10,   VARIABLE, NULL },
       { "ts", 99, CYR10,   VARIABLE, NULL },
       { "Ch", 81, CYR10,   VARIABLE, NULL },
       { "CH", 81, CYR10,   VARIABLE, NULL },
       { "ch", 113, CYR10,   VARIABLE, NULL },
       { "Dzh", 2, CYR10,   VARIABLE, NULL },
       { "DZH", 2, CYR10,   VARIABLE, NULL },
       { "dzh", 10, CYR10,   VARIABLE, NULL },
       { "Sh", 88, CYR10,   VARIABLE, NULL },
       { "SH", 88, CYR10,   VARIABLE, NULL },
       { "sh", 120, CYR10,   VARIABLE, NULL },
       { "Shch", 87, CYR10,   VARIABLE, NULL },
       { "SHCH", 87, CYR10,   VARIABLE, NULL },
       { "shch", 119, CYR10,   VARIABLE, NULL },
       { "\\Cdprime", 95, CYR10,   VARIABLE, NULL },
       { "\\cdprime", 127, CYR10,   VARIABLE, NULL },
       { "Y", 89, CYR10,   VARIABLE, NULL },
       { "y", 121, CYR10,   VARIABLE, NULL },
       { "\\Cprime", 94, CYR10,   VARIABLE, NULL },
       { "\\cprime", 126, CYR10,   VARIABLE, NULL },
       { "\\`E", 3, CYR10,   VARIABLE, NULL },
       { "\\`e", 11, CYR10,   VARIABLE, NULL },
       { "Yu", 16, CYR10,   VARIABLE, NULL },
       { "YU", 16, CYR10,   VARIABLE, NULL },
       { "yu", 24, CYR10,   VARIABLE, NULL },
       { "Ya", 23, CYR10,   VARIABLE, NULL },
       { "YA", 23, CYR10,   VARIABLE, NULL },
       { "ya", 31, CYR10,   VARIABLE, NULL },
       { "\\Dz", 22, CYR10,   VARIABLE, NULL },
       { "\\dz", 30, CYR10,   VARIABLE, NULL },
       { "N0", 125, CYR10,   VARIABLE, NULL },
       { "<", 60, CYR10,   VARIABLE, NULL },
       { ">", 62, CYR10,   VARIABLE, NULL },
     /* --- trailer record --- */      /* --- trailer record --- */
     { NULL, -999, -999, -999, NULL }      { NULL, -999, -999, -999, NULL }
  }   }

Removed from v.1.2  
changed lines
  Added in v.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>