summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorLuca Monducci <luca.mo@tiscali.it>2019-07-27 15:12:47 +0200
committerLuca Monducci <luca.mo@tiscali.it>2019-07-27 15:12:47 +0200
commit6764487fd041da7415e44183736426da13af7bda (patch)
treefb98b8d1ecc6014f6d8e6c1f5bbb632d68a0ca13 /build
parent7ee4e940ea95e4676916d0e36092926d01989c79 (diff)
parent2244f2b19af8c2556fd5dadf752c652a1c5fdcc0 (diff)
downloadinstallation-guide-6764487fd041da7415e44183736426da13af7bda.zip
Merge branch 'master' of salsa.debian.org:installer-team/installation-guide
Diffstat (limited to 'build')
-rw-r--r--build/entities/l10n/fr.ent2
-rw-r--r--build/lang-options/el2
-rw-r--r--build/stylesheets/dblatex.xsl16
3 files changed, 12 insertions, 8 deletions
diff --git a/build/entities/l10n/fr.ent b/build/entities/l10n/fr.ent
index acb0c6c01..48a6835fa 100644
--- a/build/entities/l10n/fr.ent
+++ b/build/entities/l10n/fr.ent
@@ -18,3 +18,5 @@
<!ENTITY enterkey "<keycap>Entrée</keycap>">
<!ENTITY downkey "<keycap>flèche du bas</keycap>">
<!ENTITY endkey "<keycap>Fin</keycap>">
+<!-- notation used for 'megabytes' -->
+<!ENTITY notation-megabytes " Mo">
diff --git a/build/lang-options/el b/build/lang-options/el
index c5275944b..30a2e23d1 100644
--- a/build/lang-options/el
+++ b/build/lang-options/el
@@ -1,2 +1,2 @@
-optional_paras="outdated-translation;gpl-unofficial"
+optional_paras="gpl-unofficial"
diff --git a/build/stylesheets/dblatex.xsl b/build/stylesheets/dblatex.xsl
index 8a490cae5..e59a1464b 100644
--- a/build/stylesheets/dblatex.xsl
+++ b/build/stylesheets/dblatex.xsl
@@ -16,13 +16,15 @@
</xsl:when>
<xsl:when test="contains(/book/@lang,'ko')">
<xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
- <xsl:text>\usepackage[hangul]{kotex}&#10;</xsl:text>
- <xsl:text>\setCJKmainfont{Noto Serif CJK KR}&#10;</xsl:text>
- <xsl:text>\setCJKsansfont{Noto Sans CJK KR}&#10;</xsl:text>
- <xsl:text>\setCJKmonofont{Noto Sans Mono CJK KR}&#10;</xsl:text>
- <xsl:text>\setmainfont{Noto Serif CJK KR}&#10;</xsl:text>
- <xsl:text>\setsansfont{Noto Sans CJK KR}&#10;</xsl:text>
- <xsl:text>\setmonofont{Noto Sans Mono CJK KR}&#10;</xsl:text>
+ <xsl:text>\xeCJKsetup{CJKspace=true,CJKmath=true,CJKecglue={}}&#10;</xsl:text>
+ <xsl:text>\usepackage{setspace}&#10;</xsl:text>
+ <xsl:text>\onehalfspacing&#10;</xsl:text>
+ <xsl:text>\setCJKmainfont{나눔명조}&#10;</xsl:text>
+ <xsl:text>\setCJKsansfont{나눔고딕}&#10;</xsl:text>
+ <xsl:text>\setCJKmonofont{나눔고딕코딩}&#10;</xsl:text>
+ <xsl:text>\setmainfont{나눔명조}&#10;</xsl:text>
+ <xsl:text>\setsansfont{나눔고딕}&#10;</xsl:text>
+ <xsl:text>\setmonofont{나눔고딕코딩}&#10;</xsl:text>
</xsl:when>
<xsl:when test="contains(/book/@lang,'zh')">
<xsl:text>\usepackage{xeCJK}&#10;</xsl:text>