MusicXML: Implement different styles of tuplet brackets and numbers

Curved brackets are not yet working...

diff --git a/input/regression/musicxml/12c-Tuplet-Styles.xml b/input/regression/musicxml/12c-Tuplet-Styles.xml
index d2825d82c915c1020fc3928e27e8d50fef4c5c50..6b55d4d8aba5c2fff69341523fd0d5aff2e1c316 100644 (file)
--- a/input/regression/musicxml/12c-Tuplet-Styles.xml
+++ b/input/regression/musicxml/12c-Tuplet-Styles.xml
@@ -24,7 +24,7 @@
           <mode>major</mode>
         </key>
         <time symbol="common">
-          <beats>4</beats>
+          <beats>5</beats>
           <beat-type>4</beat-type>
         </time>
         <clef>
@@ -44,9 +44,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>
+          <tuplet bracket="yes" number="1" type="start"/>
         </notations>
       </note>
       <note>
@@ -61,7 +60,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -75,7 +73,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -92,9 +89,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="yes" number="1" placement="below" show-number="none" type="start"/>
+          <tuplet bracket="yes" number="1" show-number="none" type="start"/>
         </notations>
       </note>
       <note>
@@ -109,7 +105,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -123,7 +118,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -140,9 +134,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="yes" number="1" placement="below" show-number="both" type="start"/>
+          <tuplet bracket="yes" number="1" show-number="both" type="start"/>
         </notations>
       </note>
       <note>
@@ -157,7 +150,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -171,7 +163,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -188,9 +179,53 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="both" type="start"/>
         </notations>
       </note>
       <note>
@@ -205,7 +240,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -219,7 +253,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -239,9 +272,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet number="1" placement="below" type="start"/>
+          <tuplet bracket="yes" line-shape="curved" number="1" type="start"/>
         </notations>
       </note>
       <note>
@@ -256,7 +288,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -270,7 +301,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -287,9 +317,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet number="1" placement="below" show-number="none" type="start"/>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="none" type="start"/>
         </notations>
       </note>
       <note>
@@ -304,7 +333,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -318,7 +346,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -335,9 +362,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet number="1" placement="below" show-number="both" type="start"/>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" type="start"/>
         </notations>
       </note>
       <note>
@@ -352,7 +378,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -366,7 +391,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -383,9 +407,53 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet number="1" placement="below" type="start"/>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="both" type="start"/>
         </notations>
       </note>
       <note>
@@ -400,7 +468,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -414,7 +481,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -434,9 +500,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="no" number="1" placement="below" type="start"/>
+          <tuplet bracket="no" number="1" type="start"/>
         </notations>
       </note>
       <note>
@@ -451,7 +516,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -465,7 +529,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -482,7 +545,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
           <tuplet bracket="no" number="1" show-number="none" type="start"/>
         </notations>
@@ -499,7 +561,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -513,7 +574,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -530,9 +590,53 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="no" number="1" placement="below" show-number="both" type="start"/>
+          <tuplet bracket="no" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="actual" type="start"/>
         </notations>
       </note>
       <note>
@@ -547,7 +651,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -561,7 +664,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -578,9 +680,8 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
-          <tuplet bracket="no" number="1" placement="below" type="start"/>
+          <tuplet bracket="no" number="1" show-number="both" show-type="both" type="start"/>
         </notations>
       </note>
       <note>
@@ -595,7 +696,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -609,7 +709,6 @@
           <actual-notes>3</actual-notes>
           <normal-notes>2</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -634,7 +733,6 @@
           <actual-notes>4</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
           <tuplet number="1" placement="below" show-number="both" type="start"/>
         </notations>
@@ -651,7 +749,6 @@
           <actual-notes>4</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -665,7 +762,6 @@
           <actual-notes>4</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -679,7 +775,6 @@
           <actual-notes>4</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -696,7 +791,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">begin</beam>
         <notations>
           <tuplet number="1" placement="below" type="start"/>
         </notations>
@@ -713,7 +807,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -727,7 +820,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -741,7 +833,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -755,7 +846,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -769,7 +859,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -783,7 +872,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -797,7 +885,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -811,7 +898,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -825,7 +911,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -839,7 +924,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -853,7 +937,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -867,7 +950,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -881,7 +963,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -895,7 +976,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -909,7 +989,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">continue</beam>
       </note>
       <note>
         <pitch>
@@ -923,7 +1002,6 @@
           <actual-notes>17</actual-notes>
           <normal-notes>3</normal-notes>
         </time-modification>
-        <beam number="1">end</beam>
         <notations>
           <tuplet number="1" type="stop"/>
         </notations>
@@ -936,7 +1014,6 @@
         <duration>204</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <beam number="1">begin</beam>
       </note>
       <note>
         <pitch>
@@ -946,7 +1023,6 @@
         <duration>204</duration>
         <voice>1</voice>
         <type>eighth</type>
-        <beam number="1">end</beam>
       </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>

diff --git a/python/musicexp.py b/python/musicexp.py
index c0b298f36797fd9a775c0afb588c77ea9bff4a37..bdd707476198a031ce5ca783dad876d03cda5fb3 100644 (file)
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -452,7 +452,47 @@ class RelativeMusic (MusicWrapper):
         relative_pitches = prev_relative_pitches
 
 class TimeScaledMusic (MusicWrapper):
+    def __init__ (self):
+        MusicWrapper.__init__ (self)
+        self.display_number = "actual" # valid values "actual" | "both" | None
+        # Display the basic note length for the tuplet:
+        self.display_type = None       # value values "actual" | "both" | None
+        self.display_bracket = "bracket" # valid values "bracket" | "curved" | None
+
     def print_ly (self, func):
+        if self.display_bracket == None:
+            func ("\\once \\override TupletBracket #'stencil = ##f")
+            func.newline ()
+        elif self.display_bracket == "curved":
+            warning (_ ("Tuplet brackets of curved shape are not correctly implemented"))
+            func ("\\once \\override TupletBracket #'stencil = #ly:slur::print")
+            func.newline ()
+
+        base_number_function = {None: "#f", 
+             "actual": "tuplet-number::calc-denominator-text", 
+             "both": "tuplet-number::calc-fraction-text"}.get (self.display_number, None)
+
+        if self.display_type == "actual":
+            base_duration = "8" # TODO!!!
+            func ("\\once \\override TupletNumber #'text = #(tuplet-number::append-note-wrapper %s \"%s\")" %
+                (base_number_function, base_duration))
+            func.newline ()
+        elif self.display_type == None:
+            if self.display_number == None:
+                func ("\\once \\override TupletNumber #'stencil = ##f")
+                func.newline ()
+            elif self.display_number == "both":
+                func ("\\once \\override TupletNumber #'text = #%s" % base_number_function)
+                func.newline ()
+        elif self.display_type == "both":
+            warning (_ ("Tuplet brackets displaying both note durations are not implemented, using default"))
+            if self.display_number == None:
+                func ("\\once \\override TupletNumber #'stencil = ##f")
+                func.newline ()
+            elif self.display_number == "both":
+                func ("\\once \\override TupletNumber #'text = #%s" % base_number_function)
+                func.newline ()
+
         func ('\\times %d/%d ' %
            (self.numerator, self.denominator))
         func.add_factor (Rational (self.numerator, self.denominator))

diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 48ad092feb3e6bc358e509365b3cdb6f0dfb4387..b124e99ebe57430969c415af8ae510c3badb84cf 100644 (file)
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -44,6 +44,7 @@ def error_message (str):
 
 needed_additional_definitions = []
 additional_definitions = {
+
   "snappizzicato": """#(define-markup-command (snappizzicato layout props) ()
   (interpret-markup layout props
     (markup #:stencil
@@ -54,6 +55,7 @@ additional_definitions = {
             (list 'draw-line 0.1 0 0.1 0 1)
             '(-0.1 . 0.1) '(0.1 . 1)))
         0.7 X))))""",
+
   "eyeglasses": """eyeglassesps = #"0.15 setlinewidth
       -0.9 0 translate
       1.1 1.1 scale
@@ -72,7 +74,20 @@ additional_definitions = {
       3.30 2.00 lineto
       3.42 2.26 3.80 2.40 3.65 1.70 curveto
       stroke"
-eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }"""
+eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }""",
+
+  "tuplet-note-wrapper": """      % a formatter function, which is simply a wrapper around an existing 
+      % tuplet formatter function. It takes the value returned by the given
+      % function and appends a note of given length. 
+  #(define-public ((tuplet-number::append-note-wrapper function note) grob)
+    (let* ((txt (if function (function grob) #f)))
+      (if txt 
+        (markup txt #:fontsize -5 #:note note UP)
+        (markup #:fontsize -5 #:note note UP)
+      )
+    )
+  )""",
+
 }
 
 def round_to_two_digits (val):
@@ -592,6 +607,30 @@ def group_repeats (music_list):
         # TODO: Implement repeats until the end without explicit ending bar
     return music_list
 
+def musicxml_tuplet_to_lily (tuplet_elt, fraction):
+    tsm = musicexp.TimeScaledMusic ()
+    tsm.numerator = fraction[0]
+    tsm.denominator  = fraction[1]
+
+    if hasattr (tuplet_elt, 'bracket') and tuplet_elt.bracket == "no":
+        tsm.display_bracket = None
+    elif hasattr (tuplet_elt, 'line-shape') and getattr (tuplet_elt, 'line-shape') == "curved":
+        tsm.display_bracket = "curved"
+    else:
+        tsm.display_bracket = "bracket"
+
+    display_values = {"none": None, "actual": "actual", "both": "both"}
+    if hasattr (tuplet_elt, "show-number"):
+        tsm.display_number = display_values.get (getattr (tuplet_elt, "show-number"), "actual")
+        if getattr (tuplet_elt, "show-number") == "both":
+            needed_additional_definitions.append ("tuplet-note-wrapper")
+    if hasattr (tuplet_elt, "show-type"):
+        tsm.display_type = display_values.get (getattr (tuplet_elt, "show-type"), None)
+
+    # TODO: Handle non-standard display (extract the type from the tuplet-actual 
+    # and tuplet-normal children
+    # TODO: We need the type from the time-modification tag!
+    return tsm
 
 
 def group_tuplets (music_list, events):
@@ -615,18 +654,19 @@ def group_tuplets (music_list, events):
         if hasattr (tuplet_elt, 'number'):
             nr = getattr (tuplet_elt, 'number')
         if tuplet_elt.type == 'start':
-            tuplet_info = [j, None, fraction]
+            tuplet_object = musicxml_tuplet_to_lily (tuplet_elt, fraction)
+            tuplet_info = [j, None, tuplet_object]
             indices.append (tuplet_info)
             brackets[nr] = tuplet_info
         elif tuplet_elt.type == 'stop':
             bracket_info = brackets.get (nr, None)
             if bracket_info:
-                bracket_info[1] = j
+                bracket_info[1] = j # Set the ending position to j
                 del brackets[nr]
 
     new_list = []
     last = 0
-    for (i1, i2, frac) in indices:
+    for (i1, i2, tsm) in indices:
         if i1 > i2:
             continue
 
@@ -635,12 +675,8 @@ def group_tuplets (music_list, events):
         last = i2 + 1
         seq.elements = music_list[i1:last]
 
-        tsm = musicexp.TimeScaledMusic ()
         tsm.element = seq
 
-        tsm.numerator = frac[0]
-        tsm.denominator  = frac[1]
-
         new_list.append (tsm)
 
     new_list.extend (music_list[last:])
@@ -1999,6 +2035,7 @@ def musicxml_voice_to_lily_voice (voice):
         for notations in notations_children:
             for tuplet_event in notations.get_tuplets():
                 mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
+                # TODO: Extract the type of note (for possible display later on!)
                 frac = (1,1)
                 if mod:
                     frac = mod.get_fraction ()