From 656bb6a0cb044d8d9c7bbff634c9231fedbcea17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Mon, 25 May 2015 02:10:03 +0200 Subject: [PATCH] tex2lyx: update references according to today's changes --- src/tex2lyx/test/Dummy Document.lyx.lyx | 45 +++++++++++------ src/tex2lyx/test/test-insets-basic.lyx.lyx | 50 ++++--------------- src/tex2lyx/test/test-insets.lyx.lyx | 57 +++++----------------- 3 files changed, 53 insertions(+), 99 deletions(-) diff --git a/src/tex2lyx/test/Dummy Document.lyx.lyx b/src/tex2lyx/test/Dummy Document.lyx.lyx index 346a6f254e..59d9c47377 100644 --- a/src/tex2lyx/test/Dummy Document.lyx.lyx +++ b/src/tex2lyx/test/Dummy Document.lyx.lyx @@ -2,14 +2,14 @@ \lyxformat 495 \begin_document \begin_header -\origin D:/LyXGit/Master/src/tex2lyx/test/ +\origin roundtrip \textclass article \use_default_options false \maintain_unincluded_children false \language english \language_package none -\inputencoding auto -\fontencoding default +\inputencoding iso8859-15 +\fontencoding T1 \font_roman default \font_sans default \font_typewriter default @@ -25,13 +25,22 @@ \output_sync 0 \bibtex_command default \index_command default -\paperfontsize default -\spacing single -\use_hyperref false -\papersize default +\paperfontsize 12 +\spacing onehalf +\use_hyperref true +\pdf_bookmarks 0 +\pdf_bookmarksnumbered 0 +\pdf_bookmarksopen 0 +\pdf_bookmarksopenlevel 1 +\pdf_breaklinks 0 +\pdf_pdfborder 0 +\pdf_colorlinks 0 +\pdf_backref section +\pdf_pdfusetitle 0 +\papersize a4paper \use_geometry false -\use_package amsmath 1 -\use_package amssymb 0 +\use_package amsmath 2 +\use_package amssymb 2 \use_package cancel 0 \use_package esint 1 \use_package mathdots 0 @@ -40,11 +49,11 @@ \use_package stackrel 0 \use_package stmaryrd 0 \use_package undertilde 0 -\cite_engine basic -\cite_engine_type default -\biblio_style plain +\cite_engine natbib +\cite_engine_type numerical +\biblio_style plainnat \use_bibtopic false -\use_indices false +\use_indices true \paperorientation portrait \suppress_date false \justification true @@ -53,10 +62,18 @@ \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 default +\paragraph_indentation 3mm \quotes_language english \papercolumns 1 \papersides 1 diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx index ba5c04366a..5beb99a0b9 100644 --- a/src/tex2lyx/test/test-insets-basic.lyx.lyx +++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx @@ -2,7 +2,7 @@ \lyxformat 495 \begin_document \begin_header -\origin D:/LyXGit/Master/src/tex2lyx/test/ +\origin roundtrip \textclass article \begin_preamble %% Do not edit unless you really know what you are doing. @@ -24,12 +24,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands. -\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@} -\newcommand{\lyxline}[1][1pt]{% - \par\noindent% - \rule[.5ex]{\linewidth}{#1}\par} -\newcommand{\lyxarrow}{\leavevmode\,$\triangleright$\,\allowbreak} + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands. @@ -786,7 +783,7 @@ We can input files too, like this \begin_inset CommandInset include LatexCommand input preview false -filename "DummyDocument.lyx" +filename "DummyDocument.lyx.lyx" \end_inset @@ -794,7 +791,7 @@ filename "DummyDocument.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy Document.lyx" +filename "Dummy Document.lyx.lyx" \end_inset @@ -802,7 +799,7 @@ filename "Dummy Document.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy Document.lyx" +filename "Dummy Document.lyx.lyx" \end_inset @@ -810,7 +807,7 @@ filename "Dummy Document.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy~Document.lyx" +filename "Dummy~Document.lyx.lyx" \end_inset @@ -818,7 +815,7 @@ filename "Dummy~Document.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy~Document.lyx" +filename "Dummy~Document.lyx.lyx" \end_inset @@ -5812,7 +5809,7 @@ Special formattings \end_layout \begin_layout Subsection -LyX line +Rules \end_layout \begin_layout Standard @@ -5823,13 +5820,6 @@ test \size tiny -\end_layout - -\begin_layout Standard -\noindent - -\size tiny - \begin_inset CommandInset line LatexCommand rule offset "0.5ex" @@ -5857,24 +5847,6 @@ test test \end_layout -\begin_layout Standard -\noindent - -\begin_inset CommandInset line -LatexCommand rule -offset "0.5ex" -width "100line%" -height "1pt" - -\end_inset - - -\end_layout - -\begin_layout Standard -test -\end_layout - \begin_layout Standard \size giant @@ -5901,10 +5873,6 @@ height "1pt" \end_layout -\begin_layout Subsection -rules -\end_layout - \begin_layout Standard test \begin_inset CommandInset line diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index 01e5576093..139ad780bf 100644 --- a/src/tex2lyx/test/test-insets.lyx.lyx +++ b/src/tex2lyx/test/test-insets.lyx.lyx @@ -2,7 +2,7 @@ \lyxformat 495 \begin_document \begin_header -\origin D:/LyXGit/Master/src/tex2lyx/test/ +\origin roundtrip \textclass article \begin_preamble %% Do not edit unless you really know what you are doing. @@ -21,12 +21,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands. -\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@} -\newcommand{\lyxline}[1][1pt]{% - \par\noindent% - \rule[.5ex]{\linewidth}{#1}\par} -\newcommand{\lyxarrow}{\leavevmode\,$\triangleright$\,\allowbreak} + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands. @@ -783,7 +780,7 @@ We can input files too, like this \begin_inset CommandInset include LatexCommand input preview false -filename "DummyDocument.lyx" +filename "DummyDocument.lyx.lyx" \end_inset @@ -791,7 +788,7 @@ filename "DummyDocument.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy Document.lyx" +filename "Dummy Document.lyx.lyx" \end_inset @@ -799,7 +796,7 @@ filename "Dummy Document.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy Document.lyx" +filename "Dummy Document.lyx.lyx" \end_inset @@ -807,7 +804,7 @@ filename "Dummy Document.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy~Document.lyx" +filename "Dummy~Document.lyx.lyx" \end_inset @@ -815,7 +812,7 @@ filename "Dummy~Document.lyx" \begin_inset CommandInset include LatexCommand include preview false -filename "Dummy~Document.lyx" +filename "Dummy~Document.lyx.lyx" \end_inset @@ -866,9 +863,10 @@ XFig drawings: \begin_layout Standard -\begin_inset External - template XFig - filename xfigtest.fig +\begin_inset CommandInset include +LatexCommand input +preview false +filename "xfigtest.pstex_t" \end_inset @@ -5886,7 +5884,7 @@ Special formattings \end_layout \begin_layout Subsection -LyX line +Rules \end_layout \begin_layout Standard @@ -5897,13 +5895,6 @@ test \size tiny -\end_layout - -\begin_layout Standard -\noindent - -\size tiny - \begin_inset CommandInset line LatexCommand rule offset "0.5ex" @@ -5931,24 +5922,6 @@ test test \end_layout -\begin_layout Standard -\noindent - -\begin_inset CommandInset line -LatexCommand rule -offset "0.5ex" -width "100line%" -height "1pt" - -\end_inset - - -\end_layout - -\begin_layout Standard -test -\end_layout - \begin_layout Standard \size giant @@ -5975,10 +5948,6 @@ height "1pt" \end_layout -\begin_layout Subsection -rules -\end_layout - \begin_layout Standard test \begin_inset CommandInset line -- 2.39.2