Another patch for musicxml2ly: In situations like this:
<trill-mark default-y='20'/>
<wavy-line type='start' number='1'/>
this will be created:
\trill \startTrillSpan
It should only be \startTrillSpan.
(My changes can also be found on Github: https://github.com/th-we/lilypond.)
Greets,
Thomas Weber
>From 282b5b501d89a70a4aa799214744bb69af61630c Mon Sep 17 00:00:00 2001
From: Thomas Weber <t...@notabit.eu>
Date: Sun, 13 Dec 2015 21:07:15 +0100
Subject: [PATCH] musicxml2ly: Avoid duplicate "tr" if both <trill-mark> and
<wavy-line> are present
---
scripts/musicxml2ly.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 5cf5333..397dd78 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -1179,7 +1179,7 @@ articulations_dict = {
#"toe": "?",
"turn": "turn",
"tremolo": musicxml_tremolo_to_lily_event,
- "trill-mark": "trill",
+ "trill-mark": lambda notations: None if notations.get_named_children ('wavy-line') else "trill",
#"triple-tongue": "?",
#"unstress": "?"
"up-bow": "upbow",
@@ -1187,12 +1187,16 @@ articulations_dict = {
}
articulation_spanners = [ "wavy-line" ]
-def musicxml_articulation_to_lily_event (mxl_event):
+def musicxml_articulation_to_lily_event (mxl_event, parent_node):
# wavy-line elements are treated as trill spanners, not as articulation ornaments
if mxl_event.get_name () in articulation_spanners:
return musicxml_spanner_to_lily_event (mxl_event)
tmp_tp = articulations_dict.get (mxl_event.get_name ())
+
+ if hasattr (tmp_tp, '__call__'):
+ tmp_tp = tmp_tp(parent_node)
+
if not tmp_tp:
return
@@ -2351,7 +2355,7 @@ def musicxml_voice_to_lily_voice (voice):
# accidental-marks are direct children of <notation>!
for a in notations.get_named_children ('accidental-mark'):
- ev = musicxml_articulation_to_lily_event (a)
+ ev = musicxml_articulation_to_lily_event (a, notations)
if ev:
ev_chord.append (ev)
@@ -2376,7 +2380,7 @@ def musicxml_voice_to_lily_voice (voice):
for a in ornaments:
for ch in a.get_all_children ():
- ev = musicxml_articulation_to_lily_event (ch)
+ ev = musicxml_articulation_to_lily_event (ch, a)
if ev:
ev_chord.append (ev)
--
1.9.1
ÿþ< ? x m l v e r s i o n = ' 1 . 0 ' e n c o d i n g = ' U T F - 1 6 ' s t a n d a l o n e = ' n o ' ? >
< ! D O C T Y P E s c o r e - p a r t w i s e P U B L I C ' - / / R e c o r d a r e / / D T D M u s i c X M L 3 . 0 P a r t w i s e / / E N ' ' h t t p : / / w w w . m u s i c x m l . o r g / d t d s / p a r t w i s e . d t d ' >
< s c o r e - p a r t w i s e v e r s i o n = ' 3 . 0 ' >
< i d e n t i f i c a t i o n >
< r i g h t s > C o p y r i g h t © < / r i g h t s >
< e n c o d i n g >
< s o f t w a r e > S i b e l i u s 8 . 0 < / s o f t w a r e >
< s o f t w a r e > D o l e t 6 . 5 f o r S i b e l i u s < / s o f t w a r e >
< e n c o d i n g - d a t e > 2 0 1 5 - 1 2 - 1 3 < / e n c o d i n g - d a t e >
< s u p p o r t s e l e m e n t = ' a c c i d e n t a l ' t y p e = ' y e s ' / >
< s u p p o r t s e l e m e n t = ' t r a n s p o s e ' t y p e = ' n o ' / >
< s u p p o r t s a t t r i b u t e = ' n e w - p a g e ' e l e m e n t = ' p r i n t ' t y p e = ' y e s ' v a l u e = ' y e s ' / >
< s u p p o r t s a t t r i b u t e = ' n e w - s y s t e m ' e l e m e n t = ' p r i n t ' t y p e = ' y e s ' v a l u e = ' y e s ' / >
< / e n c o d i n g >
< / i d e n t i f i c a t i o n >
< d e f a u l t s >
< s c a l i n g >
< m i l l i m e t e r s > 7 < / m i l l i m e t e r s >
< t e n t h s > 4 0 < / t e n t h s >
< / s c a l i n g >
< p a g e - l a y o u t >
< p a g e - h e i g h t > 1 6 9 7 < / p a g e - h e i g h t >
< p a g e - w i d t h > 1 2 0 0 < / p a g e - w i d t h >
< p a g e - m a r g i n s t y p e = ' o d d ' >
< l e f t - m a r g i n > 7 2 . 5 7 1 4 < / l e f t - m a r g i n >
< r i g h t - m a r g i n > 7 2 . 5 7 1 4 < / r i g h t - m a r g i n >
< t o p - m a r g i n > 7 2 . 5 7 1 4 < / t o p - m a r g i n >
< b o t t o m - m a r g i n > 7 2 . 5 7 1 4 < / b o t t o m - m a r g i n >
< / p a g e - m a r g i n s >
< p a g e - m a r g i n s t y p e = ' e v e n ' >
< l e f t - m a r g i n > 7 2 . 5 7 1 4 < / l e f t - m a r g i n >
< r i g h t - m a r g i n > 7 2 . 5 7 1 4 < / r i g h t - m a r g i n >
< t o p - m a r g i n > 7 2 . 5 7 1 4 < / t o p - m a r g i n >
< b o t t o m - m a r g i n > 7 2 . 5 7 1 4 < / b o t t o m - m a r g i n >
< / p a g e - m a r g i n s >
< / p a g e - l a y o u t >
< s y s t e m - l a y o u t >
< s y s t e m - m a r g i n s >
< l e f t - m a r g i n > 2 2 . 1 8 7 5 < / l e f t - m a r g i n >
< r i g h t - m a r g i n > 0 < / r i g h t - m a r g i n >
< / s y s t e m - m a r g i n s >
< s y s t e m - d i s t a n c e > 9 2 . 5 < / s y s t e m - d i s t a n c e >
< t o p - s y s t e m - d i s t a n c e > 7 2 . 8 1 2 5 < / t o p - s y s t e m - d i s t a n c e >
< / s y s t e m - l a y o u t >
< ? D o l e t S i b e l i u s S t a f f J u s t i f i c a t i o n P e r c e n t a g e = 6 5 ? >
< a p p e a r a n c e >
< l i n e - w i d t h t y p e = ' b e a m ' > 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' h e a v y b a r l i n e ' > 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' l e g e r ' > 1 . 5 6 2 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' l i g h t b a r l i n e ' > 1 . 5 6 2 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' s l u r m i d d l e ' > 2 . 1 8 7 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' s l u r t i p ' > 0 . 6 2 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' s t a f f ' > 0 . 9 3 7 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' s t e m ' > 0 . 9 3 7 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' t i e m i d d l e ' > 2 . 1 8 7 5 < / l i n e - w i d t h >
< l i n e - w i d t h t y p e = ' t i e t i p ' > 0 . 6 2 5 < / l i n e - w i d t h >
< n o t e - s i z e t y p e = ' g r a c e ' > 6 0 < / n o t e - s i z e >
< n o t e - s i z e t y p e = ' c u e ' > 7 5 < / n o t e - s i z e >
< / a p p e a r a n c e >
< m u s i c - f o n t f o n t - f a m i l y = ' O p u s S t d , m u s i c ' / >
< w o r d - f o n t f o n t - f a m i l y = ' P l a n t i n M T S t d ' / >
< / d e f a u l t s >
< p a r t - l i s t >
< s c o r e - p a r t i d = ' P 1 ' >
< p a r t - n a m e p r i n t - o b j e c t = ' n o ' > [ U n n a m e d ( t r e b l e s t a f f ) ] < / p a r t - n a m e >
< s c o r e - i n s t r u m e n t i d = ' P 1 - I 1 ' >
< i n s t r u m e n t - n a m e > < / i n s t r u m e n t - n a m e >
< i n s t r u m e n t - s o u n d > k e y b o a r d . p i a n o . g r a n d < / i n s t r u m e n t - s o u n d >
< / s c o r e - i n s t r u m e n t >
< m i d i - i n s t r u m e n t i d = ' P 1 - I 1 ' >
< v o l u m e > 7 9 < / v o l u m e >
< p a n > 0 < / p a n >
< / m i d i - i n s t r u m e n t >
< / s c o r e - p a r t >
< / p a r t - l i s t >
< ! - - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - >
< p a r t i d = ' P 1 ' >
< m e a s u r e n u m b e r = ' 1 ' >
< p r i n t >
< s y s t e m - l a y o u t >
< s y s t e m - m a r g i n s >
< l e f t - m a r g i n > 2 2 . 1 8 7 5 < / l e f t - m a r g i n >
< r i g h t - m a r g i n > 0 < / r i g h t - m a r g i n >
< / s y s t e m - m a r g i n s >
< t o p - s y s t e m - d i s t a n c e > 2 1 7 . 8 1 2 5 < / t o p - s y s t e m - d i s t a n c e >
< / s y s t e m - l a y o u t >
< s t a f f - l a y o u t >
< ? D o l e t S i b e l i u s E x t r a S p a c e s A b o v e = 3 ? >
< / s t a f f - l a y o u t >
< / p r i n t >
< a t t r i b u t e s >
< d i v i s i o n s > 7 6 8 < / d i v i s i o n s >
< k e y >
< f i f t h s > 0 < / f i f t h s >
< m o d e > m a j o r < / m o d e >
< / k e y >
< t i m e >
< b e a t s > 4 < / b e a t s >
< b e a t - t y p e > 4 < / b e a t - t y p e >
< / t i m e >
< c l e f >
< s i g n > G < / s i g n >
< l i n e > 2 < / l i n e >
< / c l e f >
< / a t t r i b u t e s >
< n o t e >
< p i t c h >
< s t e p > G < / s t e p >
< o c t a v e > 4 < / o c t a v e >
< / p i t c h >
< d u r a t i o n > 3 0 7 2 < / d u r a t i o n >
< v o i c e > 1 < / v o i c e >
< t y p e > w h o l e < / t y p e >
< n o t a t i o n s >
< o r n a m e n t s >
< t r i l l - m a r k d e f a u l t - y = ' 2 0 ' / >
< w a v y - l i n e t y p e = ' s t a r t ' n u m b e r = ' 1 ' / >
< w a v y - l i n e t y p e = ' s t o p ' n u m b e r = ' 1 ' / >
< / o r n a m e n t s >
< / n o t a t i o n s >
< / n o t e >
< b a r l i n e l o c a t i o n = ' r i g h t ' >
< b a r - s t y l e > l i g h t - h e a v y < / b a r - s t y l e >
< / b a r l i n e >
< / m e a s u r e >
< / p a r t >
< ! - - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = - - >
< / s c o r e - p a r t w i s e >
\version "2.16.2"
% automatically converted by musicxml2ly from /home/tom/VirtualBox VMs/shared/trill-test.xml
\header {
encodingsoftware = "Sibelius 8.0"
copyright = "Copyright © "
encodingdate = "2015-12-13"
}
#(set-global-staff-size 19.9169291339)
\paper {
paper-width = 21.0\cm
paper-height = 29.7\cm
top-margin = 1.27\cm
bottom-margin = 1.27\cm
left-margin = 1.27\cm
right-margin = 1.27\cm
between-system-space = 1.62\cm
page-top-space = 1.27\cm
}
\layout {
\context { \Score
autoBeaming = ##f
}
}
PartPOneVoiceOne = \relative g' {
\clef "treble" \key c \major \numericTimeSignature\time 4/4 g1
\trill \startTrillSpan \stopTrillSpan \bar "|."
}
% The score definition
\score {
<<
\new Staff <<
\set Staff.instrumentName = "[Unnamed (treble staff)]"
\context Staff <<
\context Voice = "PartPOneVoiceOne" { \PartPOneVoiceOne }
>>
>>
>>
\layout {}
% To create MIDI output, uncomment the following line:
% \midi {}
}
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
