From 840f6fda5138866f335b517145e1169477914134 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 8 Jul 2012 20:52:26 +0200 Subject: [PATCH] Don't stop testing after first error. This was the reason why I forgot to update the last test file in the last commit. --- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 206 ++++----------------- src/tex2lyx/test/runtests.py | 5 +- 2 files changed, 41 insertions(+), 170 deletions(-) diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index fa51c5f909..dc6e5cda52 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,40 +1,46 @@ #LyX file created by tex2lyx 2.1.0svn -\lyxformat 430 +\lyxformat 433 \begin_document \begin_header \textclass article \begin_preamble -\usepackage{fontspec}\setmainfont[Mapping=tex-text]{Linux Libertine O} -\setsansfont[Mapping=tex-text,Scale=0.75]{Linux Biolinum O} -\setmonofont{Linux Biolinum O} -\usepackage{xunicode}\usepackage{polyglossia}\setdefaultlanguage[variant=british, ordinalmonthday = false]{english} -\setotherlanguage{albanian} -\setotherlanguage[variant=polytonic]{greek} -\setotherlanguage{hebrew} + + + + + + + \end_preamble \use_default_options false -\language english -\language_package none +\maintain_unincluded_children false +\language british +\language_package default \inputencoding auto \fontencoding default -\font_roman default -\font_sans default -\font_typewriter default +\font_roman Linux Libertine O +\font_sans Linux Biolinum O +\font_typewriter Linux Biolinum O \font_default_family default \use_non_tex_fonts true \font_sc false \font_osf false -\font_sf_scale 100 +\font_sf_scale 75 \font_tt_scale 100 \graphics default +\default_output_format pdf4 +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize default \spacing single \use_hyperref 0 \papersize default \use_geometry false \use_package amsmath 1 +\use_package amssymb 0 \use_package esint 1 \use_package mathdots 0 \use_package mathtools 0 @@ -68,46 +74,17 @@ \begin_layout Part -df -\end_layout - -\begin_layout Standard - -1 English -\begin_inset ERT -status collapsed -\begin_layout Standard - - -\backslash -textgreek +df \end_layout -\end_inset - -[variant=ancient] -\begin_inset ERT -status collapsed - \begin_layout Standard -{ -\end_layout - -\end_inset +1 English +\lang ancientgreek ancient Greek -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - +\lang british English \begin_inset ERT status collapsed @@ -116,12 +93,12 @@ status collapsed \backslash -textgreek +textgreek[numerals=arabic, variant=ancient] \end_layout \end_inset -[numerals=arabic, variant=ancient] + \begin_inset ERT status collapsed @@ -150,128 +127,45 @@ status collapsed English \end_layout -\begin_layout Standard - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{albanian} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Part -df -\end_layout +\lang albanian -\begin_layout Standard - -2 Albanian -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -textgreek +df \end_layout -\end_inset - - -\begin_inset ERT -status collapsed - \begin_layout Standard -{ -\end_layout - -\end_inset +\lang albanian +2 Albanian +\lang greek Greek -\begin_inset ERT -status collapsed - -\begin_layout Standard - -} -\end_layout - -\end_inset - +\lang albanian Albanian \shape smallcaps smallcaps \shape default -\end_layout - -\begin_layout Standard - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{albanian} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{hebrew} -\end_layout - -\end_inset - - \end_layout \begin_layout Part +\lang hebrew + df \end_layout \begin_layout Standard +\lang hebrew + 3 Hebrew \end_layout \begin_layout Standard - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{hebrew} -\end_layout - -\end_inset +\lang hebrew \begin_inset ERT @@ -290,32 +184,6 @@ status collapsed \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -begin{albanian} -\end_layout - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Standard - - -\backslash -end{albanian} -\end_layout - -\end_inset - - \end_layout \end_body diff --git a/src/tex2lyx/test/runtests.py b/src/tex2lyx/test/runtests.py index ddb73c42b6..2478e9c920 100755 --- a/src/tex2lyx/test/runtests.py +++ b/src/tex2lyx/test/runtests.py @@ -36,12 +36,15 @@ def main(argv): 'box-color-size-space-align.tex', 'CJK.tex', \ 'XeTeX-polyglossia.tex'] + errors = [] for f in files: texfile = os.path.join(os.path.dirname(argv[0]), f) cmd = '%s -roundtrip -f %s' % (tex2lyx, texfile) if os.system(cmd) != 0: - error('Running `%s´ failed.' % cmd) + errors.append(f) + if len(errors) > 0: + error('Converting the following files failed: %s' % ', '.join(errors)) if __name__ == "__main__": main(sys.argv) -- 2.39.5