Author: uwestoehr Date: Thu Oct 27 15:14:32 2011 New Revision: 40037 URL: http://www.lyx.org/trac/changeset/40037
Log: backporting tex2lyx: updates testfile Modified: lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/test/test-structure.tex Modified: lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/test/test-structure.tex ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/test/test-structure.tex Thu Oct 27 15:13:43 2011 (r40036) +++ lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/test/test-structure.tex Thu Oct 27 15:14:32 2011 (r40037) @@ -1,34 +1,52 @@ %% 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[legalpaper,francais,german,newzealand]{article} +\documentclass[legalpaper,french,german,english,dummyoption]{article} +\usepackage[latin9]{inputenc} +\usepackage{color} +\usepackage{rotfloat} +\usepackage{wrapfig} + +\makeatletter %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands. +\pdfpageheight\paperheight +\pdfpagewidth\paperwidth -\usepackage{babel} +\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@} \newcommand{\noun}[1]{\textsc{#1}} +%% Because html converters don't know tabularnewline +\providecommand{\tabularnewline}{\\} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Textclass specific LaTeX commands. - \newenvironment{lyxlist}[1] - {\begin{list}{} - {\settowidth{\labelwidth}{#1} - \setlength{\leftmargin}{\labelwidth} - \addtolength{\leftmargin}{\labelsep} - \renewcommand{\makelabel}[1]{##1\hfil}}} - {\end{list}} - -% LyX will also recognize this command: -% \@ifundefined{date}{}{\date{}} -% and also this: -% \date{} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands. +{\begin{list}{} +{\settowidth{\labelwidth}{#1} + \setlength{\leftmargin}{\labelwidth} + \addtolength{\leftmargin}{\labelsep} + \renewcommand{\makelabel}[1]{##1\hfil}}} +{\end{list}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands. \newenvironment{foo}{==[}{]==} +\date{} + +\@ifundefined{showcaptionsetup}{}{% + \PassOptionsToPackage{caption=false}{subfig}} +\usepackage{subfig} +\makeatother + +\usepackage{babel} +\addto\extrasfrench{% + \providecommand{\og}{\leavevmode\flqq~}% + \providecommand{\fg}{\ifdim\lastskip>\z@\unskip\fi~\frqq}% +} + \begin{document} \title{Title} +% this should be recognized as empty date: \date{} \maketitle @@ -140,6 +158,35 @@ (we'll explain why later), though with some effort all these can be done, too. +\begin{table} +\caption{lk�l��} + + +\subfloat[�lk�l�]{ + +kl��} + +\end{table} + + +\begin{figure} +\subfloat[te\%st]{sub\textcolor{red}{fig}u\%re 1 + +} + +\hfill{} \subfloat[]{subfigure 2� + +} + +\subfloat{subfigure 3} + +\caption{figure caption} + + +strange usage, but valid +\end{figure} + + \subsection{Some paragraph stuff} A paragraph\footnote{hello} with a footnote and another @@ -226,7 +273,7 @@ and bibliography: \begin{thebibliography}{9} \bibitem{FOO} Edward Bar. \emph{The Foo Book}. (1999) -\bibitem{FO2} Walter Müller \emph{The Müller Book}. (2004) +\bibitem{FO2} Walter M�ller \emph{The M�ller Book}. (2004) \end{thebibliography} \appendix
