From 234697355e387e3349018823d259c35f4ee49713 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 17 Mar 1998 09:53:34 +0100 Subject: [PATCH] release: 0.1.56 --- .dstreamrc | 49 +- ANNOUNCE | 13 +- BUGS | 5 +- Documentation/Makefile.am | 4 +- Documentation/Makefile.am.wild | 2 +- Documentation/Makefile.in | 46 +- Documentation/faq.pod | 5 + Documentation/fonts.tex | 130 +++ Documentation/introduction.doc | 358 +++++--- Documentation/mudela-course.doc | 272 ------ Documentation/vocabulary-data | 121 +-- Documentation/vocabulary-forms.el | 8 +- Makefile.in | 92 +- NEWS | 10 + TODO | 29 +- VERSION | 2 +- bin/Makefile.in | 42 +- bin/make-website.in | 2 +- bin/mudela-book.in | 6 +- debian/Makefile.in | 42 +- flower/Makefile.in | 159 ++-- flower/include/Makefile.in | 59 +- flowertest/Makefile.in | 95 +- flowertest/check.sh | 0 init/Makefile.in | 42 +- init/engraver.ly | 28 +- init/feta11.ly | 1 + init/feta13.ly | 1 + init/feta16.ly | 1 + init/feta19.ly | 1 + init/feta20.ly | 1 + init/feta23.ly | 1 + init/feta26.ly | 1 + init/script.ly | 1 + init/table16.ly | 2 +- input/Makefile.am | 2 +- input/Makefile.in | 44 +- input/abbrev.ly | 22 + input/font-body.ly | 21 +- input/font26.ly | 3 +- input/rhythm.ly | 6 +- input/spacing.ly | 2 +- lib/Makefile.in | 131 +-- lib/include/Makefile.in | 59 +- lily/Makefile.in | 1276 +++++++++++++-------------- lily/VERSION | 2 +- lily/bezier.cc | 43 +- lily/engraver-group.cc | 30 +- lily/engraver.cc | 1 + lily/include/Makefile.in | 59 +- lily/include/bezier.hh | 15 +- lily/include/engraver-group.hh | 6 +- lily/include/engraver.hh | 6 + lily/include/local-key-grav.hh | 3 + lily/include/span-score-bar-grav.hh | 1 + lily/local-key-grav.cc | 36 +- lily/rod.cc | 2 +- lily/slur.cc | 2 + lily/span-score-bar-grav.cc | 11 + lily/stem.cc | 7 +- make/Makefile.in | 42 +- make/lelievijver.lsm | 2 +- make/lilypond.lsm | 2 +- make/lilypond.spec | 4 +- mf/Makefile.am | 2 +- mf/Makefile.am.wild | 2 +- mf/Makefile.in | 44 +- mf/TODO | 3 - mf/feta-schrift.mf | 21 +- mi2mu/Makefile.in | 148 ++-- mi2mu/include/Makefile.in | 59 +- mutopia/Coriolan/Makefile.in | 42 +- mutopia/J.S.Bach/Makefile.in | 42 +- mutopia/Makefile.in | 75 +- mutopia/los-toros-oboe.ly | 1 + mutopia/standje.ly | 12 +- test/Makefile.in | 42 +- test/check-lily-midi.sh | 0 test/check-lily-paper.sh | 0 test/check-mi2mu.sh | 0 tex/Makefile.in | 42 +- tex/feta11.tex | 57 +- tex/feta13.tex | 57 +- tex/feta16.tex | 57 +- tex/feta19.tex | 57 +- tex/feta20.tex | 57 +- tex/feta23.tex | 57 +- tex/feta26.tex | 57 +- 88 files changed, 2348 insertions(+), 2057 deletions(-) create mode 100644 Documentation/fonts.tex delete mode 100644 Documentation/mudela-course.doc mode change 100755 => 100644 flowertest/check.sh create mode 100644 input/abbrev.ly mode change 100755 => 100644 test/check-lily-midi.sh mode change 100755 => 100644 test/check-lily-paper.sh mode change 100755 => 100644 test/check-mi2mu.sh diff --git a/.dstreamrc b/.dstreamrc index f1a393d226..82f615d66b 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -1,24 +1,25 @@ #This file controls which classes produce debugging output # class name silence? -Dstream 0 +Dstream 1 # yydebug InitParser 1 -Parser 1 +Parser 0 InitDeclarations 1 Declarations 1 # FlexLexer debug InitLexer 1 Lexer 1 +My_lily_lexer 0 -walking 11 +walking 0 # flower lib File_path 1 -Matrix 1 -Vector 1 +Matrix 0 +Vector 0 # lily Atom 1 @@ -29,7 +30,6 @@ Chord 1 Chord_iterator 1 Clef_item 1 Col_configuration 1 -Column_rod 1 Colinfo 1 Colinfo 1 Collision 1 @@ -38,7 +38,7 @@ Engraver_group_engraver 1 Group_change_req 1 Head_column 1 Idealspacing 1 -Ineq_constrained_qp 1 +Ineq_constrained_qp 0 Input_translator 1 Item 1 Key_item 1 @@ -46,39 +46,35 @@ Lookup 1 Line_spacer 1 Melodic_req 1 Midi_def 1 -Midistrings 1 -Mixed_qp 1 +Midistrings 0 +Mixed_qp 0 Music 1 Music_iterator 1 -Music_output_def 1 -My_lily_lexer 1 Note_head 1 Note_performer 1 Note_req 1 -Paper_column 1 -Paper_score 1 +Paper_score 1 Paper_def 1 Performer 1 Performer_group_performer 1 -Request 1 +Request 0 Request_iterator 1 Rest_collision 1 Rest_collision_engraver 1 Rest_req 1 Rhythmic_req 1 -Rod 1 Score 1 -Score_column 1 -Score_elem 1 +Score_column 0 +Score_elem 0 Score_engraver 1 Score_performer 1 Script_column 1 Script_def 1 Script_req 1 -Slur 0 +Slur 1 Spacing_problem 1 Spanner 1 -Spring_spacer 1 +Spring_spacer 0 Staff 1 Staff_commands 1 Stem 1 @@ -92,20 +88,7 @@ Text_req 1 Time_description 1 Voice 1 Voice_iterator 1 -Word_wrap 1 +Word_wrap 0 delete_identifiers 1 parse_duration 1 parse_pitchmod 1 -Skip_req 1 -Translation_property 1 -Translator 1 -Engraver_group_engraver 1 -Translator_group 1 -Axis_group_administration 1 -Graphical_element 1 -Single_malt_grouping_item 1 -Graphical_element 1 -Note_column 1 -Graphical_element 1 -Rhythmic_head 1 -Horizontal_align_item 1 diff --git a/ANNOUNCE b/ANNOUNCE index f21190a248..3b3c6fb30f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -32,7 +32,8 @@ WHAT'S NEW SINCE VERSION 0.1? * Better MIDI importing -* Easier to use due to better scripts and input format enhancements +* Easier to use due to better shell scripts and input format +enhancements * MusixTeX not needed anymore @@ -45,16 +46,16 @@ customizable notenames. MIDI output lets you check if you have entered the correct notes. MIDI to Mudela conversion through the mi2mu program. -Font size selectable (26pt, 20pt, 16pt staffsize) for each score. +Font size selectable (from 26pt downto 11 pt) for each score. Multiple staffs in one score. Each staff may have various different meters. Multiple voices within one staff (up to four handled graciously); beams optionally shared between voices. Multiple scores within one input file. Each score is output to a different file. -Beams, slurs, chords, super/subscripts (accents and text), -general n-plet (triplet, quadruplets, etc.), lyrics, transposition, -dynamics (both absolute and hairpin style), clef changes, meter -changes, cadenza-mode, key changes, repeat bars. +Beams, slurs, chords, super/subscripts (accents and text), general +n-plet (triplet, quadruplets, etc.), lyrics, transposition, dynamics +(both absolute and hairpin style), clef changes, meter changes, +cadenza-mode, key changes, repeat bars. Integration with LaTeX through Perl scripts. diff --git a/BUGS b/BUGS index 384fb5ce6b..f7da705fa8 100644 --- a/BUGS +++ b/BUGS @@ -1,3 +1,6 @@ +input/abbrev.ly + +******** \score{ \melodic{ [c2 c] @@ -5,7 +8,7 @@ } lilypond: ../flower/include/varray.hh:141: struct Rhythmic_grouping *& Array::elem(int) const: Assertion `i >=0&&i +Q: How do I get bar numbers? + +A: See F. You have to uncomment some entries. To +do this `portably' you should redefine some engravers in your own +source files. Check out F. =head2 Development diff --git a/Documentation/fonts.tex b/Documentation/fonts.tex new file mode 100644 index 0000000000..81c87e3c09 --- /dev/null +++ b/Documentation/fonts.tex @@ -0,0 +1,130 @@ +\documentclass{article} +\def\kdots{,\ldots,} +\title{Not the Font-En-Tja font} +\author{HWN \& JCN} +\begin{document} +\maketitle + + +\section{Introduction} + +Feta (not an abbreviation of Font-En-Tja) is a font of music symbols. +All MetaFont %ugh +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 +is a matter of taste, I'd say that B\"arenreiter has the finest +typography of all. + + +\section{Bezier curves for simple slurs} + +Objective: slurs in music are curved objects designating that notes +should fluently bound. They are drawn as smooth curves, with their +center thicker and the endings tapered. + +Long slurs are flat, whereas short slurs look like small circle arcs. +Details are given in Wanske\cite{ross} and Ross\cite{wanske}. The +shape of a slur can be given as a Bezier curve with four control +points. We will assume that the slur connects two notes of the same +pitch. Different slurs can be created by rotating the derived shape. +We will also assume that the slur has a vertical axis of symmetry +through its center. The left point will be the origin. So we have +the following equations for the control points $c_1\kdots c_4$. + +\begin{eqnarray*} +c_1&=& (0,0)\\ +c_2&=& (i, h)\\ +c_3&=& (b-i, h)\\ +c_4&=& (b, 0) +\end{eqnarray*} + +The quantity $b$ is given, it is the width of the slur. The +conditions on the shape of the slur for small and large $b$ transform +to +\begin{eqnarray*} + h \to h_{\infty} , &&\quad b \to \infty\\ + h \approx r_{0} b, &&\quad b \to 0. +\end{eqnarray*} +To tackle this, we will assume that $h = F(b)$, for some kind of +$F(\cdot)$. One function that satisfies the above conditions is +$$ +F(b) = h_{\infty} \frac{2}{\pi} \arctan \left( \frac{\pi r_0}{2 +h_{\infty}} b \right). +$$ + +For satisfying results we choose $h_{\infty} = 2\cdot \texttt{interline}$ +and $r_0 = \frac 13$. + +The parameter $i$ determines the flatness of the curve. Satisfying +results have been obtained with $i = h$. + +The formula can be generalised to allow for corrections in the shape, +\begin{eqnarray*} +c_1&=& (0,0)\\ +c_2&=& (i', h')\\ +c_3&=& (b-i', h')\\ +c_4&=& (b, 0) +\end{eqnarray*} +Where +$$ +i' = h(b) (1 + i_{corr}), \quad h' = h(b) (1 + h_{corr}). +$$ + +The default values for these corrections are $0$. A $h_{corr}$ that is +negative, makes the curve flatter in the center. A $h_{corr}$ that is +positive make the curve higher. + + +\section{Sizes} + + +Traditional engraving uses a set of 9 standardised sizes for Staffs +(running from 0 to 8). + +We have tried to measure these (helped by a magnifying glass), and +found the staffsizes in the following table. One should note that +these are estimates, so I think there could be a measuring error of ~ +.5 pt. Moreover [Ross] states that not all engravers use exactly +those sizes. + +\begin{table} +\begin{tabular}{lll} +Staffsize &Numbers &Name\\ +\hline\\ +26.2pt &No. 0\\ +22.6pt &No. 1 &Giant/English\\ +21.3pt &No. 2 &Giant/English\\ +19.9pt &No. 3 &Regular, Ordinary, Common\\ +19.1pt &No. 4 &Peter\\ +17.1pt &No. 5 &Large middle\\ +15.9pt &No. 6 &Small middle\\ +13.7pt &No. 7 &Cadenza\\ +11.1pt &No. 8 &Pearl\\ +\end{tabular} +\caption{Font and staff sizes} +\end{table} + + +This table is partially taken from [Ross]. Most music is set in No.3, +but the papersizes usually are bigger than standard printer paper +(such as A4). If you plot these, you'll notice that the sizes (With +exception of 26) almost (but not quite) form a arithmetic progression. + +Ross states that the dies (the stamps to make the symbols) come in +12 different sizes. + +\bibliographystyle{plain} +\bibliography{engraving} + + + +\end{document} diff --git a/Documentation/introduction.doc b/Documentation/introduction.doc index 1af131b13f..64c81baf67 100644 --- a/Documentation/introduction.doc +++ b/Documentation/introduction.doc @@ -19,7 +19,7 @@ \documentclass{article} \usepackage{a4wide} \title{Introduction to GNU LilyPond} -\author{Jan Nieuwenhuizen} +\author{Jan Nieuwenhuizen \& Han-Wen Nienhuys} \date{March 2, 1998} \def\file#1{\verb+#1+} @@ -72,49 +72,173 @@ \emph{\Large ***Under construction***} \section{Introduction} -This document should provide a gentle introduction to -LilyPond's input language, Mudela. -For completeness and nifty features see -\file{input/*.ly} -and -\file{lily/parser.y}, \file{lily/lexer.l}. -By tradition, Mudela files have the extension \file{.ly}. - -Mudela is an ascii script language -that is especially designed -to be easy to read and write. -In the following sections -the basic elements of Mudela are presented -in a series of simple examples. -Each example has -a verbatim snippet of Mudela% -% a snippet of Mudela as it's typed-in% -\footnote{ -In an effort not to bore you too much with details, -we leave-out some red tape -that's needed for a valid piece of Mudela. -Therefore, before you try-out any of the examples, -be sure to read the section `A complete example'.} -on the left -and the resulting fragment of music on the right -as it was produced by LilyPond. - -\section{Notes} - -Let's start with a single note, a quarter C - -\begin[fragment,verbatim,center]{mudela} -c +This document is a gentle introduction to using LilyPond to typeset +simple music. + + +LilyPond is a so called ``batch'' program. This means, that you use a +texteditor (such as emacs or vi) to create an input file. When you +are done editing your input file, you run LilyPond. If Lily +finds any errors in your input file she\footnote{ If computer programs +could have gender, we're sure that LilyPond is a female computer +program, so we will refer to the program as a she. This gender-bending +is not to tease you, dear reader. We do it in real life as well. In +the past two years LilyPond has become sort of a baby daughter to us, +keeping us awake at night, but also providing lots of joy. We hope +you do not mind our little aberration from computer-manual tradition. +% +% The name LilyPond is actually sort of a girl's name. Can you guess which +% one ? +% +} complain. If everything is well, than she'll generate a file that +you can process further to view or print it. + +To get you started we'll run down the full procedure for you once. + +\begin{enumerate} +\item +Fire up your favourite editor (if you know none, try \texttt{joe silly.ly}), +and key in the following text: +\begin{verbatim} +\score { + < + \type Staff = aStaff \melodic { g'2 e'4 } + \type Lyrics = yell \lyric { Air2 ball!4 } + > +} +\end{verbatim} + +save your file as \file{silly.ly}. As might have noticed, the input +files to LilyPond have the extension \file{.ly}. + +\item +Run LilyPond on your newly created file: \verb+lilypond silly+. +LilyPond will then print all kinds of mumbo jumbo that can safely +ignored. +You might see something like this: +\begin{verbatim} +GNU LilyPond 0.1.55/FlowerLib 1.1.39 +Parsing ... [/home/hanwen/musix/spacer/init/lily-init.ly[/home/hanwen/ + + ... stuff left out here ... + + Documentation/silly.ly] +Interpreting music ...[1] (time: 0.04 seconds) +Preprocessing elements... +Calculating column positions ... [2] +Approximated: 1 lines, (with an average of 4.0 columns) +Time: 0.01 seconds +warning: Can not solve this casting problem exactly; revert to Word_wrap +[2]Time: 0.00 seconds + +Postprocessing elements... +TeX output to silly.tex ... +\end{verbatim} + All has gone well; there were some warning but no errors. The + output is a \file{TeX}\footnote{% + \file{TeX} is usually spelled as + \TeX. It is batch program for typesetting text, developed by the + famous programmer and scientist Donald Knuth to typeset his famous The + Art of Computer Programming bookseries. As you can see \TeX\ can be + adapted to do a lot more. In fact, the document that you are + reading was also done with \TeX.} file, and it is called + \file{silly.tex}. +\item + To do something useful with the output you have to run \TeX\ on it + first. type \verb+tex silly+. The output should resemble this: +\begin{verbatim} +This is TeX, Version 3.14159 (C version 6.1) +(silly.tex +Babel and hyphenation patterns for american, dutch, loaded. +(/home/hanwen/lib/texmf/tex/lilypond/lilyponddefs.tex +(/home/hanwen/lib/texmf/tex/lilypond/dyndefs.tex) +(/home/hanwen/lib/texmf/tex/lilypond/fetdefs.tex +(/home/hanwen/lib/texmf/tex/lilypond/feta20.tex) +(/home/hanwen/lib/texmf/tex/lilypond/lily-ps-defs.tex))) [1] ) +Output written on silly.dvi (1 page, 3084 bytes). +Transcript written on silly.log. +\end{verbatim} + The human translation is ``everything went OK, the result is one + page long, and I put it in \file{silly.dvi}''. The \file{silly.dvi} + file is a description of how a piece of text looks when it is + printed. You can view it, or print it. If you are using a Unix + system equipped with X-Windows, issue the command \file{xdvi silly} + to view the result. If this is not the case, consult your local + \TeX\ guru on printing and viewing DVI files. What is in your + window should look like this: +\begin{mudela} +\score { + < + \type Staff = aStaff \melodic { g'2 e'4 } + \type Lyrics = yell \lyric { Air2 ball!4 } + > +} \end{mudela} +\end{enumerate} + +The remainder of this document is not about \TeX, and mostly not even +about LilyPond. What you entered into your text editor in step~1. and +fed to LilyPond is a special kind of file composed of notenames, +special words and punctation. The remainder of this document explains +how to combine these elements to express a piece of music in the +language that LilyPond understands. So we try to explain how to use +LilyPond, and not how LilyPond works; the input language of LilyPond +is the subject of the document. For want of a better name we call +this language Mudela (short for Music Description Language). + +This document does not cover all of Mudela. Due to technical details, +the precise working of Mudela is coupled to the innards of LilyPond. +If you really want to know all the details, your best bet would be to +get the sources to LilyPond and read the parser and scanner +source\footnote{ They are in \file{lilypond-x.y.z/lily/parser.y}, +\file{lilypond-x.y.z/lily/lexer.l}. Of course, it would be even +better if you would improve LilyPond and send the resulting diffs to +us. But that would a really different ballpark (And we +haven't started on the programming guide yet.)} + +In the following sections the basic elements of Mudela are presented. +We don't want to bore you too much with details, so we will leave-out +some red tape that's needed for a valid piece of Mudela: to be +precise, we will write \verb+X Y Z+, when we really mean +\begin{verbatim} +\score { + \melodic { X Y Z } + \paper {} +} +\end{verbatim} +Usually, we will also print the resulting fragment of music on the +right just as it was produced by LilyPond. -Now that was easy and entering a scale is not much harder +For the remainder we will assume that you can carry out steps 1 to 4 +from the above instruction. We will also assume that you know how +music notation works, and that you are familiar with terms such as +``note'', ``clef'', ``slur'' etc. -%\subsection{Pitches} +\section{When you know the notes to print\ldots} +The basic building block of music is the note. You can have LilyPond +print a note by specifying the pitch and the duration. The pitch of +the central C, also know as c$^1$ is written as \verb+c'+. A quarter +note duration is written as \verb+4+: \begin[fragment,verbatim,center]{mudela} -c d e f g a b +c'4 +\end{mudela} +The \verb+c'+ actually consists of two parts: one for the note name, +and one part for the octave. The number of apostrophes specifies the +octave to use, and the letter which note name to use. 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. This gives us already +enough material to make simple songs: +\begin[fragment,verbatim]{mudela} + 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 g'4 c''2 \end{mudela} +You might wonder: ``what if I would + + % \subsection{Durations} However, having only quarter notes may get a bit dull. @@ -280,71 +404,6 @@ cis d e cis | c! d e c | \bar "|:"; c c \bar ":|:"; c c \bar ":|"; c c \bar "|."; \end{mudela} -\section{Scripts} - -Staccato may be abbreviated -\begin[fragment,verbatim,center]{mudela} -a-\staccato a-. -\end{mudela} - -Marcato -\begin[fragment,verbatim,center]{mudela} -a-\marcato a-| -\end{mudela} - -Staccatissimo -\begin[fragment,verbatim,center]{mudela} -a-\staccatissimo a-^ -\end{mudela} - -Sforzato -% duh? -% a-\sforzato a-> -\begin[fragment,verbatim,center]{mudela} -a-\accent a-> -\end{mudela} - -\begin[fragment,verbatim,center]{mudela} -a-\fermata -\end{mudela} - -\begin[fragment,verbatim,center]{mudela} -a-\fermata -\end{mudela} - -Dynamics from pianississimo upto mezzopiano -\begin[fragment,verbatim,center]{mudela} -a\ppp a\pp a\p a\mp -\end{mudela} - -from fortississimo downto mezzoforte -\begin[fragment,verbatim,center]{mudela} -a\fff a\ff a\f a\mf -\end{mudela} - -sforzando, sforzato and rinforzato -% huh? -% a\sfz a\sf a\rf -\begin[fragment,verbatim,center]{mudela} -a\sfz a\sf -\end{mudela} - -Fingering -\begin[fragment,verbatim,center]{mudela} -[e8-1 c'-5 g-3 f-2] a''-\flageolet -\end{mudela} - -Bowing -\begin[fragment,verbatim,center]{mudela} -c-\upbow d-\downbow -\end{mudela} - -Footwork -\begin[fragment,verbatim,center]{mudela} -\clef "bass"; \octave c; - 'b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] -\end{mudela} - \section{Chords and Voices} Here's a simple chord @@ -419,3 +478,98 @@ See \file{ly2dvi (1)}. \end{document} +% kut en peer. + +\begin{verbatim} + +% twinkle, v1 +\score { + \melodic { + c4 c4 g4 g4 a4 a4 g2 + f4 f4 e4 e4 d4 d4 c2 + } + \paper {} +} +\end{verbatim} + +there are a few things to note about this example: + +The braces are grouping characters. In general, in mudela data entry +for a data section called ``foobar'' looks like this: + +\begin{verbatim} +\foobar { ...... } +\end{verbatim} + +To see if it actually works, we run it through LilyPond. Invoke the +command +\begin{verbatim} + lilypond twinkle.ly +\end{verbatim} +When LilyPond starts working it will produce various ``operator +pacification'' messages, which you can safely ignore for now. The run +should have left a file called \file{lelie.tex} in your working +directory. You can process that file with \TeX, and it will look like +this: + +\begin{mudela} +\score { + \melodic { + c4 c4 g4 g4 a4 a4 g2 + f4 f4 e4 e4 d4 d4 c2 + } + \paper {} +} +\end{mudela} + +As you can see, this is the song that we wanted, albeit a little +low-pitched. You would probably want a version of the song which has +all notes an octave higher. This can be done by adding a +\verb+\octave+ command to the source. This sets the default octave +for all notes. Another convenience is the default duration: if you do +not specify a duration with the notename, the last explicitly entered +is used. The improved version reads thus + + +\begin[verbatim]{mudela} + % twinkle v2 +\score { + \melodic { + \octave c'; + c4 c g g a a g2 + f4 f e e d d c2 + } + \paper {} +} +\end{mudela} + + + +FIXME rewrite starting here. + +\begin[verbatim]{mudela} + \score { + \melodic { % {...} is a voice + c'4 g'4 % c and g are pitches, 4 is the duration + % (crotchet/quarter note) + c''4 ''c4 % c' is 1 octave up, 'c 1 down. + % <...> is a chord + } +} +\end{mudela} + + +\begin[fragment,verbatim]{mudela} + { c4 e4 g4 } +\end{mudela} + +Basics: the \verb+%+ introduces a comment. All music is inside a +\verb+\score+ block which represents one movement, ie one contiguous +block of music. Voices are grouped by \verb+{+ and \verb+}+ and +chords by \verb+<+ and \verb+>+. + + +The \verb+\octave+ command controls the default pitch (octave). If you +do not specify duration, the last one entered is used. The +\verb+\paper+ block contains parameters for spacing and dimensions. + diff --git a/Documentation/mudela-course.doc b/Documentation/mudela-course.doc deleted file mode 100644 index a24d2f382a..0000000000 --- a/Documentation/mudela-course.doc +++ /dev/null @@ -1,272 +0,0 @@ -% -*-LaTeX-*- -% this document should be run through the mudela-book script after lilypond -% has been installed. - - -\documentclass{article} -\usepackage{a4wide} -\title{Mudela and LilyPond crash course} -\author{Han-Wen Nienhuys} -\date{October 20, 1997} -\def\file#1{{\texttt{#1}}} - -\begin{document} -\maketitle -\def\interexample{\par Produces the following:\par} -\def\preexample{\par\medskip} -\def\postexample{\par\medskip} - -\emph{This document is not complete yet. It's just a brief blurb which - skims some features of Mudela} - -\section{Who is who} - -This document describes various things, but let's first point out the -different parts of the package, and their names. -\begin{description} -\item[Mudela] A language for defining music. -\item[LilyPond] A package (the only one existing :-) which can - read a mudela file and interpret it. -\item[Feta] A (Meta)Font of musical symbols. LilyPond uses it to - render sheet music. -\end{description} - -\section{Overview} - -Let's start with a very simple example, we will enter ``twinkle -twinkle little star.'' We start with the most important part: the -notes. - -Imagine being in a music-lesson, and that you made an error playing -``twinkle twinkle''. Your teacher asks you to read out loud the -melody of the song, just to verify your eyesight. You would probably -say something like -\begin{quote} - A quarter note C, Another quarter note C, a quarter G, another one, etc. -\end{quote} - -Mudela tries to capture this verbal presentation of sheet music, in -the following way. The first line of twinkle twinkle is written in -as follows -\begin{verbatim} -c4 c4 g4 g4 a4 a4 g2 -f4 f4 e4 e4 d4 d4 c2 -\end{verbatim} - -The notes are entered with names (a, b, c) combined with numbers -(2,4). The names designate the pitches, the numbers the durations: 4 -is a quarter note, 2 a half note, etc. - -Now all we have to specify what should be done with the music. We -want a paper version, so we combine the music with a ``output this on -paper'' statement. These two are combined in ``score'' block. This -is the final result with its output. We add a comment (the line -starting with \verb+%+). -Put this into a file -called \file{twinkle.ly} - -\begin{verbatim} - -% twinkle, v1 -\score { - \melodic { - c4 c4 g4 g4 a4 a4 g2 - f4 f4 e4 e4 d4 d4 c2 - } - \paper {} -} -\end{verbatim} - -there are a few things to note about this example: - -The braces are grouping characters. In general, in mudela data entry -for a data section called ``foobar'' looks like this: - -\begin{verbatim} -\foobar { ...... } -\end{verbatim} - -To see if it actually works, we run it through LilyPond. Invoke the -command -\begin{verbatim} - lilypond twinkle.ly -\end{verbatim} -When LilyPond starts working it will produce various ``operator -pacification'' messages, which you can safely ignore for now. The run -should have left a file called \file{lelie.tex} in your working -directory. You can process that file with \TeX, and it will look like -this: - -\begin{mudela} -\score { - \melodic { - c4 c4 g4 g4 a4 a4 g2 - f4 f4 e4 e4 d4 d4 c2 - } - \paper {} -} -\end{mudela} - -As you can see, this is the song that we wanted, albeit a little -low-pitched. You would probably want a version of the song which has -all notes an octave higher. This can be done by adding a -\verb+\octave+ command to the source. This sets the default octave -for all notes. Another convenience is the default duration: if you do -not specify a duration with the notename, the last explicitly entered -is used. The improved version reads thus - - -\begin[verbatim]{mudela} - % twinkle v2 -\score { - \melodic { - \octave c'; - c4 c g g a a g2 - f4 f e e d d c2 - } - \paper {} -} -\end{mudela} - - - -FIXME rewrite starting here. - -\begin[verbatim]{mudela} - \score { - \melodic { % {...} is a voice - c'4 g'4 % c and g are pitches, 4 is the duration - % (crotchet/quarter note) - c''4 ''c4 % c' is 1 octave up, 'c 1 down. - % <...> is a chord - } -} -\end{mudela} - - -\begin[fragment,verbatim]{mudela} - { c4 e4 g4 } -\end{mudela} - -Basics: the \verb+%+ introduces a comment. All music is inside a -\verb+\score+ block which represents one movement, ie one contiguous -block of music. Voices are grouped by \verb+{+ and \verb+}+ and -chords by \verb+<+ and \verb+>+. - - -The \verb+\octave+ command controls the default pitch (octave). If you -do not specify duration, the last one entered is used. The -\verb+\paper+ block contains parameters for spacing and dimensions. - -\begin[verbatim]{mudela} -\score { - % twinkle twinkle little star - \melodic { - \octave c'; - c4 c g g a a g2 - f4 f e e d [d8. e16] c2 - - } - \paper { linewidth = 5.\cm; } -} -\end{mudela} - -A more complex example; The multi command controls at what level the -different components of a chord are interpreted. The LilyPond chord -is much more general than a traditional chord. Multiple voices on a -staff are entered as a chord of voices. A score is a chord of staffs, -etc. - -\begin[verbatim]{mudela} - -\score{ - \melodic - { \octave c'; c4 c4 - \multi 1 < { c2 c2 } { c'2 c'2 } > - \multi 2 < { \stemdown c2 c2 } { \stemup c'2 c'2 } > - \multi 3 < - { \clef "bass"; c2 c2 } - { \meter 2/4;\bar "||"; - \key fis cis gis; c'2 c'2 } > - c2 c1 - c1 c1 - \multi 1< \multi 3 < - { \meter 2/4; \clef "violin"; c2 c2 } - { \meter 2/4; \clef "bass"; c2 c2 } - > - \multi 3 < - { \meter 2/4; \clef "violin"; c2 c2 } - { \meter 2/4; \clef "bass"; c2 c2 } - > - > - } -} - -\end{mudela} - - -LilyPond is designed to handle complicated stuff automatically. -Expertise should be in the program, not in the user. - -The following example shows how multiple voices on the same staff are -handled graciously (well, somewhat). If the noteheads of different -voices collide, they are moved horizontally. Rests are moved -vertically. - -[FIXME] -\def\bla{ -\begin[verbatim]{mudelaXX} -two_voice = \melodic - \multi 2 < - { \octave c'; \stemdown - c4 d e f g2~ g4 a [c8 d e f] c2| } - { \stemup - g4 f e g ~ g2 g2 c4 g4 g2 } - - > - -two_voice_steminvert = \melodic - \multi 2 < - { \octave c'; \stemup -% the f and g on 4th beat are exceptionally ugh. - c4 d e f g2 g4 a | } - { \stemdown - g4 f e g g2 g2 } - - > - -three_voice = \melodic - \multi 2 < - { \stemup - g4 f e f g a g2 } - { \property Voice.hshift = 1 \stemup - e2 e2 e2 e2 } - { \stemdown - c4 d e d c d es } - > - - -restsII = \melodic { - \octave c'; - \multi2 < - { \stemup g'8 f' e' d' c' b a g f e d c } - { \stemdown r r r r r r r r r r r r } - > - r8 r4 - \multi 2 < r8 r8 > - \multi 2 < r8 r8 r8 > - \multi 2 < r8 r8 r8 r8 > - \multi 2 < r r > - \multi 2 < r r r > - \stemup - [c''8 r8 c''8 c''8] - [c8 r8 c8 c8] -} - -\score{ - \melodic { \$two_voice \$two_voice_steminvert - \$three_voice \restsII } -} - -} -\end{document} diff --git a/Documentation/vocabulary-data b/Documentation/vocabulary-data index 003780d928..7f7640524e 100644 --- a/Documentation/vocabulary-data +++ b/Documentation/vocabulary-data @@ -1,4 +1,5 @@ Francais:US English:Deutsch:UK English:Nederlands:Italiaans +:system:::systeem: accentuation:accentuation:::accent: accolade:brace:::: accord:chord:::akkoord: @@ -15,35 +16,35 @@ appogiature double:double appoggiatura:::: appogiature longue:long appoggiatura:::: appogiature simple:simple appoggiatura:::: armature [de la clé]:key signature:::toonsoort (voortekens): -armure [de la clé]:key signature:::: -arpège:arpeggio:::: -augmenté (intervalle):augmented (interval):::: -bariton:baritone:::: -barre de mesure:bar line:::: +armure [de la clé]:key signature:::toonsoort: +arpège:arpeggio:::gebroken akoord: +augmenté (intervalle):augmented (interval):::overmatig interval: +bariton:baritone:::bariton: +barre de mesure:bar line:::maatstreep: :beam:Balk::waardestreep/balk: -barre de reprise:repeat:::: -basse:bass:::: -blanche:half note:::: +barre de reprise:repeat:::herhaling: +basse:bass:::bas: +blanche:half note:::halve noot: bâton de pause:(arbitrary number of bars' rest):::: bâton de pause:four-bar rest:::: bâton de pause:two-bar rest:::: bécarre:natural sign:::herstellingsteken: bémol:flat:::mol: -cadence:cadence:::: -cadence harmonique:harmonic cadence:::: -cadence mélodique:melodic cadence:::: +cadence:cadence:::cadens: +cadence harmonique:harmonic cadence:::cadens: +cadence mélodique:melodic cadence:::cadens: :cue-notes:Stichnoten::stichnoten: caractère:character:::: -chaîne de trilles:chain of trills:::: +chaîne de trilles:chain of trills:::triller: chevron:chevron:::: chiffrage (chiffres indicateurs):time signature:::maatsoort: chiffre inférieur:lower number:::: chiffre supérieur:upper number:::: clé:clef:::sleutel: clé d'octave:octave line:::: -clé d'ut:middle C clef:::C sleutel: -clé de fa:bass clef:::: -clé de sol:treble clef:::: +clé d'ut:middle C clef:::C sleutel, alt sleutel: +clé de fa:bass clef:::F sleutel: +clé de sol:treble clef:::G sleutel, viool sleutel: comma:comma:::: comma enharmonique:::: comma pythagoricien:::: @@ -55,31 +56,31 @@ contre-temps irr contre-temps régulier:regular contro-time:::: coulé:slur:::binding, bindingsboog: courbe rythmique:rythmic curve:::: -:opening angular bracket::::cresendo -croche:eighth note:::: +:opening angular bracket::::crescendo +croche:eighth note:::achtste noot: :closing angular bracket::::decrescendo -degré [de la gamme]:degree [of the scale]:::: -demi-pause:half rest:::: +degré [de la gamme]:degree [of the scale]:::trap [van de toonladder]: +demi-pause:half rest:::halve rust: demi-soupir:eighth rest:::achtste rust: demi-ton:semitone:::halve toon: -demi-ton chromatique:chromatic semitone:::: -demi-ton diatonique:diatonic semitone:::: +demi-ton chromatique:chromatic semitone:::chromatische halve toon: +demi-ton diatonique:diatonic semitone:::diatonische halve toon: diapason:pitch pipe; tuning fork:::stemfluitje; stemvork: -diminué (intervalle):diminished (interval):::: -dissonance:dissonant interval; dissonance:::: +diminué (intervalle):diminished (interval):::verminderd (interval): +dissonance:dissonant interval; dissonance:::dissonant interval; dissonant: dièse:sharp:::kruis: -do:C:::: -do central:middle C::::: +do:C:::C: +do central:middle C:::centrale C:: doigté::::: doigté de pédale::::: dominante:dominant:::dominant: -double barre:double bar line:::: +double barre:double bar line:::dubbele streep: double bémol:double flat:::dubbelmol: -double croche:sixteenth note:::: +double croche:sixteenth note:::zestiende noot: double dièse:double sharp:::dubbelkruis: -double triolet:double triplet:::: -duolet:duplet:::: -durée:duration:::: +double triolet:double triplet:::dubbele triool: +duolet:duplet:::duool: +durée:duration:::duur, lengte: échelle d'octave:octave line:::: échelle musicale:Musical Ladder:::: enharmonie:enharmony:::: @@ -103,25 +104,25 @@ genre diatonique:diatonic type:::: genre enharmonique:enharmonic type:::: groupe irrégulier:irregular group:::: grupetto:turn; gruppetto:::dubbelslag: -hauteur:pitch:::: -huitième de soupir:thirty-second rest:::: -incise:motive:::: +hauteur:pitch:::toonhoogte: +huitième de soupir:thirty-second rest:::32e rust: +incise:motive:::motief: indication de pédale:::: indication métronomique:metronomic indication:::: -intervalle:interval:::: +intervalle:interval:::interval: intervalle ascendant:ascending interval:::: intervalle composé:compound interval:::: -intervalle descendant:descending interval:::: +intervalle descendant:descending interval:::dalend interval: intervalle harmonique:harmonic interval:::: intervalle simple:simple interval:::: intervalles enharmoniques:enharmonic intervals:::: -juste (intervalle):perfect (interval):::: +juste (intervalle):perfect (interval):::rein (interval): la:A:::: -liaison:tie:::: +liaison:tie:::overbinding: liaison rythmique:legato curve:::: ligne:line:::: -ligne supplémentaire:ledger line:::: -majeur (intervalle):major (interval):::: +ligne supplémentaire:ledger line:::hulplijntje: +majeur (intervalle):major (interval):::groot (interval): membre de phrase:phrase member:::: mesure:bar; measure:::maat, maatstreep: mesure artificielle:artificial measure:::: @@ -136,8 +137,8 @@ mode:mode:::: mode ecclésiastique:::: mode majeur:major mode:::: mode mineur:minor mode:::: -modulation:modulation:::: -mordant:mordent:::: +modulation:modulation:::modulatie: +mordant:mordent:::mordent: ::::: mouvement:tempo; movement:::deel: mouvement conjoint:conjunct movement:::: @@ -146,16 +147,16 @@ mouvement lent:slow tempo:::: mouvement modéré:moderate tempo:::: mouvement rapide:fast tempo:::: médiante:mediant:::: -métronome:metronome:::: -noire:quarter note:::: -note:note:::: +métronome:metronome:::metronoom: +noire:quarter note:::kwartnoot: +note:note:::noot: note doublement pointée:double dotted note:::: note modale:modal note:::: note pointée:dotted note:::: note tonale:tonal note:::: -notes enharmoniques:enharmonic notes:::: +notes enharmoniques:enharmonic notes:::enharmonische noot: nuance:shading:::: -octave:octave:::: +octave:octave:::octaaf: ornement:embellishment; accessory:::: :part:::partij: partition:score:::partituur: @@ -172,12 +173,12 @@ port portées:staves:::: quadruple croche:sixty-fourth note:::: quart de soupir:sixteenth rest:::: -quarte:fourth:::: -quartolet:quadruplet:::: -quinte:fifth:::: -registre:register:::: -renversement d'intervalle:inversion of interval:::: -renvoi:return sign:::: +quarte:fourth:::kwart: +quartolet:quadruplet:::kwartool: +quinte:fifth:::kwint: +registre:register:::register: +renversement d'intervalle:inversion of interval:::inversie: +renvoi:return sign:::herstellingsteken: respiration:artificial rest:::: :double whole note::breve:brevis:breve ronde:whole note:::hele noot: @@ -191,18 +192,18 @@ sextolet:sextuplet:::: si:B:::: signes indicateurs de nuance:shading signs:::: silence:rest:::: -sixain:sextuplet:::: +sixain:sextuplet:::sextool: sixte:sixth:::: sol:G:::: soprano:soprano:::sopraan: soupir:quarter rest:::: sous-dominante:subdominant:::: sous-tonique:subtonic:::: -:dot over/below::::staccato +:dot over/below:::staccato:staccato sus-dominante:superdominant:::: sus-tonique:supertonic:::: syncope:syncopation; upbeat:::syncope: -syncope irrégulière:irregular syncopation:::: +syncope irrégulière:irregular syncopation:::onregelmatige syncope: syncope régulière:regular syncopation:::: temps:beat:::tel: temps binaire:binary beat:::: @@ -210,10 +211,10 @@ temps faible:weak beat:::: temps fort:strong beat:::: temps ternaire:ternary beat:::: tempérament mésotonique:meantone tuning:::: -tempérament égal:tempered tuning:::: -tierce:third:::: -ton:tone:::: -tonalité:tonality:::: +tempérament égal:tempered tuning:::getempereerde stemming: +tierce:third:::terts: +ton:tone:::toon: +tonalité:tonality:::tonaliteit: tonique:tonic:::: tons relatifs:relative scales:::: tons voisins:adjacent keys:::: @@ -231,7 +232,7 @@ unisson:unison:::: unité de mesure:unit of measure:::: unité de temps:unit of beat:::: ut:C:::: -voix:voice:::: +voix:voice:::stem: :quarter note::crotchet:: :quarter rest::crotchet rest:: :thirty-second note::demisemiquaver:: diff --git a/Documentation/vocabulary-forms.el b/Documentation/vocabulary-forms.el index 87893d2e13..2b3b52f30a 100644 --- a/Documentation/vocabulary-forms.el +++ b/Documentation/vocabulary-forms.el @@ -12,10 +12,10 @@ (setq forms-format-list (list "*** Musical vocabulary ***\n" - "\nItalian: " 6 - "\nFrench: " 1 + "\nItaliano: " 6 + "\nFrancais: " 1 "\nUS English: " 2 - "\nGerman: " 3 + "\nDeutsch: " 3 "\nBritish English: " 4 - "\nDutch: " 5 + "\nNederlands: " 5 )) diff --git a/Makefile.in b/Makefile.in index ad8a6ffc9e..f3d78349d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # title top level makefile for LilyPond @@ -45,12 +51,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -133,6 +139,7 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCI cd $(srcdir) && $(AUTOCONF) config.hh: stamp-h + @: stamp-h: $(srcdir)/config.hh.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=flower/config.hh:config.hh.in \ @@ -148,7 +155,7 @@ mostlyclean-hdr: clean-hdr: distclean-hdr: - rm -f config.hh + -rm -f config.hh maintainer-clean-hdr: @@ -165,7 +172,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -175,7 +182,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -189,24 +198,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hh.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)config.hh.in$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.hh.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hh.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -217,7 +231,7 @@ top_distdir = $(distdir) # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - rm -rf $(distdir) + -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -230,20 +244,20 @@ distcheck: dist && $(MAKE) install \ && $(MAKE) installcheck \ && $(MAKE) dist - rm -rf $(distdir) + -rm -rf $(distdir) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" dist: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) distdir: $(DISTFILES) - rm -rf $(distdir) + -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ @@ -252,12 +266,12 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done info: info-recursive @@ -286,19 +300,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic clean-am: clean-hdr clean-tags clean-generic mostlyclean-am @@ -313,13 +327,13 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status + -rm -f config.status .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ maintainer-clean-hdr install-data-recursive uninstall-data-recursive \ diff --git a/NEWS b/NEWS index 1bf07beb1b..a196610bf7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +pl 56 + - more dutch vocabulary + - Barnumber FAQ added + - bf: abbrev over whole note. + - feta: reverse turn. + - bf: rod distance + - bf: local key clashing + +*********** pl 55 - bezier check and ajust for slur height - better slur height ajust @@ -12,6 +21,7 @@ pl 55 - nicer trills - adjustment slur extend +********** pl 54 - bf dynamic_grav - bf accidentals with key change diff --git a/TODO b/TODO index 1c12934f6e..4945d09179 100644 --- a/TODO +++ b/TODO @@ -8,16 +8,15 @@ grep for TODO and ugh/ugr 0.2: - * add full coriolan to website. - - * collisions for local_key. + * bf: abbrevbeam? - * robustify Beam in case of no stems + * add full coriolan to website. - * latex quirk? + * robustify Beam (in case of no stems, 32nd notes) * check for groff / troff/ nroff et + * latex quirk? * use kpsepath to find all TeX dirs - configure.in - clean-fonts.sh @@ -31,8 +30,6 @@ grep for TODO and ugh/ugr * --metafont * disable spaces in TeX stuff - - * height of dyns. * handle ^C for tmp/file creation. @@ -52,8 +49,6 @@ grep for TODO and ugh/ugr * versioning for Feta - * bf: abbrevs over whole note - * the warning about the negative slur/tie length appears twice which is irritating. @@ -62,8 +57,6 @@ grep for TODO and ugh/ugr * better hshift (dots, distance, head dependent) - * tie/slur dir & curvature - * stem len adjustable STUFF @@ -128,7 +121,6 @@ PROJECTS * Makefile stuff: - shared lib on Solaris too. - - check libtool * Add mudela-output to Rosegarden. @@ -172,8 +164,6 @@ languages: (which is at Voice_gravs level) - make encapsulated spacing problems. - * On-demand loading of simple-engravers? - * accidentals per Voice_group * Convert all ref/bib stuff into BibTeX. @@ -370,8 +360,7 @@ SMALLISH PROJECTS IDEAS - * Output abstract data structures associated with -Mudela. + * Output data structures of Mudela in XML/SGML. * create libmudela, or liblily_frontend @@ -409,8 +398,6 @@ Mudela. if ( t <= get_type( q )) .. - * naming of Voice_group/Voice - * versioning stuff (cvt mudela, mudela, etc.) * a real convert-mudela @@ -423,12 +410,6 @@ Mudela. * lyrics in chords still fuck up. - * rewire acknowledge_element() logic with a process_acknowledged() - * pushgroup/popgroup - * multi threading? - - 1 thread per element/ 1 thread per line - - 1 thread per Translator - * Use hooks/dependency graphs for properties diff --git a/VERSION b/VERSION index 5532217ea8..80011142cc 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=55 +PATCH_LEVEL=56 MY_PATCH_LEVEL= # now used as shell script in configure too diff --git a/bin/Makefile.in b/bin/Makefile.in index 0c2bf5e6cb..92f8b1ccfa 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # bin/Makefile @@ -48,12 +54,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -210,26 +216,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean clean-local distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/bin/make-website.in b/bin/make-website.in index e574780344..2f636547a0 100755 --- a/bin/make-website.in +++ b/bin/make-website.in @@ -187,7 +187,7 @@ def gen_list(inputs, filename): list.write( ""); list.close() -texstuff = ["mudela-man", "mudela-course"] +texstuff = ["mudela-man", "introduction"] def gen_manuals(): print 'generating TeX doco manuals' diff --git a/bin/mudela-book.in b/bin/mudela-book.in index f23b428b52..64983a4bb6 100755 --- a/bin/mudela-book.in +++ b/bin/mudela-book.in @@ -1,4 +1,4 @@ -#!@PERL@ -w +##!@PERL@ -w # -*-Perl-*- my $mudcount = 0; my $mudela_b = 0; @@ -81,7 +81,7 @@ sub close_mudela if ($center_b) { print BOOK "\\begin{minipage}[c]{.5\\textwidth}\n"; } - print BOOK "\\input " . gen_texfile . "%\n"; + print BOOK "\\input " . gen_texfile . "\n"; if ($center_b) { print BOOK "\\end{minipage}"; $center_b = 0; @@ -102,7 +102,7 @@ sub open_mudela print BOOK "\\begin{verbatim}\n"; } if ($fragment_b) { - print MUDELA "\\score { \\melodic {\\octave c';"; + print MUDELA "\\score { \\melodic { "; } else { print MUDELA "default_paper = \\paper { \\paper_sixteen "; print MUDELA "linewidth = 7.\\cm;}"; diff --git a/debian/Makefile.in b/debian/Makefile.in index b04139b0a1..28668c8eb5 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # debian/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -154,26 +160,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/flower/Makefile.in b/flower/Makefile.in index a46863270e..5e7e42db60 100644 --- a/flower/Makefile.in +++ b/flower/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project FlowerSoft C++ library @@ -53,12 +59,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -144,7 +150,7 @@ OBJECTS = $(libflower_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .lo .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flower/Makefile @@ -156,7 +162,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-libLTLIBRARIES: clean-libLTLIBRARIES: - test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) distclean-libLTLIBRARIES: @@ -167,13 +173,13 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) $(mkinstalldirs) $(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$$p; \ done @@ -181,24 +187,36 @@ uninstall-libLTLIBRARIES: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -224,7 +242,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -234,7 +252,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -248,24 +268,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -280,117 +305,117 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -choleski.o choleski.lo: choleski.cc include/choleski.hh \ +choleski.lo choleski.o: choleski.cc include/choleski.hh \ include/matrix.hh include/matrix-storage.hh include/varray.hh \ include/real.hh include/virtual-methods.hh include/vector.hh -cpu-timer.o cpu-timer.lo: cpu-timer.cc include/cpu-timer.hh \ +cpu-timer.lo cpu-timer.o: cpu-timer.cc include/cpu-timer.hh \ include/real.hh -data-file.o data-file.lo: data-file.cc include/international.hh \ +data-file.lo data-file.o: data-file.cc include/international.hh \ include/data-file.hh include/text-stream.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh include/compare.hh \ include/varray.hh -diagonal-storage.o diagonal-storage.lo: diagonal-storage.cc \ +diagonal-storage.lo diagonal-storage.o: diagonal-storage.cc \ include/diagonal-storage.hh include/full-storage.hh \ include/varray.hh include/matrix-storage.hh include/real.hh \ include/virtual-methods.hh -dictionary.o dictionary.lo: dictionary.cc -directed-graph.o directed-graph.lo: directed-graph.cc \ +dictionary.lo dictionary.o: dictionary.cc +directed-graph.lo directed-graph.o: directed-graph.cc \ include/directed-graph.hh include/parray.hh include/varray.hh -dstream.o dstream.lo: dstream.cc include/assoc.hh include/varray.hh \ +dstream.lo dstream.o: dstream.cc include/assoc.hh include/varray.hh \ include/dstream.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh include/scalar.hh \ include/text-db.hh include/data-file.hh include/text-stream.hh \ include/string-convert.hh include/assoc-iter.hh -flower-debug.o flower-debug.lo: flower-debug.cc include/flower-debug.hh \ +flower-debug.lo flower-debug.o: flower-debug.cc include/flower-debug.hh \ include/dstream.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh -flower-version.o flower-version.lo: flower-version.cc config.hh -full-storage.o full-storage.lo: full-storage.cc include/full-storage.hh \ +flower-version.lo flower-version.o: flower-version.cc config.hh +full-storage.lo full-storage.o: full-storage.cc include/full-storage.hh \ include/varray.hh include/matrix-storage.hh include/real.hh \ include/virtual-methods.hh include/full-storage.icc -interval.o interval.lo: interval.cc include/interval.hh \ +interval.lo interval.o: interval.cc include/interval.hh \ include/fproto.hh include/real.hh include/compare.hh \ include/interval.tcc include/string.hh \ include/arithmetic-operator.hh include/string-handle.hh \ include/international.hh include/flower-debug.hh \ include/dstream.hh -lgetopt.o lgetopt.lo: lgetopt.cc include/lgetopt.hh \ +lgetopt.lo lgetopt.o: lgetopt.cc include/lgetopt.hh \ include/international.hh -libc-extension.o libc-extension.lo: libc-extension.cc \ +libc-extension.lo libc-extension.o: libc-extension.cc \ include/libc-extension.hh include/fproto.hh include/real.hh \ config.hh -matrix-debug.o matrix-debug.lo: matrix-debug.cc include/flower-debug.hh \ +matrix-debug.lo matrix-debug.o: matrix-debug.cc include/flower-debug.hh \ include/dstream.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh include/matrix.hh \ include/matrix-storage.hh include/varray.hh \ include/virtual-methods.hh include/vector.hh -matrix-storage.o matrix-storage.lo: matrix-storage.cc \ +matrix-storage.lo matrix-storage.o: matrix-storage.cc \ include/full-storage.hh include/varray.hh \ include/matrix-storage.hh include/real.hh \ include/virtual-methods.hh include/diagonal-storage.hh -matrix.o matrix.lo: matrix.cc include/matrix.hh \ +matrix.lo matrix.o: matrix.cc include/matrix.hh \ include/matrix-storage.hh include/varray.hh include/real.hh \ include/virtual-methods.hh include/vector.hh \ include/full-storage.hh include/diagonal-storage.hh -nscalar.o nscalar.lo: nscalar.cc -path.o path.lo: path.cc include/path.hh include/string.hh \ +nscalar.lo nscalar.o: nscalar.cc +path.lo path.o: path.cc include/path.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh include/varray.hh \ include/flower-debug.hh include/dstream.hh -rational.o rational.lo: rational.cc include/rational.hh \ +rational.lo rational.o: rational.cc include/rational.hh \ include/compare.hh include/arithmetic-operator.hh \ include/fproto.hh include/real.hh include/string.hh \ include/string-handle.hh include/international.hh \ include/string-convert.hh include/libc-extension.hh config.hh -scalar.o scalar.lo: scalar.cc include/scalar.hh include/string.hh \ +scalar.lo scalar.o: scalar.cc include/scalar.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh include/rational.hh -string-convert.o string-convert.lo: string-convert.cc \ +string-convert.lo string-convert.o: string-convert.cc \ include/libc-extension.hh include/fproto.hh include/real.hh \ config.hh include/string.hh include/arithmetic-operator.hh \ include/string-handle.hh include/international.hh \ include/compare.hh include/string-convert.hh \ include/rational.hh -string.o string.lo: string.cc include/string.hh \ +string.lo string.o: string.cc include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh \ include/libc-extension.hh config.hh include/string-convert.hh -stringutil.o stringutil.lo: stringutil.cc include/string-handle.hh \ +stringutil.lo stringutil.o: stringutil.cc include/string-handle.hh \ include/fproto.hh include/real.hh include/string-data.hh \ include/string.hh include/arithmetic-operator.hh \ include/international.hh include/compare.hh \ include/string-data.icc include/string-handle.icc \ include/string.icc -text-db.o text-db.lo: text-db.cc include/text-db.hh include/data-file.hh \ +text-db.lo text-db.o: text-db.cc include/text-db.hh include/data-file.hh \ include/text-stream.hh include/string.hh \ include/arithmetic-operator.hh include/fproto.hh \ include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh include/varray.hh -text-stream.o text-stream.lo: text-stream.cc include/text-stream.hh \ +text-stream.lo text-stream.o: text-stream.cc include/text-stream.hh \ include/string.hh include/arithmetic-operator.hh \ include/fproto.hh include/real.hh include/string-handle.hh \ include/international.hh include/compare.hh include/varray.hh -unionfind.o unionfind.lo: unionfind.cc include/unionfind.hh \ +unionfind.lo unionfind.o: unionfind.cc include/unionfind.hh \ include/varray.hh -vector.o vector.lo: vector.cc include/vector.hh include/real.hh \ +vector.lo vector.o: vector.cc include/vector.hh include/real.hh \ include/varray.hh info: info-recursive @@ -427,19 +452,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic @@ -461,8 +486,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/flower/include/Makefile.in b/flower/include/Makefile.in index 5229770ab9..5913ab932d 100644 --- a/flower/include/Makefile.in +++ b/flower/include/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # flower/include/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -121,21 +127,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -174,26 +185,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/flowertest/Makefile.in b/flowertest/Makefile.in index a551555eff..366c29f8a2 100644 --- a/flowertest/Makefile.in +++ b/flowertest/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -48,12 +54,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -137,7 +143,7 @@ OBJECTS = $(test_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .lo .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps flowertest/Makefile @@ -149,7 +155,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -166,7 +172,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -174,24 +180,36 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -207,21 +225,26 @@ test: $(test_OBJECTS) $(test_DEPENDENCIES) tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -236,8 +259,8 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -main.o main.lo: main.cc flower-test.hh ../flower/include/varray.hh -mat-test.o mat-test.lo: mat-test.cc ../flower/include/matrix.hh \ +main.o: main.cc flower-test.hh ../flower/include/varray.hh +mat-test.o: mat-test.cc ../flower/include/matrix.hh \ ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ ../flower/include/real.hh ../flower/include/virtual-methods.hh \ ../flower/include/vector.hh ../flower/include/string.hh \ @@ -245,16 +268,16 @@ mat-test.o mat-test.lo: mat-test.cc ../flower/include/matrix.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ flower-test.hh ../flower/include/choleski.hh -pqtest.o pqtest.lo: pqtest.cc flower-test.hh ../flower/include/pqueue.hh \ +pqtest.o: pqtest.cc flower-test.hh ../flower/include/pqueue.hh \ ../flower/include/varray.hh -rattest.o rattest.lo: rattest.cc ../flower/include/rational.hh \ +rattest.o: rattest.cc ../flower/include/rational.hh \ ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ flower-test.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh -stringtest.o stringtest.lo: stringtest.cc ../flower/include/string.hh \ +stringtest.o: stringtest.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -312,19 +335,19 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic @@ -334,8 +357,8 @@ clean: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ distclean: distclean-binPROGRAMS distclean-compile distclean-libtool \ distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ maintainer-clean-libtool maintainer-clean-tags \ diff --git a/flowertest/check.sh b/flowertest/check.sh old mode 100755 new mode 100644 diff --git a/init/Makefile.in b/init/Makefile.in index 14b9e47e09..f9c684a5ee 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # init/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -159,26 +165,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/init/engraver.ly b/init/engraver.ly index a1b51de4cb..427fb4c410 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -14,7 +14,25 @@ Staff = \translator { \consists "Staff_sym_engraver"; \consists "Collision_engraver"; \consists "Rest_collision_engraver"; - \consists "Separating_line_group_engraver"; + +%{ + Uncomment to get bar numbers on single staff systems: + + The Bar_number_engraver puts a number over a staff created + at the same level of hierarchy. This why you have to add it + here separately if you want to have numbers on single staff + systems: The Bar_number_engraver in Score_engraver will only + put numbers on bars that are Score ("system") wide. Such + bars are only created when the toplevel system has multiple + children-staffs. + +%} + %{ + + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; +%} + \consists "Separating_line_group_engraver"; \consists "Line_group_engraver"; \accepts "Voice"; @@ -99,9 +117,11 @@ Score = \translator { \type Score_engraver; \consists "Timing_engraver"; - %\consists "Bar_column_engraver"; - %\consists "Bar_number_engraver"; - + % uncomment to bar numbers on a whoole system. +%{ + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; +%} \consists "Span_score_bar_engraver"; \consists "Score_priority_engraver"; \consists "Priority_horizontal_align_engraver"; diff --git a/init/feta11.ly b/init/feta11.ly index 744ff61814..e168a29ea9 100644 --- a/init/feta11.ly +++ b/init/feta11.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/feta13.ly b/init/feta13.ly index 13a530df76..95b304a524 100644 --- a/init/feta13.ly +++ b/init/feta13.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/feta16.ly b/init/feta16.ly index 0521352920..bd8655ac9f 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/feta19.ly b/init/feta19.ly index da3fb72d61..a6d822225e 100644 --- a/init/feta19.ly +++ b/init/feta19.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/feta20.ly b/init/feta20.ly index 80eab9310b..ca0bac6deb 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/feta23.ly b/init/feta23.ly index 7cbe8810b5..37036963f7 100644 --- a/init/feta23.ly +++ b/init/feta23.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/feta26.ly b/init/feta26.ly index 79595c1a1a..6afbde925b 100644 --- a/init/feta26.ly +++ b/init/feta26.ly @@ -52,6 +52,7 @@ "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 diff --git a/init/script.ly b/init/script.ly index 951327232c..d032f44a8b 100644 --- a/init/script.ly +++ b/init/script.ly @@ -20,6 +20,7 @@ rtoe = \script { "dpedaltoe" 0 0 1 0 0 } turn = \script { "turn" 0 0 1 0 0 } open = \script { "open" 0 0 1 0 0 } flageolet = \script { "flageolet" 0 0 1 0 0 } +reverseturn = \script { "reverseturn" 0 0 1 0 0 } % could we do without this bloat? diff --git a/init/table16.ly b/init/table16.ly index b0fd33ef0a..15dede987e 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -16,7 +16,7 @@ table_sixteen= "finger" "\setfinger{%}" 0.0\pt 0.0\pt 0.0\pt 4.0\pt "italic" "\setitalic{%}" 0.0\pt 7.5\pt 0.0\pt 8.0\pt "large" "\setlarge{%}" 0.0\pt 9.50\pt 0.0\pt 10.0\pt - "roman" "\settext{%}" 0.0\pt 7.50\pt 0.0\pt 8.0\pt + "roman" "\settext{%}" 0.0\pt 4.0\pt 0.0\pt 8.0\pt } "dynamics" = \table { "mf" "\dynmf" diff --git a/input/Makefile.am b/input/Makefile.am index 3bdf8d9dc1..095d3806a8 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,7 +1,7 @@ # Generated automatically by wild-perl 0.1 # input/Makefile.am.wild -LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly +LYFILES = abbrev.ly beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) diff --git a/input/Makefile.in b/input/Makefile.in index aff9bc9d13..a8f0150cdb 100644 --- a/input/Makefile.in +++ b/input/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # input/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -94,7 +100,7 @@ YACC = @YACC@ ZIP = @ZIP@ absolute_builddir = @absolute_builddir@ -LYFILES = beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly +LYFILES = abbrev.ly beam-bug.ly beams.ly cadenza.ly collisions.ly coriolan-alto.ly denneboom.ly font-body.ly font.ly font11.ly font13.ly font16.ly font20.ly font26.ly gourlay.ly keys.ly kortjakje.ly multi.ly pedal.ly praeludium-fuga-E.ly rhythm.ly scales.ly scripts.ly sleur.ly slurs.ly spacing.ly stem.ly test-lyrics.ly tril.ly twinkle-pop.ly twinkle.ly TEXFILES = dummy.tex M4FILES = dummy.m4 EXTRA_DIST = Makefile.am.wild TODO $(LYFILES) $(TEXFILES) $(M4FILES) @@ -158,26 +164,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/input/abbrev.ly b/input/abbrev.ly new file mode 100644 index 0000000000..c2522e60a1 --- /dev/null +++ b/input/abbrev.ly @@ -0,0 +1,22 @@ + +\score{\melodic { + % default abbreviations + c4 c4: c4:32 c4: c4 c2. + 'a1 + 'a1:32 + 'c4:8 c': 'c4:16 c': +% [ 'c8:16 'c 'c 'c ] [ a a a a ] +% [ 'c 'f 'b e ] +% [ 'c16:32 'c 'c 'c ] [ a16:32 a a a ] +%% % there's still some hairy beam bugfixing todo +%% [ c'8:16 g d 'a ] +%% [ c'16:32 g d 'a ] +%% [ 'c8:32 'f 'b e ] + [:32 c16 e] + [:32 c16 e] + [:16 c8 e] + [:16 e4 g] + [:16 e2 g] + [:16 e1 g] + +}} diff --git a/input/font-body.ly b/input/font-body.ly index 5ed8e12545..19e7078057 100644 --- a/input/font-body.ly +++ b/input/font-body.ly @@ -12,7 +12,7 @@ FontBody= \melodic{ c4 g c' a' \bar ":|"; a\ppp-\upbow a\pp-\downbow a\p^\turn a\mp^\fermata | a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill| - a\fp a4.\sf a4.\sfz | % a\fz a\rf + a\fp-\reverseturn a4.\sf a4.\sfz | % a\fz a\rf [c8-\prall c-\mordent] [a'-\prallmordent a'-\prallprall] [c-\upprall a'-\downprall] [a' c] | [c \< d e f] [as' ges' f' e'] @@ -38,25 +38,6 @@ FontBody= \melodic{ a'^\flageolet \textstyle "roman"; -%{ % default abbreviations - c4 c4: c4:32 c4: c4 c2. - 'a1 - 'a1:32 - 'c4:8 c': 'c4:16 c': -% [ 'c8:16 'c 'c 'c ] [ a a a a ] -% [ 'c 'f 'b e ] -% [ 'c16:32 'c 'c 'c ] [ a16:32 a a a ] -%% % there's still some hairy beam bugfixing todo -%% [ c'8:16 g d 'a ] -%% [ c'16:32 g d 'a ] -%% [ 'c8:32 'f 'b e ] - [:32 c16 e] - [:32 c16 e] - [:16 c8 e] - [:16 e4 g] - [:16 e2 g] - [:16 e1 g] -%} \meter 1/2; a2 | \meter 3/2; < a1. { s4 \ppp \< s4 \! s4 \fff s4 \> s4 \! s4\ppp} > diff --git a/input/font26.ly b/input/font26.ly index 535383d46e..e811da1d99 100644 --- a/input/font26.ly +++ b/input/font26.ly @@ -7,8 +7,9 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\include "paper26.ly"; +\include "paper26.ly" \include "font-body.ly" + \score{ \FontBody \paper{ diff --git a/input/rhythm.ly b/input/rhythm.ly index b670410342..a0f28fb15b 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -64,8 +64,6 @@ yanother = \type Score_engraver; %\consists "Timing_engraver"; - %\consists "Bar_column_engraver"; - %\consists "Bar_number_engraver"; \consists "Span_score_bar_engraver"; \consists "Score_priority_engraver"; @@ -85,6 +83,8 @@ Rhythmic_staff = \translator nolines = "1"; \consists "Pitch_squash_engraver"; + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; \consists "Bar_engraver"; \consists "Meter_engraver"; \consists "Staff_sym_engraver"; @@ -97,6 +97,8 @@ Rhythmic_staff = \translator \type "Engraver_group_engraver"; defaultclef= violin; + \consists "Bar_column_engraver"; + \consists "Bar_number_engraver"; \consists "Timing_engraver"; \consists "Bar_engraver"; \consists "Clef_engraver"; diff --git a/input/spacing.ly b/input/spacing.ly index 9da213e905..0c8729b41c 100644 --- a/input/spacing.ly +++ b/input/spacing.ly @@ -60,7 +60,7 @@ singlepart = \melodic{ \score{ \melodic { - \singlepart +% \singlepart \multipart } \paper { diff --git a/lib/Makefile.in b/lib/Makefile.in index a5c2996924..38f347f9ae 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -53,12 +59,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -139,7 +145,7 @@ OBJECTS = $(liblily_la_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .lo .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile @@ -151,7 +157,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-libLTLIBRARIES: clean-libLTLIBRARIES: - test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) distclean-libLTLIBRARIES: @@ -162,13 +168,13 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) $(mkinstalldirs) $(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(lib_LTLIBRARIES)'; for p in $$list; do \ $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$$p; \ done @@ -176,24 +182,36 @@ uninstall-libLTLIBRARIES: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -219,7 +237,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -229,7 +247,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -243,24 +263,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -275,15 +300,15 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -binary-source-file.o binary-source-file.lo: binary-source-file.cc \ +binary-source-file.lo binary-source-file.o: binary-source-file.cc \ include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -297,7 +322,7 @@ binary-source-file.o binary-source-file.lo: binary-source-file.cc \ ../flower/include/international.hh include/source-file.hh \ include/binary-source-file.hh \ ../flower/include/string-convert.hh -duration-convert.o duration-convert.lo: duration-convert.cc \ +duration-convert.lo duration-convert.o: duration-convert.cc \ include/duration-convert.hh include/duration.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/moment.hh ../flower/include/rational.hh \ @@ -306,7 +331,7 @@ duration-convert.o duration-convert.lo: duration-convert.cc \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh \ include/warn.hh -duration.o duration.lo: duration.cc include/proto.hh \ +duration.lo duration.o: duration.cc include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -321,7 +346,7 @@ duration.o duration.lo: duration.cc include/proto.hh \ ../flower/include/rational.hh include/duration.hh \ include/plet.hh include/duration-convert.hh \ ../flower/include/varray.hh -input.o input.lo: input.cc include/proto.hh ../flower/include/fproto.hh \ +input.lo input.o: input.cc include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/input.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -333,18 +358,18 @@ input.o input.lo: input.cc include/proto.hh ../flower/include/fproto.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/source-file.hh -mapped-file-storage.o mapped-file-storage.lo: mapped-file-storage.cc -moment.o moment.lo: moment.cc ../flower/include/string.hh \ +mapped-file-storage.lo mapped-file-storage.o: mapped-file-storage.cc +moment.lo moment.o: moment.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/moment.hh ../flower/include/rational.hh -plet.o plet.lo: plet.cc include/plet.hh include/moment.hh \ +plet.lo plet.o: plet.cc include/plet.hh include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh -simple-file-storage.o simple-file-storage.lo: simple-file-storage.cc \ +simple-file-storage.lo simple-file-storage.o: simple-file-storage.cc \ include/simple-file-storage.hh include/file-storage.hh \ include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -353,7 +378,7 @@ simple-file-storage.o simple-file-storage.lo: simple-file-storage.cc \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/warn.hh -source-file.o source-file.lo: source-file.cc ../flower/include/string.hh \ +source-file.lo source-file.o: source-file.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -367,7 +392,7 @@ source-file.o source-file.lo: source-file.cc ../flower/include/string.hh \ include/windhoos-suck-suck-suck-thank-you-cygnus.hh \ include/source-file.hh include/simple-file-storage.hh \ include/file-storage.hh -source.o source.lo: source.cc include/binary-source-file.hh \ +source.lo source.o: source.cc include/binary-source-file.hh \ include/source-file.hh include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ @@ -381,7 +406,7 @@ source.o source.lo: source.cc include/binary-source-file.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/source.hh ../flower/include/path.hh \ ../flower/include/varray.hh -template.o template.lo: template.cc include/source-file.hh \ +template.lo template.o: template.cc include/source-file.hh \ include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -394,12 +419,12 @@ template.o template.lo: template.cc include/source-file.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc ../flower/include/pcursor.tcc \ ../flower/include/cursor.tcc ../flower/include/list.tcc -warn.o warn.lo: warn.cc include/warn.hh ../flower/include/string.hh \ +warn.lo warn.o: warn.cc include/warn.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -windhoos-suck-suck-suck-thank-you-cygnus.o windhoos-suck-suck-suck-thank-you-cygnus.lo: \ +windhoos-suck-suck-suck-thank-you-cygnus.lo windhoos-suck-suck-suck-thank-you-cygnus.o: \ windhoos-suck-suck-suck-thank-you-cygnus.cc info: info-recursive @@ -433,19 +458,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic @@ -467,8 +492,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/lib/include/Makefile.in b/lib/include/Makefile.in index 8f63692c46..aa411ca030 100644 --- a/lib/include/Makefile.in +++ b/lib/include/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # lib/include/Makefile @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -121,21 +127,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -174,26 +185,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/lily/Makefile.in b/lily/Makefile.in index 0e3396cc36..5d3fb49d2f 100644 --- a/lily/Makefile.in +++ b/lily/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter # title makefile for lilypond @@ -52,12 +58,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -186,6 +192,10 @@ LEXLIB = @LEXLIB@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) DIST_COMMON = Makefile.am Makefile.in lexer.cc parser.cc @@ -200,7 +210,7 @@ OBJECTS = $(lilypond_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .h .ll .lo .o .yy +.SUFFIXES: .S .c .cc .ll .lo .o .s .yy $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lily/Makefile @@ -212,7 +222,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -229,7 +239,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -237,24 +247,36 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -264,15 +286,12 @@ lilypond: $(lilypond_OBJECTS) $(lilypond_DEPENDENCIES) @rm -f lilypond $(CXXLINK) $(lilypond_LDFLAGS) $(lilypond_OBJECTS) $(lilypond_LDADD) $(LIBS) .yy.cc: - $(YACC) $(YFLAGS) $< && mv y.tab.c $@ - if test -f y.tab.h; then \ - if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \ - else :; fi -.yy.h: - $(YACC) $(YFLAGS) $< && mv y.tab.c $@ + $(YACC) $(YFLAGS) $< && mv y.tab.c $*.cc if test -f y.tab.h; then \ if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \ else :; fi +parser.hh: parser.cc + .ll.cc: $(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@ .cc.o: @@ -293,7 +312,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -303,7 +322,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -317,24 +338,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -349,19 +375,18 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -abbrev.o abbrev.lo: abbrev.cc include/abbrev.hh include/item.hh \ - include/boxes.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/interval.hh \ - ../flower/include/compare.hh include/offset.hh include/axes.hh \ - ../flower/include/string.hh \ +abbrev.o: abbrev.cc include/abbrev.hh include/item.hh include/boxes.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -384,8 +409,7 @@ abbrev.o abbrev.lo: abbrev.cc include/abbrev.hh include/item.hh \ ../flower/include/assoc.hh include/lookup.hh include/atom.hh \ ../flower/include/scalar.hh include/stem.hh include/molecule.hh \ include/dimen.hh -abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \ - abbreviation-beam-engraver.cc \ +abbreviation-beam-engraver.o: abbreviation-beam-engraver.cc \ ../lib/include/duration-convert.hh ../lib/include/duration.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -416,8 +440,8 @@ abbreviation-beam-engraver.o abbreviation-beam-engraver.lo: \ include/directional-spanner.hh include/spanner.hh \ include/rod.hh include/musical-request.hh include/misc.hh \ include/grouping.hh -abbreviation-beam.o abbreviation-beam.lo: abbreviation-beam.cc \ - include/p-col.hh include/horizontal-group-item.hh \ +abbreviation-beam.o: abbreviation-beam.cc include/p-col.hh \ + include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -450,7 +474,7 @@ abbreviation-beam.o abbreviation-beam.lo: abbreviation-beam.cc \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/lookup.hh \ include/stem-info.hh -atom.o atom.lo: atom.cc include/atom.hh ../flower/include/string.hh \ +atom.o: atom.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -461,7 +485,7 @@ atom.o atom.lo: atom.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/scalar.hh include/dimen.hh \ ../flower/include/varray.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -audio-column.o audio-column.lo: audio-column.cc include/audio-column.hh \ +audio-column.o: audio-column.cc include/audio-column.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -477,17 +501,16 @@ audio-column.o audio-column.lo: audio-column.cc include/audio-column.hh \ ../flower/include/virtual-methods.hh include/performance.hh \ include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -audio-element.o audio-element.lo: audio-element.cc \ - include/audio-element.hh ../flower/include/virtual-methods.hh \ - include/debug.hh ../flower/include/dstream.hh \ - ../flower/include/string.hh \ +audio-element.o: audio-element.cc include/audio-element.hh \ + ../flower/include/virtual-methods.hh include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh -audio-item.o audio-item.lo: audio-item.cc include/debug.hh \ +audio-item.o: audio-item.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -506,7 +529,7 @@ audio-item.o audio-item.lo: audio-item.cc include/debug.hh \ ../lib/include/input.hh include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ include/audio-column.hh -audio-staff.o audio-staff.lo: audio-staff.cc include/audio-staff.hh \ +audio-staff.o: audio-staff.cc include/audio-staff.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -523,10 +546,9 @@ audio-staff.o audio-staff.lo: audio-staff.cc include/audio-staff.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/midi-stream.hh include/midi-walker.hh \ ../flower/include/pqueue.hh ../flower/include/varray.hh -axis-group-administration.o axis-group-administration.lo: \ - axis-group-administration.cc ../flower/include/interval.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/compare.hh \ +axis-group-administration.o: axis-group-administration.cc \ + ../flower/include/interval.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/compare.hh \ include/axis-group-administration.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ include/axes.hh ../flower/include/string.hh \ @@ -538,7 +560,7 @@ axis-group-administration.o axis-group-administration.lo: \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -axis-group-element.o axis-group-element.lo: axis-group-element.cc \ +axis-group-element.o: axis-group-element.cc \ include/axis-group-element.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -552,10 +574,9 @@ axis-group-element.o axis-group-element.lo: axis-group-element.cc \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/interval.hh \ include/axis-group-administration.hh -axis-group-item.o axis-group-item.lo: axis-group-item.cc \ - include/axis-group-item.hh include/axis-group-element.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +axis-group-item.o: axis-group-item.cc include/axis-group-item.hh \ + include/axis-group-element.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -575,7 +596,7 @@ axis-group-item.o axis-group-item.lo: axis-group-item.cc \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/rod.hh -axis-group-spanner.o axis-group-spanner.lo: axis-group-spanner.cc \ +axis-group-spanner.o: axis-group-spanner.cc \ include/axis-group-spanner.hh include/spanner.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -600,17 +621,16 @@ axis-group-spanner.o axis-group-spanner.lo: axis-group-spanner.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -axis.o axis.lo: axis.cc include/axes.hh ../flower/include/string.hh \ +axis.o: axis.cc include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -bar-column-grav.o bar-column-grav.lo: bar-column-grav.cc \ - include/bar-column-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +bar-column-grav.o: bar-column-grav.cc include/bar-column-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -632,7 +652,7 @@ bar-column-grav.o bar-column-grav.lo: bar-column-grav.cc \ include/horizontal-vertical-group-elem.hh \ include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/script.hh include/staff-side.hh include/bar.hh -bar-column.o bar-column.lo: bar-column.cc include/bar.hh include/item.hh \ +bar-column.o: bar-column.cc include/bar.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ @@ -652,11 +672,11 @@ bar-column.o bar-column.lo: bar-column.cc include/bar.hh include/item.hh \ include/axis-group-administration.hh \ include/horizontal-vertical-group-elem.hh \ include/vertical-group-elem.hh include/horizontal-group-elem.hh -bar-grav.o bar-grav.lo: bar-grav.cc include/bar-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +bar-grav.o: bar-grav.cc include/bar-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -679,12 +699,11 @@ bar-grav.o bar-grav.lo: bar-grav.cc include/bar-grav.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/translator-group.hh -bar-number-grav.o bar-number-grav.lo: bar-number-grav.cc \ - include/bar-number-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +bar-number-grav.o: bar-number-grav.cc include/bar-number-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -704,7 +723,7 @@ bar-number-grav.o bar-number-grav.lo: bar-number-grav.cc \ include/command-request.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/bar.hh \ include/time-description.hh -bar.o bar.lo: bar.cc include/bar.hh include/item.hh include/boxes.hh \ +bar.o: bar.cc include/bar.hh include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -728,11 +747,10 @@ bar.o bar.lo: bar.cc include/bar.hh include/item.hh include/boxes.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -beam-grav.o beam-grav.lo: beam-grav.cc \ - ../lib/include/duration-convert.hh ../lib/include/duration.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +beam-grav.o: beam-grav.cc ../lib/include/duration-convert.hh \ + ../lib/include/duration.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh \ @@ -761,7 +779,7 @@ beam-grav.o beam-grav.lo: beam-grav.cc \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh -beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \ +beam-swallow-trans.o: beam-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -778,8 +796,7 @@ beam-swallow-trans.o beam-swallow-trans.lo: beam-swallow-trans.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -beam.o beam.lo: beam.cc include/p-col.hh \ - include/horizontal-group-item.hh \ +beam.o: beam.cc include/p-col.hh include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -812,14 +829,13 @@ beam.o beam.lo: beam.cc include/p-col.hh \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/lookup.hh \ include/stem-info.hh include/main.hh -bezier.o bezier.lo: bezier.cc include/bezier.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/dimen.hh \ - ../flower/include/string.hh \ +bezier.o: bezier.cc include/offset.hh ../flower/include/real.hh \ + include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ - ../flower/include/string-handle.hh \ + ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ - include/paper-def.hh ../lib/include/moment.hh \ + include/bezier.hh include/lily-proto.hh ../lib/include/proto.hh \ + include/dimen.hh include/paper-def.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/varray.hh \ ../flower/include/interval.hh include/music-output-def.hh \ ../flower/include/virtual-methods.hh ../flower/include/plist.hh \ @@ -829,7 +845,7 @@ bezier.o bezier.lo: bezier.cc include/bezier.hh include/lily-proto.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh -bow.o bow.lo: bow.cc include/bow.hh include/directional-spanner.hh \ +bow.o: bow.cc include/bow.hh include/directional-spanner.hh \ include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score-elem.hh \ @@ -852,16 +868,16 @@ bow.o bow.lo: bow.cc include/bow.hh include/directional-spanner.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/molecule.hh include/boxes.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh -boxes.o boxes.lo: boxes.cc include/boxes.hh ../flower/include/fproto.hh \ +boxes.o: boxes.cc include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh -break-align-item.o break-align-item.lo: break-align-item.cc \ - include/break-align-item.hh include/horizontal-align-item.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +break-align-item.o: break-align-item.cc include/break-align-item.hh \ + include/horizontal-align-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -874,7 +890,7 @@ break-align-item.o break-align-item.lo: break-align-item.cc \ include/graphical-element.hh include/lily-proto.hh \ ../lib/include/proto.hh include/drul-array.hh \ include/direction.hh -break.o break.lo: break.cc include/score-column.hh include/lily-proto.hh \ +break.o: break.cc include/score-column.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -904,17 +920,17 @@ break.o break.lo: break.cc include/score-column.hh include/lily-proto.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/scoreline.hh include/spanner.hh include/p-score.hh \ include/music-output.hh ../flower/include/cpu-timer.hh -change-iterator.o change-iterator.lo: change-iterator.cc \ - include/change-iterator.hh include/music-iterator.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/varray.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +change-iterator.o: change-iterator.cc include/change-iterator.hh \ + include/music-iterator.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/virtual-methods.hh \ include/translator-group.hh ../flower/include/string.hh \ @@ -926,19 +942,19 @@ change-iterator.o change-iterator.lo: change-iterator.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -change-translator.o change-translator.lo: change-translator.cc \ - include/change-translator.hh include/music.hh \ - ../flower/include/virtual-methods.hh ../lib/include/input.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/minterval.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +change-translator.o: change-translator.cc include/change-translator.hh \ + include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -chord-iterator.o chord-iterator.lo: chord-iterator.cc \ - include/translator-group.hh ../flower/include/string.hh \ +chord-iterator.o: chord-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -959,7 +975,7 @@ chord-iterator.o chord-iterator.lo: chord-iterator.cc \ ../flower/include/rational.hh include/music-list.hh \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh -clef-grav.o clef-grav.lo: clef-grav.cc include/bar.hh include/item.hh \ +clef-grav.o: clef-grav.cc include/bar.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ @@ -984,8 +1000,8 @@ clef-grav.o clef-grav.lo: clef-grav.cc include/bar.hh include/item.hh \ ../lib/include/warn.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/time-description.hh -clef-item.o clef-item.lo: clef-item.cc include/clef-item.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +clef-item.o: clef-item.cc include/clef-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -1011,7 +1027,7 @@ clef-item.o clef-item.lo: clef-item.cc include/clef-item.hh \ ../lib/include/input.hh include/music.hh include/minterval.hh \ include/score-elem-info.hh include/staff-info.hh \ include/translator.hh -col-info.o col-info.lo: col-info.cc include/p-col.hh \ +col-info.o: col-info.cc include/p-col.hh \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -1037,21 +1053,21 @@ col-info.o col-info.lo: col-info.cc include/p-col.hh \ ../flower/include/pointer.hh ../flower/include/assoc.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -colhpos.o colhpos.lo: colhpos.cc include/colhpos.hh \ - ../flower/include/varray.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +colhpos.o: colhpos.cc include/colhpos.hh ../flower/include/varray.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../lib/include/warn.hh ../flower/include/vector.hh \ include/line-spacer.hh ../flower/include/interval.hh -collision-grav.o collision-grav.lo: collision-grav.cc \ - include/note-column.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +collision-grav.o: collision-grav.cc include/note-column.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -1074,8 +1090,8 @@ collision-grav.o collision-grav.lo: collision-grav.cc \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/collision.hh -collision.o collision.lo: collision.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +collision.o: collision.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1104,9 +1120,8 @@ collision.o collision.lo: collision.cc include/debug.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh -command-request.o command-request.lo: command-request.cc \ - include/command-request.hh include/request.hh \ - ../flower/include/string.hh \ +command-request.o: command-request.cc include/command-request.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1119,17 +1134,16 @@ command-request.o command-request.lo: command-request.cc \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh include/musical-request.hh -crescendo.o crescendo.lo: crescendo.cc include/molecule.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/boxes.hh \ - ../flower/include/interval.hh include/offset.hh include/axes.hh \ - ../flower/include/string.hh \ +crescendo.o: crescendo.cc include/molecule.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/boxes.hh ../flower/include/interval.hh \ + include/offset.hh include/axes.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/direction.hh \ @@ -1150,7 +1164,7 @@ crescendo.o crescendo.lo: crescendo.cc include/molecule.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh -debug.o debug.lo: debug.cc include/debug.hh ../flower/include/dstream.hh \ +debug.o: debug.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1160,7 +1174,7 @@ debug.o debug.lo: debug.cc include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh ../flower/include/flower-debug.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/main.hh -dimen.o dimen.lo: dimen.cc include/dimen.hh ../flower/include/real.hh \ +dimen.o: dimen.cc include/dimen.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -1168,7 +1182,7 @@ dimen.o dimen.lo: dimen.cc include/dimen.hh ../flower/include/real.hh \ include/debug.hh ../flower/include/dstream.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh -directional-spanner.o directional-spanner.lo: directional-spanner.cc \ +directional-spanner.o: directional-spanner.cc \ include/directional-spanner.hh include/spanner.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1183,9 +1197,9 @@ directional-spanner.o directional-spanner.lo: directional-spanner.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ ../flower/include/interval.hh include/drul-array.hh \ include/direction.hh include/rod.hh -dot-column-grav.o dot-column-grav.lo: dot-column-grav.cc -dot-column.o dot-column.lo: dot-column.cc include/dots.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +dot-column-grav.o: dot-column-grav.cc +dot-column.o: dot-column.cc include/dots.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -1202,7 +1216,7 @@ dot-column.o dot-column.lo: dot-column.cc include/dots.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/rhythmic-head.hh -dots.o dots.lo: dots.cc include/dots.hh include/item.hh include/boxes.hh \ +dots.o: dots.cc include/dots.hh include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -1224,7 +1238,7 @@ dots.o dots.lo: dots.cc include/dots.hh include/item.hh include/boxes.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh -dynamic-grav.o dynamic-grav.lo: dynamic-grav.cc include/debug.hh \ +dynamic-grav.o: dynamic-grav.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1263,18 +1277,17 @@ dynamic-grav.o dynamic-grav.lo: dynamic-grav.cc include/debug.hh \ include/horizontal-vertical-group-item.hh \ include/horizontal-vertical-group-elem.hh \ include/vertical-group-elem.hh -engraver-group.o engraver-group.lo: engraver-group.cc \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/engraver-group.hh include/lily-proto.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - include/score-elem-info.hh ../flower/include/scalar.hh \ - ../flower/include/string.hh \ +engraver-group.o: engraver-group.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/engraver-group.hh \ + include/lily-proto.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh include/score-elem-info.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/engraver.hh \ @@ -1290,13 +1303,12 @@ engraver-group.o engraver-group.lo: engraver-group.cc \ include/p-score.hh include/colhpos.hh include/music-output.hh \ include/score-elem.hh ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh -engraver.o engraver.lo: engraver.cc include/music-list.hh \ - include/music.hh ../flower/include/virtual-methods.hh \ - ../lib/include/input.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/minterval.hh ../flower/include/interval.hh \ - ../flower/include/compare.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh \ +engraver.o: engraver.cc include/music-list.hh include/music.hh \ + ../flower/include/virtual-methods.hh ../lib/include/input.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/minterval.hh \ + ../flower/include/interval.hh ../flower/include/compare.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/plist.hh \ @@ -1314,7 +1326,7 @@ engraver.o engraver.lo: engraver.cc include/music-list.hh \ ../flower/include/parray.hh include/engraver-group.hh \ include/translator-group.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -general-script-def.o general-script-def.lo: general-script-def.cc \ +general-script-def.o: general-script-def.cc \ include/general-script-def.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../lib/include/input.hh \ @@ -1326,9 +1338,8 @@ general-script-def.o general-script-def.lo: general-script-def.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ ../lib/include/warn.hh include/atom.hh include/boxes.hh \ ../flower/include/interval.hh include/offset.hh include/axes.hh -global-translator.o global-translator.lo: global-translator.cc \ - include/global-translator.hh include/translator-group.hh \ - ../flower/include/string.hh \ +global-translator.o: global-translator.cc include/global-translator.hh \ + include/translator-group.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1344,21 +1355,21 @@ global-translator.o global-translator.lo: global-translator.cc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/rational.hh ../flower/include/pqueue.hh -gourlay-breaking.o gourlay-breaking.lo: gourlay-breaking.cc \ - include/gourlay-breaking.hh include/break.hh \ - ../flower/include/varray.hh ../flower/include/interval.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/compare.hh include/lily-proto.hh \ - ../lib/include/proto.hh include/colhpos.hh \ - include/spring-spacer.hh include/line-spacer.hh \ - ../flower/include/vector.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/col-info.hh \ - ../flower/include/pointer.hh ../flower/include/assoc.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +gourlay-breaking.o: gourlay-breaking.cc include/gourlay-breaking.hh \ + include/break.hh ../flower/include/varray.hh \ + ../flower/include/interval.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/compare.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + include/colhpos.hh include/spring-spacer.hh \ + include/line-spacer.hh ../flower/include/vector.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/col-info.hh ../flower/include/pointer.hh \ + ../flower/include/assoc.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -1374,9 +1385,8 @@ gourlay-breaking.o gourlay-breaking.lo: gourlay-breaking.cc \ include/direction.hh include/rod.hh include/p-score.hh \ include/music-output.hh include/paper-def.hh \ include/music-output-def.hh ../flower/include/dictionary.hh -graphical-element.o graphical-element.lo: graphical-element.cc \ - include/graphical-element.hh include/offset.hh \ - ../flower/include/real.hh include/axes.hh \ +graphical-element.o: graphical-element.cc include/graphical-element.hh \ + include/offset.hh ../flower/include/real.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -1389,8 +1399,8 @@ graphical-element.o graphical-element.lo: graphical-element.cc \ ../flower/include/directed-graph.hh \ include/axis-group-administration.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -grouping.o grouping.lo: grouping.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +grouping.o: grouping.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1399,11 +1409,11 @@ grouping.o grouping.lo: grouping.cc include/debug.hh \ ../lib/include/warn.hh include/grouping.hh include/minterval.hh \ ../flower/include/interval.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/varray.hh -head-grav.o head-grav.lo: head-grav.cc include/note-head.hh \ - include/rhythmic-head.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +head-grav.o: head-grav.cc include/note-head.hh include/rhythmic-head.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -1427,7 +1437,7 @@ head-grav.o head-grav.lo: head-grav.cc include/note-head.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/musical-request.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/dots.hh -header.o header.lo: header.cc ../flower/include/string.hh \ +header.o: header.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1436,9 +1446,9 @@ header.o header.lo: header.cc ../flower/include/string.hh \ ../flower/include/assoc-iter.hh ../flower/include/assoc.hh \ ../flower/include/varray.hh ../flower/include/dictionary.hh \ include/header.hh -horizontal-align-item.o horizontal-align-item.lo: \ - horizontal-align-item.cc include/horizontal-align-item.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +horizontal-align-item.o: horizontal-align-item.cc \ + include/horizontal-align-item.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -1452,10 +1462,10 @@ horizontal-align-item.o horizontal-align-item.lo: \ ../lib/include/proto.hh include/drul-array.hh \ include/direction.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -horizontal-group-elem.o horizontal-group-elem.lo: \ - horizontal-group-elem.cc include/horizontal-group-elem.hh \ - include/axis-group-element.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +horizontal-group-elem.o: horizontal-group-elem.cc \ + include/horizontal-group-elem.hh include/axis-group-element.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -1470,8 +1480,7 @@ horizontal-group-elem.o horizontal-group-elem.lo: \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -horizontal-group-item.o horizontal-group-item.lo: \ - horizontal-group-item.cc include/p-col.hh \ +horizontal-group-item.o: horizontal-group-item.cc include/p-col.hh \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -1494,8 +1503,7 @@ horizontal-group-item.o horizontal-group-item.lo: \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/rod.hh -horizontal-vertical-group-elem.o horizontal-vertical-group-elem.lo: \ - horizontal-vertical-group-elem.cc \ +horizontal-vertical-group-elem.o: horizontal-vertical-group-elem.cc \ include/horizontal-vertical-group-elem.hh \ include/vertical-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -1515,8 +1523,7 @@ horizontal-vertical-group-elem.o horizontal-vertical-group-elem.lo: \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \ - horizontal-vertical-group-item.cc \ +horizontal-vertical-group-item.o: horizontal-vertical-group-item.cc \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -1542,7 +1549,7 @@ horizontal-vertical-group-item.o horizontal-vertical-group-item.lo: \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/rod.hh -idealspacing.o idealspacing.lo: idealspacing.cc include/idealspacing.hh \ +idealspacing.o: idealspacing.cc include/idealspacing.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/p-col.hh include/horizontal-group-item.hh \ @@ -1567,10 +1574,9 @@ idealspacing.o idealspacing.lo: idealspacing.cc include/idealspacing.hh \ ../flower/include/plist.icc include/rod.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -identifier.o identifier.lo: identifier.cc include/midi-def.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/string.hh \ +identifier.o: identifier.cc include/midi-def.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1595,8 +1601,8 @@ identifier.o identifier.lo: identifier.cc include/midi-def.hh \ include/direction.hh include/script-def.hh \ include/general-script-def.hh include/request.hh \ include/music.hh include/minterval.hh include/translator.hh -includable-lexer.o includable-lexer.lo: includable-lexer.cc \ - include/includable-lexer.hh ../flower/include/string.hh \ +includable-lexer.o: includable-lexer.cc include/includable-lexer.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1608,7 +1614,7 @@ includable-lexer.o includable-lexer.lo: includable-lexer.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -ineq-constrained-qp.o ineq-constrained-qp.lo: ineq-constrained-qp.cc \ +ineq-constrained-qp.o: ineq-constrained-qp.cc \ include/ineq-constrained-qp.hh ../flower/include/matrix.hh \ ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ ../flower/include/real.hh ../flower/include/virtual-methods.hh \ @@ -1620,7 +1626,7 @@ ineq-constrained-qp.o ineq-constrained-qp.lo: ineq-constrained-qp.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh ../flower/include/choleski.hh -item.o item.lo: item.cc include/p-score.hh include/colhpos.hh \ +item.o: item.cc include/p-score.hh include/colhpos.hh \ ../flower/include/varray.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/parray.hh \ @@ -1645,11 +1651,11 @@ item.o item.lo: item.cc include/p-score.hh include/colhpos.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/rod.hh include/spanner.hh -key-grav.o key-grav.lo: key-grav.cc include/key-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +key-grav.o: key-grav.cc include/key-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1669,7 +1675,7 @@ key-grav.o key-grav.lo: key-grav.cc include/key-grav.hh \ ../lib/include/plet.hh include/local-key-grav.hh \ include/musical-request.hh include/local-key-item.hh \ include/bar.hh include/time-description.hh -key-item.o key-item.lo: key-item.cc include/key-item.hh include/item.hh \ +key-item.o: key-item.cc include/key-item.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ @@ -1698,12 +1704,11 @@ key-item.o key-item.lo: key-item.cc include/key-item.hh include/item.hh \ include/music.hh include/minterval.hh \ include/score-elem-info.hh include/staff-info.hh \ include/translator.hh -key-performer.o key-performer.lo: key-performer.cc \ - include/key-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/performer.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +key-performer.o: key-performer.cc include/key-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1717,7 +1722,7 @@ key-performer.o key-performer.lo: key-performer.cc \ ../flower/include/parray.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh -key.o key.lo: key.cc include/key.hh ../flower/include/varray.hh \ +key.o: key.cc include/key.hh ../flower/include/varray.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1726,15 +1731,15 @@ key.o key.lo: key.cc include/key.hh ../flower/include/varray.hh \ include/debug.hh ../flower/include/dstream.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh -keyword.o keyword.lo: keyword.cc include/keyword.hh -leastsquares.o leastsquares.lo: leastsquares.cc include/leastsquares.hh \ +keyword.o: keyword.cc include/keyword.hh +leastsquares.o: leastsquares.cc include/leastsquares.hh \ ../flower/include/varray.hh include/offset.hh \ ../flower/include/real.hh include/axes.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \ +lexer.o: lexer.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -1748,7 +1753,7 @@ lexer.o lexer.lo: lexer.cc ../flower/include/string.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/parseconstruct.hh include/main.hh include/identifier.hh \ ../lib/include/input.hh ../flower/include/virtual-methods.hh -lexerinit.o lexerinit.lo: lexerinit.cc ../lib/include/proto.hh \ +lexerinit.o: lexerinit.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -1766,9 +1771,9 @@ lexerinit.o lexerinit.lo: lexerinit.cc ../lib/include/proto.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh include/main.hh \ ../lib/include/source-file.hh ../lib/include/source.hh -lily-version.o lily-version.lo: lily-version.cc ../flower/config.hh -line-group-grav.o line-group-grav.lo: line-group-grav.cc \ - include/staff-sym.hh include/spanner.hh include/lily-proto.hh \ +lily-version.o: lily-version.cc ../flower/config.hh +line-group-grav.o: line-group-grav.cc include/staff-sym.hh \ + include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ @@ -1803,17 +1808,16 @@ line-group-grav.o line-group-grav.lo: line-group-grav.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -line-spacer.o line-spacer.lo: line-spacer.cc include/line-spacer.hh \ +line-spacer.o: line-spacer.cc include/line-spacer.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/varray.hh ../flower/include/vector.hh \ ../flower/include/interval.hh ../flower/include/compare.hh -linear-programming.o linear-programming.lo: linear-programming.cc -local-key-grav.o local-key-grav.lo: local-key-grav.cc \ - include/musical-request.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/request.hh \ - ../flower/include/string.hh \ +linear-programming.o: linear-programming.cc +local-key-grav.o: local-key-grav.cc include/musical-request.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1844,7 +1848,7 @@ local-key-grav.o local-key-grav.lo: local-key-grav.cc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/translator-group.hh -local-key-item.o local-key-item.lo: local-key-item.cc include/dimen.hh \ +local-key-item.o: local-key-item.cc include/dimen.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -1872,7 +1876,7 @@ local-key-item.o local-key-item.lo: local-key-item.cc include/dimen.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/note-head.hh include/rhythmic-head.hh include/misc.hh \ include/grouping.hh -lookup.o lookup.lo: lookup.cc include/lookup.hh include/atom.hh \ +lookup.o: lookup.cc include/lookup.hh include/atom.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -1894,7 +1898,7 @@ lookup.o lookup.lo: lookup.cc include/lookup.hh include/atom.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/main.hh -lyric-grav.o lyric-grav.lo: lyric-grav.cc include/lyric-engraver.hh \ +lyric-grav.o: lyric-grav.cc include/lyric-engraver.hh \ include/engraver.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -1923,14 +1927,13 @@ lyric-grav.o lyric-grav.lo: lyric-grav.cc include/lyric-engraver.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/lookup.hh include/atom.hh -lyric-performer.o lyric-performer.lo: lyric-performer.cc \ - include/lyric-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/performer.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ - ../flower/include/arithmetic-operator.hh \ - ../flower/include/string-handle.hh \ +lyric-performer.o: lyric-performer.cc include/lyric-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ + ../flower/include/arithmetic-operator.hh \ + ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ @@ -1943,15 +1946,15 @@ lyric-performer.o lyric-performer.lo: lyric-performer.cc \ include/general-script-def.hh include/musical-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh -main.o main.lo: main.cc ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/lgetopt.hh \ - include/misc.hh include/lily-proto.hh ../lib/include/moment.hh \ +main.o: main.cc ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/lgetopt.hh include/misc.hh \ + include/lily-proto.hh ../lib/include/moment.hh \ ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ @@ -1964,11 +1967,11 @@ main.o main.lo: main.cc ../lib/include/proto.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/my-lily-parser.hh ../lib/include/duration.hh \ ../lib/include/plet.hh ../lib/include/input.hh -meter-grav.o meter-grav.lo: meter-grav.cc include/meter-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +meter-grav.o: meter-grav.cc include/meter-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -1993,12 +1996,11 @@ meter-grav.o meter-grav.lo: meter-grav.cc include/meter-grav.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/translator-group.hh -meter-performer.o meter-performer.lo: meter-performer.cc \ - include/meter-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/performer.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +meter-performer.o: meter-performer.cc include/meter-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/performer.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2012,7 +2014,7 @@ meter-performer.o meter-performer.lo: meter-performer.cc \ ../flower/include/parray.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh -meter.o meter.lo: meter.cc ../flower/include/scalar.hh \ +meter.o: meter.cc ../flower/include/scalar.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2036,11 +2038,10 @@ meter.o meter.lo: meter.cc ../flower/include/scalar.hh \ ../flower/include/rational.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh include/atom.hh -midi-def.o midi-def.lo: midi-def.cc include/misc.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +midi-def.o: midi-def.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -2064,7 +2065,7 @@ midi-def.o midi-def.lo: midi-def.cc include/misc.hh \ include/translator-group.hh include/global-translator.hh \ ../flower/include/pqueue.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -midi-item.o midi-item.lo: midi-item.cc ../lib/include/proto.hh \ +midi-item.o: midi-item.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -2087,7 +2088,7 @@ midi-item.o midi-item.lo: midi-item.cc ../lib/include/proto.hh \ include/musical-request.hh include/midi-item.hh \ include/midi-stream.hh include/audio-item.hh \ include/audio-element.hh -midi-stream.o midi-stream.lo: midi-stream.cc ../flower/include/string.hh \ +midi-stream.o: midi-stream.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2106,7 +2107,7 @@ midi-stream.o midi-stream.lo: midi-stream.cc ../flower/include/string.hh \ ../flower/include/virtual-methods.hh include/midi-stream.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -midi-walker.o midi-walker.lo: midi-walker.cc include/midi-walker.hh \ +midi-walker.o: midi-walker.cc include/midi-walker.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -2124,7 +2125,7 @@ midi-walker.o midi-walker.lo: midi-walker.cc include/midi-walker.hh \ ../flower/include/virtual-methods.hh include/audio-staff.hh \ include/midi-item.hh include/midi-stream.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -misc.o misc.lo: misc.cc include/item.hh include/boxes.hh \ +misc.o: misc.cc include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -2139,7 +2140,7 @@ misc.o misc.lo: misc.cc include/item.hh include/boxes.hh \ include/direction.hh include/misc.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/scalar.hh \ include/grouping.hh include/minterval.hh -molecule.o molecule.lo: molecule.cc ../flower/include/interval.hh \ +molecule.o: molecule.cc ../flower/include/interval.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/compare.hh include/dimen.hh \ ../flower/include/string.hh \ @@ -2156,7 +2157,7 @@ molecule.o molecule.lo: molecule.cc ../flower/include/interval.hh \ include/direction.hh include/atom.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/tex.hh ../flower/include/scalar.hh -music-iterator.o music-iterator.lo: music-iterator.cc include/debug.hh \ +music-iterator.o: music-iterator.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2180,7 +2181,7 @@ music-iterator.o music-iterator.lo: music-iterator.cc include/debug.hh \ ../flower/include/assoc.hh ../flower/include/parray.hh \ include/translation-property.hh include/change-iterator.hh \ include/change-translator.hh -music-list.o music-list.lo: music-list.cc include/music.hh \ +music-list.o: music-list.cc include/music.hh \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/minterval.hh \ @@ -2196,9 +2197,8 @@ music-list.o music-list.lo: music-list.cc include/music.hh \ ../flower/include/link.icc ../flower/include/pcursor.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc -music-output-def.o music-output-def.lo: music-output-def.cc \ - include/debug.hh ../flower/include/dstream.hh \ - ../flower/include/string.hh \ +music-output-def.o: music-output-def.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2218,12 +2218,12 @@ music-output-def.o music-output-def.lo: music-output-def.cc \ ../flower/include/rational.hh ../flower/include/pqueue.hh \ ../flower/include/dictionary-iter.hh \ ../flower/include/assoc-iter.hh -music.o music.lo: music.cc include/music.hh \ - ../flower/include/virtual-methods.hh ../lib/include/input.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/minterval.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +music.o: music.cc include/music.hh ../flower/include/virtual-methods.hh \ + ../lib/include/input.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/minterval.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/lily-proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh include/music-list.hh \ @@ -2234,11 +2234,10 @@ music.o music.lo: music.cc include/music.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -musical-request.o musical-request.lo: musical-request.cc \ - include/musical-request.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/request.hh \ - ../flower/include/string.hh \ +musical-request.o: musical-request.cc include/musical-request.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2257,9 +2256,8 @@ musical-request.o musical-request.lo: musical-request.cc \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -my-lily-lexer.o my-lily-lexer.lo: my-lily-lexer.cc \ - include/notename-table.hh ../flower/include/pointer.hh \ - ../flower/include/string.hh \ +my-lily-lexer.o: my-lily-lexer.cc include/notename-table.hh \ + ../flower/include/pointer.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2276,12 +2274,11 @@ my-lily-lexer.o my-lily-lexer.lo: my-lily-lexer.cc \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh ../lib/include/source-file.hh \ include/parseconstruct.hh -my-lily-parser.o my-lily-parser.lo: my-lily-parser.cc \ - include/my-lily-parser.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../lib/include/duration.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +my-lily-parser.o: my-lily-parser.cc include/my-lily-parser.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../lib/include/duration.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh ../lib/include/plet.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/varray.hh \ @@ -2299,7 +2296,7 @@ my-lily-parser.o my-lily-parser.lo: my-lily-parser.cc \ include/request.hh include/direction.hh \ include/command-request.hh parser.hh include/header.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh -note-column.o note-column.lo: note-column.cc include/dot-column.hh \ +note-column.o: note-column.cc include/dot-column.hh \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -2331,11 +2328,10 @@ note-column.o note-column.lo: note-column.cc include/dot-column.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/rest.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -note-head.o note-head.lo: note-head.cc include/misc.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +note-head.o: note-head.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -2361,12 +2357,11 @@ note-head.o note-head.lo: note-head.cc include/misc.hh \ include/musical-request.hh include/request.hh \ ../lib/include/input.hh include/music.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -note-performer.o note-performer.lo: note-performer.cc \ - include/note-performer.hh include/performer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +note-performer.o: note-performer.cc include/note-performer.hh \ + include/performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2381,7 +2376,7 @@ note-performer.o note-performer.lo: note-performer.cc \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/audio-item.hh include/audio-element.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -note.o note.lo: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ +note.o: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ ../flower/include/string.hh \ @@ -2404,9 +2399,8 @@ note.o note.lo: note.cc include/my-lily-lexer.hh include/lily-proto.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/identifier.hh include/text-def.hh \ include/general-script-def.hh include/parseconstruct.hh -notename-table.o notename-table.lo: notename-table.cc \ - include/notename-table.hh ../flower/include/pointer.hh \ - ../flower/include/string.hh \ +notename-table.o: notename-table.cc include/notename-table.hh \ + ../flower/include/pointer.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2420,16 +2414,16 @@ notename-table.o notename-table.lo: notename-table.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -offset.o offset.lo: offset.cc ../flower/include/string.hh \ +offset.o: offset.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh -outputter.o outputter.lo: outputter.cc include/outputter.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/tex-stream.hh ../flower/include/string.hh \ +outputter.o: outputter.cc include/outputter.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/tex-stream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2442,8 +2436,7 @@ outputter.o outputter.lo: outputter.cc include/outputter.hh \ ../flower/include/interval.hh include/offset.hh include/axes.hh \ include/direction.hh ../flower/include/varray.hh \ include/dimen.hh include/tex.hh ../flower/include/scalar.hh -p-col.o p-col.lo: p-col.cc include/p-col.hh \ - include/horizontal-group-item.hh \ +p-col.o: p-col.cc include/p-col.hh include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -2467,7 +2460,7 @@ p-col.o p-col.lo: p-col.cc include/p-col.hh \ ../flower/include/plist.icc include/rod.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -p-score.o p-score.lo: p-score.cc include/main.hh include/lily-proto.hh \ +p-score.o: p-score.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/super-elem.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -2501,7 +2494,7 @@ p-score.o p-score.lo: p-score.cc include/main.hh include/lily-proto.hh \ include/break.hh include/gourlay-breaking.hh \ include/outputter.hh ../flower/include/list.tcc \ ../flower/include/cursor.tcc -paper-def.o paper-def.lo: paper-def.cc ../flower/include/string.hh \ +paper-def.o: paper-def.cc ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2530,7 +2523,7 @@ paper-def.o paper-def.lo: paper-def.cc ../flower/include/string.hh \ include/translator-group.hh include/global-translator.hh \ ../flower/include/pqueue.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh include/main.hh -parser.o parser.lo: parser.cc ../flower/include/scalar.hh \ +parser.o: parser.cc ../flower/include/scalar.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2565,7 +2558,7 @@ parser.o parser.lo: parser.cc ../flower/include/scalar.hh \ ../flower/include/parray.hh include/score.hh \ include/music-list.hh include/header.hh \ ../lib/include/duration-convert.hh include/change-translator.hh -performance.o performance.lo: performance.cc include/debug.hh \ +performance.o: performance.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2587,8 +2580,7 @@ performance.o performance.lo: performance.cc include/debug.hh \ include/audio-element.hh include/performance.hh \ include/music-output.hh include/score.hh \ ../lib/include/input.hh ../flower/include/parray.hh -performer-group-performer.o performer-group-performer.lo: \ - performer-group-performer.cc \ +performer-group-performer.o: performer-group-performer.cc \ include/performer-group-performer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/parray.hh \ @@ -2612,18 +2604,17 @@ performer-group-performer.o performer-group-performer.lo: \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/translator-group.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -performer.o performer.lo: performer.cc \ - include/performer-group-performer.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/performer.hh include/request.hh \ - ../flower/include/string.hh \ +performer.o: performer.cc include/performer-group-performer.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/performer.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/moment.hh \ @@ -2636,12 +2627,11 @@ performer.o performer.lo: performer.cc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/translator-group.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -pitch-squash-grav.o pitch-squash-grav.lo: pitch-squash-grav.cc \ - include/pitch-squash-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +pitch-squash-grav.o: pitch-squash-grav.cc include/pitch-squash-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2657,11 +2647,10 @@ pitch-squash-grav.o pitch-squash-grav.lo: pitch-squash-grav.cc \ include/offset.hh include/axes.hh include/score-elem.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/drul-array.hh -plet-engraver.o plet-engraver.lo: plet-engraver.cc \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/musical-request.hh \ - include/lily-proto.hh include/request.hh \ - ../flower/include/string.hh \ +plet-engraver.o: plet-engraver.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/musical-request.hh include/lily-proto.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2692,7 +2681,7 @@ plet-engraver.o plet-engraver.lo: plet-engraver.cc \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/stem.hh \ include/molecule.hh -plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.hh \ +plet-spanner.o: plet-spanner.cc include/atom.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2725,11 +2714,11 @@ plet-spanner.o plet-spanner.lo: plet-spanner.cc include/atom.hh \ include/directional-spanner.hh include/spanner.hh \ include/stem.hh include/text-def.hh \ include/general-script-def.hh ../lib/include/input.hh -plet-swallow-engraver.o plet-swallow-engraver.lo: \ - plet-swallow-engraver.cc include/musical-request.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/request.hh ../flower/include/string.hh \ +plet-swallow-engraver.o: plet-swallow-engraver.cc \ + include/musical-request.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2744,11 +2733,11 @@ plet-swallow-engraver.o plet-swallow-engraver.lo: \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -priority-halign-grav.o priority-halign-grav.lo: priority-halign-grav.cc \ - include/bar.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +priority-halign-grav.o: priority-halign-grav.cc include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -2767,17 +2756,17 @@ priority-halign-grav.o priority-halign-grav.lo: priority-halign-grav.cc \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/score-priority-grav.hh -property-iterator.o property-iterator.lo: property-iterator.cc \ - include/property-iterator.hh include/music-iterator.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/varray.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +property-iterator.o: property-iterator.cc include/property-iterator.hh \ + include/music-iterator.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/varray.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/virtual-methods.hh \ include/translation-property.hh include/music.hh \ @@ -2788,7 +2777,7 @@ property-iterator.o property-iterator.lo: property-iterator.cc \ include/translator-group.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -ps-plet.o ps-plet.lo: ps-plet.cc include/main.hh include/lily-proto.hh \ +ps-plet.o: ps-plet.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/misc.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ @@ -2812,7 +2801,7 @@ ps-plet.o ps-plet.lo: ps-plet.cc include/main.hh include/lily-proto.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/string-convert.hh -qlp.o qlp.lo: qlp.cc include/debug.hh ../flower/include/dstream.hh \ +qlp.o: qlp.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2824,7 +2813,7 @@ qlp.o qlp.lo: qlp.cc include/debug.hh ../flower/include/dstream.hh \ ../flower/include/matrix-storage.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/vector.hh -qlpsolve.o qlpsolve.lo: qlpsolve.cc include/ineq-constrained-qp.hh \ +qlpsolve.o: qlpsolve.cc include/ineq-constrained-qp.hh \ ../flower/include/matrix.hh ../flower/include/matrix-storage.hh \ ../flower/include/varray.hh ../flower/include/real.hh \ ../flower/include/virtual-methods.hh \ @@ -2836,8 +2825,8 @@ qlpsolve.o qlpsolve.lo: qlpsolve.cc include/ineq-constrained-qp.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../lib/include/warn.hh ../flower/include/choleski.hh -request-iterator.o request-iterator.lo: request-iterator.cc \ - include/translator-group.hh ../flower/include/string.hh \ +request-iterator.o: request-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2859,8 +2848,7 @@ request-iterator.o request-iterator.lo: request-iterator.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/request.hh \ include/direction.hh -request.o request.lo: request.cc include/request.hh \ - ../flower/include/string.hh \ +request.o: request.cc include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2871,9 +2859,8 @@ request.o request.lo: request.cc include/request.hh \ ../flower/include/interval.hh include/lily-proto.hh \ include/direction.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -rest-collision-grav.o rest-collision-grav.lo: rest-collision-grav.cc \ - include/debug.hh ../flower/include/dstream.hh \ - ../flower/include/string.hh \ +rest-collision-grav.o: rest-collision-grav.cc include/debug.hh \ + ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -2899,7 +2886,7 @@ rest-collision-grav.o rest-collision-grav.lo: rest-collision-grav.cc \ include/horizontal-vertical-group-elem.hh \ include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/note-column.hh include/script-column.hh -rest-collision.o rest-collision.lo: rest-collision.cc include/debug.hh \ +rest-collision.o: rest-collision.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -2931,11 +2918,11 @@ rest-collision.o rest-collision.lo: rest-collision.cc include/debug.hh \ include/collision.hh include/paper-def.hh \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh -rest-grav.o rest-grav.lo: rest-grav.cc include/rest-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +rest-grav.o: rest-grav.cc include/rest-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -2953,7 +2940,7 @@ rest-grav.o rest-grav.lo: rest-grav.cc include/rest-grav.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/drul-array.hh \ include/rest.hh include/rhythmic-head.hh -rest.o rest.lo: rest.cc include/molecule.hh include/lily-proto.hh \ +rest.o: rest.cc include/molecule.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -2979,7 +2966,7 @@ rest.o rest.lo: rest.cc include/molecule.hh include/lily-proto.hh \ include/dots.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh -rhythmic-column-grav.o rhythmic-column-grav.lo: rhythmic-column-grav.cc \ +rhythmic-column-grav.o: rhythmic-column-grav.cc \ include/rhythmic-column-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -3014,11 +3001,11 @@ rhythmic-column-grav.o rhythmic-column-grav.lo: rhythmic-column-grav.cc \ include/vertical-group-elem.hh include/horizontal-group-elem.hh \ include/script.hh include/staff-side.hh include/dot-column.hh \ include/horizontal-group-item.hh -rhythmic-head.o rhythmic-head.lo: rhythmic-head.cc \ - include/rhythmic-head.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +rhythmic-head.o: rhythmic-head.cc include/rhythmic-head.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -3042,7 +3029,7 @@ rhythmic-head.o rhythmic-head.lo: rhythmic-head.cc \ include/axis-group-element.hh \ include/axis-group-administration.hh include/p-score.hh \ include/colhpos.hh include/music-output.hh -rod.o rod.lo: rod.cc include/rod.hh include/lily-proto.hh \ +rod.o: rod.cc include/rod.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/direction.hh \ include/drul-array.hh include/p-col.hh \ @@ -3067,11 +3054,11 @@ rod.o rod.lo: rod.cc include/rod.hh include/lily-proto.hh \ ../flower/include/plist.icc include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/single-malt-grouping-item.hh -score-bar.o score-bar.lo: score-bar.cc include/score-bar.hh \ - include/bar.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +score-bar.o: score-bar.cc include/score-bar.hh include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -3081,7 +3068,7 @@ score-bar.o score-bar.lo: score-bar.cc include/score-bar.hh \ include/graphical-element.hh include/lily-proto.hh \ ../lib/include/proto.hh include/drul-array.hh \ include/direction.hh -score-column.o score-column.lo: score-column.cc include/debug.hh \ +score-column.o: score-column.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -3107,9 +3094,8 @@ score-column.o score-column.lo: score-column.cc include/debug.hh \ ../flower/include/plist.icc include/rod.hh \ include/score-column.hh ../lib/include/moment.hh \ ../flower/include/rational.hh -score-elem-info.o score-elem-info.lo: score-elem-info.cc \ - include/score-elem-info.hh ../flower/include/scalar.hh \ - ../flower/include/string.hh \ +score-elem-info.o: score-elem-info.cc include/score-elem-info.hh \ + ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3120,10 +3106,9 @@ score-elem-info.o score-elem-info.lo: score-elem-info.cc \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh -score-elem.o score-elem.lo: score-elem.cc include/outputter.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/p-score.hh include/colhpos.hh \ +score-elem.o: score-elem.cc include/outputter.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/p-score.hh include/colhpos.hh \ ../flower/include/varray.hh ../flower/include/parray.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3151,9 +3136,8 @@ score-elem.o score-elem.lo: score-elem.cc include/outputter.hh \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh -score-grav.o score-grav.lo: score-grav.cc include/super-elem.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +score-grav.o: score-grav.cc include/super-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -3189,18 +3173,18 @@ score-grav.o score-grav.lo: score-grav.cc include/super-elem.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/command-request.hh include/paper-def.hh \ include/music-output-def.hh -score-performer.o score-performer.lo: score-performer.cc \ - include/score-performer.hh include/performer-group-performer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/performer.hh \ - include/request.hh ../flower/include/string.hh \ +score-performer.o: score-performer.cc include/score-performer.hh \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/moment.hh \ @@ -3221,7 +3205,7 @@ score-performer.o score-performer.lo: score-performer.cc \ ../lib/include/warn.hh include/score.hh \ ../lib/include/source-file.hh ../lib/include/source.hh \ include/audio-staff.hh -score-priority-grav.o score-priority-grav.lo: score-priority-grav.cc \ +score-priority-grav.o: score-priority-grav.cc \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -3247,7 +3231,7 @@ score-priority-grav.o score-priority-grav.lo: score-priority-grav.cc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/assoc-iter.hh include/break-align-item.hh \ include/horizontal-align-item.hh -score.o score.lo: score.cc include/score.hh ../flower/include/varray.hh \ +score.o: score.cc include/score.hh ../flower/include/varray.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -3273,12 +3257,11 @@ score.o score.lo: score.cc include/score.hh ../flower/include/varray.hh \ ../flower/include/scalar.hh ../flower/include/pqueue.hh \ include/header.hh ../flower/include/cpu-timer.hh \ include/main.hh include/paper-def.hh -scoreline.o scoreline.lo: scoreline.cc include/scoreline.hh \ - include/colhpos.hh ../flower/include/varray.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/spanner.hh include/score-elem.hh \ - ../flower/include/parray.hh \ +scoreline.o: scoreline.cc include/scoreline.hh include/colhpos.hh \ + ../flower/include/varray.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/spanner.hh \ + include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -3301,7 +3284,7 @@ scoreline.o scoreline.lo: scoreline.cc include/scoreline.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/p-score.hh include/music-output.hh -scores.o scores.lo: scores.cc include/main.hh include/lily-proto.hh \ +scores.o: scores.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score.hh \ ../flower/include/varray.hh ../flower/include/plist.hh \ @@ -3321,8 +3304,7 @@ scores.o scores.lo: scores.cc include/main.hh include/lily-proto.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/header.hh include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -script-column.o script-column.lo: script-column.cc \ - include/script-column.hh \ +script-column.o: script-column.cc include/script-column.hh \ include/horizontal-vertical-group-item.hh \ include/axis-group-item.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ @@ -3352,7 +3334,7 @@ script-column.o script-column.lo: script-column.cc \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/general-script-def.hh \ ../lib/include/input.hh -script-def.o script-def.lo: script-def.cc include/debug.hh \ +script-def.o: script-def.cc include/debug.hh \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -3373,11 +3355,11 @@ script-def.o script-def.lo: script-def.cc include/debug.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh ../flower/include/scalar.hh -script-grav.o script-grav.lo: script-grav.cc include/script-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +script-grav.o: script-grav.cc include/script-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3402,8 +3384,7 @@ script-grav.o script-grav.lo: script-grav.cc include/script-grav.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/staff-sym.hh include/spanner.hh include/rod.hh \ include/general-script-def.hh -script.o script.lo: script.cc include/script-def.hh \ - ../flower/include/string.hh \ +script.o: script.cc include/script-def.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3429,8 +3410,8 @@ script.o script.lo: script.cc include/script-def.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/stem.hh include/molecule.hh include/lookup.hh \ include/atom.hh ../flower/include/scalar.hh -separating-group-spanner.o separating-group-spanner.lo: \ - separating-group-spanner.cc include/separating-group-spanner.hh \ +separating-group-spanner.o: separating-group-spanner.cc \ + include/separating-group-spanner.hh \ include/vertical-group-spanner.hh include/axis-group-spanner.hh \ include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -3457,8 +3438,7 @@ separating-group-spanner.o separating-group-spanner.lo: \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -separating-line-group-grav.o separating-line-group-grav.lo: \ - separating-line-group-grav.cc \ +separating-line-group-grav.o: separating-line-group-grav.cc \ include/separating-line-group-grav.hh \ include/line-group-grav.hh include/engraver.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -3493,8 +3473,7 @@ separating-line-group-grav.o separating-line-group-grav.lo: \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -single-malt-grouping-item.o single-malt-grouping-item.lo: \ - single-malt-grouping-item.cc \ +single-malt-grouping-item.o: single-malt-grouping-item.cc \ include/single-malt-grouping-item.hh include/item.hh \ include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ @@ -3519,7 +3498,7 @@ single-malt-grouping-item.o single-malt-grouping-item.lo: \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/rod.hh include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -slur-grav.o slur-grav.lo: slur-grav.cc ../lib/include/proto.hh \ +slur-grav.o: slur-grav.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3555,7 +3534,7 @@ slur-grav.o slur-grav.lo: slur-grav.cc ../lib/include/proto.hh \ include/axis-group-administration.hh \ include/horizontal-vertical-group-elem.hh \ include/vertical-group-elem.hh include/horizontal-group-elem.hh -slur.o slur.lo: slur.cc include/slur.hh include/directional-spanner.hh \ +slur.o: slur.cc include/slur.hh include/directional-spanner.hh \ include/spanner.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh include/score-elem.hh \ @@ -3588,11 +3567,11 @@ slur.o slur.lo: slur.cc include/slur.hh include/directional-spanner.hh \ include/horizontal-group-item.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/bezier.hh -span-bar-grav.o span-bar-grav.lo: span-bar-grav.cc include/span-bar.hh \ - include/bar.hh include/item.hh include/boxes.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - include/offset.hh include/axes.hh ../flower/include/string.hh \ +span-bar-grav.o: span-bar-grav.cc include/span-bar.hh include/bar.hh \ + include/item.hh include/boxes.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh include/offset.hh include/axes.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/score-elem.hh \ @@ -3610,8 +3589,8 @@ span-bar-grav.o span-bar-grav.lo: span-bar-grav.cc include/span-bar.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/vertical-align-spanner.hh include/spanner.hh \ include/rod.hh include/vertical-align-elem.hh -span-bar.o span-bar.lo: span-bar.cc include/dimen.hh \ - ../flower/include/real.hh ../flower/include/string.hh \ +span-bar.o: span-bar.cc include/dimen.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3634,9 +3613,9 @@ span-bar.o span-bar.lo: span-bar.cc include/dimen.hh \ ../flower/include/plist.icc ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/molecule.hh \ include/vertical-align-elem.hh -span-score-bar-grav.o span-score-bar-grav.lo: span-score-bar-grav.cc \ - include/span-score-bar.hh include/span-bar.hh include/bar.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +span-score-bar-grav.o: span-score-bar-grav.cc include/span-score-bar.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -3656,9 +3635,9 @@ span-score-bar-grav.o span-score-bar-grav.lo: span-score-bar-grav.cc \ include/score-elem-info.hh ../flower/include/scalar.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh -span-score-bar.o span-score-bar.lo: span-score-bar.cc \ - include/span-score-bar.hh include/span-bar.hh include/bar.hh \ - include/item.hh include/boxes.hh ../flower/include/fproto.hh \ +span-score-bar.o: span-score-bar.cc include/span-score-bar.hh \ + include/span-bar.hh include/bar.hh include/item.hh \ + include/boxes.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/interval.hh \ ../flower/include/compare.hh include/offset.hh include/axes.hh \ ../flower/include/string.hh \ @@ -3680,8 +3659,8 @@ span-score-bar.o span-score-bar.lo: span-score-bar.cc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh ../flower/include/scalar.hh -spanner.o spanner.lo: spanner.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +spanner.o: spanner.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -3704,20 +3683,20 @@ spanner.o spanner.lo: spanner.cc include/debug.hh \ ../flower/include/cursor.icc ../flower/include/iterate.hh \ ../flower/include/plist.icc include/p-score.hh \ include/colhpos.hh include/music-output.hh include/outputter.hh -spring-spacer.o spring-spacer.lo: spring-spacer.cc \ - include/spring-spacer.hh include/line-spacer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh ../flower/include/vector.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/col-info.hh ../flower/include/pointer.hh \ - ../flower/include/assoc.hh include/colhpos.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ +spring-spacer.o: spring-spacer.cc include/spring-spacer.hh \ + include/line-spacer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/vector.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/col-info.hh \ + ../flower/include/pointer.hh ../flower/include/assoc.hh \ + include/colhpos.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh include/p-col.hh \ include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ @@ -3738,7 +3717,7 @@ spring-spacer.o spring-spacer.lo: spring-spacer.cc \ include/paper-def.hh include/music-output-def.hh \ ../flower/include/dictionary.hh include/dimen.hh \ include/main.hh -staff-info.o staff-info.lo: staff-info.cc ../lib/include/proto.hh \ +staff-info.o: staff-info.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -3762,18 +3741,18 @@ staff-info.o staff-info.lo: staff-info.cc ../lib/include/proto.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh include/drul-array.hh \ include/direction.hh include/rod.hh -staff-performer.o staff-performer.lo: staff-performer.cc \ - include/staff-performer.hh include/performer-group-performer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/performer.hh \ - include/request.hh ../flower/include/string.hh \ +staff-performer.o: staff-performer.cc include/staff-performer.hh \ + include/performer-group-performer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/performer.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/moment.hh \ @@ -3788,7 +3767,7 @@ staff-performer.o staff-performer.lo: staff-performer.cc \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/audio-column.hh include/audio-item.hh \ include/audio-element.hh include/audio-staff.hh -staff-side.o staff-side.lo: staff-side.cc ../flower/include/interval.hh \ +staff-side.o: staff-side.cc ../flower/include/interval.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/compare.hh include/paper-def.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -3810,12 +3789,11 @@ staff-side.o staff-side.lo: staff-side.cc ../flower/include/interval.hh \ include/direction.hh include/staff-sym.hh include/spanner.hh \ include/drul-array.hh include/rod.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -staff-sym-grav.o staff-sym-grav.lo: staff-sym-grav.cc \ - include/staff-sym-grav.hh include/engraver.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh include/request.hh \ - ../flower/include/string.hh \ +staff-sym-grav.o: staff-sym-grav.cc include/staff-sym-grav.hh \ + include/engraver.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + include/request.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3840,11 +3818,11 @@ staff-sym-grav.o staff-sym-grav.lo: staff-sym-grav.cc \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/item.hh include/boxes.hh -staff-sym.o staff-sym.lo: staff-sym.cc include/staff-sym.hh \ - include/spanner.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +staff-sym.o: staff-sym.cc include/staff-sym.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -3866,11 +3844,11 @@ staff-sym.o staff-sym.lo: staff-sym.cc include/staff-sym.hh \ include/molecule.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ include/dimen.hh -stem-grav.o stem-grav.lo: stem-grav.cc include/stem-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +stem-grav.o: stem-grav.cc include/stem-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -3895,7 +3873,7 @@ stem-grav.o stem-grav.lo: stem-grav.cc include/stem-grav.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ ../lib/include/duration-convert.hh include/misc.hh \ include/grouping.hh include/abbrev.hh -stem-info.o stem-info.lo: stem-info.cc ../lib/include/proto.hh \ +stem-info.o: stem-info.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/dimen.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -3922,7 +3900,7 @@ stem-info.o stem-info.lo: stem-info.cc ../lib/include/proto.hh \ include/paper-def.hh include/music-output-def.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/lookup.hh include/stem-info.hh -stem.o stem.lo: stem.cc include/stem.hh include/item.hh include/boxes.hh \ +stem.o: stem.cc include/stem.hh include/item.hh include/boxes.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/interval.hh ../flower/include/compare.hh \ include/offset.hh include/axes.hh ../flower/include/string.hh \ @@ -3954,9 +3932,8 @@ stem.o stem.lo: stem.cc include/stem.hh include/item.hh include/boxes.hh \ include/minterval.hh include/beam.hh \ include/directional-spanner.hh include/spanner.hh \ include/rest.hh -super-elem.o super-elem.lo: super-elem.cc include/super-elem.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +super-elem.o: super-elem.cc include/super-elem.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh \ @@ -3975,7 +3952,7 @@ super-elem.o super-elem.lo: super-elem.cc include/super-elem.hh \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/music-output.hh include/outputter.hh -swallow-grav.o swallow-grav.lo: swallow-grav.cc include/swallow-grav.hh \ +swallow-grav.o: swallow-grav.cc include/swallow-grav.hh \ include/engraver.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -3991,7 +3968,7 @@ swallow-grav.o swallow-grav.lo: swallow-grav.cc include/swallow-grav.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -swallow-perf.o swallow-perf.lo: swallow-perf.cc include/swallow-perf.hh \ +swallow-perf.o: swallow-perf.cc include/swallow-perf.hh \ include/performer.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/varray.hh \ @@ -4007,11 +3984,10 @@ swallow-perf.o swallow-perf.lo: swallow-perf.cc include/swallow-perf.hh \ include/staff-info.hh include/translator.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/parray.hh -symtable.o symtable.lo: symtable.cc include/misc.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +symtable.o: symtable.cc include/misc.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -4023,7 +3999,7 @@ symtable.o symtable.lo: symtable.cc include/misc.hh \ include/axes.hh ../flower/include/assoc.hh \ ../flower/include/assoc-iter.hh include/symtable.hh \ ../flower/include/dictionary.hh -template1.o template1.lo: template1.cc ../lib/include/proto.hh \ +template1.o: template1.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/idealspacing.hh include/lily-proto.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -4053,19 +4029,18 @@ template1.o template1.lo: template1.cc ../lib/include/proto.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/spanner.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc -template2.o template2.lo: template2.cc include/line-spacer.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/varray.hh ../flower/include/vector.hh \ - ../flower/include/interval.hh ../flower/include/compare.hh \ - ../flower/include/pcursor.tcc ../flower/include/pcursor.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc ../flower/include/plist.tcc -template3.o template3.lo: template3.cc include/atom.hh \ - ../flower/include/string.hh \ +template2.o: template2.cc include/line-spacer.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/varray.hh \ + ../flower/include/vector.hh ../flower/include/interval.hh \ + ../flower/include/compare.hh ../flower/include/pcursor.tcc \ + ../flower/include/pcursor.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + ../flower/include/plist.tcc +template3.o: template3.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4080,7 +4055,7 @@ template3.o template3.lo: template3.cc include/atom.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/direction.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc -template4.o template4.lo: template4.cc ../lib/include/proto.hh \ +template4.o: template4.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/pcursor.hh ../flower/include/plist.hh \ ../flower/include/list.hh ../flower/include/list.icc \ @@ -4109,7 +4084,7 @@ template4.o template4.lo: template4.cc ../lib/include/proto.hh \ include/colhpos.hh include/music-output.hh \ ../flower/include/cursor.tcc ../flower/include/list.tcc \ ../flower/include/pcursor.tcc ../flower/include/plist.tcc -template5.o template5.lo: template5.cc ../lib/include/proto.hh \ +template5.o: template5.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -4118,7 +4093,7 @@ template5.o template5.lo: template5.cc ../lib/include/proto.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/interval.tcc ../flower/include/interval.hh \ ../flower/include/flower-debug.hh ../flower/include/dstream.hh -template6.o template6.lo: template6.cc ../lib/include/proto.hh \ +template6.o: template6.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/pcursor.tcc ../flower/include/pcursor.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -4135,7 +4110,7 @@ template6.o template6.lo: template6.cc ../lib/include/proto.hh \ ../flower/include/scalar.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh ../flower/include/varray.hh \ ../flower/include/parray.hh ../lib/include/input.hh -template7.o template7.lo: template7.cc ../lib/include/proto.hh \ +template7.o: template7.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/pcursor.tcc ../flower/include/pcursor.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -4152,7 +4127,7 @@ template7.o template7.lo: template7.cc ../lib/include/proto.hh \ ../flower/include/string.hh ../flower/include/string-handle.hh \ ../flower/include/international.hh include/music-iterator.hh \ ../flower/include/varray.hh -template8.o template8.lo: template8.cc ../lib/include/proto.hh \ +template8.o: template8.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ @@ -4168,8 +4143,7 @@ template8.o template8.lo: template8.cc ../lib/include/proto.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/midi-item.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc -tex-beam.o tex-beam.lo: tex-beam.cc include/atom.hh \ - ../flower/include/string.hh \ +tex-beam.o: tex-beam.cc include/atom.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4192,11 +4166,11 @@ tex-beam.o tex-beam.lo: tex-beam.cc include/atom.hh \ include/music-output-def.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/string-convert.hh include/main.hh -tex-slur.o tex-slur.lo: tex-slur.cc include/main.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/misc.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh ../flower/include/compare.hh \ +tex-slur.o: tex-slur.cc include/main.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/misc.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/scalar.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ @@ -4216,8 +4190,7 @@ tex-slur.o tex-slur.lo: tex-slur.cc include/main.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ ../flower/include/string-convert.hh -tex-stream.o tex-stream.lo: tex-stream.cc include/tex.hh \ - ../flower/include/string.hh \ +tex-stream.o: tex-stream.cc include/tex.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4227,7 +4200,7 @@ tex-stream.o tex-stream.lo: tex-stream.cc include/tex.hh \ include/main.hh include/lily-proto.hh ../lib/include/proto.hh \ include/tex-stream.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh -tex.o tex.lo: tex.cc include/dimen.hh ../flower/include/real.hh \ +tex.o: tex.cc include/dimen.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/string-handle.hh \ @@ -4236,8 +4209,8 @@ tex.o tex.lo: tex.cc include/dimen.hh ../flower/include/real.hh \ include/offset.hh include/axes.hh ../flower/include/scalar.hh \ include/atom.hh include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/varray.hh -text-def.o text-def.lo: text-def.cc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +text-def.o: text-def.cc include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4258,7 +4231,7 @@ text-def.o text-def.lo: text-def.cc include/debug.hh \ ../flower/include/assoc.hh include/molecule.hh \ include/text-def.hh include/general-script-def.hh \ ../lib/include/input.hh include/dimen.hh -text-item.o text-item.lo: text-item.cc include/musical-request.hh \ +text-item.o: text-item.cc include/musical-request.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/request.hh ../flower/include/string.hh \ @@ -4287,7 +4260,7 @@ text-item.o text-item.lo: text-item.cc include/musical-request.hh \ include/lookup.hh include/atom.hh ../flower/include/scalar.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -text-spanner.o text-spanner.lo: text-spanner.cc include/molecule.hh \ +text-spanner.o: text-spanner.cc include/molecule.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ @@ -4314,11 +4287,11 @@ text-spanner.o text-spanner.lo: text-spanner.cc include/molecule.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/music-output-def.hh ../flower/include/dictionary.hh \ ../flower/include/assoc.hh include/atom.hh -tie-grav.o tie-grav.lo: tie-grav.cc include/tie-grav.hh \ - include/engraver.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/varray.hh \ - include/request.hh ../flower/include/string.hh \ +tie-grav.o: tie-grav.cc include/tie-grav.hh include/engraver.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/varray.hh include/request.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -4342,7 +4315,7 @@ tie-grav.o tie-grav.lo: tie-grav.cc include/tie-grav.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -tie.o tie.lo: tie.cc include/paper-def.hh include/lily-proto.hh \ +tie.o: tie.cc include/paper-def.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ @@ -4370,9 +4343,9 @@ tie.o tie.lo: tie.cc include/paper-def.hh include/lily-proto.hh \ include/axis-group-administration.hh include/axis-group-item.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -time-description.o time-description.lo: time-description.cc \ - include/time-description.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh ../flower/include/compare.hh \ +time-description.o: time-description.cc include/time-description.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ include/lily-proto.hh ../lib/include/proto.hh \ @@ -4380,7 +4353,7 @@ time-description.o time-description.lo: time-description.cc \ ../flower/include/dstream.hh ../flower/include/string.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../lib/include/warn.hh -timing-grav.o timing-grav.lo: timing-grav.cc include/score-grav.hh \ +timing-grav.o: timing-grav.cc include/score-grav.hh \ include/engraver-group.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/parray.hh \ @@ -4407,9 +4380,8 @@ timing-grav.o timing-grav.lo: timing-grav.cc include/score-grav.hh \ include/timing-translator.hh include/time-description.hh \ include/grouping.hh include/command-request.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -timing-translator.o timing-translator.lo: timing-translator.cc \ - include/timing-translator.hh include/translator.hh \ - ../flower/include/string.hh \ +timing-translator.o: timing-translator.cc include/timing-translator.hh \ + include/translator.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4431,7 +4403,7 @@ timing-translator.o timing-translator.lo: timing-translator.cc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/global-translator.hh ../flower/include/pqueue.hh -translation-property.o translation-property.lo: translation-property.cc \ +translation-property.o: translation-property.cc \ include/translation-property.hh include/music.hh \ ../flower/include/virtual-methods.hh ../lib/include/input.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ @@ -4443,15 +4415,15 @@ translation-property.o translation-property.lo: translation-property.cc \ ../flower/include/international.hh ../flower/include/scalar.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -translator-ctors.o translator-ctors.lo: translator-ctors.cc \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/plist.hh \ - ../flower/include/list.hh ../flower/include/list.icc \ - ../flower/include/cursor.hh ../flower/include/link.hh \ - ../flower/include/link.icc ../flower/include/compare.hh \ - ../flower/include/pcursor.hh ../flower/include/cursor.icc \ - ../flower/include/iterate.hh ../flower/include/plist.icc \ - include/translator.hh ../flower/include/string.hh \ +translator-ctors.o: translator-ctors.cc ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/plist.hh ../flower/include/list.hh \ + ../flower/include/list.icc ../flower/include/cursor.hh \ + ../flower/include/link.hh ../flower/include/link.icc \ + ../flower/include/compare.hh ../flower/include/pcursor.hh \ + ../flower/include/cursor.icc ../flower/include/iterate.hh \ + ../flower/include/plist.icc include/translator.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/lily-proto.hh \ @@ -4461,8 +4433,8 @@ translator-ctors.o translator-ctors.lo: translator-ctors.cc \ ../flower/include/parray.hh ../lib/include/input.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -translator-group.o translator-group.lo: translator-group.cc \ - include/music-output-def.hh ../flower/include/string.hh \ +translator-group.o: translator-group.cc include/music-output-def.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4480,7 +4452,7 @@ translator-group.o translator-group.lo: translator-group.cc \ ../lib/include/input.hh include/debug.hh \ ../flower/include/dstream.hh ../lib/include/warn.hh \ ../flower/include/rational.hh -translator.o translator.lo: translator.cc include/translator.hh \ +translator.o: translator.cc include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -4500,7 +4472,7 @@ translator.o translator.lo: translator.cc include/translator.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ ../flower/include/dictionary-iter.hh \ ../flower/include/assoc-iter.hh ../flower/include/rational.hh -type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \ +type-swallow-trans.o: type-swallow-trans.cc \ include/type-swallow-trans.hh include/translator.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -4517,13 +4489,13 @@ type-swallow-trans.o type-swallow-trans.lo: type-swallow-trans.cc \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh include/direction.hh \ ../lib/include/duration.hh ../lib/include/plet.hh -version.o version.lo: version.cc include/main.hh include/lily-proto.hh \ +version.o: version.cc include/main.hh include/lily-proto.hh \ ../lib/include/proto.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh -vertical-align-elem.o vertical-align-elem.lo: vertical-align-elem.cc \ +vertical-align-elem.o: vertical-align-elem.cc \ include/vertical-align-elem.hh include/score-elem.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ @@ -4536,8 +4508,8 @@ vertical-align-elem.o vertical-align-elem.lo: vertical-align-elem.cc \ ../flower/include/international.hh ../flower/include/compare.hh \ include/lily-proto.hh ../lib/include/proto.hh \ ../flower/include/interval.hh -vertical-align-grav.o vertical-align-grav.lo: vertical-align-grav.cc \ - include/p-col.hh include/horizontal-group-item.hh \ +vertical-align-grav.o: vertical-align-grav.cc include/p-col.hh \ + include/horizontal-group-item.hh \ include/horizontal-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -4568,12 +4540,12 @@ vertical-align-grav.o vertical-align-grav.lo: vertical-align-grav.cc \ ../flower/include/dictionary.hh ../flower/include/assoc.hh \ include/vertical-align-spanner.hh include/spanner.hh \ include/vertical-align-elem.hh include/vertical-group-elem.hh -vertical-align-spanner.o vertical-align-spanner.lo: \ - vertical-align-spanner.cc include/vertical-align-spanner.hh \ - include/spanner.hh include/lily-proto.hh \ - ../lib/include/proto.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh include/score-elem.hh \ - ../flower/include/parray.hh ../flower/include/varray.hh \ +vertical-align-spanner.o: vertical-align-spanner.cc \ + include/vertical-align-spanner.hh include/spanner.hh \ + include/lily-proto.hh ../lib/include/proto.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + include/score-elem.hh ../flower/include/parray.hh \ + ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -4584,7 +4556,7 @@ vertical-align-spanner.o vertical-align-spanner.lo: \ ../flower/include/interval.hh include/drul-array.hh \ include/direction.hh include/rod.hh \ include/vertical-align-elem.hh -vertical-group-elem.o vertical-group-elem.lo: vertical-group-elem.cc \ +vertical-group-elem.o: vertical-group-elem.cc \ include/vertical-group-elem.hh include/axis-group-element.hh \ include/score-elem.hh ../flower/include/parray.hh \ ../flower/include/varray.hh \ @@ -4602,13 +4574,12 @@ vertical-group-elem.o vertical-group-elem.lo: vertical-group-elem.cc \ include/boxes.hh include/drul-array.hh include/direction.hh \ include/debug.hh ../flower/include/dstream.hh \ ../lib/include/warn.hh -vertical-group-spanner.o vertical-group-spanner.lo: \ - vertical-group-spanner.cc include/vertical-group-spanner.hh \ - include/axis-group-spanner.hh include/spanner.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/score-elem.hh ../flower/include/parray.hh \ - ../flower/include/varray.hh \ +vertical-group-spanner.o: vertical-group-spanner.cc \ + include/vertical-group-spanner.hh include/axis-group-spanner.hh \ + include/spanner.hh include/lily-proto.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/score-elem.hh \ + ../flower/include/parray.hh ../flower/include/varray.hh \ ../flower/include/virtual-methods.hh \ ../flower/include/directed-graph.hh \ include/graphical-element.hh include/offset.hh include/axes.hh \ @@ -4628,8 +4599,8 @@ vertical-group-spanner.o vertical-group-spanner.lo: \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -voice-iterator.o voice-iterator.lo: voice-iterator.cc \ - include/translator-group.hh ../flower/include/string.hh \ +voice-iterator.o: voice-iterator.cc include/translator-group.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -4650,15 +4621,15 @@ voice-iterator.o voice-iterator.lo: voice-iterator.cc \ ../flower/include/rational.hh include/music-list.hh \ include/music.hh include/minterval.hh \ ../flower/include/interval.hh -warn.o warn.lo: warn.cc ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - ../flower/include/plist.hh ../flower/include/list.hh \ - ../flower/include/list.icc ../flower/include/cursor.hh \ - ../flower/include/link.hh ../flower/include/link.icc \ - ../flower/include/compare.hh ../flower/include/pcursor.hh \ - ../flower/include/cursor.icc ../flower/include/iterate.hh \ - ../flower/include/plist.icc include/debug.hh \ - ../flower/include/dstream.hh ../flower/include/string.hh \ +warn.o: warn.cc ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh ../flower/include/plist.hh \ + ../flower/include/list.hh ../flower/include/list.icc \ + ../flower/include/cursor.hh ../flower/include/link.hh \ + ../flower/include/link.icc ../flower/include/compare.hh \ + ../flower/include/pcursor.hh ../flower/include/cursor.icc \ + ../flower/include/iterate.hh ../flower/include/plist.icc \ + include/debug.hh ../flower/include/dstream.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh include/lily-proto.hh \ @@ -4669,12 +4640,11 @@ warn.o warn.lo: warn.cc ../lib/include/proto.hh \ include/time-description.hh ../lib/include/source-file.hh \ ../lib/include/source.hh include/main.hh \ ../lib/include/input.hh -word-wrap.o word-wrap.lo: word-wrap.cc include/word-wrap.hh \ - include/break.hh ../flower/include/varray.hh \ - ../flower/include/interval.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/compare.hh \ - include/lily-proto.hh ../lib/include/proto.hh \ - include/colhpos.hh include/paper-def.hh \ +word-wrap.o: word-wrap.cc include/word-wrap.hh include/break.hh \ + ../flower/include/varray.hh ../flower/include/interval.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/compare.hh include/lily-proto.hh \ + ../lib/include/proto.hh include/colhpos.hh include/paper-def.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ ../flower/include/arithmetic-operator.hh \ include/music-output-def.hh ../flower/include/string.hh \ @@ -4731,19 +4701,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic @@ -4764,8 +4734,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/lily/VERSION b/lily/VERSION index 69f1b39d41..57e4071c29 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 53 +PATCH_LEVEL = 56 MY_PATCH_LEVEL = diff --git a/lily/bezier.cc b/lily/bezier.cc index 8c94e4efb6..657cfea0d7 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -7,6 +7,7 @@ */ #include +#include "offset.hh" #include "bezier.hh" #include "dimen.hh" #include "paper-def.hh" @@ -14,7 +15,7 @@ Bezier::Bezier (int steps_i) { steps_i_ = steps_i; - curve_ = new Point [steps_i_ + 1]; + curve_ = new Offset [steps_i_ + 1]; } Bezier::~Bezier () @@ -24,21 +25,21 @@ Bezier::~Bezier () //from GNU gs3.33: ega.c void -Bezier::calc (Point control[4]) +Bezier::calc (Offset control[4]) { Real dt = 1.0 / steps_i_; - Real cx = 3.0 * (control[1].x - control[0].x); - Real bx = 3.0 * (control[2].x - control[1].x) - cx; - Real ax = control[3].x - (control[0].x + cx + bx); - Real cy = 3.0 * (control[1].y - control[0].y); - Real by = 3.0 * (control[2].y - control[1].y) - cy; - Real ay = control[3].y - (control[0].y + cy + by); + Real cx = 3.0 * (control[1].x() - control[0].x()); + Real bx = 3.0 * (control[2].x() - control[1].x()) - cx; + Real ax = control[3].x() - (control[0].x() + cx + bx); + Real cy = 3.0 * (control[1].y () - control[0].y ()); + Real by = 3.0 * (control[2].y () - control[1].y ()) - cy; + Real ay = control[3].y () - (control[0].y () + cy + by); Real t = 0.0; int i = 0; while ( t <= 1.0 ) { - curve_[i].x = ((ax * t + bx) * t + cx) * t + control[0].x; - curve_[i++].y = ((ay * t + by) * t + cy) * t + control[0].y; + curve_[i].x() = ((ax * t + bx) * t + cx) * t + control[0].x(); + curve_[i++].y () = ((ay * t + by) * t + cy) * t + control[0].y (); t += dt; } } @@ -46,17 +47,17 @@ Bezier::calc (Point control[4]) Real Bezier::y (Real x) { - if (x <= curve_[0].x) - return curve_[0].y; + if (x <= curve_[0].x()) + return curve_[0].y (); for (int i = 1; i < steps_i_; i++ ) { - if (x < curve_[i].x) + if (x < curve_[i].x()) { - Real lin = (x - curve_[i-1].x) / (curve_[i].x - curve_[i-1].x); - return curve_[i-1].y + lin * (curve_[i].y - curve_[i-1].y); + Real lin = (x - curve_[i-1].x()) / (curve_[i].x() - curve_[i-1].x()); + return curve_[i-1].y () + lin * (curve_[i].y () - curve_[i-1].y ()); } } - return curve_[steps_i_-1].y; + return curve_[steps_i_-1].y (); } @@ -105,15 +106,19 @@ Bezier_bow::calc (Real dx, Real dy, Real h, Real d) // ugh, ugly height hack, see lily-ps-defs.tex Real height = (indent + h) * d; - Point control[4] = {0, 0, indent, height, b - indent, height, b, 0 }; + Offset control[4]; + control[0] = Offset(0, 0); + control[1] = Offset(indent, height); + control[2] = Offset(b - indent, height); + control[3] = Offset( b, 0 ); Real phi = dx ? atan (dy/dx) : sign (dy) * pi / 2.0; Real sphi = sin (phi); Real cphi = cos (phi); for (int i = 1; i < 4; i++) { - control[i].x = cphi * control[i].x - sphi * control[i].y; - control[i].y = sphi * control[i].x + cphi * control[i].y; + control[i].x() = cphi * control[i].x() - sphi * control[i].y (); + control[i].y () = sphi * control[i].x() + cphi * control[i].y (); } Bezier::calc (control); } diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc index a50b078062..29ce749fab 100644 --- a/lily/engraver-group.cc +++ b/lily/engraver-group.cc @@ -42,20 +42,30 @@ Engraver_group_engraver::do_announces() Request dummy_req; Link_array nongroups = nongroup_l_arr (); - for (int j =0; j < announce_info_arr_.size(); j++) + while (announce_info_arr_.size ()) { - Score_elem_info info = announce_info_arr_[j]; - - if (!info.req_l_) - info.req_l_ = &dummy_req; - for (int i=0; i < nongroups.size(); i++) - { // Is this good enough? + for (int j =0; j < announce_info_arr_.size(); j++) + { + Score_elem_info info = announce_info_arr_[j]; + + if (!info.req_l_) + info.req_l_ = &dummy_req; + for (int i=0; i < nongroups.size(); i++) + { // Is this good enough? + Engraver * eng = nongroups[i]->engraver_l (); + if (eng && eng!= info.origin_grav_l_arr_[0]) + eng->acknowledge_element (info); + } + } + announce_info_arr_.clear (); + for (int i=0; i < nongroups.size(); i++) + { Engraver * eng = nongroups[i]->engraver_l (); - if (eng && eng!= info.origin_grav_l_arr_[0]) - eng->acknowledge_element (info); + if (eng) + eng->process_acknowledged (); } + } - announce_info_arr_.clear(); } diff --git a/lily/engraver.cc b/lily/engraver.cc index 57bd126d6c..2786941a92 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -26,6 +26,7 @@ Engraver::announce_element (Score_elem_info i) daddy_grav_l()->announce_element (i); } + void Engraver::typeset_element (Score_elem*p) { diff --git a/lily/include/Makefile.in b/lily/include/Makefile.in index 0c08cc256f..72f2113988 100644 --- a/lily/include/Makefile.in +++ b/lily/include/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # lily/include/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -121,21 +127,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -174,26 +185,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index 69a24d5205..5f5c59d7b4 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -10,15 +10,6 @@ #include "lily-proto.hh" #include "real.hh" -/** - Handy (x,y) of reals for Bezier - */ -struct Point -{ - Real x; - Real y; -}; - /** Simple bezier curve */ @@ -29,9 +20,9 @@ public: virtual ~Bezier (); /** - Calculate bezier curve into Point (x,y) array. + Calculate bezier curve into Offset (x,y) array. */ - void calc (Point control[4]); + void calc (Offset control[4]); /** Return y that goes with x by interpolation. @@ -39,7 +30,7 @@ public: Real y (Real x); int steps_i_; - Point* curve_; + Offset* curve_; }; /** diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh index 9f3dc8b78a..72f14f3c3c 100644 --- a/lily/include/engraver-group.hh +++ b/lily/include/engraver-group.hh @@ -22,7 +22,9 @@ Group a number of engravers. Usually delegates everything to its contents. Postfix: group */ -class Engraver_group_engraver : public Engraver, public virtual Translator_group { +class Engraver_group_engraver : public Engraver, + public virtual Translator_group +{ protected: Array announce_info_arr_; public: @@ -33,7 +35,7 @@ public: DECLARE_MY_RUNTIME_TYPEINFO; virtual Staff_info get_staff_info() const; - virtual void do_announces(); + virtual void do_announces(); virtual void announce_element (Score_elem_info); }; diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index 4efd405f46..9814b24fbe 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -44,6 +44,12 @@ protected: Default: ignore the info */ virtual void acknowledge_element (Score_elem_info) {} + + /** Do things with stuff found in acknowledge_element. Ugh. Should + be looped with acknowledge_element. + + */ + virtual void process_acknowledged () {} /** Announce element. Default: pass on to daddy. Utility */ diff --git a/lily/include/local-key-grav.hh b/lily/include/local-key-grav.hh index 1602b94d9f..d7c37829bb 100644 --- a/lily/include/local-key-grav.hh +++ b/lily/include/local-key-grav.hh @@ -13,13 +13,16 @@ #include "parray.hh" struct Local_key_engraver : Engraver { + Local_key_item *key_item_p_; protected: TRANSLATOR_CLONE(Local_key_engraver); virtual void do_process_requests(); virtual void acknowledge_element (Score_elem_info); virtual void do_pre_move_processing(); virtual void do_creation_processing (); + virtual void process_acknowledged (); public: + Key local_key_; Key const *key_C_; Array mel_l_arr_; diff --git a/lily/include/span-score-bar-grav.hh b/lily/include/span-score-bar-grav.hh index dee2a30db3..39da0ab69c 100644 --- a/lily/include/span-score-bar-grav.hh +++ b/lily/include/span-score-bar-grav.hh @@ -47,6 +47,7 @@ public: TRANSLATOR_CLONE (Staff_group_bar_engraver); DECLARE_MY_RUNTIME_TYPEINFO; virtual Span_bar * get_span_bar_p () const; + virtual void acknowledge_element (Score_elem_info); }; #endif // SPAN_SCORE_BAR_GRAV_HH diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc index f136737f90..ec84f240bf 100644 --- a/lily/local-key-grav.cc +++ b/lily/local-key-grav.cc @@ -20,6 +20,7 @@ Local_key_engraver::Local_key_engraver() { key_C_ = 0; + key_item_p_ =0; } void @@ -40,10 +41,9 @@ Local_key_engraver::do_creation_processing () } void -Local_key_engraver::do_pre_move_processing() +Local_key_engraver::process_acknowledged () { - Local_key_item *key_item_p = 0; - if (mel_l_arr_.size()) + if (!key_item_p_ && mel_l_arr_.size()) { for (int i=0; i < mel_l_arr_.size(); i++) { @@ -58,7 +58,7 @@ Local_key_engraver::do_pre_move_processing() local_key_.oct (note_l->octave_i_).acc (note_l->notename_i_) == note_l->accidental_i_) continue; - if (!key_item_p) + if (!key_item_p_) { int c0_i=0; @@ -66,23 +66,28 @@ Local_key_engraver::do_pre_move_processing() if (inf.c0_position_i_l_) c0_i = *get_staff_info().c0_position_i_l_; - key_item_p = new Local_key_item (c0_i); - + key_item_p_ = new Local_key_item (c0_i); + announce_element (Score_elem_info (key_item_p_, 0)); } - key_item_p->add (note_l); - key_item_p->add_support (support_l); + key_item_p_->add (note_l); + key_item_p_->add_support (support_l); local_key_.oct (note_l->octave_i_) .set (note_l->notename_i_, note_l->accidental_i_); } } - if (key_item_p) +} + +void +Local_key_engraver::do_pre_move_processing() +{ + if (key_item_p_) { for (int i=0; i < support_l_arr_.size(); i++) - key_item_p->add_support (support_l_arr_[i]); - - announce_element (Score_elem_info (key_item_p, 0)); // ugh ugh ugh - typeset_element (key_item_p); + key_item_p_->add_support (support_l_arr_[i]); + + typeset_element (key_item_p_); + key_item_p_ =0; } mel_l_arr_.clear(); @@ -91,9 +96,6 @@ Local_key_engraver::do_pre_move_processing() forced_l_arr_.clear(); } -/* - whoah .. this looks hairy! - */ void Local_key_engraver::acknowledge_element (Score_elem_info info) { @@ -107,7 +109,7 @@ Local_key_engraver::acknowledge_element (Score_elem_info info) support_l_arr_.push (item_l); } else if (info.req_l_->command() - && info.req_l_->command()->keychange ()) + && info.req_l_->command()->keychange () && key_C_) { local_key_ = *key_C_; } diff --git a/lily/rod.cc b/lily/rod.cc index 8face4fd45..3e87138669 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -21,7 +21,7 @@ Rod::Rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r) if (li.empty_b () || ri.empty_b ()) distance_f_ = 0; else - distance_f_ = li[RIGHT] + ri[LEFT]; + distance_f_ = li[RIGHT] - ri[LEFT]; } Rod::Rod () diff --git a/lily/slur.cc b/lily/slur.cc index 8ec8633b5d..7ad52ce6d2 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -147,6 +147,8 @@ pos_correct (Real x, Real dx, Real dy) Real Slur::height_f () const { + return 0.0; + Real interline = paper ()->interline_f (); Real notewidth = paper ()->note_width (); Real internote = interline / 2; diff --git a/lily/span-score-bar-grav.cc b/lily/span-score-bar-grav.cc index 4d5f57190e..78f949d1f0 100644 --- a/lily/span-score-bar-grav.cc +++ b/lily/span-score-bar-grav.cc @@ -42,6 +42,17 @@ Staff_group_bar_engraver::get_span_bar_p () const return s; } +void +Staff_group_bar_engraver::acknowledge_element (Score_elem_info f) +{ + Span_bar_engraver::acknowledge_element (f); + if (f.elem_l_->is_type_b (Piano_brace::static_name ())) + { + // Piano_brace * brace = (Piano_brace*) f.elem_l_->item ()->bar (); + // do something. + } + +} ADD_THIS_TRANSLATOR (Piano_bar_engraver); ADD_THIS_TRANSLATOR (Staff_group_bar_engraver); ADD_THIS_TRANSLATOR (Span_score_bar_engraver); diff --git a/lily/stem.cc b/lily/stem.cc index 41175bdb5f..25fa1c13ff 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -307,12 +307,15 @@ Real Stem::note_delta_f () const { Real r=0; - if (head_l_arr_.size() && stem_xdir_ != CENTER) + if (head_l_arr_.size()) { Interval head_wid(0, head_l_arr_[0]->width ().length ()); Real rule_thick(paper ()->rule_thickness ()); Interval stem_wid(-rule_thick/2, rule_thick/2); - r = head_wid[stem_xdir_] - stem_wid[stem_xdir_]; + if (stem_xdir_ == CENTER) + r = head_wid.center (); + else + r = head_wid[stem_xdir_] - stem_wid[stem_xdir_]; } return r; } diff --git a/make/Makefile.in b/make/Makefile.in index 5126ad5c6f..43102d5709 100644 --- a/make/Makefile.in +++ b/make/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -53,12 +59,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -175,26 +181,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 025f37f376..163a8c9086 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond Versie: -Inschrijf datum: 09APR98 +Inschrijf datum: 14APR98 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: diff --git a/make/lilypond.lsm b/make/lilypond.lsm index de64d0effd..ce7fa38a65 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond Version: -Entered-date: 09APR98 +Entered-date: 14APR98 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 diff --git a/make/lilypond.spec b/make/lilypond.spec index a96e01f52f..6e3752d91b 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -31,8 +31,8 @@ strip lily/out/lilypond mi2mu/out/mi2mu make -C Documentation gifs make prefix="$RPM_BUILD_ROOT/usr" install %files -%doc BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-course.doc Documentation/mudela-man.doc +%doc Documentation/AUTHORS.txt Documentation/CodingStyle.txt Documentation/INSTALL.txt Documentation/MANIFESTO.txt Documentation/PATCHES.txt Documentation/convert-mudela.txt Documentation/faq.txt Documentation/gnu-music.txt Documentation/index.txt Documentation/internals.txt Documentation/language.txt Documentation/lilypond.txt Documentation/links.txt Documentation/literature.txt Documentation/ly2dvi.txt Documentation/mi2mu.txt Documentation/mudela-book.txt Documentation/mutopia.txt Documentation/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README +%doc input/abbrev.ly input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slurs.ly input/spacing.ly input/stem.ly input/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/introduction.doc Documentation/mudela-man.doc %doc Documentation/out/lelie_logo.gif /usr/bin/convert-mudela /usr/bin/mudela-book diff --git a/mf/Makefile.am b/mf/Makefile.am index c5026972b0..26f66e0e44 100644 --- a/mf/Makefile.am +++ b/mf/Makefile.am @@ -13,7 +13,7 @@ outdir = . TEXFILES = dimen.tex dyn.tex MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-haak.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf MFDEPS = $(outdir)/mf.dep -EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO README +EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf diff --git a/mf/Makefile.am.wild b/mf/Makefile.am.wild index f2b25ae4f4..6d5f461c5a 100644 --- a/mf/Makefile.am.wild +++ b/mf/Makefile.am.wild @@ -12,7 +12,7 @@ outdir = . TEXFILES = $(wildcard *.tex) MFFILES = $(wildcard *.mf) MFDEPS = $(outdir)/mf.dep -EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO README +EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO FONT_FILES = $(wildcard *[0-9].mf) FET_FILES = $(wildcard feta[0-9]*.mf) diff --git a/mf/Makefile.in b/mf/Makefile.in index c098564bee..506a321885 100644 --- a/mf/Makefile.in +++ b/mf/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # mf/Makefile.am.wild @@ -49,12 +55,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -107,7 +113,7 @@ outdir = . TEXFILES = dimen.tex dyn.tex MFFILES = feta-autometric.mf feta-banier.mf feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-beugel.mf feta-beum.mf feta-black16.mf feta-bolletjes.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-eindelijk.mf feta-generic.mf feta-haak.mf feta-ital-f.mf feta-ital-m.mf feta-ital-p.mf feta-ital-r.mf feta-ital-s.mf feta-ital-z.mf feta-klef.mf feta-macros.mf feta-nummer-generic.mf feta-nummer.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-params.mf feta-puntje.mf feta-schrift.mf feta-slag.mf feta-sleur.mf feta-test16.mf feta-test20.mf feta-toevallig.mf feta-watzieik.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf grayimagen.mf MFDEPS = $(outdir)/mf.dep -EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO README +EXTRA_DIST = Makefile.am.wild GNUmakefile Rules.make $(MFFILES) $(TEXFILES) TODO FONT_FILES = feta-beams16.mf feta-beams20.mf feta-beams26.mf feta-black16.mf feta-braces16.mf feta-braces20.mf feta-brackets16.mf feta-brackets20.mf feta-din10.mf feta-nummer10.mf feta-nummer12.mf feta-nummer3.mf feta-nummer4.mf feta-nummer5.mf feta-nummer6.mf feta-nummer7.mf feta-nummer8.mf feta-test16.mf feta-test20.mf feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf FET_FILES = feta11.mf feta13.mf feta16.mf feta19.mf feta20.mf feta23.mf feta26.mf @@ -175,26 +181,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean clean-local distclean: distclean-generic clean distclean-local - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/mf/TODO b/mf/TODO index 9029d68668..850230b6c7 100644 --- a/mf/TODO +++ b/mf/TODO @@ -2,15 +2,12 @@ - design decent macro for bulbed endings - printer dependencies. - y-refpoint for rests should be the 4th staffline (gclef: b') - - segno, coda - versioning - lo-res fixes. - work out sizes of character fonts. - more symbols * piano pedals, - * trills * maxima notehead * coda signs. - 128th flags - include important spacing dims in fetalog - - more sizes, see readme diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 56c36f18a3..8b28f2a47b 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -281,7 +281,8 @@ fet_endchar; % % Inspired by a computer-set version of Auf dem Strom by Baerenreiter. % -fet_beginchar("Turn","turn","turn") + +def draw_turn = save thin, thick, ball_diam, darkness; save wd, ht, thick_nibangle, ball_nib_thick; save turndir; @@ -291,7 +292,7 @@ fet_beginchar("Turn","turn","turn") ht# = 18/17 interline#; darkness = 1.20 stafflinethickness; - set_char_box(wd#/2, wd#/2, ht#/2, ht#/2); + set_char_box(wd#/2, wd#/2, ht#/2, ht#/2); thick_nibangle = 60; thick = 3 darkness; @@ -317,7 +318,6 @@ fet_beginchar("Turn","turn","turn") swoosh := z1l{curl 0} .. z2l .. z3l{up} .. {left}z4l -- z4r .. z3r{down} .. z2r{left} ; fill swoosh .. (swoosh scaled -1) .. cycle; - penlabels(2,3,4); x5r = x4; y5r = y4l - ball_diam /2; @@ -331,8 +331,21 @@ fet_beginchar("Turn","turn","turn") fill ploop scaled -1; +enddef; + +fet_beginchar("Reverse turn","reverseturn","reverseturn") + draw_turn; + currentpicture := currentpicture yscaled -1; penlabels(5,6,7); - + penlabels(2,3,4); +fet_endchar; + + +fet_beginchar("Turn","turn","turn") + draw_turn; + + penlabels(5,6,7); + penlabels(2,3,4); fet_endchar; diff --git a/mi2mu/Makefile.in b/mi2mu/Makefile.in index 024ca140ba..053e0de379 100644 --- a/mi2mu/Makefile.in +++ b/mi2mu/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -52,12 +58,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -145,7 +151,7 @@ OBJECTS = $(mi2mu_OBJECTS) default: all .SUFFIXES: -.SUFFIXES: .c .cc .lo .o +.SUFFIXES: .S .c .cc .lo .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mi2mu/Makefile @@ -157,7 +163,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-binPROGRAMS: clean-binPROGRAMS: - test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -174,7 +180,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) done uninstall-binPROGRAMS: - $(NORMAL_UNINSTALL) + @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -182,24 +188,36 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -226,7 +244,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -236,7 +254,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -250,24 +270,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -282,15 +307,15 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done -main.o main.lo: main.cc ../flower/include/string-convert.hh \ +main.o: main.cc ../flower/include/string-convert.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -310,10 +335,10 @@ main.o main.lo: main.cc ../flower/include/string-convert.hh \ include/midi-parser.hh include/mi2mu-proto.hh \ ../flower/include/parray.hh include/mudela-item.hh \ include/mudela-score.hh -mi2mu-version.o mi2mu-version.lo: mi2mu-version.cc ../flower/config.hh -midi-parser.o midi-parser.lo: midi-parser.cc \ - ../flower/include/string-convert.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/string.hh \ +mi2mu-version.o: mi2mu-version.cc ../flower/config.hh +midi-parser.o: midi-parser.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -321,9 +346,8 @@ midi-parser.o midi-parser.lo: midi-parser.cc \ include/mi2mu-global.hh include/midi-parser.hh \ ../lib/include/moment.hh ../flower/include/rational.hh \ include/mi2mu-proto.hh -midi-score-parser.o midi-score-parser.lo: midi-score-parser.cc \ - ../lib/include/moment.hh ../flower/include/rational.hh \ - ../flower/include/compare.hh \ +midi-score-parser.o: midi-score-parser.cc ../lib/include/moment.hh \ + ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../lib/include/source-file.hh ../lib/include/proto.hh \ @@ -340,7 +364,7 @@ midi-score-parser.o midi-score-parser.lo: midi-score-parser.cc \ include/midi-track-parser.hh include/mudela-item.hh \ ../lib/include/duration.hh ../lib/include/plet.hh \ include/mudela-score.hh -midi-track-parser.o midi-track-parser.lo: midi-track-parser.cc \ +midi-track-parser.o: midi-track-parser.cc \ ../flower/include/string-convert.hh ../flower/include/fproto.hh \ ../flower/include/real.hh ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -359,18 +383,18 @@ midi-track-parser.o midi-track-parser.lo: midi-track-parser.cc \ ../lib/include/plet.hh include/mudela-score.hh \ ../flower/include/parray.hh ../flower/include/varray.hh \ include/mudela-staff.hh -mudela-column.o mudela-column.lo: mudela-column.cc \ - include/mudela-column.hh ../lib/include/proto.hh \ - ../flower/include/fproto.hh ../flower/include/real.hh \ - include/mi2mu-proto.hh ../lib/include/moment.hh \ - ../flower/include/rational.hh ../flower/include/compare.hh \ +mudela-column.o: mudela-column.cc include/mudela-column.hh \ + ../lib/include/proto.hh ../flower/include/fproto.hh \ + ../flower/include/real.hh include/mi2mu-proto.hh \ + ../lib/include/moment.hh ../flower/include/rational.hh \ + ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/plist.hh ../flower/include/list.hh \ ../flower/include/list.icc ../flower/include/cursor.hh \ ../flower/include/link.hh ../flower/include/link.icc \ ../flower/include/pcursor.hh ../flower/include/cursor.icc \ ../flower/include/iterate.hh ../flower/include/plist.icc -mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \ +mudela-item.o: mudela-item.cc include/mi2mu-global.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -388,7 +412,7 @@ mudela-item.o mudela-item.lo: mudela-item.cc include/mi2mu-global.hh \ ../flower/include/iterate.hh ../flower/include/plist.icc \ include/mudela-item.hh include/mudela-stream.hh \ include/mudela-score.hh ../flower/include/parray.hh -mudela-score.o mudela-score.lo: mudela-score.cc ../lib/include/moment.hh \ +mudela-score.o: mudela-score.cc ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -407,7 +431,7 @@ mudela-score.o mudela-score.lo: mudela-score.cc ../lib/include/moment.hh \ ../flower/include/parray.hh include/mudela-staff.hh \ include/mudela-stream.hh ../flower/include/list.tcc \ ../flower/include/cursor.tcc -mudela-staff.o mudela-staff.lo: mudela-staff.cc ../lib/include/moment.hh \ +mudela-staff.o: mudela-staff.cc ../lib/include/moment.hh \ ../flower/include/rational.hh ../flower/include/compare.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ @@ -426,8 +450,8 @@ mudela-staff.o mudela-staff.lo: mudela-staff.cc ../lib/include/moment.hh \ include/mudela-staff.hh include/mudela-stream.hh \ include/mudela-voice.hh include/mudela-score.hh \ ../flower/include/parray.hh -mudela-stream.o mudela-stream.lo: mudela-stream.cc \ - include/mi2mu-global.hh ../flower/include/string.hh \ +mudela-stream.o: mudela-stream.cc include/mi2mu-global.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string-handle.hh \ @@ -436,9 +460,9 @@ mudela-stream.o mudela-stream.lo: mudela-stream.cc \ include/mi2mu-proto.hh ../lib/include/moment.hh \ ../flower/include/rational.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/mudela-stream.hh -mudela-voice.o mudela-voice.lo: mudela-voice.cc \ - ../flower/include/string-convert.hh ../flower/include/fproto.hh \ - ../flower/include/real.hh ../flower/include/string.hh \ +mudela-voice.o: mudela-voice.cc ../flower/include/string-convert.hh \ + ../flower/include/fproto.hh ../flower/include/real.hh \ + ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ ../flower/include/string-handle.hh \ ../flower/include/international.hh ../flower/include/compare.hh \ @@ -453,7 +477,7 @@ mudela-voice.o mudela-voice.lo: mudela-voice.cc \ include/mudela-item.hh ../lib/include/duration.hh \ ../lib/include/plet.hh include/mudela-staff.hh \ include/mudela-stream.hh include/mudela-voice.hh -template9.o template9.lo: template9.cc ../lib/include/proto.hh \ +template9.o: template9.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/list.hh ../flower/include/list.icc \ ../flower/include/cursor.hh ../flower/include/link.hh \ @@ -472,7 +496,7 @@ template9.o template9.lo: template9.cc ../lib/include/proto.hh \ include/mudela-score.hh ../flower/include/parray.hh \ ../flower/include/varray.hh ../flower/include/pcursor.tcc \ ../flower/include/plist.tcc -version.o version.lo: version.cc ../lib/include/proto.hh \ +version.o: version.cc ../lib/include/proto.hh \ ../flower/include/fproto.hh ../flower/include/real.hh \ ../flower/include/string.hh \ ../flower/include/arithmetic-operator.hh \ @@ -510,19 +534,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic @@ -543,8 +567,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am distclean-local - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/mi2mu/include/Makefile.in b/mi2mu/include/Makefile.in index 36d23b7e0d..e323017787 100644 --- a/mi2mu/include/Makefile.in +++ b/mi2mu/include/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # mi2mu/include/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -121,21 +127,26 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -174,26 +185,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-tags mostlyclean-generic clean: clean-tags clean-generic mostlyclean distclean: distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-tags maintainer-clean-generic \ distclean diff --git a/mutopia/Coriolan/Makefile.in b/mutopia/Coriolan/Makefile.in index c21714a381..86470d93f7 100644 --- a/mutopia/Coriolan/Makefile.in +++ b/mutopia/Coriolan/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # mutopia/Coriolan/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -158,26 +164,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/mutopia/J.S.Bach/Makefile.in b/mutopia/J.S.Bach/Makefile.in index 5a88fe6cd0..ef9808fd89 100644 --- a/mutopia/J.S.Bach/Makefile.in +++ b/mutopia/J.S.Bach/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # mutopia/J.S.Bach/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -161,26 +167,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/mutopia/Makefile.in b/mutopia/Makefile.in index 942a5ae6ec..c03acaf8c4 100644 --- a/mutopia/Makefile.in +++ b/mutopia/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # mutopia/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -135,7 +141,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -145,7 +151,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ @@ -159,24 +167,29 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -191,11 +204,11 @@ distdir: $(DISTFILES) || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done @@ -225,19 +238,19 @@ installdirs: installdirs-recursive mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-tags mostlyclean-generic clean-am: clean-tags clean-generic mostlyclean-am @@ -252,8 +265,8 @@ mostlyclean: mostlyclean-recursive mostlyclean-am clean: clean-recursive clean-am distclean: distclean-recursive distclean-am - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index e213b38dfc..faafa951fb 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -283,6 +283,7 @@ $staff_hoboone = \type Staff = hoboonestaff < a4 = \paper{ \paper_twenty linewidth= 165.\mm; + gourlay_maxmeasures = 10.0; Score = \translator { \type Score_engraver; diff --git a/mutopia/standje.ly b/mutopia/standje.ly index 7a10d0e0f4..e5cd950051 100644 --- a/mutopia/standje.ly +++ b/mutopia/standje.ly @@ -17,6 +17,7 @@ multiple \paper{}s in one \score $vocal_verse1 = \melodic{ \octave c'; + % ugh: treble/bass % \clef treble; % \clef violin; @@ -137,6 +138,7 @@ $treble_intro = \melodic{ r8 <['as-. c-.> <'as-. c-.> <'as-. c-.]> | r8 <['as-. c-.> <'as-. c-.> <'as-. c-.]> | r8 <['g-. 'b-.> <'b-. d-.> <'g-. 'b-.> <'b-. d-.> <'g-. 'b-.]> | + \break; } @@ -235,7 +237,9 @@ $bass_eentje = \melodic{ global = \melodic{ \meter 3/4; - \key bes es as; + \key bes es as; + \skip 4 * 12; + \break; } lyrics = \melodic{ @@ -251,6 +255,7 @@ $lyric_staff = \type Lyrics = lyric< > vocals = \melodic{ + \global \skip 4 * 12; \$vocal_verse1 \skip 4 * 24; @@ -299,11 +304,8 @@ $grand_staff = \type Grandstaff< \$grand_staff > \paper{ - % how does this work? - % previously we had the clear 'ideal whole note space' setting? -% arithmetic_multiplier = 6.\pt; % ugh: the *first* (intro) line may only have four measures... - gourlay_maxmeasures = 4.; + gourlay_maxmeasures = 7.; } \midi{ \tempo 4 = 54; diff --git a/test/Makefile.in b/test/Makefile.in index 4139ce858f..3c032b6410 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # project LilyPond -- the musical typesetter @@ -48,12 +54,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -189,26 +195,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/test/check-lily-midi.sh b/test/check-lily-midi.sh old mode 100755 new mode 100644 diff --git a/test/check-lily-paper.sh b/test/check-lily-paper.sh old mode 100755 new mode 100644 diff --git a/test/check-mi2mu.sh b/test/check-mi2mu.sh old mode 100755 new mode 100644 diff --git a/tex/Makefile.in b/tex/Makefile.in index 57bd6cbce4..c50d1b2eec 100644 --- a/tex/Makefile.in +++ b/tex/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. # Generated automatically by wild-perl 0.1 # tex/Makefile.am.wild @@ -46,12 +52,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AGE = @AGE@ @@ -156,26 +162,26 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic clean: clean-generic mostlyclean distclean: distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/tex/feta11.tex b/tex/feta11.tex index 85b527d241..000928bb16 100644 --- a/tex/feta11.tex +++ b/tex/feta11.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\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 index 36ddfd16bb..b6243d57c0 100644 --- a/tex/feta13.tex +++ b/tex/feta13.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\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 index 75ec2c0d0d..7eda188ab9 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\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 index 9b2e912425..a98b36dff0 100644 --- a/tex/feta19.tex +++ b/tex/feta19.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\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 index dd4c4c5340..973c4a946a 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\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 index 38b341eb46..56e72d5e5e 100644 --- a/tex/feta23.tex +++ b/tex/feta23.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\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 index c51172933a..1090ffaf6f 100644 --- a/tex/feta26.tex +++ b/tex/feta26.tex @@ -52,36 +52,37 @@ \fetdef\plusstop{37} \fetdef\upbow{38} \fetdef\downbow{39} -\fetdef\turn{40} -\fetdef\trill{41} -\fetdef\upedalheel{42} -\fetdef\dpedalheel{43} -\fetdef\upedaltoe{44} -\fetdef\dpedaltoe{45} -\fetdef\flageolet{46} -\fetdef\trilelement{47} -\fetdef\prall{48} -\fetdef\mordent{49} -\fetdef\prallprall{50} -\fetdef\prallmordent{51} -\fetdef\upprall{52} -\fetdef\downprall{53} +\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{54} -\fetdef\sixteenthflag{55} -\fetdef\thirtysecondflag{56} -\fetdef\sixtyfourthflag{57} -\fetdef\deighthflag{58} -\fetdef\dsixteenthflag{59} -\fetdef\dthirtysecondflag{60} -\fetdef\dsixtyfourthflag{61} +\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{62} -\fetdef\caltoclef{63} -\fetdef\bassclef{64} -\fetdef\cbassclef{65} -\fetdef\violinclef{66} -\fetdef\cviolinclef{67} +\fetdef\altoclef{63} +\fetdef\caltoclef{64} +\fetdef\bassclef{65} +\fetdef\cbassclef{66} +\fetdef\violinclef{67} +\fetdef\cviolinclef{68} -- 2.39.5