2003-04-17 09:47:21 +00:00
|
|
|
|
/** The .tex to .lyx converter
|
|
|
|
|
\author Andr<EFBFBD> P<EFBFBD>nitz (2003)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// {[(
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include "tex2lyx.h"
|
|
|
|
|
|
|
|
|
|
#include <cctype>
|
|
|
|
|
#include <fstream>
|
|
|
|
|
#include <iostream>
|
2003-06-30 11:36:08 +00:00
|
|
|
|
#include <sstream>
|
2003-04-17 09:47:21 +00:00
|
|
|
|
#include <vector>
|
2003-07-03 11:47:44 +00:00
|
|
|
|
#include <map>
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
using std::cerr;
|
|
|
|
|
using std::endl;
|
|
|
|
|
using std::istringstream;
|
|
|
|
|
using std::ostream;
|
|
|
|
|
using std::ostringstream;
|
2003-06-30 11:36:08 +00:00
|
|
|
|
using std::string;
|
2003-04-17 09:47:21 +00:00
|
|
|
|
using std::vector;
|
2003-07-03 11:47:44 +00:00
|
|
|
|
using std::map;
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
2003-04-25 15:54:29 +00:00
|
|
|
|
#include "mathed/math_gridinfo.h"
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
2003-07-03 11:47:44 +00:00
|
|
|
|
|
|
|
|
|
// filled in preamble.C
|
|
|
|
|
std::map<char, int> special_columns;
|
|
|
|
|
|
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
|
|
int string2int(string const & s, int deflt = 0)
|
|
|
|
|
{
|
2003-06-30 11:36:08 +00:00
|
|
|
|
istringstream is(s);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
int i = deflt;
|
|
|
|
|
is >> i;
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
string read_hlines(Parser & p)
|
|
|
|
|
{
|
|
|
|
|
ostringstream os;
|
2003-04-25 15:54:29 +00:00
|
|
|
|
p.skip_spaces();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
while (p.good()) {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (p.next_token().cs() == "hline") {
|
|
|
|
|
p.get_token();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
os << "\\hline";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
} else if (p.next_token().cs() == "cline") {
|
|
|
|
|
p.get_token();
|
|
|
|
|
os << "\\cline{" << p.verbatim_item() << "}";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
} else
|
|
|
|
|
break;
|
2003-04-25 15:54:29 +00:00
|
|
|
|
p.skip_spaces();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
};
|
|
|
|
|
//cerr << "read_hlines(), read: '" << os.str() << "'\n";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
//cerr << "read_hlines(), next token: " << p.next_token() << "\n";
|
2003-06-30 11:36:08 +00:00
|
|
|
|
return os.str();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* rather brutish way to code table structure in a string:
|
|
|
|
|
|
|
|
|
|
\begin{tabular}{ccc}
|
|
|
|
|
1 & 2 & 3\\ \hline
|
|
|
|
|
\multicolumn{2}{c}{4} & 5 //
|
|
|
|
|
6 & 7 \\
|
|
|
|
|
\end{tabular}
|
|
|
|
|
|
|
|
|
|
gets "translated" to:
|
|
|
|
|
|
|
|
|
|
1 TAB 2 TAB 3 LINE
|
|
|
|
|
\hline HLINE TAB 5 LINE
|
|
|
|
|
5 TAB 7 LINE
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
char const TAB = '\001';
|
|
|
|
|
char const LINE = '\002';
|
|
|
|
|
char const HLINE = '\004';
|
|
|
|
|
|
2003-04-23 15:14:43 +00:00
|
|
|
|
|
|
|
|
|
void handle_colalign(Parser & p, vector<ColInfo> & colinfo)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
{
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (p.get_token().cat() != catBegin)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
cerr << "wrong syntax for table column alignment. '{' expected\n";
|
|
|
|
|
|
2003-04-25 15:54:29 +00:00
|
|
|
|
char nextalign = 'b';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
bool leftline = false;
|
2003-04-23 15:14:43 +00:00
|
|
|
|
for (Token t=p.get_token(); p.good() && t.cat() != catEnd; t = p.get_token()){
|
2003-04-17 09:47:21 +00:00
|
|
|
|
#ifdef FILEDEBUG
|
|
|
|
|
cerr << "t: " << t << " c: '" << t.character() << "'\n";
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
switch (t.character()) {
|
|
|
|
|
case 'c':
|
|
|
|
|
case 'l':
|
2003-04-23 15:14:43 +00:00
|
|
|
|
case 'r': {
|
|
|
|
|
ColInfo ci;
|
2003-04-25 15:54:29 +00:00
|
|
|
|
ci.align = t.character();
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (colinfo.size() && colinfo.back().rightline > 1) {
|
|
|
|
|
ci.leftline = true;
|
|
|
|
|
--colinfo.back().rightline;
|
|
|
|
|
}
|
|
|
|
|
colinfo.push_back(ci);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
break;
|
2003-04-23 15:14:43 +00:00
|
|
|
|
}
|
2003-04-17 09:47:21 +00:00
|
|
|
|
case 'p':
|
|
|
|
|
colinfo.push_back(ColInfo());
|
|
|
|
|
colinfo.back().align = nextalign;
|
2003-04-23 15:14:43 +00:00
|
|
|
|
colinfo.back().width = p.verbatim_item();
|
2003-04-25 15:54:29 +00:00
|
|
|
|
nextalign = 'b';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
break;
|
|
|
|
|
case '|':
|
|
|
|
|
if (colinfo.empty())
|
|
|
|
|
leftline = true;
|
|
|
|
|
else
|
2003-04-23 15:14:43 +00:00
|
|
|
|
++colinfo.back().rightline;
|
2003-04-17 09:47:21 +00:00
|
|
|
|
break;
|
|
|
|
|
case '>': {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
string s = p.verbatim_item();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
if (s == "\\raggedleft ")
|
2003-04-25 15:54:29 +00:00
|
|
|
|
nextalign = 'l';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
else if (s == "\\raggedright ")
|
2003-04-25 15:54:29 +00:00
|
|
|
|
nextalign = 'r';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
else
|
|
|
|
|
cerr << "unknown '>' column '" << s << "'\n";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
default:
|
2003-07-03 11:47:44 +00:00
|
|
|
|
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";
|
|
|
|
|
}
|
2003-04-17 09:47:21 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (colinfo.size() && leftline)
|
|
|
|
|
colinfo[0].leftline = true;
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void parse_table(Parser & p, ostream & os, unsigned flags)
|
|
|
|
|
{
|
|
|
|
|
string hlines;
|
|
|
|
|
|
|
|
|
|
while (p.good()) {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
Token const & t = p.get_token();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
#ifdef FILEDEBUG
|
|
|
|
|
cerr << "t: " << t << " flags: " << flags << "\n";
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// cat codes
|
|
|
|
|
//
|
|
|
|
|
if (t.cat() == catMath) {
|
|
|
|
|
// we are inside some text mode thingy, so opening new math is allowed
|
2003-04-23 15:14:43 +00:00
|
|
|
|
Token const & n = p.get_token();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
if (n.cat() == catMath) {
|
|
|
|
|
// TeX's $$...$$ syntax for displayed math
|
|
|
|
|
os << "\\[";
|
|
|
|
|
parse_math(p, os, FLAG_SIMPLE, MATH_MODE);
|
|
|
|
|
os << "\\]";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
p.get_token(); // skip the second '$' token
|
2003-04-17 09:47:21 +00:00
|
|
|
|
} else {
|
|
|
|
|
// simple $...$ stuff
|
|
|
|
|
p.putback();
|
|
|
|
|
os << '$';
|
|
|
|
|
parse_math(p, os, FLAG_SIMPLE, MATH_MODE);
|
|
|
|
|
os << '$';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catLetter ||
|
|
|
|
|
t.cat() == catSpace ||
|
|
|
|
|
t.cat() == catSuper ||
|
|
|
|
|
t.cat() == catSub ||
|
|
|
|
|
t.cat() == catOther ||
|
|
|
|
|
t.cat() == catActive ||
|
|
|
|
|
t.cat() == catNewline ||
|
|
|
|
|
t.cat() == catParameter)
|
|
|
|
|
os << t.character();
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catBegin) {
|
|
|
|
|
os << '{';
|
|
|
|
|
parse_table(p, os, FLAG_BRACE_LAST);
|
|
|
|
|
os << '}';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catEnd) {
|
|
|
|
|
if (flags & FLAG_BRACE_LAST)
|
|
|
|
|
return;
|
|
|
|
|
cerr << "unexpected '}'\n";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catAlign) {
|
|
|
|
|
os << TAB;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-24 16:59:39 +00:00
|
|
|
|
else if (t.cs() == "tabularnewline" || t.cs() == "\\") {
|
2003-04-17 09:47:21 +00:00
|
|
|
|
// stuff before the line break
|
|
|
|
|
// and look ahead for stuff after the line break
|
|
|
|
|
os << HLINE << hlines << HLINE << LINE << read_hlines(p) << HLINE;
|
2003-04-20 18:38:29 +00:00
|
|
|
|
hlines.erase();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "hline")
|
|
|
|
|
hlines += "\\hline";
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "cline")
|
2003-04-23 15:14:43 +00:00
|
|
|
|
hlines += "\\cline{" + p.verbatim_item() + '}';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
else if (t.cat() == catComment)
|
|
|
|
|
handle_comment(p);
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "(") {
|
|
|
|
|
os << "\\(";
|
|
|
|
|
parse_math(p, os, FLAG_SIMPLE2, MATH_MODE);
|
|
|
|
|
os << "\\)";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "[") {
|
|
|
|
|
os << "\\[";
|
|
|
|
|
parse_math(p, os, FLAG_EQUATION, MATH_MODE);
|
|
|
|
|
os << "\\]";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "begin") {
|
|
|
|
|
string const name = p.getArg('{', '}');
|
2003-04-23 15:14:43 +00:00
|
|
|
|
active_environments.push_back(name);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
parse_table(p, os, FLAG_END);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "end") {
|
|
|
|
|
if (flags & FLAG_END) {
|
|
|
|
|
// eat environment name
|
|
|
|
|
string const name = p.getArg('{', '}');
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (name != active_environment())
|
2003-04-17 09:47:21 +00:00
|
|
|
|
p.error("\\end{" + name + "} does not match \\begin{"
|
2003-04-23 15:14:43 +00:00
|
|
|
|
+ active_environment() + "}");
|
|
|
|
|
active_environments.pop_back();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
p.error("found 'end' unexpectedly");
|
|
|
|
|
}
|
2003-04-23 15:14:43 +00:00
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
os << t.asInput();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-04-23 15:14:43 +00:00
|
|
|
|
void handle_hline_above(RowInfo & ri, vector<CellInfo> & ci)
|
|
|
|
|
{
|
|
|
|
|
ri.topline = true;
|
|
|
|
|
for (size_t col = 0; col < ci.size(); ++col)
|
|
|
|
|
ci[col].topline = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void handle_hline_below(RowInfo & ri, vector<CellInfo> & ci)
|
|
|
|
|
{
|
|
|
|
|
ri.bottomline = true;
|
|
|
|
|
for (size_t col = 0; col < ci.size(); ++col)
|
|
|
|
|
ci[col].bottomline = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-07-26 00:15:38 +00:00
|
|
|
|
void handle_tabular(Parser & p, ostream & os,
|
|
|
|
|
LyXTextClass const & textclass)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
{
|
|
|
|
|
string posopts = p.getOpt();
|
|
|
|
|
if (posopts.size())
|
|
|
|
|
cerr << "vertical tabular positioning '" << posopts << "' ignored\n";
|
|
|
|
|
|
|
|
|
|
vector<ColInfo> colinfo;
|
|
|
|
|
|
|
|
|
|
// handle column formatting
|
2003-04-23 15:14:43 +00:00
|
|
|
|
handle_colalign(p, colinfo);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
// handle initial hlines
|
|
|
|
|
|
|
|
|
|
// first scan of cells
|
|
|
|
|
// use table mode to keep it minimal-invasive
|
|
|
|
|
// not exactly what's TeX doing...
|
|
|
|
|
vector<string> lines;
|
|
|
|
|
ostringstream ss;
|
|
|
|
|
ss << read_hlines(p) << HLINE; // handle initial hlines
|
|
|
|
|
parse_table(p, ss, FLAG_END);
|
2003-06-30 11:36:08 +00:00
|
|
|
|
split(ss.str(), lines, LINE);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
vector< vector<CellInfo> > cellinfo(lines.size());
|
|
|
|
|
vector<RowInfo> rowinfo(lines.size());
|
|
|
|
|
|
|
|
|
|
// split into rows
|
|
|
|
|
//cerr << "// split into rows\n";
|
|
|
|
|
for (size_t row = 0; row < rowinfo.size(); ++row) {
|
|
|
|
|
|
|
|
|
|
// init row
|
2003-04-23 15:14:43 +00:00
|
|
|
|
cellinfo[row].resize(colinfo.size());
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
// split row
|
|
|
|
|
vector<string> dummy;
|
|
|
|
|
//cerr << "\n########### LINE: " << lines[row] << "########\n";
|
|
|
|
|
split(lines[row], dummy, HLINE);
|
|
|
|
|
|
|
|
|
|
// handle horizontal line fragments
|
|
|
|
|
if (dummy.size() != 3) {
|
|
|
|
|
if (dummy.size() != 1)
|
|
|
|
|
cerr << "unexpected dummy size: " << dummy.size()
|
|
|
|
|
<< " content: " << lines[row] << "\n";
|
|
|
|
|
dummy.resize(3);
|
|
|
|
|
}
|
|
|
|
|
lines[row] = dummy[1];
|
|
|
|
|
|
|
|
|
|
//cerr << "line: " << row << " above 0: " << dummy[0] << "\n";
|
|
|
|
|
//cerr << "line: " << row << " below 2: " << dummy[2] << "\n";
|
|
|
|
|
//cerr << "line: " << row << " cells 1: " << dummy[1] << "\n";
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i <= 2; i += 2) {
|
|
|
|
|
//cerr << " reading from line string '" << dummy[i] << "'\n";
|
|
|
|
|
Parser p1(dummy[i]);
|
|
|
|
|
while (p1.good()) {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
Token t = p1.get_token();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
//cerr << "read token: " << t << "\n";
|
|
|
|
|
if (t.cs() == "hline") {
|
|
|
|
|
if (i == 0) {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (rowinfo[row].topline) {
|
|
|
|
|
if (row > 0) // extra bottomline above
|
|
|
|
|
handle_hline_below(rowinfo[row - 1], cellinfo[row - 1]);
|
|
|
|
|
else
|
|
|
|
|
cerr << "dropping extra hline\n";
|
|
|
|
|
//cerr << "below row: " << row-1 << endl;
|
|
|
|
|
} else {
|
|
|
|
|
handle_hline_above(rowinfo[row], cellinfo[row]);
|
|
|
|
|
//cerr << "above row: " << row << endl;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
//cerr << "below row: " << row << endl;
|
|
|
|
|
handle_hline_below(rowinfo[row], cellinfo[row]);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
} else if (t.cs() == "cline") {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
string arg = p1.verbatim_item();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
//cerr << "read cline arg: '" << arg << "'\n";
|
|
|
|
|
vector<string> t;
|
|
|
|
|
split(arg, t, '-');
|
|
|
|
|
t.resize(2);
|
2003-04-23 15:14:43 +00:00
|
|
|
|
size_t from = string2int(t[0]) - 1;
|
2003-04-17 09:47:21 +00:00
|
|
|
|
size_t to = string2int(t[1]);
|
|
|
|
|
for (size_t col = from; col < to; ++col) {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
//cerr << "row: " << row << " col: " << col << " i: " << i << endl;
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
rowinfo[row].topline = true;
|
|
|
|
|
cellinfo[row][col].topline = true;
|
|
|
|
|
} else {
|
|
|
|
|
rowinfo[row].bottomline = true;
|
|
|
|
|
cellinfo[row][col].bottomline = true;
|
|
|
|
|
}
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
cerr << "unexpected line token: " << t << endl;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// split into cells
|
|
|
|
|
vector<string> cells;
|
|
|
|
|
split(lines[row], cells, TAB);
|
2003-04-23 15:14:43 +00:00
|
|
|
|
for (size_t col = 0, cell = 0;
|
|
|
|
|
cell < cells.size() && col < colinfo.size(); ++col, ++cell) {
|
|
|
|
|
//cerr << "cell content: '" << cells[cell] << "'\n";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
Parser p(cells[cell]);
|
2003-04-25 15:54:29 +00:00
|
|
|
|
p.skip_spaces();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
//cells[cell] << "'\n";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (p.next_token().cs() == "multicolumn") {
|
2003-04-17 09:47:21 +00:00
|
|
|
|
// how many cells?
|
2003-04-23 15:14:43 +00:00
|
|
|
|
p.get_token();
|
|
|
|
|
size_t const ncells = string2int(p.verbatim_item());
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
// special cell properties alignment
|
|
|
|
|
vector<ColInfo> t;
|
2003-04-23 15:14:43 +00:00
|
|
|
|
handle_colalign(p, t);
|
|
|
|
|
cellinfo[row][col].multi = 1;
|
|
|
|
|
cellinfo[row][col].align = t.front().align;
|
2003-07-26 00:15:38 +00:00
|
|
|
|
cellinfo[row][col].content = parse_text(p, FLAG_ITEM, false, textclass);
|
2003-04-23 15:14:43 +00:00
|
|
|
|
cellinfo[row][col].leftline |= t.front().leftline;
|
|
|
|
|
cellinfo[row][col].rightline |= t.front().rightline;
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
// add dummy cells for multicol
|
|
|
|
|
for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) {
|
|
|
|
|
++col;
|
2003-04-23 15:14:43 +00:00
|
|
|
|
cellinfo[row][col].multi = 2;
|
2003-04-25 15:54:29 +00:00
|
|
|
|
cellinfo[row][col].align = 'c';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
2003-04-23 15:14:43 +00:00
|
|
|
|
|
|
|
|
|
// more than one line on the right?
|
|
|
|
|
if (t.front().rightline > 1)
|
|
|
|
|
cellinfo[row][col + 1].leftline = true;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
// FLAG_END is a hack, we need to read all of it
|
2003-07-28 14:06:04 +00:00
|
|
|
|
cellinfo[row][col].leftline = colinfo[col].leftline;
|
|
|
|
|
cellinfo[row][col].rightline = colinfo[col].rightline;
|
|
|
|
|
cellinfo[row][col].align = colinfo[col].align;
|
2003-07-26 00:15:38 +00:00
|
|
|
|
cellinfo[row][col].content = parse_text(p, FLAG_END, false, textclass);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//cerr << "// handle almost empty last row what we have\n";
|
|
|
|
|
// handle almost empty last row
|
|
|
|
|
if (row && lines[row].empty() && row + 1 == rowinfo.size()) {
|
|
|
|
|
//cerr << "remove empty last line\n";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (rowinfo[row].topline)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
rowinfo[row - 1].bottomline = true;
|
|
|
|
|
for (size_t col = 0; col < colinfo.size(); ++col)
|
|
|
|
|
if (cellinfo[row][col].topline)
|
|
|
|
|
cellinfo[row - 1][col].bottomline = true;
|
|
|
|
|
rowinfo.pop_back();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//cerr << "// output what we have\n";
|
|
|
|
|
// output what we have
|
2003-07-28 14:06:04 +00:00
|
|
|
|
os << "\n<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
|
2003-04-17 09:47:21 +00:00
|
|
|
|
<< "\" columns=\"" << colinfo.size() << "\">\n"
|
|
|
|
|
<< "<features>\n";
|
|
|
|
|
|
|
|
|
|
//cerr << "// after header\n";
|
|
|
|
|
for (size_t col = 0; col < colinfo.size(); ++col) {
|
2003-07-28 14:06:04 +00:00
|
|
|
|
os << "<column alignment=\""
|
|
|
|
|
<< verbose_align(colinfo[col].align) << "\"";
|
|
|
|
|
os << " valignment=\"top\"";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
if (colinfo[col].leftline)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
os << " leftline=\"true\"";
|
2003-07-28 14:06:04 +00:00
|
|
|
|
if (colinfo[col].rightline)
|
|
|
|
|
os << " rightline=\"true\"";
|
|
|
|
|
if (colinfo[col].width.size())
|
|
|
|
|
os << " width=\"" << colinfo[col].width << "\"";
|
2003-07-03 12:33:47 +00:00
|
|
|
|
if (colinfo[col].special.size())
|
|
|
|
|
os << " special=\"" << colinfo[col].special << "\"";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
os << ">\n";
|
|
|
|
|
}
|
|
|
|
|
//cerr << "// after cols\n";
|
|
|
|
|
|
|
|
|
|
for (size_t row = 0; row < rowinfo.size(); ++row) {
|
|
|
|
|
os << "<row";
|
|
|
|
|
if (rowinfo[row].topline)
|
|
|
|
|
os << " topline=\"true\"";
|
|
|
|
|
if (rowinfo[row].bottomline)
|
|
|
|
|
os << " bottomline=\"true\"";
|
|
|
|
|
os << ">\n";
|
|
|
|
|
for (size_t col = 0; col < colinfo.size(); ++col) {
|
|
|
|
|
CellInfo const & cell = cellinfo[row][col];
|
|
|
|
|
os << "<cell";
|
|
|
|
|
if (cell.multi)
|
|
|
|
|
os << " multicolumn=\"" << cell.multi << "\"";
|
2003-07-28 14:06:04 +00:00
|
|
|
|
os << " alignment=\"" << verbose_align(cell.align)
|
|
|
|
|
<< "\""
|
|
|
|
|
<< " valignment=\"top\"";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
if (cell.topline)
|
|
|
|
|
os << " topline=\"true\"";
|
|
|
|
|
if (cell.bottomline)
|
|
|
|
|
os << " bottomline=\"true\"";
|
2003-07-28 14:06:04 +00:00
|
|
|
|
if (cell.leftline)
|
|
|
|
|
os << " leftline=\"true\"";
|
|
|
|
|
if (cell.rightline)
|
|
|
|
|
os << " rightline=\"true\"";
|
2003-04-23 15:14:43 +00:00
|
|
|
|
//cerr << "\nrow: " << row << " col: " << col;
|
|
|
|
|
//if (cell.topline)
|
|
|
|
|
// cerr << " topline=\"true\"";
|
|
|
|
|
//if (cell.bottomline)
|
|
|
|
|
// cerr << " bottomline=\"true\"";
|
2003-07-28 14:06:04 +00:00
|
|
|
|
os << " usebox=\"none\""
|
|
|
|
|
<< ">"
|
2003-04-17 09:47:21 +00:00
|
|
|
|
<< "\n\\begin_inset Text"
|
|
|
|
|
<< "\n\n\\layout Standard\n\n"
|
|
|
|
|
<< cell.content
|
2003-07-28 14:06:04 +00:00
|
|
|
|
<< "\n\\end_inset \n"
|
2003-04-17 09:47:21 +00:00
|
|
|
|
<< "</cell>\n";
|
|
|
|
|
}
|
|
|
|
|
os << "</row>\n";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
os << "</lyxtabular>\n";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }])
|