CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/01 11:22:42
Modified files:
. : ChangeLog
input : les-nereides.ly
input/regression: beam-quant-standard.ly fret-diagrams.ly
lily : lily-lexer.cc lily-parser.cc ly-module.cc
lily/include : main.hh
Log message:
* lily/ly-module.cc (ly_make_anonymous_module): define
%module-public-interface of module. (backportme)
* lily/lily-parser.cc (print_smob): allow printing of parser smob
without lexer.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3848&tr2=1.3849&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/les-nereides.ly.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/beam-quant-standard.ly.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/fret-diagrams.ly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-lexer.cc.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-parser.cc.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ly-module.cc.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/main.hh.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3848 lilypond/ChangeLog:1.3849
--- lilypond/ChangeLog:1.3848 Fri Jul 1 01:23:10 2005
+++ lilypond/ChangeLog Fri Jul 1 11:22:41 2005
@@ -1,3 +1,15 @@
+2005-07-01 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/ly-module.cc (ly_make_anonymous_module): define
+ %module-public-interface of module. (backportme)
+
+ * lily/lily-parser.cc (print_smob): allow printing of parser smob
+ without lexer.
+
+2005-07-01 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * input/regression/fret-diagrams.ly: stretch example.
+
2005-06-30 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* cygwin/GNUmakefile ($(outdir)/%.sh): Bugfix: use TAB (Bertalan
Index: lilypond/input/les-nereides.ly
diff -u lilypond/input/les-nereides.ly:1.76 lilypond/input/les-nereides.ly:1.77
--- lilypond/input/les-nereides.ly:1.76 Sun Jun 26 22:39:13 2005
+++ lilypond/input/les-nereides.ly Fri Jul 1 11:22:42 2005
@@ -26,10 +26,6 @@
%}
-#(define (make-text-checker text)
- (lambda (elt) (equal? text (ly:get-grob-property elt 'text))))
-
-
treble = \new Voice \relative c''{
\key a \major
r2
Index: lilypond/input/regression/beam-quant-standard.ly
diff -u lilypond/input/regression/beam-quant-standard.ly:1.13
lilypond/input/regression/beam-quant-standard.ly:1.14
--- lilypond/input/regression/beam-quant-standard.ly:1.13 Sun Jun 26
22:39:13 2005
+++ lilypond/input/regression/beam-quant-standard.ly Fri Jul 1 11:22:42 2005
@@ -10,9 +10,8 @@
\layout {
raggedright = ##t
- #(define debug-beam-quanting #t)
-
- }
+% #(define debug-beam-quanting #t)
+}
filler = \new Voice \relative {
\hideNotes
Index: lilypond/input/regression/fret-diagrams.ly
diff -u lilypond/input/regression/fret-diagrams.ly:1.2
lilypond/input/regression/fret-diagrams.ly:1.3
--- lilypond/input/regression/fret-diagrams.ly:1.2 Sun Jun 26 22:39:14 2005
+++ lilypond/input/regression/fret-diagrams.ly Fri Jul 1 11:22:42 2005
@@ -1,48 +1,56 @@
-% regression test for fret diagram markups
+%% regression test for fret diagram markups
+
+
\version "2.6.0"
-\score {
- <<
- \chords {s2 c c c d}
-
- \context Voice=mel {
-
-% A chord for ukelele
- a'2 ^\markup
- \override #'(string-count . 4) {
- \override #'(dot-color . white) {
+
+\paper {
+
+ %% stretch to prevent diagrams from colliding.
+ linewidth = 18.0 \cm
+}
+
+
+<<
+ \chords {s2 c c c d}
+
+ \context Voice=mel {
+
+ %% A chord for ukelele
+ a'2 ^\markup
+ \override #'(string-count . 4) {
+ \override #'(dot-color . white) {
\fret-diagram #"4-2-2;3-1-1;2-o;1-o;"}}
-% C major for guitar, barred on third fret
- c' ^\markup
- \override #'(number-type . roman-lower) { % lower-case roman
numeral fret label
- \override #'(size . 1.1) { % 110% of default size
- \override #'(finger-code . below-string) { % string labels below
strings
+ %% C major for guitar, barred on third fret
+ c' ^\markup
+ \override #'(number-type . roman-lower) { % lower-case roman numeral fret
label
+ \override #'(size . 1.1) { % 110% of default size
+ \override #'(finger-code . below-string) { % string labels below
strings
\override #'(barre-type . straight) { % straight barre
- \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5
2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}}
-% C major for guitar, barred on third fret
- c' ^\markup
- \override #'(number-type . arabic) { % lower-case roman numeral
fret label
- \override #'(dot-color . white) { % white dots
- \override #'(finger-code . in-dot) { % string labels in dots
+ \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4
5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3))
}}}}
+ %% C major for guitar, barred on third fret
+ c' ^\markup
+ \override #'(number-type . arabic) { % lower-case roman numeral fret label
+ \override #'(dot-color . white) { % white dots
+ \override #'(finger-code . in-dot) { % string labels in dots
\override #'(barre-type . curved) { % straight barre
- \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5
2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}}
-% C major for guitar, barred on third fret
- c' ^\markup
- \override #'(number-type . roman-upper) { % upper-case roman
numeral fret label
- \override #'(label-dir . -1) { % label fret at left side
of diagram
- \override #'(finger-code . in-dot) { % string labels in dots
+ \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4
5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3))
}}}}
+ %% C major for guitar, barred on third fret
+ c' ^\markup
+ \override #'(number-type . roman-upper) { % upper-case roman numeral fret
label
+ \override #'(label-dir . -1) { % label fret at left side of
diagram
+ \override #'(finger-code . in-dot) { % string labels in dots
\override #'(barre-type . curved) { % curved barre
- \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5
2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}}
+ \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4
5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3))
}}}}
-% simple D chord
+ %% simple D chord
d' ^\markup
- \override #'(finger-code . below-string) {
- \override #'(dot-radius . 0.35) {
- \override #'(dot-position . 0.5) {
- \override #'(fret-count . 5) {
- \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }}}}
+ \override #'(finger-code . below-string) {
+ \override #'(dot-radius . 0.35) {
+ \override #'(dot-position . 0.5) {
+ \override #'(fret-count . 5) {
+ \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }}}}
- }
- >>
-}
+ }
+>>
Index: lilypond/lily/include/main.hh
diff -u lilypond/lily/include/main.hh:1.81 lilypond/lily/include/main.hh:1.82
--- lilypond/lily/include/main.hh:1.81 Tue Apr 12 22:49:26 2005
+++ lilypond/lily/include/main.hh Fri Jul 1 11:22:42 2005
@@ -50,7 +50,7 @@
extern File_path global_path;
/*
- Debugging options
+ Debugging options: switch on
*/
#ifndef NDEBUG
Index: lilypond/lily/lily-lexer.cc
diff -u lilypond/lily/lily-lexer.cc:1.31 lilypond/lily/lily-lexer.cc:1.32
--- lilypond/lily/lily-lexer.cc:1.31 Fri Jun 10 10:58:49 2005
+++ lilypond/lily/lily-lexer.cc Fri Jul 1 11:22:42 2005
@@ -232,6 +232,10 @@
SCM mod = scm_car (scopes_);
scm_module_define (mod, sym, s);
+#if 0
+ SCM setter = ly_lily_module_constant ("module-define!");
+ scm_call_3 (setter, mod, sym, s);
+#endif
}
else
programming_error ("identifier is not a symbol");
Index: lilypond/lily/lily-parser.cc
diff -u lilypond/lily/lily-parser.cc:1.41 lilypond/lily/lily-parser.cc:1.42
--- lilypond/lily/lily-parser.cc:1.41 Fri Jun 10 10:58:49 2005
+++ lilypond/lily/lily-parser.cc Fri Jul 1 11:22:42 2005
@@ -76,7 +76,10 @@
{
scm_puts ("#<Lily_parser ", port);
Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
- scm_display (parser->lexer_->self_scm (), port);
+ if (parser->lexer_)
+ scm_display (parser->lexer_->self_scm (), port);
+ else
+ scm_puts ("(no lexer yet)", port);
scm_puts (" >", port);
return 1;
}
Index: lilypond/lily/ly-module.cc
diff -u lilypond/lily/ly-module.cc:1.42 lilypond/lily/ly-module.cc:1.43
--- lilypond/lily/ly-module.cc:1.42 Fri Jun 10 00:36:22 2005
+++ lilypond/lily/ly-module.cc Fri Jul 1 11:22:42 2005
@@ -20,9 +20,13 @@
if (!safe)
{
SCM maker = ly_lily_module_constant ("make-module");
+
SCM scm_module = ly_lily_module_constant ("the-scm-module");
mod = scm_call_0 (maker);
+ scm_module_define (mod, ly_symbol2scm ("%module-public-interface"),
+ mod);
+
ly_use_module (mod, scm_module);
ly_use_module (mod, global_lily_module);
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
