From: David Kastrup Date: Fri, 20 Dec 2013 09:26:07 +0000 (+0100) Subject: Merge branch 'translation' X-Git-Tag: release/2.19.0-1~49 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8848da24e00c75d7de626b2ecc409fb45e87ce4a;hp=e1ce25d2f8182442eec316e33b085922c6a9dcae;p=lilypond.git Merge branch 'translation' --- diff --git a/Documentation/changes.tely b/Documentation/changes.tely index 909d8e62d2..4ea92a7cb3 100644 --- a/Documentation/changes.tely +++ b/Documentation/changes.tely @@ -36,7 +36,7 @@ See user manual, \NAME\ @finalout @node Top -@top New features in 2.18 since 2.16 +@top New features in 2.20 since 2.18 @allowcodebreaks false @@ -62,425 +62,25 @@ which scares away people. @end ignore @item -Several articulations can be put into a single variable or -returned from an event function: +The PostScript functionality of stroke adjustment is no longer +applied automatically but left to the discretion of the PostScript +device (by default, Ghostscript uses it for resolutions up to +150dpi when generating raster images). When it is enabled, a more +complex drawing algorithm designed to benefit from stroke +adjustment is employed mostly for stems and bar lines. -@lilypond[verbatim,quote] -sempreStacc = -. ^\markup \italic sempre -\relative { c''4\sempreStacc c c c } -@end lilypond - -@item -The baseline of score markups is now taken from the reference -point (usually the middle of the staff) of the first bottom system -rather than the top of the bounding rectangle. The following -@lilypond[verbatim,quote] -\markup { - violin: \score { \new Staff { 1 } - \layout { indent=0 } } , - cello: \score { \new Staff { \clef "bass" } - \layout { indent=0 } } -} -@end lilypond -previously looked like -@lilypond[quote] -\markup { - violin: \general-align #Y #UP - \score { \new Staff { 1 } - \layout { indent=0 } } , - cello: \general-align #Y #UP - \score { \new Staff { \clef "bass" } - \layout { indent=0 } } -} -@end lilypond -without a reliable way to get both scores to line up. - -@item -LilyPond no longer automatically infers a @samp{\defaultchild} -context in a context definition with @samp{\accepts} clauses. Any -context definition without an explicit or inherited -@samp{\defaultchild} definition counts as a @samp{Bottom} context -and will be eligible for rhythmic events and overrides without -causing the implicit creation of other contexts. Be sure to -specify a @samp{\defaultchild} for non-@samp{Bottom} contexts when -defining them from scratch. - -@item -There is now extensive support for both discant and bass accordion -register symbols in the @samp{scm accreg} module, see -@ruser{Accordion Registers}. -@lilypond[verbatim,quote] -#(use-modules (scm accreg)) -\new PianoStaff -<< - \new Staff \relative - { \clef "treble" \discant "10" - r8 s32 f'[ bes f] s e[ a e] s d[ g d] s16 e32[ a] - \discant "121" - << { r16 r r } \\ - { d r a r bes r } >> | - 1 - } - \new Staff \relative - { \clef "treble" \freeBass "1" - r8 d'32 s16. c32 s16. bes32 s16. a32[ cis] s16 - \clef "bass" \stdBass "Master" - << { r16 ^"b" r ^"am" r ^"gm" | - 1^"a" } \\ - { d8_"D" c_"C" bes_"B" | a1_"A" } - >> - } ->> -@end lilypond - -@item -New commands @code{markLengthOn} and @code{markLengthOff} control -the allowance of horizontal space for tempo and rehearsal marks. - -@lilypond[quote,relative=2] -\markLengthOn -\compressFullBarRests -\tempo "Molto vivace" c2 c' -\mark\default -\tempo "Meno mosso" R1*16 -\mark\default -g,2 g -\bar "||" -\markLengthOff -\tempo "Molto vivace" c2 c' -\mark#1 -\tempo "Meno mosso" R1*16 -\mark\default -g,2 g -@end lilypond - -@item -Rehearsal marks at the beginning of a line are now placed to the right -of the clef and key signature by default. As in previous versions, the -@code{break-alignable-interface} controls the behavior. - -@lilypond[quote,relative=2] -\set Score.barNumberVisibility = #all-bar-numbers-visible -\set Timing.currentBarNumber = #72 -\bar"||" \time 3/4 \key e\major \mark#10 \tempo "Adagio" b2. -@end lilypond - -@item -Decimal numbers can now be written directly in music, -without a hash sign. Together with the previous change -in the way object properties are specified, the code to -change the length of stems has changed from this: -@example -\override Stem #'length = #5.6 -e' f' g' a' -@end example -to this: -@example -\override Stem.length = 5.6 -e' f' g' a' -@end example - -One has to write a digit on both sides of the dot -- values like -@code{4.} or @code{-.3} are not allowed. - -Decimal fractions are also not accepted in @code{\chordmode}. - -@item -A number of shorthands like @code{(}, @code{)}, @code{|}, -@code{[}, @code{]}, @code{~}, @code{\(}, @code{\)} and others can -now freely be redefined like normal commands. An example would be -@lilypond[verbatim,quote] -"\\{" = ( -"\\}" = ) -"(" = \melisma -")" = \melismaEnd - -\new Staff << - \relative c' { - c8 \{ d e f \} % slurred - g ( a b c ) % no slur, but with melisma - c,1 \bar "|." - } - \addlyrics { Li -- ly -- pond. } ->> -@end lilypond - -@item -The articulation shorthand for @code{\staccatissimo} has been -renamed from @code{-|} to@tie{}@code{-!}. - -@item -Tempo change ranges are now written as @code{\tempo 4 = 60 - 68} -rather than @code{\tempo 4 = 60 ~ 68}. - -@item -Grob @code{OctavateEight} was renamed to @code{ClefModifier}. -Related context properties were renamed from @code{xxxOctavationyyy} -to @code{xxxTranspositionyyy}. - -@item -There is a new @code{\absolute} command explicitly marking music -as being entered in absolute pitch. While this has been the -default previously, an explicit @code{\absolute} also prevents -reinterpretation when the passage is placed inside of -@code{\relative}: -@lilypond[verbatim,quote] -\relative c { c'4 \absolute { f'' g'' } c } -@end lilypond - -@item -When @code{\relative} is used without an explicit reference pitch, -the reference pitch now is the middle of the first octave, making -the first entered pitch indistinguishable from absolute pitch. -Previously, omitting the reference pitch would have lead to a -default of @code{c'}. Since that choice was somewhat arbitrary, -recommended usage was to always specify the reference pitch. - -@item -A new command @code{\single} can be used for converting a property -override into a tweak to be applied on a single music expression: - -@lilypond[quote,verbatim,relative=2] -1 -@end lilypond - -@item -Two ways of letting graphical objects not appear in the output are -overriding its @code{transparent} property with @code{#t} -(retaining the original spacing) or overriding its @code{stencil} -property with @code{#f} (not using any space at all). Those two -operations now have the shorthands @code{\hide} and @code{\omit}, -respectively. They can either be given a music expression to -tweak, or the name of a graphical object for which an override -should be created (for specifying both, use @code{\single} on the -override form): - -@lilypond[quote,verbatim] -\new Staff \with { \omit Clef } -\relative c'' 1 -@end lilypond - -@item -A new command @code{\temporary} can be applied to overrides in -order to not have them replace previous property settings. If a -@code{\revert} is applied to the same property subsequently, the -previous setting reappears: - -@lilypond[quote,verbatim,relative=2] -\override NoteHead.color = #red c4 -\override NoteHead.color = #green d -\revert NoteHead.color e2 -\override NoteHead.color = #red c4 -\temporary\override NoteHead.color = #green d -\revert NoteHead.color e -\revert NoteHead.color c -@end lilypond - -This is mainly useful for writing music functions that need to -have some property changed just for the duration of the function. - -@item -@code{\tag}, @code{\removeWithTag}, and @code{\keepWithTag} can -now accept a list of symbols rather than just a single symbol for -marking, removing, and keeping music with any of multiple tags. -This is particularly important for @code{\keepWithTag} since one -cannot achieve the same effect by using multiple consecutive -@code{\keepWithTag} commands. - -@item -The @samp{-d old-relative} option has been removed. Not actually -accessible from the command line any more, its remaining use was -for interpretating @code{\relative} in LilyPond files converted -automatically from version@tie{}1.8 or older. It is unclear how -much of this was actually still operative. - -@item -The meaning of @code{instrumentTransposition} has been reversed. -After -@example -\set instrumentTransposition = #@{ b #@} -@end example -a written @code{c'} now sounds like @code{b}. Previously, this -would have been the other way round. This and the following change -should make dealing with transposing instruments more -straightforward. - -@item -The music generated by @code{\set} and @code{\override} commands -is no longer affected by @code{\transpose}. The main consequence -is that @code{\transpose} will transpose audible/@/concert pitch and -printed pitch by the same amount even when the transposed music -contains @code{\transposition}. Previously, -@example -\transpose c' f' \transposition bes' -@end example -was equivalent to @code{\transposition f'}. Now it stays -equivalent to @code{\transposition bes'}. - -@item -When checking for collisions, LilyPond no longer treats objects as -rectangles. Instead, the actual shape of objects is approximated -using an integral-like approach. This generally results in more -even and snug positioning of objects and systems: - -@lilypond[relative=1] -#(ly:set-option 'debug-skylines #t) -\dynamicUp -c'4\f a4\f d\f( f) -a,4\< c c c\! -d4-.\downbow a4^"r'venu..." c \tempo "T1" e -@end lilypond - -Previously, the above snippet looked like this: - -@lilypond[relative=1] -#(ly:set-option 'debug-skylines #t) -\override Hairpin #'vertical-skylines = #'() -\override DynamicText #'vertical-skylines = #'() -\override TextScript #'vertical-skylines = #'() -\override Score.MetronomeMark #'vertical-skylines = #'() -\override Staff.Clef #'vertical-skylines = #'() -\dynamicUp -c'4\f a4\f d\f( f) -a,4\< c c c\! -d4-.\downbow a4^"r'venu..." c \tempo "T1" e -@end lilypond - -Affected objects include @code{Accidentals}, @code{Beams}, @code{Clefs}, -@code{Dynamics}, @code{FiguredBass}, @code{Flags}, @code{Glissandos}, -@code{Lyrics}, @code{MetronomeMarks}, @code{OttavaBrackets}, -@code{Pedals}, @code{RehearsalMarks}, @code{Rests}, @code{Scripts}, -@code{TextScripts}, @code{Ties}, @code{Tuplets} and @code{VoltaBrackets}. - -@item -Tuplets are now created with the @code{\tuplet} command, which -takes a fraction @code{@var{t}/@var{n}} to specify that @var{t} -notes are played in the time usually allowed for @var{n}. One -@code{\tuplet} command can create several tuplet groups if their -duration is typed after the fraction. -@lilypond[quote,verbatim,relative=2] -\tuplet 3/2 { c8 d e } \tuplet 3/2 { f e d } c2 -\tuplet 3/2 4 { c8 d e f e d } c2 -@end lilypond -The @code{\times} command with its inverted fraction order -@code{@var{n}/@var{t}} is still available. - -@item -Introducing two new markup-commands; @code{\draw-dashed-line} and -@code{\draw-dotted-line}. - -@noindent -The dashed-line extends to the whole length given by @var{dest}, if -@code{full-length} is set to @code{#t} (this is the default) without any -space at the beginning or end. @code{off} will then be altered to fit. -To insist on the given (or default) values of @code{on}, @code{off} use -@code{\override #'(full-length . #f)}. Manual settings for @code{on}, -@code{off} and @code{phase} are possible. - -@noindent -The dotted-line always extends to the whole length given by @var{dest}, -without any space at the beginning or end. Manual settings for -@code{off} are possible to get larger or smaller space between the dots. -The given (or default) value of @code{off} will be altered to fit the -line-length. - -@lilypond[verbatim,quote] -\markup { - \draw-dashed-line #'(5.1 . 2.3) - \override #'(on . 0.3) - \override #'(off . 0.5) - \draw-dashed-line #'(5.1 . 2.3) - \draw-dotted-line #'(5.1 . 2.3) - \override #'(thickness . 2) - \override #'(off . 0.2) - \draw-dotted-line #'(5.1 . 2.3) -} -@end lilypond - -@item -Starting with version@tie{}2.17.10, error messages or the -@code{textedit} @acronym{URI} used for point-and-click -functionality specify column numbers starting with@tie{}1 rather -than@tie{}0. The byte offset (also part of @code{textedit} -@acronym{URI}s) still starts at@tie{}0. - -@item -The @code{\clef} command supports optional transposition: -@lilypond[verbatim,quote,relative=1] -\clef "treble_(8)" -c2 c -\clef "bass^[15]" -c2 c -@end lilypond - -@item -The LilyPond syntax of dot-separated words @code{Voice.Accidental} -has been made interchangeable with @code{#'(Voice Accidental)}, a -Scheme list of symbols. As one result, code like -@example -\override Voice.TextSpanner #'(bound-details left text) = "rit." -@end example -is now equivalent to -@example -\override Voice.TextSpanner bound-details.left.text = "rit." -@end example -or even -@example -\override #'(Voice TextSpanner) bound-details.left.text = "rit." -@end example - -@item -Grob and grob property path no longer need to be specified as two -separate arguments to commands like @samp{\override} and -@code{\revert}, allowing for the syntax -@example -\override Voice.TextSpanner.bound-details.left.text = "rit." -@end example -Since complementary music functions like @samp{\overrideProperty} -cannot support forms with and without separating space at the same -time, using a single dotted path is now the preferred form. -Specifying grob path and grob property path separately, currently -still supported with @samp{\override} and @samp{\revert} for -compatibility reasons, is deprecated. - -@item -Due to words now being accepted as symbol function arguments, the -interfaces of @samp{\accidentalStyle}, @samp{\alterBroken}, -@samp{\footnote} and @samp{\tweak} had to be redesigned where -optional symbol arguments were involved. Please check the -respective music function documentation for details. - -@item -Several commands now accept symbol lists (conveniently entered as -dot-separated words) for various kinds of arguments. These -include @samp{\accidentalStyle}, @samp{\alterBroken}, -@samp{\footnote}, @samp{\hide}, @samp{\omit}, -@samp{\overrideProperty}, @samp{\shape}, and @samp{\tweak}. - -@item -The bar line user interface has changed. Bar glyphs now resemble the -appearance of the bar line, so a left repeat sign has to be coded -as @code{.|:}. The command @code{\defineBarLine} provides an easy way -to define additional bar line styles. - -@item -Accidentals in the key signature may be printed in octaves other -than their traditional positions, or in multiple octaves. -@lilypond[quote,relative=0] -\override Staff.KeySignature #'flat-positions = #'((-5 . 5)) -\override Staff.KeyCancellation #'flat-positions = #'((-5 . 5)) -\clef bass \key es \major es g bes d -\clef treble \bar "||" \key es \major es g bes d -\override Staff.KeySignature #'sharp-positions = #'(2) -\bar "||" \key d \major b fis b2 -@end lilypond +Stroke adjustment can be forced by specifying the command line +option @samp{-dstrokeadjust} to LilyPond. When generating +@code{PDF} files, this will usually result in markedly better +looking @code{PDF} previews but significantly larger file size. +Print quality at high resolutions will be unaffected. @end itemize @ifhtml For older news, go to +@uref{http://lilypond.org/doc/v2.18/Documentation/changes/}, @uref{http://lilypond.org/doc/v2.16/Documentation/changes/}, -@uref{http://lilypond.org/doc/v2.14/Documentation/changes/}, or @uref{../,go back} to the Documentation index. diff --git a/Documentation/contributor/administration.itexi b/Documentation/contributor/administration.itexi index 8be1d903fa..90fe795a0c 100644 --- a/Documentation/contributor/administration.itexi +++ b/Documentation/contributor/administration.itexi @@ -126,7 +126,7 @@ on which part of the job, checks to make sure that everything is running smoothly, and has final say on our policy for Documentation. Also includes LSR work. -Currently: Graham +Currently: None @item Translation Meister: trains new translators, updates the @@ -135,19 +135,6 @@ directions). Currently: Francisco -@item -Frog Meister: is responsible for code patches from (relatively) -inexperienced contributors. Keeps track of patches, does initial -reviewing of those patches, sends them to @w{@code{-devel}} when -they've had some initial review on the Frog list, pesters the -@w{@code{-devel}} community into actually reviewing said patches, and -finally pushes the patches once they're accepted. This person is -@emph{not} responsible for training new programmers, because that -would be far too much work -- his/her job is @qq{only} to guide -completed patches through our process. - -Currently: Mike Solomon - @end itemize @node Patchy diff --git a/Documentation/contributor/introduction.itexi b/Documentation/contributor/introduction.itexi index b6530b4ffd..12c62e5bfa 100644 --- a/Documentation/contributor/introduction.itexi +++ b/Documentation/contributor/introduction.itexi @@ -47,27 +47,24 @@ since the program was born. The @q{official} LilyPond Git repository is hosted by the GNU Savannah software forge at @uref{http://git.sv.gnu.org}. -Although, since Git uses a @emph{distributed} model, technically -there is no central repository. Instead, each contributor keeps a -complete copy of the entire repository (about 116MB). Changes made within one contributor's copy of the repository can be shared with other contributors using @emph{patches}. A patch -is a simple text file generated by the @command{git} program that -indicates what changes have been made (using a special format). +is a text file that indicates what changes have been made. If a contributor's patch is approved for inclusion (usually through the mailing list), someone on the current development team will @emph{push} the patch to the official repository. The Savannah software forge provides two separate interfaces for -viewing the LilyPond Git repository online: @emph{cgit} and -@emph{gitweb}. The cgit interface should work faster than gitweb +viewing the LilyPond Git repository online: +@uref{http://git.sv.gnu.org/cgit/lilypond.git/, cgit} and +@uref{http://git.sv.gnu.org/gitweb/?p=lilypond.git, gitweb}. + +@ignore +The cgit interface should work faster than gitweb in most situations, but only gitweb allows you to search through the source code using @command{grep}, which you may find useful. -The cgit interface is at -@uref{http://git.sv.gnu.org/cgit/lilypond.git/} and the gitweb -interface is at -@uref{http://git.sv.gnu.org/gitweb/?p=lilypond.git}. +@end ignore Git is a complex and powerful tool, but tends to be confusing at first, particularly for users not familiar with the command line @@ -283,8 +280,8 @@ switching git branches (not expected, but just in case...) @item You don't need to be able to completely approve patches. Make sure the patch meets whatever you know of the guidelines (for doc -style, code indentation, whatever), and then send it on to the -frog list or -devel for more comments. If you feel confident +style, code indentation, whatever), and then send it on to -devel +for more comments. If you feel confident about the patch, you can push it directly (this is mainly intended for docs and translations; code patches should almost always go to -devel before being pushed). diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi index 819534b4ad..447f553ea4 100644 --- a/Documentation/contributor/programming-work.itexi +++ b/Documentation/contributor/programming-work.itexi @@ -1888,55 +1888,8 @@ of a spanner broken at given starting and ending columns. @node How purity is defined and stored @subsection How purity is defined and stored -Purity can currently be defined two different ways in LilyPond that -correspond to two types of scenarios. In one scenario, we know that a -callback is pure, but we are not necessarily certain what properties -will use this callback. In another, we want a property to be pure, but -we don't want to guarantee that its callback function will be pure in -all circumstances. - -In the first scenario, we register the callback in define-grobs.scm in -one of four places depending on what the function does. - -@itemize -@item @code{pure-print-functions}: If finding a print function's vertical -extent does not have any @q{side effects} we register it here. We then -don't have to set the pure Y-extent property, which will be taken from the -stencil. - -@item @code{pure-print-to-height-conversions}: If a stencil can -eventually be used to glean a grob's Y-extent but is not pure (meaning -it will have a different height at different stages of the compilation -process), we add it to this list along with a function for the pure -Y-extent. - -@item @code{pure-conversions-alist}: This list contains pairs of -functions and their pure equivalents. It is onto but not one-to-one. - -@item @code{pure-functions}: Like pure-print-functions in that they work -for both pure and impure values, but they do not return a stencil. -@end itemize - -At all stages of the compilation process, when LilyPond wants the pure -version of a property, it will consult these lists and see if it can get -this property for a given Grob. Note that you do @emph{not} need to -register the pure property in the grob itself. For example, there is no -property @q{pure-Y-extent}. Rather, by registering these functions as -defined above, every time LilyPond needs a pure property, it will check -to see if a Grob contains one of these functions and, if so, will use -its value. If LilyPond cannot get a pure function, it will return a -value of @code{##f} for the property. - -LilyPond is smart enough to know if a series of chained functions are -pure. For example, if a Y-offset property has four chained functions -and all of them have pure equivalents, LilyPond will read the four pure -equivalents when calculating the pure property. However, if even one is -impure, LilyPond will not return a pure property for the offset (instead -returning something like @code{#f} or @code{'()}) and will likely wreak -havoc on your score. - -In the second scenario, we create an unpure-pure-container (unpure is -not a word, but hey, neither was Lilypond until the 90s). For example: +Purity is defined in LilyPond with the creation of an unpure-pure container +(unpure is not a word, but hey, neither was Lilypond until the 90s). For example: @example #(define (foo grob) @@ -1948,23 +1901,8 @@ not a word, but hey, neither was Lilypond until the 90s). For example: \override Stem #'length = #(ly:make-unpure-pure-container foo bar) @end example -This is useful if we want to: - -@itemize -@item create overrides that have pure alternatives (should not be used -in development, but useful for users) - -@item use return values that are not functions (i.e. pairs or booleans) -for either pure or unpure values. - -@item allow a function to be considered pure in a limited amount of -circumstances. This is useful if we are sure that, when associated with -one grob a function will be pure but not necessarily with another grob -that has different callbacks. -@end itemize - -Items can only ever have two pure heights: their actual pure height if -they are between @q{start} and @q{end}, or an empty interval if they are +Note that items can only ever have two pure heights: their actual pure height +if they are between @q{start} and @q{end}, or an empty interval if they are not. Thus, their pure property is cached to speed LilyPond up. Pure heights for spanners are generally not cached as they change depending on the start and end values. They are only cached in certain particular diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi index df0b9ed50a..22ea0591b1 100644 --- a/Documentation/contributor/quick-start.itexi +++ b/Documentation/contributor/quick-start.itexi @@ -35,12 +35,6 @@ it is available for all major operating systems and is easy to install If you are not familiar with GNU/Linux, it may be beneficial to read a couple of @qq{introduction to Ubuntu} web pages. -Some contributors have recommended a free PDF: - -@example -@uref{http://www.ubuntupocketguide.com/} -@end example - For those interested, the LilyDev remix is currently based on a 32bit version of 10.04 LTS Ubuntu (Lucid Lynx). @@ -421,11 +415,6 @@ Send patch files to the appropriate place: @item If you have a mentor, send it to them via email. -@item -New contributors should send the patch attached to an email to -@email{frogs@@lilynet.net}. Please add @qq{[PATCH]} to the -subject line. - @item Translators should send patches to @email{translations@@lilynet.net}. @@ -435,6 +424,10 @@ More experienced contributors should upload the patch for web-based review. This requires additional software and use of the command-line; see @ref{Uploading a patch for review}. +@item +If you have trouble uploading the patch for review, +ask for help on @email{lilypond-devel@@gnu.org}. + @end itemize diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely index 0192b98623..16f3518d56 100644 --- a/Documentation/essay/engraving.itely +++ b/Documentation/essay/engraving.itely @@ -1580,8 +1580,8 @@ therefore be easily embedded in other text-based formats such as @command{lilypond-book} program, included with LilyPond, the input fragments can be replaced by music images in the resulting PDF or HTML output files. Another example is the third-party OOoLilyPond extension -for OpenOffice.org, which makes it extremely easy to embed musical -examples in documents. +for OpenOffice.org or LibreOffice, which makes it extremely easy to +embed musical examples in documents. For more examples of LilyPond in action, full documentation, and the software itself, see our main website: www.lilypond.org. diff --git a/Documentation/extending/programming-interface.itely b/Documentation/extending/programming-interface.itely index 82ef216ad8..6b16fdafbc 100644 --- a/Documentation/extending/programming-interface.itely +++ b/Documentation/extending/programming-interface.itely @@ -179,13 +179,7 @@ strings (with or without quotes), numbers, full markups and markup lists, score, book, bookpart, context definition and output definition blocks. -For some kinds of expression (like most music not enclosed in braces) -LilyPond needs to look further than the expression itself in order to -determine its end. If such an expression were considered for an -optional argument by evaluating its predicate, LilyPond would not be -able to @q{backup} when it decides the expression does not fit the -parameter. So some forms of music might need to be enclosed in braces -to make them acceptable in some circumstances. Some other +Some ambiguities LilyPond sorts out by checking with predicate functions: is @samp{-3} a fingering postevent or a negative number? Is @code{"a" 4} in lyric mode a string followed by a number, or a lyric @@ -196,8 +190,8 @@ lookahead. For example, a predicate accepting both music expressions and pitches will consider @code{c''} to be a pitch rather than a music -expression. Immediately following durations or postevents might -not work with that interpretation. So it's best to avoid overly +expression. Immediately following durations or postevents will +change that interpretation. It's best to avoid overly permissive predicates like @code{scheme?} when the application rather calls for more specific argument types. diff --git a/Documentation/included/helpus.itexi b/Documentation/included/helpus.itexi index 2789f28097..96f697be4c 100644 --- a/Documentation/included/helpus.itexi +++ b/Documentation/included/helpus.itexi @@ -15,9 +15,9 @@ of spending time on those simple tasks. For a multi-faceted project like LilyPond, sometimes it's tough to know where to begin. In addition to the avenues proposed below, you can send -an e-mail to the @email{mike@@mikesolomon.org, Frog meister} -letting him know your skill set and asking how you can help or proposing a -project. He'll be able to give you guidance on how to get started. +an e-mail to the +@uref{https://lists.gnu.org/mailman/listinfo/lilypond-devel, lilypond-devel@@gnu.org} +mailing list, and we'll help you to get started. @end macro @@ -35,11 +35,6 @@ Mailing list support: answer questions from fellow users. Bug reporting: help users create proper @rweb{Bug reports}, and/or join the Bug Squad to organize @rcontrib{Issues}. -@item -@rcontrib{Grand Regression Test Checking}: verify that LilyPond works correctly -by examining output of test snippets. Checking one snippet takes less -than a minute! - @item Documentation: small changes can be proposed by following the guidelines for @rcontrib{Documentation suggestions}. @@ -90,8 +85,7 @@ Translations: see @rcontrib{Translating the documentation}, and @rcontrib{Translating the website}. @item -Bugfixes or new features: the best way to begin is to join the -Frogs, and read @rcontrib{Programming work}. +Bugfixes or new features: read @rcontrib{Programming work}. @end itemize @@ -101,23 +95,6 @@ Frogs, and read @rcontrib{Programming work}. @macro helpusProjects @subheading Projects -@subsubheading Frogs - -Website and mailing list: - -@example -@uref{http://frogs.lilynet.net} -@end example - -The Frogs are ordinary LilyPond users who have chosen to get -involved in their favorite software's development. Fixing bugs, -implementing new features, documenting the source code: there's a -lot to be done, but most importantly: this is a chance for -everyone to learn more about LilyPond, about Free Software, about -programming@dots{} and to have fun. If you're curious about any of -it, then the word is: @emph{Join the Frogs!} - - @subsubheading Grand LilyPond Input Syntax Standardization diff --git a/Documentation/included/note-head-style.ly b/Documentation/included/note-head-style.ly index a786978734..0d2cabfcda 100644 --- a/Documentation/included/note-head-style.ly +++ b/Documentation/included/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.0" \header { texidoc=" @@ -25,11 +25,11 @@ dimensions. pattern = << \new Voice { \override Stem.direction = #UP - e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 \bar "||" + e'4 2. 1 \breve*1/2 \longa*1/4 \bar "||" } \new Voice { \override Stem.direction = #DOWN - a4 a2. a1 a\breve*1/2 a\longa*1/4 \bar "||" + a4 2. 1 \breve*1/2 \longa*1/4 \bar "||" } >> diff --git a/Documentation/ly-examples/orchestra.ly b/Documentation/ly-examples/orchestra.ly index 6b205af903..d784dfd6af 100644 --- a/Documentation/ly-examples/orchestra.ly +++ b/Documentation/ly-examples/orchestra.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.0" \header { tagline = ##f @@ -271,49 +271,49 @@ R2. | ees r r r4 r8 r4 r8 | } - trian = \relative c' { + trian = { \clef percussion \time 6/8 R2.*4 | \time 9/8 R1*9/8 | } - cym = \relative c' { + cym = { \clef percussion \time 6/8 R2.*4 | \time 9/8 R1*9/8 | } - tamt = \relative c' { + tamt = { \clef percussion \time 6/8 R2. | r4 r8 r c4\mf\<^"*" ~ | - c8\!\ff r r r4 r8 | R2. | + 8\!\ff r r r4 r8 | R2. | \time 9/8 R1*9/8 | } - tamb = \relative c' { + tamb = { \clef percussion \time 6/8 R2.*4 | \time 9/8 R1*9/8 | } - snare = \relative c' { + snare = { \clef percussion \time 6/8 R2.*4 | \time 9/8 - c8\pp c c c c c c c c | + c8\pp 8 8 8 8 8 8 8 8 | } - bsdrum = \relative c' { + bsdrum = { \clef percussion \time 6/8 - c2.:32\pp\< ~ | c: ~ | - c8\!\ff \offCr r r r4 r8 | R2. | + c2.:32\pp\< ~ | 2.: ~ | + 8\!\ff \offCr r r r4 r8 | R2. | \time 9/8 - c2.:32\pp ~ c4.: | + 2.:32\pp ~ 4.: | } harprh = \relative c'' { diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely index 3dc39edd9b..cb8edf2c03 100644 --- a/Documentation/notation/changing-defaults.itely +++ b/Documentation/notation/changing-defaults.itely @@ -213,8 +213,9 @@ Handles clefs, bar lines, keys, accidentals. It can contain @strong{@emph{RhythmicStaff}} -Like @code{Staff} but for printing rhythms. Pitches are ignored; -the notes are printed on one line. +Like @code{Staff} but for printing rhythms. Pitches are ignored +when engraving; the notes are printed on one line. The MIDI +rendition retains pitches unchanged. @strong{@emph{TabStaff}} diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index f6842824a8..f935956922 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.30" +@c \version "2.19.0" @node Rhythms @section Rhythms @@ -93,6 +93,15 @@ note. a a a2 a a4 a a1 a @end lilypond +Durations occuring on their own within a music sequence will take +their pitches from the preceding note or chord. + +@lilypond[quote,verbatim,relative=2] +\time 8/1 +c \longa \breve 1 2 +4 8 16 32 64 128 128 +@end lilypond + @cindex notes, dotted @cindex dotted notes @cindex notes, double-dotted @@ -204,7 +213,7 @@ tuplets are triplets: 3@tie{}notes sound within the duration normally allowed for@tie{}2: @lilypond[quote,verbatim,relative=2] -a2 \tuplet 3/2 { b4 b b } +a2 \tuplet 3/2 { b4 4 4 } c4 c \tuplet 3/2 { b4 a g } @end lilypond @@ -425,6 +434,13 @@ should be tied to the following note, which must be at the same pitch. a2~ a4~ a16 r r8 @end lilypond +Ties can make use of the @q{last explicit pitch} interpretation of +isolated durations: + +@lilypond[quote,verbatim,relative=2] +a2 ~ 4 ~ 16 r r8 +@end lilypond + Ties are used either when the note crosses a bar line, or when dots cannot be used to denote the rhythm. Ties should also be used when note values cross larger subdivisions of the measure: @@ -450,7 +466,8 @@ created. Chords may be partially tied by placing the ties inside the chord. @lilypond[quote,verbatim,relative=1] -~ +2 ~ 2 +4~ @end lilypond @@ -1412,12 +1429,30 @@ So the first example above could be written: e8 | a4 c8 b c4 | @end lilypond -The property @code{measurePosition} contains a rational number, which -is usually positive and indicates how much of the measure has passed -at this point. The @code{\partial @var{duration}} command sets it to -a negative number, when it has a different meaning: it then says that -the current (first) bar will be @emph{preceded} by a bar 0 (the partial -bar) with a duration given by @var{duration}. +The property @code{measurePosition} contains a rational number, +which is usually positive and indicates how much of the measure +has passed at this point. @code{\partial @var{duration}} is +defined such that no numbered bar gets created: when used at the +beginning of a measure, @code{measurePosition} is set to a +negative number, implying that the current bar will be +@emph{preceded} by additional material. When used after a measure +has already started, however, it moves the requested distance +before the @emph{end} of the bar. + +@lilypond[quote,verbatim,relative=1] +\set Score.barNumberVisibility = #all-bar-numbers-visible +\override Score.BarNumber.break-visibility = + #end-of-line-invisible +\time 6/8 +\partial 8 +e8 | a4 c8 b[ c b] | +\partial 4 +r8 e,8 | a4 \bar "||" +\partial 4 +r8 e8 | a4 +c8 b[ c b] | +@end lilypond + @seealso Music Glossary: @@ -1432,19 +1467,6 @@ Snippets: Internal Reference: @rinternals{Timing_translator}. -@knownissues -The @code{\partial} command should be used only at the beginning of a -piece. If you use it after the beginning, warnings or problems may -occur, so use @code{\set Timing.measurePosition} instead. - -@lilypond[quote,verbatim,relative=1] -\time 6/8 -\partial 8 -e8 | a4 c8 b[ c b] | -\set Timing.measurePosition = #(ly:make-moment -1/4) -r8 e,8 | a4 c8 b[ c b] | -@end lilypond - @node Unmetered music @unnumberedsubsubsec Unmetered music @@ -1788,6 +1810,37 @@ inserts ties for notes. One of its uses is to debug complex scores: if the measures are not entirely filled, then the ties show exactly how much each measure is off. +The property @code{completionUnit} sets a preferred duration for +the split notes. + +@lilypond[quote,verbatim,relative=2] +\new Voice \with { + \remove "Note_heads_engraver" + \consists "Completion_heads_engraver" +} { + \time 9/8 g\breve. d4. \bar "||" + \set completionUnit = #(ly:make-moment 3 8) + g\breve. d4. +} +@end lilypond + +These engravers split notes with scaled duration, such as those in tuplets, +into notes with the same scale-factor as in the input note. + +@lilypond[quote,verbatim,relative=2] +\new Voice \with { + \remove "Note_heads_engraver" + \consists "Completion_heads_engraver" +} { + \time 2/4 r4 + \tuplet 3/2 {g4 a b} + \scaleDurations 2/3 {g a b} + g4*2/3 a b + \tuplet 3/2 {g4 a b} + r4 +} +@end lilypond + @seealso Music Glossary: @rglos{tie} @@ -1807,12 +1860,12 @@ Internals Reference: @rinternals{Forbid_line_break_engraver}. @knownissues -Not all durations (especially those containing tuplets) can be -represented exactly with normal notes and dots, but the -@code{Completion_heads_engraver} will not insert tuplets. - -The @code{Completion_heads_engraver} only affects notes; it does not -split rests. +For consistency with previous behavior, notes and rests with +duration longer than a measure, such as @code{c1*2}, are split into +notes without any scale factor, @code{@{ c1 c1 @}}. The property +@code{completionFactor} controls this behavior, and setting it to +@code{#f} cause split notes and rest to have the scale factor +of the input durations. @node Showing melody rhythms @@ -2015,6 +2068,7 @@ new beam starts. @funindex autoBeaming @funindex baseMoment @funindex beamExceptions +@funindex \beamExceptions @funindex beatStructure @funindex measureLength @funindex \time @@ -2156,42 +2210,24 @@ the time signature. Any exceptions to this default can be found in Special autobeaming rules (other than ending a beam on a beat) are defined in the @code{beamExceptions} property. +The value for @code{beamExceptions}, a somewhat complex Scheme +data structure, is easiest generated with the +@code{\beamExceptions} function. This function is given one or +more manually beamed measure-length rhythmic patterns (measures +have to be separated by a bar check@tie{}@code{|} since the +function has no other way to discern the measure length). Here is +a simple example: + @lilypond[quote,relative=2,verbatim] \time 3/16 \set Timing.beatStructure = #'(2 1) \set Timing.beamExceptions = - #'( ;start of alist - (end . ;entry for end of beams - ( ;start of alist of end points - ((1 . 32) . (2 2 2)) ;rule for 1/32 beams -- end each 1/16 - ))) %close all entries + \beamExceptions { 32[ 32] 32[ 32] 32[ 32] } c16 c c | \repeat unfold 6 { c32 } | @end lilypond -@code{beamExceptions} is an alist with a key of rule-type and a value -of beaming-rules. - -At this time the only available value of rule-type is -@code{'end} for beam ending. - -Beaming-rules is a scheme alist (or list of pairs) that indicates the -beam type and the grouping to be applied to beams containing notes with -a shortest duration of that beam type. - -@example -#'((beam-type1 . grouping-1) - (beam-type2 . grouping-2) - (beam-type3 . grouping-3)) -@end example - -Beam type is a scheme pair indicating the duration of the beam, -e.g., @code{(1 . 16)}. - -Grouping is a scheme list indicating the grouping to be applied to -the beam. The grouping is in units of the beam type. - -@warning{ A @code{beamExceptions} value must be @emph{complete} +@warning{A @code{beamExceptions} value must be @emph{complete} exceptions list. That is, every exception that should be applied must be included in the setting. It is not possible to add, remove, or change only one of the exceptions. While this may seem cumbersome, diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index a56101b0dc..23d7cf05c5 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -394,18 +394,16 @@ default value is scaled accordingly. @item ragged-bottom @funindex ragged-bottom -If set to true, systems will not spread vertically down the page. -This does not affect the last page. This should be set to true -for pieces that have only two or three systems per page, for -example orchestral scores. +If this is set to true, +systems will be set at their natural spacing, neither compressed +nor stretched vertically to fit the page. @item ragged-last-bottom @funindex ragged-last-bottom -If set to false, systems will spread vertically down the last -page. Pieces that amply fill two pages or more should have this -set to false. It also affects the last page of book parts, i.e. -parts of a book created with @code{\bookpart} blocks. +If this is set to false, then the last page, +and the last page in each section created with a @code{\bookpart} block, +will be vertically justified in the same way as the earlier pages. @end table @@ -1521,10 +1519,12 @@ The @code{\pageBreak} and @code{\noPageBreak} commands may also be inserted at top-level, between scores and top-level markups. There are also analogous settings to @code{ragged-right} and -@code{ragged-last} which have the same effect on vertical spacing: -@code{ragged-bottom} and @code{ragged-last-bottom}. If set to -@code{#t} the systems on all pages or just the last page -respectively will not be justified vertically. See +@code{ragged-last} which have the same effect on vertical spacing. +If @code{ragged-bottom} is set to @code{#t} the systems will not +be justified vertically. When @code{ragged-last-bottom} is set +to @code{#t}, as it is by default, empty space is allowed at the +bottom of the final page (or the final page in each +@code{\bookpart}). See @ref{Fixed vertical spacing paper variables,,Fixed vertical spacing @code{@bs{}paper} variables}. Page breaks are computed by the @code{page-breaking} function. LilyPond @@ -2001,35 +2001,32 @@ of these reference points: alignToZero = \with { \override VerticalAxisGroup.nonstaff-relatedstaff-spacing = #zero-space \override VerticalAxisGroup.nonstaff-nonstaff-spacing = #zero-space + \override VerticalAxisGroup.staff-affinity = #DOWN + \remove Text_engraver % avoid having two + \consists Text_engraver } lowerCaseChords = \with { chordNameLowercaseMinor = ##t } -staffAffinityDown = \with { - \override VerticalAxisGroup.staff-affinity = #DOWN -} labelContext = #(define-music-function (parser location context) (string?) - #{ s1*0^\markup { \typewriter #context } #}) + #{ s1*0^\markup { \upright {\typewriter #context } } #}) \layout { \context { \Dynamics \alignToZero } \context { \FiguredBass \alignToZero } \context { \Lyrics \alignToZero } - \context { \NoteNames \alignToZero \staffAffinityDown } - \context { \ChordNames \alignToZero - \staffAffinityDown - \lowerCaseChords } - \context { \FretBoards \alignToZero \staffAffinityDown } + \context { \NoteNames \alignToZero } + \context { \ChordNames \alignToZero \lowerCaseChords } + \context { \FretBoards \alignToZero } \context { \Score \omit BarLine \override DynamicText.self-alignment-X = #-1 \override FretBoard.X-offset = #1.75 - \override InstrumentName.minimum-Y-extent = #'(-2 . 2) - \override InstrumentName.extra-offset = #'(0 . -0.5) - \override TextScript.minimum-Y-extent = #'(-2 . 3) + \override InstrumentName.minimum-Y-extent = #'(-1 . 2) + \textLengthOn \omit TimeSignature } } @@ -2037,44 +2034,29 @@ labelContext = %% These contexts have reference points at the baseline: %% ChordNames, NoteNames, and Lyrics << - \new ChordNames { \chords { g1:m } } - \new NoteNames { s1 | g1 | } - \new RhythmicStaff { - \set RhythmicStaff.instrumentName = #"baseline " - \textLengthOn - \labelContext "ChordNames " s1 | - \labelContext "NoteNames " s1 | - \labelContext "Lyrics" s1 | - } - \new Lyrics { \lyrics { \skip 1*2 | ghijk1 | } } + \new ChordNames { \chords { \labelContext "ChordNames" g1:m } } + \new NoteNames { s1 |\labelContext "NoteNames" g1 | } + \new Lyrics { \lyrics { \skip 1*2 | \labelContext "Lyrics" ghijk1 | } } + \new RhythmicStaff \with { instrumentName = #"baseline " } s1*3 >> %% The reference point for Dynamics is the midline of 'm' in the font << - \new RhythmicStaff { - \set RhythmicStaff.instrumentName = #"mid-height " - \labelContext "Dynamics" s1*3 - } - \new Dynamics { s1\mp s\fp } + \new Dynamics { \labelContext "Dynamics" s1\mp s\fp } + \new RhythmicStaff \with { instrumentName = #"mid-height " } s1*3 >> %% The reference point for FiguredBass is its highest point << - \new RhythmicStaff { - \set RhythmicStaff.instrumentName = #"highest point " - \labelContext "FiguredBass" s1 - } - \new FiguredBass { \figuremode { <6 5>1 } } + \new FiguredBass { \labelContext "FiguredBass" \figuremode { <6 5>1 } } + \new RhythmicStaff \with { instrumentName = #"highest point " } s1 >> %% The reference point for FretBoards is the top line \include "predefined-guitar-fretboards.ly" << - \new FretBoards { \chordmode { e1 } } - \new RhythmicStaff { - \set RhythmicStaff.instrumentName = #"top line " - \labelContext "FretBoards " s1 - } + \new FretBoards { \labelContext "FretBoards" \chordmode { e1 } } + \new RhythmicStaff \with { instrumentName = #"top line " } s1 >> @end lilypond @@ -3107,11 +3089,14 @@ proportional notation settings and examine how these settings interact. We start with the following one-measure example, which uses classical spacing with ragged-right turned on. +@c The initial pitch is not necessary as long as RhythmicStaff is +@c not preceded by other material in the score, but we don't want +@c to explain that. @lilypond[quote,verbatim,ragged-right] \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> } @@ -3136,7 +3121,7 @@ setting. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3180,7 +3165,7 @@ larger reference durations space music tightly. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3194,7 +3179,7 @@ larger reference durations space music tightly. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3208,7 +3193,7 @@ larger reference durations space music tightly. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3236,10 +3221,10 @@ tuplet. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } \new RhythmicStaff { - \tuplet 9/8 { c'8 c' c' c' c' c' c' c' c' } + \tuplet 9/8 { c8 8 8 8 8 8 8 8 8 } } >> } @@ -3254,10 +3239,10 @@ result. Setting @code{proportionalNotationDuration} fixes this. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } \new RhythmicStaff { - \tuplet 9/8 { c'8 c' c' c' c' c' c' c' c' } + \tuplet 9/8 { c8 8 8 8 8 8 8 8 8 } } >> \layout { @@ -3279,10 +3264,10 @@ turn on @code{uniform-stretching}, which is a property of \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } \new RhythmicStaff { - \tuplet 9/8 { c'8 c' c' c' c' c' c' c' c' } + \tuplet 9/8 { c8 8 8 8 8 8 8 8 8 } } >> \layout { @@ -3378,13 +3363,13 @@ property of @code{SpacingSpanner}. Compare the two scores below: @lilypond[quote,verbatim,ragged-right] \new Staff { \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) - c''8 c'' c'' \clef alto d' d'2 + c''8 8 8 \clef alto d'2 2 } \new Staff { \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t - c''8 c'' c'' \clef alto d' d'2 + c''8 8 8 \clef alto d'2 2 } @end lilypond diff --git a/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly b/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly index 6189d3f64b..0cbcfeb719 100644 --- a/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly +++ b/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.6 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly index 92c4092291..fbab93e75f 100644 --- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/changing-the-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly index c69fc05c6b..e0257869b7 100644 --- a/Documentation/snippets/changing-the-tuplet-number.ly +++ b/Documentation/snippets/changing-the-tuplet-number.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.11 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/flat-flags-and-beam-nibs.ly b/Documentation/snippets/flat-flags-and-beam-nibs.ly index 9657cfe775..96a6bcc153 100644 --- a/Documentation/snippets/flat-flags-and-beam-nibs.ly +++ b/Documentation/snippets/flat-flags-and-beam-nibs.ly @@ -1,10 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.dsi.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.16.0" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.0 +\version "2.19.0" \header { lsrtags = "contemporary-notation, rhythms" @@ -47,7 +48,7 @@ carry both a left- and right-pointing flat flag. Do this with paired (Note that @code{\\set stemLeftBeamCount} is always equivalent to @code{\\once \\set}. In other words, the beam count settings are not @qq{sticky}, so the pair of flat flags attached to the lone -@code{c'16[]} in the last example have nothing to do with the +@code{16[]} in the last example have nothing to do with the @code{\\set} two notes prior.) @@ -69,25 +70,25 @@ carry both a left- and right-pointing flat flag. Do this with paired \new RhythmicStaff { r8. \set stemRightBeamCount = #0 - c16[] + 16[] } % Example 3 \new RhythmicStaff { - c16 c + 16 16 \set stemRightBeamCount = #2 - c16 r r + 16 r r \set stemLeftBeamCount = #2 - c16 c c + 16 16 16 } % Example 4 \new RhythmicStaff { - c16 c + 16 16 \set stemRightBeamCount = #2 - c16 r - c16[] + 16 r16 + 16[] r16 \set stemLeftBeamCount = #2 - c16 c + 16 16 } >> } diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly index 43f92c152f..6b8f910d87 100644 --- a/Documentation/snippets/fretted-headword.ly +++ b/Documentation/snippets/fretted-headword.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.11 +%% Note: this file works from version 2.17.30 % INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings % % Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17" % % on melodies from Bellini's "Norma" % diff --git a/Documentation/snippets/guitar-slides.ly b/Documentation/snippets/guitar-slides.ly index 205edecfda..e2e2b802f2 100644 --- a/Documentation/snippets/guitar-slides.ly +++ b/Documentation/snippets/guitar-slides.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly index 1a4328a58f..b078cc0f53 100644 --- a/Documentation/snippets/incipit.ly +++ b/Documentation/snippets/incipit.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.10 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { @@ -21,10 +21,7 @@ incipit = #(define-music-function (parser location incipit-music) (ly:music?) #{ \once \override Staff.InstrumentName.self-alignment-X = #RIGHT - \once \override Staff.InstrumentName.self-alignment-Y = #UP - \once \override Staff.InstrumentName.Y-offset = - #(lambda (grob) - (+ 4 (system-start-text::calc-y-offset grob))) + \once \override Staff.InstrumentName.self-alignment-Y = ##f \once \override Staff.InstrumentName.padding = #0.3 \once \override Staff.InstrumentName.stencil = #(lambda (grob) @@ -35,7 +32,6 @@ incipit = { { \context MensuralStaff \with { instrumentName = #instrument-name - \override VerticalAxisGroup.Y-extent = #'(-4 . 4) } $incipit-music } \layout { $(ly:grob-layout grob) diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly index 89cec8be71..4f0570da2c 100644 --- a/Documentation/snippets/jazz-combo-template.ly +++ b/Documentation/snippets/jazz-combo-template.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly index 572e39ca50..c7ad7b10a5 100644 --- a/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly +++ b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.6 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/making-glissandi-breakable.ly b/Documentation/snippets/making-glissandi-breakable.ly index fd7b1e92c1..16799a19cf 100644 --- a/Documentation/snippets/making-glissandi-breakable.ly +++ b/Documentation/snippets/making-glissandi-breakable.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.6 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly index bde66e6168..f19f6bc318 100644 --- a/Documentation/snippets/modifying-tuplet-bracket-length.ly +++ b/Documentation/snippets/modifying-tuplet-bracket-length.ly @@ -1,10 +1,11 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.dsi.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.17.11" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.0 +\version "2.19.0" \header { lsrtags = "really-simple, rhythms" @@ -30,11 +31,11 @@ modify what material they cover. % ...to cover all items up to the next note \set tupletFullLengthNote = ##t \time 2/4 - \tuplet 3/2 { c4 c c } + \tuplet 3/2 { c4 4 4 } % ...or to cover just whitespace \set tupletFullLengthNote = ##f \time 4/4 - \tuplet 5/4 { c4 c1 } + \tuplet 5/4 { 4 1 } \time 3/4 - c2. + 2. } diff --git a/Documentation/snippets/new/flat-flags-and-beam-nibs.ly b/Documentation/snippets/new/flat-flags-and-beam-nibs.ly new file mode 100644 index 0000000000..754394be7a --- /dev/null +++ b/Documentation/snippets/new/flat-flags-and-beam-nibs.ly @@ -0,0 +1,86 @@ +\version "2.19.0" + +\header { + lsrtags = "contemporary-notation, rhythms" + + texidoc = " + Flat flags on lone notes and beam nibs at the ends of beamed figures +are both possible with a combination of @code{stemLeftBeamCount}, +@code{stemRightBeamCount} and paired @code{[]} beam indicators. + + + + +For right-pointing flat flags on lone notes, use paired @code{[]} beam +indicators and set @code{stemLeftBeamCount} to zero (see Example 1). + + + + +For left-pointing flat flags, set @code{stemRightBeamCount} instead +(Example 2). + + + + +For right-pointing nibs at the end of a run of beamed notes, set +@code{stemRightBeamCount} to a positive value. And for left-pointing +nibs at the start of a run of beamed notes, set +@code{stemLeftBeamCount} instead (Example 3). + + + + +Sometimes it may make sense for a lone note surrounded by rests to +carry both a left- and right-pointing flat flag. Do this with paired +@code{[]} beam indicators alone (Example 4). + + + + +(Note that @code{\\set stemLeftBeamCount} is always equivalent to +@code{\\once \\set}. In other words, the beam count settings are not +@qq{sticky}, so the pair of flat flags attached to the lone +@code{16[]} in the last example have nothing to do with the +@code{\\set} two notes prior.) + + + + +" + doctitle = "Flat flags and beam nibs" +} +\score { + << + % Example 1 + \new RhythmicStaff { + \set stemLeftBeamCount = #0 + c16[] + r8. + } + % Example 2 + \new RhythmicStaff { + r8. + \set stemRightBeamCount = #0 + 16[] + } + % Example 3 + \new RhythmicStaff { + 16 16 + \set stemRightBeamCount = #2 + 16 r r + \set stemLeftBeamCount = #2 + 16 16 16 + } + % Example 4 + \new RhythmicStaff { + 16 16 + \set stemRightBeamCount = #2 + 16 r16 + 16[] + r16 + \set stemLeftBeamCount = #2 + 16 16 + } + >> +} diff --git a/Documentation/snippets/new/incipit.ly b/Documentation/snippets/new/incipit.ly index 09f50ff56e..3b85ef170c 100644 --- a/Documentation/snippets/new/incipit.ly +++ b/Documentation/snippets/new/incipit.ly @@ -13,10 +13,7 @@ incipit = #(define-music-function (parser location incipit-music) (ly:music?) #{ \once \override Staff.InstrumentName.self-alignment-X = #RIGHT - \once \override Staff.InstrumentName.self-alignment-Y = #UP - \once \override Staff.InstrumentName.Y-offset = - #(lambda (grob) - (+ 4 (system-start-text::calc-y-offset grob))) + \once \override Staff.InstrumentName.self-alignment-Y = ##f \once \override Staff.InstrumentName.padding = #0.3 \once \override Staff.InstrumentName.stencil = #(lambda (grob) @@ -27,7 +24,6 @@ incipit = { { \context MensuralStaff \with { instrumentName = #instrument-name - \override VerticalAxisGroup.Y-extent = #'(-4 . 4) } $incipit-music } \layout { $(ly:grob-layout grob) diff --git a/Documentation/snippets/new/modifying-tuplet-bracket-length.ly b/Documentation/snippets/new/modifying-tuplet-bracket-length.ly new file mode 100644 index 0000000000..6ee36e8201 --- /dev/null +++ b/Documentation/snippets/new/modifying-tuplet-bracket-length.ly @@ -0,0 +1,33 @@ +\version "2.19.0" + +\header { + lsrtags = "really-simple, rhythms" + + texidoc = " +Tuplet brackets can be made to run to prefatory matter or the next +note. Default tuplet brackets end at the right edge of the final note +of the tuplet; full-length tuplet brackets extend farther to the right, +either to cover all the non-rhythmic notation up to the following note, +or to cover only the whitespace before the next item of notation, be +that a clef, time signature, key signature, or another note. The +example shows how to switch tuplets to full length mode and how to +modify what material they cover. + +" + doctitle = "Modifying tuplet bracket length" +} + +\new RhythmicStaff { + % Set tuplets to be extendable... + \set tupletFullLength = ##t + % ...to cover all items up to the next note + \set tupletFullLengthNote = ##t + \time 2/4 + \tuplet 3/2 { c4 4 4 } + % ...or to cover just whitespace + \set tupletFullLengthNote = ##f + \time 4/4 + \tuplet 5/4 { 4 1 } + \time 3/4 + 2. +} diff --git a/Documentation/snippets/new/staff-headword.ly b/Documentation/snippets/new/staff-headword.ly index 67bc0f6286..a23b5cb063 100644 --- a/Documentation/snippets/new/staff-headword.ly +++ b/Documentation/snippets/new/staff-headword.ly @@ -35,22 +35,13 @@ trompette = \relative do'' { do8-. r8 sib4-> | } -tambourin = \relative do' { +tambourin = \drummode { \time 2/4 - r8 do16 do do8 do | - r8 do16 do do8 do | - r8 do r do | - r8 do16 do do8 do | - r8 do r do | -} - -tambourinMidi = \drummode { - \time 2/4 - r8 tamb16 tamb tamb8 tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | + r8 tamb16 16 8 8 | + r8 16 16 8 8 | + r8 8 r8 8 | + r8 16 16 8 8 | + r8 8 r8 8 | } upper = \relative do' { @@ -102,7 +93,7 @@ lower = \relative do { \trompette } \context DrumStaff = "tambourin" { - \tambourinMidi + \tambourin } \context Staff = "piano" << \upper @@ -113,4 +104,3 @@ lower = \relative do { \tempo 4 = 72 } } - diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly index eebc8de67a..46883755e6 100644 --- a/Documentation/snippets/score-for-diatonic-accordion.ly +++ b/Documentation/snippets/score-for-diatonic-accordion.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.20 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/snippets/staff-headword.ly b/Documentation/snippets/staff-headword.ly index 6e81017f84..952b5d833f 100644 --- a/Documentation/snippets/staff-headword.ly +++ b/Documentation/snippets/staff-headword.ly @@ -43,22 +43,13 @@ trompette = \relative do'' { do8-. r8 sib4-> | } -tambourin = \relative do' { +tambourin = \drummode { \time 2/4 - r8 do16 do do8 do | - r8 do16 do do8 do | - r8 do r do | - r8 do16 do do8 do | - r8 do r do | -} - -tambourinMidi = \drummode { - \time 2/4 - r8 tamb16 tamb tamb8 tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | + r8 tamb16 16 8 8 | + r8 16 16 8 8 | + r8 8 r8 8 | + r8 16 16 8 8 | + r8 8 r8 8 | } upper = \relative do' { @@ -110,7 +101,7 @@ lower = \relative do { \trompette } \context DrumStaff = "tambourin" { - \tambourinMidi + \tambourin } \context Staff = "piano" << \upper diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly index 8beaa131c5..6cc02b677d 100644 --- a/Documentation/snippets/unfretted-headword.ly +++ b/Documentation/snippets/unfretted-headword.ly @@ -4,7 +4,7 @@ % and then run scripts/auxiliar/makelsr.py % % This file is in the public domain. -%% Note: this file works from version 2.17.24 +%% Note: this file works from version 2.17.30 \version "2.17.30" \header { diff --git a/Documentation/usage/external.itely b/Documentation/usage/external.itely index f6cbc0980c..d6b2dfaf14 100644 --- a/Documentation/usage/external.itely +++ b/Documentation/usage/external.itely @@ -703,7 +703,7 @@ the automated method with @command{lilypond-book}. @menu * Many quotes from a large score:: -* Inserting LilyPond output into OpenOffice.org:: +* Inserting LilyPond output into OpenOffice and LibreOffice:: * Inserting LilyPond output into other programs:: @end menu @@ -714,12 +714,13 @@ If you need to quote many fragments from a large score, you can also use the clip systems feature, see @ruser{Extracting fragments of music}. -@node Inserting LilyPond output into OpenOffice.org -@unnumberedsubsec Inserting LilyPond output into OpenOffice.org +@node Inserting LilyPond output into OpenOffice and LibreOffice +@unnumberedsubsec Inserting LilyPond output into OpenOffice and LibreOffice @cindex OpenOffice.org +@cindex LibreOffice.org -LilyPond notation can be added to OpenOffice.org with +LilyPond notation can be added to OpenOffice.org and LibreOffice with @uref{http://@/ooolilypond@/.sourceforge@/.net@/,OOoLilyPond}. diff --git a/Documentation/usage/running.itely b/Documentation/usage/running.itely index 9e736bda01..7e7692c86d 100644 --- a/Documentation/usage/running.itely +++ b/Documentation/usage/running.itely @@ -664,6 +664,17 @@ point exceptions. @tab Don't use directories from input files while constructing output file names. +@item @code{strokeadjust} +@tab @code{#f} +@tab Force PostScript stroke adjustment. This option is mostly +relevant when @code{PDF} is generated from PostScript output +(stroke adjustment is usually enabled automatically for +low-resolution bitmap devices). Without this option, +@code{PDF}@tie{}previewers tend to produce widely inconsistent +stem widths at resolutions typical for screen display. The option +does not noticeably affect print quality and causes large file +size increases in @code{PDF} files. + @item @code{svg-woff} @tab @code{#f} @tab Use woff font files in SVG backend. diff --git a/Documentation/usage/updating.itely b/Documentation/usage/updating.itely index 06a960ac8a..ad92a834e3 100644 --- a/Documentation/usage/updating.itely +++ b/Documentation/usage/updating.itely @@ -151,8 +151,11 @@ The following options can be given: @item -d, --diff-version-update increase the @code{\version} string only if the file has actually been changed. In that case, the version header will correspond to -the version after the last actual change. Without that option, -the version will reflect the last @emph{attempted} conversion. +the version after the last actual change. An unstable version +number will be rounded up to the next stable version number unless +that would exceed the target version number. Without this option, +the version will instead reflect the last @emph{attempted} +conversion. @item -e, --edit Apply the conversions direct to the input file, modifying it diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi index 01172cc00f..43f4e4fc3c 100644 --- a/Documentation/web/introduction.itexi +++ b/Documentation/web/introduction.itexi @@ -142,10 +142,10 @@ simply save a file for later reference. @subsubheading Mix music and text Put fragments of music into texts without cutting and pasting -pictures. Integrate music into @LaTeX{} or HTML seamlessly, or add -music to OpenOffice.org with OOoLilyPond. Plugins are also available -to allow LilyPond code in various blogs and wikis, making online -collaboration possible. +pictures. Integrate music into @LaTeX{} and HTML seamlessly, or add +music to OpenOffice.org or LibreOffice with OOoLilyPond. Plugins are +also available to allow LilyPond code in various blogs and wikis, making +online collaboration possible. @subsubheading Accessibility @@ -497,6 +497,19 @@ Some highlights: @divClass{keep-bullets} @itemize +@item +Joe Smeets created sheet music for the children's book @emph{Zing Mee} +(@emph{Sing along}) by Annie M.G. published by Querido -- ISBN +9789045106205: +@uref{http://www.queridokinderenjeugdboeken.nl/web/Boek.htm?dbid=18954&typeofpage=134707, www.queridokinderenjeugdboeken.nl}; choir +rehearsal scores for the Dutch translation of Benjamin Britten's +@emph{Saint Nicolas} performed by @emph{Muziektheater Hollands Diep} in +2011. +@uref{http://www.muziektheaterhollandsdiep.nl/nl/voorstellingen/sint_nicolaas_leeft, www.muziektheaterhollandsdiep.nl}; and is currently +working on the score and parts for an arrangement of Moussurgsky's +@emph{Boris Godounov} for wind quartet, piano and percussion. To be +performed in 2014, again by @emph{Muziektheater Hollands Diep}. + @item A critical edition of Tommaso Traetta's @emph{Enea nel Lazio (1760)}, opera series with libretto by Vittorio Amedeo Cigna-Santi, in four @@ -1023,6 +1036,10 @@ correctly, when in fact it is working precisely as designed. More in-depth information is available in @ref{Manuals}. +Ben Lemon, a LilyPond user, has created a range of +@uref{http://benlemon.me/blog/music/lilypond/operation-lilypond/,video tutorials} +on his blog and which are aimed at new users. + @subsubheading Easier editing environments @@ -1073,7 +1090,7 @@ In particular, don't link to: @uref{http://www.tunefl.com} With tunefl you can typeset your scores directly online -without needing to install lilypond locally. It allows +without needing to install LilyPond locally. It allows trying out all the program's features using a convenient web interface. @@ -1301,7 +1318,7 @@ and @uref{http://canorus.org,Canorus}. @item @uref{http://lilycomp.sourceforge.net, LilyComp} is a graphical note entry program, acting much like a number-pad which produces -lilypond notes. +LilyPond notes. @end itemize diff --git a/Documentation/web/manuals.itexi b/Documentation/web/manuals.itexi index 956ac12976..0484ecab20 100644 --- a/Documentation/web/manuals.itexi +++ b/Documentation/web/manuals.itexi @@ -132,6 +132,11 @@ translation status for non-English readers. @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}: user-created examples, hints and tips. +@item +@uref{http://benlemon.me/blog/music/lilypond/operation-lilypond/,Video Tutorials}: +Ben Lemon, a LilyPond user, has created a range of video tutorials on +his blog and which are aimed at new users. + @item @ref{Development}: manuals for the unstable version. diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi index 8d45279fb8..0d8b05774d 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -9,17 +9,16 @@ @c used for news about the upcoming release; see CG 10.2 @newsItem -@subsubheading LilyPond 2.17.95 released! @emph{November 3, 2013} +@subsubheading LilyPond 2.17.97 released! @emph{December 8, 2013} -We are excited to announce the release of LilyPond@tie{}2.17.95 as -beta release for the upcoming stable release@tie{}2.18. The -developers are still busy finding solutions for some last-minute -problems, but the release is supposed to be feature-complete, the +We are excited to announce the release of LilyPond@tie{}2.17.97 as +a potential final beta release for the upcoming stable release@tie{}2.18. The +developers believe this to be feature-complete, the documentation to be accurate, and no important issues to be overlooked. For upgrading the syntax of your input files to the -latest version, see @rprogram{Updating files with convert-ly}. +latest version, see @uref{http://www.lilypond.org/doc/v2.17/Documentation/usage/updating-files-with-convert_002dly, Updating files with convert-ly}. Please test this release and report back any problems, see -@rweb{Bug reports}. +@uref{http://www.lilypond.org/website/bug-reports.html, Bug reports}. @newsEnd diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi index 9a548e02d5..c0a4e9f0d5 100644 --- a/Documentation/web/news.itexi +++ b/Documentation/web/news.itexi @@ -26,6 +26,35 @@ NOTE: * don't duplicate entries from news-front.itexi @end ignore +@newsItem +@subsubheading LilyPond 2.17.96 released! @emph{November 24, 2013} + +We are excited to announce the release of LilyPond@tie{}2.17.96 as +a further beta release for the upcoming stable release@tie{}2.18. The +developers believe the release to be feature-complete, the +documentation to be accurate, and no important issues to be +overlooked. For upgrading the syntax of your input files to the +latest version, see @uref{http://www.lilypond.org/doc/v2.17/Documentation/usage/updating-files-with-convert_002dly, Updating files with convert-ly}. +Please test this release and report back any problems, see +@uref{http://www.lilypond.org/website/bug-reports.html, Bug reports}. + +@newsEnd + +@newsItem +@subsubheading LilyPond 2.17.95 released! @emph{November 3, 2013} + +We are excited to announce the release of LilyPond@tie{}2.17.95 as +beta release for the upcoming stable release@tie{}2.18. The +developers are still busy finding solutions for some last-minute +problems, but the release is supposed to be feature-complete, the +documentation to be accurate, and no important issues to be +overlooked. For upgrading the syntax of your input files to the +latest version, see @rprogram{Updating files with convert-ly}. +Please test this release and report back any problems, see +@rweb{Bug reports}. + +@newsEnd + @newsItem @subsubheading LilyPond 2.17.29 released! @emph{October 20, 2013} diff --git a/Documentation/web/server/tweets.xml b/Documentation/web/server/tweets.xml index 71609b7c38..d6f425ed24 100644 --- a/Documentation/web/server/tweets.xml +++ b/Documentation/web/server/tweets.xml @@ -16,4 +16,10 @@ about them on his <a href="http://benlemon.me/blog/music/lilypond/operation-lilypond/">blog</a>. + + Server Acim, composer and professor of Composition and Conducting + in İnönü University - Malatya, Turkey, wrote the + Turkish Ebook <a href="http://yadi.sk/d/fNmncSQ3DR3Ck"> + "GNU/LilyPond, Özgür Bir Nota Yazma Programı"</a>. + diff --git a/VERSION b/VERSION index e2867ac71c..2db7fe3c6d 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 -MINOR_VERSION=17 -PATCH_LEVEL=96 +MINOR_VERSION=19 +PATCH_LEVEL=0 MY_PATCH_LEVEL= VERSION_STABLE=2.16.2 -VERSION_DEVEL=2.17.95 +VERSION_DEVEL=2.17.97 diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh index e7f29a8fcb..8275b92930 100644 --- a/flower/include/std-vector.hh +++ b/flower/include/std-vector.hh @@ -30,6 +30,7 @@ #endif #endif +#include "config.hh" /* needed at least for HAVE_STL_DATA_METHOD */ #include /* find, reverse, sort */ #include /* unary_function */ #include diff --git a/flower/string-convert.cc b/flower/string-convert.cc index eebcd92708..745a98ecea 100644 --- a/flower/string-convert.cc +++ b/flower/string-convert.cc @@ -37,8 +37,8 @@ string String_convert::bin2hex (Byte bin_char) { string str; - str += to_string ((char) nibble2hex_byte ((Byte) (bin_char >> 4))); - str += to_string ((char) nibble2hex_byte (bin_char++)); + str += ::to_string ((char) nibble2hex_byte ((Byte) (bin_char >> 4))); + str += ::to_string ((char) nibble2hex_byte (bin_char++)); return str; } @@ -49,8 +49,8 @@ String_convert::bin2hex (const string &bin_string) Byte const *byte = (Byte const *)bin_string.data (); for (ssize i = 0; i < bin_string.length (); i++) { - str += to_string ((char)nibble2hex_byte ((Byte) (*byte >> 4))); - str += to_string ((char)nibble2hex_byte (*byte++)); + str += ::to_string ((char)nibble2hex_byte ((Byte) (*byte >> 4))); + str += ::to_string ((char)nibble2hex_byte (*byte++)); } return str; } @@ -127,7 +127,7 @@ String_convert::hex2bin (string hex_string, string &bin_string_r) int low_i = hex2nibble (*byte++); if (high_i < 0 || low_i < 0) return 1; // invalid char - bin_string_r += to_string ((char) (high_i << 4 | low_i), 1); + bin_string_r += ::to_string ((char) (high_i << 4 | low_i), 1); i += 2; } return 0; @@ -165,10 +165,10 @@ String_convert::int2dec (int i, size_t length_i, char ch) fill_char = '0'; // ugh - string dec_string = to_string (i); + string dec_string = ::to_string (i); // ugh - return to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string; + return ::to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string; } // stupido. Should use int_string () @@ -182,14 +182,14 @@ String_convert::unsigned2hex (unsigned u, size_t length, char fill_char) #if 1 // both go... while (u) { - str = to_string ((char) ((u % 16)["0123456789abcdef"])) + str; + str = ::to_string ((char) ((u % 16)["0123456789abcdef"])) + str; u /= 16; } #else str += int_string (u, "%x"); // hmm. %lx vs. %x -> portability? #endif - str = to_string (fill_char, ssize_t (length - str.length ())) + str; + str = ::to_string (fill_char, ssize_t (length - str.length ())) + str; while ((str.length () > length) && (str[ 0 ] == 'f')) str = str.substr (2); @@ -299,7 +299,7 @@ String_convert::pointer_string (void const *l) string String_convert::precision_string (double x, int n) { - string format = "%." + to_string (max (0, n - 1)) + "e"; + string format = "%." + ::to_string (max (0, n - 1)) + "e"; string str = double_string (abs (x), format.c_str ()); int exp = dec2int (str.substr (str.length () - 3)); @@ -316,9 +316,9 @@ String_convert::precision_string (double x, int n) str = str.substr (0, 1) + str.substr (2); ssize dot = 1 + exp; if (dot <= 0) - str = "0." + to_string ('0', -dot) + str; + str = "0." + ::to_string ('0', -dot) + str; else if (dot >= str.length ()) - str += to_string ('0', dot - str.length ()); + str += ::to_string ('0', dot - str.length ()); else if ((dot > 0) && (dot < str.length ())) str = str.substr (0, dot) + "." + str.substr (dot); else diff --git a/input/regression/auto-beam-exceptions.ly b/input/regression/auto-beam-exceptions.ly index 676bb3aafb..b7d553b123 100644 --- a/input/regression/auto-beam-exceptions.ly +++ b/input/regression/auto-beam-exceptions.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.0" \header { @@ -11,40 +11,20 @@ \relative c' { \time 2/4 - \set Score.beamExceptions = #'( - ( end . - ( - ( (1 . 32) . (4 4 4 4) ) - ) - ) - ) + \set Score.beamExceptions = + \beamExceptions \repeat unfold 4 { 32[ 32 32 32] } \repeat unfold 16 c32 \time 3/4 - \set Score.beamExceptions = #'( - ( end . - ( - ( (1 . 32) . (4 4 4 4 4 4) ) - ) - ) - ) + \set Score.beamExceptions = + \beamExceptions \repeat unfold 6 { 32[ 32 32 32] } \repeat unfold 24 c32 c8 c32 c32 c32 c32 c16 c16 c32 c32 c32 c32 c16 c32 c32 c32 c32 c32 c32 \time 4/4 - \set Score.beamExceptions = #'( - ( end . - ( - ( (1 . 32) . (4 4 4 4 4 4 4 4) ) - ) - ) - ) + \set Score.beamExceptions = + \beamExceptions \repeat unfold 8 { 32[ 32 32 32] } \repeat unfold 32 c32 \time 6/8 - \set Score.beamExceptions = #'( - ( end . - ( - ( (1 . 32) . (4 4 4 4 4 4) ) - ) - ) - ) + \set Score.beamExceptions = + \beamExceptions \repeat unfold 6 { 32[ 32 32 32] } \repeat unfold 24 c32 } diff --git a/input/regression/chord-dots.ly b/input/regression/chord-dots.ly new file mode 100644 index 0000000000..957788d4bc --- /dev/null +++ b/input/regression/chord-dots.ly @@ -0,0 +1,17 @@ +\version "2.17.16" + +\header { + texidoc = +"The column of dots on a chord is limited to the height +of the chord plus @code{chord-dots-limit} staff-positions." +} + +\layout{ ragged-right = ##t } + +\new Staff \transpose c c' { + \override Staff.DotColumn.chord-dots-limit = #1 + << + { 4. r8 4. r8 } \\ + { f4.. r16 4.. r16} + >> +} diff --git a/input/regression/completion-heads-factor.ly b/input/regression/completion-heads-factor.ly index 79510e1484..cc29f58d4e 100644 --- a/input/regression/completion-heads-factor.ly +++ b/input/regression/completion-heads-factor.ly @@ -1,12 +1,12 @@ -\version "2.16.0" +\version "2.19.0" \header{ texidoc=" If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engraver}, -notes with a duration factor still keep their requested appearance. - -" +long notes, longer than @code{measureLength}, are split into un-scaled notes, +even if the original note used a scale-factor. +@code{completionFactor} controls this behavior." } \layout { ragged-right= ##t } @@ -20,5 +20,11 @@ notes with a duration factor still keep their requested appearance. c\breve | c1*2 | c2*4 | - c8*20 + c8*20 r2 \break + \tuplet 3/2 { d1 d d } + % \breve*2/3 is longer than a measure, but we want a tuplet, not repeats. + \set completionFactor = ##f + \tuplet 3/2 { e\breve e e } + \set completionFactor = #2/3 + \tuplet 3/2 { e\breve e e } } diff --git a/input/regression/completion-rest.ly b/input/regression/completion-rest.ly index e39e17aff8..365b7372e2 100644 --- a/input/regression/completion-rest.ly +++ b/input/regression/completion-rest.ly @@ -1,12 +1,12 @@ -\version "2.16.0" +\version "2.19.0" \header{ texidoc=" If the @code{Rest_engraver} is replaced by the @code{Completion_rest_engraver}, -rests with a duration factor still keep their requested appearance. - -" +long rests, longer than @code{measureLength}, are split into +un-scaled rests, even if the original duration used a scale-factor. +@code{completionFactor} controls this behavior." } \layout { ragged-right= ##t } @@ -20,5 +20,9 @@ rests with a duration factor still keep their requested appearance. r\breve | r1*2 | r2*4 | - r8*20 + r8*20 r2 \break + \bar "||" \time 2/4 + r\breve.*2/3 + \set completionFactor = #1/2 + r\breve.*2/3^"explicity request r1*1/2 rests" } diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index a4abc604d1..10dccdded2 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -183,6 +183,9 @@ stderr of this run." \test ##[ \tuplet 3/2 { c4 d e \tuplet 5/2 { f4 e d2 d4 } c4 } #] \test ##[ \tuplet 3/2 2 { c4 d e \tuplet 5/2 2 { f4 e d2 d4 } c4 } #] +%% pure rhythm +\test ##[ { 4 4 8 \tuplet 3/2 { 8[ 16] } 16 } #] + %% \relative and \tranpose \test #"NOT A BUG" ##[ \relative c' { c b } #] % RelativeOctaveMusic \test #"NOT A BUG" ##[ \transpose c d { c d } #] % TransposedMusic diff --git a/input/regression/header-score-reordered.ly b/input/regression/header-score-reordered.ly new file mode 100644 index 0000000000..acbe127e21 --- /dev/null +++ b/input/regression/header-score-reordered.ly @@ -0,0 +1,22 @@ +\version "2.19.0" +\header { + texidoc=" +Header blocks may appear before and after the actual music in a score. +" +} + +\markup \vspace #3 +\markup { \bold Note: expect piece and opus. } +\markup \vspace #3 + +\score { + \header { + piece = "Piece correct (set in score)" + opus = "Opus incorrect (to be superseded at score level)" + } + \new Staff { c'1 } + \header { + % This should NOT overwrite the piece from above! + opus = "Opus correct (superseded at score level)" + } +} diff --git a/input/regression/les-nereides.ly b/input/regression/les-nereides.ly index c87772419d..61b79eccd4 100644 --- a/input/regression/les-nereides.ly +++ b/input/regression/les-nereides.ly @@ -1,4 +1,4 @@ -\version "2.17.10" +\version "2.19.0" \header { composer = "ARTHUR GRAY" @@ -233,8 +233,9 @@ middleDynamics = { theScore = \score{ \context PianoStaff << \new Staff = "treble" << - \set beamExceptions = #'((end . (((1 . 8) . (2 2 2 2)) - ((1 . 32) . (4 4 4 4 4 4 4 4))))) + \set beamExceptions = + \beamExceptions { 8[ 8] 8[ 8] 8[ 8] 8[ 8] | + \repeat unfold 8 { 32[ 32 32 32] } } \treble \trebleTwo >> diff --git a/input/regression/make-relative-copies.ly b/input/regression/make-relative-copies.ly new file mode 100644 index 0000000000..93c9fe9c8e --- /dev/null +++ b/input/regression/make-relative-copies.ly @@ -0,0 +1,29 @@ +\header { + texidoc = "@code{make-relative} has to copy its argument expressions +in case the generated music expression is getting copied and modified. + +The code here defines a @code{\\reltranspose} function working inside +of @code{\\relative} and uses it. Both staves should appear +identical." +} + +\layout { + ragged-right = ##t +} + +reltranspose = +#(define-music-function (parser location from to music) + (ly:pitch? ly:pitch? ly:music?) + (make-relative (music) music + #{ \transpose #from #to $music #})) + +mus = +\reltranspose c g { + \partial 4. c8 e g | + c2 r8 c, e g c1 | \bar "|." +} + +<< + \new Staff \relative \mus + \new Staff \relative \mus +>> diff --git a/input/regression/make-relative-music.ly b/input/regression/make-relative-music.ly new file mode 100644 index 0000000000..58266b2b35 --- /dev/null +++ b/input/regression/make-relative-music.ly @@ -0,0 +1,32 @@ +\version "2.19.0" + +\header { + texidoc = "@code{make-relative} can make relativization on music +function calls behave as one would expect from looking at the +function's arguments rather than at the actually resulting +expressions. This regtest defines an example function +@code{\\withOctave} which works equally well inside and outside of +@code{\\relative}." +} + +withOctave = +#(define-music-function (parser location music) + (ly:music?) + (make-relative + (music) music + #{ \context Bottom << $music \transpose c c' $music >> #})) + +mus = { + \partial 4. c'8 e g | + c2 e,4 g | + c,8 c' b a | + 1 | \bar "|." +} + +<< + \relative \new Staff { <>^"original" \mus } + \relative \new Staff { <>^\markup \typewriter "\\relative \\withOctave" + \withOctave \mus } + \new Staff { <>^\markup \typewriter "\\withOctave \\relative" + \withOctave \relative \mus } +>> diff --git a/input/regression/make-relative.ly b/input/regression/make-relative.ly index 706bdb9adc..04bbed3900 100644 --- a/input/regression/make-relative.ly +++ b/input/regression/make-relative.ly @@ -1,4 +1,4 @@ -\version "2.17.11" +\version "2.19.0" \header { texidoc = "@code{make-relative} is a Scheme utility macro mainly @@ -16,7 +16,7 @@ The fragment should appear identical in both cases." ph = #(define-music-function (parser location p1 p2 p3 p4 p5) (ly:pitch? ly:pitch? ly:pitch? ly:pitch? ly:pitch?) - (make-relative (p1 p2 p3 p4 p5) p1 + (make-relative (p1 p2 p3 p4 p5) (make-event-chord (list p1 p2 p3 p4 p5)) #{ \repeat unfold 2 { $p1 2 } | \repeat unfold 2 { r16 $p2 8. ~ $p2 4 } | diff --git a/input/regression/midi-grace-after-rest.ly b/input/regression/midi-grace-after-rest.ly new file mode 100644 index 0000000000..8a99cddcfc --- /dev/null +++ b/input/regression/midi-grace-after-rest.ly @@ -0,0 +1,14 @@ +\header { + texidoc = "Grace notes shorten previous notes only if they'd overlap +them. The A should be a full quarter note, but the C should be shortened +to 1/4 - 9/40 * 1/8 = 71/320 (rounded down to 340/384 in MIDI)." +} +\version "2.18.0" +\score { + \relative c' { + a4 r + \grace b8 c8... r64 + \grace d8 e4 + } + \midi { } +} diff --git a/input/regression/optional-args.ly b/input/regression/optional-args.ly index 83ebf7886a..c92c6a143b 100644 --- a/input/regression/optional-args.ly +++ b/input/regression/optional-args.ly @@ -1,4 +1,4 @@ -\version "2.17.15" +\version "2.19.0" \header{ texidoc= "Test optional music function arguments. @@ -10,23 +10,18 @@ the rest is skipped." \layout { ragged-right = ##t } -% Get following pitch into Scheme -pitch = #(define-scheme-function (parser location p) (ly:pitch?) p) -% The same with a duration -dur = #(define-scheme-function (parser location p) (ly:duration?) p) - % Just like \relative, but defaulting to f as reference, making the % first note of the music the same as if written as absolute pitch ablative = #(define-music-function (parser location ref music) - ((ly:pitch? #{ \pitch f #}) ly:music?) + ((ly:pitch? #{ f #}) ly:music?) #{ \relative $ref $music #}) % Let's take a duration and four pitches, defaulting to 2 c' d' e' zap = #(define-music-function (parser location dur a b c d) - ((ly:duration? #{ \dur 2 #}) (ly:pitch? #{ \pitch c' #}) - (ly:pitch? #{ \pitch d' #}) (ly:pitch? #{ \pitch e' #}) + ((ly:duration? #{ 2 #}) (ly:pitch? #{ c' #}) + (ly:pitch? #{ d' #}) (ly:pitch? #{ e' #}) ly:music?) #{ $a $dur $b $c ^\markup{!} $d #}) \new Voice { \relative c' e' \relative c' { e' } \ablative c' e' \ablative { e' } diff --git a/input/regression/rhythmic-sequence.ly b/input/regression/rhythmic-sequence.ly new file mode 100644 index 0000000000..df647ce7d1 --- /dev/null +++ b/input/regression/rhythmic-sequence.ly @@ -0,0 +1,11 @@ +\version "2.19.0" + +\header { + texidoc = "Durations without pitches are placed into note events +without pitch information. Those are directly useful in +@code{RhythmicStaff}." +} + +\layout { ragged-right = ##t } + +\new RhythmicStaff { 4 4. r | 4 \tuplet 3/2 { 2 4 } 4 } diff --git a/input/regression/score-lines.ly b/input/regression/score-lines.ly new file mode 100644 index 0000000000..edb300fff7 --- /dev/null +++ b/input/regression/score-lines.ly @@ -0,0 +1,40 @@ +\version "2.19.0" + +\header { + texidoc = "The @code{\\score-lines} markup returns individual score +lines as stencils rather than a single stencil. Calling a function +like @code{\\rotate} on @code{\\score-lines} rotates the lines +individually, as contrasted with rotating an entire @code{\\score} +markup." +} + +\markup \fill-line { + \null + \column \rotate #-15 { + \score-lines + { + \new Staff \with { instrumentName = \markup \typewriter + "\\score-lines" } + \repeat unfold 16 c'4 + \layout { + short-indent = 0 + indent = 0 + line-width = 4\cm + } + } + } + \column \rotate #-15 { + \score + { + \new Staff \with { instrumentName = \markup \typewriter + "\\score" } + \repeat unfold 16 c'4 + \layout { + short-indent = 0 + indent = 0 + line-width = 4\cm + } + } + } + \null +} diff --git a/input/regression/tablature-slurs-with-beams.ly b/input/regression/tablature-slurs-with-beams.ly index 1425ed6807..69d68c0fa9 100644 --- a/input/regression/tablature-slurs-with-beams.ly +++ b/input/regression/tablature-slurs-with-beams.ly @@ -1,4 +1,4 @@ -\version "2.17.20" +\version "2.19.0" \header { @@ -10,7 +10,8 @@ either automatic or manual beaming. guitarSolo = { \time 3/4 - \set Timing.beamExceptions = #'((end . (((1 . 8) . (4 2))))) + \set Timing.beamExceptions = + \beamExceptions { 8[ 8 8 8] 8[ 8] } << {bes'2( aes'8-. r)} \\ {r8 cis(-\tag #'beam [ b f'-\tag #'beam ]) -. r} diff --git a/lily/accidental.cc b/lily/accidental.cc index ce05dfff72..3d2906ee85 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -163,15 +163,17 @@ Accidental_interface::get_stencil (Grob *me) SCM alist = me->get_property ("glyph-name-alist"); SCM alt = me->get_property ("alteration"); SCM glyph_name = ly_assoc_get (alt, alist, SCM_BOOL_F); + Stencil mol; if (!scm_is_string (glyph_name)) { me->warning (_f ("Could not find glyph-name for alteration %s", ly_scm_write_string (alt).c_str ())); - return SCM_EOL; + mol = fm->find_by_name ("noteheads.s1cross"); } + else + mol = fm->find_by_name (ly_scm2string (glyph_name)); - Stencil mol (fm->find_by_name (ly_scm2string (glyph_name))); if (to_boolean (me->get_property ("restore-first"))) { /* diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 8a2a8d9b81..266016d573 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -61,85 +61,73 @@ Align_interface::align_to_ideal_distances (SCM smob) return SCM_BOOL_T; } -/* for each grob, find its upper and lower skylines. If the grob has - an empty extent, delete it from the list instead. If the extent is - non-empty but there is no skyline available (or pure is true), just +/* Return upper and lower skylines for VerticalAxisGroup g. If the extent + is non-empty but there is no skyline available (or pure is true), just create a flat skyline from the bounding box */ // TODO(jneem): the pure and non-pure parts seem to share very little // code. Split them into 2 functions, perhaps? -static void -get_skylines (Grob *me, - vector *const elements, +static Skyline_pair +get_skylines (Grob *g, Axis a, - bool pure, int start, int end, - vector *const ret) + Grob *other_common, + bool pure, int start, int end) { - Grob *other_common = common_refpoint_of_array (*elements, me, other_axis (a)); + Skyline_pair skylines; - for (vsize i = elements->size (); i--;) + if (!pure) { - Grob *g = (*elements)[i]; - Skyline_pair skylines; - - if (!pure) - { - Skyline_pair *skys = Skyline_pair::unsmob (g->get_property (a == Y_AXIS - ? "vertical-skylines" - : "horizontal-skylines")); - if (skys) - skylines = *skys; - - /* This skyline was calculated relative to the grob g. In order to compare it to - skylines belonging to other grobs, we need to shift it so that it is relative - to the common reference. */ - Real offset = g->relative_coordinate (other_common, other_axis (a)); - skylines.shift (offset); - } - else + Skyline_pair *skys = Skyline_pair::unsmob (g->get_property (a == Y_AXIS + ? "vertical-skylines" + : "horizontal-skylines")); + if (skys) + skylines = *skys; + + /* This skyline was calculated relative to the grob g. In order to compare it to + skylines belonging to other grobs, we need to shift it so that it is relative + to the common reference. */ + Real offset = g->relative_coordinate (other_common, other_axis (a)); + skylines.shift (offset); + } + else if (Hara_kiri_group_spanner::request_suicide (g, start, end)) + return skylines; + else + { + assert (a == Y_AXIS); + Interval extent = g->pure_height (g, start, end); + + // This is a hack to get better accuracy on the pure-height of VerticalAlignment. + // It's quite common for a treble clef to be the highest element of one system + // and for a low note (or lyrics) to be the lowest note on another. The two will + // never collide, but the pure-height stuff only works with bounding boxes, so it + // doesn't know that. The result is a significant over-estimation of the pure-height, + // especially on systems with many staves. To correct for this, we build a skyline + // in two parts: the part we did above contains most of the grobs (note-heads, etc.) + // while the bit we're about to do only contains the breakable grobs at the beginning + // of the system. This way, the tall treble clefs are only compared with the treble + // clefs of the other staff and they will be ignored if the staff above is, for example, + // lyrics. + if (Axis_group_interface::has_interface (g)) { - assert (a == Y_AXIS); - Interval extent = g->pure_height (g, start, end); - - // This is a hack to get better accuracy on the pure-height of VerticalAlignment. - // It's quite common for a treble clef to be the highest element of one system - // and for a low note (or lyrics) to be the lowest note on another. The two will - // never collide, but the pure-height stuff only works with bounding boxes, so it - // doesn't know that. The result is a significant over-estimation of the pure-height, - // especially on systems with many staves. To correct for this, we build a skyline - // in two parts: the part we did above contains most of the grobs (note-heads, etc.) - // while the bit we're about to do only contains the breakable grobs at the beginning - // of the system. This way, the tall treble clefs are only compared with the treble - // clefs of the other staff and they will be ignored if the staff above is, for example, - // lyrics. - if (Axis_group_interface::has_interface (g) - && !Hara_kiri_group_spanner::request_suicide (g, start, end)) - { - extent = Axis_group_interface::rest_of_line_pure_height (g, start, end); - Interval begin_of_line_extent = Axis_group_interface::begin_of_line_pure_height (g, start); - if (!begin_of_line_extent.is_empty ()) - { - Box b; - b[a] = begin_of_line_extent; - b[other_axis (a)] = Interval (-infinity_f, -1); - skylines.insert (b, other_axis (a)); - } - } - - if (!extent.is_empty ()) + extent = Axis_group_interface::rest_of_line_pure_height (g, start, end); + Interval begin_of_line_extent = Axis_group_interface::begin_of_line_pure_height (g, start); + if (!begin_of_line_extent.is_empty ()) { Box b; - b[a] = extent; - b[other_axis (a)] = Interval (0, infinity_f); + b[a] = begin_of_line_extent; + b[other_axis (a)] = Interval (-infinity_f, -1); skylines.insert (b, other_axis (a)); } } - if (skylines.is_empty ()) - elements->erase (elements->begin () + i); - else - ret->push_back (skylines); + if (!extent.is_empty ()) + { + Box b; + b[a] = extent; + b[other_axis (a)] = Interval (0, infinity_f); + skylines.insert (b, other_axis (a)); + } } - reverse (*ret); + return skylines; } vector @@ -177,7 +165,7 @@ Align_interface::get_minimum_translations_without_min_dist (Grob *me, // else centered dynamics will break when there is a fixed alignment). vector Align_interface::internal_get_minimum_translations (Grob *me, - vector const &all_grobs, + vector const &elems, Axis a, bool include_fixed_spacing, bool pure, int start, int end) @@ -204,15 +192,14 @@ Align_interface::internal_get_minimum_translations (Grob *me, Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); - vector elems (all_grobs); // writable copy - vector skylines; - get_skylines (me, &elems, a, pure, start, end, &skylines); + Grob *other_common = common_refpoint_of_array (elems, me, other_axis (a)); Real where = 0; Real default_padding = robust_scm2double (me->get_property ("padding"), 0.0); vector translates; Skyline down_skyline (stacking_dir); + Grob *last_nonempty_element = 0; Real last_spaceable_element_pos = 0; Grob *last_spaceable_element = 0; Skyline last_spaceable_skyline (stacking_dir); @@ -222,14 +209,26 @@ Align_interface::internal_get_minimum_translations (Grob *me, Real dy = 0; Real padding = default_padding; - if (j == 0) - dy = skylines[j][-stacking_dir].max_height () + padding; + Skyline_pair skyline = get_skylines (elems[j], a, other_common, pure, start, end); + + if (skyline.is_empty ()) + { + translates.push_back (where); + continue; + } + + if (!last_nonempty_element) + { + dy = skyline[-stacking_dir].max_height () + padding; + for (vsize k = j; k-- > 0;) + translates[k] = stacking_dir * dy; + } else { - SCM spec = Page_layout_problem::get_spacing_spec (elems[j - 1], elems[j], pure, start, end); + SCM spec = Page_layout_problem::get_spacing_spec (last_nonempty_element, elems[j], pure, start, end); Page_layout_problem::read_spacing_spec (spec, &padding, ly_symbol2scm ("padding")); - dy = down_skyline.distance (skylines[j][-stacking_dir]) + padding; + dy = down_skyline.distance (skyline[-stacking_dir]) + padding; Real spec_distance = 0; if (Page_layout_problem::read_spacing_spec (spec, &spec_distance, ly_symbol2scm ("minimum-distance"))) @@ -249,7 +248,7 @@ Align_interface::internal_get_minimum_translations (Grob *me, Page_layout_problem::read_spacing_spec (spec, &spaceable_padding, ly_symbol2scm ("padding")); - dy = max (dy, (last_spaceable_skyline.distance (skylines[j][-stacking_dir]) + dy = max (dy, (last_spaceable_skyline.distance (skyline[-stacking_dir]) + stacking_dir * (last_spaceable_element_pos - where) + spaceable_padding)); Real spaceable_min_distance = 0; @@ -263,12 +262,9 @@ Align_interface::internal_get_minimum_translations (Grob *me, } } - if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */ - dy = 0.0; - dy = max (0.0, dy); down_skyline.raise (-stacking_dir * dy); - down_skyline.merge (skylines[j][stacking_dir]); + down_skyline.merge (skyline[stacking_dir]); where += stacking_dir * dy; translates.push_back (where); @@ -279,32 +275,18 @@ Align_interface::internal_get_minimum_translations (Grob *me, last_spaceable_element_pos = where; last_spaceable_skyline = down_skyline; } - } - - // So far, we've computed the translates for all the non-empty elements. - // Here, we set the translates for the empty elements: an empty element - // gets the same translation as the last non-empty element before it. - vector all_translates; - if (!translates.empty ()) - { - Real w = translates[0]; - for (vsize i = 0, j = 0; j < all_grobs.size (); j++) - { - if (i < elems.size () && all_grobs[j] == elems[i]) - w = translates[i++]; - all_translates.push_back (w); - } + last_nonempty_element = elems[j]; } if (pure) { SCM mta = me->get_property ("minimum-translations-alist"); mta = scm_cons (scm_cons (scm_cons (scm_from_int (start), scm_from_int (end)), - ly_floatvector2scm (all_translates)), + ly_floatvector2scm (translates)), mta); me->set_property ("minimum-translations-alist", mta); } - return all_translates; + return translates; } void diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 018d9cd22d..4de173da06 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -163,7 +163,7 @@ Arpeggio::print (SCM smob) if (dir) { Font_metric *fm = Font_interface::get_default_font (me); - arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir)); + arrow = fm->find_by_name ("scripts.arpeggio.arrow." + ::to_string (dir)); heads[dir] -= dir * arrow.extent (Y_AXIS).length (); } diff --git a/lily/audio-item.cc b/lily/audio-item.cc index a41357b28f..7934c34c4a 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -44,11 +44,13 @@ Audio_item::Audio_item () { } -Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing) +Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing, + int velocity) : pitch_ (p), length_mom_ (m), transposing_ (transposing), dynamic_ (0), + extra_velocity_ (velocity), tied_ (0), tie_event_ (tie_event) { diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 52a7d6c0bd..bddca70abb 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -188,25 +188,24 @@ Completion_heads_engraver::process_music () note that note_dur may be strictly less than left_to_do_ (say, if left_to_do_ == 5/8) */ - if (factor_.denominator () == 1 && factor_ > Rational (1, 1)) - note_dur = Duration (left_to_do_, false); - else - note_dur = Duration (left_to_do_ / factor_, false).compressed (factor_); + note_dur = Duration (left_to_do_ / factor_, false).compressed (factor_); } else { orig = unsmob_duration (note_events_[0]->get_property ("duration")); note_dur = *orig; - factor_ = note_dur.factor (); + SCM factor = get_property ("completionFactor"); + if (ly_is_procedure (factor)) + factor = scm_call_2 (factor, + context ()->self_scm (), + note_dur.smobbed_copy ()); + factor_ = robust_scm2rational (factor, note_dur.factor ()); left_to_do_ = orig->get_length (); } Moment nb = next_moment (note_dur.get_length ()); if (nb.main_part_ && nb < note_dur.get_length ()) { - if (factor_.denominator () == 1 && factor_.numerator () > 1) - note_dur = Duration (nb.main_part_, false); - else - note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_); + note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_); } do_nothing_until_ = now.main_part_ + note_dur.get_length (); @@ -314,6 +313,7 @@ ADD_TRANSLATOR (Completion_heads_engraver, "TieColumn ", /* read */ + "completionFactor " "completionUnit " "measureLength " "measurePosition " diff --git a/lily/completion-rest-engraver.cc b/lily/completion-rest-engraver.cc index 61255226ea..aeb6673f37 100644 --- a/lily/completion-rest-engraver.cc +++ b/lily/completion-rest-engraver.cc @@ -184,25 +184,24 @@ Completion_rest_engraver::process_music () note that rest_dur may be strictly less than left_to_do_ (say, if left_to_do_ == 5/8) */ - if (factor_.denominator () == 1 && factor_ > Rational (1, 1)) - rest_dur = Duration (left_to_do_, false); - else - rest_dur = Duration (left_to_do_ / factor_, false).compressed (factor_); + rest_dur = Duration (left_to_do_ / factor_, false).compressed (factor_); } else { orig = unsmob_duration (rest_events_[0]->get_property ("duration")); rest_dur = *orig; - factor_ = rest_dur.factor (); + SCM factor = get_property ("completionFactor"); + if (ly_is_procedure (factor)) + factor = scm_call_2 (factor, + context ()->self_scm (), + rest_dur.smobbed_copy ()); + factor_ = robust_scm2rational (factor, rest_dur.factor()); left_to_do_ = orig->get_length (); } Moment nb = next_moment (rest_dur.get_length ()); if (nb.main_part_ && nb < rest_dur.get_length ()) { - if (factor_.denominator () == 1 && factor_.numerator () > 1) - rest_dur = Duration (nb.main_part_, false); - else - rest_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_); + rest_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_); } do_nothing_until_ = now.main_part_ + rest_dur.get_length (); @@ -268,6 +267,7 @@ ADD_TRANSLATOR (Completion_rest_engraver, "Rest ", /* read */ + "completionFactor " "completionUnit " "middleCPosition " "measurePosition " diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 6cba432639..9b4a3831b0 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -59,7 +59,7 @@ Dot_column::calc_positioning_done (SCM smob) vector dots = extract_grob_array (me, "dots"); - vector main_heads; + vector parent_stems; Real ss = 0; Grob *commonx = me; @@ -73,7 +73,7 @@ Dot_column::calc_positioning_done (SCM smob) commonx = stem->common_refpoint (commonx, X_AXIS); if (Stem::first_head (stem) == n) - main_heads.push_back (n); + parent_stems.push_back (stem); } } @@ -83,8 +83,8 @@ Dot_column::calc_positioning_done (SCM smob) extract_grob_set (me, "side-support-elements", support); Interval base_x; - for (vsize i = 0; i < main_heads.size (); i++) - base_x.unite (main_heads[i]->extent (commonx, X_AXIS)); + for (vsize i = 0; i < parent_stems.size (); i++) + base_x.unite (Stem::first_head (parent_stems[i])->extent (commonx, X_AXIS)); for (vsize i = 0; i < support.size (); i++) { @@ -152,6 +152,36 @@ Dot_column::calc_positioning_done (SCM smob) we instead must use their pure Y positions. */ vector_sort (dots, pure_position_less); + + SCM chord_dots_limit = me->get_property ("chord-dots-limit"); + if (scm_is_number (chord_dots_limit)) + { + // Sort dots by stem, then check for dots above the limit for each stem + vector > dots_each_stem (parent_stems.size ()); + for (vsize i = 0; i < dots.size (); i++) + if (Grob *stem = unsmob_grob (dots[i]->get_parent (Y_AXIS) + -> get_object ("stem"))) + for (vsize j = 0; j < parent_stems.size (); j++) + if (stem == parent_stems[j]) + { + dots_each_stem[j].push_back (dots[i]); + break; + } + for (vsize j = 0; j < parent_stems.size (); j++) + { + Interval chord = Stem::head_positions (parent_stems[j]); + int total_room = ((int) chord.length () + 2 + + scm_to_int (chord_dots_limit)) / 2; + int total_dots = dots_each_stem[j].size (); + // remove excessive dots from the ends of the stem + for (int first_dot = 0; total_dots > total_room; total_dots--) + if (0 == (total_dots - total_room) % 2) + dots_each_stem[j][first_dot++]->suicide (); + else + dots_each_stem[j][first_dot + total_dots - 1]->suicide (); + } + } + for (vsize i = dots.size (); i--;) { if (!dots[i]->is_live ()) @@ -236,6 +266,7 @@ ADD_INTERFACE (Dot_column, " dots so they do not clash with staff lines.", /* properties */ + "chord-dots-limit " "dots " "positioning-done " "direction " diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index 94c2d55ea3..09ab3f7cf4 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -62,9 +62,9 @@ Drum_note_performer::process_music () { SCM articulations = n->get_property ("articulations"); Stream_event *tie_event = 0; - for (SCM s = articulations; - !tie_event && scm_is_pair (s); - s = scm_cdr (s)) + Moment len = get_event_length (n, now_mom ()); + int velocity = 0; + for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s)) { Stream_event *ev = unsmob_stream_event (scm_car (s)); if (!ev) @@ -72,12 +72,16 @@ Drum_note_performer::process_music () if (ev->in_event_class ("tie-event")) tie_event = ev; + SCM f = ev->get_property ("midi-length"); + if (ly_is_procedure (f)) + len = robust_scm2moment (scm_call_2 (f, len.smobbed_copy (), + context ()->self_scm ()), + len); + velocity += robust_scm2int (ev->get_property ("midi-extra-velocity"), 0); } - Moment len = get_event_length (n, now_mom ()); - Audio_note *p = new Audio_note (*pit, len, - tie_event, Pitch (0, 0, 0)); + tie_event, Pitch (0, 0, 0), velocity); Audio_element_info info (p, n); announce_element (info); } diff --git a/lily/flag.cc b/lily/flag.cc index 31ddf349c9..f4fcce8e0e 100644 --- a/lily/flag.cc +++ b/lily/flag.cc @@ -105,7 +105,7 @@ Flag::glyph_name (SCM smob) char dir = (d == UP) ? 'u' : 'd'; string font_char = flag_style - + to_string (dir) + staffline_offs + to_string (log); + + ::to_string (dir) + staffline_offs + ::to_string (log); return ly_string2scm ("flags." + font_char); } @@ -143,11 +143,11 @@ Flag::print (SCM smob) string stroke_style = ly_scm2string (stroke_style_scm); if (!stroke_style.empty ()) { - string font_char = flag_style + to_string (dir) + stroke_style; + string font_char = flag_style + ::to_string (dir) + stroke_style; Stencil stroke = fm->find_by_name ("flags." + font_char); if (stroke.is_empty ()) { - font_char = to_string (dir) + stroke_style; + font_char = ::to_string (dir) + stroke_style; stroke = fm->find_by_name ("flags." + font_char); } if (stroke.is_empty ()) diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 40e165dd6d..1d9007441b 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -236,7 +236,8 @@ Hairpin::print (SCM smob) } else { - if (Note_column::has_interface (b) + if (d == RIGHT // end at the left edge of a rest + && Note_column::has_interface (b) && Note_column::has_rests (b)) x_points[d] = e[-d]; else diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 43ed2e05a9..9ded5301a1 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -82,7 +82,7 @@ public: class Audio_note : public Audio_item { public: - Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition); + Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition, int velocity); // with tieWaitForNote, there might be a skip between the tied notes! void tie_to (Audio_note *, Moment skip = 0); @@ -93,6 +93,7 @@ public: Moment length_mom_; Pitch transposing_; Audio_dynamic *dynamic_; + int extra_velocity_; Audio_note *tied_; bool tie_event_; diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh index 4bc4cbe887..9659abbd19 100644 --- a/lily/include/lily-lexer.hh +++ b/lily/include/lily-lexer.hh @@ -49,7 +49,6 @@ private: Keyword_table *keytable_; SCM scopes_; SCM start_module_; - int hidden_state_; Input override_input_; SCM eval_scm (SCM, char extra_token = 0); public: @@ -94,7 +93,9 @@ public: SCM keyword_list () const; SCM lookup_identifier (const string &s); SCM lookup_identifier_symbol (SCM s); - void push_extra_token (int token_type, SCM scm = SCM_UNSPECIFIED); + void push_extra_token (Input const &where, + int token_type, SCM scm = SCM_UNSPECIFIED); + int pop_extra_token (); void push_chord_state (SCM alist); void push_figuredbass_state (); void push_lyric_state (); diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh index 75b1ae8e46..7db1ba417c 100644 --- a/lily/include/slur-score-parameters.hh +++ b/lily/include/slur-score-parameters.hh @@ -40,6 +40,8 @@ struct Slur_score_parameters Real free_head_distance_; Real extra_encompass_collision_distance_; Real extra_encompass_free_distance_; + Real gap_to_staffline_inside_; + Real gap_to_staffline_outside_; Real absolute_closeness_measure_; Real edge_slope_exponent_; Real close_to_edge_length_; diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh index e5ff38d611..2fc069b902 100644 --- a/lily/include/slur-scoring.hh +++ b/lily/include/slur-scoring.hh @@ -100,6 +100,7 @@ struct Slur_score_state Drul_array base_attachments_; vector configurations_; Real staff_space_; + Real line_thickness_; Real thickness_; Slur_score_state (); diff --git a/lily/input.cc b/lily/input.cc index a091ef9855..2b29c828ba 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -142,7 +142,7 @@ string Input::line_number_string () const { if (source_file_) - return to_string (source_file_->get_line (start_)); + return ::to_string (source_file_->get_line (start_)); return "?"; } diff --git a/lily/lexer.ll b/lily/lexer.ll index 285de24267..51a33fbb4b 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -123,7 +123,6 @@ SCM (* scm_parse_error_handler) (void *); %option never-interactive %option warn -%x extratoken %x chords %x figures %x incl @@ -186,36 +185,6 @@ BOM_UTF8 \357\273\277 // swallow and ignore carriage returns } -{ANY_CHAR} { - /* Generate a token without swallowing anything */ - - /* First unswallow the eaten character */ - add_lexed_char (-YYLeng ()); - yyless (0); - - /* produce requested token */ - int type = scm_to_int (scm_caar (extra_tokens_)); - yylval = scm_cdar (extra_tokens_); - extra_tokens_ = scm_cdr (extra_tokens_); - if (scm_is_null (extra_tokens_)) - yy_pop_state (); - - return type; -} - -<> { - /* Generate a token without swallowing anything */ - - /* produce requested token */ - int type = scm_to_int (scm_caar (extra_tokens_)); - yylval = scm_cdar (extra_tokens_); - extra_tokens_ = scm_cdr (extra_tokens_); - if (scm_is_null (extra_tokens_)) - yy_pop_state (); - - return type; -} - /* Use the trailing context feature. Otherwise, the BOM will not be found if the file starts with an identifier definition. */ {BOM_UTF8}/.* { @@ -673,6 +642,10 @@ BOM_UTF8 \357\273\277 yylval = SCM_UNSPECIFIED; return SCORE; } + \\score-lines { + yylval = SCM_UNSPECIFIED; + return SCORELINES; + } \\\" { start_command_quote (); } @@ -713,17 +686,17 @@ BOM_UTF8 \357\273\277 // value (for token type MARKUP_FUNCTION or // MARKUP_LIST_FUNCTION). - push_extra_token(EXPECT_NO_MORE_ARGS); + push_extra_token (here_input (), EXPECT_NO_MORE_ARGS); s = scm_cdr(s); for (; scm_is_pair(s); s = scm_cdr(s)) { SCM predicate = scm_car(s); if (predicate == ly_lily_module_constant ("markup-list?")) - push_extra_token(EXPECT_MARKUP_LIST); + push_extra_token (here_input (), EXPECT_MARKUP_LIST); else if (predicate == ly_lily_module_constant ("markup?")) - push_extra_token(EXPECT_MARKUP); + push_extra_token (here_input (), EXPECT_MARKUP); else - push_extra_token(EXPECT_SCM, predicate); + push_extra_token (here_input (), EXPECT_SCM, predicate); } return token_type; } @@ -842,15 +815,25 @@ BOM_UTF8 \357\273\277 /* Make the lexer generate a token of the given type as the next token. TODO: make it possible to define a value for the token as well */ void -Lily_lexer::push_extra_token (int token_type, SCM scm) +Lily_lexer::push_extra_token (Input const &where, int token_type, SCM scm) +{ + extra_tokens_ = scm_cons (scm_cons2 (make_input (where), + scm_from_int (token_type), + scm), extra_tokens_); +} + +int +Lily_lexer::pop_extra_token () { if (scm_is_null (extra_tokens_)) - { - if (YY_START != extratoken) - hidden_state_ = YY_START; - yy_push_state (extratoken); - } - extra_tokens_ = scm_acons (scm_from_int (token_type), scm, extra_tokens_); + return -1; + + /* produce requested token */ + yylloc = *unsmob_input (scm_caar (extra_tokens_)); + int type = scm_to_int (scm_cadar (extra_tokens_)); + yylval = scm_cddar (extra_tokens_); + extra_tokens_ = scm_cdr (extra_tokens_); + return type; } void @@ -891,32 +874,17 @@ Lily_lexer::push_markup_state () void Lily_lexer::push_note_state (SCM alist) { - bool extra = (YYSTATE == extratoken); - SCM p = scm_assq (alist, pitchname_tab_stack_); - if (extra) - yy_pop_state (); - if (scm_is_false (p)) p = scm_cons (alist, alist_to_hashq (alist)); pitchname_tab_stack_ = scm_cons (p, pitchname_tab_stack_); yy_push_state (notes); - - if (extra) { - hidden_state_ = YYSTATE; - yy_push_state (extratoken); - } } void Lily_lexer::pop_state () { - bool extra = (YYSTATE == extratoken); - - if (extra) - yy_pop_state (); - if (YYSTATE == notes || YYSTATE == chords) pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_); @@ -924,10 +892,6 @@ Lily_lexer::pop_state () if (YYSTATE != maininput) yy_pop_state (); - if (extra) { - hidden_state_ = YYSTATE; - yy_push_state (extratoken); - } } int @@ -954,7 +918,7 @@ Lily_lexer::scan_escaped_word (const string &str) SCM sid = lookup_identifier (str); if (Music *m = unsmob_music (sid)) { - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } if (sid != SCM_UNDEFINED) @@ -974,7 +938,7 @@ Lily_lexer::scan_shorthand (const string &str) SCM sid = lookup_identifier (str); if (Music *m = unsmob_music (sid)) { - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } if (sid != SCM_UNDEFINED) @@ -1013,7 +977,7 @@ Lily_lexer::scan_scm_id (SCM sid) funtype = SCM_FUNCTION; else programming_error ("Bad syntax function predicate"); - push_extra_token (EXPECT_NO_MORE_ARGS); + push_extra_token (here_input (), EXPECT_NO_MORE_ARGS); for (s = scm_cdr (s); scm_is_pair (s); s = scm_cdr (s)) { SCM optional = SCM_UNDEFINED; @@ -1026,14 +990,14 @@ Lily_lexer::scan_scm_id (SCM sid) } if (ly_is_procedure (cs)) - push_extra_token (EXPECT_SCM, cs); + push_extra_token (here_input (), EXPECT_SCM, cs); else { programming_error ("Function parameter without type-checking predicate"); continue; } if (!scm_is_eq (optional, SCM_UNDEFINED)) - push_extra_token (EXPECT_OPTIONAL, optional); + push_extra_token (here_input (), EXPECT_OPTIONAL, optional); } return funtype; } @@ -1071,10 +1035,7 @@ Lily_lexer::scan_bare_word (const string &str) int Lily_lexer::get_state () const { - if (YY_START == extratoken) - return hidden_state_; - else - return YY_START; + return YY_START; } bool @@ -1140,7 +1101,7 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) if (Music *m = unsmob_music (v)) { if (!unsmob_input (m->get_property ("origin"))) - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } int token; @@ -1148,10 +1109,12 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) case '$': token = scan_scm_id (v); if (!scm_is_eq (yylval, SCM_UNSPECIFIED)) - push_extra_token (token, yylval); + push_extra_token (here_input (), + token, yylval); break; case '#': - push_extra_token (SCM_IDENTIFIER, v); + push_extra_token (here_input (), + SCM_IDENTIFIER, v); break; } } @@ -1163,7 +1126,7 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) if (Music *m = unsmob_music (sval)) { if (!unsmob_input (m->get_property ("origin"))) - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } return sval; diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index cd7819e9c8..65906beeef 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -167,7 +167,7 @@ Lily_parser::parse_string_expression (const string &ly_code, const string &filen SCM mod = lexer_->set_current_scope (); SCM parser = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parser")); lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ()); - lexer_->push_extra_token (EMBEDDED_LILY); + lexer_->push_extra_token (Input (), EMBEDDED_LILY); SCM result = do_yyparse (); lexer_->set_identifier (ly_symbol2scm ("parser"), parser); diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index 3bffcb841c..4695eef986 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -168,7 +168,7 @@ internal_brew_primitive (Grob *me) duration_log--; case MLP_BREVIS: duration_log--; - suffix = to_string (duration_log) + color + suffix = ::to_string (duration_log) + color + (duration_log < -1 ? "lig" : "") + "mensural"; index = prefix + "s"; out = fm->find_by_name (index + "r" + suffix); diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 54d00ff683..f98e3d05e1 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -193,8 +193,10 @@ Midi_time_signature::to_string () const Midi_note::Midi_note (Audio_note *a) : Midi_channel_item (a), audio_ (a), - dynamic_byte_ (a->dynamic_ && a->dynamic_->volume_ >= 0 - ? Byte (a->dynamic_->volume_ * 0x7f) : Byte (0x5a)) + dynamic_byte_ (min (max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0 + ? a->dynamic_->volume_ * 0x7f : 0x5a) + + a->extra_velocity_), + Byte (0)), Byte (0x7f))) { } diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index b97630b0d1..0ae5265bd3 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -58,7 +58,9 @@ Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track) index_ = 0; items_ = audio_staff->audio_items_; vector_sort (items_, audio_item_less); - last_tick_ = 0; + //Pieces that begin with grace notes start at negative times. This + //is OK - MIDI output doesn't use absolute ticks, only differences. + last_tick_ = items_.empty () ? 0 : items_[0]->audio_column_->ticks (); percussion_ = audio_staff->percussion_; merge_unisons_ = audio_staff->merge_unisons_; } diff --git a/lily/music.cc b/lily/music.cc index eea6a9ca81..629986d346 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -211,20 +211,6 @@ transpose_mutable (SCM alist, Pitch delta) if (Pitch *p = unsmob_pitch (val)) { Pitch transposed = p->transposed (delta); - if (transposed.get_alteration ().abs () > Rational (1, 1)) - { - string delta_str; - if (delta.get_alteration ().abs () > Rational (1, 1)) - delta_str = (delta.normalized ().to_string () - + " " + _ ("(normalized pitch)")); - else - delta_str = delta.to_string (); - - warning (_f ("Transposing %s by %s makes alteration larger than double", - p->to_string (), - delta_str)); - transposed = transposed.normalized (); - } if (prop == ly_symbol2scm ("tonic")) transposed = Pitch (-1, transposed.get_notename (), diff --git a/lily/note-head.cc b/lily/note-head.cc index 4bf8168eb1..5d8352e72d 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -38,7 +38,7 @@ internal_print (Grob *me, string *font_char) { string style = robust_symbol2string (me->get_property ("style"), "default"); - string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + string suffix = ::to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); if (style != "default") suffix = robust_scm2string (me->get_property ("glyph-name"), ""); diff --git a/lily/note-performer.cc b/lily/note-performer.cc index ddf9fe3921..81f35d70ac 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -36,6 +36,7 @@ protected: void process_music (); DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (breathing); private: vector note_evs_; vector notes_; @@ -65,9 +66,9 @@ Note_performer::process_music () { SCM articulations = n->get_property ("articulations"); Stream_event *tie_event = 0; - for (SCM s = articulations; - !tie_event && scm_is_pair (s); - s = scm_cdr (s)) + Moment len = get_event_length (n, now_mom ()); + int velocity = 0; + for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s)) { Stream_event *ev = unsmob_stream_event (scm_car (s)); if (!ev) @@ -75,19 +76,23 @@ Note_performer::process_music () if (ev->in_event_class ("tie-event")) tie_event = ev; + SCM f = ev->get_property ("midi-length"); + if (ly_is_procedure (f)) + len = robust_scm2moment (scm_call_2 (f, len.smobbed_copy (), + context ()->self_scm ()), + len); + velocity += robust_scm2int (ev->get_property ("midi-extra-velocity"), 0); } - Moment len = get_event_length (n, now_mom ()); - Audio_note *p = new Audio_note (*pitp, len, - tie_event, transposing); + tie_event, transposing, velocity); Audio_element_info info (p, n); announce_element (info); notes_.push_back (p); /* - Shorten previous note. If it was part of a tie, shorten - the first note in the tie. + Grace notes shorten the previous non-grace note. If it was + part of a tie, shorten the first note in the tie. */ if (now_mom ().grace_part_) { @@ -96,7 +101,11 @@ Note_performer::process_music () for (vsize i = 0; i < last_notes_.size (); i++) { Audio_note *tie_head = last_notes_[i]->tie_head (); - tie_head->length_mom_ += Moment (0, now_mom ().grace_part_); + Moment start = tie_head->audio_column_->when (); + //Shorten the note if it would overlap. It might + //not if there's a rest in between. + if (start + tie_head->length_mom_ > now_mom ()) + tie_head->length_mom_ = now_mom () - start; } } } @@ -124,6 +133,26 @@ Note_performer::listen_note (Stream_event *ev) note_evs_.push_back (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, breathing) +void +Note_performer::listen_breathing (Stream_event *ev) +{ + //Shorten previous note if needed + SCM f = ev->get_property ("midi-length"); + if (ly_is_procedure (f)) + for (vsize i = 0; i < last_notes_.size (); i++) + { + Audio_note *tie_head = last_notes_[i]->tie_head (); + //Give midi-length the available time since the note started, + //including rests. It returns how much is left for the note. + Moment available = now_mom () - tie_head->audio_column_->when (); + Moment len = robust_scm2moment (scm_call_2 (f, available.smobbed_copy (), + context ()->self_scm ()), available); + if (len < tie_head->length_mom_) + tie_head->length_mom_ = len; + } +} + ADD_TRANSLATOR (Note_performer, /* doc */ "", diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc index 3bddcad4ba..3ff29d01bd 100644 --- a/lily/optimal-page-breaking.cc +++ b/lily/optimal-page-breaking.cc @@ -75,7 +75,9 @@ Optimal_page_breaking::solve () if (page_count > 1 && best.systems_per_page_[page_count - 2] > 1) min_sys_count -= best.systems_per_page_[page_count - 2]; - min_sys_count = max (min_sys_count, (vsize)1); + if (min_sys_count > ideal_sys_count // subtraction wrapped around + || min_sys_count <= 0) + min_sys_count = 1; } } else diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index 9a6f8f40f2..7220857d91 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -195,7 +195,6 @@ compress_lines (const vector &orig) else { ret.push_back (orig[i]); - ret.back ().force_ = 0; } } return ret; @@ -632,7 +631,11 @@ Page_breaking::make_pages (vector lines_per_page, SCM systems) else config = layout.solution (rag); - last_page_force = layout.force (); + if ((ragged () && layout.force () < 0.0) + || isinf (layout.force ())) + warning (_f ("page %d has been compressed", page_num)); + else + last_page_force = layout.force (); systems_configs_fncounts = scm_cons (scm_cons (lines, config), systems_configs_fncounts); footnote_count += fn_lines; @@ -1169,9 +1172,8 @@ Page_breaking::min_page_count (vsize configuration, vsize first_page_num) cur_page_height -= min_whitespace_at_top_of_page (cached_line_details_[page_starter]); cur_page_height -= min_whitespace_at_bottom_of_page (cached_line_details_.back ()); - Real cur_height = cur_rod_height + ((ragged_last () || ragged ()) ? cur_spring_height : 0); if (!too_few_lines (line_count - cached_line_details_.back ().compressed_nontitle_lines_count_) - && cur_height > cur_page_height + && cur_rod_height > cur_page_height /* don't increase the page count if the last page had only one system */ && cur_rod_height > cached_line_details_.back ().full_height ()) ret++; @@ -1437,7 +1439,9 @@ Page_breaking::finalize_spacing_result (vsize configuration, Page_spacing_result line_penalty += uncompressed_line_details_[i].break_penalty_; } - for (vsize i = 0; i < res.force_.size (); i++) + for (vsize i = ragged () ? res.force_.size () - 1 : 0; + i < res.force_.size () - ragged_last (); + i++) { Real f = res.force_[i]; @@ -1545,9 +1549,11 @@ Page_breaking::space_systems_on_2_pages (vsize configuration, vsize first_page_n page1_penalty[i] = line_count_penalty (page1_line_count); page1_status[i] = line_count_status (page1_line_count); - if (ragged2) + if (ragged1) page2_force[page2_force.size () - 1 - i] = (page2.force_ < 0 && i + 1 < page1_force.size ()) ? infinity_f : 0; + else if (ragged2 && page2.force_ > 0) + page2_force[page2_force.size () - 1 - i] = 0.0; else page2_force[page2_force.size () - 1 - i] = page2.force_; page2_penalty[page2_penalty.size () - 1 - i] = line_count_penalty (page2_line_count); diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc index 5885a66135..8b0be3a5f7 100644 --- a/lily/page-layout-problem.cc +++ b/lily/page-layout-problem.cc @@ -728,12 +728,12 @@ Page_layout_problem::solve_rod_spring_problem (bool ragged, Real fixed_force) Real overflow = spacer.configuration_length (spacer.force ()) - page_height_; if (ragged && overflow < 1e-6) - warning (_ ("cannot fit music on page: ragged-spacing was requested, but page was compressed")); + warning (_ ("ragged-bottom was specified, but page must be compressed")); else { - warning (_f ("cannot fit music on page: overflow is %f", + warning (_f ("compressing over-full page by %.1f staff-spaces", overflow)); - warning (_ ("compressing music to fit")); + force_ = -infinity_f; vsize space_count = solution_.size (); Real spacing_increment = overflow / (space_count - 2); for (vsize i = 2; i < space_count; i++) diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc index a705827d22..a2915febb2 100644 --- a/lily/page-spacing.cc +++ b/lily/page-spacing.cc @@ -329,7 +329,7 @@ Page_spacer::calc_subproblem (vsize page, vsize line) space.prepend_system (lines_[page_start]); bool overfull = (space.rod_height_ > paper_height - || (ragged + || (ragged_ && (space.rod_height_ + space.spring_len_ > paper_height))); // This 'if' statement is a little hard to parse. It won't consider this configuration // if it is overfull unless the current configuration is the first one with this start diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc index 2055214c82..047ba6a82f 100644 --- a/lily/page-turn-page-breaking.cc +++ b/lily/page-turn-page-breaking.cc @@ -232,7 +232,7 @@ Page_turn_page_breaking::solve () for (vsize i = 0; i < last_break_position (); i++) { calc_subproblem (i); - progress_indication (string ("[") + to_string (i + 1) + "]"); + progress_indication (string ("[") + ::to_string (i + 1) + "]"); } progress_indication ("\n"); diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc index cdbb2e8b00..cb39f58d1e 100644 --- a/lily/paper-column-engraver.cc +++ b/lily/paper-column-engraver.cc @@ -50,7 +50,7 @@ void Paper_column_engraver::finalize () { if (! (breaks_ % 8)) - progress_indication ("[" + to_string (breaks_) + "]"); + progress_indication ("[" + ::to_string (breaks_) + "]"); if (!made_columns_) { @@ -269,7 +269,7 @@ Paper_column_engraver::stop_translation_timestep () breaks_++; if (! (breaks_ % 8)) - progress_indication ("[" + to_string (breaks_) + "]"); + progress_indication ("[" + ::to_string (breaks_) + "]"); } context ()->get_score_context ()->unset_property (ly_symbol2scm ("forbidBreak")); diff --git a/lily/paper-column.cc b/lily/paper-column.cc index d586058fa0..4379ce1a1d 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -237,7 +237,7 @@ Paper_column::print (SCM p) { Paper_column *me = dynamic_cast (unsmob_grob (p)); - string r = to_string (Paper_column::get_rank (me)); + string r = ::to_string (Paper_column::get_rank (me)); Moment *mom = unsmob_moment (me->get_property ("when")); string when = mom ? mom->to_string () : "?/?"; diff --git a/lily/parser.yy b/lily/parser.yy index ab09f537b2..65ed8e3fb8 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -62,7 +62,7 @@ deleting them. Let's hope that a stack overflow doesn't trigger a move of the parse stack onto the heap. */ %left PREC_BOT -%nonassoc REPEAT REPEAT_IDENTIFIER +%nonassoc REPEAT %nonassoc ALTERNATIVE /* The above precedences tackle the shift/reduce problem @@ -81,7 +81,7 @@ or %left ADDLYRICS %right ':' UNSIGNED REAL E_UNSIGNED EVENT_IDENTIFIER EVENT_FUNCTION '^' '_' - HYPHEN EXTENDER DURATION_IDENTIFIER + HYPHEN EXTENDER DURATION_IDENTIFIER '!' /* The above are needed for collecting tremoli and other items (that could otherwise be interpreted as belonging to the next function @@ -146,32 +146,36 @@ Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const str parser->parser_error (*i, s); } +// The following are somewhat precarious constructs as they may change +// the value of the lookahead token. That implies that the lookahead +// token must not yet have made an impact on the state stack other +// than causing the reduction of the current rule, or switching the +// lookahead token while Bison is mulling it over will cause trouble. + #define MYBACKUP(Token, Value, Location) \ -do \ - if (yychar == YYEMPTY) \ - { \ + do { \ + if (yychar != YYEMPTY) \ + parser->lexer_->push_extra_token \ + (yylloc, yychar, yylval); \ if (Token) \ - parser->lexer_->push_extra_token (Token, Value); \ - parser->lexer_->push_extra_token (BACKUP); \ - } else { \ - parser->parser_error \ - (Location, _("Too much lookahead")); \ - } \ -while (0) + parser->lexer_->push_extra_token \ + (Location, Token, Value); \ + parser->lexer_->push_extra_token (Location, BACKUP); \ + yychar = YYEMPTY; \ + } while (0) #define MYREPARSE(Location, Pred, Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - parser->lexer_->push_extra_token (Token, Value); \ - parser->lexer_->push_extra_token (REPARSE, \ - Pred); \ - } else { \ - parser->parser_error \ - (Location, _("Too much lookahead")); \ - } \ -while (0) + do { \ + if (yychar != YYEMPTY) \ + parser->lexer_->push_extra_token \ + (yylloc, yychar, yylval); \ + parser->lexer_->push_extra_token \ + (Location, Token, Value); \ + parser->lexer_->push_extra_token \ + (Location, REPARSE, Pred); \ + yychar = YYEMPTY; \ + } while (0) %} @@ -269,6 +273,7 @@ int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); %token REST "\\rest" %token REVERT "\\revert" %token SCORE "\\score" +%token SCORELINES "\\score-lines" %token SEQUENTIAL "\\sequential" %token SET "\\set" %token SIMULTANEOUS "\\simultaneous" @@ -325,7 +330,6 @@ If we give names, Bison complains. %token EMBEDDED_LILY "#{" %token BOOK_IDENTIFIER -%token CHORD_BODY_IDENTIFIER %token CHORD_MODIFIER %token CHORD_REPETITION %token CONTEXT_DEF_IDENTIFIER @@ -347,7 +351,6 @@ If we give names, Bison complains. %token NUMBER_IDENTIFIER %token OUTPUT_DEF_IDENTIFIER %token REAL -%token REPEAT_IDENTIFIER %token RESTNAME %token SCM_ARG %token SCM_FUNCTION @@ -405,6 +408,13 @@ toplevel_expression: SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler"); scm_call_2 (proc, parser->self_scm (), $1); } + | BOOK_IDENTIFIER { + SCM proc = parser->lexer_->lookup_identifier + (unsmob_book($1)->paper_ + ? "toplevel-book-handler" + : "toplevel-bookpart-handler"); + scm_call_2 (proc, parser->self_scm (), $1); + } | score_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); scm_call_2 (proc, parser->self_scm (), $1); @@ -436,6 +446,10 @@ toplevel_expression: { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); scm_call_2 (proc, parser->self_scm (), out); + } else if (unsmob_score ($1)) + { + SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); + scm_call_2 (proc, parser->self_scm (), $1); } else if (!scm_is_eq ($1, SCM_UNSPECIFIED)) parser->parser_error (@1, _("bad expression type")); } @@ -473,6 +487,7 @@ embedded_scm_bare_arg: { $$ = parser->lexer_->eval_scm_token ($1); } + | FRACTION | full_markup_list | context_modification | score_block @@ -511,6 +526,18 @@ scm_function_call: } ; +embedded_lilypond_number: + '-' embedded_lilypond_number + { + $$ = scm_difference ($2, SCM_UNDEFINED); + } + | bare_number_common + | UNSIGNED NUMBER_IDENTIFIER + { + $$ = scm_product ($1, $2); + } + ; + embedded_lilypond: /* empty */ { @@ -520,7 +547,31 @@ embedded_lilypond: // contains no source location. $$ = MAKE_SYNTAX ("void-music", @$); } - | identifier_init + | identifier_init_nonumber + | embedded_lilypond_number + | post_event post_events + { + $$ = scm_reverse_x ($2, SCM_EOL); + if (Music *m = unsmob_music ($1)) + { + if (m->is_mus_type ("post-event-wrapper")) + $$ = scm_append + (scm_list_2 (m->get_property ("elements"), + $$)); + else + $$ = scm_cons ($1, $$); + } + if (scm_is_pair ($$) + && scm_is_null (scm_cdr ($$))) + $$ = scm_car ($$); + else + { + Music * m = MY_MAKE_MUSIC ("PostEvents", @$); + m->set_property ("elements", $$); + $$ = m->unprotect (); + } + } + | multiplied_duration | music_embedded music_embedded music_list { $3 = scm_reverse_x ($3, SCM_EOL); if (unsmob_music ($2)) @@ -577,12 +628,8 @@ assignment: identifier_init: - score_block - | book_block - | bookpart_block - | output_def - | context_def_spec_block - | music_assign + identifier_init_nonumber + | number_expression | post_event_nofinger post_events { $$ = scm_reverse_x ($2, SCM_EOL); @@ -605,7 +652,16 @@ identifier_init: $$ = m->unprotect (); } } - | number_expression + ; + +identifier_init_nonumber: + score_block + | book_block + | bookpart_block + | output_def + | context_def_spec_block + | music_assign + | pitch_or_music | FRACTION | string | embedded_scm @@ -746,6 +802,10 @@ book_body: { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); scm_call_2 (proc, $1, out); + } else if (unsmob_score ($2)) + { + SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); + scm_call_2 (proc, $1, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); } @@ -812,6 +872,10 @@ bookpart_body: { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); scm_call_2 (proc, $1, out); + } else if (unsmob_score ($2)) + { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); + scm_call_2 (proc, $1, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); } @@ -831,27 +895,69 @@ bookpart_body: score_block: SCORE '{' score_body '}' { + unsmob_score ($3)->origin ()->set_spot (@$); $$ = $3; } ; +score_headers: + /* empty */ + { + $$ = SCM_EOL; + } + | score_headers + { + if (!scm_is_pair ($1) + || !ly_is_module (scm_car ($1))) + $1 = scm_cons (ly_make_module (false), $1); + parser->lexer_->add_scope (scm_car ($1)); + } lilypond_header + { + $$ = $1; + } + | score_headers output_def + { + Output_def *od = unsmob_output_def ($2); + if (od->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) + { + parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); + + } + else + { + if (scm_is_pair ($1) && ly_is_module (scm_car ($1))) + scm_set_cdr_x ($1, scm_cons ($2, scm_cdr ($1))); + else + $$ = scm_cons ($2, $1); + } + } + ; + + + score_body: - music { + score_headers music { SCM scorify = ly_lily_module_constant ("scorify-music"); - $$ = scm_call_2 (scorify, $1, parser->self_scm ()); + $$ = scm_call_2 (scorify, $2, parser->self_scm ()); - unsmob_score ($$)->origin ()->set_spot (@$); + if (scm_is_pair ($1) && ly_is_module (scm_car ($1))) + { + unsmob_score ($$)->set_header (scm_car ($1)); + $1 = scm_cdr ($1); + } + for (SCM p = scm_reverse_x ($1, SCM_EOL); + scm_is_pair (p); p = scm_cdr (p)) + { + unsmob_score ($$)-> + add_output_def (unsmob_output_def (scm_car (p))); + } } | embedded_scm_active { - Score *score; - if (unsmob_score ($1)) - score = new Score (*unsmob_score ($1)); - else { - score = new Score; + if (!unsmob_score ($1)) + { + $$ = (new Score)->unprotect (); parser->parser_error (@1, _("score expected")); } - unsmob_score ($$)->origin ()->set_spot (@$); - $$ = score->unprotect (); } | score_body { @@ -937,7 +1043,7 @@ output_def_head_with_mode_switch: // is still time to escape from notes mode. music_or_context_def: - music_arg + music_assign | context_def_spec_block ; @@ -1020,8 +1126,17 @@ braced_music_list: } ; -music: music_arg +music: music_assign | lyric_element_music + | pitch_or_music + { + $$ = make_music_from_simple (parser, @1, $1); + if (!unsmob_music ($$)) + { + parser->parser_error (@1, _ ("music expected")); + $$ = MAKE_SYNTAX ("void-music", @$); + } + } ; music_embedded: @@ -1040,6 +1155,18 @@ music_embedded: { $$ = $3; } + | multiplied_duration post_events + { + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); + + parser->default_duration_ = *unsmob_duration ($1); + n->set_property ("duration", $1); + + if (scm_is_pair ($2)) + n->set_property ("articulations", + scm_reverse_x ($2, SCM_EOL)); + $$ = n->unprotect (); + } ; music_embedded_backup: @@ -1064,19 +1191,8 @@ music_embedded_backup: } ; -music_arg: - simple_music - { - $$ = make_music_from_simple (parser, @1, $1); - if (!unsmob_music ($$)) - { - parser->parser_error (@1, _ ("music expected")); - $$ = MAKE_SYNTAX ("void-music", @$); - } - } - | composite_music %prec COMPOSITE - ; - +// music_assign does not need to contain lyrics: there are no +// assignments in lyricmode. music_assign: simple_music | composite_music %prec COMPOSITE @@ -1087,20 +1203,10 @@ repeated_music: { $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL); } - | REPEAT_IDENTIFIER music - { - $$ = MAKE_SYNTAX ("repeat", @$, scm_car ($1), scm_cdr ($1), - $2, SCM_EOL); - } | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list { $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6); } - | REPEAT_IDENTIFIER music ALTERNATIVE braced_music_list - { - $$ = MAKE_SYNTAX ("repeat", @$, scm_car ($1), scm_cdr ($1), - $2, $4); - } ; sequential_music: @@ -1161,7 +1267,7 @@ context_modification: ; context_modification_arg: - embedded_scm_closed + embedded_scm | MUSIC_IDENTIFIER ; @@ -1199,16 +1305,6 @@ composite_music: | music_bare ; -/* Music that can be parsed without lookahead */ -closed_music: - music_bare - | complex_music_prefix closed_music - { - $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); - } - | music_function_call_closed - ; - music_bare: mode_changed_music | MUSIC_IDENTIFIER @@ -1248,13 +1344,6 @@ grouped_music_list: * will match and whether or not \default will be appearing in the * argument list, and where. * - * Many of the basic nonterminals used for argument list scanning come - * in a "normal" and a "closed" flavor. A closed expression is one - * that can be parsed without a lookahead token. That makes it - * feasible for an optional argument that may need to be skipped: - * skipping can only be accomplished by pushing back the token into - * the lexer, and that only works when there is no lookahead token. - * * Sequences of 0 or more optional arguments are scanned using either * function_arglist_backup or function_arglist_nonbackup. The first * is used when optional arguments are followed by at least one @@ -1280,71 +1369,6 @@ grouped_music_list: * */ -function_arglist_nonbackup_common: - EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup FRACTION - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup post_event_nofinger - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' UNSIGNED - { - SCM n = scm_difference ($5, SCM_UNDEFINED); - if (scm_is_true (scm_call_1 ($2, n))) - $$ = scm_cons (n, $3); - else { - Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5); - t->set_property ("digit", $5); - $$ = check_scheme_arg (parser, @4, t->unprotect (), - $3, $2, n); - } - - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' REAL - { - $$ = check_scheme_arg (parser, @4, - scm_difference ($5, SCM_UNDEFINED), - $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' NUMBER_IDENTIFIER - { - $$ = check_scheme_arg (parser, @4, - scm_difference ($5, SCM_UNDEFINED), - $3, $2); - } - ; - -function_arglist_closed_nonbackup: - function_arglist_nonbackup_common - | function_arglist_closed_common - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup embedded_scm_arg_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup bare_number_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup SCM_IDENTIFIER - { - $$ = check_scheme_arg (parser, @4, - try_string_variants ($2, $4), - $3, $2, $4); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup STRING - { - $$ = check_scheme_arg (parser, @4, - try_string_variants ($2, $4), - $3, $2, $4); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup full_markup - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - ; - symbol_list_arg: SYMBOL_LIST | SYMBOL_LIST '.' symbol_list_rev @@ -1384,8 +1408,36 @@ symbol_list_element: function_arglist_nonbackup: - function_arglist_nonbackup_common - | function_arglist_common + function_arglist_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup post_event_nofinger + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' UNSIGNED + { + SCM n = scm_difference ($5, SCM_UNDEFINED); + if (scm_is_true (scm_call_1 ($2, n))) + $$ = scm_cons (n, $3); + else { + Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5); + t->set_property ("digit", $5); + $$ = check_scheme_arg (parser, @4, t->unprotect (), + $3, $2, n); + } + + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' REAL + { + $$ = check_scheme_arg (parser, @4, + scm_difference ($5, SCM_UNDEFINED), + $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' NUMBER_IDENTIFIER + { + $$ = check_scheme_arg (parser, @4, + scm_difference ($5, SCM_UNDEFINED), + $3, $2); + } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup embedded_scm_arg { if (scm_is_true (scm_call_1 ($2, $4))) @@ -1400,6 +1452,16 @@ function_arglist_nonbackup: { $$ = check_scheme_arg (parser, @4, $4, $3, $2); } + | function_arglist_nonbackup_reparse REPARSE pitch_or_music + { + if (scm_is_true (scm_call_1 ($2, $3))) + $$ = scm_cons ($3, $1); + else + $$ = check_scheme_arg (parser, @3, + make_music_from_simple + (parser, @3, $3), + $1, $2); + } | function_arglist_nonbackup_reparse REPARSE duration_length { $$ = check_scheme_arg (parser, @3, $3, $1, $2); @@ -1440,6 +1502,28 @@ function_arglist_nonbackup_reparse: else MYREPARSE (@4, $2, SCM_ARG, $4); } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup pitch + { + $$ = $3; + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) + MYREPARSE (@4, $2, PITCH_IDENTIFIER, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup steno_tonic_pitch + { + $$ = $3; + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) + MYREPARSE (@4, $2, TONICNAME_PITCH, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); + } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup STRING { $$ = $3; @@ -1490,55 +1574,65 @@ function_arglist_nonbackup_reparse: ; +// function_arglist_backup can't occur at the end of an argument +// list. function_arglist_backup: - function_arglist_backup_common - | function_arglist_common - ; - -function_arglist_backup_common: - EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup embedded_scm_arg_closed + function_arglist_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup embedded_scm_arg { if (scm_is_true (scm_call_1 ($2, $4))) - { $$ = scm_cons ($4, $3); - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (SCM_ARG, $4, @4); + else { + $$ = make_music_from_simple (parser, @4, $4); + if (scm_is_true (scm_call_1 ($2, $$))) + $$ = scm_cons ($$, $3); + else + { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (SCM_ARG, $4, @4); + } } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup REPEAT simple_string unsigned_number + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup post_event_nofinger { - $4 = MAKE_SYNTAX ("repeat", @4, $5, $6, - MY_MAKE_MUSIC ("Music", @4)->unprotect (), - SCM_EOL); if (scm_is_true (scm_call_1 ($2, $4))) { - $$ = $3; - MYREPARSE (@4, $2, REPEAT_IDENTIFIER, scm_cons ($5, $6)); + $$ = scm_cons ($4, $3); } else { $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (REPEAT_IDENTIFIER, scm_cons ($5, $6), @4); + MYBACKUP (EVENT_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup chord_body + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup pitch { - if (scm_is_true (scm_call_1 ($2, $4))) + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) { $$ = $3; - MYREPARSE (@4, $2, CHORD_BODY_IDENTIFIER, $4); - } else { + MYREPARSE (@4, $2, PITCH_IDENTIFIER, $4); + } else if (scm_is_true (scm_call_1 ($2, $4))) + $$ = scm_cons ($4, $3); + else { $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (CHORD_BODY_IDENTIFIER, $4, @4); + MYBACKUP (PITCH_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup post_event_nofinger + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup steno_tonic_pitch { - if (scm_is_true (scm_call_1 ($2, $4))) + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) { + $$ = $3; + MYREPARSE (@4, $2, TONICNAME_PITCH, $4); + } else if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); - } else { + else { $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (EVENT_IDENTIFIER, $4, @4); + MYBACKUP (TONICNAME_PITCH, $4, @4); } } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup full_markup @@ -1589,16 +1683,6 @@ function_arglist_backup_common: MYBACKUP (NUMBER_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup FRACTION - { - if (scm_is_true (scm_call_1 ($2, $4))) - { - $$ = scm_cons ($4, $3); - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (FRACTION, $4, @4); - } - } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup '-' UNSIGNED { SCM n = scm_difference ($5, SCM_UNDEFINED); @@ -1614,7 +1698,7 @@ function_arglist_backup_common: else { $$ = scm_cons (loc_on_music (@3, $1), $3); MYBACKUP (UNSIGNED, $5, @5); - parser->lexer_->push_extra_token ('-'); + parser->lexer_->push_extra_token (@4, '-'); } } @@ -1640,38 +1724,6 @@ function_arglist_backup_common: MYBACKUP (NUMBER_IDENTIFIER, n, @5); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup PITCH_IDENTIFIER - { - if (scm_is_true (scm_call_1 ($2, $4))) - { - $$ = scm_cons ($4, $3); - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (PITCH_IDENTIFIER, $4, @4); - } - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup NOTENAME_PITCH - { - if (scm_is_true (scm_call_1 ($2, $4))) - { - MYREPARSE (@4, $2, NOTENAME_PITCH, $4); - $$ = $3; - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (NOTENAME_PITCH, $4, @4); - } - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup TONICNAME_PITCH - { - if (scm_is_true (scm_call_1 ($2, $4))) - { - MYREPARSE (@4, $2, TONICNAME_PITCH, $4); - $$ = $3; - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (TONICNAME_PITCH, $4, @4); - } - } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup DURATION_IDENTIFIER { if (scm_is_true (scm_call_1 ($2, $4))) @@ -1713,7 +1765,7 @@ function_arglist_backup_common: MYBACKUP (STRING, $4, @4); } } - | function_arglist_backup REPARSE music_assign + | function_arglist_backup REPARSE pitch_or_music { if (scm_is_true (scm_call_1 ($2, $3))) $$ = scm_cons ($3, $1); @@ -1774,11 +1826,6 @@ function_arglist_common: $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_optional FRACTION - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } | EXPECT_SCM function_arglist_optional post_event_nofinger { $$ = check_scheme_arg (parser, @3, @@ -1799,6 +1846,16 @@ function_arglist_common: $$ = check_scheme_arg (parser, @3, $3, $1, $2); } + | function_arglist_common_reparse REPARSE pitch_or_music + { + if (scm_is_true (scm_call_1 ($2, $3))) + $$ = scm_cons ($3, $1); + else + $$ = check_scheme_arg (parser, @3, + make_music_from_simple + (parser, @3, $3), + $1, $2); + } | function_arglist_common_reparse REPARSE bare_number_common { $$ = check_scheme_arg (parser, @3, @@ -1834,6 +1891,28 @@ function_arglist_common_reparse: // know the predicate to be false. MYREPARSE (@3, $1, SCM_ARG, $3); } + | EXPECT_SCM function_arglist_optional pitch + { + $$ = $2; + if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple + (parser, @3, $3)))) + MYREPARSE (@3, $1, PITCH_IDENTIFIER, $3); + else + MYREPARSE (@3, $1, SCM_ARG, $3); + } + | EXPECT_SCM function_arglist_optional steno_tonic_pitch + { + $$ = $2; + if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple + (parser, @3, $3)))) + MYREPARSE (@3, $1, TONICNAME_PITCH, $3); + else + MYREPARSE (@3, $1, SCM_ARG, $3); + } | EXPECT_SCM function_arglist_optional STRING { $$ = $2; @@ -1909,60 +1988,6 @@ function_arglist_common_reparse: } ; -function_arglist_closed: - function_arglist_closed_nonbackup - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT - { - $$ = scm_cons (loc_on_music (@4, $1), $3); - } - ; - -function_arglist_closed_common: - EXPECT_NO_MORE_ARGS { - $$ = SCM_EOL; - } - | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | EXPECT_SCM function_arglist_optional bare_number_common_closed - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | EXPECT_SCM function_arglist_optional '-' NUMBER_IDENTIFIER - { - $$ = check_scheme_arg (parser, @3, - scm_difference ($4, SCM_UNDEFINED), - $2, $1); - } - | EXPECT_SCM function_arglist_optional post_event_nofinger - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | EXPECT_SCM function_arglist_optional FRACTION - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | function_arglist_common_reparse REPARSE SCM_ARG - { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); - } - | function_arglist_common_reparse REPARSE bare_number_common_closed - { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); - } - | function_arglist_common_reparse REPARSE symbol_list_arg - { - $$ = check_scheme_arg (parser, @3, $3, $1, $2); - } - ; - function_arglist_optional: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT @@ -1980,24 +2005,6 @@ function_arglist_skip_backup: } ; -embedded_scm_closed: - embedded_scm_bare - | scm_function_call_closed - ; - -embedded_scm_arg_closed: - embedded_scm_bare_arg - | scm_function_call_closed - | closed_music - ; - -scm_function_call_closed: - SCM_FUNCTION function_arglist_closed { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); - } - ; - music_function_call: MUSIC_FUNCTION function_arglist { $$ = MAKE_SYNTAX ("music-function", @$, @@ -2155,8 +2162,8 @@ re_rhythmed_music: ; context_change: - CHANGE STRING '=' STRING { - $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4); + CHANGE symbol '=' simple_string { + $$ = MAKE_SYNTAX ("context-change", @$, $2, $4); } ; @@ -2402,10 +2409,10 @@ simple_revert_context: (scm_object_property (scm_car ($1), ly_symbol2scm ("is-grob?")))) { $$ = ly_symbol2scm ("Bottom"); - parser->lexer_->push_extra_token (SCM_IDENTIFIER, $1); + parser->lexer_->push_extra_token (@1, SCM_IDENTIFIER, $1); } else { $$ = scm_car ($1); - parser->lexer_->push_extra_token (SCM_IDENTIFIER, + parser->lexer_->push_extra_token (@1, SCM_IDENTIFIER, scm_cdr ($1)); } } @@ -2463,6 +2470,7 @@ symbol: scalar: embedded_scm_arg + | pitch_or_music | SCM_IDENTIFIER | bare_number // The following is a rather defensive variant of admitting @@ -2476,35 +2484,17 @@ scalar: { $$ = scm_difference ($2, SCM_UNDEFINED); } - | FRACTION - | STRING - | full_markup + | string ; event_chord: simple_element post_events { // Let the rhythmic music iterator sort this mess out. if (scm_is_pair ($2)) { - $$ = make_music_from_simple (parser, @1, $1); - if (unsmob_music ($$)) - unsmob_music ($$)->set_property ("articulations", - scm_reverse_x ($2, SCM_EOL)); - else - { - parser->parser_error (@1, _("music expected")); - $$ = MAKE_SYNTAX ("void-music", @1); - } + unsmob_music ($$)->set_property ("articulations", + scm_reverse_x ($2, SCM_EOL)); } } %prec ':' - | simple_chord_elements post_events { - SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - - Input i; - /* why is this giving wrong start location? -ns - * i = @$; */ - i.set_location (@1, @2); - $$ = MAKE_SYNTAX ("event-chord", i, elts); - } %prec ':' | CHORD_REPETITION optional_notemode_duration post_events { Input i; i.set_location (@1, @3); @@ -2517,7 +2507,7 @@ event_chord: $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, scm_reverse_x ($3, SCM_EOL)); } %prec ':' - | command_element + | tempo_event | note_chord_element ; @@ -2545,7 +2535,6 @@ chord_body: { $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); } - | CHORD_BODY_IDENTIFIER ; chord_body_elements: @@ -2614,38 +2603,13 @@ music_function_chord_body: | MUSIC_IDENTIFIER ; -// Event functions may only take closed arglists, otherwise it would -// not be clear whether a following postevent should be associated -// with the last argument of the event function or with the expression -// for which the function call acts itself as event. - -music_function_call_closed: - MUSIC_FUNCTION function_arglist_closed { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); - } - ; - event_function_event: - EVENT_FUNCTION function_arglist_closed { + EVENT_FUNCTION function_arglist { $$ = MAKE_SYNTAX ("music-function", @$, $1, $2); } ; -command_element: - command_event { - $$ = $1; - } - ; - -command_event: - tempo_event { - $$ = $1; - } - ; - - post_events: /* empty */ { $$ = SCM_EOL; @@ -2674,7 +2638,7 @@ post_event_nofinger: direction_less_event { $$ = $1; } - | script_dir music_function_call_closed { + | script_dir music_function_call { $$ = $2; if (!unsmob_music ($2)->is_mus_type ("post-event")) { parser->parser_error (@2, _ ("post-event expected")); @@ -2756,11 +2720,21 @@ direction_reqd_event: } | script_abbreviation { SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); - Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$); - if (scm_is_string (s)) + if (scm_is_string (s)) { + Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$); a->set_property ("articulation-type", s); - else parser->parser_error (@1, _ ("expecting string as script definition")); - $$ = a->unprotect (); + $$ = a->unprotect (); + } else { + Music *original = unsmob_music (s); + if (original && original->is_mus_type ("post-event")) { + Music *a = original->clone (); + a->set_spot (parser->lexer_->override_input (@$)); + $$ = a->unprotect (); + } else { + parser->parser_error (@1, _ ("expecting string or post-event as script definition")); + $$ = MY_MAKE_MUSIC ("PostEvents", @$)->unprotect (); + } + } } ; @@ -2824,7 +2798,14 @@ steno_tonic_pitch: pitch: steno_pitch - | PITCH_IDENTIFIER + | PITCH_IDENTIFIER quotes { + if (!scm_is_eq (SCM_INUM0, $2)) + { + Pitch p = *unsmob_pitch ($1); + p = p.transposed (Pitch (scm_to_int ($2),0,0)); + $$ = p.smobbed_copy (); + } + } ; gen_text_def: @@ -2839,7 +2820,7 @@ gen_text_def: make_simple_markup ($1)); $$ = t->unprotect (); } - | embedded_scm_closed + | embedded_scm { Music *m = unsmob_music ($1); if (m && m->is_mus_type ("post-event")) @@ -3077,15 +3058,16 @@ optional_rest: | REST { $$ = SCM_BOOL_T; } ; -simple_element: - pitch exclamations questions octave_check maybe_notemode_duration optional_rest { +pitch_or_music: + pitch exclamations questions octave_check maybe_notemode_duration optional_rest post_events { if (!parser->lexer_->is_note_state ()) parser->parser_error (@1, _ ("have to be in Note mode for notes")); if (!SCM_UNBNDP ($2) || !SCM_UNBNDP ($3) || scm_is_number ($4) || !SCM_UNBNDP ($5) - || scm_is_true ($6)) + || scm_is_true ($6) + || scm_is_pair ($7)) { Music *n = 0; if (scm_is_true ($6)) @@ -3110,11 +3092,31 @@ simple_element: n->set_property ("cautionary", SCM_BOOL_T); if (to_boolean ($2) || to_boolean ($3)) n->set_property ("force-accidental", SCM_BOOL_T); - + if (scm_is_pair ($7)) + n->set_property ("articulations", + scm_reverse_x ($7, SCM_EOL)); $$ = n->unprotect (); } - } - | DRUM_PITCH optional_notemode_duration { + } %prec ':' + | simple_chord_elements post_events { + if (scm_is_pair ($2)) { + if (unsmob_pitch ($1)) + $1 = make_chord_elements (@1, + $1, + parser->default_duration_.smobbed_copy (), + SCM_EOL); + + SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); + + $$ = MAKE_SYNTAX ("event-chord", @1, elts); + } else if (!unsmob_pitch ($1)) + $$ = MAKE_SYNTAX ("event-chord", @1, $1); + // A mere pitch drops through. + } %prec ':' + ; + +simple_element: + DRUM_PITCH optional_notemode_duration { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); @@ -3136,6 +3138,7 @@ simple_element: } ; +// Can return a single pitch rather than a list. simple_chord_elements: new_chord { if (!parser->lexer_->is_chord_state ()) @@ -3174,9 +3177,13 @@ lyric_element_music: } %prec ':' ; +// Can return a single pitch rather than a list. new_chord: - steno_tonic_pitch optional_notemode_duration { - $$ = make_chord_elements (@$, $1, $2, SCM_EOL); + steno_tonic_pitch maybe_notemode_duration { + if (SCM_UNBNDP ($2)) + $$ = $1; + else + $$ = make_chord_elements (@$, $1, $2, SCM_EOL); } | steno_tonic_pitch optional_notemode_duration chord_separator chord_items { SCM its = scm_reverse_x ($4, SCM_EOL); @@ -3240,10 +3247,10 @@ step_number: ; tempo_range: - UNSIGNED { + unsigned_number { $$ = $1; - } - | UNSIGNED '-' UNSIGNED { + } %prec ':' + | unsigned_number '-' unsigned_number { $$ = scm_cons ($1, $3); } ; @@ -3284,18 +3291,14 @@ number_factor: ; bare_number_common: - bare_number_common_closed + REAL + | NUMBER_IDENTIFIER | REAL NUMBER_IDENTIFIER { $$ = scm_product ($1, $2); } ; -bare_number_common_closed: - REAL - | NUMBER_IDENTIFIER - ; - bare_number: bare_number_common | UNSIGNED @@ -3304,14 +3307,26 @@ bare_number: } ; -bare_number_closed: - UNSIGNED - | bare_number_common_closed - ; - unsigned_number: UNSIGNED | NUMBER_IDENTIFIER + { + if (!scm_is_integer ($1) + || scm_is_true (scm_negative_p ($1))) + { + parser->parser_error (@1, _("not an unsigned integer")); + $$ = SCM_INUM0; + } + } + | embedded_scm + { + if (!scm_is_integer ($1) + || scm_is_true (scm_negative_p ($1))) + { + parser->parser_error (@1, _("not an unsigned integer")); + $$ = SCM_INUM0; + } + } ; exclamations: @@ -3326,7 +3341,13 @@ exclamations: ; questions: - { $$ = SCM_UNDEFINED; } +// This precedence rule is rather weird. It triggers when '!' is +// encountered after a pitch, and is used for deciding whether to save +// this instead for a figure modification. This should not actually +// occur in practice as pitches and figures are generated in different +// modes. Using a greedy (%right) precedence makes sure that we don't +// get stuck in a wrong interpretation. + { $$ = SCM_UNDEFINED; } %prec ':' | questions '?' { if (SCM_UNBNDP ($1)) @@ -3355,7 +3376,7 @@ full_markup: ; markup_top: - simple_markup_list { + markup_list { $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); } | markup_head_1_list simple_markup @@ -3383,7 +3404,7 @@ markup_scm: ; -simple_markup_list: +markup_list: markup_composed_list { $$ = $1; } @@ -3401,22 +3422,12 @@ markup_uncomposed_list: { $$ = $2; } - ; - -markup_list: - simple_markup_list - | markup_score - { - $$ = scm_list_1 (scm_list_2 (ly_lily_module_constant ("score-lines-markup-list"), $1)); - } - ; - -markup_score: - SCORE { + | SCORELINES { SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); parser->lexer_->push_note_state (nn); } '{' score_body '}' { - $$ = $4; + unsmob_score ($4)->origin ()->set_spot (@$); + $$ = scm_list_1 (scm_list_2 (ly_lily_module_constant ("score-lines-markup-list"), $4)); parser->lexer_->pop_state (); } ; @@ -3439,7 +3450,7 @@ markup_braced_list_body: | markup_braced_list_body markup { $$ = scm_cons ($2, $1); } - | markup_braced_list_body simple_markup_list { + | markup_braced_list_body markup_list { $$ = scm_reverse_x ($2, $1); } ; @@ -3454,7 +3465,7 @@ markup_command_basic_arguments: EXPECT_MARKUP_LIST markup_command_list_arguments markup_list { $$ = scm_cons ($3, $2); } - | EXPECT_SCM markup_command_list_arguments embedded_scm_closed { + | EXPECT_SCM markup_command_list_arguments embedded_scm { $$ = check_scheme_arg (parser, @3, $3, $2, $1); } | EXPECT_NO_MORE_ARGS { @@ -3488,6 +3499,14 @@ simple_markup: STRING { $$ = make_simple_markup ($1); } + | SCORE { + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); + } '{' score_body '}' { + unsmob_score ($4)->origin ()->set_spot (@$); + $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4); + parser->lexer_->pop_state (); + } | MARKUP_FUNCTION markup_command_basic_arguments { $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL)); } @@ -3495,10 +3514,6 @@ simple_markup: { $$ = $2; } - | markup_score - { - $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $1); - } ; markup: @@ -3580,6 +3595,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *destination = p->self_scm (); p->unprotect (); return OUTPUT_DEF_IDENTIFIER; + } else if (unsmob_score (sid)) { + *destination = unsmob_score (sid)->clone ()->unprotect (); + return SCM_IDENTIFIER; } return -1; @@ -3736,9 +3754,12 @@ make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) parser->default_duration_.smobbed_copy ()); } else if (parser->lexer_->is_chord_state ()) { if (unsmob_pitch (simple)) - return make_chord_elements (loc, simple, - parser->default_duration_.smobbed_copy (), - SCM_EOL); + return MAKE_SYNTAX + ("event-chord", + loc, + make_chord_elements (loc, simple, + parser->default_duration_.smobbed_copy (), + SCM_EOL)); } return simple; } @@ -3801,6 +3822,9 @@ yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser) lex->lexval_ = s; lex->lexloc_ = loc; + int tok = lex->pop_extra_token (); + if (tok >= 0) + return tok; lex->prepare_for_next_token (); return lex->yylex (); } diff --git a/lily/partial-iterator.cc b/lily/partial-iterator.cc index 7c3b3e965b..681479a69e 100644 --- a/lily/partial-iterator.cc +++ b/lily/partial-iterator.cc @@ -38,14 +38,34 @@ Partial_iterator::process (Moment m) if (Duration * dur = unsmob_duration (get_music ()->get_property ("duration"))) { - Context *ctx = get_outlet (); - Moment now = ctx->now_mom (); - if (now.main_part_ > Rational (0)) - get_music ()->origin ()-> - warning (_ ("trying to use \\partial after the start of a piece")); - Moment length = Moment (dur->get_length ()); - now = Moment (0, now.grace_part_); - ctx->set_property ("measurePosition", (now - length).smobbed_copy ()); + // Partial_iterator is an iterator rather than an engraver, so + // the active context it is getting called in does not depend on + // which context definition the engraver might be defined. + // + // Using where_defined to find the context where measurePosition + // should be overwritten does not actually work since the + // Timing_translator does not set measurePosition when + // initializing. + + Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"), + get_outlet ()->self_scm (), + ly_symbol2scm ("Timing"))); + + if (!timing) + programming_error ("missing Timing in \\partial"); + else + { + Moment mp = robust_scm2moment (timing->get_property ("measurePosition"), + Rational (0)); + + if (mp.main_part_ > Rational (0)) + mp.main_part_ = measure_length (timing); + else + mp.main_part_ = 0; + + Moment length = Moment (dur->get_length ()); + timing->set_property ("measurePosition", (mp - length).smobbed_copy ()); + } } else programming_error ("invalid duration in \\partial"); diff --git a/lily/performance.cc b/lily/performance.cc index 4e19544d41..dfd23a871a 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -56,7 +56,7 @@ Performance::output (Midi_stream &midi_stream) const for (vsize i = 0; i < audio_staffs_.size (); i++) { Audio_staff *s = audio_staffs_[i]; - debug_output ("[" + to_string (i), true); + debug_output ("[" + ::to_string (i), true); s->output (midi_stream, i, ports_); debug_output ("]", false); } diff --git a/lily/rest.cc b/lily/rest.cc index c4c5de1e73..3a448546b0 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -217,7 +217,7 @@ Rest::glyph_name (Grob *me, int durlog, const string &style, bool try_ledgers, actual_style = ""; } - return ("rests." + to_string (durlog) + (is_ledgered ? "o" : "") + return ("rests." + ::to_string (durlog) + (is_ledgered ? "o" : "") + actual_style); } diff --git a/lily/script-column.cc b/lily/script-column.cc index 0a014a3800..8c963929bf 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -152,11 +152,12 @@ Script_column::order_grobs (vector grobs) { SCM last_outside_staff = last->get_property ("outside-staff-priority"); /* - if outside_staff_priority is missing for previous grob, just - use it as a support for the current grob + if outside_staff_priority is missing for previous grob, + use all the scripts so far as support for the current grob */ if (!scm_is_number (last_outside_staff)) - Side_position_interface::add_support (g, last); + for (SCM t = ss; !scm_is_eq (t, s); t = scm_cdr (t)) + Side_position_interface::add_support (g, unsmob_grob (scm_car (t))); /* if outside_staff_priority is missing or is equal to original outside_staff_priority of previous grob, set new diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 3b891e8e79..3e0ad4fae7 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -63,7 +63,7 @@ Simultaneous_music_iterator::construct_children () SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); Context *c = (j && create_separate_contexts_) - ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL) + ? get_outlet ()->find_create_context (name, ::to_string (j), SCM_EOL) : get_outlet (); if (!c) diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 332995ac99..46e9d917a1 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -43,27 +43,41 @@ avoid_staff_line (Slur_score_state const &state, && (state.extremes_[LEFT].staff_ == state.extremes_[RIGHT].staff_) && state.extremes_[LEFT].staff_ && state.extremes_[RIGHT].staff_) { - Real y = bez.curve_point (ts[0])[Y_AXIS]; + Real t = ts[0]; //the first (usually only) point where slur is horizontal + Real y = bez.curve_point (t)[Y_AXIS]; + // A Bezier curve at t moves 3t-3t² as far as the middle control points + Real factor = 3.0 * t * (1.0 - t); Grob *staff = state.extremes_[LEFT].staff_; Real p = 2 * (y - staff->relative_coordinate (state.common_[Y_AXIS], Y_AXIS)) / state.staff_space_; - Real const round = my_round (p); - Real const frac = p - round; - if (fabs (frac) < 4 * state.thickness_ - && Staff_symbol_referencer::on_staff_line (staff, int (round))) + int round_p = (int) my_round (p); + if (!Staff_symbol_referencer::on_staff_line (staff, round_p)) + round_p += (p > round_p) ? 1 : -1; + if (!Staff_symbol_referencer::on_staff_line (staff, round_p)) + return bez; + + Real const distance = (p - round_p) * state.staff_space_ / 2.0; + // Allow half the thickness of the slur at the point t, plus one basic + // blot-diameter (half for the slur outline, half for the staff line) + Real const min_distance = 0.5 * state.thickness_ * factor + + state.line_thickness_ + + ((state.dir_ * distance > 0.0) + ? state.parameters_.gap_to_staffline_inside_ + : state.parameters_.gap_to_staffline_outside_); + if (fabs (distance) < min_distance) { - Direction resolution_dir = frac ? state.dir_ : CENTER; + Direction resolution_dir = (distance > 0.0) ? UP : DOWN; - // TODO: parameter - Real newp = round + resolution_dir * 5 * state.thickness_; - - Real dy = (newp - p) * state.staff_space_ / 2.0; + Real dy = resolution_dir * (min_distance - fabs (distance)); + // Shape the curve, moving the horizontal point by factor * dy bez.control_[1][Y_AXIS] += dy; bez.control_[2][Y_AXIS] += dy; + // Move the entire curve by the remaining amount + bez.translate (Offset (0.0, dy - factor * dy)); } } return bez; diff --git a/lily/slur-score-parameters.cc b/lily/slur-score-parameters.cc index a8cbe4b7f9..789e31ea4b 100644 --- a/lily/slur-score-parameters.cc +++ b/lily/slur-score-parameters.cc @@ -56,6 +56,10 @@ Slur_score_parameters::fill (Grob *me) = get_detail (details, ly_symbol2scm ("max-slope-factor")); free_head_distance_ = get_detail (details, ly_symbol2scm ("free-head-distance")); + gap_to_staffline_inside_ + = get_detail (details, ly_symbol2scm ("gap-to-staffline-inside")); + gap_to_staffline_outside_ + = get_detail (details, ly_symbol2scm ("gap-to-staffline-outside")); absolute_closeness_measure_ = get_detail (details, ly_symbol2scm ("absolute-closeness-measure")); extra_object_collision_penalty_ diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 47bb40611c..98e3f2a45d 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -226,8 +226,8 @@ Slur_score_state::fill (Grob *me) Slur::replace_breakable_encompass_objects (me); staff_space_ = Staff_symbol_referencer::staff_space (me); - Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); - thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) * lt; + line_thickness_ = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) * line_thickness_; dir_ = slur_direction (); parameters_.fill (me); diff --git a/lily/slur.cc b/lily/slur.cc index 0aa96c787d..10069aacd4 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -542,6 +542,12 @@ ADD_INTERFACE (Slur, "@item head-slur-distance-max-ratio\n" "The maximum value for the ratio of distance between a" " note head and slur.\n" + "@item gap-to-staffline-inside\n" + "Minimum gap inside the curve of the slur" + " where the slur is parallel to a staffline.\n" + "@item gap-to-staffline-outside\n" + "Minimum gap outside the curve of the slur" + " where the slur is parallel to a staffline.\n" "@item free-slur-distance\n" "The amount of vertical free space that must exist" " between adjacent slurs. This subproperty only works" diff --git a/lily/source-file.cc b/lily/source-file.cc index 26426ae8af..788c78a69e 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -181,8 +181,8 @@ Source_file::file_line_column_string (char const *context_str0) const int l, ch, col, offset; get_counts (context_str0, &l, &ch, &col, &offset); - return name_string () + ":" + to_string (l) - + ":" + to_string (col + 1); + return name_string () + ":" + ::to_string (l) + + ":" + ::to_string (col + 1); } } @@ -196,8 +196,8 @@ Source_file::quote_input (char const *pos_str0) const get_counts (pos_str0, &l, &ch, &col, &offset); string line = line_string (pos_str0); string context = line.substr (0, offset) - + to_string ('\n') - + to_string (' ', col) + + ::to_string ('\n') + + ::to_string (' ', col) + line.substr (offset, line.length () - offset); return context; } diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index d4b523c06c..a45b7dd13a 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -169,7 +169,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y) } while (hi - lo > 1); - Stencil stil (fm->find_by_name ("brace" + to_string (lo))); + Stencil stil (fm->find_by_name ("brace" + ::to_string (lo))); stil.translate_axis (-b[X_AXIS].length () / 2, X_AXIS); stil.translate_axis (-0.2, X_AXIS); diff --git a/lily/system.cc b/lily/system.cc index 1ec46fbaf6..ad4d0bab77 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -223,7 +223,7 @@ System::get_paper_systems () scm_vector_set_x (lines, scm_from_int (i), system->get_paper_system ()); - debug_output (to_string (i) + "]", false); + debug_output (::to_string (i) + "]", false); } return lines; } diff --git a/lily/time-signature.cc b/lily/time-signature.cc index f00c2563f6..89f20278bf 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -67,7 +67,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d) return numbered_time_signature (me, n, d); if ((style == "default") || (style == "")) - style = to_string ("C"); + style = ::to_string ("C"); if (style == "C") { @@ -77,7 +77,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d) return numbered_time_signature (me, n, d); } - string char_name = style + to_string (n) + to_string (d); + string char_name = style + ::to_string (n) + ::to_string (d); me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic")); Stencil out = Font_interface::get_default_font (me) ->find_by_name ("timesig." + char_name); @@ -100,9 +100,9 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den) chain); SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, - ly_string2scm (to_string (num))); + ly_string2scm (::to_string (num))); SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, - ly_string2scm (to_string (den))); + ly_string2scm (::to_string (den))); Stencil n = *unsmob_stencil (sn); Stencil d = *unsmob_stencil (sd); diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc index 2e386e6fd1..e9b858de39 100644 --- a/lily/volta-repeat-iterator.cc +++ b/lily/volta-repeat-iterator.cc @@ -33,17 +33,27 @@ protected: virtual void next_element (bool); virtual void construct_children (); virtual void process (Moment); + virtual void derived_mark () const; bool first_time_; int alt_count_; int rep_count_; int done_count_; + SCM alt_restores_; }; Volta_repeat_iterator::Volta_repeat_iterator () { done_count_ = alt_count_ = rep_count_ = 0; first_time_ = true; + alt_restores_ = SCM_EOL; +} + +void +Volta_repeat_iterator::derived_mark () const +{ + scm_gc_mark (alt_restores_); + Sequential_iterator::derived_mark (); } SCM @@ -94,17 +104,46 @@ Volta_repeat_iterator::next_element (bool side_effect) { if (alt_count_) { - string repstr = to_string (rep_count_ - alt_count_ + done_count_) + "."; - if (done_count_ > 1) + string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + "."; + if (done_count_ <= 1) { + alt_restores_ = SCM_EOL; + if (to_boolean (get_outlet ()->get_property ("timing"))) + { + for (SCM lst = get_outlet ()->get_property ("alternativeRestores"); + scm_is_pair (lst); + lst = scm_cdr (lst)) + { + SCM res = SCM_EOL; + Context *t = get_outlet ()->where_defined (scm_car (lst), + &res); + if (t) + { + alt_restores_ = scm_cons + (scm_list_3 (t->self_scm (), scm_car (lst), res), + alt_restores_); + } + } + } + } + else + { + add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); if (done_count_ - 1 < alt_count_) add_repeat_command (ly_symbol2scm ("end-repeat")); + + if (to_boolean (get_outlet ()->get_property ("timing"))) + { + for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p)) + scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"), + scm_car (p)); + } } if (done_count_ == 1 && alt_count_ < rep_count_) - repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + "."; + repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + "."; if (done_count_ <= alt_count_) add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 9c8547dd7d..dfaa47e12f 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -169,7 +169,6 @@ contained staves are not connected vertically." \name RhythmicStaff \alias "Staff" - \override BarLine.bar-extent = #'(-2 . 2) \override VoltaBracket.staff-padding = #3 \override StaffSymbol.line-count = #1 @@ -609,6 +608,7 @@ automatically when an output definition (a @code{\\score} or doubleRepeatType = #":..:" startRepeatType = #".|:" endRepeatType = #":|." + alternativeRestores = #'(measurePosition measureLength) barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers barNumberFormatter = #robust-bar-number-function clefTranspositionFormatter = #clef-transposition-markup @@ -634,6 +634,8 @@ automatically when an output definition (a @code{\\score} or autoBeaming = ##t autoBeamCheck = #default-auto-beam-check + completionFactor = #unity-if-multimeasure + scriptDefinitions = #default-script-alist pedalSustainStrings = #'("Ped." "*Ped." "*") diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index bf738074cd..83c2535af5 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -221,6 +221,14 @@ barNumberCheck = "Barcheck failed got ~a expect ~a" cbn n)))))) +beamExceptions = +#(define-scheme-function (parser location music) (ly:music?) + (_i "Extract a value suitable for setting +@code{Timing.beamExceptions} from the given pattern with explicit +beams in @var{music}. A bar check @code{|} has to be used between +bars of patterns in order to reset the timing.") + (extract-beam-exceptions music)) + bendAfter = #(define-event-function (parser location delta) (real?) (_i "Create a fall or doit of pitch interval @var{delta}.") @@ -245,7 +253,15 @@ bookOutputSuffix = breathe = #(define-music-function (parser location) () (_i "Insert a breath mark.") - (make-music 'BreathingEvent)) + (make-music 'BreathingEvent + 'midi-length + (lambda (len context) + ;;Shorten by half, or by up to a second, but always by a power of 2 + (let* ((desired (min (ly:moment-main (seconds->moment 1 context)) + (* (ly:moment-main len) 1/2))) + (scale (inexact->exact (ceiling (/ (log desired) (log 1/2))))) + (breath (ly:make-moment (expt 1/2 scale)))) + (ly:moment-sub len breath))))) clef = #(define-music-function (parser location type) (string?) diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 0a1ac2d374..1a383607f1 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -26,6 +26,7 @@ \name Staff \accepts Voice \accepts CueVoice + \accepts NullVoice \defaultchild Voice \consists "Staff_performer" @@ -181,6 +182,20 @@ \name "Devnull" } +\context { + \type "Performer_Group" + \name NullVoice + \alias Staff + \alias Voice + %% needed for melismata + %% TODO: at least the tie performer likely does not work without the + %% Note_performer, but I don't know how to shut note output off in + %% MIDI. + \consists "Tie_performer" + \consists "Beam_performer" + \consists "Slur_performer" +} + \context { \Staff \name TabStaff diff --git a/ly/script-init.ly b/ly/script-init.ly index 0cb37947e7..3b3e39ed31 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -2,18 +2,10 @@ \version "2.17.25" -% code char abbreviations -dashHat = "marcato" -dashPlus = "stopped" -dashDash = "tenuto" -dashBang = "staccatissimo" -dashLarger = "accent" -dashDot = "staccato" -dashUnderscore = "portato" - harmonic = #(make-music 'HarmonicEvent) -accent = #(make-articulation "accent") +accent = #(make-articulation "accent" + 'midi-extra-velocity 20) coda = #(make-articulation "coda") downbow = #(make-articulation "downbow") downmordent = #(make-articulation "downmordent") @@ -26,10 +18,15 @@ lheel = #(make-articulation "lheel") lineprall = #(make-articulation "lineprall") longfermata = #(make-articulation "longfermata") ltoe = #(make-articulation "ltoe") -marcato = #(make-articulation "marcato") +marcato = #(make-articulation "marcato" + 'midi-extra-velocity 40) mordent = #(make-articulation "mordent") open = #(make-articulation "open") -portato = #(make-articulation "portato") + +portato = #(make-articulation "portato" + 'midi-length + (lambda (len context) + (ly:moment-mul len (ly:make-moment 3/4)))) prall = #(make-articulation "prall") pralldown = #(make-articulation "pralldown") prallmordent = #(make-articulation "prallmordent") @@ -42,8 +39,17 @@ segno = #(make-articulation "segno") shortfermata = #(make-articulation "shortfermata") signumcongruentiae = #(make-articulation "signumcongruentiae") snappizzicato = #(make-articulation "snappizzicato") -staccatissimo = #(make-articulation "staccatissimo") -staccato = #(make-articulation "staccato") +staccatissimo = #(make-articulation "staccatissimo" + 'midi-length + (lambda (len context) + (seconds->moment 1/8 context)) + 'midi-extra-velocity 6) +staccato = #(make-articulation "staccato" + 'midi-length + (lambda (len context) + (moment-min (ly:moment-mul len (ly:make-moment 1/2)) + (seconds->moment 1/2 context))) + 'midi-extra-velocity 4) stopped = #(make-articulation "stopped") tenuto = #(make-articulation "tenuto") thumb = \finger \markup \scale #(cons (magstep 5) (magstep 5)) @@ -55,3 +61,12 @@ upmordent = #(make-articulation "upmordent") upprall = #(make-articulation "upprall") varcoda = #(make-articulation "varcoda") verylongfermata = #(make-articulation "verylongfermata") + +% code char abbreviations +dashHat = \marcato +dashPlus = \stopped +dashDash = \tenuto +dashBang = \staccatissimo +dashLarger = \accent +dashDot = \staccato +dashUnderscore = \portato diff --git a/mf/common-modules-and-initialization.mf b/mf/common-modules-and-initialization.mf new file mode 100644 index 0000000000..764dbd6470 --- /dev/null +++ b/mf/common-modules-and-initialization.mf @@ -0,0 +1,7 @@ + +staffsize# := design_size * pt#; +input debugging-settings; +input feta-autometric; +input feta-macros; +mode_setup; +input feta-params; diff --git a/mf/debugging-settings.mf b/mf/debugging-settings.mf new file mode 100644 index 0000000000..e867713461 --- /dev/null +++ b/mf/debugging-settings.mf @@ -0,0 +1,14 @@ + +% Used for example to print glyphs with stafflines +test := 0; + +if test = -1: + % TODO: what's this? Seems to be broken... + mode := smoke; +fi; + +% change this to 0.5 to have glyphs positioned on +% staff spaces instead of stafflines in testing mode +% (useful e.g. to check how accidentals visually interact +% with stafflines in different configurations). +stafflines_y_offset := 0; diff --git a/mf/declare-autometric-parameters.mf b/mf/declare-autometric-parameters.mf new file mode 100644 index 0000000000..89bf9212fe --- /dev/null +++ b/mf/declare-autometric-parameters.mf @@ -0,0 +1,9 @@ +% TODO: i'm not sure if the name is right - is this declaring or something else? + +autometric_parameter ("staffsize", staffsize#); +autometric_parameter ("stafflinethickness", stafflinethickness#); +autometric_parameter ("staff_space", staff_space#); +autometric_parameter ("linethickness", linethickness#); +autometric_parameter ("black_notehead_width", black_notehead_width#); +autometric_parameter ("ledgerlinethickness", ledgerlinethickness#); +autometric_parameter ("blot_diameter", blot_diameter#); diff --git a/mf/feta-accidentals.mf b/mf/feta-accidentals.mf index 1130672440..d2585a1954 100644 --- a/mf/feta-accidentals.mf +++ b/mf/feta-accidentals.mf @@ -18,21 +18,6 @@ % along with LilyPond. If not, see . -% -% also show in other configuration wrt staff lines. -% -def draw_shifted_too = -if test > 0: - fet_beginchar ("shifted too", ""); - set_char_box (0, 0, 0, 0); - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; -enddef; - - % % Accidentals from various sources, notably % @@ -56,1266 +41,9 @@ enddef; fet_begingroup ("accidentals"); - -% -% Draw an arrow -% -% * `stemslant' gives the direction of the stem's left boundary -% (needed for brushed stems, equals "up" for straight stems) -% * `extend' is used to make the stem longer or shorter (if negative); -% different kinds of accidentals need different values here -% -def draw_arrow (expr attach, stemwidth, stemslant, extend, pointingdown) = -begingroup; - save htip; % tip height - save wwing; % wing `radius' - save angle_wing_bot, angle_wing_top, angle_tip; - save upshift; - clearxy; - - wwing := 0.26 stemwidth; - htip := staff_space * 0.85 + stafflinethickness - wwing; - - % `flip' is used to reflect the arrow vertically - % if arrow points downward - transform flip; - if pointingdown: - flip = identity reflectedabout (origin, right); - else: - flip = identity; - fi; - - z1 = attach shifted (-stemwidth / 2, 0); - upshift := max (0, wwing + 0.1 staff_space + extend); - z2 = z1 shifted (((unitvector stemslant) - scaled upshift) transformed flip); - - z7 = attach shifted ((stemwidth/2),0); - z6 = z7 shifted (((unitvector (-xpart stemslant, ypart stemslant)) - scaled upshift) transformed flip); - z2 - z3 = ( 0.38 staff_space, 0.05 htip) transformed flip; - z6 - z5 = (-0.38 staff_space, 0.05 htip) transformed flip; - - z4 = attach shifted ((-0.2 stemwidth, upshift + htip) - transformed flip); - z4'= attach shifted (( 0.2 stemwidth, upshift + htip) - transformed flip); - - % `angle_wing_bot' is the angle at which the arc - % from z2 to z3a enters z3a - % `angle_wing_top' is the angle at which the arc - % from z3b to z4 leaves z3b - % `angle_tip' is the angle at which the arc - % from z4 to z4' leaves z4 - angle_wing_bot = 30; - angle_wing_top = 55; - angle_tip = 68; - - z3a = z3 shifted ((((dir angle_wing_bot) rotated -90) - scaled wwing) transformed flip); - z3b = z3 shifted ((((dir angle_wing_top) rotated 90) - scaled wwing) transformed flip); - - z5a = z5 shifted ((((dir (180 - angle_wing_bot)) rotated 90) - scaled wwing) transformed flip); - z5b = z5 shifted ((((dir (180 - angle_wing_top)) rotated -90) - scaled wwing) transformed flip); - - % Draw the arrow - pickup pencircle scaled 1; - fill z1 - -- z2{stemslant transformed flip} - .. {(-dir angle_wing_bot) transformed flip}z3a - .. z3b{(dir angle_wing_top) transformed flip} - .. z4{(dir angle_tip) transformed flip} - .. z4'{(dir (-angle_tip)) transformed flip} - .. {(dir (-angle_wing_top)) transformed flip}z5b - .. z5a{(-dir (-angle_wing_bot)) transformed flip} - .. z6{((-stemslant) reflectedabout (origin, up)) transformed flip} - -- z7 - -- cycle; - - labels (range 0 thru 7, 4', 3a, 3b, 5a, 5b); -endgroup; -enddef; - -save remember_pic; -picture remember_pic; - -save sharp_beamheight; -sharp_beamheight# := 0.3 staff_space# + stafflinethickness#; - -% -% The beams of most sharps have horizontal endings (as if drawn with -% a square pen). [Wanske] does not mention this, so we'll just ignore -% this fact. -% - -def draw_meta_sharp (expr width, offset) = - save beamwidth, beamslope; - save ne, nw_dist; - pair ne, nw_dist; - - beamwidth := width; - - define_whole_vertical_blacker_pixels (sharp_beamheight); - - clearxy; - - beamslope = sharp_beamheight / beamwidth; - - pickup pencircle scaled 2 blot_diameter; - - rt x2 - lft x1 = beamwidth; - z2 = z1 + whatever * (beamwidth, sharp_beamheight); - .5 [z1, z3] = (.5 w, offset); - x3 = x2; - top y2 - bot y3 = sharp_beamheight; - x4 = x1; - top y1 - bot y4 = sharp_beamheight; - - ne = unitvector (z2 - z1); - nw_dist = (ne rotated 90) * blot_diameter; - - fill lft z1{up} - ... (z1 + nw_dist){ne} - -- (z2 + nw_dist){ne} - ... rt z2{down} - -- rt z3{down} - ... (z3 - nw_dist){-ne} - -- (z4 - nw_dist){-ne} - ... lft z4{up} - -- cycle; - - labels (1, 2, 3, 4); -enddef; - - -def draw_sharp(expr arrowup, arrowdown) = - save stem, stemx, stemwidth; - save outer_space, interbeam; - save stemlength, extendleft, extendright, height, depth; - - stemwidth# := stafflinethickness# + .05 staff_space#; - define_whole_blacker_pixels (stemwidth); - - interbeam := 1.05 staff_space_rounded; - - stemlength# := 1.5 staff_space#; - define_pixels (stemlength); - - height# = stemlength#; - depth# = stemlength#; - extendright# = 0; - extendleft# = 0; - if arrowup: - height# := height# + 1.2 staff_space#; - extendright# := extendright# + 1.5 stafflinethickness#; - fi; - if arrowdown: - depth# := depth# + 1.2 staff_space#; - extendleft# := extendleft# + 1.5 stafflinethickness#; - fi; - define_pixels (extendleft, extendright); - set_char_box (extendleft#, 1.1 staff_space#, depth#, height#); - - stem := 7 / 16 * w; - stemx := hround stem; - outer_space := hround ((w - stemx - stemwidth) / 2); - - w := 2 outer_space + stemx + stemwidth; - d := d - feta_space_shift; - - draw_meta_sharp (w, -.5 interbeam); - draw_meta_sharp (w, -.5 interbeam + vround interbeam); - - % expand the charbox so that it encloses the whole arrow; - % this must not happen earlier because some commands above - % still rely on the old width - w := w + extendright; - - pickup pencircle scaled stemwidth; - - lft x5 = lft x6 = outer_space; - lft x7 = lft x8 = outer_space + stemx; - bot y5 = -stemlength; - top y6 = vround (1.5 staff_space - stem * beamslope); - bot y7 = -top y6 + feta_space_shift; - top y8 = stemlength; - - labels (5, 6, 7, 8); - - draw_gridline (z5, z6, stemwidth); - draw_gridline (z7, z8, stemwidth); - - if arrowup: - draw_arrow (z8, stemwidth, up, - stafflinethickness / 2 + stemwidth / 2, false); - fi; - if arrowdown: - draw_arrow (z5, stemwidth, up, - stafflinethickness / 2 + stemwidth / 2, true); - fi; - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -enddef; - - -fet_beginchar ("Sharp", "sharp"); - draw_sharp (false, false); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Sharp (arrow up)", "sharp.arrowup"); - draw_sharp (true, false); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Sharp (arrow down)", "sharp.arrowdown"); - draw_sharp (false, true); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Sharp (arrows up and down)", "sharp.arrowboth"); - draw_sharp (true, true); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem"); - save stem, stemwidth; - save outer_space, interbeam; - - stemwidth# := stafflinethickness# + .05 staff_space#; - define_whole_blacker_pixels (stemwidth); - - interbeam := 1.05 staff_space_rounded; - - set_char_box (0, 0.7 staff_space#, - 1.5 staff_space#, 1.5 staff_space#); - - stem := 7 / 16 * w; - outer_space := hround ((w - stemwidth) / 2); - - w := 2 outer_space + stemwidth; - d := d - feta_space_shift; - - draw_meta_sharp (w, -.5 interbeam); - draw_meta_sharp (w, -.5 interbeam + vround interbeam); - - pickup pencircle scaled stemwidth; - - lft x5 = lft x6 = outer_space; - top y6 = vround (1.5 staff_space - .5 stem); - bot y5 = -top y6 + feta_space_shift; - - labels (5, 6); - - draw_gridline (z5, z6, stemwidth); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem"); - save stem, stemx, stemwidth; - save outer_space, interbeam; - save sharp_beamheight; - - sharp_beamheight# := 0.22 staff_space# + stafflinethickness#; - - stemwidth# := stafflinethickness# + .05 staff_space#; - define_whole_blacker_pixels (stemwidth); - - interbeam := 1.2 staff_space_rounded; - - set_char_box (0, 1.1 staff_space#, - 1.5 staff_space#, 1.5 staff_space#); - - stem := 7 / 16 * w; - stemx := hround stem; - outer_space := hround ((w - stemx - stemwidth) / 2); - - w := 2 outer_space + stemx + stemwidth; - d := d - feta_space_shift; - - draw_meta_sharp (.88 w, -.5 interbeam); - draw_meta_sharp (.88 w, -.5 interbeam + vround interbeam); - sharp_beamheight# := 1/.88 sharp_beamheight#; - draw_meta_sharp (w, 0); - - pickup pencircle scaled stemwidth; - - lft x5 = lft x6 = outer_space; - lft x7 = lft x8 = outer_space + stemx; - bot y5 = -d; - top y6 = vround (1.5 staff_space - stem * beamslope); - bot y7 = -top y6 + feta_space_shift; - top y8 = h; - - labels (5, 6, 7, 8); - - draw_gridline (z5, z6, stemwidth); - draw_gridline (z7, z8, stemwidth); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem"); - save stem, stemx, stemwidth; - save outer_space, interbeam; - save sharp_beamheight; - - sharp_beamheight# := 0.22 staff_space# + stafflinethickness#; - - stemwidth# := stafflinethickness# + .05 staff_space#; - define_whole_blacker_pixels (stemwidth); - - interbeam := 1.2 staff_space_rounded; - - set_char_box (0, 0.95 staff_space#, - 1.3 staff_space#, 1.3 staff_space#); - - stem := 7 / 16 * w; - outer_space := hround ((w - stemwidth) / 2); - - w := 2 outer_space + stemwidth; - d := d - feta_space_shift; - - draw_meta_sharp (.8 w, -.5 interbeam); - draw_meta_sharp (.8 w, -.5 interbeam + vround interbeam); - sharp_beamheight# := 1/.8 sharp_beamheight#; - draw_meta_sharp (w, 0); - - pickup pencircle scaled stemwidth; - - lft x5 = lft x6 = outer_space; - top y6 = vround (1.5 staff_space - .5 stem); - bot y5 = -top y6 + feta_space_shift; - labels (5, 6); - - draw_gridline (z5, z6, stemwidth); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("3/4 Sharp", "sharp.slashslash.stemstemstem"); - save stem, stemx, stemwidth; - save outer_space, interbeam; - - stemwidth# := stafflinethickness# + .05 staff_space#; - define_whole_blacker_pixels (stemwidth); - - interbeam := 1.05 staff_space_rounded; - - set_char_box (0, 1.6 staff_space#, - 1.5 staff_space#, 1.5 staff_space#); - - stem := 9 / 32 * w; - stemx := hround stem; - outer_space := hround ((w - 2 stemx - stemwidth) / 2); - - w := 2 outer_space + 2 stemx + stemwidth; - d := d - feta_space_shift; - - draw_meta_sharp (w, -.5 interbeam); - draw_meta_sharp (w, -.5 interbeam + vround interbeam); - - pickup pencircle scaled stemwidth; - - lft x5 = lft x6 = outer_space; - lft x7 = lft x8 = outer_space + stemx; - lft x9 = lft x10 = outer_space + 2 stemx; - bot y5 = -d; - top y6 = vround (1.5 staff_space - 2 stem * beamslope); - bot y9 = -top y6 + feta_space_shift; - top y10 = h; - y7 = .5 [y5, y9]; - y8 = .5 [y6, y10]; - - labels (5, 6, 7, 8, 9, 10); - - draw_gridline (z5, z6, stemwidth); - draw_gridline (z7, z8, stemwidth); - draw_gridline (z9, z10, stemwidth); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -% -% The stems of the natural are brushed (at least, in Barenreiter SCS) -% - -def draw_natural (expr arrowup, arrowdown) = - save stemwidth, top_stem_thick; - save ne, pat_top, pat_bottom; - save depth, height, extendleft, extendright, stemlength; - save brush_scale_up, brush_scale_down; - pair ne; - path pat_top, pat_bottom; - - top_stem_thick# = stafflinethickness# + .10 staff_space#; - stemwidth# = 0.09 staff_space# + .5 stafflinethickness#; - define_whole_blacker_pixels (top_stem_thick, stemwidth); - - stemlength# = 1.5 staff_space#; - define_pixels (stemlength); - - height# = stemlength#; - depth# = stemlength#; - extendleft# = 0; - extendright# = 0; - if arrowup: - extendleft# := 3 stafflinethickness#; - height# := height# + 1.2 staff_space#; - fi; - if arrowdown: - extendright# := 3.15 stafflinethickness#; - depth# := depth# + 1.2 staff_space#; - fi; - define_pixels (extendright); - - set_char_box (extendleft#, 2/3 staff_space#, depth#, height#); - - d := d - feta_space_shift; - - pickup pencircle scaled stemwidth; - - brush_scale_up := 1.0; - brush_scale_down := 1.0; - % to look nice, arrowed stems must be less brushed - if arrowup: - brush_scale_up := 0.85; - fi; - if arrowdown: - brush_scale_down := 0.85; - fi; - - penpos1 (top_stem_thick, 0); - penpos3 (top_stem_thick, 0); - penpos2 (stemwidth, 0); - penpos4 (stemwidth, 0); - % z1' and z3' are needed for the arrowed accidentals - penpos1' (top_stem_thick * brush_scale_up, 0); - penpos3' (top_stem_thick * brush_scale_down, 0); - - x2r = w; - x4l = 0; - x3 = x3' = x2; - x1 = x1' = x4; - - y1 = y1' = stemlength; - y3 = y3' = -stemlength; - top y2 = vround (staff_space - 3/2 stafflinethickness); - y4 = -y2 + feta_space_shift; - - pat_bottom := z4r{z4r - z1r} - .. bot z4 - .. z4l{z1l - z4l}; - fill simple_serif (z1'l, z1'r, -30) - -- pat_bottom - -- cycle; - - pat_top := z2r{z2r - z3r} - .. top z2 - .. z2l{z3l - z2l}; - fill simple_serif (z3'l, z3'r, 30) - -- pat_top - -- cycle; - - ne = (x2 - x4, stafflinethickness); - - z11' = z3l + whatever * (z2l - z3l); - y11' = vround (.5 (staff_space - stafflinethickness)); - z11 = z11' + whatever * ne; - x11 = x12; - z12 = directionpoint -ne of pat_top; - z13 = z12 + whatever * ne; - x13 = x1; - z14 = z11 + whatever * ne; - x14 = x1; - - z21' = z4r + whatever * (z1r - z4r); - y21' = -y11' + feta_space_shift; - z21 = z21' + whatever * ne; - x21 = x22; - z22 = directionpoint -ne of pat_bottom; - z23 = z22 + whatever * ne; - x23 = x3; - z24 = z21 + whatever * ne; - x24 = x3; - - fill z11 - -- z12 - -- z13 - -- z14 - -- cycle; - fill z21 - -- z22 - -- z23 - -- z24 - -- cycle; - - penlabels (1, 1', 2, 3, 3', 4); - labels (11, 11', 12, 13, 14, 21, 21', 22, 23, 24); - - if arrowup: - draw_arrow (z1, top_stem_thick * brush_scale_up, - z1'l - z4l, stafflinethickness / 2, false); - fi; - if arrowdown: - draw_arrow (z3, top_stem_thick * brush_scale_down, - z2r - z3'r, stafflinethickness / 2, true); - w := w + extendright; - fi; - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -enddef; - - -fet_beginchar ("Natural", "natural"); - draw_natural (false, false); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Natural (arrow up)", "natural.arrowup"); - draw_natural (true, false); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Natural (arrow down)", "natural.arrowdown"); - draw_natural (false, true); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Natural (arrows up and down)", "natural.arrowboth"); - draw_natural (true, true); -fet_endchar; - - -draw_shifted_too; - - -% -% Dedicated to my mom. (3/10/97) -% -% Mamma, ik hou van je; kom je alsjeblieft terug? -% -- HW -% -% -% TODO: remove crook_fatness -% TODO: document, simplify! -% - -def draw_meta_flat (expr xcenter, w, crook_fatness, arrowup, arrowdown) = - save crook_thinness; - save bottom_overshoot, bot_crook_dir; - save top_stem_thick, top_stem_thick_orig; - save bottom_stem_thick, hair, smaller_hole; - save top_crook_thinness; - save zwiep; - save center; - pair center, bot_crook_dir; - save clearing, clearing_orig; - - clearxy; - - % the stem shouldn't reach the top staff line. - %% TODO: should take from height. - % - % TODO: parameterize this - % - if w >= 0.75 staff_space: - smaller_hole = 0.35 stafflinethickness; - else: - smaller_hole = 0; - fi; - crook_thinness = .7 stafflinethickness + .06 staff_space; - top_crook_thinness = 1 stafflinethickness + .065 staff_space; - clearing = 1.7 stafflinethickness; - clearing_orig = clearing; - if arrowup: - clearing := 0.5 staff_space; - fi; - bottom_overshoot = stafflinethickness; - - bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#; - top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#; - top_stem_thick_orig# = top_stem_thick#; - if arrowup: - % to look nice, arrowed stems should be less brushed - top_stem_thick# := top_stem_thick# * 0.8; - fi; - define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick, - top_stem_thick_orig); - - if odd (top_stem_thick - bottom_stem_thick): - top_stem_thick := top_stem_thick - 1; - fi; - if odd (top_stem_thick_orig - bottom_stem_thick): - top_stem_thick_orig := top_stem_thick_orig - 1; - fi; - - center = (xcenter, 0); - - x1l = hround (xcenter - .5 top_stem_thick); - y1 = vround (2 staff_space - clearing); - x2l = hround (xcenter - .5 bottom_stem_thick); - y2 = -.5 staff_space - .5 stafflinethickness; - % z16 and the `*_orig' variables are needed for arrowed accidentals - % because their inner part should be unchanged from plain ones but - % the points z3l, z3r, and z10 depend on values that are different - % for arrowed accidentals - x16l = hround (xcenter -.5 top_stem_thick_orig); - y16 = vround (2 staff_space - clearing_orig); - - penpos1 (top_stem_thick, 0); - penpos16 (top_stem_thick_orig, 0); - penpos2 (bottom_stem_thick, 0); - - y3l = vfloor ((staff_space - stafflinethickness) / 2); - z3l = whatever [z2r, z1r]; - z3r = .3 [z2r, - (z16r shifted (0, clearing_orig - 1.7 stafflinethickness))] - + (smaller_hole, 0); - x3r := hceiling x3r; - - % we insert z3l to get better conversion with mf2pt1 - fill simple_serif (z1r, z1l, 30) - -- z2l - -- z2r - -- z3l - -- cycle; - - z10 = whatever [z2r, z16r] + (smaller_hole, 0); - y10 = -1/10 staff_space; - x10 := hceiling x10; - - x11 = xcenter + bottom_overshoot / 3; - y11 = -vround (.5 (staff_space + stafflinethickness) - + bottom_overshoot); - - x2a = 0.2[x2r, x7]; - y2a = 1.5[y2, y11]; - - penpos4 (whatever, 53); - - y4l - y4r = top_crook_thinness; - y5r = .15 staff_space; - x5l = hround (w + xcenter); - y4 = staff_space / 2; - x4r = .45 [x5r, x3r]; - y4l := vround y4l; - - penpos5 (crook_fatness, -175); - - bot_crook_dir = unitvector ((x5l, 0) - z11); - z8 = z11 + whatever * bot_crook_dir; - y8 = -staff_space / 2; - - z7 = z8 - + whatever * bot_crook_dir - + crook_thinness * (bot_crook_dir rotated 90); - x7 = .1 [x3r, x8]; - - unfill z3r{z3r - z10} - .. z4r{right} - .. z5r{down} - .. z7{-bot_crook_dir} - & z7 - .. z10{z3r - z10} - -- cycle; - - if arrowdown: - fill z2l{down} - .. z2a{up} - .. z8{bot_crook_dir} - .. z5l{up} - .. z4l{left} - .. z3l - -- cycle; - else: - fill z2l{down} - .. z11{right} - .. z8{bot_crook_dir} - .. z5l{up} - .. z4l{left} - .. z3l - -- cycle; - fi; - - if arrowup: - draw_arrow (z1, top_stem_thick, z1l - z2l, - 0.5 stafflinethickness, false); - fi; - if arrowdown: - draw_arrow ((0.5 [x2l, x2a], y2), x2a - x2l, up, - staff_space / 2, true); - fi; -enddef; - - -def draw_arrowed_meta_flat (expr xcenter, width, crook_fatness, - arrowup, arrowdown) = - save depth, height, extendleft; - - depth# = 0.6 staff_space#; - height# = 1.9 staff_space#; - extendleft# := 1.2 stafflinethickness#; - if arrowup: - extendleft# := 3.45 stafflinethickness#; - height# := height# + 0.8 staff_space#; - fi; - if arrowdown: - extendleft# := 3.45 stafflinethickness#; - depth# := depth# + 1.6 staff_space#; - fi; - - set_char_box (extendleft#, width, depth#, height#); - draw_meta_flat(xcenter, w, crook_fatness, arrowup, arrowdown); -enddef; - -% -% unfortunately, 600dpi is not enough to show the brush of the stem. -% - -fet_beginchar ("Flat", "flat"); - draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, - false, false); - penlabels (range 0 thru 11); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Flat (arrow up)", "flat.arrowup"); - draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, - true, false); - penlabels (range 0 thru 23); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Flat (arrow down)", "flat.arrowdown"); - draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, - false, true); - penlabels (range 0 thru 23); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Arrowed Flat (arrow up and down)", "flat.arrowboth"); - draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, - true, true); - penlabels (range 0 thru 23); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Flat (slashed)", "flat.slash"); - set_char_box (.4 staff_space#, .8 staff_space#, - 0.6 staff_space#, 1.9 staff_space#); - - draw_meta_flat (0, w, 0.31 staff_space, false, false); - - clearxy; - - save slope, slash_width; - slope = 0.5; - slash_width = w; - - z11 = (0, h / 2); - z12 = z11 - (slash_width, slash_width * slope) / 2; - z13 = z11 + (slash_width, slash_width * slope) / 2; - penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); - penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); - - z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); - z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); - - fill z13r - .. z15 - .. z13l - -- z12l - .. z14 - .. z12r - -- z13r - .. cycle; - - penlabels (12, 13); - labels (14, 15); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -fet_beginchar ("Flat (slashed twice)", "flat.slashslash"); - set_char_box (.4 staff_space#, .8 staff_space#, - 0.6 staff_space#, 1.9 staff_space#); - - draw_meta_flat (0, w, 0.31 staff_space, false, false); - - clearxy; - - save slope, slash_width; - slope = 0.5; - slash_width = w; - - z11 = (0, 5/12 h); - z12 = z11 - (slash_width, slash_width * slope) / 2; - z13 = z11 + (slash_width, slash_width * slope) / 2; - penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); - penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); - - z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); - z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); - - fill z13r - .. z15 - .. z13l - -- z12l - .. z14 - .. z12r - -- z13r - .. cycle; - - penlabels (12, 13); - labels (14, 15); - - z21 = (0, 2/3 h); - z22 = z21 - (slash_width, slash_width * slope) / 2; - z23 = z21 + (slash_width, slash_width * slope) / 2; - penpos22 (1.5 stafflinethickness, angle (z23 - z22) - 90); - penpos23 (1.5 stafflinethickness, angle (z23 - z22) - 90); - - z24 = z22 - .75 stafflinethickness * unitvector (z23 - z22); - z25 = z23 + .75 stafflinethickness * unitvector (z23 - z22); - - fill z23r - .. z25 - .. z23l - -- z22l - .. z24 - .. z22r - -- z23r - .. cycle; - - penlabels (22, 23); - labels (24, 25); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat"); - set_char_box (0, 1.6 staff_space#, - 0.6 staff_space#, 1.9 staff_space#); - - % This is a modified version of `draw_meta_flat'. - - save crook_thinness, crook_fatness; - save bottom_overshoot, bot_crook_dir; - save top_stem_thick, bottom_stem_thick, hair, smaller_hole; - save top_crook_thinness; - save zwiep; - save center; - pair center, bot_crook_dir; - save clearing, wid; - save pat; - path pat; - - clearxy; - - wid = w / 2; - - % the stem shouldn't reach the top staff line. - %% TODO: should take from height. - % - % TODO: parameterize this - % - if wid >= 0.75 staff_space: - smaller_hole = 0.35 stafflinethickness; - else: - smaller_hole = 0; - fi; - clearing = 1.7 stafflinethickness; - crook_thinness = .7 stafflinethickness + .06 staff_space; - crook_fatness = 0.31 staff_space; - top_crook_thinness = 1 stafflinethickness + .065 staff_space; - bottom_overshoot = stafflinethickness; - - bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#; - top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#; - define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick); - - if odd (top_stem_thick - bottom_stem_thick): - top_stem_thick := top_stem_thick - 1; - fi; - - center = (0, 0); - - x1l = hround (-.5 top_stem_thick); - y1 = vround (2 staff_space - clearing); - x2l = hround (-.5 bottom_stem_thick); - y2 = -.5 staff_space - .5 stafflinethickness; - - penpos1 (top_stem_thick, 0); - penpos2 (bottom_stem_thick, 0); - - y3l = vfloor ((staff_space - stafflinethickness) / 2); - z3l = whatever [z2r, z1r]; - z3r = .3 [z2r, z1r] + (smaller_hole, 0); - x3r := hceiling x3r; - - z10 = whatever [z2r, z1r] + (smaller_hole, 0); - y10 = -1/10 staff_space; - x10 := hceiling x10; - - x11 = bottom_overshoot / 3; - y11 = -vround (.5 (staff_space + stafflinethickness) - + bottom_overshoot); - - penpos4 (whatever, 53); - - y4l - y4r = top_crook_thinness; - y5r = .15 staff_space; - x5l = hround (wid); - y4 = staff_space / 2; - x4r = .45 [x5r, x3r]; - y4l := vround y4l; - - penpos5 (crook_fatness, -175); - - bot_crook_dir = unitvector ((x5l, 0) - z11); - z8 = z11 + whatever * bot_crook_dir; - y8 = -staff_space / 2; - - z7 = z8 - + whatever * bot_crook_dir - + crook_thinness * (bot_crook_dir rotated 90); - x7 = .1 [x3r, x8]; - - pat := z3r{z3r - z10} - .. z4r{right} - .. z5r{down} - .. z7{-bot_crook_dir} - & z7 - .. z10{z3r - z10} - -- cycle; - unfill pat; - unfill pat xscaled -1; - - pat := z11{right} - .. z8{bot_crook_dir} - .. z5l{up} - .. z4l{left} - .. z3l; - fill pat - -- simple_serif (z1r, z1l, 30) - -- reverse pat xscaled -1 shifted (-feta_eps, 0) - -- cycle; - - currentpicture := currentpicture shifted (w/2, 0); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Semi flat", "mirroredflat"); - set_char_box (1.2 stafflinethickness#, .8 staff_space#, - 0.6 staff_space#, 1.9 staff_space#); - - draw_meta_flat (0, w, 0.31 staff_space, false, false); - currentpicture := currentpicture xscaled -1 shifted (w - b, 0); -fet_endchar; - - -fet_beginchar ("Semi flat", "mirroredflat.backslash"); - set_char_box (.4 staff_space#, .8 staff_space#, - 0.6 staff_space#, 1.9 staff_space#); - - draw_meta_flat (0, w, 0.31 staff_space, false, false); - - clearxy; - - save slope, slash_width; - slope = 0.5; - slash_width = w; - - z11 = (0, h / 2); - z12 = z11 - (slash_width, slash_width * slope) / 2; - z13 = z11 + (slash_width, slash_width * slope) / 2; - penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); - penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); - - z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); - z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); - - fill z13r - .. z15 - .. z13l - -- z12l - .. z14 - .. z12r - -- z13r - .. cycle; - - currentpicture := currentpicture xscaled -1 shifted (w - b, 0); - - labels (1, 2, 3); -fet_endchar; - - -fet_beginchar ("Double Flat", "flatflat"); - save left_wid, overlap, right_wid; - - left_wid = .7; - right_wid = .8; - overlap = .05; - - set_char_box (1.2 stafflinethickness#, - (left_wid + right_wid - overlap) * staff_space#, - .6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space, - false, false); - draw_meta_flat (hround ((left_wid - overlap) * staff_space), - right_wid * staff_space, 1/3 staff_space, - false, false); -fet_endchar; - - -fet_beginchar ("3/4 Flat", "flatflat.slash"); - save left_wid, overlap, right_wid; - - left_wid = .7; - right_wid = .8; - overlap = .05; - - set_char_box (1.2 stafflinethickness#, - (left_wid + right_wid - overlap) * staff_space#, - .6 staff_space#, 1.9 staff_space#); - draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space, - false, false); - draw_meta_flat (hround ((left_wid - overlap) * staff_space), - right_wid * staff_space, 1/3 staff_space, - false, false); - - %% maybe we should clip part of the stems? - %% or make the 1st flat smaller? - %% or reverse it? - pickup pencircle scaled 2 stafflinethickness; - - z12 = round (-.25 w - b, .55 staff_space) + feta_offset; - z13 = round (.75 w, 1.45 staff_space) + feta_offset; - penpos12 (2 stafflinethickness, angle (z13 - z12) - 90); - penpos13 (2 stafflinethickness, angle (z13 - z12) - 90); - - z14 = z12 - stafflinethickness * unitvector (z13 - z12); - z15 = z13 + stafflinethickness * unitvector (z13 - z12); - - fill z13r - .. z15 - .. z13l - -- z12l - .. z14 - .. z12r - -- z13r - .. cycle; - - penlabels (12, 13); - labels (14, 15); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Double Sharp", "doublesharp"); - save klaverblad, klaversteel; - save pat; - path pat; - - klaversteel = 1/15 staff_space; - klaverblad = .4 staff_space - .5 stafflinethickness; - - set_char_box (0, staff_space#, .5 staff_space#, .5 staff_space#); - - z1 = (klaversteel, 0); - z2 = (w / 2 - klaverblad / 10, h - klaverblad); - z3 = (w / 2, h); - z4 = z2 reflectedabout ((0, 0), (1, 1)); - z5 = z1 reflectedabout ((0, 0), (1, 1)); - - labels (1, 2, 3, 4, 5); - - pickup pencircle scaled blot_diameter; - - x2 := hfloor (rt x2) - blot_diameter / 2; - x3 := hfloor (rt x3) - blot_diameter / 2; - y3 := vfloor (top y3) - blot_diameter / 2; - y4 := vfloor (top y4) - blot_diameter / 2; - - pat = (rt z1){dir45} - .. {right}(bot z2) - .. rt z2 - -- rt z3{z3 - z2} - .. top z3{z4 - z3} - -- top z4{z4 - z3} - .. (lft z4){down} - .. {dir 225}(top z5); - pat := pat - -- reverse pat xscaled -1 shifted (-feta_eps, 0); - - % assure symmetry -- it's more important to center the glyph on the - % staff line than centering it between staff lines, so we use - % feta_shift, not feta_space_shift. - h := h + feta_shift; - - fill pat shifted (0, feta_shift) - -- reverse pat yscaled -1 shifted (0, -feta_eps) - -- cycle; - - % ugh - currentpicture := currentpicture shifted (hround (w / 2), 0); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -def draw_paren = - save leftindent; - - leftindent := .2 staff_space; - - set_char_box (0, .5 staff_space# + stafflinethickness#, - staff_space#, staff_space#); - - d := d - feta_shift; - - z1 = (leftindent, h); - z2 = (w - stafflinethickness, .5 (h - d)); - z3 = (leftindent, -d); - - penpos1 (stafflinethickness, 35); - penpos2 (.1 staff_space + stafflinethickness, 0); - penpos3 (stafflinethickness, -35); - - fill z2l{down} - .. simple_serif (z3l, z3r, 90) - .. z2r{up} - .. simple_serif (z1r, z1l, 90) - .. z2l{down} - -- cycle; -enddef; - - -fet_beginchar ("Right Parenthesis", "rightparen"); - draw_paren; - penlabels (1, 2, 3); - - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); -fet_endchar; - - -draw_shifted_too; - - -fet_beginchar ("Left Parenthesis", "leftparen"); - draw_paren; - - currentpicture := currentpicture xscaled -1; - - set_char_box (charwd, charbp, chardp, charht); -fet_endchar; - + input feta-arrow; + input feta-sharps; + input feta-naturals; + input feta-flats; + input feta-parenthesis; fet_endgroup ("accidentals"); diff --git a/mf/feta-alphabet-generic.mf b/mf/feta-alphabet-generic.mf new file mode 100644 index 0000000000..047f08bc8a --- /dev/null +++ b/mf/feta-alphabet-generic.mf @@ -0,0 +1,19 @@ +% This file is part of LilyPond, the GNU music typesetter. +% +% Copyright (C) 1997--2012 Han-Wen Nienhuys +% +% The LilyPond font is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version, or under the SIL Open Font License. + + +input common-modules-and-initialization; + +fet_beginfont ("feta-alphabet", design_size, "fetaNumber"); + number_design_size := design_size / 2; + dynamic_design_size := 14 design_size / 20; + + input feta-numbers; + input feta-dynamics; +fet_endfont ("feta-numbers"); diff --git a/mf/feta-alphabet.mf b/mf/feta-alphabet.mf deleted file mode 100644 index 5663a791b7..0000000000 --- a/mf/feta-alphabet.mf +++ /dev/null @@ -1,19 +0,0 @@ -test := 0; - -staffsize# := design_size * pt#; - -input feta-autometric; -input feta-macros; -input feta-params; - -fet_beginfont ("feta-alphabet", design_size, "fetaNumber"); - -mode_setup; - -number_design_size := design_size / 2; -dynamic_design_size := 14 design_size / 20; - -input feta-numbers; -input feta-dynamics; - -fet_endfont ("feta-numbers"); diff --git a/mf/feta-alphabet11.mf b/mf/feta-alphabet11.mf index 04ba4e3867..c9e10df325 100644 --- a/mf/feta-alphabet11.mf +++ b/mf/feta-alphabet11.mf @@ -1,6 +1,6 @@ -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 11.22; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet13.mf b/mf/feta-alphabet13.mf index d314f40d4d..56924fb199 100644 --- a/mf/feta-alphabet13.mf +++ b/mf/feta-alphabet13.mf @@ -1,6 +1,6 @@ -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 12.60; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet14.mf b/mf/feta-alphabet14.mf index 9a1bd2ee71..8db8b63da7 100644 --- a/mf/feta-alphabet14.mf +++ b/mf/feta-alphabet14.mf @@ -1,6 +1,6 @@ -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 14.14; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet16.mf b/mf/feta-alphabet16.mf index 86eb9c8c89..e93d0e61c0 100644 --- a/mf/feta-alphabet16.mf +++ b/mf/feta-alphabet16.mf @@ -1,6 +1,6 @@ -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 15.87; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet18.mf b/mf/feta-alphabet18.mf index db216c154b..30441bbd9b 100644 --- a/mf/feta-alphabet18.mf +++ b/mf/feta-alphabet18.mf @@ -1,6 +1,6 @@ -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 17.82; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet20.mf b/mf/feta-alphabet20.mf index 0affe39057..3d86449713 100644 --- a/mf/feta-alphabet20.mf +++ b/mf/feta-alphabet20.mf @@ -1,7 +1,6 @@ -% feta-alphabet20.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 20; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet23.mf b/mf/feta-alphabet23.mf index c8a725e59e..ffd3381ce4 100644 --- a/mf/feta-alphabet23.mf +++ b/mf/feta-alphabet23.mf @@ -1,7 +1,6 @@ -% feta-alphabet23.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 22.45; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-alphabet26.mf b/mf/feta-alphabet26.mf index 71af0403f9..02170ec89d 100644 --- a/mf/feta-alphabet26.mf +++ b/mf/feta-alphabet26.mf @@ -1,6 +1,6 @@ -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 25.20; -input feta-alphabet; +input feta-alphabet-generic; end. diff --git a/mf/feta-arrow.mf b/mf/feta-arrow.mf new file mode 100644 index 0000000000..fab1bf1ba4 --- /dev/null +++ b/mf/feta-arrow.mf @@ -0,0 +1,82 @@ + +% +% Draw an arrow +% +% * `stemslant' gives the direction of the stem's left boundary +% (needed for brushed stems, equals "up" for straight stems) +% * `extend' is used to make the stem longer or shorter (if negative); +% different kinds of accidentals need different values here +% +def draw_arrow (expr attach, stemwidth, stemslant, extend, pointingdown) = +begingroup; + save htip; % tip height + save wwing; % wing `radius' + save angle_wing_bot, angle_wing_top, angle_tip; + save upshift; + clearxy; + + wwing := 0.26 stemwidth; + htip := staff_space * 0.85 + stafflinethickness - wwing; + + % `flip' is used to reflect the arrow vertically + % if arrow points downward + transform flip; + if pointingdown: + flip = identity reflectedabout (origin, right); + else: + flip = identity; + fi; + + z1 = attach shifted (-stemwidth / 2, 0); + upshift := max (0, wwing + 0.1 staff_space + extend); + z2 = z1 shifted (((unitvector stemslant) + scaled upshift) transformed flip); + + z7 = attach shifted ((stemwidth/2),0); + z6 = z7 shifted (((unitvector (-xpart stemslant, ypart stemslant)) + scaled upshift) transformed flip); + z2 - z3 = ( 0.38 staff_space, 0.05 htip) transformed flip; + z6 - z5 = (-0.38 staff_space, 0.05 htip) transformed flip; + + z4 = attach shifted ((-0.2 stemwidth, upshift + htip) + transformed flip); + z4'= attach shifted (( 0.2 stemwidth, upshift + htip) + transformed flip); + + % `angle_wing_bot' is the angle at which the arc + % from z2 to z3a enters z3a + % `angle_wing_top' is the angle at which the arc + % from z3b to z4 leaves z3b + % `angle_tip' is the angle at which the arc + % from z4 to z4' leaves z4 + angle_wing_bot = 30; + angle_wing_top = 55; + angle_tip = 68; + + z3a = z3 shifted ((((dir angle_wing_bot) rotated -90) + scaled wwing) transformed flip); + z3b = z3 shifted ((((dir angle_wing_top) rotated 90) + scaled wwing) transformed flip); + + z5a = z5 shifted ((((dir (180 - angle_wing_bot)) rotated 90) + scaled wwing) transformed flip); + z5b = z5 shifted ((((dir (180 - angle_wing_top)) rotated -90) + scaled wwing) transformed flip); + + % Draw the arrow + pickup pencircle scaled 1; + fill z1 + -- z2{stemslant transformed flip} + .. {(-dir angle_wing_bot) transformed flip}z3a + .. z3b{(dir angle_wing_top) transformed flip} + .. z4{(dir angle_tip) transformed flip} + .. z4'{(dir (-angle_tip)) transformed flip} + .. {(dir (-angle_wing_top)) transformed flip}z5b + .. z5a{(-dir (-angle_wing_bot)) transformed flip} + .. z6{((-stemslant) reflectedabout (origin, up)) transformed flip} + -- z7 + -- cycle; + + labels (range 0 thru 7, 4', 3a, 3b, 5a, 5b); +endgroup; +enddef; diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf index 1210262421..8cf00c4efe 100644 --- a/mf/feta-braces-a.mf +++ b/mf/feta-braces-a.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- 256 smallest braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 0; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf index df91510af7..c6a02a08e4 100644 --- a/mf/feta-braces-b.mf +++ b/mf/feta-braces-b.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 1; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf index 87fc66047d..591065d303 100644 --- a/mf/feta-braces-c.mf +++ b/mf/feta-braces-c.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 2; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf index ffad571c0c..a2ef2510a3 100644 --- a/mf/feta-braces-d.mf +++ b/mf/feta-braces-d.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 3; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf index a0b130bdad..dfdb94fd7e 100644 --- a/mf/feta-braces-e.mf +++ b/mf/feta-braces-e.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 4; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf index ad31d2bcc8..866c543539 100644 --- a/mf/feta-braces-f.mf +++ b/mf/feta-braces-f.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 5; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf index 545ca5a855..4347abe688 100644 --- a/mf/feta-braces-g.mf +++ b/mf/feta-braces-g.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 6; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-generic.mf b/mf/feta-braces-generic.mf new file mode 100644 index 0000000000..fea872acce --- /dev/null +++ b/mf/feta-braces-generic.mf @@ -0,0 +1,47 @@ +% This file is part of LilyPond, the GNU music typesetter. +% +% Copyright (C) 1997--2012 Han-Wen Nienhuys +% Jan Nieuwenhuizen +% +% The LilyPond font is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version, or under the SIL Open Font License. + + +% We have to reduce the pixel-per-point value to +% support large brace glyphs in case we are using MetaPost +% (which by default sets `hppp' to 49.80244, regardless of +% the used `mag' value) + +if known miterlimit: + bpppix_ := 0.2; % ten times larger than original + + numeric mm, pt, dd, bp, cm, pc, cc, in; + + mm * bpppix_ = 2.83464; + pt * bpppix_ = 0.99626; + dd * bpppix_ = 1.06601; + bp * bpppix_ = 1; + cm * bpppix_ = 28.34645; + pc * bpppix_ = 11.95517; + cc * bpppix_ = 12.79213; + in * bpppix_ = 72; + + hppp := pt; + vppp := pt; +fi; + +design_size := 20; %% arbitrary + +input common-modules-and-initialization; + +% +% We must let the design increase for each font to make sure that mftrace +% doesn't jack up the resolution too highly for the longer braces. +% + +fet_beginfont ("feta-braces-" & char (97 + font_count), + (font_count + 1) * 20, "fetaBraces"); + input feta-braces; +fet_endfont ("feta-braces"); diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf index 646e153106..dda3ce2069 100644 --- a/mf/feta-braces-h.mf +++ b/mf/feta-braces-h.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 7; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf index 0f3fcd3567..29d519112b 100644 --- a/mf/feta-braces-i.mf +++ b/mf/feta-braces-i.mf @@ -1,22 +1,5 @@ % Feta (not the Font-En-Tja) music font -- next 256 braces -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . font_count := 8; -input feta-braces; +input feta-braces-generic; end. diff --git a/mf/feta-braces.mf b/mf/feta-braces.mf index c948f345fd..cf592e72b0 100644 --- a/mf/feta-braces.mf +++ b/mf/feta-braces.mf @@ -17,49 +17,11 @@ % You should have received a copy of the GNU General Public License % along with LilyPond. If not, see . - -% We have to reduce the pixel-per-point value to -% support large brace glyphs in case we are using MetaPost -% (which by default sets `hppp' to 49.80244, regardless of -% the used `mag' value) - -if known miterlimit: - bpppix_ := 0.2; % ten times larger than original - - numeric mm, pt, dd, bp, cm, pc, cc, in; - - mm * bpppix_ = 2.83464; - pt * bpppix_ = 0.99626; - dd * bpppix_ = 1.06601; - bp * bpppix_ = 1; - cm * bpppix_ = 28.34645; - pc * bpppix_ = 11.95517; - cc * bpppix_ = 12.79213; - in * bpppix_ = 72; - - hppp := pt; - vppp := pt; -fi; - - -input feta-autometric; -input feta-macros; - -staffsize# := 20 pt#; %% arbitrary - -input feta-params; - % % We must let the design increase for each font to make sure that mftrace % doesn't jack up the resolution too highly for the longer braces. % -fet_beginfont ("feta-braces-" & char (97 + font_count), - (font_count + 1) * 20, "fetaBraces"); - -mode_setup; - - save code, braces_per_font; code := 64; braces_per_font := 64; @@ -160,5 +122,3 @@ for i := 0 step 1 until font_count: number := number + 1; endfor; endfor; - -fet_endfont ("feta-braces"); diff --git a/mf/feta-clefs.mf b/mf/feta-clefs.mf index d76b341453..2b79030ae5 100644 --- a/mf/feta-clefs.mf +++ b/mf/feta-clefs.mf @@ -105,7 +105,7 @@ def draw_c_clef (expr reduction) = % ugh, should be bulb, not flare? - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; @@ -270,7 +270,7 @@ def draw_bass_clef (expr exact_center, reduction) = penlabels (1, 2, 3, 4, 5, 6); - draw_staff (-3, 1, 0); + draw_staff_if_debugging (-3, 1); enddef; @@ -482,7 +482,7 @@ def draw_gclef (expr reduction) = penlabels (range 101 thru 121); penlabels (110', 111'); - draw_staff (-1, 3, 0); + draw_staff_if_debugging (-1, 3); enddef; @@ -522,7 +522,7 @@ def draw_percussion_clef (expr reduction) = draw_block ((-b, -d), (-b + razt, h)); draw_block ((w - razt, -d), (w, h)); - draw_staff (-3, 1, 1); + draw_staff_if_debugging (-3, 1); enddef; @@ -729,7 +729,7 @@ def draw_tab_clef (expr reduction) = draw_tab_B ((-b + .025 reduced_ss, -d), (2.1 reduced_ss, letterheight), 0.25); - draw_staff (-3, 2, 0.5); + draw_staff_if_debugging (-3, 2); enddef; diff --git a/mf/feta-flags-generic.mf b/mf/feta-flags-generic.mf index 947cc8a35a..8fc5aab9ee 100644 --- a/mf/feta-flags-generic.mf +++ b/mf/feta-flags-generic.mf @@ -1,4 +1,3 @@ -% Feta (not the Font-En-Tja) music font -- generic stuff: include lots of files, but don't % This file is part of LilyPond, the GNU music typesetter. % % Copyright (C) 1997--2012 Han-Wen Nienhuys @@ -7,40 +6,14 @@ % it under the terms of the GNU General Public License as published by % the Free Software Foundation, either version 3 of the License, or % (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . - - -if test = -1: - mode := smoke; -fi -staffsize# := design_size * pt#; -mode_setup; - -input feta-macros; - -input feta-params; +input common-modules-and-initialization; font_x_height staff_space#; fet_beginfont ("feta", design_size, "fetaMusic"); + input feta-flags; -input feta-flags; - -autometric_parameter ("staffsize", staffsize#); -autometric_parameter ("stafflinethickness", stafflinethickness#); -autometric_parameter ("staff_space", staff_space#); -autometric_parameter ("linethickness", linethickness#); -autometric_parameter ("black_notehead_width", black_notehead_width#); -autometric_parameter ("ledgerlinethickness", ledgerlinethickness#); -autometric_parameter ("blot_diameter", blot_diameter#); - + input declare-autometric-parameters; fet_endfont; diff --git a/mf/feta-flags11.mf b/mf/feta-flags11.mf index 30cd7f0976..8026bf499d 100644 --- a/mf/feta-flags11.mf +++ b/mf/feta-flags11.mf @@ -1,13 +1,5 @@ -% feta-flags11.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 11.22; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags13.mf b/mf/feta-flags13.mf index 3210b1abc1..51e508fee3 100644 --- a/mf/feta-flags13.mf +++ b/mf/feta-flags13.mf @@ -1,13 +1,5 @@ -% feta-flags13.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 12.60; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags14.mf b/mf/feta-flags14.mf index 9a5449cc5d..22055a8cc2 100644 --- a/mf/feta-flags14.mf +++ b/mf/feta-flags14.mf @@ -1,13 +1,5 @@ -% feta-flags14.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 14.14; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags16.mf b/mf/feta-flags16.mf index d02993736a..3e706e7d23 100644 --- a/mf/feta-flags16.mf +++ b/mf/feta-flags16.mf @@ -1,13 +1,5 @@ -% feta-flags16.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 15.87; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags18.mf b/mf/feta-flags18.mf index dcaefd440d..a15fea7560 100644 --- a/mf/feta-flags18.mf +++ b/mf/feta-flags18.mf @@ -1,13 +1,5 @@ -% feta-flags18.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 17.82; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags20.mf b/mf/feta-flags20.mf index b7b834ecc4..9eedbeb78d 100644 --- a/mf/feta-flags20.mf +++ b/mf/feta-flags20.mf @@ -1,13 +1,5 @@ -% feta-flags20.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 20; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags23.mf b/mf/feta-flags23.mf index dcd640c8a9..1500a15110 100644 --- a/mf/feta-flags23.mf +++ b/mf/feta-flags23.mf @@ -1,13 +1,5 @@ -% feta-flags23.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 22.45; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flags26.mf b/mf/feta-flags26.mf index b2a1fe616f..322213b562 100644 --- a/mf/feta-flags26.mf +++ b/mf/feta-flags26.mf @@ -1,13 +1,5 @@ -% feta-flags26.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 25.20; -test := 0; - - input feta-flags-generic; - end. - diff --git a/mf/feta-flats.mf b/mf/feta-flats.mf new file mode 100644 index 0000000000..b7470e2fec --- /dev/null +++ b/mf/feta-flats.mf @@ -0,0 +1,535 @@ + +% +% Dedicated to my mom. (3/10/97) +% +% Mamma, ik hou van je; kom je alsjeblieft terug? +% -- HW +% +% +% TODO: remove crook_fatness +% TODO: document, simplify! +% + +def draw_meta_flat (expr xcenter, w, crook_fatness, arrowup, arrowdown) = + save crook_thinness; + save bottom_overshoot, bot_crook_dir; + save top_stem_thick, top_stem_thick_orig; + save bottom_stem_thick, hair, smaller_hole; + save top_crook_thinness; + save zwiep; + save center; + pair center, bot_crook_dir; + save clearing, clearing_orig; + + clearxy; + + % the stem shouldn't reach the top staff line. + %% TODO: should take from height. + % + % TODO: parameterize this + % + if w >= 0.75 staff_space: + smaller_hole = 0.35 stafflinethickness; + else: + smaller_hole = 0; + fi; + crook_thinness = .7 stafflinethickness + .06 staff_space; + top_crook_thinness = 1 stafflinethickness + .065 staff_space; + clearing = 1.7 stafflinethickness; + clearing_orig = clearing; + if arrowup: + clearing := 0.5 staff_space; + fi; + bottom_overshoot = stafflinethickness; + + bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#; + top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#; + top_stem_thick_orig# = top_stem_thick#; + if arrowup: + % to look nice, arrowed stems should be less brushed + top_stem_thick# := top_stem_thick# * 0.8; + fi; + define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick, + top_stem_thick_orig); + + if odd (top_stem_thick - bottom_stem_thick): + top_stem_thick := top_stem_thick - 1; + fi; + if odd (top_stem_thick_orig - bottom_stem_thick): + top_stem_thick_orig := top_stem_thick_orig - 1; + fi; + + center = (xcenter, 0); + + x1l = hround (xcenter - .5 top_stem_thick); + y1 = vround (2 staff_space - clearing); + x2l = hround (xcenter - .5 bottom_stem_thick); + y2 = -.5 staff_space - .5 stafflinethickness; + % z16 and the `*_orig' variables are needed for arrowed accidentals + % because their inner part should be unchanged from plain ones but + % the points z3l, z3r, and z10 depend on values that are different + % for arrowed accidentals + x16l = hround (xcenter -.5 top_stem_thick_orig); + y16 = vround (2 staff_space - clearing_orig); + + penpos1 (top_stem_thick, 0); + penpos16 (top_stem_thick_orig, 0); + penpos2 (bottom_stem_thick, 0); + + y3l = vfloor ((staff_space - stafflinethickness) / 2); + z3l = whatever [z2r, z1r]; + z3r = .3 [z2r, + (z16r shifted (0, clearing_orig - 1.7 stafflinethickness))] + + (smaller_hole, 0); + x3r := hceiling x3r; + + % we insert z3l to get better conversion with mf2pt1 + fill simple_serif (z1r, z1l, 30) + -- z2l + -- z2r + -- z3l + -- cycle; + + z10 = whatever [z2r, z16r] + (smaller_hole, 0); + y10 = -1/10 staff_space; + x10 := hceiling x10; + + x11 = xcenter + bottom_overshoot / 3; + y11 = -vround (.5 (staff_space + stafflinethickness) + + bottom_overshoot); + + x2a = 0.2[x2r, x7]; + y2a = 1.5[y2, y11]; + + penpos4 (whatever, 53); + + y4l - y4r = top_crook_thinness; + y5r = .15 staff_space; + x5l = hround (w + xcenter); + y4 = staff_space / 2; + x4r = .45 [x5r, x3r]; + y4l := vround y4l; + + penpos5 (crook_fatness, -175); + + bot_crook_dir = unitvector ((x5l, 0) - z11); + z8 = z11 + whatever * bot_crook_dir; + y8 = -staff_space / 2; + + z7 = z8 + + whatever * bot_crook_dir + + crook_thinness * (bot_crook_dir rotated 90); + x7 = .1 [x3r, x8]; + + unfill z3r{z3r - z10} + .. z4r{right} + .. z5r{down} + .. z7{-bot_crook_dir} + & z7 + .. z10{z3r - z10} + -- cycle; + + if arrowdown: + fill z2l{down} + .. z2a{up} + .. z8{bot_crook_dir} + .. z5l{up} + .. z4l{left} + .. z3l + -- cycle; + else: + fill z2l{down} + .. z11{right} + .. z8{bot_crook_dir} + .. z5l{up} + .. z4l{left} + .. z3l + -- cycle; + fi; + + if arrowup: + draw_arrow (z1, top_stem_thick, z1l - z2l, + 0.5 stafflinethickness, false); + fi; + if arrowdown: + draw_arrow ((0.5 [x2l, x2a], y2), x2a - x2l, up, + staff_space / 2, true); + fi; +enddef; + + +def draw_arrowed_meta_flat (expr xcenter, width, crook_fatness, + arrowup, arrowdown) = + save depth, height, extendleft; + + depth# = 0.6 staff_space#; + height# = 1.9 staff_space#; + extendleft# := 1.2 stafflinethickness#; + if arrowup: + extendleft# := 3.45 stafflinethickness#; + height# := height# + 0.8 staff_space#; + fi; + if arrowdown: + extendleft# := 3.45 stafflinethickness#; + depth# := depth# + 1.6 staff_space#; + fi; + + set_char_box (extendleft#, width, depth#, height#); + draw_meta_flat(xcenter, w, crook_fatness, arrowup, arrowdown); +enddef; + +% +% unfortunately, 600dpi is not enough to show the brush of the stem. +% + +fet_beginchar ("Flat", "flat"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + false, false); + penlabels (range 0 thru 11); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Arrowed Flat (arrow up)", "flat.arrowup"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + true, false); + penlabels (range 0 thru 23); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Arrowed Flat (arrow down)", "flat.arrowdown"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + false, true); + penlabels (range 0 thru 23); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Arrowed Flat (arrow up and down)", "flat.arrowboth"); + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + true, true); + penlabels (range 0 thru 23); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Flat (slashed)", "flat.slash"); + set_char_box (.4 staff_space#, .8 staff_space#, + 0.6 staff_space#, 1.9 staff_space#); + + draw_meta_flat (0, w, 0.31 staff_space, false, false); + + clearxy; + + save slope, slash_width; + slope = 0.5; + slash_width = w; + + z11 = (0, h / 2); + z12 = z11 - (slash_width, slash_width * slope) / 2; + z13 = z11 + (slash_width, slash_width * slope) / 2; + penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); + z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; + + penlabels (12, 13); + labels (14, 15); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Flat (slashed twice)", "flat.slashslash"); + set_char_box (.4 staff_space#, .8 staff_space#, + 0.6 staff_space#, 1.9 staff_space#); + + draw_meta_flat (0, w, 0.31 staff_space, false, false); + + clearxy; + + save slope, slash_width; + slope = 0.5; + slash_width = w; + + z11 = (0, 5/12 h); + z12 = z11 - (slash_width, slash_width * slope) / 2; + z13 = z11 + (slash_width, slash_width * slope) / 2; + penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); + z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; + + penlabels (12, 13); + labels (14, 15); + + z21 = (0, 2/3 h); + z22 = z21 - (slash_width, slash_width * slope) / 2; + z23 = z21 + (slash_width, slash_width * slope) / 2; + penpos22 (1.5 stafflinethickness, angle (z23 - z22) - 90); + penpos23 (1.5 stafflinethickness, angle (z23 - z22) - 90); + + z24 = z22 - .75 stafflinethickness * unitvector (z23 - z22); + z25 = z23 + .75 stafflinethickness * unitvector (z23 - z22); + + fill z23r + .. z25 + .. z23l + -- z22l + .. z24 + .. z22r + -- z23r + .. cycle; + + penlabels (22, 23); + labels (24, 25); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat"); + set_char_box (0, 1.6 staff_space#, + 0.6 staff_space#, 1.9 staff_space#); + + % This is a modified version of `draw_meta_flat'. + + save crook_thinness, crook_fatness; + save bottom_overshoot, bot_crook_dir; + save top_stem_thick, bottom_stem_thick, hair, smaller_hole; + save top_crook_thinness; + save zwiep; + save center; + pair center, bot_crook_dir; + save clearing, wid; + save pat; + path pat; + + clearxy; + + wid = w / 2; + + % the stem shouldn't reach the top staff line. + %% TODO: should take from height. + % + % TODO: parameterize this + % + if wid >= 0.75 staff_space: + smaller_hole = 0.35 stafflinethickness; + else: + smaller_hole = 0; + fi; + clearing = 1.7 stafflinethickness; + crook_thinness = .7 stafflinethickness + .06 staff_space; + crook_fatness = 0.31 staff_space; + top_crook_thinness = 1 stafflinethickness + .065 staff_space; + bottom_overshoot = stafflinethickness; + + bottom_stem_thick# = 0.06 staff_space# + 0.6 stafflinethickness#; + top_stem_thick# = 0.1 staff_space# + 1.2 stafflinethickness#; + define_whole_blacker_pixels (bottom_stem_thick, top_stem_thick); + + if odd (top_stem_thick - bottom_stem_thick): + top_stem_thick := top_stem_thick - 1; + fi; + + center = (0, 0); + + x1l = hround (-.5 top_stem_thick); + y1 = vround (2 staff_space - clearing); + x2l = hround (-.5 bottom_stem_thick); + y2 = -.5 staff_space - .5 stafflinethickness; + + penpos1 (top_stem_thick, 0); + penpos2 (bottom_stem_thick, 0); + + y3l = vfloor ((staff_space - stafflinethickness) / 2); + z3l = whatever [z2r, z1r]; + z3r = .3 [z2r, z1r] + (smaller_hole, 0); + x3r := hceiling x3r; + + z10 = whatever [z2r, z1r] + (smaller_hole, 0); + y10 = -1/10 staff_space; + x10 := hceiling x10; + + x11 = bottom_overshoot / 3; + y11 = -vround (.5 (staff_space + stafflinethickness) + + bottom_overshoot); + + penpos4 (whatever, 53); + + y4l - y4r = top_crook_thinness; + y5r = .15 staff_space; + x5l = hround (wid); + y4 = staff_space / 2; + x4r = .45 [x5r, x3r]; + y4l := vround y4l; + + penpos5 (crook_fatness, -175); + + bot_crook_dir = unitvector ((x5l, 0) - z11); + z8 = z11 + whatever * bot_crook_dir; + y8 = -staff_space / 2; + + z7 = z8 + + whatever * bot_crook_dir + + crook_thinness * (bot_crook_dir rotated 90); + x7 = .1 [x3r, x8]; + + pat := z3r{z3r - z10} + .. z4r{right} + .. z5r{down} + .. z7{-bot_crook_dir} + & z7 + .. z10{z3r - z10} + -- cycle; + unfill pat; + unfill pat xscaled -1; + + pat := z11{right} + .. z8{bot_crook_dir} + .. z5l{up} + .. z4l{left} + .. z3l; + fill pat + -- simple_serif (z1r, z1l, 30) + -- reverse pat xscaled -1 shifted (-feta_eps, 0) + -- cycle; + + currentpicture := currentpicture shifted (w/2, 0); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Semi flat", "mirroredflat"); + set_char_box (1.2 stafflinethickness#, .8 staff_space#, + 0.6 staff_space#, 1.9 staff_space#); + + draw_meta_flat (0, w, 0.31 staff_space, false, false); + currentpicture := currentpicture xscaled -1 shifted (w - b, 0); +fet_endchar; + + +fet_beginchar ("Semi flat", "mirroredflat.backslash"); + set_char_box (.4 staff_space#, .8 staff_space#, + 0.6 staff_space#, 1.9 staff_space#); + + draw_meta_flat (0, w, 0.31 staff_space, false, false); + + clearxy; + + save slope, slash_width; + slope = 0.5; + slash_width = w; + + z11 = (0, h / 2); + z12 = z11 - (slash_width, slash_width * slope) / 2; + z13 = z11 + (slash_width, slash_width * slope) / 2; + penpos12 (1.5 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (1.5 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - .75 stafflinethickness * unitvector (z13 - z12); + z15 = z13 + .75 stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; + + currentpicture := currentpicture xscaled -1 shifted (w - b, 0); + + labels (1, 2, 3); +fet_endchar; + + +fet_beginchar ("Double Flat", "flatflat"); + save left_wid, overlap, right_wid; + + left_wid = .7; + right_wid = .8; + overlap = .05; + + set_char_box (1.2 stafflinethickness#, + (left_wid + right_wid - overlap) * staff_space#, + .6 staff_space#, 1.9 staff_space#); + draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space, + false, false); + draw_meta_flat (hround ((left_wid - overlap) * staff_space), + right_wid * staff_space, 1/3 staff_space, + false, false); +fet_endchar; + + +fet_beginchar ("3/4 Flat", "flatflat.slash"); + save left_wid, overlap, right_wid; + + left_wid = .7; + right_wid = .8; + overlap = .05; + + set_char_box (1.2 stafflinethickness#, + (left_wid + right_wid - overlap) * staff_space#, + .6 staff_space#, 1.9 staff_space#); + draw_meta_flat (0, left_wid * staff_space, 1/3 staff_space, + false, false); + draw_meta_flat (hround ((left_wid - overlap) * staff_space), + right_wid * staff_space, 1/3 staff_space, + false, false); + + %% maybe we should clip part of the stems? + %% or make the 1st flat smaller? + %% or reverse it? + pickup pencircle scaled 2 stafflinethickness; + + z12 = round (-.25 w - b, .55 staff_space) + feta_offset; + z13 = round (.75 w, 1.45 staff_space) + feta_offset; + penpos12 (2 stafflinethickness, angle (z13 - z12) - 90); + penpos13 (2 stafflinethickness, angle (z13 - z12) - 90); + + z14 = z12 - stafflinethickness * unitvector (z13 - z12); + z15 = z13 + stafflinethickness * unitvector (z13 - z12); + + fill z13r + .. z15 + .. z13l + -- z12l + .. z14 + .. z12r + -- z13r + .. cycle; + + penlabels (12, 13); + labels (14, 15); + + draw_staff_if_debugging (-2, 2); +fet_endchar; diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf deleted file mode 100644 index 0d253ce653..0000000000 --- a/mf/feta-generic.mf +++ /dev/null @@ -1,60 +0,0 @@ -% Feta (not the Font-En-Tja) music font -- generic stuff: include lots of files, but don't -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 1997--2012 Han-Wen Nienhuys -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . - - -if test = -1: - mode := smoke; -fi - -staffsize# := design_size * pt#; - -mode_setup; - -input feta-macros; - -input feta-params; - -font_x_height staff_space#; - -fet_beginfont ("feta", design_size, "fetaMusic"); - -if test = 0: - input feta-rests; - input feta-accidentals; - input feta-arrowheads; - input feta-dots; - input feta-scripts; - input feta-clefs; - input feta-timesignatures; - input feta-pedals; - input feta-brackettips; - input feta-accordion; - input feta-ties; -else: - input feta-test-generic.mf; -fi - -autometric_parameter ("staffsize", staffsize#); -autometric_parameter ("stafflinethickness", stafflinethickness#); -autometric_parameter ("staff_space", staff_space#); -autometric_parameter ("linethickness", linethickness#); -autometric_parameter ("black_notehead_width", black_notehead_width#); -autometric_parameter ("ledgerlinethickness", ledgerlinethickness#); -autometric_parameter ("blot_diameter", blot_diameter#); - -fet_endfont; diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf index c464c3f7f8..37544a7b64 100644 --- a/mf/feta-macros.mf +++ b/mf/feta-macros.mf @@ -21,6 +21,7 @@ % debugging % + def print_penpos (suffix $) = message "z" & str$ & "l = (" & decimal x.$.l & ", " &decimal y.$.l & ");" @@ -50,15 +51,15 @@ def treq = enddef; -def draw_staff (expr first, last, offset) = +def draw_staff_if_debugging (expr first, last) = if test <> 0: pickup pencircle scaled stafflinethickness; for i := first step 1 until last: draw (-staff_space, - (i + offset) * staff_space_rounded) + (i + stafflines_y_offset) * staff_space_rounded) -- (4 staff_space, - (i + offset) * staff_space_rounded); + (i + stafflines_y_offset) * staff_space_rounded); endfor; fi; enddef; diff --git a/mf/feta-naturals.mf b/mf/feta-naturals.mf new file mode 100644 index 0000000000..3c824c78c9 --- /dev/null +++ b/mf/feta-naturals.mf @@ -0,0 +1,163 @@ + +% +% The stems of the natural are brushed (at least, in Barenreiter SCS) +% + +% general parameters: +save full_width, full_height; +save stem_thickness, stem_end_thickness_multiplier; +save beam_thickness, beam_slant, hole_highest_point; + +full_height# := 3 staff_space#; +full_width# := 2/3 staff_space#; +stem_thickness# := 0.09 staff_space# + 0.5 stafflinethickness#; +stem_end_thickness_multiplier := 10/7; +beam_slant := 1.266 stafflinethickness; +beam_thickness := 0.485 staff_space - stafflinethickness; +hole_highest_point := 0.5 (staff_space - stafflinethickness); + + +def draw_natural (expr arrowup, arrowdown) = + save upstem_factor, downstem_factor; + save upstem_end_thickness, downstem_end_thickness; + save half_height, half_box_height; + save beam_direction, r_stem_top_path, l_stem_bottom_path; + pair beam_direction; + path r_stem_top_path, l_stem_bottom_path; + + upstem_factor = downstem_factor = stem_end_thickness_multiplier; + + half_height# := 0.5 full_height#; + define_pixels (half_height); + define_pixels (full_width); + + set_char_box (0, full_width#, half_height#, half_height#); + d := d - feta_space_shift; + + if arrowup: + b := b + 3 stafflinethickness; + h := h + 1.2 staff_space; + % to look nice, arrowed stems must be less brushed + upstem_factor := 0.5 (1 + upstem_factor); + fi; + if arrowdown: + w := w + 3 stafflinethickness; + d := d + 1.2 staff_space; + % to look nice, arrowed stems must be less brushed + downstem_factor := 0.5 (1 + downstem_factor); + fi; + + upstem_end_thickness# = upstem_factor * stem_thickness#; + downstem_end_thickness# = downstem_factor * stem_thickness#; + define_whole_blacker_pixels (upstem_end_thickness, downstem_end_thickness); + define_whole_blacker_pixels (stem_thickness); + + half_box_height := hole_highest_point + beam_thickness + %% correction for the fact that x11 != x12. + %% ideally y2 should be calculated from y11 + %% and beam_thickness, but the brushed stems + %% would cause a cyclic dependency: + %% y2 -> x11 -> y14 -> y13 -> y12 -> y2 + + 0.5 stem_thickness * beam_slant / full_width; + + %% stems: + + pickup pencircle scaled stem_thickness; + + penpos1 (upstem_end_thickness, 0); + penpos3 (downstem_end_thickness, 0); + penpos2 (stem_thickness, 0); + penpos4 (stem_thickness, 0); + + x2r = full_width; + x4l = 0; + x3 = x2; + x1 = x4; + + y1 = half_height; + y3 = -half_height; + top y2 = vround (half_box_height); + y4 = -y2 + feta_space_shift; + + l_stem_bottom_path := z4r{z4r - z1r} + .. bot z4 + .. z4l{z1l - z4l}; + + r_stem_top_path := z2r{z2r - z3r} + .. top z2 + .. z2l{z3l - z2l}; + + fill simple_serif (z1l, z1r, -30) + -- l_stem_bottom_path + -- cycle; + + fill simple_serif (z3l, z3r, 30) + -- r_stem_top_path + -- cycle; + + %% beams: + + beam_direction = (full_width, beam_slant); + + z11 = z3l + whatever * (z2l - z3l); + y11 = vround (hole_highest_point); + z12 = directionpoint -beam_direction of r_stem_top_path; + z13 = z12 + whatever * beam_direction; + x13 = x1; + z14 = z11 + whatever * beam_direction; + x14 = x1; + + z21 = z4r + whatever * (z1r - z4r); + y21 = -y11 + feta_space_shift; + z22 = directionpoint -beam_direction of l_stem_bottom_path; + z23 = z22 + whatever * beam_direction; + x23 = x3; + z24 = z21 + whatever * beam_direction; + x24 = x3; + + fill z11 + -- z12 + -- z13 + -- z14 + -- cycle; + + fill z21 + -- z22 + -- z23 + -- z24 + -- cycle; + + if arrowup: + draw_arrow (z1, upstem_end_thickness, + z1l - z4l, stafflinethickness / 2, false); + fi; + if arrowdown: + draw_arrow (z3, downstem_end_thickness, + z2r - z3r, stafflinethickness / 2, true); + fi; + + %% debugging: + penlabels (1, 2, 3, 4); + labels (11, 12, 13, 14, 21, 22, 23, 24); + draw_staff_if_debugging (-2, 2); +enddef; + + +fet_beginchar ("Natural", "natural"); + draw_natural (false, false); +fet_endchar; + + +fet_beginchar ("Arrowed Natural (arrow up)", "natural.arrowup"); + draw_natural (true, false); +fet_endchar; + + +fet_beginchar ("Arrowed Natural (arrow down)", "natural.arrowdown"); + draw_natural (false, true); +fet_endchar; + + +fet_beginchar ("Arrowed Natural (arrows up and down)", "natural.arrowboth"); + draw_natural (true, true); +fet_endchar; diff --git a/mf/feta-noteheads-generic.mf b/mf/feta-noteheads-generic.mf index 3c255073c8..290deaf084 100644 --- a/mf/feta-noteheads-generic.mf +++ b/mf/feta-noteheads-generic.mf @@ -1,4 +1,3 @@ -% Feta (not the Font-En-Tja) music font -- generic stuff: include lots of files, but don't % This file is part of LilyPond, the GNU music typesetter. % % Copyright (C) 1997--2012 Han-Wen Nienhuys @@ -7,40 +6,14 @@ % it under the terms of the GNU General Public License as published by % the Free Software Foundation, either version 3 of the License, or % (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . - - -if test = -1: - mode := smoke; -fi -staffsize# := design_size * pt#; -mode_setup; - -input feta-macros; - -input feta-params; +input common-modules-and-initialization; font_x_height staff_space#; fet_beginfont ("feta", design_size, "fetaMusic"); + input feta-noteheads; -input feta-noteheads; - -autometric_parameter ("staffsize", staffsize#); -autometric_parameter ("stafflinethickness", stafflinethickness#); -autometric_parameter ("staff_space", staff_space#); -autometric_parameter ("linethickness", linethickness#); -autometric_parameter ("black_notehead_width", black_notehead_width#); -autometric_parameter ("ledgerlinethickness", ledgerlinethickness#); -autometric_parameter ("blot_diameter", blot_diameter#); - + input declare-autometric-parameters; fet_endfont; diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf index 82abf14e54..2ebf537b59 100644 --- a/mf/feta-noteheads.mf +++ b/mf/feta-noteheads.mf @@ -21,16 +21,11 @@ test_outlines := 0; -save remember_pic; -picture remember_pic; - - % Most beautiful noteheads are pronounced, not circular, % and not even symmetric. % These examples are inspired by [Wanske]; see literature list. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % NOTE HEAD VARIABLES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -159,33 +154,17 @@ enddef; fet_beginchar ("Longa notehead", "uM2"); draw_longa (true); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Longa notehead", "dM2"); draw_longa (false); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Longa notehead", "uM2"); - draw_longa (true); - - draw_staff (-2, 2, 0.5); - fet_endchar; - - - fet_beginchar ("Longa notehead", "dM2"); - draw_longa (false); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - def draw_brevis (expr linecount, line_thickness_multiplier) = save stemthick, fudge, gap; @@ -253,35 +232,17 @@ enddef; fet_beginchar ("Brevis notehead", "sM1"); draw_brevis (1, 1); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Brevis notehead", "sM1"); - draw_brevis(1, 1); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Double-lined brevis notehead", "sM1double"); draw_brevis (2, 0.8); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Double-lined brevis notehead", "sM1double"); - draw_brevis (2, 0.8); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Whole notehead", "s0"); draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, 0.707, 0); undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10, @@ -289,60 +250,26 @@ fet_beginchar ("Whole notehead", "s0"); whole_notehead_width# := charwd; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole notehead", "s0"); - draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, - 0.707, 0); - undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10, - 0.68, 2 stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half notehead", "s1"); draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17); undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#); half_notehead_width# := charwd; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half notehead", "s1"); - draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, - 0.66, 0.17); - undraw_inside_ellipse (3.25, 33, 0.81, - 2.5 stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Quarter notehead", "s2"); draw_quarter_path; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Quarter notehead", "s2"); - draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, - 0.707, 0); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -351,58 +278,26 @@ fet_beginchar ("Whole diamondhead", "s0diamond"); undraw_inside_ellipse (1.30, 125, 0.6, .4 staff_space# + stafflinethickness#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole diamondhead", "s0diamond"); - draw_outside_ellipse (1.80, 0, 0.495, 0); - undraw_inside_ellipse (1.30, 125, 0.6, - .4 staff_space# + stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half diamondhead", "s1diamond"); draw_outside_ellipse (1.50, 34, 0.49, 0.17); undraw_inside_ellipse (3.5, 33, 0.80, .3 staff_space# + 1.5 stafflinethickness#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half diamondhead", "s1diamond"); - draw_outside_ellipse (1.50, 34, 0.49, 0.17); - undraw_inside_ellipse (3.5, 33, 0.80, - .3 staff_space# - + 1.5 stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Quarter diamondhead", "s2diamond"); draw_outside_ellipse (1.80, 35, 0.495, -0.25); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Quarter diamondhead", "s2diamond"); - draw_outside_ellipse (1.80, 35, 0.495, -0.25); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -561,19 +456,10 @@ enddef; fet_beginchar ("Whole trianglehead", "s0triangle"); draw_whole_triangle_head; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole trianglehead", "s0triangle"); - draw_whole_triangle_head; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - def draw_small_triangle_head (expr dir) = save hei, xs; save llap; @@ -595,14 +481,14 @@ enddef; fet_beginchar ("Half trianglehead (downstem)", "d1triangle"); draw_small_triangle_head (-1); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Half trianglehead (upstem)", "u1triangle"); draw_small_triangle_head (1); - draw_staff (-2, 2, 0.5); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -623,14 +509,14 @@ enddef; fet_beginchar ("Quarter trianglehead (upstem)", "u2triangle"); draw_closed_triangle_head (1); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Quarter trianglehead (downstem)", "d2triangle"); draw_closed_triangle_head (-1); - draw_staff (-2, 2, 0.5); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -707,21 +593,21 @@ enddef; fet_beginchar ("Whole slashhead", "s0slash"); draw_slash (4 slash_thick# + 0.5 staff_space#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Half slashhead", "s1slash"); draw_slash (3.0 slash_thick# + 0.15 staff_space#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Quarter slashhead", "s2slash"); draw_slash (1.5 slash_thick#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -835,28 +721,10 @@ fet_beginchar ("Whole Crossed notehead", "s0cross"); draw_cross (3.75); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole Crossed notehead", "s0cross"); - save wid, hei; - - wid# := black_notehead_width# + 4 stafflinethickness#; - hei# := noteheight# + stafflinethickness#; - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half Crossed notehead", "s1cross"); save wid, hei; @@ -867,28 +735,10 @@ fet_beginchar ("Half Crossed notehead", "s1cross"); draw_cross (3.0); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half Crossed notehead", "s1cross"); - save wid, hei; - - wid# := black_notehead_width# + 2 stafflinethickness#; - hei# := noteheight# + stafflinethickness# / 2; - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Crossed notehead", "s2cross"); wid# := black_notehead_width#; hei# := noteheight#; @@ -896,25 +746,10 @@ fet_beginchar ("Crossed notehead", "s2cross"); draw_cross (1.0); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Crossed notehead", "s2cross"); - wid# := black_notehead_width#; - hei# := noteheight#; - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("X-Circled notehead", "s2xcircle"); save wid, hei; save cthick, cxd, cyd, dy; @@ -960,29 +795,10 @@ fet_beginchar ("X-Circled notehead", "s2xcircle"); z12 = (charwx * hppp, charwy * vppp); labels (12); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("X-Circled notehead", "s2xcircle"); - save wid, hei; - save cthick, cxr, cyr; - - wid# := black_notehead_width# * sqrt (sqrt2); - hei# := noteheight# * sqrt (sqrt2); - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%% % % SOLFA SHAPED NOTES @@ -1634,7 +1450,7 @@ def draw_sol_head (expr filled) = if not filled: undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#); fi - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; fet_beginchar ("Whole solhead", "s0sol"); @@ -2253,7 +2069,7 @@ begingroup if not filled: undraw_inside_ellipse (1.9, 33, 0.74, 5.5 stafflinethickness#); fi - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); endgroup enddef; diff --git a/mf/feta-noteheads11.mf b/mf/feta-noteheads11.mf index b02844a196..cba81dee23 100644 --- a/mf/feta-noteheads11.mf +++ b/mf/feta-noteheads11.mf @@ -1,13 +1,5 @@ -% feta-noteheads11.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 11.22; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads13.mf b/mf/feta-noteheads13.mf index e010769f4b..0516809917 100644 --- a/mf/feta-noteheads13.mf +++ b/mf/feta-noteheads13.mf @@ -1,13 +1,5 @@ -% feta-noteheads13.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 12.60; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads14.mf b/mf/feta-noteheads14.mf index 7d25cb2a60..14d3b78b01 100644 --- a/mf/feta-noteheads14.mf +++ b/mf/feta-noteheads14.mf @@ -1,13 +1,5 @@ -% feta-noteheads14.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 14.14; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads16.mf b/mf/feta-noteheads16.mf index 755f9ffdd5..8c8370dc59 100644 --- a/mf/feta-noteheads16.mf +++ b/mf/feta-noteheads16.mf @@ -1,13 +1,5 @@ -% feta-noteheads16.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 15.87; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads18.mf b/mf/feta-noteheads18.mf index bdc6918bf3..a1e705c48c 100644 --- a/mf/feta-noteheads18.mf +++ b/mf/feta-noteheads18.mf @@ -1,13 +1,5 @@ -% feta-noteheads18.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 17.82; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads20.mf b/mf/feta-noteheads20.mf index 072f99207c..9ac9379de2 100644 --- a/mf/feta-noteheads20.mf +++ b/mf/feta-noteheads20.mf @@ -1,13 +1,5 @@ -% feta-noteheads20.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 20; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads23.mf b/mf/feta-noteheads23.mf index ab0154832e..f6ddb0db44 100644 --- a/mf/feta-noteheads23.mf +++ b/mf/feta-noteheads23.mf @@ -1,13 +1,5 @@ -% feta-noteheads23.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 22.45; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads26.mf b/mf/feta-noteheads26.mf index b25d21495c..e72c7012d5 100644 --- a/mf/feta-noteheads26.mf +++ b/mf/feta-noteheads26.mf @@ -1,13 +1,5 @@ -% feta-noteheads26.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 25.20; -test := 0; - - input feta-noteheads-generic; - end. - diff --git a/mf/feta-other-generic.mf b/mf/feta-other-generic.mf new file mode 100644 index 0000000000..0ec50a8230 --- /dev/null +++ b/mf/feta-other-generic.mf @@ -0,0 +1,29 @@ +% This file is part of LilyPond, the GNU music typesetter. +% +% Copyright (C) 1997--2012 Han-Wen Nienhuys +% +% The LilyPond font is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version, or under the SIL Open Font License. + + +input common-modules-and-initialization; + +font_x_height staff_space#; + +fet_beginfont ("feta", design_size, "fetaMusic"); + input feta-rests; + input feta-accidentals; + input feta-arrowheads; + input feta-dots; + input feta-scripts; + input feta-clefs; + input feta-timesignatures; + input feta-pedals; + input feta-brackettips; + input feta-accordion; + input feta-ties; + + input declare-autometric-parameters; +fet_endfont; diff --git a/mf/feta-parenthesis.mf b/mf/feta-parenthesis.mf new file mode 100644 index 0000000000..ad2561a596 --- /dev/null +++ b/mf/feta-parenthesis.mf @@ -0,0 +1,44 @@ + + +def draw_paren = + save leftindent; + + leftindent := .2 staff_space; + + set_char_box (0, .5 staff_space# + stafflinethickness#, + staff_space#, staff_space#); + + d := d - feta_shift; + + z1 = (leftindent, h); + z2 = (w - stafflinethickness, .5 (h - d)); + z3 = (leftindent, -d); + + penpos1 (stafflinethickness, 35); + penpos2 (.1 staff_space + stafflinethickness, 0); + penpos3 (stafflinethickness, -35); + + fill z2l{down} + .. simple_serif (z3l, z3r, 90) + .. z2r{up} + .. simple_serif (z1r, z1l, 90) + .. z2l{down} + -- cycle; +enddef; + + +fet_beginchar ("Right Parenthesis", "rightparen"); + draw_paren; + penlabels (1, 2, 3); + + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Left Parenthesis", "leftparen"); + draw_paren; + + currentpicture := currentpicture xscaled -1; + + set_char_box (charwd, charbp, chardp, charht); +fet_endchar; diff --git a/mf/feta-rests.mf b/mf/feta-rests.mf index 09439853a0..9147b7fa95 100644 --- a/mf/feta-rests.mf +++ b/mf/feta-rests.mf @@ -43,7 +43,7 @@ fet_beginchar ("whole rest", "0"); currentpicture := currentpicture shifted (0, -block_rest_y + feta_space_shift); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -52,7 +52,7 @@ fet_beginchar ("half rest", "1"); block_rest; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -72,8 +72,6 @@ fet_beginchar ("whole rest (outside staff)", "0o"); lft x5 = -b - block_rest_y; rt x6 = w + block_rest_y; draw_gridline (z5, z6, ledgerlinethickness_rounded); - - draw_staff (-2, 2, -3); fet_endchar; @@ -90,8 +88,6 @@ fet_beginchar ("half rest (outside staff)", "1o"); rt x6 = w + block_rest_y; draw_gridline (z5, z6, ledgerlinethickness_rounded); - - draw_staff (-2, 2, 3); fet_endchar; @@ -103,7 +99,7 @@ fet_beginchar ("maxima rest", "M3"); addto currentpicture also currentpicture shifted (2 breve_rest_x, 0); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -113,7 +109,7 @@ fet_beginchar ("longa rest", "M2"); draw_block ((0, -breve_rest_y + feta_shift), (breve_rest_x, breve_rest_y)); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -122,7 +118,7 @@ fet_beginchar ("breve rest", "M1"); draw_block ((0, 0), (breve_rest_x, breve_rest_y)); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("breve rest (outside staff)", "M1o"); @@ -139,8 +135,6 @@ fet_beginchar ("breve rest (outside staff)", "M1o"); draw_gridline (z5, z6, ledgerlinethickness_rounded); draw_gridline ((x5, 0), (x6, 0), ledgerlinethickness_rounded); - - draw_staff (-2, 2, 3); fet_endchar; @@ -226,7 +220,7 @@ fet_beginchar ("Quarter rest", "2"); penlabels (1, 2, 3, 4, 5, 6, 7); penlabels (10, 11, 12, 13); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -374,7 +368,7 @@ def draw_eighth_rest (expr show_labels) = -- z1l .. cycle; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; @@ -440,7 +434,7 @@ fet_beginchar ("16th rest", "4"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -494,7 +488,7 @@ fet_beginchar ("32th rest", "5"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -552,7 +546,7 @@ fet_beginchar ("64th rest", "6"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -614,7 +608,7 @@ fet_beginchar ("128th rest", "7"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; diff --git a/mf/feta-scripts.mf b/mf/feta-scripts.mf index 91c3ae1fe4..0baef99bb4 100644 --- a/mf/feta-scripts.mf +++ b/mf/feta-scripts.mf @@ -1277,7 +1277,6 @@ fet_beginchar ("Varied Segno", "varsegno"); addto currentpicture also currentpicture scaled -1; penlabels (1, 1', 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12); - % draw_staff (-2, 2, 0); fet_endchar; @@ -1495,7 +1494,7 @@ fet_beginchar ("Arpeggio", "arpeggio"); draw_arpeggio; penlabels (range 1 thru 9); - draw_staff (-2, 2, 0.0); + draw_staff_if_debugging (-2, 2); endgroup; fet_endchar; diff --git a/mf/feta-sharps.mf b/mf/feta-sharps.mf new file mode 100644 index 0000000000..eeade7d207 --- /dev/null +++ b/mf/feta-sharps.mf @@ -0,0 +1,339 @@ + +% +% The beams of most sharps have horizontal endings (as if drawn with +% a square pen). [Wanske] does not mention this, so we'll just ignore +% this fact. +% + +save default_width, default_height, onestemmed_height; +save default_interbeam_dist, triples_interbeam_dist; +save default_beam_thickness, stem_thickness; + +default_width# := 1.1 staff_space#; +default_height# := 3 staff_space#; +onestemmed_height# := 2.66 staff_space#; +define_pixels (default_width); + +default_interbeam_dist := 1.05 staff_space_rounded; +triples_interbeam_dist := 1.2 staff_space_rounded; + +default_beam_thickness# := 0.3 staff_space# + stafflinethickness#; +stem_thickness# := stafflinethickness# + .05 staff_space#; +define_whole_blacker_pixels (stem_thickness); + + +def draw_sharp_beam (expr length, y_offset) = + save beam_length; + save ne_beam_dir, nw_dist; + pair ne_beam_dir, nw_dist; + + beam_length := length; + + define_whole_vertical_blacker_pixels (default_beam_thickness); + + clearxy; + + pickup pencircle scaled 2 blot_diameter; + + rt x2 - lft x1 = beam_length; + z2 = z1 + whatever * (beam_length, default_beam_thickness); + .5 [z1, z3] = (.5 w, y_offset); + x3 = x2; + top y2 - bot y3 = default_beam_thickness; + x4 = x1; + top y1 - bot y4 = default_beam_thickness; + + ne_beam_dir = unitvector (z2 - z1); + nw_dist = (ne_beam_dir rotated 90) * blot_diameter; + + fill lft z1{up} + ... (z1 + nw_dist){ne_beam_dir} + -- (z2 + nw_dist){ne_beam_dir} + ... rt z2{down} + -- rt z3{down} + ... (z3 - nw_dist){-ne_beam_dir} + -- (z4 - nw_dist){-ne_beam_dir} + ... lft z4{up} + -- cycle; + + labels (1, 2, 3, 4); +enddef; + + +def draw_sharp (expr arrowup, arrowdown) = + save dist_between_stems; + save outer_space; + save half_height, interbeam_dist; + + half_height# := 0.5 default_height#; + define_pixels (half_height); + interbeam_dist := default_interbeam_dist; + + set_char_box (0, default_width#, half_height#, half_height#); + d := d - feta_space_shift; + + dist_between_stems := hround (7 / 16 * default_width); + outer_space := hround ((w - dist_between_stems - stem_thickness) / 2); + + w := 2 outer_space + dist_between_stems + stem_thickness; + + draw_sharp_beam (w, -.5 interbeam_dist); + draw_sharp_beam (w, -.5 interbeam_dist + vround interbeam_dist); + + % expand the charbox so that it encloses the whole arrow; + % this must not happen earlier because some commands above + % still rely on the old width + if arrowup: + w := w + 1.5 stafflinethickness; + h := h + 1.2 staff_space; + fi; + if arrowdown: + b := b + 1.5 stafflinethickness; + d := d + 1.2 staff_space; + fi; + + pickup pencircle scaled stem_thickness; + + lft x5 = lft x6 = outer_space; + lft x7 = lft x8 = outer_space + dist_between_stems; + bot y5 = -half_height; + top y8 = half_height; + z6 = z8 + whatever * ne_beam_dir; + bot y7 = -top y6 + feta_space_shift; + + draw_gridline (z5, z6, stem_thickness); + draw_gridline (z7, z8, stem_thickness); + + if arrowup: + draw_arrow (z8, stem_thickness, up, + stafflinethickness / 2 + stem_thickness / 2, false); + fi; + if arrowdown: + draw_arrow (z5, stem_thickness, up, + stafflinethickness / 2 + stem_thickness / 2, true); + fi; + + labels (5, 6, 7, 8); + draw_staff_if_debugging (-2, 2); +enddef; + + +fet_beginchar ("Sharp", "sharp"); + draw_sharp (false, false); +fet_endchar; + + +fet_beginchar ("Arrowed Sharp (arrow up)", "sharp.arrowup"); + draw_sharp (true, false); +fet_endchar; + + +fet_beginchar ("Arrowed Sharp (arrow down)", "sharp.arrowdown"); + draw_sharp (false, true); +fet_endchar; + + +fet_beginchar ("Arrowed Sharp (arrows up and down)", "sharp.arrowboth"); + draw_sharp (true, true); +fet_endchar; + + +fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem"); + save outer_space; + save half_height, interbeam_dist; + + half_height# := 0.5 onestemmed_height#; + define_pixels (half_height); + interbeam_dist := default_interbeam_dist; + + set_char_box (0, 0.7 staff_space#, half_height#, half_height#); + d := d - feta_space_shift; + + outer_space := hround ((w - stem_thickness) / 2); + + w := 2 outer_space + stem_thickness; + + draw_sharp_beam (w, -.5 interbeam_dist); + draw_sharp_beam (w, -.5 interbeam_dist + vround interbeam_dist); + + pickup pencircle scaled stem_thickness; + + lft x5 = lft x6 = outer_space; + top y6 = half_height; + bot y5 = -top y6 + feta_space_shift; + + draw_gridline (z5, z6, stem_thickness); + + labels (5, 6); + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem"); + save dist_between_stems; + save outer_space; + save half_height, interbeam_dist; + save default_beam_thickness; + + half_height# := 0.5 default_height#; + define_pixels (half_height); + interbeam_dist := triples_interbeam_dist; + + default_beam_thickness# := 0.22 staff_space# + stafflinethickness#; + + set_char_box (0, default_width#, half_height#, half_height#); + + dist_between_stems := hround (7 / 16 * default_width); + outer_space := hround ((w - dist_between_stems - stem_thickness) / 2); + + w := 2 outer_space + dist_between_stems + stem_thickness; + d := d - feta_space_shift; + + draw_sharp_beam (.88 w, -.5 interbeam_dist); + draw_sharp_beam (.88 w, -.5 interbeam_dist + vround interbeam_dist); + default_beam_thickness# := 1/.88 default_beam_thickness#; + draw_sharp_beam (w, 0); + + pickup pencircle scaled stem_thickness; + + lft x5 = lft x6 = outer_space; + lft x7 = lft x8 = outer_space + dist_between_stems; + bot y5 = -half_height; + top y8 = half_height; + z6 = z8 + whatever * ne_beam_dir; + bot y7 = -top y6 + feta_space_shift; + + draw_gridline (z5, z6, stem_thickness); + draw_gridline (z7, z8, stem_thickness); + + labels (5, 6, 7, 8); + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem"); + save outer_space; + save half_height, interbeam_dist; + save default_beam_thickness; + + half_height# := 0.5 onestemmed_height#; + define_pixels (half_height); + interbeam_dist := triples_interbeam_dist; + + default_beam_thickness# := 0.22 staff_space# + stafflinethickness#; + + set_char_box (0, 0.95 staff_space#, half_height#, half_height#); + + outer_space := hround ((w - stem_thickness) / 2); + + w := 2 outer_space + stem_thickness; + d := d - feta_space_shift; + + draw_sharp_beam (.8 w, -.5 interbeam_dist); + draw_sharp_beam (.8 w, -.5 interbeam_dist + vround interbeam_dist); + default_beam_thickness# := 1/.8 default_beam_thickness#; + draw_sharp_beam (w, 0); + + pickup pencircle scaled stem_thickness; + + lft x5 = lft x6 = outer_space; + top y6 = half_height; + bot y5 = -top y6 + feta_space_shift; + + draw_gridline (z5, z6, stem_thickness); + + labels (5, 6); + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("3/4 Sharp", "sharp.slashslash.stemstemstem"); + save dist_between_stems; + save outer_space; + save half_height, interbeam_dist; + + half_height# := 0.5 default_height#; + define_pixels (half_height); + interbeam_dist := default_interbeam_dist; + + set_char_box (0, 1.6 staff_space#, half_height#, half_height#); + d := d - feta_space_shift; + + dist_between_stems := hround (9 / 32 * w); + outer_space := hround ((w - 2 dist_between_stems - stem_thickness) / 2); + + w := 2 outer_space + 2 dist_between_stems + stem_thickness; + + draw_sharp_beam (w, -.5 interbeam_dist); + draw_sharp_beam (w, -.5 interbeam_dist + vround interbeam_dist); + + pickup pencircle scaled stem_thickness; + + lft x5 = lft x6 = outer_space; + lft x9 = lft x10 = outer_space + dist_between_stems; + lft x7 = lft x8 = outer_space + 2 dist_between_stems; + bot y5 = -half_height; + top y8 = half_height; + z6 = z8 + whatever * ne_beam_dir; + bot y7 = -top y6 + feta_space_shift; + y9 = .5 [y5, y7]; + y10 = .5 [y6, y8]; + + draw_gridline (z5, z6, stem_thickness); + draw_gridline (z7, z8, stem_thickness); + draw_gridline (z9, z10, stem_thickness); + + labels (5, 6, 7, 8, 9, 10); + draw_staff_if_debugging (-2, 2); +fet_endchar; + + +fet_beginchar ("Double Sharp", "doublesharp"); + save klaverblad, klaversteel; + save pat; + path pat; + + klaversteel = 1/15 staff_space; + klaverblad = .4 staff_space - .5 stafflinethickness; + + set_char_box (0, staff_space#, .5 staff_space#, .5 staff_space#); + + z1 = (klaversteel, 0); + z2 = (w / 2 - klaverblad / 10, h - klaverblad); + z3 = (w / 2, h); + z4 = z2 reflectedabout ((0, 0), (1, 1)); + z5 = z1 reflectedabout ((0, 0), (1, 1)); + + pickup pencircle scaled blot_diameter; + + x2 := hfloor (rt x2) - blot_diameter / 2; + x3 := hfloor (rt x3) - blot_diameter / 2; + y3 := vfloor (top y3) - blot_diameter / 2; + y4 := vfloor (top y4) - blot_diameter / 2; + + pat = (rt z1){dir45} + .. {right}(bot z2) + .. rt z2 + -- rt z3{z3 - z2} + .. top z3{z4 - z3} + -- top z4{z4 - z3} + .. (lft z4){down} + .. {dir 225}(top z5); + pat := pat + -- reverse pat xscaled -1 shifted (-feta_eps, 0); + + % assure symmetry -- it's more important to center the glyph on the + % staff line than centering it between staff lines, so we use + % feta_shift, not feta_space_shift. + h := h + feta_shift; + + fill pat shifted (0, feta_shift) + -- reverse pat yscaled -1 shifted (0, -feta_eps) + -- cycle; + + % ugh + currentpicture := currentpicture shifted (hround (w / 2), 0); + + labels (1, 2, 3, 4, 5); + draw_staff_if_debugging (-2, 2); +fet_endchar; diff --git a/mf/feta-test-generic.mf b/mf/feta-test-generic.mf deleted file mode 100644 index a910b52c5a..0000000000 --- a/mf/feta-test-generic.mf +++ /dev/null @@ -1,17 +0,0 @@ -% -% test stuff. -% in a separate file to avoid tainting non-test font files for testing. -% - -%input feta-rests; -input feta-accidentals; -%input feta-dots; -%input feta-arrowheads; -%input feta-scripts; -%input feta-trills; -%input feta-clefs; -%input feta-brackettips; -%input feta-timesignatures; -%input feta-pedals; -%input feta-accordion; -%input feta-ties; diff --git a/mf/feta-test11.mf b/mf/feta-test11.mf deleted file mode 100644 index ad21720acc..0000000000 --- a/mf/feta-test11.mf +++ /dev/null @@ -1,15 +0,0 @@ -% feta-test11.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; - -design_size := 11; -test := 1; - -% smoked cheese -% test := -1; - -input feta-generic; - -end. - diff --git a/mf/feta-test13.mf b/mf/feta-test13.mf deleted file mode 100644 index 28abf42cd5..0000000000 --- a/mf/feta-test13.mf +++ /dev/null @@ -1,16 +0,0 @@ -% feta-test13.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; - -design_size := 13; -test := 1; - -% smoked cheese -% test := -1; - -input feta-generic; - - -end. - diff --git a/mf/feta-test16.mf b/mf/feta-test16.mf deleted file mode 100644 index eaa280aa43..0000000000 --- a/mf/feta-test16.mf +++ /dev/null @@ -1,16 +0,0 @@ -% feta-test16.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; - -design_size := 16; -test := 1; - -% smoked cheese -% test := -1; - -input feta-generic; - - -end. - diff --git a/mf/feta-test20.mf b/mf/feta-test20.mf deleted file mode 100644 index 5a58be3dd6..0000000000 --- a/mf/feta-test20.mf +++ /dev/null @@ -1,16 +0,0 @@ -% feta-test20.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; - -design_size := 20; -test := 1; - -% smoked cheese -% test := -1; - -input feta-generic; - - -end. - diff --git a/mf/feta-test23.mf b/mf/feta-test23.mf deleted file mode 100644 index 5a25b4691c..0000000000 --- a/mf/feta-test23.mf +++ /dev/null @@ -1,16 +0,0 @@ -% feta-test23.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; - -design_size := 23; -test := 1; - -% smoked cheese -% test := -1; - -input feta-generic; - - -end. - diff --git a/mf/feta-test26.mf b/mf/feta-test26.mf deleted file mode 100644 index e9e1521834..0000000000 --- a/mf/feta-test26.mf +++ /dev/null @@ -1,15 +0,0 @@ -% feta-test26.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; - -design_size := 26; -test := 1; - -% smoked cheese -% test := -1; - -input feta-generic; - - -end. diff --git a/mf/feta-timesignatures.mf b/mf/feta-timesignatures.mf index 0098f0ad42..8a50fc512a 100644 --- a/mf/feta-timesignatures.mf +++ b/mf/feta-timesignatures.mf @@ -90,7 +90,7 @@ def draw_C = penlabels (1, 2, 3, 4, 5); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; diff --git a/mf/feta11.mf b/mf/feta11.mf index be6a6a7e10..ddc0f0d292 100644 --- a/mf/feta11.mf +++ b/mf/feta11.mf @@ -1,13 +1,6 @@ -% feta11.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 11.22; -test := 0; - - -input feta-generic; +input feta-other-generic; end. - diff --git a/mf/feta13.mf b/mf/feta13.mf index 5014c12342..37871789ce 100644 --- a/mf/feta13.mf +++ b/mf/feta13.mf @@ -1,13 +1,6 @@ -% feta13.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 12.60; -test := 0; - - -input feta-generic; +input feta-other-generic; end. - diff --git a/mf/feta14.mf b/mf/feta14.mf index 23ac8e4d15..a70db3e136 100644 --- a/mf/feta14.mf +++ b/mf/feta14.mf @@ -1,14 +1,6 @@ -% feta14.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 14.14; -test := 0; - - -input feta-generic; - +input feta-other-generic; end. - diff --git a/mf/feta16.mf b/mf/feta16.mf index 174460b715..d38c756bf7 100644 --- a/mf/feta16.mf +++ b/mf/feta16.mf @@ -1,13 +1,6 @@ -% feta16.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 15.87; -test := 0; - - -input feta-generic; +input feta-other-generic; end. - diff --git a/mf/feta18.mf b/mf/feta18.mf index b52f6a3e35..d69ff7ccce 100644 --- a/mf/feta18.mf +++ b/mf/feta18.mf @@ -1,14 +1,6 @@ -% feta18.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. -input feta-autometric; - -% todo change file name design_size := 17.82; -test := 0; - - -input feta-generic; - +input feta-other-generic; end. diff --git a/mf/feta20.mf b/mf/feta20.mf index 2b561b200d..eafc6fa163 100644 --- a/mf/feta20.mf +++ b/mf/feta20.mf @@ -1,14 +1,7 @@ -% feta20.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 20; -input feta-autometric; - - % use feta-test for debugging. -test := 0; -input feta-generic; - - +input feta-other-generic; end. diff --git a/mf/feta23.mf b/mf/feta23.mf index d2cf0025e9..0a0be5cae0 100644 --- a/mf/feta23.mf +++ b/mf/feta23.mf @@ -1,15 +1,6 @@ -% feta23.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. -input feta-autometric; - -% todo change file name design_size := 22.45; -test := 0; - - -input feta-generic; - +input feta-other-generic; end. - diff --git a/mf/feta26.mf b/mf/feta26.mf index 2bfa536618..62ed9540e4 100644 --- a/mf/feta26.mf +++ b/mf/feta26.mf @@ -1,15 +1,6 @@ -% feta26.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 25.20; -test := 0; - - -input feta-generic; - +input feta-other-generic; end. - - diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf index ec6561dc8e..4221f02a38 100644 --- a/mf/parmesan-clefs.mf +++ b/mf/parmesan-clefs.mf @@ -125,9 +125,7 @@ enddef; fet_beginchar ("Ed. Vat. do clef", "vaticana.do"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_vaticana_do_clef ((0, 0), 1.0); fet_endchar; @@ -194,9 +192,7 @@ enddef; fet_beginchar ("Ed. Vat. fa clef", "vaticana.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_vaticana_fa_clef ((0, 0), 1.0); fet_endchar; @@ -282,9 +278,7 @@ enddef; fet_beginchar ("Ed. Med. do clef", "medicaea.do"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_medicaea_do_clef ((0, 0), 1.0); fet_endchar; @@ -352,9 +346,7 @@ enddef; fet_beginchar ("Ed. Med. fa clef", "medicaea.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_medicaea_fa_clef ((0, 0), 1.0); fet_endchar; @@ -589,9 +581,7 @@ enddef; fet_beginchar ("neo-mensural c clef", "neomensural.c"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_neomensural_c_clef ((0, 0), 1.0); fet_endchar; @@ -696,9 +686,7 @@ enddef; fet_beginchar ("petrucci c1 clef", "petrucci.c1"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), +2, 1.0); fet_endchar; @@ -709,9 +697,7 @@ fet_endchar; fet_beginchar ("petrucci c2 clef", "petrucci.c2"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), +1, 1.0); fet_endchar; @@ -722,9 +708,7 @@ fet_endchar; fet_beginchar ("petrucci c3 clef", "petrucci.c3"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), 0, 1.0); fet_endchar; @@ -735,9 +719,7 @@ fet_endchar; fet_beginchar ("petrucci c4 clef", "petrucci.c4"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), -1, 1.0); fet_endchar; @@ -748,9 +730,7 @@ fet_endchar; fet_beginchar ("petrucci c5 clef", "petrucci.c5"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), -2, 1.0); fet_endchar; @@ -840,9 +820,7 @@ enddef; fet_beginchar ("mensural c clef", "mensural.c"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_c_clef ((0, 0), 1.0, true); fet_endchar; @@ -853,9 +831,7 @@ fet_endchar; fet_beginchar ("black mensural c clef", "blackmensural.c"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_c_clef ((0, 0), 1.0, false); fet_endchar; @@ -1034,9 +1010,7 @@ enddef; fet_beginchar ("petrucci f clef", "petrucci.f"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_f_clef ((0, 0), 1.0); fet_endchar; @@ -1142,9 +1116,7 @@ enddef; fet_beginchar ("mensural f clef", "mensural.f"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_f_clef ((0, 0), 1.0); fet_endchar; @@ -1374,9 +1346,7 @@ enddef; fet_beginchar ("petrucci g clef", "petrucci.g"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_g_clef ((0, 0), 1.0); fet_endchar; @@ -1408,9 +1378,7 @@ enddef; % until the code for the mensural g clef will be rewritten. % fet_beginchar ("mensural g clef", "mensural.g"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_g_clef ((0, 0), 1.0); fet_endchar; @@ -1499,9 +1467,7 @@ enddef; fet_beginchar ("Hufnagel do clef", "hufnagel.do"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_do_clef ((0, 0), 1.0); fet_endchar; @@ -1595,9 +1561,7 @@ enddef; fet_beginchar ("Hufnagel fa clef", "hufnagel.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_fa_clef ((0, 0), 1.0); fet_endchar; @@ -1619,9 +1583,7 @@ enddef; fet_beginchar ("Hufnagel do/fa clef", "hufnagel.do.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_do_fa_clef ((0, 0), 1.0); fet_endchar; diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf deleted file mode 100644 index 31b35ff25b..0000000000 --- a/mf/parmesan-generic.mf +++ /dev/null @@ -1,50 +0,0 @@ -% Feta (not the Font-En-Tja) music font -- generic stuff: include lots of files, -% This file is part of LilyPond, the GNU music typesetter. -% -% Copyright (C) 2002--2012 Juergen Reuter -% -% The LilyPond font is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . - - -if test = -1: - mode := smoke; -fi; - -mode_setup; - -staffsize# := design_size * pt#; - -input feta-macros; -input feta-params; - -input parmesan-macros; - - -font_x_height staff_space#; - - -fet_beginfont ("parmesan", design_size, "parmesanMusic"); - if test = 0: - input parmesan-rests; - input parmesan-clefs; - input parmesan-custodes - input parmesan-accidentals; - input parmesan-flags; - input parmesan-timesignatures; - input parmesan-scripts; - input parmesan-dots; - else: - - fi; -fet_endfont; diff --git a/mf/parmesan-noteheads-generic.mf b/mf/parmesan-noteheads-generic.mf index a4103791ff..746839bc76 100644 --- a/mf/parmesan-noteheads-generic.mf +++ b/mf/parmesan-noteheads-generic.mf @@ -1,4 +1,3 @@ -% Feta (not the Font-En-Tja) music font -- generic stuff: include lots of files % This file is part of LilyPond, the GNU music typesetter. % % Copyright (C) 1997--2012 Han-Wen Nienhuys @@ -7,28 +6,9 @@ % it under the terms of the GNU General Public License as published by % the Free Software Foundation, either version 3 of the License, or % (at your option) any later version, or under the SIL Open Font License. -% -% LilyPond is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with LilyPond. If not, see . - - -if test = -1: - mode := smoke; -fi - -staffsize# := design_size * pt#; - -mode_setup; - -input feta-macros; -input feta-params; +input common-modules-and-initialization; input parmesan-macros; font_x_height staff_space#; diff --git a/mf/parmesan-noteheads11.mf b/mf/parmesan-noteheads11.mf index 288695a45e..4f35548ff1 100644 --- a/mf/parmesan-noteheads11.mf +++ b/mf/parmesan-noteheads11.mf @@ -1,13 +1,5 @@ -% feta-noteheads11.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 11.22; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads13.mf b/mf/parmesan-noteheads13.mf index ad126423aa..13cedf0b14 100644 --- a/mf/parmesan-noteheads13.mf +++ b/mf/parmesan-noteheads13.mf @@ -1,13 +1,5 @@ -% feta-noteheads13.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 12.60; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads14.mf b/mf/parmesan-noteheads14.mf index f5d3a41df7..4c41de5149 100644 --- a/mf/parmesan-noteheads14.mf +++ b/mf/parmesan-noteheads14.mf @@ -1,13 +1,5 @@ -% feta-noteheads14.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 14.14; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads16.mf b/mf/parmesan-noteheads16.mf index 3db517fa04..53f67ceb68 100644 --- a/mf/parmesan-noteheads16.mf +++ b/mf/parmesan-noteheads16.mf @@ -1,13 +1,5 @@ -% feta-noteheads16.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 15.87; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads18.mf b/mf/parmesan-noteheads18.mf index ed0f99ec0e..4fcc73d5c4 100644 --- a/mf/parmesan-noteheads18.mf +++ b/mf/parmesan-noteheads18.mf @@ -1,13 +1,5 @@ -% feta-noteheads18.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 17.82; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads20.mf b/mf/parmesan-noteheads20.mf index 8891652bb8..3d2d91ff28 100644 --- a/mf/parmesan-noteheads20.mf +++ b/mf/parmesan-noteheads20.mf @@ -1,13 +1,5 @@ -% feta-noteheads20.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 20; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads23.mf b/mf/parmesan-noteheads23.mf index fe64e6f496..7a0d3bfd93 100644 --- a/mf/parmesan-noteheads23.mf +++ b/mf/parmesan-noteheads23.mf @@ -1,13 +1,5 @@ -% feta-noteheads23.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 22.45; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads26.mf b/mf/parmesan-noteheads26.mf index 082ffc208d..f7cb63aa90 100644 --- a/mf/parmesan-noteheads26.mf +++ b/mf/parmesan-noteheads26.mf @@ -1,13 +1,5 @@ -% feta-noteheads26.mf -% part of LilyPond's pretty-but-neat music font - -input feta-autometric; +% Produce font files at specified size. design_size := 25.20; -test := 0; - - input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-other-generic.mf b/mf/parmesan-other-generic.mf new file mode 100644 index 0000000000..a0e9f38e9e --- /dev/null +++ b/mf/parmesan-other-generic.mf @@ -0,0 +1,26 @@ +% This file is part of LilyPond, the GNU music typesetter. +% +% Copyright (C) 2002--2012 Juergen Reuter +% +% The LilyPond font is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version, or under the SIL Open Font License. + + + +input common-modules-and-initialization; +input parmesan-macros; + +font_x_height staff_space#; + +fet_beginfont ("parmesan", design_size, "parmesanMusic"); + input parmesan-rests; + input parmesan-clefs; + input parmesan-custodes + input parmesan-accidentals; + input parmesan-flags; + input parmesan-timesignatures; + input parmesan-scripts; + input parmesan-dots; +fet_endfont; diff --git a/mf/parmesan11.mf b/mf/parmesan11.mf index 27ba341437..050559744f 100644 --- a/mf/parmesan11.mf +++ b/mf/parmesan11.mf @@ -1,13 +1,6 @@ -% parmesan11.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 11.22; -input feta-autometric; - -test := 0; - -input parmesan-generic; - +input parmesan-other-generic; end. - diff --git a/mf/parmesan13.mf b/mf/parmesan13.mf index 905da48d5d..8e139d450d 100644 --- a/mf/parmesan13.mf +++ b/mf/parmesan13.mf @@ -1,14 +1,6 @@ -% parmesan13.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 12.60; -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/mf/parmesan14.mf b/mf/parmesan14.mf index 6357337be2..2eb056525f 100644 --- a/mf/parmesan14.mf +++ b/mf/parmesan14.mf @@ -1,14 +1,5 @@ -% parmesan14.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 14.14; - -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/mf/parmesan16.mf b/mf/parmesan16.mf index 19b0516779..d8dd45d2ff 100644 --- a/mf/parmesan16.mf +++ b/mf/parmesan16.mf @@ -1,14 +1,6 @@ -% parmesan16.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 15.87; -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/mf/parmesan18.mf b/mf/parmesan18.mf index 8c28507046..cd1052b3ae 100644 --- a/mf/parmesan18.mf +++ b/mf/parmesan18.mf @@ -1,14 +1,6 @@ -% parmesan18.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 17.82; -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/mf/parmesan20.mf b/mf/parmesan20.mf index d14251edce..a7e8452c6f 100644 --- a/mf/parmesan20.mf +++ b/mf/parmesan20.mf @@ -1,14 +1,6 @@ -% parmesan20.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 20; -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/mf/parmesan23.mf b/mf/parmesan23.mf index 39b643732b..e47b714b5c 100644 --- a/mf/parmesan23.mf +++ b/mf/parmesan23.mf @@ -1,14 +1,6 @@ -% parmesan23.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 22.45; -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/mf/parmesan26.mf b/mf/parmesan26.mf index 1be6fb5191..925ceaa8ab 100644 --- a/mf/parmesan26.mf +++ b/mf/parmesan26.mf @@ -1,14 +1,6 @@ -% parmesan26.mf -% part of LilyPond's pretty-but-neat music font +% Produce font files at specified size. design_size := 25.20; -input feta-autometric; - -test := 0; - -input parmesan-generic; - - +input parmesan-other-generic; end. - diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index 3e62f0366e..03df7c03cb 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -1,4 +1,4 @@ -%!PS-Adobe-1.0: music-drawing-routines.ps +%!PS-Adobe-2.0 % % Functions for direct and embedded PostScript @@ -63,12 +63,7 @@ bind def 0 setgray 0 setlinecap % Prepare graphics state 1 setlinewidth 0 setlinejoin 10 setmiterlimit [ ] 0 setdash newpath - /languagelevel where % If level not equal to 1 then - {pop languagelevel % set strokeadjust and - 1 ne % overprint to their defaults. - {false setstrokeadjust false setoverprint - } if - } if + false setoverprint } bind def /EndEPSF { %def @@ -77,11 +72,18 @@ bind def b4_Inc_state restore } bind def -/stroke_and_fill { +/stroke_and_fill? { + { gsave - stroke + false setstrokeadjust + stroke grestore fill + } + { + stroke + } + ifelse } bind def /vector_add { % x1 y1 x2 y2 vector_add x1+x2 y1+y2 @@ -95,30 +97,104 @@ bind def /draw_round_box % width height x y blot { - dup - 0.0 gt { - setlinewidth % w h x y - rmoveto % w h - 2 copy 0 ne exch 0 ne and + 0 max setlinewidth + matrix currentmatrix 5 1 roll + currentpoint translate newpath translate + 2 copy 0 min exch 0 min exch translate + abs exch abs exch + currentlinewidth 0 eq + { % straight corners + 2 copy 2 mul gt + { % horizontal + 0 1 index 2 div moveto + setlinewidth + 0 rlineto + 0 setlinecap + stroke + } + { + 2 copy exch 2 mul gt + { % vertical + 1 index 2 div 0 moveto + exch setlinewidth + 0 exch rlineto + 0 setlinecap + stroke + } + { + 0 0 4 2 roll rectfill + } + ifelse + } + ifelse + } + { % rounded corners + 2 copy 0 eq exch 0 eq or + { % line shape + 0 0 moveto + rlineto + 1 setlinecap + stroke + 0 setlinecap + } + { % full shape + currentstrokeadjust { + currentlinewidth 2 div + 0 0 2 index 180 270 arc + 2 index 0 2 index 270 360 arc + 3 copy 0 90 arc + 0 2 index 3 -1 roll 90 180 arc + closepath + 2 copy 2 mul gt + { % horizontal + 2 copy add currentlinewidth add 10 add % large enough + 0 1 index neg moveto + 2 index 1 index neg lineto + 2 index 1 index lineto + 0 exch lineto closepath + gsave clip newpath + 0 1 index 2 div moveto + currentlinewidth add setlinewidth + 0 rlineto + 2 setlinecap + stroke + grestore + } { - 0 setlinecap - 1 setlinejoin - currentpoint % w h x1 y1 - 4 2 roll % x1 y1 w h - 4 copy - rectfill - rectstroke - } { - 1 setlinecap - rlineto stroke - } ifelse - } { - pop % w h x y - rmoveto % w h - currentpoint % w h x1 y1 - 4 2 roll % x1 y1 w h - rectfill - } ifelse + 2 copy exch 2 mul gt + { % vertical + 2 copy add currentlinewidth add 10 add % large enough + dup neg 0 moveto + dup 0 lineto + dup 2 index lineto + neg 1 index lineto closepath + gsave clip newpath + 1 index 2 div 0 moveto + exch currentlinewidth add setlinewidth + 0 exch rlineto + 2 setlinecap + stroke + grestore + } + { + pop pop + fill + } + ifelse + } + ifelse + newpath + } + { + 1 setlinejoin + 0 0 4 2 roll 4 copy rectstroke rectfill + } + ifelse + } + ifelse + } + ifelse + setmatrix } bind def /draw_polygon % fill? x(n) y(n) x(n-1) y(n-1) ... x(0) y(0) n blot @@ -136,11 +212,7 @@ bind def rmoveto % x(0) y(0) { polygon_x polygon_y vector_add lineto } repeat % n times closepath - { %fill? - stroke_and_fill - }{ - stroke - } ifelse + stroke_and_fill? } bind def /draw_circle % filled? radius thickness draw_circle @@ -150,9 +222,7 @@ bind def 3 2 roll % f? x0 y0 r dup 0 rmoveto 0 360 arc closepath - { stroke_and_fill } - { stroke } - ifelse + stroke_and_fill? } bind def /draw_ellipse % filled? x-radius y-radius thickness draw_ellipse @@ -164,9 +234,7 @@ bind def 1 0 rmoveto 1 0 360 arc closepath savematrix setmatrix - { stroke_and_fill} - { stroke } - ifelse + stroke_and_fill? } bind def /draw_partial_ellipse % filled connect x-radius y-radius startangle endangle thickness draw_partial_ellipse @@ -205,7 +273,7 @@ bind def connect { startangle cos startangle sin moveto endangle cos endangle sin lineto } if - savematrix setmatrix filled { stroke_and_fill } { stroke } ifelse + savematrix setmatrix filled stroke_and_fill? grestore } bind def @@ -213,7 +281,6 @@ bind def { setlinewidth % dx dy x1 y1 1 setlinecap - 1 setlinejoin rmoveto % dx dy rlineto stroke @@ -222,7 +289,6 @@ bind def /draw_dashed_line % dx dy thickness dashpattern offset draw_dashed_line { 1 setlinecap - 1 setlinejoin setdash % dx dy thickness setlinewidth %dx dy rlineto diff --git a/python/convertrules.py b/python/convertrules.py index e2eb3baa4a..8c472a63e0 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3683,6 +3683,17 @@ def conv(str): str = re.sub ("New_dynamic_engraver", "Dynamic_engraver", str) return str +@rule ((2, 19, 0), r'''(make-relative (a b) b ...) -> make-relative (a b) #{ a b #}...''') +def conv (str): + str = re.sub (r"(\(make-relative\s+\(\s*(([A-Za-z][-_A-Za-z0-9]*)" + + r"(?:\s+[A-Za-z][-_A-Za-z0-9]*)*)\s*\)\s*)\3(?=\s)", + r"\1(make-event-chord (list \2))", str) + str = re.sub (r"(\(make-relative\s+\(\s*([A-Za-z][-_A-Za-z0-9]*" + + r"(?:\s+([A-Za-z][-_A-Za-z0-9]*))+)\s*\)\s*)\3(?=\s)", + r"\1(make-sequential-music (list \2))", str) + return str + + # Guidelines to write rules (please keep this at the end of this file) # # - keep at most one rule per version; if several conversions should be done, diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 14e0209675..176f9a496b 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -38,83 +38,126 @@ (let ((value (ly:context-property context name))) (if (not (null? value)) value default))) - (define (beamingmoment (car a)) - (fraction->moment (car b)))) - - (define (ending-moments group-list start-beat base-moment) + (define (ending-moments group-list start-beat base-length) (if (null? group-list) '() (let ((new-start (+ start-beat (car group-list)))) - (cons (ly:moment-mul (ly:make-moment new-start 1) base-moment) - (ending-moments (cdr group-list) new-start base-moment))))) + (cons (* new-start base-length) + (ending-moments (cdr group-list) new-start base-length))))) - (define (larger-setting test-beam sorted-alist) - (if (null? sorted-alist) - '() - (let* ((first-key (caar sorted-alist)) - (first-moment (fraction->moment first-key))) - (if (moment<=? test-beam first-moment) - (car sorted-alist) - (larger-setting test-beam (cdr sorted-alist)))))) + (define (larger-setting type sorted-alist) + (assoc type sorted-alist <=)) - (define (beat-end? moment beat-structure) - (pair? (member moment beat-structure))) ;; member returns a list if found, not #t + (define (beat-end? moment beat-endings) + (pair? (memv moment beat-endings))) ;; member returns a list if found, not #t ;; Start of actual auto-beam test routine ;; ;; ;; Don't start auto beams on grace notes - (if (and (!= (ly:moment-grace-numerator (ly:context-now context)) 0) - (= dir START)) - #f - (let* ((base-moment (get 'baseMoment (ly:make-moment 1 4))) - (measure-length (get 'measureLength (ly:make-moment 1 1))) + (and (or (zero? (ly:moment-grace (ly:context-now context))) + (!= dir START)) + (let* ((base-length (cond ((get 'baseMoment #f) => ly:moment-main) + (else 1/4))) + (measure-length (cond ((get 'measureLength #f) => ly:moment-main) + (else 1))) (time-signature-fraction (get 'timeSignatureFraction '(4 . 4))) (beat-structure (get 'beatStructure '(1 1 1 1))) - (beat-endings (ending-moments beat-structure 0 base-moment)) - (exceptions (sort (assoc-get 'end - (get 'beamExceptions '()) - '()) - beamingfraction test-beam)) - (non-grace (ly:make-moment - (ly:moment-main-numerator measure-pos) - (ly:moment-main-denominator measure-pos))) - (pos (if (ly:momentmoment default-beat-length) - test-beam)) - (exception-moments (ending-moments - exception-grouping 0 grouping-moment))) + default-beat-length + type)) + (exception-moments (and exception-grouping + (ending-moments + exception-grouping 0 grouping-moment)))) (if (= dir START) ;; Start rules -- #t if beam is allowed to start (or beam-half-measure ;; Start anywhere, but option for mid-measure - (not (equal? (ly:moment-add pos pos) measure-length)) + (not (= (+ pos pos) measure-length)) (not (= 3 (car time-signature-fraction))) ;; in triple meter - (not (= (cdr type) ;; when the beamed note is 1/6 of a measure + (not (= (denominator type) ;; when the beamed note is 1/6 of a measure (* 2 (cdr time-signature-fraction))))) ;; End rules -- #t if beam is required to end - (or (= (ly:moment-main-numerator pos) 0) ;; end at measure beginning - (if (null? exception-grouping) - (beat-end? pos beat-endings) ;; no exception, so check beat ending - (member pos exception-moments))))))) ;; check exception rule + (or (zero? pos) ;; end at measure beginning + (if exception-grouping + (beat-end? pos exception-moments) ;; check exception rule + (beat-end? pos beat-endings))))))) ;; no exception, so check beat ending + + +(define-public (extract-beam-exceptions music) + "Creates a value useful for setting @code{beamExceptions} from @var{music}." + (define (car> a b) (> (car a) (car b))) + (define (beatify! lst) + ;; takes a collection of end points, sorts them, and returns the + ;; non-zero differences as beaming pattern + (let ((s (sort-list! lst <))) + (remove! zero? + (map - s (cons 0 s))))) + (let ((res '())) + (let analyze ((m (unfold-repeats-fully (event-chord-reduce music))) + (pos 0)) + ;; enter beam ends from m starting at pos into res, return new pos + (cond ((music-is-of-type? m 'bar-check) 0) + ((music-is-of-type? m 'simultaneous-music) + (fold (lambda (m prev) (max (analyze m pos) prev)) + pos + (ly:music-property m 'elements))) + ((not (music-is-of-type? m 'rhythmic-event)) + (let ((elt (ly:music-property m 'element))) + (fold analyze + (if (ly:music? elt) (analyze elt pos) pos) + (ly:music-property m 'elements)))) + ;; Have rhythmic event. + ((any + (lambda (art) + (and (music-is-of-type? art 'beam-event) + (= (ly:music-property art 'span-direction START) STOP))) + (ly:music-property m 'articulations)) + (let* ((len (duration-length (ly:music-property m 'duration))) + (pos (+ pos len)) + (ass (assv len res))) + (cond ((or (zero? len) (not (integer? (/ pos len)))) + (ly:warning m (_ "Beam end fits no pattern"))) + (ass + (set-cdr! ass (cons (/ pos len) (cdr ass)))) + (else + (set! res (cons (list len (/ pos len)) res)))) + pos)) + (else + (+ pos (duration-length (ly:music-property m 'duration)))))) + + ;; takes the output from the loop, generates actual beam exceptions + (list + (cons 'end + (map! + (lambda (l) + (cons (car l) + (beatify! (cdr l)))) + (sort-list! res car>)))))) diff --git a/scm/bar-line.scm b/scm/bar-line.scm index 03c6f80815..302936e49c 100644 --- a/scm/bar-line.scm +++ b/scm/bar-line.scm @@ -910,50 +910,51 @@ of the volta brackets relative to the bar lines." line-thickness 1/2)) (bar-array (ly:grob-object grob 'bars)) - (bar-array-length (ly:grob-array-length bar-array)) ;; the bar-array starts with the uppermost bar line grob that is ;; covered by the left edge of the volta bracket; more (span) ;; bar line grobs from other staves may follow - (left-bar-line (if (> bar-array-length 0) - (ly:grob-array-ref bar-array 0) - '())) + (left-bar-line (and (ly:grob-array? bar-array) + (positive? (ly:grob-array-length bar-array)) + (ly:grob-array-ref bar-array 0))) ;; we need the vertical-axis-group-index of the left-bar-line ;; to find the corresponding right-bar-line - (vag-index (if (null? left-bar-line) - -1 - (ly:grob-get-vertical-axis-group-index left-bar-line))) + (vag-index (and left-bar-line + (ly:grob-get-vertical-axis-group-index left-bar-line))) ;; the bar line corresponding to the right edge of the volta bracket ;; is the last entry with the same vag-index, so we transform the array to a list, - ;; reverse it and search for suitable entries: - (filtered-grobs (filter (lambda (e) - (eq? (ly:grob-get-vertical-axis-group-index e) - vag-index)) - (reverse (ly:grob-array->list bar-array)))) - ;; we need the first one (if any) - (right-bar-line (if (pair? filtered-grobs) - (car filtered-grobs) - '())) + ;; reverse it and search for the first suitable entry from + ;; the back + (right-bar-line (and left-bar-line + (find (lambda (e) + (eqv? (ly:grob-get-vertical-axis-group-index e) + vag-index)) + (reverse (ly:grob-array->list bar-array))))) ;; the left-bar-line may be a #', ;; so we add "" as a fallback return value - (left-bar-glyph-name (if (null? left-bar-line) - (string annotation-char) - (ly:grob-property left-bar-line 'glyph-name ""))) - (right-bar-glyph-name (if (null? right-bar-line) - (string annotation-char) - (ly:grob-property right-bar-line 'glyph-name ""))) - (left-bar-broken (or (null? left-bar-line) - (not (zero? (ly:item-break-dir left-bar-line))))) - (right-bar-broken (or (null? right-bar-line) - (not (zero? (ly:item-break-dir right-bar-line))))) + (left-bar-glyph-name (if left-bar-line + (ly:grob-property left-bar-line 'glyph-name "") + (string annotation-char))) + (right-bar-glyph-name (if right-bar-line + (ly:grob-property right-bar-line 'glyph-name "") + (string annotation-char))) + ;; This is the original logic. It flags left-bar-broken if + ;; there is no left-bar-line. That seems strange. + (left-bar-broken (not (and left-bar-line + (zero? (ly:item-break-dir left-bar-line))))) + (right-bar-broken (not (and right-bar-line + (zero? (ly:item-break-dir + right-bar-line))))) + ;; Revert to current grob for getting layout info if no + ;; left-bar-line available (left-span-stencil-extent (ly:stencil-extent (span-bar::compound-bar-line - left-bar-line + (or left-bar-line grob) left-bar-glyph-name dummy-extent) X)) (right-span-stencil-extent (ly:stencil-extent (span-bar::compound-bar-line - right-bar-line + (or right-bar-line grob) right-bar-glyph-name dummy-extent) X)) @@ -968,7 +969,7 @@ of the volta brackets relative to the bar lines." (- (max 0 (interval-end left-span-stencil-extent)) (max 0 (interval-end (ly:stencil-extent (bar-line::compound-bar-line - left-bar-line + (or left-bar-line grob) left-bar-glyph-name dummy-extent) X))) diff --git a/scm/c++.scm b/scm/c++.scm index a131e7f342..ec54ed28c9 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -33,6 +33,11 @@ (and (pair? x) (index? (car x)) (index? (cdr x)))) +(define-public (rational-or-procedure? x) + (or + (and (rational? x) (exact? x)) + (procedure? x))) + (define-public (number-or-grob? x) (or (ly:grob? x) (number? x))) diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index 20d77ea72f..69262b061d 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -60,6 +60,9 @@ vertical alignment.") numbers. Can be @code{numbers} for going back to the same number or @code{numbers-with-letters} for going back to the same number with letter suffixes. No setting will not go back in measure-number time.") + (alternativeRestores ,symbol-list? "Timing variables that are +restored to their value at the end of the first alternative in +subsequent alternatives.") (associatedVoice ,string? "Name of the @code{Voice} that has the melody for this @code{Lyrics} line.") (autoAccidentals ,list? "List of different ways to typeset an @@ -215,6 +218,17 @@ and @samp{bracketed}.") symbol go, measured in half staff spaces from the center of the staff.") (completionBusy ,boolean? "Whether a completion-note head is playing.") + (completionFactor ,rational-or-procedure? +"When @code{Completion_heads_engraver} and +@code{Completion_rest_engraver} need to split a note or rest with a +scaled duration, such as @code{c2*3}, this specifies the scale factor +to use for the newly-split notes and rests created by the engraver. + +If @code{#f}, the completion engraver uses the scale-factor of +each duration being split. + +If set to a callback procedure, that procedure is called with the +context of the completion engraver, and the duration to be split.") (completionUnit ,ly:moment? "Sub-bar unit of completion.") (connectArpeggios ,boolean? "If set, connect arpeggios across piano staff.") @@ -444,12 +458,12 @@ associated with the current context. Ranges from@tie{}@w{-1} to@tie{}1, where the values@tie{}@w{-1} (@code{#LEFT}),@tie{}0 (@code{#CENTER}) and@tie{}1 (@code{#RIGHT}) correspond to hard left, center, and hard right, respectively.") - (midiReverbLevel ,number? "Reverb effect level for the MIDI channel -associated with the current context. Ranges from 0 to@tie{}1 -(0=off,@tie{}1=full effect).") - (midiChorusLevel ,number? "Chorus effect level for the MIDI channel -associated with the current context. Ranges from 0 to@tie{}1 -(0=off,@tie{}1=full effect).") + (midiReverbLevel ,number? "Reverb effect level for the MIDI +channel associated with the current context. Ranges from 0 +to@tie{}1 (0=off,@tie{}1=full effect).") + (midiChorusLevel ,number? "Chorus effect level for the MIDI +channel associated with the current context. Ranges from 0 +to@tie{}1 (0=off,@tie{}1=full effect).") (minimumFret ,number? "The tablature auto string-selecting mechanism selects the highest string with a fret at least @code{minimumFret}.") diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index a5b0895c9b..cfa2cfb4c1 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -170,6 +170,9 @@ when a spanner is broken at a line break.") ;;; ;;; c ;;; + (chord-dots-limit ,integer? "Limits the column of dots +on each chord to the height of the chord plus +@code{chord-dots-limit} staff-positions.") (circled-tip ,boolean? "Put a circle at start/@/end of hairpins (al/@/del niente).") (clip-edges ,boolean? "Allow outward pointing beamlets at the @@ -1015,7 +1018,8 @@ texts.") ;;; ;;; x ;;; - (X-extent ,number-pair? "Hard coded extent in X@tie{}direction.") + (X-extent ,number-pair? "Extent (size) in the X@tie{}direction, +measured in staff-space units, relative to object's reference point.") (X-offset ,number? "The horizontal amount that this object is moved relative to its X-parent.") (X-positions ,number-pair? "Pair of X staff coordinates of a spanner @@ -1026,7 +1030,8 @@ in the form @code{(@var{left} . @var{right})}, where both @var{left} and ;;; ;;; y ;;; - (Y-extent ,number-pair? "Hard coded extent in Y@tie{}direction.") + (Y-extent ,number-pair? "Extent (size) in the Y@tie{}direction, +measured in staff-space units, relative to object's reference point.") (Y-offset ,number? "The vertical amount that this object is moved relative to its Y-parent.") diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index a4e0d52a76..64be8844ce 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -727,6 +727,7 @@ (DotColumn . ( (axes . (,X)) + (chord-dots-limit . 3) (direction . ,RIGHT) (positioning-done . ,ly:dot-column::calc-positioning-done) (X-extent . ,ly:axis-group-interface::width) @@ -1898,6 +1899,7 @@ (cross-staff . ,ly:script-interface::calc-cross-staff) (direction . ,ly:script-interface::calc-direction) (font-encoding . fetaMusic) + (horizon-padding . 0.1) ; to avoid interleaving with accidentals (positioning-done . ,ly:script-interface::calc-positioning-done) (side-axis . ,Y) @@ -2501,13 +2503,14 @@ (axes . (,X)) (direction . ,RIGHT) (font-size . -4) + ;; minimum shift to the right, in case the parent note has no stem + (minimum-space . 2.5) + (horizon-padding . 0.1) ; to avoid interleaving with augmentation dots (padding . 0.3) (side-axis . ,X) (stencil . ,parenthesize-elements) (stencils . ,parentheses-item::calc-parenthesis-stencils) - ;; offset a bit to the right, further if needed to clear the main note - (X-offset . ,(lambda (grob) - (ly:side-position-interface::x-aligned-side grob 2.5))) + (X-offset . ,ly:side-position-interface::x-aligned-side) (Y-extent . ,grob::always-Y-extent-from-stencil) (meta . ((class . Item) (interfaces . (axis-group-interface @@ -2709,6 +2712,7 @@ (VoltaBracket . ( + (baseline-skip . 1.7) (direction . ,UP) (edge-height . (2.0 . 2.0)) ;; staff-space; (font-encoding . fetaText) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 9e5528f5bb..fa98be0872 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -1014,13 +1014,9 @@ samplePath = (define-markup-list-command (score-lines layout props score) (ly:score?) - " -This is the same as the @code{\\score} markup but delivers its -systems as a list of lines. This is not usually called directly by -the user. Instead, it is called when the parser encounters -@code{\\score} in a context where only markup lists are allowed. When -used as the argument of a toplevel @code{\\markuplist}, the result can -be split across pages." + "This is the same as the @code{\\score} markup but delivers its +systems as a list of lines. Its @var{score} argument is entered in +braces like it would be for @code{\\score}." (let ((output (ly:score-embedded-format score layout))) (if (ly:music-output? output) @@ -3958,7 +3954,7 @@ Make a fraction of two markups. (define-markup-command (normal-size-super layout props arg) (markup?) #:category font - #:properties ((baseline-skip)) + #:properties ((font-size 0)) " @cindex setting superscript in standard font size @@ -3974,13 +3970,12 @@ Set @var{arg} in superscript with a normal font size. @end lilypond" (ly:stencil-translate-axis (interpret-markup layout props arg) - (* 0.5 baseline-skip) Y)) + (* 1.0 (magstep font-size)) Y)) (define-markup-command (super layout props arg) (markup?) #:category font - #:properties ((font-size 0) - (baseline-skip)) + #:properties ((font-size 0)) " @cindex superscript text @@ -4001,7 +3996,7 @@ Set @var{arg} in superscript. layout (cons `((font-size . ,(- font-size 3))) props) arg) - (* 0.5 baseline-skip) + (* 1.0 (magstep font-size)) ; original font-size Y)) (define-markup-command (translate layout props offset arg) @@ -4026,8 +4021,7 @@ is a pair of numbers representing the displacement in the X and Y axis. (define-markup-command (sub layout props arg) (markup?) #:category font - #:properties ((font-size 0) - (baseline-skip)) + #:properties ((font-size 0)) " @cindex subscript text @@ -4049,13 +4043,13 @@ Set @var{arg} in subscript. layout (cons `((font-size . ,(- font-size 3))) props) arg) - (* -0.5 baseline-skip) + (* -0.75 (magstep font-size)) ; original font-size Y)) (define-markup-command (normal-size-sub layout props arg) (markup?) #:category font - #:properties ((baseline-skip)) + #:properties ((font-size 0)) " @cindex setting subscript in standard font size @@ -4071,7 +4065,7 @@ Set @var{arg} in subscript with a normal font size. @end lilypond" (ly:stencil-translate-axis (interpret-markup layout props arg) - (* -0.5 baseline-skip) + (* -0.75 (magstep font-size)) Y)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm index fd759d52d1..32a747aba8 100644 --- a/scm/define-music-display-methods.scm +++ b/scm/define-music-display-methods.scm @@ -526,8 +526,17 @@ Otherwise, return #f." (map-in-order (lambda (event) (music->lily-string event parser)) (ly:music-property note 'articulations)))) - (else ;; unknown? - ""))) + (else + ;; pure duration + ;; FIXME: { c4 c4 4 4 } must not be output as { c4 c 4 4 } + ;; quite tricky to do. Do it when outputting sequences? + (format #f "~a~{~a~}" + (duration->lily-string (ly:music-property note 'duration) + #:force-duration #t + #:remember #t) + (map-in-order (lambda (event) + (music->lily-string event parser)) + (ly:music-property note 'articulations)))))) (define-display-method ClusterNoteEvent (note parser) (simple-note->lily-string note parser)) diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm index 5c9c12538e..4469f88ff0 100644 --- a/scm/define-music-properties.scm +++ b/scm/define-music-properties.scm @@ -119,6 +119,12 @@ This property can only be defined as initializer in whether to allow, forbid or force a line break.") (metronome-count ,number-or-pair? "How many beats in a minute?") + (midi-extra-velocity ,integer? "How much louder or softer should +this note be in MIDI output? The default is 0.") + (midi-length ,procedure? "Function to determine how long to play +a note in MIDI. It should take a moment (the written length of the +note) and a context, and return a moment (the length to play the +note).") (moment ,ly:moment? "The moment at which an event happens.") (music-cause ,ly:music? "The music object that is the cause of an event.") diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index d92affb11c..bb7dc55504 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -84,7 +84,9 @@ "/output-scale " (number->string (ly:output-def-lookup layout 'output-scale)) " def\n" (output-entry "page-height" 'paper-height) - (output-entry "page-width" 'paper-width))) + (output-entry "page-width" 'paper-width) + (if (ly:get-option 'strokeadjust) "true setstrokeadjust\n" "") + )) (define (dump-page outputter page page-number page-count landscape?) (ly:outputter-dump-string @@ -97,7 +99,6 @@ "") "%%EndPageSetup\n" "\n" - "true setstrokeadjust\n" "gsave 0 paper-height translate set-ps-scale-to-lily-scale\n")) (ly:outputter-dump-stencil outputter page) (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n")) diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm index 7e5ab5858c..7ad02ec09e 100644 --- a/scm/layout-slur.scm +++ b/scm/layout-slur.scm @@ -28,6 +28,8 @@ (max-slope-factor . 10) (free-head-distance . 0.3) (free-slur-distance . 0.8) + (gap-to-staffline-inside . 0.2) + (gap-to-staffline-outside . 0.1) (extra-object-collision-penalty . 50) (accidental-collision . 3) (extra-encompass-free-distance . 0.3) diff --git a/scm/lily-library.scm b/scm/lily-library.scm index 43b05e57c2..570c740775 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -80,6 +80,11 @@ (cons (ly:moment-main-numerator moment) (ly:moment-main-denominator moment))) +(define-public (seconds->moment s context) + "Return a moment equivalent to s seconds at the current tempo." + (ly:moment-mul (ly:context-property context 'tempoWholesPerMinute) + (ly:make-moment (/ s 60)))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; durations @@ -116,6 +121,16 @@ non-visual scale factor 1." duration (base note length and dot count), as a number of whole notes." (duration-length (duration-visual dur))) +(define-public (unity-if-multimeasure context dur) + "Given a context and a duration, return @code{1} if the duration is +longer than the @code{measureLength} in that context, and @code{#f} otherwise. +This supports historic use of @code{Completion_heads_engraver} to split +@code{c1*3} into three whole notes." + (if (ly:momentmake-music arg)) location)) (define-ly-syntax-simple (void-music) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 383b7f3f6d..592cff33c3 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -20,6 +20,7 @@ (use-modules (scm safe-utility-defs)) (use-modules (ice-9 optargs)) +(use-modules (srfi srfi-11)) ;;; ly:music-property with setter ;;; (ly:music-property my-music 'elements) @@ -382,6 +383,28 @@ beats to be distinguished." (unfold-repeats e))) music)) +(define-public (unfold-repeats-fully music) + "Unfolds repeats and expands the resulting @code{unfolded-repeated-music}." + (map-some-music + (lambda (m) + (and (music-is-of-type? m 'unfolded-repeated-music) + (make-sequential-music + (ly:music-deep-copy + (let loop ((n (ly:music-property m 'repeat-count)) + (alts (ly:music-property m 'elements)) + (body (ly:music-property m 'element))) + (cond ((<= n 0) '()) + ((null? alts) + (cons body (loop (1- n) alts body))) + (else + (cons* body (car alts) + (loop (1- n) + (if (pair? (cdr alts)) + (cdr alts) + alts) + body))))))))) + (unfold-repeats music))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; property setting music objs. @@ -614,9 +637,10 @@ in @var{grob}." (make-music 'PropertyUnset 'symbol sym)) -(define-safe-public (make-articulation name) - (make-music 'ArticulationEvent - 'articulation-type name)) +(define-safe-public (make-articulation name . properties) + (apply make-music 'ArticulationEvent + 'articulation-type name + properties)) (define-public (make-lyric-event string duration) (make-music 'LyricEvent @@ -728,7 +752,8 @@ duration is replaced with the specified @var{duration}." (set! (ly:music-property repeat-chord 'articulations) (append! (set-origin! (ly:music-deep-copy arts)) - (ly:music-property repeat-chord 'articulations)))))) + (ly:music-property repeat-chord 'articulations))))) + repeat-chord) (define-public (expand-repeat-chords! event-types music) @@ -747,8 +772,7 @@ respective predecessor chord." last-chord)) (last-chord (set! (ly:music-property music 'duration) '()) - (copy-repeat-chord last-chord music chord-repeat event-types) - music) + (copy-repeat-chord last-chord music chord-repeat event-types)) (else (ly:music-warning music (_ "Bad chord repetition")) #f))) @@ -757,6 +781,73 @@ respective predecessor chord." (ly:music-property music 'elements))))) music) +;;; This does _not_ copy any articulations. Rationale: one main +;;; incentive for pitch-repeating durations is after ties, such that +;;; 4~2~8. can stand in for a 15/16 note in \partial 4 position. In +;;; this use case, any repeated articulations will be a nuisance. +;;; +;;; String assignments in TabStaff might seem like a worthwhile +;;; exception, but they would be better tackled by the respective +;;; engravers themselves (see issue 3662). +;;; +;;; Repeating chords as well seems problematic for things like +;;; \score { +;;; << +;;; \new Staff { c4 c c } +;;; \new RhythmicStaff { 4 4 4 4 } +;;; >> +;;; } +;;; +;;; However, because of MIDI it is not advisable to use RhythmicStaff +;;; without any initial pitch/drum-type. For music functions taking +;;; pure rhythms as an argument, the running of expand-repeat-notes! +;;; at scorification time is irrelevant: at that point of time, the +;;; music function has already run. + +(define-public (expand-repeat-notes! music) + "Walks through @var{music} and gives pitchless notes (not having a +pitch in code{pitch} or a drum type in @code{drum-type}) the pitch(es) +from the predecessor note/chord if available." + (let ((last-pitch #f)) + (map-some-music + (lambda (m) + (define (set-and-ret last) + (set! last-pitch last) + m) + (cond + ((music-is-of-type? m 'event-chord) + (set-and-ret m)) + ((music-is-of-type? m 'note-event) + (cond + ((or (ly:music-property m 'pitch #f) + (ly:music-property m 'drum-type #f)) + => set-and-ret) + ;; ok, naked rhythm. Go through the various cases of + ;; last-pitch + ;; nothing available: just keep as-is + ((not last-pitch) m) + ((ly:pitch? last-pitch) + (set! (ly:music-property m 'pitch) last-pitch) + m) + ((symbol? last-pitch) + (set! (ly:music-property m 'drum-type) last-pitch) + m) + ;; Ok, this is the big bad one: the reference is a chord. + ;; For now, we use the repeat chord logic. That's not + ;; really efficient as cleaning out all articulations is + ;; quite simpler than what copy-repeat-chord does. + (else + (copy-repeat-chord last-pitch + (make-music 'EventChord + 'elements + (ly:music-property m 'articulations) + 'origin + (ly:music-property m 'origin)) + (ly:music-property m 'duration) + '(rhythmic-event))))) + (else #f))) + music))) + ;;; splitting chords into voices. (define (voicify-list lst number) "Make a list of Musics. @@ -1255,12 +1346,13 @@ then revert skipTypesetting." (else music)))) -(define-public toplevel-music-functions +(define-session-public toplevel-music-functions (list (lambda (music parser) (expand-repeat-chords! (cons 'rhythmic-event (ly:parser-lookup parser '$chord-repeat-events)) music)) + (lambda (music parser) (expand-repeat-notes! music)) (lambda (music parser) (voicify-music music)) (lambda (x parser) (music-map music-check-error x)) (lambda (x parser) (music-map precompute-music-length x)) @@ -1879,38 +1971,111 @@ yourself." (map (lambda (x) (ly:music-property x 'pitch)) (event-chord-notes event-chord))) -(defmacro-public make-relative (pitches last-pitch music) - "The list of pitch-carrying variables in @var{pitches} is used as a -sequence for creating relativable music from @var{music}. -The variables in @var{pitches} are, when considered inside of -@code{\\relative}, all considered to be specifications to the preceding -variable. The first variable is relative to the preceding musical -context, and @var{last-pitch} specifies the pitch passed as relative -base onto the following musical context." +(define-public (event-chord-reduce music) + "Reduces event chords in @var{music} to their first note event, +retaining only the chord articulations. Returns the modified music." + (map-some-music + (lambda (m) + (and (music-is-of-type? m 'event-chord) + (let*-values (((notes arts) (partition + (lambda (mus) + (music-is-of-type? mus 'rhythmic-event)) + (ly:music-property m 'elements))) + ((dur) (ly:music-property m 'duration)) + ((full-arts) (append arts + (ly:music-property m 'articulations))) + ((first-note) (and (pair? notes) (car notes)))) + (cond (first-note + (set! (ly:music-property first-note 'articulations) + full-arts) + first-note) + ((ly:duration? dur) + ;; A repeat chord. Produce an unpitched note. + (make-music 'NoteEvent + 'duration dur + 'articulations full-arts)) + (else + (ly:music-error m (_ "Missing duration")) + (make-music 'NoteEvent + 'duration (ly:make-duration 2 0 0) + 'articulations full-arts)))))) + music)) + + +(defmacro-public make-relative (variables reference music) + "The list of pitch or music variables in @var{variables} is used as +a sequence for creating relativable music from @var{music}. + +When the constructed music is used outside of @code{\\relative}, it +just reflects plugging in the @var{variables} into @var{music}. + +The action inside of @code{\\relative}, however, is determined by +first relativizing the surrogate @var{reference} with the variables +plugged in and then using the variables relativized as a side effect +of relativizing @var{reference} for evaluating @var{music}. + +Since pitches don't have the object identity required for tracing the +effect of the reference call, they are replaced @emph{only} for the +purpose of evaluating @var{reference} with simple pitched note events. + +The surrogate @var{reference} expression has to be written with that +in mind. In addition, it must @emph{not} contain @emph{copies} of +music that is supposed to be relativized but rather the +@emph{originals}. This @emph{includes} the pitch expressions. As a +rule, inside of @code{#@{@dots{}#@}} variables must @emph{only} be +introduced using @code{#}, never via the copying construct @code{$}. +The reference expression will usually just be a sequential or chord +expression naming all variables in sequence, implying that following +music will be relativized according to the resulting pitch of the last +or first variable, respectively. + +Since the usual purpose is to create more complex music from general +arguments and since music expression parts must not occur more than +once, one @emph{does} generally need to use copying operators in the +@emph{replacement} expression @var{music} when using an argument more +than once there. Using an argument more than once in @var{reference}, +in contrast, does not make sense. + +There is another fine point to mind: @var{music} must @emph{only} +contain freshly constructed elements or copied constructs. This will +be the case anyway for regular LilyPond code inside of +@code{#@{@dots{}#@}}, but any other elements (apart from the +@var{variables} themselves which are already copied) must be created +or copied as well. + +The reason is that it is usually permitted to change music in-place as +long as one does a @var{ly:music-deep-copy} on it, and such a copy of +the whole resulting expression will @emph{not} be able to copy +variables/values inside of closures where the information for +relativization is being stored. +" ;; pitch and music generator might be stored instead in music ;; properties, and it might make sense to create a music type of its ;; own for this kind of construct rather than using ;; RelativeOctaveMusic - (define ((make-relative::to-relative-callback pitches p->m p->p) music pitch) - (let* ((chord (make-event-chord - (map - (lambda (p) - (make-music 'NoteEvent - 'pitch p)) - pitches))) - (pitchout (begin - (ly:make-music-relative! chord pitch) - (event-chord-pitches chord)))) - (set! (ly:music-property music 'element) - (apply p->m pitchout)) - (apply p->p pitchout))) + (define ((make-relative::to-relative-callback variables music-call ref-call) + music pitch) + (let* ((ref-vars (map (lambda (v) + (if (ly:pitch? v) + (make-music 'NoteEvent 'pitch v) + (ly:music-deep-copy v))) + variables)) + (after-pitch (ly:make-music-relative! (apply ref-call ref-vars) pitch)) + (actual-vars (map (lambda (v r) + (if (ly:pitch? v) + (ly:music-property r 'pitch) + r)) + variables ref-vars)) + (rel-music (apply music-call actual-vars))) + (set! (ly:music-property music 'element) rel-music) + after-pitch)) `(make-music 'RelativeOctaveMusic 'to-relative-callback (,make-relative::to-relative-callback - (list ,@pitches) - (lambda ,pitches ,music) - (lambda ,pitches ,last-pitch)) + (list ,@variables) + (lambda ,variables ,music) + (lambda ,variables ,reference)) 'element ,music)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/scm/time-signature-settings.scm b/scm/time-signature-settings.scm index 82e22fe591..97efdce3d8 100644 --- a/scm/time-signature-settings.scm +++ b/scm/time-signature-settings.scm @@ -26,7 +26,7 @@ ;;; time signature. Each default-properties set can contain the ;;; following entries: ;;; -;;; (baseMoment . (numerator . denominator)) +;;; (baseMoment . (/ numerator denominator)) ;;; (beatStructure . structure-list) ;;; (beamExceptions . (alist of beam exceptions that don't follow beats)) ;;; @@ -37,7 +37,7 @@ ;;; ;;; grouping-rules is an alist containing (beam-type . grouping-list) entries ;;; -;;; beam-type is (numerator . denominator) +;;; beam-type is the length as a rational number ;;; grouping-list is a list that specifies the ;;; number of stems of the given duration that are grouped in a beamed unit. ;;; For an exception, the duration used is beam-type. For measureBeats, @@ -45,33 +45,32 @@ ;;; ;;; If an exception is specified for a given beam-type, it will apply to all ;;; beams of shorter durations that don't have an individual exception, so -;;; ((1 . 8) . (3 3 2)) +;;; (1/8 . (3 3 2)) ;;; will cause all primary beams to be broken at 3/8, 6/8, and 8/8. ;;; -;;; ((1 . 32) . (16 8 4 4)) +;;; (1/32 . (16 8 4 4)) ;;; will cause all 1/32, 1/64, and 1/128 beams to be broken at 1/2, 3/4, ;;; 7/8, and 8/8. ;;; +;;; Tuplets are referenced using their actual (scaled) length, so +;;; a 3/2 tuplet of the 1/8 kind would get exceptions looked up +;;; under 1/12. +;;; ;;; If no values are given for baseMoment and measureBeats, default values ;;; will be assigned: -;;; baseMoment gets the value (ly:make-moment 1 time-signature-denominator) +;;; baseMoment gets the value (/ time-signature-denominator) ;;; beatStructure gets a list of (3 3 3 ...), where the number of entries is the ;;; number of beats, each containing 3 base-moments, if the time ;;; signature numerator is greater than 3 and divisible by 3, and ;;; a list of (1 1 1 ...), where the number of entries is the ;;; number of base moments in a measure otherwise. -;;; -;;; NOTE: numerator is kept in beam-type because of -;;; tuplets, e.g. (2 . 24) = (2 . 3) * (1 . 8) -;;; for eighth-note triplets. -;;; (define-public default-time-signature-settings '( ;; in 2/2 time: ;; use defaults, but end beams with 32nd notes each 1 4 beat ((2 . 2) . - ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8)))))))) + ((beamExceptions . ((end . ((1/32 . (8 8 8 8)))))))) ;; in 2/4, 2/8 and 2/16 time: ;; use defaults, so no entries are necessary @@ -80,7 +79,7 @@ ;; use defaults, but end beams with 32nd notes and higher each 1 4 beat ((3 . 2) . - ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8)))))))) + ((beamExceptions . ((end . ((1/32 . (8 8 8 8 8 8)))))))) ;; in 3 4 time: ;; use defaults, but combine all beats into a unit if possible @@ -89,12 +88,12 @@ ;; in order to avoid beaming every beam type for the entire measure, we set ;; triplets back to every beat. ((3 . 4) . - ((beamExceptions . ((end . (((1 . 8) . (6)) ;1/8 note whole measure - ((1 . 12) . (3 3 3)))))))) ;Anything shorter by beat + ((beamExceptions . ((end . ((1/8 . (6)) ;1/8 note whole measure + (1/12 . (3 3 3)))))))) ;Anything shorter by beat ;; in 3 8 time: ;; beam entire measure together - ((3 . 8) . ((beamExceptions . ((end . (((1 . 8) . (3)))))))) + ((3 . 8) . ((beamExceptions . ((end . ((1/8 . (3)))))))) ;; in 3 16 time: ;; use defaults -- no entries necessary @@ -102,7 +101,7 @@ ;; in 4 2 time: ;; use defaults, but end beams with 16th notes or finer each 1 4 beat ((4 . 2) . - ((beamExceptions . ((end . (((1 . 16) . (4 4 4 4 4 4 4 4)))))))) + ((beamExceptions . ((end . ((1/16 . (4 4 4 4 4 4 4 4)))))))) ;; in 4 4 (common) time: ;; use defaults, but combine beats 1,2 and 3,4 if only 8th notes @@ -110,8 +109,8 @@ ;; ly/engraver-init.ly where the default time signature is set ;; are set ((4 . 4) . - ((beamExceptions . ((end . (((1 . 8) . (4 4)) ; 1/8 notes half measure - ((1 . 12) . (3 3 3 3)))))))) ;Anything shorter by beat + ((beamExceptions . ((end . ((1/8 . (4 4)) ; 1/8 notes half measure + (1/12 . (3 3 3 3)))))))) ;Anything shorter by beat ;; in 4/8 time: ;; combine beats 1 and 2, so beam in 2 @@ -123,7 +122,7 @@ ;; in 6 4 time: ;; use defaults, but end beams with 32nd or finer each 1/4 beat ((6 . 4) . - ((beamExceptions . ((end . (((1 . 16) . (4 4 4 4 4 4)))))))) + ((beamExceptions . ((end . ((1/16 . (4 4 4 4 4 4)))))))) ;; in 6 8 time: ;; use defaults, so no entries necessary @@ -134,7 +133,7 @@ ;; in 9 4 time: ;; use defaults, but end beams with 32nd or finer each 1 4 beat ((9 . 4) . - ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8 8 8)))))))) + ((beamExceptions . ((end . ((1/32 . (8 8 8 8 8 8 8 8)))))))) ;; in 9 8 time ;; use defaults, so no entries necessary @@ -145,7 +144,7 @@ ;; in 12 4 time: ;; use defaults, but end beams with 32nd or finer notes each 1 4 beat ((12 . 4) . - ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8 8 8 8 8 8 8)))))))) + ((beamExceptions . ((end . ((1/32 . (8 8 8 8 8 8 8 8 8 8 8 8)))))))) ;; in 12 8 time: ;; use defaults, so no entries necessary diff --git a/scripts/build/gen-emmentaler-scripts.py b/scripts/build/gen-emmentaler-scripts.py index dafb50c0ef..9f645b5929 100644 --- a/scripts/build/gen-emmentaler-scripts.py +++ b/scripts/build/gen-emmentaler-scripts.py @@ -85,8 +85,11 @@ Generate("%(filename)s-%(design_size)d.woff"); open (path, 'w').write (script) subfonts = ['feta%(design_size)d', - 'parmesan%(design_size)d', - 'feta-alphabet%(design_size)d'] + 'feta-noteheads%(design_size)d', + 'feta-flags%(design_size)d', + 'parmesan%(design_size)d', + 'parmesan-noteheads%(design_size)d', + 'feta-alphabet%(design_size)d'] ns = [] for s in subfonts: @@ -98,10 +101,10 @@ Generate("%(filename)s-%(design_size)d.woff"); path = os.path.join (outdir, '%s-%d.dep' % (filename, design_size)) - deps = r'''%(filename)s-%(design_size)d.otf: $(outdir)/feta%(design_size)d.pfa \ - $(outdir)/parmesan%(design_size)d.pfa \ - $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-table \ - $(outdir)/feta-alphabet%(design_size)d.pfa feta%(design_size)d.otf-gtable + deps = r'''%(filename)s-%(design_size)d.otf: $(outdir)/feta%(design_size)d.pfb \ + $(outdir)/parmesan%(design_size)d.pfb \ + $(outdir)/feta-alphabet%(design_size)d.pfb feta%(design_size)d.otf-table \ + feta%(design_size)d.otf-gtable ''' % vars() open (path, 'w').write (deps) diff --git a/scripts/build/mf-to-table.py b/scripts/build/mf-to-table.py index f191d0aa8f..7c193987ec 100644 --- a/scripts/build/mf-to-table.py +++ b/scripts/build/mf-to-table.py @@ -264,6 +264,6 @@ for filenm in files: open (global_lisp_nm, 'w').write (global_lisp_table (g)) if depfile_nm: open (depfile_nm, 'wb').write (get_deps (deps, - [base + '.log', base + '.dvi', base + '.pfa', + [base + '.log', base + '.dvi', depfile_nm, base + '.pfb'])) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 641d763713..ede9d4a98b 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -292,17 +292,18 @@ def do_one_file (infile_name): # Note that last_change can be set even if the result is # the same if two conversion rules cancelled out if result == input: - # check the y in x.y.z (minor version number) - previous_stable = (last[0], 2*(last[1]/2), 0) - if ((last[0:2] != from_version[0:2]) and - (previous_stable > from_version)): - # previous stable version - last = previous_stable - else: - # make no (actual) change to the version number - last = from_version + # make no (actual) change to the version number + last = from_version else: last = last_change + # If the last update was to an unstable version + # number, and the final update target is no longer in + # the same unstable series, we update to the stable + # series following the unstable version. + if last[1]%2: # unstable + next_stable = (last[0], last[1]+1, 0) + if next_stable <= to_version: + last = next_stable newversion = r'\version "%s"' % tup_to_str (last) if lilypond_version_re.search (result):