From 46a84e9187fe0edc901725f958f391bb1d1c3b44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Fri, 12 Apr 2019 10:03:44 +0200 Subject: [PATCH] ctest update: Japanese documents (should) work with non-TeX fonts. * do not ignore Japanese (platex) with system fonts. * CJK can be used with XeTeX and TeX-fonts if the input encoding is utf8. do not ignore. * TODO: set non-TeX fonts and uninvert where possible. --- .../export/latex/inputenc-utf8-plain.lyx | 5 +- .../export/latex/supported-languages.lyx | 48 +++++++++++++------ development/autotests/ignoredTests | 22 +++++---- development/autotests/invertedTests | 8 ++-- ...Multilingual_Typesetting_%28CJKutf8%29.lyx | 5 +- 5 files changed, 56 insertions(+), 32 deletions(-) diff --git a/autotests/export/latex/inputenc-utf8-plain.lyx b/autotests/export/latex/inputenc-utf8-plain.lyx index 6163f72e46..84128ef33c 100644 --- a/autotests/export/latex/inputenc-utf8-plain.lyx +++ b/autotests/export/latex/inputenc-utf8-plain.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 566 +\lyxformat 572 \begin_document \begin_header \save_transient_properties true @@ -52,7 +52,7 @@ logicalmkup \use_microtype false \use_dash_ligatures false \graphics default -\default_output_format default +\default_output_format pdf2 \output_sync 0 \bibtex_command default \index_command default @@ -98,6 +98,7 @@ logicalmkup \papercolumns 1 \papersides 1 \paperpagestyle default +\tablestyle default \tracking_changes false \output_changes false \html_math_output 0 diff --git a/autotests/export/latex/supported-languages.lyx b/autotests/export/latex/supported-languages.lyx index c990a25f1c..9b7b4702c8 100644 --- a/autotests/export/latex/supported-languages.lyx +++ b/autotests/export/latex/supported-languages.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 571 +\lyxformat 572 \begin_document \begin_header \save_transient_properties true @@ -291,6 +291,11 @@ Afrikaans Babel afrikaans \end_layout +\begin_layout Labeling +\labelwidthstring 00.00.0000 +Polyglossia n.a. +\end_layout + \begin_layout Labeling \labelwidthstring 00.00.0000 LangCode af_ZA @@ -380,7 +385,7 @@ LyX arabic_arabi \begin_layout Labeling \labelwidthstring 00.00.0000 -Babel arabic +Babel arabic (fails with non-TeX fonts) \end_layout \begin_layout Labeling @@ -2308,15 +2313,22 @@ Encoding jis-platex \begin_layout Labeling \labelwidthstring 00.00.0000 -Requires japanese (platex). - +Requires japanese (platex) or non-TeX fonts \end_layout \begin_layout Itemize -Does not work with pdfLaTeX, XeTeX, or LuaTeX. +Does not work with pdfLaTeX and conflicts with +\emph on +inputenc +\emph default + package. \end_layout +\begin_layout Itemize +XeTeX and LuaTeX work only with non-TeX fonts. +\end_layout + \begin_layout Itemize Does not work as secondary language unless the document encoding is set to one of the special @@ -2327,19 +2339,25 @@ Does not work as secondary language unless the document encoding is set \begin_inset Quotes grd \end_inset - input encodings. + input encodings or non-TeX fonts are used. \end_layout -\begin_layout Itemize +\begin_layout Quote +\begin_inset Branch polyglossia-only +inverted 0 +status open + +\begin_layout Standard + +\series bold +日本語 +\series default +（にほんご、にっぽんご[注 1]）は、主に日本国内や日本人同士の間で使用されている言語である。 +\end_layout + +\end_inset + -\emph on -inputenc -\emph default - and -\emph on -fontenc -\emph default - packages not loaded \end_layout \begin_layout Subsection* diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests index e1eda0e1ce..269270d82a 100644 --- a/development/autotests/ignoredTests +++ b/development/autotests/ignoredTests @@ -59,18 +59,17 @@ export/examples/Modules/Chessboard_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF) # XeTeX with TeX-fonts works only for input encodings "utf8" and "ascii". # Generally, documentation and templates use "auto" 8-bit encodings. # 1. Exceptions to the following pattern (test cases with the right encoding): -!export/.*(utf8|ascii)_pdf4_texF !export/examples/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ja|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/Welcome_pdf4_texF !export/examples/ja/Multilingual_Typesetting_.*CJK.*_pdf4_texF # 2. Catchall patterns to ignore the other tests: .*_pdf4_texF export/(doc|examples|templates)/(|ar|ca|cs|da|de|el|es|eu|fa|fr|gl|he|hu|id|it|ja|ko|nb|nl|pl|pt|pt_BR|pt_PT|ro|ru|sk|sl|sr|sv|uk|zh_CN)/.*pdf4_texF -# CJK fails with LuaTeX or XeTeX and 8-bit fonts: -export/examples/ja/Multilingual_Typesetting_.*CJK.*_texF -export/.*/ko/.*texF -export/.*/zh_CN/.*texF -export/export/latex/CJK/zh_CN-toc_.*_texF +# CJK fails with LuaTeX and 8-bit fonts: +export/examples/ja/Multilingual_Typesetting_.*CJK.(dvi3|pdf5)_texF +export/.*/ko/.(dvi3|pdf5)_texF +export/.*/zh_CN/.(dvi3|pdf5)_texF +export/export/latex/CJK/zh_CN-toc_.(dvi3|pdf5)_texF # Japanese knitr.lyx and sweave.lyx support only XeLaTeX with system fonts # because they use the "bxjsarticle" class. @@ -84,12 +83,15 @@ export/examples/ja/Modules/Sweave.* # Other Japanese documents use language "japanese" wich is tied to "platex" # (automatically invoked instead of "latex" to create a DVI file). # Export by plain- and pdflatex engines works with language "japanese-cjk", e.g. -!export/examples/ja/Multilingual_Typesetting_.*CJK.* +!export/examples/ja/Multilingual_Typesetting_.*CJK.*(dvi|pdf[23]?) +!export/examples/ja/Multilingual_Typesetting_.*CJK.*systemF # For a discussion of alternatives for Japanese with LaTeX , see also # http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/ -export/.*/ja/.*_(pdf[245]|dvi3).* -# the unicodesymbols-tests use pdflatex, too: -export/export/latex/unicodesymbols/.*-platex_pdf2 +export/.*/ja/.*_(pdf2|texF) +# ignore tests for pLaTeX with pdflatex or Xe/LuaTeX and 8-bit fonts: +export/export/latex/.*platex.*(pdf2|texF) +export/export/latex/ja_wrong_auto_encoding_(pdf2|texF) + # export of minted documents to 2.2.x is not guaranteed to work (and currently # fails for our two minted example files), as explained here: diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 40e2afc0b6..91f8afc0e2 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -86,7 +86,7 @@ export/templates/Articles/R_Journal_(dvi3|pdf[45])_systemF export/export/latex/supported-languages_.*_systemF # dvipdfm fails (missing Hebrew font DavidCLM-Medium.pfa) -# also many warnings +# also many warnings # xdvipdfmx:warning: Interpreting PS code failed!!! Output might be broken!!! # xdvipdfmx:warning: Interpreting special command ps: (ps:) failed. # maybe due to the Hebrew vocalisation using Postscript 3 specials @@ -161,8 +161,10 @@ export/export/latex/fa-OT1_pdf2 #11522 Support specification of complementing non-TeX fonts # More than one non-TeX font required for the character set in many documents # to prevent "missing glyph" errors with non-TeX fonts -export/export/latex/luainputenc-utf8_pdf5_systemF -export/export/latex/xetex-inputenc.*_pdf4_systemF +# FIXME: fix and uninvert documents that work after setting a Japanese system font. +export/export/latex/.*inputenc-.*_systemF +!export/examples/ja/Multilingual_Typesetting_%28CJKutf8%29_.*_systemF +export/.*/ja/.*_systemF # export/doc/(|de/|es/|fr/)Math.*systemF # minimal example for Math.lyx: diff --git a/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx b/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx index 36817ed179..2d2480478f 100644 --- a/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx +++ b/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 566 +\lyxformat 572 \begin_document \begin_header \save_transient_properties true @@ -38,7 +38,7 @@ logicalmkup \maintain_unincluded_children false \language japanese-cjk \language_package auto -\inputencoding utf8-cjk +\inputencoding utf8 \fontencoding auto \font_roman "DejaVuSerif" "DejaVu Serif" \font_sans "DejaVuSans" "DejaVu Sans" @@ -100,6 +100,7 @@ logicalmkup \papercolumns 1 \papersides 1 \paperpagestyle default +\tablestyle default \tracking_changes false \output_changes false \html_math_output 0 -- 2.39.5