%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 <hanwen@xs4all.nl>
+
+ * 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 <hanwen@xs4all.nl>
+
+ * input/regression/fret-diagrams.ly: stretch example.
+
2005-06-30 Jan Nieuwenhuizen <janneke@gnu.org>
* cygwin/GNUmakefile ($(outdir)/%.sh): Bugfix: use TAB (Bertalan
2005-06-30 Jan Nieuwenhuizen <janneke@gnu.org>
* cygwin/GNUmakefile ($(outdir)/%.sh): Bugfix: use TAB (Bertalan
-#(define (make-text-checker text)
- (lambda (elt) (equal? text (ly:get-grob-property elt 'text))))
-
-
treble = \new Voice \relative c''{
\key a \major
r2
treble = \new Voice \relative c''{
\key a \major
r2
\layout {
raggedright = ##t
\layout {
raggedright = ##t
- #(define debug-beam-quanting #t)
-
- }
+% #(define debug-beam-quanting #t)
+}
filler = \new Voice \relative {
\hideNotes
filler = \new Voice \relative {
\hideNotes
-% regression test for fret diagram markups
+%% regression test for fret diagram markups
+
+
-\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;"}}
\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
\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
\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
\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)) }}}}
- \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;" }}}}
+
+ }
+>>
extern File_path global_path;
/*
extern File_path global_path;
/*
+ Debugging options: switch on
SCM mod = scm_car (scopes_);
scm_module_define (mod, sym, 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");
}
else
programming_error ("identifier is not a symbol");
{
scm_puts ("#<Lily_parser ", port);
Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
{
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;
}
scm_puts (" >", port);
return 1;
}
if (!safe)
{
SCM maker = ly_lily_module_constant ("make-module");
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 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);
}
ly_use_module (mod, scm_module);
ly_use_module (mod, global_lily_module);
}