gbranden pushed a commit to branch master
in repository groff.
commit 4158a296d9408ab46cb8411c836ef221c0719b6f
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Feb 12 09:01:05 2026 -0600
Re-order URW font directory search path.
* font/devpdf/Foundry.in:
* m4/groff.m4 (GROFF_URW_FONTS_CHECK): Alter ordering of directories to
attempt to find separately packaged URW fonts, which might in
principle get updated more frequently than those shipped with
Ghostscript, before those supplied by Ghostscript itself. This
procedure cannot be perfectly reliable using _any_ ordering because
host systems can update their Ghostscript and URW font packages (if
any) on separate and arbitrary schedules, and these matters are
outside of groff's contol. If groff finds the "wrong" URW fonts (or
can't find them at all), use the "--with-urw-fonts-dir=" option to
groff's "configure" script to point it at the correct ones.
Also drop stale commentary from m4/groff.m4.
---
ChangeLog | 17 +++++++++++++++++
font/devpdf/Foundry.in | 2 +-
m4/groff.m4 | 18 +++++++-----------
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5e801ca34..da36085c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2026-02-12 G. Branden Robinson <[email protected]>
+
+ Re-order URW font directory search path.
+
+ * font/devpdf/Foundry.in:
+ * m4/groff.m4 (GROFF_URW_FONTS_CHECK): Alter ordering of
+ directories to attempt to find separately packaged URW fonts,
+ which might in principle get updated more frequently than those
+ shipped with Ghostscript, before those supplied by Ghostscript
+ itself. This procedure cannot be perfectly reliable using _any_
+ ordering because host systems can update their Ghostscript and
+ URW font packages (if any) on separate and arbitrary schedules,
+ and these matters are outside of groff's contol. If groff finds
+ the "wrong" URW fonts (or can't find them at all), use the
+ "--with-urw-fonts-dir=" option to groff's "configure" script to
+ point it at the correct ones.
+
2026-01-20 Deri James <[email protected]>
* src/devices/gropdf/gropdf.pl: Allow whitespace after grout
diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
index 9f94b0e01..1489bfdbd 100644
--- a/font/devpdf/Foundry.in
+++ b/font/devpdf/Foundry.in
@@ -20,7 +20,7 @@
#=======================================================================
#Foundry|Name|Search path
-foundry||@urwfontsdir@:(gs):/usr/share/fonts/type1/gsfonts:/usr/share/fonts/default/Type1:/usr/share/fonts/default/Type1/adobestd35:/usr/share/fonts/type1/urw-base35:/usr/share/fonts/urw-base35:/usr/share/ghostscript/Resource/Font:/opt/local/share/fonts/urw-fonts:/usr/local/share/fonts/ghostscript
+foundry||@urwfontsdir@:(gs):/usr/share/fonts/type1/urw-base35/:/usr/share/fonts/urw-base35:/opt/local/share/fonts/urw-fonts/:/usr/local/share/fonts/ghostscript/:/usr/share/fonts/type1/gsfonts/:/usr/share/fonts/default/Type1/adobestd35/:/usr/share/fonts/default/Type1/:/usr/share/ghostscript/Resource/Font
# Enable the font description files for grops (generated from Adobe
# foundry font files) to be used with gropdf. afmtodit must not be
diff --git a/m4/groff.m4 b/m4/groff.m4
index 1fb124eef..782e217da 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -321,12 +321,8 @@ AC_DEFUN([GROFF_URW_FONTS_PATH], [
])
# Check for availability of URW fonts in the directory specified by the
-# user (see GROFF_URW_FONTS_PATH above). We do NOT search the path of
-# directories built into Ghostscript because those fonts lack the
-# corresponding AFM files we need to generate groff font description
-# files; see afmtodit(1). Ghostscript's own fonts are treated as the
-# "default foundry" and we already provide descriptions of them in
-# font/devpdf (along with groff's EURO font).
+# user (see GROFF_URW_FONTS_PATH above), if any. Otherwise search a set
+# of directories commonly (but variously) used to store them.
AC_DEFUN([GROFF_URW_FONTS_CHECK], [
AC_REQUIRE([GROFF_URW_FONTS_SUPPORT])
@@ -339,14 +335,14 @@ AC_DEFUN([GROFF_URW_FONTS_CHECK], [
dnl Keep this list in sync with font/devpdf/Foundry.in.
_list_paths="\
- /usr/share/fonts/type1/gsfonts/ \
- /usr/share/fonts/default/Type1/ \
- /usr/share/fonts/default/Type1/adobestd35/ \
/usr/share/fonts/type1/urw-base35/ \
/usr/share/fonts/urw-base35 \
- /usr/share/ghostscript/Resource/Font \
/opt/local/share/fonts/urw-fonts/ \
- /usr/local/share/fonts/ghostscript/"
+ /usr/local/share/fonts/ghostscript/ \
+ /usr/share/fonts/type1/gsfonts/ \
+ /usr/share/fonts/default/Type1/adobestd35/ \
+ /usr/share/fonts/default/Type1/ \
+ /usr/share/ghostscript/Resource/Font"
if test -n "$urwfontsdir"
then
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
