backporting tex2lyx: the support for rotated floats

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40036 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-10-27 13:13:43 +00:00
parent 04eb1d59a2
commit 5fc564c469
4 changed files with 37 additions and 15 deletions

View File

@ -17,7 +17,6 @@ Format LaTeX feature LyX feature
226 nothing (impossible to import) InsetBranch, \branch...\end_branch
226 transformations InsetExternal
228 draft InsetExternal
231 sidewaysfigure/sidewaystable InsetFloat
232 bibtopic InsetBibTeX
248 booktabs.sty InsetTabular
254 esint.sty \use_esint
@ -35,7 +34,6 @@ Format LaTeX feature LyX feature
309 \nocite InsetCitation
310 \nocite{*} InsetBibtex
312 rotfloat.sty InsetFloat
312 wide sideways{figure,table} InsetFloat
316 subfig.sty (subfloats) InsetFloat
317 floating placements InsetWrap
322 ? local layout

View File

@ -638,6 +638,9 @@ void handle_package(Parser &p, string const & name, string const & opts,
; // Ignore this, the geometry settings are made by the \geometry
// command. This command is handled below.
else if (name == "rotfloat")
; // ignore this
else if (is_known(name, known_languages))
h_language = name;

View File

@ -1070,6 +1070,25 @@ void parse_environment(Parser & p, ostream & os, bool outer,
p.skip_spaces();
}
else if (unstarred_name == "sidewaysfigure"
|| unstarred_name == "sidewaystable") {
eat_whitespace(p, os, parent_context, false);
parent_context.check_layout(os);
if (unstarred_name == "sidewaysfigure")
begin_inset(os, "Float figure\n");
else
begin_inset(os, "Float table\n");
os << "wide " << convert<string>(is_starred)
<< "\nsideways true"
<< "\nstatus open\n\n";
parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
end_inset(os);
// We don't need really a new paragraph, but
// we must make sure that the next item gets a \begin_layout.
parent_context.new_paragraph(os);
p.skip_spaces();
}
else if (name == "minipage") {
eat_whitespace(p, os, parent_context, false);
parse_box(p, os, 0, FLAG_END, outer, parent_context, "", "", name);

View File

@ -37,26 +37,28 @@ What's new
- tex2lyx produces now the current file format 413.
- the font packages utopia, fourier, ccfonts, chancery and beraserif
are now recognized
- the following things are now recognized:
- if no language package is set, or if a language package is set that
works independently of babel and polyglossia, tex2lyx recognizes this
now
- the font packages utopia, fourier, ccfonts, chancery and beraserif
- the setting of the document-wide background color and text color
- if no language package is set, or if a language package is set that
works independently of babel and polyglossia
- the setting of the document-wide background color and text color
(\color, \pagecolor), the background color of shaded boxes and the
text color of greyed-out notes are now recognized
text color of greyed-out notes
- phantom spaces are recognized (\phantom, \hphanton, \vphantom)
- the LaTeX command \rule
- the LaTeX command \rule is recognized
- phantom spaces (\phantom, \hphanton, \vphantom)
- recognized custom width for nomenclature list (\printnomenclature)
- custom width for nomenclature list (\printnomenclature)
- all types of underlined or striked out text are recognized
- all types of underlined or striked out text
- hyperlinks are recognized (\href)
- hyperlinks (\href)
- rotated floats (sidewaysfigure, sidewaystable)
* USER INTERFACE