X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fencoding.scm;h=bebf515b6b83ac4df03b2408c2a284bfa2a0eef6;hb=HEAD;hp=a35be6c391ce44ffc871fe5c15533a18a170751a;hpb=f2fbf0dd215c8af6a30aae6c9634f3b92333b0ab;p=lilypond.git diff --git a/scm/encoding.scm b/scm/encoding.scm index a35be6c391..bebf515b6b 100644 --- a/scm/encoding.scm +++ b/scm/encoding.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2004--2011 Jan Nieuwenhuizen +;;;; Copyright (C) 2004--2015 Jan Nieuwenhuizen ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -17,44 +17,44 @@ (define-public latin1-coding-vector #(.notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef - .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef - .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef - .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef - %% 0x20 - space exclam quotedbl numbersign dollar percent ampersand quoteright - parenleft parenright asterisk plus comma hyphen period slash - zero one two three four five six seven - eight nine colon semicolon less equal greater question - %% 0x40 - at A B C D E F G - H I J K L M N O - P Q R S T U V W - X Y Z bracketleft backslash bracketright asciicircum underscore - %% 0x60 - `quoteleft a b c d e f g - h i j k l m n o - p q r s t u v w - x y z braceleft bar braceright asciitilde .notdef - %% 0x80 - .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef - .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef - dotlessi grave acute circumflex tilde macron breve dotaccent - dieresis .notdef ring cedilla .notdef hungarumlaut ogonek caron - %% 0xA0 - space exclamdown cent sterling currency yen brokenbar section - dieresis copyright ordfeminine guillemotleft logicalnot hyphen registered macron - degree plusminus twosuperior threesuperior acute mu paragraph periodcentered - cedilla onesuperior ordmasculine guillemotright onequarter onehalf threequarters questiondown - %% 0xC0 - Agrave Aacute Acircumflex Atilde Adieresis Aring AE Ccedilla - Egrave Eacute Ecircumflex Edieresis Igrave Iacute Icircumflex Idieresis - Eth Ntilde Ograve Oacute Ocircumflex Otilde Odieresis multiply - Oslash Ugrave Uacute Ucircumflex Udieresis Yacute Thorn germandbls - %% 0xE0 - agrave aacute acircumflex atilde adieresis aring ae ccedilla - egrave eacute ecircumflex edieresis igrave iacute icircumflex idieresis - eth ntilde ograve oacute ocircumflex otilde odieresis divide - oslash ugrave uacute ucircumflex udieresis yacute thorn ydieresis)) + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef + %% 0x20 + space exclam quotedbl numbersign dollar percent ampersand quoteright + parenleft parenright asterisk plus comma hyphen period slash + zero one two three four five six seven + eight nine colon semicolon less equal greater question + %% 0x40 + at A B C D E F G + H I J K L M N O + P Q R S T U V W + X Y Z bracketleft backslash bracketright asciicircum underscore + %% 0x60 + `quoteleft a b c d e f g + h i j k l m n o + p q r s t u v w + x y z braceleft bar braceright asciitilde .notdef + %% 0x80 + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef + .notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef + dotlessi grave acute circumflex tilde macron breve dotaccent + dieresis .notdef ring cedilla .notdef hungarumlaut ogonek caron + %% 0xA0 + space exclamdown cent sterling currency yen brokenbar section + dieresis copyright ordfeminine guillemotleft logicalnot hyphen registered macron + degree plusminus twosuperior threesuperior acute mu paragraph periodcentered + cedilla onesuperior ordmasculine guillemotright onequarter onehalf threequarters questiondown + %% 0xC0 + Agrave Aacute Acircumflex Atilde Adieresis Aring AE Ccedilla + Egrave Eacute Ecircumflex Edieresis Igrave Iacute Icircumflex Idieresis + Eth Ntilde Ograve Oacute Ocircumflex Otilde Odieresis multiply + Oslash Ugrave Uacute Ucircumflex Udieresis Yacute Thorn germandbls + %% 0xE0 + agrave aacute acircumflex atilde adieresis aring ae ccedilla + egrave eacute ecircumflex edieresis igrave iacute icircumflex idieresis + eth ntilde ograve oacute ocircumflex otilde odieresis divide + oslash ugrave uacute ucircumflex udieresis yacute thorn ydieresis)) (define-public (decode-byte-string str) @@ -62,10 +62,10 @@ assuming that @var{str} is byte-coded using latin-1 encoding." (let* ((len (string-length str)) - (output-vector (make-vector len '.notdef))) + (output-vector (make-vector len '.notdef))) (do - ((idx 0 (1+ idx))) - ((>= idx len) output-vector) + ((idx 0 (1+ idx))) + ((>= idx len) output-vector) (vector-set! output-vector idx - (vector-ref latin1-coding-vector - (char->integer (string-ref str idx))))))) + (vector-ref latin1-coding-vector + (char->integer (string-ref str idx)))))))