diff -ruN math.7_mar_2003/lexer.mll math/lexer.mll --- math.7_mar_2003/lexer.mll 2003-03-07 15:59:38.000000000 +0100 +++ math/lexer.mll 2003-03-10 11:30:03.000000000 +0100 @@ -9,8 +9,8 @@ let literal_mn = ['0'-'9'] let literal_uf_lt = [',' ':' ';' '?' '!' '\''] let delimiter_uf_lt = ['(' ')' '.'] -let literal_uf_op = ['+' '-' '*' '=' '|'] -let delimiter_uf_op = ['/'] +let literal_uf_op = ['+' '-' '*' '='] +let delimiter_uf_op = ['/' '|'] let boxchars = ['0'-'9' 'a'-'z' 'A'-'Z' '+' '-' '*' ',' '=' '(' ')' ':' '/' ';' '?' '.' '!' ' ' '\128'-'\255'] let aboxchars = ['0'-'9' 'a'-'z' 'A'-'Z' '+' '-' '*' ',' '=' '(' ')' ':' '/' ';' '?' '.' '!' ' '] @@ -48,6 +48,7 @@ | literal_uf_lt { let str = Lexing.lexeme lexbuf in LITERAL (HTMLABLEC (FONT_UFH, str,str)) } | delimiter_uf_lt { let str = Lexing.lexeme lexbuf in DELIMITER (HTMLABLEC (FONT_UFH, str,str)) } | literal_uf_op { let str = Lexing.lexeme lexbuf in LITERAL (MHTMLABLEC (FONT_UFH, str," "^str^" ",MO,str)) } + | delimiter_uf_op { let str = Lexing.lexeme lexbuf in DELIMITER (MHTMLABLEC (FONT_UFH, str," "^str^" ",MO,str)) } | "\\" alpha + { Texutil.find (Lexing.lexeme lexbuf) } | "\\sqrt" space * "[" { FUN_AR1opt "\\sqrt" } | "\\," { LITERAL (HTMLABLE (FONT_UF, "\\,"," ")) } diff -ruN math.7_mar_2003/parser.mly math/parser.mly --- math.7_mar_2003/parser.mly 2003-03-07 17:02:00.000000000 +0100 +++ math/parser.mly 2003-03-10 11:22:15.000000000 +0100 @@ -72,6 +72,7 @@ LITERAL { TEX_LITERAL $1 } | DELIMITER { TEX_LITERAL $1 } | BIG DELIMITER { TEX_BIG ($1,$2) } + | BIG SQ_CLOSE { TEX_BIG ($1,sq_close_ri) } | left expr right { TEX_LR ($1,$3,$2) } | FUN_AR1 lit { TEX_FUN1($1,$2) } | FUN_AR1hl lit { let t,h=$1 in TEX_FUN1hl(t,h,$2) } diff -ruN math.7_mar_2003/texutil.ml math/texutil.ml --- math.7_mar_2003/texutil.ml 2003-03-07 17:04:08.000000000 +0100 +++ math/texutil.ml 2003-03-10 11:27:35.000000000 +0100 @@ -246,8 +246,8 @@ | "\\ddagger" -> LITERAL (HTMLABLEM(FONT_UFH, "\\ddagger ", "‡")) | "\\Dagger" -> LITERAL (HTMLABLEM(FONT_UFH, "\\ddagger ", "‡")) | "\\colon" -> LITERAL (HTMLABLEC(FONT_UFH, "\\colon ", ":")) - | "\\Vert" -> LITERAL (HTMLABLEM(FONT_UFH, "\\Vert ", "||")) - | "\\vert" -> LITERAL (HTMLABLEM(FONT_UFH, "\\vert ", "|")) + | "\\Vert" -> DELIMITER (HTMLABLEM(FONT_UFH, "\\Vert ", "||")) + | "\\vert" -> DELIMITER (HTMLABLEM(FONT_UFH, "\\vert ", "|")) | "\\wp" -> LITERAL (HTMLABLE (FONT_UF, "\\wp ", "℘")) | "\\weierp" -> LITERAL (HTMLABLE (FONT_UF, "\\wp ", "℘")) | "\\wedge" -> LITERAL (HTMLABLE (FONT_UF, "\\wedge ", "∧")) @@ -320,12 +320,14 @@ | "\\dots" -> LITERAL (HTMLABLEM(FONT_UFH,"\\dots ", "...")) | "\\quad" -> LITERAL (HTMLABLE (FONT_UF, "\\quad ","  ")) | "\\qquad" -> LITERAL (HTMLABLE (FONT_UF, "\\qquad ","    ")) - | "\\mid" -> DELIMITER (HTMLABLEM(FONT_UFH,"\\mid ", " | ")) + | "\\mid" -> LITERAL (HTMLABLEM(FONT_UFH,"\\mid ", " | ")) | "\\neg" -> LITERAL (HTMLABLEM(FONT_UFH,"\\neg ", "¬")) | "\\langle" -> DELIMITER (HTMLABLE (FONT_UFH,"\\langle ","⟨")) | "\\rangle" -> DELIMITER (HTMLABLE (FONT_UFH,"\\rangle ","⟩")) | "\\lang" -> DELIMITER (HTMLABLE (FONT_UFH,"\\langle ","⟨")) | "\\rang" -> DELIMITER (HTMLABLE (FONT_UFH,"\\rangle ","⟩")) + | "\\lbrack" -> DELIMITER (HTMLABLEC(FONT_UFH,"[","[")) + | "\\rbrack" -> DELIMITER (HTMLABLEC(FONT_UFH,"]","]")) | "\\ddots" -> LITERAL (TEX_ONLY "\\ddots ") | "\\clubs" -> LITERAL (TEX_ONLY "\\clubsuit ") | "\\clubsuit" -> LITERAL (TEX_ONLY "\\clubsuit ")