From 211fac7955fca91cc840a01543758c4e687bc12c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Sun, 7 Dec 2008 21:09:53 +0100
Subject: info: Fix ornaments.

* src/guile/skribilo/engine/info.scm (%ornaments): Remove LaTeXisms.
  Use `output-justified' when outputting ornaments.
---
 src/guile/skribilo/engine/info.scm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/guile')

diff --git a/src/guile/skribilo/engine/info.scm b/src/guile/skribilo/engine/info.scm
index fa4fe5c..8647db3 100644
--- a/src/guile/skribilo/engine/info.scm
+++ b/src/guile/skribilo/engine/info.scm
@@ -343,17 +343,17 @@
 ;*---------------------------------------------------------------------*/
 ;*    *ornaments* ...                                                  */
 ;*---------------------------------------------------------------------*/
-(define *ornaments*
-   `((bold "{\\textbf{" "}}")
-     (emph "*" "*")
-     (underline "_" "_")
-     (it "{\\textit{" "}}")
-     (samp "{\\textit{" "}}")
-     (sc "{\\sc{" "}}")
-     (sup "^" "")
-     (sub "_" "")
-     (code "`" "'")
-     (samp "`" "'")))
+(define %ornaments
+   `((bold      "*" "*")
+     (emph      "_" "_")
+     (underline "*" "*")
+     (it        "_" "_")
+     (samp      "_" "_")
+     (sc        "" "")
+     (sup       "^" "")
+     (sub       "_" "")
+     (code      "`" "'")
+     (samp      "`" "'")))
 
 ;*---------------------------------------------------------------------*/
 ;*    info ::%ornament ...                                             */
@@ -363,9 +363,11 @@
                   (before (cadr ornament))
                   (after  (caddr ornament)))
               (markup-writer name info-engine
-                             :before before
-                             :after after)))
-          *ornaments*)
+                             :before (lambda (n e)
+                                       (output-justified before))
+                             :after  (lambda (n e)
+                                       (output-justified after)))))
+          %ornaments)
 
 ;*---------------------------------------------------------------------*/
 ;*    info ::%pre ...                                                  */
-- 
cgit v1.2.3