Merge branch 'master' into translation

[lilypond.git] / Documentation / ja / notation / input.itely

diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely
index 431b62b6e5811eb5a27eb28ef160ec0a88652035..dfd4584bdd9f80e7ca1d6e10e065fa6ee9ec8a34 100644 (file)
--- a/Documentation/ja/notation/input.itely
+++ b/Documentation/ja/notation/input.itely
@@ -2216,6 +2216,17 @@ FT_Get_Glyph_Name () error: invalid argument
 @c KEEP LY
 @lilypond[quote]
 %c No verbatim here as the code does not display correctly in PDF
+% Font settings for Cyrillic and Hebrew
+% Linux Libertine fonts contain Cyrillic and Hebrew glyphs.
+\paper {
+  #(define fonts
+    (set-global-fonts
+     #:roman "Linux Libertine O,serif"
+     #:sans "Linux Biolinum O,sans-serif"
+     #:typewriter "Linux Libertine Mono O,monospace"
+   ))
+}
+
 % キリル文字
 bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
@@ -2440,12 +2451,14 @@ showLastLength = R1*5
 スキップするということに注意してください。@c
 くれぐれも注意してください。
 
-@lilypond[quote,relative=2,ragged-right,verbatim]
-c8 d
-\set Score.skipTypesetting = ##t
-e8 e e e e e e e
-\set Score.skipTypesetting = ##f
-c8 d b bes a g c2
+@lilypond[quote,ragged-right,verbatim]
+\relative {
+  c''8 d
+  \set Score.skipTypesetting = ##t
+  e8 e e e e e e e
+  \set Score.skipTypesetting = ##f
+  c8 d b bes a g c2
+}
 @end lilypond
 
 多声の音楽では、@code{Score.skipTypesetting} はすべてのボイスと譜に@c