as Scheme variable.
* scripts/convert-ly.py (conv): dashes rule.
Apply rule.
2003-08-26 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * lily/my-lily-lexer.cc (start_main_input): define input-file-name
+ as Scheme variable.
+
* scripts/convert-ly.py (conv): dashes rule.
+ Apply rule.
* Documentation/user/lilypond-book.itely: syntax fixes.
es' des'4^1~ \stemDown des'8.[ c'16] }
}
\transpose c' c, {
- g4(-4 a8-3~a f-5 g-4 | a4-3 g8\markup { \finger "4-3" } ~g f-4 e-5 |
- d4)\markup { \finger "4-5" }( g8-3~g es f-4 | g4-3 f8-4~f es d-4 |
+ g4(-4 a8-3~a f-5 g-4 | a4-3 g8-\markup { \finger "4-3" } ~g f-4 e-5 |
+ d4)-\markup { \finger "4-5" }( g8-3~g es f-4 | g4-3 f8-4~f es d-4 |
c4) r8 f4-4( as8-5~ | as g-4 b)-5 as4-5( ces'8-4~ |
ces' b des'-4 c'4)-5( <<es'-4 es''>>8 |
\stemDown \tieDown des'4.)_5~des'~ |
(if (and (memq 'note-head-interface ifs)
(memq sp '(-2 -3 -5)))
(begin
- (ly:set-grob-property! gr 'molecule-callback brew-new@\markup-molecule)
+ (ly:set-grob-property! gr 'molecule-callback brew-new-markup-molecule)
(ly:set-grob-property! gr 'font-family 'roman)
(ly:set-grob-property!
gr 'text
- (make-raise@\markup -0.5
+ (make-raise-markup -0.5
(case sp
- ((-5) (make-simple@\markup "m"))
- ((-3) (make-simple@\markup "c "))
- ((-2) (make-smaller@\markup (make-bold@\markup "2")))
- (else (make-simple@\markup "bla"))
+ ((-5) (make-simple-markup "m"))
+ ((-3) (make-simple-markup "c "))
+ ((-2) (make-smaller-markup (make-bold-markup "2")))
+ (else (make-simple-markup "bla"))
))))
)))
% 7sus4 denoted with ^7 wahh
chExceptionMusic = \notes {
- <<c f g bes>>1\markup { \super "7" "wahh" }}
+ <<c f g bes>>1-\markup { \super "7" "wahh" }}
% add to existing exceptions.
chExceptions = #(append
c4-"normal"
% why doesn't this work?
- c4\markup \bold \magnify #2.0 "foobar"
+ c4-\markup \bold \magnify #2.0 "foobar"
\property Voice .NoteHead \set #'font-magnification = #1.2
\property Voice.TextScript \set #'font-magnification = #2.0
\score {
\notes
{
- f'\markup {
+ f'-\markup {
foo
\raise #0.2 \hbracket \bold bar
\override #'(baseline-skip . 4)
\notes\relative c''' {
a^"two"^"m.d."
\context Voice
- \outputproperty #(make-text-checker (make-simple@\markup "m.d."))
+ \outputproperty #(make-text-checker (make-simple-markup "m.d."))
#'extra-offset = #'(-4.0 . -3.5)
a^"two"^"m.d."
a^"two"^"m.d."
#(define (make-text-script x)
(let ((m (make-music-by-name 'TextScriptEvent)))
(ly:set-mus-property! m 'direction DOWN)
- (ly:set-mus-property! m 'text (make-simple@\markup x))
+ (ly:set-mus-property! m 'text (make-simple-markup x))
m))
#(define (add-text-script m x)
\score { \notes \relative c'' {
\property Voice.TextScript \override #'molecule-callback =
- #(make-molecule-boxer 0.1 0.3 0.2 brew-new@\markup-molecule)
+ #(make-molecule-boxer 0.1 0.3 0.2 brew-new-markup-molecule)
c'4^"foo"
#(make-molecule-boxer 0.05 0.25 0.25 Stem::brew_molecule)
\property Score.RehearsalMark \override #'molecule-callback =
- #(make-molecule-boxer 0.15 0.3 0.3 brew-new@\markup-molecule)
+ #(make-molecule-boxer 0.15 0.3 0.3 brew-new-markup-molecule)
c8
\property Voice.Stem \revert #'molecule-callback
efullmusicJazzAlt = \notes
{
- <<c e gis>>1\markup { "+" }
- <<c e g b>>\markup { \normal-size-super
+ <<c e gis>>1-\markup { "+" }
+ <<c e g b>>-\markup { \normal-size-super
% \override #'(font-family . math) "N" }
\override #'(font-family . math) "M" }
%%c:3.5.7 = \markup { \override #'(font-family . math) "M" }
%%c:3.5.7 = \markup { \normal-size-super "maj7" }
- <<c es ges>>\markup { \super "o" } % should be $\circ$ ?
- <<c es ges bes>>\markup { \super \combine "o" "/" }
- <<c es ges beses>>\markup { \super "o7" }
+ <<c es ges>>-\markup { \super "o" } % should be $\circ$ ?
+ <<c es ges bes>>-\markup { \super \combine "o" "/" }
+ <<c es ges beses>>-\markup { \super "o7" }
}
efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f)
epartialmusicJazzAlt = \notes{
- <<c d>>1\markup { \normal-size-super "2" }
- <<c es>>\markup { "m" }
- <<c f>>\markup { \normal-size-super "sus4" }
- <<c g>>\markup { \normal-size-super "5" }
+ <<c d>>1-\markup { \normal-size-super "2" }
+ <<c es>>-\markup { "m" }
+ <<c f>>-\markup { \normal-size-super "sus4" }
+ <<c g>>-\markup { \normal-size-super "5" }
%% TODO, partial exceptions
- <<c es f>>\markup { "m" }\markup { \normal-size-super "sus4" }
- <<c d es>>\markup { "m" }\markup { \normal-size-super "sus2" }
+ <<c es f>>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+ <<c d es>>-\markup { "m" }-\markup { \normal-size-super "sus2" }
}
epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f)
\sequential {
\property ChordNames.majorSevenSymbol = #whiteTriangleMarkup
- \property ChordNames.chordNameSeparator = #(make-simple@\markup "/")
+ \property ChordNames.chordNameSeparator = #(make-simple-markup "/")
\property ChordNames.chordNameExceptionsFull = #efullJazzAlt
\property ChordNames.chordNameExceptionsPartial = #epartialJazzAlt
\property ChordNames.chordNameFunction = #jazz-chord-names
\score{
\notes\relative c''{
- c\piuf
+ c-\piuf
c
c2\< c2\!
\score {
\notes\relative c''' {
\property Voice.Stem \set #'direction = #1
- \outputproperty #(make-text-checker (make-simple@\markup "m.d."))
+ \outputproperty #(make-text-checker (make-simple-markup "m.d."))
#'extra-offset = #'(-3.5 . -4.5)
a^2^"m.d."
}
\property Voice.TextSpanner \set #'style = #'trill
\property Voice.TextSpanner \set #'edge-height = #'(0 . 0)
\property Voice.TextSpanner \set #'edge-text
- = #(cons (make-musicglyph@\markup "scripts-trill") "")
+ = #(cons (make-musicglyph-markup "scripts-trill") "")
a#(ly:export (make-span-event 'TextSpanEvent START)) b c a #(ly:export (make-span-event 'TextSpanEvent STOP))
}
\paper { raggedright = ##t}
if (heads.empty_b ())
{
- programming_error ("Huh? Dumb blonde encountered?");
/*
- Nee Valerie, jij bent _niet_ dom.
+ Dumb blonde error
+
+ :-)
*/
+ programming_error ("Huh, no heads for arpeggio found.");
return SCM_EOL;
}
s = s.left_string (s.index_last ('\"'));
yy_pop_state();
- this->here_input().source_file_->name_ = s;
+ this->here_input().source_file_->name_ = s;
+ scm_module_define (gh_car (scopes_),
+ ly_symbol2scm ("input-file-name"),
+ scm_makfrom0str (s.to_str0()));
+
}
<version>. {
{
new_input (main_input_string_, &global_input_file->sources_);
allow_includes_b_ = allow_includes_b_ && ! (safe_global_b);
+
+ scm_module_define (gh_car (scopes_),
+ ly_symbol2scm ("input-file-name"),
+ scm_makfrom0str (main_input_string_.to_str0()));
}
void
\chordmodifiers #default-chord-modifier-list
-whiteTriangleMarkup = #(make-override@\markup
- '(font-family . math) (make-simple@\markup "M"))
+whiteTriangleMarkup = #(make-override-markup
+ '(font-family . math) (make-simple-markup "M"))
-blackTriangleMarkup = #(make-override@\markup
- '(font-family . math) (make-simple@\markup "N"))
+blackTriangleMarkup = #(make-override-markup
+ '(font-family . math) (make-simple-markup "N"))
ignatzekExceptionMusic = \notes{
- <<c e gis>>1\markup { "+" }
- <<c es ges>>\markup { \super "o" } % should be $\circ$ ?
- <<c es ges bes>>\markup { \super \combine "o" "/" }
- <<c es ges beses>>\markup { \super "o7" }
+ <<c e gis>>1-\markup { "+" }
+ <<c es ges>>-\markup { \super "o" } % should be $\circ$ ?
+ <<c es ges bes>>-\markup { \super \combine "o" "/" }
+ <<c es ges beses>>-\markup { \super "o7" }
}
ignatzekExceptions = #(sequential-music-to-chord-exceptions
ignatzekExceptionMusic #t)
partialJazzMusic = \notes{
- <<c d>>1\markup { \normal-size-super "2" }
- <<c es>>\markup { "m" }
- <<c f>>\markup { \normal-size-super "sus4" }
- <<c g>>\markup { \normal-size-super "5" }
+ <<c d>>1-\markup { \normal-size-super "2" }
+ <<c es>>-\markup { "m" }
+ <<c f>>-\markup { \normal-size-super "sus4" }
+ <<c g>>-\markup { \normal-size-super "5" }
%% TODO, partial exceptions
- <<c es f>>\markup { "m" }\markup { \normal-size-super "sus4" }
- <<c d es>>\markup { "m" }\markup { \normal-size-super "sus2" }
+ <<c es f>>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+ <<c d es>>-\markup { "m" }-\markup { \normal-size-super "sus2" }
}
%% TODO: compatibility ignatzek code
%% chord names:
chordNameFunction = #ignatzek-chord-names
majorSevenSymbol = #whiteTriangleMarkup
- chordNameSeparator = #(make-simple@\markup "/")
+ chordNameSeparator = #(make-simple-markup "/")
chordNameExceptions = #ignatzekExceptions
chordNoteNamer = #'()
chordRootNamer = #note-name->markup
tablatureFormat = #fret-number-tablature-format
%%
- bassFigureFormatFunction = #make-bass-figure@\markup
- metronomeMarkFormatter = #make-metronome@\markup
+ bassFigureFormatFunction = #make-bass-figure-markup
+ metronomeMarkFormatter = #make-metronome-markup
\grobdescriptions #all-grob-descriptions
}
#(if (and (ly:get-option 'old-relative)
(not (ly:get-option 'old-relative-used)))
- (ly:warn "Old relative compatibility was not used."))
+ (ly:warn (string-append
+ "\n"
+ input-file-name ": old relative compatibility was not used.")))
}
germanChords = {
- \property ChordNames. chordRootNamer = #(chord-name->german@\markup #t)
- \property ChordNames. chordNoteNamer = #note-name->german@\markup
+ \property ChordNames. chordRootNamer = #(chord-name->german-markup #t)
+ \property ChordNames. chordNoteNamer = #note-name->german-markup
}
semiGermanChords = {
- \property ChordNames. chordRootNamer = #(chord-name->german@\markup #f)
- \property ChordNames. chordNoteNamer = #note-name->german@\markup
+ \property ChordNames. chordRootNamer = #(chord-name->german-markup #f)
+ \property ChordNames. chordNoteNamer = #note-name->german-markup
}
(molecule-callback . ,Volta_bracket_interface::brew_molecule)
(direction . 1)
(padding . 1)
- (font-style . volta)
+ (font-family . number)
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(thickness . 1.6) ; stafflinethickness
(height . 2.0) ; staffspace;
;;; (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
-(define style-to-font-alist
- `(
-))
-
(define (font-field name font-descr)
(list-ref
font-descr
(list (cons markup #t))))))
-; fixme, how's this supposed to work?
-; and why don't we import font-setting from elt?
-(define (style-to-font-name sheet style)
- (let* ((entry (assoc style style-to-font-alist))
- (qualifiers (if entry (cdr entry) '()))
- (font (find-first-font qualifiers sheet))
- (err (current-error-port))
- )
-
- (if (equal? font "")
- (begin
- (display "\ncouldn't find any font satisfying " err)
- (write qualifiers err)
- "cmr10"
- )
- font) ; return the topmost.
- ))
-
-(if #f (begin
- (define (test-module)
- (display (filter pair? '(1 2 (1 2) (1 .2)))
- (display (filter-field 'font-name 'cmbx paper20-style-sheet-alist))
-
- (display (style-to-font-name 'paper20 'large)))
- )))
-
;;; ascii-script font init
(define as-font-sheet-alist
'((as5 . (((* * * braces *) . ("as-braces9"))
conversions.append (((1,9,0), conv, """New relative mode,
Postfix articulations, new chord syntax."""))
-def conv (str):
- str = re.sub ('-\\markup', '@\\markup', str)
- str = re.sub (r'-\\', r'\\', str)
- str = re.sub (r'-\)', ')', str)
- str = re.sub (r'-\(', '(', str)
- str = re.sub ('-\[', '[', str)
- str = re.sub ('-\]', ']', str)
- str = re.sub ('-~', '~', str)
- str = re.sub ('@\\markup', r'-\\markup', str)
- return str
-
-conversions.append (((1,9,1), conv, """Remove - before articulation"""))
+if 1:
+ def conv (str):
+ str = re.sub (r'-\\markup', r'@\\markup', str)
+ str = re.sub (r'-\\', r'\\', str)
+ str = re.sub (r'-\)', ')', str)
+ str = re.sub (r'-\(', '(', str)
+ str = re.sub ('-\[', '[', str)
+ str = re.sub ('-\]', ']', str)
+ str = re.sub ('-~', '~', str)
+ str = re.sub (r'@\\markup', r'-\\markup', str)
+ return str
+
+ conversions.append (((1,9,1), conv, """Remove - before articulation"""))
################################
# END OF CONVERSIONS