copy bounding boxes for Courier, Helvetica and Times from URW versions

git-svn-id: https://svn.r-project.org/R/trunk@85744 00db46b3-68df-0310-9c12-caf00c1e9a41
r-devel · Dec 29, 2023 · 326a022 · 326a022
1 parent 8faf877
commit 326a022
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 13 deletions.
diff --git a/doc/NEWS.Rd b/doc/NEWS.Rd
@@ -224,7 +224,7 @@
       \item \code{iconv(sub = "Unicode")} now zero-pads to four (hex)
       digits, rather than to 4 or 8.  (This seems to have become the
       convention once Unicode restricted the number of Unicode points
-      to \eqn{2{^31} - 1}{2^31 - 1} and so will never need more than 6
+      to \eqn{2^{31} - 1}{2^31 - 1} and so will never need more than 6
       digits.)
 
       \item \code{NCOL(NULL)} now returns 0 instead of 1, for
@@ -235,6 +235,12 @@
       a legacy encoding supporting classic macOS up to 2001 (with
       various revisions), and no longer has universal \code{libiconv}
       support.%% e.g. not in musl
+
+      \item The information for the Euro glyph missing from the Adobe
+      \file{.afm} files for the Courier, Helvetica and Times families
+      has been copied from their URW equivalents -- this will much
+      improve vertical centring in the \code{pdf()} and
+      \code{postscript()} devices.
     }
   }
 

diff --git a/src/library/grDevices/inst/afm/Courier-Bold.afm b/src/library/grDevices/inst/afm/Courier-Bold.afm
@@ -337,6 +337,6 @@ C -1 ; WX 600 ; N zcaron ; B 81 0 520 667 ;
 C -1 ; WX 600 ; N ncommaaccent ; B 18 -250 592 454 ;
 C -1 ; WX 600 ; N onesuperior ; B 153 230 447 616 ;
 C -1 ; WX 600 ; N imacron ; B 77 0 523 585 ;
-C -1 ; WX 600 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 600 ; N Euro ; B 4 -14 538 597 ;
 EndCharMetrics
 EndFontMetrics
diff --git a/src/library/grDevices/inst/afm/Courier-BoldOblique.afm b/src/library/grDevices/inst/afm/Courier-BoldOblique.afm
@@ -337,6 +337,6 @@ C -1 ; WX 600 ; N zcaron ; B 81 0 643 667 ;
 C -1 ; WX 600 ; N ncommaaccent ; B 18 -250 615 454 ;
 C -1 ; WX 600 ; N onesuperior ; B 212 230 514 616 ;
 C -1 ; WX 600 ; N imacron ; B 77 0 575 585 ;
-C -1 ; WX 600 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 600 ; N Euro ; B 54 -14 639 597 ;
 EndCharMetrics
 EndFontMetrics
diff --git a/src/library/grDevices/inst/afm/Courier-Oblique.afm b/src/library/grDevices/inst/afm/Courier-Oblique.afm
@@ -337,6 +337,6 @@ C -1 ; WX 600 ; N zcaron ; B 99 0 624 669 ;
 C -1 ; WX 600 ; N ncommaaccent ; B 26 -250 585 441 ;
 C -1 ; WX 600 ; N onesuperior ; B 231 249 491 622 ;
 C -1 ; WX 600 ; N imacron ; B 95 0 543 565 ;
-C -1 ; WX 600 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 600 ; N Euro ; B 60 -16 634 576 ;
 EndCharMetrics
 EndFontMetrics
diff --git a/src/library/grDevices/inst/afm/Courier.afm b/src/library/grDevices/inst/afm/Courier.afm
@@ -337,6 +337,6 @@ C -1 ; WX 600 ; N zcaron ; B 99 0 502 669 ;
 C -1 ; WX 600 ; N ncommaaccent ; B 26 -250 575 441 ;
 C -1 ; WX 600 ; N onesuperior ; B 172 249 428 622 ;
 C -1 ; WX 600 ; N imacron ; B 95 0 505 565 ;
-C -1 ; WX 600 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 600 ; N Euro ; B 11 -16 534 576 ;
 EndCharMetrics
 EndFontMetrics
diff --git a/src/library/grDevices/inst/afm/Helvetica-Bold.afm b/src/library/grDevices/inst/afm/Helvetica-Bold.afm
@@ -337,7 +337,7 @@ C -1 ; WX 500 ; N zcaron ; B 20 0 480 750 ;
 C -1 ; WX 611 ; N ncommaaccent ; B 65 -228 546 546 ;
 C -1 ; WX 333 ; N onesuperior ; B 26 283 237 710 ;
 C -1 ; WX 278 ; N imacron ; B -8 0 285 678 ;
-C -1 ; WX 556 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 556 ; N Euro ; B 6 -23 546 724 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2481

diff --git a/src/library/grDevices/inst/afm/Helvetica-BoldOblique.afm b/src/library/grDevices/inst/afm/Helvetica-BoldOblique.afm
@@ -337,7 +337,7 @@ C -1 ; WX 500 ; N zcaron ; B 20 0 586 750 ;
 C -1 ; WX 611 ; N ncommaaccent ; B 65 -228 629 546 ;
 C -1 ; WX 333 ; N onesuperior ; B 148 283 388 710 ;
 C -1 ; WX 278 ; N imacron ; B 69 0 429 678 ;
-C -1 ; WX 556 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 556 ; N Euro ; B 21 -23 648 724 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2481

diff --git a/src/library/grDevices/inst/afm/Helvetica-Oblique.afm b/src/library/grDevices/inst/afm/Helvetica-Oblique.afm
@@ -337,7 +337,7 @@ C -1 ; WX 500 ; N zcaron ; B 31 0 571 734 ;
 C -1 ; WX 556 ; N ncommaaccent ; B 65 -225 573 538 ;
 C -1 ; WX 333 ; N onesuperior ; B 166 281 371 703 ;
 C -1 ; WX 278 ; N imacron ; B 95 0 417 684 ;
-C -1 ; WX 556 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 556 ; N Euro ; B 12 -22 636 709 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2705

diff --git a/src/library/grDevices/inst/afm/Helvetica.afm b/src/library/grDevices/inst/afm/Helvetica.afm
@@ -337,7 +337,7 @@ C -1 ; WX 500 ; N zcaron ; B 31 0 469 734 ;
 C -1 ; WX 556 ; N ncommaaccent ; B 65 -225 491 538 ;
 C -1 ; WX 333 ; N onesuperior ; B 43 281 222 703 ;
 C -1 ; WX 278 ; N imacron ; B 5 0 272 684 ;
-C -1 ; WX 556 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 556 ; N Euro ; B 2 -23 543 709 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2705

diff --git a/src/library/grDevices/inst/afm/Times-Bold.afm b/src/library/grDevices/inst/afm/Times-Bold.afm
@@ -337,7 +337,7 @@ C -1 ; WX 444 ; N zcaron ; B 21 0 420 704 ;
 C -1 ; WX 556 ; N ncommaaccent ; B 21 -218 539 473 ;
 C -1 ; WX 300 ; N onesuperior ; B 28 275 273 688 ;
 C -1 ; WX 278 ; N imacron ; B -8 0 272 637 ;
-C -1 ; WX 500 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 500 ; N Euro ; B -36 -24 478 671 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2242

diff --git a/src/library/grDevices/inst/afm/Times-BoldItalic.afm b/src/library/grDevices/inst/afm/Times-BoldItalic.afm
@@ -337,7 +337,7 @@ C -1 ; WX 389 ; N zcaron ; B -43 -78 424 690 ;
 C -1 ; WX 556 ; N ncommaaccent ; B -6 -218 493 462 ;
 C -1 ; WX 300 ; N onesuperior ; B 30 274 301 683 ;
 C -1 ; WX 278 ; N imacron ; B 2 -9 294 623 ;
-C -1 ; WX 500 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 500 ; N Euro ; B 53 -5 666 689 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2038

diff --git a/src/library/grDevices/inst/afm/Times-Italic.afm b/src/library/grDevices/inst/afm/Times-Italic.afm
@@ -337,7 +337,7 @@ C -1 ; WX 389 ; N zcaron ; B -2 -81 434 661 ;
 C -1 ; WX 500 ; N ncommaaccent ; B 14 -187 474 441 ;
 C -1 ; WX 300 ; N onesuperior ; B 43 271 284 676 ;
 C -1 ; WX 278 ; N imacron ; B 46 -11 311 583 ;
-C -1 ; WX 500 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 500 ; N Euro ; B 57 0 668 693 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2321

diff --git a/src/library/grDevices/inst/afm/Times-Roman.afm b/src/library/grDevices/inst/afm/Times-Roman.afm
@@ -337,7 +337,7 @@ C -1 ; WX 444 ; N zcaron ; B 27 0 418 674 ;
 C -1 ; WX 500 ; N ncommaaccent ; B 16 -218 485 460 ;
 C -1 ; WX 300 ; N onesuperior ; B 57 270 248 676 ;
 C -1 ; WX 278 ; N imacron ; B 6 0 271 601 ;
-C -1 ; WX 500 ; N Euro ; B 0 0 0 0 ;
+C -1 ; WX 500 ; N Euro ; B -16 -14 477 674 ;
 EndCharMetrics
 StartKernData
 StartKernPairs 2073

diff --git a/src/library/grDevices/tests/ref/PS-CP1250.ps b/src/library/grDevices/tests/ref/PS-CP1250.ps
diff --git a/src/library/grDevices/tests/ref/PS-CP1251.ps b/src/library/grDevices/tests/ref/PS-CP1251.ps
diff --git a/src/library/grDevices/tests/ref/PS-CP1253.ps b/src/library/grDevices/tests/ref/PS-CP1253.ps
diff --git a/src/library/grDevices/tests/ref/PS-CP1257.ps b/src/library/grDevices/tests/ref/PS-CP1257.ps
diff --git a/src/library/grDevices/tests/ref/PS-Greek.ps b/src/library/grDevices/tests/ref/PS-Greek.ps
diff --git a/src/library/grDevices/tests/ref/PS-ISOLatin9.ps b/src/library/grDevices/tests/ref/PS-ISOLatin9.ps
diff --git a/src/library/grDevices/tests/ref/PS-WinAnsi.ps b/src/library/grDevices/tests/ref/PS-WinAnsi.ps
diff --git a/src/library/grDevices/tests/ref/pdf-CP1250.pdf b/src/library/grDevices/tests/ref/pdf-CP1250.pdf
diff --git a/src/library/grDevices/tests/ref/pdf-CP1251.pdf b/src/library/grDevices/tests/ref/pdf-CP1251.pdf
diff --git a/src/library/grDevices/tests/ref/pdf-CP1253.pdf b/src/library/grDevices/tests/ref/pdf-CP1253.pdf
diff --git a/src/library/grDevices/tests/ref/pdf-CP1257.pdf b/src/library/grDevices/tests/ref/pdf-CP1257.pdf
diff --git a/src/library/grDevices/tests/ref/pdf-Greek.pdf b/src/library/grDevices/tests/ref/pdf-Greek.pdf
diff --git a/src/library/grDevices/tests/ref/pdf-ISOLatin9.pdf b/src/library/grDevices/tests/ref/pdf-ISOLatin9.pdf
diff --git a/src/library/grDevices/tests/ref/pdf-WinAnsi.pdf b/src/library/grDevices/tests/ref/pdf-WinAnsi.pdf