From f8fd7252a58e222ecf63b630dccf3496d0e92f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Milde?= Date: Fri, 10 May 2019 16:21:09 +0200 Subject: [PATCH] Fix/update inpuencoding / unicodesymbols ctests. --- autotests/export/latex/inputenc-cp858.lyx | 21 ++-- autotests/export/latex/luainputenc-utf8.lyx | 22 +--- ...2-hebrew_he_HE8.lyx => 012-hebrew_HE8.lyx} | 76 ++++------- .../latex/unicodesymbols/012-hebrew_he.lyx | 119 ++++++++++++++++-- 4 files changed, 147 insertions(+), 91 deletions(-) rename autotests/export/latex/unicodesymbols/{012-hebrew_he_HE8.lyx => 012-hebrew_HE8.lyx} (78%) diff --git a/autotests/export/latex/inputenc-cp858.lyx b/autotests/export/latex/inputenc-cp858.lyx index 2cd2a3c7d7..a34ec444fd 100644 --- a/autotests/export/latex/inputenc-cp858.lyx +++ b/autotests/export/latex/inputenc-cp858.lyx @@ -171,12 +171,13 @@ literal "false" \end_inset -\end_layout +\begin_inset Note Note +status open -\begin_layout Standard +\begin_layout Plain Layout \begin_inset CommandInset include LatexCommand input -filename "unicodesymbols/012-hebrew_he_HE8.lyx" +filename "unicodesymbols/031-thai_th.lyx" literal "false" \end_inset @@ -184,11 +185,15 @@ literal "false" \end_layout -\begin_layout Standard -\begin_inset CommandInset include -LatexCommand input -filename "unicodesymbols/031-thai_th.lyx" -literal "false" +\end_inset + + +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Thai and Hebrew cannot be used in the same document (see supported-languages). +\end_layout \end_inset diff --git a/autotests/export/latex/luainputenc-utf8.lyx b/autotests/export/latex/luainputenc-utf8.lyx index 4be0e296a4..14e4c6b02d 100644 --- a/autotests/export/latex/luainputenc-utf8.lyx +++ b/autotests/export/latex/luainputenc-utf8.lyx @@ -218,23 +218,11 @@ literal "false" \end_layout \begin_layout Plain Layout -\begin_inset CommandInset include -LatexCommand input -filename "unicodesymbols/012-hebrew_he_HE8.lyx" -literal "false" - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -Hebrew does not work with XeTeX and TeX-fonts: -\end_layout - -\begin_layout Plain Layout -Error 256 (driver return code) generating output; file 012-hebrew_he_HE8.pdf - may not be valid. +Hebrew does not work with LuaTeX and TeX-fonts, because it loads +\emph on +inputenc +\emph default + if not already loaded. \end_layout \end_inset diff --git a/autotests/export/latex/unicodesymbols/012-hebrew_he_HE8.lyx b/autotests/export/latex/unicodesymbols/012-hebrew_HE8.lyx similarity index 78% rename from autotests/export/latex/unicodesymbols/012-hebrew_he_HE8.lyx rename to autotests/export/latex/unicodesymbols/012-hebrew_HE8.lyx index 33694d6ecb..3e42d7bce2 100644 --- a/autotests/export/latex/unicodesymbols/012-hebrew_he_HE8.lyx +++ b/autotests/export/latex/unicodesymbols/012-hebrew_HE8.lyx @@ -1,19 +1,19 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 571 +\lyxformat 573 \begin_document \begin_header \save_transient_properties true \origin unavailable \textclass article \begin_preamble -\def\HeblatexEncoding{HE8} + \end_preamble \use_default_options false \maintain_unincluded_children false \language english \language_package default \inputencoding utf8 -\fontencoding HE8,T1 +\fontencoding HE8 \font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" @@ -89,24 +89,16 @@ \begin_body \begin_layout Subsection* -12 Hebrew +12) Hebrew \end_layout \begin_layout Standard -Hebrew text must be set to the -\begin_inset Quotes eld -\end_inset - -hebrew -\begin_inset Quotes erd -\end_inset - - language in order to select the right font encoding. -\end_layout - -\begin_layout Standard -This document uses the nonstandard Hebrew font encoding HE8 that includes - additional characters (see Document>Settings>Fonts and >User Preamble). +Hebrew characters are only available in the right font encoding (LHE or + HE8). + This file selects HE8 as custom font encoding under Document>Settings>Fonts. + The writing direction is unchanged, RTL support requires setting the text + language (cf. + 012-hebrew_he.lyx). \end_layout \begin_layout Standard @@ -116,9 +108,7 @@ inverted 0 status open \begin_layout Standard - -\lang hebrew -א֑ א֒ א֓ א֔ א֕ א֖ א֗ א֘ א֙ א֚ א֛ א֜ א֝ א֞ א֟ +א֑ א֒ א֓ א֔ א֕ א֖ א֗ א֘ א֙ א֚ א֛ א֜ א֝ א֞ א֟ \end_layout \end_inset @@ -127,15 +117,13 @@ status open \end_layout \begin_layout Standard -5A0 +5A0 \begin_inset Branch na inverted 0 status open \begin_layout Standard - -\lang hebrew -א֠ א֡ א֢ א֣ א֤ א֥ א֦ א֧ א֨ א֩ א֪ א֫ א֬ א֭ א֮ א֯ +א֠ א֡ א֢ א֣ א֤ א֥ א֦ א֧ א֨ א֩ א֪ א֫ א֬ א֭ א֮ א֯ \end_layout \end_inset @@ -144,16 +132,12 @@ status open \end_layout \begin_layout Standard -5B0 -\lang hebrew - אְ אֱ אֲ אֳ אִ אֵ אֶ אַ אָ אֹ +5B0 אְ אֱ אֲ אֳ אִ אֵ אֶ אַ אָ אֹ \begin_inset Branch na inverted 0 status open \begin_layout Standard - -\lang hebrew אֺ \end_layout @@ -165,8 +149,6 @@ inverted 0 status open \begin_layout Standard - -\lang hebrew אֿ \end_layout @@ -177,65 +159,53 @@ status open \begin_layout Standard 5C0 -\lang hebrew - \begin_inset Branch na inverted 0 status open \begin_layout Standard - -\lang hebrew -׀ +׀ \end_layout \end_inset - שׁ שׂ ׃ +שׁ שׂ ׃ \begin_inset Branch na inverted 0 status open \begin_layout Standard - +אׄ אׅ ׆ א \lang hebrew -אׄ אׅ ׆ אׇ +ׇ \end_layout \end_inset - + \end_layout \begin_layout Standard -5D0 -\lang hebrew -א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן +5D0 א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן \end_layout \begin_layout Standard -5E0 -\lang hebrew -נ ס ע ף פ ץ צ ק ר ש ת +5E0 נ ס ע ף פ ץ צ ק ר ש ת \end_layout \begin_layout Standard -5F0 -\lang hebrew -װ ױ ײ +5F0 װ ױ ײ \begin_inset Branch na inverted 0 status open \begin_layout Standard - -\lang hebrew ׳ ״ \end_layout \end_inset - + \end_layout \end_body diff --git a/autotests/export/latex/unicodesymbols/012-hebrew_he.lyx b/autotests/export/latex/unicodesymbols/012-hebrew_he.lyx index 8e83d3af6a..02921b074f 100644 --- a/autotests/export/latex/unicodesymbols/012-hebrew_he.lyx +++ b/autotests/export/latex/unicodesymbols/012-hebrew_he.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 571 +\lyxformat 573 \begin_document \begin_header \save_transient_properties true @@ -63,6 +63,11 @@ \filename_suffix 0 \color #faf0e6 \end_branch +\branch HE8-only +\selected 1 +\filename_suffix 0 +\color #faf0e6 +\end_branch \index Index \shortcut idx \color #008000 @@ -101,14 +106,18 @@ hebrew \begin_inset Quotes erd \end_inset - language in order to select the right font encoding (LHE or HE8). + language in order to select the right font encoding (LHE or HE8) and writing + direction (right-to-left). Hebrew 8-bit TeX fonts are not part of TeXLive. \end_layout \begin_layout Standard Babel-Hebrew defaults to the legacy font encoding LHE, that only supports the basic Hebrew alphabet. - +\end_layout + +\begin_layout Standard +LyX selects the HE8 font encoding if available. \end_layout \begin_layout Standard @@ -120,7 +129,7 @@ status open \begin_layout Standard \lang hebrew -א֑ א֒ א֓ א֔ א֕ א֖ א֗ א֘ א֙ א֚ א֛ א֜ א֝ א֞ א֟ +א֑ א֒ א֓ א֔ א֕ א֖ א֗ א֘ א֙ א֚ א֛ א֜ א֝ א֞ א֟ \end_layout \end_inset @@ -129,7 +138,7 @@ status open \end_layout \begin_layout Standard -5A0 +5A0 \begin_inset Branch na inverted 0 status open @@ -137,7 +146,7 @@ status open \begin_layout Standard \lang hebrew -א֠ א֡ א֢ א֣ א֤ א֥ א֦ א֧ א֨ א֩ א֪ א֫ א֬ א֭ א֮ א֯ +א֠ א֡ א֢ א֣ א֤ א֥ א֦ א֧ א֨ א֩ א֪ א֫ א֬ א֭ א֮ א֯ \end_layout \end_inset @@ -147,6 +156,21 @@ status open \begin_layout Standard 5B0 +\lang hebrew + +\begin_inset Branch HE8-only +inverted 0 +status open + +\begin_layout Standard + +\lang hebrew +אְ אֱ אֲ אֳ אִ אֵ אֶ אַ אָ אֹ +\end_layout + +\end_inset + + \begin_inset Branch na inverted 0 status open @@ -154,16 +178,70 @@ status open \begin_layout Standard \lang hebrew -אֻ אּ אֽ ־ אֿ אְ אֱ אֲ אֳ אִ אֵ אֶ אַ אָ אֹ אֺ +אֺ +\end_layout + +\end_inset + + +\begin_inset Branch HE8-only +inverted 0 +status open + +\begin_layout Standard + +\lang hebrew +אֻ אּ אֽ ־ +\end_layout + +\end_inset + + +\begin_inset Branch na +inverted 0 +status open + +\begin_layout Standard + +\lang hebrew +אֿ +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +5C0 +\lang hebrew + +\begin_inset Branch na +inverted 0 +status open + +\begin_layout Standard + +\lang hebrew +׀ \end_layout \end_inset -\end_layout +\begin_inset Branch HE8-only +inverted 0 +status open \begin_layout Standard -5C0 + +\lang hebrew +שׁ שׂ ׃ +\end_layout + +\end_inset + + \begin_inset Branch na inverted 0 status open @@ -171,7 +249,7 @@ status open \begin_layout Standard \lang hebrew -שׁ שׂ ׃ אׄ אׅ ׆ אׇ ׀ +אׄ אׅ ׆ אׇ \end_layout \end_inset @@ -182,7 +260,7 @@ status open \begin_layout Standard 5D0 \lang hebrew -א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן +א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן \end_layout \begin_layout Standard @@ -193,6 +271,21 @@ status open \begin_layout Standard 5F0 +\lang hebrew + +\begin_inset Branch HE8-only +inverted 0 +status open + +\begin_layout Standard + +\lang hebrew +װ ױ ײ +\end_layout + +\end_inset + + \begin_inset Branch na inverted 0 status open @@ -200,12 +293,12 @@ status open \begin_layout Standard \lang hebrew -װ ױ ײ ׳ ״ +׳ ״ \end_layout \end_inset - + \end_layout \end_body