CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/21 23:58:19
Modified files:
. : ChangeLog
buildscripts : substitute-encoding.py
scm : define-grobs.scm output-lib.scm
Log message:
* scm/output-lib.scm (fret-number-tablature-format): vcenter and
whiteout for markups.
* buildscripts/substitute-encoding.py (note_glyph): include _ in
regex too. This fixes change clef appearance in PDF.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3808&tr2=1.3809&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/substitute-encoding.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.205&tr2=1.206&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-lib.scm.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3808 lilypond/ChangeLog:1.3809
--- lilypond/ChangeLog:1.3808 Tue Jun 21 23:19:28 2005
+++ lilypond/ChangeLog Tue Jun 21 23:58:18 2005
@@ -1,5 +1,13 @@
2005-06-22 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/output-lib.scm (fret-number-tablature-format): vcenter and
+ whiteout for markups.
+
+ * buildscripts/substitute-encoding.py (note_glyph): include _ in
+ regex too. This fixes change clef appearance in PDF.
+
+ * ttftool/include/*: remove.
+
* configure.in (reloc_b): remove TTFTOOL_ENDIAN
* config.make.in (WINDRES): remove TTFTOOL_ENDIAN.
@@ -70,7 +78,7 @@
* scm/editor.scm (editor-command-template-alist): Use char iso
column, except for Emacs.
- (get-editor-command): Substitute char too (Bert).
+ (get-editor-command): Substitute char too (Bertalan Fodor).
2005-06-16 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/buildscripts/substitute-encoding.py
diff -u lilypond/buildscripts/substitute-encoding.py:1.3
lilypond/buildscripts/substitute-encoding.py:1.4
--- lilypond/buildscripts/substitute-encoding.py:1.3 Wed Jun 1 19:21:57 2005
+++ lilypond/buildscripts/substitute-encoding.py Tue Jun 21 23:58:19 2005
@@ -28,7 +28,7 @@
glyphs.append (nm)
- m = re.sub ("(/[a-z-.A-Z0-9]+) %", note_glyph, enc_str )
+ m = re.sub ("(/[a-z.A-Z0-9_]+) %", note_glyph, enc_str )
glyphs = filter (lambda x: None == re.match (r'/\.notdef', x),
glyphs)
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.205 lilypond/scm/define-grobs.scm:1.206
--- lilypond/scm/define-grobs.scm:1.205 Mon Jun 6 18:44:50 2005
+++ lilypond/scm/define-grobs.scm Tue Jun 21 23:58:19 2005
@@ -1298,7 +1298,7 @@
(font-series . bold)
(meta . ((interfaces
. (rhythmic-head-interface
- font-interface
+ font-interface
note-head-interface staff-symbol-referencer-interface
text-interface item-interface ))))
))
Index: lilypond/scm/output-lib.scm
diff -u lilypond/scm/output-lib.scm:1.79 lilypond/scm/output-lib.scm:1.80
--- lilypond/scm/output-lib.scm:1.79 Mon May 9 21:08:38 2005
+++ lilypond/scm/output-lib.scm Tue Jun 21 23:58:19 2005
@@ -15,11 +15,13 @@
;; The TabNoteHead tablatureFormat callback.
;; Compute the text grob-property
(define-public (fret-number-tablature-format string tuning pitch)
- (number->string
- (- (ly:pitch-semitones pitch)
- (list-ref tuning
- ;; remove 1 because list index starts at 0 and guitar string at
1.
- (- string 1)))))
+ (make-whiteout-markup
+ (make-vcenter-markup
+ (number->string
+ (- (ly:pitch-semitones pitch)
+ (list-ref tuning
+ ;; remove 1 because list index starts at 0 and guitar string
at 1.
+ (- string 1)))))))
;; The 5-string banjo has got a extra string, the fifth (duh), wich
;; starts at the fifth fret on the neck. Frets on the fifth string
@@ -28,11 +30,13 @@
;; on the banjo neck.
;; We solve this by defining a new fret-number-tablature function:
(define-public (fret-number-tablature-format-banjo string tuning pitch)
+ (make-whiteout-markup
+ (make-vcenter-markup
(let ((fret (- (ly:pitch-semitones pitch) (list-ref tuning (- string 1)))))
- (number->string (cond
- ((and (> fret 0) (= string 5))
- (+ fret 5))
- (else fret)))))
+ (number->string (cond
+ ((and (> fret 0) (= string 5))
+ (+ fret 5))
+ (else fret)))))))
(define-public (hammer-print-function grob)
(let* ((note-collums (ly:grob-property grob 'note-columns))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
