Reviewers: lemzwerg, J_lowe, dak,
Message:
On 2015/08/26 07:09:10, dak wrote:
On 2015/08/26 07:06:58, J_lowe wrote:
> Patch counted down please push.
>
> PATCH_PUSH
The commit message appears to talk about "antient.ly" instead of
"ancient.ly".
Fixing that before rebasing/pushing might be a good idea.
I've fixed.
Thank you.
Description:
Issue 4571 / 4: Add font aliases settings for NR: antient.itely
This commit adds generic font aliases settings.
Issue 4571 / 3: Add font aliases settings for NR: input.itely
This commit adds generic font aliases settings.
Issue 4571 / 2: Add font aliases settings for snippets utf-8.ly
This commit adds following generic font aliases settings:
Linux Libertine is serif.
Linux Biolinum is sans-serif.
Linux Libertine Mono is monospace.
So characters that are not contained
in the Libertine font (like Japanese)
are substituted to a serif font.
Issue 4571 / 1: Add font aliases settings for Unicode demonstration
This commit adds following generic font aliases settings:
Linux Libertine is serif.
Linux Biolinum is sans-serif.
Linux Libertine Mono is monospace.
So characters that are not contained
in the Libertine font (like Japanese)
are substituted to a serif font.
Please review this at https://codereview.appspot.com/261980044/
Affected files (+42, -31 lines):
M Documentation/de/notation/ancient.itely
M Documentation/de/notation/input.itely
M Documentation/es/notation/ancient.itely
M Documentation/es/notation/input.itely
M Documentation/fr/notation/ancient.itely
M Documentation/fr/notation/input.itely
M Documentation/ja/notation/input.itely
M Documentation/notation/ancient.itely
M Documentation/notation/input.itely
M Documentation/snippets/new/utf-8.ly
M input/regression/typography-demo.ly
M input/regression/utf-8.ly
M input/regression/utf-8-mixed-text.ly
Index: Documentation/de/notation/ancient.itely
diff --git a/Documentation/de/notation/ancient.itely
b/Documentation/de/notation/ancient.itely
index
2457c7227e1005c103e4947edbea098418c4823d..4d777e2b92f3f7db9442544538bb1e7f0ac9efe5
100644
--- a/Documentation/de/notation/ancient.itely
+++ b/Documentation/de/notation/ancient.itely
@@ -2540,7 +2540,7 @@ richtigen Werten, sodass man sofort den Choral
notieren kann:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
Index: Documentation/de/notation/input.itely
diff --git a/Documentation/de/notation/input.itely
b/Documentation/de/notation/input.itely
index
9527a450af5b380a488091bb890d9293d6df5a53..5879d98eb894c2c6ec9a1e13e5407122f072a0b4
100644
--- a/Documentation/de/notation/input.itely
+++ b/Documentation/de/notation/input.itely
@@ -2207,9 +2207,9 @@ Heir ein Beispiel mit Kyrilliza, hebräischem und
portugiesischem Text:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: Documentation/es/notation/ancient.itely
diff --git a/Documentation/es/notation/ancient.itely
b/Documentation/es/notation/ancient.itely
index
c60704da809df14dd5fb6d3ad09a37ef621615bd..072f9933eefc858fc876556fe061f9dd44113ada
100644
--- a/Documentation/es/notation/ancient.itely
+++ b/Documentation/es/notation/ancient.itely
@@ -2476,7 +2476,7 @@ inmediatamente con la introducción del propio canto:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
@@ -2667,7 +2667,7 @@ kievano:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
Index: Documentation/es/notation/input.itely
diff --git a/Documentation/es/notation/input.itely
b/Documentation/es/notation/input.itely
index
756f0dfd66c814060ffcf18fe4c975a2d313e77b..abe7941049cf98ee6c6d29d2447c5a29c778f096
100644
--- a/Documentation/es/notation/input.itely
+++ b/Documentation/es/notation/input.itely
@@ -2480,9 +2480,9 @@ He aquí un ejemplo que muestra texto cirílico, hebreo
y portugués:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: Documentation/fr/notation/ancient.itely
diff --git a/Documentation/fr/notation/ancient.itely
b/Documentation/fr/notation/ancient.itely
index
374739efe8313d980aa1e18ef8c3c15988f525cb..2976478858904fd12a7cb0bcc23f07c448b58665
100644
--- a/Documentation/fr/notation/ancient.itely
+++ b/Documentation/fr/notation/ancient.itely
@@ -2467,7 +2467,7 @@ lancer dans la saisie de votre chant, comme
ci-dessous :
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
@@ -2653,7 +2653,7 @@ Voici comment générer des ligatures en notation
kiévienne :
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
Index: Documentation/fr/notation/input.itely
diff --git a/Documentation/fr/notation/input.itely
b/Documentation/fr/notation/input.itely
index
4097716826d91a226bb7a96432942f8256021703..ac2b8ca0f3a86a9d626bd9a518e575dfb5b8a48b
100644
--- a/Documentation/fr/notation/input.itely
+++ b/Documentation/fr/notation/input.itely
@@ -2523,9 +2523,9 @@ portugais.
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: Documentation/ja/notation/input.itely
diff --git a/Documentation/ja/notation/input.itely
b/Documentation/ja/notation/input.itely
index
9ce314da42b8bef83236493ab6dbbfb179eb9d86..dfd4584bdd9f80e7ca1d6e10e065fa6ee9ec8a34
100644
--- a/Documentation/ja/notation/input.itely
+++ b/Documentation/ja/notation/input.itely
@@ -2221,9 +2221,9 @@ FT_Get_Glyph_Name () error: invalid argument
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: Documentation/notation/ancient.itely
diff --git a/Documentation/notation/ancient.itely
b/Documentation/notation/ancient.itely
index
57a8b21e12176c1c3f1dca7baad95bd2c9ad7e1f..9f2f25690e3daebb38dc9a69a4bd9275893a77e1
100644
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -2412,7 +2412,7 @@ values, so you can immediately go ahead entering the
chant:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
@@ -2590,7 +2590,7 @@ The following example demonstrates the use of Kievan
ligatures:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
+ #:roman "Linux Libertine O,serif"
))
}
Index: Documentation/notation/input.itely
diff --git a/Documentation/notation/input.itely
b/Documentation/notation/input.itely
index
1346590f8e78c23b86bb4a2b61ca8771e1f4f2f1..a5b04b4b2414171179a2ab7b155a8c894a6ab906
100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -2379,9 +2379,9 @@ text:
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: Documentation/snippets/new/utf-8.ly
diff --git a/Documentation/snippets/new/utf-8.ly
b/Documentation/snippets/new/utf-8.ly
index
2788c3cf08ef5bc843982480b72172b5e7db2434..7dcb13ed6780dbbd8369b3537a9cb73509478c87
100644
--- a/Documentation/snippets/new/utf-8.ly
+++ b/Documentation/snippets/new/utf-8.ly
@@ -39,9 +39,9 @@ Debian GNU/Linux, Ubuntu
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: input/regression/typography-demo.ly
diff --git a/input/regression/typography-demo.ly
b/input/regression/typography-demo.ly
index
51a2dd601f518a07ffc727a198b75b63e22d061e..c915c7fe52663c261f887c70b481cd2270ea53b0
100644
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -27,9 +27,9 @@ ignoreMelismaOff = \unset ignoreMelismata
% Linux Libertine fonts contain Cyrillic and Hebrew glyphs.
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
Index: input/regression/utf-8-mixed-text.ly
diff --git a/input/regression/utf-8-mixed-text.ly
b/input/regression/utf-8-mixed-text.ly
index
7f93917c2f4c9036f926c35e34fda0a4922526ef..b0fba2c5d25a1a0ced08eb5d0b1a09a19084cab8
100644
--- a/input/regression/utf-8-mixed-text.ly
+++ b/input/regression/utf-8-mixed-text.ly
@@ -7,4 +7,15 @@
\version "2.16.0"
+% Font settings for Cyrillic
+% Linux Libertine fonts contain Cyrillic glyphs.
+\paper {
+ #(define fonts
+ (set-global-fonts
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
+ ))
+}
+
\markup { "Здравствуйте Hallo" }
Index: input/regression/utf-8.ly
diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly
index
ae9742f1a2f37d2d25cf781ed9c72a024bebba9f..b5fefcf9231c8c9ef200c0d3f05358613d1a6884
100644
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@ -34,9 +34,9 @@ will render Bulgarian (Cyrillic), Hebrew, Japanese and
Portuguese.
\paper {
#(define fonts
(set-global-fonts
- #:roman "Linux Libertine O"
- #:sans "Linux Biolinum O"
- #:typewriter "Linux Libertine Mono O"
+ #:roman "Linux Libertine O,serif"
+ #:sans "Linux Biolinum O,sans-serif"
+ #:typewriter "Linux Libertine Mono O,monospace"
))
}
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
