[groff] 12/12: [devhtml,devutf8]: Improve CJK font desc handling.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit b2a0fe8b0bc9a8a4b5115730d81e04420edc34c7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Dec 6 03:26:45 2024 -0600

    [devhtml,devutf8]: Improve CJK font desc handling.
    
    Stop pointlessly overwriting new CJK font descriptions for grohtml(1)
    and grotty(1).  Unlike the Latin script descriptions, they aren't
    generated from a ".proto" file.
    
    * font/devhtml/devhtml.am (DEVHTMLFONTS): Move CJK font description
      files from here...
    
      (DEVHTMLFONTSFILES_CJK): ...to this new macro.
    
      (devhtmlfont_DATA, EXTRA_DIST): Expand `DEVHTMLFONTSFILES_CJK` here.
      The latter ensures their presence in the distribution archive.
    
    * font/devutf8/devutf8.am (DEVUTF8FONTS): Move CJK font description
      files from here...
    
      (DEVUTF8FONTSFILES_CJK): ...to this new macro.
    
      (devutf8font_DATA, EXTRA_DIST): Expand `DEVUTF8FONTSFILES_CJK` here.
      The latter ensures their presence in the distribution archive.
---
 ChangeLog               | 20 ++++++++++++++++++++
 font/devhtml/devhtml.am | 12 ++++++++----
 font/devutf8/devutf8.am | 12 ++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f7dcd4aec..c2edcfdb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2024-12-06  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       Stop pointlessly overwriting new CJK font descriptions for
+       grohtml(1) and grotty(1).  Unlike the Latin script descriptions,
+       they aren't generated from a ".proto" file.
+
+       * font/devhtml/devhtml.am (DEVHTMLFONTS): Move CJK font
+       description files from here...
+       (DEVHTMLFONTSFILES_CJK): ...to this new macro.
+       (devhtmlfont_DATA, EXTRA_DIST): Expand `DEVHTMLFONTSFILES_CJK`
+       here.  The latter ensures their presence in the distribution
+       archive.
+
+       * font/devutf8/devutf8.am (DEVUTF8FONTS): Move CJK font
+       description files from here...
+       (DEVUTF8FONTSFILES_CJK): ...to this new macro.
+       (devutf8font_DATA, EXTRA_DIST): Expand `DEVUTF8FONTSFILES_CJK`
+       here.  The latter ensures their presence in the distribution
+       archive.
+
 2024-12-05  Deri James  <deri@chuzzlewit.myzen.co.uk>
 
        Backport gropdf and pdfpic.tmac to Perl 5.8.
diff --git a/font/devhtml/devhtml.am b/font/devhtml/devhtml.am
index f91a2aed4..b02efb978 100644
--- a/font/devhtml/devhtml.am
+++ b/font/devhtml/devhtml.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2024 Free Software Foundation, Inc.
 #
 # This file is part of 'groff'.
 #
@@ -26,7 +26,9 @@ DEVHTMLFONTSFILES = \
   font/devhtml/CI \
   font/devhtml/CB \
   font/devhtml/CBI \
-  font/devhtml/S \
+  font/devhtml/S
+
+DEVHTMLFONTSFILES_CJK = \
   font/devhtml/CSH \
   font/devhtml/CSS \
   font/devhtml/CTH \
@@ -41,12 +43,14 @@ DEVHTMLCPI = 10
 DEVHTMLLPI = 6
 
 devhtmlfontdir = $(fontdir)/devhtml
-devhtmlfont_DATA = $(DEVHTMLFONTSFILES) font/devhtml/DESC
+devhtmlfont_DATA = $(DEVHTMLFONTSFILES) $(DEVHTMLFONTSFILES_CJK) \
+  font/devhtml/DESC
 MOSTLYCLEANFILES += $(DEVHTMLFONTSFILES) font/devhtml/DESC
 EXTRA_DIST += \
   font/devhtml/R.proto \
   font/devhtml/DESC.proto \
-  font/devhtml/R.in
+  font/devhtml/R.in \
+  $(DEVHTMLFONTSFILES_CJK)
 
 $(DEVHTMLFONTSFILES): $(devhtml_srcdir)/R.proto
        $(AM_V_GEN)$(MKDIR_P) `dirname $@` \
diff --git a/font/devutf8/devutf8.am b/font/devutf8/devutf8.am
index 652a0909f..afa0e81bd 100644
--- a/font/devutf8/devutf8.am
+++ b/font/devutf8/devutf8.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2024 Free Software Foundation, Inc.
 #
 # This file is part of 'groff'.
 #
@@ -21,7 +21,9 @@ DEVUTF8FONTSFILES = \
   font/devutf8/R \
   font/devutf8/I \
   font/devutf8/B \
-  font/devutf8/BI \
+  font/devutf8/BI
+
+DEVUTF8FONTSFILES_CJK = \
   font/devutf8/CSH \
   font/devutf8/CSS \
   font/devutf8/CTH \
@@ -36,13 +38,15 @@ DEVUTF8CPI = 10
 DEVUTF8LPI = 6
 
 devutf8fontdir = $(fontdir)/devutf8
-devutf8font_DATA = $(DEVUTF8FONTSFILES) font/devutf8/DESC
+devutf8font_DATA = $(DEVUTF8FONTSFILES) $(DEVUTF8FONTSFILES_CJK) \
+  font/devutf8/DESC
 MOSTLYCLEANFILES += $(DEVUTF8FONTSFILES) font/devutf8/DESC
 EXTRA_DIST += \
   font/devutf8/R.proto \
   font/devutf8/DESC.proto \
   font/devutf8/NOTES \
-  font/devutf8/R.in
+  font/devutf8/R.in \
+  $(DEVUTF8FONTSFILES_CJK)
 
 $(DEVUTF8FONTSFILES): $(devutf8_srcdir)/R.proto
        $(AM_V_GEN)$(MKDIR_P) `dirname $@` \