From c6bae50e5b72b3152528e751c1efa559148d0828 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Tue, 19 Mar 2019 22:14:44 +0100 Subject: [PATCH] ctest update and small documentation fixes. --- .../export/latex/6197-polish-amssymb.lyx | 16 ++++++++- .../latex/CJK/en-de-el-ru-zh_CN_utf8.lyx | 4 +-- development/autotests/invertedTests | 7 ++-- development/autotests/unreliableTests | 31 ++++++++++------ .../ja/Graphics_&_Insets/Feynman_Diagrams.lyx | 14 ++------ lib/templates/Articles/R_Journal.lyx | 35 ++++++++++++++++++- src/BufferParams.h | 10 +++--- 7 files changed, 84 insertions(+), 33 deletions(-) diff --git a/autotests/export/latex/6197-polish-amssymb.lyx b/autotests/export/latex/6197-polish-amssymb.lyx index ea5805d947..31ac474c05 100644 --- a/autotests/export/latex/6197-polish-amssymb.lyx +++ b/autotests/export/latex/6197-polish-amssymb.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 566 +\lyxformat 567 \begin_document \begin_header \save_transient_properties true @@ -107,5 +107,19 @@ lll as character 0x142 LATIN SMALL LETTER L WITH STROKE: = ł. \end_layout +\begin_layout Standard +The toolbar button [ +\begin_inset Formula $\llless$ +\end_inset + +] inserts +\backslash +lll which becomes +\begin_inset Formula $\lll$ +\end_inset + +. +\end_layout + \end_body \end_document diff --git a/autotests/export/latex/CJK/en-de-el-ru-zh_CN_utf8.lyx b/autotests/export/latex/CJK/en-de-el-ru-zh_CN_utf8.lyx index a9996745bf..f677b592ff 100644 --- a/autotests/export/latex/CJK/en-de-el-ru-zh_CN_utf8.lyx +++ b/autotests/export/latex/CJK/en-de-el-ru-zh_CN_utf8.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 566 +\lyxformat 567 \begin_document \begin_header \save_transient_properties true @@ -21,7 +21,7 @@ \font_osf false \font_sf_scale 100 100 \font_tt_scale 100 100 -\font_cjk bsmi +\font_cjk gbsn \use_microtype false \use_dash_ligatures true \graphics default diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 7d135e4228..d86a13da18 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -67,11 +67,9 @@ export/export/latex/luainputenc-utf8_pdf5_texF # nonstandard tests failing for unknown reason: -export/examples/aa_sample_(dvi3|pdf[45])_.* export/templates/obsolete/ACM-siggraph_pdf5_(texF|systemF) export/templates/IUCr-article_pdf4_systemF export/templates/RJournal_(dvi3|pdf[45])_systemF -export/templates/aa_(dvi3|pdf[45])_.* export/templates/kluwer_.*_systemF @@ -214,6 +212,11 @@ export/examples/ru/(example_lyxified|splash)_(dvi3|pdf[45])_texF export/export/latex/uk-babel-date-missing-chars-with-ascii_(pdf4|dvi3)_texF export/(doc|examples)/uk/(Intro|splash)_(pdf4|dvi3)_texF +# Fails with XeTeX/LuaTeX +# Reported upstream (https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg184435.html) +# Is there a new version fixing the problem? +export/examples/aa_sample_(dvi3|pdf[45])_.* +export/templates/aa_(dvi3|pdf[45])_.* # Gives the following error: # # ! Package hpstatement Error: H or P statement "H251" diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests index 805bb94f42..5b683c563a 100644 --- a/development/autotests/unreliableTests +++ b/development/autotests/unreliableTests @@ -19,31 +19,32 @@ export/templates/IUCr-article_(dvi|pdf).* export/templates/kluwer_.*_systemF export/templates/ectaart_(dvi3|pdf5).* -# requires knitr, requires rjournal.sty (not in TeXLive) -# incompatible with fontspec? -export/templates/RJournal_(dvi3|pdf[45])_systemF - -# Requires aa.cls (not in TeXLive). -# Fails with XeTeX/LuaTeX -# Reported upstream (https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg184435.html) -# Is there a new version fixing the problem? -export/examples/aa_sample_(dvi3|pdf[45])_.* -export/templates/aa_(dvi3|pdf[45])_.* - # Requires iucr.cls (not in TeXLive) # Is there a new version fixing the problem? # Does LuaTeX produce sensible results? export/templates/IUCr-article_pdf4_systemF +# Requires aa.cls (not in TeXLive). +export/examples/aa_sample_.* +export/templates/aa_.* + # Requires acmsiggraph.cls (not in TeXLive) # see http://wiki.lyx.org/Examples/AcmSiggraph export/templates/obsolete/ACM-siggraph/ACM-siggraph_(dvi|pdf).* +# Requires copernicus.cls (not in TeXLive) +# see https://publications.copernicus.org/for_authors/manuscript_preparation.html +export/templates/copernicus_.* + # R (http://www.r-project.org) export/examples/sweave.* # R package knitr (http://yihui.name/knitr) export/examples/knitr.* +# requires knitr, requires RJournal.sty (not in TeXLive) +# incompatible with fontspec? +export/templates/RJournal_.* + # LilyPond-book version 2.13 or newer. export/examples/lilypond.* @@ -75,6 +76,9 @@ export/templates/maa-monthly.* # svjour3.cls, svglov2.clo (see https://wiki.lyx.org/Examples/Springer) export/templates/springer/svjour3.* +# requires obsolete versions of class- or style-files +export/templates/obsolete.* + Sublabel: needauth ################## @@ -115,6 +119,11 @@ export/(doc|examples)/uk/(Intro|splash)_.*_texF # new problem with TL18 (see invertedTests) export/export/latex/luainputenc-utf8_pdf5_texF +# aastex: hard-coded version in class name: +# 2018-05-12 aastex6.cls -> aastex62.cls +export/examples/aas_sample62_.* +export/templates/aastex62_.* + # since TeXLive18, 8-bit LaTeX defaults to utf-8 # ---------------------------------------------- diff --git a/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx b/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx index a247299122..5da6c676c3 100644 --- a/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx +++ b/lib/examples/ja/Graphics_&_Insets/Feynman_Diagrams.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -15,16 +15,6 @@ % the documentation team % email: lyx-docs@lists.lyx.org -% if pdflatex is used -\usepackage{ifpdf} -\ifpdf - -% set fonts for nicer pdf view -%\IfFileExists{lmodern.sty} - {\usepackage{lmodern}}{} - -\fi % end if pdflatex is used - % increase link area for cross-references and autoname them, \AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}} \newlength{\abc} @@ -46,7 +36,7 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" +\font_roman "lmodern" "default" \font_sans "default" "default" \font_typewriter "default" "default" \font_math "auto" "auto" diff --git a/lib/templates/Articles/R_Journal.lyx b/lib/templates/Articles/R_Journal.lyx index 36e5450aa8..2bafb67ac8 100644 --- a/lib/templates/Articles/R_Journal.lyx +++ b/lib/templates/Articles/R_Journal.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -81,6 +81,39 @@ knitr \begin_body \begin_layout Standard +\begin_inset Note Note +status open + +\begin_layout Plain Layout +This document requires the LaTeX style file +\begin_inset Quotes eld +\end_inset + +RJournal.sty +\begin_inset Quotes erd +\end_inset + +. +\end_layout + +\begin_layout Plain Layout +See +\begin_inset Flex URL +status open + +\begin_layout Plain Layout + +https://journal.r-project.org/submissions.html +\end_layout + +\end_inset + + +\end_layout + +\end_inset + + \begin_inset ERT status open diff --git a/src/BufferParams.h b/src/BufferParams.h index 229d1be6a5..8f402f870d 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -324,18 +324,20 @@ public: * The encoding of the LyX file is always utf8 and has nothing to * do with this setting. * The difference between \c auto and \c default is that \c auto also - * causes loading of the inputenc package, while \c default does not. + * causes loading of the inputenc package and writes a \inputenc{} command + * to the file when switching to another encoding, while \c default does not. * \c default will not work unless the user takes additional measures * (such as using special environments like the CJK environment from * CJK.sty). - * \c default can be seen as an unspecified 8bit encoding, since LyX + * \c default can be seen as an unspecified mix of 8bit encodings, since LyX * does not interpret it in any way apart from display on screen. */ std::string inputenc; /// The main encoding used by this buffer for LaTeX output. - /// Individual pieces of text can use different encodings. + /// If the main encoding is \c auto or \c default, + /// individual pieces of text can use different encodings. /// Output for XeTeX with 8-bit TeX fonts uses ASCII (set at runtime) - /// instead of the value returned by this function. + /// instead of the value returned by this function (cf. #10600). Encoding const & encoding() const; /// std::string origin; -- 2.39.5