From c3e7d94cc2bac8567c25797865968bd53ce2bd38 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 25 Feb 2001 18:53:20 +0100 Subject: [PATCH] patch::: 1.3.131.jcn2 1.3.131.jcn2 ============ * Fixes for ascii-script output. Stylesheet needs some work, just as PostScript output. * Bugfix: convert-ly --to accepts argument. * Prepared Petites Preludes for (first?) submission to mutopia. --- CHANGES | 10 + VERSION | 2 +- ly/declarations-as.ly | 33 +--- ly/declarations.ly | 2 +- ly/init-as.ly | 2 +- ly/paper-as5.ly | 40 ++-- ly/paper-as9.ly | 43 ++-- ly/params-as.ly | 186 +++--------------- mutopia/J.S.Bach/Petites-Preludes/GNUmakefile | 2 + mutopia/J.S.Bach/Petites-Preludes/header.ly | 40 ++++ .../J.S.Bach/Petites-Preludes/preludes-1.ly | 55 ++---- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 62 ++---- .../J.S.Bach/Petites-Preludes/preludes-3.ly | 51 +---- .../J.S.Bach/Petites-Preludes/preludes-4.ly | 151 +++++++------- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 60 ++---- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 53 ++--- .../Petites-Preludes/preludes-score.ly | 24 +-- scm/ascii-script.scm | 7 +- scm/auto-beam.scm | 4 +- scm/lily.scm | 2 +- scripts/convert-ly.py | 11 +- 21 files changed, 271 insertions(+), 569 deletions(-) create mode 100644 mutopia/J.S.Bach/Petites-Preludes/header.ly diff --git a/CHANGES b/CHANGES index 6b0a505022..281ffa35d8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +1.3.131.jcn2 +============ + +* Fixes for ascii-script output. Stylesheet needs some work, just as +PostScript output. + +* Bugfix: convert-ly --to accepts argument. + +* Prepared Petites Preludes for (first?) submission to mutopia. + 1.3.131.jcn1 ============ diff --git a/VERSION b/VERSION index 50cbaad621..76280b6600 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=131 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/ly/declarations-as.ly b/ly/declarations-as.ly index 06acf86c1b..8c20b69d2a 100644 --- a/ly/declarations-as.ly +++ b/ly/declarations-as.ly @@ -1,23 +1,11 @@ - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% UGH UGH UGH UGHUGH FIXME -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -> duplication! - breve = \duration #(make-duration -1 0) -longa = \duration #'(make-duration -2 0 ) -maxima = \duration #'(make-duration -3 0 ) - - -#(begin - (eval-string (ly-gulp-file "slur.scm")) - (eval-string (ly-gulp-file "generic-property.scm")) - (eval-string (ly-gulp-file "basic-properties.scm")) - ) +longa = \duration #(make-duration -2 0 ) +maxima = \duration #(make-duration -3 0) \include "nederlands.ly" % dutch \include "chord-modifiers.ly" \include "script.ly" - % declarations for standard directions left = -1 right = 1 @@ -27,28 +15,18 @@ start = -1 stop = 1 smaller = -1 bigger = 1 - center=0 break = \penalty -1000000; noBreak = \penalty 1000000; \include "scale-definitions.ly" - melisma = \property Staff.melismaBusy = ##t melismaEnd = \property Staff.melismaBusy = ##f +papersize = "a4" -%papersize = "a4" -%\include "generic-paper.ly" - -#(eval-string (ly-gulp-file "paper.scm")) - -\paper { - texsetting = ""; - pssetting = ""; - scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse;\n";% UGH. -} - +\include "engraver.ly" +\include "generic-paper.ly" \include "paper-as9.ly" % ugh @@ -60,7 +38,6 @@ melismaEnd = \property Staff.melismaBusy = ##f \include "property.ly" - unusedEntry = \notes { c4 } % reset default duration % music = "\melodic\relative c" diff --git a/ly/declarations.ly b/ly/declarations.ly index 407ded53ca..dd152b8957 100644 --- a/ly/declarations.ly +++ b/ly/declarations.ly @@ -1,6 +1,6 @@ breve = \duration #(make-duration -1 0) longa = \duration #(make-duration -2 0 ) -maxima = \duration #(make-duration -3 0) +maxima = \duration #(make-duration -3 0) \include "nederlands.ly" % dutch \include "chord-modifiers.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index 1fe3c67e14..f8fd77706c 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -27,7 +27,7 @@ ) \paper { - \paperAs_nine + \paperAsNine \translator { \StaffContext barSize = \staffheight; } % no beam-slope diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 44f0842b92..3ce1bf58af 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -4,35 +4,21 @@ paperAsFive = \paper { staffheight = 5.\char; - - font_large = 1.; - font_Large = 1.; - font_normal = 1.; - font_script = 1.; - - font_finger = 1.; - font_volta = 1.; - font_number = 1.; - font_mark = 1.; - - % what about: - "font_number-1" = 1.; - %"font_number" = 10.; - "font_number+1" = 1.; + %% aiai only have these: +%{ + mf/as5.af + mf/as9.af + mf/as-braces5.af + mf/as-braces9.af + mf/as-dummy1.af + mf/as-dummy.af + mf/as-number1.af + mf/as-number4.af +%} - % Ugh - magnification_dynamic = 2.; - - - -2 = \font "as5" - -1 = \font "as5" - 0 = \font "as5" - - "font_feta-2" = 9.; - "font_feta-1" = 9.; - "font_feta" = 9.; + \stylesheet #(make-style-sheet 'paper16) \include "params-as.ly"; } -\paper { \paperAs_five } +\paper { \paperAsFive } diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index eae4c50c16..828bb961d3 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -4,38 +4,21 @@ paperAsNine = \paper { staffheight = 9.\char; - -% font_large = 4.; -% font_Large = 4.; -% font_normal = 4.; - font_large = 1.; - font_Large = 1.; - font_normal = 4.; - font_script = 1.; - - font_finger = 1.; - font_volta = 1.; - font_number = 4.; - font_mark = 4.; - - % what about: - "font_number-1" = 1.; - %"font_number" = 10.; - "font_number+1" = 4.; + %% aiai only have these: +%{ + mf/as5.af + mf/as9.af + mf/as-braces5.af + mf/as-braces9.af + mf/as-dummy1.af + mf/as-dummy.af + mf/as-number1.af + mf/as-number4.af +%} + \stylesheet #(make-style-sheet 'paper16) - % Ugh - magnification_dynamic = 2.; - - - -2 = \font "as9" - -1 = \font "as9" - 0 = \font "as9" - - "font_feta-2" = 9.; - "font_feta-1" = 9.; - "font_feta" = 9.; \include "params-as.ly"; } -\paper { \paperAs_nine } +\paper { \paperAsNine } diff --git a/ly/params-as.ly b/ly/params-as.ly index f805540d69..5ed66e729d 100644 --- a/ly/params-as.ly +++ b/ly/params-as.ly @@ -15,166 +15,30 @@ indent = 8.0\char; staffspace = (\staffheight - 1.0 ) / 4.0; stafflinethickness = \staffspace / 2.0; -% deprecated -interline = \staffspace; +% paperfile = "a4.ly"; +%\include \paperfile; +%\include "paper.ly"; + +%staffspace = \staffheight / 4.0; +%stafflinethickness = \staffspace / 10.0; + +outputscale = \staffheight / 4.0; + +\translator { \NoteNamesContext } +\translator { \ScoreContext } +\translator { \ChoirStaffContext} +\translator { \GraceContext} +\translator { \RhythmicStaffContext} +\translator { \StaffContext } +\translator { \VoiceContext} +\translator { \StaffGroupContext } +\translator { \ChordNamesContext } +\translator { \ChordNamesVoiceContext} +\translator { \GrandStaffContext} +\translator { \LyricsContext } +\translator { \ThreadContext} +\translator { \PianoStaffContext} +\translator { \LyricsVoiceContext } +\translator { \StaffContainerContext } -%{ -The space taken by a note is determined by the formula - -arithmetic_multiplier * ( c + log2 (time) )) - -where code(time) is the amount of time a note occupies. The value -of code(c) is chosen such that the smallest space within a measure is -arithmetic_basicspace. The smallest space is the one following the -shortest note in the measure. Typically arithmetic_basicspace is set -to the width of a quarter note head. -%} -% quartwidth == 1.32 * staffspace -arithmetic_basicspace = 2.; -%arithmetic_multiplier = 0.9 * \quartwidth ; -arithmetic_multiplier = 0.9 * 1.32 * \staffspace; - - -% catch suspect beam slopes, set slope to zero if -% outer stem is lengthened more than -beam_lengthened = 0.2 * \staffspace; -% and slope is running away steeper than -beam_steep_slope = 0.2 / 1.0; - -%{ -dit(code(slur_x_gap)) Horizontal space between note and slur. Set to -code(\staffspace / 5) by default. - -%} -% OSU: suggested gap = ss / 5; -slur_x_gap = \staffspace / 5.0; -slur_y_gap = 0.25 * \staffspace; -slur_y_free = 0.75 * \staffspace; -slur_x_minimum = 1.5 * \staffspace; - - -% use tangent controls or area asymmetry? -bezier_area = 1.0; -bezier_asymmetry = 1.0; -bezier_beautiful = 2.0; - -% The constants that define the valid areas for the middle control points -% Used in de_uglyfy. Bit empirical. -bezier_control1 = 1.5; -bezier_control2 = 0.8; -bezier_control3 = -2.0; - -% URG: the magic constants for area asymmetry -bezier_pct_c0 = -0.2; -bezier_pct_c3 = 0.000006; -bezier_pct_out_max = 0.8; -bezier_pct_in_max = 1.2; -bezier_area_steps = 1.0; - -bezier_before_blowfit = 0.5; - -%{ -Like beams, slurs often aren't as steep as the notes they encompass. -This sets the amount of damping. -%} -% slope damping: keep dy/dx < slur_slope_damping -slur_slope_damping = 0.3; -slur_interstaff_slope_damping = 0.6; -% height damping: keep h/dx < slur_height_damping -slur_height_damping = 0.4; -slur_interstaff_height_damping = 0.5; -% snap to stem if slur ends closer to stem than -slur_snap_to_stem = 1.75 * \staffspace; -slur_interstaff_snap_to_stem = 2.5 * \staffspace; -% maximum dy change allowed by snapping -slur_snap_max_slope_change = 0.5; -slur_interstaff_snap_max_slope_change = 0.5; - - - -tie_x_minimum = \staffspace + \slur_x_minimum; -% OSU: tie gap == slur gap -tie_x_gap = \slur_x_gap; -tie_y_gap = 0.25 * \staffspace; -% length of a tie that's a staffspace high -tie_staffspace_length = 4.0 * \staffspace; - - -%{ - Specifies the maximum height of slurs. -%} -slur_height_limit_factor = \staffheight; - - -%{ -Specifes the ratio of slur hight to slur width -to aim for. Default value is 0.3. -%} - -% slur_ratio = 0.3; -% try bit flatter slurs -slur_ratio = 0.25; -slur_clip_ratio = 1.2; -slur_clip_height = 3.0 * \staffheight; -slur_clip_angle = 100.0; -slur_rc_factor = 2.4; - -% vertical space between lines. -line_kern = \staffspace; - - -% chop off this much when next to pp / ff sign. -crescendo_shorten = 4.0 * \staffspace; -crescendo_thickness = \stafflinethickness; -crescendo_height = 0.666 * \staffspace; - -% deprecated! -postBreakPadding = 0.0; - -% optical correction amount. -stemSpacingCorrection = 0.5*\staffspace; - - -%{ - relative strength of space following breakable columns (eg. prefatory matter) - %} -breakable_column_space_strength = 2.0; - -% space after inline clefs and such get this much stretched -decrease_nonmus_spacing_factor = 1.0 ; - -%{ - space before musical columns (eg. taken by accidentals) get this much - stretched when they follow a musical column, in absence of grace notes. - - 0.0 means no extra space (accidentals are ignored) -%} -musical_to_musical_left_spacing_factor = 0.4; - -%{ - stretch space this much if there are grace notes before the column -%} -before_grace_spacing_factor = 1.2; - -%{ -If columns do not have spacing information set, set it to this much -%} -loose_column_distance = 2.0 * \staffspace; - -%{ -Relative cost of compressing (vs. stretching). Increasing this -will cause scores to be set looser -. -%} - -compression_energy_factor = 0.6; - -% if stem is on middle line, choose this direction. -stem_default_neutral_direction = 1.0; - -% Backward compatibility -- has no function; -Gourlay = 0.0; -Wordwrap =0.0; - -\include "engraver.ly"; diff --git a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile index 4bd2ddbf9c..f21147b3c7 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile +++ b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile @@ -10,4 +10,6 @@ export LILYINCLUDE examples=preludes-2 LOCALSTEPMAKE_TEMPLATES=mutopia +mutopia-examples=preludes-score + include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Petites-Preludes/header.ly b/mutopia/J.S.Bach/Petites-Preludes/header.ly new file mode 100644 index 0000000000..21cf4ae115 --- /dev/null +++ b/mutopia/J.S.Bach/Petites-Preludes/header.ly @@ -0,0 +1,40 @@ +%{ + Header for Petites Preludes. + + Six Petits Preludes, + Collection Johann Peter Kellner + ca 1703 - 1707 + + Kellner was a student of Bach's that copied some 90 works of his master. +%} + +instrument = "Piano" + +\header{ + title = "Petites Pr\'eludes"; + subtitle = "Clavierbuechlein"; + composer = "Johann Sebastian Bach (1685-1750)"; + enteredby = "JCN,HWN"; + instrument = \instrument; + + % mutopia headers. + mutopiatitle = "Petites Préluedes"; + mutopiacomposer = "J.S.Bach (1685-1750)"; + mutopiaopus = "BWV924,939,999,925,926,940"; + mutopiainstrument = \intrument; + date = "1700s"; + source = "Ed. Henry Lemoine Urtext"; + style = "Baroque"; + copyright = "Public Domain"; + maintainer = "Jan Nieuwenhuizen"; + maintainer_email = "janneke@gnu.org"; + lastupdated = "2001/Feb/25"; + mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small + \\\\This music is part of the Mutopia project, + \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset + and placed in the public domain by " + \maintainer + + ".\\\\Unrestricted modification and redistribution is permitted + and encouraged---copy this music and share it!}"; + tagline = \mutopiapublicdomain; + footer = "pre-Mutopia-200y/mm/dd-nr"; +} diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 52ffbdaca8..555a93fc65 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -1,34 +1,9 @@ -%{ +#(set! point-and-click #t) + +opus = "BWV 924" +piece = "1" - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 - Kellner was a student of Bach's that copied some 90 works of his master. - -%} -\header{ - copyright = "public domain"; - source = "Ed. Henry Lemoine Urtext"; - title = "Pr\\\"aludum"; - - opus = "BWV 924"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "jcn,hwn"; - - % mutopia headers. - mutopiatitle = "Prelude"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV924"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Nov/14"; -} %{ TODO: this file needs additional layouting: the trills look @@ -36,15 +11,14 @@ differently in Lemoine, and the sharps should be below the trill. Additionally, the performance of trills should be explained. +FIXME (Bach sure didn't)? Lemoine puts fermatas on ending bar lines everywhere. -1.2.x versions of lily contain a version with dynamics and fingerings. - %} -\version "1.3.117"; +\version "1.3.98"; lowstaff = \translator "Staff" = "lower" @@ -53,7 +27,7 @@ upstaff = \translator "Staff" = "upper" % upper = \context Staff \notes\relative c { upper = \context Staff=upper \notes\relative c { \context Voice=i - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic r16 g'' c e r g, c e r g, c d r b d g | @@ -73,11 +47,12 @@ upper = \context Staff=upper \notes\relative c { r b, d a' r b, d g r a, c g' r a, c f! | - % ugh arpeggio + % ugh arpeggio FIXME: is that so? r4 - \stemBoth + \stemBoth + \lowstaff \stemUp r16 g,, b d [ f \upstaff \stemDown g16 b d ] | @@ -119,7 +94,7 @@ upper = \context Staff=upper \notes\relative c { % lower = \context Staff \notes\relative c{ lower = \context Staff=lower \notes\relative c{ \context Voice=i - \property Voice . textStyle = "roman" + \property Voice.TextScript \set #'font-style = #'roman c4 e g^"\\textsharp"-\mordent g,4 | d'4-\mordent f a-\mordent^"\\textsharp" a,4 | e' e'-\mordent a, b-\upprall | @@ -130,8 +105,8 @@ lower = \context Staff=lower \notes\relative c{ g'-\mordent g, g'-\mordent g, | g' r s s | s s s s \clef "bass"; | < - { \stemUp g1 ~ g ~ g ~ g ~ g ~ g ~ g } - \context Voice=ii { \stemDown g,1 ~ g ~ g ~ g ~ g ~ g ~ g } + { \stemUp\tieUp g1 ~ g ~ g ~ g ~ g ~ g ~ g } + \context Voice=ii { \stemDown\tieDown g,1 ~ g ~ g ~ g ~ g ~ g ~ g } > \bar "|."; @@ -157,7 +132,7 @@ global = \notes{ \paper { linewidth = 18.0 \cm; } \midi{ \tempo 4 = 80; } \header { - opus = "BWV 924"; - piece = "1"; + opus = \opus; + piece = \piece; } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 1c25f3db60..6515363d5e 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -1,51 +1,13 @@ -%{ +#(set! point-and-click #t) - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 +opus= "BWV 939" +piece = "2" - - Kellner was a student of Bach's. - -%} - -\header{ - copyright = "public domain"; - source = "Ed. Henry Lemoine Urtext"; - title = "Pr\\\"aludum"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "jcn,hwn"; - - - opus= "393"; - % mutopia headers. - mutopiatitle = "Prelude"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV939"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Nov/14"; -} - - - -%{ -Old versions of LilyPond include this prelude with dynamics and fingerings. -%} - - - -\version "1.3.117"; +\version "1.3.98"; upper = \context Staff \notes\relative c{ \context Voice=i - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic r8 c' e g e c bes' g | a c, f a f c c' a | b g b d b g f' d | @@ -64,8 +26,10 @@ upper = \context Staff \notes\relative c{ c2 r4 < - { \stemUp c ~ c8} - \context Voice=ii { \stemDown ~ } + { \stemUp\tieUp c ~ c8} + % We get a warning: No ties created! + % but they are too! + \context Voice=ii { \stemDown\tieDown ~ } > \stemBoth d, fis a fis d c' a | @@ -87,8 +51,8 @@ upper = \context Staff \notes\relative c{ lower = \context Staff \notes\relative c{ \context Voice=i < - { \stemUp c1 ~ | c ~ | c } - \context Voice=ii { \stemDown c,1 ~ | c ~ | c } + { \stemUp\tieUp c1 ~ | c ~ | c } + \context Voice=ii { \stemDown\tieDown c,1 ~ | c ~ | c } > \stemBoth | r8 c e g e c c' e, | @@ -130,8 +94,8 @@ global = \notes{ } \midi{ \tempo 4 = 100; } \header { - opus = "BWV 939"; - piece = "2"; + opus = \opus; + piece = \piece; } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 7720c7d113..7b47bee65a 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -1,39 +1,7 @@ -%{ - - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 - - - +#(set! point-and-click #t) - Kellner was a student of Bach's that copied some 90 works of his master. - - -%} -\header{ - copyright = "public domain"; - source = "Ed. Henry Lemoine Urtext"; - title = "Pr\\\"aludum in C moll"; - subtitle = "f\\\"ur Laute"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "jcn,hwn"; - copyright = "public domain"; - - % mutopia headers. - mutopiatitle = "Prelude"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV999"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Nov/14"; -} +opus= "BWV 999" +piece = "3" %{ @@ -43,9 +11,10 @@ switch staffs to avoid leger lines. Not all editions agree on the last note: ed. Lemoine has a quarter note, some have dotted half notes. - +This file was partly generated using m4. %} -\version "1.3.117"; + +\version "1.3.98"; upper = \notes \transpose c'' { @@ -156,6 +125,7 @@ lower = \notes{ g,4 r [es8 c] | g,4 r [es8 c] | g,4 r r | + %% FIXME: \fermata? g,4_\fermata \bar "|."; } @@ -178,14 +148,11 @@ global = \notes{ > > \paper{ - \translator { \PianoStaffContext - minVerticalAlign = 2.2 * \staffheight; - maxVerticalAlign = 2.2 * \staffheight ; - } \translator {\OrchestralScoreContext } } \midi{ \tempo 4 = 100; } \header{ - opus = "BWV 999"; + opus = \opus; + piece = \piece; } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index db8edfecae..6cfb776a0e 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -1,33 +1,9 @@ -%{ +#(set! point-and-click #t) - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 +opus = "BWV 925" +piece = "4" - Kellner was a student of Bach's that copied some 90 works of his master. - -%} -\header{ - copyright = "public domain"; - source = "Ed. Henry Lemoine Urtext"; - title = "Pr\\\"aludum"; - opus = "BWV 925"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "jcn,hwn"; - - % mutopia headers. - mutopiatitle = "Prelude"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV925"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Nov/14"; -} +\version "1.3.98" %{ @@ -37,55 +13,55 @@ This stretches LilyPond capabilities a little. one = \context Staff \notes\relative c { \context Voice=i - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic % r16_"legato" r16 - \property Voice . textStyle = "finger" + \property Voice.TextScript \set #'font-style = #'finger d' fis d a' b cis a d cis d e d fis e d | - \property Voice . textStyle = "finger" - \stemup + \property Voice.TextScript \set #'font-style = #'finger + \stemUp\tieUp cis4 fis ~ fis8 fis e4 ~ | - e16 \stemboth a,16 cis a d e fis d + e16 \stemBoth\tieBoth a,16 cis a d e fis d g fis g a g b a g | - \stemup + \stemUp fis4 e8 a | %5 < g!16 d> fis g a - \stemboth + \stemBoth g b a g | - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic fis e fis g fis a g fis - \property Voice . textStyle = "finger" + \property Voice.TextScript \set #'font-style = #'finger % e4-"2\\_5" ~ e16 e, fis g | e4 ~ e16 e, fis g | - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic a g a b a c b a g fis g a g b a g | - \stemup + \stemUp\tieUp fis4 \skip 4*7; | %10 - \property Voice . textStyle = "finger" + \property Voice.TextScript \set #'font-style = #'finger % d'4. cis8-"4\\_5" ~ cis b4 a8-"4\\_5" ~ | d'4. cis8 ~ cis b4 a8 ~ | - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic a g4 fis8 ~ fis16 fis e d - \property Voice . textStyle = "finger" + \property Voice.TextScript \set #'font-style = #'finger % e4-"3\\_5" ~ | e4 ~ | e16 e d cis d4 ~ d16 d cis b cis4 | - \stemboth + \stemBoth fis,16 a d c b d g fis d b' a g fis e d c! | b d g a fis8-\prall e16 d d8. e16~ e d8 cis16 | %15 - \stemup + \stemUp\tieUp r16 d fis d g a b g c b c d c e d c | b4 a ~ a8 g ~ g16 fis8 e16 | fis8 e~ e d~ d4 cis | @@ -96,54 +72,63 @@ one = \context Staff \notes\relative c { two = \context Staff \notes\relative c{ \context Voice=ii - \stemup - \property Voice . textStyle = "finger" + \stemUp + \property Voice.TextScript \set #'font-style = #'finger fis4 e8 a4 a4 gis8 | a8 - \translator Staff=upper \stemdown + \translator Staff=upper \stemDown\tieDown a'4 a8 b4. cis8 ~ | cis8 - \translator Staff=lower \stemup + \translator Staff=lower \stemUp\tieUp a,8 ~ a d ~ d d4-> cis8 | d8 - \translator Staff=upper \stemdown + \translator Staff=upper \stemDown\tieDown d'4-> cis8 ~ cis b4 b8 | %5 r8 a4 a8 - \translator Staff=lower \stemup + \translator Staff=lower \stemUp\tieUp g8 fis e4 ~ | e4 d ~ d16 d cis b cis4 ~ | cis8 a d4. d4^> cis8 | - \translator Staff=upper \stemdown - d4 \stemboth r16 b d b~ + \translator Staff=upper \stemDown\tieDown + d4 \stemBoth\tieBoth r16 b d b~ r16 cis, e cis~ | r16 d, fis d~ r16 fis a fis~ | %10 - \stemdown + \stemDown fis4 e d cis | b a b4. b8 | a4 - \translator Staff=lower \stemup + \translator Staff=lower \stemUp r16 b fis a g4 r16 a e g | \skip 1*1; s16 - \translator Staff=upper \stemdown + \translator Staff=upper \stemDown\tieDown d'8. ~ d8 c d4 a8 g | %15 - fis8 \translator Staff=lower \stemup c' b4 \stemdown - \stemdown + \stemDown\tieDown a'8~ | a g~ g16 e fis8~ fis16 d8.~ d8. cis!16 | - \translator Staff=lower \stemup +% \translator Staff=lower \stemUp \context Staff < - \context Voice=i { \stemup d8 a~ a4 } - \context Voice=ii { \stemdown a8 g fis16 e fis d } +% \context Voice=i { \stemUp\tieU d8 a~ a4 } +% \context Voice=ii { \stemDown a8 g fis16 e fis d } + \context Voice=ii { + \translator Staff = upper + \stemDown\tieDown d8 a~ a4 + } + \context Voice=iii { + \translator Staff = lower + \stemUp a8 g fis16 e fis d + } > - \stemup + \translator Staff=lower + \stemUp\tieUp g fis g a g b a g ~ | g g fis e fis4 ~ fis2 \bar "|."; @@ -151,19 +136,19 @@ two = \context Staff \notes\relative c{ three = \notes\relative c{ \context Voice=iii - \stemdown + \stemDown d4 cis b e | a16 a, cis a d e fis d g fis g a g b a g | fis4 fis e a | - d16 \stemboth d, fis d a' b cis a + d16 \stemBoth d, fis d a' b cis a d cis d e d fis e d | %5 cis b cis d c e d c - \stemdown b4 cis8 b | + \stemDown b4 cis8 b | a fis b a gis e a g | fis4. d8 e4 a4 | - \stemboth + \stemBoth r16 d, fis d g8 g, r16 e' g e a8 a, | r16 fis' a fis b8 b, r16 g' b g d'8 d, | @@ -171,17 +156,17 @@ three = \notes\relative c{ r16 d,16 fis d a' b cis a d b d b fis' g a fis | fis16 g, b g d' e fis d g8 g, r16 cis e cis | - fis8 fis, \stemdown r16 b d b e e, + fis8 fis, \stemDown r16 b d b e8 e, r16 a cis a | - \stemboth + \stemBoth d e fis d g fis e d cis! a b cis d e fis d | - g8 e \stemdown a a, b8. g16 a4 | + g8 e \stemDown\tieDown a a, b8. g16 a4 | %15 d8 a'~ a g~ g g fis4 | - \stemup + \stemUp r16 g b g d'8. c16 b8. bes16 a8 g | - \stemdown + \stemDown r16 a, cis! a' d, e fis d e8 d e a, | d a~ a16 a b cis d2 | } @@ -189,19 +174,20 @@ three = \notes\relative c{ four = \context Staff \notes\relative c{ \skip 1*9; \context Voice=iv - \stemup - \property Voice.horizontalNoteShift = 1 + \stemUp + \property Voice.NoteColumn \override #'horizontal-shift = #1 %10 a''2 fis | d s | -% \property Voice.horizontalNoteShift = 0 \skip 1*2; | s4 - \translator Staff=lower \stemup + \translator Staff=lower \stemUp\tieUp a4 ~ a16 d, g8 fis e | %15 - \stemdown + \stemDown\tieDown d1 ~ | + % we'll get some warnings, but it looks better + \property Voice.NoteColumn \override #'horizontal-shift = #0 d | d, ~ | d2 d2 @@ -209,7 +195,7 @@ four = \context Staff \notes\relative c{ global = \notes{ \time 4/4; - \key d; + \key d \major; } \score{ @@ -228,11 +214,16 @@ global = \notes{ > > \paper{ - linewidth = 18.0 \cm; + linewidth = 18.0 \cm; + \translator{ + \VoiceContext + % consider ending beam at every 1 2 note + autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4) + } } \midi{ \tempo 4 = 70; } \header{ - opus = "BWV 925"; - piece = "4"; + opus = \opus; + piece = \piece; } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 40d38e2ddd..9afd7e04e2 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -1,41 +1,13 @@ -%{ - - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 - - Kellner was a student of Bach's that copied some 90 works of his master. - -%} - -\header{ - copyright = "public domain"; - source = "Ed. Henry Lemoine Urtext"; - title = "Pr\\\"aludum"; - opus = "BWV 926"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "jcn,hwn"; - - % mutopia headers. - mutopiatitle = "Prelude"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV926"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Nov/14"; - -} +#(set! point-and-click #t) + +piece = "5" +opus = "BWV 926" -\version "1.3.117"; +\version "1.3.98"; upper = \context Staff \notes\relative c \context Voice=i { - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic [d'8 a' f d a' f] | @@ -53,10 +25,10 @@ upper = \context Staff \notes\relative c < { \stemUp - \property Voice . textStyle = "roman" + \property Voice.TextScript \set #'font-style = #'roman c4-\mordent^"(\\textsharp)" r r | c4-\mordent^"(\\textsharp)" r r - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic } \context Voice=ii { \stemDown a4 r r | a4 r r } > | @@ -151,9 +123,9 @@ lower = \context Staff \notes\relative c{ g! es' c g es' c | fis,4 r r d fis d | - \property Voice . textStyle = "roman" + \property Voice.TextScript \set #'font-style = #'roman g4-\mordent^"(\\textsharp)" r r8 f!8 | - \property Voice . textStyle = "italic" + \property Voice.TextScript \set #'font-style = #'italic e4-\prall r r | f4-\mordent r r8 e | d4 r8 f e d | @@ -186,13 +158,19 @@ lower = \context Staff \notes\relative c{ [f a] \stemDown - [d, f] a s s8 s4-"*" | + [d, f] a s s8 s4 | \stemBoth % ugh whole rest has duration of one bar R2. | % r4 r r | + \stemBoth cis,8 e cis a d16 c bes a | g8 g' a g a a, | + % ah, both at last + % what's going on here?? + \stemBoth + \stemBoth + \stemBoth d4 d' d, | d r r | d, d' d, | @@ -223,8 +201,8 @@ global = \notes{ } \midi{ \tempo 4 = 90; } \header{ - piece = "5"; - opus = "BWV 926"; + piece = \piece; + opus = \opus; } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 89a8c28e65..56db045f37 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -1,37 +1,9 @@ -%{ +#(set! point-and-click #t) - Six Petits Preludes, - Collection Johann Peter Kellner - ca 1703 - 1707 +opus = "BWV 940" +piece = "6" - Kellner was a student of Bach's that copied some 90 works of his master. - -%} - -\header{ - copyright = "public domain"; - source = "Ed. Henry Lemoine Urtext"; - title = "Pr\\\"aludum"; - opus = "BWV 940"; - composer = "Johann Sebastian Bach (1685-1750)"; - enteredby = "jcn,hwn"; - - % mutopia headers. - mutopiatitle = "Prelude"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV940"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Nov/14"; - -} - -\version "1.3.117"; +\version "1.3.98"; @@ -43,7 +15,7 @@ one = \context Staff \notes\relative c{ \stemBoth d16 a' g f e f cis d e8.-\mordent f16 d8.-\prall cis16 | - \stemUp + \stemUp\tieUp cis4 ~ cis16 a d8 ~ d4 a | %5 b2 ~ b4 a ~ | @@ -65,7 +37,7 @@ two = \context Staff \notes\relative c{ f2 e2 | \translator Staff=lower \stemUp r4 a, bes b | - \translator Staff=upper \stemDown + \translator Staff=upper \stemDown\tieDown r16 b' a g f8. f16 e2 ~ | %5 e2 ~ e4 ~ e16 e f! d | @@ -91,7 +63,7 @@ three = \context Staff \notes\relative c{ e8.-\mordent f16 d8.-\prall c16 \stemBoth c4. d8 | \stemDown e4 ~ e16 f e d cis a b cis d e f d | - \property Voice . textStyle = "finger" + \property Voice.TextScript \set #'font-style = #'finger bes!2 a ~ | a a | d, cis' | @@ -106,13 +78,15 @@ four = \context Staff \notes\relative c{ d2 cis | \skip 1*2; | \skip 4*3; - \translator Staff=upper \stemUp \property Voice.horizontalNoteShift = 1 + \translator Staff=upper \stemUp + \property Voice.NoteColumn \override #'horizontal-shift = #1 c''4 | %5 a gis ~ gis16 gis fis e \skip 4*1; - \translator Staff=lower \stemDown \property Voice.horizontalNoteShift = 0 - \stemUp + \translator Staff=lower \stemDown + \property Voice.NoteColumn \override #'horizontal-shift = #0 + \stemUp\tieUp b2 a | g a4. gis16 a | gis2 < g8 cis,> e4 | @@ -148,7 +122,8 @@ global = \notes{ } \midi{ \tempo 4 = 40; } \header{ - opus = "BWV 940"; + piece = \piece; + opus = \opus; } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly index 2136b74bf0..eb902adcfe 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly @@ -1,27 +1,7 @@ +\version "1.3.98" % This is the main score file of the Petites Preludes -\header{ -title = "Petites Pr\'eludes"; -% urg subtitle = "Clavierb\\"uchlein"; -subtitle = "Clavierbuechlein"; -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "public domain"; -maintainer = "Jan Nieuwenhuizen"; - - % mutopia headers. - mutopiatitle = "Petites Pr&aigueludes"; - mutopiacomposer = "J.S.Bach"; - mutopiaopus = "BWV924,939,999,925,926,940"; - mutopiainstrument = "Piano"; - style = "baroque"; - copyright = "Public Domain"; - tagline = "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by " + \maintainer + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - lastupdated = "1999/Oct/16"; - -} - +\include "header.ly"; \paper { linewidth = 18.0\cm; } diff --git a/scm/ascii-script.scm b/scm/ascii-script.scm index c0f0f8b79a..c2f45d67d5 100644 --- a/scm/ascii-script.scm +++ b/scm/ascii-script.scm @@ -1,3 +1,4 @@ +(debug-enable 'backtrace) ;;;; AsciiScript as (define (as-scm action-name) @@ -69,7 +70,7 @@ (func "h-line" dx)))))) (define (font-load-command name-mag command) - (func "load-font" (car name-mag) (magstep (cdr name-mag)))) + (func "load-font" (car name-mag) (cdr name-mag))) (define (header creator generate) (func "header" creator generate)) @@ -107,7 +108,7 @@ "Programming error: No such font known " (car name-mag-pair)))) "") ; issue no command - (func "select-font" (car font-name-symbol))))) + (func "select-font" (car name-mag-pair)))) (define (start-line height) (func "start-line" height)) @@ -139,7 +140,7 @@ (func "v-line" (* -1 h))) ""))) - (cond ((eq? action-name 'all-definitions) +(cond ((eq? action-name 'all-definitions) `(begin (define beam ,beam) (define bracket ,bracket) diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index bcb394ab3e..4475fd390c 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -87,7 +87,7 @@ ;;; Users may override in most cases, simply by issuing ;;; ;;; % from here on consider ending beam every 1 4 note -;;; \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4) +;;; \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 1 4) ;;; ;;; % no autobeaming ;;; \property Voice.beamAuto = ##f @@ -98,7 +98,7 @@ ;;; \translator{ ;;; \VoiceContext ;;; % consider ending beam at every 1 2 note -;;; autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2) +;;; autoBeamSettings \override #'(end * * * *) = #(make-moment 1 2) ;;; } ;;; } ;;; diff --git a/scm/lily.scm b/scm/lily.scm index f8b1a671ed..4172279e55 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -60,7 +60,7 @@ '("output-lib.scm" "tex.scm" "ps.scm" - ;; "ascii-script.scm" + "ascii-script.scm" )) (if (not standalone) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 0c0505f58b..c8a19658b7 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -550,6 +550,15 @@ if 1: conversions.append (((1,3,97), conv, 'ChordName -> ChordNames')) +if 1: + def conv (str): + str = re.sub ('\\\\property *Voice *[.] *textStyle *= *"([^"]*)"', '\\\\property Voice.TextScript \\\\set #\'font-style = #\'\\1', str) + str = re.sub ('\\\\property *Lyrics *[.] *textStyle *= *"([^"]*)"', '\\\\property Lyrics.LyricText \\\\set #\'font-style = #\'\\1', str) + + return str + + conversions.append (((1,3,98), conv, 'CONTEXT.textStyle -> GROB.#font-style ')) + if 1: def conv (str): str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str) @@ -738,7 +747,7 @@ from_version = () outfile_name = '' (options, files) = getopt.getopt ( - sys.argv[1:], 'o:f:t:seh', ['version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to']) + sys.argv[1:], 'o:f:t:seh', ['version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to=']) for opt in options: o = opt[0] -- 2.39.5