From 5fc564c4691d8e3cbc39032550d32249128f6a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 27 Oct 2011 13:13:43 +0000 Subject: [PATCH] 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 --- src/tex2lyx/TODO.txt | 2 -- src/tex2lyx/preamble.cpp | 3 +++ src/tex2lyx/text.cpp | 19 +++++++++++++++++++ status.20x | 28 +++++++++++++++------------- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 42d62a31b1..2261d995b1 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -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 diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index 6dbc6eda4e..f1d12d80cc 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -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; diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index e707299402..7409ae6db9 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -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(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); diff --git a/status.20x b/status.20x index f2d054cc62..93c718a81d 100644 --- a/status.20x +++ b/status.20x @@ -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 - (\color, \pagecolor), the background color of shaded boxes and the - text color of greyed-out notes are now recognized + - if no language package is set, or if a language package is set that + works independently of babel and polyglossia -- phantom spaces are recognized (\phantom, \hphanton, \vphantom) + - 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 -- the LaTeX command \rule is recognized + - the LaTeX command \rule -- recognized custom width for nomenclature list (\printnomenclature) + - phantom spaces (\phantom, \hphanton, \vphantom) -- all types of underlined or striked out text are recognized + - custom width for nomenclature list (\printnomenclature) -- hyperlinks are recognized (\href) + - all types of underlined or striked out text + + - hyperlinks (\href) + + - rotated floats (sidewaysfigure, sidewaystable) * USER INTERFACE