Text filter changes to always embed Courier and Symbol fonts, when

used.  This ensures that all glyphs are available that are needed.

Remove pstoraster from list of directories to make...

Changelog updates...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@2354 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 5a11fe9f26e040438743d2eb429235f49675835d..4b5aaf7218f89dfb5fb646d627202c7162288145 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,20 @@
-CHANGES.txt - 04/22/2002
+CHANGES.txt - 04/23/2002
 ------------------------
 
 CHANGES IN CUPS V1.1.15
 
        - Updated the CUPS license agreement for the new MacOS
          license exception.
+       - Removed the pstoraster filter (based on GNU
+         Ghostscript 5.50) and now provide the raster "driver"
+         and patch file necessary to use the current GNU
+         Ghostscript 7.05 release.
+       - Removed unnecessary fonts and updated the Courier and
+         Symbol fonts to the latest versions to better support
+         non-ISOLatin1 text.
+       - The text filter now always embeds the Courier and
+         Symbol fonts to ensure that they contain the full set
+         of glyphs.
        - The lp and lpr commands now only override the SIGINT
          handler if it is not being ignored (patch from Robert
          Ambrose for some interactive software that catches

diff --git a/Makefile b/Makefile
index 94024b66f278d446ea6a56251dfe988fbab6daf7..c34691ac607dcbfc317624650017b90f23a83719 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.45 2002/04/17 17:53:04 mike Exp $"
+# "$Id: Makefile,v 1.46 2002/04/23 17:49:34 mike Exp $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -28,7 +28,7 @@ include Makedefs
 # Directories to make...
 #
 
-DIRS   =       cups backend berkeley cgi-bin filter man pdftops pstoraster \
+DIRS   =       cups backend berkeley cgi-bin filter man pdftops \
                scheduler systemv
 
 #
@@ -166,5 +166,5 @@ tardist:
        epm $(EPMFLAGS) -f tardist cups
 
 #
-# End of "$Id: Makefile,v 1.45 2002/04/17 17:53:04 mike Exp $".
+# End of "$Id: Makefile,v 1.46 2002/04/23 17:49:34 mike Exp $".
 #

diff --git a/filter/texttops.c b/filter/texttops.c
index 2330a81c31ae8c97891bec93a5c15ede28f4a454..a6c0dcbd39a955701404e0081c439b5e0a362b54 100644 (file)
--- a/filter/texttops.c
+++ b/filter/texttops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: texttops.c,v 1.43 2002/03/14 22:20:03 mike Exp $"
+ * "$Id: texttops.c,v 1.44 2002/04/23 17:49:34 mike Exp $"
  *
  *   Text to PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -703,7 +703,9 @@ WriteProlog(const char *title,              /* I - Title of job */
     else
       j = 0;
 
-    if (ppd != NULL && j >= ppd->num_fonts)
+    if ((ppd != NULL && j >= ppd->num_fonts) ||
+        strncmp(fonts[i], "Courier", 7) == 0 ||
+       strcmp(fonts[i], "Symbol") == 0)
     {
      /*
       * Need to embed this font...
@@ -732,7 +734,9 @@ WriteProlog(const char *title,              /* I - Title of job */
     else
       j = 0;
 
-    if (ppd != NULL && j >= ppd->num_fonts)
+    if ((ppd != NULL && j >= ppd->num_fonts) ||
+        strncmp(fonts[i], "Courier", 7) == 0 ||
+       strcmp(fonts[i], "Symbol") == 0)
     {
      /*
       * Need to embed this font...
@@ -1300,5 +1304,5 @@ write_text(const char *s) /* I - String to write */
 
 
 /*
- * End of "$Id: texttops.c,v 1.43 2002/03/14 22:20:03 mike Exp $".
+ * End of "$Id: texttops.c,v 1.44 2002/04/23 17:49:34 mike Exp $".
  */