itextomml 1.5.2 → 1.5.3

data/ext/y.tab.h

@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -33,183 +30,192 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Tokens.  */
+#ifndef YY_ITEX2MML_YY_Y_TAB_H_INCLUDED
+# define YY_ITEX2MML_YY_Y_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int itex2MML_yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TEXATOP = 258,
-     TEXOVER = 259,
-     CHAR = 260,
-     STARTMATH = 261,
-     STARTDMATH = 262,
-     ENDMATH = 263,
-     MI = 264,
-     MIB = 265,
-     MN = 266,
-     MO = 267,
-     SUP = 268,
-     SUB = 269,
-     MROWOPEN = 270,
-     MROWCLOSE = 271,
-     LEFT = 272,
-     RIGHT = 273,
-     BIG = 274,
-     BBIG = 275,
-     BIGG = 276,
-     BBIGG = 277,
-     BIGL = 278,
-     BBIGL = 279,
-     BIGGL = 280,
-     BBIGGL = 281,
-     FRAC = 282,
-     TFRAC = 283,
-     OPERATORNAME = 284,
-     MATHOP = 285,
-     MATHBIN = 286,
-     MATHREL = 287,
-     MOP = 288,
-     MOL = 289,
-     MOLL = 290,
-     MOF = 291,
-     MOR = 292,
-     PERIODDELIM = 293,
-     OTHERDELIM = 294,
-     LEFTDELIM = 295,
-     RIGHTDELIM = 296,
-     MOS = 297,
-     MOB = 298,
-     SQRT = 299,
-     ROOT = 300,
-     BINOM = 301,
-     TBINOM = 302,
-     UNDER = 303,
-     OVER = 304,
-     OVERBRACE = 305,
-     UNDERLINE = 306,
-     UNDERBRACE = 307,
-     UNDEROVER = 308,
-     TENSOR = 309,
-     MULTI = 310,
-     ARRAYALIGN = 311,
-     COLUMNALIGN = 312,
-     ARRAY = 313,
-     COLSEP = 314,
-     ROWSEP = 315,
-     ARRAYOPTS = 316,
-     COLLAYOUT = 317,
-     COLALIGN = 318,
-     ROWALIGN = 319,
-     ALIGN = 320,
-     EQROWS = 321,
-     EQCOLS = 322,
-     ROWLINES = 323,
-     COLLINES = 324,
-     FRAME = 325,
-     PADDING = 326,
-     ATTRLIST = 327,
-     ITALICS = 328,
-     SANS = 329,
-     TT = 330,
-     BOLD = 331,
-     BOXED = 332,
-     SLASHED = 333,
-     RM = 334,
-     BB = 335,
-     ST = 336,
-     END = 337,
-     BBLOWERCHAR = 338,
-     BBUPPERCHAR = 339,
-     BBDIGIT = 340,
-     CALCHAR = 341,
-     FRAKCHAR = 342,
-     CAL = 343,
-     FRAK = 344,
-     CLAP = 345,
-     LLAP = 346,
-     RLAP = 347,
-     ROWOPTS = 348,
-     TEXTSIZE = 349,
-     SCSIZE = 350,
-     SCSCSIZE = 351,
-     DISPLAY = 352,
-     TEXTSTY = 353,
-     TEXTBOX = 354,
-     TEXTSTRING = 355,
-     XMLSTRING = 356,
-     CELLOPTS = 357,
-     ROWSPAN = 358,
-     COLSPAN = 359,
-     THINSPACE = 360,
-     MEDSPACE = 361,
-     THICKSPACE = 362,
-     QUAD = 363,
-     QQUAD = 364,
-     NEGSPACE = 365,
-     NEGMEDSPACE = 366,
-     NEGTHICKSPACE = 367,
-     PHANTOM = 368,
-     HREF = 369,
-     UNKNOWNCHAR = 370,
-     EMPTYMROW = 371,
-     STATLINE = 372,
-     TOOLTIP = 373,
-     TOGGLE = 374,
-     TOGGLESTART = 375,
-     TOGGLEEND = 376,
-     FGHIGHLIGHT = 377,
-     BGHIGHLIGHT = 378,
-     SPACE = 379,
-     INTONE = 380,
-     INTTWO = 381,
-     INTTHREE = 382,
-     BAR = 383,
-     WIDEBAR = 384,
-     VEC = 385,
-     WIDEVEC = 386,
-     HAT = 387,
-     WIDEHAT = 388,
-     CHECK = 389,
-     WIDECHECK = 390,
-     TILDE = 391,
-     WIDETILDE = 392,
-     DOT = 393,
-     DDOT = 394,
-     DDDOT = 395,
-     DDDDOT = 396,
-     UNARYMINUS = 397,
-     UNARYPLUS = 398,
-     BEGINENV = 399,
-     ENDENV = 400,
-     MATRIX = 401,
-     PMATRIX = 402,
-     BMATRIX = 403,
-     BBMATRIX = 404,
-     VMATRIX = 405,
-     VVMATRIX = 406,
-     SVG = 407,
-     ENDSVG = 408,
-     SMALLMATRIX = 409,
-     CASES = 410,
-     ALIGNED = 411,
-     GATHERED = 412,
-     SUBSTACK = 413,
-     PMOD = 414,
-     RMCHAR = 415,
-     COLOR = 416,
-     BGCOLOR = 417,
-     XARROW = 418,
-     OPTARGOPEN = 419,
-     OPTARGCLOSE = 420,
-     ITEXNUM = 421,
-     RAISEBOX = 422,
-     NEG = 423
-   };
+  enum yytokentype
+  {
+    TEXOVER = 258,
+    TEXATOP = 259,
+    CHAR = 260,
+    STARTMATH = 261,
+    STARTDMATH = 262,
+    ENDMATH = 263,
+    MI = 264,
+    MIB = 265,
+    MN = 266,
+    MO = 267,
+    SUP = 268,
+    SUB = 269,
+    MROWOPEN = 270,
+    MROWCLOSE = 271,
+    LEFT = 272,
+    RIGHT = 273,
+    BIG = 274,
+    BBIG = 275,
+    BIGG = 276,
+    BBIGG = 277,
+    BIGL = 278,
+    BBIGL = 279,
+    BIGGL = 280,
+    BBIGGL = 281,
+    FRAC = 282,
+    TFRAC = 283,
+    OPERATORNAME = 284,
+    MATHOP = 285,
+    MATHBIN = 286,
+    MATHREL = 287,
+    MOP = 288,
+    MOL = 289,
+    MOLL = 290,
+    MOF = 291,
+    MOR = 292,
+    PERIODDELIM = 293,
+    OTHERDELIM = 294,
+    LEFTDELIM = 295,
+    RIGHTDELIM = 296,
+    MOS = 297,
+    MOB = 298,
+    SQRT = 299,
+    ROOT = 300,
+    BINOM = 301,
+    TBINOM = 302,
+    UNDER = 303,
+    OVER = 304,
+    OVERBRACE = 305,
+    UNDERLINE = 306,
+    UNDERBRACE = 307,
+    UNDEROVER = 308,
+    TENSOR = 309,
+    MULTI = 310,
+    ARRAYALIGN = 311,
+    COLUMNALIGN = 312,
+    ARRAY = 313,
+    COLSEP = 314,
+    ROWSEP = 315,
+    ARRAYOPTS = 316,
+    COLLAYOUT = 317,
+    COLALIGN = 318,
+    ROWALIGN = 319,
+    ALIGN = 320,
+    EQROWS = 321,
+    EQCOLS = 322,
+    ROWLINES = 323,
+    COLLINES = 324,
+    FRAME = 325,
+    PADDING = 326,
+    ATTRLIST = 327,
+    ITALICS = 328,
+    SANS = 329,
+    TT = 330,
+    BOLD = 331,
+    BOXED = 332,
+    SLASHED = 333,
+    RM = 334,
+    BB = 335,
+    ST = 336,
+    END = 337,
+    BBLOWERCHAR = 338,
+    BBUPPERCHAR = 339,
+    BBDIGIT = 340,
+    CALCHAR = 341,
+    FRAKCHAR = 342,
+    CAL = 343,
+    FRAK = 344,
+    CLAP = 345,
+    LLAP = 346,
+    RLAP = 347,
+    ROWOPTS = 348,
+    TEXTSIZE = 349,
+    SCSIZE = 350,
+    SCSCSIZE = 351,
+    DISPLAY = 352,
+    TEXTSTY = 353,
+    TEXTBOX = 354,
+    TEXTSTRING = 355,
+    XMLSTRING = 356,
+    CELLOPTS = 357,
+    ROWSPAN = 358,
+    COLSPAN = 359,
+    THINSPACE = 360,
+    MEDSPACE = 361,
+    THICKSPACE = 362,
+    QUAD = 363,
+    QQUAD = 364,
+    NEGSPACE = 365,
+    NEGMEDSPACE = 366,
+    NEGTHICKSPACE = 367,
+    PHANTOM = 368,
+    HREF = 369,
+    UNKNOWNCHAR = 370,
+    EMPTYMROW = 371,
+    STATLINE = 372,
+    TOOLTIP = 373,
+    TOGGLE = 374,
+    TOGGLESTART = 375,
+    TOGGLEEND = 376,
+    FGHIGHLIGHT = 377,
+    BGHIGHLIGHT = 378,
+    SPACE = 379,
+    INTONE = 380,
+    INTTWO = 381,
+    INTTHREE = 382,
+    BAR = 383,
+    WIDEBAR = 384,
+    VEC = 385,
+    WIDEVEC = 386,
+    HAT = 387,
+    WIDEHAT = 388,
+    CHECK = 389,
+    WIDECHECK = 390,
+    TILDE = 391,
+    WIDETILDE = 392,
+    DOT = 393,
+    DDOT = 394,
+    DDDOT = 395,
+    DDDDOT = 396,
+    UNARYMINUS = 397,
+    UNARYPLUS = 398,
+    BEGINENV = 399,
+    ENDENV = 400,
+    MATRIX = 401,
+    PMATRIX = 402,
+    BMATRIX = 403,
+    BBMATRIX = 404,
+    VMATRIX = 405,
+    VVMATRIX = 406,
+    SVG = 407,
+    ENDSVG = 408,
+    SMALLMATRIX = 409,
+    CASES = 410,
+    ALIGNED = 411,
+    GATHERED = 412,
+    SUBSTACK = 413,
+    PMOD = 414,
+    RMCHAR = 415,
+    COLOR = 416,
+    BGCOLOR = 417,
+    XARROW = 418,
+    OPTARGOPEN = 419,
+    OPTARGCLOSE = 420,
+    ITEXNUM = 421,
+    RAISEBOX = 422,
+    NEG = 423
+  };
 #endif
 /* Tokens.  */
-#define TEXATOP 258
-#define TEXOVER 259
+#define TEXOVER 258
+#define TEXATOP 259
 #define CHAR 260
 #define STARTMATH 261
 #define STARTDMATH 262
@@ -375,15 +381,16 @@
 #define RAISEBOX 422
 #define NEG 423
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 extern YYSTYPE itex2MML_yylval;
 
+int itex2MML_yyparse (char **ret_str);
+
+#endif /* !YY_ITEX2MML_YY_Y_TAB_H_INCLUDED  */

data/lib/itex_stringsupport.rb

@@ -1,5 +1,5 @@
 # Some useful additions to the String class
-# Copyright (C) 2010, Jacques Distler. All rights reserved.
+# Copyright (C) 2010-16, Jacques Distler. All rights reserved.
 # Licensed under a triple GPL/MPL/LGPL License.
 
 class String
@@ -564,7 +564,6 @@ end
 	'daleth' => 'ℸ',
 	'demptyv' => '⦱',
 	'ell' => 'ℓ',
-	'empty' => '∅',
 	'emptyv' => '∅',
 	'gimel' => 'ℷ',
 	'iiota' => '℩',
@@ -813,7 +812,6 @@ end
 	'upsi' => 'υ',
 	'Xi' => 'Ξ',
 	'xi' => 'ξ',
-	'zeta' => 'ζ',
 	'Afr' => '𝔄',
 	'afr' => '𝔞',
 	'Bfr' => '𝔅',
@@ -1521,8 +1519,6 @@ end
 	'clubs' => '♣',
 	'copysr' => '℗',
 	'cross' => '✗',
-	'Dagger' => '‡',
-	'dagger' => '†',
 	'dash' => '‐',
 	'diams' => '♦',
 	'dlcrop' => '⌍',
@@ -2002,7 +1998,7 @@ end
 	'NotExists' => '∄',
 	'NotGreater' => '≯',
 	'NotGreaterEqual' => '≱',
-	'NotGreaterFullEqual' => '≦̸',
+	'NotGreaterFullEqual' => '≧̸',
 	'NotGreaterGreater' => '≫̸',
 	'NotGreaterLess' => '≹',
 	'NotGreaterSlantEqual' => '⩾̸',
@@ -2315,7 +2311,7 @@ end
       "'" => ''',
       '"' => '"',
     }
-    TO_ESCAPE_PATTERN = Regexp.union(TO_ESCAPE.keys)
+    TO_ESCAPE_PATTERN = Regexp.union(*TO_ESCAPE.keys)
     
     def escapeHTML
       self.gsub(TO_ESCAPE_PATTERN){|m| TO_ESCAPE[m]}
@@ -2331,24 +2327,16 @@ end
       when /\Aquot\z/ni            then '"'
       when /\Aapos\z/ni            then "'"
       when /\A#0*(\d+)\z/n       then
-        if Integer($1) < 256
-          Integer($1).chr
+        if Integer($1) < 1114111
+          [Integer($1)].pack("U")
         else
-          if Integer($1) < 1114111
-            [Integer($1)].pack("U")
-          else
-            "&##{$1};"
-          end
+          "&##{$1};"
         end
       when /\A#x([0-9a-f]+)\z/ni then
-        if $1.hex < 256
+        if $1.hex < 1114111
           [$1.hex].pack("U")
         else
-          if $1.hex < 1114111
-            [$1.hex].pack("U")
-          else
-            "&#x#{$1};"
-          end
+          "&#x#{$1};"
         end
       else
         "&#{match};"