-/** The .tex to .lyx converter
- \author André Pönitz (2003)
+/**
+ * \file table.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
*/
// {[(
#include <config.h>
-#include "Lsstream.h"
#include "tex2lyx.h"
#include <cctype>
#include <fstream>
#include <iostream>
-#include <string>
+#include <sstream>
#include <vector>
+#include <map>
using std::cerr;
using std::endl;
using std::string;
using std::vector;
+#include "mathed/math_gridinfo.h"
-namespace {
-
-struct ColInfo
-{
- ColInfo() : rightline(0), leftline(false) {}
- string align; // column alignment
- string width; // column width
- int rightline; // a line on the right?
- bool leftline;
-};
-
-
-struct RowInfo
-{
- RowInfo() : topline(false), bottomline(false) {}
- bool topline; // horizontal line above
- int bottomline; // horizontal line below
-};
-
-
-struct CellInfo
-{
- CellInfo()
- : multi(0), leftline(false), rightline(false),
- topline(false), bottomline(false)
- {}
+// filled in preamble.C
+std::map<char, int> special_columns;
- string content; // cell content
- int multi; // multicolumn flag
- string align; // cell alignment
- bool leftline; // do we have a line on the left?
- bool rightline; // do we have a line on the right?
- bool topline; // do we have a line above?
- bool bottomline; // do we have a line below?
-};
+namespace {
int string2int(string const & s, int deflt = 0)
{
string read_hlines(Parser & p)
{
ostringstream os;
- p.skipSpaces();
+ p.skip_spaces();
while (p.good()) {
if (p.next_token().cs() == "hline") {
p.get_token();
os << "\\cline{" << p.verbatim_item() << "}";
} else
break;
- p.skipSpaces();
+ p.skip_spaces();
};
//cerr << "read_hlines(), read: '" << os.str() << "'\n";
//cerr << "read_hlines(), next token: " << p.next_token() << "\n";
}
-
/* rather brutish way to code table structure in a string:
\begin{tabular}{ccc}
char const LINE = '\002';
char const HLINE = '\004';
-string get_align(char c)
-{
- switch (c) {
- case 'c': return "center";
- case 'l': return "left";
- case 'r': return "right";
- case 'b': return "block";
- }
- return "center";
-}
-
void handle_colalign(Parser & p, vector<ColInfo> & colinfo)
{
if (p.get_token().cat() != catBegin)
cerr << "wrong syntax for table column alignment. '{' expected\n";
- string nextalign = "block";
+ char nextalign = 'b';
bool leftline = false;
for (Token t=p.get_token(); p.good() && t.cat() != catEnd; t = p.get_token()){
#ifdef FILEDEBUG
case 'l':
case 'r': {
ColInfo ci;
- ci.align = get_align(t.character());
+ ci.align = t.character();
if (colinfo.size() && colinfo.back().rightline > 1) {
ci.leftline = true;
--colinfo.back().rightline;
colinfo.push_back(ColInfo());
colinfo.back().align = nextalign;
colinfo.back().width = p.verbatim_item();
- nextalign = "block";
+ nextalign = 'b';
break;
case '|':
if (colinfo.empty())
case '>': {
string s = p.verbatim_item();
if (s == "\\raggedleft ")
- nextalign = "left";
+ nextalign = 'l';
else if (s == "\\raggedright ")
- nextalign = "right";
+ nextalign = 'r';
else
cerr << "unknown '>' column '" << s << "'\n";
break;
}
default:
- cerr << "ignoring special separator '" << t << "'\n";
+ if (special_columns.find(t.character()) != special_columns.end()) {
+ ColInfo ci;
+ ci.align = 'c';
+ ci.special += t.character();
+ int const nargs = special_columns[t.character()];
+ for (int i = 0; i < nargs; ++i)
+ ci.special += "{" + p.verbatim_item() + "}";
+ //cerr << "handling special column '" << t << "' " << nargs
+ // << " '" << ci.special << "'\n";
+ colinfo.push_back(ci);
+ } else {
+ cerr << "ignoring special separator '" << t << "'\n";
+ }
break;
}
}
}
else if (t.cs() == "tabularnewline" || t.cs() == "\\") {
- //else if (t.cs() == "tabularnewline") {
// stuff before the line break
// and look ahead for stuff after the line break
os << HLINE << hlines << HLINE << LINE << read_hlines(p) << HLINE;
}
-void handle_tabular(Parser & p, ostream & os)
+void handle_tabular(Parser & p, ostream & os,
+ Context & context)
{
string posopts = p.getOpt();
if (posopts.size())
cell < cells.size() && col < colinfo.size(); ++col, ++cell) {
//cerr << "cell content: '" << cells[cell] << "'\n";
Parser p(cells[cell]);
- p.skipSpaces();
+ p.skip_spaces();
//cells[cell] << "'\n";
if (p.next_token().cs() == "multicolumn") {
// how many cells?
handle_colalign(p, t);
cellinfo[row][col].multi = 1;
cellinfo[row][col].align = t.front().align;
- cellinfo[row][col].content = parse_text(p, FLAG_ITEM, false);
+ ostringstream os;
+ parse_text_in_inset(p, os, FLAG_ITEM, false, context);
+ cellinfo[row][col].content = os.str();
cellinfo[row][col].leftline |= t.front().leftline;
cellinfo[row][col].rightline |= t.front().rightline;
for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) {
++col;
cellinfo[row][col].multi = 2;
- cellinfo[row][col].align = "center";
+ cellinfo[row][col].align = 'c';
}
// more than one line on the right?
} else {
// FLAG_END is a hack, we need to read all of it
- cellinfo[row][col].content = parse_text(p, FLAG_END, false);
+ cellinfo[row][col].leftline = colinfo[col].leftline;
+ cellinfo[row][col].rightline = colinfo[col].rightline;
+ cellinfo[row][col].align = colinfo[col].align;
+ ostringstream os;
+ parse_text_in_inset(p, os, FLAG_CELL, false, context);
+ cellinfo[row][col].content = os.str();
}
}
//cerr << "// output what we have\n";
// output what we have
- os << "<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
+ os << "\n<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
<< "\" columns=\"" << colinfo.size() << "\">\n"
<< "<features>\n";
//cerr << "// after header\n";
for (size_t col = 0; col < colinfo.size(); ++col) {
- os << "<column alignment=\"" << colinfo[col].align << "\"";
- if (colinfo[col].rightline)
- os << " rightline=\"true\"";
+ os << "<column alignment=\""
+ << verbose_align(colinfo[col].align) << "\"";
+ os << " valignment=\"top\"";
if (colinfo[col].leftline)
os << " leftline=\"true\"";
- os << " valignment=\"top\"";
- os << " width=\"" << colinfo[col].width << "\"";
+ if (colinfo[col].rightline)
+ os << " rightline=\"true\"";
+ if (colinfo[col].width.size())
+ os << " width=\"" << colinfo[col].width << "\"";
+ if (colinfo[col].special.size())
+ os << " special=\"" << colinfo[col].special << "\"";
os << ">\n";
}
//cerr << "// after cols\n";
os << "<cell";
if (cell.multi)
os << " multicolumn=\"" << cell.multi << "\"";
- if (cell.leftline)
- os << " leftline=\"true\"";
- if (cell.rightline)
- os << " rightline=\"true\"";
+ os << " alignment=\"" << verbose_align(cell.align)
+ << "\""
+ << " valignment=\"top\"";
if (cell.topline)
os << " topline=\"true\"";
if (cell.bottomline)
os << " bottomline=\"true\"";
+ if (cell.leftline)
+ os << " leftline=\"true\"";
+ if (cell.rightline)
+ os << " rightline=\"true\"";
//cerr << "\nrow: " << row << " col: " << col;
//if (cell.topline)
// cerr << " topline=\"true\"";
//if (cell.bottomline)
// cerr << " bottomline=\"true\"";
- os << " alignment=\"" << cell.align << "\""
- << " valignment=\"top\""
- << " usebox=\"none\""
- << ">"
- << "\n\\begin_inset Text"
- << "\n\n\\layout Standard\n\n"
+ os << " usebox=\"none\""
+ << ">"
+ << "\n\\begin_inset Text\n"
<< cell.content
- << "\n\\end_inset\n\n"
+ << "\n\\end_inset \n"
<< "</cell>\n";
}
os << "</row>\n";
projects / lyx.git / blobdiff