summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorroot <galaxico@quteity>2019-06-26 14:55:31 +0300
committerroot <galaxico@quteity>2019-06-26 14:55:31 +0300
commit4bb6d14fa00159bad75ef88bbcf6a84560722ab0 (patch)
treea200a05bacb2e075b092144192795603e82f9f6b /build
parentdfc2cc21025dfb7b0605d5059edfb79d3486629b (diff)
parentb6b2c92725cbab11b8853070163abd9e8a13f6ff (diff)
downloadinstallation-guide-4bb6d14fa00159bad75ef88bbcf6a84560722ab0.zip
updated Greek translations
Diffstat (limited to 'build')
-rw-r--r--build/arch-options/amd648
-rw-r--r--build/arch-options/arm644
-rw-r--r--build/arch-options/armel4
-rw-r--r--build/arch-options/armhf4
-rw-r--r--build/arch-options/hppa4
-rw-r--r--build/arch-options/hurd-i3864
-rw-r--r--build/arch-options/i3866
-rw-r--r--build/arch-options/ia644
-rw-r--r--build/arch-options/kfreebsd-amd646
-rw-r--r--build/arch-options/kfreebsd-i3866
-rw-r--r--build/arch-options/mips4
-rw-r--r--build/arch-options/mips64el4
-rw-r--r--build/arch-options/mipsel4
-rw-r--r--build/arch-options/powerpc6
-rw-r--r--build/arch-options/ppc64el6
-rw-r--r--build/arch-options/s3904
-rw-r--r--build/arch-options/s390x4
-rw-r--r--build/arch-options/sparc4
-rwxr-xr-xbuild/buildone.sh1
-rwxr-xr-xbuild/buildone_ng.sh2
-rw-r--r--build/entities/common.ent88
-rw-r--r--build/lang-options/cs2
-rw-r--r--build/lang-options/el2
-rw-r--r--build/lang-options/ru2
-rw-r--r--build/stylesheets/dblatex.xsl15
25 files changed, 120 insertions, 78 deletions
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 3fcf373ab..db9f6376d 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -6,9 +6,11 @@ archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc"
arch_listname="amd64"
arch_porturl="amd64"
# This is coming from the lowmem package
-minimum_memory=178
+minimum_memory_strict=170
+# This is coming from the lowmem package
+minimum_memory=550
# This is coming from the rootskel package, S60frontend
-minimum_memory_gtk=229
+minimum_memory_gtk=800
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
smp_config_option="Symmetric multi-processing support"
@@ -25,4 +27,4 @@ goodies="supports-lang-chooser"
# To re-add the "checked for this arch" or "not-checked for this arch" warnings
# back (see en/bookinfo.xml file), add "checked" or "not-checked" to status here.
-status="" \ No newline at end of file
+status=""
diff --git a/build/arch-options/arm64 b/build/arch-options/arm64
index d57e43b47..757d7a9ed 100644
--- a/build/arch-options/arm64
+++ b/build/arch-options/arm64
@@ -10,7 +10,9 @@ archspec="arm;arm64;not-x86;not-s390;not-powerpc"
arch_listname="arm"
arch_porturl="arm"
# This is coming from the lowmem package
-minimum_memory=31
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=80
# These two options should be set if condition 'smp' is set below
smp_config_section="Kernel Features"
smp_config_option="Symmetric Multi-Processing"
diff --git a/build/arch-options/armel b/build/arch-options/armel
index 0045a3366..c04f4fad2 100644
--- a/build/arch-options/armel
+++ b/build/arch-options/armel
@@ -10,7 +10,9 @@ archspec="arm;armel;not-x86;not-s390;not-powerpc"
arch_listname="arm"
arch_porturl="arm"
# This is coming from the lowmem package
-minimum_memory=31
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=80
# These two options should be set if condition 'smp' is set below
smp_config_section="N/A"
smp_config_option="N/A"
diff --git a/build/arch-options/armhf b/build/arch-options/armhf
index e14bbefe5..05e720ef6 100644
--- a/build/arch-options/armhf
+++ b/build/arch-options/armhf
@@ -10,7 +10,9 @@ archspec="arm;armhf;not-x86;not-s390;not-powerpc"
arch_listname="arm"
arch_porturl="arm"
# This is coming from the lowmem package
-minimum_memory=31
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=80
# These two options should be set if condition 'smp' is set below
smp_config_section="Kernel Features"
smp_config_option="Symmetric Multi-Processing"
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index 5320ddde5..73033c78b 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -6,7 +6,9 @@ archspec="hppa;not-x86;not-s390;not-powerpc"
arch_listname="hppa"
arch_porturl="hppa"
# This is coming from the lowmem package
-minimum_memory=32
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=64
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386
index 2f08d42ea..0b341aeb6 100644
--- a/build/arch-options/hurd-i386
+++ b/build/arch-options/hurd-i386
@@ -6,7 +6,9 @@ archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc"
arch_listname="hurd"
arch_porturl="hurd"
# This is coming from the lowmem package
-minimum_memory=365
+minimum_memory_strict=390
+# This is coming from the lowmem package
+minimum_memory=500
# This is coming from the rootskel package, S60frontend
minimum_memory_gtk=750
# These two options should be set if condition 'smp' is set below
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index e044b6332..4cb7d5316 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -6,9 +6,11 @@ archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc"
arch_listname="boot"
arch_porturl="i386"
# This is coming from the lowmem package
-minimum_memory=135
+minimum_memory_strict=120
+# This is coming from the lowmem package
+minimum_memory=400
# This is coming from the rootskel package, S60frontend
-minimum_memory_gtk=293
+minimum_memory_gtk=550
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index 4e6fcf630..baf322f79 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -7,7 +7,9 @@ arch_listname="ia64"
arch_porturl="ia64"
# TODO: update
# This is coming from the lowmem package
-minimum_memory=32
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=64
# These two options should be set if condition 'smp' is set below
smp_config_section="General setup"
smp_config_option="SMP support"
diff --git a/build/arch-options/kfreebsd-amd64 b/build/arch-options/kfreebsd-amd64
index 2db9389a1..9239f2a8e 100644
--- a/build/arch-options/kfreebsd-amd64
+++ b/build/arch-options/kfreebsd-amd64
@@ -6,9 +6,11 @@ archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc"
arch_listname="bsd"
arch_porturl="kfreebsd-gnu"
# This is coming from the lowmem package
-minimum_memory=170
+minimum_memory_strict=170
+# This is coming from the lowmem package
+minimum_memory=232
# This is coming from the rootskel package, S60frontend
-minimum_memory_gtk=224
+minimum_memory_gtk=256
# These two options should be set if condition 'smp' is set below
# TODO: update
smp_config_section="Processor type and features"
diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386
index 2d075c697..46be8b717 100644
--- a/build/arch-options/kfreebsd-i386
+++ b/build/arch-options/kfreebsd-i386
@@ -6,9 +6,11 @@ archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc"
arch_listname="bsd"
arch_porturl="kfreebsd-gnu"
# This is coming from the lowmem package
-minimum_memory=90
+minimum_memory_strict=90
+# This is coming from the lowmem package
+minimum_memory=104
# This is coming from the rootskel package, S60frontend
-minimum_memory_gtk=293
+minimum_memory_gtk=256
# These two options should be set if condition 'smp' is set below
# TODO: update
smp_config_section="Processor type and features"
diff --git a/build/arch-options/mips b/build/arch-options/mips
index c34dc5d16..cee077d71 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -6,7 +6,9 @@ archspec="mips;not-x86;not-s390;not-powerpc"
arch_listname="mips"
arch_porturl="mips"
# This is coming from the lowmem package
-minimum_memory=33
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=85
# These two options should be set if condition 'smp' is set below
smp_config_section="Kernel type"
smp_config_option="Multi-Processing support"
diff --git a/build/arch-options/mips64el b/build/arch-options/mips64el
index 9343cba0a..2817c76a9 100644
--- a/build/arch-options/mips64el
+++ b/build/arch-options/mips64el
@@ -6,7 +6,9 @@ archspec="mips64el;not-x86;not-s390;not-powerpc"
arch_listname="mips"
arch_porturl="mips"
# This is coming from the lowmem package
-minimum_memory=33
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=85
# These two options should be set if condition 'smp' is set below
smp_config_section="Kernel type"
smp_config_option="Multi-Processing support"
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index 9c5389df2..ac4e22738 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -6,7 +6,9 @@ archspec="mipsel;not-x86;not-s390;not-powerpc"
arch_listname="mips"
arch_porturl="mips"
# This is coming from the lowmem package
-minimum_memory=33
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=85
# These two options should be set if condition 'smp' is set below
smp_config_section="Kernel type"
smp_config_option="Multi-Processing support"
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index 4929a7a2e..d885d54e2 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -7,9 +7,11 @@ arch_listname="powerpc"
arch_porturl="powerpc"
# TODO: update
# This is coming from the lowmem package
-minimum_memory=32
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=64
# This is coming from the rootskel package, S60frontend
-minimum_memory_gtk=293
+minimum_memory_gtk=800
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor support"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/ppc64el b/build/arch-options/ppc64el
index 2d012e10d..0b11af35d 100644
--- a/build/arch-options/ppc64el
+++ b/build/arch-options/ppc64el
@@ -7,9 +7,11 @@ arch_listname="powerpc"
arch_porturl="powerpc"
# TODO: update
# This is coming from the lowmem package
-minimum_memory=32
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=64
# This is coming from the rootskel package, S60frontend
-minimum_memory_gtk=170
+minimum_memory_gtk=800
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor support"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index 7d3781894..b00794ce9 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -7,7 +7,9 @@ arch_listname="s390"
arch_porturl="s390"
# TODO: update
# This is coming from the lowmem package
-minimum_memory=20
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=44
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/s390x b/build/arch-options/s390x
index 8d45cb17b..76efbb3a7 100644
--- a/build/arch-options/s390x
+++ b/build/arch-options/s390x
@@ -11,7 +11,9 @@ arch_listname="s390"
arch_porturl="s390"
# TODO: update
# This is coming from the lowmem package
-minimum_memory=20
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=44
# These two options should be set if condition 'smp' is set below
smp_config_section="Processor type and features"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 4fdd4658f..7bbcc5845 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -7,7 +7,9 @@ arch_listname="sparc"
arch_porturl="sparc"
# TODO: update
# This is coming from the lowmem package
-minimum_memory=32
+minimum_memory_strict=32
+# This is coming from the lowmem package
+minimum_memory=64
# These two options should be set if condition 'smp' is set below
smp_config_section="General setup"
smp_config_option="Symmetric multi-processing support"
diff --git a/build/buildone.sh b/build/buildone.sh
index 3b8dc442c..7375838ff 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -96,6 +96,7 @@ create_profiled () {
echo "<!ENTITY kernelpackage \"${kernelpackage}\">" >> $dynamic
echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic
+ echo "<!ENTITY minimum-memory-strict \"${minimum_memory_strict}&notation-megabytes;\">" >> $dynamic
echo "<!ENTITY minimum-memory \"${minimum_memory}&notation-megabytes;\">" >> $dynamic
echo "<!ENTITY minimum-memory-gtk \"${minimum_memory_gtk}&notation-megabytes;\">" >> $dynamic
diff --git a/build/buildone_ng.sh b/build/buildone_ng.sh
index a2fb0ffee..c251e132b 100755
--- a/build/buildone_ng.sh
+++ b/build/buildone_ng.sh
@@ -100,6 +100,7 @@ create_profiled () {
echo "<!ENTITY kernelpackage \"${kernelpackage}\">" >> $dynamic
echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic
echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic
+ echo "<!ENTITY minimum-memory-strict \"${minimum_memory_strict}&notation-megabytes;\">" >> $dynamic
echo "<!ENTITY minimum-memory \"${minimum_memory}&notation-megabytes;\">" >> $dynamic
echo "<!ENTITY minimum-memory-gtk \"${minimum_memory_gtk}&notation-megabytes;\">" >> $dynamic
@@ -277,6 +278,7 @@ done
# Clean up
rm -r $tempdir
+
# Delete temporary PO files and generated XML files
clear_po
clear_xml
diff --git a/build/entities/common.ent b/build/entities/common.ent
index ed2892ef8..128095798 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -4,7 +4,7 @@
<!-- current year (to be used for copyright declaration). -->
<!-- When changing this, also change in "debian/copyright" file! -->
-<!ENTITY current-year "2017">
+<!ENTITY current-year "2019">
<!-- short name to use for Debian -->
<!ENTITY debian "Debian">
@@ -62,7 +62,7 @@
cleanup, plus minimal ~150MB work space included.
Also update the value in debian-installer/build/boot/x86/f2.txt
-->
-<!ENTITY minimum-fs-size "780&notation-megabytes;">
+<!ENTITY minimum-fs-size "850&notation-megabytes;">
<!--
Size of install as used in appendix/files.xml; all values based on amd64.
@@ -91,46 +91,46 @@ to first switch tasksel to that DE using the following command, e.g:
-->
<!-- Size of the basic installation -->
- <!ENTITY base-system-size "613">
- <!ENTITY std-system-size "800">
+ <!ENTITY base-system-size "701">
+ <!ENTITY std-system-size "933">
<!-- Desktop environment task - GNOME -->
- <!ENTITY task-desktop-gnome-inst "3163">
- <!ENTITY task-desktop-gnome-dl "935">
- <!ENTITY task-desktop-gnome-tot "4098">
+ <!ENTITY task-desktop-gnome-inst "2724">
+ <!ENTITY task-desktop-gnome-dl "785">
+ <!ENTITY task-desktop-gnome-tot "3509">
<!-- Desktop environment task - KDE -->
- <!ENTITY task-desktop-kde-inst "3044">
- <!ENTITY task-desktop-kde-dl "911">
- <!ENTITY task-desktop-kde-tot "3955">
+ <!ENTITY task-desktop-kde-inst "4244">
+ <!ENTITY task-desktop-kde-dl "1280">
+ <!ENTITY task-desktop-kde-tot "5524">
<!-- Desktop environment task - Xfce -->
- <!ENTITY task-desktop-xfce-inst "2122">
- <!ENTITY task-desktop-xfce-dl "593">
- <!ENTITY task-desktop-xfce-tot "2715">
+ <!ENTITY task-desktop-xfce-inst "2342">
+ <!ENTITY task-desktop-xfce-dl "657">
+ <!ENTITY task-desktop-xfce-tot "2999">
<!-- Desktop environment task - LXDE -->
- <!ENTITY task-desktop-lxde-inst "2133">
- <!ENTITY task-desktop-lxde-dl "602">
- <!ENTITY task-desktop-lxde-tot "2735">
+ <!ENTITY task-desktop-lxde-inst "2486">
+ <!ENTITY task-desktop-lxde-dl "707">
+ <!ENTITY task-desktop-lxde-tot "3193">
<!-- Desktop environment task - MATE -->
- <!ENTITY task-desktop-mate-inst "2288">
- <!ENTITY task-desktop-mate-dl "644">
- <!ENTITY task-desktop-mate-tot "2932">
+ <!ENTITY task-desktop-mate-inst "2857">
+ <!ENTITY task-desktop-mate-dl "757">
+ <!ENTITY task-desktop-mate-tot "3614">
<!-- Desktop environment task - Cinnamon -->
- <!ENTITY task-desktop-cinnamon-inst "2878">
- <!ENTITY task-desktop-cinnamon-dl "843">
- <!ENTITY task-desktop-cinnamon-tot "3721">
+ <!ENTITY task-desktop-cinnamon-inst "3824">
+ <!ENTITY task-desktop-cinnamon-dl "1102">
+ <!ENTITY task-desktop-cinnamon-tot "4926">
<!-- Web server task -->
- <!ENTITY task-web-inst "40">
- <!ENTITY task-web-dl "9">
- <!ENTITY task-web-tot "49">
+ <!ENTITY task-web-inst "44">
+ <!ENTITY task-web-dl "11">
+ <!ENTITY task-web-tot "55">
<!-- Print server task -->
- <!ENTITY task-print-inst "407">
- <!ENTITY task-print-dl "95">
- <!ENTITY task-print-tot "502">
+ <!ENTITY task-print-inst "440">
+ <!ENTITY task-print-dl "91">
+ <!ENTITY task-print-tot "531">
<!-- SSH server task -->
- <!ENTITY task-ssh-inst "1">
+ <!ENTITY task-ssh-inst "2">
<!ENTITY task-ssh-dl "0">
- <!ENTITY task-ssh-tot "1">
+ <!ENTITY task-ssh-tot "2">
-<!-- Size needed by base and gnome desktop task for / with separate /usr, /var, /boot, for amd64 -->
+<!-- Size needed by base and gnome/kde desktop task for / with separate /usr, /var, /boot, for amd64 -->
<!ENTITY root-system-size-min "250">
<!ENTITY root-system-size-max "350">
@@ -138,18 +138,18 @@ to first switch tasksel to that DE using the following command, e.g:
<!-- use:
for i in binary-*; do echo -n "$i: "; zgrep '^Package:' ./binary-all/Packages.gz ./$i/Packages.gz | wc -l; done
-->
-<!-- last updated: 2017-02-11 for Stretch (Samuel Thibault) -->
+<!-- last updated: 2019-06-02 for Buster (Samuel Thibault) -->
<!ENTITY num-of-distrib-pkgs
- "<phrase arch='amd64'>75746</phrase>
- <phrase arch='arm64'>74365</phrase>
- <phrase arch='armel'>74134</phrase>
- <phrase arch='armhf'>74360</phrase>
- <phrase arch='i386'>75573</phrase>
- <phrase arch='mips'>73821</phrase>
- <phrase arch='mips64el'>73793</phrase>
- <phrase arch='mipsel'>74037</phrase>
- <phrase arch='ppc64el'>74309</phrase>
- <phrase arch='s390x'>73878</phrase>
+ "<phrase arch='amd64'>85212</phrase>
+ <phrase arch='arm64'>83841</phrase>
+ <phrase arch='armel'>82997</phrase>
+ <phrase arch='armhf'>83498</phrase>
+ <phrase arch='i386'>84902</phrase>
+ <phrase arch='mips'>82790</phrase>
+ <phrase arch='mips64el'>83004</phrase>
+ <phrase arch='mipsel'>83095</phrase>
+ <phrase arch='ppc64el'>83524</phrase>
+ <phrase arch='s390x'>82943</phrase>
">
<!-- Number of current Debian developers -->
@@ -159,13 +159,13 @@ to first switch tasksel to that DE using the following command, e.g:
<!-- Number of current Debian maillists (see
http://lists.debian.org/completeindex.html) -->
-<!ENTITY num-of-debian-maillists "283">
+<!ENTITY num-of-debian-maillists "317">
<!-- version of X11 shipping with the current release, see version of the xorg package -->
<!ENTITY x11ver "7.7">
<!-- version of BRLTTY shipping with the current release, see version of the brltty package -->
-<!ENTITY brlttyver "5.4">
+<!ENTITY brlttyver "5.6">
<!-- version of Speakup shipping with the current release, see version of the speakup-doc package -->
<!ENTITY speakupver "3.1.6">
diff --git a/build/lang-options/cs b/build/lang-options/cs
index 6c87bd96e..7fdda7b3d 100644
--- a/build/lang-options/cs
+++ b/build/lang-options/cs
@@ -1,2 +1,2 @@
-# empty placeholder file
+optional_paras="outdated-translation"
diff --git a/build/lang-options/el b/build/lang-options/el
index 7fdda7b3d..c5275944b 100644
--- a/build/lang-options/el
+++ b/build/lang-options/el
@@ -1,2 +1,2 @@
-optional_paras="outdated-translation"
+optional_paras="outdated-translation;gpl-unofficial"
diff --git a/build/lang-options/ru b/build/lang-options/ru
index 7fdda7b3d..6c87bd96e 100644
--- a/build/lang-options/ru
+++ b/build/lang-options/ru
@@ -1,2 +1,2 @@
-optional_paras="outdated-translation"
+# empty placeholder file
diff --git a/build/stylesheets/dblatex.xsl b/build/stylesheets/dblatex.xsl
index a16797c24..e59a1464b 100644
--- a/build/stylesheets/dblatex.xsl
+++ b/build/stylesheets/dblatex.xsl
@@ -16,12 +16,15 @@
</xsl:when>
<xsl:when test="contains(/book/@lang,'ko')">
<xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
- <xsl:text>\setCJKmainfont{WenQuanYi Micro Hei}&#10;</xsl:text>
- <xsl:text>\setCJKsansfont{WenQuanYi Micro Hei}&#10;</xsl:text>
- <xsl:text>\setCJKmonofont{WenQuanYi Micro Hei Mono}&#10;</xsl:text>
- <xsl:text>\setmainfont{WenQuanYi Micro Hei}&#10;</xsl:text>
- <xsl:text>\setsansfont{WenQuanYi Micro Hei}&#10;</xsl:text>
- <xsl:text>\setmonofont{WenQuanYi Micro Hei Mono}&#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>