release: 1.0.13

diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index beff5d81a9fe7ad11386d0a47e6617df52a6c9dc..8b4a15a5d457edcb101f47db9340e47dd0f8158f 100644 (file)
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -21,11 +21,11 @@ PS_FILES = $(DVI_FILES:.dvi=.ps)
 STEPMAKE_TEMPLATES=tex documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
 
 STEPMAKE_TEMPLATES=tex documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
 

-
+export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS)

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

-export BIBINPUTS:="$(topdir)/Documentation/tex//"$(PATHSEP)$(BIBINPUTS)
+

 
 
 
 
 
 


@@ -40,6 +40,15 @@ default:
 GENHTMLS = engraving colorado glossary computer-notation
 OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 
 GENHTMLS = engraving colorado glossary computer-notation
 OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 

+#urg should generalise and move Lilypond -> StepMake
+# URG.  Lilypond specific. Move out. 
+$(outdir)/%.html: %.data $(depth)/VERSION
+       $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='\r' --package=$(topdir) -o $@ $<
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
+
+$(outdir)/%.tex: %.data $(depth)/VERSION
+       $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='\r' --package=$(topdir) -o $@ --latex $<
+

 
 $(outdir)/glossary.dvi: $(outdir)/glossary-table.tex
 $(outdir)/glossary.html: $(outdir)/glossary-table.html
 
 $(outdir)/glossary.dvi: $(outdir)/glossary-table.tex
 $(outdir)/glossary.html: $(outdir)/glossary-table.html

diff --git a/Documentation/tex/computer-forms.el b/Documentation/tex/computer-forms.el
deleted file mode 100644 (file)
index bc750e9..0000000
--- a/Documentation/tex/computer-forms.el
+++ /dev/null
@@ -1,21 +0,0 @@
-; Computer vocabularies are Copyright (C) 1998 
-; Jan Nieuwenhuizen <janneke@gnu.org>
-; Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
-(setq forms-file "computer.data")
-(setq forms-number-of-fields 7)
-(setq forms-read-only nil)                 ; to make sure
-(setq forms-field-sep ":")
-(setq forms-multi-line nil)
-
-(setq forms-format-list
-      (list
-       "*** Musical vocabulary ***\n"
-       "\nUS English:        " 1
-       "\nFrancais:          " 2
-       "\nDeutsch:           " 3
-       "\nBritish English:   " 4
-       "\nNederlands:        " 5
-       "\nItaliano:          " 6
-       "\n\nExplanation\n\n" 7
-       ))

diff --git a/Documentation/tex/computer.data b/Documentation/tex/computer.data
deleted file mode 100644 (file)
index 3732093..0000000
--- a/Documentation/tex/computer.data
+++ /dev/null
@@ -1,88 +0,0 @@
-assemble::::samenstellen::
-assembler::::samensteller::
-assert::::::
-binary::::tweetallig, binair::
-bit::::hapje::
-boot::::::
-bug::::luis::
-byte::::hapje::
-c(entral) p(rocessing) u(nit)::::c(entrale) v(erwerkings) e(enheid)::
-character::::teken:carattere:
-compile::::vertalen:compilare:
-compiler::::vertaler:compilatore:
-computer:ordinateur:rechner::rekentuig:comptatore:
-debug::::ontluizen::
-debugger::::ontluizer::
-default::::verval::
-device::::apparaat::
-directory::inhaltsverzeichnis(urg)::index::
-drag and drop::::sleur en pleur(silly)::
-(disk) drive::::(schijf) speler::
-edit::::redigeren, bewerken (hmm)::
-editor::::redigeur, bewerker (hmm)::
-exception::::uitzondering:eccezione:
-f(requently) a(sked) q(uestions)::::v(eel) v(oorkomende) v(ragen)::
-fatal::::noodlottig:fatale:
-file::datei::bestand:documento:
-float::::zweef::
-floating point::::zwevende komma::
-floppy disk::::schijfje:dischetto:
-free software::::vrij bedenksel::
-hard disk::::harde schijf::
-hardware::::ijzer::
-hexadecimal::::zestientallig::
-home page::::volkstuintje(silly), thuispagina(urg)::
-howto::::hoedan::
-hyper link::::super verbinding::
-identifier::::::
-inode::::::
-input::::invoer::
-int::::heel::
-integer::::geheel getal::
-interface::schnittstelle::tussensmoel(silly)::
-interpret::::vertolken:interpretare:
-interpreter::::vertolker::
-keyboard::tastatur::toetsenbord::
-lilypond:étang de lis:lilyteich:lily pond:lelievijver:stagno del giglio:
-(hard) link::::(harde) verbinding::
-linux::::loes(silly)::
-log in::::aanloggen::
-maintainer::::onderhouder::
-memory::::geheugen::
-menu::::::
-mirror::::spiegel::
-monitor::::beeldscherm::
-mouse::::muis::
-octal::::achttallig::
-open source software::::open-baar bedenksel::
-output::::uitvoer::
-(disk) partition::::(schijf) deel::
-patch::::lap::
-pixel::::puntje::
-pointer::::wijzer::
-printer::drucker::drukker::
-program::::programma::
-public domain::::publiek domein(urg)::
-real (number)::::reeel getal::
-real time::::waartijds::
-reset::::::
-root (directory)::::::
-root window::::::
-run::::draaien:girare:
-script::::schrift::
-sector::::segment::
-shell::::schaal::
-shortcut::::afstekertje::
-signed (int)::::::
-software::::bedenksel, programmatuur(spec), zachtwaar(silly)::
-string::::snoer:corda:
-swap(file)::::wisselbestand::
-symbolic link::::verwijz(ende verbind)ing::
-t(ape)ar(chive)::::b(and)ar(chief)::
-tarball::::barbaal::
-template::::leest::
-terminal::::eindstation::
-track::::spoor::
-unsigned (int)::::::
-void (pointer)::::leeg (wijzer)::
-workstation::::werkstation::

diff --git a/Documentation/tex/glossary-forms.el b/Documentation/tex/glossary-forms.el
index 0ad71b35af2e652c560d7c611a5bd6ff1a4afa4d..3ab4a48de2e3883c535c866f562c3673f4e4fd1e 100644 (file)
--- a/Documentation/tex/glossary-forms.el
+++ b/Documentation/tex/glossary-forms.el
@@ -7,7 +7,7 @@
 (setq forms-number-of-fields 7)
 (setq forms-read-only nil)                 ; to make sure
 (setq forms-field-sep "@")
 (setq forms-number-of-fields 7)
 (setq forms-read-only nil)                 ; to make sure
 (setq forms-field-sep "@")

-(setq forms-multi-line nil)
+(setq forms-multi-line "\C-m")

 
 (setq forms-format-list
       (list
 
 (setq forms-format-list
       (list

diff --git a/Documentation/tex/glossary-table.data b/Documentation/tex/glossary-table.data
index f5ffac0a408a9761f34dd7eb929960321f7f39b9..981de9bf6712b4d85e0ed09e9c18f9f710f1a4f3 100644 (file)
--- a/Documentation/tex/glossary-table.data
+++ b/Documentation/tex/glossary-table.data
@@ -9,12 +9,12 @@ accidental@alt
 adjacent keys@tons voisins@@@@@
 alto@alto@@@alt@@
 ancient form??? (diatonic minor scale)@forme du mode mineur ancien@@@@@
 adjacent keys@tons voisins@@@@@
 alto@alto@@@alt@@
 ancient form??? (diatonic minor scale)@forme du mode mineur ancien@@@@@

-appoggiatura@appogiature, ports de voix, notes d'agr\'ement@langer Vorschl\"age@@@appogiature@
-arbitrary number of bars' rest)@bâton de pause@@@@@
+appoggiatura@appogiature, ports de voix, notes d'agr\'ement@langer Vorschl\"age@@lange voorslag@appogiature@
+arbitrary number of bars' rest)@bâton de pause@@@meermaats rust@@

 arpeggio@arpège, arpègement@Brechungen@@gebroken akoord@arpeggio@
 artificial measure@mesure artificielle@@@@@
 artificial rest@respiration@@@@@
 arpeggio@arpège, arpègement@Brechungen@@gebroken akoord@arpeggio@
 artificial measure@mesure artificielle@@@@@
 artificial rest@respiration@@@@@

-ascending interval@intervalle ascendant@@@@@
+ascending interval@intervalle ascendant@@@stijgend interval@@

 augmented (interval)@augmenté (intervalle)@@@overmatig interval@@
 B@si@@@@@
 backfall, forefall@accent, chute, port de voix@Vorschlag@@korte voorslag@appogiature@
 augmented (interval)@augmenté (intervalle)@@@overmatig interval@@
 B@si@@@@@
 backfall, forefall@accent, chute, port de voix@Vorschlag@@korte voorslag@appogiature@


@@ -25,14 +25,14 @@ bass clef@cl
 bass@basse@@@bas@@
 beam@barre@Balken@@waardestreep/balk@barra@
 beat@temps@@@tel@@
 bass@basse@@@bas@@
 beam@barre@Balken@@waardestreep/balk@barra@
 beat@temps@@@tel@@

-brace@accolade@Klammer@@@accolada@Symbol at the start of a system that connects staffs.
+brace@accolade@Klammer@@accolade, haak@accolada@Symbol at the start of a system that connects staffs.

 brass@@@@koper (blazers)@@
 C clef@clé d'ut@@@C sleutel, alt sleutel@chiave di tenore@
 C@do@@@C@@
 C@ut@@@@@
 cadence@cadence@@@cadens@@
 cadenza@fioriture@@@cadens@cadenza@
 brass@@@@koper (blazers)@@
 C clef@clé d'ut@@@C sleutel, alt sleutel@chiave di tenore@
 C@do@@@C@@
 C@ut@@@@@
 cadence@cadence@@@cadens@@
 cadenza@fioriture@@@cadens@cadenza@

-cent@@@@@@1/1200 of an octave (1/100 of an equally tempered semitone)
+cent@@@@cent@@1/1200 of an octave (1/100 of an equally tempered semitone)

 chain of trills@chaîne de trilles@@@triller@@
 character@caractère@@@@@
 chevron@chevron@@@@@
 chain of trills@chaîne de trilles@@@triller@@
 character@caractère@@@@@
 chevron@chevron@@@@@


@@ -41,19 +41,19 @@ chromatic scale@gamme chromatique@@@chromatische toonladder@@
 chromatic semitone@demi-ton chromatique@@@chromatische halve toon@@
 chromatic transposition@transposition chromatique@@@@@
 chromatic type@genre chromatique@@@@@
 chromatic semitone@demi-ton chromatique@@@chromatische halve toon@@
 chromatic transposition@transposition chromatique@@@@@
 chromatic type@genre chromatique@@@@@

-church mode, ecclesiastical mode@mode ecclésiastique@@@@@
-clef@clé@Schl\"ussel@@Sleutel@la chiave (pl. le chiavi)@
-comma@comma@@@@@Difference in pitch of a note when the note is derived from a different tuning system.
+church mode, ecclesiastical mode@mode ecclésiastique@@@kerk toonladder@@
+clef@clé@Schl\"ussel@@sleutel@la chiave (pl. le chiavi)@
+comma@comma@@@komma@@Difference in pitch of a note when the note is derived from a different tuning system.

 compound interval@intervalle composé@@@@@
 compound interval@intervalle composé@@@@@

-compound measure@mesure composée@@@@@
+compound measure@mesure composée@@@samengestelde maat@@

 conjunct movement@mouvement conjoint@@@@@
 consonant interval; consonance@consonance@@@consonant@@
 contralto@contralto@@@@@
 contro-time@contre-temps@@@@@
 crescendo@crescendo@@@@crescendo@written with an extended opening angular bracket, indicates increasing volume
 conjunct movement@mouvement conjoint@@@@@
 consonant interval; consonance@consonance@@@consonant@@
 contralto@contralto@@@@@
 contro-time@contre-temps@@@@@
 crescendo@crescendo@@@@crescendo@written with an extended opening angular bracket, indicates increasing volume

-cue-notes@@Stichnoten@@stichnoten@@
+cue-notes@@Stichnoten@@stichnoten@@In an orchestral part, notes for a different instrument that hint when to\rstart playing.  Usually printed in smaller type.

 D@ré@@@@@
 D@ré@@@@@

-dash over/below@pizzicato@@@@@
+dash over/below@@@@@pizzicato@With plucked strings

 decrescendo@@@@@decrescendo@written with an extended closing angular bracket, indicates decreasing volume
 degree [of the scale]@degré [de la gamme]@@@trap [van de toonladder]@@
 descending interval@intervalle descendant@@@dalend interval@@
 decrescendo@@@@@decrescendo@written with an extended closing angular bracket, indicates decreasing volume
 degree [of the scale]@degré [de la gamme]@@@trap [van de toonladder]@@
 descending interval@intervalle descendant@@@dalend interval@@


@@ -68,27 +68,27 @@ dissonant interval; dissonance@dissonance@@@dissonant interval; dissonant@@
 dominant ninth chord@accord de neuvième dominante@@@dominant noon akkoord@@
 dominant seventh chord@accord de septième dominante@@@dominant septiem akkoord@@
 dominant@dominante@@@dominant@@A tone that creates tension;the fifth degree of the scale.
 dominant ninth chord@accord de neuvième dominante@@@dominant noon akkoord@@
 dominant seventh chord@accord de septième dominante@@@dominant septiem akkoord@@
 dominant@dominante@@@dominant@@A tone that creates tension;the fifth degree of the scale.

-dorian mode@@@@@@Mode obtained by raising the sixth in minor mode.  A Dorian scale can be played from D to D with no sharps or flats.
-dot (augmentation dot) @point@Punkt@@punt@punto@
+dorian mode@@@@dorische toonladder@@Mode obtained by raising the sixth in minor mode.  A Dorian scale can be played from D to D with no sharps or flats.
+dot (augmentation dot) @point@Punkt@@punt@punto@An augmentation dot after note adds multiplies the duration by one and a half.

 dot and curved line combined@point et liaison combinés@@@@@
 dot and curved line combined@point et liaison combinés@@@@@

-dot over/below@@@@staccato@staccato@
+dot over/below@@@@staccato@staccato@Play each note short.

 dot@point@@@punt@@
 dotted note@note pointée@@@@@
 double appoggiatura@appogiature double@@@@@
 dot@point@@@punt@@
 dotted note@note pointée@@@@@
 double appoggiatura@appogiature double@@@@@

-double bar line@double barre@Doppeltaktstrich@@dubbele streep@doppia barra@
+double bar line@double barre@Doppeltaktstrich@@dubbele streep@doppia barra@Indicates the end of a section within a movement.

 double dotted note@note doublement pointée@@@@@
 double flat@double bémol@Doppel-Be@@dubbelmol@doppio bemolle@
 double dotted note@note doublement pointée@@@@@
 double flat@double bémol@Doppel-Be@@dubbelmol@doppio bemolle@

-double sharp@double dièse@Doppelkreuz@@dubbelkruis@doppio diesis@
-double trill@trille double@@@@@
+double sharp@double dièse@Doppelkreuz@@dubbelkruis@doppio diesis@Raise pitch by two semitones
+double trill@trille double@@@@@A trill on a chord

 double triplet@double triolet@@@dubbele triool@@
 double triplet@double triolet@@@dubbele triool@@

-double whole note@@@breve@brevis@breve@
+double whole note@@@breve@brevis@breve@Note during twice as long as a whole note. Mainly used in pre-1650 music.

 duple meter@temps binaire@@@tweedelige maatsoort@@
 duplet@duolet@@@duool@@
 duration@durée@@@duur, lengte@@
 E@mi@@@@@
 eighth note@croche@@quaver@achtste noot@@
 eighth rest@demi-soupir@@quaver rest@achtste rust@@
 duple meter@temps binaire@@@tweedelige maatsoort@@
 duplet@duolet@@@duool@@
 duration@durée@@@duur, lengte@@
 E@mi@@@@@
 eighth note@croche@@quaver@achtste noot@@
 eighth rest@demi-soupir@@quaver rest@achtste rust@@

-engraving@@notenstechen@@steken@@
+engraving@@notenstechen@@steken@@The traditional process of music printing: cutting in a plate of metal.\rNow also the term for the art of music typography.

 enharmonic@enharmonique@@@enharmonisch@@Two notes, intervals, or scales are enharmonic if they have different names but sound the same.  Examples: C sharp and D flat, diminished fourth and major third
 equal temperament@tempérament égal@@@getempereerde stemming@@Tuning system in which each semitone is precisely 100 cents.
 essential alteration@altération essentielle@@@@@
 enharmonic@enharmonique@@@enharmonisch@@Two notes, intervals, or scales are enharmonic if they have different names but sound the same.  Examples: C sharp and D flat, diminished fourth and major third
 equal temperament@tempérament égal@@@getempereerde stemming@@Tuning system in which each semitone is precisely 100 cents.
 essential alteration@altération essentielle@@@@@


@@ -97,22 +97,22 @@ extension of interval@extension d'intervalle@@@@@
 F@fa@@@@@
 fermata@pauses@Fermate@@fermate@fermata@Prolonged sound or silence of indefinite duration
 fifth@quinte@@@kwint@@
 F@fa@@@@@
 fermata@pauses@Fermate@@fermate@fermata@Prolonged sound or silence of indefinite duration
 fifth@quinte@@@kwint@@

-flag, hook, tail, pennant@crochet@F\"anchen@@vlaggetje@coda uncinata@
-flat@bémol@Be@@mol@bemolle@
+flag, hook, tail, pennant@crochet@F\"anchen@@vlaggetje@coda uncinata@Ornament at the end of the stem of a note. The number of flags\rdetermines the lengths of notes shorter than a quarter note.
+flat@bémol@Be@@mol@bemolle@Lower pitch by a semitone

 four-bar rest@bâton de pause@@@@@
 fourth@quarte@@@kwart@@
 G@sol@@@@@
 four-bar rest@bâton de pause@@@@@
 fourth@quarte@@@kwart@@
 G@sol@@@@@

-glissando@glissement@Glissando@@glissando@glissando@
+glissando@glissement@Glissando@@glissando@glissando@Letting the pitch  slide fluently from one note to the other

 graces@petites notes@kurz Vorschl\"age, Manieren (?)@@versieringen@appogiature@
 grand staff@@@@piano systeem@@A combination of two staffs with a brace.  Usually used for piano music.
 half note@blanche@@minim@halve noot@@
 half rest@demi-pause@@minim rest@halve rust@@
 graces@petites notes@kurz Vorschl\"age, Manieren (?)@@versieringen@appogiature@
 grand staff@@@@piano systeem@@A combination of two staffs with a brace.  Usually used for piano music.
 half note@blanche@@minim@halve noot@@
 half rest@demi-pause@@minim rest@halve rust@@

-harmonic cadence@cadence harmonique@@@cadens@@
+harmonic cadence@cadence harmonique@@@harmonische cadens@@Sequence of chords that terminate a musical phrase or section.

 harmonic form (diatonic minor scale)@forme harmonique@@@@@
 harmonic interval@intervalle harmonique@@@@@
 incomplete measure@mesure incomplète@@@@@
 interval@intervalle@@@interval@@Difference in pitch between two notes
 harmonic form (diatonic minor scale)@forme harmonique@@@@@
 harmonic interval@intervalle harmonique@@@@@
 incomplete measure@mesure incomplète@@@@@
 interval@intervalle@@@interval@@Difference in pitch between two notes

-inversion of interval@renversement d'intervalle@@@inversie@@
+inversion of interval@renversement d'intervalle@@@interval inversie@@

 irregular contro-time@contre-temps irrégulier@@@@@
 irregular group@groupe irrégulier@@@@@
 irregular measure@mesure irrégulière@@@@@
 irregular contro-time@contre-temps irrégulier@@@@@
 irregular group@groupe irrégulier@@@@@
 irregular measure@mesure irrégulière@@@@@


@@ -124,7 +124,7 @@ kind of rest@figure de silence@@@@@
 leading note@sensible@@@@@
 ledger line, leger line@ligne supplémentaire@Hilfslinien, Kopfstriche (?)@@hulplijntje@lineette@A ledger line is an extension of the staff.  
 legato curve@liaison rythmique@@@legato boog@@
 leading note@sensible@@@@@
 ledger line, leger line@ligne supplémentaire@Hilfslinien, Kopfstriche (?)@@hulplijntje@lineette@A ledger line is an extension of the staff.  
 legato curve@liaison rythmique@@@legato boog@@

-lilypond@étang de lis@lilyteich@lily pond@lelievijver@stagno del giglio@
+lilypond@étang de lis@lilyteich@lily pond@lelievijver@stagno del giglio@A pond with  lilies floating in it, also the name of a music typesetter.

 line@ligne@@@lijn@@
 long appoggiatura@appogiature longue@@@@@
 lower number@chiffre inférieur@@@@@
 line@ligne@@@lijn@@
 long appoggiatura@appogiature longue@@@@@
 lower number@chiffre inférieur@@@@@


@@ -132,13 +132,13 @@ major (interval)@majeur (intervalle)@@@groot (interval)@@
 major mode@mode majeur@@@@@
 meantone temperament@tempérament mésotonique@@@@@Tuning based on a fifth that is 16 cents smaller than the natural fifth.  
 mediant@médiante@@@mediant@@The third degree of a scale
 major mode@mode majeur@@@@@
 meantone temperament@tempérament mésotonique@@@@@Tuning based on a fifth that is 16 cents smaller than the natural fifth.  
 mediant@médiante@@@mediant@@The third degree of a scale

-melodic cadence@cadence mélodique@@@cadens@@
+melodic cadence@cadence mélodique@@@cadens@@A free-form section at the end of a solo-concerto, where the soloist\rcan demonstrate his/her virtuosity.

 melodic form (diatonic minor scale)@forme mélodique@@@@@
 meter, time@m\`etre@Takt, Metrum@@maatsoort@@A recurring pattern of stress
 melodic form (diatonic minor scale)@forme mélodique@@@@@
 meter, time@m\`etre@Takt, Metrum@@maatsoort@@A recurring pattern of stress

-metronome@métronome@@@metronoom@@
-metronomic indication@indication métronomique@@@@@
+metronome@métronome@@@metronoom@@Device which sounds a steady beat
+metronomic indication@indication métronomique@@@@@Exact tempo indication (in beats per minute).  Also denoted by M.M. (M\"azels Metronom)

 mezzo-soprano@mezzo-soprano@@@@@
 mezzo-soprano@mezzo-soprano@@@@@

-middle C@do central@@@centrale C@@
+middle C@do central@@@centrale C@@First C below the 440 Hz A.

 minor (interval)@mineur (intervalle)@@@@@
 minor mode@mode mineur@@@@@
 modal note@note modale@@@@@
 minor (interval)@mineur (intervalle)@@@@@
 minor mode@mode mineur@@@@@
 modal note@note modale@@@@@


@@ -147,8 +147,8 @@ modulation@modulation@@@modulatie@@
 mordent@mordant, pinc\'e@Pralltriller, Mordent@@mordent@mordente@
 motive@incise@@@motief@@
 musical ladder@échelle musicale@@@@@
 mordent@mordant, pinc\'e@Pralltriller, Mordent@@mordent@mordente@
 motive@incise@@@motief@@
 musical ladder@échelle musicale@@@@@

-mixolydian mode@@@@@@Mode obtained by lowering the seventh in major.  A mixolydian scale can be obtained by playing G to G with no sharps or flats.
-natural sign@bécarre@Aufl\"osungszeichen@@herstellingsteken@bequadro@
+mixolydian mode@@@@Mixolydische toonladder@@Mode obtained by lowering the seventh in major.  A mixolydian scale can be obtained by playing G to G with no sharps or flats.
+natural sign@bécarre@Aufl\"osungszeichen@@herstellingsteken@bequadro@Do not play the following note flat or sharp.

 ninth@@@@noon@@
 note head@@Notenkopf@@noot balletje@@
 note@note@Note@@noot@nota@
 ninth@@@@noon@@
 note head@@Notenkopf@@noot balletje@@
 note@note@Note@@noot@nota@


@@ -164,7 +164,7 @@ perfect (interval)@juste (intervalle)@@@rein (interval)@@
 perfect major chord@accord parfait majeur@@@@@
 perfect minor chord@accord parfait mineur@@@@@
 phrase member@membre de phrase@@@@@
 perfect major chord@accord parfait majeur@@@@@
 perfect minor chord@accord parfait mineur@@@@@
 phrase member@membre de phrase@@@@@

-phrase@phrase@@@@@
+phrase@phrase@@@frase, zin@@

 phrasing@phrasé@@@@@
 pitch pipe; tuning fork@diapason@@@stemfluitje; stemvork@@
 pitch@hauteur@@@toonhoogte@@
 phrasing@phrasé@@@@@
 pitch pipe; tuning fork@diapason@@@stemfluitje; stemvork@@
 pitch@hauteur@@@toonhoogte@@


@@ -230,7 +230,7 @@ tonal note@note tonale@@@@@
 tonality@tonalité@@@tonaliteit@@
 tone@ton@@@toon@@
 tonic@tonique@@@tonica@@
 tonality@tonalité@@@tonaliteit@@
 tone@ton@@@toon@@
 tonic@tonique@@@tonica@@

-transposition@transposition@@@transpositie@@
+transposition@transposition@@@transpositie@@Shifting a melody up or down in pitch, while keeping the same relative pitches.

 treble clef@clé de sol@G Schl\"ussel@@G sleutel, viool sleutel@chiave di violino@
 tremolo@tr\'emolo@Tremolo@@tremolo@tremolo@
 trill; shake@trille, tremblement, battement (cadence)@Triller@@triller@trillo@
 treble clef@clé de sol@G Schl\"ussel@@G sleutel, viool sleutel@chiave di violino@
 tremolo@tr\'emolo@Tremolo@@tremolo@tremolo@
 trill; shake@trille, tremblement, battement (cadence)@Triller@@triller@trillo@


@@ -240,7 +240,7 @@ tritone@triton@@@@@
 turn; gruppetto@bris\'e, groupe, doubl\'e, grupetto@Doppelschlag@@dubbelslag@grupetto@
 two-bar rest@bâton de pause@@@@@
 underline over/below@portamento@@@@@
 turn; gruppetto@bris\'e, groupe, doubl\'e, grupetto@Doppelschlag@@dubbelslag@grupetto@
 two-bar rest@bâton de pause@@@@@
 underline over/below@portamento@@@@@

-unison@unisson@@@@unisono@
+unison@unisson@@@@unisono@Different instruments playing exactly the same melody.

 unit of beat@unité de temps@@@@@
 unit of measure@unité de mesure@@@@@
 upper number@chiffre supérieur@@@@@
 unit of beat@unité de temps@@@@@
 unit of measure@unité de mesure@@@@@
 upper number@chiffre supérieur@@@@@

diff --git a/Documentation/tex/glossary.yo b/Documentation/tex/glossary.yo
index 3fb23a5f58193f44be066502af52fa7bef1d9655..eb929dd2e38e8b8f098a034030bffc2d0d3e0a18 100644 (file)
--- a/Documentation/tex/glossary.yo
+++ b/Documentation/tex/glossary.yo
@@ -31,7 +31,7 @@ whentexinfo(notableofcontents())
 
 article(Glossary of notation terms)
       (Han-Wen Nienhuys and Jan Nieuwenhuizen)
 
 article(Glossary of notation terms)
       (Han-Wen Nienhuys and Jan Nieuwenhuizen)

-      (nop()PIPETHROUGH(date "+%B %d, %Y")()()nop())
+      ()

 
 COMMENT(
 
 
 COMMENT(
 


@@ -74,6 +74,9 @@ whenlatex(latexcommand(
        \inlanguage{Nederlands}{#5}\inlanguage{Italiano}{#6}}
       \input glossary-table
     }
        \inlanguage{Nederlands}{#5}\inlanguage{Italiano}{#6}}
       \input glossary-table
     }

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

 ))
 
 whenhtml(
 ))
 
 whenhtml(

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index ea02839fdd8c544bfacb1ef4a7a3d5e3e5791d26..826b4569e4a1b3115fcfbe3ee237b92a646e3765 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -1257,6 +1257,9 @@ dit(code(barAlways)) If set to 1 a bar line is drawn after each note.
 dit(code(defaultBarType)) Sets the default type of bar line.  See
 code(\bar) keyword.
 
 dit(code(defaultBarType)) Sets the default type of bar line.  See
 code(\bar) keyword.
 

+
+
+

 dit(code(keyoctaviation)) If set to 1, then keys are the same in all
 octaves.  If set to 0 then the key signature for different octaves can
 be different and is specified independently: code(\keysignature bes
 dit(code(keyoctaviation)) If set to 1, then keys are the same in all
 octaves.  If set to 0 then the key signature for different octaves can
 be different and is specified independently: code(\keysignature bes


@@ -1276,8 +1279,23 @@ dit(code(createKeyOnClefChange)) Set to a nonempty string if you want key
 signatures to be printed when the clef changes.  Set to the empty string (the
 default) if you do not want key signatures printed.
 
 signatures to be printed when the clef changes.  Set to the empty string (the
 default) if you do not want key signatures printed.
 

-dit(code(timeSignatureStyle)) Specify a character to print for the time
-signature.  The different time signature characters are shown below with
+
+dit(code(timeSignatureStyle)) Changes the default two-digit layout
+   for time signatures. The following values are recognized:
+   description(
+      dit(code(C)): 4/4 and 2/2 are typeset as C and struck C,
+      respectively. All other time signatures are written with two digits.
+      dit(code(old)): 2/2, 3/2, 3/4, 4/4, 6/4 and 9/4 are typeset with
+      old-style mensuration marks. All other time signatures are 
+      written with two digits.
+      dit(code(1)): All time signatures are typeset with a single
+      digit, e.g. 3/2 is written as 3.
+      dit(code(C2/2,C4/4, old2/2, old3/2, old3/4, old4/4, old6/4 or
+      old9/4)): Tells Lilypond to use a specific symbol as time
+      signature.
+   )
+
+The different time signature characters are shown below with

 their names:
 mudela(fragment,center)(
 \relative c'' {
 their names:
 mudela(fragment,center)(
 \relative c'' {


@@ -1297,6 +1315,7 @@ a2^"old9\_4" a2
 
 COMMENT( timeSignatureSymbol?  timeSignatureChar? )
 
 
 COMMENT( timeSignatureSymbol?  timeSignatureChar? )
 

+

 )
    
 
 )
    
 

diff --git a/NEWS b/NEWS
index 0011d46a84ec683c1da7d83070cde18af7a5484e..13afbece6361a94ec13d736c024900de1284c299 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,37 @@
+pl 12.mb1
+       - bf: feta-timesig.mf Added horizontal space, minor corrections.
+       - Changed meaning of Staff.timeSignatureStyle:
+               C       Use C and stroked C for 4/4,2/2
+               old     Use old style mensuration marks
+               1       Use single number
+               Cn/m    Set symbol explicitly, n/m=2/2 or 4/4   
+               oldn/m  Set symbol explicitly, n/m=2/2,3/2,3/4,4/4,6/4 or 9/4.
+         All other time signatures are typeset with the default two-digit
+         layout.
+               
+

 pl 12.jcn2
        - Lookup abstract base class
        - Lookup/Symtable(s): separation of input/output
 
 pl 12.jcn1
 pl 12.jcn2
        - Lookup abstract base class
        - Lookup/Symtable(s): separation of input/output
 
 pl 12.jcn1

-       - applied to 12.hwn2 patch
-       - redo of 11.jcn2's lookup/identifier
-
-pl 11.jcn2

        - preparations for braindead PostScript output
 
        - preparations for braindead PostScript output
 

+pl 12.hwn3
+       - praeludium-fuga-E to relative mode
+       - bf: mudela-mode.el
+       - bf: BIBINPUTS
+       - more dutch glossary + explanations
+       - table-to-html fixes
+pl 12.hwn2
+       - bf: mymycode in .yo
+       - VERSION to out/
+       - add VPATH to mutopia
+       - access_Identifier (bool): (non)copy arg now explicit.
+       - bf: lilypond-latex.tex
+  
+
+

 pl 12.hwn1
        - \remove "Engraver_type";
        - \output "bla" -> output = "bla" (mudela 0.1.6)
 pl 12.hwn1
        - \remove "Engraver_type";
        - \output "bla" -> output = "bla" (mudela 0.1.6)

diff --git a/TODO b/TODO
index 89c536fba333940319cc2bcdd4548515072a6dae..0ff8de840f9de981939ae15213e004d053c14e59 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,6 +10,12 @@ grep for TODO and ugh/ugr/urg
 
 BUGS:
 
 
 BUGS:
 

+       * fix \n after proccing
+
+ Summary of minor spelling irregularities:
+>   capitalization/use of underscores in property names
+>   \lyric vs \notes  \lyric vs \type Lyrics  (\lyric should have an -s)
+

        * fix Score.skipBars
 
        * repeat bars: need distance after ":|" and before "|:"
        * fix Score.skipBars
 
        * repeat bars: need distance after ":|" and before "|:"


@@ -31,8 +37,6 @@ BUGS:
 
        * make engraver hacking robust.
 
 
        * make engraver hacking robust.
 

-       * fix LOCALE settings, and \def\foo{2,000pt} output
-

        * use streambufs and iostream
        to provide IO handling for TeX stream, mudela stream, data-file.
 
        * use streambufs and iostream
        to provide IO handling for TeX stream, mudela stream, data-file.
 

diff --git a/VERSION b/VERSION
index 6b5e3eac28b83963eae670b962264f6f7dd7a3b2..e7a8da66cd99b8522d7e1718305ce763d27faa97 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0

-PATCH_LEVEL=12
-MY_PATCH_LEVEL=jcn2
+PATCH_LEVEL=13
+MY_PATCH_LEVEL=

 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 3f85164681692f84c6a49c46e5ff9ecc37d36a48..4d4b505197d1469b1b98914af14595ac21b90224 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -59,6 +59,7 @@ class Feta_file(File):
            if begin_autometric_re.search(line) == -1:
                line = ''
            line = line + regsub.sub('\n','', suf)
            if begin_autometric_re.search(line) == -1:
                line = ''
            line = line + regsub.sub('\n','', suf)

+            line = regsub.sub('\r','', line)

 
        if self.eof():
           return ''
 
        if self.eof():
           return ''

diff --git a/init/bar-numbering.ly b/init/bar-numbering.ly
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/init/property.ly b/init/property.ly
index 999a8307b44bdc84cf7b9c2d1bfbd6cdff5cb60b..4ab97b920fdd1b5f975e37a11e8859b9cb83da14 100644 (file)
--- a/init/property.ly
+++ b/init/property.ly
@@ -48,6 +48,14 @@ beamquantisation     2       quantise avoide wedge2) \beampostraditional
 keyoctaviation 0       Key signature only for specified octave \specialkey
 keyoctaviation 1       Key signature for all octaves   \normalkey
 
 keyoctaviation 0       Key signature only for specified octave \specialkey
 keyoctaviation 1       Key signature for all octaves   \normalkey
 

+timeSignatureStyle     C       Use C and stroked C for 4/4,2/2
+timeSignatureStyle     old     Use old style mensuration marks
+timeSignatureStyle     1       Use single number
+timeSignatureStyle     ""      Use normal two-digit time signature
+timeSignatureStyle     Cn/m    Set symbol explicitly, n/m=2/2 or 4/4   
+timeSignatureStyle     oldn/m  Set symbol explicitly,
+                               n/m=2/2,3/2,3/4,4/4,6/4 or 9/4.
+

 
 [Staff?]
 instrument             ascii   midi instrument table lookup
 
 [Staff?]
 instrument             ascii   midi instrument table lookup

diff --git a/init/score-bar-numbering.ly b/init/score-bar-numbering.ly
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/init/score-paper.ly b/init/score-paper.ly
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index 80ce97738bbd458290ee2caacb2c15fae65e5a27..da3004548de230a50102bb10e9fd5090c9d3a1df 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -32,19 +32,19 @@ praeludium_commands = \notes {
    \key e;
 }
 
    \key e;
 }
 

-praeludium_right = \notes\transpose c'' {
+praeludium_right =  \notes {

   \$praeludium_commands
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
   \type Staff <
   \$praeludium_commands
   \clef violin;
 
   % 13 -- how to type -- where to split -- this more neatly?
   \type Staff <

-    { \stemup r4 dis'4 e'4. e'8 ~ |
-      \shifton e'4 [d'8 fis'8] \shiftoff gis'4 ~ [gis'8 fis'16 e'16] |
-      fis'4 ~ [fis'8 e'16 dis'16] e'4 r8 e'8 }
-    { \stemup \shifton r4 bis4 cis'4 \shiftoff cis'4 |
-      a'4 ~ [a'16 gis'16 a'16 b'16] \shifton dis'4 cis'4 ~ |
-      [cis'8 dis'16 ais16] bis4 cis'4 r8 b8 }
-    {
+    \type Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ |
+      \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] |
+      fis4 ~ [fis8 e16 dis] e4 r8 e8 }
+    \type Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis |
+      a' ~ [a16 gis a b] \shifton dis,4 cis ~ |
+      [cis8 dis16 ais] bis4 cis r8 b }
+    \type Voice = IV \relative c'' {

 
       %\stemup
       %{
 
       %\stemup
       %{


@@ -52,61 +52,61 @@ praeludium_right = \notes\transpose c'' {
        edition; a hack to avoid collisions
       %}
       \stemdown
        edition; a hack to avoid collisions
       %}
       \stemdown

-      \shifton s4 gis4 }
+      \shifton s4 gis }

       
       

-    { \stemdown
+    \type Voice =  II \relative c' { \stemdown

 %      \shifton       % idem
 
 %      \shifton       % idem
 

-      r4 fis4 \shiftoff gis4 gis4 |
-      a4. cis'8 gis2 |
-      fis4 gis4 gis4 r8 e8 }
+      r4 fis \shiftoff gis gis |
+      a4. cis8 gis2 |
+      fis4 gis gis r8 e8 }

   > |
   % 16
 }
 
   > |
   % 16
 }
 

-praeludium_left = \notes {
+praeludium_left = \notes \relative c {

   \$praeludium_commands
   \clef bass;
 
   % 13
   \type Staff <
   \$praeludium_commands
   \clef bass;
 
   % 13
   \type Staff <

-    { \stemup r4 dis'4 cis'4 cis'4 ~ |
-      [cis'8 a8 d'8 cis'8] [bis8 gis8] cis'4 |
-      dis'2 cis'4 r8 cis'8 }
+    { \stemup r4 dis' cis cis ~ |
+      [cis8 a d cis] [bis gis] cis4 |
+      dis2 cis4 r8 cis }

     { \stemup bis2 }
     { \stemup bis2 }

-    { \stemup \shifton r4 gis4 ~ [gis 8 gis8] ~ \stemdown \shiftoff gis4 |
+    { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 |

       a4. fis8 gis4. a8 ~ |
       a4. fis8 gis4. a8 ~ |

-      a4 gis4 gis4 r8 gis8 }
+      a4 gis4 gis r8 gis }

 %    { \stemup \shifton s4 fis4 e}
 % a quick hack to avoid some collisons
     { \stemdown \shifton s4 fis4 e}
     { \stemdown s4 dis4 cis4 }
   > |
 %    { \stemup \shifton s4 fis4 e}
 % a quick hack to avoid some collisons
     { \stemdown \shifton s4 fis4 e}
     { \stemdown s4 dis4 cis4 }
   > |

-  % 16
+  %16

 }
 
 }
 

-praeludium_pedal = \notes {
+praeludium_pedal = \notes \relative c{

   \$praeludium_commands  
   \clef bass;
 
   \$praeludium_commands  
   \clef bass;
 

-  % 13
-  r4 fis,4-\ltoe e,4.-\lheel e8-\rheel | 
-  fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a8-\rtoe] | 
-  dis4-\ltoe gis4-\rtoe [cis8-\ltoe b,!8-\lheel ais,8-\rtoe gis,8-\ltoe] |
-  % 16
+  %13
+  r4 fis,4-\ltoe e4.-\lheel e'8-\rheel | 
+  fis4.-\rtoe fis8-\rtoe fis4-\rtoe [e8-\ltoe a-\rtoe] | 
+  dis,4-\ltoe gis-\rtoe [cis,8-\ltoe b!-\lheel ais-\rtoe gis-\ltoe] |
+  %16

 }
 
 
 }
 
 

-fuga2_commands = \notes{
-  \time 3/4;
+fugaII_commands = \notes{
+  \time3/4;

   \key e;              % E-major
 }
 
   \key e;              % E-major
 }
 

-fuga2_right = \notes\transpose c'' {
-  \$fuga2_commands
+fugaII_right = \notes   \relative c''   {
+  \$fugaII_commands

   \clef violin;
 
   \clef violin;
 

-  % 15
+  %15

   \type Staff <
     { \stemup [b8 fis8] b4 }
     { \stemdown fis2 }
   \type Staff <
     { \stemup [b8 fis8] b4 }
     { \stemdown fis2 }


@@ -120,56 +120,56 @@ fuga2_right = \notes\transpose c'' {
       |
    %}
    \type Staff <
       |
    %}
    \type Staff <

-     { \stemup \shiftoff e'4 }
-     { \stemup \shifton cis'4 }
-     { \stemup \shifton ais4 }
-     { \stemdown fis4 }
+     { \stemup \shiftoff e4 }
+     { \stemup \shifton cis }
+     { \stemup \shifton ais }
+     { \stemdown fis }

    > |
    > |

-  % 16
+  %16

   \type Staff <
   \type Staff <

-    { \stemup dis'2 dis'4 |
-      cis'2 cis'4 |
-      b4. [cis'8 dis'8 e'8] }
-    { \stemup \shifton [b8 fis8] b2 ~ |
-      [b8 a!16 gis16] a2 ~ |
+    { \stemup dis2 dis4 |
+      cis2 cis4 |
+      b4. [cis8 dis e] }
+    { \stemup \shifton [b8 fis] b2 ~ |
+      [b8 a!16 gis] a2 ~ |

       a4 gis2 }
     { \stemdown fis2. ~ |
       a4 gis2 }
     { \stemdown fis2. ~ |

-      fis2. ~ |
+      fis ~ |

       fis4 e2 }
   > |
       fis4 e2 }
   > |

-  % 19
+  %19

 }
 
 }
 

-fuga2_left = \notes {
-  \$fuga2_commands  
+fugaII_left = \notes {
+  \$fugaII_commands  

   \clef bass;
 
   \clef bass;
 

-  % 15
+  %15

   \type Staff < 
     { \stemdown b2 \stemup ais4 |
       b2 b4 }
     { \stemdown s2 e4 |
       fis2 fis4 }
   >
   \type Staff < 
     { \stemdown b2 \stemup ais4 |
       b2 b4 }
     { \stemdown s2 e4 |
       fis2 fis4 }
   >

-  \stemdown cis'2 e'4 |
+  \stemdown cis2 e4 |

   b4. b8 b4 |
   b4. b8 b4 |

-  % 19
+  %19

 }
 
 }
 

-fuga2_pedal = \notes {
-  \$fuga2_commands  
+fugaII_pedal = \notes \relative c {
+  \$fugaII_commands  

   \clef bass;
 
   \clef bass;
 

-  % 15
+  %15

   dis4.-\ltoe e8-\rtoe cis4 |
   dis4.-\ltoe e8-\rtoe cis4 |

-  b,4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] |
+  b4.-\lheel [cis8-\ltoe dis8-\rtoe e8-\rheel] |

   fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] |
   dis4-\rtoe e4-\rheel e,4-\ltoe |
   fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] |
   dis4-\rtoe e4-\rheel e,4-\ltoe |

-  % 19
+  %19

 }
 
 breakmusic = \notes { 
 }
 
 breakmusic = \notes { 

-  %\time 4/4;
+  %\time4/4;

   r1
 }
 
   r1
 }
 


@@ -179,16 +179,16 @@ breakmusic = \notes {
   \type Score <
     \type GrandStaff <
       \type Staff = treble {
   \type Score <
     \type GrandStaff <
       \type Staff = treble {

-        \praeludium_right \breakmusic \fuga2_right }
+        \praeludium_right \breakmusic \fugaII_right }

       \type Staff = bass { 
       \type Staff = bass { 

-        \praeludium_left \breakmusic \fuga2_left }
+        \praeludium_left \breakmusic \fugaII_left }

     > 
     \type Staff = pedal {
     > 
     \type Staff = pedal {

-      \praeludium_pedal \breakmusic \fuga2_pedal }
+      \praeludium_pedal \breakmusic \fugaII_pedal }

   >
 
   \paper{}
 
   \midi {
   >
 
   \paper{}
 
   \midi {

-    \tempo 4 = 96; }
+    \tempo 4 =96; }

 }
 }

diff --git a/input/test/time.fly b/input/test/time.fly
index 0029b154143dd16e018b6118bea8c962ee074bd4..3908c4cf641ad7fffcdec22a55304d5a64058362 100644 (file)
--- a/input/test/time.fly
+++ b/input/test/time.fly
@@ -1,23 +1,111 @@
-
-

 \property Staff.timeSignatureStyle = "C"
 \property Staff.timeSignatureStyle = "C"

-\time 12/8;
-
-[c8 c c][c8 c c][c8 c c][c8 c c]
-
+\time 1/1;
+c''1^"timeSignatureStyle = \"C\"" |

 \time 2/2;
 \time 2/2;

-\property Staff.timeSignatureStyle = "old3_2"
-c2 c2
-
+c1 |
+\time 3/4;
+c2. |
+\time 4/4;
+c1 |
+\time 5/4;
+c2. c2 |
+\time 6/4;
+c1. |
+\time 3/2;
+c1. |
+\time 7/4;
+c1 c2. |
+\time 8/4;
+c\breve |
+\time 9/4;
+c2. c2. c2. |
+\break
+\property Staff.timeSignatureStyle = "old"
+\time 1/1;
+c1^"timeSignatureStyle = \"old\"" |

 \time 2/2;
 \time 2/2;

-\property Staff.timeSignatureStyle = "oldC"
-c2 c2
-
+c1 |
+\time 3/4;
+c2. |
+\time 4/4;
+c1 |
+\time 5/4;
+c2. c2 |
+\time 6/4;
+c1. |
+\time 3/2;
+c1. |
+\time 7/4;
+c1 c2. |
+\time 8/4;
+c\breve |
+\time 9/4;
+c2. c2. c2. |
+\break
+\property Staff.timeSignatureStyle = ""
+\time 1/1;
+c1^"timeSignatureStyle = \"\"" |

 \time 2/2;
 \time 2/2;

-\property Staff.timeSignatureStyle = "old6_4"
-c2 c2
-
+c1 |
+\time 3/4;
+c2. |
+\time 4/4;
+c1 |
+\time 5/4;
+c2. c2 |
+\time 6/4;
+c1. |
+\time 3/2;
+c1. |
+\time 7/4;
+c1 c2. |
+\time 8/4;
+c\breve |
+\time 9/4;
+c2. c2. c2. |
+\break
+\property Staff.timeSignatureStyle = "1"
+\time 1/1;
+c1^"timeSignatureStyle = \"1\"" |
+\time 2/2;
+c1 |
+\time 3/4;
+c2. |
+\time 4/4;
+c1 |
+\time 5/4;
+c2. c2 |
+\time 6/4;
+c1. |
+\time 3/2;
+c1. |
+\time 7/4;
+c1 c2. |
+\time 8/4;
+c\breve |
+\time 9/4;
+c2. c2. c2. |
+\break
+\property Staff.timeSignatureStyle = "old9/4"
+\property Staff.textalignment = \center
+\time 1/1;
+c1^"old9/4" |
+\property Staff.timeSignatureStyle = "old6/4"

 \time 2/2;
 \time 2/2;

-\property Staff.timeSignatureStyle = "old9_4"
-c2 c2
+c1^"old6/4" |
+\property Staff.timeSignatureStyle = "old3/2"
+\time 3/4;
+c2.^"old3/2" |
+\property Staff.timeSignatureStyle = "old4/4"
+\time 4/4;
+c1^"old4/4" |
+\property Staff.timeSignatureStyle = "old2/2"
+\time 5/4;
+c2.^"old2/2" c2 |
+\property Staff.timeSignatureStyle = "C4/4"
+\time 6/4;
+c1.^"C4/4" |
+\property Staff.timeSignatureStyle = "C2/2"
+\time 3/2;
+c1.^"C2/2" |

 
 

diff --git a/lily/VERSION b/lily/VERSION
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lily/afm.cc b/lily/afm.cc
index 2935a8a96797100ed0ab1fb06c2a43107b0b1ede..afd43bf1afe47e9f9b1c34203e684f5116017caa 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -105,13 +105,13 @@ Adobe_font_metric::str () const
   UGH. should have hashtable.
  */
 Adobe_font_char_metric
   UGH. should have hashtable.
  */
 Adobe_font_char_metric

-Adobe_font_metric::find_char (String nm) const
+Adobe_font_metric::find_char (String nm, bool warn) const

 {
   for (int i=0; i < char_metrics_.size (); i++)
     if (char_metrics_[i].N_ == nm)
       return char_metrics_[i];
 {
   for (int i=0; i < char_metrics_.size (); i++)
     if (char_metrics_[i].N_ == nm)
       return char_metrics_[i];

-
-  warning (_f ("can't find character called `%s'", nm.ch_C()));
+  if (warn)
+    warning (_f ("can't find character called `%s'", nm.ch_C()));

 
  Adobe_font_char_metric a;
  return a;
 
  Adobe_font_char_metric a;
  return a;

diff --git a/lily/atom.cc b/lily/atom.cc
index ff2e75626aa6c0e45d4137d238d94ef55509d8d3..cbb5579563cc487a302db695a527e8d9850b1e56 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -114,3 +114,9 @@ Atom::translate (Offset o)
   off_ += o;
   check_infinity_b ();
 }
   off_ += o;
   check_infinity_b ();
 }

+
+bool
+Atom::empty() const
+{
+  return (dim_.y().length() == 0);
+}

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index 8a932d05fc0c988d5fe9921ee85f3a96cad98a43..4f5d85c8d562c74256446d8316605d5e230b91fc 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -43,7 +43,7 @@ struct Adobe_font_metric {
   String EncodingScheme_;
   Array<Adobe_font_char_metric> char_metrics_;
 
   String EncodingScheme_;
   Array<Adobe_font_char_metric> char_metrics_;
 

-  Adobe_font_char_metric find_char (String name) const;
+  Adobe_font_char_metric find_char (String name, bool warn=true) const;

   String str () const;
   Adobe_font_metric ();
 };
   String str () const;
   Adobe_font_metric ();
 };

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index 774e185d364e959656236d0d8dee96c65cb11d17..0d88e7ce315cbba217a753c552fdc4c15f32e6f1 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -32,5 +32,6 @@ public:
   Box extent() const;
   void print() const;
   bool check_infinity_b () const;
   Box extent() const;
   void print() const;
   bool check_infinity_b () const;

+  bool empty() const;

 };
 #endif
 };
 #endif

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 3993b9e9a7121f2e0d4533c28d102e58c16aec3c..a1bedc7a24769668d43e518212dbd3494bec9b3a 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -31,7 +31,7 @@ public:
   Atom accidental (int) const;
   void add (String, Symtable*);
   virtual Atom afm_find (String s) const = 0;
   Atom accidental (int) const;
   void add (String, Symtable*);
   virtual Atom afm_find (String s) const = 0;

-  Atom afm_find (String, String) const; 
+  Atom afm_find (String, String) const;

   Atom ball (int) const;
   Atom bar (String, Real height) const;
   Atom beam (Real,Real, Real) const;
   Atom ball (int) const;
   Atom bar (String, Real height) const;
   Atom beam (Real,Real, Real) const;


@@ -55,7 +55,7 @@ public:
   Atom text (String style, String text) const;
   Atom vbrace (Real &dy) const;
   virtual Atom vbracket (Real &dy) const = 0;
   Atom text (String style, String text) const;
   Atom vbrace (Real &dy) const;
   virtual Atom vbracket (Real &dy) const = 0;

-  Atom special_time_signature (String) const;
+  Atom special_time_signature (String, Array<Scalar>) const;

   Atom time_signature (Array<Scalar>) const;
 
   Paper_def * paper_l_;
   Atom time_signature (Array<Scalar>) const;
 
   Paper_def * paper_l_;

diff --git a/lily/lookup.cc b/lily/lookup.cc
index afb9ee10dcf0d50d8f5ad597d9bc7890224ec41e..fc6843a497801d45ccac418ee93d54e1002dd983 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -78,6 +78,9 @@ Lookup::afm_find (String s, String str) const
   Adobe_font_char_metric m = afm_p_->find_char (s);
 
   Atom a;
   Adobe_font_char_metric m = afm_p_->find_char (s);
 
   Atom a;

+  if (m.width () ==0)
+    return a;
+  

   a.dim_ = m.B_;
   a.dim_[X_AXIS] *= 1 / 1000.0;
   a.dim_[Y_AXIS] *= 1 / 1000.0;
   a.dim_ = m.B_;
   a.dim_[X_AXIS] *= 1 / 1000.0;
   a.dim_[Y_AXIS] *= 1 / 1000.0;


@@ -190,10 +193,18 @@ Lookup::script (String str) const
 }
 
 Atom
 }
 
 Atom

-Lookup::special_time_signature (String s) const
+Lookup::special_time_signature (String s, Array<Scalar> arr) const

 {
 {

-  Atom a (afm_find ("timesig-"+ s));
-  return a;
+  String symbolname="timesig-"+s+"%/%";
+  Atom a (afm_find (substitute_args(symbolname,arr)));
+  if (!a.empty()) 
+    return a;
+  // Try if the full name was given
+  a=afm_find ("timesig-"+s);
+  if (!a.empty()) 
+    return a;
+  // Resort to default layout with numbers
+  return time_signature(arr);

 }
 
 Atom
 }
 
 Atom

diff --git a/lily/ps-plet.cc b/lily/ps-plet.cc
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 50878c467905b469faada933b93c4cf3ea9530f8..7e18f0e05dc7d93f9535fc40403021a0b02c2623 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -24,7 +24,16 @@ Time_signature::brew_molecule_p () const
   Atom s;
   if (time_sig_type_str_.length_i ())
     {
   Atom s;
   if (time_sig_type_str_.length_i ())
     {

-      s = lookup_l ()-> special_time_signature (time_sig_type_str_);
+      if (time_sig_type_str_[0]=='1')
+       {
+         Array<Scalar> tmparr=args_;
+         tmparr[1]=Scalar(0);
+         s = lookup_l ()->time_signature (tmparr);
+       }
+      else
+       {
+         s = lookup_l ()-> special_time_signature (time_sig_type_str_,args_);
+       }

     }
   else
     s = lookup_l ()->time_signature (args_);
     }
   else
     s = lookup_l ()->time_signature (args_);

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index 5cc82d569969c9c5fc3fc09fc5a3b26865a8fc78..f416bba8c25d33b4c59c1bb105795b952fb83e3e 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -90,8 +90,5 @@
 1.0.11.mb1
 1.0.11.uu1
 1.0.12
 1.0.11.mb1
 1.0.11.uu1
 1.0.12

-1.0.12.am1
-1.0.12.hwn1
-1.0.12.hwn2
-1.0.12.jcn1
-1.0.12.jcn2
+1.0.12.uu1
+1.0.13

diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index 9fa9b7e27257a546055f18861900396e0f197e56..de000695407e35a103cbcaaa037bf9c01a327e43 100644 (file)
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
 Begin3
 Titel: LilyPond

-Versie: 1.0.12
-Inschrijf datum: 30SEP98
+Versie: 1.0.13
+Inschrijf datum: 05OCT98

 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps

-       770k lilypond-1.0.12.tar.gz 
+       770k lilypond-1.0.13.tar.gz 

 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/

-       770k lilypond-1.0.12.tar.gz 
+       770k lilypond-1.0.13.tar.gz 

 Copi-eer voorwaarden: GPL
 End
 Copi-eer voorwaarden: GPL
 End

diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index 714d3bc1908220a720b820cb1027b920cd2ac8f7..a048f5c5277403ae5129db4f53e2d62f019f8e9a 100644 (file)
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Begin3
 Title: LilyPond

-Version: 1.0.12
-Entered-date: 30SEP98
+Version: 1.0.13
+Entered-date: 05OCT98

 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play
 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play


@@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
        janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert

-       770k lilypond-1.0.12.tar.gz 
+       770k lilypond-1.0.13.tar.gz 

 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/

-       770k lilypond-1.0.12.tar.gz 
+       770k lilypond-1.0.13.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index a86c555bb25340300212efe6d0142ad5dba4ecdc..ffb495021d34d4e6bb407c35e213babcdbebdaef 100644 (file)
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
 Name: lilypond

-Version: 1.0.12
+Version: 1.0.13

 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing

-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.12.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.13.tar.gz

 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index bf233f56803c30d079ec0292e0075ef00caa1879..7cddd3215d33bdcce5330da3469f96e92342d125 100644 (file)
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -1,12 +1,19 @@
 % 
 % feta-timesig.mf --  implement Time Signatures
 % 
 % 
 % feta-timesig.mf --  implement Time Signatures
 % 

-% source file of the Feta (Font-En-Tja) music font
+% source file of the Feta (not an abbreviation of Font-En-Tja) music font

 % 
 % (c) 1998 Mats Bengtsson <matsb@s3.kth.se>
 
 fet_begingroup("timesig");
 
 % 
 % (c) 1998 Mats Bengtsson <matsb@s3.kth.se>
 
 fet_begingroup("timesig");
 

+def set_C_width =
+       save left_width, right_width;
+       left_width# := .8 interline#;
+       right_width# := .7 interline#;
+       define_pixels(left_width,right_width);
+enddef;
+

 def draw_C =
        save hair, bulb_rad;
        hair# := stafflinethickness#;
 def draw_C =
        save hair, bulb_rad;
        hair# := stafflinethickness#;


@@ -16,9 +23,9 @@ def draw_C =
        x1r = x5;
        y1r = .4 interline;
        z2 = (0, interline);
        x1r = x5;
        y1r = .4 interline;
        z2 = (0, interline);

-       z3r = (-b, 0);
+       z3r = (-left_width, 0);

        z4 = (0, -interline);
        z4 = (0, -interline);

-       z5r = (w, -2 stafflinethickness);
+       z5r = (right_width, -2 stafflinethickness);

        
        penpos1(hair, 0);
        penpos2(stafflinethickness, 90);
        
        penpos1(hair, 0);
        penpos2(stafflinethickness, 90);


@@ -36,14 +43,18 @@ def draw_C =
        penlabels(1,2,3,4,5);
 enddef;
 
        penlabels(1,2,3,4,5);
 enddef;
 

-fet_beginchar ("4/4 meter", "C", "fourfourmeter")
-       set_char_box(.8 interline#, .7 interline#, interline#, interline#);
+fet_beginchar ("4/4 meter", "C4/4", "fourfourmeter")
+       set_C_width;
+       set_char_box(left_width# + interline#, right_width# + interline#, 
+               interline#, interline#);

        
        draw_C;
 fet_endchar;
 
        
        draw_C;
 fet_endchar;
 

-fet_beginchar ("2/2 meter", "C2", "allabreve")
-       set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
+fet_beginchar ("2/2 meter", "C2/2", "allabreve")
+       set_C_width;
+       set_char_box(left_width# + interline#, right_width# + interline#, 
+               1.4 interline#, 1.4 interline#);

        
        draw_C;
        draw_block((-1.5stafflinethickness, -d), (0, h));
        
        draw_C;
        draw_block((-1.5stafflinethickness, -d), (0, h));


@@ -57,31 +68,37 @@ Cdiameter# := 3/2 interline#;
 Cthickness# := 2 stafflinethickness#;
 define_pixels(Cdiameter,Cthickness);
 
 Cthickness# := 2 stafflinethickness#;
 define_pixels(Cdiameter,Cthickness);
 

-fet_beginchar ("Mensural 4/4 meter", "oldC", "oldfourfourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#);
+%% tempus imperfectum cum prolatione imperfecta
+fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .5 Cdiameter#, .5 Cdiameter#);

        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter;
 fet_endchar;
 
        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter;
 fet_endchar;
 

-fet_beginchar ("Mensural 2/2 meter", "oldC2", "oldallabreve")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, interline#, interline#);
+fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               interline#, interline#);

        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter;
        draw_block((-Cthickness, -d), (0, h));
 fet_endchar;
 
        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter;
        draw_block((-Cthickness, -d), (0, h));
 fet_endchar;
 

-fet_beginchar ("Mensural 3/2 meter", "old3_2", "oldthreetwometer")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#);
+%% tempus perfectum cum prolatione imperfecta
+fet_beginchar ("Mensural 3/2 meter", "old3/2", "oldthreetwometer")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .5 Cdiameter#, .5 Cdiameter#);

        
        pickup pencircle scaled Cthickness;
        draw fullcircle scaled Cdiameter;
 fet_endchar;
 
        
        pickup pencircle scaled Cthickness;
        draw fullcircle scaled Cdiameter;
 fet_endchar;
 

-fet_beginchar ("Mensural 6/4 meter", "old6_4", "oldsixfourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
-               .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
+%% tempus imperfectum cum prolatione perfecta
+fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .5 Cdiameter# + .5 interline#, .5 Cdiameter#+ .5 interline#);

        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter 
        
        pickup pencircle scaled Cthickness;
        draw threequartercircle rotated 45 scaled Cdiameter 


@@ -90,9 +107,10 @@ fet_beginchar ("Mensural 6/4 meter", "old6_4", "oldsixfourmeter")
        draw (0,.5 interline);
 fet_endchar;
 
        draw (0,.5 interline);
 fet_endchar;
 

-fet_beginchar ("Mensural 9/4 meter", "old9_4", "oldninefourmeter")
-       set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
-               .5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
+%% tempus perfectum cum prolatione perfecta
+fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               .5 Cdiameter# + .5 interline#, .5 Cdiameter#+ .5 interline#);

        
        pickup pencircle scaled Cthickness;
        draw fullcircle scaled Cdiameter shifted (0,.5 interline);
        
        pickup pencircle scaled Cthickness;
        draw fullcircle scaled Cdiameter shifted (0,.5 interline);

diff --git a/mudela-mode.el b/mudela-mode.el
index f6ea3233e75b1e5b6da49d000e9ae8021a0cdbeb..53c8104d9340f9350119efdef99726df1fa6b942 100644 (file)
--- a/mudela-mode.el
+++ b/mudela-mode.el
@@ -35,7 +35,7 @@
                     "accepts" "accidentals" "break" "bar" "cadenza" 
                     "clef" "cm" "consists" "contains" "duration" "absdynamic" 
                     "in" "translator" "type" "lyric" "key" "maininput" "notes"
                     "accepts" "accidentals" "break" "bar" "cadenza" 
                     "clef" "cm" "consists" "contains" "duration" "absdynamic" 
                     "in" "translator" "type" "lyric" "key" "maininput" "notes"

-                    "musical_pitch" "meter" "midi" "mm" "header"
+                    "musical_pitch" "time" "midi" "mm" "header"

                     "notenames" "octave" "output" "partial" "paper" "plet"
                     "property" "pt" "shape" "relative" "include" "score"
                     "script" "skip"  "table" "spandynamic" "symboltables"
                     "notenames" "octave" "output" "partial" "paper" "plet"
                     "property" "pt" "shape" "relative" "include" "score"
                     "script" "skip"  "table" "spandynamic" "symboltables"

diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index a14be9e911f13fd18decfccb8be094dbb6338caf..417657c88aca4d54183574a5693cd896bc03eefa 100644 (file)
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -227,6 +227,7 @@ bc=\notes\transpose c'{
 
 \score{
   \type StaffGroup <
 
 \score{
   \type StaffGroup <

+    \property StaffGroup.timeSignatureStyle = "old"

     \vi1
     \vi2
     \bc
     \vi1
     \vi2
     \bc

diff --git a/scripts/ly2dvi32.py b/scripts/ly2dvi32.py
index 40f1e157db939e84f4c80b80ee206c8ab18449d1..74c5495c087e20b74aaa7cd57ab3d518bb8d25cb 100644 (file)
--- a/scripts/ly2dvi32.py
+++ b/scripts/ly2dvi32.py
@@ -14,7 +14,7 @@ Output: DVI file
 """
 
 name = 'ly2dvi'
 """
 
 name = 'ly2dvi'

-version = '0.0.4'
+version = '0.0.5'

 errorlog = ''
 
 import sys
 errorlog = ''
 
 import sys


@@ -504,14 +504,18 @@ class Properties:
         locate and open titledefs.tex file
         """
 
         locate and open titledefs.tex file
         """
 

-        path =''
-        cmd =('kpsewhich tex %s %s' % (var,errorlog))
-        pipe = os.popen (cmd, 'r')
-        path = pipe.readline ()[:-1] # chop off \n
-       return_status =  pipe.close()
-       if return_status and not path:
+        if os.name == 'nt':

             path = os.path.join(this.get('root'), 'texmf', 'tex',
                                 'lilypond', var)
             path = os.path.join(this.get('root'), 'texmf', 'tex',
                                 'lilypond', var)

+        else:
+            path =''
+            cmd =('kpsewhich tex %s %s' % (var,errorlog))
+            pipe = os.popen (cmd, 'r')
+            path = pipe.readline ()[:-1] # chop off \n
+            return_status =  pipe.close()
+            if return_status and not path:
+                path = os.path.join(this.get('root'), 'texmf', 'tex',
+                                    'lilypond', var)

        fd = open(path, 'r')
         return fd
 
        fd = open(path, 'r')
         return fd
 

diff --git a/stepmake/NEWS b/stepmake/NEWS
index fcf8a7380da3c45610c8cd61ed4ceb93b536f727..fe5a858598e2d44da1e424547ad63f2e2c01614a 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,7 +1,12 @@
+pl 55
+       - table-to-html stuff moved .
+

 pl 54
        - && for TeX
 pl 54
        - && for TeX

+

 pl 53
        - moved TeX stuff into tex template
 pl 53
        - moved TeX stuff into tex template

+

 pl 52
        - striproff
        - reeable $(PACKAGE)_LIBES,_INCLUDES
 pl 52
        - striproff
        - reeable $(PACKAGE)_LIBES,_INCLUDES

diff --git a/stepmake/VERSION b/stepmake/VERSION
index 70ca4128d75a4062835a9460d84a7bda07b6c364..8f110f1f6df8bf48ae7527c5f8b60eb602bbf75e 100644 (file)
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1

-PATCH_LEVEL=54
+PATCH_LEVEL=55

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

diff --git a/stepmake/bin/table-to-html.py b/stepmake/bin/table-to-html.py
index af199bbfbe47d807d041d0986339b357968598b3..437116fbcc7842547a02fa4395a388374821b913 100644 (file)
--- a/stepmake/bin/table-to-html.py
+++ b/stepmake/bin/table-to-html.py
@@ -43,67 +43,60 @@ def header (html):
 def footer (html):
     html.write ('</table></body>')
 
 def footer (html):
     html.write ('</table></body>')
 

-def convert_html (inname, outname, separator):
-    # urg, again?
-    from flower import *
-    table = File (inname)
+def convert_html (inname, outname, cols, separator, linesep):
+    table = open (inname)

     # ugh
     # ugh

-    html = File (outname, 'w')
+    html = open (outname, 'w')

 
     header (html)
     i = 0
 
     header (html)
     i = 0

-    while not table.eof ():
-       line = table.readline ()
+    for line in table.readlines ():

        i = i + 1
        if not len(line):
            continue
        columns = split (line, separator)
        html_line = '<tr><td>' + join (columns, '</td><td>') + '</td></tr>'
        i = i + 1
        if not len(line):
            continue
        columns = split (line, separator)
        html_line = '<tr><td>' + join (columns, '</td><td>') + '</td></tr>'

+       html_line= regsub.gsub (linesep, ' ',html_line)

        html.write (html_line)
        html.write (html_line)

-       if len (columns) < 7:
-           print inname + ': ' + str(i) + ':warning: not enough cols\n'
-           continue
-       if len (columns) > 7:
-           print inname + ': ' + str(i) + ':warning: too many cols\n'
-           continue
+
+       if len (columns) <> cols:
+               print i
+               raise 'not enough cols'

 
     table.close ()
     footer (html)
     html.close ()
 
 
     table.close ()
     footer (html)
     html.close ()
 

-def convert_tex (inname, outname, separator):
-    # urg, again?
-    from flower import *
-    table = File (inname)
-    # ugh
-    html = File (outname, 'w')
+
+def convert_tex (inname, outname, cols, separator, linesep):
+    table = open (inname)
+    html = open(outname, 'w')

 
     i = 0
 
     i = 0

-    while not table.eof ():
-       line = table.readline ()
+    for line in table.readlines ():    

        i = i + 1
        if not len(line):
            continue
        columns = split (line, separator)
        i = i + 1
        if not len(line):
            continue
        columns = split (line, separator)

-       if len (columns) < 7:
-           print inname + ': ' + str(i) + ':warning: not enough cols\n'
-           continue
-       if len (columns) > 7:
-           print inname + ': ' + str(i) + ':warning: too many cols\n'
-           continue
-
-       html_line =  '\\tableentry{' + join (columns, '}{') + '}\n'
-       html.write (html_line)
+       if len (columns) <> cols:
+               print i
+               raise 'not enough cols'
+
+       tex_line =  '\\tableentry{' + join (columns, '}{') + '}\n'
+       tex_line = regsub.gsub (linesep, ' ', tex_line)
+       html.write (tex_line)
+       

     table.close ()
     html.close ()
 
 def main ():
     identify ()
     (options, files) = getopt.getopt (
     table.close ()
     html.close ()
 
 def main ():
     identify ()
     (options, files) = getopt.getopt (

-       sys.argv[1:], 'to:hp:s:', ['help', 'latex', 'output=', 'package=', 'separator='])
+       sys.argv[1:], 'tl:o:hp:c:s:', ['columns=', 'help', 'latex', 'output=', 'package=', 'separator=', 'linesep='])

     latex = 0
     separator = '@'
     output = ''
     latex = 0
     separator = '@'
     output = ''

+    linesep = '\r'

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


@@ -117,6 +110,10 @@ def main ():
            output = a
        elif o == '--package' or o == '-p':
            topdir=a
            output = a
        elif o == '--package' or o == '-p':
            topdir=a

+       elif o == '--linesep' or o == '-l':
+               linesep = a
+       elif o == '--columns' or o == '-c':
+               cols =  atoi(a)

        else:
            print o
            raise getopt.error
        else:
            print o
            raise getopt.error


@@ -129,9 +126,9 @@ def main ():
     from flower import *
 
     if latex:
     from flower import *
 
     if latex:

-       convert_tex (files[0], output, separator)
+       convert_tex (files[0], output,  cols, separator, linesep)

     else:
     else:

-       convert_html (files[0], output, separator)
+       convert_html (files[0], output, cols, separator, linesep)

 
 main ()
 
 
 main ()
 

diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm
index 0e0ce4505c6408218da46e6f2e5a9ae90757da10..8e72fc13ca626c094b6db3442fe5e662b31e8f4b 100644 (file)
--- a/stepmake/make/out/stepmake.lsm
+++ b/stepmake/make/out/stepmake.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title: StepMake
 Begin3
 Title: StepMake

-Version: 0.1.53
-Entered-date: 29SEP98
+Version: 0.1.55
+Entered-date: 05OCT98

 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
        hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
        hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert

-       40k stepmake-0.1.53.tar.gz 
+       40k stepmake-0.1.55.tar.gz 

 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/

-       40k stepmake-0.1.53.tar.gz 
+       40k stepmake-0.1.55.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec
index 805479cac1c13d7ebaa425252be9cd99bd533c6b..ebad41221a3c1899fa3cfbe1b5a21d30a353cd2e 100644 (file)
--- a/stepmake/make/out/stepmake.spec
+++ b/stepmake/make/out/stepmake.spec
@@ -1,9 +1,9 @@
 Name: stepmake
 Name: stepmake

-Version: 0.1.53
+Version: 0.1.55

 Release: 1
 Copyright: GPL
 Group: Development
 Release: 1
 Copyright: GPL
 Group: Development

-Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.53.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.55.tar.gz

 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install
 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install

diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make
index 2cb0849430f4a3bad87d57b146532fec04e7a41d..2f32642a650768fbb1ad548ba1fd19e22d7bc150 100644 (file)
--- a/stepmake/stepmake/documentation-rules.make
+++ b/stepmake/stepmake/documentation-rules.make
@@ -15,13 +15,6 @@ $(outdir)/%.png: %.xpm
 $(outdir)/%.txt: $(outdir)/%.1
        troff -man -Tascii $< | grotty -b -u -o > $@
 
 $(outdir)/%.txt: $(outdir)/%.1
        troff -man -Tascii $< | grotty -b -u -o > $@
 

-#urg should generalise and move Lilypond -> StepMake
-$(outdir)/%.html: %.data $(depth)/VERSION
-       $(PYTHON) $(step-bindir)/table-to-html.py --package=$(topdir) -o $@ $<
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
-
-$(outdir)/%.tex: %.data $(depth)/VERSION
-       $(PYTHON) $(step-bindir)/table-to-html.py --package=$(topdir) -o $@ --latex $<

 
 include $(stepdir)/yodl-rules.make
 include $(stepdir)/texinfo-rules.make
 
 include $(stepdir)/yodl-rules.make
 include $(stepdir)/texinfo-rules.make

diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index ccbb7c3ab1fe97adcd619dbcbdbb7fe924f9c7b0..7b0b9820db4ab43206a9df28389e61ad8e9b6570 100644 (file)
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -6,10 +6,9 @@ $(outdir)/%.dvi: $(outdir)/%.tex
 $(outdir)/%.dvi: $(outdir)/%.latex
        (cd $(outdir)&& \
          latex \\nonstopmode \\input $(<F)&&\
 $(outdir)/%.dvi: $(outdir)/%.latex
        (cd $(outdir)&& \
          latex \\nonstopmode \\input $(<F)&&\

-         bibtex $(basename $(<F))&&\
+         (bibtex $(basename $(<F))&&\

          latex \\nonstopmode \\input $(<F)&&\
          latex \\nonstopmode \\input $(<F)&&\

-         latex \\nonstopmode \\input $(<F)&&\
-       )
+         latex \\nonstopmode \\input $(<F) ) || true)

 
 $(outdir)/%.ps: $(outdir)/%.dvi
        dvips -ta4 -o $@ $<
 
 $(outdir)/%.ps: $(outdir)/%.dvi
        dvips -ta4 -o $@ $<

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 1f1f6d9b74ebd907988582da796188d3e5fab413..efa71663b4967aa8b8989067d65cb8e61d35675f 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -90,23 +90,10 @@
 
 \def\generalmeter#1#2{%
   \ifnum #2 = 0\relax
 
 \def\generalmeter#1#2{%
   \ifnum #2 = 0\relax

-    \ifcase #1
-    \or\or
-      % 2
-      \allabreve
-    \or
-      % 3
-      \threetwometer    % tempus perfectum cum prolatione imperfecta
-    \or
-      % 4
-      \fourfourmeter    % tempus imperfectum cum prolatione imperfecta
-    \or\or
-      % 6
-      \sixfourmeter     % tempus imperfectum cum prolatione perfecta
-    \or\or\or
-      % 9
-      \ninefourmeter    % tempus perfectum cum prolatione perfecta
-    \fi
+    \vbox to 0pt{%
+      \vss
+      \hbox to 0.45\staffheight{\hss \fetanummer #1\hss}%
+      \vss}%

   \else
     \vbox to 0pt{%
       \vss
   \else
     \vbox to 0pt{%
       \vss