pool/a2ps
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/a2ps?expand=0&rev=48
This commit is contained in:
Dr. Werner Fink 2015-03-02 12:09:08 +00:00 committed by Git OBS Bridge
parent 4effd0cdf3
commit ed50e62dca
3 changed files with 365 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

501
a2ps-4.14.diff
View File

@ -1,11 +1,54 @@
diff -rupN a2ps-4.14.old/afm/fontsmap a2ps-4.14/afm/fontsmap ---
--- a2ps-4.14.old/afm/fontsmap 2007-12-28 17:52:50.000000000 -0800 afm/fontsmap | 40 ++++++++++++++++++++++++++++++++++++++++
+++ a2ps-4.14/afm/fontsmap 2014-08-06 22:05:06.973897332 -0700 afm/pcrb.afm | 3 ++-
afm/pcrbo.afm | 3 ++-
afm/pcrr.afm | 3 ++-
afm/pcrro.afm | 3 ++-
afm/phvb.afm | 3 ++-
afm/phvbo.afm | 3 ++-
afm/phvr.afm | 3 ++-
afm/phvro.afm | 3 ++-
afm/ptmb.afm | 3 ++-
afm/ptmbi.afm | 3 ++-
afm/ptmi.afm | 3 ++-
afm/ptmr.afm | 3 ++-
configure | 5 +++--
configure.in | 5 +++--
contrib/emacs/a2ps.el | 2 +-
doc/Makefile.in | 2 +-
encoding/encoding.map | 4 ++++
etc/Makefile.in | 2 +-
etc/a2ps_cfg.in | 40 +++++++++++++++++++++++++++++++++++++---
lib/jobs.c | 10 +++++++++-
lib/metaseq.c | 2 +-
lib/options.c | 23 ++++++++++++++++++++++-
lib/path-concat.c | 7 +++----
lib/xstrrpl.c | 1 +
man/a2ps.1 | 3 +--
ogonkify/Makefile.in | 2 +-
ogonkify/ogonkify.in.in | 2 +-
ogonkify/pcrb-o.afm | 3 ++-
ogonkify/pcrbo-o.afm | 3 ++-
ogonkify/pcrr-o.afm | 3 ++-
ogonkify/pcrro-o.afm | 3 ++-
ogonkify/phvb-o.afm | 3 ++-
ogonkify/phvbo-o.afm | 3 ++-
ogonkify/phvr-o.afm | 3 ++-
ogonkify/phvro-o.afm | 3 ++-
ogonkify/ptmb-o.afm | 3 ++-
ogonkify/ptmbi-o.afm | 3 ++-
ogonkify/ptmr-o.afm | 3 ++-
ogonkify/ptmri-o.afm | 3 ++-
src/main.c | 14 +++++++++++++-
41 files changed, 190 insertions(+), 46 deletions(-)
--- afm/fontsmap
+++ afm/fontsmap 2015-03-02 11:12:19.889518618 +0000
@@ -47,6 +47,14 @@ Bookman-Demi pbkd @@ -47,6 +47,14 @@ Bookman-Demi pbkd
Bookman-DemiItalic pbkdi Bookman-DemiItalic pbkdi
Bookman-Light pbkl Bookman-Light pbkl
Bookman-LightItalic pbkli Bookman-LightItalic pbkli
+CenturySchL-Bold c059016l +CenturySchL-Bold c059016l
+CenturySchL-BoldItal c059036l +CenturySchL-BoldItal c059036l
+CenturySchL-Ital c059033l +CenturySchL-Ital c059033l
+CenturySchL-Roma c059013l +CenturySchL-Roma c059013l
@ -20,7 +63,7 @@ diff -rupN a2ps-4.14.old/afm/fontsmap a2ps-4.14/afm/fontsmap
Courier-Oblique pcrro Courier-Oblique pcrro
Courier-Oblique-Ogonki pcrro-o Courier-Oblique-Ogonki pcrro-o
Courier-Ogonki pcrr-o Courier-Ogonki pcrr-o
+Cyrillic fcyr +Cyrillic fcyr
+Cyrillic-Italic fcyri +Cyrillic-Italic fcyri
+Dingbats d050000l +Dingbats d050000l
Helvetica phvr Helvetica phvr
@ -30,7 +73,7 @@ diff -rupN a2ps-4.14.old/afm/fontsmap a2ps-4.14/afm/fontsmap
NewCenturySchlbk-BoldItalic pncbi NewCenturySchlbk-BoldItalic pncbi
NewCenturySchlbk-Italic pncri NewCenturySchlbk-Italic pncri
NewCenturySchlbk-Roman pncr NewCenturySchlbk-Roman pncr
+NimbusMonL-Bold n022004l +NimbusMonL-Bold n022004l
+NimbusMonL-BoldObli n022024l +NimbusMonL-BoldObli n022024l
+NimbusMonL-Regu n022003l +NimbusMonL-Regu n022003l
+NimbusMonL-ReguObli n022023l +NimbusMonL-ReguObli n022023l
@ -73,9 +116,17 @@ diff -rupN a2ps-4.14.old/afm/fontsmap a2ps-4.14/afm/fontsmap
+URWPalladioL-Roma p052003l +URWPalladioL-Roma p052003l
ZapfChancery-MediumItalic pzcmi ZapfChancery-MediumItalic pzcmi
ZapfDingbats pzdr ZapfDingbats pzdr
diff -rupN a2ps-4.14.old/afm/pcrb.afm a2ps-4.14/afm/pcrb.afm --- afm/pcrb.afm
--- a2ps-4.14.old/afm/pcrb.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/pcrb.afm 2015-03-02 11:25:16.821630267 +0000
+++ a2ps-4.14/afm/pcrb.afm 2014-08-06 22:08:42.880800508 -0700 @@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 84
StdVW 106
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 202 -15 398 572 ;
C 34 ; WX 600 ; N quotedbl ; B 135 277 465 562 ;
@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 30 0 594 79 @@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 30 0 594 79
C -1 ; WX 600 ; N rcommaaccent ; B 47 -250 580 454 ; C -1 ; WX 600 ; N rcommaaccent ; B 47 -250 580 454 ;
C -1 ; WX 600 ; N Ntilde ; B 8 -12 610 759 ; C -1 ; WX 600 ; N Ntilde ; B 8 -12 610 759 ;
@ -84,9 +135,17 @@ diff -rupN a2ps-4.14.old/afm/pcrb.afm a2ps-4.14/afm/pcrb.afm
C -1 ; WX 600 ; N Rcommaaccent ; B 24 -250 599 562 ; C -1 ; WX 600 ; N Rcommaaccent ; B 24 -250 599 562 ;
C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 578 562 ; C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 578 562 ;
C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ;
diff -rupN a2ps-4.14.old/afm/pcrbo.afm a2ps-4.14/afm/pcrbo.afm --- afm/pcrbo.afm
--- a2ps-4.14.old/afm/pcrbo.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/pcrbo.afm 2015-03-02 11:25:37.897517874 +0000
+++ a2ps-4.14/afm/pcrbo.afm 2014-08-06 22:10:02.365238052 -0700 @@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 84
StdVW 106
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 215 -15 495 572 ;
C 34 ; WX 600 ; N quotedbl ; B 211 277 585 562 ;
@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 30 0 664 79 @@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 30 0 664 79
C -1 ; WX 600 ; N rcommaaccent ; B 47 -250 655 454 ; C -1 ; WX 600 ; N rcommaaccent ; B 47 -250 655 454 ;
C -1 ; WX 600 ; N Ntilde ; B 8 -12 730 759 ; C -1 ; WX 600 ; N Ntilde ; B 8 -12 730 759 ;
@ -95,9 +154,17 @@ diff -rupN a2ps-4.14.old/afm/pcrbo.afm a2ps-4.14/afm/pcrbo.afm
C -1 ; WX 600 ; N Rcommaaccent ; B 24 -250 617 562 ; C -1 ; WX 600 ; N Rcommaaccent ; B 24 -250 617 562 ;
C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 636 562 ; C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 636 562 ;
C -1 ; WX 600 ; N Atilde ; B -9 0 669 759 ; C -1 ; WX 600 ; N Atilde ; B -9 0 669 759 ;
diff -rupN a2ps-4.14.old/afm/pcrr.afm a2ps-4.14/afm/pcrr.afm --- afm/pcrr.afm
--- a2ps-4.14.old/afm/pcrr.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/pcrr.afm 2015-03-02 11:26:49.557518929 +0000
+++ a2ps-4.14/afm/pcrr.afm 2014-08-06 22:11:03.645344292 -0700 @@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 51
StdVW 51
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 236 -15 364 572 ;
C 34 ; WX 600 ; N quotedbl ; B 187 328 413 562 ;
@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 43 0 574 80 @@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 43 0 574 80
C -1 ; WX 600 ; N rcommaaccent ; B 60 -250 559 441 ; C -1 ; WX 600 ; N rcommaaccent ; B 60 -250 559 441 ;
C -1 ; WX 600 ; N Ntilde ; B 7 -13 593 729 ; C -1 ; WX 600 ; N Ntilde ; B 7 -13 593 729 ;
@ -106,9 +173,17 @@ diff -rupN a2ps-4.14.old/afm/pcrr.afm a2ps-4.14/afm/pcrr.afm
C -1 ; WX 600 ; N Rcommaaccent ; B 38 -250 588 562 ; C -1 ; WX 600 ; N Rcommaaccent ; B 38 -250 588 562 ;
C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 554 562 ; C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 554 562 ;
C -1 ; WX 600 ; N Atilde ; B 3 0 597 729 ; C -1 ; WX 600 ; N Atilde ; B 3 0 597 729 ;
diff -rupN a2ps-4.14.old/afm/pcrro.afm a2ps-4.14/afm/pcrro.afm --- afm/pcrro.afm
--- a2ps-4.14.old/afm/pcrro.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/pcrro.afm 2015-03-02 11:27:09.441659325 +0000
+++ a2ps-4.14/afm/pcrro.afm 2014-08-06 22:12:02.009356448 -0700 @@ -21,7 +21,7 @@ Ascender 629
Descender -157
StdHW 51
StdVW 51
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 243 -15 464 572 ;
C 34 ; WX 600 ; N quotedbl ; B 273 328 532 562 ;
@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 43 0 645 80 @@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 43 0 645 80
C -1 ; WX 600 ; N rcommaaccent ; B 60 -250 636 441 ; C -1 ; WX 600 ; N rcommaaccent ; B 60 -250 636 441 ;
C -1 ; WX 600 ; N Ntilde ; B 7 -13 712 729 ; C -1 ; WX 600 ; N Ntilde ; B 7 -13 712 729 ;
@ -117,9 +192,17 @@ diff -rupN a2ps-4.14.old/afm/pcrro.afm a2ps-4.14/afm/pcrro.afm
C -1 ; WX 600 ; N Rcommaaccent ; B 38 -250 598 562 ; C -1 ; WX 600 ; N Rcommaaccent ; B 38 -250 598 562 ;
C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 607 562 ; C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 607 562 ;
C -1 ; WX 600 ; N Atilde ; B 3 0 655 729 ; C -1 ; WX 600 ; N Atilde ; B 3 0 655 729 ;
diff -rupN a2ps-4.14.old/afm/phvb.afm a2ps-4.14/afm/phvb.afm --- afm/phvb.afm
--- a2ps-4.14.old/afm/phvb.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/phvb.afm 2015-03-02 11:27:26.974018785 +0000
+++ a2ps-4.14/afm/phvb.afm 2014-08-06 22:14:23.764816837 -0700 @@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 118
StdVW 140
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 90 0 244 718 ;
C 34 ; WX 474 ; N quotedbl ; B 98 447 376 718 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 76 0 685 93 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 76 0 685 93
C -1 ; WX 389 ; N rcommaaccent ; B 64 -228 373 546 ; C -1 ; WX 389 ; N rcommaaccent ; B 64 -228 373 546 ;
C -1 ; WX 722 ; N Ntilde ; B 69 0 654 923 ; C -1 ; WX 722 ; N Ntilde ; B 69 0 654 923 ;
@ -128,9 +211,17 @@ diff -rupN a2ps-4.14.old/afm/phvb.afm a2ps-4.14/afm/phvb.afm
C -1 ; WX 722 ; N Rcommaaccent ; B 76 -228 677 718 ; C -1 ; WX 722 ; N Rcommaaccent ; B 76 -228 677 718 ;
C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 583 718 ; C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 583 718 ;
C -1 ; WX 722 ; N Atilde ; B 20 0 702 923 ; C -1 ; WX 722 ; N Atilde ; B 20 0 702 923 ;
diff -rupN a2ps-4.14.old/afm/phvbo.afm a2ps-4.14/afm/phvbo.afm --- afm/phvbo.afm
--- a2ps-4.14.old/afm/phvbo.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/phvbo.afm 2015-03-02 11:27:51.946018640 +0000
+++ a2ps-4.14/afm/phvbo.afm 2014-08-06 22:15:49.732310374 -0700 @@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 118
StdVW 140
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 94 0 397 718 ;
C 34 ; WX 474 ; N quotedbl ; B 193 447 529 718 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 76 0 777 93 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 76 0 777 93
C -1 ; WX 389 ; N rcommaaccent ; B 26 -228 489 546 ; C -1 ; WX 389 ; N rcommaaccent ; B 26 -228 489 546 ;
C -1 ; WX 722 ; N Ntilde ; B 69 0 807 923 ; C -1 ; WX 722 ; N Ntilde ; B 69 0 807 923 ;
@ -139,9 +230,17 @@ diff -rupN a2ps-4.14.old/afm/phvbo.afm a2ps-4.14/afm/phvbo.afm
C -1 ; WX 722 ; N Rcommaaccent ; B 76 -228 778 718 ; C -1 ; WX 722 ; N Rcommaaccent ; B 76 -228 778 718 ;
C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 611 718 ; C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 611 718 ;
C -1 ; WX 722 ; N Atilde ; B 20 0 741 923 ; C -1 ; WX 722 ; N Atilde ; B 20 0 741 923 ;
diff -rupN a2ps-4.14.old/afm/phvr.afm a2ps-4.14/afm/phvr.afm --- afm/phvr.afm
--- a2ps-4.14.old/afm/phvr.afm 2007-09-19 17:01:46.000000000 -0700 +++ afm/phvr.afm 2015-03-02 11:28:14.677519094 +0000
+++ a2ps-4.14/afm/phvr.afm 2014-08-06 22:16:51.732388169 -0700 @@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 76
StdVW 88
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
C 33 ; WX 278 ; N exclam ; B 90 0 187 718 ;
C 34 ; WX 355 ; N quotedbl ; B 70 463 285 718 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 81 0 674 92 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 81 0 674 92
C -1 ; WX 333 ; N rcommaaccent ; B 77 -225 332 538 ; C -1 ; WX 333 ; N rcommaaccent ; B 77 -225 332 538 ;
C -1 ; WX 722 ; N Ntilde ; B 76 0 646 917 ; C -1 ; WX 722 ; N Ntilde ; B 76 0 646 917 ;
@ -150,9 +249,17 @@ diff -rupN a2ps-4.14.old/afm/phvr.afm a2ps-4.14/afm/phvr.afm
C -1 ; WX 722 ; N Rcommaaccent ; B 88 -225 684 718 ; C -1 ; WX 722 ; N Rcommaaccent ; B 88 -225 684 718 ;
C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 537 718 ; C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 537 718 ;
C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ; C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ;
diff -rupN a2ps-4.14.old/afm/phvro.afm a2ps-4.14/afm/phvro.afm --- afm/phvro.afm
--- a2ps-4.14.old/afm/phvro.afm 2007-09-19 17:01:47.000000000 -0700 +++ afm/phvro.afm 2015-03-02 11:28:32.318018677 +0000
+++ a2ps-4.14/afm/phvro.afm 2014-08-06 22:18:06.324685586 -0700 @@ -21,7 +21,7 @@ Ascender 718
Descender -207
StdHW 76
StdVW 88
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
C 33 ; WX 278 ; N exclam ; B 90 0 340 718 ;
C 34 ; WX 355 ; N quotedbl ; B 168 463 438 718 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 81 0 764 92 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 81 0 764 92
C -1 ; WX 333 ; N rcommaaccent ; B 30 -225 446 538 ; C -1 ; WX 333 ; N rcommaaccent ; B 30 -225 446 538 ;
C -1 ; WX 722 ; N Ntilde ; B 76 0 799 917 ; C -1 ; WX 722 ; N Ntilde ; B 76 0 799 917 ;
@ -161,9 +268,17 @@ diff -rupN a2ps-4.14.old/afm/phvro.afm a2ps-4.14/afm/phvro.afm
C -1 ; WX 722 ; N Rcommaaccent ; B 88 -225 773 718 ; C -1 ; WX 722 ; N Rcommaaccent ; B 88 -225 773 718 ;
C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 555 718 ; C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 555 718 ;
C -1 ; WX 667 ; N Atilde ; B 14 0 699 917 ; C -1 ; WX 667 ; N Atilde ; B 14 0 699 917 ;
diff -rupN a2ps-4.14.old/afm/ptmb.afm a2ps-4.14/afm/ptmb.afm --- afm/ptmb.afm
--- a2ps-4.14.old/afm/ptmb.afm 2007-09-19 17:01:48.000000000 -0700 +++ afm/ptmb.afm 2015-03-02 11:28:49.234018769 +0000
+++ a2ps-4.14/afm/ptmb.afm 2014-08-06 22:19:02.986671634 -0700 @@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 44
StdVW 139
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 81 -13 251 691 ;
C 34 ; WX 555 ; N quotedbl ; B 83 404 472 691 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 14 0 690 91 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 14 0 690 91
C -1 ; WX 444 ; N rcommaaccent ; B 29 -218 434 473 ; C -1 ; WX 444 ; N rcommaaccent ; B 29 -218 434 473 ;
C -1 ; WX 722 ; N Ntilde ; B 16 -18 701 884 ; C -1 ; WX 722 ; N Ntilde ; B 16 -18 701 884 ;
@ -172,9 +287,17 @@ diff -rupN a2ps-4.14.old/afm/ptmb.afm a2ps-4.14/afm/ptmb.afm
C -1 ; WX 722 ; N Rcommaaccent ; B 26 -218 715 676 ; C -1 ; WX 722 ; N Rcommaaccent ; B 26 -218 715 676 ;
C -1 ; WX 667 ; N Lcommaaccent ; B 19 -218 638 676 ; C -1 ; WX 667 ; N Lcommaaccent ; B 19 -218 638 676 ;
C -1 ; WX 722 ; N Atilde ; B 9 0 689 884 ; C -1 ; WX 722 ; N Atilde ; B 9 0 689 884 ;
diff -rupN a2ps-4.14.old/afm/ptmbi.afm a2ps-4.14/afm/ptmbi.afm --- afm/ptmbi.afm
--- a2ps-4.14.old/afm/ptmbi.afm 2007-09-19 17:01:48.000000000 -0700 +++ afm/ptmbi.afm 2015-03-02 11:29:07.549519056 +0000
+++ a2ps-4.14/afm/ptmbi.afm 2014-08-06 22:21:00.578719402 -0700 @@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 42
StdVW 121
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 389 ; N exclam ; B 67 -13 370 684 ;
C 34 ; WX 555 ; N quotedbl ; B 136 398 536 685 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B -46 0 685 8 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B -46 0 685 8
C -1 ; WX 389 ; N rcommaaccent ; B -67 -218 389 462 ; C -1 ; WX 389 ; N rcommaaccent ; B -67 -218 389 462 ;
C -1 ; WX 722 ; N Ntilde ; B -27 -15 748 862 ; C -1 ; WX 722 ; N Ntilde ; B -27 -15 748 862 ;
@ -183,9 +306,17 @@ diff -rupN a2ps-4.14.old/afm/ptmbi.afm a2ps-4.14/afm/ptmbi.afm
C -1 ; WX 667 ; N Rcommaaccent ; B -29 -218 623 669 ; C -1 ; WX 667 ; N Rcommaaccent ; B -29 -218 623 669 ;
C -1 ; WX 611 ; N Lcommaaccent ; B -22 -218 590 669 ; C -1 ; WX 611 ; N Lcommaaccent ; B -22 -218 590 669 ;
C -1 ; WX 667 ; N Atilde ; B -67 0 593 862 ; C -1 ; WX 667 ; N Atilde ; B -67 0 593 862 ;
diff -rupN a2ps-4.14.old/afm/ptmi.afm a2ps-4.14/afm/ptmi.afm --- afm/ptmi.afm
--- a2ps-4.14.old/afm/ptmi.afm 2007-09-19 17:01:48.000000000 -0700 +++ afm/ptmi.afm 2015-03-02 11:29:33.353519026 +0000
+++ a2ps-4.14/afm/ptmi.afm 2014-08-06 22:21:52.639626587 -0700 @@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 32
StdVW 76
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ;
C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B -8 0 700 87 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B -8 0 700 87
C -1 ; WX 389 ; N rcommaaccent ; B -3 -217 412 441 ; C -1 ; WX 389 ; N rcommaaccent ; B -3 -217 412 441 ;
C -1 ; WX 667 ; N Ntilde ; B -20 -15 727 836 ; C -1 ; WX 667 ; N Ntilde ; B -20 -15 727 836 ;
@ -194,9 +325,17 @@ diff -rupN a2ps-4.14.old/afm/ptmi.afm a2ps-4.14/afm/ptmi.afm
C -1 ; WX 611 ; N Rcommaaccent ; B -13 -187 588 653 ; C -1 ; WX 611 ; N Rcommaaccent ; B -13 -187 588 653 ;
C -1 ; WX 556 ; N Lcommaaccent ; B -8 -217 559 653 ; C -1 ; WX 556 ; N Lcommaaccent ; B -8 -217 559 653 ;
C -1 ; WX 611 ; N Atilde ; B -51 0 566 836 ; C -1 ; WX 611 ; N Atilde ; B -51 0 566 836 ;
diff -rupN a2ps-4.14.old/afm/ptmr.afm a2ps-4.14/afm/ptmr.afm --- afm/ptmr.afm
--- a2ps-4.14.old/afm/ptmr.afm 2007-09-19 17:01:48.000000000 -0700 +++ afm/ptmr.afm 2015-03-02 11:29:56.738018858 +0000
+++ a2ps-4.14/afm/ptmr.afm 2014-08-06 22:22:50.515635517 -0700 @@ -21,7 +21,7 @@ Ascender 683
Descender -217
StdHW 28
StdVW 84
-StartCharMetrics 314
+StartCharMetrics 315
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 130 -9 238 676 ;
C 34 ; WX 408 ; N quotedbl ; B 77 431 331 676 ;
@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 16 0 685 88 @@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 16 0 685 88
C -1 ; WX 333 ; N rcommaaccent ; B 5 -218 335 460 ; C -1 ; WX 333 ; N rcommaaccent ; B 5 -218 335 460 ;
C -1 ; WX 722 ; N Ntilde ; B 12 -11 707 850 ; C -1 ; WX 722 ; N Ntilde ; B 12 -11 707 850 ;
@ -205,9 +344,22 @@ diff -rupN a2ps-4.14.old/afm/ptmr.afm a2ps-4.14/afm/ptmr.afm
C -1 ; WX 667 ; N Rcommaaccent ; B 17 -198 659 662 ; C -1 ; WX 667 ; N Rcommaaccent ; B 17 -198 659 662 ;
C -1 ; WX 611 ; N Lcommaaccent ; B 12 -218 598 662 ; C -1 ; WX 611 ; N Lcommaaccent ; B 12 -218 598 662 ;
C -1 ; WX 722 ; N Atilde ; B 15 0 706 850 ; C -1 ; WX 722 ; N Atilde ; B 15 0 706 850 ;
diff -rupN a2ps-4.14.old/configure a2ps-4.14/configure --- configure.in
--- a2ps-4.14.old/configure 2007-12-28 19:28:03.000000000 -0800 +++ configure.in 2015-03-02 11:15:46.993517948 +0000
+++ a2ps-4.14/configure 2014-08-06 21:32:03.896139361 -0700 @@ -207,8 +207,9 @@ AC_MSG_CHECKING(for PostScript fonts pat
# Try to find some PostScript fonts.
# Find out if ghostscript is installed
ac_psfont_path=
-for ac_dir in /usr/local/ghostscript/fonts \
- /usr/local/share/ghostscript/fonts;
+for ac_dir in usr/share/ghostscript/fonts \
+ /usr/X11R6/lib/X11/fonts/Type1/ \
+ /usr/X11R6/lib/X11/fonts/latin2/Type1/ ;
do
if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
ac_psfont_path="$ac_psfont_path:$ac_dir";
--- configure
+++ configure 2014-08-07 04:32:04.000000000 +0000
@@ -30759,8 +30759,9 @@ echo $ECHO_N "checking for PostScript fo @@ -30759,8 +30759,9 @@ echo $ECHO_N "checking for PostScript fo
# Try to find some PostScript fonts. # Try to find some PostScript fonts.
# Find out if ghostscript is installed # Find out if ghostscript is installed
@ -220,9 +372,8 @@ diff -rupN a2ps-4.14.old/configure a2ps-4.14/configure
do do
if test "cd $ac_dir 2>/dev/null && echo *.afm"; then if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
ac_psfont_path="$ac_psfont_path:$ac_dir"; ac_psfont_path="$ac_psfont_path:$ac_dir";
diff -rupN a2ps-4.14.old/contrib/emacs/a2ps.el a2ps-4.14/contrib/emacs/a2ps.el --- contrib/emacs/a2ps.el
--- a2ps-4.14.old/contrib/emacs/a2ps.el 2007-12-28 17:58:11.000000000 -0800 +++ contrib/emacs/a2ps.el 2014-08-07 05:23:41.000000000 +0000
+++ a2ps-4.14/contrib/emacs/a2ps.el 2014-08-06 22:23:41.146518510 -0700
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
;; a2ps-compile-regexp ;; a2ps-compile-regexp
@ -232,9 +383,19 @@ diff -rupN a2ps-4.14.old/contrib/emacs/a2ps.el a2ps-4.14/contrib/emacs/a2ps.el
;;thank god for make-regexp.el! ;;thank god for make-regexp.el!
(defvar a2ps-font-lock-keywords (defvar a2ps-font-lock-keywords
diff -rupN a2ps-4.14.old/encoding/encoding.map a2ps-4.14/encoding/encoding.map --- doc/Makefile.in
--- a2ps-4.14.old/encoding/encoding.map 2007-12-28 17:39:21.000000000 -0800 +++ doc/Makefile.in 2015-03-02 11:22:54.806018972 +0000
+++ a2ps-4.14/encoding/encoding.map 2014-08-06 22:30:00.355141802 -0700 @@ -146,7 +146,7 @@ GNU_PACKAGE = @GNU_PACKAGE@
GPERF = @GPERF@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
--- encoding/encoding.map
+++ encoding/encoding.map 2014-08-07 05:30:00.000000000 +0000
@@ -84,6 +84,10 @@ iso15 iso15 @@ -84,6 +84,10 @@ iso15 iso15
latin9 iso15 latin9 iso15
latin0 iso15 latin0 iso15
@ -246,9 +407,19 @@ diff -rupN a2ps-4.14.old/encoding/encoding.map a2ps-4.14/encoding/encoding.map
######################################################################## ########################################################################
# Other encodings # Other encodings
diff -rupN a2ps-4.14.old/etc/a2ps_cfg.in a2ps-4.14/etc/a2ps_cfg.in --- etc/Makefile.in
--- a2ps-4.14.old/etc/a2ps_cfg.in 2007-12-28 17:38:58.000000000 -0800 +++ etc/Makefile.in 2014-08-07 05:31:54.000000000 +0000
+++ a2ps-4.14/etc/a2ps_cfg.in 2014-08-06 22:38:22.696941149 -0700 @@ -482,7 +482,7 @@ uninstall-local:
# Building the correct a2ps.cfg
a2ps.cfg: a2ps_cfg Makefile
- sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg
+ sed "s!@libpath@!$(libpath)!;s!@psfontpath@!$(PSFONT_PATH)!" a2ps_cfg > a2ps.cfg
# Building a time stamp to know the version.
README: README.in Makefile
--- etc/a2ps_cfg.in
+++ etc/a2ps_cfg.in 2014-08-07 05:38:23.000000000 +0000
@@ -58,6 +58,39 @@ Medium: Folio 612 936 @@ -58,6 +58,39 @@ Medium: Folio 612 936
Medium: Quarto 610 780 Medium: Quarto 610 780
Medium: 10x14 720 1008 Medium: 10x14 720 1008
@ -306,25 +477,12 @@ diff -rupN a2ps-4.14.old/etc/a2ps_cfg.in a2ps-4.14/etc/a2ps_cfg.in
-@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS -@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS
+##@COM_ghostview@Variable: ghostview @ghostview@ --arguments=-dNOPLATFONTS +##@COM_ghostview@Variable: ghostview @ghostview@ --arguments=-dNOPLATFONTS
+#@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS +#@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS
+Variable: a2ps-open +Variable: ghostview a2ps-open
# Used for the `pdf' printer. # Used for the `pdf' printer.
# Use as `#{ps2pdf} INPUT OUTPUT'. # Use as `#{ps2pdf} INPUT OUTPUT'.
diff -rupN a2ps-4.14.old/etc/Makefile.in a2ps-4.14/etc/Makefile.in --- lib/jobs.c
--- a2ps-4.14.old/etc/Makefile.in 2007-12-28 19:28:07.000000000 -0800 +++ lib/jobs.c 2014-08-07 05:41:30.000000000 +0000
+++ a2ps-4.14/etc/Makefile.in 2014-08-06 22:31:53.889128113 -0700
@@ -482,7 +482,7 @@ uninstall-local:
# Building the correct a2ps.cfg
a2ps.cfg: a2ps_cfg Makefile
- sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg
+ sed "s!@libpath@!$(libpath)!;s!@psfontpath@!$(PSFONT_PATH)!" a2ps_cfg > a2ps.cfg
# Building a time stamp to know the version.
README: README.in Makefile
diff -rupN a2ps-4.14.old/lib/jobs.c a2ps-4.14/lib/jobs.c
--- a2ps-4.14.old/lib/jobs.c 2007-12-28 17:37:54.000000000 -0800
+++ a2ps-4.14/lib/jobs.c 2014-08-06 22:41:30.490237460 -0700
@@ -135,10 +135,18 @@ a2ps_job_new (void) @@ -135,10 +135,18 @@ a2ps_job_new (void)
/* Set the NLS on */ /* Set the NLS on */
@ -345,9 +503,8 @@ diff -rupN a2ps-4.14.old/lib/jobs.c a2ps-4.14/lib/jobs.c
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE);
diff -rupN a2ps-4.14.old/lib/metaseq.c a2ps-4.14/lib/metaseq.c --- lib/metaseq.c
--- a2ps-4.14.old/lib/metaseq.c 2007-12-28 17:58:20.000000000 -0800 +++ lib/metaseq.c 2014-08-07 05:46:14.000000000 +0000
+++ a2ps-4.14/lib/metaseq.c 2014-08-06 22:46:13.885218338 -0700
@@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack @@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack
int justification = 1; int justification = 1;
@ -357,9 +514,8 @@ diff -rupN a2ps-4.14.old/lib/metaseq.c a2ps-4.14/lib/metaseq.c
{ {
int type; int type;
diff -rupN a2ps-4.14.old/lib/options.c a2ps-4.14/lib/options.c --- lib/options.c
--- a2ps-4.14.old/lib/options.c 2007-12-28 17:58:21.000000000 -0800 +++ lib/options.c 2015-03-02 11:08:10.593519054 +0000
+++ a2ps-4.14/lib/options.c 2014-08-07 07:24:59.080146157 -0700
@@ -54,11 +54,14 @@ @@ -54,11 +54,14 @@
#include "argv.h" #include "argv.h"
#include "quotearg.h" #include "quotearg.h"
@ -393,9 +549,23 @@ diff -rupN a2ps-4.14.old/lib/options.c a2ps-4.14/lib/options.c
xstrcpy (job->medium_request, optarg); xstrcpy (job->medium_request, optarg);
break; break;
diff -rupN a2ps-4.14.old/lib/path-concat.c a2ps-4.14/lib/path-concat.c @@ -641,6 +654,14 @@ a2ps_handle_options (a2ps_job * job, int
--- a2ps-4.14.old/lib/path-concat.c 2007-12-28 17:37:54.000000000 -0800 break;
+++ a2ps-4.14/lib/path-concat.c 2014-08-07 07:27:19.276571665 -0700
case 'X': /* change the encoding scheme */
+ if (!strcasecmp("LC_CTYPE", optarg))
+ {
+ char * codeset = nl_langinfo(_NL_CTYPE_CODESET_NAME);
+ if (codeset && !strncasecmp(codeset, "iso", 3))
+ optarg = xstrdup(codeset);
+ else
+ optarg = xstrdup("ISO-8859-15");
+ }
/* Since there can be -X in the config files, and because
* the encoding.map has not been read yet (because to read
* encoding.map, one has to know the lib path, and to know
--- lib/path-concat.c
+++ lib/path-concat.c 2014-08-07 14:27:19.000000000 +0000
@@ -21,10 +21,6 @@ @@ -21,10 +21,6 @@
# include <config.h> # include <config.h>
#endif #endif
@ -417,9 +587,8 @@ diff -rupN a2ps-4.14.old/lib/path-concat.c a2ps-4.14/lib/path-concat.c
#ifndef DIRECTORY_SEPARATOR #ifndef DIRECTORY_SEPARATOR
# define DIRECTORY_SEPARATOR '/' # define DIRECTORY_SEPARATOR '/'
diff -rupN a2ps-4.14.old/lib/xstrrpl.c a2ps-4.14/lib/xstrrpl.c --- lib/xstrrpl.c
--- a2ps-4.14.old/lib/xstrrpl.c 2007-12-28 17:37:54.000000000 -0800 +++ lib/xstrrpl.c 2014-08-07 14:29:47.000000000 +0000
+++ a2ps-4.14/lib/xstrrpl.c 2014-08-07 07:29:46.837124580 -0700
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <assert.h> #include <assert.h>
#include "xstrrpl.h" #include "xstrrpl.h"
@ -428,9 +597,8 @@ diff -rupN a2ps-4.14.old/lib/xstrrpl.c a2ps-4.14/lib/xstrrpl.c
extern char * stpcpy(); extern char * stpcpy();
/* Perform subsitutions in string. Result is malloc'd /* Perform subsitutions in string. Result is malloc'd
diff -rupN a2ps-4.14.old/man/a2ps.1 a2ps-4.14/man/a2ps.1 --- man/a2ps.1
--- a2ps-4.14.old/man/a2ps.1 2007-12-28 19:29:02.000000000 -0800 +++ man/a2ps.1 2014-08-07 14:32:29.000000000 +0000
+++ a2ps-4.14/man/a2ps.1 2014-08-07 07:32:28.759925975 -0700
@@ -81,8 +81,7 @@ first fill (DIRECTION=) rows, or columns @@ -81,8 +81,7 @@ first fill (DIRECTION=) rows, or columns
predefined font sizes and layouts for 1.. 9 virtuals predefined font sizes and layouts for 1.. 9 virtuals
.TP .TP
@ -441,9 +609,8 @@ diff -rupN a2ps-4.14.old/man/a2ps.1 a2ps-4.14/man/a2ps.1
.TP .TP
\fB\-j\fR, \fB\-\-borders\fR* \fB\-j\fR, \fB\-\-borders\fR*
print borders around columns print borders around columns
diff -rupN a2ps-4.14.old/ogonkify/Makefile.in a2ps-4.14/ogonkify/Makefile.in --- ogonkify/Makefile.in
--- a2ps-4.14.old/ogonkify/Makefile.in 2007-12-28 19:27:58.000000000 -0800 +++ ogonkify/Makefile.in 2014-08-07 14:34:25.000000000 +0000
+++ a2ps-4.14/ogonkify/Makefile.in 2014-08-07 07:34:24.718932161 -0700
@@ -223,7 +223,7 @@ PSPROGS = allchars.ps compose.ps helper. @@ -223,7 +223,7 @@ PSPROGS = allchars.ps compose.ps helper.
# #
@EXTENSIONS_TRUE@bin_SCRIPTS = ogonkify composeglyphs @EXTENSIONS_TRUE@bin_SCRIPTS = ogonkify composeglyphs
@ -453,9 +620,8 @@ diff -rupN a2ps-4.14.old/ogonkify/Makefile.in a2ps-4.14/ogonkify/Makefile.in
@EXTENSIONS_TRUE@fonts_DATA = $(CREATED_PFAS) @EXTENSIONS_TRUE@fonts_DATA = $(CREATED_PFAS)
# #
diff -rupN a2ps-4.14.old/ogonkify/ogonkify.in.in a2ps-4.14/ogonkify/ogonkify.in.in --- ogonkify/ogonkify.in.in
--- a2ps-4.14.old/ogonkify/ogonkify.in.in 2007-12-28 18:05:05.000000000 -0800 +++ ogonkify/ogonkify.in.in 2014-08-07 14:35:27.000000000 +0000
+++ a2ps-4.14/ogonkify/ogonkify.in.in 2014-08-07 07:35:27.037010315 -0700
@@ -38,7 +38,7 @@ $encoding='L2'; @@ -38,7 +38,7 @@ $encoding='L2';
'ibmpc','IBMPCEncoding', 'mac','MacintoshEncoding', 'ibmpc','IBMPCEncoding', 'mac','MacintoshEncoding',
'HP','HPRomanEncoding'); 'HP','HPRomanEncoding');
@ -465,9 +631,8 @@ diff -rupN a2ps-4.14.old/ogonkify/ogonkify.in.in a2ps-4.14/ogonkify/ogonkify.in.
'Times-Roman', 'Times-Italic', 'Times-Bold', 'Times-BoldItalic', 'Times-Roman', 'Times-Italic', 'Times-Bold', 'Times-BoldItalic',
'Helvetica', 'Helvetica-Oblique', 'Helvetica-Bold', 'Helvetica', 'Helvetica-Oblique', 'Helvetica-Bold',
'Helvetica-BoldOblique'); 'Helvetica-BoldOblique');
diff -rupN a2ps-4.14.old/ogonkify/pcrb-o.afm a2ps-4.14/ogonkify/pcrb-o.afm --- ogonkify/pcrb-o.afm
--- a2ps-4.14.old/ogonkify/pcrb-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/pcrb-o.afm 2014-08-07 14:36:40.000000000 +0000
+++ a2ps-4.14/ogonkify/pcrb-o.afm 2014-08-07 07:36:40.027273107 -0700
@@ -5,7 +5,7 @@ FontName Courier-Bold-Ogonki @@ -5,7 +5,7 @@ FontName Courier-Bold-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Courier-Bold-Ogonki Composite font FullName Courier-Bold-Ogonki Composite font
@ -485,9 +650,27 @@ diff -rupN a2ps-4.14.old/ogonkify/pcrb-o.afm a2ps-4.14/ogonkify/pcrb-o.afm
C -1 ; WX 600 ; N Yacute ; B 12 0 589 784 ; C -1 ; WX 600 ; N Yacute ; B 12 0 589 784 ;
C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ; C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ;
C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ;
diff -rupN a2ps-4.14.old/ogonkify/pcrr-o.afm a2ps-4.14/ogonkify/pcrr-o.afm --- ogonkify/pcrbo-o.afm
--- a2ps-4.14.old/ogonkify/pcrr-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/pcrbo-o.afm 2015-03-02 11:19:25.065518657 +0000
+++ a2ps-4.14/ogonkify/pcrr-o.afm 2014-08-07 07:37:28.600113457 -0700 @@ -5,7 +5,7 @@ FontName Courier-BoldOblique-Ogonki
EncodingScheme StandardEncoding
FullName Courier-BoldOblique-Ogonki Composite font
FontBBox -56 -250 868 801
-StartCharMetrics 315
+StartCharMetrics 316
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 216 -15 495 572 ;
C 34 ; WX 600 ; N quotedbl ; B 212 277 584 562 ;
@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 77 0 642 78
C -1 ; WX 600 ; N brokenbar ; B 218 -175 488 675 ;
C -1 ; WX 600 ; N Oacute ; B 74 -18 645 784 ;
C -1 ; WX 600 ; N otilde ; B 71 -15 642 636 ;
+C -1 ; WX 600 ; N Euro ; B -2 0 721 562 ;
C -1 ; WX 600 ; N Yacute ; B 109 0 708 784 ;
C -1 ; WX 600 ; N Icircumflex ; B 77 0 642 780 ;
C -1 ; WX 600 ; N Atilde ; B -9 0 638 759 ;
--- ogonkify/pcrr-o.afm
+++ ogonkify/pcrr-o.afm 2014-08-07 14:37:29.000000000 +0000
@@ -5,7 +5,7 @@ FontName Courier-Ogonki @@ -5,7 +5,7 @@ FontName Courier-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Courier-Ogonki Composite font FullName Courier-Ogonki Composite font
@ -505,9 +688,8 @@ diff -rupN a2ps-4.14.old/ogonkify/pcrr-o.afm a2ps-4.14/ogonkify/pcrr-o.afm
C -1 ; WX 600 ; N Yacute ; B 24 0 576 793 ; C -1 ; WX 600 ; N Yacute ; B 24 0 576 793 ;
C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ; C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ;
C -1 ; WX 600 ; N Atilde ; B 3 0 597 732 ; C -1 ; WX 600 ; N Atilde ; B 3 0 597 732 ;
diff -rupN a2ps-4.14.old/ogonkify/pcrro-o.afm a2ps-4.14/ogonkify/pcrro-o.afm --- ogonkify/pcrro-o.afm
--- a2ps-4.14.old/ogonkify/pcrro-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/pcrro-o.afm 2014-08-07 14:38:18.000000000 +0000
+++ a2ps-4.14/ogonkify/pcrro-o.afm 2014-08-07 07:38:18.442975784 -0700
@@ -5,7 +5,7 @@ FontName Courier-Oblique-Ogonki @@ -5,7 +5,7 @@ FontName Courier-Oblique-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Courier-Oblique-Ogonki Composite font FullName Courier-Oblique-Ogonki Composite font
@ -525,9 +707,8 @@ diff -rupN a2ps-4.14.old/ogonkify/pcrro-o.afm a2ps-4.14/ogonkify/pcrro-o.afm
C -1 ; WX 600 ; N Yacute ; B 133 0 695 793 ; C -1 ; WX 600 ; N Yacute ; B 133 0 695 793 ;
C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ; C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ;
C -1 ; WX 600 ; N Atilde ; B 3 0 656 732 ; C -1 ; WX 600 ; N Atilde ; B 3 0 656 732 ;
diff -rupN a2ps-4.14.old/ogonkify/phvb-o.afm a2ps-4.14/ogonkify/phvb-o.afm --- ogonkify/phvb-o.afm
--- a2ps-4.14.old/ogonkify/phvb-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/phvb-o.afm 2014-08-07 14:39:07.000000000 +0000
+++ a2ps-4.14/ogonkify/phvb-o.afm 2014-08-07 07:39:07.060816910 -0700
@@ -5,7 +5,7 @@ FontName Helvetica-Bold-Ogonki @@ -5,7 +5,7 @@ FontName Helvetica-Bold-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Helvetica-Bold-Ogonki Composite font FullName Helvetica-Bold-Ogonki Composite font
@ -545,9 +726,8 @@ diff -rupN a2ps-4.14.old/ogonkify/phvb-o.afm a2ps-4.14/ogonkify/phvb-o.afm
C -1 ; WX 584 ; N plusminus ; B 40 0 544 674 ; C -1 ; WX 584 ; N plusminus ; B 40 0 544 674 ;
C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ; C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ;
C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ; C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ;
diff -rupN a2ps-4.14.old/ogonkify/phvbo-o.afm a2ps-4.14/ogonkify/phvbo-o.afm --- ogonkify/phvbo-o.afm
--- a2ps-4.14.old/ogonkify/phvbo-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/phvbo-o.afm 2014-08-07 14:40:08.000000000 +0000
+++ a2ps-4.14/ogonkify/phvbo-o.afm 2014-08-07 07:40:08.179874322 -0700
@@ -5,7 +5,7 @@ FontName Helvetica-BoldOblique-Ogonki @@ -5,7 +5,7 @@ FontName Helvetica-BoldOblique-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Helvetica-BoldOblique-Ogonki Composite font FullName Helvetica-BoldOblique-Ogonki Composite font
@ -565,9 +745,27 @@ diff -rupN a2ps-4.14.old/ogonkify/phvbo-o.afm a2ps-4.14/ogonkify/phvbo-o.afm
C -1 ; WX 584 ; N plusminus ; B 40 0 639 674 ; C -1 ; WX 584 ; N plusminus ; B 40 0 639 674 ;
C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ; C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ;
C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ; C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ;
diff -rupN a2ps-4.14.old/ogonkify/phvro-o.afm a2ps-4.14/ogonkify/phvro-o.afm --- ogonkify/phvr-o.afm
--- a2ps-4.14.old/ogonkify/phvro-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/phvr-o.afm 2015-03-02 11:18:39.510018504 +0000
+++ a2ps-4.14/ogonkify/phvro-o.afm 2014-08-07 07:41:15.175033395 -0700 @@ -5,7 +5,7 @@ FontName Helvetica-Ogonki
EncodingScheme StandardEncoding
FullName Helvetica-Ogonki Composite font
FontBBox -174 -220 1001 944
-StartCharMetrics 285
+StartCharMetrics 286
C 32 ; WX 278 ; N space ; B 0 0 0 0 ;
C 33 ; WX 278 ; N exclam ; B 124 0 208 729 ;
C 34 ; WX 355 ; N quotedbl ; B 52 462 305 708 ;
@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 30 -21 804
C -1 ; WX 834 ; N onequarter ; B 30 -21 804 709 ;
C -1 ; WX 333 ; N onesuperior ; B 60 284 219 709 ;
C -1 ; WX 556 ; N otilde ; B 36 -23 510 716 ;
+C -1 ; WX 833 ; N Euro ; B 75 0 761 729 ;
C -1 ; WX 584 ; N plusminus ; B 40 0 544 618 ;
C -1 ; WX 737 ; N registered ; B -13 -23 751 741 ;
C -1 ; WX 500 ; N scaron ; B 34 -24 459 740 ;
--- ogonkify/phvro-o.afm
+++ ogonkify/phvro-o.afm 2014-08-07 14:41:15.000000000 +0000
@@ -5,7 +5,7 @@ FontName Helvetica-Oblique-Ogonki @@ -5,7 +5,7 @@ FontName Helvetica-Oblique-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Helvetica-Oblique-Ogonki Composite font FullName Helvetica-Oblique-Ogonki Composite font
@ -585,29 +783,8 @@ diff -rupN a2ps-4.14.old/ogonkify/phvro-o.afm a2ps-4.14/ogonkify/phvro-o.afm
C -1 ; WX 584 ; N plusminus ; B 40 0 621 618 ; C -1 ; WX 584 ; N plusminus ; B 40 0 621 618 ;
C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ; C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ;
C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ; C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ;
diff -rupN a2ps-4.14.old/ogonkify/ptmbi-o.afm a2ps-4.14/ogonkify/ptmbi-o.afm --- ogonkify/ptmb-o.afm
--- a2ps-4.14.old/ogonkify/ptmbi-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/ptmb-o.afm 2014-08-07 14:42:05.000000000 +0000
+++ a2ps-4.14/ogonkify/ptmbi-o.afm 2014-08-07 07:42:54.844757781 -0700
@@ -5,7 +5,7 @@ FontName Times-BoldItalic-Ogonki
EncodingScheme StandardEncoding
FullName Times-BoldItalic-Ogonki Composite font
FontBBox -168 -232 1014 894
-StartCharMetrics 285
+StartCharMetrics 286
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 389 ; N exclam ; B 66 -13 367 676 ;
C 34 ; WX 555 ; N quotedbl ; B 142 367 549 693 ;
@@ -219,6 +219,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 0 720 6
C -1 ; WX 750 ; N onequarter ; B 30 0 720 676 ;
C -1 ; WX 300 ; N onesuperior ; B 17 270 283 676 ;
C -1 ; WX 500 ; N otilde ; B 27 -13 507 648 ;
+C -1 ; WX 889 ; N Euro ; B -29 -12 907 662 ;
C -1 ; WX 570 ; N plusminus ; B 33 0 537 665 ;
C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ;
C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ;
diff -rupN a2ps-4.14.old/ogonkify/ptmb-o.afm a2ps-4.14/ogonkify/ptmb-o.afm
--- a2ps-4.14.old/ogonkify/ptmb-o.afm 2007-12-28 19:28:25.000000000 -0800
+++ a2ps-4.14/ogonkify/ptmb-o.afm 2014-08-07 07:42:05.346901410 -0700
@@ -5,7 +5,7 @@ FontName Times-Bold-Ogonki @@ -5,7 +5,7 @@ FontName Times-Bold-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Times-Bold-Ogonki Composite font FullName Times-Bold-Ogonki Composite font
@ -625,29 +802,27 @@ diff -rupN a2ps-4.14.old/ogonkify/ptmb-o.afm a2ps-4.14/ogonkify/ptmb-o.afm
C -1 ; WX 570 ; N plusminus ; B 50 0 520 600 ; C -1 ; WX 570 ; N plusminus ; B 50 0 520 600 ;
C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ; C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ;
C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ; C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ;
diff -rupN a2ps-4.14.old/ogonkify/ptmri-o.afm a2ps-4.14/ogonkify/ptmri-o.afm --- ogonkify/ptmbi-o.afm
--- a2ps-4.14.old/ogonkify/ptmri-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/ptmbi-o.afm 2014-08-07 14:42:55.000000000 +0000
+++ a2ps-4.14/ogonkify/ptmri-o.afm 2014-08-07 07:44:39.709572016 -0700 @@ -5,7 +5,7 @@ FontName Times-BoldItalic-Ogonki
@@ -5,7 +5,7 @@ FontName Times-Italic-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Times-Italic-Ogonki Composite font FullName Times-BoldItalic-Ogonki Composite font
FontBBox -169 -217 1010 883 FontBBox -168 -232 1014 894
-StartCharMetrics 285 -StartCharMetrics 285
+StartCharMetrics 286 +StartCharMetrics 286
C 32 ; WX 250 ; N space ; B 0 0 0 0 ; C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ; C 33 ; WX 389 ; N exclam ; B 66 -13 367 676 ;
C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ; C 34 ; WX 555 ; N quotedbl ; B 142 367 549 693 ;
@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412 @@ -219,6 +219,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 0 720 6
C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ; C -1 ; WX 750 ; N onequarter ; B 30 0 720 676 ;
C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ; C -1 ; WX 300 ; N onesuperior ; B 17 270 283 676 ;
C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ; C -1 ; WX 500 ; N otilde ; B 27 -13 507 648 ;
+C -1 ; WX 833 ; N Euro ; B -18 0 873 653 ; +C -1 ; WX 889 ; N Euro ; B -29 -12 907 662 ;
C -1 ; WX 611 ; N Aacute ; B -51 0 564 876 ; C -1 ; WX 570 ; N plusminus ; B 33 0 537 665 ;
C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ; C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ;
C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ; C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ;
diff -rupN a2ps-4.14.old/ogonkify/ptmr-o.afm a2ps-4.14/ogonkify/ptmr-o.afm --- ogonkify/ptmr-o.afm
--- a2ps-4.14.old/ogonkify/ptmr-o.afm 2007-12-28 19:28:25.000000000 -0800 +++ ogonkify/ptmr-o.afm 2014-08-07 14:43:39.000000000 +0000
+++ a2ps-4.14/ogonkify/ptmr-o.afm 2014-08-07 07:43:38.709516664 -0700
@@ -5,7 +5,7 @@ FontName Times-Roman-Ogonki @@ -5,7 +5,7 @@ FontName Times-Roman-Ogonki
EncodingScheme StandardEncoding EncodingScheme StandardEncoding
FullName Times-Roman-Ogonki Composite font FullName Times-Roman-Ogonki Composite font
@ -665,9 +840,27 @@ diff -rupN a2ps-4.14.old/ogonkify/ptmr-o.afm a2ps-4.14/ogonkify/ptmr-o.afm
C -1 ; WX 722 ; N Aacute ; B 15 0 706 890 ; C -1 ; WX 722 ; N Aacute ; B 15 0 706 890 ;
C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ; C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ;
C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ; C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ;
diff -rupN a2ps-4.14.old/src/main.c a2ps-4.14/src/main.c --- ogonkify/ptmri-o.afm
--- a2ps-4.14.old/src/main.c 2007-12-28 17:33:58.000000000 -0800 +++ ogonkify/ptmri-o.afm 2014-08-07 14:44:40.000000000 +0000
+++ a2ps-4.14/src/main.c 2014-08-07 07:49:12.751295878 -0700 @@ -5,7 +5,7 @@ FontName Times-Italic-Ogonki
EncodingScheme StandardEncoding
FullName Times-Italic-Ogonki Composite font
FontBBox -169 -217 1010 883
-StartCharMetrics 285
+StartCharMetrics 286
C 32 ; WX 250 ; N space ; B 0 0 0 0 ;
C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ;
C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ;
@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412
C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ;
C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ;
C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ;
+C -1 ; WX 833 ; N Euro ; B -18 0 873 653 ;
C -1 ; WX 611 ; N Aacute ; B -51 0 564 876 ;
C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ;
C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ;
--- src/main.c
+++ src/main.c 2014-08-07 14:49:13.000000000 +0000
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
#include "signame.h" #include "signame.h"
#include "long-options.h" #include "long-options.h"

6
a2ps.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 2 12:06:41 UTC 2015 - werner@suse.de
- Fix ported patch a2ps-4.14.diff to avoid bug in locale handling
as well in font format definition (boo#919249, boo#919243)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 6 11:23:03 UTC 2015 - werner@suse.de Fri Feb 6 11:23:03 UTC 2015 - werner@suse.de

22
a2ps.spec
View File

@ -90,21 +90,23 @@ latin encodings are supported.
%prep %prep
%setup -q -n a2ps-4.14 %setup -q -n a2ps-4.14
touch -r configure.in .ref touch -r configure.in .ref
%patch -P 1 -p 0 -b .security %patch1 -p0 -b .security
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch -P 6 -p 1 -b .incld %patch6 -p1 -b .incld
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%patch7 -p1 %patch7 -p1
%endif %endif
%patch -P 8 -p 0 -b .base %patch8 -p0 -b .base
%patch -P 9 -p 0 -b .utf8 %patch9 -p0 -b .utf8
%patch -P 10 -p 0 -b .types %patch10 -p0 -b .types
%patch -P 11 -p 0 -b .psgen %patch11 -p0 -b .psgen
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch -p1 %patch -p0 -b .p0
cp -f %SOURCE1 po/ko.po cp -f %SOURCE1 po/ko.po
find -type f | grep -vE '(parseppd|parsessh).y' | xargs \
sed -ri 's/59 Temple Place(,| -) Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/'
%build %build
#XXX: ugly hack; necessary?? #XXX: ugly hack; necessary??
@ -123,7 +125,7 @@ cp -f %SOURCE1 po/ko.po
done done
make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie" make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie"
sh ./config.status sh ./config.status
make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" MAKEINFO='makeinfo --force'
pushd doc pushd doc
texi2html a2ps.texi texi2html a2ps.texi
popd popd