From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Sun, 17 Feb 2013 17:00:43 +0000 (+0100)
Subject: Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation
X-Git-Tag: release/2.17.13-1~10
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=23108a9515e7f76b44fac0b323afb169d708bfa1

Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation
---

23108a9515e7f76b44fac0b323afb169d708bfa1
diff --cc Documentation/ja/learning/tweaks.itely
index 7f0c0dbd17,b688efff09..682c438c5b
--- a/Documentation/ja/learning/tweaks.itely
+++ b/Documentation/ja/learning/tweaks.itely
@@@ -518,10 -475,12 +518,10 @@@ a4^"Black
  @cindex transparent property, example (transparent プロパティの例)
  @cindex TupletNumber, example of overriding (TupletNumber をオーバライドする例)
  
 -@c NOTE Tuplet brackets collide if notes are high on staff
 -@c See issue 509
  @lilypond[quote,ragged-right,verbatim,fragment,relative=1]
- \times 2/3 { c8[ c c] }
+ \tuplet 3/2 { c8[ c c] }
  \once \override TupletNumber.text = #tuplet-number::calc-fraction-text
- \times 2/3 {
+ \tuplet 3/2 {
    c8[ c]
    c8[ c]
    \once \override TupletNumber.transparent = ##t