From: hanwen Date: Fri, 1 Jul 2005 11:22:42 +0000 (+0000) Subject: * lily/ly-module.cc (ly_make_anonymous_module): define X-Git-Tag: release/2.7.2~78 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=ae3edc2c6adb14108cfc186f409ae400f3080497;p=lilypond.git * 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. --- diff --git a/ChangeLog b/ChangeLog index 08dc1dd06d..1a56e8edf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-07-01 Han-Wen Nienhuys + + * 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 + + * input/regression/fret-diagrams.ly: stretch example. + 2005-06-30 Jan Nieuwenhuizen * cygwin/GNUmakefile ($(outdir)/%.sh): Bugfix: use TAB (Bertalan diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 4dfc33aecd..3fdfbd9004 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -26,10 +26,6 @@ possibly more impressive to render without tweaks? %} -#(define (make-text-checker text) - (lambda (elt) (equal? text (ly:get-grob-property elt 'text)))) - - treble = \new Voice \relative c''{ \key a \major r2 diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly index 6350431189..9dca8fb87e 100644 --- a/input/regression/beam-quant-standard.ly +++ b/input/regression/beam-quant-standard.ly @@ -10,9 +10,8 @@ \layout { raggedright = ##t - #(define debug-beam-quanting #t) - - } +% #(define debug-beam-quanting #t) +} filler = \new Voice \relative { \hideNotes diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly index 3ad2ff72e9..25d46947ae 100644 --- a/input/regression/fret-diagrams.ly +++ b/input/regression/fret-diagrams.ly @@ -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;" }}}} + + } +>> diff --git a/lily/include/main.hh b/lily/include/main.hh index 26a6d4ff44..b8bd188db6 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -50,7 +50,7 @@ extern int exit_status_global; extern File_path global_path; /* - Debugging options + Debugging options: switch on */ #ifndef NDEBUG diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 06ab799acc..8ff4dd65cd 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -232,6 +232,10 @@ Lily_lexer::set_identifier (SCM name, SCM s) 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"); diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 050f8dd7b2..df42f0ae9a 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -76,7 +76,10 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*) { scm_puts ("#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; } diff --git a/lily/ly-module.cc b/lily/ly-module.cc index 6a6e5d58c6..7d613fcdd8 100644 --- a/lily/ly-module.cc +++ b/lily/ly-module.cc @@ -20,9 +20,13 @@ ly_make_anonymous_module (bool safe) 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); }