From: matsb <matsb>
Date: Wed, 10 Aug 2005 08:18:48 +0000 (+0000)
Subject: 	* scm/define-markup-commands.scm (normal-text): Added 2 new
X-Git-Tag: release/2.6.4~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=38247ad6be8e300ec75ce88cd7277852d1ac48af;p=lilypond.git

	* scm/define-markup-commands.scm (normal-text): Added 2 new
	markup commands, \normal-text and \medium (the latter thanks to
	Bruce Fairchild).
---

diff --git a/ChangeLog b/ChangeLog
index 1d674279cb..6b011a61f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-10  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+	* scm/define-markup-commands.scm (normal-text): Added 2 new
+	markup commands, \normal-text and \medium (the latter thanks to
+	Bruce Fairchild). 
+
 2005-08-08  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* Documentation/user/programming-interface.itely (Markup
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 4c62c02615..1bbe8d14cc 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -421,6 +421,17 @@ recommend font for this is bold and italic"
   (interpret-markup
    layout (prepend-alist-chain 'font-shape 'upright props) arg))
 
+(def-markup-command (normal-text layout props arg) (markup?)
+  "Set all font related properties (except the size) to get the default normal text font, no matter what font was used earlier."
+  ;; ugh - latin1
+  (interpret-markup layout
+                    (cons '((font-family . roman) (font-shape . upright) (font-series . medium) (font-encoding . latin1)) props)
+                    arg)) 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; symbols.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (def-markup-command (doublesharp layout props) ()
   "Draw a double sharp symbol."