From: Günter Milde Date: Thu, 21 Mar 2019 16:41:14 +0000 (+0100) Subject: Amend d3ec77c6338: adapt ctest tag files. X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2407 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ecd0b57f6f330cc3d9f368ac92f20814efe4b351;p=features.git Amend d3ec77c6338: adapt ctest tag files. Update the regular expressions for inversion and tagging of tests to use the new paths for examples and templates. --- diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests index e36a7287f0..3f7d6e7c46 100644 --- a/development/autotests/ignoredTests +++ b/development/autotests/ignoredTests @@ -12,7 +12,8 @@ Sublabel: problematic # ================================================ # problems exporting to lyx16x -export/examples/(Literate|noweb2lyx)_lyx16 +export/examples/Modules/Noweb_lyx16 +export/examples/Modules/Noweb2LyX_lyx16 # Tests created for lyx2lyx-tests only !export/export/lyx2lyx/lyx_.*_test_lyx[12][1236] @@ -33,27 +34,29 @@ Sublabel: special # Inside these two files, we state that they should only be expected # to work with pdflatex and possibly lualatex. -export/examples/PDF-form_(dvi.*|pdf[^25]*) -export/examples/(|de/|fr/)PDF-comment_dvi3_.*F -export/examples/(|de/|fr/)PDF-comment_pdf5_texF +export/examples/Modules/PDF_Form_(dvi.*|pdf[^25]*) +export/examples/(|de/|fr/)Modules/PDF_Comments_dvi3_.*F +export/examples/(|de/|fr/)Modules/PDF_Comments_pdf5_texF # Seems, like only latex and pdflatex compilations work #! Missing number, treated as zero. # in copernicus.cls:199 # \ifnum\pdfoutput=\z@ -export/templates/copernicus_(dvi3|pdf4|pdf5)_(texF|systemF) +export/templates/Articles/Copernicus_.*(dvi3|pdf4|pdf5)_(texF|systemF) # Document uses Postscript specials -# Does not compile with pdflatex (see note in the document source). -export/examples/instant_preview_(dvi3|pdf4)_systemF -export/examples/instant_preview_pdf[25].* -export/examples/(chessgame|chess-article|powerdot)_pdf[25].* -export/examples/chessboard-article_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF) -export/examples/fr/powerdot_pdf[25].* +# Does not compile with pdflatex or non-TeX fonts (see note in the document source). +export/examples/Graphics_._Insets/Instant_Preview_pdf[25].* +export/examples/Graphics_._Insets/Instant_Preview_(dvi3|pdf4)_systemF + +export/examples/(chessgame|chess-article)_pdf[25].* +export/examples/(|fr/)Presentations/Powerdot_pdf[25].* +export/examples/Modules/Chessboard_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF) + # requires jss.cls (not on CTAN) # "All documents need to be processed by pdflatex" [jss.pdf] -export/templates/JSS-article_(dvi|dvi3_.*|pdf3?) +export/templates/Articles/Journal_of_Statistical_Software_.*(dvi|dvi3_.*|pdf3?) # CJK fails with LuaTeX or XeTeX and 8-bit fonts: export/examples/ko/Welcome.*texF @@ -69,13 +72,14 @@ export/.*/zh_CN/.*texF # Exceptions: # * Japanese knitr.lyx and sweave.lyx support only XeLaTeX # with system fonts because they use the "bxjsarticle" class. -# * examples/multilingual.lyx uses "Japanese (CJK)" # The "!" means the following: # "Protect these tests from being matched by future patterns in this file". -!export/.*/ja/(knitr|sweave).*_(lyx.*|xhtml|pdf4_systemF) -export/.*/ja/(knitr|sweave).* -# -!export/.*/ja/multilingual.* +!export/examples/ja/Modules/Rnw.*knitr.*_(lyx.*|xhtml|pdf4_systemF) +export/examples/ja/Modules/Rnw.*knitr.* +!export/examples/ja/Modules/Sweave.*_(lyx.*|xhtml|pdf4_systemF) +export/examples/ja/Modules/Sweave.* +# examples/multilingual.lyx uses "Japanese (CJK)" +!export/examples/ja/Multilingual_Typesetting_.* export/.*/ja/.*_(pdf[245]|dvi3).* # the unicodesymbols-tests use pdflatex, too: export/export/latex/unicodesymbols/.*-platex_pdf2 @@ -83,29 +87,29 @@ export/export/latex/unicodesymbols/.*-platex_pdf2 # 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: # https://www.mail-archive.com/search?l=mid&q=20190113085555.GA7928%40GIOVE -export/examples/minted.*lyx22 +export/examples/Insets/Minted.*lyx22 # Subdocuments that are not expected to work as stand-alone documents: export/mathmacros/Spacechild[123].* -export/examples/springer/svmono_(acknow|acronym|appendix|chapter|dedication|foreword|glossary|part|preface|referenc|solutions)_lyx[0-9][0-9] -export/examples/springer/svmult_(acknow|acronym|appendix|cblist|dedication|foreword|glossary|part|preface|referenc)_lyx[0-9][0-9] -export/examples/thesis/(Acknowledgments|Appendix|Summary|Bibliography|chapter-[12])_lyx[0-9][0-9] +# chapters of Springer books (svmono, svmult) (except 00_Main_File) +export/examples/Books/Springer_.*(0[^0]|1.)_.*_lyx.* +export/examples/Theses/PhD_Thesis/(Acknowledgments|Appendix|Summary|Bibliography|chapter-[12])_lyx[0-9][0-9] # Used only as include file for some tests .*/export/IncludeMissingEndTagDiv.* # Bibliography.lyx is not expected to compile. See the following for discussion: # https://www.mail-archive.com/search?l=mid&q=20190104195414.opgeuggeqakxl2fo%40barna # Ignore all formats except xhtml export -export/examples/thesis/Bibliography_[^x].* +export/examples/Theses/PhD_Thesis/Bibliography_[^x].* # Document class "Docbook article (SGML)" does not work with LaTeX: -export/examples/docbook_article_(dvi3|pdf[245]).* -export/templates/DocBook_article_(dvi3|pdf[245]).* +export/examples/Articles/DocBook_Article_(dvi3|pdf[245]).* +export/templates/Articles/DocBook_Article_(dvi3|pdf[245]).* # `acmart` and `copernicus` are not supported by LyX < 2.3 -export/templates/acmart_lyx(16|20|21|22) -export/templates/copernicus_lyx(16|20|21|22) +export/templates/Articles/Association_for_Computing_Machinery_lyx(16|20|21|22) +export/templates/Articles/Copernicus_Publications_.*_lyx(16|20|21|22) # ============================================================ @@ -121,13 +125,13 @@ export/templates/attic/latex8_(dvi|dvi3_.*|lyx(22|23)) # aastex.cls is obsolete and replaced by aastex6.cls # aastex6.cls is obsolete and replaced by aastex62.cls export/doc/attic/aastex6_sample_(dvi|pdf|lyx(16|20|21|22|23)).* -export/templates/aastex6_.* -export/templates/aastex62_lyx16 -export/examples/aas_sample_.* -export/examples/aas_sample62_lyx16 +export/examples/Articles/American_Astronomical_Society_.*v._6.* +export/examples/Articles/American_Astronomical_Society_.*v._6.2.*_lyx16 +export/templates/Articles/American_Astronomical_Society_.*v._6.* +export/templates/Articles/American_Astronomical_Society_.*v._6.2.*_lyx16 check_load/doc/attic/aastex6_sample -check_load/templates/aastex(6)? -check_load/examples/aas_sample +check_load/examples/Articles/American_Astronomical_Society_.*v._6. +check_load/templates/Articles/American_Astronomical_Society_.*v._6. diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 26d476671e..760570aab0 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -36,22 +36,22 @@ export/export/latex/iconv-error-nomenclature_pdf2 # the float `sidebar'. LyX will not be able to produce a float list. # # which makes "check_load" and "lyx2lyx" fail (lyx2lyx for < 2.3 is ignored). -check_load/templates/acmart -export/templates/acmart_lyx23 +check_load/templates/Articles/Association_for_Computing_Machinery_.ACM. +export/templates/Articles/Association_for_Computing_Machinery_.ACM._lyx23 # Failing LyX2LyX conversions for old versions: # # "beamer" lyx2lyx fails sometimes for versions < 2.1 # Back-conversion results in some layouts without name ("\begin_layout \n") # which trigger a warning message leading to test failure. -export/examples/(|de/|fr/|ja/)beamer_lyx(16|20) -export/templates/.*beamer-conference-ornate-20min_lyx(16|20) -export/examples/beamerlyxexample1_lyx(16|20) +export/examples/(|de/|fr/|ja/)Presentations/Beamer_lyx(16|20) +export/examples/Presentations/Beamer_.Complex._lyx(16|20) +export/templates/(|de/|es/|fr/|ja/)Presentations/Beamer_lyx(16|20) # # modernCV fails for versions < 2.1 # * reversed order of \end_layout and \end_inset results in corrupt LyX file # * reversed order of command arguments results in incompilable LaTeX -export/examples/(|es/)modernCV_lyx(16|20) +export/examples/(|es/)Curricula_Vitae/Modern_CV_lyx(16|20) # # back-conversion fails for rotated float inset in a list export/export/lyx2lyx/lyx_2_3_test_lyx(16|20|21|22) @@ -65,12 +65,11 @@ export/export/latex/CJK/ko_default_pdf2 # ! TeX capacity exceeded, sorry [input stack +size=5000]. export/export/latex/luainputenc-utf8_pdf5_texF - # nonstandard tests failing for unknown reason: -export/templates/obsolete/ACM-siggraph_pdf5_(texF|systemF) -export/templates/IUCr-article_pdf4_systemF -export/templates/RJournal_(dvi3|pdf[45])_systemF -export/templates/kluwer_.*_systemF +export/templates/Obsolete/ACM_SIGGGRAPH.*_pdf5_(texF|systemF) +export/templates/Articles/International_Union_of_Crystallography.*_pdf4_systemF +export/templates/Articles/RJournal_(dvi3|pdf[45])_systemF +export/templates/Articles/Kluwer_.*_systemF # ================================================ @@ -94,7 +93,7 @@ export/export/latex/6197-polish-amssymb_pdf._texF # the Cyrillic script is not required yet Polyglossia tests for support. # The document "sr/Braille.lyx" is an example of case b). # (For some reason, the false positive error is not thrown with PDF (luatex).) -export/examples/sr/Braille_(dvi3|pdf4)_systemF +export/examples/sr/Modules/Braille_(dvi3|pdf4)_systemF #9681 Run-together words in Greek and Cyrillic documents # no-termination of replacement macros can lead to non-existing macros if @@ -113,13 +112,13 @@ export/doc/(de|es|fr)/EmbeddedObjects_pdf4_texF export/doc/es/Customization_pdf4_texF # see also the discussion at: # https://www.mail-archive.com/search?l=mid&q=20170228190738.cgs3tl3ny2bxiegk%40steph -export/examples/es/linguistics_pdf4_texF +export/examples/es/Modules/Linguistics_pdf4_texF export/export/latex/bug9871-slovak-ascii-preambleencoding_pdf2 #10355 xmllint detects failures export/doc/attic/eu_UserGuide_xhtml export/doc/(es|ja)/UserGuide_xhtml -export/examples/spreadsheet_xhtml +export/examples/External_Material/Spreadsheet_xhtml export/export/WrongDfnTagHandling_xhtml #10371 Compilation error if longest label marker in labeling style @@ -127,7 +126,7 @@ export/export/WrongDfnTagHandling_xhtml export/export/latex/LongestLabelWithUnderscore.* #11455 "Unable to process argument!" with multiple 1.6.x roundtrips -export/templates/IEEEtran-Journal_lyx16 +export/templates/Articles/IEEE_Transactions_Journal_lyx16 #10600 forced use of "ascii" inputenc with XeTeX # Non-ASCII in ERT, fails with inputenc==ASCII @@ -139,7 +138,7 @@ export/export/latex/xetex-inputenc-utf8_pdf4_texF # Example for lib/scripts/listerrors # Requires noweb. Seems to be restricted to plain "latex". # Find out why and whether the script could be improved. -export/examples/listerrors_(pdf[245]).* +export/examples/Modules/Noweb_Listerrors_(pdf[245]).* #11521 Font encoding "LAE" required with farsi. # The Farsi font encoding LAE must be added also to a custom font encoding @@ -216,14 +215,14 @@ export/(doc|examples)/uk/(Intro|Welcome)_(pdf4)_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])_.* +export/examples/Articles/Astronomy_._Astrophysics_(dvi3|pdf[45])_.* +export/templates/Articles/Astronomy_._Astrophysics_(dvi3|pdf[45])_.* # Gives the following error: # # ! Package hpstatement Error: H or P statement "H251" # # (hpstatement) is not defined. # seems to be polyglossia-related (dvi3 worked with babel) -export/examples/H-P-statements_.*_systemF +export/examples/Modules/Hazard_and_Precautionary_Statements_.*_systemF # These files use packages that are not compatible with the newest LuaTeX. We # could potentially fix these by loading the luatex85 package early in the @@ -252,11 +251,11 @@ export/doc/(sk|nb)/Intro_(dvi3|pdf5)_systemF # LaTeX error: "kernel/command-already-defined" # Lines 2684 ... 2690 in fontspec-xetex.sty # Lines 2608 ... 2614 in fontspec-luatex.sty -export/templates/slides_.*_systemF +export/templates/Presentations/Slides_.*_systemF # Beamer: conflicts with some combinations of packages/settings/languages -export/templates/ja_beamer-conference-ornate-20min_(pdf2|pdf[45]).* -export/templates/es_beamer-conference-ornate-20min_pdf4_texF +export/templates/ja/Presentations/Beamer_(pdf2|pdf[45]).* +export/templates/es/Presentations/Beamer_pdf4_texF # Arabic # @@ -302,7 +301,7 @@ export/.*/he/.*(dvi3|pdf5)_systemF export/.*/he/.*_texF # CJKutf8 does not work with XeTeX and LuaTeX (and 8-bit fonts) -export/examples/ja/multilingual_.*_texF +export/examples/ja/Multilingual_Typesetting_.*_texF export/export/latex/CJK/zh_CN-toc_.*_texF # See comment in unreliableTests @@ -320,7 +319,7 @@ Sublabel: externalissues # Error: /invalidfileaccess in --file-- # ps2pdf succeeds if the -dNOSAFER flag is used. For discussion, see: # https://www.mail-archive.com/search?l=mid&q=1506851183.3130.15.camel%40lyx.org -export/examples/ja/lilypond_pdf +export/examples/ja/Modules/LilyPond_Book_pdf # ps2pdf gives the following error on updated TL18: # Error: /undefined in d7Z diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests index 8b38e76814..7be2b4fe34 100644 --- a/development/autotests/unreliableTests +++ b/development/autotests/unreliableTests @@ -15,77 +15,75 @@ Sublabel: nonstandard # e.g. a class or package file not in TeXLive. # TODO: rename to "extra" or "exotic"? -export/templates/IUCr-article_(dvi|pdf).* -export/templates/kluwer_.*_systemF -export/templates/ectaart_(dvi3|pdf5).* +# aa.cls (not in TeXLive). +eport/examples/Articles/Astronomy_&_Astrophysics.* +eport/templates/Articles/Astronomy_&_Astrophysics.* -# 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).* +# AEA.cls (see https://wiki.lyx.org/Examples/AEA) +export/templates/Articles/American_Economic_Association_(AEA).* -# Requires copernicus.cls (not in TeXLive) +# copernicus.cls (not in TeXLive) # see https://publications.copernicus.org/for_authors/manuscript_preparation.html -export/templates/copernicus_.* +export/templates/Articles/Copernicus_Publications_Manuscript_Preparation_.* -# R (http://www.r-project.org) -export/examples/sweave.* -# R package knitr (http://yihui.name/knitr) -export/examples/knitr.* +# ectaart.cls +# see https://wiki.lyx.org/Examples/Econometrica +export/templates/Articles/Econometrica.* -# requires knitr, requires RJournal.sty (not in TeXLive) -# incompatible with fontspec? -export/templates/RJournal_.* +# iucr.cls (not in TeXLive) +export/templates/Articles/International_Union_of_Crystallography.* -# LilyPond-book version 2.13 or newer. -export/examples/lilypond.* +# ws-ijmpc.cls, w-ijmpd.cls +# see https://wiki.lyx.org/Examples/IJMP +export/templates/Articles/Int._Journal_of_Modern_Physics_C.* +export/templates/Articles/Int._Journal_of_Modern_Physics_D.* -# svmono.cls -export/examples/springer/svmono.* -# svmult.cls -export/examples/springer/svmult.* +# iopart.cls, iopams.sty, setstack.sty +# see https://wiki.lyx.org/Layouts/Iopart +export/templates/Articles/Institute_of_Physics_.* -# AEA.cls (see https://wiki.lyx.org/Examples/AEA) -export/templates/AEA.* - -# ws-ijmpc.cls, w-ijmpd.cls (see https://wiki.lyx.org/Examples/IJMP) -export/templates/IJMPC.* -export/templates/IJMPD.* +# jasatex.cls +# see https://wiki.lyx.org/Layouts/JASATeX +export/templates/Articles/Journal_of_the_Acoustical_Society_of_America.* -# iopart.cls, iopams.sty, setstack.sty (see https://wiki.lyx.org/Layouts/Iopart) -export/templates/IOP-article.* +# jss.cls +export/templates/Articles/Journal_of_Statistical_Software_.* -# jasatex.cls (see https://wiki.lyx.org/Layouts/JASATeX) -export/templates/JASA.* - -# ectaart.cls (see https://wiki.lyx.org/Examples/Econometrica) -export/templates/ectaart.* +# LilyPond-book version 2.13 or newer. +export/examples/Modules/LilyPond_Book.* # maa-monthly.sty (not in TeXLive) # http://www.maa.org/sites/default/files/pdf/pubs/maa-monthly.sty -export/templates/maa-monthly.* +export/templates/Articles/Mathematical_Monthly.* + +# knitr, RJournal.sty (not in TeXLive) +# incompatible with fontspec? +export/templates/Articles/RJournal_.* + +# R (http://www.r-project.org) +# R package knitr (http://yihui.name/knitr) +export/examples/Modules/Sweave.* +export/examples/Modules/Rnw.*knitr.* + +# obsolete versions of documentclass or style files +export/templates/Obsolete/.* -# svjour3.cls, svglov2.clo (see https://wiki.lyx.org/Examples/Springer) -export/templates/springer/svjour3.* +# svjour3.cls, svglov2.clo +# see https://wiki.lyx.org/Examples/Springer +export/templates/Articles/Springers_Global_Journal_Template.* -# requires obsolete versions of class- or style-files -export/templates/obsolete.* +# svmono.cls +export/examples/Books/Springer_Monographs.* +# svmult.cls +export/examples/springer/Books/Springer_Contributed_Books.* Sublabel: needauth ################## # Tests that require authorisation to call external programs. -export/examples/gnuplot.* -export/examples/minted-filelisting.* -export/examples/minted-listings.* +export/examples/External_Material/Gnuplot.* +export/examples/Graphics_._Insets/Minted_File_Listing.* +export/examples/Graphics_._Insets/Minted_Listings.* Sublabel: erratic @@ -120,19 +118,17 @@ export/(doc|examples)/uk/(Intro|Welcome)_.*_texF 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 -# ---------------------------------------------- +# 2018-05-12 aastex6.cls -> aastex62.cls +lib/examples/Articles/American_Astronomical_Society_.* +export/templates/Articles/American_Astronomical_Society_.* # `acmart` calls "libertine" as default font. # With TeXLive < 18, this clashes with LyX setting up 8-bit TeX fonts # PDF (luatex) and PDF (xetex) (compilation error or wrong fonts). # See also #9744 allow parallel configuration of TeX and non-TeX fonts. -export/templates/acmart_pdf[45]_texF +export/templates/Articles/Association_for_Computing_Machinery_pdf[45]_texF + +# since TeXLive18, 8-bit LaTeX defaults to utf-8 Sublabel: wrong_output @@ -145,7 +141,7 @@ Sublabel: wrong_output # seminar.sty uses Postscript specials or PGF resulting in problems with slide # size and orientation depending on the output format and viewing application. # For details see Troubleshooting and the Appendix in examples/seminar.lyx. -export/examples/(|fr/)seminar_(dvi|pdf).* +export/examples/(|fr/)Presentations/Seminar_(dvi|pdf).* # Babel-Spanish uses UTF-8 encoded strings if it detects Xe/LuaTeX. # With "language default" (=="latin9"), Babel strings come out wrong @@ -157,12 +153,15 @@ export/examples/(|fr/)seminar_(dvi|pdf).* # (see invertedTests, some more tests fail with TeXLive versions < 18). # Should we set inputenc to utf8 in the documents to work around the problem? # (Changing the default in lib/languages requires more tests for utf8 first.) -export/examples/es/(ejemplo_con_lyx|tufte_book)_(pdf5|dvi3)_texF +export/examples/es/.*_(pdf5|dvi3)_texF export/doc/es/.*_(pdf5|dvi3)_texF -# The date and chapter headings are garbled. These exports used to fail with -# TL16, but now compile without error (TL18, TL19-pre). -export/(doc|examples)/uk/(Intro|Welcome)_dvi3_texF +# since TL18, Babel-Ukrainean uses UTF-8 if it detects Xe/LuaTeX (for "\date"). +# * garbled output with LuaTeX + TeX fonts (since TL18) +# (date and chapter headings) +# * missing chars with XeTeX + TeX fonts (see invertedTests) +export/export/latex/uk-babel-date-missing-chars-with-ascii_.*_texF +export/(doc|examples)/uk/(Intro|Welcome)_.*_texF # LyX issues @@ -196,18 +195,19 @@ export/export/mixing_inTitle_layouts_(pdf|dvi).* # https://www.mail-archive.com/search?l=mid&q=20160831134006.4fewxothddqfeyw4%40steph # (not expecting much attention because DVI is not given high priority) export/doc/es/Customization_dvi3_systemF -export/examples/(|es/)(europe|modern)CV_dvi3_systemF +export/examples/(|es/)Curricula_Vitae/Europe_CV_dvi3_systemF +export/examples/(|es/)Curricula_Vitae/Modern_CV_dvi3_systemF # `acmart` requires PDFlatex: # * Missing page number in DVI, Postscript, and PDF (ps2pdf) # * "PDF (ps2pdf)" fails (problem with Postscript) in TeXLive < 2018 -export/templates/acmart_dvi.* -#export/templates/acmart_ps # not tested by ctest autotests -export/templates/acmart_pdf +# "Postscript" not tested by ctest autotests +export/templates/Articles/Association_for_Computing_Machinery_dvi.* +export/templates/Articles/Association_for_Computing_Machinery_pdf # lyx2lyx back-conversion of "Date" info-inset writes # the name of the day in English instead of Japanese. -export/examples/ja/multilingual_lyx.* +export/examples/ja/Multilingual_Typesetting_.*_lyx.* # No localization of auto-strings with Chinese language under 8-bit TeX # (ctex font issue with texlive-lang-chinese (from Debian) under pdflatex)