the sources for metapost 1.211

git-svn-id: svn://tug.org/texlive/trunk@17649 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 17 insertions, 16 deletions

diff --git a/Build/source/texk/web2c/mplibdir/svgout.w b/Build/source/texk/web2c/mplibdir/svgout.w
index b94f469d78b..23bb4b860d5 100644
--- a/Build/source/texk/web2c/mplibdir/svgout.w
+++ b/Build/source/texk/web2c/mplibdir/svgout.w
@@ -97,7 +97,7 @@ line. It could also be a boolean because right now the only interesting
 thing it does is keep track of whether or not we are start-of-line.
 
 @<Globals@>=
-integer file_offset;
+size_t file_offset;
 
 @ @<Set initial values@>=
 mp->svg->file_offset = 0;
@@ -115,7 +115,7 @@ static void mp_svg_print_ln (MP mp) {
 @c
 static void mp_svg_print_char (MP mp, int s) {
   char ss[2]; 
-  ss[0]=s; ss[1]=0; 
+  ss[0]=(char)s; ss[1]=0; 
   (mp->write_ascii_file)(mp,mp->output_file,(char *)ss); 
   mp->svg->file_offset ++;
 }
@@ -150,8 +150,8 @@ strings in before feeding the attribute value to |mp_svg_attribute|.
 
 @<Globals...@>=
 char *buf;
-int loc;
-int bufsize;
+unsigned loc;
+unsigned bufsize;
 
 @ Start with a modest size of 256. the buffer will grow automatically
 when needed.
@@ -176,7 +176,7 @@ the end of the buffer.
     }
     buffer = mp_xmalloc(mp,l,1);
     memset (buffer,0,l);
-    memcpy(buffer,mp->svg->buf,mp->svg->bufsize);
+    memcpy(buffer,mp->svg->buf,(size_t)mp->svg->bufsize);
     mp_xfree(mp->svg->buf);
     mp->svg->buf = buffer ;
     mp->svg->bufsize = l;    
@@ -234,7 +234,7 @@ static void mp_svg_store_int (MP mp,integer n) {
   } while (n!=0);
   /* print the digits */
   while ( k-->0 ){ 
-    append_char('0'+mp->dig[k]);
+    append_char((char)('0'+mp->dig[k]));
   }
 }
 
@@ -245,9 +245,9 @@ are printed, just in case.
 
 @c 
 static void mp_svg_store_dd (MP mp,integer n) {
-  n=abs(n) % 100; 
-  append_char('0'+(n / 10));
-  append_char('0'+(n % 10));
+  char nn=(char)abs(n) % 100; 
+  append_char((char)('0'+(nn / 10)));
+  append_char((char)('0'+(nn % 10)));
 }
 
 @ Conversely, here is a procedure analogous to |mp_svg_store_int|. 
@@ -277,7 +277,7 @@ static void mp_svg_store_scaled (MP mp,scaled s) {
     do {  
       if ( delta>unity )
         s=s+0100000-(delta / 2); /* round the final digit */
-      append_char('0'+(s / unity)); 
+      append_char((char)('0'+(s / unity))); 
       s=10*(s % unity); 
       delta=delta*10;
     } while (s>delta);
@@ -796,7 +796,8 @@ static void mp_svg_font_path_out (MP mp, mp_knot *h) {
 @c
 static void mp_svg_print_glyph_defs (MP mp, mp_edge_object *h) {
   mp_graphic_object *p; /* object index */
-  int k, l; /* general purpose indices */
+  int k; /* general purpose index */
+  size_t l; /* a string length */
   int **mp_chars = NULL; /* a twodimensional array of used glyphs */
   mp_ps_font *f = NULL; 
   mp_edge_object *ch;
@@ -853,12 +854,12 @@ static void mp_svg_print_glyph_defs (MP mp, mp_edge_object *h) {
                append_string("GLYPH");
                append_string(mp->font_name[k]);
                append_char('_');
-               mp_svg_store_int(mp,l);
+               mp_svg_store_int(mp, (int)l);
                mp_svg_attribute(mp, "id", mp->svg->buf);
                mp_svg_reset_buf(mp);
                mp_svg_close_starttag(mp);
                if (f != NULL) {
-                 ch = mp_ps_font_charstring(mp,f,l);
+                 ch = mp_ps_font_charstring(mp,f,(int)l);
                  if (ch != NULL) {
                    p = ch->body;
                    mp_svg_open_starttag(mp,"path");
@@ -902,7 +903,7 @@ void mp_svg_text_out (MP mp, mp_text_object *p, int prologues) {
   char *fname;
   unsigned char *s;
   int k; /* a character */
-  int l; /* string length */
+  size_t l; /* string length */
   boolean transformed ;
   scaled ds; /* design size and scale factor for a text node */
   fname = mp->font_ps_name[gr_font_n(p)];
@@ -977,7 +978,7 @@ void mp_svg_text_out (MP mp, mp_text_object *p, int prologues) {
         mp_svg_store_int(mp,k);
         append_char(';');
       } else {
-        append_char(k);
+        append_char((char)k);
       }
     }
     mp_svg_print_buf(mp);
@@ -1202,7 +1203,7 @@ int mp_svg_gr_ship_out (mp_edge_object *hh, int qprologues, int standalone) {
   }
   if (mp->history >= mp_fatal_error_stop ) return 1;
   mp_open_output_file(mp);
-  if ( (qprologues>=1) && (mp->last_ps_fnum<mp->last_fnum) )
+  if ( (qprologues>=1) && mp->ps->tfm_tree == NULL && (mp->last_ps_fnum<mp->last_fnum) )
     mp_read_psname_table(mp);
   /* The next seems counterintuitive, but calls from |mp_svg_ship_out|
    * set standalone to true, and because embedded use is likely, it is