[groff] 19/21: Revert "[gropdf]: Provide more info in diagnostic message."

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit cafd4dffd259b37275072745d6731253b83afe90
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 18 12:35:42 2022 -0600

    Revert "[gropdf]: Provide more info in diagnostic message."
    
    This reverts commit 4753f2b17b8d836cf66fcb17f5412239e8b45743.
    
    Per request from Deri James.
    
    https://lists.gnu.org/archive/html/groff-commit/2022-11/msg00092.html
---
 ChangeLog                    | 17 -----------------
 src/devices/gropdf/gropdf.pl | 20 ++++++--------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d0c82ae5..5e4d0372c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -284,23 +284,6 @@
        previous value.  Since commit 5125754cdf, 23 February, no mdoc
        macro ever changes the type size.
 
-2022-11-08  G. Branden Robinson <g.branden.robinson@gmail.com>
-
-       * src/devices/gropdf/gropdf.pl: Provide more information in
-       diagnostic issued when an embeddable font is required by the
-       document and listed in the "download" file, but can't be opened.
-       (LoadDownload): Construct a "path" of each file specification
-       attempted.  Store this as the value for the hash `missing` keyed
-       on the tuple of scalars `foundry` and `name`, instead of the
-       name of the device description directory, which isn't very
-       helpful for troubleshooting.  Also: don't start message clause
-       with a capital letter (per GNU Coding Standards); double quote
-       file name references; and move parenthesized groff font name
-       outside of single quotes.
-       (LoadFont): Recast diagnostic message to communicate the
-       foregoing information.  Also make embedding failure messages
-       more consistent in style.
-
 2022-11-08  Deri James  <deri@chuzzlewit.myzen.co.uk>
 
        [gropdf]: Cater for invalid entries in download file.
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index b1e274b95..678597da6 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -682,14 +682,7 @@ sub LoadDownload
 
             if (!-r $pth)
             {
-               if (exists($missing{"$foundry $name"}))
-               {
-                   $missing{"$foundry $name"}.=":$pth";
-               }
-               else
-               {
-                   $missing{"$foundry $name"}="$pth";
-               }
+                $missing{"$foundry $name"}="$dir/$devnm";
                 next;
             }
 
@@ -2583,15 +2576,14 @@ sub LoadFont
     {
         if (exists($missing{$fontkey}))
         {
-           Warn("unable to embed font file for '$fnt{internalname}'"
-             . " ($ofontnm); check \"download\" file(s) (tried: "
-             . "\"$missing{$fontkey}\")");
+            Warn("The download file in '$missing{$fontkey}' "
+            . " has erroneous entry for '$fnt{internalname} ($ofontnm)'");
         }
         else
         {
-           Warn("unable to embed font file for '$fnt{internalname}'"
-             . " ($ofontnm); no entry for it in \"download\" file(s)")
-             if $embedall;
+            Warn("unable to embed font file for '$fnt{internalname}'"
+            . " ($ofontnm) (missing entry in 'download' file?)")
+            if $embedall;
         }
         $fno=++$objct;
         $fontlst{$fontno}->{OBJ}=BuildObj($objct,