Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / filter / texttops.c

diff --git a/filter/texttops.c b/filter/texttops.c
index 879672c9557c7543e5b16c1106b2656898252905..59460ce7a6618545253dcf258e7e4b6a0e5d4692 100644 (file)
--- a/filter/texttops.c
+++ b/filter/texttops.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: texttops.c 4680 2005-09-21 09:28:39Z mike $"
+ * "$Id: texttops.c 7720 2008-07-11 22:46:21Z mike $"
  *
  *   Text to PostScript filter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2005 by Easy Software Products.
+ *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -38,6 +29,7 @@
  */
 
 #include "textcommon.h"
+#include <cups/i18n.h>
 
 
 /*
@@ -208,8 +200,8 @@ WriteProlog(const char *title,              /* I - Title of job */
   printf("%%cupsRotation: %d\n", (Orientation & 3) * 90);
   puts("%%Creator: texttops/" CUPS_SVERSION);
   printf("%%%%CreationDate: %s\n", curdate);
-  printf("%%%%Title: %s\n", title);
-  printf("%%%%For: %s\n", user);
+  WriteTextComment("Title", title);
+  WriteTextComment("For", user);
   puts("%%Pages: (atend)");
 
  /*
@@ -238,7 +230,7 @@ WriteProlog(const char *title,              /* I - Title of job */
   }
   else
   {
-    fprintf(stderr, "ERROR: Unable to open \"%s\" - %s\n", filename,
+    fprintf(stderr, _("ERROR: Unable to open \"%s\" - %s\n"), filename,
             strerror(errno));
     exit(1);
   }
@@ -258,7 +250,7 @@ WriteProlog(const char *title,              /* I - Title of job */
       * Can't open charset file!
       */
 
-      fprintf(stderr, "ERROR: Unable to open %s: %s\n", filename,
+      fprintf(stderr, _("ERROR: Unable to open %s: %s\n"), filename,
               strerror(errno));
       exit(1);
     }
@@ -274,7 +266,7 @@ WriteProlog(const char *title,              /* I - Title of job */
       */
 
       fclose(fp);
-      fprintf(stderr, "ERROR: Bad/empty charset file %s\n", filename);
+      fprintf(stderr, _("ERROR: Bad charset file %s\n"), filename);
       exit(1);
     }
 
@@ -285,7 +277,7 @@ WriteProlog(const char *title,              /* I - Title of job */
       */
 
       fclose(fp);
-      fprintf(stderr, "ERROR: Bad charset file %s\n", filename);
+      fprintf(stderr, _("ERROR: Bad charset file %s\n"), filename);
       exit(1);
     }
 
@@ -346,7 +338,7 @@ WriteProlog(const char *title,              /* I - Title of job */
          * Can't have a font without all required values...
          */
 
-         fprintf(stderr, "ERROR: bad font description line: %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad font description line: %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -359,7 +351,7 @@ WriteProlog(const char *title,              /* I - Title of job */
          Directions[NumFonts] = -1;
        else
        {
-         fprintf(stderr, "ERROR: Bad text direction %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad text direction %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -382,7 +374,7 @@ WriteProlog(const char *title,              /* I - Title of job */
          * Can't have a font without all required values...
          */
 
-         fprintf(stderr, "ERROR: bad font description line: %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad font description line: %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -395,7 +387,7 @@ WriteProlog(const char *title,              /* I - Title of job */
           Widths[NumFonts] = 2;
        else 
        {
-         fprintf(stderr, "ERROR: Bad text width %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad text width %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -510,7 +502,7 @@ WriteProlog(const char *title,              /* I - Title of job */
          * Can't have a font without all required values...
          */
 
-         fprintf(stderr, "ERROR: bad font description line: %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad font description line: %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -523,7 +515,7 @@ WriteProlog(const char *title,              /* I - Title of job */
          Directions[NumFonts] = -1;
        else
        {
-         fprintf(stderr, "ERROR: Bad text direction %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad text direction %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -546,7 +538,7 @@ WriteProlog(const char *title,              /* I - Title of job */
          * Can't have a font without all required values...
          */
 
-         fprintf(stderr, "ERROR: bad font description line: %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad font description line: %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -559,7 +551,7 @@ WriteProlog(const char *title,              /* I - Title of job */
           Widths[NumFonts] = 2;
        else 
        {
-         fprintf(stderr, "ERROR: Bad text width %s\n", valptr);
+         fprintf(stderr, _("ERROR: Bad text width %s\n"), valptr);
          fclose(fp);
          exit(1);
        }
@@ -615,7 +607,7 @@ WriteProlog(const char *title,              /* I - Title of job */
     }
     else
     {
-      fprintf(stderr, "ERROR: Bad charset type %s\n", lineptr);
+      fprintf(stderr, _("ERROR: Bad charset type %s\n"), lineptr);
       fclose(fp);
       exit(1);
     }
@@ -812,7 +804,7 @@ WriteProlog(const char *title,              /* I - Title of job */
 
     puts("% Reencode base fonts");
 
-    for (i = 1 + PrettyPrint; i >= 0; i --)
+    for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
       for (j = 0; j < NumFonts; j ++)
       {
        printf("/%s findfont\n", Fonts[j][i]);
@@ -831,7 +823,7 @@ WriteProlog(const char *title,              /* I - Title of job */
 
     puts("% Create composite fonts...");
 
-    for (i = 1 + PrettyPrint; i >= 0; i --)
+    for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
     {
       puts("8 dict begin");
       puts("/FontType 0 def/FontMatrix[1.0 0 0 1.0 0 0]def/FMapType 2 def/Encoding[");
@@ -1013,7 +1005,7 @@ write_line(int     row,           /* I - Row number (0 to N) */
   lchar_t      *start;         /* First character in sequence */
 
 
-  for (col = 0, start = line; col < SizeColumns;)
+  for (col = 0; col < SizeColumns;)
   {
     while (col < SizeColumns && (line->ch == ' ' || line->ch == 0))
     {
@@ -1307,5 +1299,5 @@ write_text(const char *s) /* I - String to write */
 
 
 /*
- * End of "$Id: texttops.c 4680 2005-09-21 09:28:39Z mike $".
+ * End of "$Id: texttops.c 7720 2008-07-11 22:46:21Z mike $".
  */