From 633bc1bf0b705e17df83311e3c90b289f087d726 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 13 May 1998 15:53:19 +0200 Subject: [PATCH] release: 0.1.64 --- .dstreamrc | 25 ++- AUTHORS.txt | 4 +- Documentation/INSTALL.pod | 19 ++ Documentation/Makefile | 23 +-- Documentation/index.pod | 8 +- .../{vocabulary-data => vocabulary.data} | 2 +- INSTALL.txt | 98 +++++----- NEWS | 25 +++ PATCHES.txt | 6 +- TODO | 10 +- VERSION | 2 +- bin/ly2dvi.sh | 1 + bin/table-to-html.py | 92 +++++++++ init/paper.ly | 2 +- init/params.ly | 13 ++ input/bugs/beam-length.ly | 12 ++ input/bugs/tie-bug.ly | 13 ++ input/test/Makefile | 2 +- lib/include/source-file.hh | 2 +- lib/source-file.cc | 14 +- lily/VERSION | 2 +- lily/beam.cc | 65 +++++-- lily/stem-info.cc | 39 ++-- make/Docrules.make | 18 +- make/Rules.make | 4 + make/Targets.make | 15 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mutopia/J.S.Bach/Makefile | 6 +- mutopia/J.S.Bach/allemande-alto.ly | 7 +- mutopia/J.S.Bach/allemande-cello.ly | 7 +- mutopia/J.S.Bach/allemande-urtext.ly | 95 +++++++--- mutopia/J.S.Bach/courante-alto.ly | 7 +- mutopia/J.S.Bach/courante-cello.ly | 9 +- mutopia/J.S.Bach/courante-urtext.ly | 43 ++--- mutopia/J.S.Bach/menuetto-alto.ly | 3 +- mutopia/J.S.Bach/menuetto-cello.ly | 1 + mutopia/J.S.Bach/menuetto-urtext.ly | 7 +- mutopia/J.S.Bach/prelude-urtext.ly | 48 +++-- mutopia/J.S.Bach/preludes-1.ly | 84 ++++----- mutopia/J.S.Bach/preludes-2.ly | 58 +++--- mutopia/J.S.Bach/preludes-3.ly.m4 | 177 ------------------ mutopia/J.S.Bach/preludes-4.ly | 78 ++++---- mutopia/J.S.Bach/preludes-5.ly | 32 ++-- mutopia/J.S.Bach/preludes-6.ly | 12 +- mutopia/J.S.Bach/preludes.ly | 17 ++ mutopia/J.S.Bach/preludes.tex | 63 ------- mutopia/J.S.Bach/sarabande-alto.ly | 1 + mutopia/J.S.Bach/sarabande-cello.ly | 1 + mutopia/J.S.Bach/sarabande-urtext.ly | 45 +++-- mutopia/J.S.Bach/scs-paper.ly | 3 +- mutopia/J.S.Bach/scsii-alto.ly | 2 - mutopia/J.S.Bach/scsii-cello.ly | 2 - mutopia/J.S.Bach/solo-cello-suite-ii.ly | 1 - mutopia/J.S.Bach/wtk1-fugue1.ly | 34 ++-- mutopia/J.S.Bach/wtk1-prelude1.ly | 36 ++-- mutopia/W.A.Mozart/horn-concerto-3.ly | 9 +- tex/lilyponddefs.tex | 18 +- tex/titledefs.tex | 18 +- 60 files changed, 780 insertions(+), 680 deletions(-) rename Documentation/{vocabulary-data => vocabulary.data} (100%) create mode 100755 bin/table-to-html.py create mode 100644 input/bugs/beam-length.ly create mode 100644 input/bugs/tie-bug.ly delete mode 100644 mutopia/J.S.Bach/preludes-3.ly.m4 create mode 100644 mutopia/J.S.Bach/preludes.ly delete mode 100644 mutopia/J.S.Bach/preludes.tex diff --git a/.dstreamrc b/.dstreamrc index 7d088d518c..253955b01d 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -8,6 +8,7 @@ InitParser 1 Parser 1 InitDeclarations 1 Declarations 1 +yyparse 1 # FlexLexer debug InitLexer 1 Lexer 1 @@ -22,10 +23,11 @@ Matrix 1 Vector 1 # lily +Absolute_dynamic_req 1 Atom 1 Axis_group_administration 1 Bar 1 -Beam 1 +Beam 0 Bow 1 Bezier_bow 1 Change_iterator 1 @@ -38,15 +40,19 @@ Colinfo 1 Colinfo 1 Collision 1 Column_rod 1 +Duration_identifier 1 Engraver 1 Engraver_group_engraver 1 +General_script_def 1 Graphical_element 1 Group_change_req 1 Head_column 1 Horizontal_align_item 1 Idealspacing 1 +Identifier 1 Ineq_constrained_qp 1 Input_translator 1 +int_identifier 1 Item 1 Key_item 1 Lookup 1 @@ -55,26 +61,28 @@ Melodic_req 1 Midi_def 1 Midistrings 1 Mixed_qp 1 -Music 0 +Music 1 Music_iterator 1 Music_output_def 1 Note_column 1 Note_head 1 Note_performer 1 -Note_req 0 +Note_req 1 Paper_column 1 Paper_score 1 Paper_def 1 Performer 1 Performer_group_performer 1 +Real_identifier 1 Request 1 Request_iterator 1 Rest_collision 1 Rest_collision_engraver 1 Rest_req 1 -Rhythmic_head 0 -Rhythmic_req 0 -Score 0 +Rhythmic_head 1 +Rhythmic_req 1 +Scope 1 +Score 1 Score_column 1 Score_elem 1 Score_engraver 1 @@ -86,13 +94,16 @@ Single_malt_grouping_item 1 Slur 1 Spacer_rod 1 Spacing_problem 1 +Span_req 1 +Span_dynamic_req 1 Spanner 1 Spring_spacer 1 +Skip_req 1 Staff 1 Staff_commands 1 Staff_symbol 1 Stem 1 -Stem_info 1 +Stem_info 0 Stem_req 1 Symtable 1 Symtables 1 diff --git a/AUTHORS.txt b/AUTHORS.txt index cca297b7b4..91bf41de38 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -61,7 +61,7 @@ CONTRIBUTORS -6/Apr/98 LilyPond 0.1.63 1 +6/Apr/98 LilyPond 0.1.64 1 @@ -127,6 +127,6 @@ AUTHORS(1) LilyPond documentation AUTHORS(1) -6/Apr/98 LilyPond 0.1.63 2 +6/Apr/98 LilyPond 0.1.64 2 diff --git a/Documentation/INSTALL.pod b/Documentation/INSTALL.pod index 093db58f92..b6bdf07f28 100644 --- a/Documentation/INSTALL.pod +++ b/Documentation/INSTALL.pod @@ -98,6 +98,25 @@ most MusiXTeX preprocessors) =back +=head1 WEBSITE + +If you want to auto-generate Lily's website, you'll need some additional +conversion tools. + +=over 5 + +=item * + +Xpmtoppm (from the libgr-progs package). + +=item * + +Bib2html (http://pertsserver.cs.uiuc.edu/~hull/bib2html.) +Which, in turn depends on Man2htlm (http://askdonald.ask.uni-karlsruhe.de/ +hppd/hpux/Networking/WWW/Man2html-1.05) for proper installation (ugh). +TeTeX users, don't forget to rerun texhash. + +=back =head1 CONFIGURING and COMPILING diff --git a/Documentation/Makefile b/Documentation/Makefile index c3cf69814f..e8fe751ce9 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -22,10 +22,10 @@ include ./$(depth)/make/Docrules.make # +DATAFILES = $(wildcard *.data) TEXTFILES = $(OUTPODFILES:.pod=$(DOTTEXT)) GROFFFILES = $(OUTPODFILES:.pod=.1) -HTMLFILES = $(OUTPODFILES:.pod=.html) - +HTMLFILES = $(OUTPODFILES:.pod=.html) $(datafiles) default: do-doc @@ -37,24 +37,21 @@ giffiles = $(addprefix $(outdir)/,$(XPMS:.xpm=.gif)) gifs: $(giffiles) -EXTRA_DISTFILES = $(XPMS) vocabulary-data vocabulary-forms.el automake.urgh\ +datafiles = $(addprefix $(outdir)/,$(DATAFILES:.data=.html)) + +EXTRA_DISTFILES = $(XPMS) vocabulary.data vocabulary-forms.el automake.urgh\ gnu-music-history # don't do DVI files. They can only be made if lily is installed -do-doc: ugh-mutopia $(TEXTFILES) +do-doc: $(TEXTFILES) readme-topfiles: cd $(depth); for i in $(README_TOPFILES); do \ - ln -f $$i Documentation/$(outdir); done - -$(outdir)/%$(DOTTEXT): $(depth)/%$(DOTTEXT) - rm -f $@ - ln $< $@ + ln -f $$i Documentation/$(outdir)/$$i$(DOTTEXT); done README_TOPFILES=NEWS DEDICATION TODO ANNOUNCE-0.1 README_TXTFILES=$(addprefix $(outdir)/,$(addsuffix $(DOTTEXT), $(README_TOPFILES))) -#local-WWW: $(HTMLFILES) $(README_TXTFILES) $(giffiles) local-WWW: $(HTMLFILES) readme-topfiles $(README_TXTFILES) $(giffiles) # generic targets and rules: @@ -63,10 +60,8 @@ include $(depth)/make/Targets.make include $(depth)/make/Rules.make # ugh -check-doc-deps: - @echo hi +check-doc-deps: do-doc + @echo # hi doc: do-doc -ugh-mutopia: $(outdir)/mutopia.1 - troff -man -Tascii $< | grotty -b -u -o > $(outdir)/mutopia$(DOTTEXT) diff --git a/Documentation/index.pod b/Documentation/index.pod index 438075e961..cdf09123ce 100644 --- a/Documentation/index.pod +++ b/Documentation/index.pod @@ -14,7 +14,6 @@ version this was. =over 4 =item * - The announcement of 0.1 @@ -106,6 +105,13 @@ Manual pages +=item * + +Musical vocabulary. + + =back =head2 The program diff --git a/Documentation/vocabulary-data b/Documentation/vocabulary.data similarity index 100% rename from Documentation/vocabulary-data rename to Documentation/vocabulary.data index fb42e711e0..e9e616a284 100644 --- a/Documentation/vocabulary-data +++ b/Documentation/vocabulary.data @@ -1,5 +1,5 @@ -:engraving:notenstechen::steken:: Francais:US English:Deutsch:UK English:Nederlands:Italiaans: +:engraving:notenstechen::steken:: :Grand staff:::Piano systeem::A combination of two staffs with a brace. Usually used for piano music. :system:::systeem:: accentuation:accentuation:::accent:: diff --git a/INSTALL.txt b/INSTALL.txt index 6c7ee5ec6a..bf28be6025 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -61,7 +61,7 @@ RECOMMENDED -7/May/98 LilyPond 0.1.63 1 +13/May/98 LilyPond 0.1.64 1 @@ -80,6 +80,20 @@ INSTALL(1) LilyPond documentation INSTALL(1) compile. It's lot slower than most MusiXTeX preprocessors) +WEBSITE + If you want to auto-generate Lily's website, you'll need + some additional conversion tools. + + o Xpmtoppm (from the libgr-progs package). + + o Bib2html + (http://pertsserver.cs.uiuc.edu/~hull/bib2html.) + Which, in turn depends on Man2htlm + (http://askdonald.ask.uni-karlsruhe.de/ + hppd/hpux/Networking/WWW/Man2html-1.05) for proper + installation (ugh). TeTeX users, don't forget to + rerun texhash. + CONFIGURING and COMPILING to install GNU LilyPond, simply type: @@ -111,30 +125,29 @@ CONFIGURING and COMPILING CPPFLAGS are the preprocessor flags. - the configure script is Cygnus configure, and it will - accept --help. If you are not root, you will probably have - to make it with - configure --prefix=/home/me_myself_and_I/ - In this case, you will have to set MFINPUTS, and TEXINPUTS - accordingly. - - If you want to install GNU LilyPond in /usr/local, and - your TeX has no default hooks for local stuff (mine is - broken too), you can do: +13/May/98 LilyPond 0.1.64 2 -7/May/98 LilyPond 0.1.63 2 +INSTALL(1) LilyPond documentation INSTALL(1) + the configure script is Cygnus configure, and it will + accept --help. If you are not root, you will probably have + to make it with + configure --prefix=/home/me_myself_and_I/ -INSTALL(1) LilyPond documentation INSTALL(1) + In this case, you will have to set MFINPUTS, and TEXINPUTS + accordingly. + If you want to install GNU LilyPond in /usr/local, and + your TeX has no default hooks for local stuff (mine is + broken too), you can do: configure --prefix=/usr/local --enable-tex-prefix=/usr/lib/texmf @@ -177,30 +190,30 @@ INSTALL(1) LilyPond documentation INSTALL(1) Output to different configuration files. Needed for multi-platform builds - All options are documented in the configure help The - option --enable-optimise is recommended for Real Life - usage. - If you do - make all - everything will be compiled, but nothing will be - installed. The resulting binaries can be found in the - subdirectories out/ (which contain all files generated - during compilation). +13/May/98 LilyPond 0.1.64 3 -7/May/98 LilyPond 0.1.63 3 +INSTALL(1) LilyPond documentation INSTALL(1) + All options are documented in the configure help The + option --enable-optimise is recommended for Real Life + usage. + If you do -INSTALL(1) LilyPond documentation INSTALL(1) + make all + everything will be compiled, but nothing will be + installed. The resulting binaries can be found in the + subdirectories out/ (which contain all files generated + during compilation). CONFIGURING FOR MULTIPLE PLATFORMS If you want to compile LilyPond with different @@ -243,30 +256,23 @@ CAVEATS EXAMPLE This is what I type in my xterm: - lilypond someinput.ly - tex someinput.tex - xdvi someinput& - This is what the output looks like over here: +13/May/98 LilyPond 0.1.64 4 +INSTALL(1) LilyPond documentation INSTALL(1) + lilypond someinput.ly + tex someinput.tex + xdvi someinput& - -7/May/98 LilyPond 0.1.63 4 - - - - - -INSTALL(1) LilyPond documentation INSTALL(1) - + This is what the output looks like over here: GNU LilyPond 0.0.78 #4/FlowerLib 1.1.24 #0 Parsing ... [/home/hw/share/lilypond/init// @@ -317,15 +323,9 @@ WINDOWS NT/95 entire source tree is unpacked correctly, in particular the empty out directories (flower/out, lib/out et. al.) -AUTHORS - Han-Wen Nienhuys - - Jan Nieuwenhuizen - - -7/May/98 LilyPond 0.1.63 5 +13/May/98 LilyPond 0.1.64 5 @@ -334,12 +334,12 @@ AUTHORS INSTALL(1) LilyPond documentation INSTALL(1) - Have fun! - - - +AUTHORS + Han-Wen Nienhuys + Jan Nieuwenhuizen + Have fun! @@ -391,6 +391,6 @@ INSTALL(1) LilyPond documentation INSTALL(1) -7/May/98 LilyPond 0.1.63 6 +13/May/98 LilyPond 0.1.64 6 diff --git a/NEWS b/NEWS index 06305c5fb9..32035856f1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,28 @@ +********* +pl 64 + +pl 63.jcn3 + - beam stemlength stuff runtime + - dropped lq for beam-stemlengths, fixes [d d d] [d g d] + - ugly sed fix for commas in .ly.m4 + - beam damp corrent fix + - scsii: small fixes + - preludes.ly; dropped silly preludes.tex + +pl 63.jcn2 + - vocabulary on website + - data-to-html.py + - bf: beam damped-slope correct + - bf: make website + - some preludes-* fixes + +pl 63.jcn1 + - "relative" sizes for titledefs + - bib2html/man2html urls in INSTALL.pod + - auto-generated feta stuff in doosdist + - bf's: make dist, docdeps + - bf's scsii + pl 63 - non_fatal_error () (should use!) - Mozart Horn concerto 3, horn part diff --git a/PATCHES.txt b/PATCHES.txt index 424a9b2332..24afc7b64d 100644 --- a/PATCHES.txt +++ b/PATCHES.txt @@ -61,7 +61,7 @@ PREREQUISITES -12/May/98 LilyPond 0.1.63 1 +12/May/98 LilyPond 0.1.64 1 @@ -127,7 +127,7 @@ SYNCHRONISE -12/May/98 LilyPond 0.1.63 2 +12/May/98 LilyPond 0.1.64 2 @@ -193,6 +193,6 @@ MAINTAINER -12/May/98 LilyPond 0.1.63 3 +12/May/98 LilyPond 0.1.64 3 diff --git a/TODO b/TODO index 51b540901c..290ea68f84 100644 --- a/TODO +++ b/TODO @@ -13,7 +13,7 @@ grep for TODO and ugh/ugr/urg * notes almost touch barline: whitespace at the begin of the bar should be at fixed at at least (about) one interline. - hack at spring-spacer.cc:662 doen't work anymore + hack at spring-spacer.cc:662 doesn't work anymore * do rest-collisions for Multi_measure_rests as well. @@ -24,6 +24,8 @@ grep for TODO and ugh/ugr/urg * deps for ly2dvi + * fix .txt rules / make dist from freshly configured tar-ball + * document use of ly2dvi more prominently * deprecate \duration @@ -39,8 +41,6 @@ grep for TODO and ugh/ugr/urg * multibar rest - symbol(s) - * latex mutopia/los-toros-oboe-16.tex: max memsize - * move all hard-coded constants and staffheight dependent to runtime, i.e. init/params.ly. e.g.: stem length params, beam positions @@ -52,6 +52,10 @@ grep for TODO and ugh/ugr/urg * fix title/instrument placements; see input/test/title.ly + * <\voiceone c4. \voicetwo c4> + + * add full cello suites to web site (kom op, Maarten!) + * rename - plet -> tuplet - grav -> engraver diff --git a/VERSION b/VERSION index c63ff42d3c..440a99a9f7 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=63 +PATCH_LEVEL=64 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/bin/ly2dvi.sh b/bin/ly2dvi.sh index 3b502f2922..447f29e371 100755 --- a/bin/ly2dvi.sh +++ b/bin/ly2dvi.sh @@ -742,6 +742,7 @@ $LLHF EOF mudelaDefs cat << EOF >> $LatF +\cmrtwenty% ugh \makelilytitle EOF } diff --git a/bin/table-to-html.py b/bin/table-to-html.py new file mode 100755 index 0000000000..bc4bc7152a --- /dev/null +++ b/bin/table-to-html.py @@ -0,0 +1,92 @@ +#!@PYTHON@ + +# +# table-to-html.py -- convert char-separated table to html table +# +# source file of the GNU LilyPond music typesetter +# +# (c) 1998 Jan Nieuwenhuizen +# + +import getopt +from string import * +import regex +import regsub +import os +import sys +import time + +version = '0.1' + +lilypath ='' +try: + lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/' +except KeyError: + try: + lilypath = os.environ['top_srcdir'] + '/' + except KeyError: + print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' + +lilypath = lilypath + '/bin/' +sys.path.append (lilypath) + +from flower import * + +def program_id (): + return 'table-to-html.py version ' + version; + +def identify (): + sys.stdout.write (program_id () + '\n') + +def help (): + sys.stdout.write ("Usage: table-to-html [options] TABLE_FILE HTML_FILE\n" + + "Generate mozarella metrics table from preparated feta log\n\n" + + "Options:\n" + + " -h, --help print this help\n" + + " -s, --separator=SEP specify separator [:]\n") + sys.exit (0) + + +def header (html): + html.write ('') + +def footer (html): + html.write ('
') + +def convert (inname, outname, separator): + table = File (inname) + # ugh + html = File (outname, 'w') + + header (html) + while not table.eof (): + line = table.readline () + columns = split (line, separator) + html_line = '' + join (columns, '') + '' + html.write (html_line) + table.close () + footer (html) + html.close () + + +def main (): + identify () + (options, files) = getopt.getopt ( + sys.argv[1:], 'hs:', ['help','separator=']) + + separator = ':' + for opt in options: + o = opt[0] + a = opt[1] + if o == '--separator' or o == '-s': + separator = a + elif o== '--help' or o == '-h': + help () + else: + print o + raise getopt.error + + convert (files[0], files[1], separator) + +main () + diff --git a/init/paper.ly b/init/paper.ly index 8585b8af9a..794a69b345 100644 --- a/init/paper.ly +++ b/init/paper.ly @@ -1,7 +1,7 @@ % paper.ly linewidth20 = \hsize - 2.5 * \staffheight; -textheight20 = \vsize - 7.0 * \staffheight; +textheight20 = \vsize - 5.0 * \staffheight; linewidth = \staffheight/20.0 * \linewidth20; textheight = \staffheight/20.0 * \textheight20; diff --git a/init/params.ly b/init/params.ly index 8e9b2e2d90..0dfb82e371 100644 --- a/init/params.ly +++ b/init/params.ly @@ -13,6 +13,19 @@ beam_thickness = 0.48 * (\interline - \staffline); interbeam = (2.0 * \interline - \beam_thickness) / 2.0; interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0; +% some beam-stemlength settings... +% +% beam_*1 : multiplicity < beam_multiple_break +% beam_*2 : multiplicity >= beam_multiple_break +% +beam_multiple_break = 3.0; +beam_minimum_stem1 = 1.5 * \interline; +beam_minimum_stem2 = 1.0 * \interline; +beam_ideal_stem1 = 2.0 * \interline; +beam_ideal_stem2 = 1.5 * \interline; +% beam_slope_damp_correct_factor = 2.0; +beam_slope_damp_correct_factor = 0.0; + % OSU: suggested gap = ss / 5; slur_x_gap = \interline / 5.0; slur_x_minimum = 2.0 * \interline; diff --git a/input/bugs/beam-length.ly b/input/bugs/beam-length.ly new file mode 100644 index 0000000000..1297b78336 --- /dev/null +++ b/input/bugs/beam-length.ly @@ -0,0 +1,12 @@ +% beams should look the same +\score{ + \melodic{ + \octave relative; + [d''8 d d] [d g d] + c c + c4 c c c + c c c c + c c c c + } +} + diff --git a/input/bugs/tie-bug.ly b/input/bugs/tie-bug.ly new file mode 100644 index 0000000000..61c49afdea --- /dev/null +++ b/input/bugs/tie-bug.ly @@ -0,0 +1,13 @@ + +\score{ + \melodic{ + \octave relative; + < + {\voicetwo f} + % this is the correct way + % {\voicetwo } + {\voiceone c' ~ c } + > + } +} + diff --git a/input/test/Makefile b/input/test/Makefile index c06a326f62..9f29c9f5db 100644 --- a/input/test/Makefile +++ b/input/test/Makefile @@ -7,6 +7,6 @@ depth = ../.. include $(depth)/make/Mutopia.make -examples=font20 denneboom spacing +examples=font20 denneboom include $(depth)/make/WWW.make diff --git a/lib/include/source-file.hh b/lib/include/source-file.hh index ccf80eeded..0983a829a4 100644 --- a/lib/include/source-file.hh +++ b/lib/include/source-file.hh @@ -35,7 +35,7 @@ protected: Slice line_slice (char const* pos_ch_C) const; String line_str (char const* pos_ch_C) const; int column_i (char const* pos_ch_C) const; - int position_i (char const* pos_ch_C) const; + int char_i (char const* pos_ch_C) const; private: String name_str_; diff --git a/lib/source-file.cc b/lib/source-file.cc index 7a7470119d..14fabe7959 100644 --- a/lib/source-file.cc +++ b/lib/source-file.cc @@ -54,7 +54,7 @@ Source_file::file_line_column_str (char const *context_ch_C) const return _ ("(unknown)"); else return name_str () + ":" + String (line_i (context_ch_C)) - + ":" + String (position_i (context_ch_C)); + + ":" + String (char_i (context_ch_C)); } String @@ -112,7 +112,7 @@ Source_file::line_str (char const* pos_ch_C) const } int -Source_file::position_i (char const* pos_ch_C) const +Source_file::char_i (char const* pos_ch_C) const { if (!in_b (pos_ch_C)) return 0; @@ -127,11 +127,11 @@ Source_file::column_i (char const* pos_ch_C) const if (!in_b (pos_ch_C)) return 0; - int pos_i = position_i (pos_ch_C); + int ch_i = char_i (pos_ch_C); String line = line_str (pos_ch_C); int col_i = 0; - for (int i = 0; i < pos_i; i++) + for (int i = 0; i < ch_i; i++) if (line[i] == '\t') col_i = (col_i / 8 + 1) * 8; else @@ -146,12 +146,12 @@ Source_file::error_str (char const* pos_ch_C) const if (!in_b (pos_ch_C)) return _ ("(position unknown)"); - int pos_i = position_i (pos_ch_C); + int ch_i = char_i (pos_ch_C); String line = line_str (pos_ch_C); - String context = line.left_str (pos_i) + String context = line.left_str (ch_i) + String ('\n') + String (' ', column_i (pos_ch_C)) - + line.cut (pos_i, INT_MAX); + + line.cut (ch_i, INT_MAX); return context; } diff --git a/lily/VERSION b/lily/VERSION index d173a2d56b..9e7293e3d7 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,5 +1,5 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=63 +PATCH_LEVEL=64 MY_PATCH_LEVEL= diff --git a/lily/beam.cc b/lily/beam.cc index f60d230e75..142d1f7b3b 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -204,6 +204,7 @@ Beam::solve_slope () assert (multiple_i_); Array sinfo; + DOUT << "Beam::solve_slope: \n"; for (int j=0; j = 1) + { + Real staffline_f = paper ()->rule_thickness (); + Real epsilon_f = staffline_f / 8; + if (abs (slope_f_) < epsilon_f) + left_y_ = (sinfo[0].idealy_f_ + sinfo.top ().idealy_f_) / 2; + else + /* + symmetrical, but results often in having stemlength = minimal + + left_y_ = sinfo[0].dir_ == dir_ ? sinfo[0].miny_f_ : sinfo[0].maxy_f_; + + what about + */ + { + Real dx = stems_.top ()->hpos_f () - stems_[0]->hpos_f (); + left_y_ = sinfo[0].idealy_f_ >? sinfo.top ().idealy_f_ - slope_f_ * dx; + } } + // uh? Real dy = 0.0; for (int i=0; i < sinfo.size (); i++) { @@ -247,15 +293,7 @@ Beam::solve_slope () } left_y_ += dy; left_y_ *= dir_; - slope_f_ *= dir_; - solved_slope_f_ = slope_f_; - /* - This neat trick is by Werner Lemberg, damped = tanh (slope_f_) corresponds - with some tables in [Wanske] - */ - if (damping_i_) - slope_f_ = 0.6 * tanh (slope_f_) / damping_i_; quantise_dy (); } @@ -466,10 +504,14 @@ Beam::set_stemlens () */ Real dx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f (); - Real damped_slope_dy_f = (solved_slope_f_ - slope_f_) * dx_f / 2; - if (abs (damped_slope_dy_f) <= epsilon_f) + Real damp_correct_f = paper ()->get_var ("beam_slope_damp_correct_factor"); + Real damped_slope_dy_f = (solved_slope_f_ - slope_f_) * dx_f + * sign (slope_f_); + damped_slope_dy_f *= damp_correct_f; + if (damped_slope_dy_f <= epsilon_f) damped_slope_dy_f = 0; + DOUT << "Beam::set_stemlens: \n"; Real x0 = stems_[0]->hpos_f (); Real dy_f = 0; // urg @@ -503,8 +545,7 @@ Beam::set_stemlens () dy_f = dy_f >? info.miny_f_ - y; } } - if (dy_f && damped_slope_dy_f - && (sign (dy_f) == sign (damped_slope_dy_f))) + if (damped_slope_dy_f && (dy_f >= 0)) dy_f += damped_slope_dy_f; damped_slope_dy_f = 0; if (abs (dy_f) <= epsilon_f) diff --git a/lily/stem-info.cc b/lily/stem-info.cc index afe5962a88..4251d294f9 100644 --- a/lily/stem-info.cc +++ b/lily/stem-info.cc @@ -45,7 +45,6 @@ Stem_info::Stem_info (Stem const *s) */ Real internote_f = s->paper ()->internote_f (); - Real interline_f = 2.0 * internote_f; Real interbeam_f = s->paper ()->interbeam_f (mult_i_); Real beam_f = s->paper ()->beam_thickness_f (); @@ -64,6 +63,11 @@ Stem_info::Stem_info (Stem const *s) idealy_f_ = s->chord_start_f () * beam_dir_ / internote_f; idealy_f_ *= internote_f; + Real break_i = (int)rint (s->paper ()->get_var ("beam_multiple_break")); + Real min_stem1_f = s->paper ()->get_var ("beam_minimum_stem1"); + Real min_stem2_f = s->paper ()->get_var ("beam_minimum_stem2"); + Real ideal_stem1_f = s->paper ()->get_var ("beam_ideal_stem1"); + Real ideal_stem2_f = s->paper ()->get_var ("beam_ideal_stem2"); if (!beam_dir_ || (beam_dir_ == dir_)) { @@ -71,13 +75,16 @@ Stem_info::Stem_info (Stem const *s) miny_f_ = idealy_f_; maxy_f_ = INT_MAX; - // B"arenreiter - if (mult_i_ < 3) - idealy_f_ += 2.0 * interline_f; + if (mult_i_ < break_i) + { + idealy_f_ += ideal_stem1_f; + miny_f_ += min_stem1_f; + } else - idealy_f_ += 1.5 * interline_f; - - miny_f_ += 1.0 * interline_f; + { + idealy_f_ += ideal_stem2_f; + miny_f_ += min_stem2_f; + } // lowest beam of (UP) beam must never be lower than second staffline miny_f_ = miny_f_ >? (- 2 * internote_f - beam_f @@ -87,22 +94,24 @@ Stem_info::Stem_info (Stem const *s) { idealy_f_ -= beam_f; maxy_f_ = idealy_f_; + miny_f_ = -INT_MAX; // B"arenreiter - if (mult_i_ < 3) - idealy_f_ -= 2.0 * interline_f; + if (mult_i_ < break_i) + { + idealy_f_ -= ideal_stem1_f; + maxy_f_ -= min_stem1_f; + } else - idealy_f_ -= 1.5 * interline_f; - - maxy_f_ -= 1.0 * interline_f; - - miny_f_ = -INT_MAX; + { + idealy_f_ -= ideal_stem2_f; + maxy_f_ -= min_stem2_f; + } } idealy_f_ /= internote_f; miny_f_ /= internote_f; maxy_f_ /= internote_f; - miny_f_ /= internote_f; DOUT << "dir_: " << dir_ << '\n'; DOUT << "mult_i_: " << mult_i_ << '\n'; diff --git a/make/Docrules.make b/make/Docrules.make index fdd23e632f..b8428e2e0c 100644 --- a/make/Docrules.make +++ b/make/Docrules.make @@ -20,27 +20,25 @@ $(outdir)/%.mudtex: %.doc $(outdir)/%$(DOTTEXT): $(outdir)/%.1 troff -man -Tascii $< | grotty -b -u -o > $@ -#$(depth)/%$(DOTTEXT): $(outdir)/%$(DOTTEXT) -# urg -# $(depth)/%$(DOTTEXT): out/%$(DOTTEXT) -# cp $< $@ -# huh? -$(outdir)/%$(DOTTEXT): $(depth)/% - cp $< $@ - # perl 5.003/4 POD2HTML5004=$(POD2HTML) --noindex --infile $< --outfile=$@; sh $(depth)/bin/add-URLs.sh $@ POD2HTML5003=$(POD2HTML) $< ; mv $(notdir $@) $(outdir)/ - +# we'll set pod2html5004 to default (hopefully), for now, +# because almost everybody has that version. +# 5004's pod2hmtl is broken, though; you should use pod2html of 5003 do_pod2html=$(POD2HTML5004) - +# do_pod2html=$(POD2HTML5003) $(outdir)/%.html: %.pod $(depth)/VERSION $(do_pod2html) add-html-footer $@ +$(outdir)/%.html: %.data $(depth)/VERSION + table-to-html $< $@ + add-html-footer $@ + $(outdir)/%.5: %.pod $(pod2groff) diff --git a/make/Rules.make b/make/Rules.make index 3df1ad41d0..f7f3d7fe4a 100644 --- a/make/Rules.make +++ b/make/Rules.make @@ -38,6 +38,10 @@ $(outdir)/%.cc: %.ll $(outdir)/%: %.m4 $(M4) $< > $@ +# urg +$(outdir)/%.ly: %.lym4 + $(M4) $< | sed "s/\`/,/g" > $@ + # outdirs: # # ?$(outdir)/%.dep: diff --git a/make/Targets.make b/make/Targets.make index 037a6981ab..ce3ecb34e8 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -130,19 +130,22 @@ dist: # ugh. should generate in out/ dozedist: doosdist -doosdist: +doosdist: check-mf-deps + rm -rf $(distdir) -mkdir $(distdir) -# nogo, SUBDIRS is handed down to subdir... -# $(MAKE) SUBDIRS="Documentation init input tex" localdist $(MAKE) localdist chmod -Rf a+rX $(distdir) # ugh, the ugly way, then + rm -f $(distdir)/mf/$(outdir)/*.log + # urg + (cd $(distdir)/init; ln -s ../../../mf/out/*.ly .) + (cd $(distdir)/tex; ln -s ../../../mf/out/*.tex .) (cd $(distdir); rm -rf $(NO_DOOS_DIST)) ln $(lilyout)/lilypond $(distdir)/bin/lilypond.exe - strip -s $(distdir)/bin/lilypond.exe + -strip -s $(distdir)/bin/lilypond.exe ln $(mi2muout)/mi2mu $(distdir)/bin/mi2mu.exe - strip -s $(distdir)/bin/mi2mu.exe - (cd ./$(depth); $(ZIP) $(outdir)/$(DIST_NAME).exe.zip $(distdir)) + -strip -s $(distdir)/bin/mi2mu.exe + (cd ./$(depth)/$(outdir); $(ZIP) $(DIST_NAME).exe.zip $(DIST_NAME)) # should be trapped rm -rf $(distdir)/ diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index adce118197..74c1164c54 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.63 -Inschrijf datum: 12MAY98 +Versie: 0.1.64 +Inschrijf datum: 13MAY98 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: @@ -16,8 +16,8 @@ Auteur: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 395k lilypond-0.1.63.tar.gz + 395k lilypond-0.1.64.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.63.tar.gz + 395k lilypond-0.1.64.tar.gz Copi"eer politie: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 88daadf489..9c9d106401 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.63 -Entered-date: 12MAY98 +Version: 0.1.64 +Entered-date: 13MAY98 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music @@ -15,8 +15,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 570k lilypond-0.1.63.tar.gz + 570k lilypond-0.1.64.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 570k lilypond-0.1.63.tar.gz + 570k lilypond-0.1.64.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index ca0c70fbf4..29a01b7de2 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.63 +Version: 0.1.64 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-0.1.63.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-0.1.64.tar.gz Summary: A program for typesetting music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mutopia/J.S.Bach/Makefile b/mutopia/J.S.Bach/Makefile index 93521cfb7d..50f649f7b1 100644 --- a/mutopia/J.S.Bach/Makefile +++ b/mutopia/J.S.Bach/Makefile @@ -5,7 +5,7 @@ depth = ../.. # -EXTRA_DISTFILES=preludes.tex +EXTRA_DISTFILES= # descent order into subdirectories: # @@ -17,8 +17,6 @@ SUBDIRS = include ./$(depth)/make/Mutopia.make # -examples=prelude-cello menuetto-alto wtk1-fugue2 -#menuetto-cello -> broken -#preludes-2 -> broken +examples=scsii-cello wtk1-fugue2 preludes-2 include $(depth)/make/WWW.make diff --git a/mutopia/J.S.Bach/allemande-alto.ly b/mutopia/J.S.Bach/allemande-alto.ly index 22906e21be..e1002e5d33 100644 --- a/mutopia/J.S.Bach/allemande-alto.ly +++ b/mutopia/J.S.Bach/allemande-alto.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Allemande"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; @@ -28,9 +29,11 @@ allemande_alto_global = \melodic{ \key bes; \partial 16; \clef alto; - \skip 1*12; + \skip 1*11; + s2. s8. \bar ":|:"; - \skip 1*12; + \skip 1*11; + s2. s4 s8 \bar ":|"; } diff --git a/mutopia/J.S.Bach/allemande-cello.ly b/mutopia/J.S.Bach/allemande-cello.ly index 5282f90001..2818a696db 100644 --- a/mutopia/J.S.Bach/allemande-cello.ly +++ b/mutopia/J.S.Bach/allemande-cello.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Allemande"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; @@ -28,9 +29,11 @@ allemande_cello_global = \melodic{ \key bes; \partial 16; \clef bass; - \skip 1*12; + \skip 1*11; + s2. s8. \bar ":|:"; - \skip 1*12; + \skip 1*11; + s2. s4 s8 \bar ":|"; } diff --git a/mutopia/J.S.Bach/allemande-urtext.ly b/mutopia/J.S.Bach/allemande-urtext.ly index b3ec3ef1d1..2b1631b41c 100644 --- a/mutopia/J.S.Bach/allemande-urtext.ly +++ b/mutopia/J.S.Bach/allemande-urtext.ly @@ -7,61 +7,96 @@ Well, there are still some scripts in this "urtext". But merging music and scripts doen't work too well yet (see alto_scripts). %} -\version "0.1.14"; n = { \slurnormal } d = { \slurdotted } comma = "\\sethuge,"; -% write as two voices? -allemande = \melodic{ - a,16 | - <[''d8 g' f' a> bes16()a][g()f e()d][d()cis d()e]['g8 \d bes16()g] | - [f( a )d f,] [e8 cis'] <[''d8. a' d> e16] [f g a bes!] | +allemande_a = \melodic{ + \voiceone a,16 | + [a8 bes16()a] \onevoice + [g()f e()d][d()cis d()e][g,8 \d bes16()g] | + [f( a )d f,] [e8 cis']\voiceone[d8. e16]\onevoice[f g a bes!] | %3 - <['d8 a' fis' c,> \n d16()es][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]<[f8. a> | + \voiceone[c8 \n d16()es]\onevoice[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] + <[f8. a> | % urg fix - [b \n f,( e )d][e \d cis'( d )cis]<'d8. {[d'( )e16]}>\n[f( e d)e] | + [b \n f,( e )d][e \d cis'( d )cis]\voiceone[d'8.( )e16]\onevoice + \n[f( e d)e] | %6 [d( c b )c][b( a gis)a][g8-\prall fis16()e][e' c( a )g] | - <[f! e'> a, f d]<\voiceone d {\voicetwo[b f' d b]}>\onevoice + \voiceone [e' a, f d] [d f d b]\onevoice [fis( b e )gis] \d [b( d c )b] | %8 \n[c( a f )d][d( f e )d][gis'8.-\trill()a16]\d[b d e,()d] | % urg - [c( e a')d']< {\voiceone [b8.-\trill a16] a8 } - {\voicetwo e,4 ['dis8 ~ dis32 e( fis gis][a b c d c b c )a]}> | - \onevoice + % check [c( e a')d']\voiceone [b8.-\trill a16] a8 \onevoice | + [c( e a')d']\voiceone [b8.-\trill a16] a8 s4 s8 \onevoice | %10 - [d'!16 gis'( a b a gis fis )e]<[c8 e a'> f16()e] [d()c b!()a] | - <[gis8 d' b'> e'16()f]\d[e()d c()b]<\voicetwo a8 e' - {\voiceone[d'16()b c()a]}> \onevoice e8 gis | - ['a8. cis16][e g!( f! )e][f( a )d gis,] a8. + [d,!16 gis'( a b a gis fis )e] \voiceone [d8 f16()e]\onevoice + [d()c b!()a] | + \voiceone[d'8 e16()f]\onevoice\d[e()d c()b] + \voiceone[d''16()b c()a] \onevoice [e8 gis] | + [a,8. cis16][e g!( f! )e][f( a )d gis,] a8. %13 - e,16 <\voicetwo a, cis'' {\voiceone ['e8. f16]}> \onevoice - \n[g!()e fis()a]\n['cis( d )e bes,][a8.-\trill()g16] | + e,16 \voiceone [e8. f16] \onevoice + \n[g!()e fis()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(] | %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] | + [)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] | %17 - \n[c(bes)c bes'][a(c)es g,]<['c8-\trill fis'>\d g16()a] ['d8 es16()c] | - [bes(d )g bes,]['d8 fis]<['g8. g'> a16][bes d g, f] | + \n[c(bes)c bes'][a(c)es g,]\voiceone[fis8-\trill\d g16()a]\onevoice + [d,8 es16()c] | + [bes(d )g bes,][d,8 fis][g8. a16][bes d g, f] | %19 - <\voicetwo bes,8. {\voicetwo[e'-\trill()f16]}> [g()e c()bes] - \n[a()f' g,()f][e g'( a )bes] | + \voiceone[e'8.-\trill()f16]\onevoice [g()e c()bes] + \n[a()f' g,()f][e g''( a )bes] | % :-( % [bes( a g )f^\comma] [bes( a g )f^"\\sethuge{\\ '}"] - [a()'e f()d][bes d(f)a][d'()a bes()g] | + [a()e, f()d][bes d(f)a][d'()a bes()g] | %21 - ['a(\n)g'(\n cis'())d][e()'g a()'es][f()d bes()d]\d['gis f'(e)d] | + [a,(\n)g'(\n cis'())d][e()g, a()es,][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^"\\sethuge\\ ,"] [c(a)fis d'][c a( b )d] - [f!(d )'gis d'] | + [f!(d )gis, d'] | %23 - [cis(e g!)bes][e'()a bes()g][f()'cis d()'gis][a8 cis!] | - ['d16 d''(c!)a][bes!(g)e cis'][d a f d] d'8. + [cis(e g!)bes][e'()a, bes()g][f()cis, d()gis,][a8 cis!] | + % knee + \stemup [d,16 \stemboth d''(c!)a][bes!(g)e cis'][d a f d] d,8. + \octave c'; } +allemande_b = \melodic{ + \voicetwo + s16 | + s8 s2. | + s2 s16 s4 | + s8 s2. | + s1 | + s2 d,,8. s16 s4 | + s1 | + f''!16 s16*3 b, s16*3 s2 | + s1 | + s4 e [dis,8 ~ dis32 e( fis gis][a b c d! c b c )a] | + s2 s8 s4 | + % check s8 s4 s8. s16 | + s8 s4 s8 s4 | + s1 | + % check +% s16 + s8 s2. | + s1*3 | + s2 c,,8 s8 s4 | + s2 g,8. s16 s4 | + bes'8. + \octave c; +} + +allemande = \type Voice \melodic< + \$allemande_a + \$allemande_b +> + diff --git a/mutopia/J.S.Bach/courante-alto.ly b/mutopia/J.S.Bach/courante-alto.ly index 966700fb92..9885930e5e 100644 --- a/mutopia/J.S.Bach/courante-alto.ly +++ b/mutopia/J.S.Bach/courante-alto.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Courante"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; @@ -28,9 +29,11 @@ courante_alto_global = \melodic{ \key bes; \partial 16; \clef alto; - \skip 2.*16; + \skip 2.*15; + s2 s8. \bar ":|:"; - \skip 2.*16; + \skip 2.*15; + s2 s8 \bar ":|"; } diff --git a/mutopia/J.S.Bach/courante-cello.ly b/mutopia/J.S.Bach/courante-cello.ly index f855077b0b..2ecb5ba007 100644 --- a/mutopia/J.S.Bach/courante-cello.ly +++ b/mutopia/J.S.Bach/courante-cello.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Courante"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; @@ -27,10 +28,12 @@ courante_cello_global = \melodic{ \meter 3/4; \key bes; \partial 16; - \clef alto; - \skip 2.*16; + \clef bass; + \skip 2.*15; + s2 s8. \bar ":|:"; - \skip 2.*16; + \skip 2.*15; + s2 s8 \bar ":|"; } diff --git a/mutopia/J.S.Bach/courante-urtext.ly b/mutopia/J.S.Bach/courante-urtext.ly index 75b3d69c1e..21b6b4d1ee 100644 --- a/mutopia/J.S.Bach/courante-urtext.ly +++ b/mutopia/J.S.Bach/courante-urtext.ly @@ -7,42 +7,42 @@ Well, there are still some scripts in this "urtext". But merging music and scripts doen't work too well yet (see alto_scripts). %} -\version "0.1.14"; n = { \slurnormal } d = { \slurdotted } -% write as two voices? +% write as two voices? see allemande/sarabande courante = \melodic{ d'16 | - [d a f a] ['d f g a]\d[bes()a bes()g] | + [d a f a] [d, f g a]\d[bes()a bes()g] | <\voiceone g4 a {\voicetwo \n cis, ~ [cis16 d e f]}> \onevoice \d[g()f g()e] | [f()d e()c!]\n[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<''g4 {f'~ [f16} {c'4 ~ [c16 bes a g]}> [f()es d()es] | + % [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<{\voicetwo } {\voiceone c'4 ~ [c16 bes a g]}> + \onevoice [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]| + \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,] | %10 - ['cis( e )a' b][cis d e f][g()f g()e] | - [''d( f' )d' e]\n[d()c d()c][b()a b()a] | + [cis,( e )a' b][cis d e f][g()f g()e] | + [d,,( f' )d' e]\n[d()c d()c][b()a b()a] | \n[gis( a )b e,]\n[f()e f()d][e()c d()b] | %13 - \n[c a'( b c][b a gis)a]['d a' e, a'] | + \n[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, g] | - [a e, cis e]['a cis e gis] a8. + [dis, a'( b c][b a gis)a][e, a' e, g] | + [a e, cis e][a, cis e gis] a8. %17 e'16 | - [e cis a cis]['e f g a][bes()g cis'()'g] | + [e cis a cis][e, f g a][bes()g cis'()g,] | <\voicetwo f4 {\voiceone d' ~ \stemdown[d16 a d e] }> - [f d a, c!] | - \n[b f,(d)f]\d['g d'(f)g][b f, d' f,] | + | + \n[b f,(d)f]\d[g, d'(f)g][b f, d' f,] | %20 [e g c,(d][e f g a][)bes! d c g,] | <\voiceone a {\voicetwo [f c'(bes a][g f es d] @@ -51,18 +51,19 @@ courante = \melodic{ \onevoice [a bes c d] | %23 - ['e bes,(a)g][a f' \n'g()f]\d['c()g f' e] | + [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]| - [cis g' b, g']['a g' b, g']['cis g' a, g']| + [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']| + [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']| %29 - \n['f d'(e f][e d cis)d]['g d' a d]| + \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]| - ['gis d,(e f][e d cis)d][a d a cis]| - [d a f a]['d f a, d] + [gis, d'(e f][e d cis)d][a d a cis]| + [d a f a][d, f a, d] d,8. + \octave c'; } diff --git a/mutopia/J.S.Bach/menuetto-alto.ly b/mutopia/J.S.Bach/menuetto-alto.ly index e18f00eec0..0cc2d45773 100644 --- a/mutopia/J.S.Bach/menuetto-alto.ly +++ b/mutopia/J.S.Bach/menuetto-alto.ly @@ -5,7 +5,8 @@ subtitle = "Suite II"; piece = "Menuetto I"; description = "Transcribed for Alto"; source = "?"; -opus = "BWV 1008 no. 5"; +% opus = "BWV 1008 no. 5"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/menuetto-cello.ly b/mutopia/J.S.Bach/menuetto-cello.ly index 17cc7c3f16..4252960470 100644 --- a/mutopia/J.S.Bach/menuetto-cello.ly +++ b/mutopia/J.S.Bach/menuetto-cello.ly @@ -5,6 +5,7 @@ subtitle = "Suite II"; piece = "Menuetto I"; source = "?"; % opus = "BWV 1008 no. 5"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/menuetto-urtext.ly b/mutopia/J.S.Bach/menuetto-urtext.ly index 712d06bdf6..2940d61faf 100644 --- a/mutopia/J.S.Bach/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/menuetto-urtext.ly @@ -7,7 +7,6 @@ Well, there are still some scripts in this "urtext". But merging music and scripts doen't work too well yet (see alto_scripts). %} -\version "0.1.14"; menuetto_i_a = \melodic{ % \octave relative; bes4 | @@ -40,13 +39,14 @@ menuetto_i_a = \melodic{ [g,8 f g e] f4 | [g,8 g'] | | + \octave c; } menuetto_i_b = \melodic{ % \octave relative; \slurdotted \skip 2.*1; | - \skip 8*5; | + \skip 8*5; | \skip 2.*1; | a,8 \skip 8*5; | \skip 2.*1; | @@ -66,6 +66,7 @@ menuetto_i_b = \melodic{ % g2 f4 | g4 \skip 4*1; f4 | cis8 \skip 8*3; d4 | + \octave c; } % UGH, fix this like in sarabande @@ -115,7 +116,7 @@ menuetto_i = \type Voice \melodic< menuetto_ii = \melodic{ \slurdotted - fis4^\trill [d8( e fis )g] | + fis'4^\trill [d8( e fis )g] | a4 fis,, a'' | [g,,8()b] e4 g | \slurnormal diff --git a/mutopia/J.S.Bach/prelude-urtext.ly b/mutopia/J.S.Bach/prelude-urtext.ly index 5424767c2a..33c6433024 100644 --- a/mutopia/J.S.Bach/prelude-urtext.ly +++ b/mutopia/J.S.Bach/prelude-urtext.ly @@ -7,23 +7,31 @@ Well, there are still some scripts in this "urtext". But merging music and scripts doen't work too well yet (see alto_scripts). %} -\version "0.1.14"; n = { \slurnormal } d = { \slurdotted } -prelude = \melodic{ - [d,8 f] a4 ~ [a16 f( e )d] | - [cis( e g )a] bes4 ~ [bes16 a( g )f] | +% +% this must be redone a bit: +% +% * two voices: see allemande/sarabande +% * beams in different beam-thread: see first few bars +% * slurs/ties in two different threads: urtext, and additionals +% + +%prelude_notes = \melodic{ +prelude_notes = \type Thread = prelude \melodic{ + d,8 f a4 ~ a16 f( e )d | + cis( e g )a bes4 ~ bes16 a( g )f | + [e( g a )cis] \d [e8.() bes,16] \n [a16( g f )e] | [f( g a )f] [d8( c! bes )a] | %5 [bes16 d( f )a] \d [d8.()c16] [bes( a g )f] | [e( g bes )d] [c( a bes )g] [f( e )g bes,] | \n [a c( e )g] \d [c8.()bes16] \n [a( g f )e] | - \d [d( f a )c] [bes( g a )f] \n [e( f )a f] | + \d [d( f a )c] [bes( g a )f] \n [e( f a )f] | %9 \d [g, bes( d )f] [bes8.() a16] \n [g( f e )g] | - % check slur! [a, c( e )g] [c a( e )g] [f( a )'d )es] | [a, c( e )g] [c a( e )g] [f( a )d, es] | [d a( bes )d] [g bes( a )c] \d [bes( g )d' f,] | %12 @@ -75,29 +83,35 @@ prelude = \melodic{ [e cis( b )cis]\n[a( b )cis d][e d e cis] | %47 [d \n b( a )b][f,(gis )b cis][d cis d b] | - r r | - [bes16 g( fis)g][es g d g]\d[es( g)bes d,] | + <{\voiceone }{\voicetwo g,,}>\onevoice r r | + [bes''16 g( fis)g][es g d g]\d[es( g)bes d,] | [cis--( \n e!( g ))a]\d[bes8.()a16]\n[g( fis )g e'] | %51 [f,! d' bes g]\d[a()f e()g][f()d cis()e] | [d bes( a )g][fis--( \n a( c! ))es]\d[d( c bes )a] | [bes g( fis )g][es g d g]\n[es( g )bes d,] | %54 - <\stemdown cis4 bes' {\voiceone [g'8.( )f16] }> - \n[e!( d cis b][a g f )e] \stemboth | + <\voicetwo cis4 bes' {\voiceone [g'8.( )f16] }> + \n[e!( d cis b][a g f )e] \onevoice | \d[d--( \n a'( d ))e][f( e d c!][bes! a g )f] | \d[e--( \n a( cis ))e][g( f e d][cis b a )g] | [f a( d )f][a d,( f )a][d bes! c! a] | [g,, \d d'( g )a][bes \n g( fis)g][es' g, d' g,] | - | - | - | - | - | + <{\voiceone | | | | | } + {\voicetwo a,,2. a a a }> + \octave c'; } +prelude_beam1 = \melodic { [s8 s]s4[s16 s s s] } +prelude_beam2 = \melodic { [s16 s s s]s4[s16 s s s] } +prelude_beams = \type Thread = prelude \melodic{ + \$prelude_beam1 + \$prelude_beam2 +} - - +prelude = \type Voice \melodic< + \$prelude_notes + \$prelude_beams +> diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly index 124b1b8019..9bb0f07040 100644 --- a/mutopia/J.S.Bach/preludes-1.ly +++ b/mutopia/J.S.Bach/preludes-1.ly @@ -3,7 +3,8 @@ filename = "preludes-1.ly"; % mmm title = "DOUZE PETITES PR\'ELUDES"; opus = "BWV 924"; -piece = "\\numfont 1"; +% piece = "\\numfont 1"; +piece = "1"; % blz 1 % Clavierb"uchlein f"ur W. Fr. Bach % Clav. W. Fr. Bach: 2-Praeambulum I @@ -13,56 +14,55 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "0.1.14"; one = \melodic{ \octave c''; \textstyle "italic"; - r16\p_"legato"\< ['g-1( c-3 )e-5] r ['g-1( c )e] - r ['g( c )d] r ['b-1( d-2 \!)g-5] | - r\mf ['a( d-2 ) g-5] r ['a(\< d )f-4] - r ['a( d )e-3] r [c-1( e-2 \!)a-5] | - r\f ['b e a-5] r ['b e-3 g-5] - r [c-1 e-3 f-4] r ['g d-3 f-5] | - r ['g-"poco a poco dim." d-4 e] r ['g c-2 e] - r ['a-1 c-3 d-4] r ['e b,-3 d-5] | - r ['e b, c-4] r ['e a,-2 c] - r ['f-1 a,-3 bes,-4] r ['c g,-3 bes,-5] | - r ['c g, a,-4] r ['c f,-2 a,] - r ['d f,-2 b,-5] r ['e g,-2 c-5] | - r\p ['d g, c-5] r ['d g, b,-4] - r ['c g,-3 b,-5] r ['c fis,-2 a,-4] | - r [''b d, a,-5] r [''b d, g,-4] - r [''a c, g,-5] r [''a c, f,!-4] | + r16\p_"legato"\< [g,-1( c-3 )e-5] r [g,-1( c )e] + r [g,( c )d] r [b,-1( d-2 \!)g-5] | + r\mf [a,( d-2 ) g-5] r [a,(\< d )f-4] + r [a,( d )e-3] r [c-1( e-2 \!)a-5] | + r\f [b, e a-5] r [b, e-3 g-5] + r [c-1 e-3 f-4] r [g, d-3 f-5] | + r [g,-"poco a poco dim." d-4 e] r [g, c-2 e] + r [a,-1 c-3 d-4] r [e, b,-3 d-5] | + r [e, b, c-4] r [e, a,-2 c] + r [f,-1 a,-3 bes,-4] r [c, g,-3 bes,-5] | + r [c, g, a,-4] r [c, f,-2 a,] + r [d, f,-2 b,-5] r [e, g,-2 c-5] | + r\p [d, g, c-5] r [d, g, b,-4] + r [c, g,-3 b,-5] r [c, fis,-2 a,-4] | + r [b,, d, a,-5] r [b,, d, g,-4] + r [a,, c, g,-5] r [a,, c, f,!-4] | % ugh, arpeggio < - { \voiceone; f,4 r s } - { \voicetwo; <''g4 d,> r s } + { \voiceone f,4 r s } + { \voicetwo r s } > - \onevoice; + \onevoice % ugh beam across staffs, slur starts at lower staff - r16 [''g-1( b,, d,] | - \voiceone; - )''b s4 ['g16-1( b,-2 d] )'b s s s [f-2 g-3 b-5 f-2] | - \onevoice; + r16 [g,,-1( b,, d,] | + \voiceone + )b,, s4 [g,16-1( b,-2 d] )b, s s s [f-2 g-3 b-5 f-2] | + \onevoice [e-1\f c'-5( g-3 f-2] [e-1 c'-5 g-3 e-2] [)d c'-5( f-3 e-2] [d-1 b-5 f-3 d-2] | [)c b-5( e-3 d-2] [c-1 a-5 e-3 c-2] - [)'b-1 a-5( d-3 c-2] ['b-1 g-5 d-3 b,-2] | - [)'a g-5 c-4 b,] ['a-"poco a poco dim." fis-5 c-2 a,-1] - ['b-2 f d-4 c] ['b f d-4 b,-2] | - ['g e c-3 b,] ['a e-5 c-3 a,-1] - ['fis-2 d b,-3 a,] ['g-1 d-5 b,-4 g,-2] | - ['e c-5 a,-4 g,-3] ['fis-2 c-5 a,-4 fis,-2] - ['d c-5 b,-4 a,] ['b-4 g,-2 d-5 f,-1] | - ['g-4 e,-2 f,-1 d-5] [c-4 b, a, g,] - [f-5 d-3 es-4 c-2] ['fis-1 es-4 d-3 c-2] | - ['b-1 d-5 b,-3 g,-1] ['as-4-"cresc. e rall." f,-2 g,-3 d,-1] - ['es-2 fis,-3 a,-4 c-5] + [)b,-1 a-5( d-3 c-2] [b,-1 g-5 d-3 b,-2] | + [)a, g-5 c-4 b,] [a,-"poco a poco dim." fis-5 c-2 a,-1] + [b,-2 f d-4 c] [b, f d-4 b,-2] | + [g, e c-3 b,] [a, e-5 c-3 a,-1] + [fis,-2 d b,-3 a,] [g,-1 d-5 b,-4 g,-2] | + [e, c-5 a,-4 g,-3] [fis,-2 c-5 a,-4 fis,-2] + [d, c-5 b,-4 a,] [b,-4 g,-2 d-5 f,-1] | + [g,-4 e,-2 f,-1 d-5] [c-4 b, a, g,] + [f-5 d-3 es-4 c-2] [fis,-1 es-4 d-3 c-2] | + [b,-1 d-5 b,-3 g,-1] [as,-4-"cresc. e rall." f,-2 g,-3 d,-1] + [es,-2 fis,-3 a,-4 c-5] < - { \voiceone; r [c8 b,16] } - { \voicetwo; ['d8 f,-2] } + { \voiceone r [c8 b,16] } + { \voicetwo [d,8 f,-2] } > - \onevoice; | + \onevoice | \bar "|."; } @@ -79,14 +79,14 @@ two = \melodic{ g-\mordent^"(\\textsharp)" g, g-\mordent g, | g-\mordent g, g-\mordent g, | % ugh, f should be at upper staff - g-\mordent r r16 ['g-5( b,-4 d] )f-1 s s s | + g-\mordent r r16 [g,-5( b,-4 d] )f-1 s s s | % s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] % huh, can't violin anymore (see BUGS) s [g-5( b-4 d'-2] )f'-1 s s s s [g'-4 b'-2 d''-1] s s s s \clef bass; | < - { \voiceone; g1 ~ g ~ g ~ g ~ g ~ g ~ g } - { \voicetwo; g,1 ~ g, ~ g, ~ g, ~ g, ~ g, ~ g, } + { \voiceone g1 ~ g ~ g ~ g ~ g ~ g ~ g } + { \voicetwo g,1 ~ g, ~ g, ~ g, ~ g, ~ g, ~ g, } > \bar "|."; diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly index ac159f2903..8f4dca4506 100644 --- a/mutopia/J.S.Bach/preludes-2.ly +++ b/mutopia/J.S.Bach/preludes-2.ly @@ -2,7 +2,8 @@ filename = "preludes-2.ly"; title = "2"; opus = "BWV 939"; -piece = "\\numfont 2"; +% urg?? piece = "\\numfont 2"; +piece = "2"; % blz 10 % % Six Petits Pr'eludes @@ -13,7 +14,6 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "0.1.14"; one = \melodic{ \octave c''; \textstyle "italic"; @@ -21,65 +21,65 @@ one = \melodic{ [)a,-4\< c,-1( f,-2 a,-4] [f, c, c-5 a,-3] | [)b,-4 g,-1( b,-2 d-4] [b,-2 g, f-5 \!d-3] | < - {\voiceone )e2-4\f r4 e-5 } - {\voicetwo r4 } + {\voiceone )e2-4\f r4 e-5 } + {\voicetwo r4 } > - \onevoice | + \onevoice | < - { \voiceone d2-4 r4 d-4 } - { \voicetwo r4 } + { \voiceone d2-4 r4 d-4 } + { \voicetwo r4 } > - \onevoice | + \onevoice | < - { \voiceone d8 } - { \voicetwo } + { \voiceone d8 } + { \voicetwo } > - \onevoice + \onevoice [g,8-1\mf( b,-2 d-4] < - { \voiceone )b,4 e-5 } - { \voicetwo g,4 b, } + { \voiceone )b,4 e-5 } + { \voicetwo g,4 b, } > - \onevoice | + \onevoice | < - { \voiceone c2 r4 < {c-5 ~ c8} {a,4 ~ a,8} > } - { \voicetwo c2 r4 e,4 ~ e,8 } + { \voiceone c2 r4 < {c-5 ~ c8} {a,4 ~ a,8} > } + { \voicetwo c2 r4 e,4 ~ e,8 } > - \onevoice + \onevoice [d,-1\p( fis,-2 a,-4] [fis,-2 d,-1 c-5 a,-3] | [)b,-4\< g,-1( b,-2 d-4] [ b,-2 g,-1 f!-5 d-3] | [)e-4 g,-1( c-2 e-4] [c-2 g, g-5 e-3] | [)fis-4 a,-1( c-2 fis-4] [c a, a-5 \!fis-3] | < - { \voiceone )g2-5\f } - { \voicetwo } + { \voiceone )g2-5\f } + { \voicetwo } > - \onevoice + \onevoice r4 b4-2( | [c8-1 e-2 g c'] [g-2 e-1 bes-4 g-2] | [)a16->-3 g-2 f-1 e-3] [d c b,!-3 a,-2] [b,-3\< g,-1 a, b,] [c-1 d e \!f] | g4-5\ff < - { \voiceone c2-5 b,4-4 } - { \voicetwo g,2-2 d,4-1 } + { \voiceone c2-5 b,4-4 } + { \voicetwo g,2-2 d,4-1 } > - \onevoice + \onevoice < - { \voiceone c1^5 } - { \voicetwo e,1_1} + { \voiceone c1^5 } + { \voicetwo e,1_1} > - \onevoice + \onevoice \bar "|."; } two = \melodic{ \octave c; < - { \voiceone c1 ~ | c ~ | c } - { \voicetwo c,1 ~ | c, ~ | c, } + { \voiceone c1 ~ | c ~ | c } + { \voicetwo c,1 ~ | c, ~ | c, } > - \onevoice | + \onevoice | r8 [c-5( e-3 g-1] [e-3 c-5 c' e-4] | [)fis-3 d-5( fis-3 a-1] [fis-3 d-5 d' fis-4] | )g2-3 r4 g-2( | diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4 deleted file mode 100644 index fc91c68737..0000000000 --- a/mutopia/J.S.Bach/preludes-3.ly.m4 +++ /dev/null @@ -1,177 +0,0 @@ -\header{ -filename = "preludes-3.ly"; -title = "3"; -opus = "BWV 999"; -piece = "\\numfont 3"; -% Pr"aludum in C Moll f"ur Laute -% blz 16 -% Six Petits Pr'eludes -% Collection Johann Peter Kellner -% ca 1703 - 1707 -composer = "Johann Sebastian Bach (1685-1750)"; -enteredby = "jcn"; -copyright = "public domain"; -} - -define(comma, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |) -define(s, `comma(translit($*,` ', `,'))') -define(t, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |) - -one = \melodic{ - \octave c'; - \textstyle "italic"; -%# s(`c' `es' `g' `\p(\<' `\!' `)\!' `\>') - t(c,es,g,`\p(\<',\!,`)\!',\>) -%# s(c es g `(' `' `)') - t(c,es,g,`(',`',`)') -%# s(c f as `(' `' `)') - t(c,f,as,`(',`',`)') - s(c f as) - s('b d f \< \!) - s('b d f) - s('g c es \> \!) - s('g c es) - s('g c es \< \!) - s('g c es) - s('a c es) - s('a c es) - s('a 'bes d \> \!) - s('g 'bes d) - s('bes d g) - s('a es g \mf) - s('a c fis) - s('a c fis) - s('bes d g) - - -%# s(c fis a -"poco a poco cresc.") - t(c,fis,a,-"poco a poco cresc.") - s(d g bes) - s(d fis c') - - s(cis g bes) - s(c es a !-"dim.") - s('bes e g) - s('a c g) - - s('a c fis) - s('g 'bes e) - s('fis 'a es) - - s('g 'bes d -"dim.") - s('g 'a c) - s('fis 'a c) - s('fis 'a c) - r16\p ['g 'a c] ['b 'g 'b 'g] r 'g r 'g -%# s('a c fis -"poco cresc.") - t('a,c,fis,-"poco cresc.") - s(c fis a) - s('b d g) - s('b d f -"dim.") - s('g c es) - s('fis c es) - s('fis c es) - r16 ['g(\< 'b d] ['b 'g 'b d] [es c 'a )\!fis] | - \multi 2 < - {\stemup; g2.-\fermata\mf} - {\stemdown; <'b2. d>} - > - \stemboth; - \bar "|."; -} - -two = \melodic{ - \octave c; - \clef bass; - % c4 r [g8-.(\ped )es-.\*] | - c4 r [g8-.( )es-.] | - c4 r [g8-.( )es-.] | - c4 r [as8-.( )f-.] | - - c4 r [as8-.( )f-.] | - c4 r [as8-.( )f-.] | - c4 r [as8-.( )f-.] | - - c4-- r [es8 c] | - 'bes!4-- r [es8 c] | - 'as!4-- r [es8 c] | - - 'g4-- r [es8 c] | - 'fis4-- r [es8 c] | - 'fis4 r [fis8 d] | - - 'g4 r [d8 'bes] | - 'g4 r ['bes8 'g] | - 'es4 r [g8 es] | - - c4 r [c8 'a] | - 'd4 r [d8 'a] | - 'd4 r [d8 'a] | - 'd4 r [d8 'bes] | - - - 'd4 r [es8 c] | - 'd4 r [g8 d] | - 'd4 r [a8 fis] | - - 'd4 r [g8 es] | - 'd4 r [fis8 d] | - 'd4 r [e8 cis] | - 'd4 r [es8 c] | - - 'd4 r [d8 'a] | - 'd4 r [cis8 'bes] | - 'd4 r [c!8 'a] | - - 'd4 r ['bes8 'g] | - 'd4 r [es8 c] | - 'd4 r [d8 a] | - - 'g4 r [es8 c] | - 'g4 r [d8 'b] | - 'g4 r [es8 c] | - - 'g4 r [es8 c] | - 'g4 r [g8 d] | - 'g4 r [as8 f] | - 'g4 r [es8 c] | - - 'g4 r [es8 c] | - 'g4 r [es8 c] | - 'g4 r r | - 'g2._\fermata - \bar "|."; -} - -global = \melodic{ - \meter 3/4; - \key bes es as; -} - -treble_staff = \type Staff = treble < - \global - \one -> - -bass_staff = \type Staff = bass < -% bass = Staff < - \clef "bass"; - \global - \two -> - -grand_staff = \type Grand_staff < - \treble_staff - \bass_staff -> - -a4 = \paper{ - linewidth= 193.\mm; -} - -\score{ - % Semplice e non troppo legato - \grand_staff - \paper{ \a4 } - \midi{ \tempo 4 = 100; } -} diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly index c9098c7b19..7ebf40661f 100644 --- a/mutopia/J.S.Bach/preludes-4.ly +++ b/mutopia/J.S.Bach/preludes-4.ly @@ -2,7 +2,8 @@ filename = "preludes-4.ly"; title = "4"; opus = "BWV 925"; -piece = "\\numfont 4"; +% piece = "\\numfont 4"; +piece = "4"; % blz 8 % Clavierb"uchlein f"ur W. Fr. Bach % Clav. W. Fr. Bach: 27-Praeludium ex d neutral @@ -11,19 +12,18 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "0.1.14"; one = \melodic{ \octave c''; \textstyle "italic"; r16\p_"legato" \textstyle "finger"; - ['d-1( fis,-3 d,-1] ['a-2 b,-3 cis-4 a,-3] + [d,-1( fis,-3 d,-1] [a,-2 b,-3 cis-4 a,-3] [d-3 cis-2 d-1 e-2] [d-1 fis-3 e-2 d-1] | \textstyle "finger"; - \stemup; + \stemup )cis4-2 fis-5 ~ [fis8 fis-4] e4-3 ~ | - e16\< \stemboth ['a16( cis a,] [d-2 e fis d-1] + e16\< \stemboth [a,16( cis a,] [d-2 e fis d-1] [g-3 fis g a-4] [g-3 b a \!g] | \stemup )fis4-"2\\_3" [e8-2 a-5] | @@ -33,30 +33,30 @@ one = \melodic{ \textstyle "italic"; [fis_"dim." e fis-3 g] [fis-3 a-5 g fis] \textstyle "finger"; - e4-"2\\_5" ~ e16 ['e( fis, g, ] | + e4-"2\\_5" ~ e16 [e,( fis, g, ] | \textstyle "italic"; - ['a-4_"dim." g,-1 a, b,] ['a-2 c-4 b, a,] - ['g-1 fis,-2 g,-3 a,] ['g-3 b, a, g,] | + [a,-4_"dim." g,-1 a, b,] [a,-2 c-4 b, a,] + [g,-1 fis,-2 g,-3 a,] [g,-3 b, a, g,] | \stemup - )'fis4\p + )fis,4\p \skip 4*7; | \textstyle "finger"; d4.\mf cis8-"4\\_5" ~ cis b,4-5 a,8-"4\\_5" ~ | \textstyle "italic"; - a, g,4-5 fis,8-4 ~ ['fis16 fis,-4-"dim." e,-3 d,-2] + a, g,4-5 fis,8-4 ~ [fis,16 fis,-4-"dim." e,-3 d,-2] \textstyle "finger"; e,4-"3\\_5" ~ | - ['e16 e,-5 d, cis,] d,4-5 ~ ['d16 d,-5 cis, b,,] cis,4-5 | + [e,16 e,-5 d, cis,] d,4-5 ~ [d,16 d,-5 cis, b,,] cis,4-5 | \stemboth - [''fis16-1\p a,,-2 d,-5\< c,-4] [''b-1 d,-2 g,-5 fis,-4] - ['d-1 b,-5 a, g,] ['fis-2 e,-1 d,-4 \!'c!-3] | - [''b-2 d,-1 g, a,] ['fis8-\prall e,16-4 d,-3] - ['d8. e,16~] ['e d,8 cis,16] | + [fis,,16-1\p a,,-2 d,-5\< c,-4] [b,,-1 d,-2 g,-5 fis,-4] + [d,-1 b,-5 a, g,] [fis,-2 e,-1 d,-4 \!c,!-3] | + [b,,-2 d,-1 g, a,] [fis,8-\prall e,16-4 d,-3] + [d,8. e,16~] [e, d,8 cis,16] | \stemup - r16 ['d-1\< fis, d,] ['g a, b, g,-1] [c-3 b, c d] [c e d-4 \!c] | - b,4-5 a, ~ ['a8 g,-5 ~] ['g16 fis,8-4 e,16-3] | - ['fis8-4 e,-5~] ['e d,-5~] d,4 cis,-4 | - d,2\p-"rall." ~ ['d16 a,,-2( b,,-3 cis,-4] )'d4-5 | + r16 [d,-1\< fis, d,] [g, a, b, g,-1] [c-3 b, c d] [c e d-4 \!c] | + b,4-5 a, ~ [a,8 g,-5 ~] [g,16 fis,8-4 e,16-3] | + [fis,8-4 e,-5~] [e, d,-5~] d,4 cis,-4 | + d,2\p-"rall." ~ [d,16 a,,-2( b,,-3 cis,-4] )d,4-5 | \bar "|."; } @@ -65,7 +65,7 @@ two = \melodic{ \textstyle "finger"; % ugh: koor % \translator Staff=bass \octave c; \stemup -% \stemup; +% \stemup fis4-1( e8-2 a4 a4 gis8-2 | ) a8 \translator Staff=treble \octave c''; \stemdown @@ -84,10 +84,10 @@ two = \melodic{ \translator Staff=treble \octave c''; \stemdown d,4 \stemboth - r16 [''b-1\< d,-2 b,,~] <'g4-5 e,-3 b,,> - r16 ['cis-1 e,-2 \!'cis~] | - <'a4-5 fis,-3 cis,> r16 ['d-1 fis,-2 d,~] <'b4-5 g,-3 d,> - r16 ['fis-1 a, fis,~] | + r16 [b,,-1\< d,-2 b,,~] + r16 [cis,-1 e,-2 \!cis,~] | + r16 [d,-1 fis,-2 d,~] + r16 [fis,-1 a, fis,~] | \stemdown fis,4 e, d, cis, | b,, a,, b,,4. b,,8 | @@ -96,21 +96,21 @@ two = \melodic{ r16 [b-3 fis-1 a-2] g4-1 r16 [a-3 e-1 g-2] | \skip 4*4; \skip 16*1; \translator Staff=treble \octave c''; \stemdown - d,8.-1 ~ ['d8 c,] d,4 [''a8 g,,] | + d,8.-1 ~ [d,8 c,] d,4 [a,,8 g,,] | \translator Staff=bass \octave c; \stemup [fis'8 c'-1] b4-1 \stemdown \stemdown a,8~ | - ['a g,-3~] ['g16 e, fis,8~] ['fis16 d,8.~] ['d8. cis,!16] | + [a, g,-3~] [g,16 e, fis,8~] [fis,16 d,8.~] [d,8. cis,!16] | \translator Staff=bass \octave c; \stemup % <[d'8-2 a-1> e-1 fis-2 d-1] < - { \voiceone; [d'8-2 a~] a4 } - { \voicethree; [a8-1 g] [fis16-2 e-1 fis-2 d-1] } + { \voiceone [d'8-2 a~] a4 } + { \voicethree [a8-1 g] [fis16-2 e-1 fis-2 d-1] } > - \voiceone; + \voiceone [g-1 fis-2 g-1 a-2] [g-1 b-3 a-2 g-1 ~] | [g g-1 fis-2 e-1] fis4-2 ~ fis2 \bar "|."; @@ -118,9 +118,9 @@ two = \melodic{ three = \melodic{ \octave c; -% \stemdown; +% \stemdown d4-3 c-4 b, e-3 | - a16 ['a-5\mf( cis-3 a,-5] [d-2 e-1 fis-2 d-4] + a16 [a,-5\mf( cis-3 a,-5] [d-2 e-1 fis-2 d-4] [g-1 fis-3 g a] [g b a g] | )fis4 fis e a-4 | d'16 \stemboth [d-5\f( fis-3 d-5] [a-2 b-1 cis'-2 a-4] @@ -133,27 +133,27 @@ three = \melodic{ r16 [d-4( fis-2 d-4] [)g8-.-1 g,-.-5] r16 [e-4( g-2 e-4] [)a8-. a,-.-5] | r16 [fis-4( a fis] [)b8-. b,-.] r16 [g-4( b g] [)d'8-. d-.] | - r16 ['d16-5( fis,-3 d,] ['a-2 b,-1 cis-2 a,-4] [d b,-5 d-3 b,] + r16 [d,16-5( fis,-3 d,] [a,-2 b,-1 cis-2 a,-4] [d b,-5 d-3 b,] [fis-2 g a-2 fis-4] | - )fis16 ['g( b, g,] [d-2 e fis-2 d-4] [)g8-. g,-.] r16 [cis-4( e cis] | - [)fis8-. fis,-.] \stemdown r16 ['b-4( d b,] [)e8-. e,-.] - r16 ['a-4 cis a,] | + )fis16 [g,( b, g,] [d-2 e fis-2 d-4] [)g8-. g,-.] r16 [cis-4( e cis] | + [)fis8-. fis,-.] \stemdown r16 [b,-4( d b,] [)e8-. e,-.] + r16 [a,-4 cis a,] | \stemboth [d-1 e-3 fis-2 d-4] [g-1 fis-2 e-3 d-1] [cis!-3 a,-5 b, cis] [d-2 e fis-2 d-4] | - [g8 e-3] \stemdown [a a,] ['b8.-4 g,16-5] a,4-4 | + [g8 e-3] \stemdown [a a,] [b,8.-4 g,16-5] a,4-4 | [d8-5 a-2~] [a g-3~] [g g-3] fis4-4 | \stemup r16 [g-2 b-1 g-3] [d'8.-1 c'16-1] [b8.-2 bes16-3] [a8-1 g] | \stemdown - r16 ['a-2 cis!-1 a-2] [d-1 e fis d] [e8-1 d-2] [e-1 a,-2] | - [d a,-2~] ['a16 a,-2 b, cis-2] d2 | + r16 [a,-2 cis!-1 a-2] [d-1 e fis d] [e8-1 d-2] [e-1 a,-2] | + [d a,-2~] [a,16 a,-2 b, cis-2] d2 | } four = \melodic{ \skip 4*36; \octave c'; -% \stemup; +% \stemup % \property Voice.hshift = 1 a2 fis | d diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly index 3e1f0a394a..2584662853 100644 --- a/mutopia/J.S.Bach/preludes-5.ly +++ b/mutopia/J.S.Bach/preludes-5.ly @@ -1,7 +1,8 @@ \header{ filename = "preludes-5.ly"; title = "5"; -piece = "\\numfont 5"; +% piece = "\\numfont 5"; +piece = "5"; opus = "BWV 926"; % blz 2 % Clavierb"uchlein f"ur W. Fr. Bach @@ -12,7 +13,6 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "0.1.14"; one = \melodic{ \octave c'; \textstyle "italic"; @@ -28,15 +28,15 @@ one = \melodic{ [a gis-3 fis e d'-5 \!b-2] | < { - \voiceone; + \voiceone \textstyle "roman"; c'4-\mordent^"(\\textsharp)"\p r r | c'4-\mordent^"(\\textsharp)" r r \textstyle "italic"; } - { \voicetwo; a4 r r | a4 r r } + { \voicetwo a4 r r | a4 r r } > | - \onevoice; + \onevoice [a'8\mf( es'-3\> d' c' bes!-3 a] | [g fis-3 e!-2 d-1 c'-4 \!a] | [)bes8-\mordent\p( d'8-5 bes-3 g-1] )g'4 | @@ -47,13 +47,13 @@ one = \melodic{ [f-3 d-1 f-2 a-3 d'-5 g-2] | < { - \voiceone; + \voiceone % ... textnatural [cis'8-\prall e'8-5-"poco cresc." cis'-3 a e' cis'] } - { \voicetwo; a4 } + { \voicetwo a4 } > - \onevoice; + \onevoice [a8 e'-5 cis' a bes!-3 a] | [g e'-5 cis'-3 g e'-5 cis'-3] | [g-1 e'-5 cis' g a-3 g] | @@ -70,7 +70,7 @@ one = \melodic{ [f-3 a f d a-5 f] | [d-1 a-5 f-3 d-1 cis-2 d-1] | [e-3\< g-5 e-3 bes,-1 g-5 e-3] | - ['bes-1 g-5 e-3 \!cis-2 a,-1 g-5] | + [bes,-1 g-5 e-3 \!cis-2 a,-1 g-5] | [f16-4\mf d-2 c-1 bes,-3] \stemup a,-2 s16 s8 s4 | % ugh % s1 | @@ -81,18 +81,18 @@ one = \melodic{ a'8-5 < { - \voiceone; + \voiceone f'4-4\> ~ | \![f'8 e'] [e'32-4 f' e'8. ~] [e'8 d'-3] } - { \voicetwo; r4 cis'-2 } + { \voicetwo r4 cis'-2 } > | - \onevoice; + \onevoice [d'8-4 c'!-3 a-1 d'-4 bes-2 g-1] | [c'-5 a-3 fis-2 bes-4 g e ] | [a-5 fis-"dim. e rall." d g-5 e cis-2] | < - { \voiceone; } - { \voicetwo; [d32( cis d8. ~] ) d2 } + { \voiceone } + { \voicetwo [d32( cis d8. ~] ) d2 } > | \bar "|."; } @@ -149,7 +149,7 @@ two = \melodic{ a, \stemup [d-5-"m.d." c bes,] a, - \stemdown ['g-2 f,-"m.g." e,] ['d f,-4 a,-2 d-1] | + \stemdown [g,-2 f,-"m.g." e,] [d, f,-4 a,-2 d-1] | \stemup % [f-2\ped a] [f-2-"Ped." a] @@ -168,7 +168,7 @@ lilypond: ../flower/include/varray.hh:116: struct Rhythmic_grouping *& Array [bes-2 a-2 \!g-1] | + r16 [e-3 d-1 c!-2] [bes,! d8.] s4 r16\> [bes-2 a-2 \!g-1] | fis1-2 } @@ -54,7 +54,7 @@ three = \melodic{ \octave c; \stemup f2-1( e-2 | - \stemboth; + \stemboth [)d16 d'( c' bes] [a-4 bes-2 f-5 g-4] [a32 g a8 bes16-2] [g8.-4 f16-5] | @@ -64,7 +64,7 @@ three = \melodic{ \stemdown e4 ~ [e16 f-2( e-3 d-4] [cis a, b, cis-3] [d-4 e-3 f-2 d-4] | \textstyle "finger"; - )'bes!2-"5\\_4" a, ~ | + )bes,!2-"5\\_4" a, ~ | a, a, | d, cis-5 | a1-2 @@ -73,7 +73,7 @@ three = \melodic{ four = \melodic{ \octave c; - \stemdown; + \stemdown d2-3 cis-4 | \skip 4*12; \translator Staff=treble \octave c'; \stemup \property Voice.hshift = 1 diff --git a/mutopia/J.S.Bach/preludes.ly b/mutopia/J.S.Bach/preludes.ly new file mode 100644 index 0000000000..406c08d9cf --- /dev/null +++ b/mutopia/J.S.Bach/preludes.ly @@ -0,0 +1,17 @@ +\header{ +filename = "preludes.ly"; +% mmm +title = "DOUZE PETITES PR\'ELUDES"; +% urg subtitle = "Clavierb\\"uchlein"; +subtitle = "Clavierbuechlein"; +composer = "Johann Sebastian Bach (1685-1750)"; +enteredby = "jcn"; +copyright = "public domain"; +} + +\include "preludes-1.ly" +\include "preludes-2.ly" +\include "preludes-3.ly" +\include "preludes-4.ly" +\include "preludes-5.ly" +\include "preludes-6.ly" diff --git a/mutopia/J.S.Bach/preludes.tex b/mutopia/J.S.Bach/preludes.tex deleted file mode 100644 index b1680f9d3a..0000000000 --- a/mutopia/J.S.Bach/preludes.tex +++ /dev/null @@ -1,63 +0,0 @@ -\documentclass{article} %UGH -\usepackage{a4} - -% UGH UGH -\advance\oddsidemargin-30mm -\evensidemargin\oddsidemargin -% ugh, centre -\advance\textwidth60mm -\advance\topmargin-20mm -\addtolength{\textheight}{40mm} -\footskip5mm - -\usepackage{fancyheadings} -\lhead{} -\rhead{} -\chead{} -\lfoot{} -\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi} -\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi} - -\headrulewidth0mm -\pagestyle{fancy} -\thispagestyle{fancy} - -\input titledefs -\input lilyponddefs -\def\interscoreline{\vskip2mm} -%ugh -\staffheight=20pt - -\font\numfont=feta-nummer10 scaled \magstep2 -\def\piece#1#2#3{% -% \hbox to0pt{\vbox to\staffheight{\vss}} -% \nopagebreak - \vbox to 0pt{\large\bf#3\vss} - \nopagebreak - \vbox to0pt{\vbox to4.5\staffheight{\vss\numfont#1}\vss} - \nopagebreak - \input#2% -} - -\begin{document} - -\title{DOUZE PETITS PR\'ELUDES\\ - TWAALF KLEINE PRELUDI\"EN} -\composer{J.S.\ Bach (1685-1750)} - -\makelilytitle -\kern-\staffheight - -\piece{1}{preludes-1}{Moderato} -\piece{2}{preludes-2}{Moderato} -\newpage -\piece{3}{preludes-3}{Semplice e non troppo legato} -\newpage -\piece{4}{preludes-4}{Allegretto} -\newpage -\piece{5}{preludes-5}{Moderato} -\newpage -\piece{6}{preludes-6}{Andante espressivo} - -\end{document} - diff --git a/mutopia/J.S.Bach/sarabande-alto.ly b/mutopia/J.S.Bach/sarabande-alto.ly index 7d11a7b436..f81fdbfdfa 100644 --- a/mutopia/J.S.Bach/sarabande-alto.ly +++ b/mutopia/J.S.Bach/sarabande-alto.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Sarabande"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/sarabande-cello.ly b/mutopia/J.S.Bach/sarabande-cello.ly index 7532301b65..47489be30c 100644 --- a/mutopia/J.S.Bach/sarabande-cello.ly +++ b/mutopia/J.S.Bach/sarabande-cello.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Sarabande"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/sarabande-urtext.ly b/mutopia/J.S.Bach/sarabande-urtext.ly index 0b8647f276..cdf66f028b 100644 --- a/mutopia/J.S.Bach/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/sarabande-urtext.ly @@ -7,15 +7,14 @@ Well, there are still some scripts in this "urtext". But merging music and scripts doen't work too well yet (see alto_scripts). %} -\version "0.1.14"; n = { \slurnormal } d = { \slurdotted } sarabande_a = \melodic{ % \octave relative; - \voiceone \d['d8.()e16] e4.-\trill([d16 )e] | + \voiceone \d[d,8.()e16] e4.-\trill([d16 )e] | f4. \onevoice [e8(d)c] | - [bes g']\n[f e16(f][g a bes)'d] | + [bes g']\n[f e16(f][g a bes)d,] | cis4.-\trill\d[b8(a)g] | % copy bar 1, half bar 2 \voiceone \d[d'8.()e16] e4.-\trill([d16 )e] | @@ -26,53 +25,59 @@ sarabande_a = \melodic{ \voiceone \n[f' g16()a] a4. [g16()f] | [g8 a16()bes]a4. [c16()d]| % 11 - \onevoice \d ['e8()f][''c g'][f'()e] | + \onevoice \d [e,8()f][c,, g'][f'()e] | f4 f,2 | \voiceone a''4 \d a4.-\trill()bes8 | [c bes16()a] \onevoice [fis8.-\trill()es16][d8()c] | - [bes g']['a fis'][es'()d] | + [bes g'][a, fis'][es'()d] | %16 \voiceone bes4.-\trill \onevoice [a8(g)f!] | [g bes,()a f'(g)a] | - ['d as,()g es'(f)g]| - ['cis bes'][a g16()f][e!8 f16()d] | - [cis8 e16()a]['a8. g'16]\n[f8()e] | + [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] | %21 \voiceone [d e16()f]f4. [e16()d] | [e8 f16()g]g4. [a16()bes] | - \d[a8 cis16()d]['d8 e16(f32)g][f8-\trill \n e16()d] | - d4 ['d16 a'( b cis][d e f )g] | + \d[a8 cis16()d][d,8 e16(f32)g][f8-\trill \n 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] | - \onevoice [d(cis)d f,] ['a8 e']\d[d'()cis] | + \onevoice [d(cis)d f,] [a,8 e']\d[d'()cis] | d4 d,,2 | + \octave c'; } sarabande_b = \melodic{ % \octave relative; \voicetwo - d'4 a,2 | - <'d4. a'> s8*3 | +% dispute +% d4 a,2 | +% this avoids the clash bug + d8. s16 a,2 | + s8*3 | s2.*2 - d4 a,2 | - <'d4. a'> s8*3 | +% d4 a,2 | + d8. s16 a,2 | + s8*3 | s2. | - <'c4. g'> s8*3 | + s8*3 | a4 r8 | bes4 | s2.*2 | \d[f8()es] e4. r8 | d4 s2 | s2. | - <'g4. d'> s8*3 | + s8*3 | s2.*4 | bes4 g2 | - g4 <'cis4. bes'> s8 | - <'f8 a d'> r r g a4 | + g4 s8 | + r r g, a4 | s2. | f'4 fis4. s8 | - <'g4 d'> gis'4. s8 | + gis'4. s8 | + \octave c,; } diff --git a/mutopia/J.S.Bach/scs-paper.ly b/mutopia/J.S.Bach/scs-paper.ly index 797b91ef08..d9722237bc 100644 --- a/mutopia/J.S.Bach/scs-paper.ly +++ b/mutopia/J.S.Bach/scs-paper.ly @@ -2,7 +2,6 @@ linewidth= 180.\mm; gourlay_maxmeasures = 10.0; % for simple testing only! - castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn +% castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn \include "bar-numbering.ly"; } - diff --git a/mutopia/J.S.Bach/scsii-alto.ly b/mutopia/J.S.Bach/scsii-alto.ly index e1fdc23753..e0ba58142c 100644 --- a/mutopia/J.S.Bach/scsii-alto.ly +++ b/mutopia/J.S.Bach/scsii-alto.ly @@ -5,5 +5,3 @@ instrument="Alto"; instrument="alto"; \include "solo-cello-suite-ii.ly" - -\version "0.1.14"; diff --git a/mutopia/J.S.Bach/scsii-cello.ly b/mutopia/J.S.Bach/scsii-cello.ly index eb2a23bcc1..8434573408 100644 --- a/mutopia/J.S.Bach/scsii-cello.ly +++ b/mutopia/J.S.Bach/scsii-cello.ly @@ -5,5 +5,3 @@ instrument="Cello"; instrument="cello"; \include "solo-cello-suite-ii.ly" - -\version "0.1.14"; diff --git a/mutopia/J.S.Bach/solo-cello-suite-ii.ly b/mutopia/J.S.Bach/solo-cello-suite-ii.ly index 61e6e375a3..f251d595c2 100644 --- a/mutopia/J.S.Bach/solo-cello-suite-ii.ly +++ b/mutopia/J.S.Bach/solo-cello-suite-ii.ly @@ -8,7 +8,6 @@ composer = "Johann Sebastian Bach(1685-1750)"; % urg -\version "0.1.14"; % \include "prelude-" + \instrument + ".ly"; i = "prelude-" + \instrument + ".ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 4c020f6e4d..1fab56068f 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -27,7 +27,7 @@ tenor = \stemdown r8 [c8 d e] [f. g32 f] [e8 a] | [d g] ~ [g16 a g f] [e f e d] [c d c b,] | - ['a8 fis] g4 ~ [g8 fis16 e] [f8 d] | + [a,8 fis] g4 ~ [g8 fis16 e] [f8 d] | [g f! e d] c r r g ~ | %% 5 [g f16 e] f4 ~ [f16 f e8] d4 | @@ -78,25 +78,25 @@ soprane = f2 [e8. fis16] g4 ~ %% 10 g4 fis [g16 f! e d] [c d c b,] | - ['a16 c b, a,] g,8 r8 r16 [c16 b, a,] ['gis8 e] | - [d c16 b,16] ['a gis, a, b,] [c fis, a, gis,] ['b8 a,16 b,] - [c8 f e d] ~ [d c16 b,] ['b8. a,16] | + [a,16 c b, a,] g,8 r8 r16 [c16 b, a,] [gis,8 e] | + [d c16 b,16] [a, gis, a, b,] [c fis, a, gis,] [b,8 a,16 b,] + [c8 f e d] ~ [d c16 b,] [b,8. a,16] | a,4 r4 r2 | %% 15 - r2 r8 ['g8 a, b,] | - [c8. d32 c] ['b8 c] [d e] [f!. g32 f!] | + r2 r8 [g,8 a, b,] | + [c8. d32 c] [b,8 c] [d e] [f!. g32 f!] | [e8 a d g] ~ [g16 a g f] [e8 a] | [d8 bes] [a g16 f] [g f g e] [f g g f32 g] | [a16 cis d g] [e8. d16] d8 r8 r4 | %% 20 r2 r4 r8 g, | - ['a b,] [c. d32 c] ['b8 e a, d] ~ | - [e16 e d c] ['b c d e] [f g a g] [f e d c] | + [a, b,] [c. d32 c] [b,8 e a, d] ~ | + [e16 e d c] [b, c d e] [f g a g] [f e d c] | b,4 [c8 d] g, c4 b,8 | - c4 ['b8 bes,8] a, d4 c8 | + c4 [b,8 bes,8] a, d4 c8 | %% 25 [d8 e] f4 ~ [f16 a g f] [e f e d] | - c2 r16 ['g32 a, b,!16 c] [d e f8] ~ | + c2 r16 [g,32 a, b,!16 c] [d e f8] ~ | [f32 c d e f16 g] [a8. b16] | } @@ -153,23 +153,23 @@ bass = %% 5 r2 r8 [c8 d e] | [f. g32 f] [e8 a] [d g] ~ [g16 a g f] | - [e f e d] [c d c b,] ['a8 d a fis] | + [e f e d] [c d c b,] [a,8 d a fis] | [g16 a bes g] [cis8 d] a4 e4 | [a16 b c' d'] [c' b a g] c'8 r8 r4 | %% 10 - r2 r8 ['g8 a, b,] | - [c. d32 c] ['b8 e] ['a d] ~ [d16 e d c] | + r2 r8 [g,8 a, b,] | + [c. d32 c] [b,8 e] [a, d] ~ [d16 e d c] | b,8 e4 d8 c f!4 e8 ~ | e d4 e8 [f! e16 d] e4 | a,4 r4 r2 | %% 15 - r8 ['g8 a, b,] [c. d32 c] ['b8 e] | - ['a8 d] ~ [d16 e d c] ['b8 bes, a, g'] | - ['a8 fis g e] d4 [e8 f!] | + r8 [g,8 a, b,] [c. d32 c] [b,8 e] | + [a,8 d] ~ [d16 e d c] [b,8 bes, a, g'] | + [a,8 fis g e] d4 [e8 f!] | [g8. a32 g] [f8 bes] [e a] ~ [a16 bes a g] | [f e f d] [g8 a] d2 ~ | %% 20 - [d16 e d c] ['b a, g, fis,] ['e8 e fis g] ~ | + [d16 e d c] [b, a, g, fis,] [e,8 e fis g] ~ | [g a16 g16] [fis8 d] g2 ~ | g2 a4 [b8 c'] | [f16 a g f] [e d c b,] [c d e f] [g8 g,] | diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 1de5aa24cd..368602e9f7 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -53,27 +53,27 @@ soprane = r8 [d16 a] [d' d a d'] r8 [d16 a] [d' d a d'] | r8 [d16 f] [b d f b] r8 [d16 f] [b d f b] | r8 [c16 g] [c' c g c'] r8 [c16 g] [c' c g c'] | - r8 ['a16 c] [f a, c f] r8 ['a16 c] [f a, c f] | - r8 ['a16 c] [f a, c f] r8 ['a16 c] [f a, c f] | - r8 ['g16 b,] [f g, b, f] r8 ['g16 b,] [f g, b, f] | - r8 ['g16 c] [e g, c e] r8 ['g16 c] [e g, c e] | + r8 [a,16 c] [f a, c f] r8 [a,16 c] [f a, c f] | + r8 [a,16 c] [f a, c f] r8 [a,16 c] [f a, c f] | + r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] | + r8 [g,16 c] [e g, c e] r8 [g,16 c] [e g, c e] | %% 20 - r8 ['bes16 c] [e bes, c e] r8 ['bes16 c] [e bes, c e] | - r8 ['a16 c] [e a, c e] r8 ['a16 c] [e a, c e] | - r8 ['a16 c] [ees a, c ees] r8 ['a16 c] [ees a, c ees] | - r8 ['b16 c] [d b, c d] r8 ['b16 c] [d b, c d] | - r8 ['g16 b,] [d g, b, d] r8 ['g16 b,] [d g, b, d] | - r8 ['g16 c] [e g, c e] r8 ['g16 c] [e g, c e] | - r8 ['g16 c] [f g, c f] r8 ['g16 c] [f g, c f] | - r8 ['g16 b,] [f g, b, f] r8 ['g16 b,] [f g, b, f] | - r8 ['a16 c] [fis a, c fis] r8 ['a16 c] [fis a, c fis] | - r8 ['g16 c] [g g, c g] r8 ['g16 c] [g g, c g] | + r8 [bes,16 c] [e bes, c e] r8 [bes,16 c] [e bes, c e] | + r8 [a,16 c] [e a, c e] r8 [a,16 c] [e a, c e] | + r8 [a,16 c] [ees a, c ees] r8 [a,16 c] [ees a, c ees] | + r8 [b,16 c] [d b, c d] r8 [b,16 c] [d b, c d] | + r8 [g,16 b,] [d g, b, d] r8 [g,16 b,] [d g, b, d] | + r8 [g,16 c] [e g, c e] r8 [g,16 c] [e g, c e] | + r8 [g,16 c] [f g, c f] r8 [g,16 c] [f g, c f] | + r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] | + r8 [a,16 c] [fis a, c fis] r8 [a,16 c] [fis a, c fis] | + r8 [g,16 c] [g g, c g] r8 [g,16 c] [g g, c g] | %% 30 - r8 ['g16 c] [f g, c f] r8 ['g16 c] [f g, c f] | - r8 ['g16 b,] [f g, b, f] r8 ['g16 b,] [f g, b, f] | - r8 ['g16 bes,] [e g, bes, e] r8 ['g16 bes,] [e g, bes, e] | + r8 [g,16 c] [f g, c f] r8 [g,16 c] [f g, c f] | + r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] | + r8 [g,16 bes,] [e g, bes, e] r8 [g,16 bes,] [e g, bes, e] | - r8 ['f16 a,] [c f c a,] [c a, f, a,] ['f d, f, d,] | + r8 [f,16 a,] [c f c a,] [c a, f, a,] [f, d, f, d,] | r8 [g16 b] [d' f' d' b] [d' b g b] [d f e d] | || } diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly index cc1a111d89..c6701bc1ce 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3.ly @@ -265,14 +265,14 @@ rondo = \melodic { } - +%{ \score { { \property Score.SkipBars = 1 \allegro } } - +%} %{ \score { @@ -281,10 +281,13 @@ rondo = \melodic { } } +%} \score { { \property Score.SkipBars = 1 \rondo } + \paper{ + castingalgorithm =\Wordwrap; + } } -%} diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 771a7416a2..00ad42fc35 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -80,12 +80,15 @@ \font\italicfont=cmti10 scaled \magstep1 \font\boldfont=cmbx10 \font\largefont=cmbx12 + \font\Largefont=cmbx14 \font\hugefont=cmbx15 scaled \magstep 2 \else - \def\settext##1{{\normalfont\normalsize ##1}} +% \def\settext##1{{\normalfont\normalsize ##1}} + \def\settext##1{{\normalfont ##1}} \def\setitalic##1{\textit{\normalsize ##1}} \def\setbold##1{\textbf{\normalsize ##1}} \def\setlarge##1{\textbf{\large ##1}} + \def\setLarge##1{\textbf{\Large ##1}} \def\sethuge##1{\textbf{\huge ##1}} \fi } @@ -98,13 +101,15 @@ \font\italicfont=cmti9 \font\boldfont=cmbx8 \font\largefont=cmbx10 + \font\Largefont=cmbx12 \font\hugefont=cmbx12 scaled \magstep 2 \else \def\settext##1{{\normalfont\footnotesize ##1}} \def\setitalic##1{\textit{\small ##1}} \def\setbold##1{\textbf{\footnotesize ##1}} \def\setlarge##1{\textbf{\normalsize ##1}} - \def\sethuge##1{\textbf{\huge ##1}} + \def\setLarge##1{\textbf{\large ##1}} + \def\sethuge##1{\textbf{\Large ##1}} \fi } \def\cmrthirteen{ @@ -116,13 +121,15 @@ \font\italicfont=cmti7 \font\boldfont=cmbx7 \font\largefont=cmbx9 + \font\Largefont=cmbx10 \font\hugefont=cmbx12 \else \def\settext##1{{\normalfont\scriptsize ##1}} \def\setitalic##1{\textit{\scriptsize ##1}} \def\setbold##1{\textbf{\scriptsize ##1}} \def\setlarge##1{\textbf{\small ##1}} - \def\sethuge##1{\textbf{\huge ##1}} + \def\setLarge##1{\textbf{\normalsize ##1}} + \def\sethuge##1{\textbf{\large ##1}} \fi } \def\cmreleven{ @@ -134,13 +141,15 @@ \font\italicfont=cmti6 \font\boldfont=cmbx6 \font\largefont=cmbx8 + \font\Largefont=cmbx9 \font\hugefont=cmbx10 \else \def\settext##1{{\normalfont\tiny ##1}} \def\setitalic##1{\textit{\tiny ##1}} \def\setbold##1{\textbf{\tiny ##1}} \def\setlarge##1{\textbf{\footnotesize ##1}} - \def\sethuge##1{\textbf{\huge ##1}} + \def\setLarge##1{\textbf{\small ##1}} + \def\sethuge##1{\textbf{\normalsize ##1}} \fi } \def\musixsixteendefs{ @@ -263,6 +272,7 @@ \def\setitalic#1{\italicfont #1} \def\setbold#1{\boldfont #1} \def\setlarge#1{\largefont #1} + \def\setLarge#1{\Largefont #1} \def\sethuge#1{\hugefont #1} \fi diff --git a/tex/titledefs.tex b/tex/titledefs.tex index d7118eabb7..420f5fe9ac 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -34,24 +34,24 @@ % \def\makelilytitle { - {\center\bfseries\huge\center\thetitle} + {\center\bfseries\center\sethuge{\thetitle}} \par - {\center\bfseries\Large\thesubtitle} + {\center\bfseries\setLarge{\thesubtitle}} \bigskip - {\flushright\scshape\thecomposer\par} + {\flushright\setlarge{\normalfont\scshape\thecomposer}\par} % urg \edef\saveparskip{\parskip}\parskip-5mm - {\flushright\theopus\par} - {\flushright\thearranger\par} + {\flushright\settext{\theopus}\par} + {\flushright\settext{\thearranger}\par} \parskip\saveparskip - {\center\large\theinstrument\par} - {\flushleft\scshape\large\thepiece} + {\center\setlarge{\theinstrument}\par} + {\flushleft\setLarge{\normalfont\scshape\thepiece}} } \def\makelilypiecetitle { \bigskip - {\flushright\theopus\par} - {\flushleft\scshape\large\thepiece} + {\flushright\settext{\theopus}\par} + {\flushleft\setLarge{\normalfont\scshape\thepiece}} } \endinput -- 2.39.2