From f3a833ca7e6e833be6dc15638fb337004e3bb366 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 6 Nov 2011 18:56:26 +0000 Subject: [PATCH] Import optional argument of tabular (vertical alignment) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40148 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/TODO.txt | 1 - src/tex2lyx/table.cpp | 18 +++++++++++++----- src/tex2lyx/test/test-structure.tex | 2 +- status.20x | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index a3d5547bb6..eda127abe7 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -37,7 +37,6 @@ Format LaTeX feature LyX feature 332 ? InsetGraphics groupId 336 ? \font_cjk 343 ? \use_default_options -347 tabular valign InsetTabular 350 ? \default_output_format 353 \printsubindex InsetIndex 354 \printindex*, \printsubindex* InsetIndex diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp index 4360783394..37a74509b6 100644 --- a/src/tex2lyx/table.cpp +++ b/src/tex2lyx/table.cpp @@ -773,14 +773,20 @@ void handle_hline_below(RowInfo & ri, vector & ci) void handle_tabular(Parser & p, ostream & os, bool is_long_tabular, Context & context) { + string tabularvalignment("middle"); string posopts = p.getOpt(); if (!posopts.empty()) { // FIXME: Convert this to ERT if (is_long_tabular) - cerr << "horizontal longtable"; + cerr << "horizontal longtable positioning '" + << posopts << "' ignored\n"; + else if (posopts == "[t]") + tabularvalignment = "top"; + else if (posopts == "[b]") + tabularvalignment = "bottom"; else - cerr << "vertical tabular"; - cerr << " positioning '" << posopts << "' ignored\n"; + cerr << "vertical tabular positioning '" + << posopts << "' ignored\n"; } vector colinfo; @@ -1106,8 +1112,10 @@ void handle_tabular(Parser & p, ostream & os, bool is_long_tabular, << "\" columns=\"" << colinfo.size() << "\">\n"; os << "\n"; + << write_attribute("islongtable", is_long_tabular); + if (!is_long_tabular) + os << write_attribute("tabularvalignment", tabularvalignment); + os << ">\n"; //cerr << "// after header\n"; for (size_t col = 0; col < colinfo.size(); ++col) { diff --git a/src/tex2lyx/test/test-structure.tex b/src/tex2lyx/test/test-structure.tex index ba4bbce724..d773dee15c 100644 --- a/src/tex2lyx/test/test-structure.tex +++ b/src/tex2lyx/test/test-structure.tex @@ -101,7 +101,7 @@ An environment \caption{rotated table, spanning all columns} \centering{}% -\begin{tabular}{|c|c|} +\begin{tabular}[b]{|c|c|} \hline a & b\tabularnewline \hline diff --git a/status.20x b/status.20x index 0a5ba22740..c54e73538c 100644 --- a/status.20x +++ b/status.20x @@ -160,6 +160,8 @@ What's new - Fix LaTeX import of theorem environment with optional argument (bug 6834). +- Fix LaTeX import of tabular environment with optional argument. + - Store the autosave files of unnamed buffers in the correct directory and make sure they are not left behind after saving (bug 7793). -- 2.39.5