]> git.lyx.org Git - features.git/blobdiff - src/insets/InsetTabular.cpp
Improved character count statistics for letter based insets (e.g. the LyX logo).
[features.git] / src / insets / InsetTabular.cpp
index e007e59174841ebf8b495e9b84ef8dd7ff804655..8458ce47285d0449566a37a614e990a38ad3a486 100644 (file)
@@ -42,6 +42,7 @@
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "xml.h"
 #include "output_xhtml.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
@@ -3498,154 +3499,253 @@ void Tabular::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-int Tabular::docbookRow(odocstream & os, row_type row,
-                          OutputParams const & runparams) const
+void Tabular::docbookRow(XMLStream & xs, row_type row,
+                  OutputParams const & runparams, bool header) const
 {
-       int ret = 0;
+       switch (buffer().params().docbook_table_output) {
+       case BufferParams::HTMLTable:
+               docbookRowAsHTML(xs, row, runparams, header);
+               break;
+       case BufferParams::CALSTable:
+               docbookRowAsCALS(xs, row, runparams);
+               break;
+       }
+}
+
+
+void Tabular::docbookRowAsHTML(XMLStream & xs, row_type row,
+                  OutputParams const & runparams, bool header) const
+{
+       string const celltag = header ? "th" : "td";
        idx_type cell = getFirstCellInRow(row);
 
-       os << "<row>\n";
+       xs << xml::StartTag("tr");
+       xs << xml::CR();
        for (col_type c = 0; c < ncols(); ++c) {
-               if (isPartOfMultiColumn(row, c))
+               if (isPartOfMultiColumn(row, c) || isPartOfMultiRow(row, c))
                        continue;
 
-               os << "<entry align=\"";
+               stringstream attr;
+
+               Length const cwidth = column_info[c].p_width;
+               if (!cwidth.zero()) {
+                       string const hwidth = cwidth.asHTMLString();
+                       attr << "style =\"width: " << hwidth << ";\" ";
+               }
+
+               attr << "align='";
                switch (getAlignment(cell)) {
+               case LYX_ALIGN_BLOCK:
+                       attr << "justify";
+                       break;
+               case LYX_ALIGN_DECIMAL: {
+                       Language const *tlang = buffer().paragraphs().front().getParLanguage(buffer().params());
+                       attr << "char' char='" << to_utf8(tlang->decimalSeparator());
+               }
+                       break;
                case LYX_ALIGN_LEFT:
-                       os << "left";
+                       attr << "left";
                        break;
                case LYX_ALIGN_RIGHT:
-                       os << "right";
+                       attr << "right";
                        break;
                default:
-                       os << "center";
+                       attr << "center";
                        break;
                }
-
-               os << "\" valign=\"";
+               attr << "'";
+               attr << " valign='";
                switch (getVAlignment(cell)) {
                case LYX_VALIGN_TOP:
-                       os << "top";
+                       attr << "top";
                        break;
                case LYX_VALIGN_BOTTOM:
-                       os << "bottom";
+                       attr << "bottom";
                        break;
                case LYX_VALIGN_MIDDLE:
-                       os << "middle";
+                       attr << "middle";
                }
-               os << '"';
+               attr << "'";
 
-               if (isMultiColumn(cell)) {
-                       os << " namest=\"col" << c << "\" ";
-                       os << "nameend=\"col" << c + columnSpan(cell) - 1 << '"';
-               }
+               if (isMultiColumn(cell))
+                       attr << " colspan='" << columnSpan(cell) << "'";
+               else if (isMultiRow(cell))
+                       attr << " rowspan='" << rowSpan(cell) << "'";
 
-               os << '>';
-               ret += cellInset(cell)->docbook(os, runparams);
-               os << "</entry>\n";
+               xs << xml::StartTag(celltag, attr.str(), true);
+               cellInset(cell)->docbook(xs, runparams);
+               xs << xml::EndTag(celltag);
+               xs << xml::CR();
                ++cell;
        }
-       os << "</row>\n";
-       return ret;
+       xs << xml::EndTag("tr");
+       xs << xml::CR();
 }
 
 
-int Tabular::docbook(odocstream & os, OutputParams const & runparams) const
+void Tabular::docbookRowAsCALS(XMLStream & xs, row_type row,
+                                OutputParams const & runparams) const
 {
-       int ret = 0;
+       idx_type cell = getFirstCellInRow(row);
 
-       //+---------------------------------------------------------------------
-       //+                      first the opening preamble                    +
-       //+---------------------------------------------------------------------
+       xs << xml::StartTag("row");
+       xs << xml::CR();
+       for (col_type c = 0; c < ncols(); ++c) {
+               if (isPartOfMultiColumn(row, c) || isPartOfMultiRow(row, c))
+                       continue;
 
-       os << "<tgroup cols=\"" << ncols()
-          << "\" colsep=\"1\" rowsep=\"1\">\n";
+               stringstream attr;
 
-       for (col_type c = 0; c < ncols(); ++c) {
-               os << "<colspec colname=\"col" << c << "\" align=\"";
-               switch (column_info[c].alignment) {
+               attr << "align='";
+               switch (getAlignment(cell)) {
+               case LYX_ALIGN_BLOCK:
+                       attr << "justify";
+                       break;
+               case LYX_ALIGN_DECIMAL: {
+                       Language const *tlang = buffer().paragraphs().front().getParLanguage(buffer().params());
+                       attr << "char' char='" << to_utf8(tlang->decimalSeparator());
+               }
+                       break;
                case LYX_ALIGN_LEFT:
-                       os << "left";
+                       attr << "left";
                        break;
                case LYX_ALIGN_RIGHT:
-                       os << "right";
+                       attr << "right";
                        break;
+
                default:
-                       os << "center";
+                       attr << "center";
                        break;
                }
-               os << '"';
-               if (runparams.flavor == OutputParams::XML)
-                       os << '/';
-               os << ">\n";
-               ++ret;
+               attr << "'";
+               attr << " valign='";
+               switch (getVAlignment(cell)) {
+               case LYX_VALIGN_TOP:
+                       attr << "top";
+                       break;
+               case LYX_VALIGN_BOTTOM:
+                       attr << "bottom";
+                       break;
+               case LYX_VALIGN_MIDDLE:
+                       attr << "middle";
+               }
+               attr << "'";
+
+               if (isMultiColumn(cell))
+                       attr << " colspan='" << columnSpan(cell) << "'";
+               else if (isMultiRow(cell))
+                       attr << " rowspan='" << rowSpan(cell) << "'";
+               else
+                       attr << " colname='c" << (c + 1) << "'"; // Column numbering starts at 1.
+
+               // All cases where there should be a line *below* this row.
+               if (row_info[row].bottom_space_default)
+                       attr << " rowsep='1'";
+
+               xs << xml::StartTag("entry", attr.str(), true);
+               cellInset(cell)->docbook(xs, runparams);
+               xs << xml::EndTag("entry");
+               xs << xml::CR();
+               ++cell;
        }
+       xs << xml::EndTag("row");
+       xs << xml::CR();
+}
 
-       //+---------------------------------------------------------------------
-       //+                      Long Tabular case                             +
-       //+---------------------------------------------------------------------
 
-       // output caption info
-       // The caption flag wins over head/foot
+void Tabular::docbook(XMLStream & xs, OutputParams const & runparams) const
+{
+       docstring ret;
+
+       // Some tables are inline. Likely limitation: cannot output a table within a table; is that really a limitation?
+       if (!runparams.docbook_in_table) { // Check on the *outer* set of parameters, so that the table can be closed
+               // properly at the end of this function.
+               xs << xml::StartTag("informaltable");
+               xs << xml::CR();
+       }
+
+       // "Formal" tables have a title and use the tag <table>; the distinction with <informaltable> is done outside.
+       // HTML has the caption first with titles forbidden, and CALS has a title first.
        if (haveLTCaption()) {
-               os << "<caption>\n";
-               ++ret;
-               for (row_type r = 0; r < nrows(); ++r) {
-                       if (row_info[r].caption) {
-                               ret += docbookRow(os, r, runparams);
-                       }
+               std::string tag = ((buffer().params().docbook_table_output) == BufferParams::HTMLTable) ? "caption" : "title";
+
+               xs << xml::StartTag(tag);
+               for (row_type r = 0; r < nrows(); ++r)
+                       if (row_info[r].caption)
+                               docbookRow(xs, r, runparams);
+               xs << xml::EndTag(tag);
+               xs << xml::CR();
+       }
+
+       // CALS header: describe all columns in this table. For names, take 'c' then the ID of the column.
+       // Start at one, as is customary with CALS!
+       if (buffer().params().docbook_table_output == BufferParams::CALSTable) {
+               for (col_type c = 0; c < ncols(); ++c) {
+                       std::stringstream attr;
+                       attr << "colnum='" << (c + 1) << "' ";
+                       attr << "colname='c" << (c + 1) << "' ";
+                       Length const cwidth = column_info[c].p_width;
+                       if (!cwidth.zero())
+                               attr << "colwidth='" << cwidth.asHTMLString() << "' ";
+                       attr << "rowheader='norowheader'"; // Last attribute, hence no space at the end.
+
+                       xs << xml::CompTag("colspec", attr.str());
+                       xs << xml::CR();
                }
-               os << "</caption>\n";
-               ++ret;
        }
-       // output header info
-       if (haveLTHead(false) || haveLTFirstHead(false)) {
-               os << "<thead>\n";
-               ++ret;
+
+       // Output the header of the table. For both HTML and CALS, this is surrounded by a thead.
+       bool const havefirsthead = haveLTFirstHead(false);
+       // if we have a first head, then we are going to ignore the
+       // headers for the additional pages, since there aren't any
+       // in DocBook. this test accomplishes that.
+       bool const havehead = !havefirsthead && haveLTHead(false);
+       if (havehead || havefirsthead) {
+               xs << xml::StartTag("thead") << xml::CR();
                for (row_type r = 0; r < nrows(); ++r) {
-                       if ((row_info[r].endhead || row_info[r].endfirsthead) &&
+                       if (((havefirsthead && row_info[r].endfirsthead) ||
+                            (havehead && row_info[r].endhead)) &&
                            !row_info[r].caption) {
-                               ret += docbookRow(os, r, runparams);
+                               docbookRow(xs, r, runparams, true); // TODO: HTML vs CALS
                        }
                }
-               os << "</thead>\n";
-               ++ret;
+               xs << xml::EndTag("thead");
+               xs << xml::CR();
        }
-       // output footer info
-       if (haveLTFoot(false) || haveLTLastFoot(false)) {
-               os << "<tfoot>\n";
-               ++ret;
+
+       // Output the footer of the table. For both HTML and CALS, this is surrounded by a tfoot and output just after
+       // the header (and before the body).
+       bool const havelastfoot = haveLTLastFoot(false);
+       // as before.
+       bool const havefoot = !havelastfoot && haveLTFoot(false);
+       if (havefoot || havelastfoot) {
+               xs << xml::StartTag("tfoot") << xml::CR();
                for (row_type r = 0; r < nrows(); ++r) {
-                       if ((row_info[r].endfoot || row_info[r].endlastfoot) &&
+                       if (((havelastfoot && row_info[r].endlastfoot) ||
+                            (havefoot && row_info[r].endfoot)) &&
                            !row_info[r].caption) {
-                               ret += docbookRow(os, r, runparams);
+                               docbookRow(xs, r, runparams); // TODO: HTML vs CALS
                        }
                }
-               os << "</tfoot>\n";
-               ++ret;
+               xs << xml::EndTag("tfoot");
+               xs << xml::CR();
        }
 
-       //+---------------------------------------------------------------------
-       //+                      the single row and columns (cells)            +
-       //+---------------------------------------------------------------------
+       // Output the main part of the table. The tbody container is mandatory for CALS, but optional for HTML (only if
+       // there is no header and no footer). It never hurts to have it, though.
+       xs << xml::StartTag("tbody");
+       xs << xml::CR();
+       for (row_type r = 0; r < nrows(); ++r)
+               if (isValidRow(r))
+                       docbookRow(xs, r, runparams);
+       xs << xml::EndTag("tbody");
+       xs << xml::CR();
 
-       os << "<tbody>\n";
-       ++ret;
-       for (row_type r = 0; r < nrows(); ++r) {
-               if (isValidRow(r)) {
-                       ret += docbookRow(os, r, runparams);
-               }
+       // If this method started the table tag, also make it close it.
+       if (!runparams.docbook_in_table) {
+               xs << xml::EndTag("informaltable");
+               xs << xml::CR();
        }
-       os << "</tbody>\n";
-       ++ret;
-       //+---------------------------------------------------------------------
-       //+                      the closing of the tabular                    +
-       //+---------------------------------------------------------------------
-
-       os << "</tgroup>";
-       ++ret;
-
-       return ret;
 }
 
 
@@ -3728,20 +3828,22 @@ docstring Tabular::xhtml(XMLStream & xs, OutputParams const & runparams) const
                        align = "right";
                        break;
                }
-               xs << xml::StartTag("div", "class='longtable' style='text-align: " + align + ";'")
-                  << xml::CR();
+               xs << xml::StartTag("div", "class='longtable' style='text-align: " + align + ";'");
+               xs << xml::CR();
                // The caption flag wins over head/foot
                if (haveLTCaption()) {
-                       xs << xml::StartTag("div", "class='longtable-caption' style='text-align: " + align + ";'")
-                          << xml::CR();
+                       xs << xml::StartTag("div", "class='longtable-caption' style='text-align: " + align + ";'");
+                       xs << xml::CR();
                        for (row_type r = 0; r < nrows(); ++r)
                                if (row_info[r].caption)
                                        ret += xhtmlRow(xs, r, runparams);
-                       xs << xml::EndTag("div") << xml::CR();
+                       xs << xml::EndTag("div");
+                       xs << xml::CR();
                }
        }
 
-       xs << xml::StartTag("table") << xml::CR();
+       xs << xml::StartTag("table");
+       xs << xml::CR();
 
        // output header info
        bool const havefirsthead = haveLTFirstHead(false);
@@ -3750,7 +3852,8 @@ docstring Tabular::xhtml(XMLStream & xs, OutputParams const & runparams) const
        // in XHTML. this test accomplishes that.
        bool const havehead = !havefirsthead && haveLTHead(false);
        if (havehead || havefirsthead) {
-               xs << xml::StartTag("thead") << xml::CR();
+               xs << xml::StartTag("thead");
+               xs << xml::CR();
                for (row_type r = 0; r < nrows(); ++r) {
                        if (((havefirsthead && row_info[r].endfirsthead) ||
                             (havehead && row_info[r].endhead)) &&
@@ -3758,7 +3861,8 @@ docstring Tabular::xhtml(XMLStream & xs, OutputParams const & runparams) const
                                ret += xhtmlRow(xs, r, runparams, true);
                        }
                }
-               xs << xml::EndTag("thead") << xml::CR();
+               xs << xml::EndTag("thead");
+               xs << xml::CR();
        }
        // output footer info
        bool const havelastfoot = haveLTLastFoot(false);
@@ -3773,21 +3877,22 @@ docstring Tabular::xhtml(XMLStream & xs, OutputParams const & runparams) const
                                ret += xhtmlRow(xs, r, runparams);
                        }
                }
-               xs << xml::EndTag("tfoot") << xml::CR();
+               xs << xml::EndTag("tfoot");
+               xs << xml::CR();
        }
 
        xs << xml::StartTag("tbody") << xml::CR();
-       for (row_type r = 0; r < nrows(); ++r) {
-               if (isValidRow(r)) {
+       for (row_type r = 0; r < nrows(); ++r)
+               if (isValidRow(r))
                        ret += xhtmlRow(xs, r, runparams);
-               }
+       xs << xml::EndTag("tbody");
+       xs << xml::CR();
+       xs << xml::EndTag("table");
+       xs << xml::CR();
+       if (is_long_tabular) {
+               xs << xml::EndTag("div");
+               xs << xml::CR();
        }
-       xs << xml::EndTag("tbody")
-          << xml::CR()
-          << xml::EndTag("table")
-          << xml::CR();
-       if (is_long_tabular)
-               xs << xml::EndTag("div") << xml::CR();
        return ret;
 }
 
@@ -4175,6 +4280,12 @@ docstring InsetTableCell::xhtml(XMLStream & xs, OutputParams const & rp) const
 }
 
 
+void InsetTableCell::docbook(XMLStream & xs, OutputParams const & runparams) const
+{
+       InsetText::docbook(xs, runparams);
+}
+
+
 void InsetTableCell::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        TextMetrics & tm = mi.base.bv->textMetrics(&text());
@@ -4255,6 +4366,18 @@ bool InsetTabular::insetAllowed(InsetCode code) const
 }
 
 
+bool InsetTabular::allowMultiPar() const
+{
+       for (Tabular::col_type c = 0; c < tabular.ncols(); ++c) {
+               for (Tabular::row_type r = 0; r < tabular.nrows(); ++r) {
+                       if (tabular.cellInset(r,c)->allowMultiPar())
+                               return true;
+               }
+       }
+       return false;
+}
+
+
 bool InsetTabular::allowsCaptionVariation(std::string const & newtype) const
 {
        return tabular.is_long_tabular &&
@@ -6010,30 +6133,9 @@ int InsetTabular::plaintext(odocstringstream & os,
 }
 
 
-int InsetTabular::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetTabular::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       int ret = 0;
-       Inset * master = 0;
-
-       // FIXME: Why not pass a proper DocIterator here?
-#if 0
-       // if the table is inside a float it doesn't need the informaltable
-       // wrapper. Search for it.
-       for (master = owner(); master; master = master->owner())
-               if (master->lyxCode() == FLOAT_CODE)
-                       break;
-#endif
-
-       if (!master) {
-               os << "<informaltable>";
-               ++ret;
-       }
-       ret += tabular.docbook(os, runparams);
-       if (!master) {
-               os << "</informaltable>";
-               ++ret;
-       }
-       return ret;
+       tabular.docbook(xs, runparams);
 }