From 73a4bfc3d8e9bb5365e33a11a6ad3b8340d5195b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 12 Jun 2022 21:09:35 +0200
Subject: Remove custom let*.

While it was nice, the most important part was the multi-valued let from
srfi-71 (which is implemented in srfi-71)). The minor pattern matching
structures could often be replaced with car+cdr, or a propper match.
---
 module/text/markup.scm | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'module/text/markup.scm')

diff --git a/module/text/markup.scm b/module/text/markup.scm
index 295ca198..53dab321 100644
--- a/module/text/markup.scm
+++ b/module/text/markup.scm
@@ -1,6 +1,7 @@
 (define-module (text markup)
   :use-module (hnh util)
   :use-module (srfi srfi-1)
+  :use-module (srfi srfi-71)
   :use-module (ice-9 match)
   :use-module (ice-9 pretty-print)
   :use-module (text util)
@@ -70,20 +71,20 @@
     [(br) "\n"]
     [(hr) (string-append "     " (make-string 60 #\─) "     \n")]
     [(dl)
-     (let* ((dts dds (partition (lambda (x) (eq? 'dt (car x))) body)))
-       (let* ((dts* (map sxml->ansi-text dts))
-              (m (if (null? dts*) 0 (apply max (map true-string-length dts*)))))
-         (string-concatenate
-          (map (lambda (dt dd)
-                 (let ((dds (string-split dd #\newline)))
-                   (string-concatenate
-                    (map (lambda (left right)
-                           (string-append (true-string-pad left m) " │ " right "\n"))
-                         (cons dt (map (const "") (iota (1- (length dds)))))
-                         dds))))
-               dts*
-               (map (compose sxml->ansi-text (add-attributes `((width ,(- 70 m 5)))))
-                    dds)))))]
+     (let* ((dts dds (partition (lambda (x) (eq? 'dt (car x))) body))
+            (dts* (map sxml->ansi-text dts))
+            (m (if (null? dts*) 0 (apply max (map true-string-length dts*)))))
+       (string-concatenate
+        (map (lambda (dt dd)
+               (let ((dds (string-split dd #\newline)))
+                 (string-concatenate
+                  (map (lambda (left right)
+                         (string-append (true-string-pad left m) " │ " right "\n"))
+                       (cons dt (map (const "") (iota (1- (length dds)))))
+                       dds))))
+             dts*
+             (map (compose sxml->ansi-text (add-attributes `((width ,(- 70 m 5)))))
+                  dds))))]
     [(dt) (string-concatenate (map (compose sxml->ansi-text (add-attributes args))
                                    body))]
     [(dd)
-- 
cgit v1.2.3