May 22, 2008 · May 23, 2008 · May 25, 2008 · May 25, 2008 · May 26, 2008 · May 26, 2008
diff --git a/ttconv/pprdrv.h b/ttconv/pprdrv.h
  virtual void write(const char*) = 0;

  virtual void printf(const char* format, ...);
  virtual voidputchar(int val);
  virtual voidput_char(int val);
  virtual void puts(const char* a);
  virtual void putline(const char* a);
 };
diff --git a/ttconv/pprdrv_tt.cpp b/ttconv/pprdrv_tt.cpp

    if(!in_string)
    {
 stream.putchar('<');
 stream.put_char('<');
    string_len=0;
    line_len++;
    in_string=TRUE;
    }

    stream.putchar( hexdigits[ n / 16 ] );
    stream.putchar( hexdigits[ n % 16 ] );
    stream.put_char( hexdigits[ n / 16 ] );
    stream.put_char( hexdigits[ n % 16 ] );
    string_len++;
    line_len+=2;

    if(line_len > 70)
   {
   stream.putchar('\n');
   stream.put_char('\n');
   line_len=0;
   }

 #endif

 sfnts_pputBYTE(stream, 0);/* extra byte for pre-2013 compatibility */
 stream.putchar('>');
 stream.put_char('>');
 line_len++;
    }
    in_string=FALSE;
    /* a BuildGlyph and BuildChar proceedures. */
    if( font->target_type == PS_TYPE_3 )
    {
 stream.putchar('\n');
 stream.put_char('\n');

 stream.putline("/BuildGlyph");
 stream.putline(" {exch begin");/* start font dictionary */
 stream.putline(" true 3 1 roll get exec");
 stream.putline(" end}_d");

 stream.putchar('\n');
 stream.put_char('\n');

 /* This proceedure is for compatiblity with */
 /* level 1 interpreters. */
 stream.putline(" 1 index /BuildGlyph get exec");
 stream.putline("}_d");

 stream.putchar('\n');
 stream.put_char('\n');
    }

    /* If we are generating a type 42 font, we need to check to see */
    /* setup instructions and part of BuildGlyph came from. */
    else if( font->target_type == PS_TYPE_42 )
    {
 stream.putchar('\n');
 stream.put_char('\n');

 /* If we have no "resourcestatus" command, or FontType 42 */
 /* is unknown, leave "true" on the stack. */
 /* if the printer has no built-in TrueType */
 /* rasterizer. */
 stream.putline("}if");
 stream.putchar('\n');
 stream.put_char('\n');
    } /* end of if Type 42 not understood. */

    stream.putline("FontName currentdict end definefont pop");
diff --git a/ttconv/pprdrv_tt2.cpp b/ttconv/pprdrv_tt2.cpp
 {/* have a log of points. */
 if(stack_depth == 0)
    {
        stream.putchar('{');
        stream.put_char('{');
        stack_depth=1;
        }

diff --git a/ttconv/ttutil.cpp b/ttconv/ttutil.cpp
  va_end(arg_list);
 }

 void TTStreamWriter::putchar(int val)
 void TTStreamWriter::put_char(int val)
 {
  char c[2];
  c[0] = (char)val;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,7 +40,7 @@ class TTStreamWriter {
		virtual void write(const char*) = 0;

		virtual void printf(const char* format, ...);
		virtual voidputchar(int val);
		virtual voidput_char(int val);
		virtual void puts(const char* a);
		virtual void putline(const char* a);
		};
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -482,20 +482,20 @@ void sfnts_pputBYTE(TTStreamWriter& stream, BYTE n)

		if(!in_string)
		{
		stream.putchar('<');
		stream.put_char('<');
		string_len=0;
		line_len++;
		in_string=TRUE;
		}

		stream.putchar( hexdigits[ n / 16 ] );
		stream.putchar( hexdigits[ n % 16 ] );
		stream.put_char( hexdigits[ n / 16 ] );
		stream.put_char( hexdigits[ n % 16 ] );
		string_len++;
		line_len+=2;

		if(line_len > 70)
		{
		stream.putchar('\n');
		stream.put_char('\n');
		line_len=0;
		}

Expand DownExpand Up		@@ -548,7 +548,7 @@ void sfnts_end_string(TTStreamWriter& stream)
		#endif

		sfnts_pputBYTE(stream, 0);/* extra byte for pre-2013 compatibility */
		stream.putchar('>');
		stream.put_char('>');
		line_len++;
		}
		in_string=FALSE;
Expand DownExpand Up		@@ -955,7 +955,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
		/* a BuildGlyph and BuildChar proceedures. */
		if( font->target_type == PS_TYPE_3 )
		{
		stream.putchar('\n');
		stream.put_char('\n');

		stream.putline("/BuildGlyph");
		stream.putline(" {exch begin");/* start font dictionary */
Expand All		@@ -964,7 +964,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
		stream.putline(" true 3 1 roll get exec");
		stream.putline(" end}_d");

		stream.putchar('\n');
		stream.put_char('\n');

		/* This proceedure is for compatiblity with */
		/* level 1 interpreters. */
Expand All		@@ -973,7 +973,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
		stream.putline(" 1 index /BuildGlyph get exec");
		stream.putline("}_d");

		stream.putchar('\n');
		stream.put_char('\n');
		}

		/* If we are generating a type 42 font, we need to check to see */
Expand All		@@ -985,7 +985,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
		/* setup instructions and part of BuildGlyph came from. */
		else if( font->target_type == PS_TYPE_42 )
		{
		stream.putchar('\n');
		stream.put_char('\n');

		/* If we have no "resourcestatus" command, or FontType 42 */
		/* is unknown, leave "true" on the stack. */
Expand DownExpand Up		@@ -1066,7 +1066,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
		/* if the printer has no built-in TrueType */
		/* rasterizer. */
		stream.putline("}if");
		stream.putchar('\n');
		stream.put_char('\n');
		} /* end of if Type 42 not understood. */

		stream.putline("FontName currentdict end definefont pop");
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -104,7 +104,7 @@ void GlyphToType3::stack(TTStreamWriter& stream, int new_elem)
		{/* have a log of points. */
		if(stack_depth == 0)
		{
		stream.putchar('{');
		stream.put_char('{');
		stack_depth=1;
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,7 +52,7 @@ void TTStreamWriter::printf(const char* format, ...)
		va_end(arg_list);
		}

		void TTStreamWriter::putchar(int val)
		void TTStreamWriter::put_char(int val)
		{
		char c[2];
		c[0] = (char)val;
Expand Down