%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 2011 Bertrand Bordage <bordage.bertrand@gmail.com>
+%%%% Copyright (C) 2011--2014 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
%%%% 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
+ ("…" . "…")
+ ("–" . "–")
+ ("—" . "—")
+ ("¡" . "¡")
+ ("¿" . "¿")
+ ("&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
+ (" " . " ")
+ (" " . " ")
+ (" " . " ")
+ (" " . " ")
+ ("&nnbsp;" . " ") ; narrow non-breaking space
+ ("‍" . "")
+ ("‌" . "")
+ ("·" . "·") ; interpunct
- ; General typography
- ("§bull;" . "•")
- ("§copyright;" . "©")
- ("§registered;" . "®")
- ("§trademark;" . "™")
- ("§dagger;" . "†")
- ("§Dagger;" . "‡")
- ("§numero;" . "№")
- ("§ordf;" . "ª")
- ("§ordm;" . "º")
- ("§para;" . "¶")
- ("§sect;" . "§")
- ("§deg;" . "°")
- ("§numero;" . "№")
- ("§permil;" . "‰")
- ("§brvbar;" . "¦")
+ ;; General typography
+ ("•" . "•")
+ ("©right;" . "©")
+ ("®istered;" . "®")
+ ("&trademark;" . "™")
+ ("†" . "†")
+ ("‡" . "‡")
+ ("№" . "№")
+ ("ª" . "ª")
+ ("º" . "º")
+ ("¶" . "¶")
+ ("§" . "§")
+ ("°" . "°")
+ ("№" . "№")
+ ("‰" . "‰")
+ ("¦" . "¦")
- ; Diacritics
- ("§acute;" . "´")
- ("§acutedbl;" . "˝")
- ("§grave;" . "`")
- ("§breve;" . "˘")
- ("§caron;" . "ˇ")
- ("§cedilla;" . "¸")
- ("§circumflex;" . "^")
- ("§diaeresis;" . "¨")
- ("§macron;" . "¯")
+ ;; Diacritics
+ ("´" . "´")
+ ("´dbl;" . "˝")
+ ("`" . "`")
+ ("˘" . "˘")
+ ("ˇ" . "ˇ")
+ ("¸la;" . "¸")
+ ("&circumflex;" . "^")
+ ("&diaeresis;" . "¨")
+ ("¯on;" . "¯")
- ; 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
+ ("+" . "+")
+ ("−" . "−")
+ ("×" . "×")
+ ("÷" . "÷")
+ ("¹" . "¹")
+ ("²" . "²")
+ ("³" . "³")
+ ("&sqrt;" . "√")
+ ("&increment;" . "∆")
+ ("&infty;" . "∞")
+ ("∑" . "∑")
+ ("±" . "±")
+ ("&bulletop;" . "∙")
+ ("&partial;" . "∂")
+ ("&neg;" . "¬")
- ; Currency symbols
- ("§currency;" . "¤")
- ("§dollar;" . "$")
- ("§euro;" . "€")
- ("§pounds;" . "£")
- ("§yen;" . "¥")
- ("§cent;" . "¢"))))
+ ;; Currency symbols
+ ("¤cy;" . "¤")
+ ("$" . "$")
+ ("€" . "€")
+ ("£s;" . "£")
+ ("¥" . "¥")
+ ("¢" . "¢"))))