deri pushed a commit to branch master
in repository groff.
commit 6475a5fa8d65ff89a706b1b0e46604942cd0eb5c
Author: Deri James <[email protected]>
AuthorDate: Tue Feb 17 20:31:02 2026 +0000
Install groff fonts according to gropdf mode.
Full : All 35 Postscript 2 fonts + 35 URW fonts
Intermediate : All 35 Postscript 2 fonts
Basic : Just 14 PDF standard fonts
(Reinstates groff 1.23.0 behaviour).
* configure.ac: Add automake conditional GROPDF_INTER. Set if
not in basic mode.
* font/devpdf/devpdf.am: Split groff fonts list into 3 so that
the 3 modes above can be accommodated, based on the two automake
conditionals GROPDF_INTER and HAVE_URW_FONTS.
* m4/groff.m4: Fix logic error setting 'gropdf_service_level'.
Fixes <https://savannah.gnu.org/bugs/index.php?68060>
---
ChangeLog | 21 +++++++++++++++++++++
configure.ac | 1 +
font/devpdf/devpdf.am | 32 ++++++++++++++++++--------------
m4/groff.m4 | 8 ++++----
4 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dec38ff9a..e0fc42a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2026-01-20 Deri James <[email protected]>
+
+ Install groff fonts according to gropdf mode.
+
+ Full : All 35 Postscript 2 fonts + 35 URW fonts
+ Intermediate : All 35 Postscript 2 fonts
+ Basic : Just 14 PDF standard fonts
+
+ (Reinstates groff 1.23.0 behaviour).
+
+ * configure.ac: Add automake conditional GROPDF_INTER. Set if
+ not in basic mode.
+
+ * font/devpdf/devpdf.am: Split groff fonts list into 3 so that
+ the 3 modes above can be accommodated, based on the two automake
+ conditionals GROPDF_INTER and HAVE_URW_FONTS.
+
+ * m4/groff.m4: Fix logic error setting 'gropdf_service_level'.
+
+ Fixes <https://savannah.gnu.org/bugs/index.php?68060>
+
2026-02-12 G. Branden Robinson <[email protected]>
Add another URW font directory search path.
diff --git a/configure.ac b/configure.ac
index f52cd906e..eba15e472 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ AM_CONDITIONAL([HAVE_URW_FONTS], [test
"$groff_have_urw_fonts" = yes ])
AM_CONDITIONAL([HAVE_MAKEINFO], [test "$groff_have_makeinfo" = yes ])
AM_CONDITIONAL([HAVE_TEXI2DVI], [test "$groff_have_texi2dvi" = yes ])
AM_CONDITIONAL([USE_TEX], [test "$groff_use_tex" = yes ])
+AM_CONDITIONAL([GROPDF_INTER], [test "$gropdf_service_level" != basic ])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([test-groff], [chmod +x test-groff])
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index f59ca22c5..c60e9856c 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -24,15 +24,6 @@ devpdf_builddir = font/devpdf
devpdffont_descriptions_from_devps = \
font/devpdf/S \
font/devpdf/ZD \
- font/devpdf/ZCMI \
- font/devpdf/AB \
- font/devpdf/ABI \
- font/devpdf/AI \
- font/devpdf/AR \
- font/devpdf/BMB \
- font/devpdf/BMBI \
- font/devpdf/BMI \
- font/devpdf/BMR \
font/devpdf/CB \
font/devpdf/CBI \
font/devpdf/CI \
@@ -41,6 +32,22 @@ devpdffont_descriptions_from_devps = \
font/devpdf/HBI \
font/devpdf/HI \
font/devpdf/HR \
+ font/devpdf/TB \
+ font/devpdf/TBI \
+ font/devpdf/TI \
+ font/devpdf/TR \
+ font/devpdf/EURO
+
+if GROPDF_INTER
+devpdffont_descriptions_from_devps += \
+ font/devpdf/AB \
+ font/devpdf/ABI \
+ font/devpdf/AI \
+ font/devpdf/AR \
+ font/devpdf/BMB \
+ font/devpdf/BMBI \
+ font/devpdf/BMI \
+ font/devpdf/BMR \
font/devpdf/HNB \
font/devpdf/HNBI \
font/devpdf/HNI \
@@ -53,11 +60,8 @@ devpdffont_descriptions_from_devps = \
font/devpdf/PBI \
font/devpdf/PI \
font/devpdf/PR \
- font/devpdf/TB \
- font/devpdf/TBI \
- font/devpdf/TI \
- font/devpdf/TR \
- font/devpdf/EURO
+ font/devpdf/ZCMI
+endif
if HAVE_URW_FONTS
devpdffont_descriptions_for_urw = \
diff --git a/m4/groff.m4 b/m4/groff.m4
index 4ed11b596..d5d1b37e7 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -271,16 +271,16 @@ AC_DEFUN([GROFF_GROPDF_DEPENDENCIES_CHECK], [
AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
AC_REQUIRE([GROFF_URW_FONTS_CHECK])
- gropdf_service_level=full
+ gropdf_service_level=basic
- if test "$groff_have_urw_fonts" != yes
+ if test "$GHOSTSCRIPT" != missing
then
gropdf_service_level=intermediate
fi
- if test "$GHOSTSCRIPT" = missing
+ if test "$groff_have_urw_fonts" = yes
then
- gropdf_service_level=basic
+ gropdf_service_level=full
fi
])
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
