[groff] 17/17: [grops]: Fix Savannah #65246 (spacey file names).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f918f6d285514690999061bd6269e13389a0b611
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Feb 17 20:08:45 2024 -0600

    [grops]: Fix Savannah #65246 (spacey file names).
    
    * src/devices/grops/psrm.cpp (resource_manager::read_download_file):
      Stop interpreting spaces as token delimiters, so that PostScript font
      files with spaces in their names can be handled (read and embedded in
      the generated PostScript).
    
    * src/devices/grops/grops.1.man (Usage): Update documentation.
    
    * NEWS: Add item reporting this user-visible change.
    
    Fixes <https://savannah.gnu.org/bugs/?65246>.  Thanks to Deri James for
    the report.
---
 ChangeLog                     | 14 ++++++++++++++
 NEWS                          |  9 +++++++++
 src/devices/grops/grops.1.man |  2 +-
 src/devices/grops/psrm.cpp    |  4 ++--
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f3bfbd23..feb6ad2fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-02-17  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/devices/grops/psrm.cpp
+       (resource_manager::read_download_file): Stop interpreting spaces
+       as token delimiters, so that PostScript font files with spaces
+       in their names can be handled (read and embedded in the
+       generated PostScript).
+       * src/devices/grops/grops.1.man (Usage): Update documentation.
+
+       * NEWS: Add item reporting this user-visible change.
+
+       Fixes <https://savannah.gnu.org/bugs/?65246>.  Thanks to Deri
+       James for the report.
+
 2024-02-17  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [output drivers]: Reset line number at end of input.
diff --git a/NEWS b/NEWS
index cfe5b770e..41bbc911f 100644
--- a/NEWS
+++ b/NEWS
@@ -205,6 +205,15 @@ o The s (ms) macro package now sets the vertical spacing 
register
   size of 20 points, the vertical spacing now defaults to 24 points
   rather than 22.
 
+Output drivers
+--------------
+
+o The PostScript output driver grops no longer accepts spaces as field
+  separators in its "download" file; this is so that spaces can appear
+  in font file names, and to better align the syntax of this file with
+  that used by gropdf.  The download file for grops shipped by groff has
+  long used tabs rather than spaces for field separation.
+
 Miscellaneous
 -------------
 
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.man
index 634f1616f..9f4b73fd9 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -516,7 +516,7 @@ Blank lines and those
 beginning with
 .B #
 are ignored;
-fields may be separated by tabs or spaces.
+fields are separated by tabs.
 .
 .I file
 is sought using the same mechanism as for
diff --git a/src/devices/grops/psrm.cpp b/src/devices/grops/psrm.cpp
index 591d17c70..f793bd45f 100644
--- a/src/devices/grops/psrm.cpp
+++ b/src/devices/grops/psrm.cpp
@@ -1099,10 +1099,10 @@ void resource_manager::read_download_file()
   int lineno = 0;
   while (fgets(buf, sizeof buf, fp)) {
     lineno++;
-    char *p = strtok(buf, " \t\r\n");
+    char *p = strtok(buf, "\t\r\n");
     if (p == 0 /* nullptr */ || *p == '#')
       continue;
-    char *q = strtok(0 /* nullptr */, " \t\r\n");
+    char *q = strtok(0 /* nullptr */, "\t\r\n");
     if (!q)
       fatal_with_file_and_line(path, lineno, "file name missing for"
                               " font '%1'", p);