From b188e74cd6b089be3d63d905bf9db532e53f54c5 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 26 May 2013 16:47:17 +0200 Subject: [PATCH] Remove include test with space Unfortunately automake does not support file names with spaces for files in EXTRA_DIST: These file names are put into a shell list, and it is impossible quote the name in a way that works both with the shell and with make. Therefore I removed the corresponding test file. --- src/tex2lyx/Makefile.am | 2 - src/tex2lyx/test/Dummy Document.lyx | 98 ------------------- src/tex2lyx/test/Dummy Document.tex | 2 - ...ummyDocument.lyx => DummyDocument.lyx.lyx} | 2 +- ...my~Document.lyx => Dummy~Document.lyx.lyx} | 2 +- src/tex2lyx/test/test-insets.lyx.lyx | 6 +- src/tex2lyx/test/test-insets.tex | 6 +- 7 files changed, 9 insertions(+), 109 deletions(-) delete mode 100644 src/tex2lyx/test/Dummy Document.lyx delete mode 100644 src/tex2lyx/test/Dummy Document.tex rename src/tex2lyx/test/{DummyDocument.lyx => DummyDocument.lyx.lyx} (99%) rename src/tex2lyx/test/{Dummy~Document.lyx => Dummy~Document.lyx.lyx} (99%) diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 5be47e7556..96b479fe90 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -26,7 +26,6 @@ TEST_FILES = \ test/CJKutf8.tex \ test/DummyDocument.tex \ test/Dummy~Document.tex \ - test/Dummy\ Document.tex \ test/foo.eps \ test/foo.png \ test/test-insets.tex \ @@ -46,7 +45,6 @@ TEST_RESULTS = \ test/CJKutf8.lyx.lyx \ test/DummyDocument.lyx.lyx \ test/Dummy~Document.lyx.lyx \ - test/Dummy\ Document.lyx.lyx \ test/test-insets.lyx.lyx \ test/test.lyx.lyx \ test/test-modules.lyx.lyx \ diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy Document.lyx deleted file mode 100644 index 4daef5419a..0000000000 --- a/src/tex2lyx/test/Dummy Document.lyx +++ /dev/null @@ -1,98 +0,0 @@ -#LyX file created by tex2lyx 2.1.0dev -\lyxformat 471 -\begin_document -\begin_header -\textclass article -\use_default_options false -\maintain_unincluded_children false -\language english -\language_package none -\inputencoding iso8859-15 -\fontencoding T1 -\font_roman default -\font_sans default -\font_typewriter default -\font_math auto -\font_default_family default -\use_non_tex_fonts false -\font_sc false -\font_osf false -\font_sf_scale 100 -\font_tt_scale 100 -\graphics default -\default_output_format default -\output_sync 0 -\bibtex_command default -\index_command default -\paperfontsize 12 -\spacing onehalf -\use_hyperref true -\pdf_bookmarks 1 -\pdf_bookmarksnumbered 0 -\pdf_bookmarksopen 0 -\pdf_bookmarksopenlevel 1 -\pdf_breaklinks 0 -\pdf_pdfborder 0 -\pdf_colorlinks 0 -\pdf_backref section -\pdf_pdfusetitle 1 -\papersize a4paper -\use_geometry false -\use_package amsmath 2 -\use_package amssymb 2 -\use_package cancel 0 -\use_package esint 1 -\use_package mathdots 0 -\use_package mathtools 0 -\use_package mhchem 0 -\use_package stackrel 0 -\use_package stmaryrd 0 -\use_package undertilde 0 -\cite_engine natbib -\cite_engine_type numerical -\biblio_style plainnat -\use_bibtopic false -\use_indices true -\paperorientation portrait -\suppress_date false -\justification true -\use_refstyle 0 -\index Index -\shortcut idx -\color #008000 -\end_index -\index new -\shortcut new -\color #008000 -\end_index -\index test -\shortcut test -\color #008000 -\end_index -\secnumdepth 3 -\tocdepth 3 -\paragraph_separation indent -\paragraph_indentation 3mm -\quotes_language english -\papercolumns 1 -\papersides 1 -\paperpagestyle default -\tracking_changes false -\output_changes false -\html_math_output 0 -\html_css_as_file 0 -\html_be_strict false -\end_header - -\begin_body - -\begin_layout Subsection -Space Test -\end_layout - -\begin_layout Standard -The file name contains a space. -\end_layout - -\end_body -\end_document diff --git a/src/tex2lyx/test/Dummy Document.tex b/src/tex2lyx/test/Dummy Document.tex deleted file mode 100644 index dff06d3b1a..0000000000 --- a/src/tex2lyx/test/Dummy Document.tex +++ /dev/null @@ -1,2 +0,0 @@ -\subsection{Space Test} -The file name contains a space. diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx similarity index 99% rename from src/tex2lyx/test/DummyDocument.lyx rename to src/tex2lyx/test/DummyDocument.lyx.lyx index 47a6e55f0f..ef16248dbd 100644 --- a/src/tex2lyx/test/DummyDocument.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 471 +\lyxformat 472 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/Dummy~Document.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx similarity index 99% rename from src/tex2lyx/test/Dummy~Document.lyx rename to src/tex2lyx/test/Dummy~Document.lyx.lyx index 89f3c164b4..183cab3166 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 471 +\lyxformat 472 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index c1baf269b0..7b0c5a449a 100644 --- a/src/tex2lyx/test/test-insets.lyx.lyx +++ b/src/tex2lyx/test/test-insets.lyx.lyx @@ -742,7 +742,7 @@ filename "DummyDocument.lyx.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy Document.lyx.lyx" +filename "Dummy Document.tex" \end_inset @@ -750,7 +750,7 @@ filename "Dummy Document.lyx.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy Document.lyx.lyx" +filename "Dummy Document.tex" \end_inset @@ -770,7 +770,7 @@ filename "Dummy~Document.lyx.lyx" \end_inset - File names containg double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the paring. Since the file does not exist, the variant without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files). + File names containg double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the parsing. File names containing spaces can not be handled by automake (make dist would fail), so no test file is provided as well. Since the files do not exist, the variants without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files). \begin_inset CommandInset include LatexCommand include preview false diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex index bb5844a1fa..ebc7d619aa 100644 --- a/src/tex2lyx/test/test-insets.tex +++ b/src/tex2lyx/test/test-insets.tex @@ -147,13 +147,15 @@ M., \& Rasio, F.~A. 2004, ApJ, 604, 632\end{thebibliography} We can input files too, like this \input{DummyDocument}, or with the include variant (tests quoting as well): -\include{\string"Dummy\space Document\string"} +\include{\string"Dummy\space Document\string".tex} \include{\string"Dummy Document\string".tex} \include{\string"Dummy\string~Document\string"} \include{\string"Dummy\string~Document\string".tex} File names containg double quotes are not legal on windows, so no test file is provided. Nevertheless, they are legal on unix, so we test at least the -paring. Since the file does not exist, the variant without extension would +parsing. File names containing spaces can not be handled by automake +(make dist would fail), so no test file is provided as well. +Since the files do not exist, the variants without extension would not work (tex2lyx can't deduce the correct extension of nonexisting files). \include{\string"Dummy\string"Document\string".tex} -- 2.39.2