Tex2lyx tests: adapt some check files for expected output

[lyx.git] / src / tex2lyx / test / test-insets-basic.tex

diff --git a/src/tex2lyx/test/test-insets-basic.tex b/src/tex2lyx/test/test-insets-basic.tex
index 431d51de9e4bec439e1e990f917685fefb3f5e2f..605733efd331692ca7e3bc494ece900e0bac911a 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.tex
+++ b/src/tex2lyx/test/test-insets-basic.tex
@@ -1,4 +1,3 @@
-%% LyX trick_preamble_code_into_believing_that_this_was_created_by_lyx created this file.  For more info, see http://www.lyx.org/.
 %% Do not edit unless you really know what you are doing.
 \documentclass[a4paper,12pt]{article}
 \usepackage[T1]{fontenc}
@@ -34,7 +33,6 @@
 \usepackage{booktabs}
 \usepackage{multirow}
 \usepackage{hhline}
-\usepackage{dcolumn}
 \usepackage{pdfpages}
 \usepackage{textcomp}
 \usepackage{amssymb}
@@ -66,8 +64,7 @@
 
 \title{Title}
 
-\date %stupid stuff
-{two days ago}
+\date{two days ago}%stupid stuff
 
 \maketitle
 
@@ -182,10 +179,6 @@ ftp:\href{ftp://www.test.test}{ftp://www.test.test}
 
 ftp2:\href{ftp://www.test.test}{www.test.test}
 
-parser test (stupid, but valid):\href{http://www.test.test}{\}}
-
-parser test (escaped):\href{http://www.test.test}{a brace \} and another one \{ and something}
-
 
 \section{Lists\index{Lists}}
 
@@ -436,20 +429,15 @@ in \% of pixel size & 76.3 & 95.9 & 92.3\tabularnewline
 \end{tabular}
 \end{table}
 
-A table using dcolumn:
+A table using decimal alignment:
 
 \begin{table} 
-\begin{tabular}{ccddd} 
-One&Two& 
-\multicolumn{1}{c}{\textrm{Three}}& 
-\multicolumn{1}{c}{\textrm{Four}}& 
-\multicolumn{1}{c}{\textrm{Five}}\\ 
+\begin{tabular}{ccr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}lr@{\extracolsep{0pt}.}l}
+One & Two & \multicolumn{2}{c}{Three} & \multicolumn{2}{c}{Four} & \multicolumn{2}{c}{Five}\tabularnewline
 \hline 
-one&two&\mbox{three}&\mbox{four}&\mbox{five}\\ 
-He&2& 2.77234 & 45672. & 0.69 \\ 
-C\footnote{Some tables require footnotes.} 
-&C\footnote{Some tables need more than one footnote.} 
-& 12537.64 & 37.66345 & 86.37 \\ 
+one & two & \multicolumn{2}{c}{three} & \multicolumn{2}{c}{four} & \multicolumn{2}{c}{five}\tabularnewline
+He & 2 & 2&77234  & 45672&  & 0&69 \tabularnewline
+C & C & 12537&64  & 37&66345  & 86&37 \tabularnewline
 \end{tabular} 
 \end{table}
 
@@ -487,23 +475,16 @@ The following tow don't work, but they should???
 
 \section{Special formattings\index{Special formattings}}
 
-\subsection{LyX line}
+\subsection{Rules}
 
 test
 
-{\tiny \lyxline{\tiny}}{\tiny \par}
+{\tiny \rule[0.5ex]{1\linewidth}{1pt}}{\tiny \par}
 
 test {\Huge Test} {\tiny test} test
 
-\lyxline{\normalsize}
-
-test
-
 {\Huge \lyxline{\Huge}}{\Huge \par}
 
-
-\subsection{rules}
-
 test\rule[0.001\textwidth]{1\columnwidth}{0.05\textheight}
 
 test
@@ -550,7 +531,7 @@ e\textsuperscript{h}
 \textsublhalfring{e}
 \textsubplus{e}
 \=*{e}
-\b{e}
+(don't mix up with \b{e})
 \"{e}
 \textovercross{e}
 \s{e}