itextomml 1.3.20 → 1.3.21

data/README

@@ -6,6 +6,10 @@ A summary of the LaTeX syntax supported in itex can be found at
 
       http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html
 
+The source repository for the itex2MML project may be found at
+
+      http://golem.ph.utexas.edu/~distler/code/itexToMML/changes
+
 The Ruby module provides four public methods
 
        require 'itextomml'

data/ext/itex2MML.h

@@ -1,11 +1,11 @@
-/*             itex2MML 1.3.20
- *   itex2MML.h last modified 2/21/2010
+/*             itex2MML 1.3.21
+ *   itex2MML.h last modified 4/4/2010
  */
 
 #ifndef ITEX2MML_H
 #define ITEX2MML_H
 
-#define ITEX2MML_VERSION "1.3.20"
+#define ITEX2MML_VERSION "1.3.21"
 
 #ifdef __cplusplus
 extern "C" {

data/ext/itex2MML_ruby.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.40
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -9,7 +9,6 @@
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
-
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -52,12 +51,6 @@
 # endif
 #endif
 
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
-#endif
-
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -161,12 +154,6 @@
 # endif
 #endif
 
-#ifndef SWIG_MSC_UNSUPPRESS_4505
-# if defined(_MSC_VER)
-#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
-#endif
-
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -231,7 +218,7 @@
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic C API SWIG runtime support for pointer
+ * This file contains generic CAPI SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
@@ -250,11 +237,11 @@
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the SWIG runtime code.
-  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
+  creating a static or dynamic library from the swig runtime code.
+  In 99.9% of the cases, swig just needs to declare them as 'static'.
   
-  But only do this if strictly necessary, ie, if you have problems
-  with your compiler or suchlike.
+  But only do this if is strictly necessary, ie, if you have problems
+  with your compiler or so.
 */
 
 #ifndef SWIGRUNTIME
@@ -281,14 +268,14 @@
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return and integer 
+   The swig conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old versions of SWIG, code such as the following was usually written:
+   In old swig versions, you usually write code as:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -296,7 +283,7 @@
        //fail code
      }
 
-   Now you can be more explicit:
+   Now you can be more explicit as:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -305,7 +292,7 @@
       // fail code
     }
 
-   which is the same really, but now you can also do
+   that seems to be the same, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -323,7 +310,7 @@
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   also requires SWIG_ConvertPtr to return new result values, such as
+   requires also to SWIG_ConvertPtr to return new result values, as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {			       
@@ -341,7 +328,7 @@
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   SWIG errors code.
+   swig errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -355,8 +342,9 @@
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
-*/
 
+
+ */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -381,6 +369,7 @@
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
+
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -403,6 +392,8 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
+
+
 #include <string.h>
 
 #ifdef __cplusplus
@@ -499,58 +490,40 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
+/* think of this as a c++ template<> or a scheme macro */
+#define SWIG_TypeCheck_Template(comparison, ty)         \
+  if (ty) {                                             \
+    swig_cast_info *iter = ty->cast;                    \
+    while (iter) {                                      \
+      if (comparison) {                                 \
+        if (iter == ty->cast) return iter;              \
+        /* Move iter to the top of the linked list */   \
+        iter->prev->next = iter->next;                  \
+        if (iter->next)                                 \
+          iter->next->prev = iter->prev;                \
+        iter->next = ty->cast;                          \
+        iter->prev = 0;                                 \
+        if (ty->cast) ty->cast->prev = iter;            \
+        ty->cast = iter;                                \
+        return iter;                                    \
+      }                                                 \
+      iter = iter->next;                                \
+    }                                                   \
+  }                                                     \
+  return 0
+
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (strcmp(iter->type->name, c) == 0) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
+  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
 }
 
-/* 
-  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
-*/
+/* Same as previous function, except strcmp is replaced with a pointer comparison */
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
-  if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (iter->type == from) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
-      }
-      iter = iter->next;
-    }
-  }
-  return 0;
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
+  SWIG_TypeCheck_Template(iter->type == from, into);
 }
 
 /*
@@ -838,15 +811,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifdef read
 # undef read
 #endif
-#ifdef bind
-# undef bind
-#endif
-#ifdef close
-# undef close
-#endif
-#ifdef connect
-# undef connect
-#endif
 
 
 /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
@@ -1803,7 +1767,7 @@ static VALUE mItex2MML;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x010340 
+#define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1876,7 +1840,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/1.3.40/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/sw/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1952,12 +1916,12 @@ SWIGINTERN VALUE
 _wrap_itex2MML_filter(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   unsigned long arg2 ;
+  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  int result;
   VALUE vresult = Qnil;
   
   if ((argc < 2) || (argc > 2)) {
@@ -1987,12 +1951,12 @@ SWIGINTERN VALUE
 _wrap_itex2MML_html_filter(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   unsigned long arg2 ;
+  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   unsigned long val2 ;
   int ecode2 = 0 ;
-  int result;
   VALUE vresult = Qnil;
   
   if ((argc < 2) || (argc > 2)) {

data/ext/lex.yy.c

@@ -6,29 +6,10 @@
 
 /* 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 35
+#define YY_FLEX_SUBMINOR_VERSION 33
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -50,7 +31,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if __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. 
@@ -113,12 +94,11 @@ typedef unsigned int flex_uint32_t;
 
 #else	/* ! __cplusplus */
 
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#if __STDC__
 
 #define YY_USE_CONST
 
-#endif	/* defined (__STDC__) */
+#endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -172,12 +152,7 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-#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 int itex2MML_yyleng;
 
 extern FILE *itex2MML_yyin, *itex2MML_yyout;
 
@@ -203,6 +178,16 @@ 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
@@ -220,7 +205,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int 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
@@ -290,8 +275,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 yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t itex2MML_yyleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int itex2MML_yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -319,7 +304,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,yy_size_t len  );
+YY_BUFFER_STATE itex2MML_yy_scan_bytes (yyconst char *bytes,int len  );
 
 void *itex2MML_yyalloc (yy_size_t  );
 void *itex2MML_yyrealloc (void *,yy_size_t  );
@@ -2159,7 +2144,7 @@ int itex2MML_lineno = 1;
 
 int itex2MML_rowposn = 0;
 int itex2MML_displaymode = 0;
-#line 2163 "lex.yy.c"
+#line 2148 "lex.yy.c"
 
 #define INITIAL 0
 #define MATH 1
@@ -2189,35 +2174,6 @@ 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.
  */
@@ -2260,7 +2216,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 fwrite( itex2MML_yytext, itex2MML_yyleng, 1, itex2MML_yyout )
+#define ECHO (void) fwrite( itex2MML_yytext, itex2MML_yyleng, 1, itex2MML_yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -2271,7 +2227,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( itex2MML_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -2359,7 +2315,7 @@ YY_DECL
    if (itex2MML_rowposn==2) itex2MML_rowposn=1;
 
 
-#line 2363 "lex.yy.c"
+#line 2319 "lex.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -4856,7 +4812,7 @@ YY_RULE_SETUP
 #line 965 "itex2MML.l"
 ECHO;
 	YY_BREAK
-#line 4860 "lex.yy.c"
+#line 4816 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(MATH):
 case YY_STATE_EOF(ATTRIBUTELIST):
@@ -5054,7 +5010,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -5068,7 +5024,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -5123,14 +5079,6 @@ 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;
@@ -5209,7 +5157,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 yy_size_t number_to_move = (yy_n_chars) + 2;
+		register int 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 =
@@ -5258,7 +5206,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -5534,7 +5482,7 @@ void itex2MML_yypop_buffer_state (void)
  */
 static void itex2MML_yyensure_buffer_stack (void)
 {
-	yy_size_t num_to_alloc;
+	int num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -5546,9 +5494,7 @@ 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;
@@ -5566,8 +5512,6 @@ 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*));
@@ -5612,7 +5556,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 yystr a NUL-terminated string to scan
+ * @param str 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
@@ -5631,11 +5575,12 @@ 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, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE itex2MML_yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -5717,7 +5662,7 @@ FILE *itex2MML_yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t itex2MML_yyget_leng  (void)
+int itex2MML_yyget_leng  (void)
 {
         return itex2MML_yyleng;
 }

data/ext/y.tab.c

@@ -5266,7 +5266,7 @@ int itex2MML_do_html_filter (const char * buffer, unsigned long length, const in
 	}
       ++ptr2;
     }
-  if (itex2MML_write)
+  if (itex2MML_write && ptr2 > ptr1)
     (*itex2MML_write) (ptr1, ptr2 - ptr1);
 
   if (ptr2 == end) goto _finish;

data/lib/itextomml.rb

@@ -103,69 +103,3 @@ module Itex2MML
   end
 end
 
-## Unit Tests ##
-if __FILE__ == $0
-  require 'test/unit'
-
-  class Itex2MMLTest < Test::Unit::TestCase
-
-    def test_inline_html
-      itex = Itex2MML::Parser.new
-      assert_equal("Inline: <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.html_filter('Inline: $\sin(x)$'))
-    end
-
-    def test_inline
-      itex = Itex2MML::Parser.new
-      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.filter('Inline: $\sin(x)$'))
-    end
-
-    def test_inline_inline
-      itex = Itex2MML::Parser.new
-      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.inline_filter('\sin(x)'))
-    end
-
-    def test_block_html
-      itex = Itex2MML::Parser.new
-      assert_equal("Block: <math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.html_filter('Block: $$\sin(x)$$'))
-    end
-
-    def test_block
-      itex = Itex2MML::Parser.new
-      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.filter('Block: $$\sin(x)$$'))
-    end
-
-    def test_block_block
-      itex = Itex2MML::Parser.new
-      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.block_filter('\sin(x)'))
-    end
-
-    def test_inline_utf8
-      itex = Itex2MML::Parser.new
-      s = "".respond_to?(:force_encoding) ? "\u00F3" : "\303\263"
-      assert_equal("ecuasi"+ s + "n <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'>" +
-             "<mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>",
-              itex.html_filter("ecuasi\303\263n $\\sin(x)$"))
-    end
-
-    def test_inline_utf8_inline
-      itex = Itex2MML::Parser.new
-      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.filter("ecuasi\303\263n $\\sin(x)$"))
-    end
-    
-    def test_utf8_in_svg_foreignObject
-      itex = Itex2MML::Parser.new
-      s = "".respond_to?(:force_encoding) ? "\u2032" : "\342\200\262"
-      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>g" +
-          "</mi><mo>&prime;</mo><mo>=</mo><semantics><annotation-xml encoding=\"SVG1.1\"><svg w" +
-          "idth='40' height='40' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3." +
-          "org/1999/xlink'><foreignObject height='19' width='20' font-size='16' y='0' x='0'><ma" +
-          "th display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>g</mi><mo>" +
-          s + "</mo></math></foreignObject></svg></annotation-xml></semantics></math>",
-        itex.filter("$g' = \\begin{svg}<svg width='40' height='40' xmlns='http://www.w3.org/20" +
-          "00/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><foreignObject height='19' width='" +
-          "20' font-size='16' y='0' x='0'><math display='inline' xmlns='http://www.w3.org/1998/M" +
-          "ath/MathML'><mi>g</mi><mo>\342\200\262</mo></math></foreignObject></svg>\\end{svg}$"))
-    end
-
-  end
-end

data/test/test_itextomml.rb

@@ -0,0 +1,73 @@
+#  Authors: Justin Bonnar <jbonnar@berkeley.edu>
+#           Jacques Distler <distler@golem.ph.utexas.edu>
+#
+#  Placed in the Public Domain
+
+$:.unshift File.expand_path( File.join( File.dirname( __FILE__ ), "../lib" ) )
+$:.unshift File.expand_path( File.join( File.dirname( __FILE__ ), "../ext" ) )
+require 'itextomml'
+
+## Unit Tests ##
+  require 'test/unit'
+
+  class Itex2MMLTest < Test::Unit::TestCase
+
+    def test_inline_html
+      itex = Itex2MML::Parser.new
+      assert_equal("Inline: <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.html_filter('Inline: $\sin(x)$'))
+    end
+
+    def test_inline
+      itex = Itex2MML::Parser.new
+      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.filter('Inline: $\sin(x)$'))
+    end
+
+    def test_inline_inline
+      itex = Itex2MML::Parser.new
+      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.inline_filter('\sin(x)'))
+    end
+
+    def test_block_html
+      itex = Itex2MML::Parser.new
+      assert_equal("Block: <math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.html_filter('Block: $$\sin(x)$$'))
+    end
+
+    def test_block
+      itex = Itex2MML::Parser.new
+      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.filter('Block: $$\sin(x)$$'))
+    end
+
+    def test_block_block
+      itex = Itex2MML::Parser.new
+      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.block_filter('\sin(x)'))
+    end
+
+    def test_inline_utf8
+      itex = Itex2MML::Parser.new
+      s = "".respond_to?(:force_encoding) ? "\u00F3" : "\303\263"
+      assert_equal("ecuasi"+ s + "n <math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'>" +
+             "<mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>",
+              itex.html_filter("ecuasi\303\263n $\\sin(x)$"))
+    end
+
+    def test_inline_utf8_inline
+      itex = Itex2MML::Parser.new
+      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>sin</mi><mo stretchy=\"false\">(</mo><mi>x</mi><mo stretchy=\"false\">)</mo></math>", itex.filter("ecuasi\303\263n $\\sin(x)$"))
+    end
+    
+    def test_utf8_in_svg_foreignObject
+      itex = Itex2MML::Parser.new
+      s = "".respond_to?(:force_encoding) ? "\u2032" : "\342\200\262"
+      assert_equal("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>g" +
+          "</mi><mo>&prime;</mo><mo>=</mo><semantics><annotation-xml encoding=\"SVG1.1\"><svg w" +
+          "idth='40' height='40' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3." +
+          "org/1999/xlink'><foreignObject height='19' width='20' font-size='16' y='0' x='0'><ma" +
+          "th display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>g</mi><mo>" +
+          s + "</mo></math></foreignObject></svg></annotation-xml></semantics></math>",
+        itex.filter("$g' = \\begin{svg}<svg width='40' height='40' xmlns='http://www.w3.org/20" +
+          "00/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><foreignObject height='19' width='" +
+          "20' font-size='16' y='0' x='0'><math display='inline' xmlns='http://www.w3.org/1998/M" +
+          "ath/MathML'><mi>g</mi><mo>\342\200\262</mo></math></foreignObject></svg>\\end{svg}$"))
+    end
+
+  end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 20
-  version: 1.3.20
+  - 21
+  version: 1.3.21
 platform: ruby
 authors: 
 - Jacques Distler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 -05:00
+date: 2010-04-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - ext/itex2MML.h
 - ext/y.tab.h
 - lib/itextomml.rb
+- test/test_itextomml.rb
 - README
 has_rdoc: true
 homepage: http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
@@ -65,5 +66,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Native Ruby bindings to itex2MML.
-test_files: []
-
+test_files: 
+- test/test_itextomml.rb