From 2059367f59496fb11796bd2cf239f6b58625231e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 29 Apr 1998 03:29:36 +0200 Subject: [PATCH] release: 0.1.60 --- .dstreamrc | 31 ++- Documentation/Makefile | 11 +- Documentation/PATCHES.pod | 21 +- Documentation/faq.pod | 13 + Documentation/index.pod | 39 +-- Documentation/man/Makefile | 2 + Documentation/man/index.pod | 50 ++++ Documentation/tex/Makefile | 15 ++ Documentation/{ => tex}/colorado.bib | 0 Documentation/{ => tex}/engraving.bib | 0 Documentation/{fonts.tex => tex/fonts.doc} | 0 Documentation/{ => tex}/mudela.doc | 2 +- .../tex/out/dummy.dep | 0 INSTALL.txt | 10 +- NEWS | 37 +++ PATCHES.txt | 72 ++++- TODO | 10 +- VERSION | 2 +- bin/genheader.py | 0 bin/ls-latex.py | 82 ++++++ bin/make-patch.py | 12 +- bin/make-website.py | 1 + bin/mf-to-table.py | 3 - bin/mutopia-index.py | 39 ++- configure | 84 +++--- configure.in | 4 + flower/NEWS | 4 + flower/VERSION | 2 +- flower/include/full-storage.hh | 38 +-- flower/include/varray.hh | 49 +--- flower/include/varray.icc | 66 +++++ init/feta11.ly | 178 +++++++++++++ init/feta13.ly | 178 +++++++++++++ init/feta16.ly | 178 +++++++++++++ init/feta19.ly | 178 +++++++++++++ init/feta20.ly | 178 +++++++++++++ init/feta23.ly | 178 +++++++++++++ init/feta26.ly | 178 +++++++++++++ input/bugs/a.ly | 56 ++++ input/bugs/multi-slope.ly | 6 + input/bugs/slur-broken.ly | 20 ++ input/dummy.tex | 0 input/part.ly | 10 +- input/test/broken.ly | 44 ++++ input/test/sleur.ly | 10 +- lily/VERSION | 9 +- lily/bar-number-grav.cc | 3 + lily/bezier.cc | 59 +++-- lily/bow.cc | 37 ++- lily/multi-measure-rest-engraver.cc | 2 +- lily/slur.cc | 51 +++- make/Docrules.make | 2 +- make/Files.make | 2 + make/Targets.make | 5 + make/Toplevel.make.in | 11 + make/Variables.make | 4 +- make/WWW.make | 6 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 8 +- mutopia/Coriolan/Makefile | 3 + mutopia/Coriolan/clarinetti-part.ly | 1 + mutopia/Coriolan/clarinetto-1.ly | 8 +- mutopia/Coriolan/clarinetto-2.ly | 10 +- mutopia/Coriolan/corni-part.ly | 1 + mutopia/Coriolan/corno-1.ly | 10 +- mutopia/Coriolan/corno-2.ly | 10 +- mutopia/Coriolan/fagotti-part.ly | 1 + mutopia/Coriolan/fagotto-1.ly | 10 +- mutopia/Coriolan/fagotto-2.ly | 10 +- mutopia/Coriolan/flauti-part.ly | 1 + mutopia/Coriolan/flauto-1.ly | 8 +- mutopia/Coriolan/flauto-2.ly | 8 +- mutopia/Coriolan/music.ly | 18 ++ mutopia/Coriolan/oboe-1.ly | 8 +- mutopia/Coriolan/oboe-2.ly | 10 +- mutopia/Coriolan/oboi-part.ly | 1 + mutopia/Coriolan/timpani.ly | 10 +- mutopia/Coriolan/trombe-part.ly | 1 + mutopia/Coriolan/trombo-1.ly | 10 +- mutopia/Coriolan/trombo-2.ly | 10 +- mutopia/Coriolan/violino-2.ly | 2 +- mutopia/J.S.Bach/preludes-1.ly | 9 +- mutopia/J.S.Bach/preludes-2.ly | 6 + mutopia/J.S.Bach/preludes-3.ly.m4 | 6 + mutopia/J.S.Bach/preludes-4.ly | 5 + mutopia/J.S.Bach/preludes-5.ly | 6 +- mutopia/J.S.Bach/preludes-6.ly | 5 + mutopia/Makefile | 4 +- mutopia/TODO | 6 - mutopia/los-toros-oboe-16.tex | 2 +- mutopia/los-toros-oboe.ly | 17 +- mutopia/standje.ly | 245 ++++++++++++++---- test/bow.cc | 26 +- tex/feta11.tex | 176 +++++++++++++ tex/feta13.tex | 176 +++++++++++++ tex/feta16.tex | 176 +++++++++++++ tex/feta19.tex | 176 +++++++++++++ tex/feta20.tex | 176 +++++++++++++ tex/feta23.tex | 176 +++++++++++++ tex/feta26.tex | 176 +++++++++++++ tex/lilyponddefs.tex | 113 +++++--- 102 files changed, 3708 insertions(+), 431 deletions(-) create mode 100644 Documentation/man/index.pod create mode 100644 Documentation/tex/Makefile rename Documentation/{ => tex}/colorado.bib (100%) rename Documentation/{ => tex}/engraving.bib (100%) rename Documentation/{fonts.tex => tex/fonts.doc} (100%) rename Documentation/{ => tex}/mudela.doc (99%) rename flower/include/config.hh => Documentation/tex/out/dummy.dep (100%) mode change 100644 => 100755 bin/genheader.py create mode 100644 bin/ls-latex.py create mode 100644 flower/include/varray.icc create mode 100644 init/feta11.ly create mode 100644 init/feta13.ly create mode 100644 init/feta16.ly create mode 100644 init/feta19.ly create mode 100644 init/feta20.ly create mode 100644 init/feta23.ly create mode 100644 init/feta26.ly create mode 100644 input/bugs/a.ly create mode 100644 input/bugs/multi-slope.ly create mode 100644 input/bugs/slur-broken.ly delete mode 100644 input/dummy.tex create mode 100644 input/test/broken.ly create mode 100644 mutopia/Coriolan/music.ly create mode 100644 tex/feta11.tex create mode 100644 tex/feta13.tex create mode 100644 tex/feta16.tex create mode 100644 tex/feta19.tex create mode 100644 tex/feta20.tex create mode 100644 tex/feta23.tex create mode 100644 tex/feta26.tex diff --git a/.dstreamrc b/.dstreamrc index dedc100f50..1e6bbc084b 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -23,20 +23,27 @@ Vector 0 # lily Atom 0 +Axis_group_administration 0 Bar 0 Beam 0 +Bow 0 +Bezier_bow 1 Change_iterator 0 Chord 0 Chord_iterator 0 Clef_item 0 Col_configuration 0 +Col_hpositions 0 Colinfo 0 Colinfo 0 Collision 0 +Column_rod 0 Engraver 0 Engraver_group_engraver 0 +Graphical_element 0 Group_change_req 0 Head_column 0 +Horizontal_align_item 0 Idealspacing 0 Ineq_constrained_qp 0 Input_translator 0 @@ -50,9 +57,12 @@ Midistrings 0 Mixed_qp 0 Music 0 Music_iterator 0 +Music_output_def 0 +Note_column 0 Note_head 0 Note_performer 0 Note_req 0 +Paper_column 0 Paper_score 1 Paper_def 0 Performer 0 @@ -62,6 +72,7 @@ Request_iterator 0 Rest_collision 0 Rest_collision_engraver 0 Rest_req 0 +Rhythmic_head 0 Rhythmic_req 0 Score 1 Score_column 0 @@ -71,12 +82,15 @@ Score_performer 0 Script_column 0 Script_def 0 Script_req 0 +Single_malt_grouping_item 0 Slur 0 +Spacer_rod 0 Spacing_problem 0 Spanner 0 Spring_spacer 0 Staff 0 Staff_commands 0 +Staff_symbol 0 Stem 0 Stem 0 Stem_req 0 @@ -86,22 +100,13 @@ Symtables 0 Text_def 0 Text_req 0 Time_description 0 +Translation_property 0 +Translator 0 +Translator_group 0 Voice 0 Voice_iterator 0 Word_wrap 0 + delete_identifiers 0 parse_duration 0 parse_pitchmod 0 -Translator_group 0 -Translator 0 -Music_output_def 0 -Graphical_element 0 -Axis_group_administration 0 -Horizontal_align_item 0 -Single_malt_grouping_item 0 -Note_column 0 -Rhythmic_head 0 -Paper_column 0 -Paper_column 0 -Staff_symbol 0 -Column_rod 0 diff --git a/Documentation/Makefile b/Documentation/Makefile index 27248c9ad8..44f2d7792e 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -8,7 +8,7 @@ depth = .. # identify module: # NAME = Documentation -SUBDIRS=man +SUBDIRS=man tex # @@ -22,13 +22,10 @@ include ./$(depth)/make/Docrules.make # -DOCFILES = $(wildcard *.doc) -OUTPODFILES = $(addprefix $(outdir)/,$(PODFILES)) -BIBFILES= $(wildcard *.bib) TEXTFILES = $(OUTPODFILES:.pod=.txt) GROFFFILES = $(OUTPODFILES:.pod=.1) HTMLFILES = $(OUTPODFILES:.pod=.html) -DVIFILES = $(addprefix $(outdir)/, $(DOCFILES:.doc=.dvi)) + default: do-doc @@ -41,15 +38,13 @@ giffiles=$(XPMS:.xpm=.gif) gifs: $(addprefix $(outdir)/, $(giffiles)) -EXTRA_DISTFILES = $(XPMS) $(DOCFILES) vocabulary-data vocabulary-forms.el fonts.tex automake.urgh $(BIBFILES) +EXTRA_DISTFILES = $(XPMS) vocabulary-data vocabulary-forms.el automake.urgh # don't do DVI files. They can only be made if lily is installed do-doc: $(TEXTFILES) html: $(HTMLFILES) -dvi: $(DVIFILES) - # generic targets and rules: # include $(depth)/make/Targets.make diff --git a/Documentation/PATCHES.pod b/Documentation/PATCHES.pod index 7fbc7480c0..45089c039f 100644 --- a/Documentation/PATCHES.pod +++ b/Documentation/PATCHES.pod @@ -94,6 +94,20 @@ The Lily directory structure, which looks like: =back +=head1 APPLYING PATCHES + +If you're following LilyPond development regularly, you probably want to +download just the patch for each subsequent release. +After downloading the patch (into the patches directory, of course), simply +apply it: + + gzip -dc ../patches/patch-0.1.49.gz | patch -p1 -E + +and don't forget to make automatically generated files: + + autoconf 1) + configure + =head1 SYNCHRONISE If you're not very quick with sending your patch, there's a good chance @@ -104,10 +118,15 @@ Your best bet is to download the latest release, and apply your patch against this new source tree: cd lilypond-0.1.49 - zpatch -p0 -E < ../patches/patch-0.1.48.jcn1.gz + gzip -dc ../patches/patch-0.1.48.jcn1.gz | patch -p1 -E + autoconf 1) + configure Then, make a patch as shown above. +1) patches don't include automatically generated files, i.e. F + and files generated by F. + =head1 MAINTAINER Han-Wen Nienhuys diff --git a/Documentation/faq.pod b/Documentation/faq.pod index 9611c995d0..01ff8a6d89 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -26,6 +26,19 @@ forget to remove the stale F as well. If the problem persists, then please mail me. +Q: I upgraded by applying a patch, and now my configure/build breaks. + +A: Patches don't include automatically generated files, i.e. F + and files generated by F. Regenerate them yourself: + + autoconf + configure + +You might need to create some extra "out" directories. Do this +with + + make outdirs + Q: Some of your neat scripts fail, what directories do you use: A: [This only applies if you don't do C, and develop out diff --git a/Documentation/index.pod b/Documentation/index.pod index 3470425b5b..cc2376a15e 100644 --- a/Documentation/index.pod +++ b/Documentation/index.pod @@ -20,7 +20,7 @@ version this was. =over 4 -=item http://sca.uwaterloo.ca/~praetzel/lilypond/ +=item http://sca.uwaterloo.ca/lilypond/ Eric Praetzel was kind enough to provide a mirror of both the website and the ftp site. @@ -131,7 +131,7 @@ The lilypond logo (medium size, format: .gif) =back -=head2 Documentation: manpages, manuals +=head2 Documentation: manuals =over 4 @@ -144,41 +144,6 @@ PS documents about LilyPond > -=item * - -manual page for mi2mu, the MIDI convertor. - - -=item * - -The manual page - - -=item * - -Easy titling for LilyPond - - -=item * - -The mudela convertor: convert-mudela - - -=item * - -mudela in TeX: mudela-book - - =back =head2 The program diff --git a/Documentation/man/Makefile b/Documentation/man/Makefile index 67d1357ae6..dd1319b14d 100644 --- a/Documentation/man/Makefile +++ b/Documentation/man/Makefile @@ -13,3 +13,5 @@ INSTALLATION_OUT_FILES=$(MANGROFF) INSTALLATION_DIR=$(mandir)/man$(SECTION) include $(depth)/make/Install_outfiles.make + +WWW: $(OUTPODFILES:.pod=.html) diff --git a/Documentation/man/index.pod b/Documentation/man/index.pod new file mode 100644 index 0000000000..e633352326 --- /dev/null +++ b/Documentation/man/index.pod @@ -0,0 +1,50 @@ +=head1 NAME + +The Manuals of LilyPond -- the GNU Project music typesetter + +=head1 DESCRIPTION + +These are the manpages that document LilyPond. + + +=head2 Documentation: manpages, manuals + + +=over 4 + +=item * + +manual page for mi2mu, the MIDI convertor. + + +=item * + +The manual page + + +=item * + +Easy titling for LilyPond + + +=item * + +The mudela convertor: convert-mudela + + +=item * + +mudela in TeX: mudela-book + + +=back diff --git a/Documentation/tex/Makefile b/Documentation/tex/Makefile new file mode 100644 index 0000000000..8d2ea583d9 --- /dev/null +++ b/Documentation/tex/Makefile @@ -0,0 +1,15 @@ + +depth=../.. +include ./$(depth)/make/Include.make +include ./$(depth)/make/Docrules.make +# + +DOCFILES = $(wildcard *.doc) +OUTDOCFILES = $(addprefix $(outdir)/, $(DOCFILES)) +BIBFILES= $(wildcard *.bib) +EXTRA_DISTFILES= $(BIBFILES) $(DOCFILES) + +dvi: $(DVIFILES) + +local-WWW: $(OUTDOCFILES:.doc=.ps.gz) + ls-latex --extension .ps.gz $(DOCFILES) > $(outdir)/index.html diff --git a/Documentation/colorado.bib b/Documentation/tex/colorado.bib similarity index 100% rename from Documentation/colorado.bib rename to Documentation/tex/colorado.bib diff --git a/Documentation/engraving.bib b/Documentation/tex/engraving.bib similarity index 100% rename from Documentation/engraving.bib rename to Documentation/tex/engraving.bib diff --git a/Documentation/fonts.tex b/Documentation/tex/fonts.doc similarity index 100% rename from Documentation/fonts.tex rename to Documentation/tex/fonts.doc diff --git a/Documentation/mudela.doc b/Documentation/tex/mudela.doc similarity index 99% rename from Documentation/mudela.doc rename to Documentation/tex/mudela.doc index 60d906ac77..1d3e303bd5 100644 --- a/Documentation/mudela.doc +++ b/Documentation/tex/mudela.doc @@ -196,7 +196,7 @@ the precise working of Mudela is coupled to the innards of LilyPond. If you really want to know all the details, your best bet would be to get the sources to LilyPond and read the parser and scanner source. They are in \file{lilypond-x.y.z/lily/parser.y}, -\file{lilypond-x.y.z/lily/lexer.l\footnote{Of course, it would be even +\file{lilypond-x.y.z/lily/lexer.l}\footnote{Of course, it would be even better if you would improve LilyPond and send the resulting diffs to us. But that would a really different ballpark (And we haven't started with the programming guide yet.)} diff --git a/flower/include/config.hh b/Documentation/tex/out/dummy.dep similarity index 100% rename from flower/include/config.hh rename to Documentation/tex/out/dummy.dep diff --git a/INSTALL.txt b/INSTALL.txt index d52fa09d70..d1baab3015 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -61,7 +61,7 @@ RECOMMENDED -27/Apr/98 LilyPond 0.1.59 1 +25/Apr/98 LilyPond 0.1.59 1 @@ -127,7 +127,7 @@ CONFIGURING and COMPILING -27/Apr/98 LilyPond 0.1.59 2 +25/Apr/98 LilyPond 0.1.59 2 @@ -193,7 +193,7 @@ CONFIGURING FOR MULTIPLE PLATFORMS -27/Apr/98 LilyPond 0.1.59 3 +25/Apr/98 LilyPond 0.1.59 3 @@ -259,7 +259,7 @@ EXAMPLE -27/Apr/98 LilyPond 0.1.59 4 +25/Apr/98 LilyPond 0.1.59 4 @@ -325,6 +325,6 @@ AUTHORS -27/Apr/98 LilyPond 0.1.59 5 +25/Apr/98 LilyPond 0.1.59 5 diff --git a/NEWS b/NEWS index 7fc5f9bcb5..4a4d8ad0b5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,40 @@ +************** +pl 60 + - mats patches: use Latex font stuff. + - fixes to the .59 patch release (jcn) + - make website|examples target + +pl 59.jcn3 + - bf: preludes-5 + - no inline compiler warnings by default + - bf: gcc 2.8 compile bow.cc + - moved functions with loops from varray.hh to varray.cc + - bf: minimum length for tie + - slur clipping standard + - bf: second broken slur minimum length + +pl 59.jcn2 + - added some to .dstream + - bf: second part of broken slur + - slur encompassing noteheads adjust + - bwv'd preludes + - bf: make-patch -d + - doc'd rerunning of autoconf + - rest of real standje (rename and move simplified standchen to + input/test?) + - bf: clipping + - bit better bar number placement + +pl 59.jcn1 + - more INLINE + - bf: multi-measure rest + +pl 58.jcn7 + - los-toros: do multi-bar rest + + + +*************** pl 59 - ly2dvi 0.9.hwn1, -K switch, - doc: moved manpages in separate directory. diff --git a/PATCHES.txt b/PATCHES.txt index a608193dc0..70d234cbd7 100644 --- a/PATCHES.txt +++ b/PATCHES.txt @@ -61,7 +61,7 @@ PREREQUISITES -20/Apr/98 LilyPond 0.1.59 1 +28/Apr/98 LilyPond 0.1.60 1 @@ -89,6 +89,20 @@ PATCHES(1) LilyPond documentation PATCHES(1) test/ + If you're following LilyPond development regularly, you + probably want to download just the patch for each + subsequent release. After downloading the patch (into the + patches directory, of course), simply apply it: + + gzip -dc ../patches/patch-0.1.49.gz | patch -p1 -E + + and don't forget to make automatically generated files: + + autoconf 1) + configure + + +SYNCHRONISE If you're not very quick with sending your patch, there's a good chance that an new release of LilyPond comes available. In such a case (and sometimes for other unkown @@ -98,13 +112,30 @@ PATCHES(1) LilyPond documentation PATCHES(1) against this new source tree: cd lilypond-0.1.49 - zpatch -p0 -E < ../patches/patch-0.1.48.jcn1.gz + gzip -dc ../patches/patch-0.1.48.jcn1.gz | patch -p1 -E + autoconf 1) + configure Then, make a patch as shown above. + 1) patches don't include automatically generated files, + i.e. configure + and files generated by configure. + MAINTAINER Han-Wen Nienhuys + + +28/Apr/98 LilyPond 0.1.60 2 + + + + + +PATCHES(1) LilyPond documentation PATCHES(1) + + Just keep on sending those patches! @@ -127,6 +158,41 @@ MAINTAINER -20/Apr/98 LilyPond 0.1.59 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +28/Apr/98 LilyPond 0.1.60 3 diff --git a/TODO b/TODO index 4d189db612..06720105d2 100644 --- a/TODO +++ b/TODO @@ -20,6 +20,10 @@ grep for TODO and ugh/ug * robustify Beam (in case of no stems, 32nd notes) + * fix [c8 c16 c16] (mustn't slope) + + * fix silly " "2*12 a4 (=4*12) sticky plet + * check for groff / troff/ nroff et * latex quirk? @@ -180,9 +184,13 @@ languages: * add to MIDI output: - tempo change + - ornaments (and trills?) - repeat - slurs - - dynamics etc. + - accents + - dynamics + - account for rhythmic position in measure + - etc. * grace notes - make separate class for Grace_*_engravers diff --git a/VERSION b/VERSION index ca4b0d8662..5256cfd8a8 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=59 +PATCH_LEVEL=60 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/bin/genheader.py b/bin/genheader.py old mode 100644 new mode 100755 diff --git a/bin/ls-latex.py b/bin/ls-latex.py new file mode 100644 index 0000000000..1f53bb81f5 --- /dev/null +++ b/bin/ls-latex.py @@ -0,0 +1,82 @@ +#!@PYTHON@ + +import sys +import os + +lilypath ='' +try: + lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/' +except KeyError: + print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' + sys.exit(1) + +lilypath = lilypath + '/bin/' +sys.path.append(lilypath) + +from lilypython import * +import __main__ +import glob + + + +latex_author_re = regex.compile('\\author{\([^}]+\)}') +latex_title_re = regex.compile('\\title{\([^}]+\)}') + +class Latex_head: + def __init__ (self): + self.author = '' + self.title = '' + self.date = '' + self.site = '' + + +def read_latex_header (fn): + s = gulp_file (fn) + i = regex.search( '\\\\begin{document}', s) + if i < 0: + raise 'huh?' + s = s[:i] + s = regsub.gsub('%.*$', '', s) + s = regsub.gsub('\n', ' ', s) + if latex_author_re.search (s) == -1 : + raise 'huh?' + + header = Latex_head() + header.filename= fn; + header.author = latex_author_re.group (1) + if latex_title_re.search (s) == -1: + raise 'huh?' + header.title = latex_title_re.group (1) + return header + +def print_html_head (l,o,h): + (pre, ext) = o + out = regsub.gsub ('\.[^.]+$', ext, h.filename) + l.write ('
  • %s

    by %s

    ' % (pre + out, h.title, h.author )) + l.write ('
    • ') + + +import getopt + +(cl_options, files) = getopt.getopt(sys.argv[1:], + 'e:h', ['help', 'prefix=' ,'extension=']) + +tex = '' +output ='' +pre = '' + +for opt in cl_options: + o = opt[0] + a = opt[1] + if o == '--extension' or o == '-e': + ext = a + if o == '--prefix' or o == '-p': + pre = a + +l = sys.stdout + +l.write ('TeX documents

    TeX documents

      ') + +for x in files: + print_html_head (l, (pre,ext), read_latex_header (x)) +l.write ('
    ') diff --git a/bin/make-patch.py b/bin/make-patch.py index 69e14b0cc2..d6c8502d9e 100755 --- a/bin/make-patch.py +++ b/bin/make-patch.py @@ -53,7 +53,7 @@ usage \n\ cd lilypond-source-dir; patch -E -p1 < %s\n\ \n\ Patches do not contain automatically generated files, \n\ -i.e. you should rerun configure\n\n' +i.e. you should rerun autoconf and configure\n\n' # ugh, how to get rid of .tex files generated by lily? pats = ['*.lsm', 'configure', '*.txt', 'lilypond.spec'] @@ -144,8 +144,9 @@ def main(): sys.stderr.write('copying ' + srcdir + ' to ' + diffdir + '\n') # os.system('cp -pr %s %s' % (srcdir, diffdir)) os.system('mkdir -p %s '% (diffdir)) - os.system('tar cf - --exclude out %s | tar -xf - -C %s' - % (srcdir, '/tmp/make-patch')) + os.chdir (srcdir) + os.system('tar cf - --exclude out . | tar -xf - -C %s' + % diffdir) if to_b != 0: os.chdir ('/tmp/make-patch') @@ -156,8 +157,9 @@ def main(): sys.stderr.write('copying ' + srcdir + ' to ' + diffdir + '\n') os.system('mkdir -p %s '% (diffdir)) # os.system('cp -pr %s %s' (srcdir, diffdir))% - os.system('tar -cf - --exclude out %s | tar -xf - -C %s ' - % (srcdir, '/tmp/make-patch')) + os.chdir (srcdir) + os.system('tar -cf - --exclude out . | tar -xf - -C %s ' + % diffdir) os.chdir('/tmp/make-patch') os.chdir(todir) diff --git a/bin/make-website.py b/bin/make-website.py index ccff8df603..ac6d865af6 100755 --- a/bin/make-website.py +++ b/bin/make-website.py @@ -55,6 +55,7 @@ include_path=[ 'input', 'mutopia' , 'mutopia/J.S.Bach', 'mutopia/Coriolan', def set_vars(): __main__.lilyversion = version_tuple_to_str(lilydirs.version_tuple()) os.environ["TEXINPUTS"] = os.environ["TEXINPUTS"] + ":%s/input/:" % depth; + os.environ["CONFIGSUFFIX"] = 'www'; os.environ["LILYINCLUDE"] = join (':', __main__.include_path) +':'+ os.environ["LILYINCLUDE"]; os.environ["LILYTOP"] = depth; diff --git a/bin/mf-to-table.py b/bin/mf-to-table.py index e3827346ca..4c6e542890 100755 --- a/bin/mf-to-table.py +++ b/bin/mf-to-table.py @@ -27,8 +27,6 @@ except KeyError: except KeyError: print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/' - sys.exit(1) - lilypath = lilypath + '/bin/' sys.path.append(lilypath) @@ -178,7 +176,6 @@ class Log_reader: raise 'unknown label: ' + label def writedeps (self, deps): - filename = deps[0] split = os.path.splitext(filename) basename=split[0]; diff --git a/bin/mutopia-index.py b/bin/mutopia-index.py index a268cded6e..ba178fdb72 100644 --- a/bin/mutopia-index.py +++ b/bin/mutopia-index.py @@ -16,16 +16,29 @@ from lilypython import * -def gen_list(inputs, filename): +def gen_list(inputs, subdir, filename): + (pre, subdirs, post)=subdir print "generating HTML list %s\n" % filename list = open(filename, 'w') - list.write ('Rendered Examples\n' - 'These example files are taken from the LilyPond distribution.\n' + list.write ('Rendered Examples\n') + list.write ('') + if len(subdirs): + list.write ('

    subdirectories

    ') + list.write ('
      ') + for ex in subdirs: + print 'subdir %s ' % ex + list.write ('
    • Subdirectory: %s
      • \n' % (pre + ex + post , ex)) + + list.write ('
    ') + + list.write('

    Contents of this directory

    \n'); + list.write ('These example files are taken from the LilyPond distribution.\n' 'LilyPond currently only outputs TeX and MIDI. The pictures and\n' 'PostScript files were generated using TeX, Ghostscript and some\n' 'graphics tools. The papersize used for these examples is A4. The GIF\n' 'files have been scaled to eliminate aliasing.\n'); + for ex in inputs: print '%s, ' % ex header = read_mudela_header(ex + '.ly.txt') @@ -65,4 +78,22 @@ def gen_list(inputs, filename): allfiles = multiple_find (['*.ly.txt'], '.') -gen_list (sys.argv[1:], 'index.html') +import getopt + +(cl_options, files) = getopt.getopt(sys.argv[1:], + 'hs:', ['help', 'subdirs=', 'suffix=', 'prefix=']) +subdir_pre='' +subdir_suf ='' + +subdirs =[] +for opt in cl_options: + o = opt[0] + a = opt[1] + if o == '--subdirs' or o == '-s': + subdirs.append (a) + elif o == '--prefix': + subdir_pre = a + elif o == '--suffix': + subdir_suf = a + +gen_list (files, (subdir_pre, subdirs, subdir_suf), 'index.html') diff --git a/configure b/configure index 0b529a29cc..9bec2ccabc 100755 --- a/configure +++ b/configure @@ -758,17 +758,21 @@ fi if test "$printing_b" = no; then + # ugh cat >> confdefs.h <<\EOF #define NPRINT 1 EOF + DEFINES="$DEFINES -DNPRINT" fi if test "$checking_b" = no; then + # ugh cat >> confdefs.h <<\EOF #define NDEBUG 1 EOF + DEFINES="$DEFINES -DNDEBUG" fi if test "$optimise_b" = yes; then @@ -822,7 +826,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:826: checking for $ac_word" >&5 +echo "configure:830: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -853,7 +857,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:857: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:861: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -863,11 +867,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -887,12 +891,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:891: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:895: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:896: checking whether we are using GNU C++" >&5 +echo "configure:900: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -901,7 +905,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -916,7 +920,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:920: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -946,7 +950,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:950: checking for $ac_word" >&5 +echo "configure:954: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,7 +987,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:987: checking for a BSD compatible install" >&5 +echo "configure:991: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1037,7 +1041,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1041: checking for $ac_word" >&5 +echo "configure:1045: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1071,7 +1075,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1075: checking for $ac_word" >&5 +echo "configure:1079: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1112,7 +1116,7 @@ test -n "$FIND" || FIND="error" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:1116: checking for 8-bit clean memcmp" >&5 +echo "configure:1120: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1120,7 +1124,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -1151,12 +1155,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1155: checking for vprintf" >&5 +echo "configure:1159: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1206,12 +1210,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1210: checking for _doprnt" >&5 +echo "configure:1214: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1264,12 +1268,12 @@ fi for ac_func in memmem snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1268: checking for $ac_func" >&5 +echo "configure:1272: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1372,7 +1376,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1376: checking for $ac_word" >&5 +echo "configure:1380: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1406,7 +1410,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1410: checking for $ac_word" >&5 +echo "configure:1414: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1440,7 +1444,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1444: checking for $ac_word" >&5 +echo "configure:1448: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1472,7 +1476,7 @@ test -n "$MAKE" || MAKE="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1476: checking for $ac_word" >&5 +echo "configure:1480: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1504,7 +1508,7 @@ fi # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1508: checking for $ac_word" >&5 +echo "configure:1512: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1538,7 +1542,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1542: checking for $ac_word" >&5 +echo "configure:1546: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1572,7 +1576,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1576: checking for $ac_word" >&5 +echo "configure:1580: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1608,7 +1612,7 @@ if test "x$TEXPREFIX" = xauto ; then echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:1612: checking TeX/MF root dir directory" >&5 +echo "configure:1616: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -1649,7 +1653,7 @@ if test "x$MFDIR" = xauto; then echo $ac_n "checking MF input directory""... $ac_c" 1>&6 -echo "configure:1653: checking MF input directory" >&5 +echo "configure:1657: checking MF input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')` @@ -1674,7 +1678,7 @@ if test "x$TEXDIR" = xauto ; then echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:1678: checking TeX input directory" >&5 +echo "configure:1682: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -1791,7 +1795,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1795: checking how to run the C++ preprocessor" >&5 +echo "configure:1799: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1804,12 +1808,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1829,17 +1833,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1833: checking for FlexLexer.h" >&5 +echo "configure:1837: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* diff --git a/configure.in b/configure.in index 5b00c8f99d..c1d2bb5cce 100644 --- a/configure.in +++ b/configure.in @@ -106,11 +106,15 @@ AC_ARG_ENABLE(config, if test "$printing_b" = no; then + # ugh AC_DEFINE(NPRINT) + DEFINES="$DEFINES -DNPRINT" fi if test "$checking_b" = no; then + # ugh AC_DEFINE(NDEBUG) + DEFINES="$DEFINES -DNDEBUG" fi if test "$optimise_b" = yes; then diff --git a/flower/NEWS b/flower/NEWS index 111717025e..eda8c8ccf4 100644 --- a/flower/NEWS +++ b/flower/NEWS @@ -1,3 +1,7 @@ +pl 41.jcn1 + trying to get rid of 2.8 ice: + - moved functions with loops from varray.hh to varray.cc + pl 41 - matrix fixes; more inlining no virtual methods diff --git a/flower/VERSION b/flower/VERSION index 53f4cca490..3ab55969ef 100644 --- a/flower/VERSION +++ b/flower/VERSION @@ -4,4 +4,4 @@ PATCH_LEVEL=41 # use to send patches, always empty for released version: # -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 diff --git a/flower/include/full-storage.hh b/flower/include/full-storage.hh index 8fec189c73..10438e3a7e 100644 --- a/flower/include/full-storage.hh +++ b/flower/include/full-storage.hh @@ -13,6 +13,10 @@ #include "varray.hh" #include "real.hh" +#ifndef INLINE +#define INLINE inline +#endif + /// simplest matrix storage. refer to its baseclass for the doco. class Full_storage { @@ -26,9 +30,9 @@ class Full_storage /// the storage Real** els_p_p_; - void init() ; + INLINE void init() ; - bool valid (int i, int j) const ; + INLINE bool valid (int i, int j) const ; void resize_rows (int); void resize_cols (int); @@ -40,13 +44,13 @@ public: void OK() const; /// height of matrix - int rows() const; + INLINE int rows() const; /// width of matrix - int cols() const; + INLINE int cols() const; /// size if square - int dim() const; + INLINE int dim() const; /** set the size. contents lost. PRE @@ -87,10 +91,10 @@ public: in the 0-part of a sparse matrix. */ - Real& elem (int i,int j); + INLINE Real& elem (int i,int j); /// access a element, no modify - Real elem (int i, int j) const; + INLINE Real elem (int i, int j) const; Array row (int i) const ; Array column (int j) const; @@ -124,7 +128,7 @@ public: .. */ - bool mult_ok (int i, int j) const; + INLINE bool mult_ok (int i, int j) const; /** walk through matrix (regular multiply). @@ -134,12 +138,12 @@ public: PRE mult_ok (i,j) */ - void mult_next (int &i, int &j) const; + INLINE void mult_next (int &i, int &j) const; /** valid matrix entry. return false if at end of row */ - bool trans_ok (int i, int j) const; + INLINE bool trans_ok (int i, int j) const; /** walk through matrix (transposed multiply). @@ -149,22 +153,18 @@ public: ver_ok (i,j) */ - void trans_next (int &i, int &j) const; + INLINE void trans_next (int &i, int &j) const; - Full_storage(); - Full_storage (int i, int j); - Full_storage (Full_storage const&); - Full_storage (int i); + INLINE Full_storage(); + INLINE Full_storage (int i, int j); + INLINE Full_storage (Full_storage const&); + INLINE Full_storage (int i); void operator=(Full_storage const &); ~Full_storage(); }; -#ifndef INLINE -#define INLINE inline -#endif - #include "full-storage.icc" diff --git a/flower/include/varray.hh b/flower/include/varray.hh index 82106ca8d6..ce9c2217e7 100644 --- a/flower/include/varray.hh +++ b/flower/include/varray.hh @@ -8,13 +8,12 @@ #define ARRAY_H #include -/// copy a bare (C-)array from #src# to #dest# sized #count# -template -inline void arrcpy (T*dest, T*src, int count) { - for (int i_shadows_local=0; i_shadows_local < count ; i_shadows_local++) - *dest++ = *src++; -} +#ifndef INLINE +#define INLINE inline +#endif +/// copy a bare (C-)array from #src# to #dest# sized #count# +template void arrcpy (T*dest, T*src, int count); /** Scaleable array/stack template, for a type T with default constructor. @@ -187,14 +186,8 @@ public: } bool empty() const { return !size_; } - void insert (T k, int j) - { - assert (j >=0 && j<= size_); - set_size (size_+1); - for (int i=size_-1; i > j; i--) - array_p_[i] = array_p_[i-1]; - array_p_[j] = k; - } + + void insert (T k, int j); /** remove i-th element, and return it. */ @@ -218,24 +211,7 @@ public: } // quicksort. void sort (int (*compare)(T const&,T const&), - int lower = -1, int upper = -1) - { - if (lower < 0) - { - lower = 0 ; - upper = size()-1; - } - if (lower >= upper) - return; - swap (lower, (lower+upper)/2); - int last = lower; - for (int i= lower +1; i <= upper; i++) - if (compare (array_p_[i], array_p_[lower]) < 0) - swap (++last,i); - swap (lower, last); - sort (compare, lower, last-1); - sort (compare, last+1, upper); - } + int lower = -1, int upper = -1); void concat (Array const &src) { int s = size_; @@ -251,12 +227,9 @@ public: arrcpy (r.array_p_, array_p_ + lower, s); return r; } - void reverse() - { - int h = size_/2; - for (int i =0,j = size_-1; i < h; i++,j--) - swap (i,j); - } + void reverse(); }; +#include "varray.icc" + #endif diff --git a/flower/include/varray.icc b/flower/include/varray.icc new file mode 100644 index 0000000000..4d8ccb9387 --- /dev/null +++ b/flower/include/varray.icc @@ -0,0 +1,66 @@ +/* + (c) Han-Wen Nienhuys 1995,96,97,98 + + Distributed under GNU GPL +*/ + + +#if 0 +#include "varray.hh" +#ifdef INLINE +#undef INLINE +#endif + +#define INLINE +#endif + +/* + functions with loops don't inline + */ + +template INLINE void +arrcpy (T*dest, T*src, int count) +{ + for (int i_shadows_local=0; i_shadows_local < count ; i_shadows_local++) + *dest++ = *src++; +} + +template INLINE void +Array::insert (T k, int j) +{ + assert (j >=0 && j<= size_); + set_size (size_+1); + for (int i=size_-1; i > j; i--) + array_p_[i] = array_p_[i-1]; + array_p_[j] = k; +} + +template INLINE void +Array::sort (int (*compare)(T const&,T const&), + int lower = -1, int upper = -1) +{ + if (lower < 0) + { + lower = 0 ; + upper = size () - 1; + } + if (lower >= upper) + return; + swap (lower, (lower+upper)/2); + int last = lower; + for (int i= lower +1; i <= upper; i++) + if (compare (array_p_[i], array_p_[lower]) < 0) + swap (++last,i); + swap (lower, last); + sort (compare, lower, last-1); + sort (compare, last+1, upper); +} + +template INLINE void +Array::reverse () +{ + int h = size_/2; + for (int i =0,j = size_-1; i < h; i++,j--) + swap (i,j); +} + diff --git a/init/feta11.ly b/init/feta11.ly new file mode 100644 index 0000000000..404a216c1b --- /dev/null +++ b/init/feta11.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta11.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 4.12\pt -1.72\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 4.12\pt 0.00\pt 1.72\pt + "0o" "\\outsidewholerest" -1.72\pt 5.84\pt -1.72\pt 0.28\pt + "1o" "\\outsidehalfrest" -1.72\pt 5.84\pt -0.28\pt 1.72\pt + "2" "\\quartrest" 0.00\pt 2.97\pt 2.06\pt 9.90\pt + "3" "\\eighthrest" 0.00\pt 3.67\pt 2.75\pt 7.81\pt + "4" "\\sixteenthrest" 0.00\pt 4.27\pt 0.00\pt 7.81\pt + "5" "\\thirtysecondrest" 0.00\pt 4.81\pt 0.00\pt 10.56\pt + "6" "\\sixtyfourthrest" 0.00\pt 5.16\pt 0.00\pt 13.31\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 5.75\pt 0.00\pt 16.06\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 3.03\pt -4.12\pt 4.12\pt + "0" "\\natural" 0.00\pt 1.83\pt -4.12\pt 4.12\pt + "-1" "\\flat" -0.33\pt 2.20\pt -1.38\pt 5.50\pt + "-2" "\\flatflat" -0.33\pt 3.99\pt -1.38\pt 5.50\pt + "2" "\\sharpsharp" 0.00\pt 2.75\pt -1.38\pt 1.38\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.24\pt -0.62\pt 0.62\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.24\pt -1.38\pt 1.38\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-1l" "\\brevisledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "-2" "\\longaball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-2l" "\\longaledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "0" "\\wholeball" 0.00\pt 5.45\pt -1.51\pt 1.51\pt + "0l" "\\wholeledger" -1.36\pt 6.81\pt -0.28\pt 0.28\pt + "1" "\\halfball" 0.00\pt 3.79\pt -1.51\pt 1.51\pt + "1l" "\\halfledger" -0.95\pt 4.74\pt -0.28\pt 0.28\pt + "2" "\\quartball" 0.00\pt 3.63\pt -1.51\pt 1.51\pt + "2l" "\\quartledger" -0.91\pt 4.54\pt -0.28\pt 0.28\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -3.64\pt 3.64\pt -0.21\pt 3.99\pt + "dfermata" "\\dfermata" -3.64\pt 3.64\pt -3.99\pt 0.21\pt + "sforzato" "\\sforzatoaccent" -2.47\pt 2.47\pt -1.38\pt 1.38\pt + "staccato" "\\staccato" -0.41\pt 0.41\pt -0.41\pt 0.41\pt + "ustaccatissimo" "\\ustaccatissimo" -0.55\pt 0.55\pt -0.20\pt 2.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.55\pt 0.55\pt -2.75\pt 0.20\pt + "tenuto" "\\tenuto" -2.47\pt 2.47\pt -0.17\pt 0.17\pt + "umarcato" "\\umarcato" -1.38\pt 1.38\pt 0.00\pt 3.03\pt + "dmarcato" "\\dmarcato" -1.38\pt 1.38\pt -3.03\pt 0.00\pt + "open" "\\ouvert" -1.10\pt 1.10\pt -1.38\pt 1.38\pt + "stopped" "\\plusstop" -1.51\pt 1.51\pt -1.51\pt 1.51\pt + "upbow" "\\upbow" -1.79\pt 1.79\pt 0.00\pt 5.72\pt + "downbow" "\\downbow" -2.06\pt 2.06\pt 0.00\pt 3.67\pt + "reverseturn" "\\reverseturn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt + "turn" "\\turn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt + "trill" "\\trill" -2.75\pt 2.75\pt 0.00\pt 6.19\pt + "upedalheel" "\\upedalheel" -1.38\pt 1.38\pt -1.38\pt 1.83\pt + "dpedalheel" "\\dpedalheel" -1.38\pt 1.38\pt -1.83\pt 1.38\pt + "upedaltoe" "\\upedaltoe" -1.38\pt 1.38\pt 0.00\pt 4.12\pt + "dpedaltoe" "\\dpedaltoe" -1.38\pt 1.38\pt -4.12\pt 0.00\pt + "flageolet" "\\flageolet" -1.47\pt 1.47\pt -1.47\pt 1.47\pt + "trilelement" "\\trilelement" -1.83\pt 0.72\pt -1.38\pt 1.38\pt + "prall" "\\prall" -3.11\pt 3.11\pt -1.38\pt 1.38\pt + "mordent" "\\mordent" -3.11\pt 3.11\pt -1.38\pt 1.38\pt + "prallprall" "\\prallprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "prallmordent" "\\prallmordent" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "upprall" "\\upprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "downprall" "\\downprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.14\pt 3.39\pt -8.43\pt 0.14\pt + "u4" "\\sixteenthflag" -0.14\pt 3.39\pt -9.80\pt 0.14\pt + "u5" "\\thirtysecondflag" -0.14\pt 3.39\pt -11.87\pt 0.14\pt + "u6" "\\sixtyfourthflag" -0.14\pt 3.39\pt -14.62\pt 0.14\pt + "d3" "\\deighthflag" -0.14\pt 3.76\pt -0.14\pt 8.02\pt + "d4" "\\dsixteenthflag" -0.14\pt 3.76\pt -0.14\pt 8.43\pt + "d5" "\\dthirtysecondflag" -0.14\pt 3.76\pt -0.14\pt 10.77\pt + "d6" "\\dsixtyfourthflag" -0.14\pt 3.76\pt -0.14\pt 12.14\pt + } + "clefs" = \table { + "alto" "\\altoclef" -2.75\pt 10.24\pt -5.50\pt 5.50\pt + "alto_change" "\\caltoclef" -2.20\pt 8.19\pt -4.40\pt 4.40\pt + "bass" "\\bassclef" -1.38\pt 9.90\pt -6.88\pt 2.75\pt + "bass_change" "\\cbassclef" -1.10\pt 7.92\pt -5.50\pt 2.20\pt + "violin" "\\violinclef" -2.40\pt 10.28\pt -8.25\pt 13.75\pt + "violin_change" "\\cviolinclef" -2.08\pt 8.06\pt -6.60\pt 11.00\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta11.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 4.12\pt -1.72\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 4.12\pt 0.00\pt 1.72\pt + "0o" "\\outsidewholerest" -1.72\pt 5.84\pt -1.72\pt 0.28\pt + "1o" "\\outsidehalfrest" -1.72\pt 5.84\pt -0.28\pt 1.72\pt + "2" "\\quartrest" 0.00\pt 2.97\pt 2.06\pt 9.90\pt + "3" "\\eighthrest" 0.00\pt 3.67\pt 2.75\pt 7.81\pt + "4" "\\sixteenthrest" 0.00\pt 4.27\pt 0.00\pt 7.81\pt + "5" "\\thirtysecondrest" 0.00\pt 4.81\pt 0.00\pt 10.56\pt + "6" "\\sixtyfourthrest" 0.00\pt 5.16\pt 0.00\pt 13.31\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 5.75\pt 0.00\pt 16.06\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 3.03\pt -4.12\pt 4.12\pt + "0" "\\natural" 0.00\pt 1.83\pt -4.12\pt 4.12\pt + "-1" "\\flat" -0.33\pt 2.20\pt -1.38\pt 5.50\pt + "-2" "\\flatflat" -0.33\pt 3.99\pt -1.38\pt 5.50\pt + "2" "\\sharpsharp" 0.00\pt 2.75\pt -1.38\pt 1.38\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.24\pt -0.62\pt 0.62\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.24\pt -1.38\pt 1.38\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-1l" "\\brevisledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "-2" "\\longaball" 0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-2l" "\\longaledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "0" "\\wholeball" 0.00\pt 5.45\pt -1.51\pt 1.51\pt + "0l" "\\wholeledger" -1.36\pt 6.81\pt -0.28\pt 0.28\pt + "1" "\\halfball" 0.00\pt 3.79\pt -1.51\pt 1.51\pt + "1l" "\\halfledger" -0.95\pt 4.74\pt -0.28\pt 0.28\pt + "2" "\\quartball" 0.00\pt 3.63\pt -1.51\pt 1.51\pt + "2l" "\\quartledger" -0.91\pt 4.54\pt -0.28\pt 0.28\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -3.64\pt 3.64\pt -0.21\pt 3.99\pt + "dfermata" "\\dfermata" -3.64\pt 3.64\pt -3.99\pt 0.21\pt + "sforzato" "\\sforzatoaccent" -2.47\pt 2.47\pt -1.38\pt 1.38\pt + "staccato" "\\staccato" -0.41\pt 0.41\pt -0.41\pt 0.41\pt + "ustaccatissimo" "\\ustaccatissimo" -0.55\pt 0.55\pt -0.20\pt 2.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.55\pt 0.55\pt -2.75\pt 0.20\pt + "tenuto" "\\tenuto" -2.47\pt 2.47\pt -0.17\pt 0.17\pt + "umarcato" "\\umarcato" -1.38\pt 1.38\pt 0.00\pt 3.03\pt + "dmarcato" "\\dmarcato" -1.38\pt 1.38\pt -3.03\pt 0.00\pt + "open" "\\ouvert" -1.10\pt 1.10\pt -1.38\pt 1.38\pt + "stopped" "\\plusstop" -1.51\pt 1.51\pt -1.51\pt 1.51\pt + "upbow" "\\upbow" -1.79\pt 1.79\pt 0.00\pt 5.72\pt + "downbow" "\\downbow" -2.06\pt 2.06\pt 0.00\pt 3.67\pt + "reverseturn" "\\reverseturn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt + "turn" "\\turn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt + "trill" "\\trill" -2.75\pt 2.75\pt 0.00\pt 6.19\pt + "upedalheel" "\\upedalheel" -1.38\pt 1.38\pt -1.38\pt 1.83\pt + "dpedalheel" "\\dpedalheel" -1.38\pt 1.38\pt -1.83\pt 1.38\pt + "upedaltoe" "\\upedaltoe" -1.38\pt 1.38\pt 0.00\pt 4.12\pt + "dpedaltoe" "\\dpedaltoe" -1.38\pt 1.38\pt -4.12\pt 0.00\pt + "flageolet" "\\flageolet" -1.47\pt 1.47\pt -1.47\pt 1.47\pt + "trilelement" "\\trilelement" -1.83\pt 0.72\pt -1.38\pt 1.38\pt + "prall" "\\prall" -3.11\pt 3.11\pt -1.38\pt 1.38\pt + "mordent" "\\mordent" -3.11\pt 3.11\pt -1.38\pt 1.38\pt + "prallprall" "\\prallprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "prallmordent" "\\prallmordent" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "upprall" "\\upprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + "downprall" "\\downprall" -4.39\pt 4.39\pt -1.38\pt 1.38\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.14\pt 3.39\pt -8.43\pt 0.14\pt + "u4" "\\sixteenthflag" -0.14\pt 3.39\pt -9.80\pt 0.14\pt + "u5" "\\thirtysecondflag" -0.14\pt 3.39\pt -11.87\pt 0.14\pt + "u6" "\\sixtyfourthflag" -0.14\pt 3.39\pt -14.62\pt 0.14\pt + "d3" "\\deighthflag" -0.14\pt 3.76\pt -0.14\pt 8.02\pt + "d4" "\\dsixteenthflag" -0.14\pt 3.76\pt -0.14\pt 8.43\pt + "d5" "\\dthirtysecondflag" -0.14\pt 3.76\pt -0.14\pt 10.77\pt + "d6" "\\dsixtyfourthflag" -0.14\pt 3.76\pt -0.14\pt 12.14\pt + } + "clefs" = \table { + "alto" "\\altoclef" -2.75\pt 10.24\pt -5.50\pt 5.50\pt + "alto_change" "\\caltoclef" -2.20\pt 8.19\pt -4.40\pt 4.40\pt + "bass" "\\bassclef" -1.38\pt 9.90\pt -6.88\pt 2.75\pt + "bass_change" "\\cbassclef" -1.10\pt 7.92\pt -5.50\pt 2.20\pt + "violin" "\\violinclef" -2.40\pt 10.28\pt -8.25\pt 13.75\pt + "violin_change" "\\cviolinclef" -2.08\pt 8.06\pt -6.60\pt 11.00\pt + } + % } % $name diff --git a/init/feta13.ly b/init/feta13.ly new file mode 100644 index 0000000000..95e17d1dcb --- /dev/null +++ b/init/feta13.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta13.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 4.88\pt -2.03\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 4.88\pt 0.00\pt 2.03\pt + "0o" "\\outsidewholerest" -2.03\pt 6.91\pt -2.03\pt 0.33\pt + "1o" "\\outsidehalfrest" -2.03\pt 6.91\pt -0.33\pt 2.03\pt + "2" "\\quartrest" 0.00\pt 3.51\pt 2.44\pt 11.70\pt + "3" "\\eighthrest" 0.00\pt 4.33\pt 3.25\pt 9.24\pt + "4" "\\sixteenthrest" 0.00\pt 5.04\pt 0.00\pt 9.24\pt + "5" "\\thirtysecondrest" 0.00\pt 5.69\pt 0.00\pt 12.49\pt + "6" "\\sixtyfourthrest" 0.00\pt 6.10\pt 0.00\pt 15.74\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 6.79\pt 0.00\pt 18.99\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 3.58\pt -4.88\pt 4.88\pt + "0" "\\natural" 0.00\pt 2.17\pt -4.88\pt 4.88\pt + "-1" "\\flat" -0.39\pt 2.60\pt -1.62\pt 6.50\pt + "-2" "\\flatflat" -0.39\pt 4.71\pt -1.62\pt 6.50\pt + "2" "\\sharpsharp" 0.00\pt 3.25\pt -1.62\pt 1.62\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.46\pt -0.73\pt 0.73\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.46\pt -1.62\pt 1.62\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt + "-1l" "\\brevisledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt + "-2" "\\longaball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt + "-2l" "\\longaledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt + "0" "\\wholeball" 0.00\pt 6.44\pt -1.79\pt 1.79\pt + "0l" "\\wholeledger" -1.61\pt 8.04\pt -0.33\pt 0.33\pt + "1" "\\halfball" 0.00\pt 4.48\pt -1.79\pt 1.79\pt + "1l" "\\halfledger" -1.12\pt 5.60\pt -0.33\pt 0.33\pt + "2" "\\quartball" 0.00\pt 4.29\pt -1.79\pt 1.79\pt + "2l" "\\quartledger" -1.07\pt 5.37\pt -0.33\pt 0.33\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -4.31\pt 4.31\pt -0.24\pt 4.71\pt + "dfermata" "\\dfermata" -4.31\pt 4.31\pt -4.71\pt 0.24\pt + "sforzato" "\\sforzatoaccent" -2.92\pt 2.92\pt -1.62\pt 1.62\pt + "staccato" "\\staccato" -0.49\pt 0.49\pt -0.49\pt 0.49\pt + "ustaccatissimo" "\\ustaccatissimo" -0.65\pt 0.65\pt -0.20\pt 3.25\pt + "dstaccatissimo" "\\dstaccatissimo" -0.65\pt 0.65\pt -3.25\pt 0.20\pt + "tenuto" "\\tenuto" -2.92\pt 2.92\pt -0.20\pt 0.20\pt + "umarcato" "\\umarcato" -1.62\pt 1.62\pt 0.00\pt 3.58\pt + "dmarcato" "\\dmarcato" -1.62\pt 1.62\pt -3.58\pt 0.00\pt + "open" "\\ouvert" -1.30\pt 1.30\pt -1.62\pt 1.62\pt + "stopped" "\\plusstop" -1.79\pt 1.79\pt -1.79\pt 1.79\pt + "upbow" "\\upbow" -2.11\pt 2.11\pt 0.00\pt 6.76\pt + "downbow" "\\downbow" -2.44\pt 2.44\pt 0.00\pt 4.33\pt + "reverseturn" "\\reverseturn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt + "turn" "\\turn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt + "trill" "\\trill" -3.25\pt 3.25\pt 0.00\pt 7.31\pt + "upedalheel" "\\upedalheel" -1.62\pt 1.62\pt -1.62\pt 2.17\pt + "dpedalheel" "\\dpedalheel" -1.62\pt 1.62\pt -2.17\pt 1.62\pt + "upedaltoe" "\\upedaltoe" -1.62\pt 1.62\pt 0.00\pt 4.88\pt + "dpedaltoe" "\\dpedaltoe" -1.62\pt 1.62\pt -4.88\pt 0.00\pt + "flageolet" "\\flageolet" -1.73\pt 1.73\pt -1.73\pt 1.73\pt + "trilelement" "\\trilelement" -2.17\pt 0.85\pt -1.62\pt 1.62\pt + "prall" "\\prall" -3.67\pt 3.67\pt -1.62\pt 1.62\pt + "mordent" "\\mordent" -3.67\pt 3.67\pt -1.62\pt 1.62\pt + "prallprall" "\\prallprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "prallmordent" "\\prallmordent" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "upprall" "\\upprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "downprall" "\\downprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.16\pt 4.01\pt -9.96\pt 0.16\pt + "u4" "\\sixteenthflag" -0.16\pt 4.01\pt -11.59\pt 0.16\pt + "u5" "\\thirtysecondflag" -0.16\pt 4.01\pt -14.02\pt 0.16\pt + "u6" "\\sixtyfourthflag" -0.16\pt 4.01\pt -17.27\pt 0.16\pt + "d3" "\\deighthflag" -0.16\pt 4.44\pt -0.16\pt 9.47\pt + "d4" "\\dsixteenthflag" -0.16\pt 4.44\pt -0.16\pt 9.96\pt + "d5" "\\dthirtysecondflag" -0.16\pt 4.44\pt -0.16\pt 12.72\pt + "d6" "\\dsixtyfourthflag" -0.16\pt 4.44\pt -0.16\pt 14.35\pt + } + "clefs" = \table { + "alto" "\\altoclef" -3.25\pt 12.10\pt -6.50\pt 6.50\pt + "alto_change" "\\caltoclef" -2.60\pt 9.68\pt -5.20\pt 5.20\pt + "bass" "\\bassclef" -1.62\pt 11.70\pt -8.12\pt 3.25\pt + "bass_change" "\\cbassclef" -1.30\pt 9.36\pt -6.50\pt 2.60\pt + "violin" "\\violinclef" -2.83\pt 12.15\pt -9.75\pt 16.25\pt + "violin_change" "\\cviolinclef" -2.46\pt 9.52\pt -7.80\pt 13.00\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta13.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 4.88\pt -2.03\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 4.88\pt 0.00\pt 2.03\pt + "0o" "\\outsidewholerest" -2.03\pt 6.91\pt -2.03\pt 0.33\pt + "1o" "\\outsidehalfrest" -2.03\pt 6.91\pt -0.33\pt 2.03\pt + "2" "\\quartrest" 0.00\pt 3.51\pt 2.44\pt 11.70\pt + "3" "\\eighthrest" 0.00\pt 4.33\pt 3.25\pt 9.24\pt + "4" "\\sixteenthrest" 0.00\pt 5.04\pt 0.00\pt 9.24\pt + "5" "\\thirtysecondrest" 0.00\pt 5.69\pt 0.00\pt 12.49\pt + "6" "\\sixtyfourthrest" 0.00\pt 6.10\pt 0.00\pt 15.74\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 6.79\pt 0.00\pt 18.99\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 3.58\pt -4.88\pt 4.88\pt + "0" "\\natural" 0.00\pt 2.17\pt -4.88\pt 4.88\pt + "-1" "\\flat" -0.39\pt 2.60\pt -1.62\pt 6.50\pt + "-2" "\\flatflat" -0.39\pt 4.71\pt -1.62\pt 6.50\pt + "2" "\\sharpsharp" 0.00\pt 3.25\pt -1.62\pt 1.62\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.46\pt -0.73\pt 0.73\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.46\pt -1.62\pt 1.62\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt + "-1l" "\\brevisledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt + "-2" "\\longaball" 0.00\pt 6.50\pt -1.79\pt 1.79\pt + "-2l" "\\longaledger" -1.62\pt 8.12\pt -0.33\pt 0.33\pt + "0" "\\wholeball" 0.00\pt 6.44\pt -1.79\pt 1.79\pt + "0l" "\\wholeledger" -1.61\pt 8.04\pt -0.33\pt 0.33\pt + "1" "\\halfball" 0.00\pt 4.48\pt -1.79\pt 1.79\pt + "1l" "\\halfledger" -1.12\pt 5.60\pt -0.33\pt 0.33\pt + "2" "\\quartball" 0.00\pt 4.29\pt -1.79\pt 1.79\pt + "2l" "\\quartledger" -1.07\pt 5.37\pt -0.33\pt 0.33\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -4.31\pt 4.31\pt -0.24\pt 4.71\pt + "dfermata" "\\dfermata" -4.31\pt 4.31\pt -4.71\pt 0.24\pt + "sforzato" "\\sforzatoaccent" -2.92\pt 2.92\pt -1.62\pt 1.62\pt + "staccato" "\\staccato" -0.49\pt 0.49\pt -0.49\pt 0.49\pt + "ustaccatissimo" "\\ustaccatissimo" -0.65\pt 0.65\pt -0.20\pt 3.25\pt + "dstaccatissimo" "\\dstaccatissimo" -0.65\pt 0.65\pt -3.25\pt 0.20\pt + "tenuto" "\\tenuto" -2.92\pt 2.92\pt -0.20\pt 0.20\pt + "umarcato" "\\umarcato" -1.62\pt 1.62\pt 0.00\pt 3.58\pt + "dmarcato" "\\dmarcato" -1.62\pt 1.62\pt -3.58\pt 0.00\pt + "open" "\\ouvert" -1.30\pt 1.30\pt -1.62\pt 1.62\pt + "stopped" "\\plusstop" -1.79\pt 1.79\pt -1.79\pt 1.79\pt + "upbow" "\\upbow" -2.11\pt 2.11\pt 0.00\pt 6.76\pt + "downbow" "\\downbow" -2.44\pt 2.44\pt 0.00\pt 4.33\pt + "reverseturn" "\\reverseturn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt + "turn" "\\turn" -3.55\pt 3.55\pt -1.72\pt 1.72\pt + "trill" "\\trill" -3.25\pt 3.25\pt 0.00\pt 7.31\pt + "upedalheel" "\\upedalheel" -1.62\pt 1.62\pt -1.62\pt 2.17\pt + "dpedalheel" "\\dpedalheel" -1.62\pt 1.62\pt -2.17\pt 1.62\pt + "upedaltoe" "\\upedaltoe" -1.62\pt 1.62\pt 0.00\pt 4.88\pt + "dpedaltoe" "\\dpedaltoe" -1.62\pt 1.62\pt -4.88\pt 0.00\pt + "flageolet" "\\flageolet" -1.73\pt 1.73\pt -1.73\pt 1.73\pt + "trilelement" "\\trilelement" -2.17\pt 0.85\pt -1.62\pt 1.62\pt + "prall" "\\prall" -3.67\pt 3.67\pt -1.62\pt 1.62\pt + "mordent" "\\mordent" -3.67\pt 3.67\pt -1.62\pt 1.62\pt + "prallprall" "\\prallprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "prallmordent" "\\prallmordent" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "upprall" "\\upprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + "downprall" "\\downprall" -5.18\pt 5.18\pt -1.62\pt 1.62\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.16\pt 4.01\pt -9.96\pt 0.16\pt + "u4" "\\sixteenthflag" -0.16\pt 4.01\pt -11.59\pt 0.16\pt + "u5" "\\thirtysecondflag" -0.16\pt 4.01\pt -14.02\pt 0.16\pt + "u6" "\\sixtyfourthflag" -0.16\pt 4.01\pt -17.27\pt 0.16\pt + "d3" "\\deighthflag" -0.16\pt 4.44\pt -0.16\pt 9.47\pt + "d4" "\\dsixteenthflag" -0.16\pt 4.44\pt -0.16\pt 9.96\pt + "d5" "\\dthirtysecondflag" -0.16\pt 4.44\pt -0.16\pt 12.72\pt + "d6" "\\dsixtyfourthflag" -0.16\pt 4.44\pt -0.16\pt 14.35\pt + } + "clefs" = \table { + "alto" "\\altoclef" -3.25\pt 12.10\pt -6.50\pt 6.50\pt + "alto_change" "\\caltoclef" -2.60\pt 9.68\pt -5.20\pt 5.20\pt + "bass" "\\bassclef" -1.62\pt 11.70\pt -8.12\pt 3.25\pt + "bass_change" "\\cbassclef" -1.30\pt 9.36\pt -6.50\pt 2.60\pt + "violin" "\\violinclef" -2.83\pt 12.15\pt -9.75\pt 16.25\pt + "violin_change" "\\cviolinclef" -2.46\pt 9.52\pt -7.80\pt 13.00\pt + } + % } % $name diff --git a/init/feta16.ly b/init/feta16.ly new file mode 100644 index 0000000000..a575a5cc9b --- /dev/null +++ b/init/feta16.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta16.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 6.00\pt -2.50\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 6.00\pt 0.00\pt 2.50\pt + "0o" "\\outsidewholerest" -2.50\pt 8.50\pt -2.50\pt 0.40\pt + "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.40\pt 2.50\pt + "2" "\\quartrest" 0.00\pt 4.32\pt 3.00\pt 14.40\pt + "3" "\\eighthrest" 0.00\pt 5.33\pt 4.00\pt 11.37\pt + "4" "\\sixteenthrest" 0.00\pt 6.21\pt 0.00\pt 11.37\pt + "5" "\\thirtysecondrest" 0.00\pt 7.00\pt 0.00\pt 15.37\pt + "6" "\\sixtyfourthrest" 0.00\pt 7.51\pt 0.00\pt 19.37\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 8.36\pt 0.00\pt 23.37\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 4.40\pt -6.00\pt 6.00\pt + "0" "\\natural" 0.00\pt 2.67\pt -6.00\pt 6.00\pt + "-1" "\\flat" -0.48\pt 3.20\pt -2.00\pt 8.00\pt + "-2" "\\flatflat" -0.48\pt 5.80\pt -2.00\pt 8.00\pt + "2" "\\sharpsharp" 0.00\pt 4.00\pt -2.00\pt 2.00\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.80\pt -0.90\pt 0.90\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.80\pt -2.00\pt 2.00\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-1l" "\\brevisledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt + "-2" "\\longaball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-2l" "\\longaledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt + "0" "\\wholeball" 0.00\pt 7.92\pt -2.20\pt 2.20\pt + "0l" "\\wholeledger" -1.98\pt 9.90\pt -0.40\pt 0.40\pt + "1" "\\halfball" 0.00\pt 5.51\pt -2.20\pt 2.20\pt + "1l" "\\halfledger" -1.38\pt 6.89\pt -0.40\pt 0.40\pt + "2" "\\quartball" 0.00\pt 5.28\pt -2.20\pt 2.20\pt + "2l" "\\quartledger" -1.32\pt 6.61\pt -0.40\pt 0.40\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt + "dfermata" "\\dfermata" -5.30\pt 5.30\pt -5.80\pt 0.30\pt + "sforzato" "\\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt + "staccato" "\\staccato" -0.60\pt 0.60\pt -0.60\pt 0.60\pt + "ustaccatissimo" "\\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt + "dstaccatissimo" "\\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt + "tenuto" "\\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt + "umarcato" "\\umarcato" -2.00\pt 2.00\pt 0.00\pt 4.40\pt + "dmarcato" "\\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt + "open" "\\ouvert" -1.60\pt 1.60\pt -2.00\pt 2.00\pt + "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt + "upbow" "\\upbow" -2.60\pt 2.60\pt 0.00\pt 8.32\pt + "downbow" "\\downbow" -3.00\pt 3.00\pt 0.00\pt 5.33\pt + "reverseturn" "\\reverseturn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt + "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt + "trill" "\\trill" -4.00\pt 4.00\pt 0.00\pt 9.00\pt + "upedalheel" "\\upedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt + "dpedalheel" "\\dpedalheel" -2.00\pt 2.00\pt -2.67\pt 2.00\pt + "upedaltoe" "\\upedaltoe" -2.00\pt 2.00\pt 0.00\pt 6.00\pt + "dpedaltoe" "\\dpedaltoe" -2.00\pt 2.00\pt -6.00\pt 0.00\pt + "flageolet" "\\flageolet" -2.13\pt 2.13\pt -2.13\pt 2.13\pt + "trilelement" "\\trilelement" -2.67\pt 1.05\pt -2.00\pt 2.00\pt + "prall" "\\prall" -4.52\pt 4.52\pt -2.00\pt 2.00\pt + "mordent" "\\mordent" -4.52\pt 4.52\pt -2.00\pt 2.00\pt + "prallprall" "\\prallprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "prallmordent" "\\prallmordent" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "upprall" "\\upprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "downprall" "\\downprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.20\pt 4.94\pt -12.26\pt 0.20\pt + "u4" "\\sixteenthflag" -0.20\pt 4.94\pt -14.26\pt 0.20\pt + "u5" "\\thirtysecondflag" -0.20\pt 4.94\pt -17.26\pt 0.20\pt + "u6" "\\sixtyfourthflag" -0.20\pt 4.94\pt -21.26\pt 0.20\pt + "d3" "\\deighthflag" -0.20\pt 5.46\pt -0.20\pt 11.66\pt + "d4" "\\dsixteenthflag" -0.20\pt 5.46\pt -0.20\pt 12.26\pt + "d5" "\\dthirtysecondflag" -0.20\pt 5.46\pt -0.20\pt 15.66\pt + "d6" "\\dsixtyfourthflag" -0.20\pt 5.46\pt -0.20\pt 17.66\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt + "alto_change" "\\caltoclef" -3.20\pt 11.91\pt -6.40\pt 6.40\pt + "bass" "\\bassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt + "bass_change" "\\cbassclef" -1.60\pt 11.52\pt -8.00\pt 3.20\pt + "violin" "\\violinclef" -3.49\pt 14.95\pt -12.00\pt 20.00\pt + "violin_change" "\\cviolinclef" -3.03\pt 11.72\pt -9.60\pt 16.00\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta16.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 6.00\pt -2.50\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 6.00\pt 0.00\pt 2.50\pt + "0o" "\\outsidewholerest" -2.50\pt 8.50\pt -2.50\pt 0.40\pt + "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.40\pt 2.50\pt + "2" "\\quartrest" 0.00\pt 4.32\pt 3.00\pt 14.40\pt + "3" "\\eighthrest" 0.00\pt 5.33\pt 4.00\pt 11.37\pt + "4" "\\sixteenthrest" 0.00\pt 6.21\pt 0.00\pt 11.37\pt + "5" "\\thirtysecondrest" 0.00\pt 7.00\pt 0.00\pt 15.37\pt + "6" "\\sixtyfourthrest" 0.00\pt 7.51\pt 0.00\pt 19.37\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 8.36\pt 0.00\pt 23.37\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 4.40\pt -6.00\pt 6.00\pt + "0" "\\natural" 0.00\pt 2.67\pt -6.00\pt 6.00\pt + "-1" "\\flat" -0.48\pt 3.20\pt -2.00\pt 8.00\pt + "-2" "\\flatflat" -0.48\pt 5.80\pt -2.00\pt 8.00\pt + "2" "\\sharpsharp" 0.00\pt 4.00\pt -2.00\pt 2.00\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 1.80\pt -0.90\pt 0.90\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 1.80\pt -2.00\pt 2.00\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-1l" "\\brevisledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt + "-2" "\\longaball" 0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-2l" "\\longaledger" -2.00\pt 10.00\pt -0.40\pt 0.40\pt + "0" "\\wholeball" 0.00\pt 7.92\pt -2.20\pt 2.20\pt + "0l" "\\wholeledger" -1.98\pt 9.90\pt -0.40\pt 0.40\pt + "1" "\\halfball" 0.00\pt 5.51\pt -2.20\pt 2.20\pt + "1l" "\\halfledger" -1.38\pt 6.89\pt -0.40\pt 0.40\pt + "2" "\\quartball" 0.00\pt 5.28\pt -2.20\pt 2.20\pt + "2l" "\\quartledger" -1.32\pt 6.61\pt -0.40\pt 0.40\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt + "dfermata" "\\dfermata" -5.30\pt 5.30\pt -5.80\pt 0.30\pt + "sforzato" "\\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt + "staccato" "\\staccato" -0.60\pt 0.60\pt -0.60\pt 0.60\pt + "ustaccatissimo" "\\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt + "dstaccatissimo" "\\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt + "tenuto" "\\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt + "umarcato" "\\umarcato" -2.00\pt 2.00\pt 0.00\pt 4.40\pt + "dmarcato" "\\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt + "open" "\\ouvert" -1.60\pt 1.60\pt -2.00\pt 2.00\pt + "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt + "upbow" "\\upbow" -2.60\pt 2.60\pt 0.00\pt 8.32\pt + "downbow" "\\downbow" -3.00\pt 3.00\pt 0.00\pt 5.33\pt + "reverseturn" "\\reverseturn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt + "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt + "trill" "\\trill" -4.00\pt 4.00\pt 0.00\pt 9.00\pt + "upedalheel" "\\upedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt + "dpedalheel" "\\dpedalheel" -2.00\pt 2.00\pt -2.67\pt 2.00\pt + "upedaltoe" "\\upedaltoe" -2.00\pt 2.00\pt 0.00\pt 6.00\pt + "dpedaltoe" "\\dpedaltoe" -2.00\pt 2.00\pt -6.00\pt 0.00\pt + "flageolet" "\\flageolet" -2.13\pt 2.13\pt -2.13\pt 2.13\pt + "trilelement" "\\trilelement" -2.67\pt 1.05\pt -2.00\pt 2.00\pt + "prall" "\\prall" -4.52\pt 4.52\pt -2.00\pt 2.00\pt + "mordent" "\\mordent" -4.52\pt 4.52\pt -2.00\pt 2.00\pt + "prallprall" "\\prallprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "prallmordent" "\\prallmordent" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "upprall" "\\upprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + "downprall" "\\downprall" -6.38\pt 6.38\pt -2.00\pt 2.00\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.20\pt 4.94\pt -12.26\pt 0.20\pt + "u4" "\\sixteenthflag" -0.20\pt 4.94\pt -14.26\pt 0.20\pt + "u5" "\\thirtysecondflag" -0.20\pt 4.94\pt -17.26\pt 0.20\pt + "u6" "\\sixtyfourthflag" -0.20\pt 4.94\pt -21.26\pt 0.20\pt + "d3" "\\deighthflag" -0.20\pt 5.46\pt -0.20\pt 11.66\pt + "d4" "\\dsixteenthflag" -0.20\pt 5.46\pt -0.20\pt 12.26\pt + "d5" "\\dthirtysecondflag" -0.20\pt 5.46\pt -0.20\pt 15.66\pt + "d6" "\\dsixtyfourthflag" -0.20\pt 5.46\pt -0.20\pt 17.66\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt + "alto_change" "\\caltoclef" -3.20\pt 11.91\pt -6.40\pt 6.40\pt + "bass" "\\bassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt + "bass_change" "\\cbassclef" -1.60\pt 11.52\pt -8.00\pt 3.20\pt + "violin" "\\violinclef" -3.49\pt 14.95\pt -12.00\pt 20.00\pt + "violin_change" "\\cviolinclef" -3.03\pt 11.72\pt -9.60\pt 16.00\pt + } + % } % $name diff --git a/init/feta19.ly b/init/feta19.ly new file mode 100644 index 0000000000..b08510dd83 --- /dev/null +++ b/init/feta19.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta19.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 7.12\pt -2.97\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 7.12\pt 0.00\pt 2.97\pt + "0o" "\\outsidewholerest" -2.97\pt 10.09\pt -2.97\pt 0.48\pt + "1o" "\\outsidehalfrest" -2.97\pt 10.09\pt -0.48\pt 2.97\pt + "2" "\\quartrest" 0.00\pt 5.13\pt 3.56\pt 17.10\pt + "3" "\\eighthrest" 0.00\pt 6.33\pt 4.75\pt 13.50\pt + "4" "\\sixteenthrest" 0.00\pt 7.37\pt 0.00\pt 13.50\pt + "5" "\\thirtysecondrest" 0.00\pt 8.32\pt 0.00\pt 18.25\pt + "6" "\\sixtyfourthrest" 0.00\pt 8.92\pt 0.00\pt 23.00\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 9.93\pt 0.00\pt 27.75\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 5.23\pt -7.12\pt 7.12\pt + "0" "\\natural" 0.00\pt 3.17\pt -7.12\pt 7.12\pt + "-1" "\\flat" -0.57\pt 3.80\pt -2.38\pt 9.50\pt + "-2" "\\flatflat" -0.57\pt 6.89\pt -2.38\pt 9.50\pt + "2" "\\sharpsharp" 0.00\pt 4.75\pt -2.38\pt 2.38\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.14\pt -1.07\pt 1.07\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.14\pt -2.38\pt 2.38\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-1l" "\\brevisledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "-2" "\\longaball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-2l" "\\longaledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "0" "\\wholeball" 0.00\pt 9.41\pt -2.61\pt 2.61\pt + "0l" "\\wholeledger" -2.35\pt 11.76\pt -0.48\pt 0.48\pt + "1" "\\halfball" 0.00\pt 6.54\pt -2.61\pt 2.61\pt + "1l" "\\halfledger" -1.64\pt 8.18\pt -0.48\pt 0.48\pt + "2" "\\quartball" 0.00\pt 6.27\pt -2.61\pt 2.61\pt + "2l" "\\quartledger" -1.57\pt 7.84\pt -0.48\pt 0.48\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.29\pt 6.29\pt -0.36\pt 6.89\pt + "dfermata" "\\dfermata" -6.29\pt 6.29\pt -6.89\pt 0.36\pt + "sforzato" "\\sforzatoaccent" -4.27\pt 4.27\pt -2.38\pt 2.38\pt + "staccato" "\\staccato" -0.71\pt 0.71\pt -0.71\pt 0.71\pt + "ustaccatissimo" "\\ustaccatissimo" -0.95\pt 0.95\pt -0.20\pt 4.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.95\pt 0.95\pt -4.75\pt 0.20\pt + "tenuto" "\\tenuto" -4.27\pt 4.27\pt -0.29\pt 0.29\pt + "umarcato" "\\umarcato" -2.38\pt 2.38\pt 0.00\pt 5.23\pt + "dmarcato" "\\dmarcato" -2.38\pt 2.38\pt -5.23\pt 0.00\pt + "open" "\\ouvert" -1.90\pt 1.90\pt -2.38\pt 2.38\pt + "stopped" "\\plusstop" -2.61\pt 2.61\pt -2.61\pt 2.61\pt + "upbow" "\\upbow" -3.09\pt 3.09\pt 0.00\pt 9.88\pt + "downbow" "\\downbow" -3.56\pt 3.56\pt 0.00\pt 6.33\pt + "reverseturn" "\\reverseturn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt + "turn" "\\turn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt + "trill" "\\trill" -4.75\pt 4.75\pt 0.00\pt 10.69\pt + "upedalheel" "\\upedalheel" -2.38\pt 2.38\pt -2.38\pt 3.17\pt + "dpedalheel" "\\dpedalheel" -2.38\pt 2.38\pt -3.17\pt 2.38\pt + "upedaltoe" "\\upedaltoe" -2.38\pt 2.38\pt 0.00\pt 7.12\pt + "dpedaltoe" "\\dpedaltoe" -2.38\pt 2.38\pt -7.12\pt 0.00\pt + "flageolet" "\\flageolet" -2.53\pt 2.53\pt -2.53\pt 2.53\pt + "trilelement" "\\trilelement" -3.17\pt 1.24\pt -2.38\pt 2.38\pt + "prall" "\\prall" -5.37\pt 5.37\pt -2.38\pt 2.38\pt + "mordent" "\\mordent" -5.37\pt 5.37\pt -2.38\pt 2.38\pt + "prallprall" "\\prallprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "prallmordent" "\\prallmordent" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "upprall" "\\upprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "downprall" "\\downprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.24\pt 5.86\pt -14.56\pt 0.24\pt + "u4" "\\sixteenthflag" -0.24\pt 5.86\pt -16.93\pt 0.24\pt + "u5" "\\thirtysecondflag" -0.24\pt 5.86\pt -20.50\pt 0.24\pt + "u6" "\\sixtyfourthflag" -0.24\pt 5.86\pt -25.25\pt 0.24\pt + "d3" "\\deighthflag" -0.24\pt 6.49\pt -0.24\pt 13.85\pt + "d4" "\\dsixteenthflag" -0.24\pt 6.49\pt -0.24\pt 14.56\pt + "d5" "\\dthirtysecondflag" -0.24\pt 6.49\pt -0.24\pt 18.60\pt + "d6" "\\dsixtyfourthflag" -0.24\pt 6.49\pt -0.24\pt 20.97\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.75\pt 17.68\pt -9.50\pt 9.50\pt + "alto_change" "\\caltoclef" -3.80\pt 14.14\pt -7.60\pt 7.60\pt + "bass" "\\bassclef" -2.38\pt 17.10\pt -11.88\pt 4.75\pt + "bass_change" "\\cbassclef" -1.90\pt 13.68\pt -9.50\pt 3.80\pt + "violin" "\\violinclef" -4.14\pt 17.75\pt -14.25\pt 23.75\pt + "violin_change" "\\cviolinclef" -3.60\pt 13.92\pt -11.40\pt 19.00\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta19.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 7.12\pt -2.97\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 7.12\pt 0.00\pt 2.97\pt + "0o" "\\outsidewholerest" -2.97\pt 10.09\pt -2.97\pt 0.48\pt + "1o" "\\outsidehalfrest" -2.97\pt 10.09\pt -0.48\pt 2.97\pt + "2" "\\quartrest" 0.00\pt 5.13\pt 3.56\pt 17.10\pt + "3" "\\eighthrest" 0.00\pt 6.33\pt 4.75\pt 13.50\pt + "4" "\\sixteenthrest" 0.00\pt 7.37\pt 0.00\pt 13.50\pt + "5" "\\thirtysecondrest" 0.00\pt 8.32\pt 0.00\pt 18.25\pt + "6" "\\sixtyfourthrest" 0.00\pt 8.92\pt 0.00\pt 23.00\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 9.93\pt 0.00\pt 27.75\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 5.23\pt -7.12\pt 7.12\pt + "0" "\\natural" 0.00\pt 3.17\pt -7.12\pt 7.12\pt + "-1" "\\flat" -0.57\pt 3.80\pt -2.38\pt 9.50\pt + "-2" "\\flatflat" -0.57\pt 6.89\pt -2.38\pt 9.50\pt + "2" "\\sharpsharp" 0.00\pt 4.75\pt -2.38\pt 2.38\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.14\pt -1.07\pt 1.07\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.14\pt -2.38\pt 2.38\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-1l" "\\brevisledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "-2" "\\longaball" 0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-2l" "\\longaledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "0" "\\wholeball" 0.00\pt 9.41\pt -2.61\pt 2.61\pt + "0l" "\\wholeledger" -2.35\pt 11.76\pt -0.48\pt 0.48\pt + "1" "\\halfball" 0.00\pt 6.54\pt -2.61\pt 2.61\pt + "1l" "\\halfledger" -1.64\pt 8.18\pt -0.48\pt 0.48\pt + "2" "\\quartball" 0.00\pt 6.27\pt -2.61\pt 2.61\pt + "2l" "\\quartledger" -1.57\pt 7.84\pt -0.48\pt 0.48\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.29\pt 6.29\pt -0.36\pt 6.89\pt + "dfermata" "\\dfermata" -6.29\pt 6.29\pt -6.89\pt 0.36\pt + "sforzato" "\\sforzatoaccent" -4.27\pt 4.27\pt -2.38\pt 2.38\pt + "staccato" "\\staccato" -0.71\pt 0.71\pt -0.71\pt 0.71\pt + "ustaccatissimo" "\\ustaccatissimo" -0.95\pt 0.95\pt -0.20\pt 4.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.95\pt 0.95\pt -4.75\pt 0.20\pt + "tenuto" "\\tenuto" -4.27\pt 4.27\pt -0.29\pt 0.29\pt + "umarcato" "\\umarcato" -2.38\pt 2.38\pt 0.00\pt 5.23\pt + "dmarcato" "\\dmarcato" -2.38\pt 2.38\pt -5.23\pt 0.00\pt + "open" "\\ouvert" -1.90\pt 1.90\pt -2.38\pt 2.38\pt + "stopped" "\\plusstop" -2.61\pt 2.61\pt -2.61\pt 2.61\pt + "upbow" "\\upbow" -3.09\pt 3.09\pt 0.00\pt 9.88\pt + "downbow" "\\downbow" -3.56\pt 3.56\pt 0.00\pt 6.33\pt + "reverseturn" "\\reverseturn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt + "turn" "\\turn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt + "trill" "\\trill" -4.75\pt 4.75\pt 0.00\pt 10.69\pt + "upedalheel" "\\upedalheel" -2.38\pt 2.38\pt -2.38\pt 3.17\pt + "dpedalheel" "\\dpedalheel" -2.38\pt 2.38\pt -3.17\pt 2.38\pt + "upedaltoe" "\\upedaltoe" -2.38\pt 2.38\pt 0.00\pt 7.12\pt + "dpedaltoe" "\\dpedaltoe" -2.38\pt 2.38\pt -7.12\pt 0.00\pt + "flageolet" "\\flageolet" -2.53\pt 2.53\pt -2.53\pt 2.53\pt + "trilelement" "\\trilelement" -3.17\pt 1.24\pt -2.38\pt 2.38\pt + "prall" "\\prall" -5.37\pt 5.37\pt -2.38\pt 2.38\pt + "mordent" "\\mordent" -5.37\pt 5.37\pt -2.38\pt 2.38\pt + "prallprall" "\\prallprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "prallmordent" "\\prallmordent" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "upprall" "\\upprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + "downprall" "\\downprall" -7.57\pt 7.57\pt -2.38\pt 2.38\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.24\pt 5.86\pt -14.56\pt 0.24\pt + "u4" "\\sixteenthflag" -0.24\pt 5.86\pt -16.93\pt 0.24\pt + "u5" "\\thirtysecondflag" -0.24\pt 5.86\pt -20.50\pt 0.24\pt + "u6" "\\sixtyfourthflag" -0.24\pt 5.86\pt -25.25\pt 0.24\pt + "d3" "\\deighthflag" -0.24\pt 6.49\pt -0.24\pt 13.85\pt + "d4" "\\dsixteenthflag" -0.24\pt 6.49\pt -0.24\pt 14.56\pt + "d5" "\\dthirtysecondflag" -0.24\pt 6.49\pt -0.24\pt 18.60\pt + "d6" "\\dsixtyfourthflag" -0.24\pt 6.49\pt -0.24\pt 20.97\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.75\pt 17.68\pt -9.50\pt 9.50\pt + "alto_change" "\\caltoclef" -3.80\pt 14.14\pt -7.60\pt 7.60\pt + "bass" "\\bassclef" -2.38\pt 17.10\pt -11.88\pt 4.75\pt + "bass_change" "\\cbassclef" -1.90\pt 13.68\pt -9.50\pt 3.80\pt + "violin" "\\violinclef" -4.14\pt 17.75\pt -14.25\pt 23.75\pt + "violin_change" "\\cviolinclef" -3.60\pt 13.92\pt -11.40\pt 19.00\pt + } + % } % $name diff --git a/init/feta20.ly b/init/feta20.ly new file mode 100644 index 0000000000..9e72e2a112 --- /dev/null +++ b/init/feta20.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta20.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 7.50\pt -3.12\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 7.50\pt 0.00\pt 3.12\pt + "0o" "\\outsidewholerest" -3.12\pt 10.62\pt -3.12\pt 0.50\pt + "1o" "\\outsidehalfrest" -3.12\pt 10.62\pt -0.50\pt 3.12\pt + "2" "\\quartrest" 0.00\pt 5.40\pt 3.75\pt 18.00\pt + "3" "\\eighthrest" 0.00\pt 6.67\pt 5.00\pt 14.21\pt + "4" "\\sixteenthrest" 0.00\pt 7.76\pt 0.00\pt 14.21\pt + "5" "\\thirtysecondrest" 0.00\pt 8.75\pt 0.00\pt 19.21\pt + "6" "\\sixtyfourthrest" 0.00\pt 9.38\pt 0.00\pt 24.21\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 10.45\pt 0.00\pt 29.21\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 5.50\pt -7.50\pt 7.50\pt + "0" "\\natural" 0.00\pt 3.33\pt -7.50\pt 7.50\pt + "-1" "\\flat" -0.60\pt 4.00\pt -2.50\pt 10.00\pt + "-2" "\\flatflat" -0.60\pt 7.25\pt -2.50\pt 10.00\pt + "2" "\\sharpsharp" 0.00\pt 5.00\pt -2.50\pt 2.50\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.25\pt -1.12\pt 1.12\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.25\pt -2.50\pt 2.50\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-1l" "\\brevisledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt + "-2" "\\longaball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-2l" "\\longaledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt + "0" "\\wholeball" 0.00\pt 9.90\pt -2.75\pt 2.75\pt + "0l" "\\wholeledger" -2.48\pt 12.38\pt -0.50\pt 0.50\pt + "1" "\\halfball" 0.00\pt 6.89\pt -2.75\pt 2.75\pt + "1l" "\\halfledger" -1.72\pt 8.61\pt -0.50\pt 0.50\pt + "2" "\\quartball" 0.00\pt 6.61\pt -2.75\pt 2.75\pt + "2l" "\\quartledger" -1.65\pt 8.26\pt -0.50\pt 0.50\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.63\pt 6.63\pt -0.38\pt 7.25\pt + "dfermata" "\\dfermata" -6.63\pt 6.63\pt -7.25\pt 0.38\pt + "sforzato" "\\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt + "staccato" "\\staccato" -0.75\pt 0.75\pt -0.75\pt 0.75\pt + "ustaccatissimo" "\\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt + "dstaccatissimo" "\\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt + "tenuto" "\\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt + "umarcato" "\\umarcato" -2.50\pt 2.50\pt 0.00\pt 5.50\pt + "dmarcato" "\\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt + "open" "\\ouvert" -2.00\pt 2.00\pt -2.50\pt 2.50\pt + "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt + "upbow" "\\upbow" -3.25\pt 3.25\pt 0.00\pt 10.40\pt + "downbow" "\\downbow" -3.75\pt 3.75\pt 0.00\pt 6.67\pt + "reverseturn" "\\reverseturn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt + "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt + "trill" "\\trill" -5.00\pt 5.00\pt 0.00\pt 11.25\pt + "upedalheel" "\\upedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt + "dpedalheel" "\\dpedalheel" -2.50\pt 2.50\pt -3.33\pt 2.50\pt + "upedaltoe" "\\upedaltoe" -2.50\pt 2.50\pt 0.00\pt 7.50\pt + "dpedaltoe" "\\dpedaltoe" -2.50\pt 2.50\pt -7.50\pt 0.00\pt + "flageolet" "\\flageolet" -2.67\pt 2.67\pt -2.67\pt 2.67\pt + "trilelement" "\\trilelement" -3.33\pt 1.31\pt -2.50\pt 2.50\pt + "prall" "\\prall" -5.65\pt 5.65\pt -2.50\pt 2.50\pt + "mordent" "\\mordent" -5.65\pt 5.65\pt -2.50\pt 2.50\pt + "prallprall" "\\prallprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "prallmordent" "\\prallmordent" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "upprall" "\\upprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "downprall" "\\downprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.25\pt 6.17\pt -15.33\pt 0.25\pt + "u4" "\\sixteenthflag" -0.25\pt 6.17\pt -17.83\pt 0.25\pt + "u5" "\\thirtysecondflag" -0.25\pt 6.17\pt -21.58\pt 0.25\pt + "u6" "\\sixtyfourthflag" -0.25\pt 6.17\pt -26.58\pt 0.25\pt + "d3" "\\deighthflag" -0.25\pt 6.83\pt -0.25\pt 14.58\pt + "d4" "\\dsixteenthflag" -0.25\pt 6.83\pt -0.25\pt 15.33\pt + "d5" "\\dthirtysecondflag" -0.25\pt 6.83\pt -0.25\pt 19.58\pt + "d6" "\\dsixtyfourthflag" -0.25\pt 6.83\pt -0.25\pt 22.08\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.00\pt 18.61\pt -10.00\pt 10.00\pt + "alto_change" "\\caltoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt + "bass" "\\bassclef" -2.50\pt 18.00\pt -12.50\pt 5.00\pt + "bass_change" "\\cbassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt + "violin" "\\violinclef" -4.36\pt 18.69\pt -15.00\pt 25.00\pt + "violin_change" "\\cviolinclef" -3.79\pt 14.65\pt -12.00\pt 20.00\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta20.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 7.50\pt -3.12\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 7.50\pt 0.00\pt 3.12\pt + "0o" "\\outsidewholerest" -3.12\pt 10.62\pt -3.12\pt 0.50\pt + "1o" "\\outsidehalfrest" -3.12\pt 10.62\pt -0.50\pt 3.12\pt + "2" "\\quartrest" 0.00\pt 5.40\pt 3.75\pt 18.00\pt + "3" "\\eighthrest" 0.00\pt 6.67\pt 5.00\pt 14.21\pt + "4" "\\sixteenthrest" 0.00\pt 7.76\pt 0.00\pt 14.21\pt + "5" "\\thirtysecondrest" 0.00\pt 8.75\pt 0.00\pt 19.21\pt + "6" "\\sixtyfourthrest" 0.00\pt 9.38\pt 0.00\pt 24.21\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 10.45\pt 0.00\pt 29.21\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 5.50\pt -7.50\pt 7.50\pt + "0" "\\natural" 0.00\pt 3.33\pt -7.50\pt 7.50\pt + "-1" "\\flat" -0.60\pt 4.00\pt -2.50\pt 10.00\pt + "-2" "\\flatflat" -0.60\pt 7.25\pt -2.50\pt 10.00\pt + "2" "\\sharpsharp" 0.00\pt 5.00\pt -2.50\pt 2.50\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.25\pt -1.12\pt 1.12\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.25\pt -2.50\pt 2.50\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-1l" "\\brevisledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt + "-2" "\\longaball" 0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-2l" "\\longaledger" -2.50\pt 12.50\pt -0.50\pt 0.50\pt + "0" "\\wholeball" 0.00\pt 9.90\pt -2.75\pt 2.75\pt + "0l" "\\wholeledger" -2.48\pt 12.38\pt -0.50\pt 0.50\pt + "1" "\\halfball" 0.00\pt 6.89\pt -2.75\pt 2.75\pt + "1l" "\\halfledger" -1.72\pt 8.61\pt -0.50\pt 0.50\pt + "2" "\\quartball" 0.00\pt 6.61\pt -2.75\pt 2.75\pt + "2l" "\\quartledger" -1.65\pt 8.26\pt -0.50\pt 0.50\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.63\pt 6.63\pt -0.38\pt 7.25\pt + "dfermata" "\\dfermata" -6.63\pt 6.63\pt -7.25\pt 0.38\pt + "sforzato" "\\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt + "staccato" "\\staccato" -0.75\pt 0.75\pt -0.75\pt 0.75\pt + "ustaccatissimo" "\\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt + "dstaccatissimo" "\\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt + "tenuto" "\\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt + "umarcato" "\\umarcato" -2.50\pt 2.50\pt 0.00\pt 5.50\pt + "dmarcato" "\\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt + "open" "\\ouvert" -2.00\pt 2.00\pt -2.50\pt 2.50\pt + "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt + "upbow" "\\upbow" -3.25\pt 3.25\pt 0.00\pt 10.40\pt + "downbow" "\\downbow" -3.75\pt 3.75\pt 0.00\pt 6.67\pt + "reverseturn" "\\reverseturn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt + "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt + "trill" "\\trill" -5.00\pt 5.00\pt 0.00\pt 11.25\pt + "upedalheel" "\\upedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt + "dpedalheel" "\\dpedalheel" -2.50\pt 2.50\pt -3.33\pt 2.50\pt + "upedaltoe" "\\upedaltoe" -2.50\pt 2.50\pt 0.00\pt 7.50\pt + "dpedaltoe" "\\dpedaltoe" -2.50\pt 2.50\pt -7.50\pt 0.00\pt + "flageolet" "\\flageolet" -2.67\pt 2.67\pt -2.67\pt 2.67\pt + "trilelement" "\\trilelement" -3.33\pt 1.31\pt -2.50\pt 2.50\pt + "prall" "\\prall" -5.65\pt 5.65\pt -2.50\pt 2.50\pt + "mordent" "\\mordent" -5.65\pt 5.65\pt -2.50\pt 2.50\pt + "prallprall" "\\prallprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "prallmordent" "\\prallmordent" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "upprall" "\\upprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + "downprall" "\\downprall" -7.97\pt 7.97\pt -2.50\pt 2.50\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.25\pt 6.17\pt -15.33\pt 0.25\pt + "u4" "\\sixteenthflag" -0.25\pt 6.17\pt -17.83\pt 0.25\pt + "u5" "\\thirtysecondflag" -0.25\pt 6.17\pt -21.58\pt 0.25\pt + "u6" "\\sixtyfourthflag" -0.25\pt 6.17\pt -26.58\pt 0.25\pt + "d3" "\\deighthflag" -0.25\pt 6.83\pt -0.25\pt 14.58\pt + "d4" "\\dsixteenthflag" -0.25\pt 6.83\pt -0.25\pt 15.33\pt + "d5" "\\dthirtysecondflag" -0.25\pt 6.83\pt -0.25\pt 19.58\pt + "d6" "\\dsixtyfourthflag" -0.25\pt 6.83\pt -0.25\pt 22.08\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.00\pt 18.61\pt -10.00\pt 10.00\pt + "alto_change" "\\caltoclef" -4.00\pt 14.89\pt -8.00\pt 8.00\pt + "bass" "\\bassclef" -2.50\pt 18.00\pt -12.50\pt 5.00\pt + "bass_change" "\\cbassclef" -2.00\pt 14.40\pt -10.00\pt 4.00\pt + "violin" "\\violinclef" -4.36\pt 18.69\pt -15.00\pt 25.00\pt + "violin_change" "\\cviolinclef" -3.79\pt 14.65\pt -12.00\pt 20.00\pt + } + % } % $name diff --git a/init/feta23.ly b/init/feta23.ly new file mode 100644 index 0000000000..d809738412 --- /dev/null +++ b/init/feta23.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta23.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 8.44\pt -3.52\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 8.44\pt 0.00\pt 3.52\pt + "0o" "\\outsidewholerest" -3.52\pt 11.95\pt -3.52\pt 0.56\pt + "1o" "\\outsidehalfrest" -3.52\pt 11.95\pt -0.56\pt 3.52\pt + "2" "\\quartrest" 0.00\pt 6.08\pt 4.22\pt 20.25\pt + "3" "\\eighthrest" 0.00\pt 7.50\pt 5.62\pt 15.98\pt + "4" "\\sixteenthrest" 0.00\pt 8.73\pt 0.00\pt 15.98\pt + "5" "\\thirtysecondrest" 0.00\pt 9.85\pt 0.00\pt 21.61\pt + "6" "\\sixtyfourthrest" 0.00\pt 10.56\pt 0.00\pt 27.23\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 11.75\pt 0.00\pt 32.86\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 6.19\pt -8.44\pt 8.44\pt + "0" "\\natural" 0.00\pt 3.75\pt -8.44\pt 8.44\pt + "-1" "\\flat" -0.68\pt 4.50\pt -2.81\pt 11.25\pt + "-2" "\\flatflat" -0.68\pt 8.16\pt -2.81\pt 11.25\pt + "2" "\\sharpsharp" 0.00\pt 5.62\pt -2.81\pt 2.81\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.53\pt -1.27\pt 1.27\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.53\pt -2.81\pt 2.81\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-1l" "\\brevisledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "-2" "\\longaball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-2l" "\\longaledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "0" "\\wholeball" 0.00\pt 11.14\pt -3.09\pt 3.09\pt + "0l" "\\wholeledger" -2.78\pt 13.92\pt -0.56\pt 0.56\pt + "1" "\\halfball" 0.00\pt 7.75\pt -3.09\pt 3.09\pt + "1l" "\\halfledger" -1.94\pt 9.69\pt -0.56\pt 0.56\pt + "2" "\\quartball" 0.00\pt 7.43\pt -3.09\pt 3.09\pt + "2l" "\\quartledger" -1.86\pt 9.29\pt -0.56\pt 0.56\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -7.45\pt 7.45\pt -0.42\pt 8.16\pt + "dfermata" "\\dfermata" -7.45\pt 7.45\pt -8.16\pt 0.42\pt + "sforzato" "\\sforzatoaccent" -5.06\pt 5.06\pt -2.81\pt 2.81\pt + "staccato" "\\staccato" -0.84\pt 0.84\pt -0.84\pt 0.84\pt + "ustaccatissimo" "\\ustaccatissimo" -1.13\pt 1.13\pt -0.20\pt 5.63\pt + "dstaccatissimo" "\\dstaccatissimo" -1.13\pt 1.13\pt -5.63\pt 0.20\pt + "tenuto" "\\tenuto" -5.06\pt 5.06\pt -0.34\pt 0.34\pt + "umarcato" "\\umarcato" -2.81\pt 2.81\pt 0.00\pt 6.19\pt + "dmarcato" "\\dmarcato" -2.81\pt 2.81\pt -6.19\pt 0.00\pt + "open" "\\ouvert" -2.25\pt 2.25\pt -2.81\pt 2.81\pt + "stopped" "\\plusstop" -3.09\pt 3.09\pt -3.09\pt 3.09\pt + "upbow" "\\upbow" -3.66\pt 3.66\pt 0.00\pt 11.70\pt + "downbow" "\\downbow" -4.22\pt 4.22\pt 0.00\pt 7.50\pt + "reverseturn" "\\reverseturn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt + "turn" "\\turn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt + "trill" "\\trill" -5.62\pt 5.62\pt 0.00\pt 12.66\pt + "upedalheel" "\\upedalheel" -2.81\pt 2.81\pt -2.81\pt 3.75\pt + "dpedalheel" "\\dpedalheel" -2.81\pt 2.81\pt -3.75\pt 2.81\pt + "upedaltoe" "\\upedaltoe" -2.81\pt 2.81\pt 0.00\pt 8.44\pt + "dpedaltoe" "\\dpedaltoe" -2.81\pt 2.81\pt -8.44\pt 0.00\pt + "flageolet" "\\flageolet" -3.00\pt 3.00\pt -3.00\pt 3.00\pt + "trilelement" "\\trilelement" -3.75\pt 1.47\pt -2.81\pt 2.81\pt + "prall" "\\prall" -6.36\pt 6.36\pt -2.81\pt 2.81\pt + "mordent" "\\mordent" -6.36\pt 6.36\pt -2.81\pt 2.81\pt + "prallprall" "\\prallprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "prallmordent" "\\prallmordent" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "upprall" "\\upprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "downprall" "\\downprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.28\pt 6.94\pt -17.24\pt 0.28\pt + "u4" "\\sixteenthflag" -0.28\pt 6.94\pt -20.05\pt 0.28\pt + "u5" "\\thirtysecondflag" -0.28\pt 6.94\pt -24.27\pt 0.28\pt + "u6" "\\sixtyfourthflag" -0.28\pt 6.94\pt -29.90\pt 0.28\pt + "d3" "\\deighthflag" -0.28\pt 7.68\pt -0.28\pt 16.40\pt + "d4" "\\dsixteenthflag" -0.28\pt 7.68\pt -0.28\pt 17.24\pt + "d5" "\\dthirtysecondflag" -0.28\pt 7.68\pt -0.28\pt 22.02\pt + "d6" "\\dsixtyfourthflag" -0.28\pt 7.68\pt -0.28\pt 24.83\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.62\pt 20.94\pt -11.25\pt 11.25\pt + "alto_change" "\\caltoclef" -4.50\pt 16.75\pt -9.00\pt 9.00\pt + "bass" "\\bassclef" -2.81\pt 20.25\pt -14.06\pt 5.62\pt + "bass_change" "\\cbassclef" -2.25\pt 16.20\pt -11.25\pt 4.50\pt + "violin" "\\violinclef" -4.90\pt 21.02\pt -16.88\pt 28.12\pt + "violin_change" "\\cviolinclef" -4.26\pt 16.48\pt -13.50\pt 22.50\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta23.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 8.44\pt -3.52\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 8.44\pt 0.00\pt 3.52\pt + "0o" "\\outsidewholerest" -3.52\pt 11.95\pt -3.52\pt 0.56\pt + "1o" "\\outsidehalfrest" -3.52\pt 11.95\pt -0.56\pt 3.52\pt + "2" "\\quartrest" 0.00\pt 6.08\pt 4.22\pt 20.25\pt + "3" "\\eighthrest" 0.00\pt 7.50\pt 5.62\pt 15.98\pt + "4" "\\sixteenthrest" 0.00\pt 8.73\pt 0.00\pt 15.98\pt + "5" "\\thirtysecondrest" 0.00\pt 9.85\pt 0.00\pt 21.61\pt + "6" "\\sixtyfourthrest" 0.00\pt 10.56\pt 0.00\pt 27.23\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 11.75\pt 0.00\pt 32.86\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 6.19\pt -8.44\pt 8.44\pt + "0" "\\natural" 0.00\pt 3.75\pt -8.44\pt 8.44\pt + "-1" "\\flat" -0.68\pt 4.50\pt -2.81\pt 11.25\pt + "-2" "\\flatflat" -0.68\pt 8.16\pt -2.81\pt 11.25\pt + "2" "\\sharpsharp" 0.00\pt 5.62\pt -2.81\pt 2.81\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.53\pt -1.27\pt 1.27\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.53\pt -2.81\pt 2.81\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-1l" "\\brevisledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "-2" "\\longaball" 0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-2l" "\\longaledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "0" "\\wholeball" 0.00\pt 11.14\pt -3.09\pt 3.09\pt + "0l" "\\wholeledger" -2.78\pt 13.92\pt -0.56\pt 0.56\pt + "1" "\\halfball" 0.00\pt 7.75\pt -3.09\pt 3.09\pt + "1l" "\\halfledger" -1.94\pt 9.69\pt -0.56\pt 0.56\pt + "2" "\\quartball" 0.00\pt 7.43\pt -3.09\pt 3.09\pt + "2l" "\\quartledger" -1.86\pt 9.29\pt -0.56\pt 0.56\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -7.45\pt 7.45\pt -0.42\pt 8.16\pt + "dfermata" "\\dfermata" -7.45\pt 7.45\pt -8.16\pt 0.42\pt + "sforzato" "\\sforzatoaccent" -5.06\pt 5.06\pt -2.81\pt 2.81\pt + "staccato" "\\staccato" -0.84\pt 0.84\pt -0.84\pt 0.84\pt + "ustaccatissimo" "\\ustaccatissimo" -1.13\pt 1.13\pt -0.20\pt 5.63\pt + "dstaccatissimo" "\\dstaccatissimo" -1.13\pt 1.13\pt -5.63\pt 0.20\pt + "tenuto" "\\tenuto" -5.06\pt 5.06\pt -0.34\pt 0.34\pt + "umarcato" "\\umarcato" -2.81\pt 2.81\pt 0.00\pt 6.19\pt + "dmarcato" "\\dmarcato" -2.81\pt 2.81\pt -6.19\pt 0.00\pt + "open" "\\ouvert" -2.25\pt 2.25\pt -2.81\pt 2.81\pt + "stopped" "\\plusstop" -3.09\pt 3.09\pt -3.09\pt 3.09\pt + "upbow" "\\upbow" -3.66\pt 3.66\pt 0.00\pt 11.70\pt + "downbow" "\\downbow" -4.22\pt 4.22\pt 0.00\pt 7.50\pt + "reverseturn" "\\reverseturn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt + "turn" "\\turn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt + "trill" "\\trill" -5.62\pt 5.62\pt 0.00\pt 12.66\pt + "upedalheel" "\\upedalheel" -2.81\pt 2.81\pt -2.81\pt 3.75\pt + "dpedalheel" "\\dpedalheel" -2.81\pt 2.81\pt -3.75\pt 2.81\pt + "upedaltoe" "\\upedaltoe" -2.81\pt 2.81\pt 0.00\pt 8.44\pt + "dpedaltoe" "\\dpedaltoe" -2.81\pt 2.81\pt -8.44\pt 0.00\pt + "flageolet" "\\flageolet" -3.00\pt 3.00\pt -3.00\pt 3.00\pt + "trilelement" "\\trilelement" -3.75\pt 1.47\pt -2.81\pt 2.81\pt + "prall" "\\prall" -6.36\pt 6.36\pt -2.81\pt 2.81\pt + "mordent" "\\mordent" -6.36\pt 6.36\pt -2.81\pt 2.81\pt + "prallprall" "\\prallprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "prallmordent" "\\prallmordent" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "upprall" "\\upprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + "downprall" "\\downprall" -8.97\pt 8.97\pt -2.81\pt 2.81\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.28\pt 6.94\pt -17.24\pt 0.28\pt + "u4" "\\sixteenthflag" -0.28\pt 6.94\pt -20.05\pt 0.28\pt + "u5" "\\thirtysecondflag" -0.28\pt 6.94\pt -24.27\pt 0.28\pt + "u6" "\\sixtyfourthflag" -0.28\pt 6.94\pt -29.90\pt 0.28\pt + "d3" "\\deighthflag" -0.28\pt 7.68\pt -0.28\pt 16.40\pt + "d4" "\\dsixteenthflag" -0.28\pt 7.68\pt -0.28\pt 17.24\pt + "d5" "\\dthirtysecondflag" -0.28\pt 7.68\pt -0.28\pt 22.02\pt + "d6" "\\dsixtyfourthflag" -0.28\pt 7.68\pt -0.28\pt 24.83\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.62\pt 20.94\pt -11.25\pt 11.25\pt + "alto_change" "\\caltoclef" -4.50\pt 16.75\pt -9.00\pt 9.00\pt + "bass" "\\bassclef" -2.81\pt 20.25\pt -14.06\pt 5.62\pt + "bass_change" "\\cbassclef" -2.25\pt 16.20\pt -11.25\pt 4.50\pt + "violin" "\\violinclef" -4.90\pt 21.02\pt -16.88\pt 28.12\pt + "violin_change" "\\cviolinclef" -4.26\pt 16.48\pt -13.50\pt 22.50\pt + } + % } % $name diff --git a/init/feta26.ly b/init/feta26.ly new file mode 100644 index 0000000000..c18ebdfc43 --- /dev/null +++ b/init/feta26.ly @@ -0,0 +1,178 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta26.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 9.75\pt -4.06\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 9.75\pt 0.00\pt 4.06\pt + "0o" "\\outsidewholerest" -4.06\pt 13.81\pt -4.06\pt 0.65\pt + "1o" "\\outsidehalfrest" -4.06\pt 13.81\pt -0.65\pt 4.06\pt + "2" "\\quartrest" 0.00\pt 7.02\pt 4.88\pt 23.40\pt + "3" "\\eighthrest" 0.00\pt 8.67\pt 6.50\pt 18.47\pt + "4" "\\sixteenthrest" 0.00\pt 10.08\pt 0.00\pt 18.47\pt + "5" "\\thirtysecondrest" 0.00\pt 11.38\pt 0.00\pt 24.97\pt + "6" "\\sixtyfourthrest" 0.00\pt 12.20\pt 0.00\pt 31.47\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 13.58\pt 0.00\pt 37.97\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 7.15\pt -9.75\pt 9.75\pt + "0" "\\natural" 0.00\pt 4.33\pt -9.75\pt 9.75\pt + "-1" "\\flat" -0.78\pt 5.20\pt -3.25\pt 13.00\pt + "-2" "\\flatflat" -0.78\pt 9.42\pt -3.25\pt 13.00\pt + "2" "\\sharpsharp" 0.00\pt 6.50\pt -3.25\pt 3.25\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.92\pt -1.46\pt 1.46\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.92\pt -3.25\pt 3.25\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-1l" "\\brevisledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "-2" "\\longaball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-2l" "\\longaledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "0" "\\wholeball" 0.00\pt 12.87\pt -3.58\pt 3.58\pt + "0l" "\\wholeledger" -3.22\pt 16.09\pt -0.65\pt 0.65\pt + "1" "\\halfball" 0.00\pt 8.95\pt -3.58\pt 3.58\pt + "1l" "\\halfledger" -2.24\pt 11.19\pt -0.65\pt 0.65\pt + "2" "\\quartball" 0.00\pt 8.59\pt -3.58\pt 3.58\pt + "2l" "\\quartledger" -2.15\pt 10.73\pt -0.65\pt 0.65\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -8.61\pt 8.61\pt -0.49\pt 9.43\pt + "dfermata" "\\dfermata" -8.61\pt 8.61\pt -9.43\pt 0.49\pt + "sforzato" "\\sforzatoaccent" -5.85\pt 5.85\pt -3.25\pt 3.25\pt + "staccato" "\\staccato" -0.98\pt 0.98\pt -0.98\pt 0.98\pt + "ustaccatissimo" "\\ustaccatissimo" -1.30\pt 1.30\pt -0.20\pt 6.50\pt + "dstaccatissimo" "\\dstaccatissimo" -1.30\pt 1.30\pt -6.50\pt 0.20\pt + "tenuto" "\\tenuto" -5.85\pt 5.85\pt -0.39\pt 0.39\pt + "umarcato" "\\umarcato" -3.25\pt 3.25\pt 0.00\pt 7.15\pt + "dmarcato" "\\dmarcato" -3.25\pt 3.25\pt -7.15\pt 0.00\pt + "open" "\\ouvert" -2.60\pt 2.60\pt -3.25\pt 3.25\pt + "stopped" "\\plusstop" -3.58\pt 3.58\pt -3.58\pt 3.58\pt + "upbow" "\\upbow" -4.23\pt 4.23\pt 0.00\pt 13.52\pt + "downbow" "\\downbow" -4.88\pt 4.88\pt 0.00\pt 8.67\pt + "reverseturn" "\\reverseturn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt + "turn" "\\turn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt + "trill" "\\trill" -6.50\pt 6.50\pt 0.00\pt 14.62\pt + "upedalheel" "\\upedalheel" -3.25\pt 3.25\pt -3.25\pt 4.33\pt + "dpedalheel" "\\dpedalheel" -3.25\pt 3.25\pt -4.33\pt 3.25\pt + "upedaltoe" "\\upedaltoe" -3.25\pt 3.25\pt 0.00\pt 9.75\pt + "dpedaltoe" "\\dpedaltoe" -3.25\pt 3.25\pt -9.75\pt 0.00\pt + "flageolet" "\\flageolet" -3.47\pt 3.47\pt -3.47\pt 3.47\pt + "trilelement" "\\trilelement" -4.33\pt 1.70\pt -3.25\pt 3.25\pt + "prall" "\\prall" -7.35\pt 7.35\pt -3.25\pt 3.25\pt + "mordent" "\\mordent" -7.35\pt 7.35\pt -3.25\pt 3.25\pt + "prallprall" "\\prallprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "prallmordent" "\\prallmordent" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "upprall" "\\upprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "downprall" "\\downprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.33\pt 8.02\pt -19.92\pt 0.33\pt + "u4" "\\sixteenthflag" -0.33\pt 8.02\pt -23.17\pt 0.33\pt + "u5" "\\thirtysecondflag" -0.33\pt 8.02\pt -28.05\pt 0.33\pt + "u6" "\\sixtyfourthflag" -0.33\pt 8.02\pt -34.55\pt 0.33\pt + "d3" "\\deighthflag" -0.33\pt 8.88\pt -0.33\pt 18.95\pt + "d4" "\\dsixteenthflag" -0.33\pt 8.88\pt -0.33\pt 19.92\pt + "d5" "\\dthirtysecondflag" -0.33\pt 8.88\pt -0.33\pt 25.45\pt + "d6" "\\dsixtyfourthflag" -0.33\pt 8.88\pt -0.33\pt 28.70\pt + } + "clefs" = \table { + "alto" "\\altoclef" -6.50\pt 24.19\pt -13.00\pt 13.00\pt + "alto_change" "\\caltoclef" -5.20\pt 19.36\pt -10.40\pt 10.40\pt + "bass" "\\bassclef" -3.25\pt 23.40\pt -16.25\pt 6.50\pt + "bass_change" "\\cbassclef" -2.60\pt 18.72\pt -13.00\pt 5.20\pt + "violin" "\\violinclef" -5.66\pt 24.29\pt -19.50\pt 32.50\pt + "violin_change" "\\cviolinclef" -4.92\pt 19.04\pt -15.60\pt 26.00\pt + } + % } % $name +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta26.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" 0.00\pt 9.75\pt -4.06\pt 0.00\pt + "1" "\\halfrest" 0.00\pt 9.75\pt 0.00\pt 4.06\pt + "0o" "\\outsidewholerest" -4.06\pt 13.81\pt -4.06\pt 0.65\pt + "1o" "\\outsidehalfrest" -4.06\pt 13.81\pt -0.65\pt 4.06\pt + "2" "\\quartrest" 0.00\pt 7.02\pt 4.88\pt 23.40\pt + "3" "\\eighthrest" 0.00\pt 8.67\pt 6.50\pt 18.47\pt + "4" "\\sixteenthrest" 0.00\pt 10.08\pt 0.00\pt 18.47\pt + "5" "\\thirtysecondrest" 0.00\pt 11.38\pt 0.00\pt 24.97\pt + "6" "\\sixtyfourthrest" 0.00\pt 12.20\pt 0.00\pt 31.47\pt + "7" "\\hundredtwentyeighthrest" 0.00\pt 13.58\pt 0.00\pt 37.97\pt + } + "accidentals" = \table { + "1" "\\sharp" 0.00\pt 7.15\pt -9.75\pt 9.75\pt + "0" "\\natural" 0.00\pt 4.33\pt -9.75\pt 9.75\pt + "-1" "\\flat" -0.78\pt 5.20\pt -3.25\pt 13.00\pt + "-2" "\\flatflat" -0.78\pt 9.42\pt -3.25\pt 13.00\pt + "2" "\\sharpsharp" 0.00\pt 6.50\pt -3.25\pt 3.25\pt + } + "dots" = \table { + "dot" "\\dot" 0.00\pt 2.92\pt -1.46\pt 1.46\pt + "repeatcolon" "\\repeatcolon" 0.00\pt 2.92\pt -3.25\pt 3.25\pt + } + "balls" = \table { + "-1" "\\brevisball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-1l" "\\brevisledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "-2" "\\longaball" 0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-2l" "\\longaledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "0" "\\wholeball" 0.00\pt 12.87\pt -3.58\pt 3.58\pt + "0l" "\\wholeledger" -3.22\pt 16.09\pt -0.65\pt 0.65\pt + "1" "\\halfball" 0.00\pt 8.95\pt -3.58\pt 3.58\pt + "1l" "\\halfledger" -2.24\pt 11.19\pt -0.65\pt 0.65\pt + "2" "\\quartball" 0.00\pt 8.59\pt -3.58\pt 3.58\pt + "2l" "\\quartledger" -2.15\pt 10.73\pt -0.65\pt 0.65\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -8.61\pt 8.61\pt -0.49\pt 9.43\pt + "dfermata" "\\dfermata" -8.61\pt 8.61\pt -9.43\pt 0.49\pt + "sforzato" "\\sforzatoaccent" -5.85\pt 5.85\pt -3.25\pt 3.25\pt + "staccato" "\\staccato" -0.98\pt 0.98\pt -0.98\pt 0.98\pt + "ustaccatissimo" "\\ustaccatissimo" -1.30\pt 1.30\pt -0.20\pt 6.50\pt + "dstaccatissimo" "\\dstaccatissimo" -1.30\pt 1.30\pt -6.50\pt 0.20\pt + "tenuto" "\\tenuto" -5.85\pt 5.85\pt -0.39\pt 0.39\pt + "umarcato" "\\umarcato" -3.25\pt 3.25\pt 0.00\pt 7.15\pt + "dmarcato" "\\dmarcato" -3.25\pt 3.25\pt -7.15\pt 0.00\pt + "open" "\\ouvert" -2.60\pt 2.60\pt -3.25\pt 3.25\pt + "stopped" "\\plusstop" -3.58\pt 3.58\pt -3.58\pt 3.58\pt + "upbow" "\\upbow" -4.23\pt 4.23\pt 0.00\pt 13.52\pt + "downbow" "\\downbow" -4.88\pt 4.88\pt 0.00\pt 8.67\pt + "reverseturn" "\\reverseturn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt + "turn" "\\turn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt + "trill" "\\trill" -6.50\pt 6.50\pt 0.00\pt 14.62\pt + "upedalheel" "\\upedalheel" -3.25\pt 3.25\pt -3.25\pt 4.33\pt + "dpedalheel" "\\dpedalheel" -3.25\pt 3.25\pt -4.33\pt 3.25\pt + "upedaltoe" "\\upedaltoe" -3.25\pt 3.25\pt 0.00\pt 9.75\pt + "dpedaltoe" "\\dpedaltoe" -3.25\pt 3.25\pt -9.75\pt 0.00\pt + "flageolet" "\\flageolet" -3.47\pt 3.47\pt -3.47\pt 3.47\pt + "trilelement" "\\trilelement" -4.33\pt 1.70\pt -3.25\pt 3.25\pt + "prall" "\\prall" -7.35\pt 7.35\pt -3.25\pt 3.25\pt + "mordent" "\\mordent" -7.35\pt 7.35\pt -3.25\pt 3.25\pt + "prallprall" "\\prallprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "prallmordent" "\\prallmordent" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "upprall" "\\upprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + "downprall" "\\downprall" -10.37\pt 10.37\pt -3.25\pt 3.25\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.33\pt 8.02\pt -19.92\pt 0.33\pt + "u4" "\\sixteenthflag" -0.33\pt 8.02\pt -23.17\pt 0.33\pt + "u5" "\\thirtysecondflag" -0.33\pt 8.02\pt -28.05\pt 0.33\pt + "u6" "\\sixtyfourthflag" -0.33\pt 8.02\pt -34.55\pt 0.33\pt + "d3" "\\deighthflag" -0.33\pt 8.88\pt -0.33\pt 18.95\pt + "d4" "\\dsixteenthflag" -0.33\pt 8.88\pt -0.33\pt 19.92\pt + "d5" "\\dthirtysecondflag" -0.33\pt 8.88\pt -0.33\pt 25.45\pt + "d6" "\\dsixtyfourthflag" -0.33\pt 8.88\pt -0.33\pt 28.70\pt + } + "clefs" = \table { + "alto" "\\altoclef" -6.50\pt 24.19\pt -13.00\pt 13.00\pt + "alto_change" "\\caltoclef" -5.20\pt 19.36\pt -10.40\pt 10.40\pt + "bass" "\\bassclef" -3.25\pt 23.40\pt -16.25\pt 6.50\pt + "bass_change" "\\cbassclef" -2.60\pt 18.72\pt -13.00\pt 5.20\pt + "violin" "\\violinclef" -5.66\pt 24.29\pt -19.50\pt 32.50\pt + "violin_change" "\\cviolinclef" -4.92\pt 19.04\pt -15.60\pt 26.00\pt + } + % } % $name diff --git a/input/bugs/a.ly b/input/bugs/a.ly new file mode 100644 index 0000000000..2706aa128d --- /dev/null +++ b/input/bugs/a.ly @@ -0,0 +1,56 @@ +\header{ +enteredby = "jcn"; +copyright = "PD"; +TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; +} + +\version "0.1.9"; + +shortlong = \melodic{ + \octave c'; + c4()c( c c | + c c c c | + c c c c | + \break; + c c c )c | +} + +sl = \melodic{ + \octave c''; +% e4()e( a e | + e4 e( a e | + e e e e | + e e e a | + \break; + e e g )e | +} + +broken = \melodic{ + \octave c''; + c c c c() + c c c c( + c )c c c( + c c )c c( + )a' a' a' a'() + a' a' a' a'() + c( c c )c + c( c c )'f + 'f( c c )c + 'f( c c )'f +} + +\score{ + \melodic{ +% \shortlong + \sl +% \broken + } + \paper{ + indent = 0.0\pt; + %for broken! +% linewidth= 30.\mm; + castingalgorithm = \Wordwrap; + } +} + diff --git a/input/bugs/multi-slope.ly b/input/bugs/multi-slope.ly new file mode 100644 index 0000000000..24677ef3d0 --- /dev/null +++ b/input/bugs/multi-slope.ly @@ -0,0 +1,6 @@ +\score{ + \melodic{ + \octave c'; + [c8 c16 c16] + } +} diff --git a/input/bugs/slur-broken.ly b/input/bugs/slur-broken.ly new file mode 100644 index 0000000000..dfdf22adc2 --- /dev/null +++ b/input/bugs/slur-broken.ly @@ -0,0 +1,20 @@ +shortlong = \melodic{ + c4()c( c c | + c c c c | + c c c c | + \break; + c c c )c | + c c c c | + c c c c | + c c c c | + c c c c | +} + +\score{ + \shortlong + \paper{ + indent = 0.0\pt; + % linewidth= 30.\mm; + castingalgorithm = \Wordwrap; + } +} diff --git a/input/dummy.tex b/input/dummy.tex deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/input/part.ly b/input/part.ly index 39737f22ff..b2d6ad9bc2 100644 --- a/input/part.ly +++ b/input/part.ly @@ -1,11 +1,11 @@ part = \melodic{ \octave c; - c c c c + c-1 c c c r1*3 - c4 c c c - c c c c - c c c c - c c c c + c4-5 c c c + c-6 c c c + c-7 c c c + c-8 c c c } a4 = \paper{ diff --git a/input/test/broken.ly b/input/test/broken.ly new file mode 100644 index 0000000000..23333057a2 --- /dev/null +++ b/input/test/broken.ly @@ -0,0 +1,44 @@ +\header{ +enteredby = "jcn"; +copyright = "PD"; +TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; +} + +\version "0.1.9"; + +shortlong = \melodic{ + c4()c( c c | + c c c c | + c c c c | + \break; + c c c )c | +} + +broken = \melodic{ + \octave c''; + c c c c() + c c c c( + c )c c c( + c c )c c( + )a' a' a' a'() + a' a' a' a'() + c( c c )c + c( c c )'f + 'f( c c )c + 'f( c c )'f +} + +\score{ + \melodic{ +% \shortlong + \broken + } + \paper{ + indent = 0.0\pt; + %for broken! + linewidth= 30.\mm; + castingalgorithm = \Wordwrap; + } +} + diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 9ea0df5912..116aa60db0 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -11,6 +11,7 @@ shortlong = \melodic{ c4()c( c c | c c c c | c c c c | + \break; c c c )c | } @@ -133,6 +134,7 @@ blend = \melodic{ \octave c'; e( c'' c'' )e \stemup + f'( c'' c'' )f' e( c'' c'' )e \stemdown f'( \stemboth 'a 'a \stemdown )f' @@ -174,7 +176,7 @@ clipping = \melodic{ \score{ \melodic{ % use blend for fast check - %\blend + \blend % { \shortlong \dirs @@ -185,16 +187,16 @@ clipping = \melodic{ \tiltup \tiltdown \bug - \clipping % } + \clipping % use broken with small linewidth %\broken } \paper{ indent = 0.0\pt; %for broken! - %linewidth= 40.\mm; - %castingalgorithm = \Wordwrap; + % linewidth= 30.\mm; + castingalgorithm = \Wordwrap; } } diff --git a/lily/VERSION b/lily/VERSION index bd76086098..e825e8955d 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,5 @@ -MAJOR_VERSION = 0 -MINOR_VERSION = 1 -PATCH_LEVEL = 58 -MY_PATCH_LEVEL = +MAJOR_VERSION=0 +MINOR_VERSION=1 +PATCH_LEVEL=60 +MY_PATCH_LEVEL= + diff --git a/lily/bar-number-grav.cc b/lily/bar-number-grav.cc index 03e5fece81..9a24c2739b 100644 --- a/lily/bar-number-grav.cc +++ b/lily/bar-number-grav.cc @@ -34,10 +34,13 @@ Bar_number_engraver::acknowledge_element (Score_elem_info i) script_p_ = new Script; Text_def *td_p =new Text_def; td_p->text_str_ = time->bars_i_; + td_p->align_i_ = LEFT; script_p_->specs_l_ = td_p; script_p_->breakable_b_ = true; script_p_->dir_ = UP; +// script_p_->y_ += 2; + script_p_->y_ = 8; announce_element (Score_elem_info (script_p_, &dummy)); } diff --git a/lily/bezier.cc b/lily/bezier.cc index bb360581e2..5fea339288 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -15,9 +15,9 @@ #include "paper-def.hh" #include "debug.hh" #include "main.hh" -#define SLUR_DOUT if (check_debug && !monitor->silent_b ("Slur")) cout +#define BEZIER_BOW_DOUT if (check_debug && !monitor->silent_b ("Bezier_bow")) cout #else -#define SLUR_DOUT cerr +#define BEZIER_BOW_DOUT cerr #endif void @@ -101,7 +101,7 @@ Bezier::y (Real x) Offset z1 = curve_[i-1]; Offset z2 = curve_[i]; Real multiplier = (x - z2.x ()) / (z1.x () - z2.x ()); - Real y = z1.y () * multiplier + (1.0 - multiplier) * z2.y(); + Real y = z1.y () * multiplier + (1.0 - multiplier) *z2.y(); return y; } @@ -243,8 +243,6 @@ Bezier_bow::calc () bool Bezier_bow::calc_clipping () { - if (!experimental_features_global_b) - return false; #ifndef STANDALONE Real staffsize_f = paper_l_->get_var ("barsize"); #else @@ -288,13 +286,23 @@ Bezier_bow::calc_clipping () begin_dy = c * begin_alpha / max_alpha * begin_h; if (end_alpha >= max_alpha) end_dy = c * end_alpha / max_alpha * end_h; - encompass_[0].y () += begin_dy; - encompass_[encompass_.size () - 1].y () += end_dy; - Offset delta = encompass_[encompass_.size () - 1] - encompass_[0]; - alpha_ = delta.arg (); - alpha_ *= dir_; -// again = false; + Real dy = end_dy >? begin_dy; + + if (!experimental_features_global_b) + { + encompass_[0].y () += dy; + encompass_[encompass_.size () - 1].y () += dy; + } + else + { + encompass_[0].y () += begin_dy; + encompass_[encompass_.size () - 1].y () += end_dy; + + Offset delta = encompass_[encompass_.size () - 1] - encompass_[0]; + alpha_ = delta.arg (); + alpha_ *= dir_; + } } origin_ = encompass_[0]; @@ -309,8 +317,12 @@ Bezier_bow::calc_clipping () void Bezier_bow::calc_controls () { + // try clipping twice for (int i = 0; i < 3; i++) { + if (i && !calc_clipping ()) + return; + calc_default (0); calc_bezier (); @@ -320,13 +332,10 @@ Bezier_bow::calc_controls () return; } calc_tangent_controls (); - blow_fit (); + blow_fit (); // ugh blow_fit (); - - if (!calc_clipping ()) - return; } } @@ -354,7 +363,7 @@ void Bezier_bow::calc_tangent_controls () { Offset ijk_p (control_[3].x () / 2, control_[1].y ()); - SLUR_DOUT << "ijk: " << ijk_p.x () << ", " << ijk_p.y () << endl; + BEZIER_BOW_DOUT << "ijk: " << ijk_p.x () << ", " << ijk_p.y () << endl; Real default_rc = ijk_p.y () / ijk_p.x (); @@ -390,8 +399,8 @@ Bezier_bow::calc_tangent_controls () end_p = ijk_p; end_rc = default_rc; } - SLUR_DOUT << "begin " << begin_p.x () << ", " << begin_p.y () << endl; - SLUR_DOUT << "end " << end_p.x () << ", " << end_p.y () << endl; + BEZIER_BOW_DOUT << "begin " << begin_p.x () << ", " << begin_p.y () << endl; + BEZIER_BOW_DOUT << "end " << end_p.x () << ", " << end_p.y () << endl; Real height =control_[1].y (); for (int i = 0; i < encompass_.size (); i++ ) @@ -430,17 +439,17 @@ Bezier_bow::calc_tangent_controls () Real c3 = begin_p.y () > end_p.y () ? begin_p.y () - rc3 * begin_p.x () : end_p.y () - rc3 * end_p.x (); - SLUR_DOUT << "y1 = " << rc1 << " x + 0" << endl; - SLUR_DOUT << "y2 = " << rc2 << " x + " << c2 << endl; - SLUR_DOUT << "y3 = " << rc3 << " x + " << c3 << endl; + BEZIER_BOW_DOUT << "y1 = " << rc1 << " x + 0" << endl; + BEZIER_BOW_DOUT << "y2 = " << rc2 << " x + " << c2 << endl; + BEZIER_BOW_DOUT << "y3 = " << rc3 << " x + " << c3 << endl; control_[1].x () = c3 / (rc1 - rc3); control_[1].y () = rc1 * control_[1].x (); control_[2].x () = (c3 - c2) / (rc2 - rc3); - SLUR_DOUT << "c2.x () = " << control_[2].x () << endl; - SLUR_DOUT << "(c3 - c2) = " << (c3 - c2) << endl; - SLUR_DOUT << "(rc2 - rc3) = " << (rc2 - rc3) << endl; + BEZIER_BOW_DOUT << "c2.x () = " << control_[2].x () << endl; + BEZIER_BOW_DOUT << "(c3 - c2) = " << (c3 - c2) << endl; + BEZIER_BOW_DOUT << "(rc2 - rc3) = " << (rc2 - rc3) << endl; control_[2].y () = rc2 * control_[2].x () + c2; - SLUR_DOUT << "c2.y ()" << control_[2].y () << endl; + BEZIER_BOW_DOUT << "c2.y ()" << control_[2].y () << endl; calc_return (begin_alpha, end_alpha); } diff --git a/lily/bow.cc b/lily/bow.cc index 30e82e05e2..48477b9837 100644 --- a/lily/bow.cc +++ b/lily/bow.cc @@ -8,10 +8,12 @@ */ #include "bow.hh" +#include "debug.hh" #include "paper-def.hh" #include "molecule.hh" #include "lookup.hh" #include "bezier.hh" +#include "main.hh" IMPLEMENT_IS_TYPE_B1(Bow,Directional_spanner); @@ -28,8 +30,21 @@ Bow::brew_molecule_p () const Array c = get_controls (); Atom a = paper ()->lookup_l ()->slur (c); -// a.translate (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT])); - a.translate (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT] - c[0].y ())); + Real dy = c[3].y () - c[0].y (); + if (check_debug && !monitor->silent_b ("Bow")) + { + static int i = 1; + cout << "******" << i++ << "******" << endl; + // gcc 2.7.2: ices +// cout << "c0.y: " << c[0].y << endl; + cout << "c0.y: " << c[0].y () << endl; + cout << "c3.y: " << c[3].y () << endl; + cout << "dy: " << dy << endl; + cout << "dy_f_l: " << dy_f_drul_[LEFT] << endl; + cout << "dy_f_r: " << dy_f_drul_[RIGHT] << endl; + cout << "dy_f: " << dy_f_drul_[RIGHT] - dy_f_drul_[LEFT] << endl; + } + a.translate (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT])); mol_p->add (a); @@ -74,11 +89,25 @@ Bow::get_encompass_offset_arr () const { Real dx = width (). length (); dx += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); + Real left_x = 0; + Real interline = paper ()->interline_f (); + if (dx < 2.0 * interline) + { + left_x = - 3.0 * interline; + dx = 2.0 * interline; + } Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]; +#define RESIZE_ICE +#ifndef RESIZE_ICE Array notes; - notes.push (Offset (0,0)); - notes.push (Offset (dx, dy)); + notes.push (Offset (left_x, 0)); + notes.push (Offset (left_x + dx, dy)); +#else + Array notes (2); + notes[0] = Offset (left_x, 0); + notes[1] = Offset (left_x + dx, dy); +#endif return notes; } diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index d7e78c400e..2c93ec04c6 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -78,7 +78,7 @@ Multi_measure_rest_engraver::do_pre_move_processing () if (part_b_) return; - if (last_mom_ <= now_moment () + Moment (1)) + if (last_mom_ <= now_moment ()) multi_measure_req_l_ = 0; } diff --git a/lily/slur.cc b/lily/slur.cc index 69b49cde0a..4df6464f91 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -25,8 +25,8 @@ #include "debug.hh" #include "boxes.hh" #include "bezier.hh" +// #include "main.hh" -//IMPLEMENT_IS_TYPE_B1(Slur,Spanner); IMPLEMENT_IS_TYPE_B1(Slur,Bow); Slur::Slur () @@ -170,24 +170,51 @@ Slur::get_encompass_offset_arr () const Real dx = width ().length (); dx += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); dx = dx ? 2 * interline; + dx = dx >? 2.0 * interline; Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]); if (abs (dy) > 1000) dy = sign (dy) * 1000; + Real start_x = 0; + Real start_y = left_y - dy_f_drul_[LEFT]; int first = 1; int last = encompass_arr_.size () - 1; + + // broken slur first part if (encompass_arr_[0] != spanned_drul_[LEFT]) { first = 0; left_x = spanned_drul_[LEFT]->width ().length (); left_x -= 2 * notewidth; - left_y = encompass_arr_[last]->stem_l_->height ()[dir_]; + // urg + start_x = left_x - 2 * notewidth; + + // urg + if (encompass_arr_.size () > 1) + dx += notewidth; + + if (dx < 2.0 * interline) + { + left_x -= 2.0 * interline - dx; + dx = 2.0 * interline; + start_x = left_x; + } + + if (dir_ == UP) + left_y = left_y >? dy_f_drul_[LEFT]; + else + left_y = left_y notes; - notes.push (Offset (0,0)); + notes.push (Offset (start_x, start_y)); #else int n = last - first + 2; Array notes (n); - notes[0] = Offset (0,0); + notes[0] = Offset (start_x, start_y); #endif for (int i = first; i < last; i++) { @@ -211,7 +238,14 @@ Slur::get_encompass_offset_arr () const Real x = stem->hpos_f (); if (stem->dir_ != dir_) - x += 0.5 * notewidth; + { + x += 0.5 * notewidth; + // ugh + if (dir_ == DOWN) + x -= 0.5 * notewidth; + else + x += 0.5 * notewidth; + } else if (stem->dir_ == UP) x += 1.0 * notewidth; @@ -224,6 +258,7 @@ Slur::get_encompass_offset_arr () const */ y += 2.5 * internote * dir_; + // ugh if (dir_ == DOWN) y += 1.5 * internote * dir_; @@ -232,11 +267,11 @@ Slur::get_encompass_offset_arr () const #ifndef RESIZE_ICE notes.push (Offset (x, y)); } - notes.push (Offset (dx, dy)); + notes.push (Offset (start_x + dx, start_y + dy)); #else notes[i - first + 1] = Offset (x, y); } - notes[n - 1] = Offset (dx, dy); + notes[n - 1] = Offset (start_x + dx, start_y + dy); #endif return notes; diff --git a/make/Docrules.make b/make/Docrules.make index e66b3c8212..e718c7779a 100644 --- a/make/Docrules.make +++ b/make/Docrules.make @@ -15,7 +15,7 @@ $(outdir)/%.dvi: $(outdir)/%.mudtex mv $(notdir $@) $(outdir) $(outdir)/%.mudtex: %.doc - $(depth)/bin/out/mudela-book --noindex --outdir=$(outdir)/ --outname=$(notdir $@) $< + $(depth)/bin/out/mudela-book --outdir=$(outdir)/ --outname=$(notdir $@) $< $(outdir)/%.txt: $(outdir)/%.1 troff -man -Tascii $< | grotty -b -u -o > $@ diff --git a/make/Files.make b/make/Files.make index 87baac4272..31cdf0e205 100644 --- a/make/Files.make +++ b/make/Files.make @@ -21,6 +21,8 @@ EXTRA_SOURCE_FILES = $(wildcard *.yy *.ll) # PODFILES = $(wildcard *.pod) +OUTPODFILES = $(addprefix $(outdir)/,$(PODFILES)) + CCFILES = $(wildcard *.cc) MAKEFILES = $(wildcard *.make) diff --git a/make/Targets.make b/make/Targets.make index c696163f14..37135f0f46 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -33,6 +33,7 @@ exe: $(EXECUTABLE) # $(LIBRARY): $(configheader) $(OFILES) $(AR_COMMAND) $(OFILES) + $(AR) ts $@ #silly irix $(RANLIB_COMMAND) $(SHAREDLIBRARY): $(configheader) $(OFILES) $(MODULE_LIBDEPS) @@ -230,6 +231,10 @@ check-mf-deps: $(configheader): $(depth)/$(configuration).hh cp $< $@ +WWW: local-WWW + $(LOOP) + +local-WWW: ifneq ($(DEPFILES),) diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in index f376ebc313..d3dfff3081 100644 --- a/make/Toplevel.make.in +++ b/make/Toplevel.make.in @@ -64,3 +64,14 @@ Makefile: make/Toplevel.make.in cat $< >> $@ chmod -w $@ + +website: + + +examples: + $(MAKE) CONFIGSUFFIX='www' -C input WWW + $(MAKE) CONFIGSUFFIX='www' -C mutopia WWW + tar cfz $(outdir)/examples.tar.gz `find input mutopia -type d -name 'out-www' -print` + + + diff --git a/make/Variables.make b/make/Variables.make index 60a2205ab9..6d6f7a5bdd 100644 --- a/make/Variables.make +++ b/make/Variables.make @@ -152,8 +152,8 @@ CFLAGS = $(ICFLAGS) $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS) # huh, but still, no warnings even provoced with linux's gcc 2.7.2.1? # -pipe makes it go faster, but is not supported on all platforms. -# EXTRA_CXXFLAGS= -fno-rtti -fno-exceptions -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion -EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion +# EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion +EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS) INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) diff --git a/make/WWW.make b/make/WWW.make index 58379aed6e..bb47c54f87 100644 --- a/make/WWW.make +++ b/make/WWW.make @@ -5,7 +5,9 @@ ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(examples))) gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(examples))) +html_subdirs=$(addprefix --subdirs ,$(SUBDIRS)) -WWW: $(ly_examples) $(ps_examples) $(gif_examples) - (cd $(outdir); $(PYTHON) ../$(depth)/bin/mutopia-index.py $(examples)) + +local-WWW: $(ly_examples) $(ps_examples) $(gif_examples) + (cd $(outdir); $(PYTHON) ../$(depth)/bin/mutopia-index.py --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(examples)) diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 5069c41b95..a62c481739 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.59 -Inschrijf datum: 27APR98 +Versie: 0.1.60 +Inschrijf datum: 29APR98 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.59.tar.gz + 395k lilypond-0.1.60.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.59.tar.gz + 395k lilypond-0.1.60.tar.gz Copi"eer politie: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index f8ba14b405..af277bebce 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.59 -Entered-date: 27APR98 +Version: 0.1.60 +Entered-date: 29APR98 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.59.tar.gz + 570k lilypond-0.1.60.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 570k lilypond-0.1.59.tar.gz + 570k lilypond-0.1.60.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 46cb95948a..6a07511883 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.59 +Version: 0.1.60 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-0.1.59.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-0.1.60.tar.gz Summary: A program for typesetting music. URL: http://www.cs.ruu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys @@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu make -C Documentation gifs make prefix="$RPM_BUILD_ROOT/usr" install %files -%doc Documentation/out/AUTHORS.txt Documentation/out/CodingStyle.txt Documentation/out/INSTALL.txt Documentation/out/MANIFESTO.txt Documentation/out/PATCHES.txt Documentation/out/faq.txt Documentation/out/gnu-music.txt Documentation/out/index.txt Documentation/out/internals.txt Documentation/out/language.txt Documentation/out/links.txt Documentation/out/literature.txt Documentation/out/mutopia.txt Documentation/out/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/cadenza.ly input/coriolan-alto.ly input/dummy.tex input/keys.ly input/kortjakje.ly input/multi.ly input/part.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/mudela.doc +%doc Documentation/out/AUTHORS.txt Documentation/out/CodingStyle.txt Documentation/out/INSTALL.txt Documentation/out/MANIFESTO.txt Documentation/out/PATCHES.txt Documentation/out/faq.txt Documentation/out/gnu-music.txt Documentation/out/index.txt Documentation/out/internals.txt Documentation/out/language.txt Documentation/out/links.txt Documentation/out/literature.txt Documentation/out/mi2mu.txt Documentation/out/mutopia.txt Documentation/out/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README +%doc input/cadenza.ly input/coriolan-alto.ly input/keys.ly input/kortjakje.ly input/multi.ly input/part.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/mudela.doc %doc Documentation/out/lelie_logo.gif /usr/bin/convert-mudela /usr/bin/mudela-book diff --git a/mutopia/Coriolan/Makefile b/mutopia/Coriolan/Makefile index 40ce58e198..1b13f7fcf5 100644 --- a/mutopia/Coriolan/Makefile +++ b/mutopia/Coriolan/Makefile @@ -7,3 +7,6 @@ depth = ../.. # generic stuff/Makefile # include ./$(depth)/make/Mutopia.make + +examples=coriolan oboi-part +include $(depth)/make/WWW.make diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index dff3a502af..98b5765212 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -13,6 +13,7 @@ copyright = "public domain"; \include "clarinetti.ly" \score{ +% \property Score.part = 1 \$clarinetti_staff \paper{} } diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 29b6bce0f4..635b57a802 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -13,11 +13,11 @@ copyright = "public domain"; clarinetto1 = \melodic{ \octave c'; - r1 | r1 | c'4-.\ff r r2 | r1 | - r1 | r1 | d'4-. r r2 | r1 | - r1 | r1 | es'4-. r r2 | r1 | + r1*2 | c'4-.\ff r r2 | r1*3 | + d'4-. r r2 | r1*3 | + es'4-. r r2 | r1 | es'4-. r r2 | d'4-. r r2 | - r1 | r1 | r1 | r1 | + r1*4 | as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f | } diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index f69468e831..aa1fd84857 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -17,11 +17,11 @@ clarinetto2 = \melodic{ % lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed. % Aborted (core dumped) % r1 | r1 | as4-.\ff r r2 | r1 | - r1 | r1 | as4-. r r2 | r1 | - r1 | r1 | b4-. r r2 | r1 | - r1 | r1 | c'4-. r r2 | r1 | + r1*2 | as4-. r r2 | r1*3 | + b4-. r r2 | r1*3 | + c'4-. r r2 | r1 | c'4-. r r2 | b4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 'b4-. | + r1*5 | + r2 r4 'b4-. | } diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 088608e52a..ae4c5e0e05 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -15,6 +15,7 @@ copyright = "public domain"; \include "corni.ly" \score{ +% \property Score.part = 1 \$corni_staff \paper{} } diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 5193c002d9..0869da4d2d 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -13,11 +13,11 @@ copyright = "public domain"; corno1 = \melodic{ \octave c'; - r1 | r1 | as'4-.\ff r r2 | r1 | - r1 | r1 | as'4-. r r2 | r1 | - r1 | r1 | es'4-. r r2 | r1 | + r1*2 | as'4-.\ff r r2 | r1*3 | + as'4-. r r2 | r1*3 | + es'4-. r r2 | r1 | g'4-. r r2 | g'4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 g'4-.\f | + r1*5 | + r2 r4 g'4-.\f | } diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index cbebbf49d5..5eb5c4895b 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -15,11 +15,11 @@ corno2 = \melodic{ \octave c'; % koor: corno-part.ly % r1 | r1 | f'4-.\ff r r2 | r1 | - r1 | r1 | f'4-. r r2 | r1 | - r1 | r1 | f'4-. r r2 | r1 | - r1 | r1 | es'4-. r r2 | r1 | + r1*2 | f'4-. r r2 | r1*3 | + f'4-. r r2 | r1*3 | + es'4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 g4-. | + r1*5 | + r2 r4 g4-. | } diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index b9b19b0ba0..ad23c5c12d 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -15,6 +15,7 @@ copyright = "public domain"; \include "fagotti.ly" \score{ +% \property Score.part = 1 \$fagotti_staff \paper{} } diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 8cf7e432b1..6718dd4c8b 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -13,11 +13,11 @@ copyright = "public domain"; fagotto1 = \melodic{ \octave c; - r1 | r1 | as4-.\ff r r2 | r1 | - r1 | r1 | as4-. r r2 | r1 | - r1 | r1 | a4-. r r2 | r1 | + r1*2 | as4-.\ff r r2 | r1*3 | + as4-. r r2 | r1*3 | + a4-. r r2 | r1 | c'4-. r r2 | b4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 g4-.\f | + r1*5 | + r2 r4 g4-.\f | } diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 946ce94545..2889c688a8 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -15,11 +15,11 @@ fagotto2 = \melodic{ \octave c; % koor % r1 | r1 | f4-.\ff r r2 | r1 | - r1 | r1 | f4-. r r2 | r1 | - r1 | r1 | f4-. r r2 | r1 | - r1 | r1 | fis4-. r r2 | r1 | + r1*2 | f4-. r r2 | r1*3 | + f4-. r r2 | r1*3 | + fis4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 'g4-. | + r1*5 | + r2 r4 'g4-. | } diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 5e9dfb00e8..13e4510f34 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -15,6 +15,7 @@ copyright = "public domain"; \include "flauti.ly" \score{ +% \property Score.part = 1 \$flauti_staff \paper{} } diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index bb62b1bb1b..5475ffe1ee 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -13,11 +13,11 @@ copyright = "public domain"; flauto1 = \melodic{ \octave c''; - r1 | r1 | c'4-.\ff r r2 | r1 | - r1 | r1 | d'4-. r r2 | r1 | - r1 | r1 | es'4-. r r2 | r1 | + r1*2 | c'4-.\ff r r2 | r1*3 | + d'4-. r r2 | r1*3 | + es'4-. r r2 | r1 | g'4-. r r2 | b4-. r r2 | - r1 | r1 | r1 | r1 | + r1*4 | r2 es'\p_"\ \ \ cresc." ( | )dis'2. es'4-.\f | } diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 0a6f57b8c9..aeddce6a8f 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -15,11 +15,11 @@ flauto2 = \melodic{ \octave c''; % koor % r1 | r1 | as4-.\ff r r2 | r1 | - r1 | r1 | as4-. r r2 | r1 | - r1 | r1 | b4-. r r2 | r1 | - r1 | r1 | c'4-. r r2 | r1 | + r1*2 | as4-. r r2 | r1*3 | + b4-. r r2 | r1*3 | + c'4-. r r2 | r1 | es'4-. r r2 | d4-. r r2 | - r1 | r1 | r1 | r1 | + r1*4 | r2 r2 | r2 r4 b4-. | } diff --git a/mutopia/Coriolan/music.ly b/mutopia/Coriolan/music.ly new file mode 100644 index 0000000000..240986b5c8 --- /dev/null +++ b/mutopia/Coriolan/music.ly @@ -0,0 +1,18 @@ +flauto-1.ly +flauto-2.ly +oboe-1.ly +oboe-2.ly +clarinetto-1.ly +clarinetto-2.ly +fagotto-1.ly +fagotto-2.ly +corno-1.ly +corno-2.ly +trombo-1.ly +trombo-2.ly +timpani.ly +violino-1.ly +violino-2.ly +viola.ly +violoncello.ly +contrabasso.ly diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index b68f11cbf3..ab3290fb16 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -13,11 +13,11 @@ copyright = "public domain"; oboe1 = \melodic{ \octave c''; - r1 | r1 | as4-.\ff r r2 | r1 | - r1 | r1 | as4-. r r2 | r1 | - r1 | r1 | a4-. r r2 | r1 | + r1*2 | as4-.\ff r r2 | r1*3 | + as4-. r r2 | r1*3 | + a4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | - r1 | r1 | r1 | r1 | + r1*4 | as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f | } diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 94cecf9b4d..75e5e5dfab 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -15,11 +15,11 @@ oboe2 = \melodic{ \octave c''; % koor % r1 | r1 | f4-.\ff r r2 | r1 | - r1 | r1 | f4-. r r2 | r1 | - r1 | r1 | f4-. r r2 | r1 | - r1 | r1 | es4-. r r2 | r1 | + r1*2| f4-. r r2 | r1*3 | + f4-. r r2 | r1*3 | + es4-. r r2 | r1 | es4-. r r2 | 'b4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 'b4-. | + r1*5 | + r2 r4 'b4-. | } diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 3d67ea5234..eef9019b7e 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -15,6 +15,7 @@ copyright = "public domain"; \include "oboi.ly" \score{ +% \property Score.part = 1 \$oboi_staff \paper{} } diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 9ad4482ecf..3c3bd64aa9 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -13,12 +13,12 @@ copyright = "public domain"; timpani = \melodic{ \octave c; - r1 | r1 | c4-.\ff r r2 | r1 | - r1 | r1 | c4-. r r2 | r1 | - r1 | r1 | c4-. r r2 | r1 | + r1*2 | c4-.\ff r r2 | r1*3 | + c4-. r r2 | r1*3 | + c4-. r r2 | r1 | 'g4-. r r2 | 'g4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 'g4-. | + r1*5 | + r2 r4 'g4-. | } $timpani_staff = \type Staff = timpani < diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index b32d202d52..a9f5fd0506 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -15,6 +15,7 @@ copyright = "public domain"; \include "trombe.ly" \score{ +% \property Score.part = 1 \$trombe_staff \paper{} } diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 49aefe57de..a377271834 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -13,11 +13,11 @@ copyright = "public domain"; trombo1 = \melodic{ \octave c'; - r1 | r1 | c'4-.\ff r r2 | r1 | - r1 | r1 | c'4-. r r2 | r1 | - r1 | r1 | c'4-. r r2 | r1 | + r1*2 | c'4-.\ff r r2 | r1*3 | + c'4-. r r2 | r1*3 | + c'4-. r r2 | r1 | g4-. r r2 | g4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 g4-.\f | + r1*5 | + r2 r4 g4-.\f | } diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 1ca561b103..1288eabaef 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -15,11 +15,11 @@ trombo2 = \melodic{ \octave c'; % koor % r1 | r1 | c4-.\ff r r2 | r1 | - r1 | r1 | c4-. r r2 | r1 | - r1 | r1 | c4-. r r2 | r1 | - r1 | r1 | c4-. r r2 | r1 | + r1*2 | c4-. r r2 | r1*3 | + c4-. r r2 | r1*3 | + c4-. r r2 | r1 | 'g4-. r r2 | 'g4-. r r2 | - r1 | r1 | r1 | r1 | - r1 | r2 r4 'g4-. | + r1*5 | + r2 r4 'g4-. | } diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 260ea14181..28e91a5052 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -17,7 +17,7 @@ violino2 = \melodic{ c1 ~ | c | r r2 | r1 | c1 ~ | c | r r2 | r1 | r r2 | r r2 | - r1 | r1 | r1 | + r1*3 | r2 ['b8-.\p f-.] [f()es] | [es8-. as-.] as4.-"cresc." g8-. g4 ~ | [g8 fis-.] fis4 ~ fis g-.\f | diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly index a248586c76..db687e59f2 100644 --- a/mutopia/J.S.Bach/preludes-1.ly +++ b/mutopia/J.S.Bach/preludes-1.ly @@ -1,7 +1,12 @@ \header{ filename = "preludes-1.ly"; -title = "DOUZE P\'ETITES PRELUDES"; -% tempo = "Moderato" +% mmm +title = "DOUZE PETITES PR\'ELUDES"; +opus = "BWV 924"; +% blz 1 +% Clavierb"uchlein f"ur W. Fr. Bach +% Clav. W. Fr. Bach: 2-Praeambulum I +% ca 1720 composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly index 48dcb7d083..eb4a1fcc8d 100644 --- a/mutopia/J.S.Bach/preludes-2.ly +++ b/mutopia/J.S.Bach/preludes-2.ly @@ -1,6 +1,12 @@ \header{ filename = "preludes-2.ly"; title = "2"; +opus = "BWV 939"; +% blz 10 +% +% Six Petits Pr'eludes +% Collection Johann Peter Kellner +% ca 1703 - 1707 composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4 index ec1ef4fc2c..7515b635df 100644 --- a/mutopia/J.S.Bach/preludes-3.ly.m4 +++ b/mutopia/J.S.Bach/preludes-3.ly.m4 @@ -1,6 +1,12 @@ \header{ filename = "preludes-3.ly"; title = "3"; +opus = "BWV 999"; +% 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"; diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly index 3e4887586a..eb7dc7b213 100644 --- a/mutopia/J.S.Bach/preludes-4.ly +++ b/mutopia/J.S.Bach/preludes-4.ly @@ -1,6 +1,11 @@ \header{ filename = "preludes-4.ly"; title = "4"; +opus = "BWV 925"; +% blz 8 +% Clavierb"uchlein f"ur W. Fr. Bach +% Clav. W. Fr. Bach: 27-Praeludium ex d neutral +% ca 1720 composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly index 4753fdc05c..34dd4d41c4 100644 --- a/mutopia/J.S.Bach/preludes-5.ly +++ b/mutopia/J.S.Bach/preludes-5.ly @@ -1,6 +1,10 @@ \header{ filename = "preludes-5.ly"; title = "5"; +% blz 2 +% Clavierb"uchlein f"ur W. Fr. Bach +% Clav. W. Fr. Bach: 4-Praeludium 2 +% ca 1720 composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; @@ -102,7 +106,7 @@ two = \melodic{ d-\mordent r r | 'd4 r r | d-\mordent r r | - d r r | +% d r r | 'd4 r r | [d8-2 'a-5 d-2 f-1 d-4 f-2] | [a-1 f-4 a-2 d'-1 a-2 d'-1] | diff --git a/mutopia/J.S.Bach/preludes-6.ly b/mutopia/J.S.Bach/preludes-6.ly index 1c46d4b0cd..7a8a718b1c 100644 --- a/mutopia/J.S.Bach/preludes-6.ly +++ b/mutopia/J.S.Bach/preludes-6.ly @@ -1,6 +1,11 @@ \header{ filename = "preludes-6.ly"; title = "6"; +opus = "BWV 940"; +% blz 11 +% Six Petits Pr'eludes +% Collection Johann Peter Kellner +% ca 1703 - 1707 composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; diff --git a/mutopia/Makefile b/mutopia/Makefile index c67daf25f0..dc989a75a2 100644 --- a/mutopia/Makefile +++ b/mutopia/Makefile @@ -16,4 +16,6 @@ examples=standje gallina # # generic stuff/Makefile # -include ./$(depth)/make/Mutopia.make +include $(depth)/make/Mutopia.make + +include $(depth)/make/WWW.make diff --git a/mutopia/TODO b/mutopia/TODO index e282e81cf8..7239bc104c 100644 --- a/mutopia/TODO +++ b/mutopia/TODO @@ -1,9 +1,3 @@ - more composers > 70y + - (more) free composers - beethoven's coriolan - - more composers > 70y + - - (more) free composers - - beethoven's coriolan - - more composers > 70y + - - (more) free composers - - beethoven's coriolan diff --git a/mutopia/los-toros-oboe-16.tex b/mutopia/los-toros-oboe-16.tex index 98973e2e4b..a1424d8ee9 100644 --- a/mutopia/los-toros-oboe-16.tex +++ b/mutopia/los-toros-oboe-16.tex @@ -25,7 +25,7 @@ \begin{document} -\input lilyponddefs +% \input lilyponddefs \input titledefs \def\interscoreline{\vskip3mm} \title{La Feria\normalsize\\[2ex]Los Toros} diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index 85707a1282..27ec629df5 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -184,7 +184,8 @@ hoboonelast = \melodic{ % eiht measures rest.. \textstyle "bold"; % r2^"Un peu plus lent et \\'el\\'egant" - r2^"\\fetanummer8" +% r2^"\\fetanummer8" + r2*8 r4 r8\p bes | g2->^"Un peu plus lent et \\'el\\'egant" ~ | \textstyle "italic"; @@ -274,7 +275,7 @@ global = \melodic{ \skip 4*58; \key bes es as; | \bar "||"; - \skip 4*206; + \skip 4*220; \bar "|."; } @@ -301,9 +302,8 @@ a4 = \paper{ \consists "Staff_sym_engraver"; \consists "Collision_engraver"; \consists "Rest_collision_engraver"; -% not yet: multibar rest -% \consists "Bar_column_engraver"; -% \consists "Bar_number_engraver"; + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; \consists "Separating_line_group_engraver"; \consists "Line_group_engraver"; @@ -325,9 +325,8 @@ a4sixteen = \paper{ \consists "Staff_sym_engraver"; \consists "Collision_engraver"; \consists "Rest_collision_engraver"; -% not yet: multibar rest -% \consists "Bar_column_engraver"; -% \consists "Bar_number_engraver"; + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; \consists "Separating_line_group_engraver"; \consists "Line_group_engraver"; @@ -341,6 +340,6 @@ a4sixteen = \paper{ \midi{ \tempo 4 = 80; } - \paper{ \a4sixteen } +% \paper{ \a4sixteen } } diff --git a/mutopia/standje.ly b/mutopia/standje.ly index e5cd950051..c89b735296 100644 --- a/mutopia/standje.ly +++ b/mutopia/standje.ly @@ -21,81 +21,105 @@ $vocal_verse1 = \melodic{ % ugh: treble/bass % \clef treble; % \clef violin; - [2/3 g8( )as] g \] c'4. g8 | - [2/3 f8( )g] f \] c'4 f8 r | - g4.-> f8 [2/3 f( )es] d \] | + [/3 g8( )as] g \] c'4. g8 | + [/3 f8( )g] f \] c'4 f8 r | + g4.-> f8 [/3 f( )es] d \] | es2 r4 | % ugh: a whole should be a measure %r1 | r2. | r2. | - [2/3 g8( )as] g \] es'4. g8 | - [2/3 f8( )g] f \] d'4. c'8 | - bes4. as8 [2/3 as( )g] f \] | + [/3 g8( )as] g \] es'4. g8 | + [/3 f8( )g] f \] d'4. c'8 | + bes4. as8 [/3 as( )g] f \] | g2 r4 | r2. | r2. | g8. b16 es'4. d'8 | c'8. g16 es4. c8 | - % [as3 2\grace( bes3 2\grace] ) - [2/3 as8( )g] as \] c'4. as8 | + % [/3 as\grace( bes ] ) + [/3 as8( )g] as \] c'4. as8 | g2. | - %[f3 2\grace( g] ) - [2/3 f8( )e] f \] as4. f8 | + %[/3 f\grace( g] ) + [/3 f8( )e] f \] as4. f8 | es!2. | g8. b16 es'4. d'8 | c'8. g16 e4. c8 | - % [a3 2\grace b] ) - [2/3 a!8( ) gis] a \] c'4. a8 | + % [/3 a\grace( b] ) + [/3 a!8( ) gis] a \] c'4. a8 | g!2. | - [2/3 d'8\f cis'] d' \] f'4. b8 | + % [/3 a\grace( b] ) + [/3 d'8\f cis'] d' \] f'4. b8 | c'!2. | } +$vocal_through = \melodic{ + \octave c'; + g8. g16 b8. b16 d'8. d16 | + c'4 b r | + g4. b8 d'8. c'16 | + b2 r4 | + e'4. d'8 [/3 d'( )c'] b \] | + a8. b16 c'4-> a8 r | + r2. | + r2. | + % 4 bars copied from end verse 1 + % [/3 a\grace( b] ) + [/3 a!8( ) gis] a \] c'4. a8 | + g!2. | + % [/3 a\grace( b] ) + [/3 d'8\f cis'] d' \] f'4. b8 | + c'!2. ~ | + c'4 r c' | + as2. | + g | + es2 r4 | +} + $lyric_verse1 = \lyric{ % 5 - \[2/3 Lei-4 se8 \] fleh-4. en8 | - \[2/3 mei-4 ne8 \] Lie-4 der8 _8 | - Durch4. die8 \[2/3 Nacht4 zu8 \] | + \[/3 Lei-4 se8 \] fleh-4. en8 | + \[/3 mei-4 ne8 \] Lie-4 der8 _8 | + Durch4. die8 \[/3 Nacht4 zu8 \] | dir;2 _4 | _4 _ _ | _ _ _ | % 11 - \[2/3 In4 den8 \] stil-4. len8 | - \[2/3 Hainr4 her-8 \] nie-4. der,8 | - Lieb4. chen,8 \[2/3 komm4 zu8 \] | + \[/3 In4 den8 \] stil-4. len8 | + \[/3 Hainr4 her-8 \] nie-4. der,8 | + Lieb4. chen,8 \[/3 komm4 zu8 \] | mir!2 _4 | _4 _ _ | _ _ _ | % 17 Fl\"us-8. ternd16 schlan-4. ke8 | Wip-8. fel16 rau-4. schen8 | - \[2/3 In4 des8 \] Mon-4. des8 | + \[/3 In4 des8 \] Mon-4. des8 | Licht;2. | _4 _ _ | _4 _ _ | % 23 Des8. Ver-16 r\"a-4. ters8 | feind-8. lich16 Lau-4. schen8 | - \[2/3 F\"urch-4 te,8 \] Hol-4. de,8 | + \[/3 F\"urch-4 te,8 \] Hol-4. de,8 | nicht,2. | - \[2/3 f\"urch-4 te,8 \] Hol-4. de,8 | + \[/3 f\"urch-4 te,8 \] Hol-4. de,8 | nicht.2. | } $lyric_verse2 = \lyric{ % 5 - \[2/3 H\"orst4 die8 \] Nach-4. ti-8 - \[2/3 gal-4 len8 \] schla-4 gen?8 _8 - Ach!4. sie8 \[2/3 fleh-4 en8 \] + \[/3 H\"orst4 die8 \] Nach-4. ti-8 + \[/3 gal-4 len8 \] schla-4 gen?8 _8 + Ach!4. sie8 \[/3 fleh-4 en8 \] dich,2 _4 _4 _ _ _4_ _ % 11 - \[2/3 Mit4 der8 \] T\"o-4. ne8 - \[2/3 s\"u\ss-4 en8 \] Kla-4. gen8 - Fleh-4. en8 \[2/3 sie4 f\"ur8 \] + \[/3 Mit4 der8 \] T\"o-4. ne8 + \[/3 s\"u\ss-4 en8 \] Kla-4. gen8 + Fleh-4. en8 \[/3 sie4 f\"ur8 \] mich.2 _4 _4_ _ _4_ _ @@ -103,30 +127,36 @@ $lyric_verse2 = \lyric{ % 17 Sie-8. ver-16 stehn4. des8 Bus-8. ens16 Seh-4. nen,8 - \[2/3 Ken-4 nen8 \] Lieb-4. es-8 + \[/3 Ken-4 nen8 \] Lieb-4. es-8 schmerz,2. - \[2/3 Ken-4 nen8 \] Lieb-4. es-8 + \[/3 Ken-4 nen8 \] Lieb-4. es-8 schmerz,2. % 23 R\"uh-8. ren16 mit4. den8 Sil-8. ber-16 t\"o-4. nen8 - \[2/3 Jed-4 es8 \] wei-4. che8 + \[/3 Jed-4 es8 \] wei-4. che8 Herz.2. - \[2/3 Jed-4 es8 \] wei-4. che8 + \[/3 Jed-4 es8 \] wei-4. che8 Herz.2. } -$lyric_through1 = \lyric{ +$lyric_through = \lyric{ % 37 La\ss8. auch16 dir8. die16 Brust8. be-16 | - we- gen, | + we-4 gen, _ | Lieb-4. chen,8 h\"o-8. re16 | - mich!2 _ | - Be-8. bend16 harr' ich8 _8 | - dir8. ent-16 ge- gen!8 _8 | - \[2/3 Komm, be-8 \] gl\"u4. cke8 | + mich!2 _4 | + Be-8. bend16 harr'4 ich8 _8 | + dir8. ent-16 ge-4 gen!8 _8 | + \[/3 Komm,4 be-8 \] gl\"u4. cke8 | + mich!2. | + \[/3 Komm,4 be-8 \] gl\"u4. cke8 | mich!2. | + _2 be-4 | + gl\"u-2. | + cke2. | + mich!2 _4 | } $treble_intro = \melodic{ @@ -149,27 +179,27 @@ $treble_verse1 = \melodic{ r8 <['f c> <'f c> <'f c]> | r8 <['f 'g 'b> <'g 'b d> <'f 'g 'b> <'g 'b d> <'f 'g 'b]> | r8 <['es 'g c> <'g c es> <'es 'g c> <'g c es> <'es 'g c]> | - <)f'8 d'> <[2/3 f' d'> | + <)f'8 d'> <[/3 f' d'> | | r8 <['g c> <'g c> <'g c]> | r8 <['f c> <'f c> <'f c]> | r8 <['f 'as 'bes> <'as 'bes d> <'f 'g 'bes> <'g 'bes d> <'f 'g 'bes]> | r8 <['es 'g 'bes> <'g 'bes es> <'es 'g 'bes> <'g 'bes es]> <{ es'( | )bes4. as8}{ c'( | )d4.( )f8 } > - < [2/3 f as> | + < [/3 f as> | | r8 <['f 'g> <'g 'b> <'f 'g> <'g 'b> <'f 'g]> | r8 <['es 'g> <'g c> <'es 'g> <'g c> <'es 'g]> | r8\pp <['es 'as c> <'as c es> <'es 'as c> <'as c es> <'es 'as c]> | r8 <['es 'g 'bes> <'g 'bes 'es> <'es 'g 'bes> <'g 'bes 'es> <'es 'g 'bes]> | - % [as3 2\grace( bes ) - [2/3 as8(( g )as]1/1 c'4.-> ) as8 | + % [/3 as\grace( bes ) + [/3 as8(( g )as]1/1 c'4.-> ) as8 | g2. | r8 <['f 'g> <'g 'b> <'f 'g> <'g 'b> <'f 'g]> | r8 <['e 'g> <'g c> <'e 'g> <'g c> <'e 'g]> | r8 <['f 'a c> <'a c f> <'f 'a c> <'a c f> <'f 'a c]> | r8 <['e 'g c> <'g c e> <'e 'g c> <'g c e> <'e 'g c]> | - <{[2/3 f'8\f( e' f']1/1 a'4. )f'8 } {\[2/3 f e f \] a4. f8 } > | + <{[/3 f'8\f( e' f']1/1 a'4. )f'8 } {\[/3 f e f \] a4. f8 } > | r4 | } @@ -185,6 +215,50 @@ $treble_eentje = \melodic{ | } +$treble_through = \melodic{ + \octave c'; + r2. | + % lily: 221: warning: Junking request: Span_dynamic_req: the \> + <['g8.\< g> <'g16 g> <'b8. b> <\!'b16\> b16> | + % lily: 222: warning: Can't find cresc to end. + < { c4( )'b } { c'4( )b } > \!r | +% ugh +% <'g4. g> <'b8 b> <[d8.-> d'->> c'16] | + <'g4. g> <'b8 b> [d'8.-> c'16] | +% ugh, ugh: connecting chords + < { d2.\f( )a2} { e2. ~ e2 } { b2. c2 }> r4 | + < + { + \voiceone + [a8. b16] c'4->( )a8 r | + [a8. b16] c'4->( )a8 r | + } + { + \voicetwo + | + | + } + > + % 4 bars copied from end verse1 + r8 <['f\p 'a c> <'a c f> <'f 'a c> <'a c f> <'f 'a c]> | + r8 <['e 'g c> <'g c e> <'e 'g c> <'g c e> <'e 'g c]> | + <{[/3 f'8\f( e' f']1/1 a'4. )f'8 } {\[/3 f e f \] a4. f8 } > | + r4 | + r4 | + r4 | + <'b2 b> r4 | + | + + % four copied from begin eentje + <[as8.->( c'> <)f16 )as]> | + <[e8-. g-.(> | + <['b8-. g-.(> | + \textstyle "italic"; + | + <'g2. e g> | + <'g2.-\fermata e g> | +} + $bass_intro = \melodic{ \octave c; \clef bass; @@ -234,20 +308,64 @@ $bass_eentje = \melodic{ <''g8 'g> <[d g> | 'c8 <[e g> | } + +$bass_through = \melodic{ + \octave c; + <''g8 'g> <['g 'b d> <'b d f> <'g 'b d> <'as!-> b-> d->> <'b d f]> | + <''g8 'g> <['g d> <'g d> <'as-> b-> d->> <'b d f]> | + % copied + <''g8 'g> <['g d> <'g d> <'as-> b-> d->> <'b d f]> | + <''g8 'g> <['g d e> <'g d> <'gis-> 'b-> d->> <'b d f]> | + <''gis8 'gis> <[d e> | + <''a8 'a> <[c e> | + <''a8 'a> <['a d f> <'a d f> <'a d f]> | + <''a8 'a> <['a c e> <'a c e> <'a c e]> | + % 4 bars copied from end verse1 + <''f2 'f> r4 | + <'c2 c> r4 | + <''g8 'g> <[d g> | + 'c8 <[c e g> | + + <'c8 c> <[c es! g> | + <''f8 'f> <[d f> | + <''g8 'g> <[d f> | + 'c8 <[c e> | + 'c8 <[c f> | + 'c8 <[c e> | + ''g8 <['g d> <'g d> <'g d]> | + % copied from two bars back + 'c8 <[c e> | + 'c8 <[c e> | + <'c2._\fermata 'g c> | +} global = \melodic{ \meter 3/4; \key bes es as; - \skip 4 * 12; + \skip 4 * 12; \break; + \skip 4 * 234; + \bar "|."; +} + + +$lyric_four = \lyric{ + _4 _ _ + _ _ _ + _ _ _ + _ _ _ } lyrics = \melodic{ \meter 3/4; - \skip 4 * 12; +% \skip 4 * 12; + \$lyric_four \$lyric_verse1 - \skip 4 * 24; +% \skip 4 * 24; + \$lyric_four + \$lyric_four \$lyric_verse2 + \$lyric_through } $lyric_staff = \type Lyrics = lyric< @@ -255,15 +373,16 @@ $lyric_staff = \type Lyrics = lyric< > vocals = \melodic{ - \global \skip 4 * 12; \$vocal_verse1 \skip 4 * 24; \$vocal_verse1 + \$vocal_through } $vocal_staff = \type Staff = vocal< \property Staff.instrument = "alto sax" + \global \$vocals > @@ -273,6 +392,7 @@ treble = { \$treble_verse1 \$treble_eentje \$treble_verse1 + \$treble_through } $treble_staff = \type Staff = treble< @@ -285,6 +405,7 @@ bass = \melodic{ \$bass_verse1 \$bass_eentje \$bass_verse1 + \$bass_through } $bass_staff = \type Staff = bass< @@ -297,16 +418,38 @@ $grand_staff = \type Grandstaff< \$bass_staff > +a4 = \paper{ + gourlay_maxmeasures = 7.; +% linewidth= 193.\mm; + linewidth= 175.\mm; + Staff = \translator { + \type "Engraver_group_engraver"; + defaultclef = violin; + + \consists "Bar_engraver"; + \consists "Clef_engraver"; + \consists "Key_engraver"; + \consists "Meter_engraver"; + \consists "Local_key_engraver"; + \consists "Staff_sym_engraver"; + \consists "Collision_engraver"; + \consists "Rest_collision_engraver"; + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; + \consists "Separating_line_group_engraver"; + \consists "Line_group_engraver"; + + \accepts "Voice"; + } +} + \score{ < \$vocal_staff \$lyric_staff \$grand_staff > - \paper{ - % ugh: the *first* (intro) line may only have four measures... - gourlay_maxmeasures = 7.; - } + \paper{ \a4 } \midi{ \tempo 4 = 54; } diff --git a/test/bow.cc b/test/bow.cc index 02d5adbc44..35c344686c 100644 --- a/test/bow.cc +++ b/test/bow.cc @@ -56,7 +56,7 @@ out (Bezier_bow& b) cout << "boogje:=z4..controls z5 and z6..z1;\n"; cout << "draw boogje;\n"; #endif - cout << "showit; shipit;clearit;\n"; + cout << "showit; shipit;clearit;" << endl; } void @@ -128,23 +128,31 @@ main () bow ((Point[6]){ 0,0, 20,60, 40,0, 60,0, 80,0, 100,1 }, 6, 1); bow ((Point[6]){ 0,1, 20,0, 40,0, 60,0, 80,60, 100,0 }, 6, 1); - bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1); +// bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1); bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,20, 100,100 }, 6, -1); bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-20, 100,-100 }, 6, 1); - bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-140, 100,-100 }, 6, -1); +// bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-140, 100,-100 }, 6, -1); + bow ((Point[7]){ 0,0, 20,40, 100,0, 150,0, 200,0, 280,40, 300,0 }, 7, 1); #endif +#if 0 // bugs -// bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,40, 100,1 }, 6, 1); -// bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,-40, 100,1 }, 6, -1); -// bow ((Point[6]){ 0,0, 20,40, 40,0, 60,0, 80,0, 100,1 }, 6, 1); -// bow ((Point[6]){ 0,0, 20,-40, 40,0, 60,0, 80,0, 100,1 }, 6, -1); + bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1); bow ((Point[6]){ 0,0, 20,-40, 40,0, 60,20, 80,20, 100,40 }, 6, -1); bow ((Point[6]){ 0,0, 20,-20, 40,-20, 60,-20, 80,-80, 100,-40 }, 6, -1); - + bow ((Point[6]){ 0,0, 20,-20, 40,-40, 60,-60, 80,-140, 100,-100 }, 6, -1); bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1); - cout << "\\end\n"; +#endif + +// bow ((Point[6]){ 0,0, 20,20, 40,0, 60,0, 80,20, 100,1 }, 6, 1); +// bow ((Point[6]){ 0,20, 20,40, 40,0, 60,0, 80,40, 100,20 }, 6, 1); + + bow ((Point[7]){ 0,0, 20,40, 100,0, 150,0, 200,0, 280,40, 300,0 }, 7, 1); + bow ((Point[7]){ 0,20, 20,40, 100,0, 150,0, 200,0, 280,40, 300,20 }, 7, 1); + + cout << "\\end" << endl; + return 0; } diff --git a/tex/feta11.tex b/tex/feta11.tex new file mode 100644 index 0000000000..39cabb6e48 --- /dev/null +++ b/tex/feta11.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta11.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta11.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/feta13.tex b/tex/feta13.tex new file mode 100644 index 0000000000..7011ced737 --- /dev/null +++ b/tex/feta13.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta13.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta13.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/feta16.tex b/tex/feta16.tex new file mode 100644 index 0000000000..247fb209a9 --- /dev/null +++ b/tex/feta16.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta16.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta16.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/feta19.tex b/tex/feta19.tex new file mode 100644 index 0000000000..400ff78e49 --- /dev/null +++ b/tex/feta19.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta19.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta19.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/feta20.tex b/tex/feta20.tex new file mode 100644 index 0000000000..9175549824 --- /dev/null +++ b/tex/feta20.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta20.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta20.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/feta23.tex b/tex/feta23.tex new file mode 100644 index 0000000000..aeb53e9462 --- /dev/null +++ b/tex/feta23.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta23.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta23.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/feta26.tex b/tex/feta26.tex new file mode 100644 index 0000000000..218a27366d --- /dev/null +++ b/tex/feta26.tex @@ -0,0 +1,176 @@ +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta26.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + +% Creator: mf-to-table.py version 0.6 +% Automatically generated on +% Do not edit +% input from out/feta26.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\reverseturn{40} +\fetdef\turn{41} +\fetdef\trill{42} +\fetdef\upedalheel{43} +\fetdef\dpedalheel{44} +\fetdef\upedaltoe{45} +\fetdef\dpedaltoe{46} +\fetdef\flageolet{47} +\fetdef\trilelement{48} +\fetdef\prall{49} +\fetdef\mordent{50} +\fetdef\prallprall{51} +\fetdef\prallmordent{52} +\fetdef\upprall{53} +\fetdef\downprall{54} + +% flags +\fetdef\eighthflag{55} +\fetdef\sixteenthflag{56} +\fetdef\thirtysecondflag{57} +\fetdef\sixtyfourthflag{58} +\fetdef\deighthflag{59} +\fetdef\dsixteenthflag{60} +\fetdef\dthirtysecondflag{61} +\fetdef\dsixtyfourthflag{62} + +% clefs +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} + diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index a5bc3c4fde..aa31034329 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -70,44 +70,72 @@ \musixcalc } -\def\cmrtwenty{ + \def\cmrtwenty{ + \font\smalltextfont=cmr8 \font\meterfont=cmbx15 - \font\italicfont=cmti10 scaled \magstep1 - \font\musicmathfont=cmsy10 - \font\normaltextfont=cmr10 %\textfont is a primitive - \font\smalltextfont=cmr8 - \font\boldfont=cmbx10 - \font\textmusic=cmmi12 - \font\largefont=cmbx12 -} -\def\cmrsixteen{ - \font\smalltextfont=cmr6 - \font\normaltextfont=cmr8 %\textfont is a primitive - \font\meterfont=cmbx12 - \font\italicfont=cmti9 - \font\textmusic=cmmi10 - \font\boldfont=cmbx8 - \font\largefont=cmbx10 -} -\def\cmreleven{ - \font\smalltextfont=cmr5 - \font\normaltextfont=cmr6 - \font\meterfont=cmbx8 - \font\italicfont=cmti6 - \font\textmusic=cmmi8 - \font\boldfont=cmbx6 - \font\largefont=cmbx8 -} - -\def\cmrthirteen{ - \font\smalltextfont=cmr6 - \font\normaltextfont=cmr7 - \font\meterfont=cmbx9 - \font\italicfont=cmti7 - \font\textmusic=cmmi9 - \font\boldfont=cmbx7 - \font\largefont=cmbx9 -} + \font\textmusic=cmmi12 +% \font\musicmathfont=cmsy10 %%Not used?? /MB + \ifundefined{documentclass} + \font\normaltextfont=cmr10 %\textfont is a primitive + \font\italicfont=cmti10 scaled \magstep1 + \font\boldfont=cmbx10 + \font\largefont=cmbx12 + \else + \def\settext##1{{\normalfont\normalsize ##1}} + \def\setitalic##1{\textit{\normalsize ##1}} + \def\setbold##1{\textbf{\normalsize ##1}} + \def\setlarge##1{\textbf{\large ##1}} + \fi + } + \def\cmrsixteen{ + \font\smalltextfont=cmr6 + \font\meterfont=cmbx12 + \font\textmusic=cmmi10 + \ifundefined{documentclass} + \font\normaltextfont=cmr8 %\textfont is a primitive + \font\italicfont=cmti9 + \font\boldfont=cmbx8 + \font\largefont=cmbx10 + \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}} + \fi + } + \def\cmreleven{ + \font\smalltextfont=cmr5 + \font\meterfont=cmbx8 + \font\textmusic=cmmi8 + \ifundefined{documentclass} + \font\normaltextfont=cmr6 + \font\italicfont=cmti6 + \font\boldfont=cmbx6 + \font\largefont=cmbx8 + \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}} + \fi + } + + \def\cmrthirteen{ + \font\smalltextfont=cmr6 + \font\meterfont=cmbx9 + \font\textmusic=cmmi9 + \ifundefined{documentclass} + \font\normaltextfont=cmr7 + \font\italicfont=cmti7 + \font\boldfont=cmbx7 + \font\largefont=cmbx9 + \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}} + \fi + } \def\musixsixteendefs{ \sixteenfonts \musixcalc @@ -223,12 +251,15 @@ \def\rulesym#1#2{\dimen0=#1% \vrule height .5\dimen0 depth .5\dimen0 width #2} -\def\settext#1{\normaltextfont #1} -\def\setitalic#1{\italicfont #1} -\def\setbold#1{\boldfont #1} +\ifundefined{documentclass} + \def\settext#1{\normaltextfont #1} + \def\setitalic#1{\italicfont #1} + \def\setbold#1{\boldfont #1} + \def\setlarge#1{\largefont #1} +\fi + \def\setdynamic#1{\dynfont #1} \def\setfinger#1{\fingerfont #1} -\def\setlarge#1{\largefont #1} \def\setnumber#1{\fetanummer #1} % the interline symbol. Redefine to remove it. -- 2.39.2