itextomml 1.3.23 → 1.3.24

data/ext/itex2MML.h

@@ -1,11 +1,11 @@
-/*             itex2MML 1.3.23
- *   itex2MML.h last modified 4/28/2010
+/*             itex2MML 1.3.24
+ *   itex2MML.h last modified 5/24/2010
  */
 
 #ifndef ITEX2MML_H
 #define ITEX2MML_H
 
-#define ITEX2MML_VERSION "1.3.23"
+#define ITEX2MML_VERSION "1.3.24"
 
 #ifdef __cplusplus
 extern "C" {

data/ext/lex.yy.c

@@ -6,10 +6,29 @@
 
 /* A lexical scanner generated by flex */
 
+#define yy_create_buffer itex2MML_yy_create_buffer
+#define yy_delete_buffer itex2MML_yy_delete_buffer
+#define yy_flex_debug itex2MML_yy_flex_debug
+#define yy_init_buffer itex2MML_yy_init_buffer
+#define yy_flush_buffer itex2MML_yy_flush_buffer
+#define yy_load_buffer_state itex2MML_yy_load_buffer_state
+#define yy_switch_to_buffer itex2MML_yy_switch_to_buffer
+#define yyin itex2MML_yyin
+#define yyleng itex2MML_yyleng
+#define yylex itex2MML_yylex
+#define yylineno itex2MML_yylineno
+#define yyout itex2MML_yyout
+#define yyrestart itex2MML_yyrestart
+#define yytext itex2MML_yytext
+#define yywrap itex2MML_yywrap
+#define yyalloc itex2MML_yyalloc
+#define yyrealloc itex2MML_yyrealloc
+#define yyfree itex2MML_yyfree
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -31,7 +50,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -94,11 +113,12 @@ typedef unsigned int flex_uint32_t;
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -152,7 +172,12 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-extern int itex2MML_yyleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t itex2MML_yyleng;
 
 extern FILE *itex2MML_yyin, *itex2MML_yyout;
 
@@ -178,16 +203,6 @@ extern FILE *itex2MML_yyin, *itex2MML_yyout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
-#endif
-
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -205,7 +220,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -275,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when itex2MML_yytext is formed. */
 static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int itex2MML_yyleng;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t itex2MML_yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -304,7 +319,7 @@ static void itex2MML_yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE itex2MML_yy_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE itex2MML_yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE itex2MML_yy_scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE itex2MML_yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
 
 void *itex2MML_yyalloc (yy_size_t  );
 void *itex2MML_yyrealloc (void *,yy_size_t  );
@@ -2219,7 +2234,7 @@ int itex2MML_lineno = 1;
 
 int itex2MML_rowposn = 0;
 int itex2MML_displaymode = 0;
-#line 2223 "lex.yy.c"
+#line 2238 "lex.yy.c"
 
 #define INITIAL 0
 #define MATH 1
@@ -2250,6 +2265,35 @@ int itex2MML_displaymode = 0;
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int itex2MML_yylex_destroy (void );
+
+int itex2MML_yyget_debug (void );
+
+void itex2MML_yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE itex2MML_yyget_extra (void );
+
+void itex2MML_yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *itex2MML_yyget_in (void );
+
+void itex2MML_yyset_in  (FILE * in_str  );
+
+FILE *itex2MML_yyget_out (void );
+
+void itex2MML_yyset_out  (FILE * out_str  );
+
+yy_size_t itex2MML_yyget_leng (void );
+
+char *itex2MML_yyget_text (void );
+
+int itex2MML_yyget_lineno (void );
+
+void itex2MML_yyset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -2292,7 +2336,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( itex2MML_yytext, itex2MML_yyleng, 1, itex2MML_yyout )
+#define ECHO fwrite( itex2MML_yytext, itex2MML_yyleng, 1, itex2MML_yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -2303,7 +2347,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		yy_size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( itex2MML_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -2391,7 +2435,7 @@ YY_DECL
    if (itex2MML_rowposn==2) itex2MML_rowposn=1;
 
 
-#line 2395 "lex.yy.c"
+#line 2439 "lex.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -4981,7 +5025,7 @@ YY_RULE_SETUP
 #line 1001 "itex2MML.l"
 ECHO;
 	YY_BREAK
-#line 4985 "lex.yy.c"
+#line 5029 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(MATH):
 case YY_STATE_EOF(ATTRIBUTELIST):
@@ -5180,7 +5224,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -5194,7 +5238,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -5249,6 +5293,14 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) itex2MML_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -5327,7 +5379,7 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
 		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
@@ -5376,7 +5428,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -5652,7 +5704,7 @@ void itex2MML_yypop_buffer_state (void)
  */
 static void itex2MML_yyensure_buffer_stack (void)
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -5664,7 +5716,9 @@ static void itex2MML_yyensure_buffer_stack (void)
 		(yy_buffer_stack) = (struct yy_buffer_state**)itex2MML_yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in itex2MML_yyensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -5682,6 +5736,8 @@ static void itex2MML_yyensure_buffer_stack (void)
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in itex2MML_yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -5726,7 +5782,7 @@ YY_BUFFER_STATE itex2MML_yy_scan_buffer  (char * base, yy_size_t  size )
 
 /** Setup the input buffer state to scan a string. The next call to itex2MML_yylex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -5745,12 +5801,11 @@ YY_BUFFER_STATE itex2MML_yy_scan_string (yyconst char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE itex2MML_yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+YY_BUFFER_STATE itex2MML_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n;
-	int i;
+	yy_size_t n, i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -5832,7 +5887,7 @@ FILE *itex2MML_yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-int itex2MML_yyget_leng  (void)
+yy_size_t itex2MML_yyget_leng  (void)
 {
         return itex2MML_yyleng;
 }

data/ext/y.tab.c

@@ -738,7 +738,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -2172,7 +2172,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -4411,7 +4411,7 @@ yyreduce:
   case 230:
 #line 1291 "itex2MML.y"
     {
-  (yyval) = itex2MML_copy3("<mover>", (yyvsp[(2) - (2)]), "<mo stretchy=\"false\">&#x302;</mo></mover>");
+  (yyval) = itex2MML_copy3("<mover>", (yyvsp[(2) - (2)]), "<mo stretchy=\"false\">&#x5E;</mo></mover>");
   itex2MML_free_string((yyvsp[(2) - (2)]));
 }
     break;
@@ -4419,7 +4419,7 @@ yyreduce:
   case 231:
 #line 1295 "itex2MML.y"
     {
-  (yyval) = itex2MML_copy3("<mover>", (yyvsp[(2) - (2)]), "<mo>&#x302;</mo></mover>");
+  (yyval) = itex2MML_copy3("<mover>", (yyvsp[(2) - (2)]), "<mo>&#x5E;</mo></mover>");
   itex2MML_free_string((yyvsp[(2) - (2)]));
 }
     break;

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: itextomml
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 23
-  version: 1.3.23
+  version: 1.3.24
 platform: ruby
 authors: 
 - Jacques Distler
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -05:00
+date: 2010-05-24 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -49,20 +44,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Native Ruby bindings to itex2MML.