texinfo: Properly render @acronym in plain text.

Fixes <https://bugs.gnu.org/37846>.
Reported by Christopher Baines <mail@cbaines.net>.

* module/texinfo/plain-text.scm (acronym): New procedure.
(tag-handlers): Change 'acro' handle to ACRONYM, and add 'acronym'
handler.
* test-suite/tests/texinfo.plain-text.test ("stexi->plain-text")
["acronym", "recursive acronym"]: New tests.

diff --git a/module/texinfo/plain-text.scm b/module/texinfo/plain-text.scm
index 6b7885ada92f469635fc64e8592f6aecb0bcfb57..5ea99c86bcbaf78536a1e1f657a8f0b7a5331b14 100644 (file)
--- a/module/texinfo/plain-text.scm
+++ b/module/texinfo/plain-text.scm
@@ -198,6 +198,16 @@
 (define (var tag . body)
   (string-upcase (stexi->plain-text body)))
 
+(define (acronym tag . elts)
+  (match elts
+    ((('% ('acronym text)))
+     (stexi->plain-text text))
+    ((('% ('acronym text) ('meaning . body)))
+     (string-append (stexi->plain-text text)
+                    " ("
+                    (string-concatenate (map stexi->plain-text body))
+                    ")"))))
+
 (define (passthrough tag . body)
   (stexi->plain-text body))
 
@@ -246,7 +256,8 @@
     (url          ,code)
     (dfn          ,(make-surrounder "\""))
     (cite         ,(make-surrounder "\""))
-    (acro         ,passthrough)
+    (acro         ,acronym)                       ;XXX: useless?
+    (acronym      ,acronym)
     (email        ,key)
     (emph         ,(make-surrounder "_"))
     (sc           ,var)

diff --git a/test-suite/tests/texinfo.plain-text.test b/test-suite/tests/texinfo.plain-text.test
index 565da8c7d368c30daa15aa84d5754d741ddd1e1d..4315cdbb1933a869323b428a9c7bb70153ecd15f 100644 (file)
--- a/test-suite/tests/texinfo.plain-text.test
+++ b/test-suite/tests/texinfo.plain-text.test
@@ -31,4 +31,22 @@
       "This is another sentence.\nThat too.\n\n"
     (with-fluids ((*line-width* 26))
       (stexi->plain-text
-       '(*fragment* (para "This is another sentence. That too."))))))
+       '(*fragment* (para "This is another sentence. That too.")))))
+
+  (pass-if-equal "acronym"
+      "What's GNU (GNU's Not Unix)?\n\n"
+    (stexi->plain-text
+     '(*fragment* (para "What's "
+                        (acronym (% (acronym "GNU")
+                                    (meaning "GNU's Not Unix")))
+                        "?"))))
+
+  (pass-if-equal "recursive acronym"
+      "What's GNU (GNU's Not Unix)?\n\n"
+    (stexi->plain-text
+     '(*fragment* (para "What's "
+                        (acronym (% (acronym "GNU")
+                                    (meaning (acronym
+                                              (% (acronym "GNU")))
+                                             "'s Not Unix")))
+                        "?")))))