Graham Percival [Wed, 19 Sep 2007 01:52:20 +0000 (18:52 -0700)]
Add framework for Notation chapter, and do Pitches.
I couldn't figure out how to make a notation/ dir to put all the things
like pitches, rhythms, etc. :(
Graham Percival [Tue, 18 Sep 2007 23:32:28 +0000 (16:32 -0700)]
Fix the problem Vocal music and Ancient music for subsections.
Graham Percival [Tue, 18 Sep 2007 21:17:33 +0000 (14:17 -0700)]
node/subsection -> anchor/unnumberedsubsubsec change.
Graham Percival [Tue, 18 Sep 2007 20:24:20 +0000 (13:24 -0700)]
Remove all subsubsections from instrument-notation; prepares for more
changes. (yes, vocal music now looks ugly. deal with it. :)
Graham Percival [Sun, 16 Sep 2007 19:37:08 +0000 (12:37 -0700)]
Link fix for glossary in info.
Graham Percival [Sat, 15 Sep 2007 22:09:32 +0000 (15:09 -0700)]
More improvements to macro.
Graham Percival [Sat, 15 Sep 2007 21:15:08 +0000 (14:15 -0700)]
Mroe translation fixes.
Graham Percival [Sat, 15 Sep 2007 21:05:30 +0000 (14:05 -0700)]
Fix nodes in es.
Graham Percival [Sat, 15 Sep 2007 21:02:13 +0000 (14:02 -0700)]
Fix links in de.
Graham Percival [Sat, 15 Sep 2007 20:57:20 +0000 (13:57 -0700)]
Fix broken links in fr.
Graham Percival [Sat, 15 Sep 2007 20:45:03 +0000 (13:45 -0700)]
Translated menus.
Graham Percival [Sat, 15 Sep 2007 20:32:32 +0000 (13:32 -0700)]
More macro simplifications.
Graham Percival [Sat, 15 Sep 2007 20:02:08 +0000 (13:02 -0700)]
More simplification, fixes.
Graham Percival [Sat, 15 Sep 2007 19:39:13 +0000 (12:39 -0700)]
Begin simplifying macros.itexi.
Graham Percival [Sat, 15 Sep 2007 17:31:15 +0000 (10:31 -0700)]
Added -learning to translations.
Graham Percival [Sat, 15 Sep 2007 17:25:01 +0000 (10:25 -0700)]
Half-update translations.
Graham Percival [Sat, 15 Sep 2007 17:15:43 +0000 (10:15 -0700)]
Split learning manual in english docs.
Reinhold Kainhofer [Fri, 2 Nov 2007 00:49:11 +0000 (01:49 +0100)]
MusicXML: convert Tab and drum staves to Lilypond
-) Depending on the staff attributes, create TabStaff/TabVoice,
DrumStaff/DrumVoice, RhythmicStaff/Voice or ordinary Staff/Voice
staves.
-) From the staff attributes, create the list of string tunings
for tab staves.
These two points were all that was missing for proper tablature support.
As an implementation detail, I changed all the keys in the dicts from
the full part objects to the part ID (which is also used in the part-list
element in Lilypond, so we can do proper assignments now).
Reinhold Kainhofer [Wed, 31 Oct 2007 16:36:03 +0000 (17:36 +0100)]
Fix German translation (don't use "Slur"...)
Thanks to Till Rettig for pointing out this issue!
Reinhold Kainhofer [Wed, 31 Oct 2007 15:56:30 +0000 (16:56 +0100)]
MusicXML: Improvements / Fixes for articulations
Implement some more conversions for articulations, make \context Staff
actually use the type attribute instead of hard-coded "Staff", fix crashes
due to empty type attributes in articulations.
Reinhold Kainhofer [Wed, 31 Oct 2007 15:14:48 +0000 (16:14 +0100)]
Some more typos in the German translation (mostly "and" instad of "und")
Reinhold Kainhofer [Wed, 31 Oct 2007 14:48:43 +0000 (15:48 +0100)]
Fix typo in the German translation
Reinhold Kainhofer [Tue, 30 Oct 2007 19:06:50 +0000 (20:06 +0100)]
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer
Reinhold Kainhofer [Tue, 30 Oct 2007 16:58:16 +0000 (17:58 +0100)]
MusicXML: Don't crash when a note has multiple <notations> children
Reinhold Kainhofer [Mon, 29 Oct 2007 23:02:04 +0000 (00:02 +0100)]
MusicXML: Convert string information
For tab staves and voices, we will need to convert the <string> number
to lilypond to lilypond's \1, ..., \6 commands. So far, the tab staff
is not yet created, so these commands do not have any effect yet, but
they will be needed in the near future.
Reinhold Kainhofer [Sun, 28 Oct 2007 20:45:38 +0000 (21:45 +0100)]
MusicXML: Correctly split multi-line part group names
newlines might consist of \r, \n, or combinations thereof,
so we need to split at any combination of these.
Reinhold Kainhofer [Sun, 28 Oct 2007 20:44:03 +0000 (21:44 +0100)]
MusicXML: Correctly convert nested staff/part groups
In MusicXML, part group nesting is done simply by inserting
start/stop markers in the list of parts, where the part groups
might even overlap. In Lilypond, we want the real hierarchy (so
that we can assign group names etc.). To achieve this, we need
to loop through all parts, trying to detect the correct start/stop
markers. What makes things even more complicated is the fact
that the group IDs don't have to the unique in the whole score,
just unique enough to describe overlapping part groups. The other
issue are overlapping part groups, which we need to split up into
a part, which fits into the hierarchy and the remaining part, which
we simply ignore.
Reinhold Kainhofer [Sun, 28 Oct 2007 13:27:58 +0000 (14:27 +0100)]
MusicXML: Cleanup voice handling and fix lyrics order for multiple stanzas
So far, multiple stanzas were handled by a dict, indexed by the voice ID.
However, the order of the elements in a dict is not defined (in particular,
the order is not preserved), so the stanzas got reordered and lost their
sorting.
Furthermore, each voice (with the associated lyrics and the raw data) was
handled by nested lists, which were really complicated to work with (since
one always had to remember the structure of these lists). I now use a
class/struct instead for each voice, which is much more intuitive!
Reinhold Kainhofer [Sat, 27 Oct 2007 20:45:17 +0000 (22:45 +0200)]
MusicXML: Fix problem with lyrics on notes with grace notes
When a note had grace notes (and it was tied or part of a slur), sometimes
the lyrics for that note were completely ignored and all subsequent
lyrics were one note off. Now I simply ignore all slurs/ties of grace notes
and everything works just fine.
Also, clean up the staff change code. Now a staff change is not only applied
before a note, but also before other stuff (like clef change).
Reinhold Kainhofer [Sat, 27 Oct 2007 17:37:04 +0000 (19:37 +0200)]
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer
Reinhold Kainhofer [Sat, 27 Oct 2007 17:36:15 +0000 (19:36 +0200)]
MusicXML: Implement staff changes in piano staves
When we encounter a note with a different staff value than the
previous note in that voice, simply add the \change Staff=.. event
into the notes. However, this does not work inside chords, so we
ignore all staff changes inside chords. I'll have to find a different
way to print some notes of a chord on one staff and the other notes
on the other staff...
Reinhold Kainhofer [Sat, 27 Oct 2007 15:53:58 +0000 (17:53 +0200)]
MusicXML: Sample file for staff change
Reinhold Kainhofer [Sat, 27 Oct 2007 15:53:31 +0000 (17:53 +0200)]
MusicXML: Fix problems with chord detection and pickup measures
Pickup measures messed up chord detection and voice start positions
for multi-voice parts, because I erroneously reset the position after
a pickup measure to 1, while in fact it should have been the length
of the pickup measure!
Also, fix some typos and only ignore skips in pickup measures intended
for padding to a full measure. Explicitly adde skips need to be honored.
Reinhold Kainhofer [Sat, 27 Oct 2007 13:13:36 +0000 (15:13 +0200)]
MusicXML: Another sample file for problem with pickup measures
Pickup measures also mess up the start of voices that start later
Reinhold Kainhofer [Sat, 27 Oct 2007 12:54:37 +0000 (14:54 +0200)]
MusicXML: Sample file for problem with pickup measures and chord detection
Reinhold Kainhofer [Fri, 26 Oct 2007 22:18:54 +0000 (00:18 +0200)]
MusicXML: Fix bugs with repeat detection
-) Sometimes the contents of the first volta was duplicated (once
before and the second time inside the first volta). The cause
was theat I forgot an if clause to mark the repeat's body finished
when the first volta ending is encountered
-) I messed up the order of the repeat/ending markers in the output.
John Mandereau [Fri, 26 Oct 2007 19:41:58 +0000 (21:41 +0200)]
Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
MusicXML: Add sample file for chord names printed above staff
MusicXML: Update the rest duration sample file with correct multi-measure rest
MusicXML: Fix small problems with assignment <harmony> <=> voice
MusicXML: Updates sample files for fretboards
MusicXMl: Fix fretboard assignment to voices.
MusicXML: Sample file for fretboards on multi-staff/-voice pieces
MusicXML: Convert fretboards from MusicXML to Lilypond
Till Paala [Fri, 26 Oct 2007 16:25:28 +0000 (19:25 +0300)]
Updates to German
Reinhold Kainhofer [Fri, 26 Oct 2007 16:18:01 +0000 (18:18 +0200)]
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer
Reinhold Kainhofer [Fri, 26 Oct 2007 16:15:01 +0000 (18:15 +0200)]
MusicXML: Add sample file for chord names printed above staff
Reinhold Kainhofer [Fri, 26 Oct 2007 16:10:54 +0000 (18:10 +0200)]
MusicXML: Update the rest duration sample file with correct multi-measure rest
Reinhold Kainhofer [Fri, 26 Oct 2007 15:46:43 +0000 (17:46 +0200)]
MusicXML: Fix small problems with assignment <harmony> <=> voice
Oops, I didn't want to treat <direction > elements like <harmony>.
The direction elements should still be asssigned to all voices (or
all voices of the staff).
Also, at the end of the loop, assign all remaining <harmony> elements
to the voice of the previous note and don't simply discard it.
Reinhold Kainhofer [Fri, 26 Oct 2007 15:02:32 +0000 (17:02 +0200)]
MusicXML: Updates sample files for fretboards
Reinhold Kainhofer [Fri, 26 Oct 2007 15:00:18 +0000 (17:00 +0200)]
MusicXMl: Fix fretboard assignment to voices.
Instead of assigning <harmony> elements to every voice or only the very
first voice (in the frist case, we'll have duplicated frets, in the
second one the fretboards will often be inserted at the completely
wrong position), simply insert the fretboard into the next note that
we encounter in the MusicXML file.
I suppose we could also do something similar for text markup (i.e.
<direction><words>...</word></direction>), but there we need to
distinguish direction elements with words-only subelements and with
dynamics subelements.
Reinhold Kainhofer [Fri, 26 Oct 2007 14:39:06 +0000 (16:39 +0200)]
MusicXML: Sample file for fretboards on multi-staff/-voice pieces
The detection to which note a fretboard is assigned breaks down
terribly for parts with multiple staves and/or voices...
Reinhold Kainhofer [Fri, 26 Oct 2007 14:38:08 +0000 (16:38 +0200)]
MusicXML: Convert fretboards from MusicXML to Lilypond
In MusicXML, fretboards are inside <harmony> elements, assigned
to a particular staff, while in lilypond the \fret-diagram is a
text markup assigned to a particular note. So we run into the same
problems as we do with dynamics (i.e. we need to find a proper
note to assign the element to, which is not very robust). For
single-voice harmony, this works quite well so far.
Joe Neeman [Thu, 25 Oct 2007 22:29:32 +0000 (08:29 +1000)]
Fix 500.
Avoid NaN in Break_aligned_interface::calc_extent_aligned_anchor.
John Mandereau [Thu, 25 Oct 2007 05:17:11 +0000 (07:17 +0200)]
Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
Update thanks.
Till Paala [Wed, 24 Oct 2007 17:08:42 +0000 (20:08 +0300)]
Addition to German update
Till Paala [Wed, 24 Oct 2007 16:54:05 +0000 (19:54 +0300)]
Another update to German
Till Paala [Wed, 24 Oct 2007 15:37:36 +0000 (18:37 +0300)]
Typos and updates to German translation
Graham Percival [Wed, 24 Oct 2007 09:41:22 +0000 (02:41 -0700)]
Merge branch 'master' of git://git.sv.gnu.org/lilypond
Graham Percival [Wed, 24 Oct 2007 09:39:44 +0000 (02:39 -0700)]
Update thanks.
Reinhold Kainhofer [Tue, 23 Oct 2007 22:08:50 +0000 (00:08 +0200)]
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer
Reinhold Kainhofer [Tue, 23 Oct 2007 21:39:33 +0000 (23:39 +0200)]
MusicXMl: Add sample file for repeat without ending bar
Sample file
Reinhold Kainhofer [Tue, 23 Oct 2007 21:39:06 +0000 (23:39 +0200)]
MusicXML: Fix bug in lyrics and ties
I forgot to reset the is_tied flag, so after a tie, no lyrics would be
printed out any more (the second note of a tie is in a melisma and does
not use any lyrics syllables in lilypond - Of course only if it is
really a tied note...).
Reinhold Kainhofer [Tue, 23 Oct 2007 21:32:23 +0000 (23:32 +0200)]
MusicXML: Also finish repeats that do not have an explicit ending bar
Some musicXML examples just display the first page of a multi-page score.
Sometimes a repeat occurs on these pages with no ending bar (which would
follow on a subsequent page). Simply finish the \repeat sequence at the
very end of the page.
Reinhold Kainhofer [Tue, 23 Oct 2007 20:18:27 +0000 (22:18 +0200)]
MusicXML: Fix lyrics on chords, ignore lyrics for notes inside melismata
The lyrics detection code so far ignored chords (ie. it added a \skip for
every additional note in the chord). Now I simply ignore all subsequent
notes and the corresponding syllables for the lyrics.
By default, lilypond does not add lyrics to notes in melismata (i.e.
tied notes and notes inside slurs), so while walking through all notes,
we need to check whether we are inside a slur, a tie or a grace note
and simply ignore the lyrics on these notes.
There are some scores, which still put lyrics on notes inside slurs, so
in the future, I'll also add a way to set/unset ignoreMelismata, but
that's left for the future.
Rune Zedeler [Tue, 23 Oct 2007 04:31:24 +0000 (06:31 +0200)]
Merge branch 'master' of git://git.sv.gnu.org/lilypond
Rune Zedeler [Tue, 23 Oct 2007 04:26:35 +0000 (06:26 +0200)]
Bugfix: Rational.cc: Modulo and trunc did not work with negative numbers.
This is a library fix that did not show any bugs in lilypond - because
lilypond does not use modulus of negative rationals.
Reinhold Kainhofer [Tue, 23 Oct 2007 00:07:35 +0000 (02:07 +0200)]
MusicXML: Convert colors in text markup using \with-color #(rgb-color ...)
Now that we have the rgb-color scheme function in git, make use of it in
text markup conversion. In MusicXML, the color is given as #AARRGGBB
or #RRGGBB, we simply ignore the alpha channel, extract the r, g and b
values and scale them to the 0.0 - 1.0 range
Reinhold Kainhofer [Mon, 22 Oct 2007 23:07:32 +0000 (01:07 +0200)]
MusicXML: Add test file for text markup
Reinhold Kainhofer [Mon, 22 Oct 2007 22:46:29 +0000 (00:46 +0200)]
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer
Erlend Aasland [Mon, 22 Oct 2007 14:17:09 +0000 (16:17 +0200)]
Add rgb-color macro.
Han-Wen Nienhuys [Mon, 22 Oct 2007 03:26:45 +0000 (01:26 -0200)]
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
Han-Wen Nienhuys [Mon, 22 Oct 2007 03:21:25 +0000 (01:21 -0200)]
strip MusicXML from examples.html
Reinhold Kainhofer [Sun, 21 Oct 2007 21:08:47 +0000 (23:08 +0200)]
MusicXML: Convert some more text markup attributes
Convert italics, better font sizes. Unfortunately, I don't know
how to convert RGB colors to x-colors used by lilypond, so colors
are not converted. Similarly, font families are not converted, mainly
because I don'tknow the correct lilypond expression for this.
Underline, overline and strike-through don't seem to be supported
by lilypond at all :-(
Reinhold Kainhofer [Sun, 21 Oct 2007 17:04:02 +0000 (19:04 +0200)]
MusicXML: Convert words, assigned to staves => assign to notes in Lilypond
In MusicXML, words are represented in direction elements, in Lilypond, they
are assigned to notes....
Also try to convert as many font attributes as possible (several are still
missing, currently only text-size and text-wight are supported)
Joe Neeman [Sat, 20 Oct 2007 22:18:26 +0000 (08:18 +1000)]
Fix 449.
Ensure that a TrillPitchGroup is included in the horizontal skylines.
Reinhold Kainhofer [Fri, 19 Oct 2007 00:52:38 +0000 (02:52 +0200)]
MusicXML: Implement Barline styles and repeats in musicxml2ly
-) The <barline> element is now converted to a \bar"...." lilypond
expression. Not all bar styles from MusicXML are supported by lilypond,
though.
-) Convert repeats and alternative endings from MusicXML to lilypond.
While lilypond has a nice hierarchy (i.e. nested music) for repeating
structures, MusicXML only has markers "here starts/ends a repeat or
altern.ending", so I need to somehow build up that repeat hierarchy
from the flat data. I've imlemented this via a loop that looks for
a repeat structure, replaces that one repeat by a proper instance
of musicexp.RepeatedMusic. Since I directly modify the list of
event chords, after replacing one repeat, I have to start the
whole loop from the start (because the iterators are off after
the list is modified).
-) Add some more unit test files for barlines and repeating structures
(some even do not make sense from a musical point of view)
-) Fix typo in the coverage/regression tests make file
Graham Percival [Thu, 18 Oct 2007 22:46:53 +0000 (15:46 -0700)]
Merge branch 'master' of git://git.sv.gnu.org/lilypond
Lilypond GDP [Thu, 18 Oct 2007 20:39:28 +0000 (22:39 +0200)]
Fix build: usermanref is removed in favor of ruser
Werner Lemberg [Thu, 18 Oct 2007 19:59:36 +0000 (21:59 +0200)]
Typo.
Werner Lemberg [Thu, 18 Oct 2007 19:57:47 +0000 (21:57 +0200)]
Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond
Werner Lemberg [Thu, 18 Oct 2007 19:57:18 +0000 (21:57 +0200)]
New glyph for `scripts.caesura'.
The old shape has been renamed to `scripts.caesura.curved'.
Based on patches from Maximilian Albert.
Werner Lemberg [Thu, 18 Oct 2007 15:44:44 +0000 (17:44 +0200)]
Add copyright.
Werner Lemberg [Thu, 18 Oct 2007 15:14:21 +0000 (17:14 +0200)]
Add copyright.
Werner Lemberg [Thu, 18 Oct 2007 15:12:55 +0000 (17:12 +0200)]
Add copyright.
Werner Lemberg [Thu, 18 Oct 2007 15:10:39 +0000 (17:10 +0200)]
Add copyright.
Werner Lemberg [Thu, 18 Oct 2007 15:08:36 +0000 (17:08 +0200)]
Add copyright.
Werner Lemberg [Thu, 18 Oct 2007 15:06:47 +0000 (17:06 +0200)]
Add copyright.
Graham Percival [Wed, 17 Oct 2007 06:46:37 +0000 (23:46 -0700)]
Merge branch 'master' of git://git.sv.gnu.org/lilypond
Graham Percival [Wed, 17 Oct 2007 06:46:17 +0000 (23:46 -0700)]
Add warning about changed syntax for text on line spanners.
Mats Bengtsson [Mon, 15 Oct 2007 14:10:45 +0000 (16:10 +0200)]
Makes it possible to get a bar line at the left end of the
stave also for single stave scores.
Mats Bengtsson [Mon, 15 Oct 2007 13:59:26 +0000 (15:59 +0200)]
Use the collapse-height mechanism also for SystemStartBar.
Makes it possible to get a bar line at the left end of the
stave also for single stave scores.
Graham Percival [Mon, 15 Oct 2007 02:03:32 +0000 (19:03 -0700)]
Merge branch 'master' of git://git.sv.gnu.org/lilypond
Graham Percival [Mon, 15 Oct 2007 02:02:42 +0000 (19:02 -0700)]
We use @ruser{} instead of @usermanref{} now.
Graham Percival [Mon, 15 Oct 2007 01:58:19 +0000 (18:58 -0700)]
We now use @ruser{} in the docs.
Graham Percival [Mon, 15 Oct 2007 01:57:30 +0000 (18:57 -0700)]
Update thanks.
John Mandereau [Fri, 12 Oct 2007 19:44:21 +0000 (21:44 +0200)]
Update German PO from FTP
Reinhold Kainhofer [Fri, 12 Oct 2007 09:18:27 +0000 (11:18 +0200)]
MusicXML: Fix wrong chord detection with mid-measure attributes
Mid-measure attributes (like clef changes) need to be inserted as
commands, not as music, because that will reset the current measure
position and mess up chord detection for the following notes.
Reinhold Kainhofer [Wed, 10 Oct 2007 13:00:03 +0000 (15:00 +0200)]
MusicXML: Add sanity check before setting a duration
Reinhold Kainhofer [Tue, 9 Oct 2007 23:43:14 +0000 (01:43 +0200)]
MusicXML: Add description header for the feature coverage test page
Reinhold Kainhofer [Tue, 9 Oct 2007 22:23:55 +0000 (00:23 +0200)]
MusicXML: Support for upbeats and partial/implicit measures
-) In the Duration class, don't write out e.g. *3/1 for the factor.
In this case, *3 is much better
-) Add support for implicit measures, i.e. measures in MusicXML that do
not count. These are typically used for upbeats and for places where
a repeat or clef/key change occurs inside a measure. In this case,
the measure is split into to <measure> elements, the second one with
the implicit attribute set to "yes". Now we don't start a measure
in lilypond for those implicit measures.
-) Implicit measures at the very beginning are now converted as \partial X
-) Don't print out | %0 at the very beginning (i.e. for the measure with
number 0)
Signed-off-by: Reinhold Kainhofer <reinhold@kainhofer.com>
Reinhold Kainhofer [Sat, 6 Oct 2007 19:48:15 +0000 (21:48 +0200)]
Ignore ttf files with fontforge configure check
Signed-off-by: Reinhold Kainhofer <reinhold@kainhofer.com>
Reinhold Kainhofer [Tue, 9 Oct 2007 22:50:27 +0000 (00:50 +0200)]
Revert "Allow header/footer snippets in test cases, expand lilypond-book to insert versionnumber"
This reverts commit
47c4f0bf5eb5be69826b23fd9be5bbc48765ef41.
Francisco Vila [Tue, 9 Oct 2007 09:44:10 +0000 (11:44 +0200)]
Another typo
Francisco Vila [Mon, 8 Oct 2007 17:54:15 +0000 (19:54 +0200)]
typo
John Mandereau [Mon, 8 Oct 2007 18:31:21 +0000 (20:31 +0200)]
Update Spanish PO from FTP
John Mandereau [Sun, 7 Oct 2007 08:00:34 +0000 (10:00 +0200)]
Update French and Vietnamese POs from Free Translation Project
Nitpick: also remove fuzzy mark in lilypond.pot