X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftext-replacements.ly;h=36a5f109eee28d1dad633c874ef9809e2fd26498;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=158fde40cc3cf95b64c54e3f4f679e8cdedb7c0c;hpb=28d8d9ac38857927790af5759c393adeff1ceb82;p=lilypond.git

diff --git a/ly/text-replacements.ly b/ly/text-replacements.ly
index 158fde40cc..36a5f109ee 100644
--- a/ly/text-replacements.ly
+++ b/ly/text-replacements.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2011 Bertrand Bordage <bordage.bertrand@gmail.com>
+%%%% Copyright (C) 2011--2015 Bertrand Bordage <bordage.bertrand@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
@@ -15,119 +15,120 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.15.7"
+\version "2.16.0"
 
 #(define (add-text-replacements! alist)
-     (assoc-set! text-font-defaults 'replacement-alist
-       (cdaar
-         (internal-add-text-replacements (list text-font-defaults) alist))))
+   (set! text-font-defaults
+	 (assoc-set! text-font-defaults 'replacement-alist
+		     (cdaar
+		      (internal-add-text-replacements (list text-font-defaults) alist)))))
 
 #(define (include-special-characters)
-  (add-text-replacements!
-    '(; Punctuation
-      ("§hellip;" . "…")
-      ("§ndash;" . "–")
-      ("§mdash;" . "—")
-      ("§iexcl;" . "¡")
-      ("§iquest;" . "¿")
-      ("§solidus;" . "∕") ; this is not a slash,
-                          ; contrary to what is said in Unicode.
+   (add-text-replacements!
+     '(;; Punctuation
+       ("&hellip;" . "…")
+       ("&ndash;" . "–")
+       ("&mdash;" . "—")
+       ("&iexcl;" . "¡")
+       ("&iquest;" . "¿")
+       ("&solidus;" . "∕") ; this is not a slash,
+                           ; contrary to what is said in Unicode.
 
-      ; French, German and English quotes open/close
-      ("§flq;" . "‹")
-      ("§frq;" . "›")
-      ("§flqq;" . "«")
-      ("§frqq;" . "»")
-      ("§glq;" . "‚")
-      ("§grq;" . "‘")
-      ("§glqq;" . "„")
-      ("§grqq;" . "“")
-      ("§elq;" . "‘")
-      ("§erq;" . "’")
-      ("§elqq;" . "“")
-      ("§erqq;" . "”")
+       ;; French, German and English quotes open/close
+       ("&flq;" . "‹")
+       ("&frq;" . "›")
+       ("&flqq;" . "«")
+       ("&frqq;" . "»")
+       ("&glq;" . "‚")
+       ("&grq;" . "‘")
+       ("&glqq;" . "„")
+       ("&grqq;" . "“")
+       ("&elq;" . "‘")
+       ("&erq;" . "’")
+       ("&elqq;" . "“")
+       ("&erqq;" . "”")
 
-      ; Word dividers
-      ("§ensp;" . " ")
-      ("§emsp;" . " ")
-      ("§thinsp;" . " ")
-      ("§nbsp;" . " ")
-      ("§nnbsp;" . " ") ; narrow non-breaking space
-      ("§zwj;" . "‍")
-      ("§zwnj;" . "‌")
-      ("§middot;" . "·") ; interpunct
+       ;; Word dividers
+       ("&ensp;" . " ")
+       ("&emsp;" . " ")
+       ("&thinsp;" . " ")
+       ("&nbsp;" . " ")
+       ("&nnbsp;" . " ") ; narrow non-breaking space
+       ("&zwj;" . "‍")
+       ("&zwnj;" . "‌")
+       ("&middot;" . "·") ; interpunct
 
-      ; General typography
-      ("§bull;" . "•")
-      ("§copyright;" . "©")
-      ("§registered;" . "®")
-      ("§trademark;" . "™")
-      ("§dagger;" . "†")
-      ("§Dagger;" . "‡")
-      ("§numero;" . "№")
-      ("§ordf;" . "ª")
-      ("§ordm;" . "º")
-      ("§para;" . "¶")
-      ("§sect;" . "§")
-      ("§deg;" . "°")
-      ("§numero;" . "№")
-      ("§permil;" . "‰")
-      ("§brvbar;" . "¦")
+       ;; General typography
+       ("&bull;" . "•")
+       ("&copyright;" . "©")
+       ("&registered;" . "®")
+       ("&trademark;" . "™")
+       ("&dagger;" . "†")
+       ("&Dagger;" . "‡")
+       ("&numero;" . "№")
+       ("&ordf;" . "ª")
+       ("&ordm;" . "º")
+       ("&para;" . "¶")
+       ("&sect;" . "§")
+       ("&deg;" . "°")
+       ("&numero;" . "№")
+       ("&permil;" . "‰")
+       ("&brvbar;" . "¦")
 
-      ; Diacritics
-      ("§acute;" . "´")
-      ("§acutedbl;" . "˝")
-      ("§grave;" . "`")
-      ("§breve;" . "˘")
-      ("§caron;" . "ˇ")
-      ("§cedilla;" . "¸")
-      ("§circumflex;" . "^")
-      ("§diaeresis;" . "¨")
-      ("§macron;" . "¯")
+       ;; Diacritics
+       ("&acute;" . "´")
+       ("&acutedbl;" . "˝")
+       ("&grave;" . "`")
+       ("&breve;" . "˘")
+       ("&caron;" . "ˇ")
+       ("&cedilla;" . "¸")
+       ("&circumflex;" . "^")
+       ("&diaeresis;" . "¨")
+       ("&macron;" . "¯")
 
-      ; Non-ASCII Letters (Excluding Accented Letters)
-      ("§aa;" . "å")
-      ("§AA;" . "Å")
-      ("§ae;" . "æ")
-      ("§AE;" . "Æ")
-      ("§dh;" . "ð")
-      ("§DH;" . "Ð")
-      ("§dj;" . "đ")
-      ("§DJ;" . "Đ")
-      ("§l;" . "ł")
-      ("§L;" . "Ł")
-      ("§ng;" . "ŋ")
-      ("§NG;" . "Ŋ")
-      ("§o;" . "ø")
-      ("§O;" . "Ø")
-      ("§oe;" . "œ")
-      ("§OE;" . "Œ")
-      ("§s;" . "ſ")
-      ("§ss;" . "ß")
-      ("§th;" . "þ")
-      ("§TH;" . "Þ")
+       ;; Non-ASCII Letters (Excluding Accented Letters)
+       ("&aa;" . "Ã¥")
+       ("&AA;" . "Å")
+       ("&ae;" . "æ")
+       ("&AE;" . "Æ")
+       ("&dh;" . "ð")
+       ("&DH;" . "Ð")
+       ("&dj;" . "đ")
+       ("&DJ;" . "Đ")
+       ("&l;" . "ł")
+       ("&L;" . "Ł")
+       ("&ng;" . "ŋ")
+       ("&NG;" . "Ŋ")
+       ("&o;" . "ø")
+       ("&O;" . "Ø")
+       ("&oe;" . "œ")
+       ("&OE;" . "Œ")
+       ("&s;" . "Å¿")
+       ("&ss;" . "ß")
+       ("&th;" . "þ")
+       ("&TH;" . "Þ")
 
-      ; Mathematical symbols
-      ("§plus;" . "+")
-      ("§minus;" . "−")
-      ("§times;" . "×")
-      ("§div;" . "÷")
-      ("§sup1;" . "¹")
-      ("§sup2;" . "²")
-      ("§sup3;" . "³")
-      ("§sqrt;" . "√")
-      ("§increment;" . "∆")
-      ("§infty;" . "∞")
-      ("§sum;" . "∑")
-      ("§pm;" . "±")
-      ("§bulletop;" . "∙")
-      ("§partial;" . "∂")
-      ("§neg;" . "¬")
+       ;; Mathematical symbols
+       ("&plus;" . "+")
+       ("&minus;" . "−")
+       ("&times;" . "×")
+       ("&div;" . "÷")
+       ("&sup1;" . "¹")
+       ("&sup2;" . "²")
+       ("&sup3;" . "³")
+       ("&sqrt;" . "√")
+       ("&increment;" . "∆")
+       ("&infty;" . "∞")
+       ("&sum;" . "∑")
+       ("&pm;" . "±")
+       ("&bulletop;" . "∙")
+       ("&partial;" . "∂")
+       ("&neg;" . "¬")
 
-      ; Currency symbols
-      ("§currency;" . "¤")
-      ("§dollar;" . "$")
-      ("§euro;" . "€")
-      ("§pounds;" . "£")
-      ("§yen;" . "¥")
-      ("§cent;" . "¢"))))
+       ;; Currency symbols
+       ("&currency;" . "¤")
+       ("&dollar;" . "$")
+       ("&euro;" . "€")
+       ("&pounds;" . "£")
+       ("&yen;" . "Â¥")
+       ("&cent;" . "¢"))))