Author: uwestoehr
Date: Thu Oct 27 15:13:43 2011
New Revision: 40036
URL: http://www.lyx.org/trac/changeset/40036
Log:
backporting tex2lyx: the support for rotated floats
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/TODO.txt
lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp
lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/text.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/TODO.txt
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/TODO.txt Thu Oct 27
15:00:09 2011 (r40035)
+++ lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/TODO.txt Thu Oct 27
15:13:43 2011 (r40036)
@@ -17,7 +17,6 @@
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 @@
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
Modified: lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp Thu Oct 27
15:00:09 2011 (r40035)
+++ lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/preamble.cpp Thu Oct 27
15:13:43 2011 (r40036)
@@ -638,6 +638,9 @@
; // 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;
Modified: lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/text.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/text.cpp Thu Oct 27
15:00:09 2011 (r40035)
+++ lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/text.cpp Thu Oct 27
15:13:43 2011 (r40036)
@@ -1070,6 +1070,25 @@
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);
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Oct 27 15:00:09 2011
(r40035)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Oct 27 15:13:43 2011
(r40036)
@@ -37,26 +37,28 @@
- 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
