X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-context-mods.scm;h=aa239e71ea5ea193e7bfaf4aa5713c3314669627;hb=acae40c266a7df9b4882f937c733745c803ac9e4;hp=b83ff69cac53779729b96ac3a6826ba46c209fcb;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/scm/document-context-mods.scm b/scm/document-context-mods.scm
index b83ff69cac..aa239e71ea 100644
--- a/scm/document-context-mods.scm
+++ b/scm/document-context-mods.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2011--2014 Neil Puttock <n.puttock@gmail.com>
+;;;; Copyright (C) 2011--2015 Neil Puttock <n.puttock@gmail.com>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -29,32 +29,31 @@
        (let ((value (car args))
              (path (cdr args)))
          (string-append
-          "@item Sets "
-          (format "grob property @code{~a} "
+          (format #f "@item Sets grob property @code{~a} "
                   (grob-property-path path))
-          (format "in @code{@rinternals{~a}} to ~a."
-                  name-sym
-                  (scm->texi value))
-          "\n")))
+          (format #f "in @code{@rinternals{~a}} to" name-sym)
+          (if (pretty-printable? value)
+            (format #f ":~a\n" (scm->texi value))
+            (format #f " ~a.\n" (scm->texi value))))))
       ((pop)
        (string-append
-        "@item Reverts "
-        (format "grob property @code{~a} "
+        (format #f "@item Reverts grob property @code{~a} "
                 (grob-property-path (car args)))
-        (format "in @code{@rinternals{~a}}."
-                name-sym)
-        "\n"))
+        (format #f "in @code{@rinternals{~a}}.\n"
+                name-sym)))
       ((assign)
-       (format "@item Sets translator property @code{~a} to ~a.\n"
-               name-sym
-               (scm->texi (car args))))
+       (string-append
+         (format #f "@item Sets translator property @code{~a} to" name-sym)
+         (if (pretty-printable? value)
+           (format #f ":~a\n" (scm->texi (car args)))
+           (format #f " ~a.\n" (scm->texi (car args))))))
       ((unset)
-       (format "@item Unsets translator property @code{~a}.\n"
+       (format #f "@item Unsets translator property @code{~a}.\n"
                name-sym))
       ((consists)
-       (format "@item Adds @code{@rinternals{~a}}.\n" name-sym))
+       (format #f "@item Adds @code{@rinternals{~a}}.\n" name-sym))
       ((remove)
-       (format "@item Removes @code{@rinternals{~a}}.\n" name-sym))
+       (format #f "@item Removes @code{@rinternals{~a}}.\n" name-sym))
       (else ""))))
 
 (define (document-context-mod context-mod-pair)
@@ -63,7 +62,7 @@
          (docstring (filter (lambda (mod)
                               (eq? (car mod) 'description))
                             mod-list)))
-    (format
+    (format #f
      "@item @code{~a}
 @findex ~a
 ~a
@@ -85,7 +84,7 @@
        (document-context-mod obj-pair)))
 
 (define context-mods-doc-string
-  (format
+  (format #f
    "@table @asis
 ~a
 @end table