anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- tex2lyx/text.cpp: a fix for subfloat support

Browse Source 
- tex2lyx: some testfile tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40035 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-10-27 13:00:09 +00:00
parent b787d0090b
commit a3e5f3cd47
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tex2lyx/test/test-structure.tex
View File

@ -1,6 +1,6 @@
%% LyX trick_preamble_code_into_believing_that_this_was_created_by_lyx created this file. For more info, see http://www.lyx.org/. %% 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. %% Do not edit unless you really know what you are doing.
\documentclass[legalpaper,french,german,english]{article} \documentclass[legalpaper,french,german,english,dummyoption]{article}
\usepackage[latin9]{inputenc} \usepackage[latin9]{inputenc}
\usepackage{color} \usepackage{color}
\usepackage{rotfloat} \usepackage{rotfloat}
@ -29,10 +29,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands.
\newenvironment{foo}{==[}{]==} \newenvironment{foo}{==[}{]==}
% LyX will also recognize this command: \date{}
% \@ifundefined{date}{}{\date{}}
% and also this:
% \date{}
\@ifundefined{showcaptionsetup}{}{% \@ifundefined{showcaptionsetup}{}{%
\PassOptionsToPackage{caption=false}{subfig}} \PassOptionsToPackage{caption=false}{subfig}}
@ -49,6 +46,7 @@
\title{Title} \title{Title}
% this should be recognized as empty date:
\date{} \date{}
\maketitle \maketitle

2
src/tex2lyx/text.cpp
View File

@ -1084,6 +1084,8 @@ void parse_environment(Parser & p, ostream & os, bool outer,
// we must make sure that the next item gets a \begin_layout. // we must make sure that the next item gets a \begin_layout.
parent_context.new_paragraph(os); parent_context.new_paragraph(os);
p.skip_spaces(); p.skip_spaces();
// the float is parsed thus delete the type
float_type = "";
} }
else if (unstarred_name == "sidewaysfigure" else if (unstarred_name == "sidewaysfigure"