diff -Naur cups-1.1.20/filter/texttops.c cups-1.1.20.new/filter/texttops.c --- cups-1.1.20/filter/texttops.c 2004-03-17 18:20:01 +0300 +++ cups-1.1.20.new/filter/texttops.c 2004-03-17 18:19:23 +0300 @@ -53,6 +53,22 @@ int Directions[256];/* Text directions for each font */ +/** + * convert font name to appropriate nimbus font + */ +const char *nimbus_name(const char* font) +{ + if (!strcmp(font,"Courier")) + return "NimbusMonL-Regu"; + else if(!strcmp(font,"Courier-Bold")) + return "NimbusMonL-Bold"; + else if(!strcmp(font,"Courier-Oblique")) + return "NimbusMonL-ReguObli"; + else if(!strcmp(font,"Courier-BoldOblique")) + return "NimbusMonL-BoldObli"; + else + return font; +} /* * Local functions... */ @@ -842,7 +858,7 @@ for (i = PrettyPrint ? 2 : 1; i >= 0; i --) { - printf("/%s findfont\n", Fonts[0][i]); + printf("/%s findfont\n", nimbus_name(Fonts[0][i])); puts("dup length 1 add dict begin\n" " { 1 index /FID ne { def } { pop pop } ifelse } forall\n" " /Encoding cupsEncoding00 def\n" @@ -862,7 +878,7 @@ for (i = 1 + PrettyPrint; i >= 0; i --) for (j = 0; j < NumFonts; j ++) { - printf("/%s findfont\n", Fonts[j][i]); + printf("/%s findfont\n", nimbus_name(Fonts[j][i])); printf("dup length 1 add dict begin\n" " { 1 index /FID ne { def } { pop pop } ifelse } forall\n" " /Encoding cupsEncoding%02x def\n"