release: 0.1.61

diff --git a/.dstreamrc b/.dstreamrc
index 1e6bbc084b5ea8f8b3c71209040b8da841999d4f..7d088d518ce6570f6213ec826841b152ed5fc16f 100644 (file)
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -1,7 +1,7 @@
 #This file controls which classes produce debugging output
 
 # class name           silence?
 #This file controls which classes produce debugging output
 
 # class name           silence?

-Dstream                        1
+Dstream                        0

 
 # yydebug
 InitParser             1
 
 # yydebug
 InitParser             1


@@ -18,95 +18,95 @@ walking             1
 
 # flower lib
 File_path              1
 
 # flower lib
 File_path              1

-Matrix                 0
-Vector                 0
+Matrix                 1
+Vector                 1

 
 # lily
 
 # lily

-Atom                   0
-Axis_group_administration      0
-Bar                    0
-Beam                   0
-Bow                    0
+Atom                   1
+Axis_group_administration      1
+Bar                    1
+Beam                   1
+Bow                    1

 Bezier_bow             1
 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
-Item                   0
-Key_item               0
-Lookup                 0
-Line_spacer            0
-Melodic_req            0
-Midi_def               0
-Midistrings            0
-Mixed_qp               0
+Change_iterator                1
+Chord                  1
+Chord_iterator         1
+Clef_item              1
+Col_configuration      1
+Col_hpositions         1
+Colinfo                        1
+Colinfo                        1
+Collision              1
+Column_rod             1
+Engraver               1
+Engraver_group_engraver 1
+Graphical_element      1
+Group_change_req       1
+Head_column            1
+Horizontal_align_item  1
+Idealspacing           1
+Ineq_constrained_qp    1
+Input_translator       1
+Item                   1
+Key_item               1
+Lookup                 1
+Line_spacer            1
+Melodic_req            1
+Midi_def               1
+Midistrings            1
+Mixed_qp               1

 Music                  0
 Music                  0

-Music_iterator         0
-Music_output_def       0
-Note_column            0
-Note_head              0
-Note_performer         0
+Music_iterator         1
+Music_output_def       1
+Note_column            1
+Note_head              1
+Note_performer         1

 Note_req               0
 Note_req               0

-Paper_column           0
+Paper_column           1

 Paper_score                    1
 Paper_score                    1

-Paper_def              0
-Performer              0
-Performer_group_performer      0
-Request                        0
-Request_iterator       0
-Rest_collision         0
-Rest_collision_engraver 0
-Rest_req               0
+Paper_def              1
+Performer              1
+Performer_group_performer      1
+Request                        1
+Request_iterator       1
+Rest_collision         1
+Rest_collision_engraver 1
+Rest_req               1

 Rhythmic_head  0
 Rhythmic_req           0
 Rhythmic_head  0
 Rhythmic_req           0

-Score                  1
-Score_column           0
-Score_elem             0
-Score_engraver         0
-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
-Symtable               0
-Symtables              0
+Score                  0
+Score_column           1
+Score_elem             1
+Score_engraver         1
+Score_performer                1
+Script_column          1
+Script_def             1
+Script_req             1
+Single_malt_grouping_item      1
+Slur                   1
+Spacer_rod             1
+Spacing_problem        1
+Spanner                        1
+Spring_spacer          1
+Staff                  1
+Staff_commands         1
+Staff_symbol           1
+Stem                   1
+Stem_info              1
+Stem_req               1
+Symtable               1
+Symtables              1

 
 

-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
+Text_def               1
+Text_req               1
+Time_description       1
+Translation_property   1
+Translator             1
+Translator_group       1
+Voice                  1
+Voice_iterator         1
+Word_wrap              1

 
 

-delete_identifiers     0
-parse_duration         0
-parse_pitchmod         0
+delete_identifiers     1
+parse_duration         1
+parse_pitchmod         1

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 44f2d7792e401d9bd9029b852297a205f2f1d20d..c1522874121d2dc79ef26fbdf3057f522d458c92 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -27,8 +27,8 @@ GROFFFILES = $(OUTPODFILES:.pod=.1)
 HTMLFILES = $(OUTPODFILES:.pod=.html)
 
 
 HTMLFILES = $(OUTPODFILES:.pod=.html)
 
 

+default: all do-doc

 
 

-default: do-doc

 #
 # list of distribution files:
 #
 #
 # list of distribution files:
 #


@@ -43,7 +43,7 @@ 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)
 
 # don't do DVI files. They can only be made if lily is installed
 do-doc: $(TEXTFILES)
 

-html: $(HTMLFILES)
+local-WWW: $(HTMLFILES)

 
 # generic targets and rules:
 #
 
 # generic targets and rules:
 #

diff --git a/Documentation/index.pod b/Documentation/index.pod
index cc2376a15e595b0e92a8505e4954f8f5c04fa929..573226533c2a8883c96c183a78c1f3eb8540ee6c 100644 (file)
--- a/Documentation/index.pod
+++ b/Documentation/index.pod
@@ -137,12 +137,18 @@ The lilypond logo (medium size, format: .gif)
 =over 4
 
 =item *
 =over 4
 
 =item *

-<a href=tex_manuals.html
+<a href=../tex/out-www/index.html

 >
 PS documents about LilyPond
 </a
 >
 
 >
 PS documents about LilyPond
 </a
 >
 

+=item *
+<a href=../man/out-www/index.html
+>
+Manual pages
+</a
+>

 
 =back
 
 
 =back
 

diff --git a/Documentation/man/Makefile b/Documentation/man/Makefile
index dd1319b14d7a78687e0aa35699d88e3ae6924006..e7ce73f0ca9fc70656b7b8ccb967860d44d02682 100644 (file)
--- a/Documentation/man/Makefile
+++ b/Documentation/man/Makefile
@@ -4,14 +4,16 @@ depth = ../..
 include $(depth)/make/Include.make
 include $(depth)/make/Docrules.make
 SECTION=1
 include $(depth)/make/Include.make
 include $(depth)/make/Docrules.make
 SECTION=1

+MANTXT = $(addprefix $(outdir)/, $(addsuffix .txt,$(basename $(PODFILES) .pod)))

 MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(PODFILES) .pod)))
 
 MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(PODFILES) .pod)))
 

-default: $(MANGROFF)
+default: $(MANTXT) $(MANGROFF)

 
 
 INSTALLATION_OUT_FILES=$(MANGROFF)
 
 
 INSTALLATION_OUT_FILES=$(MANGROFF)

-INSTALLATION_DIR=$(mandir)/man$(SECTION)
+INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION)

 
 include $(depth)/make/Install_outfiles.make
 
 
 include $(depth)/make/Install_outfiles.make
 

-WWW: $(OUTPODFILES:.pod=.html)
+local-WWW: $(OUTPODFILES:.pod=.html)
+       ls-latex  --title 'Manual pages for LilyPond' $(PODFILES)  > $(outdir)/index.html

diff --git a/Documentation/man/index.pod b/Documentation/man/index.pod
deleted file mode 100644 (file)
index e633352..0000000
--- a/Documentation/man/index.pod
+++ /dev/null
@@ -1,50 +0,0 @@
-=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 *
-<a href=mi2mu.html
->
-manual page for mi2mu, the MIDI convertor.
-</a
->
-
-=item *
-<a href=lilypond.html
->
-The manual page
-</a
->
-
-=item *
-<a href=ly2dvi.html
->
-Easy titling for LilyPond
-</a
->
-
-=item *
-<a href=convert-mudela.html
->
-The mudela convertor: convert-mudela
-</a
->
-
-=item *
-<a href=mudela-book.html
->
-mudela in TeX: mudela-book
-</a
->
-
-=back

diff --git a/Documentation/man/lilypond.pod b/Documentation/man/lilypond.pod
index 8742d2ec6bcaa8cfc0aa6fc84d25127cd57306cf..9338fd8f79702eb6ad11c4851930370ab9c909fd 100644 (file)
--- a/Documentation/man/lilypond.pod
+++ b/Documentation/man/lilypond.pod
@@ -26,7 +26,11 @@ add F<FILE> to the search path for input files.
 This disables TeX output. If you have a \midi definition, it will do
 the midi output only.
 
 This disables TeX output. If you have a \midi definition, it will do
 the midi output only.
 

-=item B<-d,--debug>,
+=item B<-d,--dependencies>
+
+Also output rules to be included in Makefile.
+
+=item B<-D,--debug>,

 
 Turn debugging info on.  GNU LilyPond reads the file F<.dstreamrc>, 
 which lists what functions and classes may produce copious debugging
 
 Turn debugging info on.  GNU LilyPond reads the file F<.dstreamrc>, 
 which lists what functions and classes may produce copious debugging

diff --git a/Documentation/man/ly2dvi.pod b/Documentation/man/ly2dvi.pod
index 60968cf9d5b3eddb10ec99796654a7cec4a9d1c8..7e585743e78a52f210da7718974df2b61723fd63 100644 (file)
--- a/Documentation/man/ly2dvi.pod
+++ b/Documentation/man/ly2dvi.pod
@@ -27,32 +27,46 @@ Set debug mode. There are two levels - in level one some debug
 info is written, in level two the command C<set -x> is run, which
 echoes every command in the ly2dvi script.
 
 info is written, in level two the command C<set -x> is run, which
 echoes every command in the ly2dvi script.
 

+=item B<-H,--headers=>
+
+Name of additional LaTeX headers file. This is included in the
+tex file at the end of the headers, last line before \begin{document}
+
+=item B<-K,--keeplilypond>
+
+Keep LilyPond output after the run.
+
+=item B<-L,--landscape>
+
+Set landscape orientation - portrait is the default.
+(C<-L> produces C<\usepackage[landscape]{article}>)
+
+=item B<-N,--nonumber>
+
+Switch off page numbering.
+

 =item B<-O,--orientation=>
 
 Set orientation - portrait is the default.
 (C<-O> landscape produces C<\usepackage[landscape]{article}>)
 
 =item B<-O,--orientation=>
 
 Set orientation - portrait is the default.
 (C<-O> landscape produces C<\usepackage[landscape]{article}>)
 

-=item B<-o,--output=>
-
-Set output directory.
-

 =item B<-h,--help>
 
 Print help.
 
 =item B<-h,--help>
 
 Print help.
 

-=item B<-k,--keep>
+=item B<-k,--keeply2dvi>

 
 Keep the LaTeX file after the run.
 
 
 Keep the LaTeX file after the run.
 

-=item B<-K>
-
-Keep LilyPond output after the run.
-
-=item B<-l,--language>
+=item B<-l,--language=>

 
 Specify LaTeX language.
 (C<-l norsk> produces C<\usepackage[norsk]{babel}>).
 
 
 Specify LaTeX language.
 (C<-l norsk> produces C<\usepackage[norsk]{babel}>).
 

+=item B<-o,--output=>
+
+Set output directory.
+

 =item B<-p,--papersize=>
 
 Specify papersize.
 =item B<-p,--papersize=>
 
 Specify papersize.


@@ -73,22 +87,26 @@ file. They are overridden by corresponding command line options.
 
 =over 5
 
 
 =over 5
 

-=item B<papersize>
+=item B<language="";>

 
 

-Specify papersize.
+Specify LaTeX language

 
 

-=item B<orientation>
+=item B<latexheaders="";>

 
 

-Set orientation.
+Specify additional LaTeX headers file

 
 

-=item B<language>
+=item B<orientation="";>

 
 

-Specify LaTeX language
+Set orientation.

 
 

-=item B<paperlinewidth>
+=item B<paperlinewidth="";>

 
 Specify the width (pt, mm or cm) of the printed lines.
 
 
 Specify the width (pt, mm or cm) of the printed lines.
 

+=item B<papersize="";>
+
+Specify papersize.
+

 =back
 
 =head1 ENVIRONMENT
 =back
 
 =head1 ENVIRONMENT


@@ -143,27 +161,31 @@ In the current version the following are allowed:
 
 =over 5
 
 
 =over 5
 

-=item B<ORIENTATION>
+=item B<LANGUAGE=>

 
 

-Set orientation - portrait is the default.
+Specify LaTeX language.

 
 

-=item B<LANGUAGE>
+=item B<LATEXHF=>

 
 

-Specify LaTeX language.
+Specify additional LaTeX headers file

 
 

-=item B<OUTPUTDIR>
+=item B<LILYINCLUDE=>

 
 

-Set output directory.
+Additional directories for input files.

 
 

-=item B<PAPERSIZE>
+=item B<ORIENTATION=>

 
 

-Specify papersize.
+Set orientation - portrait is the default.

 
 

-=item B<LILYINCLUDE>
+=item B<OUTPUTDIR=>

 
 

-Additional directories for input files.
+Set output directory.

 
 

-=item B<TMP>
+=item B<PAPERSIZE=>
+
+Specify papersize.
+
+=item B<TMP=>

 
 Temporary directory name.
 
 
 Temporary directory name.
 

diff --git a/Documentation/tex/Makefile b/Documentation/tex/Makefile
index 8d2ea583d994871d104d2e561f2a99dfa58025ac..34befe747bb7b52112ce147bd3f3b2e6307f2d6a 100644 (file)
--- a/Documentation/tex/Makefile
+++ b/Documentation/tex/Makefile
@@ -11,5 +11,8 @@ EXTRA_DISTFILES= $(BIBFILES) $(DOCFILES)
 
 dvi: $(DVIFILES)
 
 
 dvi: $(DVIFILES)
 

-local-WWW: $(OUTDOCFILES:.doc=.ps.gz)
-       ls-latex --extension .ps.gz $(DOCFILES) > $(outdir)/index.html
+local-WWW: $(OUTDOCFILES:.doc=.ps.gz) $(addprefix $(outdir)/, $(BIBFILES))
+       ls-latex --title 'LaTeX documents about LilyPond' --extension .ps.gz $(BIBFILES) $(DOCFILES) > $(outdir)/index.html
+
+$(outdir)/%.bib: %.bib
+       ln $< $@

diff --git a/Documentation/tex/colorado.bib b/Documentation/tex/colorado.bib
index 295597239392d6680ce65bdf2a607017a44584f4..1ce4165e245a9cf513d5130d71d20b65f99d3110 100644 (file)
--- a/Documentation/tex/colorado.bib
+++ b/Documentation/tex/colorado.bib
@@ -1,5 +1,6 @@
 %
 %

-% from the University of Colorado Engraving page (by Alyssa Lamb)
+% TITLE=University of Colorado Engraving music bibliography
+% AUTHOR=Alyssa Lamb

 %
 
 @Book {
 %
 
 @Book {

diff --git a/Documentation/tex/engraving.bib b/Documentation/tex/engraving.bib
index ad34b6a0a320bbda1bd6c648aceb066d4384450b..1da420396f8e0eea00830cc674f7edf10c5b68cd 100644 (file)
--- a/Documentation/tex/engraving.bib
+++ b/Documentation/tex/engraving.bib
@@ -1,3 +1,9 @@
+%
+% TITLE=The engraving bibliography
+% AUTHOR=Han-Wen Nienhuys
+%
+
+

 @Book{rastall,
   author =      {Richard Rastall},
   ALTeditor =   {},
 @Book{rastall,
   author =      {Richard Rastall},
   ALTeditor =   {},

diff --git a/Documentation/tex/fonts.doc b/Documentation/tex/fonts.doc
index a9e1940fbee7cfd10fccf7a4e101863fd3a50441..a8c78d20caffc0b2f0abdb8e9c85555d0dfcd9d4 100644 (file)
--- a/Documentation/tex/fonts.doc
+++ b/Documentation/tex/fonts.doc
@@ -1,3 +1,5 @@
+% -*-LaTeX-*-
+

 \documentclass{article}
 \def\kdots{,\ldots,}
 \title{Not the Font-En-Tja font}
 \documentclass{article}
 \def\kdots{,\ldots,}
 \title{Not the Font-En-Tja font}


@@ -8,16 +10,12 @@
 
 \section{Introduction}
 
 
 \section{Introduction}
 

-This document are some design notes of the Feta font.  Feta (not an
-abbreviation of Font-En-Tja) is a font of music symbols.  All MetaFont
-sources are original.  The symbols are modelled after various editions
-of music, notably
-\begin{itemize}
-\item B\"arenreiter
-\item Hofmeister
-\item Breitkopf
-\item Durand \& C'ie
-\end{itemize}
+This document are some design notes of the Feta font, and other
+symbols related to LilyPond.  Feta (not an abbreviation of
+Font-En-Tja) is a font of music symbols.  All MetaFont sources are
+original.  The symbols are modelled after various editions of music,
+notably \begin{itemize} \item B\"arenreiter \item Hofmeister \item
+Breitkopf \item Durand \& C'ie \end{itemize}

 
 The best references on Music engraving are Wanske\cite{wanske} and
 Ross\cite{ross} quite some of their insights were used.  Although it
 
 The best references on Music engraving are Wanske\cite{wanske} and
 Ross\cite{ross} quite some of their insights were used.  Although it


@@ -202,6 +200,66 @@ Staffsize       &Numbers                &Name\\
 Ross states that the dies (the stamps to make the symbols) come in
 12 different sizes.
 
 Ross states that the dies (the stamps to make the symbols) come in
 12 different sizes.
 

+\section{Beams}
+
+\subsection{Slope}
+
+Traditionally, beam slopes are computed by following a large and hairy
+set of rules.  Some of these are talked-about in Wanske, a more
+recipy-like description can be found in Ross.
+
+There are some problems when trying to follow these rules:
+\begin{itemize}
+
+\item the set is not complete
+
+\item they are not formulated as a general rule with exceptions, but
+rather as a huge case of individual rules\cite{ross}
+
+\item in some cases, the result is wrong or ugly (or both)
+
+\item they try to solve a couple of problems at a time (e.g. Ross
+handles ideal slope and slope-quantisation as a paired problem)
+\end{itemize}
+Reading Ross it is clear that the rules presented there are certainly
+not the ultimate idea of what beam(slope)s should look like, but
+rather a (very much) simplified hands-on recipy for a human engraver.
+
+There are good reasons not to follow those rules:
+
+\begin{itemize}
+\item One cannot expect a human engraver to solve least-squares
+problems for every beam
+  
+\item A human engravers will allways trust themselves in judging the
+outcome of the applied recipy.  If, in a complicated case, the result
+"doesn't look good", they will ignore the rules and draw their own
+beams, based on experience.
+
+\item The exact rules probably even don't "really exsist" but in the
+minds of good engravers, in the form of experience
+\end{itemize}
+
+We'll propose to do a least-squares solve.  This seems to be the best
+way to calculate the slope for a computerised engraver such as Lily.
+
+It would be nice to have some rules to catch and handle "ugly" cases,
+though.  In general, the slope of the beam should mirror the pitches
+of the notes.  If this "can't be done" because there simply is no
+uniform "trend", it would probably be best to set the slope to zero.
+
+
+\subsection{Quantising}
+
+The beams should be prevented to conflict with the stafflines,
+especially at small slopes.  Traditionally, poor printing techniques
+imposed rather strict rules for quantisation.  In modern (post 1955)
+music printing we see that quality has improved substantially and
+obsoleted the technical justification for following some of these
+strict rules, notably the avoiding of so-called wedges.
+
+
+

 \bibliographystyle{plain}
 \bibliography{engraving}
 
 \bibliographystyle{plain}
 \bibliography{engraving}
 

diff --git a/Documentation/tex/mudela.doc b/Documentation/tex/mudela.doc
index 1d3e303bd5fbeefaf02d21eac8d37660b6292e30..0e0cb6cf022ccb403ccd382520b7e2a00fe41644 100644 (file)
--- a/Documentation/tex/mudela.doc
+++ b/Documentation/tex/mudela.doc
@@ -257,7 +257,7 @@ print a note by specifying its pitch and the duration.  The pitch of
 the central C, also known as c$^1$, is written as \verb+c'+.  A quarter
 note duration is written as \verb+4+.  So, to print quarter note with
 central C pitch, you enter the following
 the central C, also known as c$^1$, is written as \verb+c'+.  A quarter
 note duration is written as \verb+4+.  So, to print quarter note with
 central C pitch, you enter the following

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 c'4
 \end{mudela}
 The pitch \verb+c'+ actually consists of two parts: one for the note
 c'4
 \end{mudela}
 The pitch \verb+c'+ actually consists of two parts: one for the note


@@ -266,19 +266,19 @@ specifies the octave to use, and the letter which note name to use.
 The note names simply are the letters \verb+a+ to \verb+g+.
 
 For example,
 The note names simply are the letters \verb+a+ to \verb+g+.
 
 For example,

-\begin[fragment,verbatim]{mudela}
+\begin{mudela}[fragment,verbatim]

   c'4 d'4 e'4 c'4 c''4 d''4 e''4 f''4 g''4 a''4 b''4 c'''4
 \end{mudela}
 
 The duration of a note is specified as a number: a whole note is
 denoted by 1, the half note by 2, the quarter by 4, and so on.  Here
 are some random notes to show how it works
   c'4 d'4 e'4 c'4 c''4 d''4 e''4 f''4 g''4 a''4 b''4 c'''4
 \end{mudela}
 
 The duration of a note is specified as a number: a whole note is
 denoted by 1, the half note by 2, the quarter by 4, and so on.  Here
 are some random notes to show how it works

-\begin[fragment,verbatim]{mudela}
+\begin{mudela}[fragment,verbatim]

 'c8 c8 c'16 c''32 d''64 b'64 c'''2 c1 c'4 d'4 e'4 f'4 g'4 a'4
 \end{mudela}
 
 This gives us already enough material to make simple songs:
 'c8 c8 c'16 c''32 d''64 b'64 c'''2 c1 c'4 d'4 e'4 f'4 g'4 a'4
 \end{mudela}
 
 This gives us already enough material to make simple songs:

-\begin[fragment,verbatim]{mudela}
+\begin{mudela}[fragment,verbatim]

         c''4 d''4 e''4 c''4
         e''4 f''4 g''2
         g''8 a''8 g''8 f''8 e''4 c''4
         c''4 d''4 e''4 c''4
         e''4 f''4 g''2
         g''8 a''8 g''8 f''8 e''4 c''4


@@ -334,7 +334,7 @@ to cs), Italian, Swedish, Norwegian
 However, having only quarter notes may get a bit dull.
 Durations are entered as their reciproce values
 % a1 a2 a4 a a8 a a16 a a32 a a64 a a a a
 However, having only quarter notes may get a bit dull.
 Durations are entered as their reciproce values
 % a1 a2 a4 a a8 a a16 a a32 a a64 a a a a

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 a1 a2 a4 a a8 a a16 a32 a64
 \end{mudela}
 note that you only have to specify
 a1 a2 a4 a a8 a a16 a32 a64
 \end{mudela}
 note that you only have to specify


@@ -342,7 +342,7 @@ the duration when it changes:
 Lily assumes a note has the same duration as the previous one.
 
 Now we can already write a little tune
 Lily assumes a note has the same duration as the previous one.
 
 Now we can already write a little tune

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 c d e c | c d e c | e f g2
 \end{mudela}
 As you'll probably have guessed,
 c d e c | c d e c | e f g2
 \end{mudela}
 As you'll probably have guessed,


@@ -353,13 +353,13 @@ In the scale shown above
 we left-out the last c note of the next octave.
 Postfixing the pitch with a quote \verb+'+
 produces a note by one octave higher
 we left-out the last c note of the next octave.
 Postfixing the pitch with a quote \verb+'+
 produces a note by one octave higher

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 c c' c''
 \end{mudela}
 
 Prefixing the pitch with a quote \verb+'+
 produces a note by one octave lower
 c c' c''
 \end{mudela}
 
 Prefixing the pitch with a quote \verb+'+
 produces a note by one octave lower

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 a 'a ''a
 \end{mudela}
 
 a 'a ''a
 \end{mudela}
 


@@ -367,50 +367,50 @@ a 'a ''a
 
 A tie connects two adjacent noteheads
 
 
 A tie connects two adjacent noteheads
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 e' ~ e
 \end{mudela}
 
 Whereas a slur rather connects `chords', 
 and tries to avoid crossing stems
 
 e' ~ e
 \end{mudela}
 
 Whereas a slur rather connects `chords', 
 and tries to avoid crossing stems
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 e'( )e
 \end{mudela}
 
 And of course, such a (legato) slur can span several notes
 e'( )e
 \end{mudela}
 
 And of course, such a (legato) slur can span several notes

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 c( d e )f
 \end{mudela}
 
 \section{Beams and Plets}
 
 A beam is 
 c( d e )f
 \end{mudela}
 
 \section{Beams and Plets}
 
 A beam is 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 [a8 a] [a16 a a a]
 \end{mudela}
 
 Here's a beamed triplet
 [a8 a] [a16 a a a]
 \end{mudela}
 
 Here's a beamed triplet

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 [/3 a8 a a]/1
 \end{mudela}
 
 a triplet without a beam
 [/3 a8 a a]/1
 \end{mudela}
 
 a triplet without a beam

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 \[/3 a4 a8\]
 \end{mudela}
 
 and a combination
 \[/3 a4 a8\]
 \end{mudela}
 
 and a combination

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 [/3 a8 a16 a] a8 \]
 \end{mudela}
 
 Abbreviations
 [/3 a8 a16 a] a8 \]
 \end{mudela}
 
 Abbreviations

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 c1:16 [:16 e1 g]
 \end{mudela}
 
 c1:16 [:16 e1 g]
 \end{mudela}
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 c4:32 [:16 c8 d8]
 \end{mudela}
 
 c4:32 [:16 c8 d8]
 \end{mudela}
 


@@ -423,55 +423,55 @@ Simply include the language specific init file \file{<language.ly>}.}.
 The default set are the ones we like best are the Dutch notenames.
 
 A sharp is formed by adding \verb+is+
 The default set are the ones we like best are the Dutch notenames.
 
 A sharp is formed by adding \verb+is+

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 cis dis eis fis gis ais bis
 \end{mudela}
 
 and a flat is formed by adding \verb+es+%
 %\footnote{Exceptions: \verb+es+ and \verb+as+.}
 \footnote{Exceptions: {\tt es} and {\tt as}.}
 cis dis eis fis gis ais bis
 \end{mudela}
 
 and a flat is formed by adding \verb+es+%
 %\footnote{Exceptions: \verb+es+ and \verb+as+.}
 \footnote{Exceptions: {\tt es} and {\tt as}.}

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 ces des es fes ges as bes
 \end{mudela}
 
 With the obvious names for double sharps
 ces des es fes ges as bes
 \end{mudela}
 
 With the obvious names for double sharps

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 cisis disis eisis fisis gisis aisis bisis
 \end{mudela}
 
 and double flats
 cisis disis eisis fisis gisis aisis bisis
 \end{mudela}
 
 and double flats

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 ceses deses eses feses geses ases beses
 \end{mudela}
 See why we like-em?
 
 There are two special `notenames', the rest
 ceses deses eses feses geses ases beses
 \end{mudela}
 See why we like-em?
 
 There are two special `notenames', the rest

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 r16 [a a a]
 \end{mudela}
 
 and the space
 r16 [a a a]
 \end{mudela}
 
 and the space

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 a2 s-"diminuendo" | a
 \end{mudela}
 
 
 \section{Commands}
 
 a2 s-"diminuendo" | a
 \end{mudela}
 
 
 \section{Commands}
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 \clef "bass"; 'c
 \end{mudela}
 
 and a clef-change
 \clef "bass"; 'c
 \end{mudela}
 
 and a clef-change

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 \clef "violin"; f' e' \clef "alto"; d' c'
 \end{mudela}
 
 \clef "violin"; f' e' \clef "alto"; d' c'
 \end{mudela}
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 \meter 3/4; c g g |
 \end{mudela}
 
 \meter 3/4; c g g |
 \end{mudela}
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 \key fis cis;
 'g 'a 'b cis d e fis g'
 \end{mudela}
 \key fis cis;
 'g 'a 'b cis d e fis g'
 \end{mudela}


@@ -485,11 +485,11 @@ Lily will determine what accidentals to typeset.
 A reminder accidental can be forced by
 using an exclamation mark \verb+!+
 on a pitch a reminder accidental
 A reminder accidental can be forced by
 using an exclamation mark \verb+!+
 on a pitch a reminder accidental

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 cis d e cis | c! d e c |
 \end{mudela}
 
 cis d e cis | c! d e c |
 \end{mudela}
 

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 \meter 2/4;
 \bar "|:"; c c \bar ":|:"; c c \bar ":|"; c c \bar "|."; 
 \end{mudela}
 \meter 2/4;
 \bar "|:"; c c \bar ":|:"; c c \bar ":|"; c c \bar "|."; 
 \end{mudela}


@@ -497,12 +497,12 @@ cis d e cis | c! d e c |
 \section{Chords and Voices}
 
 Here's a simple chord
 \section{Chords and Voices}
 
 Here's a simple chord

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 <c e g>
 \end{mudela}
 
 here are a few
 <c e g>
 \end{mudela}
 
 here are a few

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 <
         { c()d()c }
         { e()f()e }
 <
         { c()d()c }
         { e()f()e }


@@ -511,7 +511,7 @@ here are a few
 \end{mudela}
 
 and similarly voices
 \end{mudela}
 
 and similarly voices

-\begin[fragment,verbatim,center]{mudela}
+\begin{mudela}[fragment,verbatim,center]

 <
         { \voiceone c g c g }
         { \voicetwo 'c2 'g2 }
 <
         { \voiceone c g c g }
         { \voicetwo 'c2 'g2 }


@@ -524,7 +524,7 @@ and similarly voices
 
 A Mudela file needs some red tape
 
 
 A Mudela file needs some red tape
 

-\begin[verbatim,center]{mudela}
+\begin{mudela}[verbatim,center]

 \score{
         \melodic {
                 \octave c';
 \score{
         \melodic {
                 \octave c';


@@ -537,7 +537,7 @@ A Mudela file needs some red tape
 
 \section{Lyrics}
 
 
 \section{Lyrics}
 

-\begin[verbatim,center]{mudela}
+\begin{mudela}[verbatim,center]

 \score{
         < 
                 \melodic{ 
 \score{
         < 
                 \melodic{ 


@@ -796,14 +796,14 @@ meaning of \verb+_+ and the resolution of words
 
 You enter a note by giving the name and the reciprocal of the duration:
 
 
 You enter a note by giving the name and the reciprocal of the duration:
 

-\begin[fragment,verbatim]{mudela}
+\begin{mudela}[fragment,verbatim]

 a'4     % Dutch names
 \end{mudela}
 
 is a A-1 pitched crotchet. The ' signifies an octave change.  A-1 is 440
 Hz concert-pitch. \verb+c'+ is also known as the central c. More examples:
 
 a'4     % Dutch names
 \end{mudela}
 
 is a A-1 pitched crotchet. The ' signifies an octave change.  A-1 is 440
 Hz concert-pitch. \verb+c'+ is also known as the central c. More examples:
 

-\begin[fragment,verbatim]{mudela}
+\begin{mudela}[fragment,verbatim]

         'a      % 110
         a       % 220
         A       % 110, uppercase octavates down
         'a      % 110
         a       % 220
         A       % 110, uppercase octavates down


@@ -844,7 +844,7 @@ s       % a "space" rest, nothing is printed.
 These notenames along with duration are enough material to construct
 simple melodies:
 
 These notenames along with duration are enough material to construct
 simple melodies:
 

-\begin[verbatim,fragment]{mudela}
+\begin{mudela}[verbatim,fragment]

 \octave c';
 c4 c4 g4 g4 a4 a4 g2
 f4 f4 e4 e4 d4 d4 c2
 \octave c';
 c4 c4 g4 g4 a4 a4 g2
 f4 f4 e4 e4 d4 d4 c2


@@ -861,7 +861,7 @@ implemented as START and STOP stop features and then attached to the note.
 \end{description}
 
 example: 
 \end{description}
 
 example: 

-\begin[verbatim,fragment]{mudela}
+\begin{mudela}[verbatim,fragment]

   \octave c';
   [c8 () d8 () e8  
   e8(] [)g8 <c'8] e'8>              % NO nesting!
   \octave c';
   [c8 () d8 () e8  
   e8(] [)g8 <c'8] e'8>              % NO nesting!


@@ -876,14 +876,14 @@ they should be attached to the note.  For this reason, the construct
 
 Ties connect the noteheads of adjacent notes. They are entered as follows:
 
 
 Ties connect the noteheads of adjacent notes. They are entered as follows:
 

-\begin[verbatim,fragment]{mudela}
+\begin{mudela}[verbatim,fragment]

 a'4 ~ a''4
 \end{mudela}
 
 Slurs connect whole chords, and try to avoid crossing stems. They are
 entered as follows:
 
 a'4 ~ a''4
 \end{mudela}
 
 Slurs connect whole chords, and try to avoid crossing stems. They are
 entered as follows:
 

-\begin[verbatim,fragment]{mudela}
+\begin{mudela}[verbatim,fragment]

 a'4(  )a''4
 \end{mudela}
 
 a'4(  )a''4
 \end{mudela}
 


@@ -891,7 +891,7 @@ a'4(  )a''4
 
 Symbols which can be put at either side (above or below) of a staff
 are entered as follows:
 
 Symbols which can be put at either side (above or below) of a staff
 are entered as follows:

-\begin[verbatim,fragment]{mudela}
+\begin{mudela}[verbatim,fragment]

         a-^     % marcato, direction: default
         %a^-     % portato, direction: above note
         a_.     % staccato, direction: below note
         a-^     % marcato, direction: default
         %a^-     % portato, direction: above note
         a_.     % staccato, direction: below note

diff --git a/Documentation/vocabulary-data b/Documentation/vocabulary-data
index 43847bb9855b3c4e8c2759ebbfed1dac2a0c730d..fdc193aef242a1aa8dc7eef1e4ea8eed5454dbc1 100644 (file)
--- a/Documentation/vocabulary-data
+++ b/Documentation/vocabulary-data
@@ -1,5 +1,6 @@
 :engraving:notenstechen::steken::
 Francais:US English:Deutsch:UK English:Nederlands:Italiaans:
 :engraving:notenstechen::steken::
 Francais:US English:Deutsch:UK English:Nederlands:Italiaans:

+:Grand staff:::Piano systeem::A combination of two staffs with a brace.  Usually used for piano music.

 :system:::systeem::
 accentuation:accentuation:::accent::
 accolade:brace:::::
 :system:::systeem::
 accentuation:accentuation:::accent::
 accolade:brace:::::

diff --git a/NEWS b/NEWS
index 4a4d8ad0b57f790bcb135753aab8f7e14a1ed03f..51026e6884ac1f94c3dfce01c5d94300ca292ce6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,45 @@
-**************
+pl 61
+       - bf: mudela-book error msgs
+       - don't dist feta-tables.
+       - bf: mf-to-table, deps[0] catch
+       - reworked initialisation parsing logic; Got a no-redtape mode
+         for free
+       - 20 pt staffsize now default
+       - dependencies for LilyPond (-d, --dependencies).  --debug moved to -D
+       - (c) 1998
+       - ly2dvi 0.10 (JAF)
+       - changed \begin[options]{mudela} to \begin{mudela}[options]
+       - more WWW hacks.
+       
+pl 60.jcn2
+       - minor adjust for asymmetricity of beam symbol
+       - added TEST beam quantisation; see input/test/beam-pos.ly
+       - removed some empty .cc .hh
+       - Grandstaff -> Grand_staff (After [Gerou] and Harvard Dictionary of
+         Music)
+       - bf's: slur and tie post-processing
+       - cleaned-up bow: get encompass
+       - cleaned-up beam-yspan and beam-leftpos quantisation
+       - misc.cc: some funcs to get lower and upper bounds from array of values
+       - interval.*: Slice (Interval of int)
+       - added some doco to beam.cc
+       - removed some x,y by-ref passing in Lookup
+       - cleaned-up beam-yspan quantisation
+       - cleaned-up slur get encompass
+       - configure: --disable-optimise for compile without -O
+
+pl 59.jcn4
+       - bf: beam quantise
+       - bf: sticky plet bug
+       - bf: chords in beam
+       - bf: typo beamquantisaton
+       - bf: don't blow_fit infeasible bows (x_i < x_0 || x_i > x_n)
+       - bf's: beam/stemlengths, beam-bug [c8 c16 c16]
+       - bf: placement broken tie
+       - yet another try to raise bar-number
+       - bf's: bow tangent clipping, allow higher bows
+
+************

 pl 60
        - mats patches: use Latex font stuff.
        - fixes to the .59 patch release (jcn)
 pl 60
        - mats patches: use Latex font stuff.
        - fixes to the .59 patch release (jcn)

diff --git a/README b/README
index 82740ef2da72d4c22de8a3d97eae594bf2b77a61..9b9075c73f78f58f0911cf06ccb7caf11a1b3a1c 100644 (file)
--- a/README
+++ b/README
@@ -22,9 +22,7 @@ version, then this is version is *not* meant for producing nice output
 2. REQUIREMENTS
 
 For the compilation and running of LilyPond you need some additional
 2. REQUIREMENTS
 
 For the compilation and running of LilyPond you need some additional

-packages. The most unusual one of this are the metafont sources to
-MusixTeX-fonts. Please refer to the installation instructions on how
-to obtain and install them.
+packages. Please refer to the installation instructions.

 
 
 3. INSTALLATION
 
 
 3. INSTALLATION


@@ -69,6 +67,7 @@ The website also contains the complete documentation
 If you decide to build LilyPond from source, please read the INSTALL
 document first, especially the Windows NT/95 section.
 
 If you decide to build LilyPond from source, please read the INSTALL
 document first, especially the Windows NT/95 section.
 

+

 7. CAVEATS
 
 * Please read the file BUGS for some ugly bugs.  This especially applies
 7. CAVEATS
 
 * Please read the file BUGS for some ugly bugs.  This especially applies

diff --git a/TODO b/TODO
index 06720105d2e4c8f05e34bd76e7b9e699544dccde..e57940c8969eaa04aece29d7bd0fe5d49a45bea6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,11 +4,35 @@ This is an assorted collection of stuff that will be done, might be
 done, or is an idea that I want to think about
 
 Most of the items are marked in the code as well, with full explanation. 
 done, or is an idea that I want to think about
 
 Most of the items are marked in the code as well, with full explanation. 

-grep for TODO and ugh/ug
+grep for TODO and ugh/ugr/urg

 
 0.2:
 
 
 0.2:
 

-       * ly2dvi seams to eat accents as in \'el\'egant
+       * add a Duration_convert memberr to Duration_iter to set parameters.
+       Junk global duration settings. 
+ 
+       * deps for ly2dvi
+
+       * depracate \duration
+
+       * clean up abbrev/plet/beam/abbrevbeam/duration mess in parser.
+
+       * minimum length second part broken tie
+ 
+        * lowest beam of (UP) beam must never be lower than second staffline
+
+       * multibar rests
+
+       * make lily output make dependencies.
+
+       * make sure that columns never touch
+         old hack at spring-spacer.cc:690 seems to be broken
+ 
+       * latex mutopia/los-toros-oboe-16.tex: max memsize
+ 
+       * fix position of bar number
+ 
+       * fix website.

 
        * libtoolize flowerlib
 
 
        * libtoolize flowerlib
 


@@ -16,18 +40,12 @@ grep for TODO and ugh/ug
 
        * bf: abbrevbeam? 
 
 
        * bf: abbrevbeam? 
 

-       * add full coriolan to website.
-

        * robustify Beam (in case of no stems, 32nd notes)
 
        * 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
 
        * fix silly " "2*12 a4 (=4*12) sticky plet 
 
        * check for groff / troff/ nroff et
 

-       * latex quirk?
-

        * use kpsepath to find all TeX dirs
        - configure.in 
        - clean-fonts.sh
        * use kpsepath to find all TeX dirs
        - configure.in 
        - clean-fonts.sh


@@ -64,12 +82,20 @@ grep for TODO and ugh/ug
        * The `3' in the meter key is a one or two pixels too thin (at 600dpi)
        in the middle:
 
        * The `3' in the meter key is a one or two pixels too thin (at 600dpi)
        in the middle:
 

+       * the tenuto script is too long and too thin
+

        * better hshift (dots, distance, head dependent)
 
        * stem len adjustable
 
 STUFF
        * better hshift (dots, distance, head dependent)
 
        * stem len adjustable
 
 STUFF

-      * clefs: The names I'd like are of the form
+       * convert-mudela:
+       - make smarter
+       - fix convert-mudela -e *.ly ;
+       - convert-mudela -e empty.ly
+       - redo in python.
+
+      * clefs (AG): The names I'd like are of the form

 
             [FGC]n{[_^]8}   F, G or C clef, on nth line, subscripted
                             or superscripted with an 8.
 
             [FGC]n{[_^]8}   F, G or C clef, on nth line, subscripted
                             or superscripted with an 8.


@@ -97,6 +123,15 @@ STUFF
 
        this modifies \stem for the c2
 
 
        this modifies \stem for the c2
 

+       * emacs mudela-mode
+
+       -  should handle block comments too.
+       -  handle lexer modes (\header, \melodic, \lyric) etc.
+       -  indentation
+       -  notenames?
+       -  fontlock: \melodic \melodic
+ 
+

        * use properties for:
        - Text_style
        - default_octave
        * use properties for:
        - Text_style
        - default_octave


@@ -125,10 +160,19 @@ STUFF
        * tried egcs 1.0.2: failed on lily/stem.cc -> flower/include/interval.hh
          should narrow down and send bug report
 
        * tried egcs 1.0.2: failed on lily/stem.cc -> flower/include/interval.hh
          should narrow down and send bug report
 

+       * gcc 2.8.1: see ice and RESIZE_ICE
+

        * xdvi: PS in magnifying glass.
 
        * Fix profiling. gprof bugreport?
 
        * xdvi: PS in magnifying glass.
 
        * Fix profiling. gprof bugreport?
 

+       * GNU diff 2.7: diff -rN does not see a new directory with empty file
+
+       * GNU patch 2.1: <must find simple example> if patch chokes on a
+         hunk, or on allegedly unsorted hunks in a diff, it may stop 
+         without a trace of failure (create .rej file, print error or 
+         dump core) and just ignore any further diffs.
+

 PROJECTS
 
        * Unicode support?
 PROJECTS
 
        * Unicode support?


@@ -278,8 +322,6 @@ languages:
 
        * Rhythmic staff.
 
 
        * Rhythmic staff.
 

-       * multibar rests
-

        * markers
 
 
        * markers
 
 

diff --git a/VERSION b/VERSION
index 5256cfd8a81dd945eaa7cc5768e635e0f72bba1b..5f824472e8dc52b046e5a312edd2e21666fc3249 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
 MAJOR_VERSION=0
 MINOR_VERSION=1

-PATCH_LEVEL=60
+PATCH_LEVEL=61

 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:

diff --git a/bin/clean-diaper.sh b/bin/clean-diaper.sh
index 06be9040aebea8577292f8494176d7923ae0fee9..47c2a069db6f006cf0dfac631efdebfd87423516 100755 (executable)
--- a/bin/clean-diaper.sh
+++ b/bin/clean-diaper.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # unclobber current dir.
 #!/bin/sh
 
 # unclobber current dir.

-rm -vf *.aux *.log *.orig *~
+rm -vf *.aux *.log *.orig *~  *dvi *.dep
+
+# subdirs

 rm -vf `grep -li "^% Creator: GNU LilyPond" *.out *.tex` 
 rm -vf `grep -li "Creator: mi2mu" *.midi.ly`
 rm -vf `grep -li "%Creator: dvipsk" *.ps`
 rm -vf `grep -li "^% Creator: GNU LilyPond" *.out *.tex` 
 rm -vf `grep -li "Creator: mi2mu" *.midi.ly`
 rm -vf `grep -li "%Creator: dvipsk" *.ps`


@@ -11,8 +13,10 @@ rm -vf `find -name 'core'`
 rm -vf `find -name '*.orig'`
 rm -vf `find -name '*.rej'`
 
 rm -vf `find -name '*.orig'`
 rm -vf `find -name '*.rej'`
 

+
+
+

     
 # docxx mess
     
 # docxx mess

-rm -vf *dvi

 rm -vf *.class  HIER*.html dxxgifs.tex gifs.db icon?.gif logo.gif down.gif \
     aindex.html index.html
 rm -vf *.class  HIER*.html dxxgifs.tex gifs.db icon?.gif logo.gif down.gif \
     aindex.html index.html

diff --git a/bin/conflily.sh b/bin/conflily.sh
index 56793f1e278f931a9a13234bcea9bb8eb6ba433b..e42d608713373f8e2a8f8b3228fe86c533c4c912 100755 (executable)
--- a/bin/conflily.sh
+++ b/bin/conflily.sh
@@ -32,4 +32,4 @@ fi
 ln -sf $lelie/current/lily/out/lilypond bin/lilypond
 ln -sf $lelie/current/mi2mu/out/mi2mu bin/mi2mu
 
 ln -sf $lelie/current/lily/out/lilypond bin/lilypond
 ln -sf $lelie/current/mi2mu/out/mi2mu bin/mi2mu
 

-configure --prefix=/usr --enable-debugging --enable-printing --enable-checking
+configure --prefix=/usr --enable-debugging --enable-printing --enable-checking --disable-optimise

diff --git a/bin/convert-mudela.pl b/bin/convert-mudela.pl
index 3be80d97daba3aa3c70f0fe79b327c0131cca6b0..e4979d35d6e65aec4f18bfbb7a9f092db61a4096 100755 (executable)
--- a/bin/convert-mudela.pl
+++ b/bin/convert-mudela.pl
@@ -165,6 +165,11 @@ sub convert_0_1_8_to_0_1_9
 #  print "introduced plet and finger shorthands...\n";
 }
 
 #  print "introduced plet and finger shorthands...\n";
 }
 

+sub convert_0_1_9_to_0_1_10
+{
+    s/Grandstaff/Grand_staff/;    
+}
+

 ###############################################################
 
 sub    last_conversion
 ###############################################################
 
 sub    last_conversion


@@ -214,6 +219,7 @@ my %minor_conversions = ("0.0.50" => \&no_conv,
                         ,"0.1.7" => \&convert_0_1_6_to_0_1_7
                         ,"0.1.8" => \&convert_0_1_7_to_0_1_8
                         ,"0.1.9" => \&convert_0_1_8_to_0_1_9
                         ,"0.1.7" => \&convert_0_1_6_to_0_1_7
                         ,"0.1.8" => \&convert_0_1_7_to_0_1_8
                         ,"0.1.9" => \&convert_0_1_8_to_0_1_9

+                        ,"0.1.10" => \&convert_0_1_9_to_0_1_10

                         );
 
  
                         );
 
  

diff --git a/bin/ls-latex.py b/bin/ls-latex.py
index 1f53bb81f5801490a85788272a9852d3252ed987..13b413fc7b09b9c720a9af0935bf4d5e078bf127 100644 (file)
--- a/bin/ls-latex.py
+++ b/bin/ls-latex.py
@@ -47,24 +47,63 @@ def read_latex_header (fn):
     if latex_title_re.search (s) == -1:
        raise 'huh?'
     header.title = latex_title_re.group (1)
     if latex_title_re.search (s) == -1:
        raise 'huh?'
     header.title = latex_title_re.group (1)

+    header.outfile = regsub.gsub ('\.doc+$', '.ps.gz', fn)

     return  header
 
     return  header
 

+
+bib_author_re = regex.compile('% *AUTHOR *= *\(.*\)$')
+bib_title_re = regex.compile('% *TITLE *= *\(.*\)$')
+
+def bib_header (fn):
+    s = gulp_file (fn)
+    if bib_author_re.search (s) == -1 :
+       raise 'huh?'
+
+    header = Latex_head()
+    header.filename= fn;
+    header.author = bib_author_re.group (1)
+    if bib_title_re.search (s) == -1:
+       raise 'huh?'    
+    header.title = bib_title_re.group (1)
+    header.outfile = fn
+    return header
+
+
+def read_pod_header (fn):
+    header = Latex_head ()
+    s = gulp_file (fn)
+    i = regex.search( '[^\n \t]', s)
+    s = s[i:]
+    i = regex.search( '\n\n', s)
+    s = s[i+2:]    
+    if i < 0:
+       raise 'huh?'
+    i = regex.search( '\n\n', s)
+    header.title = s[:i]
+    header.filename = fn
+    header.outfile = regsub.gsub ('\.pod$', '.html', fn)
+    return  header
+
+

 def print_html_head (l,o,h):
 def print_html_head (l,o,h):

-    (pre, ext) = o
-    out = regsub.gsub ('\.[^.]+$', ext, h.filename)
-    l.write ('<li><a href=%s>%s</a><p>by %s</p>' % (pre + out, h.title, h.author ))
-    l.write ('</li>')
+    pre =o
+
+    l.write ('<li><a href=%s>%s</a>' % (pre + h.outfile, h.title ))
+    if h.author:
+       l.write ('<p>by %s</p>' % h.author)
+    l.write ('</li>\n')

 
 
 import getopt
 
 (cl_options, files) = getopt.getopt(sys.argv[1:], 
 
 
 import getopt
 
 (cl_options, files) = getopt.getopt(sys.argv[1:], 

-                                   'e:h', ['help', 'prefix=' ,'extension='])
+                                   'e:h', ['help', 'prefix=' ,'extension='
+                                           , 'title='])

 
 tex = ''
 output =''
 pre = ''
 
 tex = ''
 output =''
 pre = ''

-
+title = ''

 for opt in cl_options:
     o = opt[0]
     a = opt[1]
 for opt in cl_options:
     o = opt[0]
     a = opt[1]


@@ -72,11 +111,20 @@ for opt in cl_options:
        ext = a
     if o == '--prefix' or o == '-p':
        pre = a
        ext = a
     if o == '--prefix' or o == '-p':
        pre = a

+    if o == '--title' or o == '-t':
+       title = a  

 
 l = sys.stdout
 
 
 l = sys.stdout
 

-l.write ('<html><title>TeX documents</title><h1> TeX documents</h1><ul>')
+l.write ('<html><title>%s</title><h1> %s</h1><ul>\n' % (title, title))
+

 
 for x in files:
 
 for x in files:

-    print_html_head (l, (pre,ext), read_latex_header (x))
+    if regex.search ('\\.bib$', x) <> -1:
+       head = bib_header (x)
+    elif regex.search ('\\.pod$', x) <> -1:
+       head = read_pod_header (x)
+    else:
+       head = read_latex_header (x)
+    print_html_head (l, pre, head)

 l.write ('</ul></html>')
 l.write ('</ul></html>')

diff --git a/bin/ly2dvi.sh b/bin/ly2dvi.sh
index 11c15cfeb623d0ee6087359282485960c0293775..2f048fb4da8cedf4960ddca8e6df765058fa4420 100755 (executable)
--- a/bin/ly2dvi.sh
+++ b/bin/ly2dvi.sh
@@ -8,24 +8,29 @@
 #  Original LaTeX file made by Mats Bengtsson, 17/8 1997
 #
 
 #  Original LaTeX file made by Mats Bengtsson, 17/8 1997
 #
 

-VERSION="0.9"
+VERSION="0.10"

 NAME=ly2dvi.sh
 IDENTIFICATION="$NAME $VERSION" 
 NOW=`date`
 echo "$IDENTIFICATION" 1>&2
 
 NAME=ly2dvi.sh
 IDENTIFICATION="$NAME $VERSION" 
 NOW=`date`
 echo "$IDENTIFICATION" 1>&2
 

-KEEP_LILY_OUTPUT=N
-

 # NEWS
 
 # NEWS
 

+#0.10
+#      - -K,--keeplilypond : Keep lilypond output files (default delete)
+#      - -k,--keeply2dvi   : Keep ly2dvi   output files (default delete)
+#      - -L,--landscape    : Set landscape orientation
+#      - -N,--nonumber     : Turn off page numbering (\pagestyle{empty})
+#      - Could not reinsert "\usepackage[T1]{fontenc}" because
+#        "los-toros" won't work with it
+#      - Ekstra LaTeX headers from input file
+

 #0.9.hwn1
 #       - option to remove output of lily
 #0.9.hwn1
 #       - option to remove output of lily

-

 # 0.9  - Trap Lilypond abort
 #      - Replaced "\usepackage[T1]{fontenc}" with
 #        \usepackage[latin1]{inputenc} (takk, Mats)
 #      - Removed "()" around "\LilyIdString" (Janne didn't want it)
 # 0.9  - Trap Lilypond abort
 #      - Replaced "\usepackage[T1]{fontenc}" with
 #        \usepackage[latin1]{inputenc} (takk, Mats)
 #      - Removed "()" around "\LilyIdString" (Janne didn't want it)

-

 # 0.8  - Trap Lilypond segmentation fault
 #      - Function for cleanup
 #      - Trap line
 # 0.8  - Trap Lilypond segmentation fault
 #      - Function for cleanup
 #      - Trap line


@@ -137,12 +142,22 @@ KEEP_LILY_OUTPUT=N
 # Clean up
 #
 cleanup() {
 # Clean up
 #
 cleanup() {

-  $debug_echo "("$LF")("$FN")("$LOGFILE")"

   if [ "$KEEP_LY2DVI_OUTPUT" != "Y" ]
   then
   if [ "$KEEP_LY2DVI_OUTPUT" != "Y" ]
   then

-    [ -n "$LF" -a -f "$LF" ]           && rm -f $LF
+    [ -n "$LatF" -a -f "$LatF" ]       && rm -f $LatF

     [ -n "$LOGFILE" -a -f "$LOGFILE" ] && rm -f $LOGFILE
     [ -n "$FN" ]                       && rm -f $FN.*
     [ -n "$LOGFILE" -a -f "$LOGFILE" ] && rm -f $LOGFILE
     [ -n "$FN" ]                       && rm -f $FN.*

+    for F in *$$* $TMP/*$$*
+    do
+      rm -f $F
+    done
+  fi
+  if [ "$KEEP_LILY_OUTPUT" != "Y" ]
+  then
+    for F in $LILY_OUTPUT_FILES
+    do
+      [ -f $F ] && rm -f $F
+    done

   fi
 }
 #
   fi
 }
 #


@@ -154,14 +169,18 @@ Generate dvi file from mudela or lilypond output
 Usage: $0 [options] file[s]
 
 Options:
 Usage: $0 [options] file[s]
 
 Options:

-  -D, --debug           set debug mode
-  -O, --orientation=    set orientation (landscape or portrait (default))
-  -o, --output=         set output directory
-  -h, --help            this help text
-  -k, --keep            keep LaTeX file
-  -l, --language=       give LaTeX language (babel)
-  -p, --papersize=      give LaTeX papersize (eg. a4paper)
-  -s, --separate        run all files separately through LaTeX
+  -D,--debug           set debug mode
+  -H,--headers=        name of additional LaTeX headers file
+  -K,--keeplilypond    keep lilypond output files
+  -L,--landscape       set landscape orientation
+  -N,--nonumber        switch off page numbering
+  -O,--orientation=    set orientation (landscape or portrait (default))
+  -o,--output=         set output directory
+  -h,--help            this help text
+  -k,--keeply2dvi      keep ly2dvi output files
+  -l,--language=       give LaTeX language (babel)
+  -p,--papersize=      give LaTeX papersize (eg. a4paper)
+  -s,--separate        run all files separately through LaTeX

 
   files may be (a mix of) input to or output from lilypond(1)
 EOF
 
   files may be (a mix of) input to or output from lilypond(1)
 EOF


@@ -182,6 +201,7 @@ fi
 LOGFILE=$TMP/lilylog.$$                        # Logfile for lilypond
 PWIDTH=600;                            # Width of A4 paper!
 PHEIGTH=845;                            # Heigth of A4 paper!
 LOGFILE=$TMP/lilylog.$$                        # Logfile for lilypond
 PWIDTH=600;                            # Width of A4 paper!
 PHEIGTH=845;                            # Heigth of A4 paper!

+PNUM="%"                                # Page numbering on

 #
 # RC-files ?
 #
 #
 # RC-files ?
 #


@@ -193,7 +213,8 @@ done
 fORI=$ORIENTATION
 fLNG=$LANGUAGE
 fPSZ=$PAPERSIZE
 fORI=$ORIENTATION
 fLNG=$LANGUAGE
 fPSZ=$PAPERSIZE

-unset ORIENTATION LANGUAGE PAPERSIZE
+fLHF=$LATEXHF
+unset ORIENTATION LANGUAGE PAPERSIZE LATEXHF

 # 
 # Keywords defined in titledefs.tex
 #
 # 
 # Keywords defined in titledefs.tex
 #


@@ -228,7 +249,7 @@ SEPFILE=N
 #
 # "x:" x takes argument
 #
 #
 # "x:" x takes argument
 #

-switches="DO:hkl:o:Kp:s\?"
+switches="DH:KLNO:hkl:o:p:s\?"

 options=""
 #
 # ugh, "\-" is a hack to support long options
 options=""
 #
 # ugh, "\-" is a hack to support long options


@@ -243,9 +264,21 @@ do
       [ $debug_echo = echo ] && set -x
       debug_echo=echo
       ;;
       [ $debug_echo = echo ] && set -x
       debug_echo=echo
       ;;

+    H  )
+      LATEXHF=$OPTARG
+      ;;
+    K  )
+      KEEP_LILY_OUTPUT=Y
+      ;;
+    L  )
+      ORIENTATION=landscape
+      ;;

     O  )
       ORIENTATION=$OPTARG
       ;;
     O  )
       ORIENTATION=$OPTARG
       ;;

+    N  )
+      PNUM="\pagestyle{empty}"
+      ;;

     h  )
       help;
       exit 0
     h  )
       help;
       exit 0


@@ -253,10 +286,6 @@ do
     k  )
       KEEP_LY2DVI_OUTPUT=Y
       ;;
     k  )
       KEEP_LY2DVI_OUTPUT=Y
       ;;

-    K  )
-      KEEP_LILY_OUTPUT=Y
-      ;;
-    

     l  )
       LANGUAGE=$OPTARG
       ;;
     l  )
       LANGUAGE=$OPTARG
       ;;


@@ -277,29 +306,41 @@ do
     -)
       $debug_echo "long option: \`$OPTARG'"
       case "$OPTARG" in
     -)
       $debug_echo "long option: \`$OPTARG'"
       case "$OPTARG" in

-        D*|-D*)
+        d*|-d*)

           [ $debug_echo = echo ] && set -x
           debug_echo=echo
           ;;
           [ $debug_echo = echo ] && set -x
           debug_echo=echo
           ;;

+        hea*|-hea*)
+          LATEXHF=`echo $OPTARG | sed -e s/"^.*="//`
+          ;;

         h*|-h*)
           help;
          exit 0
           ;;
         h*|-h*)
           help;
          exit 0
           ;;

+        keepli*|-keepli*)
+          KEEP_LILY_OUTPUT=Y
+          ;;

         k*|-k*)
           KEEP_LY2DVI_OUTPUT=Y
           ;;
         k*|-k*)
           KEEP_LY2DVI_OUTPUT=Y
           ;;

-        l*|-l*)
-          LANGUAGE=`echo $OPTARG | sed -e s/"^.*="//`
+        land*|-land*)
+          ORIENTATION=landscape

           ;;
           ;;

-        p*|-p*)
-          PAPERSIZE=`echo $OPTARG | sed -e s/"^.*="//`
+        lang*|-lang*)
+          LANGUAGE=`echo $OPTARG | sed -e s/"^.*="//`

           ;;
           ;;

+       n*|-n*)
+         PNUM="\pagestyle{empty}"
+         ;;

        or*|-or*)
          ORIENTATION=`echo $OPTARG | sed -e s/"^.*="//`
          ;;
        ou*|-ou*)
          OUTPUTDIR=`echo $OPTARG | sed -e s/"^.*="//`
          ;;
        or*|-or*)
          ORIENTATION=`echo $OPTARG | sed -e s/"^.*="//`
          ;;
        ou*|-ou*)
          OUTPUTDIR=`echo $OPTARG | sed -e s/"^.*="//`
          ;;

+        p*|-p*)
+          PAPERSIZE=`echo $OPTARG | sed -e s/"^.*="//`
+          ;;

         s*|-s*)
          SEPFILE=Y
           ;;
         s*|-s*)
          SEPFILE=Y
           ;;


@@ -330,9 +371,9 @@ BN=`basename $File .tex`
 FN=$BN.$$
 if [ "$KEEP_LY2DVI_OUTPUT" != "Y" ]
 then
 FN=$BN.$$
 if [ "$KEEP_LY2DVI_OUTPUT" != "Y" ]
 then

-  LF=$TMP/$FN.tex
+  LatF=$TMP/$FN.tex

 else
 else

-  LF=$FN.tex
+  LatF=$FN.tex

 fi
 #
 # Find:
 fi
 #
 # Find:


@@ -342,11 +383,23 @@ fi
 #   textwidth
 #
 eval `sed -n \\
 #   textwidth
 #
 eval `sed -n \\

-  -e 's/\\\\def\\\\mudelapapersize{\([^}]*\).*$/fPSZ=\1;/p' \\
-  -e 's/\\\\def\\\\mudelaorientation{\([^}]*\).*$/fORI=\1;/p' \\

   -e 's/\\\\def\\\\mudelalanguage{\([^}]*\).*$/fLNG=\1;/p' \\
   -e 's/\\\\def\\\\mudelalanguage{\([^}]*\).*$/fLNG=\1;/p' \\

+  -e 's/\\\\def\\\\mudelalatexheaders{\([^}]*\).*$/fLHF=\1;/p' \\
+  -e 's/\\\\def\\\\mudelaorientation{\([^}]*\).*$/fORI=\1;/p' \\

   -e 's/\\\\def\\\\mudelapaperlinewidth{\([^}]*\).*$/TWN=\1;/p' \\
   -e 's/\\\\def\\\\mudelapaperlinewidth{\([^}]*\).*$/TWN=\1;/p' \\

+  -e 's/\\\\def\\\\mudelapapersize{\([^}]*\).*$/fPSZ=\1;/p' \\

     $File`
     $File`

+#
+if [ -z "$LATEXHF" ]
+then
+  LATEXHF=$fLHF
+fi
+LLHF="%"
+if [ -n "$LATEXHF" ]
+then
+  [ -f $LATEXHF ] && LLHF="\input{$LATEXHF}"
+fi
+#

 if [ -z "$PAPERSIZE" ]
 then
   PAPERSIZE=$fPSZ
 if [ -z "$PAPERSIZE" ]
 then
   PAPERSIZE=$fPSZ


@@ -419,7 +472,7 @@ MARG=`expr $MARG / 2`"pt"
 #
 # Write LaTeX file
 #
 #
 # Write LaTeX file
 #

-cat << EOF > $LF
+cat << EOF > $LatF

 % Creator: $IDENTIFICATION
 % Automatically generated from  $IF, $NOW
 
 % Creator: $IDENTIFICATION
 % Automatically generated from  $IF, $NOW
 


@@ -427,8 +480,9 @@ cat << EOF > $LF
 \nonstopmode
 $LLNG
 \usepackage{geometry}
 \nonstopmode
 $LLNG
 \usepackage{geometry}

-%\usepackage[T1]{fontenc}

 \usepackage[latin1]{inputenc}
 \usepackage[latin1]{inputenc}

+%\usepackage[T1]{fontenc}
+$PNUM

 %\addtolength{\oddsidemargin}{-1cm}
 %\addtolength{\topmargin}{-1cm}
 \setlength{\textwidth}{$TW}
 %\addtolength{\oddsidemargin}{-1cm}
 %\addtolength{\topmargin}{-1cm}
 \setlength{\textwidth}{$TW}


@@ -436,6 +490,7 @@ $LLNG
 \geometry{width=$TW, left=$MARG}
 \input lilyponddefs
 \input titledefs
 \geometry{width=$TW, left=$MARG}
 \input lilyponddefs
 \input titledefs

+$LLHF

 \begin{document}
 EOF
 #
 \begin{document}
 EOF
 #


@@ -449,12 +504,12 @@ do
     LLL=`echo $LL | sed -e 's/}.*$//' -e 's/.*{//'`
     if [ "$LLL" != "" ]
     then
     LLL=`echo $LL | sed -e 's/}.*$//' -e 's/.*{//'`
     if [ "$LLL" != "" ]
     then

-      echo "\\"$L'{'$LLL'}%'                                >> $LF
+      echo "\\"$L'{'$LLL'}%'                                >> $LatF

     fi
   fi
 done
 #
     fi
   fi
 done
 #

-cat << EOF >> $LF
+cat << EOF >> $LatF

 \makelilytitle
 EOF
 }
 \makelilytitle
 EOF
 }


@@ -462,14 +517,14 @@ EOF
 # Conclusion
 #
 endFile(){
 # Conclusion
 #
 endFile(){

-cat << EOF >> $LF
+cat << EOF >> $LatF

 \vfill\hfill{\LilyIdString}
 \end{document}
 EOF
 #
 # Run LaTeX
 #
 \vfill\hfill{\LilyIdString}
 \end{document}
 EOF
 #
 # Run LaTeX
 #

-latex $LF || exit 5
+latex $LatF || exit 5

 #
 # Rename dvi file
 #
 #
 # Rename dvi file
 #


@@ -480,10 +535,6 @@ then
     cp $FN.dvi $RESULT
 fi
 #
     cp $FN.dvi $RESULT
 fi
 #

-# Clean up
-#
-cleanup
-#

 # Output some info
 #
 cat << EOF
 # Output some info
 #
 cat << EOF


@@ -598,7 +649,7 @@ do
       FFile=$File
       startFile
     fi
       FFile=$File
       startFile
     fi

-    cat << EOF >> $LF
+    cat << EOF >> $LatF

 \input{$File}
 EOF
     if [ $SEPFILE = Y ]
 \input{$File}
 EOF
     if [ $SEPFILE = Y ]


@@ -613,13 +664,6 @@ if [ $SEPFILE = N ]
 then
   endFile
 fi
 then
   endFile
 fi

-
-
-
-if [ $KEEP_LILY_OUTPUT = N ]
-then
-    rm $LILY_OUTPUT_FILES
-fi

 #
 # OK - finished
 #
 #
 # OK - finished
 #

diff --git a/bin/make-patch.py b/bin/make-patch.py
index d6c8502d9e06036f29dafc10278918d86f2ae310..bf3eb0ce1fa9d682782c068bd5166d920016bc9b 100755 (executable)
--- a/bin/make-patch.py
+++ b/bin/make-patch.py
@@ -56,7 +56,7 @@ Patches do not contain automatically generated files, \n\
 i.e. you should rerun autoconf and configure\n\n'
 
 # ugh, how to get rid of .tex files generated by lily?
 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']
+pats = ['*.lsm', 'configure', '*.txt', '.dstreamrc', 'lilypond.spec']

 
 def remove_automatic(dirnames):
     files = []
 
 def remove_automatic(dirnames):
     files = []

diff --git a/bin/mf-deps.py b/bin/mf-deps.py
deleted file mode 100755 (executable)
index b259b59..0000000
--- a/bin/mf-deps.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!@PYTHON@
-# -*- python -*-
-
-# 
-# mf-deps.py -- dependencies for metafont 
-# 
-# source file of the GNU LilyPond music typesetter
-# 
-# (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-# 
-
-
-"""look into metafont source for dependencies.
-
- fixme: python path
- fixme: error reporting
- fixem: python sucks slightly: why doesn't it have closures?
-
-"""
-
-import sys
-import os
-
-lilypath =''
-try:
-       lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/'
-except KeyError:
-       try:
-               lilypath = os.environ['top_srcdir'] + '/'
-       except KeyError:
-           print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/'
-
-           sys.exit(1)
-
-lilypath = lilypath + '/bin/'
-sys.path.append(lilypath)
- 
-from regex import * ;
-from regsub import * ;
-import sys;
-import os;
-
-
-version = "0.2"
-input_re = compile('^[ \t]*input *\([^;]+\);')
-postfixes = ['log', 'dvi', '2602gf', 'tfm']
-
-def identify ():
-    return "mf-deps.py %s" % version
-
-
-
-def print_one(x):
-    print x
-
-def line_concat(x,y):
-    return x + '\n' +  y
-
-class Targetdeps:
-    """Dependencies for one toplevel sourcefile
-
-    """
-    
-    def __init__(self,nm):
-       split = os.path.splitext(nm)    
-       self.basename=split[0];
-       self.depfiles = []
-       self.checkdep(nm)
-       
-    def checkdep(self, name):
-       split = os.path.splitext(name)
-       name = split[0] + '.mf';
-
-       if name not in self.depfiles:
-           self.get_filedeps(name)
-
-    def get_filedeps(self,filename):
-#      print sys.stderr.write( 'checking ' + filename + '\n');
-       try:
-           file = open(filename)
-       except IOError:
-#          print sys.stderr.write( 'can\'t open ' + filename + '\n')
-           return
-
-       self.depfiles.append(filename)
-       lines = file.readlines()
-       file.close()
-       for line in lines:
-           if input_re.search (line) <> -1:
-               self.checkdep( input_re.group(1))
-
-    def target_string(self):
-       # ugh.  Closures, anyone?
-#      targets =  map (lambda x,y = self.basename: 'out/' + y + '.' + x, postfixes)
-       targets =  map (lambda x,y = self.basename: y + '.' + x, postfixes)
-       depstring = reduce(lambda x,y: x + ' ' + y, self.depfiles) 
-       dependencies = map (lambda x, y=depstring: x + ': ' + y, targets)
-
-       return reduce(line_concat, dependencies)
-
-print "# Automatically generated by %s\n" % identify ()
-
-for file in sys.argv[1:]: # skip programname
-    t = Targetdeps(file)
-    print t.target_string()
-
-

diff --git a/bin/mf-to-table.py b/bin/mf-to-table.py
index 4c6e5428905ea771c05d02da73ecbcb82128f8ac..0db3593dcdd8986791a8aa11a7c11e9c890caf23 100755 (executable)
--- a/bin/mf-to-table.py
+++ b/bin/mf-to-table.py
@@ -176,6 +176,9 @@ class Log_reader:
            raise 'unknown label: ' + label
 
     def writedeps (self, deps):
            raise 'unknown label: ' + label
 
     def writedeps (self, deps):

+       if not len (deps):
+           sys.stderr.write  ('Huh, no main target??')
+           return

        filename = deps[0]
        split = os.path.splitext(filename)      
        basename=split[0];
        filename = deps[0]
        split = os.path.splitext(filename)      
        basename=split[0];

diff --git a/bin/mudela-book.pl b/bin/mudela-book.pl
index abb9366e020a6c38510286199bb59e985553fc8c..09e52f2f0afe1150d411fd3f3a139cde9908131d 100755 (executable)
--- a/bin/mudela-book.pl
+++ b/bin/mudela-book.pl
@@ -95,6 +95,7 @@ sub open_mudela
     $mudela_b = 1      ;
     open MUDELA, ">$outdir/book-mudela.ly";
     print BOOK "\\preexample%\n";
     $mudela_b = 1      ;
     open MUDELA, ">$outdir/book-mudela.ly";
     print BOOK "\\preexample%\n";

+    print MUDELA "\\include \"paper16.ly\"\n";

     if ($center_b) {
        print BOOK "\\begin{minipage}[c]{.5\\textwidth}\n";
        print MUDELA "default_paper = \\paper { \\paper_sixteen ";
     if ($center_b) {
        print BOOK "\\begin{minipage}[c]{.5\\textwidth}\n";
        print MUDELA "default_paper = \\paper { \\paper_sixteen ";


@@ -176,8 +177,8 @@ sub main
        die "The input can't be the output\n";
     }
 
        die "The input can't be the output\n";
     }
 

-    open INFILE, "<$infile";
-    open BOOK, ">$openout";
+    open INFILE, "<$infile" or die "Can't open $infile\n";
+    open BOOK, ">$openout" or  die "Can't open $openout\n";;

     while (<INFILE>) {
        if ($mudela_b) {
            if (end_b "mudela") {
     while (<INFILE>) {
        if ($mudela_b) {
            if (end_b "mudela") {


@@ -192,7 +193,7 @@ sub main
            }
            
        } else {
            }
            
        } else {

-           if (/^\\begin(\[.*\])?{mudela}/ ) {
+           if (/^\\begin{mudela}(\[.*\])?/ ) {

                my $opts ="";
                $opts = $1 if ( defined ($1));
 
                my $opts ="";
                $opts = $1 if ( defined ($1));
 

diff --git a/configure b/configure
index 9bec2ccabcce716def3e3844609da875b79c5a50..ce55c055630a2c2b5c40601eec829d43df87ce18 100755 (executable)
--- a/configure
+++ b/configure
@@ -663,7 +663,7 @@ ac_cv_prog_lex_root=lex.yy
 OPTIMIZE="-O"
 printing_b=no
 checking_b=yes
 OPTIMIZE="-O"
 printing_b=no
 checking_b=yes

-optimise_b=no
+optimise_b=tja

 profile_b=no
 CONFIGSUFFIX=
 debug_b=yes
 profile_b=no
 CONFIGSUFFIX=
 debug_b=yes


@@ -784,6 +784,10 @@ EOF
 
 fi
 
 
 fi
 

+if test "$optimise_b" = no; then
+    OPTIMIZE=""
+fi
+

 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"
 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"


@@ -826,7 +830,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
 # 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:830: checking for $ac_word" >&5
+echo "configure:834: 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
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -857,7 +861,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:861: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:865: 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.
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -867,11 +871,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 <<EOF
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF

-#line 871 "configure"
+#line 875 "configure"

 #include "confdefs.h"
 main(){return(0);}
 EOF
 #include "confdefs.h"
 main(){return(0);}
 EOF

-if { (eval echo configure:875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:879: \"$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
   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


@@ -891,12 +895,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: 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:895: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:899: 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 "$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:900: checking whether we are using GNU C++" >&5
+echo "configure:904: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -905,7 +909,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-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
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:913: \"$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
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no


@@ -920,7 +924,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
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6

-echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:928: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -950,7 +954,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
 # 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:954: checking for $ac_word" >&5
+echo "configure:958: 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
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -987,7 +991,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
 # 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:991: checking for a BSD compatible install" >&5
+echo "configure:995: 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
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -1041,7 +1045,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
 # 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:1045: checking for $ac_word" >&5
+echo "configure:1049: 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
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1075,7 +1079,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
 # 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:1079: checking for $ac_word" >&5
+echo "configure:1083: 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
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1116,7 +1120,7 @@ test -n "$FIND" || FIND="error"
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6

-echo "configure:1120: checking for 8-bit clean memcmp" >&5
+echo "configure:1124: 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
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1124,7 +1128,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF

-#line 1128 "configure"
+#line 1132 "configure"

 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);


@@ -1137,7 +1141,7 @@ main()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1145: \"$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
 then
   ac_cv_func_memcmp_clean=yes
 else


@@ -1155,12 +1159,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
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6

-echo "configure:1159: checking for vprintf" >&5
+echo "configure:1163: 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 <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 1164 "configure"
+#line 1168 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */


@@ -1186,7 +1190,7 @@ vprintf();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else


@@ -1210,12 +1214,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6

-echo "configure:1214: checking for _doprnt" >&5
+echo "configure:1218: 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 <<EOF
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 1219 "configure"
+#line 1223 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */


@@ -1241,7 +1245,7 @@ _doprnt();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else


@@ -1268,12 +1272,12 @@ fi
 for ac_func in memmem snprintf 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in memmem snprintf 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:1272: checking for $ac_func" >&5
+echo "configure:1276: 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 <<EOF
 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 <<EOF

-#line 1277 "configure"
+#line 1281 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -1299,7 +1303,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -1376,7 +1380,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
 # 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:1380: checking for $ac_word" >&5
+echo "configure:1384: 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
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1410,7 +1414,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
 # 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:1414: checking for $ac_word" >&5
+echo "configure:1418: 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
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1444,7 +1448,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
 # 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:1448: checking for $ac_word" >&5
+echo "configure:1452: 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
 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1476,7 +1480,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
 # 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:1480: checking for $ac_word" >&5
+echo "configure:1484: 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
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1508,7 +1512,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
 # 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:1512: checking for $ac_word" >&5
+echo "configure:1516: 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
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1542,7 +1546,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
 # 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:1546: checking for $ac_word" >&5
+echo "configure:1550: 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
 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1576,7 +1580,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
 # 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:1580: checking for $ac_word" >&5
+echo "configure:1584: 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
 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1612,7 +1616,7 @@ if test "x$TEXPREFIX" = xauto ; then
     
 
     echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6
     
 
     echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6

-echo "configure:1616: checking TeX/MF root dir directory" >&5    
+echo "configure:1620: checking TeX/MF root dir directory" >&5    

 
     find_root_prefix="$prefix"
     
 
     find_root_prefix="$prefix"
     


@@ -1653,7 +1657,7 @@ if test "x$MFDIR" = xauto; then
     
     
     echo $ac_n "checking MF input directory""... $ac_c" 1>&6
     
     
     echo $ac_n "checking MF input directory""... $ac_c" 1>&6

-echo "configure:1657: checking MF input directory" >&5    
+echo "configure:1661: checking MF input directory" >&5    

     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')`
     
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')`
     


@@ -1678,7 +1682,7 @@ if test "x$TEXDIR" = xauto ; then
     
     
     echo $ac_n "checking TeX input directory""... $ac_c" 1>&6
     
     
     echo $ac_n "checking TeX input directory""... $ac_c" 1>&6

-echo "configure:1682: checking TeX input directory" >&5    
+echo "configure:1686: checking TeX input directory" >&5    

     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')`
     
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')`
     


@@ -1795,7 +1799,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6

-echo "configure:1799: checking how to run the C++ preprocessor" >&5
+echo "configure:1803: 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
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -1808,12 +1812,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
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF

-#line 1812 "configure"
+#line 1816 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :


@@ -1833,17 +1837,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
 
 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6

-echo "configure:1837: checking for FlexLexer.h" >&5
+echo "configure:1841: 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
 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

-#line 1842 "configure"
+#line 1846 "configure"

 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*

diff --git a/configure.in b/configure.in
index c1d2bb5cce614730f69a6307d51a9ef74e040ad6..73ab40b1f5d2ec2f943f942bd5772ffbd3b5339b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,7 @@ ac_cv_prog_lex_root=lex.yy
 OPTIMIZE="-O"
 printing_b=no
 checking_b=yes
 OPTIMIZE="-O"
 printing_b=no
 checking_b=yes

-optimise_b=no
+optimise_b=tja

 profile_b=no
 CONFIGSUFFIX=
 debug_b=yes
 profile_b=no
 CONFIGSUFFIX=
 debug_b=yes


@@ -123,6 +123,10 @@ if test "$optimise_b" = yes; then
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 

+if test "$optimise_b" = no; then
+    OPTIMIZE=""
+fi
+

 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"
 if test $profile_b = yes; then
     EXTRA_LIBES="-pg"
     DEFINES="$DEFINES -pg"

diff --git a/flower/NEWS b/flower/NEWS
index eda8c8ccf497179577b099288398e01944565578..e0736d4cf09c83348cc8766c3ec2cbc8bd171f48 100644 (file)
--- a/flower/NEWS
+++ b/flower/NEWS
@@ -1,4 +1,5 @@
-pl 41.jcn1
+pl 42
+       - interval.*: Slice (Interval of int)

        trying to get rid of 2.8 ice:
         - moved functions with loops from varray.hh to varray.cc
 
        trying to get rid of 2.8 ice:
         - moved functions with loops from varray.hh to varray.cc
 

diff --git a/flower/VERSION b/flower/VERSION
index 3ab55969ef478701d77caa5d9dc47eacb1beab9b..cf5e1da91bb29ec3edd9010163366c4dbc3c3d53 100644 (file)
--- a/flower/VERSION
+++ b/flower/VERSION
@@ -1,7 +1,7 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1
 MAJOR_VERSION=1
 MINOR_VERSION=1

-PATCH_LEVEL=41
+PATCH_LEVEL=42

 
 # use to send patches, always empty for released version:
 #
 
 # use to send patches, always empty for released version:
 #

-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=

diff --git a/flower/axis.cc b/flower/axis.cc
index ff8566988dafe928bcb80209d3d800c4bee22629..92a1dea00132502821aab0de46c46c1dfcab457a 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <assert.h>
 */
 
 #include <assert.h>

diff --git a/flower/choleski.cc b/flower/choleski.cc
index 5c803ab0a8af41581ddb0015b8aa7afce8905420..5793fceae4e968ef7baa89a53c3268fad8dd3338 100644 (file)
--- a/flower/choleski.cc
+++ b/flower/choleski.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "choleski.hh"
 */
 
 #include "choleski.hh"

diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc
index 1a6b0e83a62ab16fb8990e163f9d94eec2395e09..a4d79a37761431289d85258b77a72928c1945923 100644 (file)
--- a/flower/cpu-timer.cc
+++ b/flower/cpu-timer.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "cpu-timer.hh"
 */
 
 #include "cpu-timer.hh"

diff --git a/flower/directed-graph.cc b/flower/directed-graph.cc
index 50dafedf13e92cb801bb1aa3a519f9942700e41f..5c61a41963119a28b6dd1e56c09da66c34c5bf16 100644 (file)
--- a/flower/directed-graph.cc
+++ b/flower/directed-graph.cc
@@ -3,7 +3,7 @@
 
   source file FlowerLib
 
 
   source file FlowerLib
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "directed-graph.hh"
 */
 
 #include "directed-graph.hh"

diff --git a/flower/dstream.cc b/flower/dstream.cc
index 28f7a472aaf491ee7e0b38e00cf1b5a76ba7a6e9..7857d33338a7e36841d430054e82776ec1947b1f 100644 (file)
--- a/flower/dstream.cc
+++ b/flower/dstream.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <fstream.h>
 */
 
 #include <fstream.h>

diff --git a/flower/file-path.cc b/flower/file-path.cc
new file mode 100644 (file)
index 0000000..e6f9c4c
--- /dev/null
+++ b/flower/file-path.cc
@@ -0,0 +1,111 @@
+/*
+   path.cc - manipulation of paths and filenames.
+*/
+#include <stdio.h>
+#include "file-path.hh"
+#include "flower-debug.hh"
+
+#ifndef DIRSEP
+#define DIRSEP '/'
+#endif
+
+#ifndef PATHSEP
+#define PATHSEP ':'
+#endif
+
+/**
+   @param path the original full filename
+   @return 4 components of the path. They can be empty
+*/
+void
+split_path (String path,
+           String &drive, String &dirs, String &filebase, String &extension)
+{
+  // peel off components, one by one.
+  int di = path.index_i (':');
+  if (di >= 0)
+    {
+      drive = path.left_str (di + 1);
+      path = path.right_str (path.length_i () - di -1);
+    }
+  else
+    drive = "";
+
+  di = path.index_last_i (DIRSEP);
+  if (di >=0)
+    {
+      dirs = path.left_str (di + 1);
+      path = path.right_str (path.length_i ()-di -1);
+    }
+  else
+    dirs = "";
+
+  di = path.index_last_i ('.');
+  if (di >= 0)
+    {
+      filebase = path.left_str (di);
+      extension =path.right_str (path.length_i ()-di);
+    }
+  else
+    {
+      extension = "";
+      filebase = path;
+    }
+}
+
+void
+File_path::parse_path (String p)
+{
+  int l;
+  
+  while ( (l = p.length_i ()) )
+    {
+      int i = p.index_i(PATHSEP);
+      if (i <0) 
+       i = l;
+      add (p.left_str(i));
+      p = p.right_str (l- i - 1);
+    }
+}
+
+
+
+
+/** find a file.
+  It will search in the current dir, in the construction-arg, and
+  in any other added path, in this order.
+  */
+String
+File_path::find (String nm) const
+{
+  fdebug << _("looking for ") << nm << ": ";
+  if (!nm.length_i() || (nm == "-") )
+    return nm;
+  for (int i=0; i < size(); i++)
+    {
+      String path  = elem(i);
+      String sep (DIRSEP);
+      String right(path.right_str (1));
+      if (path.length_i () && right != sep)
+       path += DIRSEP;
+
+      path += nm;
+
+      fdebug << path << "? ";
+      FILE *f = fopen (path.ch_C(), "r"); // ugh!
+      if (f)
+       {
+         fdebug << _("found\n");
+         fclose (f);
+         return path;
+       }
+    }
+  fdebug << "\n";
+  return "";
+}
+
+void
+File_path::add (String s)
+{
+   push (s); 
+}

diff --git a/flower/full-storage.cc b/flower/full-storage.cc
index 8389854361dd3aef1926d305f1fa5b2c59efb8e4..4fc5605cfb01b5d8f0e706bca174369b9b329362 100644 (file)
--- a/flower/full-storage.cc
+++ b/flower/full-storage.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "full-storage.hh"
 */
 
 #include "full-storage.hh"

diff --git a/flower/include/acursor.hh b/flower/include/acursor.hh
index 51ae3ea4d25b50d6869eec423bbca0467abba2e3..d49dbd6b4ef3950f412f0f0cbe4980b7eab5a815 100644 (file)
--- a/flower/include/acursor.hh
+++ b/flower/include/acursor.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/arithmetic-operator.hh b/flower/include/arithmetic-operator.hh
index 6b95340495ac97d4d4e7684d9d0b791569e71949..4a472819e3d9507a45bb990e8496c7e9e0a5baff 100644 (file)
--- a/flower/include/arithmetic-operator.hh
+++ b/flower/include/arithmetic-operator.hh
@@ -3,7 +3,7 @@
   
   source file of the Flower Library
   
   
   source file of the Flower Library
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/flower/include/axes.hh b/flower/include/axes.hh
index 82e561eb9fccac3f42eef1fdcf44158e5c10e24c..786e5157b76130201ce1396344e756cadf8803c2 100644 (file)
--- a/flower/include/axes.hh
+++ b/flower/include/axes.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/cpu-timer.hh b/flower/include/cpu-timer.hh
index 3205c42b35db0826ff34e72ebc86c9cf8accfe28..65def573e533f87d465175048a24692a1f3ec8a4 100644 (file)
--- a/flower/include/cpu-timer.hh
+++ b/flower/include/cpu-timer.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/cursor.icc b/flower/include/cursor.icc
index 15549fb737cf7de74ad2bc256aae8e3def964600..a000736b1e4955bcba29b9b8017c8a78f4832900 100644 (file)
--- a/flower/include/cursor.icc
+++ b/flower/include/cursor.icc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/data-file.hh b/flower/include/data-file.hh
index 93cd3f2bc5714a2b7f80b60c848a366940b8ee51..f371c39092553fc33cb3bbc9577df5585557a391 100644 (file)
--- a/flower/include/data-file.hh
+++ b/flower/include/data-file.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/diagonal-storage.hh b/flower/include/diagonal-storage.hh
index f3883e1ca400e0fc718dd4e6cc9affe80d4f9106..ae9572d5b724c9d737a43d5d4f80c6a0f475c44d 100644 (file)
--- a/flower/include/diagonal-storage.hh
+++ b/flower/include/diagonal-storage.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/dictionary-iter.hh b/flower/include/dictionary-iter.hh
index b80bb149246bcad54ce56d3526b2eef61dc75821..414d62b77f51f0d39432df1e374df10528987add 100644 (file)
--- a/flower/include/dictionary-iter.hh
+++ b/flower/include/dictionary-iter.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/dictionary.hh b/flower/include/dictionary.hh
index 87af9f9f7ae2ede0fefb692f4dd715a6c01e689e..2e16bed20112658b951c65422f225ad664340820 100644 (file)
--- a/flower/include/dictionary.hh
+++ b/flower/include/dictionary.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/directed-graph.hh b/flower/include/directed-graph.hh
index 5c9b8bc8b0bbdda256d80a07033cf72087a952d0..33c9e4ee236ad8b405c1d65af29ac9688dbe21dd 100644 (file)
--- a/flower/include/directed-graph.hh
+++ b/flower/include/directed-graph.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/dstream.hh b/flower/include/dstream.hh
index d9f896e43449d5ee19544fad0dafb49248bcb400..c1c04f39219ca21326269df3a63d63a98bef59f8 100644 (file)
--- a/flower/include/dstream.hh
+++ b/flower/include/dstream.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef DSTREAM_HH
 */
 
 #ifndef DSTREAM_HH

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
new file mode 100644 (file)
index 0000000..67d3129
--- /dev/null
+++ b/flower/include/file-path.hh
@@ -0,0 +1,47 @@
+/*
+  path.hh -- declare File_path
+
+  source file of the Flower Library
+
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#ifndef PATH_HH
+#define PATH_HH
+#include "string.hh"
+#include "varray.hh"
+
+
+/**    
+  search in directories for a file.
+
+   Abstraction of PATH variable. An interface for searching input files.
+   Search a number of dirs for a file.
+
+   TODO: add a unix style PATH interface 
+   Should use kpathsea?
+   
+*/
+
+class File_path : private Array<String>
+{
+public:
+  /// locate a file in the search path
+  String find (String nm) const;
+
+  /// add to end of path.
+  Array<String>::push;
+  void add (String str);
+  void parse_path (String);
+};
+
+/** split a path into its components.
+
+  @params path
+
+  @return
+  String &drive, String &dirs, String &filebase, String &extension
+ */
+void split_path (String path, String &drive, String &dirs, String &filebase, String &extension);
+
+#endif

diff --git a/flower/include/flower-debug.hh b/flower/include/flower-debug.hh
index b3855d15666d16262fe1fcb1ac5672411e7ec7fc..5c8138e94625e438c288302e3bdcd2908f6179c1 100644 (file)
--- a/flower/include/flower-debug.hh
+++ b/flower/include/flower-debug.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/fproto.hh b/flower/include/fproto.hh
index 5c491d61144622fccc6bafdfaf6a22c259ddb42f..96cbfc5db6ca640ac8a5e408626a1178ef562f11 100644 (file)
--- a/flower/include/fproto.hh
+++ b/flower/include/fproto.hh
@@ -17,6 +17,7 @@ typedef int i32;
 /// (i64)
 typedef long long I64;
 
 /// (i64)
 typedef long long I64;
 

+template<class T> struct Link_array;

 template<class T> struct Array;
 template<class T> struct sstack;
 template<class T,class K> struct Assoc;
 template<class T> struct Array;
 template<class T> struct sstack;
 template<class T,class K> struct Assoc;


@@ -35,6 +36,7 @@ template<class T> struct PQueue;
 #include "real.hh"
 
 typedef Interval_t<Real> Interval;
 #include "real.hh"
 
 typedef Interval_t<Real> Interval;

+typedef Interval_t<int> Slice;

 
 struct Choleski_decomposition;
 
 
 struct Choleski_decomposition;
 

diff --git a/flower/include/full-storage.hh b/flower/include/full-storage.hh
index 10438e3a7e8c01795e8b1a06a9c8ad86d4e21173..4d68e128288df554312db85a0556245e956bba05 100644 (file)
--- a/flower/include/full-storage.hh
+++ b/flower/include/full-storage.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/full-storage.icc b/flower/include/full-storage.icc
index a1b4c1bf41c2523afcb535b4d05804cfe123ec26..008f4169f5c5c58f4814679fe0571b641e7555a4 100644 (file)
--- a/flower/include/full-storage.icc
+++ b/flower/include/full-storage.icc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/international.hh b/flower/include/international.hh
index b14cc3bfaf432393991978921c77a9da74473570..730b9924e6e38511733763ef734f8aa63a155b86 100644 (file)
--- a/flower/include/international.hh
+++ b/flower/include/international.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 2d7488aeeffa8efcbe71b7fc0a92006888bc8f1f..f33bcb5aa06de2366420bc17a585306aa78771a7 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -171,12 +171,10 @@ Interval_t<T> operator *(Interval_t<T> i,T a){
   return a*i;
 }
 
   return a*i;
 }
 

+// again? see fproto.hh

 typedef Interval_t<Real> Interval;
 typedef Interval_t<Real> Interval;

-
-
+typedef Interval_t<int> Slice;

 
 
 #endif // INTERVAL_HH
 
 
 
 #endif // INTERVAL_HH
 

-
-

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 01dbbb169592e16778b15f213faf8218a07ba4c7..d6c93b48f2e136d73ef6d70700f081a2de5fae32 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/iterate.hh b/flower/include/iterate.hh
index 65b092d1d53d4c0637742da335d8fed8159d8aa8..d68226777fd8b2ee41f63bce0776a866fe212ebc 100644 (file)
--- a/flower/include/iterate.hh
+++ b/flower/include/iterate.hh
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
 
   source file of the flowerlib
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 2497910a2961e252372c3e524de119aa3f878814..051077b6e771620794a8083e302e721560468b92 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
 
   source file of the flowerlib
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/list.icc b/flower/include/list.icc
index 3f930f02b9f85230cab5fb82e3d6ef2917e8f0d8..7192c4d9f6749353ba2e52c1ad7fa22095a223a5 100644 (file)
--- a/flower/include/list.icc
+++ b/flower/include/list.icc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1996,1997
+  (c) 1996, 1997--1998

   Jan Nieuwenhuizen <jan@digicash.com>
   Han-Wen Nienhuys <hanwen@stack.nl>
 */
   Jan Nieuwenhuizen <jan@digicash.com>
   Han-Wen Nienhuys <hanwen@stack.nl>
 */

diff --git a/flower/include/list.tcc b/flower/include/list.tcc
index c5084dce05fbc47920481f1358cd9378b20ea50f..6cba5338489c2a78859a10e5359327ee15d2b9ea 100644 (file)
--- a/flower/include/list.tcc
+++ b/flower/include/list.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #ifndef LIST_CC
 #define LIST_CC
 */
 #ifndef LIST_CC
 #define LIST_CC

diff --git a/flower/include/matrix-storage.hh b/flower/include/matrix-storage.hh
index 7cb3f4c3d49d688a48b679fba7cb17a507075d92..581e6ee937f5659c897bedc6b8b9e3e33ebbaf1f 100644 (file)
--- a/flower/include/matrix-storage.hh
+++ b/flower/include/matrix-storage.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/matrix.hh b/flower/include/matrix.hh
index 660b2d776fd7b1b262dd30adab1c502878b14977..64ba718215d17eb38eb6cca4a7c27a7a6c830753 100644 (file)
--- a/flower/include/matrix.hh
+++ b/flower/include/matrix.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/nscalar.hh b/flower/include/nscalar.hh
index d1b361b70dccda5093dced7a86da174b5ae2ee24..774f2e7dc1221062edae664739890fcb75817f1a 100644 (file)
--- a/flower/include/nscalar.hh
+++ b/flower/include/nscalar.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index e1e597202030e8c61c118b6479fb7e0658bc05a1..c6caad2c2f0846e32efe2c494ebc74ad8ceccd70 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/path.hh b/flower/include/path.hh
deleted file mode 100644 (file)
index 74a2dfa..0000000
--- a/flower/include/path.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-  path.hh -- declare File_path
-
-  source file of the Flower Library
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#ifndef PATH_HH
-#define PATH_HH
-#include "string.hh"
-#include "varray.hh"
-
-
-/**    
-  search in directories for a file.
-
-   Abstraction of PATH variable. An interface for searching input files.
-   Search a number of dirs for a file.
-
-   TODO: add a unix style PATH interface 
-   Should use kpathsea?
-   
-*/
-
-class File_path : private Array<String>
-{
-public:
-  /// locate a file in the search path
-  String find (String nm) const;
-
-  /// add to end of path.
-  Array<String>::push;
-  void add (String str);
-  void parse_path (String);
-};
-
-/** split a path into its components.
-
-  @params path
-
-  @return
-  String &drive, String &dirs, String &filebase, String &extension
- */
-void split_path (String path, String &drive, String &dirs, String &filebase, String &extension);
-
-#endif

diff --git a/flower/include/plist.icc b/flower/include/plist.icc
index d81b322e48dac5e58461e86c6bffdcbf39dfeb7e..d149e8ebc83f97d05f99a2fd0bba64e66d7c8dad 100644 (file)
--- a/flower/include/plist.icc
+++ b/flower/include/plist.icc
@@ -1,7 +1,7 @@
 /* -*-c++-*-
   plist.icc -- part of flowerlib
 
 /* -*-c++-*-
   plist.icc -- part of flowerlib
 

-  (c) 1996,1997 Han-Wen Nienhuys& Jan Nieuwenhuizen
+  (c) 1996, 1997--1998 Han-Wen Nienhuys& Jan Nieuwenhuizen

 */
 
 #ifndef PLIST_INL
 */
 
 #ifndef PLIST_INL

diff --git a/flower/include/plist.tcc b/flower/include/plist.tcc
index ee6889faef313c15d492e52c30c165356df55243..794e0b0fc1f0a03faf180b2d60b9b7a015116acd 100644 (file)
--- a/flower/include/plist.tcc
+++ b/flower/include/plist.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/pointer.hh b/flower/include/pointer.hh
index cc8097c3600da122acc9d0352741cf13a35e4416..803af25ab91661bfd2dbf8c455894f3fabdb0fa0 100644 (file)
--- a/flower/include/pointer.hh
+++ b/flower/include/pointer.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/pointer.tcc b/flower/include/pointer.tcc
index 4ce1302189594ef71b71a3d3d0b09db7d8de9e42..4c82e7d27ed5e008c0ee1ffdd7e33feda612cce1 100644 (file)
--- a/flower/include/pointer.tcc
+++ b/flower/include/pointer.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/pqueue.hh b/flower/include/pqueue.hh
index cc352cb2da78ea7f4922dd657faed75c174e8cec..67726d47f1feb2ffa71195bb92350dc9021cd27d 100644 (file)
--- a/flower/include/pqueue.hh
+++ b/flower/include/pqueue.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/priorities.hh b/flower/include/priorities.hh
index 59949bd860cf483bc3d0adcb3bb933b17cddbb73..4b804ba275ab4b6ec60f571cd16e5ef37564bd20 100644 (file)
--- a/flower/include/priorities.hh
+++ b/flower/include/priorities.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 587a7f63f1612be4c912e90d57dacb5a4fb31b85..3c15f76c4f5749c4d9f4e23cf770daac0d9d573f 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 3b030c4cba429b9dbf14b396cc9d27c880343614..05e214ac16d0667379a62707678f4b5d13b6ea06 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/scalar.hh b/flower/include/scalar.hh
index 457c78af04f1ddc6a72b45e412939162f0dd2949..e8c58e684e06f106930f219865f8b9c492a4c52e 100644 (file)
--- a/flower/include/scalar.hh
+++ b/flower/include/scalar.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/string-data.hh b/flower/include/string-data.hh
index 0b71643e98aa11e6cb60699f89131b0b012080ca..7695bedde6c8c234be48cdff422aaf2cb19284a2 100644 (file)
--- a/flower/include/string-data.hh
+++ b/flower/include/string-data.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc
index 7d62f1ffcbd179642966095c0b9f68252252ff13..599b9d82a632b01bd62a2e24d16f50eeeaa972de 100644 (file)
--- a/flower/include/string-data.icc
+++ b/flower/include/string-data.icc
@@ -3,7 +3,7 @@
 
   source file of Flower lib
 
 
   source file of Flower lib
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef STRINGDATA_INL
 */
 
 #ifndef STRINGDATA_INL

diff --git a/flower/include/string-handle.hh b/flower/include/string-handle.hh
index ccd149b9cf7e6ec84d1d8e6f89e94194580e9058..08b957c51f9aae49bec85087077f51e463027849 100644 (file)
--- a/flower/include/string-handle.hh
+++ b/flower/include/string-handle.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/include/string-handle.icc b/flower/include/string-handle.icc
index 51db730a22eb8e93e17997a3978c03ffb79689c3..6f9d908f57d3c4dd5a569b1b66c5cba65aa04bfb 100644 (file)
--- a/flower/include/string-handle.icc
+++ b/flower/include/string-handle.icc
@@ -4,7 +4,7 @@
 
   source file of Flower lib
 
 
   source file of Flower lib
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef STRINGHANDLE_INL
 */
 
 #ifndef STRINGHANDLE_INL

diff --git a/flower/include/string.icc b/flower/include/string.icc
index 8a03288c04ef52f605975188fa13c9cdc3bee119..3bdbb0336e5ff3df41e64d07ae641aa5b6a0f590 100644 (file)
--- a/flower/include/string.icc
+++ b/flower/include/string.icc
@@ -3,7 +3,7 @@
   
   source file of the Flower Library
   
   
   source file of the Flower Library
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 278ed57190d2aef1dd23cc030cc96d6304e3ca79..2ce3d4056989ab9af030b5814f126b3be7d40727 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/interval.cc b/flower/interval.cc
index d4ca0f40f470117ffcf12b847b734a84bffd1516..2a71fea2327574039165014c90910f5aeebbb4d6 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -11,13 +11,10 @@
 #include "real.hh"
 #include "interval.tcc"
 
 #include "real.hh"
 #include "interval.tcc"
 

-
-template INTERVAL__INSTANTIATE(Real);
-
-
+template INTERVAL__INSTANTIATE (Real);

 
 Real
 
 Real

-Interval_t<Real>::infinity() 
+Interval_t<Real>::infinity () 

 {
   return HUGE_VAL;
 }
 {
   return HUGE_VAL;
 }


@@ -27,3 +24,18 @@ Interval_t<Real>::T_to_str (Real r)
 {
   return String (r);
 }
 {
   return String (r);
 }

+
+template INTERVAL__INSTANTIATE (int);
+
+int
+Interval_t<int>::infinity () 
+{
+  return INT_MAX;
+}
+
+String
+Interval_t<int>::T_to_str (int i)
+{
+  return String (i);
+}
+

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index f44b468e8520d502752ff5bc0408496a4cc5f31a..c7f1b4bd0851e8ab404b03db02e9f4bbcf0843ed 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -4,7 +4,7 @@
 
   source file of the flowerlib
 
 
   source file of the flowerlib
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include <stdarg.h>
 #include <stdio.h>
 */
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/flower/matrix-debug.cc b/flower/matrix-debug.cc
index 5a6149720c9cd4f56d0eafa28a41ef89914e056d..82080f2a6d8a560930ba15498a5ef22c4bbc99d1 100644 (file)
--- a/flower/matrix-debug.cc
+++ b/flower/matrix-debug.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/flower/matrix.cc b/flower/matrix.cc
index 09a7668a05af84a68a1a004b383087db718305e7..314447220a3ec3ff000205cc54f7df233c03cec4 100644 (file)
--- a/flower/matrix.cc
+++ b/flower/matrix.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "matrix.hh"
 */
 
 #include "matrix.hh"

diff --git a/flower/nscalar.cc b/flower/nscalar.cc
index c8b829dd152c98e778023a82a4b59424cd4d7804..75bbe6bad468109dbd2ff48d602cb6af17069e8a 100644 (file)
--- a/flower/nscalar.cc
+++ b/flower/nscalar.cc
@@ -3,6 +3,6 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 */
 

diff --git a/flower/offset.cc b/flower/offset.cc
index 3085f246b5a2d12f0e4a24249adb925f39bcf27f..d92c3af31ac0ccaf2ae8414d4d7084005224cdd4 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include <math.h>
 
 */
 #include <math.h>
 

diff --git a/flower/path.cc b/flower/path.cc
deleted file mode 100644 (file)
index b9ed1c5..0000000
--- a/flower/path.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-   path.cc - manipulation of paths and filenames.
-*/
-#include <stdio.h>
-#include "path.hh"
-#include "flower-debug.hh"
-
-#ifndef DIRSEP
-#define DIRSEP '/'
-#endif
-
-#ifndef PATHSEP
-#define PATHSEP ':'
-#endif
-
-/**
-   @param path the original full filename
-   @return 4 components of the path. They can be empty
-*/
-void
-split_path (String path,
-           String &drive, String &dirs, String &filebase, String &extension)
-{
-  // peel off components, one by one.
-  int di = path.index_i (':');
-  if (di >= 0)
-    {
-      drive = path.left_str (di + 1);
-      path = path.right_str (path.length_i () - di -1);
-    }
-  else
-    drive = "";
-
-  di = path.index_last_i (DIRSEP);
-  if (di >=0)
-    {
-      dirs = path.left_str (di + 1);
-      path = path.right_str (path.length_i ()-di -1);
-    }
-  else
-    dirs = "";
-
-  di = path.index_last_i ('.');
-  if (di >= 0)
-    {
-      filebase = path.left_str (di);
-      extension =path.right_str (path.length_i ()-di);
-    }
-  else
-    {
-      extension = "";
-      filebase = path;
-    }
-}
-
-void
-File_path::parse_path (String p)
-{
-  int l;
-  
-  while ( (l = p.length_i ()) )
-    {
-      int i = p.index_i(PATHSEP);
-      if (i <0) 
-       i = l;
-      add (p.left_str(i));
-      p = p.right_str (l- i - 1);
-    }
-}
-
-
-
-
-/** find a file.
-  It will search in the current dir, in the construction-arg, and
-  in any other added path, in this order.
-  */
-String
-File_path::find (String nm) const
-{
-  fdebug << _("looking for ") << nm << ": ";
-  if (!nm.length_i() || (nm == "-") )
-    return nm;
-  for (int i=0; i < size(); i++)
-    {
-      String path  = elem(i);
-      String sep (DIRSEP);
-      String right(path.right_str (1));
-      if (path.length_i () && right != sep)
-       path += DIRSEP;
-
-      path += nm;
-
-      fdebug << path << "? ";
-      FILE *f = fopen (path.ch_C(), "r"); // ugh!
-      if (f)
-       {
-         fdebug << _("found\n");
-         fclose (f);
-         return path;
-       }
-    }
-  fdebug << "\n";
-  return "";
-}
-
-void
-File_path::add (String s)
-{
-   push (s); 
-}

diff --git a/flower/rational.cc b/flower/rational.cc
index df18b4cbcd57cf5b0ecd2d8368d36d667e576698..a7b7d696c8b2d59860a1bc2259c15fcf1c9aa2b8 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -3,7 +3,7 @@
   
   source file of the Flower Library
 
   
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include <stdlib.h>
 #include "rational.hh"
 */
 #include <stdlib.h>
 #include "rational.hh"

diff --git a/flower/scalar.cc b/flower/scalar.cc
index 79bfd53d5f954eeeada0810c3462327e3bd6cc5e..bdd2452ad7b5216ac23afc71f617b621172bb491 100644 (file)
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
 
   source file of the Flower Library
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <assert.h>
 */
 
 #include <assert.h>

diff --git a/flower/string.cc b/flower/string.cc
index 65279ce0370549f4fef27267218f7bef051c067a..366abcd6bff7c95452a478ecb78ca9c33e1f7f99 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -2,7 +2,7 @@
 
  string.cc - implement String
  
 
  string.cc - implement String
  

- (c) 1997 Han-Wen Nienhuys & Jan Nieuwenhuizen
+ (c)  1997--1998 Han-Wen Nienhuys & Jan Nieuwenhuizen

 
  */
 
 
  */
 

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index f8332672f01c481e0c72ea99fd88b1d822a3c32f..f10adcb623915706ef93aa150515df4a8eb046ba 100644 (file)
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -6,7 +6,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl> */
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl> */

 
 #ifdef STRING_DEBUG 
 #define memmove mymemmove
 
 #ifdef STRING_DEBUG 
 #define memmove mymemmove

diff --git a/init/Makefile b/init/Makefile
index 1e846bdbbf4da6b926de9a859d9eb4feb6d64c01..25c1bd56a996e382eb44131364ce715883517300 100644 (file)
--- a/init/Makefile
+++ b/init/Makefile
@@ -9,14 +9,6 @@ include ./$(depth)/make/Include.make
 INIFILES = $(wildcard *.ly)
 DISTFILES = Makefile $(INIFILES)
 
 INIFILES = $(wildcard *.ly)
 DISTFILES = Makefile $(INIFILES)
 

-## we probably can make tex/*defs.tex and init/*.ly in one go...
-## moved to mf/Makefile
-FONT_FILES = $(wildcard $(depth)/mf/*[0-9].mf)
-TABLES = $(patsubst $(depth)/mf/%.mf,%.ly,$(FONT_FILES))
-
-localclean:
-       rm -f $(TABLES)
-

 INSTALLATION_DIR=$(datadir)/lilypond/
 INSTALLATION_FILES=$(INIFILES)
 
 INSTALLATION_DIR=$(datadir)/lilypond/
 INSTALLATION_FILES=$(INIFILES)
 

diff --git a/init/book-fragment.ly b/init/book-fragment.ly
new file mode 100644 (file)
index 0000000..f6789cf
--- /dev/null
+++ b/init/book-fragment.ly
@@ -0,0 +1,18 @@
+% Toplevel initialisation file. 
+       
+\version "0.1.9";
+
+
+\include "declarations.ly"
+
+\include "paper16.ly"
+
+\score { 
+  \melodic {
+    \maininput
+  }
+  \paper { \paper_sixteen
+    linewidth = -1.\cm;
+    castingalgorithm = \Wordwrap; 
+  }
+}

diff --git a/init/declarations.ly b/init/declarations.ly
new file mode 100644 (file)
index 0000000..76933ee
--- /dev/null
+++ b/init/declarations.ly
@@ -0,0 +1,31 @@
+
+  
+breve = \duration { -1 0 }
+longa = \duration { -2 0 }
+
+\include "dynamic.ly"
+\include "nederlands.ly"               % dutch
+\include "script.ly"
+
+
+Gourlay = 1.0
+Wordwrap = 0.0
+
+\include "paper20.ly"
+
+default_paper = \paper{
+       \paper_twenty
+}
+
+% ugh
+\include "midi.ly"
+
+% declarations for standard directions
+left = -1
+right = 1
+up = 1
+down = -1
+% zillie spellink?
+center=0
+
+\include "property.ly"

diff --git a/init/engraver.ly b/init/engraver.ly
index 1e16c2146b8a609d65df95b65503c48571a03396..14c8d745a848c5ee9a8ce8046a3336e4727c42c2 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -71,7 +71,7 @@ Thread = \translator {
        \consists "Tie_engraver";
 }
 
        \consists "Tie_engraver";
 }
 

-Grandstaff = \translator {
+Grand_staff = \translator {

        \type "Engraver_group_engraver";
 
        \consists "Span_bar_engraver";
        \type "Engraver_group_engraver";
 
        \consists "Span_bar_engraver";


@@ -91,7 +91,7 @@ Staff_group = \translator {
        \consists "Line_group_engraver";
        \accepts "Staff";
        \accepts "Rhythmic_staff";
        \consists "Line_group_engraver";
        \accepts "Staff";
        \accepts "Rhythmic_staff";

-       \accepts "Grandstaff";
+       \accepts "Grand_staff";

        \accepts "Lyrics";
 }
 
        \accepts "Lyrics";
 }
 


@@ -132,7 +132,7 @@ Score = \translator {
        \accepts "Staff";
        \accepts "Rhythmic_staff";      
        \accepts "Lyrics";
        \accepts "Staff";
        \accepts "Rhythmic_staff";      
        \accepts "Lyrics";

-       \accepts "Grandstaff";
+       \accepts "Grand_staff";

 }
 
 Stupid_score = \translator {
 }
 
 Stupid_score = \translator {

diff --git a/init/feta11.ly b/init/feta11.ly
deleted file mode 100644 (file)
index 404a216..0000000
--- a/init/feta11.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 95e17d1..0000000
--- a/init/feta13.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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
deleted file mode 100644 (file)
index a575a5c..0000000
--- a/init/feta16.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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
deleted file mode 100644 (file)
index b08510d..0000000
--- a/init/feta19.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 9e72e2a..0000000
--- a/init/feta20.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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
deleted file mode 100644 (file)
index d809738..0000000
--- a/init/feta23.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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
deleted file mode 100644 (file)
index c18ebdf..0000000
--- a/init/feta26.ly
+++ /dev/null
@@ -1,178 +0,0 @@
-% 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/init/lily-init.ly b/init/lily-init.ly
index 1fb4992c05c4fa66181d22626b77635d19fadc6f..22b5bffa6d393e65d3559b24c0a08a37c369e6d5 100644 (file)
--- a/init/lily-init.ly
+++ b/init/lily-init.ly
@@ -1,34 +1,8 @@
 % Toplevel initialisation file. 
        
 % Toplevel initialisation file. 
        

-\version "0.1.9";
-  
-breve = \duration { -1 0 }
-longa = \duration { -2 0 }
+\version "0.1.10";

 
 

-\include "dynamic.ly"
-\include "nederlands.ly"               % dutch
-\include "script.ly"

 
 

+\include "declarations.ly"

 
 

-Gourlay = 1.0
-Wordwrap = 0.0
-
-\include "paper16.ly"
-
-default_paper = \paper{
-       \paper_sixteen
-}
-
-% ugh
-\include "midi.ly"
-
-% declarations for standard directions
-left = -1
-right = 1
-up = 1
-down = -1
-% zillie spellink?
-center=0
-
-\include "property.ly"
-
+\maininput

diff --git a/init/no-tape.ly b/init/no-tape.ly
new file mode 100644 (file)
index 0000000..b38ed08
--- /dev/null
+++ b/init/no-tape.ly
@@ -0,0 +1,13 @@
+% Toplevel initialisation file. 
+       
+\version "0.1.10";
+
+
+\include "declarations.ly"
+
+\score { 
+  \melodic {
+    \maininput
+  }
+  \paper { }  
+}

diff --git a/init/paper16.ly b/init/paper16.ly
index 091048ee8a21350a6b257cc489d0071d4e9dc8f3..35b411d5d9609bcc6a125c2f57354ff521528134 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -39,7 +39,11 @@ paper_sixteen = \paper {
        interbeam = 3.14\pt;
 
        gourlay_energybound = 100000.;
        interbeam = 3.14\pt;
 
        gourlay_energybound = 100000.;

-       gourlay_maxmeasures = 14.;
+       %{
+       The following bounds the number of measures
+       on a line.  Decreasing it greatly reduces computation time
+       %}
+       gourlay_maxmeasures = 10.;

        castingalgorithm = \Gourlay;
        \symboltables { \table_sixteen }
        \include "engraver.ly"
        castingalgorithm = \Gourlay;
        \symboltables { \table_sixteen }
        \include "engraver.ly"

diff --git a/init/paper20.ly b/init/paper20.ly
index 2804010f1e8b688753203f97da2ec8d87e8431cc..eca46a73a46d5e630613e1de15df0483e462aa44 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -3,7 +3,7 @@
 \include "table20.ly"
 
 paper_twenty = \paper {
 \include "table20.ly"
 
 paper_twenty = \paper {

-       linewidth = 15.0 \cm;
+       linewidth = 17.0 \cm;

        indent = 12.\mm;
        rulethickness = 0.4\pt;
        barsize = 20.0 \pt;
        indent = 12.\mm;
        rulethickness = 0.4\pt;
        barsize = 20.0 \pt;


@@ -30,7 +30,7 @@ paper_twenty = \paper {
        interbeam = 3.90\pt;
 
        gourlay_energybound = 100000.;
        interbeam = 3.90\pt;
 
        gourlay_energybound = 100000.;

-       gourlay_maxmeasures = 12.;
+       gourlay_maxmeasures = 10.;

        
        castingalgorithm = \Gourlay;
        \symboltables { \table_twenty }
        
        castingalgorithm = \Gourlay;
        \symboltables { \table_twenty }

diff --git a/init/performer.ly b/init/performer.ly
index 90b3688412fcdf13a5aaafd4b40c13946ad2ae9e..7d7cd9f11342546053818236a2f81610526d12ae 100644 (file)
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -21,7 +21,7 @@ Voice = \translator
        \accepts Thread;
 }
 
        \accepts Thread;
 }
 

-Grandstaff = \translator
+Grand_staff = \translator

 {
        \type "Performer_group_performer";
        \accepts Staff;
 {
        \type "Performer_group_performer";
        \accepts Staff;


@@ -49,7 +49,7 @@ Score = \translator {
        \type "Score_performer";
        instrument = piano;
        \accepts Staff;
        \type "Score_performer";
        instrument = piano;
        \accepts Staff;

-       \accepts Grandstaff;
+       \accepts Grand_staff;

        \accepts Lyrics; 
        \accepts Staff_group;
        \consists "Swallow_performer";
        \accepts Lyrics; 
        \accepts Staff_group;
        \consists "Swallow_performer";

diff --git a/input/bugs/a.ly b/input/bugs/a.ly
index 2706aa128d38d4af0b12d1079145ebcdff036b43..1c1d75b1571820a326f756b600be42df84fa6843 100644 (file)
--- a/input/bugs/a.ly
+++ b/input/bugs/a.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 shortlong = \melodic{
        \octave c';
 
 shortlong = \melodic{
        \octave c';

diff --git a/input/bugs/stem-length.ly b/input/bugs/stem-length.ly
new file mode 100644 (file)
index 0000000..e4cb944
--- /dev/null
+++ b/input/bugs/stem-length.ly
@@ -0,0 +1,7 @@
+\score{
+       \melodic{
+               \octave c';
+               [a'16 a']
+               [c16 c]
+       }
+}

diff --git a/input/cadenza.ly b/input/cadenza.ly
index e05e2b6ad8ed4b46202597e2dfe82f96aa834b3e..54abee9d043b410edfcb63e12c0f88fc549abebf 100644 (file)
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -13,7 +13,7 @@ Tested Features: cadenza mode
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 
 cad = \melodic  {
 
 
 cad = \melodic  {


@@ -21,7 +21,6 @@ cad = \melodic  {
        \type Staff {
        \cadenza 1;
        \grouping 1*4;
        \type Staff {
        \cadenza 1;
        \grouping 1*4;

-       \duration  8;

        \octave c';
 
        \clef "violin";
        \octave c';
 
        \clef "violin";


@@ -33,30 +32,29 @@ cad = \melodic  {
                \bar "empty";
                        c [c_"rubato" e g c']
        \octave c'';
                \bar "empty";
                        c [c_"rubato" e g c']
        \octave c'';

-       e4. e [g () f_"rit" e d]
+       e4. e8 [g () f_"rit" e d]

 
 

-       \duration 16;

        dis4() e4
                \bar "" ;
        dis4() e4
                \bar "" ;

-               r8 [c d] [e f g gis]
-       \duration 4;
-       a-> 'f() 'e g
+               r8 [c16 d] [e f g gis]
+
+       a4-> 'f() 'e g

        f-> 'd() 'cis e
        f-> 'd() 'cis e

-       \duration 8;    
+

        d4^\fermata
                \bar "" ;
 
        r8 'a ['b cis]
        d4^\fermata
                \bar "" ;
 
        r8 'a ['b cis]

-       \duration 16;   [d cis d e]
-       f4() [f e d c]
+       [d16 cis d e]
+       f4() [f16 e d c]

        'b4-\turn
        \octave c'; [2/3 d'8 c'8 a8]1/1
        g2
                \bar "" ;
        'b4-\turn
        \octave c'; [2/3 d'8 c'8 a8]1/1
        g2
                \bar "" ;

-       [g c e g] [c' e g c']\octave c''; 
+       [g16 c e g] [c' e g c']\octave c''; 

        [e 'g c e] g4^\fermata 
                \bar "" ;
        [e 'g c e] g4^\fermata 
                \bar "" ;

-       [g8.(_"a tempo" e g8. )e]
+       [g8.(_"a tempo" e16 g8. )e16]

        a4. g8 [f8 e8 d8 c8]
        'g2 d2-\trill
        c4
        a4. g8 [f8 e8 d8 c8]
        'g2 d2-\trill
        c4

diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index 317c4e9953206d2eda212af8558a1a9bccad9a0c..656491bab3e17ceb7e701bdaaec85c6abaf48571 100644 (file)
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -16,7 +16,7 @@ TestedFeatures:
 % (maybe even sooner :-)
 %
 
 % (maybe even sooner :-)
 %
 

-\version "0.1.8";
+\version "0.1.10";

 
 alto1 = \melodic{
        \meter 4/4; 
 
 alto1 = \melodic{
        \meter 4/4; 

diff --git a/input/keys.ly b/input/keys.ly
index fc17241fbd4d4ef6012acafbad6a1ce664a40e82..5ea9c767f71ce270a8cd2684bd4cf20d46f07be2 100644 (file)
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -1,8 +1,7 @@
-\version "0.1.9";
+\version "0.1.10";

 
 
 blah = \melodic{
 
 
 blah = \melodic{

-       \duration "last";

        \meter 4/4;
        \octave c';
        \key bes es as;
        \meter 4/4;
        \octave c';
        \key bes es as;

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index f011d7bf27b6575fb513516661f965021935c689..e3cac3ecf205eb7195ca7c0897708ae51032a2e7 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -11,7 +11,7 @@ copyright =    "public domain";
 Tested Features: example file with comments
 
 %}
 Tested Features: example file with comments
 
 %}

-\version "0.1.9";
+\version "0.1.10";

 
 
 % the % is a comment.
 
 
 % the % is a comment.


@@ -59,7 +59,7 @@ begeleiding = \melodic{
 }
 
 \score{
 }
 
 \score{

-       \melodic \type Grandstaff <
+       \melodic \type Grand_staff <

                \melodie
                \begeleiding 
        >
                \melodie
                \begeleiding 
        >

diff --git a/input/multi.ly b/input/multi.ly
index 5bfcd1038bac128a1785d37ea5d35b7eaebc2897..27542ccc8b02e02b29b362581497926d18cb951d 100644 (file)
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -11,7 +11,7 @@ Tested Features: \multi
 WARNING: the \multi construct is not very intuitive.  You better try
 the
 
 WARNING: the \multi construct is not very intuitive.  You better try
 the
 

-       \type Grandstaff <
+       \type Grand_staff <

                \type Staff = treble {.. }
                \type Staff = bass {.. }
        >               
                \type Staff = treble {.. }
                \type Staff = bass {.. }
        >               


@@ -21,7 +21,7 @@ construct to get multiple staffs, it's cleaner
 %}
 
 
 %}
 
 

-\version "0.1.9";
+\version "0.1.10";

 
 \score{
        \melodic 
 
 \score{
        \melodic 

diff --git a/input/pedal.ly b/input/pedal.ly
index d82a03e7102d027e36a5ce2b22ff0b6214fe2882..41affb55f2e103659cd7fdb77c54db50f531d097 100644 (file)
--- a/input/pedal.ly
+++ b/input/pedal.ly
@@ -24,7 +24,7 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 

-\version "0.1.9";
+\version "0.1.10";

 
 \score{
                \melodic {
 
 \score{
                \melodic {

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 2b05688939cbdf532f3f2ca111ad2e5532b5ff5f..0b4525b396f4412961e3e6e2f4bb62a8dd56f469 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -19,7 +19,7 @@
    * organ staff...
 %}
 
    * organ staff...
 %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 noShift = { \property Voice.hshift = 0 }
 Shift = { \property Voice.hshift = 1 }
 
 noShift = { \property Voice.hshift = 0 }
 Shift = { \property Voice.hshift = 1 }


@@ -167,7 +167,7 @@ breakmusic = \melodic {
 % these should be two separate scores...
 \score{
   \type Score <
 % these should be two separate scores...
 \score{
   \type Score <

-    \type Grandstaff <
+    \type Grand_staff <

       \type Staff = treble {
         \praeludium_right \breakmusic \fuga2_right }
       \type Staff = bass { 
       \type Staff = treble {
         \praeludium_right \breakmusic \fuga2_right }
       \type Staff = bass { 

diff --git a/input/rhythm.ly b/input/rhythm.ly
index a0f28fb15bf362f60161aafc15e4fce83ce87227..2ceedaa4f9350d63d303ed0b57fa54254731e156 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,7 +7,7 @@ TestedFeatures =         "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
 
 
 

-\version "0.1.9";
+\version "0.1.10";

 
 ritme = \melodic{ %\octave ;
        \partial 8;
 
 ritme = \melodic{ %\octave ;
        \partial 8;


@@ -74,7 +74,7 @@ yanother =
        \accepts "Staff_group";
        \accepts "Staff";
        \accepts "Lyrics";
        \accepts "Staff_group";
        \accepts "Staff";
        \accepts "Lyrics";

-       \accepts "Grandstaff";
+       \accepts "Grand_staff";

 }
 
 Rhythmic_staff = \translator
 }
 
 Rhythmic_staff = \translator

diff --git a/input/scales.ly b/input/scales.ly
index 793e2205859eeb09a4d6e62ac820a0241053d39c..3e3ad7de7f9b1078ec121297cb8e4af5b65c249d 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 % scales with accents.
 %
 
 % scales with accents.
 %
 

-\version "0.1.9";
+\version "0.1.10";

 blah =         \melodic {
                \meter 6/8;     
                \octave  'c ;
 blah =         \melodic {
                \meter 6/8;     
                \octave  'c ;

diff --git a/input/scripts.ly b/input/scripts.ly
index 042ec2216f80bcc2bb5436fc7b26ecc95d727b8f..19c6751e26c2f8f2cf7dacab569a1634248309d9 100644 (file)
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -1,10 +1,10 @@
        
        

-\version "0.1.9";
+\version "0.1.10";

 
 
 blah =         \melodic {
        \octave c';
 
 
 blah =         \melodic {
        \octave c';

-       'c ->-.-\fermata-"text"
+       'c4 ->-.-\fermata-"text"

        c ->-.-\fermata-"text"
        c' ->-.-\fermata-"text"
        c'' ->-.-\fermata-"text"
        c ->-.-\fermata-"text"
        c' ->-.-\fermata-"text"
        c'' ->-.-\fermata-"text"


@@ -45,9 +45,8 @@ blah =        \melodic {
        \stemboth
 
       \meter 4/4;
        \stemboth
 
       \meter 4/4;

-       \duration  8;

        \octave c';
        \octave c';

-       [c \< d e \! f][d' \> e' f' \! g'] 
+       [c8 \< d e \! f][d' \> e' f' \! g'] 

        [c-> \< d-> e-> \! f->][d'-> \> e'-> f'-> \! g'->] 
        [c-^ \< d-^ e-^ \! f-^][d'-^ \> e'-^ f'-^ \! g'-^] 
        [c-. \< d-. e-. \! f-.][d'-. \> e'-. f'-. \! g'-.]
        [c-> \< d-> e-> \! f->][d'-> \> e'-> f'-> \! g'->] 
        [c-^ \< d-^ e-^ \! f-^][d'-^ \> e'-^ f'-^ \! g'-^] 
        [c-. \< d-. e-. \! f-.][d'-. \> e'-. f'-. \! g'-.]

diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly
new file mode 100644 (file)
index 0000000..0f6a295
--- /dev/null
+++ b/input/test/beam-chord.ly
@@ -0,0 +1,17 @@
+\score{
+       \melodic{
+               \property Score.beamquantisation = \none
+
+               \octave c';
+               [a'8 <a' g'']>
+               [c <c 'e]>
+               [a'16 <a' g'']>
+               [c <c 'e]>
+               [a'32 <a' g'']>
+               [c <c 'e]>
+       }
+       \paper{
+               castingalgorithm = \Wordwrap;
+               linewidth = 60.0\mm;
+       }
+}

diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
new file mode 100644 (file)
index 0000000..74367dc
--- /dev/null
+++ b/input/test/beam-pos.ly
@@ -0,0 +1,13 @@
+\score{
+       \melodic{
+               \property Score.beamquantisation = 3 % TEST
+               \octave c';
+               [c8 c] [c c] [c c] [c c]
+               [a'8 a'] [a' a'] [a' a'] [a' a']
+       }
+       \paper{
+               castingalgorithm = \Wordwrap;
+               linewidth = 60.0\mm;
+       }
+}
+

diff --git a/input/test/beams.ly b/input/test/beams.ly
index 953bd7c02ab8914d2a4a2e923a9a562f1ff47b6f..ff1f127511bb347edf45a89383db73b1c1bb75a6 100644 (file)
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -1,4 +1,3 @@
-

 \header{
 filename =      "beams.ly";
 composer =      "heu";
 \header{
 filename =      "beams.ly";
 composer =      "heu";


@@ -7,90 +6,68 @@ copyright =    "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
 
 TestedFeatures =        "beams and beamflags";
 }

-\version "0.1.9";
+\version "0.1.10";

 
 \score{
 
 \score{

-       \melodic { \multi 3 < 
-               { \octave c'; 
+       <
+%              \property Score.beamquantisation = \none
+               \type Grand_staff < 
+               \melodic { 
+                       \octave c'; 

                        \meter 8/4;
                        \meter 8/4;

-                       \duration8;
-                       \stemup [c c'' a' f']
-                       \duration16;
-                       \stemup [c c'' a' f']
-                       \duration32;
-                       \stemup [c c'' a' f']
-                       \duration64;
-                       \stemup [c c'' a' f']
-                       \duration128;
-                       \stemup [c c'' a' f']
+                       \stemup [c8 c'' a' f']
+                       \stemup [c16 c'' a' f']
+                       \stemup [c32 c'' a' f']
+                       \stemup [c64 c'' a' f']
+                       \stemup [c128 c'' a' f']

                        r32
 
                        r32
 

-                       \duration 8;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 16;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 32;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 64;
-                       \stemup ['g 'g 'g 'g]
-                       \duration 128;
-                       \stemup ['g 'g 'g 'g]
+                       \stemup [g8 g g g]
+                       \stemup [g16 g g g]
+                       \stemup [g32 g g g]
+                       \stemup [g64 g g g]
+                       \stemup [g128 g g g]

                        r32
                        r32

+
+                       \octave c;
+                       \stemboth;
+                       [c'8 c'] [b b] [a a] [g g] [f f] [e e]
+                       [c'16 c'] [b b] [a a] [g g]  [f f] [e e]
+                       [c'32 c'] [b b] [a a] [g g] [f f] [e e]
+                       [c'64 c'] [e e]

                }
                }

-       
-       { \octave c';  
+       >
+       <       
+               \melodic { 
+                       \octave c';  

                        \meter 8/4;
                        \meter 8/4;

-                       \duration8;
-                       \stemdown [a' 'a c e]
-                       \duration16;
-                       \stemdown [a' 'a c e]
-                       \duration32;
-                       \stemdown [a' 'a c e]
-                       \duration64;
-                       \stemdown [a' 'a c e]
-                       \duration128;
-                       \stemdown [a' 'a c e]
+                       \stemdown [a'8 'a c e]
+                       \stemdown [a'16 'a c e]
+                       \stemdown [a'32 'a c e]
+                       \stemdown [a'64 'a c e]
+                       \stemdown [a'128 'a c e]

                        r32
 
                        \octave c;
                        r32
 
                        \octave c;

-                       \duration 8;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 16;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 32;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 64;
-                       \stemdown [d'' d'' d'' d'']
-                       \duration 128;
-                       \stemdown [d'' d'' d'' d'']
+                       \stemdown [d''8 d'' d'' d'']
+                       \stemdown [d''16 d'' d'' d'']
+                       \stemdown [d''32 d'' d'' d'']
+                       \stemdown [d''64 d'' d'' d'']
+                       \stemdown [d''128 d'' d'' d'']

                        r32
 
                        r32
 

-               } >
-               
-               {\duration "last";
-                       % ugh, "duration mode"
-                       
-                       [g8 g] [a a] [b b] [c' c']
-                       
-                       [g16 g ] [a a] [b b] [c' c']
-                       [g32 g] [a a] [b b] [c' c']
-                       
-                       [g64 g ] [c' c' ]
-               }
-               {
-                       \transpose d {
-                       \octave c''';
-                       | [g8 g] [a a] [b b] [c' c']
-                       [g16 g ] [a a] [b b] [c' c']
-                       [g32 g] [a a] [b b] [c' c']
-                       [g64 g]
-                       [c' c']
-                       }
+                       \octave c'';
+                       \stemboth;
+                       [a8 a] [b b] [c' c'] [d' d'] [e' e'] [f' f']
+                       [a16 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
+                       [a32 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
+                       [a64 a] [f' f'] 

                }
                }

-       }
+       >
+       >
+

        \paper{
        \paper{

-               gourlay_maxmeasures = 1.;
+               castingalgorithm = \Wordwrap;

        }
 }
 
        }
 }
 

-

diff --git a/input/test/broken.ly b/input/test/broken.ly
index 23333057a24b93e1dbfb9907fc7ba175f1ddb7df..17a90a08b279b6591f0ec4844ffbed703b81a68f 100644 (file)
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 shortlong = \melodic{
        c4()c( c c  |
 
 shortlong = \melodic{
        c4()c( c c  |

diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index 475f2e238b2019ad4676120b206072426d58eedd..ba1be97c6cddd4241aeaa2d564f7b447a0204a2f 100644 (file)
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,7 +5,7 @@ enteredby =      "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }

-\version "0.1.9";
+\version "0.1.10";

 
 
 
 
 
 

diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index b4aa56da1396332df8ae57e20c476fe20143b82a..f870302100282f86793f6d92bcce6d3724580d89 100644 (file)
--- a/input/test/denneboom.ly
+++ b/input/test/denneboom.ly
@@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes";
 
 \include "paper20.ly"
 
 
 \include "paper20.ly"
 

-\version "0.1.9";
+\version "0.1.10";

 
 oden = \lyric{ 
        O8 |
 
 oden = \lyric{ 
        O8 |

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 19e7078057d0ee17cdcae6c881c916e7910f9c5f..b2b222c3415b4085ed21f513414fc1d4fec24fa8 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,4 +1,4 @@
-\version "0.1.9";
+\version "0.1.10";

 FontBody=      \melodic{ 
                \octave c';
                \bar "|:";
 FontBody=      \melodic{ 
                \octave c';
                \bar "|:";

diff --git a/input/test/font.ly b/input/test/font.ly
index 0e92c3145d471483e8d24ea66caf6154c4b805ca..6ae34c8633449c49f8279693c76c18311537e965 100644 (file)
--- a/input/test/font.ly
+++ b/input/test/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "font-body.ly"
 \score{
 
 \include "font-body.ly"
 \score{

diff --git a/input/test/font16.ly b/input/test/font16.ly
index 9ba966fdf2b476cd4c16497a9de0a4864c89a600..1507d2c66e540e6ff919c75fb807eb0b8dbb3f49 100644 (file)
--- a/input/test/font16.ly
+++ b/input/test/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 \include "font-body.ly"
 
 \score{
 \include "font-body.ly"
 
 \score{

diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index 4e55085818d77f891ee2163a9e713cb5bea35b3a..f57627fde544a7a9fba2e3d3e5e0613f46224be7 100644 (file)
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -4,7 +4,7 @@ copyright =      "PD";
 TestedFeatures =        "This file tests some nasty Gourlay spacings";
 }
 
 TestedFeatures =        "This file tests some nasty Gourlay spacings";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 %{
 
 
 %{
 

diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 116aa60db0b0a53100d6f59388b3e6395cb4cd79..3026613cae0e5b11119a9ded343b86dbe655dce4 100644 (file)
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 shortlong = \melodic{
        c4()c( c c  |
 
 shortlong = \melodic{
        c4()c( c c  |

diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index 3d45dea955525af4d161e5f77b68b8bcea8d3085..6663ffdffab3aab43644d081a180a4f23e6957a4 100644 (file)
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,5 +1,5 @@
 
 

-\version "0.1.9";
+\version "0.1.10";

 
 \score{
        \melodic{\octave c';
 
 \score{
        \melodic{\octave c';

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 0c8729b41c2ccfec7db60d1e61a7761522b7ad9b..710df30c48583e3e9a504b4ec726f05f6a1e51eb 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
 TestedFeatures =        "This file tests various spacings";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 multipart = \melodic{ 
     \multi 3 < 
 
 multipart = \melodic{ 
     \multi 3 < 

diff --git a/input/test/stem.ly b/input/test/stem.ly
index 7bf1a4f42fdf8962303474ee2cd381289bfa8205..8cd604af5f90380bf4f4bff247fed997c8d805ca 100644 (file)
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
        
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 beamintervals = \melodic{
                \meter 7/4;
 
 beamintervals = \melodic{
                \meter 7/4;

diff --git a/input/test/tie.ly b/input/test/tie.ly
new file mode 100644 (file)
index 0000000..2018b00
--- /dev/null
+++ b/input/test/tie.ly
@@ -0,0 +1,18 @@
+tie = \melodic{
+       \octave c'';
+       e4 ~ e e e ~ |
+       e ~ a a a ~ |
+       a d d d ~ |
+       e e e e |
+       ''g ''g ''g ''g ~ |
+       ''g ''g ''g ''g |
+}
+
+\score{
+       \tie
+       \paper{ 
+             indent = 0.0\pt;
+               linewidth= 30.\mm;
+               castingalgorithm = \Wordwrap;
+       }
+}

diff --git a/input/tril.ly b/input/tril.ly
index 6f2639d8b32020d2fe25a0968792fcba60971827..6e9c55bf2f722d4710f70092deef1d89a61b86a4 100644 (file)
--- a/input/tril.ly
+++ b/input/tril.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests trills"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \score{
        \melodic{ 
 
 \score{
        \melodic{ 

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 0984052f5308ac5b654a00ee4df41827cd3fded1..fb57977c30ca7add15e976ab9fe7ae1795483996 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 Tested Features                lyrics and chords
 %}
 
 Tested Features                lyrics and chords
 %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 melodie = \melodic {
         \clef"violin";
 
 melodie = \melodic {
         \clef"violin";

diff --git a/input/twinkle.ly b/input/twinkle.ly
index afefc91a2e315a400bda64cb33f91499bfc83778..17d3515621b7a165bc1e3ad8fbea8e92e87d0cd8 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 melody = \melodic{
        \clef violin;
 
 melody = \melodic{
        \clef violin;


@@ -36,7 +36,6 @@ melody = \melodic{
 accompany = \melodic {
        \clef "bass";
        \octave 'c;
 accompany = \melodic {
        \clef "bass";
        \octave 'c;

-       \duration 4;

        c4 c' | e' c' | f' c' | e' c' | 
        d' b | c' a | f g | c2 | 
 
        c4 c' | e' c' | f' c' | e' c' | 
        d' b | c' a | f g | c2 | 
 

diff --git a/lib/binary-source-file.cc b/lib/binary-source-file.cc
index 75d7ce24caf011d2b2f619f5c620fa0696300d1b..971d4d0c21dfc58d63bf9cc5bfda6608d7132ae3 100644 (file)
--- a/lib/binary-source-file.cc
+++ b/lib/binary-source-file.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen
+  (c)  1997--1998 Jan Nieuwenhuizen

 */
 
 
 */
 
 

diff --git a/lib/duration-convert.cc b/lib/duration-convert.cc
index 5947216cd5d673ac6fcedd83a903258b7839d54b..1fc42aa3becccc27e5eb6ecd7969677e8340f2c1 100644 (file)
--- a/lib/duration-convert.cc
+++ b/lib/duration-convert.cc
@@ -3,11 +3,12 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

           Jan Nieuwenhuizen <jan@digicash.com>
 */
 #include <assert.h>
 #include "duration-convert.hh"
           Jan Nieuwenhuizen <jan@digicash.com>
 */
 #include <assert.h>
 #include "duration-convert.hh"

+#include "duration-iter.hh"

 #include "warn.hh"
 
 // statics Duration_convert
 #include "warn.hh"
 
 // statics Duration_convert


@@ -198,110 +199,3 @@ Duration_convert::ticks2standardised_dur (int ticks_i)
   Duration dur = mom2standardised_dur (mom);
   return dur;
 }
   Duration dur = mom2standardised_dur (mom);
   return dur;
 }

-
-Duration_iterator::Duration_iterator ()
-{
-  cursor_dur_.durlog_i_ = 7;
-  if (Duration_convert::no_smaller_than_i_s)
-    cursor_dur_.durlog_i_ = Duration_convert::no_smaller_than_i_s;
-}
-
-Duration 
-Duration_iterator::operator ++(int)
-{
-  return forward_dur ();
-}
-
-Duration
-Duration_iterator::operator ()()
-{
-  return dur ();
-}
-
-Duration_iterator::operator bool ()
-{
-  return ok ();
-}
-
-Duration
-Duration_iterator::dur ()
-{
-  return cursor_dur_;
-}
-
-Duration
-Duration_iterator::forward_dur ()
-{
-  /* should do smart table? guessing: 
-     duration wholes
-     16        0.0625
-     32..      0.0703
-     8:2/3     0.0833
-     16.       0.0938
-     8 0.1250
-     16..      0.1406
-     4:2/3     0.1667
-     8.        0.1875
-               
-     */
-  assert (ok ());
-
-  Duration dur = cursor_dur_;
-
-  if (!cursor_dur_.dots_i_ && !cursor_dur_.plet_b ()) 
-    {
-      cursor_dur_.durlog_i_ += 1;
-      cursor_dur_.dots_i_ = 2;
-    }
-  else if (cursor_dur_.dots_i_ == 2) 
-    {
-      assert (!cursor_dur_.plet_b ());
-      cursor_dur_.dots_i_ = 0;
-      cursor_dur_.durlog_i_ -=2;
-      cursor_dur_.set_plet (2, 3);
-    }
-  else if (cursor_dur_.plet_b () 
-          && (cursor_dur_.plet_.iso_i_ == 2)
-          && (cursor_dur_.plet_.type_i_ == 3)) 
-    {
-      assert (!cursor_dur_.dots_i_);
-      cursor_dur_.set_plet (1, 1);
-      cursor_dur_.durlog_i_ += 1;
-      cursor_dur_.dots_i_ = 1;
-    }
-  else if (cursor_dur_.dots_i_ == 1) 
-    {
-      assert (!cursor_dur_.plet_b ());
-      cursor_dur_.dots_i_ = 0;
-      cursor_dur_.durlog_i_ -= 1;
-    }
-               
-  if (Duration_convert::no_triplets_b_s
-      && cursor_dur_.plet_b () && ok ())
-    forward_dur ();
-  if (Duration_convert::no_double_dots_b_s 
-      && (cursor_dur_.dots_i_ == 2) && ok ())
-    forward_dur ();
-  if (Duration_convert::no_smaller_than_i_s
-      && (cursor_dur_.durlog_i_ > Duration_convert::no_smaller_than_i_s) && ok ())
-    forward_dur ();
-  if (Duration_convert::no_smaller_than_i_s
-      && cursor_dur_.dots_i_
-      && (cursor_dur_.durlog_i_ >= Duration_convert::no_smaller_than_i_s)
-      && ok ())
-    forward_dur ();
-  if (Duration_convert::no_smaller_than_i_s
-      && (cursor_dur_.dots_i_ == 2)
-      && (cursor_dur_.durlog_i_ >= Duration_convert::no_smaller_than_i_s / 2)
-      && ok ())
-    forward_dur ();
-
-  return dur;
-}
-
-bool
-Duration_iterator::ok ()
-{
-  return (cursor_dur_.durlog_i_ 
-         && !((cursor_dur_.durlog_i_ == 0) && (cursor_dur_.dots_i_ > 2)));
-}

diff --git a/lib/duration-iter.cc b/lib/duration-iter.cc
new file mode 100644 (file)
index 0000000..b1af3fd
--- /dev/null
+++ b/lib/duration-iter.cc
@@ -0,0 +1,119 @@
+/*
+  duration-convert.cc -- implement Duration_convert
+
+  source file of the LilyPond music typesetter
+
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+          Jan Nieuwenhuizen <jan@digicash.com>
+*/
+#include <assert.h>
+#include "duration-convert.hh"
+#include "warn.hh"
+#include "duration-iter.hh"
+
+Duration_iterator::Duration_iterator ()
+{
+  cursor_dur_.durlog_i_ = 7;
+  if (Duration_convert::no_smaller_than_i_s)
+    cursor_dur_.durlog_i_ = Duration_convert::no_smaller_than_i_s;
+}
+
+Duration 
+Duration_iterator::operator ++(int)
+{
+  return forward_dur ();
+}
+
+Duration
+Duration_iterator::operator ()()
+{
+  return dur ();
+}
+
+Duration_iterator::operator bool ()
+{
+  return ok ();
+}
+
+Duration
+Duration_iterator::dur ()
+{
+  return cursor_dur_;
+}
+
+Duration
+Duration_iterator::forward_dur ()
+{
+  /* should do smart table? guessing: 
+     duration wholes
+     16        0.0625
+     32..      0.0703
+     8:2/3     0.0833
+     16.       0.0938
+     8 0.1250
+     16..      0.1406
+     4:2/3     0.1667
+     8.        0.1875
+               
+     */
+  assert (ok ());
+
+  Duration dur = cursor_dur_;
+
+  if (!cursor_dur_.dots_i_ && !cursor_dur_.plet_b ()) 
+    {
+      cursor_dur_.durlog_i_ += 1;
+      cursor_dur_.dots_i_ = 2;
+    }
+  else if (cursor_dur_.dots_i_ == 2) 
+    {
+      assert (!cursor_dur_.plet_b ());
+      cursor_dur_.dots_i_ = 0;
+      cursor_dur_.durlog_i_ -=2;
+      cursor_dur_.set_plet (2, 3);
+    }
+  else if (cursor_dur_.plet_b () 
+          && (cursor_dur_.plet_.iso_i_ == 2)
+          && (cursor_dur_.plet_.type_i_ == 3)) 
+    {
+      assert (!cursor_dur_.dots_i_);
+      cursor_dur_.set_plet (1, 1);
+      cursor_dur_.durlog_i_ += 1;
+      cursor_dur_.dots_i_ = 1;
+    }
+  else if (cursor_dur_.dots_i_ == 1) 
+    {
+      assert (!cursor_dur_.plet_b ());
+      cursor_dur_.dots_i_ = 0;
+      cursor_dur_.durlog_i_ -= 1;
+    }
+               
+  if (Duration_convert::no_triplets_b_s
+      && cursor_dur_.plet_b () && ok ())
+    forward_dur ();
+  if (Duration_convert::no_double_dots_b_s 
+      && (cursor_dur_.dots_i_ == 2) && ok ())
+    forward_dur ();
+  if (Duration_convert::no_smaller_than_i_s
+      && (cursor_dur_.durlog_i_ > Duration_convert::no_smaller_than_i_s) && ok ())
+    forward_dur ();
+  if (Duration_convert::no_smaller_than_i_s
+      && cursor_dur_.dots_i_
+      && (cursor_dur_.durlog_i_ >= Duration_convert::no_smaller_than_i_s)
+      && ok ())
+    forward_dur ();
+  if (Duration_convert::no_smaller_than_i_s
+      && (cursor_dur_.dots_i_ == 2)
+      && (cursor_dur_.durlog_i_ >= Duration_convert::no_smaller_than_i_s / 2)
+      && ok ())
+    forward_dur ();
+
+  return dur;
+}
+
+bool
+Duration_iterator::ok ()
+{
+  return (cursor_dur_.durlog_i_ 
+         && !((cursor_dur_.durlog_i_ == 0) && (cursor_dur_.dots_i_ > 2)));
+}

diff --git a/lib/duration.cc b/lib/duration.cc
index eca46dd12bdb212c4c72176e0be4e24614127634..95e056b7899cca83be869eed18079f5f72b14a89 100644 (file)
--- a/lib/duration.cc
+++ b/lib/duration.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

            Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
            Han-Wen Nienhuys <hanwen@stack.nl>
 */
 


@@ -16,6 +16,7 @@
 #include "moment.hh"
 #include "duration.hh"
 #include "duration-convert.hh"
 #include "moment.hh"
 #include "duration.hh"
 #include "duration-convert.hh"

+#include "duration-iter.hh"

 
 // statics Duration
 int Duration::division_1_i_s = 384 * 4;
 
 // statics Duration
 int Duration::division_1_i_s = 384 * 4;


@@ -52,12 +53,14 @@ Duration::set_plet (int i, int t)
   plet_.type_i_ = t;
 }
 
   plet_.type_i_ = t;
 }
 

+/*

 void
 Duration::set_plet (Duration d)
 {
   plet_.iso_i_ = d.plet_.iso_i_; 
   plet_.type_i_ = d.plet_.type_i_;
 }
 void
 Duration::set_plet (Duration d)
 {
   plet_.iso_i_ = d.plet_.iso_i_; 
   plet_.type_i_ = d.plet_.type_i_;
 }

+*/

 
 void
 Duration::set_ticks (int ticks_i)
 
 void
 Duration::set_ticks (int ticks_i)

diff --git a/lib/include/duration-convert.hh b/lib/include/duration-convert.hh
index 747363832308284d3ec2f7fc5907f4acde17774d..82e102d4c89577474cfb4c5fbd3d19c934961043 100644 (file)
--- a/lib/include/duration-convert.hh
+++ b/lib/include/duration-convert.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -32,81 +32,52 @@
 */
 struct Duration_convert {
        
 */
 struct Duration_convert {
        

-    /* Urgh. statics.
-     */
-    static bool const midi_as_plet_b_s = true;
-    static bool no_quantify_b_s;
-    static bool no_double_dots_b_s;
-    static bool no_triplets_b_s;
-    static int no_smaller_than_i_s;
-    static Array<Duration> dur_array_s;
-
-    /// Return number of ticks in (ticks, division_1) representation
-    static int dur2ticks_i (Duration dur );
+  /* Urgh. statics.
+   */
+  static bool const midi_as_plet_b_s = true;
+  static bool no_quantify_b_s;
+  static bool no_double_dots_b_s;
+  static bool no_triplets_b_s;
+  static int no_smaller_than_i_s;
+  static Array<Duration> dur_array_s;
+
+  /// Return number of ticks in (ticks, division_1) representation
+  static int dur2ticks_i (Duration dur );

        
        

-    /// Return the type_i representation of note length i
-    static int i2_type (int i);
+  /// Return the type_i representation of note length i
+  static int i2_type (int i);

 
 

-    /// Return the note length corresponding to the type_i representation
-    /// Return 0 if longer than whole note.
-    static int type2_i (int type);
+  /// Return the note length corresponding to the type_i representation
+  /// Return 0 if longer than whole note.
+  static int type2_i (int type);

 
 

-    /// Return Moment representation (fraction of whole note).
-    static Moment dur2_mom (Duration dur );
+  /// Return Moment representation (fraction of whole note).
+  static Moment dur2_mom (Duration dur );

 
 

-    /// Return Mudela string representation.
-    static String dur2_str (Duration dur );
+  /// Return Mudela string representation.
+  static String dur2_str (Duration dur );

 
 

-    /// Return duration from Moment (fraction of whole) representation.
-    static Duration mom2_dur (Moment mom );
+  /// Return duration from Moment (fraction of whole) representation.
+  static Duration mom2_dur (Moment mom );

 
 

-    /// Return standardised duration, best guess if not exact.
-    static Duration mom2standardised_dur (Moment mom );
+  /// Return standardised duration, best guess if not exact.
+  static Duration mom2standardised_dur (Moment mom );

   
   

-    /// Return plet factor (not a Moment: should use Rational?).
-    static Moment plet_factor_mom (Duration dur );
+  /// Return plet factor (not a Moment: should use Rational?).
+  static Moment plet_factor_mom (Duration dur );

 
 

-    static void set_array ();
+  static void set_array ();

 
 

-    /** Return synchronisation factor for mom, so that
+  /** Return synchronisation factor for mom, so that

       mom2_dur (mom / sync_f ) will return the duration dur.           
       mom2_dur (mom / sync_f ) will return the duration dur.           

-      */ 
-    static Real sync_f (Duration dur, Moment mom );
+  */ 
+  static Real sync_f (Duration dur, Moment mom );

 
 

-    /// Return exact duration, in midi-ticks if not-exact.
-    static Duration ticks2_dur (int ticks_i );
+  /// Return exact duration, in midi-ticks if not-exact.
+  static Duration ticks2_dur (int ticks_i );

 
 

-    /// Return standardised duration, best guess if not exact.
-    static Duration ticks2standardised_dur (int ticks_i );
-};
-
-/// (iter_dur)
-struct Duration_iterator {
-    /// start at shortest: 128:2/3
-    Duration_iterator ();
-
-    // **** what about these three here ?
-    /// return forward_dur ();
-    Duration operator ++(int); 
-
-    /// return ok ()
-    operator bool (); 
-
-    /// return dur ()
-    Duration operator ()(); 
-    // ****
-
-    /// return current dur
-    Duration dur ();
-
-    /// return dur (), step to next
-    Duration forward_dur ();
-
-    /// durations left?
-    bool ok ();
-
-private:
-    Duration cursor_dur_;
+  /// Return standardised duration, best guess if not exact.
+  static Duration ticks2standardised_dur (int ticks_i );

 };
 
 
 };
 
 

diff --git a/lib/include/duration-iter.hh b/lib/include/duration-iter.hh
new file mode 100644 (file)
index 0000000..1c01ac7
--- /dev/null
+++ b/lib/include/duration-iter.hh
@@ -0,0 +1,47 @@
+/*   
+  duration-iter.hh -- declare Duration_iterator
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  
+ */
+
+#ifndef DURATION_ITER_HH
+#define DURATION_ITER_HH
+
+/// (iter_dur)
+struct Duration_iterator {
+  
+  /// start at shortest: 128:2/3
+  Duration_iterator ();
+
+  // **** what about these three here ?
+  /// return forward_dur ();
+  Duration operator ++(int); 
+
+  /// return ok ()
+  operator bool (); 
+
+  /// return dur ()
+  Duration operator ()(); 
+
+
+  /// return current dur
+  Duration dur ();
+
+  /// return dur (), step to next
+  Duration forward_dur ();
+
+  /// durations left?
+  bool ok ();
+
+private:
+
+  Duration cursor_dur_;
+};
+
+
+
+#endif /* DURATION_ITER_HH */
+

diff --git a/lib/include/duration.hh b/lib/include/duration.hh
index 69eaf8dcaf769e867573a5e4b215cbdc19111c67..59c968f75126ae8ef0a3db8ab5fa2ebbd6743745 100644 (file)
--- a/lib/include/duration.hh
+++ b/lib/include/duration.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 
 */
 
 
 */
 


@@ -15,9 +15,6 @@
 #include "fproto.hh"
 #include "moment.hh"
 #include "plet.hh"
 #include "fproto.hh"
 #include "moment.hh"
 #include "plet.hh"

-// ugh, to get me in lily lib
-extern bool no_triplets_bo_g;
-

 
 /**
   Class to handle "musical" durations. This means: balltype 1,2,4,etc. and dots.
 
 /**
   Class to handle "musical" durations. This means: balltype 1,2,4,etc. and dots.


@@ -30,7 +27,7 @@ struct Duration {
   bool plet_b ();
   String str () const;
   void set_plet (int,int );
   bool plet_b ();
   String str () const;
   void set_plet (int,int );

-  void set_plet (Duration );
+

   static bool duration_type_b (int t);
   void set_ticks (int ticks_i );
   Moment length () const ;     // zo naai mij
   static bool duration_type_b (int t);
   void set_ticks (int ticks_i );
   Moment length () const ;     // zo naai mij

diff --git a/lib/include/file-storage.hh b/lib/include/file-storage.hh
index 1ac150f59245c117774309bf45973c8e19d18220..b2e679bb574bf76b7d658470ef4f3292f1f79d91 100644 (file)
--- a/lib/include/file-storage.hh
+++ b/lib/include/file-storage.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lib/include/input.hh b/lib/include/input.hh
index f82ba2d2240ef58d860a3a0d49ccf8a51a6049f8..767a2e76b80b3016c87d572968f7aa0be6cec110 100644 (file)
--- a/lib/include/input.hh
+++ b/lib/include/input.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lib/include/mapped-file-storage.hh b/lib/include/mapped-file-storage.hh
index 4ca29a300622d6c281d210115ce525bd1a4f5de5..506bbc978f8d3ba33dc302dbf221e689de7c239e 100644 (file)
--- a/lib/include/mapped-file-storage.hh
+++ b/lib/include/mapped-file-storage.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lib/include/plet.hh b/lib/include/plet.hh
index ecedcc4d437d26f287796a7b847c66bf924ea4ad..de32eb1753cfa2802e491f51bda933ad40d16587 100644 (file)
--- a/lib/include/plet.hh
+++ b/lib/include/plet.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lib/include/simple-file-storage.hh b/lib/include/simple-file-storage.hh
index 4deb0969ff9c21eb15e11fae07f47d4262993f42..4f4bd591999f455c14dc17640d1da1cfa6d1fc5a 100644 (file)
--- a/lib/include/simple-file-storage.hh
+++ b/lib/include/simple-file-storage.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lib/include/warn.hh b/lib/include/warn.hh
index 45edc4ba40bd70b18e95f5db9fa102b2194baeef..a65c4aa19a246044e588157c76579a6519331483 100644 (file)
--- a/lib/include/warn.hh
+++ b/lib/include/warn.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lib/input.cc b/lib/input.cc
index e9cc3fd0070ea54f6b3a0a7ef1ebd930b319c25b..c50b3b733545e46de396617f273dc7136f28e1e4 100644 (file)
--- a/lib/input.cc
+++ b/lib/input.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "proto.hh"
 #include "input.hh"
 */
 #include "proto.hh"
 #include "input.hh"

diff --git a/lib/mapped-file-storage.cc b/lib/mapped-file-storage.cc
index c318925b4e543aa60100d2d4fca3d21ec9d6d417..17d451d1a66c2fee42291629c709f902ad5ca7ae 100644 (file)
--- a/lib/mapped-file-storage.cc
+++ b/lib/mapped-file-storage.cc
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   Jan Nieuwenhuizen <jan@digicash.com>.
 
   Nextstep fixes by tiggr@ics.ele.tue.nl
   Jan Nieuwenhuizen <jan@digicash.com>.
 
   Nextstep fixes by tiggr@ics.ele.tue.nl

diff --git a/lib/moment.cc b/lib/moment.cc
index ef1fa46defbb1b1b3d254ea3e4dec0ff22cc23c4..d29ce9065bc9d91e1820f39e51525e14586421de 100644 (file)
--- a/lib/moment.cc
+++ b/lib/moment.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <iostream.h>
 */
 
 #include <iostream.h>

diff --git a/lib/plet.cc b/lib/plet.cc
index 84579eca716929bde820e253f3ae5e33f762cd39..9a098cc4c9b7c4ce60fe90f4ac0b1264f66eaf45 100644 (file)
--- a/lib/plet.cc
+++ b/lib/plet.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "plet.hh"
 */
 
 #include "plet.hh"

diff --git a/lib/simple-file-storage.cc b/lib/simple-file-storage.cc
index a8e98aaeb83441315c4c40db2b4ee68234260e6f..561ab838c960c30270ee29b1378035b88efa457a 100644 (file)
--- a/lib/simple-file-storage.cc
+++ b/lib/simple-file-storage.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <stdio.h>
 */
 
 #include <stdio.h>

diff --git a/lib/source-file.cc b/lib/source-file.cc
index b6153c984ad6994fe8f5031df1ec1c6475d913e4..c14dcccd6fd2d4953db9b326ec5e0dd463e5fce1 100644 (file)
--- a/lib/source-file.cc
+++ b/lib/source-file.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

   & Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
   & Han-Wen Nienhuys <hanwen@stack.nl>
 */
 

diff --git a/lib/source.cc b/lib/source.cc
index d350b487cae7c3b093ebe20854177a13a8005665..5d384f757e5bbb1246d441833e0e707bf8cd329c 100644 (file)
--- a/lib/source.cc
+++ b/lib/source.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -15,7 +15,7 @@
 #include "plist.hh"
 #include "source-file.hh"
 #include "source.hh"
 #include "plist.hh"
 #include "source-file.hh"
 #include "source.hh"

-#include "path.hh"
+#include "file-path.hh"

 
 Sources::Sources ()
 {
 
 Sources::Sources ()
 {

diff --git a/lib/template.cc b/lib/template.cc
index 2ea84593a96794c2a2ff2f703e8ed58750dc4502..6c117a2a603b56702f6ce9719fc8feb52b4ea060 100644 (file)
--- a/lib/template.cc
+++ b/lib/template.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "source-file.hh"
 */
 
 #include "source-file.hh"

diff --git a/lily/VERSION b/lily/VERSION
index e825e8955d8089333e335493caecdfc1a58349cf..eb481f9509c87cb954432a1e6fb7f6bca0288c3b 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
 MAJOR_VERSION=0
 MINOR_VERSION=1

-PATCH_LEVEL=60
+PATCH_LEVEL=61

 MY_PATCH_LEVEL=
 
 MY_PATCH_LEVEL=
 

diff --git a/lily/abbrev.cc b/lily/abbrev.cc
index d91899c75656fea84879e996c1f4da3f36e30f8e..54088537b6700a8adb971cc462f7313383cd375c 100644 (file)
--- a/lily/abbrev.cc
+++ b/lily/abbrev.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/abbreviation-beam-engraver.cc b/lily/abbreviation-beam-engraver.cc
index e8e8ef0614e92e639a46df0e71692845ed0820d1..ca62b92d24644994f3e0b502134ac8aad1f30f21 100644 (file)
--- a/lily/abbreviation-beam-engraver.cc
+++ b/lily/abbreviation-beam-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

            Jan Nieuwenhuizen <jan@digicash.com>
 */
 
            Jan Nieuwenhuizen <jan@digicash.com>
 */
 

diff --git a/lily/abbreviation-beam.cc b/lily/abbreviation-beam.cc
index d9a4e5bac8b2bc6c252a32575bfd0eacb9545b73..6637d19f0f3527c04b616648f454df9e6c079775 100644 (file)
--- a/lily/abbreviation-beam.cc
+++ b/lily/abbreviation-beam.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

           Jan Nieuwenhuizen <jan@digicash.com>
 */
 
           Jan Nieuwenhuizen <jan@digicash.com>
 */
 

diff --git a/lily/atom.cc b/lily/atom.cc
index 68d85f8e0e2cf695aabb980cce6c9aef338b0b7b..8c5c2f80e479af95e981b8c56387b4b2a0890c65 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "atom.hh"
 #include "tex.hh"
 */
 #include "atom.hh"
 #include "tex.hh"

diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index e0dbd2efffc26aafca0e1f895f5991f30714da30..2f5ad611a68dc778118d1deb8961cf742951e7c3 100644 (file)
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #include "audio-column.hh"
  */
 
 #include "audio-column.hh"

diff --git a/lily/audio-element.cc b/lily/audio-element.cc
index 77aaeb44f591ec0138f0e0f0688c63da2778a34c..18f265c46edd46915791a0ba6fe0049cd25f3f85 100644 (file)
--- a/lily/audio-element.cc
+++ b/lily/audio-element.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "audio-element.hh"
 */
 
 #include "audio-element.hh"

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 60a6badc8dd6292065a6b965ebde17388eae73de..81b0285ba6356e13f6fc480992435529356b397c 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 #include "debug.hh"
 #include "audio-item.hh"
 */
 #include "debug.hh"
 #include "audio-item.hh"

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 6dc14d11809e744896848aba5230ab3284c54252..d35fb23a58c65b1b78c2bf5f15da92bd3247a493 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #include "audio-staff.hh"
  */
 
 #include "audio-staff.hh"

diff --git a/lily/axis-group-administration.cc b/lily/axis-group-administration.cc
index 11eb1263b7675ff289e52983da141f9f4586c747..bf42295aee3c225eca3e58ce161625a6bf54c90f 100644 (file)
--- a/lily/axis-group-administration.cc
+++ b/lily/axis-group-administration.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "interval.hh"
 #include "axis-group-administration.hh"
 */
 #include "interval.hh"
 #include "axis-group-administration.hh"

diff --git a/lily/axis-group-element.cc b/lily/axis-group-element.cc
index b97b94cf61556b8065abba8ed204b78bd6a75b9b..b4061af7f5b5c94ff293d33cb6f3463047eb7936 100644 (file)
--- a/lily/axis-group-element.cc
+++ b/lily/axis-group-element.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "axis-group-element.hh"
 */
 
 #include "axis-group-element.hh"

diff --git a/lily/axis-group-item.cc b/lily/axis-group-item.cc
index 5362516f025a2586d2bd046920243baa6871a5a5..2706fa8faa658fc8dffcd57fa05489f8bab009f0 100644 (file)
--- a/lily/axis-group-item.cc
+++ b/lily/axis-group-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "axis-group-item.hh"
 #include "p-col.hh"
 */
 #include "axis-group-item.hh"
 #include "p-col.hh"

diff --git a/lily/axis-group-spanner.cc b/lily/axis-group-spanner.cc
index 5cace351e33134d0de7eb1b37d69726a5851c37a..344b4060cce15e9f96d5ab215973486fd5710bca 100644 (file)
--- a/lily/axis-group-spanner.cc
+++ b/lily/axis-group-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "axis-group-spanner.hh"
 */
 
 #include "axis-group-spanner.hh"

diff --git a/lily/bar-column-grav.cc b/lily/bar-column-grav.cc
index e4219fdb38f6b3768d9789839bc926767fef434c..7afced803a8a5759e49ecc07224f2b1e8fbed196 100644 (file)
--- a/lily/bar-column-grav.cc
+++ b/lily/bar-column-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/bar-column.cc b/lily/bar-column.cc
index 05710d8706fadcc1ab3a8989d3b639b21b0989aa..57bf47660d8665d62442b41010950fa4bf97fbff 100644 (file)
--- a/lily/bar-column.cc
+++ b/lily/bar-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "bar.hh"
 */
 
 #include "bar.hh"

diff --git a/lily/bar-grav.cc b/lily/bar-grav.cc
index 4b8e1d4472992f95057a7db6f1fe02e54cb069fb..b711bf4a07c3e249a55e125ab14b9df6e3866f38 100644 (file)
--- a/lily/bar-grav.cc
+++ b/lily/bar-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "bar-grav.hh"
 */
 
 #include "bar-grav.hh"

diff --git a/lily/bar-number-grav.cc b/lily/bar-number-grav.cc
index 9a24c2739baf7500d38f06759a318a8de796a10d..be49f69b3f9632936f9d439e5b31a4221431bc8d 100644 (file)
--- a/lily/bar-number-grav.cc
+++ b/lily/bar-number-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -12,6 +12,7 @@
 #include "text-def.hh"
 #include "command-request.hh"
 #include "bar.hh"
 #include "text-def.hh"
 #include "command-request.hh"
 #include "bar.hh"

+#include "stem.hh"

 #include "time-description.hh"
 
 Bar_number_engraver::Bar_number_engraver()
 #include "time-description.hh"
 
 Bar_number_engraver::Bar_number_engraver()


@@ -20,6 +21,7 @@ Bar_number_engraver::Bar_number_engraver()
 }
 
 static Command_script_req dummy;
 }
 
 static Command_script_req dummy;

+static Stem support;

 
 void
 Bar_number_engraver::acknowledge_element (Score_elem_info i)
 
 void
 Bar_number_engraver::acknowledge_element (Score_elem_info i)


@@ -38,9 +40,15 @@ Bar_number_engraver::acknowledge_element (Score_elem_info i)
 
       script_p_->specs_l_ = td_p;
       script_p_->breakable_b_ = true;
 
       script_p_->specs_l_ = td_p;
       script_p_->breakable_b_ = true;

+
+      // ugh, howto move this up?

       script_p_->dir_ = UP;
       script_p_->dir_ = UP;

-//      script_p_->y_ += 2;
-      script_p_->y_ = 8;
+////      script_p_->y_ += 2;
+      script_p_->y_ = 10;
+
+      support.dir_ = UP;
+      support.set_stemend (10);
+      script_p_->set_stem (&support);

 
       announce_element (Score_elem_info (script_p_, &dummy));
     }
 
       announce_element (Score_elem_info (script_p_, &dummy));
     }

diff --git a/lily/bar.cc b/lily/bar.cc
index 0a699a26abcd36cfd1db10eec3d7fcad9ed55377..701bbd7b86bd90f5ecf9122182d353cabb5759ae 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "bar.hh"
 */
 
 #include "bar.hh"

diff --git a/lily/beam-grav.cc b/lily/beam-grav.cc
index 8cd5958f1763ee3344dd2eac94072487dfede035..9a3f9586c2f5c1f8131037219bc9a75e7cc7bc10 100644 (file)
--- a/lily/beam-grav.cc
+++ b/lily/beam-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "duration-convert.hh"
 #include "time-description.hh"
 */
 #include "duration-convert.hh"
 #include "time-description.hh"


@@ -56,9 +56,9 @@ Beam_engraver::do_process_requests()
   if (prop.isnum_b ()) 
     beam_p_->damping_i_ = prop;
 
   if (prop.isnum_b ()) 
     beam_p_->damping_i_ = prop;
 

-  prop = get_property ("beamquantisaton");
+  prop = get_property ("beamquantisation");

   if (prop.isnum_b ()) 
   if (prop.isnum_b ()) 

-    beam_p_->quantisation_ = (Beam::Quantise)(int)prop;
+    beam_p_->quantisation_ = (Beam::Quantisation)(int)prop;

  
   announce_element (Score_elem_info (beam_p_, span_reqs_drul_[LEFT]));
 }
  
   announce_element (Score_elem_info (beam_p_, span_reqs_drul_[LEFT]));
 }

diff --git a/lily/beam-swallow-trans.cc b/lily/beam-swallow-trans.cc
index cf23d55088db6d21f0b5ab1d538875db8fe32a91..38418fc3330dadd1b9a6f3b79b0b5070bf6f1d2b 100644 (file)
--- a/lily/beam-swallow-trans.cc
+++ b/lily/beam-swallow-trans.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/beam.cc b/lily/beam.cc
index c3991ea3cabdcc53041c0cd04b125eb4a6ce642e..fef050e58ba962cf11604b351afe9e8b3df58c42 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -3,13 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+    Jan Nieuwenhuizen <jan@digicash.com>

 
 

-  TODO
+*/

 
 

-  Less hairy code.  knee: ([\stem 1; c8 \stem -1; c8]

 
 

-*/
+/*
+  [TODO]
+    * lowest beam of (UP) beam must never be lower than second staffline
+    * centre beam symbol
+    * less hairy code
+    * redo grouping 
+    * (future) knee: ([\stem 1; c8 \stem -1; c8]
+ */

 
 #include <math.h>
 
 
 #include <math.h>
 


@@ -29,25 +36,15 @@
 #include "lookup.hh"
 #include "grouping.hh"
 #include "stem-info.hh"
 #include "lookup.hh"
 #include "grouping.hh"
 #include "stem-info.hh"

-//#include "main.hh"  // experimental features
+#include "main.hh"  // experimental features

 
 
 IMPLEMENT_IS_TYPE_B1 (Beam, Spanner);
 
 
 
 IMPLEMENT_IS_TYPE_B1 (Beam, Spanner);
 

-// ugh, hardcoded
-const Real MINIMUM_STEMLEN[] = {
-  0, // just in case
-  5, 
-  4,
-  3,
-  2,
-  2,
-};
-

 Beam::Beam ()
 {
   slope_f_ = 0;
 Beam::Beam ()
 {
   slope_f_ = 0;

-  left_y_ = 0.0;
+  left_y_ = 0;

   damping_i_ = 1;
   quantisation_ = NORMAL;
   multiple_i_ = 0;
   damping_i_ = 1;
   quantisation_ = NORMAL;
   multiple_i_ = 0;


@@ -70,7 +67,12 @@ Molecule*
 Beam::brew_molecule_p () const
 {
   Molecule *mol_p = new Molecule;
 Beam::brew_molecule_p () const
 {
   Molecule *mol_p = new Molecule;

-  Real inter_f = paper ()->internote_f ();
+
+  Real interline_f = paper ()->interline_f ();
+  Real internote_f = interline_f / 2;
+  Real staffline_f = paper ()->rule_thickness ();
+  Real beam_f = 0.48 * (interline_f - staffline_f);
+

   Real x0 = stems_[0]->hpos_f ();
   for (int j=0; j <stems_.size (); j++)
     {
   Real x0 = stems_[0]->hpos_f ();
   for (int j=0; j <stems_.size (); j++)
     {


@@ -80,10 +82,12 @@ Beam::brew_molecule_p () const
 
       Molecule sb = stem_beams (i, next, prev);
       Real  x = i->hpos_f ()-x0;
 
       Molecule sb = stem_beams (i, next, prev);
       Real  x = i->hpos_f ()-x0;

-      sb.translate (Offset (x, (x * slope_f_  + left_y_)* inter_f));
+      sb.translate (Offset (x, (x * slope_f_ + left_y_) * internote_f));

       mol_p->add (sb);
     }
       mol_p->add (sb);
     }

-  mol_p->translate_axis (x0 - spanned_drul_[LEFT]->absolute_coordinate (X_AXIS), X_AXIS);
+  mol_p->translate_axis (x0 
+    - spanned_drul_[LEFT]->absolute_coordinate (X_AXIS), X_AXIS);
+

   return mol_p;
 }
 
   return mol_p;
 }
 


@@ -181,16 +185,22 @@ Beam::set_default_dir ()
 }
 
 /*
 }
 
 /*

-  should use minimum energy formulation (cf linespacing)
-*/
+  See Documentation/tex/fonts.doc
+ */

 void
 Beam::solve_slope ()
 {
 void
 Beam::solve_slope ()
 {

+  /*
+    should use minimum energy formulation (cf linespacing)
+  */
+
+  assert (multiple_i_);

   Array<Stem_info> sinfo;
   for (int j=0; j <stems_.size (); j++)
     {
       Stem *i = stems_[j];
 
   Array<Stem_info> sinfo;
   for (int j=0; j <stems_.size (); j++)
     {
       Stem *i = stems_[j];
 

+      i->mult_i_ = multiple_i_;

       i->set_default_extents ();
       if (i->invisible_b ())
        continue;
       i->set_default_extents ();
       if (i->invisible_b ())
        continue;


@@ -208,12 +218,12 @@ Beam::solve_slope ()
   else
     {
 
   else
     {
 

-      Real leftx = sinfo[0].x;
+      Real leftx = sinfo[0].x_;

       Least_squares l;
       for (int i=0; i < sinfo.size (); i++)
        {
       Least_squares l;
       for (int i=0; i < sinfo.size (); i++)
        {

-         sinfo[i].x -= leftx;
-         l.input.push (Offset (sinfo[i].x, sinfo[i].idealy_f_));
+         sinfo[i].x_ -= leftx;
+         l.input.push (Offset (sinfo[i].x_, sinfo[i].idealy_f_));

        }
 
       l.minimise (slope_f_, left_y_);
        }
 
       l.minimise (slope_f_, left_y_);


@@ -222,7 +232,7 @@ Beam::solve_slope ()
   Real dy = 0.0;
   for (int i=0; i < sinfo.size (); i++)
     {
   Real dy = 0.0;
   for (int i=0; i < sinfo.size (); i++)
     {

-      Real y = sinfo[i].x * slope_f_ + left_y_;
+      Real y = sinfo[i].x_ * slope_f_ + left_y_;

       Real my = sinfo[i].miny_f_;
 
       if (my - y > dy)
       Real my = sinfo[i].miny_f_;
 
       if (my - y > dy)


@@ -240,205 +250,197 @@ Beam::solve_slope ()
   if (damping_i_)
     slope_f_ = 0.6 * tanh (slope_f_) / damping_i_;
 
   if (damping_i_)
     slope_f_ = 0.6 * tanh (slope_f_) / damping_i_;
 

-  quantise_yspan ();
+  quantise_dy ();

 
 

-  // y-values traditionally use internote dimension: therefore slope = (y/in)/x
-  // but mf and beam-lookup use PT dimension for y (as used for x-values)
-  // ugh --- there goes our simplified but careful quantisation

   Real sl = slope_f_ * paper ()->internote_f ();
   paper ()->lookup_l ()->beam (sl, 20 PT, 1 PT);
   slope_f_ = sl / paper ()->internote_f ();
 }
 
 void
   Real sl = slope_f_ * paper ()->internote_f ();
   paper ()->lookup_l ()->beam (sl, 20 PT, 1 PT);
   slope_f_ = sl / paper ()->internote_f ();
 }
 
 void

-Beam::quantise_yspan ()
+Beam::quantise_dy ()

 {
   /*
     [Ross] (simplification of)
     Try to set slope_f_ complying with y-span of:
       - zero
 {
   /*
     [Ross] (simplification of)
     Try to set slope_f_ complying with y-span of:
       - zero

-      - beam_thickness / 2 + staffline_thickness / 2
-      - beam_thickness + staffline_thickness
+      - beam_f / 2 + staffline_f / 2
+      - beam_f + staffline_f

     + n * interline
     */
 
     + n * interline
     */
 

-  if (!quantisation_)
+  if (quantisation_ <= NONE)

     return;
 
   Real interline_f = paper ()->interline_f ();
   Real internote_f = interline_f / 2;
     return;
 
   Real interline_f = paper ()->interline_f ();
   Real internote_f = interline_f / 2;

-  Real staffline_thickness = paper ()->rule_thickness ();
-  Real beam_thickness = 0.48 * (interline_f - staffline_thickness);
-
-  const int QUANTS = 3;
-  Real qdy[QUANTS] = {
-    0,
-    beam_thickness / 2 + staffline_thickness / 2,
-    beam_thickness + staffline_thickness
-  };
-
-  Real xspan_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f ();
-  // y-values traditionally use internote dimension: therefore slope = (y/in)/x
-  Real yspan_f = xspan_f * abs (slope_f_ * internote_f);
-  int yspan_i = (int)(yspan_f / interline_f);
-  Real q = (yspan_f / interline_f - yspan_i) * interline_f;
-  int i = 0;
-  for (; i < QUANTS - 1; i++)
-    if ((q >= qdy[i]) && (q <= qdy[i + 1]))
-      {
-       if (q - qdy[i] < qdy[i + 1] - q)
-         break;
-       else
-       { 
-         i++;
-         break;
-       }
-      }
-  q = qdy[i];
+  Real staffline_f = paper ()->rule_thickness ();
+  Real beam_f = 0.48 * (interline_f - staffline_f);
+
+  Real dx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f ();
+
+  // dim(y) = internote; so slope = (y/internote)/x
+  Real dy_f = dx_f * abs (slope_f_ * internote_f);
+  
+  Real quanty_f = 0.0;
+
+  /* UGR.   ICE in 2.8.1; bugreport filed. */
+  Array<Real> allowed_fraction (3);
+  allowed_fraction[0] = 0;
+  allowed_fraction[1] = (beam_f / 2 + staffline_f / 2);
+  allowed_fraction[2] = (beam_f + staffline_f);

 
 

-  yspan_f = (Real)yspan_i * interline_f + q;
-  // y-values traditionally use internote dimension: therefore slope = (y/in)/x
-  slope_f_ = yspan_f / xspan_f / internote_f * sign (slope_f_);
+
+    Interval iv = quantise_iv (allowed_fraction, interline_f, dy_f);
+    quanty_f = (dy_f - iv.min () <= iv.max () - dy_f)
+      ? iv.min ()
+      : iv.max ();
+
+
+  slope_f_ = (quanty_f / dx_f) / internote_f * sign (slope_f_);

 }
 
 }
 

+static int test_pos = 0;
+
+
+/*
+  
+  Prevent interference from stafflines and beams.  See Documentation/tex/fonts.doc
+  
+ */

 void
 void

-Beam::quantise_left_y (Beam::Pos pos, bool extend_b)
+Beam::quantise_left_y (bool extend_b)

 {
 {

-  /*
-   quantising left y should suffice, as slope is quantised too
-   if extend then stems must not get shorter
+   /*
+    we only need to quantise the start of the beam as dy is quantised too
+   if extend_b then stems must *not* get shorter

    */
 
    */
 

-  if (!quantisation_)
+  if (quantisation_ <= NONE)

     return;
 
     return;
 

+  /*
+    ----------------------------------------------------------
+                                                   ########
+                                       ########
+                             ########
+    --------------########------------------------------------
+       ########
+
+       hang       straddle   sit        inter      hang
+   */
+
+  Real interbeam_f = paper ()->interbeam_f ();

   Real interline_f = paper ()->interline_f ();
   Real internote_f = interline_f / 2;
   Real interline_f = paper ()->interline_f ();
   Real internote_f = interline_f / 2;

-  Real staffline_thickness = paper ()->rule_thickness ();
-  Real beam_thickness = 0.48 * (interline_f - staffline_thickness);
+  Real staffline_f = paper ()->rule_thickness ();
+  Real beam_f = 0.48 * (interline_f - staffline_f);
+  Real symbol_f = beam_f + interbeam_f * (multiple_i_ - 1);

 
 

-  const int QUANTS = 7;
-  Real qy[QUANTS] = 
-  {
-    0,
-    beam_thickness / 2,
-    beam_thickness,
-    interline_f / 2 + beam_thickness / 2 + staffline_thickness / 2,
-    interline_f,
-    interline_f + beam_thickness / 2,
-    interline_f + beam_thickness
-  };
-  /* 
-   ugh, using i triggers gcc 2.7.2.1 internal compiler error (far down):
-   for (int i = 0; i < QUANTS; i++)
+  Real straddle = 0;
+  Real sit = beam_f / 2 - staffline_f / 2;
+  Real inter = interline_f / 2;
+  Real hang = interline_f - beam_f / 2 + staffline_f / 2;
+
+  /*
+    Put all allowed positions into an array.
+    Whether a position is allowed or not depends on 
+    strictness of quantisation, multiplicity and direction.
+
+    For simplicity, we'll assume dir = UP and correct if 
+    dir = DOWN afterwards.

    */
    */

-  
-  // fixme!
-  for (int ii = 0; ii < QUANTS; ii++)
-    qy[ii] -= 0.5 *beam_thickness;
-  Pos qpos[QUANTS] = 
-  {
-    HANG,
-    STRADDLE,
-    SIT,
-    INTER,
-    HANG,
-    STRADDLE,
-    SIT
-  };
-
-  // y-values traditionally use internote dimension
-  Real y = left_y_ * internote_f;
-  int y_i = (int)floor(y / interline_f);
-  y = (y / interline_f - y_i) * interline_f;
-
-  if (y < 0)
-    for (int ii = 0; ii < QUANTS; ii++)
-      qy[ii] -= interline_f;
-
-  int lower_i = 0;
-  int i = 0;
-  for (; i < QUANTS; i++)
+
+  // dim(left_y_) = internote
+  Real dy_f = dir_ * left_y_ * internote_f;
+
+  Array<Real> allowed_position;
+  if (quantisation_ != TEST)

     {
     {

-      if (qy[i] > y)
-       break;
-      // found if lower_i is allowed, and nearer (from below) y than new pos
-      if ((pos & qpos[lower_i]) && (y - qy[lower_i] < y - qy[i]))
-        break;
-      // if new pos is allowed or old pos isn't: assign new pos
-      if ((pos & qpos[i]) || !(pos & qpos[lower_i]))
-       lower_i = i;
+      if (quantisation_ <= NORMAL) 
+       {
+         if ((multiple_i_ <= 2) || (abs (dy_f) >= staffline_f / 2))
+           allowed_position.push (straddle);
+         if ((multiple_i_ <= 1) || (abs (dy_f) >= staffline_f / 2))
+           allowed_position.push (sit);
+         allowed_position.push (hang);
+       }
+      else
+        // TODO: check and fix TRADITIONAL
+       {
+         if ((multiple_i_ <= 2) || (abs (dy_f) >= staffline_f / 2))
+           allowed_position.push (straddle);
+         if ((multiple_i_ <= 1) && (dy_f <= staffline_f / 2))
+           allowed_position.push (sit);
+         if (dy_f >= -staffline_f / 2)
+           allowed_position.push (hang);
+       }

     }
     }

-
-  int upper_i = QUANTS - 1;
-  for (i = QUANTS - 1; i >= 0; i--)
+  else

     {
     {

-      if (qy[i] < y)
-       break;
-      // found if upper_i is allowed, and nearer (from above) y than new pos
-      if ((pos & qpos[upper_i]) && (qy[upper_i] - y < qy[i] - y))
-        break;
-      // if new pos is allowed or old pos isn't: assign new pos
-      if ((pos & qpos[i]) || !(pos & qpos[upper_i]))
-       upper_i = i;
+      if (test_pos == 0)
+        {
+       allowed_position.push (hang);
+       cout << "hang" << hang << endl;
+       }
+      else if (test_pos==1)
+        {
+       allowed_position.push (straddle);
+       cout << "straddle" << straddle << endl;
+       }
+      else if (test_pos==2)
+        {
+       allowed_position.push (sit);
+       cout << "sit" << sit << endl;
+       }
+      else if (test_pos==3)
+        {
+       allowed_position.push (inter);
+       cout << "inter" << inter << endl;
+       }

     }
 
     }
 

-  // y-values traditionally use internote dimension
-  Real upper_y = (qy[upper_i] + interline_f * y_i) / internote_f;
-  Real lower_y = (qy[lower_i] + interline_f * y_i) / internote_f;
+#if 0
+  // this currently never happens
+  Real q = (dy_f / interline_f - dy_i) * interline_f;
+  if ((quantisation_ < NORMAL) && (q < interline_f / 3 - beam_f / 2))
+    allowed_position.push (inter);
+#endif

 
 

+  Interval iv = quantise_iv (allowed_position, interline_f, dy_f);
+
+  Real quanty_f = dy_f - iv.min () <= iv.max () - dy_f ? iv.min () : iv.max ();

   if (extend_b)
   if (extend_b)

-    left_y_ = (dir_ > 0 ? upper_y : lower_y);
-  else
-    left_y_ = (upper_y - y < y - lower_y ? upper_y : lower_y);
+    quanty_f = iv.max ();
+
+  // dim(left_y_) = internote
+  left_y_ = dir_ * quanty_f / internote_f;

 }
 
 void
 Beam::set_stemlens ()
 {
 }
 
 void
 Beam::set_stemlens ()
 {

-  Real x0 = stems_[0]->hpos_f ();
-  Real dy = 0;
-
+  Real interbeam_f = paper ()->interbeam_f ();

   Real interline_f = paper ()->interline_f ();
   Real internote_f = interline_f / 2;
   Real interline_f = paper ()->interline_f ();
   Real internote_f = interline_f / 2;

-  Real staffline_thickness = paper ()->rule_thickness ();
-  Real beam_thickness = 0.48 * (interline_f - staffline_thickness);
-  Real interbeam_f = paper ()->interbeam_f ();
-  if (multiple_i_ > 3)
-    interbeam_f += 2.0 * staffline_thickness / 4;
-  Real xspan_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f ();
-  /*
-   ugh, y values are in "internote" dimension
-   */
-  Real yspan_f = xspan_f * abs (slope_f_ * internote_f);
-  int yspan_i = (int)(yspan_f / interline_f);
-
-  Pos left_pos = NONE;
+  Real staffline_f = paper ()->rule_thickness ();
+  Real beam_f = 0.48 * (interline_f - staffline_f);

 
 

-  if ((yspan_f < staffline_thickness / 2) || (quantisation_ == NORMAL))
-    left_pos = (Pos)(STRADDLE | SIT | HANG);
-  else
-    left_pos = (Pos) (sign (slope_f_) > 0 ? STRADDLE | HANG 
-      : SIT | STRADDLE);
-
-  /* 
-   ugh, slope currently mangled by availability mf chars...
-   be more generous regarding beam position between stafflines
+  /*
+    if we have more than three beams they must open-up
+    in order to not collide with staff lines

    */
    */

-  Real q = (yspan_f / interline_f - yspan_i) * interline_f;
-  if ((quantisation_ < NORMAL) && (q < interline_f / 3 - beam_thickness / 2))
-    left_pos = (Pos) (left_pos | INTER);
-
-
-  if (multiple_i_ > 1)
-    left_pos = (Pos) (dir_ > 0 ? HANG : SIT);
+  if (multiple_i_ > 3)
+    interbeam_f += 2.0 * staffline_f / 4;

 
 

+  Real x0 = stems_[0]->hpos_f ();
+  Real dy = 0;

   // ugh, rounding problems! (enge floots)
   // ugh, rounding problems! (enge floots)

-  const Real EPSILON = interline_f / 10;
+  Real epsilon = staffline_f / 8;

   do
     { 
       left_y_ += dy * dir_;
   do
     { 
       left_y_ += dy * dir_;

-      quantise_left_y (left_pos, dy);
+      quantise_left_y (dy);

       dy = 0;
       for (int i=0; i < stems_.size (); i++)
        {
       dy = 0;
       for (int i=0; i < stems_.size (); i++)
        {


@@ -448,19 +450,29 @@ Beam::set_stemlens ()
 
          Real x = s->hpos_f () - x0;
          s->set_stemend (left_y_ + slope_f_ * x);
 
          Real x = s->hpos_f () - x0;
          s->set_stemend (left_y_ + slope_f_ * x);

-         Real y = s->stem_length_f ();
-         // duh: 
-//       int mult_i = stems_[i]->beams_left_i_ >? stems_[i]->beams_right_i_;
-         int mult_i = multiple_i_;
-         if (mult_i > 1)
-             // dim(y) = internote
-             y -= (Real)(mult_i - 1) * interbeam_f / internote_f;
-         if (y < MINIMUM_STEMLEN[mult_i])
-           dy = dy >? (MINIMUM_STEMLEN[mult_i] - y);
+         Real y = s->stem_end_f () * dir_;
+         Stem_info info (s);
+         if (y < info.miny_f_)
+           dy = dy >? info.miny_f_ - y;

        }
        }

-    } while (abs (dy) > EPSILON);
+    } while (abs (dy) > epsilon);
+
+  // ugh asymmetric symbol ?
+  if (dir_ == UP)
+    left_y_ -= dir_ * staffline_f / 4;
+
+  if ((multiple_i_ >= 3) && (dir_ == UP))
+    left_y_ -= dir_ * staffline_f / 4;
+
+  test_pos++;
+  test_pos %= 4;

 }
 
 }
 

+/*
+ FIXME
+ ugh.  this is broken and should be rewritten.
+  - [c8. c32 c32]
+ */

 void
 Beam::set_grouping (Rhythmic_grouping def, Rhythmic_grouping cur)
 {
 void
 Beam::set_grouping (Rhythmic_grouping def, Rhythmic_grouping cur)
 {


@@ -506,15 +518,16 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const
   assert (!next || next->hpos_f () > here->hpos_f ());
   assert (!prev || prev->hpos_f () < here->hpos_f ());
 
   assert (!next || next->hpos_f () > here->hpos_f ());
   assert (!prev || prev->hpos_f () < here->hpos_f ());
 

-  Real staffline_thickness = paper ()->rule_thickness ();
+  Real staffline_f = paper ()->rule_thickness ();

   Real interbeam_f = paper ()->interbeam_f ();
   Real internote_f =paper ()->internote_f (); 
   Real interline_f = 2 * internote_f;
   Real interbeam_f = paper ()->interbeam_f ();
   Real internote_f =paper ()->internote_f (); 
   Real interline_f = 2 * internote_f;

-  Real beamheight_f = 0.48 * (interline_f - staffline_thickness);
+  Real beamheight_f = 0.48 * (interline_f - staffline_f);
+

   if (multiple_i_ > 3)
   if (multiple_i_ > 3)

-    interbeam_f += 2.0 * staffline_thickness / 4;
+    interbeam_f += 2.0 * staffline_f / 4;

   Real dy = interbeam_f;
   Real dy = interbeam_f;

-  Real stemdx = staffline_thickness;
+  Real stemdx = staffline_f;

   Real sl = slope_f_* internote_f;
   paper ()->lookup_l ()->beam (sl, 20 PT, 1 PT);
 
   Real sl = slope_f_* internote_f;
   paper ()->lookup_l ()->beam (sl, 20 PT, 1 PT);
 


@@ -591,3 +604,4 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const
    */
   return leftbeams;
 }
    */
   return leftbeams;
 }

+

diff --git a/lily/bezier.cc b/lily/bezier.cc
index 5fea33928893670794afa16f7567f89fffaed0f1..2267e2d42c95560d0880df422d034b744755d3da 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -8,6 +8,7 @@
 
 #include <math.h>
 #include "bezier.hh"
 
 #include <math.h>
 #include "bezier.hh"

+#include "misc.hh"

 
 #ifndef STANDALONE
 #include "direction.hh"
 
 #ifndef STANDALONE
 #include "direction.hh"


@@ -94,21 +95,20 @@ Bezier::set (Array<Offset> points)
 Real
 Bezier::y (Real x)
 {
 Real
 Bezier::y (Real x)
 {

-  for (int i = 1; i < curve_.size (); i++ )
-    {
-      if (x < curve_[i].x () || (i == curve_.size () - 1))
-       {
-         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();
-
-         return y;
-        }
-    }
-  assert (false);
-  // silly c++
-  return 0;
+  // ugh
+  // bounds func should be templatised to take array of offsets too?
+  Array<Real> positions;
+  for (int i = 0; i < curve_.size (); i++)
+    positions.push (curve_[i].x ());
+
+  Slice slice = get_bounds_slice (positions, x);
+  // ugh
+  Offset z1 = curve_[0 >? slice.max () - 1];
+  Offset z2 = curve_[1 >? slice.max ()];
+  Real multiplier = (x - z2.x ()) / (z1.x () - z2.x ());
+  Real y = z1.y () * multiplier + (1.0 - multiplier) * z2.y();
+
+  return y;

 }
 
 
 }
 
 


@@ -139,10 +139,13 @@ Bezier_bow::blow_fit ()
     return;
 
 #ifndef STANDALONE
     return;
 
 #ifndef STANDALONE

-  Real epsilon = paper_l_->rule_thickness ();
+  Real internote_f = paper_l_->internote_f ();

 #else
 #else

-  Real epsilon = 1.5 * 0.4 PT;
+  Real internote_f = STAFFHEIGHT / 8;

 #endif
 #endif

+
+  //urg
+  Real epsilon = internote_f / 2;

   if (abs (dy2 - dy1) < epsilon)
     return;
   
   if (abs (dy2 - dy1) < epsilon)
     return;
   


@@ -223,7 +226,9 @@ Bezier_bow::calc ()
   This function tries to address two issues:
     * the tangents of the slur should always point inwards 
       in the actual slur, i.e.  *after rotating back*.
   This function tries to address two issues:
     * the tangents of the slur should always point inwards 
       in the actual slur, i.e.  *after rotating back*.

-    * slurs shouldn't be too high ( <= 1.5 staffheight?)
+
+    * slurs shouldn't be too high 
+      let's try : h <= 1.2 b && h <= 3 staffheight?

 
   We could calculate the tangent of the bezier curve from
   both ends going inward, and clip the slur at the point
 
   We could calculate the tangent of the bezier curve from
   both ends going inward, and clip the slur at the point


@@ -249,28 +254,28 @@ Bezier_bow::calc_clipping ()
   Real staffsize_f = STAFFHEIGHT;
 #endif
 
   Real staffsize_f = STAFFHEIGHT;
 #endif
 

-  Real clip_h = staffsize_f;
+  Real b = control_[3].x () - control_[0].x ();
+  Real clip_h = 1.2 * b <? 3.0 * staffsize_f;

   Real begin_h = control_[1].y () - control_[0].y ();
   Real end_h = control_[2].y () - control_[3].y ();
   Real begin_h = control_[1].y () - control_[0].y ();
   Real end_h = control_[2].y () - control_[3].y ();

-  Real begin_dy = begin_h - clip_h;
-  Real end_dy = end_h - clip_h;
+  Real begin_dy = 0 >? begin_h - clip_h;
+  Real end_dy = 0 >? end_h - clip_h;

   
   Real pi = M_PI;
   Real begin_alpha = (control_[1] - control_[0]).arg () + alpha_;
   Real end_alpha = pi -  (control_[2] - control_[3]).arg () - alpha_;
 
   
   Real pi = M_PI;
   Real begin_alpha = (control_[1] - control_[0]).arg () + alpha_;
   Real end_alpha = pi -  (control_[2] - control_[3]).arg () - alpha_;
 

-  Real max_alpha = 1.1 * pi/2;
+  Real max_alpha = (100.0 / 90) * pi/2;

   if ((begin_dy < 0) && (end_dy < 0)
     && (begin_alpha < max_alpha) && (end_alpha < max_alpha))
     return false;
 
   encompass_.rotate (alpha_);
   if ((begin_dy < 0) && (end_dy < 0)
     && (begin_alpha < max_alpha) && (end_alpha < max_alpha))
     return false;
 
   encompass_.rotate (alpha_);

-  // ugh

   origin_.y () *= dir_;
   encompass_.translate (origin_);
 
   bool again = true;
   origin_.y () *= dir_;
   encompass_.translate (origin_);
 
   bool again = true;

-  //ugh
+

   if ((begin_dy > 0) || (end_dy > 0))
     {
       Real dy = (begin_dy + end_dy) / 4;
   if ((begin_dy > 0) || (end_dy > 0))
     {
       Real dy = (begin_dy + end_dy) / 4;


@@ -281,33 +286,21 @@ Bezier_bow::calc_clipping ()
   else
     {
       //ugh
   else
     {
       //ugh

-      Real c = -0.4;
+      Real c = 0.4;

       if (begin_alpha >= max_alpha)
       if (begin_alpha >= max_alpha)

-       begin_dy = c * begin_alpha / max_alpha * begin_h;
+       begin_dy = 0 >? c * begin_alpha / max_alpha * begin_h;

       if (end_alpha >= max_alpha)
       if (end_alpha >= max_alpha)

-       end_dy = c * end_alpha / max_alpha * end_h;
+       end_dy = 0 >? c * end_alpha / max_alpha * end_h;

 
 

-      Real dy = end_dy >? begin_dy;
+      encompass_[0].y () += begin_dy;
+      encompass_[encompass_.size () - 1].y () += end_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_;
-       }
+      Offset delta = encompass_[encompass_.size () - 1] - encompass_[0];
+      alpha_ = delta.arg ();

     }
 
   origin_ = encompass_[0];
   encompass_.translate (-origin_);
     }
 
   origin_ = encompass_[0];
   encompass_.translate (-origin_);

-  // ugh

   origin_.y () *= dir_;
   encompass_.rotate (-alpha_);
 
   origin_.y () *= dir_;
   encompass_.rotate (-alpha_);
 


@@ -317,7 +310,6 @@ Bezier_bow::calc_clipping ()
 void
 Bezier_bow::calc_controls ()
 {
 void
 Bezier_bow::calc_controls ()
 {

-  // try clipping twice

   for (int i = 0; i < 3; i++)
     {
       if (i && !calc_clipping ())
   for (int i = 0; i < 3; i++)
     {
       if (i && !calc_clipping ())


@@ -458,8 +450,10 @@ bool
 Bezier_bow::check_fit_bo ()
 {
   for (int i = 1; i < encompass_.size () - 1; i++)
 Bezier_bow::check_fit_bo ()
 {
   for (int i = 1; i < encompass_.size () - 1; i++)

-    if (encompass_[i].y () > y (encompass_[i].x ()))
-      return false;
+    if ((encompass_[i].x () > encompass_[0].x ())
+      && (encompass_[i].x () < encompass_[encompass_.size () -1].x ()))
+      if (encompass_[i].y () > y (encompass_[i].x ()))
+       return false;

   return true;
 }
 
   return true;
 }
 


@@ -468,7 +462,9 @@ Bezier_bow::check_fit_f ()
 {
   Real dy = 0;
   for (int i = 1; i < encompass_.size () - 1; i++)
 {
   Real dy = 0;
   for (int i = 1; i < encompass_.size () - 1; i++)

-    dy = dy >? (encompass_[i].y () - y (encompass_[i].x ()));
+    if ((encompass_[i].x () > encompass_[0].x ())
+      && (encompass_[i].x () < encompass_[encompass_.size () -1].x ()))
+      dy = dy >? (encompass_[i].y () - y (encompass_[i].x ()));

   return dy;
 }
 
   return dy;
 }
 

diff --git a/lily/bow.cc b/lily/bow.cc
index 48477b983738e66dd00c731b62e660b8788f4e97..770fd8a9735feffce6bf5a67087a5e5b1207fbeb 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

       Jan Nieuwenhuizen <jan@digicash.com>
 */
 
       Jan Nieuwenhuizen <jan@digicash.com>
 */
 


@@ -87,26 +87,19 @@ Bow::get_controls () const
 Array<Offset>
 Bow::get_encompass_offset_arr () const
 {
 Array<Offset>
 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];
+  Offset d (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
+    dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
+  d.x() += width (). length ();

 
 #define RESIZE_ICE
 #ifndef RESIZE_ICE
   Array<Offset> notes;
 
 #define RESIZE_ICE
 #ifndef RESIZE_ICE
   Array<Offset> notes;

-  notes.push (Offset (left_x, 0));
-  notes.push (Offset (left_x + dx, dy));
+  notes.push (Offset 0, 0));
+  notes.push (d);

 #else
   Array<Offset> notes (2);
 #else
   Array<Offset> notes (2);

-  notes[0] = Offset (left_x, 0);
-  notes[1] = Offset (left_x + dx, dy);
+  notes[0] = Offset (0, 0);
+  notes[1] = Offset (d);

 #endif
 
   return notes;
 #endif
 
   return notes;

diff --git a/lily/boxes.cc b/lily/boxes.cc
index 1529c7074915798270cde15212c9054caceeafd7..0e9befcad228af92749c6a6523ece36e0ce17c7f 100644 (file)
--- a/lily/boxes.cc
+++ b/lily/boxes.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "boxes.hh"
 */
 
 #include "boxes.hh"

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index b2ffbaee602c5aa897184f35325e2cb507217d7c..b95f5fd41e5ece0bace135b2c4e70c3298789deb 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "break-align-item.hh"
 */
 
 #include "break-align-item.hh"

diff --git a/lily/break.cc b/lily/break.cc
index 2b29b433f502ded30c7a87bb5489d11e50e85ad5..f25ac5e32f29d1c27a3819ffd888851440981b06 100644 (file)
--- a/lily/break.cc
+++ b/lily/break.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "score-column.hh"
 */
 
 #include "score-column.hh"

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 883e963e9f3d29b00a62c96f353c5bddd8fa5b6d..681ac2ae0fd48c419b84f23d6c4fa51f48987d4d 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "change-iterator.hh"
 */
 
 #include "change-iterator.hh"

diff --git a/lily/change-translator.cc b/lily/change-translator.cc
index be406c792dbd2531f765d97122eafef7a592d841..54bbed8e814a31fd9a7ca43af674a32bb98450d5 100644 (file)
--- a/lily/change-translator.cc
+++ b/lily/change-translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "change-translator.hh"
 */
 
 #include "change-translator.hh"

diff --git a/lily/chord-iterator.cc b/lily/chord-iterator.cc
index a21a7862cc56b1aa29d694b52d610864333b3e19..2d37445ae45b560653ca3c38f0024271d9cf72c6 100644 (file)
--- a/lily/chord-iterator.cc
+++ b/lily/chord-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "translator-group.hh"
 */
 
 #include "translator-group.hh"

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index 5812e7fc5d0ceff10cf56ee7e745aaad8bfa980d..d7ce0c4df0608a728b3ee013d901508adbddb2a9 100644 (file)
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>,

   Mats Bengtsson <matsb@s3.kth.se>
 */
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
 

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 0d1a185923be893a1f6285b01b96f221f6f32f7c..eda65592b94e6c2944767b3b001a95a4c0d9b1c8 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <ctype.h>
 */
 
 #include <ctype.h>

diff --git a/lily/col-info.cc b/lily/col-info.cc
index 769bc5ed724849c79452d899e4fbb3ad2786b61a..85287257b0647f6ac480ea90a9db72a010e19fd5 100644 (file)
--- a/lily/col-info.cc
+++ b/lily/col-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "p-col.hh"
 */
 
 #include "p-col.hh"

diff --git a/lily/colhpos.cc b/lily/colhpos.cc
index a220298777d8868f21a0577ff342a512dddc01dc..1e90ffeb373813a13e43174bf9d75321f1a52e51 100644 (file)
--- a/lily/colhpos.cc
+++ b/lily/colhpos.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "colhpos.hh"
 */
 
 #include "colhpos.hh"

diff --git a/lily/collision-grav.cc b/lily/collision-grav.cc
index f1b71123904818c1b4d6cde9bd171bccdd7f5ac4..6a6dcef13c57449468cfdbf9c4589f8d2e250606 100644 (file)
--- a/lily/collision-grav.cc
+++ b/lily/collision-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "note-column.hh"
 */
 
 #include "note-column.hh"

diff --git a/lily/collision.cc b/lily/collision.cc
index 17c57cf3384a34cad2efcf5b44c3c5ac893af2e6..2da1e0ddae97e26025df1f96f85ab5d10c9c5975 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "debug.hh"
 #include "collision.hh"
 */
 #include "debug.hh"
 #include "collision.hh"

diff --git a/lily/command-request.cc b/lily/command-request.cc
index a0b6227cec96500d483096e53f999390ae646970..6742e6bee75b64ac8ecddd0b59c75b9ef8ed70c5 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "command-request.hh"
 */
 
 #include "command-request.hh"

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 400b6709a05b68821543ff39e10f35e409a056f0..0dee71825b0d00460808363c74b578cefb0a6974 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "molecule.hh"
 */
 
 #include "molecule.hh"

diff --git a/lily/dot-column-grav.cc b/lily/dot-column-grav.cc
deleted file mode 100644 (file)
index 4383eb8..0000000
--- a/lily/dot-column-grav.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-  dot-column-grav.cc -- implement 
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 58a16c1ce5d0956fcc6c7ef0ddfcc937be2096fd..4c44095826f217b81fb5745260afa0d0a6408960 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "dots.hh"
 */
 
 #include "dots.hh"

diff --git a/lily/dots.cc b/lily/dots.cc
index 041e80a8cb4c7eed4dc2b1a61705c56c807f8e0a..20cf87a51508fd23bc007abdc36f056c3915478f 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "dots.hh"
 */
 
 #include "dots.hh"

diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc
index 44580b64bac24a9d7d18d042f343eff41b1e063f..9a0913c1296cee425430dc46136183200ef0a180 100644 (file)
--- a/lily/dynamic-grav.cc
+++ b/lily/dynamic-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "debug.hh"
 #include "crescendo.hh"
 */
 #include "debug.hh"
 #include "crescendo.hh"

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 29ce749fabe28fc0f1d1d260392441fa7a5513ec..bd6873d0d227ef63a0bea59b627520f09fe6009d 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 2786941a929fc4da6537a8e85659f1a944c3354b..2ccf33506924ee75afc90f7ccff9c9f2ea6985e2 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,7 +3,7 @@
 
   Sourcefile of GNU LilyPond musictypesetter
 
 
   Sourcefile of GNU LilyPond musictypesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "music-list.hh"
 */
 
 #include "music-list.hh"

diff --git a/lily/file-results.cc b/lily/file-results.cc
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/lily/file-results.cc
@@ -0,0 +1 @@
+

diff --git a/lily/general-script-def.cc b/lily/general-script-def.cc
index e434e356092447ab4361a7362875402019341aaf..9d7b657880b52566f13350ed907966232c5d7ee2 100644 (file)
--- a/lily/general-script-def.cc
+++ b/lily/general-script-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 33ff9f81a15e603c656c5e6f230ea65f5ffa907b..3620c52d694457812d6a7de919e55347b5faf173 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "global-translator.hh"
 */
 
 #include "global-translator.hh"

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 05c2a722b3236495373bca231ad29ff409aec07f..58e08b959c4f473e40840ec97d5bb2e26feb24f7 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "gourlay-breaking.hh"
 */
 
 #include "gourlay-breaking.hh"

diff --git a/lily/graphical-element.cc b/lily/graphical-element.cc
index 79c298928b158af5f34a631161a149d56776d713..f9273f0ee37a0e5b1e8db4e800cd075bf23d2be7 100644 (file)
--- a/lily/graphical-element.cc
+++ b/lily/graphical-element.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "graphical-element.hh"
 */
 
 #include "graphical-element.hh"

diff --git a/lily/grouping.cc b/lily/grouping.cc
index dfc59748e8ce5f4af4790eb5a7b7a649cb94d89c..2bdaed7db17be9beff9b8a860acb57dada0df9a1 100644 (file)
--- a/lily/grouping.cc
+++ b/lily/grouping.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/head-grav.cc b/lily/head-grav.cc
index 61256ed63a5dd800025b72b0646a913abc5ae678..104b5678de4ff963cbafc94690b5b6d021ee1ed0 100644 (file)
--- a/lily/head-grav.cc
+++ b/lily/head-grav.cc
@@ -1,7 +1,7 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
 /*
   head-grav.cc -- part of GNU LilyPond
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "note-head.hh"
 */
 
 #include "note-head.hh"

diff --git a/lily/header.cc b/lily/header.cc
index fb1e02205b9766854c4f9ff8f1f03ed656be6ec4..39dffd5dbffaf846b6be97ffcdd66d1e840a8ede 100644 (file)
--- a/lily/header.cc
+++ b/lily/header.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "string.hh"
 */
 
 #include "string.hh"

diff --git a/lily/horizontal-align-item.cc b/lily/horizontal-align-item.cc
index e5fe2e8d564c67d60ad15fbf8a3ffb6871575645..82a81c230095d4da921619f49b59296710e495cd 100644 (file)
--- a/lily/horizontal-align-item.cc
+++ b/lily/horizontal-align-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "horizontal-align-item.hh"
 */
 
 #include "horizontal-align-item.hh"

diff --git a/lily/horizontal-group-item.cc b/lily/horizontal-group-item.cc
index 6b3afaf3da7c2a8e633892e37341cab171ef76ea..a894ba521465dadbc47889e79a9cb435a1a10bb6 100644 (file)
--- a/lily/horizontal-group-item.cc
+++ b/lily/horizontal-group-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "p-col.hh"
 */
 
 #include "p-col.hh"

diff --git a/lily/horizontal-vertical-group-item.cc b/lily/horizontal-vertical-group-item.cc
index 2b70f21c624845353948d68b51e9d8ee23ea0c08..dd40fb8182f5d8037c5497a41fdad021add053d2 100644 (file)
--- a/lily/horizontal-vertical-group-item.cc
+++ b/lily/horizontal-vertical-group-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/idealspacing.cc b/lily/idealspacing.cc
index 7497d3b66a8b5508a6fab8d7e07c62a845f8c421..64c1866fd8b3a95a71ece28c1db826e31d51a873 100644 (file)
--- a/lily/idealspacing.cc
+++ b/lily/idealspacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "idealspacing.hh"
 */
 
 #include "idealspacing.hh"

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 107bd2417da618b97ad3e08e563afdc1c728d187..82156417d18a19f451bcae478805ab66ab3377cd 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <assert.h>
 */
 
 #include <assert.h>


@@ -24,9 +24,8 @@ IMPLEMENT_IS_TYPE_B(Identifier);
 
 Identifier::~Identifier()
 {
 
 Identifier::~Identifier()
 {

-  if (!accessed_b_ && !init_b_)
-       warning (_("Variable not used"));

 }
 }

+

 void
 Identifier::error (String expect)
 {
 void
 Identifier::error (String expect)
 {

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 3728476203d6c442f07a1db16d6f605f8506fb21..2d3b45597d2496496b57dc6a0342f8fa63dcf60e 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "includable-lexer.hh"
 #include "source-file.hh"
 */
 #include "includable-lexer.hh"
 #include "source-file.hh"


@@ -30,7 +30,7 @@ Includable_lexer::new_input (String s, Sources  * global_sources)
       LexerError (msg.ch_C ());
       return;
     }
       LexerError (msg.ch_C ());
       return;
     }

-
+  filename_str_arr_.push (sl->name_str ());

 
   char_count_stack_.push (0);
   if (yy_current_buffer)
 
   char_count_stack_.push (0);
   if (yy_current_buffer)


@@ -46,6 +46,7 @@ Includable_lexer::new_input (String s, Sources  * global_sources)
 
     */
   yy_switch_to_buffer (yy_create_buffer (sl->istream_l (), YY_BUF_SIZE));
 
     */
   yy_switch_to_buffer (yy_create_buffer (sl->istream_l (), YY_BUF_SIZE));

+

 }
 
 /** pop the inputstack.  conceptually this is a destructor, but it
 }
 
 /** pop the inputstack.  conceptually this is a destructor, but it

diff --git a/lily/include/abbrev.hh b/lily/include/abbrev.hh
index 9428be7dc25040ba36282bdcc73797eeb5ab4283..ace2cffa532b72124bb4991714578675c95440d4 100644 (file)
--- a/lily/include/abbrev.hh
+++ b/lily/include/abbrev.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/abbreviation-beam-engraver.hh b/lily/include/abbreviation-beam-engraver.hh
index 3a9afc14dc3ee7e217f75602e567c3c6a622ec0e..df3244e4dd089766c5f25442ebdeda6270909c86 100644 (file)
--- a/lily/include/abbreviation-beam-engraver.hh
+++ b/lily/include/abbreviation-beam-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

           Jan Nieuwenhuizen <jan@digicash.com>
 */
 
           Jan Nieuwenhuizen <jan@digicash.com>
 */
 

diff --git a/lily/include/abbreviation-beam.hh b/lily/include/abbreviation-beam.hh
index 9a29de18afa8fd514bc2cffbd82ff2e68f8d94a9..f6eb933e704aa88bc54be3d50054f1836168700a 100644 (file)
--- a/lily/include/abbreviation-beam.hh
+++ b/lily/include/abbreviation-beam.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

           Jan Nieuwenhuizen <jan@digicash.com>
 */
 
           Jan Nieuwenhuizen <jan@digicash.com>
 */
 

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index 4b76e4018cff2d61b6876d5b905df74a0a5ff1e4..b145383d7dc578066fd9c1d310fa34721169dcbb 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef ATOM_HH
 */
 
 #ifndef ATOM_HH

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 273675f611035b07cbad4c1eb8a3d8b6cbe303f5..6065e43a68c2d5783496f640d21cfae7a3ff4d11 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,7 +1,7 @@
 /*
   audio-column.hh -- declare Audio_column
 
 /*
   audio-column.hh -- declare Audio_column
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #ifndef AUDIO_COLUMN_HH
  */
 
 #ifndef AUDIO_COLUMN_HH

diff --git a/lily/include/audio-element.hh b/lily/include/audio-element.hh
index c870887c6f7bb420ef262d97a93b496df3289c69..6fe2a8e068603903cd89d78f3a48406c474dd78b 100644 (file)
--- a/lily/include/audio-element.hh
+++ b/lily/include/audio-element.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 3e3c00c4fb649e50beab4a2870dfa5a8c4142795..3edfa01e48de848f0faac8853f391af598f4153b 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,7 @@
 /*
   audio-item.hh -- declare Audio_items
 
 /*
   audio-item.hh -- declare Audio_items
 

-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #ifndef AUDIO_ITEM_HH
  */
 
 #ifndef AUDIO_ITEM_HH

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 430c5f2c8acbbe1286b5b901d8bcdc6a007e130a..12f3d9c1e8ad1ec419300d6ec9c50358990028f3 100644 (file)
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,7 +1,7 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
 /*
   audio-staff.hh -- declare Audio_staff
 

-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #ifndef AUDIO_STAFF_HH
  */
 
 #ifndef AUDIO_STAFF_HH

diff --git a/lily/include/axis-group-administration.hh b/lily/include/axis-group-administration.hh
index d7e33e4c7e35e587bafeec8bebe1be3eb30a4645..7933590884b66b452f1a3cc832dc17a596324b72 100644 (file)
--- a/lily/include/axis-group-administration.hh
+++ b/lily/include/axis-group-administration.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/axis-group-element.hh b/lily/include/axis-group-element.hh
index b79b70084ecb25a89e2b3725c95e035f611b74b9..f3bfb3f7025553a9f9074607f8916f7c4564b4e4 100644 (file)
--- a/lily/include/axis-group-element.hh
+++ b/lily/include/axis-group-element.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/axis-group-item.hh b/lily/include/axis-group-item.hh
index 1059bdaeed82b810373577792e93b848a48597c3..c61a0810201bc63fbb3c055cddff429c27c761eb 100644 (file)
--- a/lily/include/axis-group-item.hh
+++ b/lily/include/axis-group-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/axis-group-spanner.hh b/lily/include/axis-group-spanner.hh
index 15b132d3663c2214244621ceac92ad0711133aec..64c2df98b2cd6bc964774969baf292ff4faa9618 100644 (file)
--- a/lily/include/axis-group-spanner.hh
+++ b/lily/include/axis-group-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/bar-align-grav.hh b/lily/include/bar-align-grav.hh
index 7da9dfaf3d177ba798010706bc76caeaad9bf5cb..a6579db1979f9874376ac24501418084860b8d39 100644 (file)
--- a/lily/include/bar-align-grav.hh
+++ b/lily/include/bar-align-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/bar-column-grav.hh b/lily/include/bar-column-grav.hh
index c05b2a5414c4c087a55c5fdb6753586d69d495ad..9e058984f54160f747f07b73ed72d5c4666c96d0 100644 (file)
--- a/lily/include/bar-column-grav.hh
+++ b/lily/include/bar-column-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/bar-column.hh b/lily/include/bar-column.hh
index 43fac9672dea776e123878d93e12fb3b8c2a162d..84c32113eace328d2898d483459f3bfcb3556504 100644 (file)
--- a/lily/include/bar-column.hh
+++ b/lily/include/bar-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/bar-grav.hh b/lily/include/bar-grav.hh
index d62fb3ecea720694dae4796d4b9c7a097fdbbbb6..7677f5279d66b08ca43c082021a7c154bb119d77 100644 (file)
--- a/lily/include/bar-grav.hh
+++ b/lily/include/bar-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/bar-number-grav.hh b/lily/include/bar-number-grav.hh
index 5db9c041a24ac61161af2e17342ed014f43d8637..b57a8040a80defd5335f68e671306820e256e677 100644 (file)
--- a/lily/include/bar-number-grav.hh
+++ b/lily/include/bar-number-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/beam-grav.hh b/lily/include/beam-grav.hh
index 81b68adfc19b7edfb3b851a7e34907a25dd551d5..cbfe1bb7d5a50bb979bb798f8f99c3daf31570d1 100644 (file)
--- a/lily/include/beam-grav.hh
+++ b/lily/include/beam-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/beam-swallow-trans.hh b/lily/include/beam-swallow-trans.hh
index 7291fd015728c61ebc5c680012c3ad28532ba8e2..760704fc50cfce0aa9f22b970f016d842185afdb 100644 (file)
--- a/lily/include/beam-swallow-trans.hh
+++ b/lily/include/beam-swallow-trans.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 3729be625cf2c3a656294e3488b9baddaf1d41cb..5294d719d07877804912f174240a682388d1d206 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -16,13 +16,11 @@
   beam and that point in the correct direction */
 class Beam:  public Directional_spanner {
 public:
   beam and that point in the correct direction */
 class Beam:  public Directional_spanner {
 public:

-  /** The beams (especially at small slopes) should be prevented to
-    conflict with the stafflines.  This necessitates some quantisation
-    of start and end posititons of the beam.
+  /** 
+    The beams should be prevented to conflict with the stafflines, 
+    especially at small slopes.

     */
     */

-  enum Pos { NONE, SIT = 1, STRADDLE = 2, HANG = 4, INTER = 8 };
-  // ugh, silly C++ (Pos::NONE vs Quantise::NONE)  
-  enum Quantise { NUNE, NORMAL, TRADITIONAL };
+  enum Quantisation { NONE, NORMAL, TRADITIONAL, TEST };

 
   Link_array<Stem> stems_;
   /// the slope of the beam in posns / point (dimension)   
 
   Link_array<Stem> stems_;
   /// the slope of the beam in posns / point (dimension)   


@@ -33,7 +31,7 @@ public:
   /// should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams
   int damping_i_;
   /// should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional
   /// should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams
   int damping_i_;
   /// should beam pos / slope be quantised? 0: no, 1: yes, 2: traditional

-  Quantise quantisation_;
+  Quantisation quantisation_;

   /// maximum number of beams (for opening-up of beam-spacing)
   int multiple_i_;
 
   /// maximum number of beams (for opening-up of beam-spacing)
   int multiple_i_;
 


@@ -56,10 +54,10 @@ protected:
 
   virtual void do_print() const;
 
 
   virtual void do_print() const;
 

-  virtual void quantise_left_y (Beam::Pos pos, bool extend_b);
+  virtual void quantise_left_y (bool extend_b);

   virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
   virtual void solve_slope ();
   virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
   virtual void solve_slope ();

-  virtual void quantise_yspan ();
+  virtual void quantise_dy ();

   virtual Molecule*brew_molecule_p () const;
 };
 
   virtual Molecule*brew_molecule_p () const;
 };
 

diff --git a/lily/include/bow.hh b/lily/include/bow.hh
index ffa9db31a4cdd2336436ec7cc8935f627ad6b181..4dbf2ead7074cab1b98194150e1d9eb1bab4ee8f 100644 (file)
--- a/lily/include/bow.hh
+++ b/lily/include/bow.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh
index 6ef6818b3d587e705ef24f08ff0a707de77abde5..9d800f8ca6d89f6386fdcd2fa5cb483e40bd2e42 100644 (file)
--- a/lily/include/break-align-item.hh
+++ b/lily/include/break-align-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/break-caching.hh b/lily/include/break-caching.hh
index 676be223df3cb88737d640b8ccb313d297e0779f..188360d0132c20abf74a39ebed9a4c0d84d3e7db 100644 (file)
--- a/lily/include/break-caching.hh
+++ b/lily/include/break-caching.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/break.hh b/lily/include/break.hh
index c6c9058e515e66448d383bf1ce72d55c044893e2..4499686f1060e2818e47045fe0d23db0e03a1ab1 100644 (file)
--- a/lily/include/break.hh
+++ b/lily/include/break.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh
index 69bd360a7bcb18c901ebce3292716dd5e19edef9..e4adf804e1944c75c8f1e363ae2ac5587535ffd6 100644 (file)
--- a/lily/include/change-iterator.hh
+++ b/lily/include/change-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/change-translator.hh b/lily/include/change-translator.hh
index ade016e1d5cf642baffdd34cfbf0614208ff405f..8c759717ed5d55697c04aae650c99f708dcd8d33 100644 (file)
--- a/lily/include/change-translator.hh
+++ b/lily/include/change-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/chord-iterator.hh b/lily/include/chord-iterator.hh
index a3adc4a381e868416b55a0d1bb94bbeb1da72216..0a3c9fa64a7e38f2c516aaed2b0e26de595e09ca 100644 (file)
--- a/lily/include/chord-iterator.hh
+++ b/lily/include/chord-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/clef-grav.hh b/lily/include/clef-grav.hh
index ffd499920aac581a17d4b22708bfd149f4e11c4f..61318648edad7f5900de05aeb1d8e2241f73dfef 100644 (file)
--- a/lily/include/clef-grav.hh
+++ b/lily/include/clef-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 8e64f68d466be2e2268e552233852e705bec8780..49694352d091316dc5a67626e157925daf0e1942 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh
index 3c42dd98cbdc5ed040b453df627603d9f3b3a89a..01a87167ba10fef873a082c095eba138f7949598 100644 (file)
--- a/lily/include/colhpos.hh
+++ b/lily/include/colhpos.hh
@@ -1,7 +1,7 @@
 /*
   colhpos.hh -- part of GNU LilyPond
 
 /*
   colhpos.hh -- part of GNU LilyPond
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef COLHPOS_HH
 */
 
 #ifndef COLHPOS_HH

diff --git a/lily/include/collision-grav.hh b/lily/include/collision-grav.hh
index 996165c3a3b8ce6f828c18224f5c232c9f8228d9..6cf18d7dbcd8569af9b4e7d32a68d1d54e8674e0 100644 (file)
--- a/lily/include/collision-grav.hh
+++ b/lily/include/collision-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/collision.hh b/lily/include/collision.hh
index 08b07065726b25f2647ee68ebd975864bbaa92f2..9d47efb5139e42c5ec5798440e9f5d243eb44b12 100644 (file)
--- a/lily/include/collision.hh
+++ b/lily/include/collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index 11491edc4163c9fa705cc74991586b2eda8b012f..9a12dc8e19d146ca7f639909d7ff2aaf1b806d5b 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh
index 6c8a9df8054fefa9b77a52d5b6af0cebe7075ac4..0b62f658102dde03cd4fb64e3c987c9c8a783ebc 100644 (file)
--- a/lily/include/crescendo.hh
+++ b/lily/include/crescendo.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/direction.hh b/lily/include/direction.hh
index 358c482517c2611befd5265b87b64c4ca34bf04a..416b3fc33f1efc895a960f6df8b392231e422d26 100644 (file)
--- a/lily/include/direction.hh
+++ b/lily/include/direction.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/dot-column-grav.hh b/lily/include/dot-column-grav.hh
index 38db1b569ac82cbb9f0e57fe4803b55a1ed657e5..e2e3b660fdeba4b10e8bd9e62f87f2704b8743c8 100644 (file)
--- a/lily/include/dot-column-grav.hh
+++ b/lily/include/dot-column-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh
index 01e3e3d3e5ef2f1f16cd94011f47b91d8e4a8c43..9d8d5e552a4a679b8f591742c2b92995d7d3eb13 100644 (file)
--- a/lily/include/dot-column.hh
+++ b/lily/include/dot-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/dots.hh b/lily/include/dots.hh
index 5463934a21c0607134cfc44f6c0e1b9b19b6537f..846cf0364f4eafbdf5e936f51fe4a1a4b153969c 100644 (file)
--- a/lily/include/dots.hh
+++ b/lily/include/dots.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/drul-array.hh b/lily/include/drul-array.hh
index 962fd2b6c21d2a7e8b98f6de03e19974c52a5370..9169a5782876790a23bf02b7931c3da97d1a580f 100644 (file)
--- a/lily/include/drul-array.hh
+++ b/lily/include/drul-array.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/dynamic-grav.hh b/lily/include/dynamic-grav.hh
index a44e3cc8018d38a70d833b0e913aa069f67719d5..29d3e2fa73d3ff394bc38badb84a047960d0ca78 100644 (file)
--- a/lily/include/dynamic-grav.hh
+++ b/lily/include/dynamic-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/elem-group.hh b/lily/include/elem-group.hh
index 59bb03cdf052c0ad86b357eb622ac569f13d11d5..6ad1d1d24371e35b7482a8f65b506afd77b163c3 100644 (file)
--- a/lily/include/elem-group.hh
+++ b/lily/include/elem-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 72f14f3c3cdb6f20e358a0753120a3ab00f3aed6..125021cdf6122e088bea994d61709be35aa3c1bb 100644 (file)
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 9814b24fbe81c87d7f62d1e627e7502382fc713c..f6b4f6bafa82b7cca2256b1f5e6cc1461a0a92d1 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/file-results.hh b/lily/include/file-results.hh
new file mode 100644 (file)
index 0000000..3d6df5e
--- /dev/null
+++ b/lily/include/file-results.hh
@@ -0,0 +1,24 @@
+/*   
+  file-results.hh -- declare 
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  
+ */
+
+#ifndef FILE_RESULTS_HH
+#define FILE_RESULTS_HH
+#include "fproto.hh"
+
+void do_one_file (String init_str, String file_str);
+
+extern Array<String> target_str_global_array;
+extern Array<String> inclusion_global_array;
+extern Link_array<Score> score_global_array;
+void do_scores ();
+void clear_scores ();
+
+
+#endif /* FILE_RESULTS_HH */
+

diff --git a/lily/include/general-script-def.hh b/lily/include/general-script-def.hh
index 4faf568ae939bde4788dedb4f3799fc8844d0b56..024468e3436a3f4f2486a793a93ee669b7f8eb61 100644 (file)
--- a/lily/include/general-script-def.hh
+++ b/lily/include/general-script-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh
index dbcc8a52546b0c25b7a8e67abb556a4f6c424812..dddfacb0b2d1b4d1a9d451d957340c131ff03a9e 100644 (file)
--- a/lily/include/global-translator.hh
+++ b/lily/include/global-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh
index d8c3472a14898ff3c74dbab8deaa14cf489a9bfc..f01df2384885b2bd63adbb3e9f4ddedced21aef7 100644 (file)
--- a/lily/include/gourlay-breaking.hh
+++ b/lily/include/gourlay-breaking.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/graphical-element.hh b/lily/include/graphical-element.hh
index aff7de6793306291ce01805c7c1d6c79e46a767f..6dce57708b5e1f6dd23a55d9fb5cfc6f2e5bb468 100644 (file)
--- a/lily/include/graphical-element.hh
+++ b/lily/include/graphical-element.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/head-grav.hh b/lily/include/head-grav.hh
index 66411a4ea86beeb14fbc3213932700bb35ed8d09..8841f4e7e8545e5bc24567113fa4c9c5cdb4db53 100644 (file)
--- a/lily/include/head-grav.hh
+++ b/lily/include/head-grav.hh
@@ -1,7 +1,7 @@
 /*
   head-grav.hh -- part of GNU LilyPond
 
 /*
   head-grav.hh -- part of GNU LilyPond
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/header.hh b/lily/include/header.hh
index e74aadc2360d18da7b21c75725e474089c231cc1..4877f396f61507cd9a8450297559639448025e1c 100644 (file)
--- a/lily/include/header.hh
+++ b/lily/include/header.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/horizontal-align-item.hh b/lily/include/horizontal-align-item.hh
index 7ae19db88ba0a1a4b55810b37e3ea201077d5515..da0794d760e1b595f9a39978f20219fae6e84499 100644 (file)
--- a/lily/include/horizontal-align-item.hh
+++ b/lily/include/horizontal-align-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/horizontal-group-elem.hh b/lily/include/horizontal-group-elem.hh
index 8d3adfb48a9eebb6515c747dc0f0ab47c3985b2a..db851583ccd79aedd86f94638870f99c3361e352 100644 (file)
--- a/lily/include/horizontal-group-elem.hh
+++ b/lily/include/horizontal-group-elem.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/horizontal-group-item.hh b/lily/include/horizontal-group-item.hh
index 568c257c64bfc0d890d02310f92950207f8b2f4b..d94e0df1a4291acf4cde10a52628c0110940ce91 100644 (file)
--- a/lily/include/horizontal-group-item.hh
+++ b/lily/include/horizontal-group-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/horizontal-vertical-group-elem.hh b/lily/include/horizontal-vertical-group-elem.hh
index 9080872395c073c42f7bc63fe2c68f208c72c1b7..ed4c3a771301533794e10c0a95d12109f454b00e 100644 (file)
--- a/lily/include/horizontal-vertical-group-elem.hh
+++ b/lily/include/horizontal-vertical-group-elem.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/horizontal-vertical-group-item.hh b/lily/include/horizontal-vertical-group-item.hh
index 1aa8c8b82ca5254d09d91afd42f7845800ef29e2..50e1e9ef562564f5650992e127399ae67ac87eb1 100644 (file)
--- a/lily/include/horizontal-vertical-group-item.hh
+++ b/lily/include/horizontal-vertical-group-item.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
 
   
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index fc077f60ab30a3701eb3408d6880a95793be63ac..b7365e5650cac124374da87652fa60d795208f0f 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -13,7 +13,7 @@
 #include "virtual-methods.hh"
 
 #define IDACCESSOR( Input_staff, staff)\
 #include "virtual-methods.hh"
 
 #define IDACCESSOR( Input_staff, staff)\

-    virtual Input_staff * staff () { error (#Input_staff); return 0; }
+virtual Input_staff * staff () { error (#Input_staff); return 0; }

 
 /**
    A declarable data structure in mudela. 
 
 /**
    A declarable data structure in mudela. 


@@ -21,17 +21,17 @@
 
    */
 struct Identifier : public Input {
 
    */
 struct Identifier : public Input {

-    bool init_b_;
-    bool accessed_b_;
-    int token_code_i_;
+  bool init_b_;
+  bool accessed_b_;
+  int token_code_i_;

     
     

-    Identifier (int code) ;
-    virtual ~Identifier() ;
+  Identifier (int code) ;
+  virtual ~Identifier() ;

 
 

-    void print() const;
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    void error (String);
-    IDACCESSOR(Translator, translator)
+  void print() const;
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  void error (String);
+  IDACCESSOR(Translator, translator)

     IDACCESSOR(Music, music)
     IDACCESSOR(General_script_def, script)
     IDACCESSOR(Symtables, symtables)
     IDACCESSOR(Music, music)
     IDACCESSOR(General_script_def, script)
     IDACCESSOR(Symtables, symtables)


@@ -44,20 +44,20 @@ struct Identifier : public Input {
     IDACCESSOR(int, intid)
     IDACCESSOR(Duration, duration)
 
     IDACCESSOR(int, intid)
     IDACCESSOR(Duration, duration)
 

-protected:
-    virtual void do_print() const=0;
+    protected:
+  virtual void do_print() const=0;

 private:
 private:

-    Identifier (Identifier const&);
+  Identifier (Identifier const&);

 };
 
 #define DECLARE_ID_CLASS(Idclass, Class, accessor)     \
 struct Idclass : Identifier {\
 };
 
 #define DECLARE_ID_CLASS(Idclass, Class, accessor)     \
 struct Idclass : Identifier {\

-       Class *data_p_;              \
-        DECLARE_MY_RUNTIME_TYPEINFO;                       \
-       Idclass (Class*st, int code);\
-       virtual Class* accessor ();\
-       ~Idclass();\
-       virtual void do_print() const; \
+                            Class *data_p_;                 \
+                            DECLARE_MY_RUNTIME_TYPEINFO;                           \
+                            Idclass (Class*st, int code);\
+                            virtual Class* accessor ();\
+                            ~Idclass();\
+                            virtual void do_print() const; \

 }\
 
 
 }\
 
 

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index f9dce9696d8f802258d1ac421ea03405e8950968..9cf7087369832046e9946caea707284992c46baf 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -30,6 +30,8 @@ protected:
   Array<Source_file*> include_stack_;
   Array<int> char_count_stack_;
 public:
   Array<Source_file*> include_stack_;
   Array<int> char_count_stack_;
 public:

+  /// store dependencies for Makefile stuff.
+  Array<String> filename_str_arr_;

 
   Source_file* source_file_l () const;
   void new_input (String s,Sources*);
 
   Source_file* source_file_l () const;
   void new_input (String s,Sources*);

diff --git a/lily/include/ineq-constrained-qp.hh b/lily/include/ineq-constrained-qp.hh
index 5cb5c43eb9c632c156f7dbabd8a7c1e5bb4007c2..3b23cb898f2d4a86df817911859fe1f913ec1c06 100644 (file)
--- a/lily/include/ineq-constrained-qp.hh
+++ b/lily/include/ineq-constrained-qp.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 64bcca5e700ba347abe2d38d2d66e18db446e5af..0a20e7614844d1db6d35ff12b4cdfab90d579633 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #ifndef ITEM_HH
 #define ITEM_HH
 */
 #ifndef ITEM_HH
 #define ITEM_HH

diff --git a/lily/include/key-grav.hh b/lily/include/key-grav.hh
index b81605e547ce4ed72ad98ecd99a842661733e584..59ab88c6619f47a297a6c277ad38d85990c851fe 100644 (file)
--- a/lily/include/key-grav.hh
+++ b/lily/include/key-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/key-performer.hh b/lily/include/key-performer.hh
index 903e7f66b0b16979c2b3bf868dd5834f39ccc00a..f76b9e11fde996e2408fdfd8c72f39a6f61e879b 100644 (file)
--- a/lily/include/key-performer.hh
+++ b/lily/include/key-performer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #ifndef KEY_PERFOMER_HH
 */
 
 #ifndef KEY_PERFOMER_HH

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index 9adfb26c096710b52fe32ebd39e48946522f0019..670125e1c7a491eef657a6274a45ecffd5847934 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef LILY_PROTO_HH
 */
 
 #ifndef LILY_PROTO_HH

diff --git a/lily/include/line-group-grav.hh b/lily/include/line-group-grav.hh
index 5316de9a8a8bf46a2aa17a8e46e75bb6b39bed24..f6d4e6b35f86473ab906d1419cdea69938ea00ef 100644 (file)
--- a/lily/include/line-group-grav.hh
+++ b/lily/include/line-group-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/line-spacer.hh b/lily/include/line-spacer.hh
index d91901bdfefe5ccc504e0086dc3bf290c53959d9..1bc88f52c2df68e8143860e38080825ad9adff4f 100644 (file)
--- a/lily/include/line-spacer.hh
+++ b/lily/include/line-spacer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/linear-programming.hh b/lily/include/linear-programming.hh
index 1490edfede3efd5895c294f891f2a95fced45230..08eefad8230e3f17ac6b387a694bda05e00b83ff 100644 (file)
--- a/lily/include/linear-programming.hh
+++ b/lily/include/linear-programming.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/linespace.hh b/lily/include/linespace.hh
index 396c840a12b5a85e45b43b9668cefcb3338cf12c..a468fad24f1e732fc9884fda408a520d20795c72 100644 (file)
--- a/lily/include/linespace.hh
+++ b/lily/include/linespace.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #error
 */
 
 #error

diff --git a/lily/include/local-key-grav.hh b/lily/include/local-key-grav.hh
index d7c37829bb1a61e3e2a5e38a8d95ede608329667..b61446b760cf16fd5d951b0990fe118e6572c270 100644 (file)
--- a/lily/include/local-key-grav.hh
+++ b/lily/include/local-key-grav.hh
@@ -1,7 +1,7 @@
 /*
   local-key-grav.hh -- declare Local_key_engraver
 
 /*
   local-key-grav.hh -- declare Local_key_engraver
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 4e924397b17f12013962e7670d81d3af29cd3904..9b291ee9ab1dca54db51aa58b771a9ac5f18c341 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef LOOKUPSYMS_HH
 */
 
 #ifndef LOOKUPSYMS_HH


@@ -32,9 +32,8 @@ struct Lookup {
   Atom fill (Box b) const;
   Atom beam_element (int,int,Real=0) const;
 
   Atom fill (Box b) const;
   Atom beam_element (int,int,Real=0) const;
 

-  /// round slope to closest TeXslope
-  Atom beam (Real&,Real, Real) const;
-  Atom ps_beam (Real, Real, Real)const;
+  Atom beam (Real,Real, Real) const;
+  Atom ps_beam (Real, Real, Real) const;

 
   Atom streepje (int type) const;
 
 
   Atom streepje (int type) const;
 


@@ -52,10 +51,10 @@ struct Lookup {
     
   Atom dots () const;
   Atom slur (Array<Offset> controls) const;
     
   Atom dots () const;
   Atom slur (Array<Offset> controls) const;

-  Atom plet (Real &dy, Real &dx, Direction dir) const;
+  Atom plet (Real dy, Real dx, Direction dir) const;

   Atom text (String style, String text, int align = 1) const;
   Atom script (String idx) const;
   Atom text (String style, String text, int align = 1) const;
   Atom script (String idx) const;

-  Atom hairpin (Real & width, bool decresc, bool continued) const;
+  Atom hairpin (Real width, bool decresc, bool continued) const;

   Atom dynamic (String) const;
 };
 
   Atom dynamic (String) const;
 };
 

diff --git a/lily/include/lyric-engraver.hh b/lily/include/lyric-engraver.hh
index 96b6d1dbd05e59aacc3d48e9584d36f92772f4b3..195e4f92dca6fbaf6bdb5a6bf8a05b9cbdd9ad49 100644 (file)
--- a/lily/include/lyric-engraver.hh
+++ b/lily/include/lyric-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/lyric-performer.hh b/lily/include/lyric-performer.hh
index c8a476037d8ea497da7770baf006ac9c36c3fc54..2660f890021e0c329e5eec18f061621904d33162 100644 (file)
--- a/lily/include/lyric-performer.hh
+++ b/lily/include/lyric-performer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 
 */
 
 

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 646f82638a9cc8ce47ad720d89a20ac6d02640a9..e5c3191723ae9305c3704b72522caf54d5c09547 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #ifndef MAIN_HH
 #define MAIN_HH
 */
 #ifndef MAIN_HH
 #define MAIN_HH


@@ -24,6 +24,11 @@ extern bool no_paper_global_b;
 extern bool no_timestamps_global_b;
 extern int exit_status_i_;
 extern bool experimental_features_global_b;
 extern bool no_timestamps_global_b;
 extern int exit_status_i_;
 extern bool experimental_features_global_b;

+extern bool dependency_global_b;
+extern bool version_ignore_global_b;
+
+extern Array<String> get_inclusion_names ();
+extern void set_inclusion_names (Array<String>);

 
 extern String default_outname_base_global;
 extern String default_outname_suffix_global;
 
 extern String default_outname_base_global;
 extern String default_outname_suffix_global;

diff --git a/lily/include/meter-grav.hh b/lily/include/meter-grav.hh
index 90d19b1fdbbf367b445b3ef8cacab5695b6811a7..3abe46230bca69f75110728599c641e44ead1154 100644 (file)
--- a/lily/include/meter-grav.hh
+++ b/lily/include/meter-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/meter-performer.hh b/lily/include/meter-performer.hh
index fa2f06e9ffcc54f2b8c3f4576a378612bcb0653a..f3fe174dd15ad77497c2e4895010873237150d11 100644 (file)
--- a/lily/include/meter-performer.hh
+++ b/lily/include/meter-performer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #ifndef METER_PERFOMER_HH
 */
 
 #ifndef METER_PERFOMER_HH

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index 9d58a1b311ad72225dc2e289a2423555aa950328..98951c10f17401cedd01df3a55839022a15b2d82 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 
 */
 
 

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 55df8f34eefb51520c7977ccaa5b602fcb5cdc78..ca89bacec17cb4722dfb1cd45e37f81336b9f583 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,7 +1,7 @@
 /*
   midi-item.hh -- declare Midi items
 
 /*
   midi-item.hh -- declare Midi items
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #ifndef MIDI_ITEM_HH
  */
 
 #ifndef MIDI_ITEM_HH

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 87e8ec5d27c4cf6ad78cb08e5bc1629785f6e5fa..f3a3781ed3c72662ae7136cee87c411745012a75 100644 (file)
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,7 +1,7 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
 /*
   midi-stream.hh -- declare Midi_stream
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #ifndef MIDI_STREAM_HH
  */
 
 #ifndef MIDI_STREAM_HH

diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh
index 492553ec8bfb95fad741dff90617e92d7ce1a0cb..c7a20f76ace44ee60a397c26da9ae26c9336799f 100644 (file)
--- a/lily/include/midi-walker.hh
+++ b/lily/include/midi-walker.hh
@@ -1,7 +1,7 @@
 /*
   midi-walker.hh -- declare Midi_walker
 
 /*
   midi-walker.hh -- declare Midi_walker
 

-  (c) 1996, 1997 Han-Wen Nienhuys  <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys  <hanwen@stack.nl>

                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/include/minterval.hh b/lily/include/minterval.hh
index f1c1e1677ddbd690eca53d234f945b89a301b9cf..bb56394a7d40221c63f3c96ffa6ad8266dfaab63 100644 (file)
--- a/lily/include/minterval.hh
+++ b/lily/include/minterval.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 28e55399ecef3dbd594b0739529c9fa45056a562..35a10dfaf94e264457525fe83d2d6c58f69b378c 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,13 +1,10 @@
 #ifndef MISC_HH
 #define MISC_HH
 
 #ifndef MISC_HH
 #define MISC_HH
 

-#include "lily-proto.hh"

 #include "real.hh"
 #include "real.hh"

-#include "moment.hh"
-#include "scalar.hh"
-#include "grouping.hh"
+#include "varray.hh"
+#include "interval.hh"

 
 

-Moment wholes (int dur, int dots);

 double log_2(double x) ;
 int intlog2(int d);
 #if ! defined(_ABS_)
 double log_2(double x) ;
 int intlog2(int d);
 #if ! defined(_ABS_)


@@ -23,6 +20,15 @@ sign (int i) {
     else return 0;
 }
 
     else return 0;
 }
 

+#ifndef STANDALONE
+#include "lily-proto.hh"

 Interval itemlist_width (const Array<Item*> &its);
 Interval itemlist_width (const Array<Item*> &its);

+#endif
+
+int get_lower_bound (Array<Real> const& positions, Real x);
+Slice get_bounds_slice (Array<Real> const& positions, Real x);
+Interval get_bounds_iv (Array<Real> const& positions, Real x);
+Interval quantise_iv (Array<Real> const& positions, Real period, Real x);

 
 #endif
 
 #endif

+

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index ddea093d0e455e42414caf290d1f4b041e06bd51..3faccc45f8ec84e2f6a427d1dc145c6c0e691a90 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #ifndef MOLECULE_HH
 #define MOLECULE_HH
 */
 #ifndef MOLECULE_HH
 #define MOLECULE_HH

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index d543a858c99248ebccf7af0df66d835ba9029462..f3f6b4e155932ae4513fb3fb72a7dde8f94f7eb8 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index f084c19ecb00409deff1bd3a9f00193aea763053..21c3ca9056bbfa1bff3f996fe1804490af27dbd9 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh
index 2c8fa3093a8b5a95255cceb2d3d2f59bab26b257..b4cd413412da25941eee67ad3592d71ebc90929e 100644 (file)
--- a/lily/include/music-output-def.hh
+++ b/lily/include/music-output-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -23,6 +23,9 @@ class Music_output_def
 {
 public:
   Dictionary<Translator*> translator_p_dict_;
 {
 public:
   Dictionary<Translator*> translator_p_dict_;

+  Array<String> filename_str_arr_;
+
+

   
   Music_output_def (Music_output_def const&);
   Music_output_def ();
   
   Music_output_def (Music_output_def const&);
   Music_output_def ();

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index f777f1b6bbba54b84b0ebaa7a612ce497c3700f8..6f2807ff2cb5983806ced1cde181c2e8937ffd8e 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 767c109a535d78952aedcef851e98df25ab62a7a..c59cb5b88b801ae89d7de8d3589f0931837aeafa 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index e46153c9f763f89c88c9d2636b31ef985abd74dd..329b1cd0d050dd75b4820b7f8721cd76e599bd72 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index 6b659ad7d98fcc0a27f09eba22fd2d1a6dc71bba..8aa5319c28cb28b6a4298ae83df4cd62820e5103 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef LEXER_HH
 */
 
 #ifndef LEXER_HH


@@ -33,8 +33,9 @@ class My_lily_lexer : public Includable_lexer {
   bool post_quotes_b_;
   char escaped_char(char) const;
 public:
   bool post_quotes_b_;
   char escaped_char(char) const;
 public:

+  String main_input_str_;

   void * lexval_l;
   void * lexval_l;

-    
+  

   Notename_table  *note_tab_p_;
   Dictionary<Identifier*> *identifier_p_dict_p_;
   Keyword_table * keytable_p_;
   Notename_table  *note_tab_p_;
   Dictionary<Identifier*> *identifier_p_dict_p_;
   Keyword_table * keytable_p_;


@@ -42,6 +43,7 @@ public:
 
   /* *************** */
 
 
   /* *************** */
 

+  void start_main_input ();

   void clear_notenames();
   Identifier*lookup_identifier (String s);
   Melodic_req* lookup_melodic_req_l (String s);
   void clear_notenames();
   Identifier*lookup_identifier (String s);
   Melodic_req* lookup_melodic_req_l (String s);

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index b5cbd87154e8fdc594b257008156cd84faa26378..63b520ecabba7fceb3ab6277a8e0fa92ab054976 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 


@@ -70,7 +70,6 @@ public:
     
   void set_debug();
   void set_yydebug (bool);
     
   void set_debug();
   void set_yydebug (bool);

-  void print_declarations();

   bool ignore_version_b_;
 public:
   void do_init_file();
   bool ignore_version_b_;
 public:
   void do_init_file();

diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh
index b2be9b347962b8b2b6ab4a7a805174a02550a910..960349f403c46c333658018ae0eb80b67c158d4c 100644 (file)
--- a/lily/include/note-column.hh
+++ b/lily/include/note-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh
index 661e378dc132bbfc60958a9f917ae25ede1b440e..c3b77ea415af9e5526b7c0c09ffa076676412f46 100644 (file)
--- a/lily/include/note-performer.hh
+++ b/lily/include/note-performer.hh
@@ -1,7 +1,7 @@
 /*
   note-performer.hh -- declare Note_performer
 
 /*
   note-performer.hh -- declare Note_performer
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/include/notename-table.hh b/lily/include/notename-table.hh
index 2e9b0bd9fd9b8aabfff14e5ce7c520ac81627737..96dcccb84cdc6cdb20b69898b331c5cc3ba6af2d 100644 (file)
--- a/lily/include/notename-table.hh
+++ b/lily/include/notename-table.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/outputter.hh b/lily/include/outputter.hh
index 4b80892990d1175930c15c6751888b4ba17328b2..cb842e4c6c8b9f0d192c1eb618644aaf28a88373 100644 (file)
--- a/lily/include/outputter.hh
+++ b/lily/include/outputter.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/p-col.hh b/lily/include/p-col.hh
index 918800a7c6b72a7f5c7d848dbecb3e3f702ac17d..5ab02c841037af26c22ee4c99daa6b8e3589ff9c 100644 (file)
--- a/lily/include/p-col.hh
+++ b/lily/include/p-col.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh
index f8c87557a03d71ac3220cd89725a131c4cbe4ee8..60ebda08cd8be2cb042b76800b703fb62c888b0f 100644 (file)
--- a/lily/include/p-score.hh
+++ b/lily/include/p-score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 4bf3b9589ca0b7594798f26bf72849d504d25486..671faf456e836ba79ea48224a3a247a2130618a7 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 962f01fa4d296b7a0a801a7f45039bf4fa84c8cb..923575769d2f439bdde6b79da30558554547ce5b 100644 (file)
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -1,7 +1,7 @@
 /*
   performance.hh -- declare Performance
 
 /*
   performance.hh -- declare Performance
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #ifndef PERFORMANCE_HH
  */
 
 #ifndef PERFORMANCE_HH

diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh
index da592ef9bf9d7729a75c6a435f43612ba41c75e1..f5bcb61b4a27bc52568d226f4ac673e851882692 100644 (file)
--- a/lily/include/performer-group-performer.hh
+++ b/lily/include/performer-group-performer.hh
@@ -1,7 +1,7 @@
 /*
   performer-group-performer.hh -- declare Performer_group_performer
 
 /*
   performer-group-performer.hh -- declare Performer_group_performer
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 8335f87bc3c165b5fb1185f7403696012a9053a2..5d17b6afef9a3daf791be342cadc7d12f7712921 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,7 +1,7 @@
 /*
   performer.hh -- declare Performer
 
 /*
   performer.hh -- declare Performer
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/include/pitch-squash-grav.hh b/lily/include/pitch-squash-grav.hh
index dc68980ea11093d8e69197f8abcd711dab358e5e..9f224fa6ab530a7b9f689c6ef93092cf82c43a54 100644 (file)
--- a/lily/include/pitch-squash-grav.hh
+++ b/lily/include/pitch-squash-grav.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/plet-engraver.hh b/lily/include/plet-engraver.hh
index 16d0beab3594314e51a0bf47100e2e9b6013812d..7de90d45261d400dc9d1b8d23141fca6bc0604e5 100644 (file)
--- a/lily/include/plet-engraver.hh
+++ b/lily/include/plet-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #ifndef PLET_ENGRAVER_HH
 */
 
 #ifndef PLET_ENGRAVER_HH

diff --git a/lily/include/plet-spanner.hh b/lily/include/plet-spanner.hh
index 8caa2d01473131321cc95d8d67baf0b469fafac1..1625721bf45e0ad22f9597adc9dc5c8137926a43 100644 (file)
--- a/lily/include/plet-spanner.hh
+++ b/lily/include/plet-spanner.hh
@@ -1,7 +1,7 @@
 /*
   plet-spanner.hh -- part of GNU LilyPond
 
 /*
   plet-spanner.hh -- part of GNU LilyPond
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #ifndef PLET_SPANNER_HH
 */
 
 #ifndef PLET_SPANNER_HH

diff --git a/lily/include/plet-swallow-engraver.hh b/lily/include/plet-swallow-engraver.hh
index be361205c08e661c295dededd1884b314cce66dd..8dd6affd4ea2fadb9948b984924f57237d8eb848 100644 (file)
--- a/lily/include/plet-swallow-engraver.hh
+++ b/lily/include/plet-swallow-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/priority-halign-grav.hh b/lily/include/priority-halign-grav.hh
index 4d6fdb6a7d7596673000468cc3ce3db03c59c84f..b591a40eb40ef698a82153588762b38fb7b754c2 100644 (file)
--- a/lily/include/priority-halign-grav.hh
+++ b/lily/include/priority-halign-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index 08eb9bf54775946b304e3a7b13d8543a138d5675..f0dfbb5fb9bd9b02a6b638b21e1ed1d74557c650 100644 (file)
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/qlp.hh b/lily/include/qlp.hh
index e40b34ff0710b1191029ad05eacd6289030d1948..82371d363c1377be569b9e4b54eba478ed06775a 100644 (file)
--- a/lily/include/qlp.hh
+++ b/lily/include/qlp.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef QLP_HH
 */
 
 #ifndef QLP_HH

diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh
index db985df6c54a83e28ad0bf18f2d66b3a759de3dc..dc2aaa5663d6f0d01e41a17f2b6bf75513b4a02e 100644 (file)
--- a/lily/include/qlpsolve.hh
+++ b/lily/include/qlpsolve.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/request-iterator.hh b/lily/include/request-iterator.hh
index 866bb7e929da486e3a233e8e6ce4955b80063ca2..8f7a30b4c8960fd66b5fdcb685b16c01beaeb64b 100644 (file)
--- a/lily/include/request-iterator.hh
+++ b/lily/include/request-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/request.hh b/lily/include/request.hh
index e93f493176cc8f08f78c8888bc47a8acf92269b7..ccdf48422b51301ef9a6d30f22273df4360ee4cd 100644 (file)
--- a/lily/include/request.hh
+++ b/lily/include/request.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef REQUEST_HH
 */
 
 #ifndef REQUEST_HH

diff --git a/lily/include/rest-collision-grav.hh b/lily/include/rest-collision-grav.hh
index b763e4c63b3daf1cedaddf1601764521c0b81194..0e99b48b75878ffc103b1f3dc8058c811a42d745 100644 (file)
--- a/lily/include/rest-collision-grav.hh
+++ b/lily/include/rest-collision-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index cbeaf6fbe83664bbdd8c1a5fcd51dcf724a1ef3c..4d39f54347ef0166e644704d124661ff9843fc8a 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/rest-grav.hh b/lily/include/rest-grav.hh
index 974955c2c6db2f7fddfe63cd4dad9a76c8757216..67006a98af52323409763624ce1089599fe1404a 100644 (file)
--- a/lily/include/rest-grav.hh
+++ b/lily/include/rest-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 028e7f8c323bf673e87ace9e94cfee9f38c782ef..65cddc848e6b7eb89d206e91b07dce3e3020547c 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/rhythmic-column-grav.hh b/lily/include/rhythmic-column-grav.hh
index b9a2e6c78f52dd79721d9de05264f5688fb0a11e..52e0904e3bea080387f48853ff7c9bb7aec5d600 100644 (file)
--- a/lily/include/rhythmic-column-grav.hh
+++ b/lily/include/rhythmic-column-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh
index 361591012d62aee9f2a923b7306651069bae600b..84a1728b0a4ac7d89c11dda7461bcba87f209edd 100644 (file)
--- a/lily/include/rhythmic-head.hh
+++ b/lily/include/rhythmic-head.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/score-bar.hh b/lily/include/score-bar.hh
index 9ee61c5b0fe10e99d2d20d00080de6e70cd4b857..298404da5d34bc55be4f2a81786f5edfb82eefc3 100644 (file)
--- a/lily/include/score-bar.hh
+++ b/lily/include/score-bar.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/score-column.hh b/lily/include/score-column.hh
index 624c49ef31c0f77a29cb7dcb48efef9c4d58ccdc..961de68e2bc0790e4ada149fa87f18a91171a9e3 100644 (file)
--- a/lily/include/score-column.hh
+++ b/lily/include/score-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/score-elem-info.hh b/lily/include/score-elem-info.hh
index 5e327a4b0e4c24e91454ee35005b5a31053d4961..edd695c4b977a7bd285fadfea55073d60cadc79f 100644 (file)
--- a/lily/include/score-elem-info.hh
+++ b/lily/include/score-elem-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/score-grav.hh b/lily/include/score-grav.hh
index 6348cdadf073552b8d1204ea009267ba450cf58b..4f11fd0f8f42070ee47d3d86a315eb1c9e777a65 100644 (file)
--- a/lily/include/score-grav.hh
+++ b/lily/include/score-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index b093ae090ead388c118db9dd003e75f0ff6d2ca2..3aa4d4ba7e03ddade72d150029a1043bc60ebfef 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,7 +1,7 @@
 /*
   score-performer.hh -- declare Score_performer
 
 /*
   score-performer.hh -- declare Score_performer
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/include/score-priority-grav.hh b/lily/include/score-priority-grav.hh
index 48ed10e7b1044b50ae56d5a60d6cfe8ebae0d411..8b6ab1c1a729a0d96cfeea1b43c8afd30d6730c8 100644 (file)
--- a/lily/include/score-priority-grav.hh
+++ b/lily/include/score-priority-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 8d9666b0c5542381abb86f8f03fa25c0783cd902..667e44340229c84b99e3110ded8b587e93c92198 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh
index 335ed551fec491d71b6833decb69ca760534ae6a..1b7328b1e50ff9a02bff8197a2f96d5aebdba43e 100644 (file)
--- a/lily/include/script-column.hh
+++ b/lily/include/script-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/script-grav.hh b/lily/include/script-grav.hh
index e0463fcf49f8443e5c37493970d4f92bebaa8da8..e8040c53726594390082aec1bafae65dd8e3ce9d 100644 (file)
--- a/lily/include/script-grav.hh
+++ b/lily/include/script-grav.hh
@@ -1,7 +1,7 @@
 /*
   script-grav.hh -- part of GNU LilyPond
 
 /*
   script-grav.hh -- part of GNU LilyPond
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/single-malt-grouping-item.hh b/lily/include/single-malt-grouping-item.hh
index a220ee4c19a1f9c8a486468a37aa7f2be3bb4bf4..0e69c49ded3ce2d02e581066736269a47928c4bd 100644 (file)
--- a/lily/include/single-malt-grouping-item.hh
+++ b/lily/include/single-malt-grouping-item.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/slur-grav.hh b/lily/include/slur-grav.hh
index a27e0518955b6878454bd202f2339f5a0175871c..64dd45251c2c7cac9412947a9d676af535aa82bb 100644 (file)
--- a/lily/include/slur-grav.hh
+++ b/lily/include/slur-grav.hh
@@ -1,7 +1,7 @@
 /*
   slur-grav.hh -- declare Slur_engraver
 
 /*
   slur-grav.hh -- declare Slur_engraver
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/span-bar-grav.hh b/lily/include/span-bar-grav.hh
index 59a99f5f8b124dda8b3946024bbcc2e59097fdcc..c7e6241e84f4f1d85a9a5cb9529688f364273d84 100644 (file)
--- a/lily/include/span-bar-grav.hh
+++ b/lily/include/span-bar-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index af20eca67fdef9f9207ccd60f5cb63f4030cef55..4d0744de011fff6bbe54ebaf0416d8d1e62409c7 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/span-score-bar-grav.hh b/lily/include/span-score-bar-grav.hh
index 39da0ab69c8b6ef256631a1069bbf25d1e8910a7..bf4b88aa44451c4c0b13b97a16a25b2f1c2eb806 100644 (file)
--- a/lily/include/span-score-bar-grav.hh
+++ b/lily/include/span-score-bar-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/span-score-bar.hh b/lily/include/span-score-bar.hh
index 193dc8c1d0add12a111f29554334ffe19101ddf4..f42205b38e9377c98f81051222eab4caa2ac6afc 100644 (file)
--- a/lily/include/span-score-bar.hh
+++ b/lily/include/span-score-bar.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/spring-spacer.hh b/lily/include/spring-spacer.hh
index 27d2f153331321858dd73ecf351307e1fc369e98..ea94a97c6869b62f32e5eb95a22e601756752111 100644 (file)
--- a/lily/include/spring-spacer.hh
+++ b/lily/include/spring-spacer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/staff-info.hh b/lily/include/staff-info.hh
index 72cf2663833d499c5782a51111e128f2b1162c0f..9f03ca73d5181096d4c6714d017118aea7efcb47 100644 (file)
--- a/lily/include/staff-info.hh
+++ b/lily/include/staff-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh
index 063b3c1b058df6092e11c246e876a4482477c5b2..3352e85b77ccbe193898fa84b28edf363e1bb20e 100644 (file)
--- a/lily/include/staff-performer.hh
+++ b/lily/include/staff-performer.hh
@@ -1,7 +1,7 @@
 /*
   staff-performer.hh -- declare Staff_performer
 
 /*
   staff-performer.hh -- declare Staff_performer
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                  Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/include/staff-side.hh b/lily/include/staff-side.hh
index 226c70411c1f01c5cda21a4ac8ffdf4f5e3085b8..976288745861246bd6ba69c3e97ed9b0b8a49ef1 100644 (file)
--- a/lily/include/staff-side.hh
+++ b/lily/include/staff-side.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/staff-sym-grav.hh b/lily/include/staff-sym-grav.hh
index 9ec528d767cc95429c886a79c0f9a190b15cef70..ff65bf66635690c3d81b85a5bcec8fd051868d1d 100644 (file)
--- a/lily/include/staff-sym-grav.hh
+++ b/lily/include/staff-sym-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/staff-sym.hh b/lily/include/staff-sym.hh
index 5051dd9e072ee0e6f35b734278a8adf9d6f8431c..258818db1e6c60f6bde1ed6a569ab7a746d7a5c7 100644 (file)
--- a/lily/include/staff-sym.hh
+++ b/lily/include/staff-sym.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/stem-grav.hh b/lily/include/stem-grav.hh
index d0695a395f202b88849dd5c32bfa16c735572fb6..78a92365446b1f539899696db7b942a8abc53a73 100644 (file)
--- a/lily/include/stem-grav.hh
+++ b/lily/include/stem-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh
index 5fa4da6461e72a8e6a17e87dd9a7dccfc84f89d6..83ebeaf74b25d2a88fadbfe4b75b08084a0022d7 100644 (file)
--- a/lily/include/stem-info.hh
+++ b/lily/include/stem-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 
 */
 
 


@@ -13,13 +13,13 @@
 #include "real.hh"
 
 struct Stem_info {
 #include "real.hh"
 
 struct Stem_info {

-  Real x;
+  Real x_;

   int dir_;
   Real idealy_f_;
   Real miny_f_;
   int dir_;
   Real idealy_f_;
   Real miny_f_;

-  int beams_i_;
+  int mult_i_;

 
 

-  Stem_info();
+  Stem_info ();

   Stem_info (Stem const *);
 };
 
   Stem_info (Stem const *);
 };
 

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 1a63a17eb06df23b565cbc1ab5b76aba6d2fb288..e9e5cac4c49ff04166749747d03c007ec31a8288 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -66,6 +66,9 @@ public:
   int beams_left_i_;
   int beams_right_i_;
 
   int beams_left_i_;
   int beams_right_i_;
 

+  /// maximum number of beams
+  int mult_i_;
+

   Direction dir_;
     
   /* *************** */
   Direction dir_;
     
   /* *************** */

diff --git a/lily/include/super-elem.hh b/lily/include/super-elem.hh
index e5e43938876f129ac0460afbb459b763dbfcab46..4ee998706eba65eef74ead194f55e81e92795e60 100644 (file)
--- a/lily/include/super-elem.hh
+++ b/lily/include/super-elem.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/swallow-grav.hh b/lily/include/swallow-grav.hh
index 7cc4a905f112f5d3659889a87a23da8f591af194..601477fcd2225bd4f80c81e6e01ae6f422baa5da 100644 (file)
--- a/lily/include/swallow-grav.hh
+++ b/lily/include/swallow-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/swallow-perf.hh b/lily/include/swallow-perf.hh
index 9f8f5514621fcda4d8e241fe4a92a925e07364e7..699990c4dbadffe3153dc830f03e625992b0d234 100644 (file)
--- a/lily/include/swallow-perf.hh
+++ b/lily/include/swallow-perf.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/symtable.hh b/lily/include/symtable.hh
index 8c36ee6cbf5004d11bcbc98d4df1f7fbd7b23e53..71724eb0ad76f8a11d929bfeb27282ae4e53eb5e 100644 (file)
--- a/lily/include/symtable.hh
+++ b/lily/include/symtable.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/tex.hh b/lily/include/tex.hh
index 80850cafa98ac824c2d6d4f9d6ae3aa9f3c92a17..43a35d2ad34f2edda3d365677adcd49cf8d895e0 100644 (file)
--- a/lily/include/tex.hh
+++ b/lily/include/tex.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/tie-grav.hh b/lily/include/tie-grav.hh
index 299e92a3761fc2d45ab1fd5e06e8b5ad3c1753d1..834d91ed559862da41cc4dea03e1fa933d636e03 100644 (file)
--- a/lily/include/tie-grav.hh
+++ b/lily/include/tie-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index a1100653ae6d15d88cadd25f74a5496cc2050d1e..d983e164911541245158cfa297d6f9bca5f477b5 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/timing-grav.hh b/lily/include/timing-grav.hh
index 4c0c431bcf457c181181e9bc3dad6e05aff72507..22c7274a3464a7328faeae4e93f4b11a0eae136f 100644 (file)
--- a/lily/include/timing-grav.hh
+++ b/lily/include/timing-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 02da3a2488f3480e4a966a898d987b1dcf927a45..82aa0e19de7c58546cd5d6117feb496fb23f8aed 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/translation-property.hh b/lily/include/translation-property.hh
index 7fba807720bee5f68466d4e159ffcf2d734a28a9..686f0d938df45c572265993902e192a457784df8 100644 (file)
--- a/lily/include/translation-property.hh
+++ b/lily/include/translation-property.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/translator-change.hh b/lily/include/translator-change.hh
index a357307f5ef91baf4bba045149158b6b1cf34848..0220ed70f50527a5f266dd2111720a60158140ee 100644 (file)
--- a/lily/include/translator-change.hh
+++ b/lily/include/translator-change.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 1cc3a0b3c3343eb29d650361f2da9d60dd09742d..3e00c5b0e108fcc7187fff001f1b5fbd934b2bdf 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index c2ddcb131ab901eda6f0f4c35392d332cfb50cbb..1684809af56aa5eae4511acecaf1aa9b481c9ee8 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/type-swallow-trans.hh b/lily/include/type-swallow-trans.hh
index 0bebd32512008a69d90a200d75c1df5f1d74cf6f..76208a06cfe45f2125b65eefd29f68d7eba2b088 100644 (file)
--- a/lily/include/type-swallow-trans.hh
+++ b/lily/include/type-swallow-trans.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/vertical-align-elem.hh b/lily/include/vertical-align-elem.hh
index a01e2c5164c045e212a16e5f75957f02ad351e80..b4962c34a07b8d31bdf42b0c2d74ae5b449e61d6 100644 (file)
--- a/lily/include/vertical-align-elem.hh
+++ b/lily/include/vertical-align-elem.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/vertical-align-grav.hh b/lily/include/vertical-align-grav.hh
index 4f26048eee2a347cf755a537fef47ffea508b4f7..c61ba39d02192204a8518ff3fdc2418fa086e7d0 100644 (file)
--- a/lily/include/vertical-align-grav.hh
+++ b/lily/include/vertical-align-grav.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/vertical-align-spanner.hh b/lily/include/vertical-align-spanner.hh
index 489586505f4fcee7e407876fdaca91ae6734a954..df8be95bc5b0a18ebf14d0f7797c8c556aa1f95e 100644 (file)
--- a/lily/include/vertical-align-spanner.hh
+++ b/lily/include/vertical-align-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/vertical-group-elem.hh b/lily/include/vertical-group-elem.hh
index 5e46c66fd57d6c7dad802abb440790700d32ef8a..f60623e7dced972f20c91f167f57c08b034097b7 100644 (file)
--- a/lily/include/vertical-group-elem.hh
+++ b/lily/include/vertical-group-elem.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>

   
  */
 
   
  */
 

diff --git a/lily/include/vertical-group-spanner.hh b/lily/include/vertical-group-spanner.hh
index 405c65a0b7ff86de93cc937b553b8abf389abf2f..678137e29f08ba2771fe7d9970d90edf8c8d727e 100644 (file)
--- a/lily/include/vertical-group-spanner.hh
+++ b/lily/include/vertical-group-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/voice-iterator.hh b/lily/include/voice-iterator.hh
index 49bfbfc5532cd519ccfe0b97060532023b71b686..a9fec21204b9649e4994a61e70176d1699419dd3 100644 (file)
--- a/lily/include/voice-iterator.hh
+++ b/lily/include/voice-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/include/word-wrap.hh b/lily/include/word-wrap.hh
index a7d69ff0838d7e1d59478045f91340c3a01dae13..7465c279e64873c3e18e18aedaee07465a6f12d4 100644 (file)
--- a/lily/include/word-wrap.hh
+++ b/lily/include/word-wrap.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/ineq-constrained-qp.cc b/lily/ineq-constrained-qp.cc
index 4ff8adcc20e460a6ae833d6271567059e856a6d1..70856b56dc14cb3f1a869e3adff845f7b7f1a6c1 100644 (file)
--- a/lily/ineq-constrained-qp.cc
+++ b/lily/ineq-constrained-qp.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "ineq-constrained-qp.hh"
 #include "qlpsolve.hh"
 */
 #include "ineq-constrained-qp.hh"
 #include "qlpsolve.hh"

diff --git a/lily/item.cc b/lily/item.cc
index 8b2297ce5cc91d6a93585b302bf5254ba98190f5..20f52f0553021944e697561bbf55f47b864dea6d 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "p-score.hh"
 */
 
 #include "p-score.hh"

diff --git a/lily/key-grav.cc b/lily/key-grav.cc
index 60c2f2dbce19b783ea137e4c16e127b2e7852f1e..fe9885372693562ba07bdf7b44d0b4598da10efb 100644 (file)
--- a/lily/key-grav.cc
+++ b/lily/key-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
   
   Todo: key undo, special keys.
 
   
   Todo: key undo, special keys.

diff --git a/lily/key-item.cc b/lily/key-item.cc
index d80f01670dda03f6d76f5524e3708d7995004fe3..93abfa0575bd1946e894605a87a40843583d8573 100644 (file)
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
   keyplacement by Mats Bengtsson
 */
 
   keyplacement by Mats Bengtsson
 */

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index bca4c5c106e8fd59f48e914a7b17ce632a76b82a..527cf06cbbf6efcfbbc637179b68c0f8bbebc286 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include "key-performer.hh"
 */
 
 #include "key-performer.hh"

diff --git a/lily/key.cc b/lily/key.cc
index 56a6278cfa118bf7655d777727b6fa3ac2750317..9e8b9d40c51448ea19f2165b8c663a59c26b32b1 100644 (file)
--- a/lily/key.cc
+++ b/lily/key.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
   TODO
   transposition.
 
   TODO
   transposition.

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c7df7be95ebf466b81bc027c7dd06418b72f07a7..6d38b2451eb618aa6feb974b7e755fdc089c2262 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -129,6 +129,9 @@ TELP                \\\]
 }
 
 
 }
 
 

+<notes,INITIAL,lyrics>\\maininput           {
+       start_main_input ();
+}

 
 <notes,INITIAL,lyrics>\\include           {
        yy_push_state (incl);
 
 <notes,INITIAL,lyrics>\\include           {
        yy_push_state (incl);

diff --git a/lily/lexerinit.cc b/lily/lexerinit.cc
index 6f5cd27f2653bd19f22a193d5cc9fdc0d4773953..8b184bb7add2f6f88dd5598d8ea49160dfb3e20e 100644 (file)
--- a/lily/lexerinit.cc
+++ b/lily/lexerinit.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <iostream.h>
 */
 
 #include <iostream.h>

diff --git a/lily/line-group-grav.cc b/lily/line-group-grav.cc
index 465a23d819a2717009f2822df294601973c091e5..0ae8eca24e9e0817b7d67452bd2197e123abbf74 100644 (file)
--- a/lily/line-group-grav.cc
+++ b/lily/line-group-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "staff-sym.hh"
 */
 
 #include "staff-sym.hh"

diff --git a/lily/line-spacer.cc b/lily/line-spacer.cc
index 3e518e022c403babb123774c961bd8e81ea556ee..95b77e24c651abda41254b99827b2cc49c8d094b 100644 (file)
--- a/lily/line-spacer.cc
+++ b/lily/line-spacer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/linear-programming.cc b/lily/linear-programming.cc
index 83c4823db133b4d3c7c539ef9c1631909352ddc4..eed55a9b3726cf61fbb205a394972d046ac1a9b3 100644 (file)
--- a/lily/linear-programming.cc
+++ b/lily/linear-programming.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>

   
  */
 
   
  */
 

diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc
index ec84f240bfa197a655c743d7a8248ecdafeb489f..474a5910ce52f494eeef6961130ff4c48d6cf45a 100644 (file)
--- a/lily/local-key-grav.cc
+++ b/lily/local-key-grav.cc
@@ -1,7 +1,7 @@
 /*
   local-key-reg.cc -- implement Local_key_engraver
 
 /*
   local-key-reg.cc -- implement Local_key_engraver
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "musical-request.hh"
 */
 
 #include "musical-request.hh"

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index a2ddd1b43e848447170e96078acc06ceb8b671bb..ea45b32d44dba9582f61de4480f04f41d8e90203 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "dimen.hh"
 #include "local-key-item.hh"
 */
 #include "dimen.hh"
 #include "local-key-item.hh"

diff --git a/lily/lookup.cc b/lily/lookup.cc
index b0212b2f91ed18920e3d3b1f5f6737e0ad29ec07..bbdfd3c11196927b558aa6a031807307d6ec6826 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
   TODO
   This doth suck. We should have PS output, and read spacing info from TFMs
 
   TODO
   This doth suck. We should have PS output, and read spacing info from TFMs


@@ -192,21 +192,21 @@ Lookup::streepje (int type) const
 }
 
 Atom
 }
 
 Atom

-Lookup::hairpin (Real &wid, bool decresc, bool continued) const
+Lookup::hairpin (Real width, bool decresc, bool continued) const

 {
   String embed;
   Atom ret;  
   Real height = paper_l_->get_var ("barsize") / 6;
   embed = "\\embeddedps{\n" ;
 {
   String embed;
   Atom ret;  
   Real height = paper_l_->get_var ("barsize") / 6;
   embed = "\\embeddedps{\n" ;

-  embed += String (wid) + " " 
+  embed += String (width) + " " 

        + String (height) + " " 
     + String (continued ? height/2 : 0) + 
     + " draw_"  + String(decresc ? "de" : "") + "cresc}\n";
   ret.tex_ = embed;
 
 
        + String (height) + " " 
     + String (continued ? height/2 : 0) + 
     + " draw_"  + String(decresc ? "de" : "") + "cresc}\n";
   ret.tex_ = embed;
 
 

-  ret.dim_.x () = Interval (0,wid);
-  ret.dim_.y () = Interval (-2*height,2*height);
+  ret.dim_.x () = Interval (0, width);
+  ret.dim_.y () = Interval (-2*height, 2*height);

 
   return ret;
 }
 
   return ret;
 }


@@ -290,7 +290,6 @@ Lookup::vbracket (Real &y) const
   Atom bracket = (*symtables_p_)("param")->lookup ("bracket");
   Interval ydims = bracket.dim_[Y_AXIS];
 
   Atom bracket = (*symtables_p_)("param")->lookup ("bracket");
   Interval ydims = bracket.dim_[Y_AXIS];
 

-  

   Real min_y = ydims[LEFT];
   Real max_y = ydims[RIGHT];
   Real step = 1.0 PT;
   Real min_y = ydims[LEFT];
   Real max_y = ydims[RIGHT];
   Real step = 1.0 PT;

diff --git a/lily/lyric-grav.cc b/lily/lyric-grav.cc
index 182658cd5f5fefd77d81001b954e69003928366a..f90dcde52c1507397090d63c22c6d45778425196 100644 (file)
--- a/lily/lyric-grav.cc
+++ b/lily/lyric-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "lyric-engraver.hh"
 */
 
 #include "lyric-engraver.hh"

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index f55844044c4db3bf140d6e69066c635ca7951d51..d81875c95e72fb5bd1dffedf9a3c1a032efdc90e 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include "lyric-performer.hh"
 */
 
 #include "lyric-performer.hh"

diff --git a/lily/main.cc b/lily/main.cc
index 743b8e6a9ebb4f454a419213acfbea798c5197c0..2049462714fbf31e19491d47e2495d9b0dd6ad4a 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <stdlib.h>
 */
 
 #include <stdlib.h>


@@ -15,18 +15,20 @@
 #include "misc.hh"
 #include "string.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "string.hh"
 #include "main.hh"

-#include "path.hh"
+#include "file-path.hh"

 #include "config.hh"
 #include "config.hh"

-#include "source.hh"
+#include "file-results.hh"

 #include "debug.hh"
 #include "debug.hh"

-#include "my-lily-parser.hh"

 
 

-static bool version_ignore_b = false;
-Sources* source_global_l = 0;
+
+bool version_ignore_global_b = false;

 bool no_paper_global_b = false;
 bool no_timestamps_global_b = false;
 bool no_paper_global_b = false;
 bool no_timestamps_global_b = false;

+String default_outname_base_global =  "lelie";
+int default_count_global;

 
 bool experimental_features_global_b = false;
 
 bool experimental_features_global_b = false;

+bool dependency_global_b = false;

 
 int exit_status_i_;
 
 
 int exit_status_i_;
 


@@ -37,11 +39,11 @@ Long_option_init theopts[] = {
   {0, "warranty", 'w'},
   {0, "help", 'h'},
   {0, "test", 't'},
   {0, "warranty", 'w'},
   {0, "help", 'h'},
   {0, "test", 't'},

-  {0, "debug", 'd'},
+  {0, "debug", 'D'},

   {1, "init", 'i'},
   {1, "include", 'I'},
   {0, "no-paper", 'M'},
   {1, "init", 'i'},
   {1, "include", 'I'},
   {0, "no-paper", 'M'},

-
+  {0, "dependencies", 'd'},

   {0, "no-timestamps", 'T'},
   {0, "ignore-version", 'V'},
   {0,0,0}
   {0, "no-timestamps", 'T'},
   {0, "ignore-version", 'V'},
   {0,0,0}


@@ -55,7 +57,8 @@ usage ()
     "Typeset and or produce midi output from mudela-file or stdin\n"
     "\n"
     "Options:\n"
     "Typeset and or produce midi output from mudela-file or stdin\n"
     "\n"
     "Options:\n"

-    "  -d, --debug            enable debugging output\n"
+    "  -D, --debug            enable debugging output\n"
+    "  -d, --dependencies     write dependency files for every output\n"

     "  -I, --include=DIR      add DIR to search path\n"
     "  -i, --init=FILE        use FILE as init file\n"
     "  -h, --help             this help\n"
     "  -I, --include=DIR      add DIR to search path\n"
     "  -i, --init=FILE        use FILE as init file\n"
     "  -h, --help             this help\n"


@@ -112,49 +115,8 @@ notice ()
 }
 
 
 }
 
 

-static File_path path;
+ File_path path;

 
 

-void
-do_one_file (String init_str, String file_str)
-{
-  if (init_str.length_i () && path.find (init_str).empty_b ())
-    {
-      error (_("Can not find `") + init_str +"\'");
-      return ;
-    }
-  if (file_str.length_i () && path.find (file_str).empty_b ())
-    {
-      error (_("Can not find `") + file_str + "'");
-      return ;
-    }
-
-  Sources sources;
-  source_global_l = &sources;
-  source_global_l->set_path (&path);
-  {
-    My_lily_parser parser (source_global_l);
-    parser.set_version_check (version_ignore_b);
-    parser.parse_file (init_str, file_str);
-    
-    if (file_str.length_i () && file_str[0] != '-')
-      {
-       String a,b,c,d;
-       split_path (file_str, a, b, c, d);
-       default_outname_base_global = c;
-      }
-    else
-      default_outname_base_global = "lelie";
-  
-    if (parser.error_level_i_)
-      {
-       exit_status_i_  = 1;
-      }
-    else
-      do_scores ();
-    clear_scores ();
-  }
-  source_global_l = 0;
-}

 
 void
 identify ()
 
 void
 identify ()


@@ -209,9 +171,12 @@ main (int argc, char **argv)
          exit (0);
          break;
        case 'V':
          exit (0);
          break;
        case 'V':

-         version_ignore_b = true;
+         version_ignore_global_b = true;

          break;
        case 'd':
          break;
        case 'd':

+         dependency_global_b = true;
+         break; 
+       case 'D':

          set_debug (true);
          break;
        case 'M':
          set_debug (true);
          break;
        case 'M':

diff --git a/lily/meter-grav.cc b/lily/meter-grav.cc
index 9b11835eafc2f71db065370a4a61b89352db446f..f14d00a4edbbe8ff7d7e19345b21cc0d11dd9c63 100644 (file)
--- a/lily/meter-grav.cc
+++ b/lily/meter-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "meter-grav.hh"
 */
 
 #include "meter-grav.hh"

diff --git a/lily/meter-performer.cc b/lily/meter-performer.cc
index b7206c2b78ba63bc56c3a6c0dc31c67bf526549d..44849ab744b7813867e73cc1ffa6babdea77f2ba 100644 (file)
--- a/lily/meter-performer.cc
+++ b/lily/meter-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include "meter-performer.hh"
 */
 
 #include "meter-performer.hh"

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 0e85a4849fbdf75ff4169f920b187f22d08f7f11..6eff15ea8e521367e2dc35a768985a5a20609ea8 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 
 */
 #include <math.h>
 
 */
 #include <math.h>

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 05f0be08a1db8a7658f12d9f0e8241eb83a7f222..46c5f3420b485788651ffde62dc22de3802ad0de 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #include "proto.hh"
  */
 
 #include "proto.hh"

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index a9abaa677b75d65684e9be4df9a47ffc8d02a016..89aab84a8b618f7650d2e63b76917aa6b8b7a97d 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,7 +3,7 @@
 //
 // source file of the GNU LilyPond music typesetter
 //
 //
 // source file of the GNU LilyPond music typesetter
 //

-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+// (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 
 #include <fstream.h>
 #include "string.hh"
 
 #include <fstream.h>
 #include "string.hh"

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 38fbad9953ee8ae359ce5aefce614688e0e0ccb9..75f7af9321b5c46530dad4ae6cd22ab30fc2c48c 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

          Jan Nieuwenhuizen <jan@digicash.com>
  */
 
          Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/misc.cc b/lily/misc.cc
index d150d557926ecc4ecd7293a03659cd7c9666d81f..c9cb8e5dcfcb720a2bc51ebb3825c6fc1baab9b0 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,14 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+    Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include <math.h>
 
 */
 
 #include <math.h>
 

-#include "item.hh"

 #include "misc.hh"
 #include "misc.hh"

-#include "moment.hh"
+
+#ifndef STANDALONE
+#include "item.hh"
+#endif

 
 int
 intlog2(int d) {
 
 int
 intlog2(int d) {


@@ -29,7 +32,7 @@ log_2(double x) {
   return log (x)  /log (2.0);
 }
 
   return log (x)  /log (2.0);
 }
 

-#if 1
+#ifndef STANDALONE

 Interval
 itemlist_width (const Array<Item*> &its)
 {
 Interval
 itemlist_width (const Array<Item*> &its)
 {


@@ -45,3 +48,74 @@ itemlist_width (const Array<Item*> &its)
 }
 
 #endif
 }
 
 #endif

+
+
+/*
+  TODO
+    group in some Array_*
+    make more generic / templatise
+ */
+int
+get_lower_bound (Array<Real> const& positions, Real x)
+{
+  if (x < positions[0])
+    return 0;
+  for (int i = 1; i < positions.size (); i++)
+    if (x < positions[i])
+      return i - 1;
+  return positions.size () - 1;
+}
+
+Slice
+get_bounds_slice (Array<Real> const& positions, Real x)
+{
+  int l = get_lower_bound (positions, x);
+  int u = positions.size () - 1 <? l + 1;
+  if (x < positions[l])
+    u = l;
+  return Slice (l, u);
+}
+
+Interval
+get_bounds_iv (Array<Real> const& positions, Real x)
+{
+  Slice slice = get_bounds_slice (positions, x);
+  return Interval (positions[slice.min ()], positions[slice.max ()]);
+}
+
+// silly name
+Interval
+quantise_iv (Array<Real> const& positions, Real period, Real x)
+{
+  /*
+    ugh
+    assume that 
+      * positions are sorted, 
+      * positions are nonnegative
+      * period starts at zero
+   */
+
+  int n = (int)(x / period);
+  Real frac = (x / period - n) * period;
+  if (frac < 0)
+    {
+      frac += period;
+      n--;
+    }
+
+  Slice slice = get_bounds_slice (positions, frac);
+  Interval iv(positions[slice.min ()], positions[slice.max ()]);
+
+  if (slice.min () == slice.max ())
+    {
+      if (slice.min () == 0)
+       iv.min () = - period + positions.top ();
+      else
+       iv.max () = period + positions[0];
+    }
+
+  iv += period * n;
+
+  return iv;
+}
+

diff --git a/lily/molecule.cc b/lily/molecule.cc
index f054a280212b2193d93751c0c6abcabe5cc20bf4..613fc0ea1dd5586f8414b9f02222664899dfeba0 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "interval.hh"
 */
 
 #include "interval.hh"

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 9c792489141b1adf2616f6abff51941a28cbfca8..e6a65fdadb7f0b4bcde69bd43e00fd0d4eefd4e0 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "debug.hh"
 #include "music-list.hh"
 */
 #include "debug.hh"
 #include "music-list.hh"

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 93a64e6a014703140eb77d7011f87c3b70ce30ee..84934a99c525dacd97ff8af544df09a757efc964 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 297584d539bdccd0949f0868e458ebafe827565f..2e9a28786339227261492cd3f373106d97777290 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -3,9 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 */
 

+

 #include "debug.hh"
 #include "music-output-def.hh"
 #include "global-translator.hh"
 #include "debug.hh"
 #include "music-output-def.hh"
 #include "global-translator.hh"

diff --git a/lily/music.cc b/lily/music.cc
index 443088c9526c6b80224a6db4a15cfaaf37311630..298dd2dc5cefa3ec363a344ac8c206531e507c64 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 0def2d2f518da02bdaa886a62bfc1311e866ed9c..3469aaff33df17796041c183f7039324df1e58fe 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "musical-request.hh"
 */
 
 #include "musical-request.hh"

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 43495eb06cf6a01b960febcc02baa7b151bd5ef0..77f13bf18e56bc3a26dbeb71c6c939097d699f2f 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <strstream.h>
 */
 
 #include <strstream.h>


@@ -19,6 +19,7 @@
 #include "debug.hh"
 #include "source-file.hh"
 #include "parseconstruct.hh"
 #include "debug.hh"
 #include "source-file.hh"
 #include "parseconstruct.hh"

+#include "main.hh"

 
 static Keyword_ent the_key_tab[]={
   {"accepts", ACCEPTS},
 
 static Keyword_ent the_key_tab[]={
   {"accepts", ACCEPTS},


@@ -92,6 +93,18 @@ My_lily_lexer::lookup_identifier (String s)
   return (*identifier_p_dict_p_)[s];
 }
 
   return (*identifier_p_dict_p_)[s];
 }
 

+void
+My_lily_lexer::start_main_input ()
+{  
+  if (!monitor->silent_b ("InitDeclarations") && check_debug)
+    print_declarations (true);
+  if (!monitor->silent_b ("InitLexer") && check_debug)
+    set_debug (1);
+
+  new_input (main_input_str_, source_global_l);
+  
+  print_declarations(true);
+}

 
 void
 My_lily_lexer::set_identifier (String name_str, Identifier*i)
 
 void
 My_lily_lexer::set_identifier (String name_str, Identifier*i)

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index d267732e97f6afa301a0e438c4f254fbfdd7c624..beb8d7df3cbf9e41e0bbf93e74f93ae180dadd91 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "my-lily-parser.hh"
 */
 
 #include "my-lily-parser.hh"


@@ -15,7 +15,7 @@
 #include "command-request.hh"
 #include "parser.hh"
 #include "header.hh"
 #include "command-request.hh"
 #include "parser.hh"
 #include "header.hh"

-
+#include "file-results.hh"

 
 My_lily_parser::My_lily_parser (Sources * source_l)
 {
 
 My_lily_parser::My_lily_parser (Sources * source_l)
 {


@@ -50,57 +50,20 @@ My_lily_parser::set_version_check (bool ig)
 {
   ignore_version_b_ = ig;
 }
 {
   ignore_version_b_ = ig;
 }

-void
-My_lily_parser::set_debug()
-{
-#ifndef NPRINT
-  String s = "";
-  if (init_parse_b_)
-    s = "Init";
-  set_yydebug (!monitor->silent_b (s+"Parser") && check_debug);
-  lexer_p_->set_debug (!monitor->silent_b (s+"Lexer") && check_debug);
-#endif
-}
-
-void
-My_lily_parser::print_declarations()
-{
-#ifndef NPRINT
-  String s = "";
-
-  if (init_parse_b_)
-    s = "Init";
-  if (!monitor->silent_b (s+"Declarations") && check_debug)
-    {
-      lexer_p_->print_declarations (init_parse_b_);
-    }
-#endif
-}

 
 void
 My_lily_parser::parse_file (String init, String s)
 {
   lexer_p_ = new My_lily_lexer;
   init_str_ = init;
 
 void
 My_lily_parser::parse_file (String init, String s)
 {
   lexer_p_ = new My_lily_lexer;
   init_str_ = init;

+  lexer_p_->main_input_str_ = s;

 
   *mlog << _("Parsing ... ");
 
 
   *mlog << _("Parsing ... ");
 

-  init_parse_b_ = true;
-  set_debug();
-  lexer_p_->new_input (init, source_l_);
-  do_yyparse();
-
-  if (error_level_i_)
-    {
-      error (_("Found errors in init files"));
-    }
-  print_declarations();
-

   init_parse_b_ = false;
   init_parse_b_ = false;

-  set_debug();
-  lexer_p_->new_input (s , source_l_);
-  do_yyparse();
-  print_declarations();
+  set_yydebug (!monitor->silent_b ("Parser") && check_debug);
+  lexer_p_->new_input (init, source_l_);
+  do_yyparse ();

 
 
   if (!define_spot_array_.empty())
 
 
   if (!define_spot_array_.empty())


@@ -108,6 +71,8 @@ My_lily_parser::parse_file (String init, String s)
       warning (_("Braces don't match."));
       error_level_i_ = 1;
     }
       warning (_("Braces don't match."));
       error_level_i_ = 1;
     }

+
+  inclusion_global_array = lexer_p_->filename_str_arr_;

 }
 
 void
 }
 
 void


@@ -157,7 +122,14 @@ void
 My_lily_parser::set_last_duration (Duration const *d)
 {
   if (last_duration_mode_b_)
 My_lily_parser::set_last_duration (Duration const *d)
 {
   if (last_duration_mode_b_)

-    default_duration_ = *d;
+    {
+      default_duration_ = *d;
+      /* 
+        forget plet part,
+        sticky plet factor only within plet brackets
+       */  
+      default_duration_.set_plet (1, 1);
+    }

 }
 
 
 }
 
 


@@ -194,8 +166,9 @@ My_lily_parser::get_rest_element (String s,  Duration * duration_p)
   else if ((duration_p->plet_.type_i_ == 1) && (duration_p->plet_.iso_i_ > 1))
     {
       Multi_measure_rest_req* m = new Multi_measure_rest_req;
   else if ((duration_p->plet_.type_i_ == 1) && (duration_p->plet_.iso_i_ > 1))
     {
       Multi_measure_rest_req* m = new Multi_measure_rest_req;

-      plet_.iso_i_ = 1;
-      default_duration_.plet_.iso_i_ = 1;
+      // these shouldn't be necessary anymore
+//      plet_.iso_i_ = 1;
+//      default_duration_.plet_.iso_i_ = 1;

       m->duration_ = *duration_p;
       m->set_spot (here_input());
       velt_p->add (m);
       m->duration_ = *duration_p;
       m->set_spot (here_input());
       velt_p->add (m);

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 540922d4f0cc65dbe41eab052b1f179aeaa658f3..c82d2c42c2a95d9bdbf77ecbced709b4638e0a0c 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "dot-column.hh"
 #include "note-column.hh"
 */
 #include "dot-column.hh"
 #include "note-column.hh"

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 7a728aaa82e406bed48586cdd1c4528a9e53d864..3ae349b28bfcef63ecdc2b218ac7e55f4b7010f5 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "misc.hh"
 */
 
 #include "misc.hh"

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 4b60d69229142332c2ba349575764f115152ccca..6679f61ba6e04e6bb411aaf9c6b39d6acd80848d 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #include "note-performer.hh"
  */
 
 #include "note-performer.hh"

diff --git a/lily/notename-table.cc b/lily/notename-table.cc
index 049f0cdfcb1ecbb495e67b71c8190a45d51dc8ef..1f3bc9921044a2a18401b71bc389901d9708e04f 100644 (file)
--- a/lily/notename-table.cc
+++ b/lily/notename-table.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "notename-table.hh"
 */
 
 #include "notename-table.hh"

diff --git a/lily/outputter.cc b/lily/outputter.cc
index 81ef2c793e002ce610e2a08c94414a94a0829b41..d3df3f600f8d6f2f4b0c157e720564177076ef72 100644 (file)
--- a/lily/outputter.cc
+++ b/lily/outputter.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "outputter.hh"
 */
 
 #include "outputter.hh"

diff --git a/lily/p-col.cc b/lily/p-col.cc
index 7da23d8d902960f4cf6cee098639fe72d32edfc8..e776b62c926f78322a460042adc96436cebef427 100644 (file)
--- a/lily/p-col.cc
+++ b/lily/p-col.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "p-col.hh"
 */
 
 #include "p-col.hh"

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 02033ab93ead58102b8260c1404a895c4a52fd90..51c9a4b019274bb495fcd7368cb34a6f3bd0f501 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "main.hh"
 */
 
 #include "main.hh"


@@ -23,7 +23,7 @@
 #include "word-wrap.hh"
 #include "gourlay-breaking.hh"
 #include "outputter.hh"
 #include "word-wrap.hh"
 #include "gourlay-breaking.hh"
 #include "outputter.hh"

-
+#include "file-results.hh"

 // sucking Cygnus egcs - w32
 #include "list.tcc"
 #include "cursor.tcc"
 // sucking Cygnus egcs - w32
 #include "list.tcc"
 #include "cursor.tcc"


@@ -199,17 +199,21 @@ void
 Paper_score::tex_output ()
 {
   // output
 Paper_score::tex_output ()
 {
   // output

-  String outname = paper_l_->outfile_str_ ;
-  if (outname.empty_b ())
+  String base_outname = paper_l_->outfile_str_ ;
+  if (base_outname.empty_b ())

     {
     {

-      outname = default_outname_base_global;
+      base_outname = default_outname_base_global;

       int def = paper_l_->get_next_default_count ();
       if (def)
        {
       int def = paper_l_->get_next_default_count ();
       if (def)
        {

-         outname += "-" + String(def);
+         base_outname += "-" + String(def);

        }
        }

-      outname += ".tex";

     }
     }

+
+  String outname = base_outname + ".tex";
+  target_str_global_array.push (outname);
+
+  

   *mlog << _("TeX output to ") <<  outname << " ...\n";
 
   Tex_stream tex_out (outname);
   *mlog << _("TeX output to ") <<  outname << " ...\n";
 
   Tex_stream tex_out (outname);

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 92b126428c8254d051e4559a6b7534ce12df4f8a..20e412dde81f1da2260c1932079e58540b9f4da7 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <math.h>
 */
 
 #include <math.h>

diff --git a/lily/parser.yy b/lily/parser.yy
index 842423e0ea9cf72b0122bdfdf7b7ae0b5bee2c4c..f4db759c99bff8a909975413e303b080aa643642 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -12,7 +12,7 @@
 #include <iostream.h>
 
 // mmm
 #include <iostream.h>
 
 // mmm

-#define MUDELA_VERSION "0.1.9"
+#define MUDELA_VERSION "0.1.10"

 
 #include "scalar.hh"
 #include "translation-property.hh"
 
 #include "scalar.hh"
 #include "translation-property.hh"


@@ -39,6 +39,7 @@
 #include "header.hh"
 #include "duration-convert.hh"
 #include "change-translator.hh"
 #include "header.hh"
 #include "duration-convert.hh"
 #include "change-translator.hh"

+#include "file-results.hh"

 
 // needed for bison.simple's malloc() and free()
 #include <malloc.h>
 
 // needed for bison.simple's malloc() and free()
 #include <malloc.h>


@@ -264,7 +265,7 @@ mudela:     /* empty */
                THIS->default_header_p_ = $2;
        }
        | mudela score_block {
                THIS->default_header_p_ = $2;
        }
        | mudela score_block {

-               add_score ($2);
+               score_global_array.push ($2);

        }
        | mudela add_declaration { }
        | mudela error
        }
        | mudela add_declaration { }
        | mudela error


@@ -933,7 +934,7 @@ open_abbrev_parens:
        '[' ':' unsigned {
                $$ = '[';
                if (!Duration::duration_type_b ($3))
        '[' ':' unsigned {
                $$ = '[';
                if (!Duration::duration_type_b ($3))

-                       THIS->parser_error ("1:Not a duration");
+                       THIS->parser_error (String ("Not a duration: ") + $3);

                else if ($3 < 8)
                        THIS->parser_error ("Can't abbreviate");
                else
                else if ($3 < 8)
                        THIS->parser_error ("Can't abbreviate");
                else


@@ -1121,9 +1122,13 @@ dots:
 entered_notemode_duration:
        /* */           {
                $$ = new Duration (THIS->default_duration_);
 entered_notemode_duration:
        /* */           {
                $$ = new Duration (THIS->default_duration_);

+               // get sticky plet part too
+               $$->set_plet (THIS->plet_.iso_i_, THIS->plet_.type_i_);

        }
        | dots          {
                $$ = new Duration (THIS->default_duration_);
        }
        | dots          {
                $$ = new Duration (THIS->default_duration_);

+               // get sticky plet part too
+               $$->set_plet (THIS->plet_.iso_i_, THIS->plet_.type_i_);

                $$->dots_i_  = $1;
        }
        | explicit_steno_duration       {
                $$->dots_i_  = $1;
        }
        | explicit_steno_duration       {


@@ -1142,10 +1147,10 @@ explicit_steno_duration:
        unsigned                {
                $$ = new Duration;
                if (!Duration::duration_type_b ($1))
        unsigned                {
                $$ = new Duration;
                if (!Duration::duration_type_b ($1))

-                       THIS->parser_error ("2:Not a duration");
+                       THIS->parser_error ("Not a duration:" + String ($1));

                else {
                        $$->durlog_i_ = Duration_convert::i2_type ($1);
                else {
                        $$->durlog_i_ = Duration_convert::i2_type ($1);

-                       $$->set_plet (THIS->default_duration_);
+                       $$->set_plet (THIS->plet_.iso_i_, THIS->plet_.type_i_);

                     }
        }
        | DURATION_IDENTIFIER   {
                     }
        }
        | DURATION_IDENTIFIER   {


@@ -1155,10 +1160,10 @@ explicit_steno_duration:
                $$->dots_i_ ++;
        }
        | explicit_steno_duration '*' unsigned  {
                $$->dots_i_ ++;
        }
        | explicit_steno_duration '*' unsigned  {

-               $$->plet_.iso_i_ = $3;
+               $$->plet_.iso_i_ = $3;  /* ugh.  should do *= */

        }
        | explicit_steno_duration '/' unsigned {
        }
        | explicit_steno_duration '/' unsigned {

-               $$->plet_.type_i_ = $3;
+               $$->plet_.type_i_ = $3; /* ugh. should do *= iso = */

        }
        ;
 
        }
        ;
 


@@ -1169,7 +1174,7 @@ abbrev_type:
        }
        | ':' unsigned {
                if (!Duration::duration_type_b ($2))
        }
        | ':' unsigned {
                if (!Duration::duration_type_b ($2))

-                       THIS->parser_error ("3:Not a duration");
+                       THIS->parser_error ("Not a duration:" + String ($2));

                else if ($2 < 8)
                        THIS->parser_error ("Can't abbreviate");
                $$ = $2;
                else if ($2 < 8)
                        THIS->parser_error ("Can't abbreviate");
                $$ = $2;

diff --git a/lily/performance.cc b/lily/performance.cc
index 8a6d3c79876cb5ffacde3144ba9ff203a0163dad..81e281d659fa588d809e08c5a65b8f88726ea6f6 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include <time.h>
 */
 
 #include <time.h>


@@ -18,6 +18,7 @@
 #include "audio-staff.hh"
 #include "performance.hh"
 #include "score.hh"
 #include "audio-staff.hh"
 #include "performance.hh"
 #include "score.hh"

+#include "file-results.hh"

 
 Performance::Performance ()
 {
 
 Performance::Performance ()
 {


@@ -137,6 +138,7 @@ Performance::process()
   
   Midi_stream midi_stream (out);
   *mlog << _("MIDI output to ") << out<< " ..." << endl;
   
   Midi_stream midi_stream (out);
   *mlog << _("MIDI output to ") << out<< " ..." << endl;

+  target_str_global_array.push (out);

 
   output (midi_stream);
   *mlog << endl;
 
   output (midi_stream);
   *mlog << endl;

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 525b6202fcec0583147eb23c755d8d42bbc70018..a33b967e439b0e4fbd0df56c288345d667bd03b9 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/performer.cc b/lily/performer.cc
index ed171b5a7066419bb3436f1c6d8e4101ffd43355..b62f37ec074d16d8e8eae69ac2eefd9b54ec3907 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

                Jan Nieuwenhuizen <jan@digicash.com>
  */
 
                Jan Nieuwenhuizen <jan@digicash.com>
  */
 

diff --git a/lily/pitch-squash-grav.cc b/lily/pitch-squash-grav.cc
index 5671dd4af865c367871e81256c06fac939050e20..a11b61b29e8f6676fdf135501b2bd6a562967888 100644 (file)
--- a/lily/pitch-squash-grav.cc
+++ b/lily/pitch-squash-grav.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/plet-engraver.cc b/lily/plet-engraver.cc
index d94a858634ecc83f7647a0a17145fc6245995f32..d4fc9005de83ce79ec746844634c72aae3fc7310 100644 (file)
--- a/lily/plet-engraver.cc
+++ b/lily/plet-engraver.cc
@@ -1,7 +1,7 @@
 /*
   plet-engraver.cc -- implement Plet_engraver
 
 /*
   plet-engraver.cc -- implement Plet_engraver
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/plet-spanner.cc b/lily/plet-spanner.cc
index bb9980c263cdbc6897a0cf423e428338ab1dd07a..6e578441c6c16bd8f60de8cbbcd6d40c9fdbb231 100644 (file)
--- a/lily/plet-spanner.cc
+++ b/lily/plet-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include "atom.hh"
 */
 
 #include "atom.hh"

diff --git a/lily/plet-swallow-engraver.cc b/lily/plet-swallow-engraver.cc
index 1f837ad9f09fe4a906babc661eb5f278ad61f863..c13957615826e90cbd7192002291f85777513352 100644 (file)
--- a/lily/plet-swallow-engraver.cc
+++ b/lily/plet-swallow-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "musical-request.hh"
 */
 
 #include "musical-request.hh"

diff --git a/lily/priority-halign-grav.cc b/lily/priority-halign-grav.cc
index a42c4a552e29e6c72218bf1a1e4cc8ff4facb5a9..76fc2b8046edff97df3f1a2e9696015a3a596c0c 100644 (file)
--- a/lily/priority-halign-grav.cc
+++ b/lily/priority-halign-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "bar.hh"
 */
 
 #include "bar.hh"

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 2a191dead80b25da68f43f2a11fb4d3b8c8727ea..61a1b933c334ccf03ccea27c1d21407413595912 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "property-iterator.hh"
 */
 
 #include "property-iterator.hh"

diff --git a/lily/ps-plet.cc b/lily/ps-plet.cc
index 8d08783f155c780739a40bcc4e71032849bcc322..8d08d22b2ba4d20f7e8210057cccc7eaf69413d7 100644 (file)
--- a/lily/ps-plet.cc
+++ b/lily/ps-plet.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include <math.h>
 */
 
 #include <math.h>


@@ -17,7 +17,7 @@
 #include "string-convert.hh"
 
 Atom
 #include "string-convert.hh"
 
 Atom

-Lookup::plet (Real& dy , Real& dx, Direction dir) const
+Lookup::plet (Real dy , Real dx, Direction dir) const

 {
   String ps = "\\embeddedps{\n";
   
 {
   String ps = "\\embeddedps{\n";
   

diff --git a/lily/qlp.cc b/lily/qlp.cc
index 635cba40a024312ef8937158c17077ff331d23c1..f77534e3e4ca07e688b25020218972ab2cbf2db1 100644 (file)
--- a/lily/qlp.cc
+++ b/lily/qlp.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/qlpsolve.cc b/lily/qlpsolve.cc
index 3d45207eab502ea98d2694c96a53322fc32491dd..78e07042773efb7ed8b91e7e5025b92d99832a0f 100644 (file)
--- a/lily/qlpsolve.cc
+++ b/lily/qlpsolve.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
   TODO:
   try fixed point arithmetic, to speed up lily.
 
   TODO:
   try fixed point arithmetic, to speed up lily.

diff --git a/lily/request-iterator.cc b/lily/request-iterator.cc
index 3d833b94d1d1ab49562da5a7f6ad19c03c35b82e..19be49a8d374b7b98d04cd83b1a883b2035d7fbd 100644 (file)
--- a/lily/request-iterator.cc
+++ b/lily/request-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "translator-group.hh"
 */
 
 #include "translator-group.hh"

diff --git a/lily/request.cc b/lily/request.cc
index 488b2cad953d6a6ecdf62167b0b78853f17a7010..920cc79ca53eb7199f5f6ea7ca77ecc72b2dc07b 100644 (file)
--- a/lily/request.cc
+++ b/lily/request.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "request.hh"
 */
 
 #include "request.hh"

diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 119adcf2b7495182bc0cb8485605f9f6f8139a31..3729f28e7e1a680866736fe8f8c67d2d1f221355 100644 (file)
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index f1263ffcbeada879fbf4cf641ae1f791cbbed0bc..38f0a65db84500290e71fdae339441b134a54b48 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/rest-grav.cc b/lily/rest-grav.cc
index 762cbd6e36cc623d6b26005d9b2747522fd9afff..5791c6bd6611b93ad82e8a5684cfd5ad25ffed96 100644 (file)
--- a/lily/rest-grav.cc
+++ b/lily/rest-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "rest-grav.hh"
 */
 
 #include "rest-grav.hh"

diff --git a/lily/rest.cc b/lily/rest.cc
index 0028373cf5dfdd9ce5331ccc0d439ae9e78adff6..e46f3f8673f80cd13896edeaab7d7840df63920d 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "molecule.hh"
 */
 
 #include "molecule.hh"

diff --git a/lily/rhythmic-column-grav.cc b/lily/rhythmic-column-grav.cc
index 7cba706c24fbe699744ba514477b430d5b45850c..e6d5b66c04e618e361dc532fb7b44ce3ab216b0f 100644 (file)
--- a/lily/rhythmic-column-grav.cc
+++ b/lily/rhythmic-column-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "rhythmic-column-grav.hh"
 */
 
 #include "rhythmic-column-grav.hh"

diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc
index 616b8bf8cd27dafb0040a908020b3c3ff93c26a4..99e2f526804ffef93c3a98c70959f4fa8a440b6f 100644 (file)
--- a/lily/rhythmic-head.cc
+++ b/lily/rhythmic-head.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "rhythmic-head.hh"
 */
 
 #include "rhythmic-head.hh"

diff --git a/lily/score-bar.cc b/lily/score-bar.cc
index 5780eaff1ea105a92454a2292b1341dc053354ee..1882347664db6b8fd17766117206f33fe605317d 100644 (file)
--- a/lily/score-bar.cc
+++ b/lily/score-bar.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
   
   source file of the GNU LilyPond music typesetter
   

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

   
  */
 
   
  */
 

diff --git a/lily/score-column.cc b/lily/score-column.cc
index 0da2f640cbd0b024cc89f4b0b9156424ccf1d750..9f40322a0a16bbbd2cd6a1c6b2c02298bd7ff2ab 100644 (file)
--- a/lily/score-column.cc
+++ b/lily/score-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/score-elem-info.cc b/lily/score-elem-info.cc
index 4bfd4c2a16405b718d56a814cf3798f0cd952f61..e86ca938600c983f2da407c6e31ecf15a24ef73a 100644 (file)
--- a/lily/score-elem-info.cc
+++ b/lily/score-elem-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "score-elem-info.hh"
 */
 
 #include "score-elem-info.hh"

diff --git a/lily/score-elem.cc b/lily/score-elem.cc
index e81d7e0563e8609d7f44b034afdaafa493b5ab77..c207e75a4faa00fa6b9ffd281c30d8a8269249c7 100644 (file)
--- a/lily/score-elem.cc
+++ b/lily/score-elem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "outputter.hh"
 #include "p-score.hh"
 */
 #include "outputter.hh"
 #include "p-score.hh"

diff --git a/lily/score-grav.cc b/lily/score-grav.cc
index 06f54eca515ee4ce47b96cf2a11efdcf9f406fde..cfce99e6b37b1e2ed26b344bb5b004513ef4ccc7 100644 (file)
--- a/lily/score-grav.cc
+++ b/lily/score-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "super-elem.hh"
 */
 
 #include "super-elem.hh"

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 9db18a916f64dbff68816488bb1159eaaca0b78d..7d596f90b935d719421c2993e23c1274e0c0ecc0 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #include "score-performer.hh"
  */
 
 #include "score-performer.hh"

diff --git a/lily/score-priority-grav.cc b/lily/score-priority-grav.cc
index 9e2e2cc918fff32a7df260d476a23b4744e6d55e..a0f44cb5ba963dc7832b70925662f0da441f1026 100644 (file)
--- a/lily/score-priority-grav.cc
+++ b/lily/score-priority-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/score.cc b/lily/score.cc
index 8e88f8ad36e89bc633c0d4a89aebc0e70d46dfcf..d30579839a9af88321e0baab582835c1398ea897 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "score.hh"
 */
 
 #include "score.hh"

diff --git a/lily/scoreline.cc b/lily/scoreline.cc
index 4a2df191c4bbfd7e27e200aa5c43aa40479803ba..77eeead39e080bb9762d7ce6387917fbc5430fd8 100644 (file)
--- a/lily/scoreline.cc
+++ b/lily/scoreline.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "scoreline.hh"
 */
 
 #include "scoreline.hh"

diff --git a/lily/scores.cc b/lily/scores.cc
index 5badc05fb00bb0f2e53c445c417aa8a17b361675..4a25a85a0fc78201c2013868b05a20a770d8acd6 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -3,9 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 */

-
+#include <fstream.h>

 #include "main.hh"
 #include "score.hh"
 #include "string.hh"
 #include "main.hh"
 #include "score.hh"
 #include "string.hh"


@@ -13,20 +13,62 @@
 #include "header.hh"
 #include "debug.hh"
 #include "parray.hh"
 #include "header.hh"
 #include "debug.hh"
 #include "parray.hh"

+#include "file-path.hh"
+#include "file-results.hh"
+#include "my-lily-parser.hh"
+#include "source.hh"
+
+Sources* source_global_l = 0;
+Array<String> inclusion_global_array;
+Array<String> target_str_global_array;
+Link_array<Score> score_global_array;
+
+
+void write_dependency_file (String fn, Array<String> targets,
+                           Array<String> deps)
+{
+  const int WRAPWIDTH = 65;
+
+
+  cout << "Writing dependency file " << fn << " ...\n";
+  ofstream f (fn.ch_C ());
+  if (!f)
+    warning ( _("Can't open dependency file `" + fn + "\'"));
+
+  f << "# Automatically generated by " << get_version_str ()  << "\n";
+  String out;
+  for (int i=0; i < targets.size (); i ++)
+     out += targets[i] + " ";
+  out +=  ": ";
+  for (int i=0; i < deps.size (); i ++)
+    {
+      if (out.length_i() > WRAPWIDTH)
+       {
+         f << out << "\\\n";
+         out = "  ";
+       }
+      out  += " " +  deps[i];
+    }
+  f << out << endl; 
+}

 
 

-static Link_array<Score> global_score_array;
-String default_outname_suffix_global = "";
-String default_outname_base_global =  "lelie";
-int default_count_global;
+void
+do_deps()
+{
+  if (dependency_global_b)
+    {
+      write_dependency_file (default_outname_base_global  + ".dep", target_str_global_array,
+                            inclusion_global_array);
+    }
+}

 
 
 void
 do_scores()
 {
 
 
 void
 do_scores()
 {

-  for (int i=0; i < global_score_array.size(); i++)
+  for (int i=0; i < score_global_array.size(); i++)

     {
     {

-//      Score *&is_p = global_score_array[i];
-      Score* is_p = global_score_array[i];
+      Score* is_p = score_global_array[i];

       if (!is_p->header_p_)
        is_p->header_p_ = new Header;
       
       if (!is_p->header_p_)
        is_p->header_p_ = new Header;
       


@@ -43,21 +85,61 @@ do_scores()
          is_p->process();
        }
     }
          is_p->process();
        }
     }

+  do_deps ();

 }
 
 void
 clear_scores ()
 {
 }
 
 void
 clear_scores ()
 {

-  for (int i=0; i < global_score_array.size(); i++)
+  for (int i=0; i < score_global_array.size(); i++)

     {
     {

-      delete global_score_array[i];
+      delete score_global_array[i];

     }
     }

-  global_score_array.clear();
+  score_global_array.clear();
+  inclusion_global_array.clear ();

 }
 
 }
 

+extern File_path path;
+

 void
 void

-add_score (Score * s)
+do_one_file (String init_str, String file_str)

 {
 {

-  global_score_array.push (s);
-}
+  if (init_str.length_i () && path.find (init_str).empty_b ())
+    {
+      error (_("Can not find `") + init_str +"\'");
+      return ;
+    }
+  if (file_str.length_i () && path.find (file_str).empty_b ())
+    {
+      error (_("Can not find `") + file_str + "'");
+      return ;
+    }
+
+  Sources sources;
+  source_global_l = &sources;
+  source_global_l->set_path (&path);
+  {
+    My_lily_parser parser (source_global_l);
+    parser.set_version_check (version_ignore_global_b);
+    parser.parse_file (init_str, file_str);

 
 

+    
+    if (file_str.length_i () && file_str[0] != '-')
+      {
+       String a,b,c,d;
+       split_path (file_str, a, b, c, d);
+       default_outname_base_global = c;
+      }
+    else
+      default_outname_base_global = "lelie";
+  
+    if (parser.error_level_i_)
+      {
+       exit_status_i_  = 1;
+      }
+    else
+      do_scores ();
+    clear_scores ();
+  }
+  source_global_l = 0;
+}

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 47a508e2c28c90beb348bbfe2d9480667ba52f0f..7d11acf61e8c1f2a5ab754902a8eb9881c24a311 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "script-column.hh"
 */
 
 #include "script-column.hh"

diff --git a/lily/script-def.cc b/lily/script-def.cc
index e16eed4c0933e8df31267914a4709c28ac371831..5a9c3a65b389b36c73fb3387f6618d0d2142bbea 100644 (file)
--- a/lily/script-def.cc
+++ b/lily/script-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/script-grav.cc b/lily/script-grav.cc
index 597fe0809ab72e6130849746661621d9d4a9b177..7d281253fe853714da7a70fde8c5bf00ea1cee30 100644 (file)
--- a/lily/script-grav.cc
+++ b/lily/script-grav.cc
@@ -1,7 +1,7 @@
 /*
   script-reg.cc -- implement Script_engraver
 
 /*
   script-reg.cc -- implement Script_engraver
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "script-grav.hh"
 */
 
 #include "script-grav.hh"

diff --git a/lily/script.cc b/lily/script.cc
index 491e6d655fc8fa43af20734dbef021eec18e57d9..4014ed729c6f2ced45097ef127d8381ea841b8b6 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "script-def.hh"
 #include "musical-request.hh"
 */
 #include "script-def.hh"
 #include "musical-request.hh"

diff --git a/lily/slur-grav.cc b/lily/slur-grav.cc
index 732c4bd91d3a00c0a56e493c3d03bfd4b29b0d48..55133511a3aa2e1528ecb6c0680ef3e3662e0d51 100644 (file)
--- a/lily/slur-grav.cc
+++ b/lily/slur-grav.cc
@@ -1,7 +1,7 @@
 /*
   slur-grav.cc -- implement Slur_engraver
 
 /*
   slur-grav.cc -- implement Slur_engraver
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/slur.cc b/lily/slur.cc
index 4df6464f91ed122fb1fae2bf2bfe6cdf6fdac084..f091c426caf442b62e760133fc6c98c699bec930 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998, 1998 Han-Wen Nienhuys <hanwen@stack.nl>

     Jan Nieuwenhuizen <jan@digicash.com>
 */
 
     Jan Nieuwenhuizen <jan@digicash.com>
 */
 


@@ -25,6 +25,7 @@
 #include "debug.hh"
 #include "boxes.hh"
 #include "bezier.hh"
 #include "debug.hh"
 #include "boxes.hh"
 #include "bezier.hh"

+#include "encompass-info.hh"

 // #include "main.hh"
 
 IMPLEMENT_IS_TYPE_B1(Slur,Bow);
 // #include "main.hh"
 
 IMPLEMENT_IS_TYPE_B1(Slur,Bow);


@@ -93,8 +94,11 @@ Slur::do_post_processing ()
   encompass_arr_.sort (Note_column_compare);
   if (!dir_)
     set_default_dir ();
   encompass_arr_.sort (Note_column_compare);
   if (!dir_)
     set_default_dir ();

-  Real interline_f = paper ()->interline_f ();
-  Real inter_f = interline_f / 2;
+
+  Real interline = paper ()->interline_f ();
+  Real internote = interline / 2;
+  Real notewidth = paper ()->note_width ();
+  Real const SLUR_MIN = 2.0 * interline;

 
   /* 
    [OSU]: slur and tie placement
 
   /* 
    [OSU]: slur and tie placement


@@ -109,21 +113,23 @@ Slur::do_post_processing ()
    * suggested gap = ss / 5;
    */
   // jcn: 1/5 seems so small?
    * suggested gap = ss / 5;
    */
   // jcn: 1/5 seems so small?

-  Real gap_f = interline_f / 2; // 5;
+  Real gap_f = interline / 2; // 5;

   
   Drul_array<Note_column*> extrema;
   extrema[LEFT] = encompass_arr_[0];
   extrema[RIGHT] = encompass_arr_.top ();
 
   Direction d=LEFT;
   
   Drul_array<Note_column*> extrema;
   extrema[LEFT] = encompass_arr_[0];
   extrema[RIGHT] = encompass_arr_.top ();
 
   Direction d=LEFT;

-  Real nw_f = paper ()->note_width ();

  
   do 
     {
  
   do 
     {

+      /*
+        broken slur
+       */

       if (extrema[d] != spanned_drul_[d]) 
        {
          dx_f_drul_[d] = -d 
       if (extrema[d] != spanned_drul_[d]) 
        {
          dx_f_drul_[d] = -d 

-           *(spanned_drul_[d]->width ().length () -0.5*nw_f);
+           *(spanned_drul_[d]->width ().length () -0.5*notewidth);

          Direction u = d;
          flip(&u);
          if ((extrema[u] == spanned_drul_[u]) && extrema[u]->stem_l_)
          Direction u = d;
          flip(&u);
          if ((extrema[u] == spanned_drul_[u]) && extrema[u]->stem_l_)


@@ -131,147 +137,114 @@ Slur::do_post_processing ()
              dy_f_drul_[d] = extrema[u]->stem_l_->height ()[dir_];
              dy_f_drul_[u] = extrema[u]->stem_l_->height ()[dir_];
            }
              dy_f_drul_[d] = extrema[u]->stem_l_->height ()[dir_];
              dy_f_drul_[u] = extrema[u]->stem_l_->height ()[dir_];
            }

+
+         // prebreak
+         if (d == RIGHT)
+           {
+             dx_f_drul_[LEFT] = spanned_drul_[LEFT]->width ().length ();
+//           dx_f_drul_[LEFT] -= 2 * notewidth;
+
+             // urg
+             if (encompass_arr_.size () > 1)
+               dx_f_drul_[RIGHT] += notewidth;
+           }
+
+         // postbreak
+         if (d == LEFT)
+           dy_f_drul_[d] += 2.0 * dir_ * internote;

        }
        }

+      /*
+        normal slur
+       */

       else if (extrema[d]->stem_l_ && !extrema[d]->stem_l_->transparent_b_) 
         {
          dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_->height ()[dir_]);
       else if (extrema[d]->stem_l_ && !extrema[d]->stem_l_->transparent_b_) 
         {
          dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_->height ()[dir_]);

-         dx_f_drul_[d] += 0.5 * nw_f - d * gap_f;
+         dx_f_drul_[d] += 0.5 * notewidth - d * gap_f;

          if (dir_ == extrema[d]->stem_l_->dir_)
            {
              if (dir_ == d)
          if (dir_ == extrema[d]->stem_l_->dir_)
            {
              if (dir_ == d)

-               dx_f_drul_[d] += 0.5 * (dir_ * d) * d * nw_f;
+               dx_f_drul_[d] += 0.5 * (dir_ * d) * d * notewidth;

              else
              else

-               dx_f_drul_[d] += 0.25 * (dir_ * d) * d * nw_f;
+               dx_f_drul_[d] += 0.25 * (dir_ * d) * d * notewidth;

            }
        }
       else 
         {
          dy_f_drul_[d] = (int)rint (extrema[d]->head_positions_interval ()
            }
        }
       else 
         {
          dy_f_drul_[d] = (int)rint (extrema[d]->head_positions_interval ()

-           [dir_])* inter_f;
+           [dir_])* internote;

        }
        }

-      dy_f_drul_[d] += dir_ * interline_f;
+      dy_f_drul_[d] += dir_ * interline;

     }
   while (flip(&d) != LEFT);
     }
   while (flip(&d) != LEFT);

+
+  // now that both are set, do dependent
+  do 
+    {
+      /*
+        broken slur
+       */
+      if (extrema[d] != spanned_drul_[d]) 
+        {
+         // pre and post
+         if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < SLUR_MIN)
+           {
+             dx_f_drul_[d] -= d * SLUR_MIN 
+               - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+             dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * SLUR_MIN;
+           }
+         dy_f_drul_[d] = dy_f_drul_[(Direction)-d];
+       }
+     }
+  while (flip(&d) != LEFT);

 }
 
 Array<Offset>
 Slur::get_encompass_offset_arr () const
 {
 }
 
 Array<Offset>
 Slur::get_encompass_offset_arr () const
 {

-  Real interline = paper ()->interline_f ();
-  Real notewidth = paper ()->note_width ();
-  Real internote = interline / 2;
-
-  Stem* left_stem = encompass_arr_[0]->stem_l_;
-  Real left_x = left_stem->hpos_f ();
-  left_x += dx_f_drul_[LEFT];
+  Offset left = Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]);
+  left.x () += encompass_arr_[0]->stem_l_->hpos_f ();

 
 

-  Real left_y = dy_f_drul_[LEFT];
+  Offset d = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
+    dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
+  d.x () += width ().length ();

 
 

-  Real dx = width ().length ();
-  dx += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
-  dx = dx <? 1000;
-  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;
 
   int first = 1;
   int last = encompass_arr_.size () - 1;
 

-  // broken slur first part
+  // prebreak

   if (encompass_arr_[0] != spanned_drul_[LEFT])
   if (encompass_arr_[0] != spanned_drul_[LEFT])

-    {
-      first = 0;
-      left_x = spanned_drul_[LEFT]->width ().length ();
-      left_x -= 2 * notewidth;
-      // urg
-      start_x = left_x - 2 * notewidth;
+    first--;

 
 

-      // 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;
-       }
+  // postbreak
+  if (encompass_arr_.top () != spanned_drul_[RIGHT])
+    last++;

 
 

-      if (dir_ == UP)
-       left_y = left_y >? dy_f_drul_[LEFT];
-      else
-       left_y = left_y <? dy_f_drul_[LEFT];
-      start_y = left_y - dy_f_drul_[LEFT];
+#define RESIZE_ICE
+#ifndef RESIZE_ICE

 
 

-      dy = 0;
-    }
+  Array<Offset> notes;
+  notes.push (Offset (0,0));

 
 

-  // broken slur second part
-  if (encompass_arr_.top () != spanned_drul_[RIGHT])
+  for (int i = first; i < last; i++)

     {
     {

-      left_y += 2.0 * dir_ * internote;
-      start_y = left_y - dy_f_drul_[LEFT];
-      last += 1;
-      dy = 0;
+      Encompass_info info (encompass_arr_[i], dir_);
+      notes.push (info.o_ - left);

     }
     }

+  notes.push (d);

 
 

-#define RESIZE_ICE
-#ifndef RESIZE_ICE
-  Array<Offset> notes;
-  notes.push (Offset (start_x, start_y));

 #else
 #else

+

   int n = last - first + 2;
   Array<Offset> notes (n);
   int n = last - first + 2;
   Array<Offset> notes (n);

-  notes[0] = Offset (start_x, start_y);
-#endif
+  notes[0] = Offset (0,0);
+

   for (int i = first; i < last; i++)
     {
   for (int i = first; i < last; i++)
     {

-      Stem* stem = encompass_arr_[i]->stem_l_;
-      /* 
-       set x to middle of notehead or on exact x position of stem,
-       according to slur direction
-          */
-      Real x = stem->hpos_f ();
-
-      if (stem->dir_ != dir_)
-        {
-         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;
-
-      x -= left_x;
-
-      Real y = stem->height ()[dir_];
-
-      /*
-       leave a gap: slur mustn't touch head/stem
-       */
-      y += 2.5 * internote * dir_;
-
-      // ugh
-      if (dir_ == DOWN)
-       y += 1.5 * internote * dir_;
-
-      y -= left_y;
-
-#ifndef RESIZE_ICE
-      notes.push (Offset (x, y));
+      Encompass_info info (encompass_arr_[i], dir_);
+      notes[i - first + 1] = info.o_ - left;

     }
     }

-  notes.push (Offset (start_x + dx, start_y + dy));
-#else
-      notes[i - first + 1] = Offset (x, y);
-    }
-  notes[n - 1] = Offset (start_x + dx, start_y + dy);
+  notes[n - 1] = Offset (d);
+

 #endif
 
   return notes;
 #endif
 
   return notes;

diff --git a/lily/span-bar-grav.cc b/lily/span-bar-grav.cc
index 727fe56c76771a82717ca582c911aa1378bffe48..bacdcb36240054fd46f4ce38b6d08d81b75a78fa 100644 (file)
--- a/lily/span-bar-grav.cc
+++ b/lily/span-bar-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "span-bar.hh"
 */
 
 #include "span-bar.hh"

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index a371dc019d312527a0ccf65250ea5acfeedeeb57..e89b05352fcc0c6a9d3e65b381b0a6838c473ee6 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "dimen.hh"
 */
 
 #include "dimen.hh"

diff --git a/lily/span-score-bar-grav.cc b/lily/span-score-bar-grav.cc
index 78f949d1f08df8e76e604b300185ad36fe371b3a..8497cdc7c11f751d300cde661c2037d8bf8dfe27 100644 (file)
--- a/lily/span-score-bar-grav.cc
+++ b/lily/span-score-bar-grav.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "span-score-bar.hh"
 */
 
 #include "span-score-bar.hh"

diff --git a/lily/span-score-bar.cc b/lily/span-score-bar.cc
index ffd7ce076378eac2bc7d9318cbd8cace8a898aaf..6e921573c9c9496691c4b000cdbce71a85f9fa00 100644 (file)
--- a/lily/span-score-bar.cc
+++ b/lily/span-score-bar.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "span-score-bar.hh"
 */
 
 #include "span-score-bar.hh"

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 85221d3c94a9f141dea8472b026dbc152a02454c..839cf0d9b47c3111a9000c49488b88a4910cfaef 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/spring-spacer.cc b/lily/spring-spacer.cc
index db27da7950fc1ab5d5de11d4e7c3f17516dd079f..ac4b00b623d9118898dbb38ce321f5f38a254c1f 100644 (file)
--- a/lily/spring-spacer.cc
+++ b/lily/spring-spacer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996, 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998, 1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/staff-info.cc b/lily/staff-info.cc
index 383df71ce1689c5148818d85c5632172e7679366..1dbbd8407aacd524233a0714076f10f475a05486 100644 (file)
--- a/lily/staff-info.cc
+++ b/lily/staff-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 7270d20282ff281d678d7530ac64663c8dbf82fe..8bc8a049f9a718f7adf3df0e5352f214a5cbdd2f 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

  */
 
 #include "staff-performer.hh"
  */
 
 #include "staff-performer.hh"

diff --git a/lily/staff-side.cc b/lily/staff-side.cc
index 404283066c1378ece2d9cd41b932bf05c7ad5222..7b99d06f998516627239d984f1fc5a4bc67f3a16 100644 (file)
--- a/lily/staff-side.cc
+++ b/lily/staff-side.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "interval.hh"
 */
 
 #include "interval.hh"

diff --git a/lily/staff-sym-grav.cc b/lily/staff-sym-grav.cc
index 6aab67dece77bedede5aad66926fbfeba04c4183..2e09bb5777ba6ab40b651afa8063fd791f8333f4 100644 (file)
--- a/lily/staff-sym-grav.cc
+++ b/lily/staff-sym-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "staff-sym-grav.hh"
 */
 
 #include "staff-sym-grav.hh"

diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc
index b22a36592fbedacdf08d94b486c875f44d2d6e41..d4b5f35eafcd64b0b6699c037ca86c48d000056c 100644 (file)
--- a/lily/staff-sym.cc
+++ b/lily/staff-sym.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "staff-sym.hh"
 #include "lookup.hh"
 */
 #include "staff-sym.hh"
 #include "lookup.hh"

diff --git a/lily/stem-grav.cc b/lily/stem-grav.cc
index 544da9c59f1a47dfbb4c1273de9700b2ecec81b8..a809545931c777fbaf7b42192305367cc4359732 100644 (file)
--- a/lily/stem-grav.cc
+++ b/lily/stem-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "stem-grav.hh"
 */
 
 #include "stem-grav.hh"

diff --git a/lily/stem-info.cc b/lily/stem-info.cc
index 34aadfc976d97f32723a55776f5e433f20e33d31..11990ea3e7e08e3f69f4ef4201244cc46b15c73e 100644 (file)
--- a/lily/stem-info.cc
+++ b/lily/stem-info.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 
 */
 
 
 */
 


@@ -23,14 +23,13 @@ Stem_info::Stem_info ()
 
 Stem_info::Stem_info (Stem const *s)
 {
 
 Stem_info::Stem_info (Stem const *s)
 {

-  x = s->hpos_f ();
+  x_ = s->hpos_f ();

   dir_ = s->dir_;
   dir_ = s->dir_;

-  beams_i_ =  0 >? (abs (s->flag_i_) - 2);
+  mult_i_ = s->mult_i_;

 
   /*
     [todo] 
 
   /*
     [todo] 

-    * get algorithm
-    * runtime
+    * get algorithm runtime

 
     Breitkopf + H\"artel:
     miny_f_ = interline + #beams * interbeam
 
     Breitkopf + H\"artel:
     miny_f_ = interline + #beams * interbeam


@@ -45,22 +44,54 @@ Stem_info::Stem_info (Stem const *s)
     */
 
   Real internote_f = s->paper ()->internote_f ();
     */
 
   Real internote_f = s->paper ()->internote_f ();

-  Real interline_f = 2 * internote_f;
-  Real notehead_y = interline_f;
-  // huh? why do i seem to need the / 2 ?
+  Real interline_f = 2.0 * internote_f;

   Real interbeam_f = s->paper ()->interbeam_f ();
   Real interbeam_f = s->paper ()->interbeam_f ();

-  // Real interbeam_f = s->paper ()->interbeam_f () / 2;
-  // perhaps bo dim (y) = internote?
+  Real staffline_f = s->paper ()->rule_thickness ();
+  Real beam_f = 0.48 * (interline_f - staffline_f);

          
          

-   idealy_f_  = dir_ * s->stem_begin_f () + beams_i_ * interbeam_f; 
-   if (beams_i_ < 3)
-     idealy_f_ += 2 * interline_f;
-   else
-     idealy_f_ += 1.5 * interline_f;
-   idealy_f_ /= internote_f;
-  miny_f_ = dir_ * s->stem_begin_f () + 2 + beams_i_ * interbeam_f / internote_f;
-
-  idealy_f_ =  miny_f_ >? idealy_f_;
-  //    assert (miny_f_ <= idealy_f_);
+  if (check_debug && !monitor->silent_b ("Stem_info"))
+    {
+      static int i = 1;
+      cout << "******" << i++ << "******" << endl;
+      cout << "begin_f: " << s->stem_begin_f () * dir_ << endl;
+      // urg urg urg
+      cout << "chord_f/i: " << s->chord_start_f () * dir_ / internote_f << endl;
+    }
+
+  /*
+    For simplicity, we'll assume dir = UP and correct if 
+    dir = DOWN afterwards.
+   */
+  idealy_f_ = s->chord_start_f () * dir_ / internote_f;
+  idealy_f_ *= internote_f;
+
+  idealy_f_ += interbeam_f * mult_i_;
+
+  miny_f_ = idealy_f_;
+
+  // B"arenreiter
+  if (mult_i_ < 3)
+    idealy_f_ += 2.0 * interline_f;
+  else
+    idealy_f_ += 1.5 * interline_f;
+
+  miny_f_ += 1.0 * interline_f;
+
+  // lowest beam of (UP) beam must never be lower than second staffline
+  miny_f_ = miny_f_ >? (- 2 * internote_f - beam_f
+    + (mult_i_ > 0) * beam_f + interbeam_f * (mult_i_ - 1));
+
+  idealy_f_ /= internote_f;
+  miny_f_ /= internote_f;
+
+  if (check_debug && !monitor->silent_b ("Stem_info"))
+    {
+      cout << "dir_: " << dir_ << endl;
+      cout << "mult_i_: " << mult_i_ << endl;
+      cout << "idealy_f_: " << idealy_f_ << endl;
+      cout << "miny_f_: " << miny_f_ << endl;
+    }
+
+  idealy_f_ = miny_f_ >? idealy_f_;

 }
 
 }
 

diff --git a/lily/stem.cc b/lily/stem.cc
index 25fa1c13ff478127c3121408355e5155d49cdfb4..a2361b4fe8a295e77fb14e8b3d0ea11051b771d8 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
   TODO: This is way too hairy
 */
 
   TODO: This is way too hairy
 */


@@ -32,6 +32,7 @@ Stem::Stem ()
   beam_l_ = 0;
   beams_left_i_ = 0;
   beams_right_i_ = 0;
   beam_l_ = 0;
   beams_left_i_ = 0;
   beams_right_i_ = 0;

+  mult_i_ = 0;

 
   yextent_drul_[DOWN] = yextent_drul_[UP] = 0;
   flag_i_ = 2;
 
   yextent_drul_[DOWN] = yextent_drul_[UP] = 0;
   flag_i_ = 2;

diff --git a/lily/super-elem.cc b/lily/super-elem.cc
index 3e9d8d0f70a439b95dc4348a03e8ee235a420171..ca153eb5dab06e99cce8517cf6d8dc547b52dd1a 100644 (file)
--- a/lily/super-elem.cc
+++ b/lily/super-elem.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "super-elem.hh"
 */
 
 #include "super-elem.hh"

diff --git a/lily/swallow-grav.cc b/lily/swallow-grav.cc
index a8fbfcd0f31077fd6d34cec799f71feb120ae307..8c32a81a52c8513ff18c6c125a067bc61b209d21 100644 (file)
--- a/lily/swallow-grav.cc
+++ b/lily/swallow-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "swallow-grav.hh"
 
 */
 #include "swallow-grav.hh"
 

diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc
index 6d8c55936eac5154d682ea74c05ca72e1ab3fcda..5f2cbb2873423a086dc9b7b294f16a44acb8bd34 100644 (file)
--- a/lily/swallow-perf.cc
+++ b/lily/swallow-perf.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "swallow-perf.hh"
 */
 
 #include "swallow-perf.hh"

diff --git a/lily/symtable.cc b/lily/symtable.cc
index 0be5fbf742f9082d47959cebb4d8c2be35886a7b..52ef9fefc0a716ef5f2f41b18082d623d95157cf 100644 (file)
--- a/lily/symtable.cc
+++ b/lily/symtable.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "misc.hh"
 */
 
 #include "misc.hh"

diff --git a/lily/template1.cc b/lily/template1.cc
index 3eee319eae752d1976814b55e0de2f1fbe6652da..b4a5dbf20926555687254eb4695a63af26394038 100644 (file)
--- a/lily/template1.cc
+++ b/lily/template1.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/template2.cc b/lily/template2.cc
index 6aaeba4633a340a1cb08ff772d0770c7a72a2001..b9ea8f4ace0d0caf5efe8c42b02ee372a53848da 100644 (file)
--- a/lily/template2.cc
+++ b/lily/template2.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "line-spacer.hh"
 */
 
 #include "line-spacer.hh"

diff --git a/lily/template3.cc b/lily/template3.cc
index 672a7b2c249e906c0cf1e5ee6b2ab21587a01c61..5191f663c56f458d35f9e190009cf57bd0ac3e1f 100644 (file)
--- a/lily/template3.cc
+++ b/lily/template3.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "atom.hh"
 */
 
 #include "atom.hh"

diff --git a/lily/template4.cc b/lily/template4.cc
index 062c1e1a8d8cb875911cd121c347153d80599e9e..8ff8142c7e299287d9a0145f3123cb214b4de50d 100644 (file)
--- a/lily/template4.cc
+++ b/lily/template4.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #ifndef __CYGWIN32__
 */
 
 #ifndef __CYGWIN32__

diff --git a/lily/template5.cc b/lily/template5.cc
index 29bb496ff4aae017b578621880444650889f85d8..98b3dc89fd9d9f6a8babc8ace553044a49f29591 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include <limits.h>
 */
 
 #include <limits.h>


@@ -15,7 +15,6 @@
 #include "interval.tcc"
 
 template INTERVAL__INSTANTIATE(Rational);
 #include "interval.tcc"
 
 template INTERVAL__INSTANTIATE(Rational);

-template INTERVAL__INSTANTIATE(int);

 
 #include "compare.hh"
 
 
 #include "compare.hh"
 


@@ -33,14 +32,3 @@ Interval_t<Rational>::T_to_str (Rational a)
   return a.str ();
 }
 
   return a.str ();
 }
 

-int
-Interval_t<int>::infinity()
-{
-  return INT_MAX;
-}
-
-String
-Interval_t<int>::T_to_str (int i)
-{
-  return String (i);
-}

diff --git a/lily/template7.cc b/lily/template7.cc
index e430260907828ea108bd2a6fe65f3c12077a7b2a..c38954bf2d2afec9692e7793b1f53c14a2d8bfc4 100644 (file)
--- a/lily/template7.cc
+++ b/lily/template7.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/template8.cc b/lily/template8.cc
index 0f27440cff168bb7a7d68e667a62fc202756740e..2d24fce40a982e9125d466f8bbd4c09cdd6b7aae 100644 (file)
--- a/lily/template8.cc
+++ b/lily/template8.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc
index 0a1de1398db3f52a51b4791ad92fafbbbd411262..f2d07eb85554e5ebf6e8d8a7d0cc80e26134bb37 100644 (file)
--- a/lily/tex-beam.cc
+++ b/lily/tex-beam.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 /*
 */
 
 /*


@@ -38,13 +38,13 @@ Lookup::rule_symbol (Real height, Real width) const
 }
 
 Atom 
 }
 
 Atom 

-Lookup::beam(Real &slope, Real width, Real y_thick) const
+Lookup::beam(Real slope, Real width, Real thick) const

 {
   
 {
   

-  Atom a( ps_beam (slope, width, y_thick));
-  Real slope_y =slope * width; 
-  Real min_y = (0 <? slope_y )- y_thick/2;
-  Real max_y = (0 >? slope_y) + y_thick/2;
+  Atom a (ps_beam (slope, width, thick));
+  Real height = slope * width; 
+  Real min_y = (0 <? height) - thick/2;
+  Real max_y = (0 >? height) + thick/2;

   
   a.dim_[X_AXIS] = Interval(0, width);
   a.dim_[Y_AXIS] = Interval(min_y, max_y);
   
   a.dim_[X_AXIS] = Interval(0, width);
   a.dim_[Y_AXIS] = Interval(min_y, max_y);


@@ -52,29 +52,14 @@ Lookup::beam(Real &slope, Real width, Real y_thick) const
 }
 
 Atom
 }
 
 Atom

-Lookup::ps_beam (Real slope, Real width, Real y_thickness)const
+Lookup::ps_beam (Real slope, Real width, Real thick) const

 {
   String ps = "\\embeddedps{\n";
 {
   String ps = "\\embeddedps{\n";

-  ps += String (width) + " "+ String (slope) + " " + String (y_thickness)
+  ps += String (width) + " "+ String (slope) + " " + String (thick)

     + " draw_beam}";
 
     + " draw_beam}";
 

-  /* 
-   beam parts are rarely wider than 100pt: 
-   precision of 4 yields maximum (half beam spanning half a page)
-   error of: 1%% * 3*72pt === 0.2pt = 0.07mm
-   */
-  String width_str = String_convert::precision_str (width, 4);
-  String slope_str = String_convert::precision_str (slope, 4);
-  String thick_str = String_convert::precision_str (y_thickness, 3);
-  String name = "feta-beum-" + width_str + "-" + slope_str + "-" + thick_str;
-
-  int i;
-  while ((i = name.index_i ('.')) != -1)
-    name[i]=  'x';
-
-
-

   Atom s;
   s.tex_ = ps;
   return s;
 }
   Atom s;
   s.tex_ = ps;
   return s;
 }

+

diff --git a/lily/tex-stream.cc b/lily/tex-stream.cc
index ed8ef91a53c8515a1a9ce5e9853e2c717f87da7e..91f26921b324cabab8a52ddfdb146937945e53e6 100644 (file)
--- a/lily/tex-stream.cc
+++ b/lily/tex-stream.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 
 */
 
 
 */
 

diff --git a/lily/tex.cc b/lily/tex.cc
index 19285561c1296280fa5923ae3c44d8e416e6a8a6..04f3e9cf4ace306ec946927dba1226c5414c32f3 100644 (file)
--- a/lily/tex.cc
+++ b/lily/tex.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "dimen.hh"
 */
 
 #include "dimen.hh"

diff --git a/lily/text-def.cc b/lily/text-def.cc
index b81f2f5f967b5b6610765076be035dd58ba607a1..6fdf2542d2cbebc67c56728f4f8060b58a79ecc5 100644 (file)
--- a/lily/text-def.cc
+++ b/lily/text-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "debug.hh"
 */
 
 #include "debug.hh"

diff --git a/lily/text-item.cc b/lily/text-item.cc
index c471fa1453f7c96c82c8ec14a077c1c319d74f06..6384ba2582b7ec80085432ab15e40c3d7628d2a4 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index 9a4406b24af1dc54a51be76b1175d3ea84018542..1e4a53b2fbf0a071f104b91bf55da9e333aec4a1 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "molecule.hh"
 */
 
 #include "molecule.hh"

diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc
index 453a955072379a86686b1c5887a3554e05629652..a690cb36a11b79e9442d7ff1210452ea1fee4c26 100644 (file)
--- a/lily/tie-grav.cc
+++ b/lily/tie-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "tie-grav.hh"
 */
 
 #include "tie-grav.hh"

diff --git a/lily/tie.cc b/lily/tie.cc
index 799bebaaabb96e7f4197690f03112889c7d4f161..0d17f409ce08caa247a7f2d55c12ad7c629e45b1 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "paper-def.hh"
 */
 
 #include "paper-def.hh"


@@ -61,10 +61,12 @@ Tie::do_add_processing()
 void
 Tie::do_post_processing()
 {
 void
 Tie::do_post_processing()
 {

-  Real nw_f = paper ()->note_width ();
-  Real interline_f = paper ()->interline_f ();

   assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]);
 
   assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]);
 

+  Real notewidth = paper ()->note_width ();
+  Real interline_f = paper ()->interline_f ();
+  Real const TIE_MIN = 2.0 * interline_f;
+

   /* 
    [OSU]: slur and tie placement
 
   /* 
    [OSU]: slur and tie placement
 


@@ -91,24 +93,43 @@ Tie::do_post_processing()
 
   do
     {
 
   do
     {

+      // tie attached to outer notehead

       if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_)
        {
       if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_)
        {

-         /* normal tie between noteheads, with gap of space */

          if (d == LEFT)
          if (d == LEFT)

-           dx_f_drul_[d] +=  nw_f;
+           dx_f_drul_[d] += notewidth;

          dx_f_drul_[d] += -d * gap_f;
          /* attach to outer 3/4 end of head */
          dy_f_drul_[d] += dir_ * 0.25 * interline_f;
        }
          dx_f_drul_[d] += -d * gap_f;
          /* attach to outer 3/4 end of head */
          dy_f_drul_[d] += dir_ * 0.25 * interline_f;
        }

+      // tie attached to inner notehead

       else if (head_l_drul_[d])
        {
       else if (head_l_drul_[d])
        {

-         dx_f_drul_[d] += d*0.5 * nw_f;
+         dx_f_drul_[d] += d*0.5 * notewidth;

        }
        }

+      // uhm? loose end of tie // tie attached to stem

       else
        {
       else
        {

-         dy_f_drul_[d] = dy_f_drul_[(Direction) -d];

          dx_f_drul_[d] = -d * (spanned_drul_[d]->width ().length () 
          dx_f_drul_[d] = -d * (spanned_drul_[d]->width ().length () 

-                               -0.5 * nw_f);
+                               -0.5 * notewidth);
+       }
+    }
+  while (flip(&d) != LEFT);
+
+  // now that both are set, do dependent
+  do
+    {
+      // tie attached to outer notehead
+      if (!head_l_drul_[d])
+       {
+         if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < TIE_MIN)
+           {
+             dx_f_drul_[d] -= d * TIE_MIN 
+               - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+             dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * TIE_MIN;
+           }
+
+         dy_f_drul_[d] = dy_f_drul_[(Direction) -d];

        }
     }
   while (flip(&d) != LEFT);
        }
     }
   while (flip(&d) != LEFT);

diff --git a/lily/time-description.cc b/lily/time-description.cc
index 1437a7c44105d2129a9e6b57fddf91223f8b8416..e2b87d0fee76569844243bc440729f3f7bc90faa 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "time-description.hh"
 */
 
 #include "time-description.hh"

diff --git a/lily/timing-grav.cc b/lily/timing-grav.cc
index 8da02d6161559f88ff3d146d5bbaf3f58f93c13b..17f110fda3a9524acc0e060c5a689c4e389ec19a 100644 (file)
--- a/lily/timing-grav.cc
+++ b/lily/timing-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 #include "score-grav.hh"
 #include "timing-grav.hh"
 */
 #include "score-grav.hh"
 #include "timing-grav.hh"

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index de93a9206f402a3cd11e2b065a0f832171825b8c..b244db903c8de7e3fb14b079107c28f64c9e23ce 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "timing-translator.hh"
 */
 
 #include "timing-translator.hh"

diff --git a/lily/translation-property.cc b/lily/translation-property.cc
index 483036be5010b70843235005a50b78a604633ecf..a5bc9d48504afb3bd1e37512fe190ae107282f98 100644 (file)
--- a/lily/translation-property.cc
+++ b/lily/translation-property.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "translation-property.hh"
 */
 
 #include "translation-property.hh"

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 2da67c365d39cff1e2164291e3c1e88a0fcdd21f..7a65215c810a41a0594d391833237b4c775848dd 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index b91f254c3885ef9a26144199eaa8df4b005c49ac..5846c2bb37dac7c543e3449103ee9a551ae0ad24 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "music-output-def.hh"
 */
 
 #include "music-output-def.hh"

diff --git a/lily/translator.cc b/lily/translator.cc
index 5655da8a1592175968086058a6f35a4823c57894..ae5562579e8d694e530a0f8f21a61629c65cc101 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/lily/type-swallow-trans.cc b/lily/type-swallow-trans.cc
index b90ced5d1bba02871382e80517547df20aad38a4..bd85e4051432b0512729c54a29eb2a5bbfa50939 100644 (file)
--- a/lily/type-swallow-trans.cc
+++ b/lily/type-swallow-trans.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "type-swallow-trans.hh"
 */
 
 #include "type-swallow-trans.hh"

diff --git a/lily/vertical-align-elem.cc b/lily/vertical-align-elem.cc
index 8cc0ecfd499a09323583acb90889a91b49de6f9f..dbd8e4b8eb4e99f840a87a4e794745c713faaff4 100644 (file)
--- a/lily/vertical-align-elem.cc
+++ b/lily/vertical-align-elem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "vertical-align-elem.hh"
 */
 
 #include "vertical-align-elem.hh"

diff --git a/lily/vertical-align-grav.cc b/lily/vertical-align-grav.cc
index fe773a9375ac5a2dea9da15c57c91555b112143e..8024ab5a50bd75b076b119750170895310efdd24 100644 (file)
--- a/lily/vertical-align-grav.cc
+++ b/lily/vertical-align-grav.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "p-col.hh"
 */
 
 #include "p-col.hh"

diff --git a/lily/vertical-align-spanner.cc b/lily/vertical-align-spanner.cc
index 94a8c5ee723fe24995bb82465d65a79af374e8a4..cc8c0da9ab003fd4ebf8b5ee805717f45604d47c 100644 (file)
--- a/lily/vertical-align-spanner.cc
+++ b/lily/vertical-align-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "vertical-align-spanner.hh"
 */
 
 #include "vertical-align-spanner.hh"

diff --git a/lily/vertical-group-elem.cc b/lily/vertical-group-elem.cc
index ade65c5dd63287a9561f9bce32171fba5a3899cf..79e22317e07bfd338e91e9bf80eab0405c3f316c 100644 (file)
--- a/lily/vertical-group-elem.cc
+++ b/lily/vertical-group-elem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "vertical-group-elem.hh"
 */
 
 #include "vertical-group-elem.hh"

diff --git a/lily/vertical-group-spanner.cc b/lily/vertical-group-spanner.cc
index abae14aa028ab466049e15537af1f28d1a9b5f6e..c3a4c2a94cf4b3d527e3da2889cd7fd688535e9d 100644 (file)
--- a/lily/vertical-group-spanner.cc
+++ b/lily/vertical-group-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "vertical-group-spanner.hh"
 */
 
 #include "vertical-group-spanner.hh"

diff --git a/lily/voice-iterator.cc b/lily/voice-iterator.cc
index a5b3d60711d5f733d70dfef15692654c413b940e..971b22a924d694b80445888eb8b6cfcb56e6e5db 100644 (file)
--- a/lily/voice-iterator.cc
+++ b/lily/voice-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "translator-group.hh"
 */
 
 #include "translator-group.hh"

diff --git a/lily/warn.cc b/lily/warn.cc
index 86604d585341802bb2d1985cbd5ffe8d03a8d33f..33261d8f5ac7d2e5388c4f9591f97e1b955f6a7c 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "proto.hh"
 */
 
 #include "proto.hh"

diff --git a/lily/word-wrap.cc b/lily/word-wrap.cc
index c41e3ed9b2eff346b1beabbf061779abbc6b8f65..d8c0804788f13f3e6af50d87d3125da891b92e1e 100644 (file)
--- a/lily/word-wrap.cc
+++ b/lily/word-wrap.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
 
   source file of the LilyPond music typesetter
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 #include "word-wrap.hh"
 */
 
 #include "word-wrap.hh"

diff --git a/make/Install_outfiles.make b/make/Install_outfiles.make
index e3da0a9ce567f2bb4717f8994c6c49fdee4d585b..19917088c65eea7320894e76e2940fda6ba89c30 100644 (file)
--- a/make/Install_outfiles.make
+++ b/make/Install_outfiles.make
@@ -1,16 +1,15 @@
 
 
 
 

-

 localinstall: localinstall-files
 
 localinstall-files: $(INSTALLATION_OUT_FILES)
 localinstall: localinstall-files
 
 localinstall-files: $(INSTALLATION_OUT_FILES)

-       $(INSTALL) -d $(INSTALLATION_DIR)
-       $(INSTALL) -m 644 $(INSTALLATION_OUT_FILES) $(INSTALLATION_DIR)
+       $(INSTALL) -d $(INSTALLATION_OUT_DIR)
+       $(INSTALL) -m 644 $(INSTALLATION_OUT_FILES) $(INSTALLATION_OUT_DIR)

 
 localuninstall: localuninstall-files
 
 localuninstall-files:
        for i in $(notdir $(INSTALLATION_OUT_FILES)) ; do \
 
 localuninstall: localuninstall-files
 
 localuninstall-files:
        for i in $(notdir $(INSTALLATION_OUT_FILES)) ; do \

-               rm -f $(INSTALLATION_DIR)/$$i; \
+               rm -f $(INSTALLATION_OUT_DIR)/$$i; \

        done
        done

-       -rmdir $(INSTALLATION_DIR)
+       -rmdir $(INSTALLATION_OUT_DIR)

diff --git a/make/Install_outfiles.sub.make b/make/Install_outfiles.sub.make
new file mode 100644 (file)
index 0000000..e89aba9
--- /dev/null
+++ b/make/Install_outfiles.sub.make
@@ -0,0 +1,19 @@
+
+# project  LilyPond -- the musical typesetter
+# title           generic red tape for include/Makefile
+# file    make/Include.make
+#
+# Copyright (c) 1997 by    
+#      Jan Nieuwenhuizen <jan@digicash.com>
+#      Han-Wen Nienhuys <hanwen@stack.nl>
+
+# identify module:
+#
+
+
+include $(depth)/make/Variables.make
+include $(depth)/make/Version.make 
+include $(depth)/make/Files.make
+include $(depth)/make/Targets.make
+include $(depth)/make/Rules.make
+include $(depth)/make/Install_outfiles.make

diff --git a/make/Makefile b/make/Makefile
index c50099ce3132d55d53718eec2885f023a0fd4b4e..7e363dc3db6ae8757c8685ae02a45d05af9ace04 100644 (file)
--- a/make/Makefile
+++ b/make/Makefile
@@ -37,11 +37,9 @@ include ./$(depth)/make/Rules.make
 default: $(RPMSPEC) $(LSMENTRY)
 
 
 default: $(RPMSPEC) $(LSMENTRY)
 
 

-rpmdocs=$(addprefix Documentation/out/, $(notdir $(shell  find $(depth)/Documentation/ -name '*.txt' ))) \
-       BUGS TODO NEWS DEDICATION ANNOUNCE README
-rpmmudocs=$(addprefix Documentation/, $(notdir $(shell ls $(depth)/Documentation/*.doc)))
+rpmdocs=BUGS TODO NEWS DEDICATION ANNOUNCE README

 rpmdvis=$(rpmmudocs:.doc=.dvi)
 rpmdvis=$(rpmmudocs:.doc=.dvi)

-rpmexamples= $(addprefix input/, $(notdir $(shell ls $(depth)/input/*.{ly,tex})))
+rpmexamples= $(addprefix input/, $(notdir $(shell ls $(depth)/input/*.ly)))

 
 
 date = $(shell date '+%d%b%y'|tr a-z A-Z)
 
 
 date = $(shell date '+%d%b%y'|tr a-z A-Z)

diff --git a/make/Mutopia.make b/make/Mutopia.make
index 1da745a5b671c8d03ad3eea3195d3bc8192bff6a..65f407c8fbcabdcec1077f2d5b3a8925c80ea164 100644 (file)
--- a/make/Mutopia.make
+++ b/make/Mutopia.make
@@ -25,6 +25,5 @@ $(outdir)/%.ly.txt: %.ly
        ln -f $< $@
 
 $(outdir)/%.dvi: %.ly
        ln -f $< $@
 
 $(outdir)/%.dvi: %.ly

-       (cd $(outdir); \
-       LILYINCLUDE="..:$$LILYINCLUDE" ly2dvi ../$< )
+       ly2dvi -o $(outdir)  $< 

 
 

diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
index d3dfff308191dd2d14bfd64e04514b5e157b6869..f10c3474c7ba5249a721456d8e490082808dfe96 100644 (file)
--- a/make/Toplevel.make.in
+++ b/make/Toplevel.make.in
@@ -66,6 +66,7 @@ Makefile: make/Toplevel.make.in
 
 
 website:
 
 
 website:

+       $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW

 
 
 examples:
 
 
 examples:

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 10fd44ffe7da73a5ee969db36bfb32e145829b2a..bf99632045eebf6a69592bb07b7952eb0541069d 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -5,8 +5,8 @@ Copyright: GPL
 Group: Applications/Publishing
 Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: A program for typesetting music.
 Group: Applications/Publishing
 Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: A program for typesetting music.

-URL: http://www.cs.ruu.nl/~hanwen/lilypond
-Packager: Han-Wen Nienhuys <hanwen@stack.nl>
+URL: http://www.cs.uu.nl/~hanwen/lilypond
+Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

 Icon: lelie_icon.gif
 Buildroot: /tmp/lilypond-install
 
 Icon: lelie_icon.gif
 Buildroot: /tmp/lilypond-install
 


@@ -31,8 +31,11 @@ strip lily/out/lilypond mi2mu/out/mi2mu
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files

-%doc @TEXT_DOCS@
-%doc @EXAMPLE_LYS@ 
+%doc Documentation/out/*.txt
+%doc Documentation/tex/*.doc
+%doc Documentation/tex/*.bib
+%doc mutopia/*.ly
+%doc input/*.ly

 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book
 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book


@@ -50,6 +53,8 @@ make prefix="$RPM_BUILD_ROOT/usr" install
 /usr/share/lilypond/
 %post
 
 /usr/share/lilypond/
 %post
 

+ln -s 

 texhash                # takes some time...
 rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm'`
 
 texhash                # takes some time...
 rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm'`
 

+ln -s  /usr/lib/texmf/texmf/tex/lilypond  /usr/lib/texmf/texmf/tex/latex/lilypond # suck me plenty

diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index a62c481739311bad317e440d3d984c19fb14ac4a..d110ebc68efc605b1a6d2fa1e2ea5ad609f526fa 100644 (file)
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
 Begin3
 Titel: LilyPond

-Versie: 0.1.60
-Inschrijf datum: 29APR98
+Versie: 0.1.61
+Inschrijf datum: 03MAY98

 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: 
 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
        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.60.tar.gz 
+       395k lilypond-0.1.61.tar.gz 

 Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
 Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/

-       395k lilypond-0.1.60.tar.gz 
+       395k lilypond-0.1.61.tar.gz 

 Copi"eer politie: GPL
 End
 Copi"eer politie: GPL
 End

diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index af277bebcec65279f9eb6651fb509f098b146b12..ab0be3a7453b70b727b8ddfe052d955f19c9aab2 100644 (file)
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Begin3
 Title: LilyPond

-Version: 0.1.60
-Entered-date: 29APR98
+Version: 0.1.61
+Entered-date: 03MAY98

 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 
 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
        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.60.tar.gz 
+       570k lilypond-0.1.61.tar.gz 

 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/

-       570k lilypond-0.1.60.tar.gz 
+       570k lilypond-0.1.61.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 6a07511883acc05ac9ffe4199e0b2e5d87f108f8..289561852befce0e104296f7a1e62eeb1dc42bcf 100644 (file)
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,12 +1,12 @@
 Name: lilypond
 Name: lilypond

-Version: 0.1.60
+Version: 0.1.61

 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing

-Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-0.1.60.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/development/lilypond-0.1.61.tar.gz

 Summary: A program for typesetting music.
 Summary: A program for typesetting music.

-URL: http://www.cs.ruu.nl/~hanwen/lilypond
-Packager: Han-Wen Nienhuys <hanwen@stack.nl>
+URL: http://www.cs.uu.nl/~hanwen/lilypond
+Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

 Icon: lelie_icon.gif
 Buildroot: /tmp/lilypond-install
 
 Icon: lelie_icon.gif
 Buildroot: /tmp/lilypond-install
 


@@ -31,8 +31,11 @@ strip lily/out/lilypond mi2mu/out/mi2mu
 make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
 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/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/*.txt
+%doc Documentation/tex/*.doc
+%doc Documentation/tex/*.bib
+%doc mutopia/*.ly
+%doc input/*.ly

 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book
 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book


@@ -50,6 +53,8 @@ make prefix="$RPM_BUILD_ROOT/usr" install
 /usr/share/lilypond/
 %post
 
 /usr/share/lilypond/
 %post
 

+ln -s 

 texhash                # takes some time...
 rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm'`
 
 texhash                # takes some time...
 rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm'`
 

+ln -s  /usr/lib/texmf/texmf/tex/lilypond  /usr/lib/texmf/texmf/tex/latex/lilypond # suck me plenty

diff --git a/mf/Makefile b/mf/Makefile
index 7be593edd5c5a12bc9bbfdcecd7a77d24262619d..0aebf0952c574c1953f8caae55dece9a5cca118b 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -14,8 +14,8 @@ TEXFILES = $(wildcard *.tex)
 MFFILES = $(wildcard *.mf)
 EXTRA_DISTFILES =   TODO README  $(MFFILES)
 #
 MFFILES = $(wildcard *.mf)
 EXTRA_DISTFILES =   TODO README  $(MFFILES)
 #

-lyout = $(depth)/init
-texout = $(depth)/tex
+lyout = $(outdir)/
+texout = $(outdir)/

 
 FONT_FILES = $(wildcard *[0-9].mf)
 FET_FILES = $(wildcard feta[0-9]*.mf)
 
 FONT_FILES = $(wildcard *[0-9].mf)
 FET_FILES = $(wildcard feta[0-9]*.mf)


@@ -45,6 +45,20 @@ $(lyout)/%.ly $(texout)/%.tex $(outdir)/%.dep: $(outdir)/%.log
        $(PYTHON) $(depth)/bin/mf-to-table.py --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
 
 
        $(PYTHON) $(depth)/bin/mf-to-table.py --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
 
 

+lyouts:
+
+TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(TEXDIR)/lilypond depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(depth)/make/Install_outfiles.sub.make $@
+
+LYINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir)/lilypond INSTALLATION_OUT_FILES="$(LYTABLES)" -f $(depth)/make/Install_outfiles.sub.make $@
+
+localinstall:
+       $(TEXINSTALL)
+       $(LYINSTALL)
+
+localuninstall:
+       $(TEXINSTALL)
+       $(LYINSTALL)
+

 INSTALLATION_DIR=$(MFDIR)/public/lilypond
 INSTALLATION_FILES=$(MFFILES)
 
 INSTALLATION_DIR=$(MFDIR)/public/lilypond
 INSTALLATION_FILES=$(MFFILES)
 

diff --git a/mf/TODO b/mf/TODO
index 850230b6c7157300f9c14f9cd63bba8d7ee9ae6f..e93332e8b188d43d4182d675f9a2cdb5bc72ba3f 100644 (file)
--- a/mf/TODO
+++ b/mf/TODO
@@ -2,6 +2,7 @@
        - design decent macro for bulbed endings
        - printer dependencies.
        - y-refpoint for rests should be the 4th staffline (gclef: b')
        - design decent macro for bulbed endings
        - printer dependencies.
        - y-refpoint for rests should be the 4th staffline (gclef: b')

+       - clean-up eight+ rests

        - versioning    
        - lo-res fixes.
        - work out sizes of character fonts.
        - versioning    
        - lo-res fixes.
        - work out sizes of character fonts.

diff --git a/mi2mu/include/mi2mu-proto.hh b/mi2mu/include/mi2mu-proto.hh
index da4d89ba548f96df297119f4f1f6a02641ca2978..c5cc781671c9a7f5d996a949c1f999631a76216e 100644 (file)
--- a/mi2mu/include/mi2mu-proto.hh
+++ b/mi2mu/include/mi2mu-proto.hh
@@ -3,7 +3,7 @@
 
   source file of mi2mu, part of the GNU LilyPond package,
 
 
   source file of mi2mu, part of the GNU LilyPond package,
 

-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>

 */
 
 
 */
 
 

diff --git a/mi2mu/include/midi-parser.hh b/mi2mu/include/midi-parser.hh
index 3c1b491f65bdaf5c2309530544578672c171a782..cc883e2a1bcf74adbb2e9ac342c3f4435e2504cc 100644 (file)
--- a/mi2mu/include/midi-parser.hh
+++ b/mi2mu/include/midi-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 
 */
 
 

diff --git a/mi2mu/include/midi-score-parser.hh b/mi2mu/include/midi-score-parser.hh
index f9c8b646d872ff03e28c981db0ad8d6a7d8fefce..c13ea027276cdeb734619c9776dc1c66770060a9 100644 (file)
--- a/mi2mu/include/midi-score-parser.hh
+++ b/mi2mu/include/midi-score-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 
 */
 
 

diff --git a/mi2mu/include/midi-track-parser.hh b/mi2mu/include/midi-track-parser.hh
index f973209655076fab5b88f18cb2db25c4510d425c..0115adecd59d3988f0947b3ad19adffd2e6f9d79 100644 (file)
--- a/mi2mu/include/midi-track-parser.hh
+++ b/mi2mu/include/midi-track-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 
 */
 
 

diff --git a/mi2mu/main.cc b/mi2mu/main.cc
index 7f89342476ce3df368a0bd6d18b204335bd45f60..3ae4f3990569b81527372f25e71570642a7aa48d 100644 (file)
--- a/mi2mu/main.cc
+++ b/mi2mu/main.cc
@@ -7,7 +7,7 @@
 #include <assert.h>
 #include "string-convert.hh"
 #include "lgetopt.hh"
 #include <assert.h>
 #include "string-convert.hh"
 #include "lgetopt.hh"

-#include "path.hh"
+#include "file-path.hh"

 #include "duration-convert.hh"
 #include "source.hh"
 
 #include "duration-convert.hh"
 #include "source.hh"
 

diff --git a/mi2mu/midi-parser.cc b/mi2mu/midi-parser.cc
index f1b71122e1018a5021259217f95be14abeb15e4d..ad8e020d263c98c42edb39e9806cfdf15f190346 100644 (file)
--- a/mi2mu/midi-parser.cc
+++ b/mi2mu/midi-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include <assert.h>
 */
 
 #include <assert.h>

diff --git a/mi2mu/midi-score-parser.cc b/mi2mu/midi-score-parser.cc
index 7a787d062f4957ba10e076258fb4bebe81640078..b0cac0c889aa2ba297faaecf91dc27351551ad13 100644 (file)
--- a/mi2mu/midi-score-parser.cc
+++ b/mi2mu/midi-score-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include "moment.hh"
 */
 
 #include "moment.hh"

diff --git a/mi2mu/midi-track-parser.cc b/mi2mu/midi-track-parser.cc
index fd87d2a7e96b755b7ad226aab59a4d9ee7f2221d..ffc3380da3b55bf29fd3a9a3857cbee2dbfa82f9 100644 (file)
--- a/mi2mu/midi-track-parser.cc
+++ b/mi2mu/midi-track-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>

 */
 
 #include <assert.h>
 */
 
 #include <assert.h>

diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc
index 42ba6695c3a46c2a5618535fa8d92ecc8bfc6548..2a869d647c7f143fc0e867f99f46864e1ddc3ffa 100644 (file)
--- a/mi2mu/mudela-stream.cc
+++ b/mi2mu/mudela-stream.cc
@@ -3,7 +3,7 @@
 //
 // source file of the LilyPond music typesetter
 //
 //
 // source file of the LilyPond music typesetter
 //

-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+// (c)  1997--1998, 1998 Jan Nieuwenhuizen <jan@digicash.com>

 
 #include <assert.h>
 #include <time.h>
 
 #include <assert.h>
 #include <time.h>


@@ -91,7 +91,7 @@ Mudela_stream::header()
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";
   // ugh
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";
   // ugh

-  *os_p_ << "\\version \"0.1.9\";\n";
+  *os_p_ << "\\version \"0.1.10\";\n";

 }
 
 void
 }
 
 void

diff --git a/mudela-mode.el b/mudela-mode.el
index 7db23896b18a8989eb6f5465a53228e9b9daab91..48e53aa779b72f2b3a8a4e9312e2c8a671da709d 100644 (file)
--- a/mudela-mode.el
+++ b/mudela-mode.el
@@ -27,13 +27,14 @@
 ;; * handle lexer modes (\header, \melodic, \lyric) etc.
 ;; * indentation
 ;; * notenames?
 ;; * handle lexer modes (\header, \melodic, \lyric) etc.
 ;; * indentation
 ;; * notenames?

-;; * fontlock: \melodic \melodic 
+;; * fontlock: \melodic \melodic
+;; 

 
 (defconst mudela-font-lock-keywords
   (let* ((keywords '(
                   "accepts" "break" "bar" "cadenza" "clear" "clef" "cm" "consists" "contains"
                   "duration" "absdynamic" "in" "translator" "type" "lyric" "key"
 
 (defconst mudela-font-lock-keywords
   (let* ((keywords '(
                   "accepts" "break" "bar" "cadenza" "clear" "clef" "cm" "consists" "contains"
                   "duration" "absdynamic" "in" "translator" "type" "lyric" "key"

-                  "melodic" "melodic_request" "meter" "midi" "mm" "multi" "header"
+                  "maininput" "melodic" "melodic_request" "meter" "midi" "mm" "multi" "header"

                   "notenames" "octave" "output" "partial" "paper" "plet" "property" "pt" "shape"
                   "include"
                   "score" "script" "skip" "staff" "table" "spandynamic" "symboltables"
                   "notenames" "octave" "output" "partial" "paper" "plet" "property" "pt" "shape"
                   "include"
                   "score" "script" "skip" "staff" "table" "spandynamic" "symboltables"


@@ -108,8 +109,13 @@
            ( ?\" . "\"" )
            ( ?\% . "<")        
            ( ?\n . ">")
            ( ?\" . "\"" )
            ( ?\% . "<")        
            ( ?\n . ">")

-           
-           ))) 
+
+; FIXME
+;          ( ?%  .  ". 124b" )
+:          ( ?{  .  ". 23" )
+           ))
+
+  )    

 
 (defconst mu-stringlit-re
    "\"\\([^\"\n\\]\\|\\\\.\\)*\""      ; double-quoted
 
 (defconst mu-stringlit-re
    "\"\\([^\"\n\\]\\|\\\\.\\)*\""      ; double-quoted

diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index 98b576521200e2d953a8c9bc6a164d768e4d7b4e..6c99e7ed703be2ef8512202d2c727d1333d1a713 100644 (file)
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
 copyright =     "public domain";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 \include "clarinetti.ly"
 
 \include "global.ly"
 \include "clarinetti.ly"

diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index f1b600009b9a86d8ab32018a1202dfab5c7a3af9..bff0f4f8a0e8af75ac4664ce12a09c766e77add5 100644 (file)
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"

diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index 635b57a802fb20f5dc9bb734201dd6dfc952158b..e7cccf9b0c73899577397887dc66ee138f80c85f 100644 (file)
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 clarinetto1 = \melodic{
        \octave c';     
 
 clarinetto1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index aa1fd8485741c19b223cde2c83df9e4b8720eb18..0ad1fa5f6faf529a947395ae5d159c4d8b1f3d6c 100644 (file)
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -9,13 +9,16 @@ copyright =    "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 clarinetto2 = \melodic{
        \octave c';     
 % koor: clarinetto-part.ly
 % lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed.
 % Aborted (core dumped)
 
 clarinetto2 = \melodic{
        \octave c';     
 % koor: clarinetto-part.ly
 % lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed.
 % Aborted (core dumped)

+
+% huh?
+

 %      r1 | r1 | as4-.\ff r r2 | r1 |
        r1*2 | as4-. r r2 | r1*3 |
        b4-. r r2 | r1*3 |
 %      r1 | r1 | as4-.\ff r r2 | r1 |
        r1*2 | as4-. r r2 | r1*3 |
        b4-. r r2 | r1*3 |

diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index f941bb55ac6219230881246a57c8b3e2456d940a..e38cbc120a9a2688528c430de86ea3982a98af57 100644 (file)
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 contrabasso = \melodic{
        \octave c;
 
 contrabasso = \melodic{
        \octave c;

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index f3ccd57cbb71fda0d7a48c3a0443f307fdc06793..83334d2b1e81173e11f0fe54cb50b086b85572b5 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 
 
 \include "global.ly"
 


@@ -42,12 +42,12 @@ $timpani_g = \type Staff_group = timpani_group <
        \$timpani_staff
 >
 
        \$timpani_staff
 >
 

-$violini = \type Grandstaff = violini_group <
+$violini = \type Grand_staff = violini_group <

        \$violino1_staff
        \$violino2_staff
 >
 
        \$violino1_staff
        \$violino2_staff
 >
 

-$bassi = \type Grandstaff = violine_group <
+$bassi = \type Grand_staff = violine_group <

        \$violoncello_staff
        \$contrabasso_staff
 >
        \$violoncello_staff
        \$contrabasso_staff
 >

diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index ae4c5e0e05ad0422e2a922638bfb8b843056dbe2..eb12f83988d6b04b32e094011ef12d189a9ad824 100644 (file)
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 \include "corni.ly"
 
 \include "global.ly"
 \include "corni.ly"

diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index e8867a1709ae45f7e8d0caa4736bd3c1c46bbffe..38764214c0ce202d4575af0b94bcf709626326f0 100644 (file)
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "corno-1.ly"
 \include "corno-2.ly"
 
 \include "corno-1.ly"
 \include "corno-2.ly"

diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 0869da4d2d578d5f6683bc5c861ceda173fae08f..3b05a152085f3af0a6d327b62f8fbba8e2c598db 100644 (file)
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 corno1 = \melodic{
        \octave c';     
 
 corno1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index 5eb5c4895b57d77bcb6d7f6d4ca6d9a9b1d7ef2c..73f7340206ea08a93bfdaa550e83f8b68a35e821 100644 (file)
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 corno2 = \melodic{
        \octave c';     
 
 corno2 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index ad23c5c12dcec04f960edca7305c8334c4247941..8e51cf63734cdb398fb5a248e75939b44493a9c8 100644 (file)
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 \include "fagotti.ly"
 
 \include "global.ly"
 \include "fagotti.ly"

diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index 68a1ca0081d61df9ff8f6464478b28893e254900..116ba75c62119d6ae887b03cf5750f626cc73fd7 100644 (file)
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"

diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 6718dd4c8b959908870aa0a2320cff6735c6412f..f238406f2899bf16e3f6e2eb704c0b57c8286a5a 100644 (file)
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 fagotto1 = \melodic{
        \octave c;      
 
 fagotto1 = \melodic{
        \octave c;      

diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 2889c688a870ea8a3b914cee569a7044d10981a0..1a1f0bbeda678bc5656bf0739f2fbb2fe2775373 100644 (file)
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 fagotto2 = \melodic{
        \octave c;      
 
 fagotto2 = \melodic{
        \octave c;      

diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 13e4510f34c3b5624c6a7d0393250d3b8b37a8da..aa6e8d582010dd143e7ebac095ad19955f2b484d 100644 (file)
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 \include "flauti.ly"
 
 \include "global.ly"
 \include "flauti.ly"

diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index dc49d11fb55e87eb1674555e77eeb754f1b777b4..c1a2bf0aef776412ac52730290616ad87317bcea 100644 (file)
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "flauto-1.ly"
 \include "flauto-2.ly"
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"

diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 5475ffe1ee6aeb8071df5a57586238f8e8c1616f..58ed585f9ee94dd9f3c3f5313f9830a0a04c1261 100644 (file)
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 flauto1 = \melodic{
        \octave c'';    
 
 flauto1 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index aeddce6a8ffa2c6bbbccebb616ed1253fc1f0294..7a3f7707aabadd1067601a01a7537325c7e5a5f2 100644 (file)
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 flauto2 = \melodic{
        \octave c'';    
 
 flauto2 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
index 966f1f1aa45b84672db74d012519a80aa7526d44..c01d9861374100f4fb8eb45ba490a71997817e03 100644 (file)
--- a/mutopia/Coriolan/global.ly
+++ b/mutopia/Coriolan/global.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 global = \melodic{
        \meter 4/4;
 
 global = \melodic{
        \meter 4/4;

diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index ab3290fb16d2069bb34a2375b22b14a746ab89ba..a9b7601c5af9902ffd357ef1cebf08f6e0fa804c 100644 (file)
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 oboe1 = \melodic{
        \octave c'';    
 
 oboe1 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index 75e5e5dfabe93be742193ee0d69088294b81ca98..1090871206b297625779b3d5b288ea80ee1d1b42 100644 (file)
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 oboe2 = \melodic{
        \octave c'';    
 
 oboe2 = \melodic{
        \octave c'';    

diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index eef9019b7e0f7e0f5df9ef4eb80a7c573f63ce43..99a94e7c988835a5972c9f4c23aef4199af32f59 100644 (file)
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 \include "oboi.ly"
 
 \include "global.ly"
 \include "oboi.ly"

diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index cce1305de8d98a23d0bd6dd1f3cd80e26a1ef9b9..702c5a5d5e587709347464f0b2a1ed627ef408cd 100644 (file)
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "oboe-1.ly"
 \include "oboe-2.ly"
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"

diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index 3c3bd64aa9b66a33f2df400518b74d12f8371163..8936643c76d54243744b85689ab103207f40cdb7 100644 (file)
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 timpani = \melodic{
        \octave c;      
 
 timpani = \melodic{
        \octave c;      

diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index a9f5fd050659f7adbadc2aff3979c5b03ba3585a..802a494d0dfac6f2ea54c9b1b4370c82b425851d 100644 (file)
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "global.ly"
 \include "trombe.ly"
 
 \include "global.ly"
 \include "trombe.ly"

diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index 2d70dd71a91035d73a2e2f2c0ed5f24947c0925a..bb1e48f0265f5951aa2e0c3cbf69c60eb7e0ad86 100644 (file)
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "trombo-1.ly"
 \include "trombo-2.ly"
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"

diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index a37727183475155eb9f91ba692a7dbb16f1657c6..6b3bef51ab6aafb823122e597ee31a7e830843ef 100644 (file)
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 trombo1 = \melodic{
        \octave c';     
 
 trombo1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index 1288eabaef3b3d391133883cf5924b0bca94865c..f123b9a32c9447475ec28c8c1d569eb5a8cb2b6f 100644 (file)
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 trombo2 = \melodic{
        \octave c';     
 
 trombo2 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/viola.ly b/mutopia/Coriolan/viola.ly
index 1fd005e6499cd2e65ebd1c8bb9d506be5ecb9750..c4a34c898272d1fbad1bce2649d50a5d02fb318d 100644 (file)
--- a/mutopia/Coriolan/viola.ly
+++ b/mutopia/Coriolan/viola.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 viola = \melodic{
        \octave c;
 
 viola = \melodic{
        \octave c;

diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index b5290fea73f1c76a959822a0f8dc28765745fdcd..02d10f5512e64d8ab558212f01f288425150a331 100644 (file)
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 violino1 = \melodic{
        \octave c';     
 
 violino1 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index 28e91a505241c152c92b5087f1093a6a9e0be9d5..2726b10874a114f6a8bedb249c91f0f841c8dad9 100644 (file)
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 violino2 = \melodic{
        \octave c';     
 
 violino2 = \melodic{
        \octave c';     

diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 38aecb4055eac3661663106a2990d53af5f8b53b..dcf183f66bb8bb5eba493433c044d7efe805b0fc 100644 (file)
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
 
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 violoncello = \melodic{
        \octave c;
 
 violoncello = \melodic{
        \octave c;

diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly
index db687e59f23ec35562cf294bdb5b97aa67ec8434..e75e39eb832bdab3e801713dfdd722522c97041c 100644 (file)
--- a/mutopia/J.S.Bach/preludes-1.ly
+++ b/mutopia/J.S.Bach/preludes-1.ly
@@ -108,7 +108,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
        \two
 >
 

-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <

        \treble_staff
        \bass_staff
 >
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
index eb4a1fcc8d232dc5b81350022a250abd1390baf8..7ccc808db829389c47910d43c56c180391ab9a3d 100644 (file)
--- a/mutopia/J.S.Bach/preludes-2.ly
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -114,7 +114,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
        \two
 >
 

-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <

        \treble_staff
        \bass_staff
 >
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4
index 7515b635df979eca7cc04b365b06470baf826023..0643095b979d51b19af1dbaace61eabf2d8715c8 100644 (file)
--- a/mutopia/J.S.Bach/preludes-3.ly.m4
+++ b/mutopia/J.S.Bach/preludes-3.ly.m4
@@ -161,7 +161,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
        \two
 >
 

-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <

        \treble_staff
        \bass_staff
 >
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly
index eb7dc7b21346e6de34376da0278faf5942495ffd..64008af3e4deb79541fa9a5ca2bf79bb741155c7 100644 (file)
--- a/mutopia/J.S.Bach/preludes-4.ly
+++ b/mutopia/J.S.Bach/preludes-4.ly
@@ -188,7 +188,7 @@ bass_staff = \type Staff = bass <
        { \voicetwo \three }
 >
 
        { \voicetwo \three }
 >
 

-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <

        \treble_staff
        \bass_staff
 >
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly
index 34dd4d41c47e6af66d0de1159232070e343593ed..35efe1587cec93a8126a181e13ee1edc20cce12c 100644 (file)
--- a/mutopia/J.S.Bach/preludes-5.ly
+++ b/mutopia/J.S.Bach/preludes-5.ly
@@ -192,7 +192,7 @@ bass_staff = \type Staff = bass <
        \two
 >
 
        \two
 >
 

-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <

        \treble_staff
        \bass_staff
 >
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/preludes-6.ly b/mutopia/J.S.Bach/preludes-6.ly
index 7a8a718b1c4cdf8b95510ee1e952e0825400c543..e76cbcd1aff2cabbce31a67a06740a0de0ee13bd 100644 (file)
--- a/mutopia/J.S.Bach/preludes-6.ly
+++ b/mutopia/J.S.Bach/preludes-6.ly
@@ -109,7 +109,7 @@ bass_staff = \type Staff = bass <
        \four
 >
 
        \four
 >
 

-grand_staff = \type Grandstaff <
+grand_staff = \type Grand_staff <

        \treble_staff
        \bass_staff
 >
        \treble_staff
        \bass_staff
 >

diff --git a/mutopia/J.S.Bach/scsii-menuetto.ly b/mutopia/J.S.Bach/scsii-menuetto.ly
index 68e2e76afada890d095aee56bd4f7ef0339c548c..a8b41cc70c541f87dbe14e93e4a5eab1615c9deb 100644 (file)
--- a/mutopia/J.S.Bach/scsii-menuetto.ly
+++ b/mutopia/J.S.Bach/scsii-menuetto.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  Tested Features:breaking algorithm, chords, multivoice, accents
 %}
 
  Tested Features:breaking algorithm, chords, multivoice, accents
 %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 %% Stuff from MPP version
 % \lefttitle{Menuetto}
 
 %% Stuff from MPP version
 % \lefttitle{Menuetto}

diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly
index 5469e62b5ccac7f111222c01ddc61c7d1257749a..fd42f9c4600bb9b4e172bc832f68a7b42fc55756 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue1.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue1.ly
@@ -11,7 +11,7 @@ copyright =    "Public Domain";
 %{
        
 %}
 %{
        
 %}

-\version "0.1.9";
+\version "0.1.10";

 
 
 global = 
 
 
 global = 


@@ -182,7 +182,7 @@ bass =
 
         
 \score {
 
         
 \score {

-    \melodic \type Grandstaff < 
+    \melodic \type Grand_staff < 

                 \multi 2 <
                        \global 
                        \soprane
                 \multi 2 <
                        \global 
                        \soprane

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index 68a1117b0b63a87f74074e208e8bc8f95224d1b7..7cb045ba17be65271256b956ee5bc023ab4a26da 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -13,7 +13,7 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "nederlands.ly"                 % for correct parsing of note names
 
 
 \include "nederlands.ly"                 % for correct parsing of note names
 


@@ -166,7 +166,7 @@ bassdux = \melodic {
         
 \score {
   \melodic {
         
 \score {
   \melodic {

-    \type Grandstaff < 
+    \type Grand_staff < 

       \type Staff = treble < 
         \global 
         \dux
       \type Staff = treble < 
         \global 
         \dux

diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly
index b842f1931b2c2523eb665f96f768445d8ded3ecb..345b6c341b8fc2fb73393a368ed4d54a2b42eb1a 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ b/mutopia/J.S.Bach/wtk1-prelude1.ly
@@ -8,7 +8,7 @@ enteredby =      "Shay Rojansky";
 copyright =     "Public Domain";
 }
 
 copyright =     "Public Domain";
 }
 

-\version "0.1.9";
+\version "0.1.10";

 
 global = 
     \melodic {
 
 global = 
     \melodic {


@@ -162,7 +162,7 @@ bass =
 
         
 \score {
 
         
 \score {

-    \melodic \type Grandstaff < 
+    \melodic \type Grand_staff < 

                   <
                        \global 
                        \soprane
                   <
                        \global 
                        \soprane

diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index 78586dc6a32240a768822a2e10f385848242cfd5..e467d440a15843ee8b44625fd1c20f5b2b499b15 100644 (file)
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -43,7 +43,7 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
 definition below. --MB
 %} 
 

-\version "0.1.9";
+\version "0.1.10";

 
 vi1=\melodic{
   \meter 4/4;
 
 vi1=\melodic{
   \meter 4/4;

diff --git a/mutopia/gallina.tex b/mutopia/gallina.tex
deleted file mode 100644 (file)
index 21bbf4d..0000000
--- a/mutopia/gallina.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% gallina.tex
-% Mats Bengtsson, 17/8 1997
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[a4paper]{article}
-
-\addtolength{\oddsidemargin}{-1cm}
-\addtolength{\topmargin}{-1cm}
-\setlength{\textwidth}{15cm}
-\input lilyponddefs
-\input titledefs
-\begin{document}
-
-\title{La Gallina a 2 violini \\ 
-\normalsize from \textit{Canzoni overo Sonate Concertate 
-   libro terzo, opera duodecima}, 1637}
-\composer{Tarquinio Merula (1594/95-1665)}
-%\instrument{M\"a\ss ig} % heu
-%#%\tempo{M\"a\ss ig}
-\makelilytitle
-\input{gallina.out}
-
-
-\end{document}

diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 27ec629df5c569ec036b5439e39e44eb7e6a97f7..6032b7c74ac1124f8b17326c47dd5185c4cc91eb 100644 (file)
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -1,6 +1,7 @@
 \header{
 filename =      "los-toros-oboe.ly";
 \header{
 filename =      "los-toros-oboe.ly";

-title =                 "La Feria\\normalsize\\[2ex]Los Toros";
+title =                 "La Feria"
+subtitle = "Los Toros";

 opus =          "";
 composer =      "Paul Lac\\^ome d'Estalenx (1838-1920)";
 enteredby =     "jcn";
 opus =          "";
 composer =      "Paul Lac\\^ome d'Estalenx (1838-1920)";
 enteredby =     "jcn";

diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly
index 82d94001bdef16028d8626367c4cbec1cf3215c4..e0c3ea2e0ed9b7e792f014f07352c97c891f6624 100644 (file)
--- a/mutopia/standchen-16.ly
+++ b/mutopia/standchen-16.ly
@@ -9,6 +9,6 @@ description = "A schubert song in 16 pt";
 copyright =     "public domain";
 } 
 
 copyright =     "public domain";
 } 
 

-\version "0.1.9";
+\version "0.1.10";

 
 \include "standchen.ly"
 
 \include "standchen.ly"

diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly
index a724709a38a3aaf40172a3787174523b8d7a62a9..f3e87845907d562315273c417b8541ca52bdeacc 100644 (file)
--- a/mutopia/standchen-20.ly
+++ b/mutopia/standchen-20.ly
@@ -8,7 +8,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 description = "A schubert song in 20 pt";
 } 
 copyright =     "public domain";
 description = "A schubert song in 20 pt";
 } 

-\version "0.1.9";
+\version "0.1.10";

 
 % fool make-website
 % \include "standchen.ly";
 
 % fool make-website
 % \include "standchen.ly";

diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index bf860c41261c1f65eb9a06b75ed1d6e475eb445c..2a407932f02cba94b66815d0308d6620520eb7ae 100644 (file)
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -13,7 +13,7 @@ multiple \paper{}s in one \score
 %}
 
 \include "paper20.ly"
 %}
 
 \include "paper20.ly"

-\version "0.1.9";
+\version "0.1.10";

 
 commands = \melodic{
        \skip 2.*4;
 
 commands = \melodic{
        \skip 2.*4;


@@ -478,7 +478,7 @@ $bass_staff = \type Staff = bass<
        \begeleiding
 >
  
        \begeleiding
 >
  

-$grand_staff = \type Grandstaff<
+$grand_staff = \type Grand_staff<

        \$treble_staff
        \$bass_staff
 >
        \$treble_staff
        \$bass_staff
 >

diff --git a/mutopia/standje.ly b/mutopia/standje.ly
index c89b7352966b6d592aa9c44bb1617973af08284f..9193c65f050b3a4eaa3807550f7a40340df92491 100644 (file)
--- a/mutopia/standje.ly
+++ b/mutopia/standje.ly
@@ -13,7 +13,7 @@ copyright =    "public domain";
 multiple \paper{}s in one \score 
 %}
 
 multiple \paper{}s in one \score 
 %}
 

-\version "0.1.9";
+\version "0.1.10";

 
 $vocal_verse1 = \melodic{
        \octave c';
 
 $vocal_verse1 = \melodic{
        \octave c';


@@ -413,7 +413,7 @@ $bass_staff = \type Staff = bass<
        \bass
 >
 
        \bass
 >
 

-$grand_staff = \type Grandstaff<
+$grand_staff = \type Grand_staff<

        \$treble_staff
        \$bass_staff
 >
        \$treble_staff
        \$bass_staff
 >

diff --git a/test/bow.cc b/test/bow.cc
index 35c344686c4b779a79509fd1c44ed0be1cf6e131..dc077b4f29966276e9085c4897f18f51aaeaf8ca 100644 (file)
--- a/test/bow.cc
+++ b/test/bow.cc
@@ -17,9 +17,14 @@ typedef void *Paper_def;
 bool experimental_features_global_b = true;
 
 #include "bezier.hh"
 bool experimental_features_global_b = true;
 
 #include "bezier.hh"

-#include "bezier.cc"
+
+#if 0

 #include "offset.cc"
 #include "offset.cc"

+#include "interval.cc"
+#endif

 
 

+#include "misc.cc"
+#include "bezier.cc"

 
 struct Point
 {
 
 struct Point
 {


@@ -84,7 +89,7 @@ main ()
 {
   //cout.unsetf(ios::scientific);
   cout.setf(ios::fixed);
 {
   //cout.unsetf(ios::scientific);
   cout.setf(ios::fixed);

-#if 0
+#if 1

   bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,0, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,30, 60,30, 80,0, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,10, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,0, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,30, 60,30, 80,0, 100,1 }, 6, 1);
   bow ((Point[6]){ 0,0, 20,0, 40,0, 60,0, 80,10, 100,1 }, 6, 1);


@@ -123,20 +128,24 @@ main ()
   bow ((Point[6]){ 0,10, 20,20, 40,0, 60,40, 80,20, 100,50 }, 6, -1);
 #endif
 
   bow ((Point[6]){ 0,10, 20,20, 40,0, 60,40, 80,20, 100,50 }, 6, -1);
 #endif
 

+#if 1

   //clipping
   //clipping

-#if 0
+

   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,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,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);

   bow ((Point[7]){ 0,0, 20,40, 100,0, 150,0, 200,0, 280,40, 300,0 }, 7, 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);
+  bow ((Point[3]){ 0,0, 10,10, 20,-20 }, 3, 1);

 #endif
 
 #endif
 

-#if 0
-   // bugs
+#if 1
+  // infeasible

 
   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,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);


@@ -145,11 +154,6 @@ main ()
   bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1);
 #endif
 
   bow ((Point[6]){ 0,0, 20,20, 40,40, 60,60, 80,140, 100,100 }, 6, 1);
 #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;
 
 
   cout << "\\end" << endl;
 

diff --git a/test/int.cc b/test/int.cc
new file mode 100644 (file)
index 0000000..47b5243
--- /dev/null
+++ b/test/int.cc
@@ -0,0 +1,51 @@
+// vim:sw=2 makeprg=g++\ -g\ bow.cc\ -o\ bow
+#include <iostream.h>
+#define PT
+// #define STAFFHEIGHT 16.0
+#define STAFFHEIGHT 20.0
+
+#define UP 1
+#define DOWN (-1)
+
+// mmm
+#define STANDALONE
+
+#include <math.h>
+
+typedef void *Paper_def;
+
+bool experimental_features_global_b = true;
+
+#include "misc.cc"
+
+int
+main ()
+{
+  //cout.unsetf(ios::scientific);
+  cout.setf(ios::fixed);
+
+  Array<Real> a;
+  a.push (3.4);
+  a.push (3.9);
+  Interval iv;
+
+  iv = quantise_iv (a, 4, 3.5);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, -1.5);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, -7.5);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, 3.4);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  iv = quantise_iv (a, 4, 3.9);
+  cout << "iv: " << iv.min () << ", " << iv.max () << endl;
+
+  cout << "\\end" << endl;
+
+  return 0;
+}
+

diff --git a/tex/feta11.tex b/tex/feta11.tex
deleted file mode 100644 (file)
index 39cabb6..0000000
--- a/tex/feta11.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 7011ced..0000000
--- a/tex/feta13.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 247fb20..0000000
--- a/tex/feta16.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 400ff78..0000000
--- a/tex/feta19.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 9175549..0000000
--- a/tex/feta20.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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
deleted file mode 100644 (file)
index aeb53e9..0000000
--- a/tex/feta23.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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
deleted file mode 100644 (file)
index 218a273..0000000
--- a/tex/feta26.tex
+++ /dev/null
@@ -1,176 +0,0 @@
-% 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/headers.tex b/tex/headers.tex
new file mode 100644 (file)
index 0000000..915d3c1
--- /dev/null
+++ b/tex/headers.tex
@@ -0,0 +1,12 @@
+
+
+\usepackage{fancyheadings}
+\lhead{}
+\rhead{}
+\chead{}
+\lfoot{}
+\cfoot{\ifnum\thepage=1{\hfill\LilyIdString}\fi}
+\rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
+\headrulewidth0mm
+\pagestyle{fancy}
+\thispagestyle{fancy}