* InsetTabular.{cpp, h}:

[lyx.git] / src / insets / InsetTabular.cpp

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 9d2bc33fd1de1374c7a185384bb3abf97389b4ac..e8db353e8e75135fa53c48e2b7948425cabac7b6 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2636,30 +2636,10 @@ int Tabular::docbook(odocstream & os, OutputParams const & runparams) const
 docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
                           OutputParams const & runparams) const
 {
-       /* for (col_type i = 0; i < column_info.size(); ++i) {
-               os << "<colspec colname=\"col" << i << "\" align=\"";
-               switch (column_info[i].alignment) {
-               case LYX_ALIGN_LEFT:
-                       os << "left";
-                       break;
-               case LYX_ALIGN_RIGHT:
-                       os << "right";
-                       break;
-               default:
-                       os << "center";
-                       break;
-               }
-               os << '"';
-               if (runparams.flavor == OutputParams::XML)
-                       os << '/';
-               os << ">\n";
-               ++ret;
-       } */
-       
        docstring ret;
        idx_type cell = getFirstCellInRow(row);
 
-       xs << StartTag("tr");
+       xs << html::StartTag("tr");
        for (col_type j = 0; j < column_info.size(); ++j) {
                if (isPartOfMultiColumn(row, j))
                        continue;
@@ -2692,14 +2672,14 @@ docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
                attr << "'";
 
                if (isMultiColumn(cell))
-                       attr << " colspan='" << j + columnSpan(cell) - 1<< "'";
+                       attr << " colspan='" << columnSpan(cell) << "'";
 
-               xs << StartTag("td", attr.str());
+               xs << html::StartTag("td", attr.str());
                ret += cellInset(cell)->xhtml(xs, runparams);
-               xs << EndTag("td");
+               xs << html::EndTag("td");
                ++cell;
        }
-       xs << EndTag("tr");
+       xs << html::EndTag("tr");
        return ret;
 }
 
@@ -2707,20 +2687,16 @@ docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
 docstring Tabular::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
 {
        docstring ret;
-       xs << StartTag("table");
-
        // It's unclear to me if we need to mess with the long table stuff. 
        // We can borrow that too from docbook, if so.
 
-       xs << StartTag("tbody");
+       xs << html::StartTag("tbody");
        for (row_type i = 0; i < row_info.size(); ++i) {
                if (isValidRow(i)) {
                        ret += xhtmlRow(xs, i, runparams);
                }
        }
-       xs << EndTag("tbody");
-       xs << EndTag("table");
-
+       xs << html::EndTag("tbody");
        return ret;
 }
 
@@ -3415,13 +3391,14 @@ void InsetTabular::edit(Cursor & cur, bool front, EntryDirection)
                cur.pit() = 0;
                cur.pos() = cur.lastpos(); // FIXME crude guess
        }
+       cur.setCurrentFont();
        // FIXME: this accesses the position cache before it is initialized
        //resetPos(cur);
        //cur.bv().fitCursor();
 }
 
 
-void InsetTabular::updateLabels(ParIterator const & it, bool out)
+void InsetTabular::updateLabels(ParIterator const & it, UpdateType utype)
 {
        // In a longtable, tell captions what the current float is
        Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
@@ -3433,7 +3410,7 @@ void InsetTabular::updateLabels(ParIterator const & it, bool out)
        it2.forwardPos();
        size_t const end = it2.nargs();
        for ( ; it2.idx() < end; it2.top().forwardIdx())
-               buffer().updateLabels(it2, out);
+               buffer().updateLabels(it2, utype);
 
        //reset afterwards
        if (tabular.is_long_tabular)
@@ -3441,6 +3418,16 @@ void InsetTabular::updateLabels(ParIterator const & it, bool out)
 }
 
 
+void InsetTabular::addToToc(DocIterator const & cpit)
+{
+       DocIterator dit = cpit;
+       dit.forwardPos();
+       size_t const end = dit.nargs();
+       for ( ; dit.idx() < end; dit.top().forwardIdx())
+               cell(dit.idx())->addToToc(cpit);
+}
+
+
 void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        LYXERR(Debug::DEBUG, "# InsetTabular::doDispatch: cmd: " << cmd
@@ -3665,6 +3652,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                                TextMetrics const & tm =
                                        cur.bv().textMetrics(cell(cur.idx())->getText(0));
                                cur.pos() = tm.x2pos(cur.pit(), 0, cur.targetX());
+                               cur.setCurrentFont();
                        }
                }
                if (sl == cur.top()) {
@@ -3676,6 +3664,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.selIsMultiCell()) {
                        cur.pit() = cur.lastpit();
                        cur.pos() = cur.lastpos();
+                       cur.setCurrentFont();
                        return;
                }
                break;
@@ -3698,6 +3687,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                                ParagraphMetrics const & pm =
                                        tm.parMetrics(cur.lastpit());
                                cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX());
+                               cur.setCurrentFont();
                        }
                }
                if (sl == cur.top()) {
@@ -3707,6 +3697,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.selIsMultiCell()) {
                        cur.pit() = 0;
                        cur.pos() = cur.lastpos();
+                       cur.setCurrentFont();
                        return;
                }
                break;
@@ -4321,13 +4312,27 @@ int InsetTabular::docbook(odocstream & os, OutputParams const & runparams) const
 
 docstring InsetTabular::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
-       return tabular.xhtml(xs, rp);
+       // FIXME XHTML
+       // It'd be better to be able to get this from an InsetLayout, but at present
+       // InsetLayouts do not seem really to work for things that aren't InsetTexts.
+       xs << html::StartTag("table");
+       docstring ret = tabular.xhtml(xs, rp);
+       xs << html::EndTag("table");
+       return ret;
 }
 
 
 void InsetTabular::validate(LaTeXFeatures & features) const
 {
        tabular.validate(features);
+       // FIXME XHTML
+       // It'd be better to be able to get this from an InsetLayout, but at present
+       // InsetLayouts do not seem really to work for things that aren't InsetTexts.
+       if (features.runparams().flavor == OutputParams::HTML)
+               features.addPreambleSnippet("<style type=\"text/css\">\n"
+      "table { border: 1px solid black; display: inline-block; }\n"
+      "td { border: 1px solid black; padding: 0.5ex; }\n"
+      "</style>");
 }
 
 
@@ -4530,7 +4535,7 @@ void InsetTabular::moveNextCell(Cursor & cur, EntryDirection entry_from)
                break;
 
        }
-
+       cur.setCurrentFont();
        resetPos(cur);
 }
 
@@ -4580,7 +4585,7 @@ void InsetTabular::movePrevCell(Cursor & cur, EntryDirection entry_from)
                break;
 
        }
-
+       cur.setCurrentFont();
        resetPos(cur);
 }