From 01fb5246d115b6cc5201ef0b1e3191c2c4b42ae1 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 22:24:07 +0000 Subject: [PATCH] lilypond-1.1.63 --- Documentation/topdocs/INSTALL.yo | 4 + NEWS | 38 +++++ TODO | 9 +- VERSION | 2 +- aclocal.m4 | 6 - buildscripts/ps-to-pfa.py | 139 ++++++++++-------- input/bugs/hinterfleisch-gone.ly | 12 ++ input/bugs/slur-minimum.ly | 9 ++ input/rhythm.ly | 2 +- lily/auto-beam-engraver.cc | 117 +++++++++------ lily/include/stem.hh | 1 + mf/GNUmakefile | 4 +- mf/feta-autometric.mf | 2 +- mf/feta-eindelijk.mf | 2 + mf/feta-generic.mf | 4 +- mf/feta-slag.mf | 4 + mf/feta.mp | 4 + .../Cembalo-Partitas/Partita_II_Sinfonia.ly | 2 +- mutopia/J.S.Bach/Petites-Preludes/GNUmakefile | 3 + .../J.S.Bach/Petites-Preludes/preludes-3.lym4 | 18 +-- mutopia/J.S.Bach/Petites-Preludes/preludes.ly | 5 +- .../Solo-Cello-Suites/allemande-urtext.ly | 57 ++++--- .../Solo-Cello-Suites/courante-urtext.ly | 55 ++++--- .../Solo-Cello-Suites/sarabande-urtext.ly | 49 +++--- mutopia/W.A.Mozart/horn-concerto-3.ly | 2 +- ps/lilyponddefs.ps | 2 +- stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 6 - stepmake/stepmake/metapost-rules.make | 10 +- stepmake/stepmake/metapost-targets.make | 4 +- stepmake/stepmake/toplevel-targets.make | 1 + stepmake/stepmake/yodl-rules.make | 3 +- 32 files changed, 341 insertions(+), 237 deletions(-) create mode 100644 input/bugs/hinterfleisch-gone.ly create mode 100644 input/bugs/slur-minimum.ly diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index 190b2bf382..63fc6e4c76 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -58,6 +58,10 @@ it()The geometry package for LaTeX is needed to use ly2dvi. Available at lurl(ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/supported/geometry) or at mirror site lurl(ftp://ftp.dante.de) + +it()MetaPost, if you want to use direct PostScript output. Please +note that tetex-0.4pl8 (included with Redhat 5.x) does not include +file(mfplain.mp), which is needed for producing the scaleable font files. ) diff --git a/NEWS b/NEWS index fbaecd7e79..df64243e3d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,41 @@ +pl 62.hwn1 + - ps-to-pfa.py: use std modules re, find + - minor input fixes + - use mfplain.mp + - Metapost does unfill with setgray. This confuses +GS. Do text substitution with eofill. + +pl 62.jcn3 + - bfs: preludes + - found more wierd spacing + +pl 62.jcn2 + - bf: don't start auto-beam on stem that contains only a rest + - bf: rm .ms yodl output + - bumped stepmake version + +pl 62.uu1 + - don't space rhythmic requests coming from Lyrics. + +pl 62.jcn1 + - bf: auto-beamer: consider starting beam based on new rhythmic head + - bfs: preludes-4, cello-suites + - \addlyricsified standchen and twinkle (ugh: \repeat and \addlyrics) + - bf: interstaff slur slope damping + - bf: in-band signaling slur snap + +pl 61.jbr1 + - Documentation/ntweb/GNUmakefile: Made EXTRA_DIST_FILE style fix and + added dist-plain target as dependency to the default target. + - scripts/ly2dvi.py: getpid does not behave very well across platforms + so I am creating temp file names with the Python tempfile module. + The generate lilypond dependency file option was broken and + is now operational. I also changed the dependency switch + from -d or -M to match lilypond. + - stepmake/bin/package-zip32.sh: Added build of ntweb html + documentation + +*********** pl 61.hwn2 - revise / junk various input files. - junk Music_list_iterator diff --git a/TODO b/TODO index 7a9ca6eefe..35ff2f3e24 100644 --- a/TODO +++ b/TODO @@ -12,9 +12,9 @@ Grep for TODO and ugh/ugr/urg. . * align left edge of broken (de)cresc/slur/tie/tuplet/volta . * auto-staff-switching. . * broken examples: -mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly -mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly -mutopia/J.S.Bach/Solo-Cello-Suites/* +input/star-spangled-banner.ly: hw? +mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly? hw? +mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly: hw: slurs + autobeamer ? mutopia/Coriolan/* . * spacing of accidentals @@ -30,7 +30,7 @@ mutopia/Coriolan/* . * PostScript . * half notes in pfa . * We need feta-din*.mf files for more sizes than 10. -. * fix dynamics decently, ie. use kerning & ligatures. +. * fix dynamics decently, ie. use kerning & ligatures. .* Cleanups needed . * \$ and $ identifier syntax in examples. @@ -555,3 +555,4 @@ hesitate to ask. (require 'allout) (outline-init 't) + diff --git a/VERSION b/VERSION index 95b14773b2..f64a357ccb 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=62 +PATCH_LEVEL=63 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/aclocal.m4 b/aclocal.m4 index ace44c49b3..602d77213a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2,12 +2,6 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in diff --git a/buildscripts/ps-to-pfa.py b/buildscripts/ps-to-pfa.py index cf4e374b10..f1d4d8c38b 100644 --- a/buildscripts/ps-to-pfa.py +++ b/buildscripts/ps-to-pfa.py @@ -9,10 +9,11 @@ #TODO. This could be more efficient. name = 'ps-to-pfa' -version = '0.3' +version = '0.4' datadir = '' +import find import os import sys @@ -90,78 +91,94 @@ def header (f): f.write ('%!PS-AdobeFont-3.0: ' + font_name + '\n') f.write ('%%%%Creator: %s-%s\n' % (name, version)) f.write ('\n') - f.write ('/setgray { 1 add } bind def\n' - '\n' -'8 dict begin\n' -'/FontType 3 def %% Required elements of font\n' -'/FontName /%s def\n' -'/FontMatrix [.001 0 0 .001 0 0] def\n' -'%%/FontMatrix [.01 0 0 .01 0 0] def\n' -'%%/FontMatrix [0.1 0 0 0.1 0 0] def\n' -'%%/FontBBox [-1000 -1000 1000 1000] def\n' -'/FontBBox [-3000 -3000 3000 3000] def\n' -'%%/FontBBox [-300 -300 300 300] def\n' -'%%/FontBBox [-30 -30 30 30] def\n' -'\n' -'/Encoding 256 array def %% Trivial encoding vector\n' -'0 1 255 {Encoding exch /.notdef put} for\n' % (font_name)) - + f.write (r""" +8 dict begin +/FontType 3 def %% Required elements of font +/FontName /%s def""" % font_name) + f.write (r""" +/FontMatrix [.083 0 0 .083 0 0] def %% why .83? +/FontBBox [-1000 -1000 1000 1000] def %% does not seem to matter. +/Encoding 256 array def %% Trivial encoding vector +0 1 255 {Encoding exch /.notdef put} for +""") def footer (f): - f.write ('\n' -'/BuildGlyph { % Stack contains: font charname\n' -'% 1000 0 % Width\n' -'% -1000 -1000 1000 1000 % Bounding Box\n' -'% -750 -750 750 750 % Bounding Box\n' -'% -750 -750 750 750 % Bounding Box\n' -' 3000 0 % Width\n' -' -3000 -3000 3000 3000 % Bounding Box\n' -'% 300 0 % Width\n' -'% -300 -300 300 300 % Bounding Box\n' -'% 30 0 % Width\n' -'% -30 -30 30 30 % Bounding Box\n' -' setcachedevice\n' -' exch /CharProcs get exch % Get CharProcs dictionary\n' -' 2 copy known not {pop /.notdef} if % See if charname is known\n' -' get exec % Execute character procedure\n' -'} bind def\n' -'\n' -'/BuildChar { % Level 1 compatibility\n' -' 1 index /Encoding get exch get\n' -' 1 index /BuildGlyph get exec\n' -'} bind def\n' -'\n' -'currentdict\n' -'end % of font dictionary\n') - f.write ('\n') + f.write (r""" +/BuildGlyph { % Stack contains: font charname + 1000 0 % Width + -1000 -1000 1000 1000 % Bounding Box + setcachedevice + exch /CharProcs get exch % Get CharProcs dictionary + 2 copy known not {pop /.notdef} if % See if charname is known + get exec % Execute character procedure +} bind def + +/BuildChar { % Level 1 compatibility + 1 index /Encoding get exch get + 1 index /BuildGlyph get exec +} bind def + +currentdict +end % of font dictionary +""" +) + f.write ('/%s\n' % font_name) f.write ('' 'exch definefont pop % Define the font\n') + +suspect_re = re.compile ('closepath (.*?) 1 setgray newpath (.*?) closepath fill') + def characters (f): - #urg - # chars = os.listdir () - # chars.sort () sys.stderr.write ('[') - pipe = os.popen ('/bin/ls -1 ' + font_name + '.[0-9] ' + font_name + '.[0-9][0-9] ' + font_name + '.[0-9][0-9][0-9] 2> /dev/null') - chars = [] - i = pipe.readline () - while i: - chars.append (i[0:len (i)-1]) - i = pipe.readline () - f.write ('\n' -'/CharProcs 3 dict def % Subsidiary dictiorary for\n' -'CharProcs begin % individual character definitions\n') + + files = [] + import find # q + suffixes = [".[0-9]", ".[0-9][0-9]", ".[0-9][0-9][0-9]"] + for suf in suffixes: + files = files + find.find (font_name + suf) + + + # concat all files into charprocs. charprocs = ' /.notdef {} def\n' encoding = '' - for i in chars: + for i in files: s = gulp_file (i) - s = regsub.gsub ('^%.*\n', '', s) - s = regsub.gsub ('^showpage\n', '', s) - s = regsub.gsub ('^', ' ', s) - n = atoi (regsub.gsub ('.*\.', '', i)) + s = re.sub ('%[^\n]*\n', '', s) + + # if you want readable stuff, look at MP output. + s = re.sub ('[\n\t ]+', ' ', s) + s = re.sub ('showpage', '', s) + + # MP's implementation of unfill confuses GS. + # Look for "Metapost & setgray" on deja.com + # we do some twiddling to use eofill i.s.o. fill + if re.search ('setgray',s ): + m = suspect_re.search (s) + while m: + fill = m.group (1) + path = m.group (2) + + # be complicated, in case of gsave/grestore. + # vill as quick hack to avoid duple substitutions. + fill = re.sub ('fill', 'eovill', fill, count = 1) + s = re.sub (m.group (0), ' %s %s ' % (path, fill), s) + m = suspect_re.search (s) + + s = re.sub ('eovill' , 'eofill', s) + s = re.sub ('0 setgray' ,'', s) + + + m = re.match ('.*\.([0-9]+)',i) + n = atoi (m.group (1)) + s = '\n /%s-%d{\n%s} bind def\n' % (font_name, n, s) encoding = encoding + 'Encoding %d /%s-%d put\n' % (n, font_name, n) charprocs = charprocs + s + + f.write ('\n' +'/CharProcs 3 dict def % Subsidiary dictiorary for\n' +'CharProcs begin % individual character definitions\n') f.write (charprocs) f.write ('\n') f.write ('end % of CharProcs\n') @@ -176,5 +193,5 @@ characters (ps_file) footer (ps_file) sys.stderr.write ('\n') ps_file.close () -sys.stderr.write ('Wrote PostScript font: %s\n'% output_name) +sys.stderr.write ('Wrote PostScript font: %s\n' % output_name) diff --git a/input/bugs/hinterfleisch-gone.ly b/input/bugs/hinterfleisch-gone.ly new file mode 100644 index 0000000000..2a51746a62 --- /dev/null +++ b/input/bugs/hinterfleisch-gone.ly @@ -0,0 +1,12 @@ +% jij had zoon mooi tight spacing example, +% kan zo'n harde space ook niet voor en na maatstreep! +\score { + \notes \relative c'' { + \time 2/4; + \property Voice.beamAuto=0 + a4 a8 + a32 a a a +} +%set bit wide +\paper {linewidth = 100.\mm;} +} diff --git a/input/bugs/slur-minimum.ly b/input/bugs/slur-minimum.ly new file mode 100644 index 0000000000..287ca4faba --- /dev/null +++ b/input/bugs/slur-minimum.ly @@ -0,0 +1,9 @@ +% slur minimum length too long, or what happened? +\score { + \notes \relative c'' { + c8()c c()c + c()c c()c +} +%set very tight +\paper {linewidth = 40.\mm;} +} diff --git a/input/rhythm.ly b/input/rhythm.ly index 98af477f45..a3217d5daf 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -36,7 +36,7 @@ ritme = \notes\transpose c'' { another = - \relative c'' \notes{ \time 6/4; + \notes \relative c'' { \time 6/4; c1. c1. \time 4/4;c4 c4 c4 c4 c1 c1 c1 } diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index fcf83877e2..672da02f63 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -294,58 +294,87 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info) { end_beam (); } - else if (Stem* stem_l = dynamic_cast (info.elem_l_)) + } + + if (Stem* stem_l = dynamic_cast (info.elem_l_)) + { + Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); + if (!rhythmic_req) { - Rhythmic_req *rhythmic_req = dynamic_cast (info.req_l_); - if (!rhythmic_req) - { - programming_error ("Stem must have rhythmic structure"); - return; - } - - if (stem_l->beam_l_) - { - junk_beam (); - return ; - } - - /* - now that we have last_add_mom_, perhaps we can (should) do away - with these individual junk_beams - */ + programming_error ("Stem must have rhythmic structure"); + return; + } + +#if 0 + /* + Don't (start) auto-beam over empty stems. + ugly check for rests! + --> doesn't even work: stem-dir is not set + + ../flower/include/drul-array.hh:26: Real & Drul_array::elem(enum Direction): Assertion `d==1 || d== -1' failed. +/home/fred/root/usr/scripts/src/out/Linux/li: line 8: 14641 Aborted (core dumped) lilypond $opts + + */ + if (stem_l->extent (Y_AXIS).empty_b ()) + { + if (stem_l_arr_p_) + end_beam (); + return; + } +#else + if (!stem_l->head_l_arr_.size ()) + { + if (stem_l_arr_p_) + end_beam (); + return; + } +#endif - int durlog =rhythmic_req->duration_.durlog_i_; - if (durlog <= 2) + if (stem_l->beam_l_) + { + if (stem_l_arr_p_) + junk_beam (); + return ; + } + + /* + now that we have last_add_mom_, perhaps we can (should) do away + with these individual junk_beams + */ + + int durlog =rhythmic_req->duration_.durlog_i_; + if (durlog <= 2) + { + if (stem_l_arr_p_) end_beam (); - else + return; + } + + /* + if shortest duration would change + reconsider ending/starting beam first. + */ + Moment mom = rhythmic_req->duration_.length_mom (); + consider_end_and_begin (mom); + if (!stem_l_arr_p_) + return; + if (mom < shortest_mom_) + { + if (stem_l_arr_p_->size ()) { - /* - if shortest duration would change - reconsider ending/starting beam first. - */ - Moment mom = rhythmic_req->duration_.length_mom (); - consider_end_and_begin (mom); + shortest_mom_ = mom; + consider_end_and_begin (shortest_mom_); if (!stem_l_arr_p_) return; - if (mom < shortest_mom_) - { - if (stem_l_arr_p_->size ()) - { - shortest_mom_ = mom; - consider_end_and_begin (shortest_mom_); - if (!stem_l_arr_p_) - return; - } - shortest_mom_ = mom; - } - Moment now = now_mom (); - - grouping_p_->add_stem (now - beam_start_moment_ + beam_start_location_, durlog - 2); - stem_l_arr_p_->push (stem_l); - last_add_mom_ = now; - extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom (); } + shortest_mom_ = mom; } + Moment now = now_mom (); + + grouping_p_->add_stem (now - beam_start_moment_ + beam_start_location_, durlog - 2); + stem_l_arr_p_->push (stem_l); + last_add_mom_ = now; + extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom (); } } diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 9f8fb0a7e3..4a59ac6911 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -48,6 +48,7 @@ class Stem : public Item, public Staff_symbol_referencer { */ Drul_array yextent_drul_; +public: // urg, autobeamer needs to know if there are (only) rests here? Link_array head_l_arr_; Link_array rest_l_arr_; diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 44946caef7..21c285a5a4 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -4,7 +4,9 @@ depth = .. STEPMAKE_TEMPLATES=metafont metapost install install-out -EXTRA_DIST_FILES += README feta.mp mfplain.ini +EXTRA_DIST_FILES += README feta.mp + +# wtf is feta.mp ? FET_FILES = $(wildcard feta[0-9]*.mf) diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf index 27703e2686..97d88a6bc8 100644 --- a/mf/feta-autometric.mf +++ b/mf/feta-autometric.mf @@ -113,7 +113,7 @@ enddef; def breapth_endchar = scantokens extra_endchar; if proofing > 0: makebox_with_breapth(proofrule); fi - chardx := 10*(w + b); +% chardx := 10*(w + b); shipit; endgroup enddef; diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index fc2996b1ae..96a9249eb4 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -107,6 +107,8 @@ fet_beginchar("longa rest", "-2", "longarest"); draw_block ((0,-breve_rest_y), (breve_rest_x, breve_rest_y)); fet_endchar; +tracingvariables := 1; + fet_beginchar("multi rest", "-4", "multirest"); set_char_box(multi_rest_x#, multi_rest_x#, breve_rest_y#, breve_rest_y#); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index a50866f73a..b1cdd49fbc 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -35,9 +35,9 @@ if test = 0: input feta-klef; input feta-timesig; else: - input feta-bolletjes; +% input feta-bolletjes; % input feta-banier; -% input feta-eindelijk; + input feta-eindelijk; % input feta-klef; % input feta-toevallig; % input feta-schrift; diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 625c7e0dd3..413ecf5b9e 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -119,6 +119,10 @@ fet_endchar; input feta-sleur; +% +% URG. The attached slurs look weird, and discontinuous in their connection to the +% main part. --hwn + fet_beginchar("upprall", "upprall", "upprall") % trills := 4; trills := 3; diff --git a/mf/feta.mp b/mf/feta.mp index 7f0c80c8b4..fb0fb32c68 100644 --- a/mf/feta.mp +++ b/mf/feta.mp @@ -1,3 +1,7 @@ +% +% What's this ? --hwn +% + % feta.mp batchmode; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 41b4496d43..597e706039 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -234,7 +234,7 @@ allegroEn = \notes\relative c''{ c4~ [c16 g' des c] [bes es bes as] | [g as bes c] [des8 bes] g'4~ | [g8 c,16 bes] [as f' bes, as] [g des' g, f] | - [e f g as] [bes8 g] [e'.-\prallprall d32 e] | + [e f g as] [bes8 g] [e'8.-\prallprall d32 e] | %78 [f8 f,16 g] [as8 bes c d] | [es16 d c d] [es8 f g as] | diff --git a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile index e1d72d7d30..4bd2ddbf9c 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile +++ b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile @@ -4,6 +4,9 @@ depth = ../../.. EXTRA_DIST_FILES= +LILYINCLUDE:=$(LILYINCLUDE):out +export LILYINCLUDE + examples=preludes-2 LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 index fb7f748af2..234732a3d5 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 @@ -20,8 +20,8 @@ copyright = "public domain"; \version "1.1.60"; -upper = \type Staff \notes \transpose c'' { - \type Voice=i +upper = \context Staff \notes \transpose c'' { + \context Voice=i \property Voice . textstyle = "italic" %# s(^c@ ^es@ ^g@ ^\p(\<@ ^\!@ ^)\!@ ^\>@) t(c,es,g,^\p(\<@,\!,^)\!@,\>) @@ -79,15 +79,15 @@ upper = \type Staff \notes \transpose c'' { s(fis` c es) s(fis` c es) r16 [g`(\< b` d] [b` g` b` d] [es c a` \!fis] | - < - {\stemup ) g2.-\fermata\mf} - \type Voice=ii {\stemdown } + \context Staff < + \context Voice=i {\stemup ) g2.-\fermata\mf} + \context Voice=ii {\stemdown } > \stemboth \bar "|."; } -lower = \type Staff \notes{ +lower = \context Staff \notes{ % c4 r [g8-.(\ped )es-.\*] | c4 r [g8-.( )es-.] | c4 r [g8-.( )es-.] | @@ -155,12 +155,12 @@ global = \notes{ \score{ % Semplice e non troppo legato - \type GrandStaff < - \type Staff = upper < + \context GrandStaff < + \context Staff = upper < \global \upper > - \type Staff = lower < + \context Staff = lower < \global \clef "bass"; \lower diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes.ly index 6fd6068dcf..d397df5f55 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes.ly @@ -1,7 +1,7 @@ \header{ filename = "preludes.ly"; % mmm -title = "DOUZE PETITES PR\\'ELUDES"; +title = "Petites Pr\'eludes"; % urg subtitle = "Clavierb\\"uchlein"; subtitle = "Clavierbuechlein"; composer = "Johann Sebastian Bach (1685-1750)"; @@ -11,8 +11,7 @@ copyright = "public domain"; \include "preludes-1.ly" \include "preludes-2.ly" -% urg, still broken -% \include "preludes-3.ly" +\include "preludes-3.ly" \include "preludes-4.ly" \include "preludes-5.ly" \include "preludes-6.ly" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index fdfdf76f8b..622ccb12fd 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -7,12 +7,6 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -n = { \slurnormal } -d = { \slurdotted } -comma = "\\sethuge\\ \\ ," - -phrasingcomma = { } % { \bar "empty"; \mark "'"; \nobreak } - allemande_a = \context Staff \notes \relative c { \context Voice=i \stemup @@ -21,48 +15,45 @@ allemande_a = \context Staff \notes \relative c { g()f e()d d()cis d()e a,8 bes16()g | f( a )d f, e8 cis' \stemup d8. e16 \stemboth f g a bes! | %3 - \stemup c8 \n d16()es \stemboth d()c bes()a c()bes a()g d'8. f,16 | - e( g )bes d c()bes a()g \n bes()a g()f + \stemup c8 d16()es \stemboth d()c bes()a c()bes a()g d'8. f,16 | + e( g )bes d c()bes a()g bes()a g()f < f8. a> | % urg fix - b \n f( e )d e \d cis'( d )cis \stemup d8.( )e16 \stemboth - \n f( e d)e | + b f( e )d e cis' d cis \stemup d8. e16 \stemboth + f( e d)e | %6 d( c b )c b( a gis)a gis8-\prall fis16()e e' c( a )g | \stemup e' a, f d d f d b \stemboth - gis( b e )gis \d b( d c )b | + gis( b e )gis b d c b | %8 - \n c( a f )e d( f e )d gis8.-\trill()a16 \d b d e,()d | + c( a f )e d( f e )d gis8.-\trill()a16 b d e, d | % urg - c( e a)d \stemup b8.-\trill a16 a8 s4 s8 \stemboth | + c e a d \stemup b8.-\trill a16 a8 s4 s8 \stemboth | %10 d,!16 gis( a b a gis fis )e \stemup e8 f16()e \stemboth d()c b()a | - \stemup d8 e16()f \stemboth\d e()d c()b + \stemup d8 e16()f \stemboth e d c b \stemup d'16()b c()a \stemboth e8 gis | - a,8. cis16 e g!( f! )e f( a )d gis, a8. + a,8. cis16 e g! f! e f a d gis, [ a8. ] %13 e16 \stemup e8. f16 \stemboth - \n g!()e f()a \n cis,( d )e bes a8.-\trill()g16 | - f a'(f)d g \n b,()cis a' g(f e)d fis d()es c( | + g!()e f()a cis,( d )e bes a8.-\trill()g16 | + f a'(f)d g b,()cis a' g(f e)d fis d()es c( | %15 )bes g'(a, )g fis a d c' bes(fis)g bes d()a bes()g | - es(d)es g c()a bes()g \d d(c)d g \n bes()fis g()es | + es(d)es g c()a bes()g d c d g bes()fis g()es | %17 - \n c(bes)c bes' a(c)es g, \stemup fis8-\trill\d g16()a \stemboth - d,8 es16()c | - bes(d )g bes, d,8 fis' \stemup g8. a16 \stemboth bes d g, f | + c(bes)c bes' a(c)es g, \stemup fis8-\trill g16 a \stemboth + d,8 es16 c | + bes d g bes, d,8 fis' \stemup g8. a16 \stemboth bes d g, f | %19 - \stemup e8.-\trill()f16 \stemboth g()e c()bes - \n a()f' g,()f e g'( a )bes | - % :-( - % bes( a g )f^\comma - bes( a g )f \phrasingcomma + \stemup e8.-\trill f16 \stemboth g e c bes + a()f' g,()f e g'( a )bes | + bes( a g )f a()e f()d bes d(f)a d()a bes()g | %21 - a,(\n)g'(\n cis())d e()g, a()e f()d bes()d \d gis, f'(e)d | - % \n d( cis b )a^\comma c(a)fis d' c a( b )d - \n d( cis b )a \phrasingcomma %^"\\sethuge\\ \\ ," + a,()g'cis()d e()g, a()e f()d bes()d gis, f' e d | + d( cis b )a c(a)fis d' c a( b )d f!(d )gis, d' | %23 @@ -85,12 +76,14 @@ allemande_b = \notes \relative c { s1 | f!16 s16*3 b, s16*3 s2 | s1 | - s4 e dis8 ~ dis32 e( fis gis a b c d! c b c )a | + \property Voice.slurVerticalDirection=1 + s4 e [dis8 ~ dis32 e( fis gis] [a b c d! c b c )a] | + \property Voice.slurVerticalDirection=0 %10 s2 s8 s4 | s8 s4 s8 s4 | s2 s4 s8. - s16 | + s16 s8 s2. | %15 s1*3 | @@ -106,4 +99,4 @@ allemande = \context Staff \notes< > -\version "1.1.52"; +\version "1.1.55"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index 65793d7931..123c6de140 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -7,55 +7,50 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -n = { \slurnormal } -d = { \slurdotted } - courante_a = \context Staff \notes \relative c { \context Voice=i d'16 | - d a f a d, f g a \d bes()a bes()g | - \stemup s4 \stemboth \d g16()f g()e | + d a f a d, f g a bes a bes g | + \stemup s4 \stemboth g16 f g e | % urg, a good case for mean-distance-beam-dir-algorithm! - f()d e()c! \n bes(a)bes a' g f e d | + f d e c! bes(a)bes a' g f e d | %4 - % cis e \n a,(\d(b cis d e f )g )bes-- a e | - cis e \n a,(b cis d e f )g bes-- a e | - % f a \n d,(\d( e f g a bes )c )bes-- d c | - f a \n d,( e f g a bes )c bes-- d c | - \n\stemup ~ < c16 f,> bes a g \stemboth f()es d()es | + cis e a,(b cis d e f )g bes-- a e | + f a d,( e f g a bes )c bes-- d c | + \stemup ~ < c16 f,> bes a g \stemboth f()es d()es | %7 d bes(a)bes d bes e! bes f' bes, g' bes, | - \d e,( g )c d e f g a bes()a bes()g | - \n a f(e)f a f bes f c' f, d' f, | + e, g c d e f g a bes a bes g | + a f(e)f a f bes f c' f, d' f, | %10 cis( e )a b cis d e f g()f g()e | - d,( a' )f' e \n d()c d()c b()a b()a | - \n gis( a )b e, \n f()e f()d e()c d()b | + d,( a' )f' e d()c d()c b()a b()a | + gis( a )b e, f()e f()d e()c d()b | %13 - \n c a'( b c b a gis)a d, a' e a | + c a'( b c b a gis)a d, a' e a | f a( b c b a gis)a f a e a | dis, a'( b c b a gis)a e a e gis | - a e cis e a, cis e gis a8. - e'16 | + a e cis e a, cis e gis [ a8. ] + e'16 %17 e cis a cis e, f g a bes()g cis()g | \stemup d'4 ~ d16 a d e f d a c! \stemboth | - \n b16 f(d)f \d g, d'(f)g b f d' f, | + b16 f(d)f g, d' f g b f d' f, | %20 - e g c,(d e f g a )bes! d c g | + e g c, d e f g a bes! d c g | \stemup a s16*3 s4 s4 d, ~ d16 e! f g \stemboth a bes c d | %23 - e, bes(a)g a f' \n g,()f \d c()g' f' e | - f a( bes a g f e )f g e f d | + e, bes a g a f' g,()f c g' f' e | + f a bes a g f e f g e f d | cis g' b, g' a, g' b, g' cis, g' a, g' | %26 f d f a d a d e f a, f d | - g, d'(g)a bes g' a, f' g, e' f, d' | - \n cis(d)e cis a cis bes cis a cis g cis | + g, d' g a bes g' a, f' g, e' f, d' | + cis(d)e cis a cis bes cis a cis g cis | %29 - \n f, d'(e f e d cis)d g, d' a d | - \d bes d(e f e d cis)d bes d a d | + f, d'(e f e d cis)d g, d' a d | + bes d e f e d cis d bes d a d | gis, d'(e f e d cis)d a d a cis | d a f a d, f a, d d,8. @@ -67,20 +62,22 @@ courante_b = \notes \relative c { s16 | s2. | %2 - \n cis4 ~ cis16 d e f s4 | + cis4 ~ cis16 d e f s4 | s2.*3 | %6 a,4 s2 s2.*9 % 16 s2 s8. - s16 | + s16 s2. %18 f'4 s s | s2.*2 %21 + \property Voice.slurVerticalDirection=1 f16 c'(bes a g f es d )es c' f, es | + \property Voice.slurVerticalDirection=0 bes4 s s s2.*9 s2 s8. @@ -91,4 +88,4 @@ courante = \context Staff \notes< \$courante_b > -\version "1.1.52"; +\version "1.1.55"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index ead13666a5..c47147d957 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -7,45 +7,42 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -n = { \slurnormal } -d = { \slurdotted } - sarabande_a = \context Staff \notes \relative c { \context Voice=i - \stemup \d d8.()e16 e4.-\trill( d16 )e | - f4. \stemboth e8(d)c | - bes g' \n f e16(f g a bes)d, | - cis4.-\trill\d b8(a)g | + \stemup d8. e16 e4.-\trill d16 e | + f4. \stemboth e8 d c | + [bes g'] f e16(f g a bes)d, | + cis4.-\trill b8 a g | % copy bar 1, half bar 2 - \stemup \d d'8.()e16 f4.-\trill( d16 )e | + \stemup d'8. e16 f4.-\trill d16 e | %5 - f4. \stemboth d8(e)f | - \n g bes16()a c()bes a()g d'8 f, | - \stemup e4.-\trill \stemboth \d d8(c)bes | + f4. \stemboth d8 e f | + g bes16()a c()bes a()g d'8 f, | + \stemup e4.-\trill \stemboth d8 c bes | %8 - \stemup \n f' g16()a a4. g16()f | + \stemup f' g16()a a4. g16()f | g8 a16()bes bes4. c16()d | % 11 - \stemboth \d e,8()f c, g' f'()e | + \stemboth e,8 f c, g' f' e | f4 f,2 | - \stemup a'4 \d a4.-\trill()bes8 | - c bes16()a \stemboth fis8.-\trill()es16 d8()c | - bes g' a, fis' es'()d | + \stemup a'4 a4.-\trill bes8 | + c bes16 a \stemboth fis8.-\trill es16 d8 c | + bes g' a, fis' es' d | %16 - \stemup bes4.-\trill \stemboth a8(g)f! | - e bes()a f'(g)a | - d, as()g es'(f)g | - cis, bes' a g16()f e!8 f16()d | - cis8 e16()a a,8. g'16 \n f8()e | + \stemup bes4.-\trill \stemboth a8 g f! | + e bes a f' g a | + d, as g es' f g | + cis, bes' a g16 f e!8 f16 d | + cis8 e16 a a,8. g'16 f8()e | %21 \stemup d e16()f f4. e16()d | e8 f16()g g4. a16()bes | - \d a8 cis16()d d,8 e16(f32)g f8-\trill \n e16()d | + a8 cis16 d d,8 e16 f32 g f8-\trill e16()d | d4 d,16 a'( b cis d e f )g | %25 a(b c)b c4. b16()a | - \d b(cis d )cis d4. \n e16()f | - \stemboth d(cis)d f, a,8 e' \d d'()cis | + b cis d cis d4. e16()f | + \stemboth d(cis)d f, a,8 e' d' cis | d4 d,,2 | } @@ -70,7 +67,7 @@ sarabande_b = \context Staff \notes \relative c { %10 bes4 | s2.*2 | - \d f'8()es es4. r8 | + f'8 es es4. r8 | d4 s2 | %15 s2. | @@ -92,4 +89,4 @@ sarabande = \context Staff \notes< \$sarabande_b > -\version "1.1.52"; +\version "1.1.55"; diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly index e10794f19c..4987ce2aaf 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3.ly @@ -16,7 +16,7 @@ allegro = \relative c' { \time 4/4; - \partial 4; + r4 | R1*4 c'2^"tutti" g c, r diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps index a1a0d94f90..9a1bc6b629 100644 --- a/ps/lilyponddefs.ps +++ b/ps/lilyponddefs.ps @@ -1,7 +1,7 @@ %!PS-Adobe-1.0: lilyponddefs % hmm -/setgray { 1 add } bind def +% /setgray { 1 add } bind def /stafflinethickness mudelapaperstaffline def /staffheight mudelapaperstaffheight def diff --git a/stepmake/VERSION b/stepmake/VERSION index 0583295050..26f5b35fe0 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=77 +PATCH_LEVEL=78 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index a86a37f121..d579266f49 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,11 +1,5 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make index 525777d6f9..8c73b296e0 100644 --- a/stepmake/stepmake/metapost-rules.make +++ b/stepmake/stepmake/metapost-rules.make @@ -6,8 +6,14 @@ # -$(METAPOST) "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<" # -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<" -$(outdir)/%.0: %.mf - -$(METAPOST) "&mfplain \mode=lowres; \mag=30.0; batchmode; input $<" +$(outdir)/%.0: %.mf mfplain.mem + -$(METAPOST) "&mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<" + + + +mfplain.mem: mfplain.ini + $(INIMETAPOST) mfplain.ini + $(outdir)/%.pfa: $(outdir)/%.0 $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py --output $(basename $<).pfa $< diff --git a/stepmake/stepmake/metapost-targets.make b/stepmake/stepmake/metapost-targets.make index fb013f244f..c90fd062bb 100644 --- a/stepmake/stepmake/metapost-targets.make +++ b/stepmake/stepmake/metapost-targets.make @@ -1,5 +1,3 @@ -pfa: mfplain.mem $(PFA_FILES) -mfplain.mem: mfplain.ini - $(INIMETAPOST) mfplain.ini +pfa: $(PFA_FILES) diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make index 5f4602b707..daf0e7c8da 100644 --- a/stepmake/stepmake/toplevel-targets.make +++ b/stepmake/stepmake/toplevel-targets.make @@ -3,6 +3,7 @@ local-dist: configure +# urg!: this gets into every package (ie: yodl) local-distclean: rm -f config.h config.hh config.make Makefile GNUmakefile \ config.cache config.status config.log index.html \ diff --git a/stepmake/stepmake/yodl-rules.make b/stepmake/stepmake/yodl-rules.make index 66598c81ad..3c0099560c 100644 --- a/stepmake/stepmake/yodl-rules.make +++ b/stepmake/stepmake/yodl-rules.make @@ -24,5 +24,4 @@ $(outdir)/%.texinfo: %.yo $(outdir)/%.txt: %.yo # $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $< $(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< > $@ -# rm -f $(basename $<).ms - + rm -f $(basename $<).ms -- 2.39.5