fix jlreq abstract layout and adapt Chinese docs for unicode engines

jlreq layout defined the abstract environment to be boxed
in the preamble. Doing any kind of typesetting before
all the setup has finished is error prone and may lead to
wrong output (wrong fonts for example). The correct
place to put the abstract code is right before \maketitle.

The Chinese docs loaded the ctex package in case system fonts
were used. Now, with the new support for languages with babel
and polyglossia it is no longer necessary and creates collisions.

diff --git a/lib/doc/zh_CN/Intro.lyx b/lib/doc/zh_CN/Intro.lyx
index eab48dae4015191a58c9cf9f87a3c98ae2c1a3aa..762040272b9e5162e6e0f14fbae6fb1a095ea1fa 100644 (file)
--- a/lib/doc/zh_CN/Intro.lyx
+++ b/lib/doc/zh_CN/Intro.lyx
@@ -5,13 +5,6 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/zh_CN/
 \textclass article
-\begin_preamble
-% Chinese localization
-\@ifpackageloaded{fontspec}%
-{\usepackage{ctex}}% ctex with non-TeX fonts
-{%\usepackage[UTF8]{ctex}% error with font setup (missing font?)
-}
-\end_preamble
 \use_default_options true
 \maintain_unincluded_children no
 \language chinese-simplified

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index 346d280be43ca65ccc79dc0b9d62ce4b34c07f3b..93f95e389e5b818e2fc5b497255af757858586c8 100644 (file)
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -5,13 +5,6 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/zh_CN/
 \textclass book
-\begin_preamble
-% Chinese localization
-\@ifpackageloaded{fontspec}%
-{\usepackage{ctex}}% ctex with non-TeX fonts
-{%\usepackage[UTF8]{ctex}% error with font setup (missing font?)
-}
-\end_preamble
 \options cjk
 \use_default_options true
 \maintain_unincluded_children no

diff --git a/lib/layouts/jlreq-common.inc b/lib/layouts/jlreq-common.inc
index fb7dfba2c305fefa3735bc459bdcc15453eed1ee..d601c4ab3bfd59104ea117a506f377059b0d6ec5 100644 (file)
--- a/lib/layouts/jlreq-common.inc
+++ b/lib/layouts/jlreq-common.inc
@@ -94,7 +94,7 @@ End
 
 Style Abstract_over_Columns
        CopyStyle                       Abstract
-       InPreamble                      1
+       InTitle                         1
        LabelString                     "Abstract"
        Category                        FrontMatter
        LatexType                       Command