2003-08-19 10:04:35 +00:00
|
|
|
|
/**
|
|
|
|
|
* \file table.C
|
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
|
*
|
|
|
|
|
* \author Andr<EFBFBD> P<EFBFBD>nitz
|
|
|
|
|
* \author Jean-Marc Lasgouttes
|
2004-12-15 20:21:43 +00:00
|
|
|
|
* \author Georg Baum
|
2003-08-19 10:04:35 +00:00
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* Full author contact details are available in file CREDITS.
|
2003-04-17 09:47:21 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// {[(
|
|
|
|
|
|
|
|
|
|
#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
|
|
|
|
// filled in preamble.C
|
|
|
|
|
std::map<char, int> special_columns;
|
|
|
|
|
|
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
struct ColInfo
|
|
|
|
|
{
|
|
|
|
|
ColInfo() : align('c'), rightline(false), leftline(false) {}
|
|
|
|
|
/// column alignment
|
|
|
|
|
char align;
|
|
|
|
|
/// column width
|
|
|
|
|
string width;
|
|
|
|
|
/// special column alignment
|
|
|
|
|
string special;
|
|
|
|
|
/// how many lines on the right?
|
|
|
|
|
int rightline;
|
|
|
|
|
/// a line on the left?
|
|
|
|
|
bool leftline;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// row type for longtables
|
|
|
|
|
enum LTRowType
|
|
|
|
|
{
|
|
|
|
|
/// normal row
|
|
|
|
|
LT_NORMAL,
|
|
|
|
|
/// part of head
|
|
|
|
|
LT_HEAD,
|
|
|
|
|
/// part of head on first page
|
|
|
|
|
LT_FIRSTHEAD,
|
|
|
|
|
/// part of foot
|
|
|
|
|
LT_FOOT,
|
|
|
|
|
/// part of foot on last page
|
|
|
|
|
LT_LASTFOOT
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct RowInfo
|
|
|
|
|
{
|
|
|
|
|
RowInfo() : topline(false), bottomline(false), type(LT_NORMAL),
|
|
|
|
|
newpage(false) {}
|
|
|
|
|
/// horizontal line above
|
|
|
|
|
bool topline;
|
|
|
|
|
/// horizontal line below
|
|
|
|
|
bool bottomline;
|
|
|
|
|
/// These are for longtabulars only
|
|
|
|
|
/// row type (head, foot, firsthead etc.)
|
|
|
|
|
LTRowType type;
|
|
|
|
|
/// row for a pagebreak
|
|
|
|
|
bool newpage;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct CellInfo
|
|
|
|
|
{
|
|
|
|
|
CellInfo() : multi(0), align('n'), leftline(false), rightline(false),
|
|
|
|
|
topline(false), bottomline(false) {}
|
|
|
|
|
/// cell content
|
|
|
|
|
string content;
|
|
|
|
|
/// multicolumn flag
|
|
|
|
|
int multi;
|
|
|
|
|
/// cell alignment
|
|
|
|
|
char align;
|
|
|
|
|
/// do we have a line on the left?
|
|
|
|
|
bool leftline;
|
|
|
|
|
/// do we have a line on the right?
|
|
|
|
|
bool rightline;
|
|
|
|
|
/// do we have a line above?
|
|
|
|
|
bool topline;
|
|
|
|
|
/// do we have a line below?
|
|
|
|
|
bool bottomline;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// translate a horizontal alignment (as stored in ColInfo and CellInfo) to LyX
|
|
|
|
|
inline char const * verbose_align(char c)
|
|
|
|
|
{
|
|
|
|
|
return c == 'c' ? "center" : c == 'r' ? "right" : c == 'l' ? "left" : "none";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// stripped down from tabluar.C. We use it currently only for bools and
|
|
|
|
|
// strings
|
|
|
|
|
string const write_attribute(string const & name, bool const & b)
|
|
|
|
|
{
|
|
|
|
|
// we write only true attribute values so we remove a bit of the
|
|
|
|
|
// file format bloat for tabulars.
|
|
|
|
|
return b ? ' ' + name + "=\"true\"" : string();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
string const write_attribute(string const & name, string const & s)
|
|
|
|
|
{
|
|
|
|
|
return s.empty() ? string() : ' ' + name + "=\"" + s + '"';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* 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:
|
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
HLINE 1 TAB 2 TAB 3 HLINE HLINE LINE
|
|
|
|
|
\hline HLINE \multicolumn{2}{c}{4} TAB 5 HLINE HLINE LINE
|
|
|
|
|
HLINE 6 TAB 7 HLINE HLINE LINE
|
2003-04-17 09:47:21 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
char const TAB = '\001';
|
|
|
|
|
char const LINE = '\002';
|
|
|
|
|
char const HLINE = '\004';
|
|
|
|
|
|
2003-04-23 15:14:43 +00:00
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
/// handle column specifications for tabulars and multicolumns
|
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
|
|
|
|
|
|
2004-11-27 13:42:14 +00:00
|
|
|
|
// We cannot handle comments here
|
|
|
|
|
if (t.cat() == catComment) {
|
|
|
|
|
if (t.cs().empty()) {
|
|
|
|
|
// "%\n" combination
|
|
|
|
|
p.skip_spaces();
|
|
|
|
|
} else
|
|
|
|
|
cerr << "Ignoring comment: " << t.asInput();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
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)
|
2003-09-09 18:27:24 +00:00
|
|
|
|
ci.special += "{" + p.verbatim_item() + "}";
|
2003-07-03 11:47:44 +00:00
|
|
|
|
//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
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
/*!
|
|
|
|
|
* Parse hlines and similar stuff.
|
|
|
|
|
* \returns wether the token \p t was parsed
|
|
|
|
|
*/
|
|
|
|
|
bool parse_hlines(Parser & p, Token const & t, string & hlines,
|
|
|
|
|
bool is_long_tabular)
|
|
|
|
|
{
|
|
|
|
|
BOOST_ASSERT(t.cat() == catEscape);
|
|
|
|
|
|
|
|
|
|
if (t.cs() == "hline")
|
|
|
|
|
hlines += "\\hline";
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "cline")
|
|
|
|
|
hlines += "\\cline{" + p.verbatim_item() + '}';
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
else if (is_long_tabular && t.cs() == "newpage")
|
|
|
|
|
hlines += "\\newpage";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
else
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Position in a row
|
|
|
|
|
enum RowPosition {
|
|
|
|
|
/// At the very beginning, before the first token
|
|
|
|
|
ROW_START,
|
|
|
|
|
/// After the first token and before any column token
|
|
|
|
|
IN_HLINES_START,
|
|
|
|
|
/// After the first column token. Comments and whitespace are only
|
|
|
|
|
/// treated as tokens in this position
|
|
|
|
|
IN_COLUMNS,
|
|
|
|
|
/// After the first non-column token at the end
|
|
|
|
|
IN_HLINES_END
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*!
|
|
|
|
|
* Parse table structure.
|
|
|
|
|
* We parse tables in a two-pass process: This function extracts the table
|
|
|
|
|
* structure (rows, columns, hlines etc.), but does not change the cell
|
|
|
|
|
* content. The cell content is parsed in a second step in handle_tabular().
|
|
|
|
|
*/
|
|
|
|
|
void parse_table(Parser & p, ostream & os, bool is_long_tabular,
|
|
|
|
|
RowPosition & pos, unsigned flags)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
{
|
2004-12-15 20:21:43 +00:00
|
|
|
|
// table structure commands such as \hline
|
2003-04-17 09:47:21 +00:00
|
|
|
|
string hlines;
|
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
// comments that occur at places where we can't handle them
|
|
|
|
|
string comments;
|
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
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
|
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
// comments and whitespace in hlines
|
|
|
|
|
switch (pos) {
|
|
|
|
|
case ROW_START:
|
|
|
|
|
case IN_HLINES_START:
|
|
|
|
|
case IN_HLINES_END:
|
|
|
|
|
if (t.cat() == catComment) {
|
|
|
|
|
if (t.cs().empty())
|
|
|
|
|
// line continuation
|
|
|
|
|
p.skip_spaces();
|
|
|
|
|
else
|
|
|
|
|
// We can't handle comments here,
|
|
|
|
|
// store them for later use
|
|
|
|
|
comments += t.asInput();
|
|
|
|
|
continue;
|
|
|
|
|
} else if (t.cat() == catSpace ||
|
|
|
|
|
t.cat() == catNewline) {
|
|
|
|
|
// whitespace is irrelevant here, we
|
|
|
|
|
// need to recognize hline stuff
|
|
|
|
|
p.skip_spaces();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case IN_COLUMNS:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// We need to handle structure stuff first in order to
|
|
|
|
|
// determine wether we need to output a HLINE separator
|
|
|
|
|
// before the row or not.
|
|
|
|
|
if (t.cat() == catEscape) {
|
|
|
|
|
if (parse_hlines(p, t, hlines, is_long_tabular)) {
|
|
|
|
|
switch (pos) {
|
|
|
|
|
case ROW_START:
|
|
|
|
|
pos = IN_HLINES_START;
|
|
|
|
|
break;
|
|
|
|
|
case IN_COLUMNS:
|
|
|
|
|
pos = IN_HLINES_END;
|
|
|
|
|
break;
|
|
|
|
|
case IN_HLINES_START:
|
|
|
|
|
case IN_HLINES_END:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cs() == "tabularnewline" ||
|
|
|
|
|
t.cs() == "\\" ||
|
|
|
|
|
t.cs() == "cr") {
|
|
|
|
|
if (t.cs() == "cr")
|
|
|
|
|
cerr << "Warning: Converting TeX "
|
|
|
|
|
"'\\cr' to LaTeX '\\\\'."
|
|
|
|
|
<< endl;
|
|
|
|
|
// stuff before the line break
|
|
|
|
|
os << comments << HLINE << hlines << HLINE
|
|
|
|
|
<< LINE;
|
|
|
|
|
//cerr << "hlines: " << hlines << endl;
|
|
|
|
|
hlines.erase();
|
|
|
|
|
comments.erase();
|
|
|
|
|
pos = ROW_START;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (is_long_tabular &&
|
|
|
|
|
(t.cs() == "endhead" ||
|
|
|
|
|
t.cs() == "endfirsthead" ||
|
|
|
|
|
t.cs() == "endfoot" ||
|
|
|
|
|
t.cs() == "endlastfoot")) {
|
|
|
|
|
hlines += t.asInput();
|
|
|
|
|
switch (pos) {
|
|
|
|
|
case IN_COLUMNS:
|
|
|
|
|
case IN_HLINES_END:
|
|
|
|
|
// these commands are implicit line
|
|
|
|
|
// breaks
|
|
|
|
|
os << comments << HLINE << hlines
|
|
|
|
|
<< HLINE << LINE;
|
|
|
|
|
hlines.erase();
|
|
|
|
|
comments.erase();
|
|
|
|
|
pos = ROW_START;
|
|
|
|
|
break;
|
|
|
|
|
case ROW_START:
|
|
|
|
|
pos = IN_HLINES_START;
|
|
|
|
|
break;
|
|
|
|
|
case IN_HLINES_START:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// We need a HLINE separator if we either have no hline
|
|
|
|
|
// stuff at all and are just starting a row or if we just
|
|
|
|
|
// got the first non-hline token.
|
|
|
|
|
switch (pos) {
|
|
|
|
|
case ROW_START:
|
|
|
|
|
// no hline tokens exist, first token at row start
|
|
|
|
|
case IN_HLINES_START:
|
|
|
|
|
// hline tokens exist, first non-hline token at row
|
|
|
|
|
// start
|
|
|
|
|
os << hlines << HLINE << comments;
|
|
|
|
|
hlines.erase();
|
|
|
|
|
comments.erase();
|
|
|
|
|
pos = IN_COLUMNS;
|
|
|
|
|
break;
|
|
|
|
|
case IN_HLINES_END:
|
|
|
|
|
// Oops, there is still cell content after hline
|
|
|
|
|
// stuff. This does not work in LaTeX, so we ignore
|
|
|
|
|
// the hlines.
|
|
|
|
|
cerr << "Ignoring '" << hlines << "' in a cell"
|
|
|
|
|
<< endl;
|
|
|
|
|
os << comments;
|
|
|
|
|
hlines.erase();
|
|
|
|
|
comments.erase();
|
|
|
|
|
pos = IN_COLUMNS;
|
|
|
|
|
break;
|
|
|
|
|
case IN_COLUMNS:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If we come here we have normal cell content
|
2003-04-17 09:47:21 +00:00
|
|
|
|
//
|
|
|
|
|
// cat codes
|
|
|
|
|
//
|
|
|
|
|
if (t.cat() == catMath) {
|
2003-10-23 11:46:33 +00:00
|
|
|
|
// 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 << '$';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-05 10:14:13 +00:00
|
|
|
|
else if (t.cat() == catSpace || t.cat() == catNewline)
|
|
|
|
|
os << t.cs();
|
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
else if (t.cat() == catLetter ||
|
|
|
|
|
t.cat() == catSuper ||
|
|
|
|
|
t.cat() == catSub ||
|
|
|
|
|
t.cat() == catOther ||
|
|
|
|
|
t.cat() == catActive ||
|
|
|
|
|
t.cat() == catParameter)
|
|
|
|
|
os << t.character();
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catBegin) {
|
|
|
|
|
os << '{';
|
2004-12-15 20:21:43 +00:00
|
|
|
|
parse_table(p, os, is_long_tabular, pos,
|
|
|
|
|
FLAG_BRACE_LAST);
|
2003-04-17 09:47:21 +00:00
|
|
|
|
os << '}';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catEnd) {
|
|
|
|
|
if (flags & FLAG_BRACE_LAST)
|
|
|
|
|
return;
|
|
|
|
|
cerr << "unexpected '}'\n";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catAlign) {
|
|
|
|
|
os << TAB;
|
2003-11-05 10:14:13 +00:00
|
|
|
|
p.skip_spaces();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (t.cat() == catComment)
|
2003-11-05 10:14:13 +00:00
|
|
|
|
os << t.asInput();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
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-10-23 11:46:33 +00:00
|
|
|
|
os << "\\begin{" << name << '}';
|
|
|
|
|
if (is_math_env(name)) {
|
|
|
|
|
parse_math(p, os, FLAG_END, MATH_MODE);
|
|
|
|
|
} else {
|
2004-12-15 20:21:43 +00:00
|
|
|
|
parse_table(p, os, is_long_tabular, pos,
|
|
|
|
|
FLAG_END);
|
2003-10-23 11:46:33 +00:00
|
|
|
|
}
|
|
|
|
|
os << "\\end{" << name << '}';
|
|
|
|
|
active_environments.pop_back();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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() + "}");
|
2003-04-17 09:47:21 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
p.error("found 'end' unexpectedly");
|
|
|
|
|
}
|
2003-04-23 15:14:43 +00:00
|
|
|
|
|
2003-09-09 18:27:24 +00:00
|
|
|
|
else
|
2003-04-23 15:14:43 +00:00
|
|
|
|
os << t.asInput();
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
2004-12-15 20:21:43 +00:00
|
|
|
|
|
|
|
|
|
// We can have comments if the last line is incomplete
|
|
|
|
|
os << comments;
|
|
|
|
|
|
|
|
|
|
// We can have hline stuff if the last line is incomplete
|
|
|
|
|
if (!hlines.empty()) {
|
|
|
|
|
// this does not work in LaTeX, so we ignore it
|
|
|
|
|
cerr << "Ignoring '" << hlines << "' at end of tabular"
|
|
|
|
|
<< endl;
|
|
|
|
|
}
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-12-15 20:21:43 +00:00
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void handle_tabular(Parser & p, ostream & os, bool is_long_tabular,
|
2003-08-04 10:26:10 +00:00
|
|
|
|
Context & context)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
{
|
|
|
|
|
string posopts = p.getOpt();
|
2004-12-15 20:21:43 +00:00
|
|
|
|
if (!posopts.empty()) {
|
|
|
|
|
if (is_long_tabular)
|
|
|
|
|
cerr << "horizontal longtable";
|
|
|
|
|
else
|
|
|
|
|
cerr << "vertical tabular";
|
|
|
|
|
cerr << " positioning '" << posopts << "' ignored\n";
|
|
|
|
|
}
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
// first scan of cells
|
|
|
|
|
// use table mode to keep it minimal-invasive
|
|
|
|
|
// not exactly what's TeX doing...
|
|
|
|
|
vector<string> lines;
|
|
|
|
|
ostringstream ss;
|
2004-12-15 20:21:43 +00:00
|
|
|
|
RowPosition rowpos = ROW_START;
|
|
|
|
|
parse_table(p, ss, is_long_tabular, rowpos, 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());
|
2003-09-09 18:27:24 +00:00
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
// 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
|
|
|
|
|
2003-09-09 18:27:24 +00:00
|
|
|
|
// split row
|
2003-04-17 09:47:21 +00:00
|
|
|
|
vector<string> dummy;
|
|
|
|
|
//cerr << "\n########### LINE: " << lines[row] << "########\n";
|
|
|
|
|
split(lines[row], dummy, HLINE);
|
|
|
|
|
|
|
|
|
|
// handle horizontal line fragments
|
2004-12-15 20:21:43 +00:00
|
|
|
|
// we do only expect this for a last line without '\\'
|
2003-04-17 09:47:21 +00:00
|
|
|
|
if (dummy.size() != 3) {
|
2004-12-15 20:21:43 +00:00
|
|
|
|
if ((dummy.size() != 1 && dummy.size() != 2) ||
|
|
|
|
|
row != rowinfo.size() - 1)
|
2003-04-17 09:47:21 +00:00
|
|
|
|
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";
|
|
|
|
|
|
2003-09-09 18:27:24 +00:00
|
|
|
|
for (int i = 0; i <= 2; i += 2) {
|
2003-04-17 09:47:21 +00:00
|
|
|
|
//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;
|
|
|
|
|
}
|
2003-09-09 18:27:24 +00:00
|
|
|
|
} else {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
//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;
|
2004-11-27 13:42:14 +00:00
|
|
|
|
if (from >= colinfo.size()) {
|
|
|
|
|
cerr << "cline starts at non "
|
|
|
|
|
"existing column "
|
2004-12-15 20:21:43 +00:00
|
|
|
|
<< (from + 1) << endl;
|
2004-11-27 13:42:14 +00:00
|
|
|
|
from = colinfo.size() - 1;
|
|
|
|
|
}
|
2004-12-15 20:21:43 +00:00
|
|
|
|
size_t to = string2int(t[1]) - 1;
|
2004-11-27 13:42:14 +00:00
|
|
|
|
if (to >= colinfo.size()) {
|
|
|
|
|
cerr << "cline ends at non "
|
|
|
|
|
"existing column "
|
2004-12-15 20:21:43 +00:00
|
|
|
|
<< (to + 1) << endl;
|
2004-11-27 13:42:14 +00:00
|
|
|
|
to = colinfo.size() - 1;
|
|
|
|
|
}
|
2004-12-15 20:21:43 +00:00
|
|
|
|
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
|
|
|
|
}
|
2004-12-15 20:21:43 +00:00
|
|
|
|
} else if (t.cs() == "endhead") {
|
|
|
|
|
if (i > 0)
|
|
|
|
|
rowinfo[row].type = LT_HEAD;
|
|
|
|
|
for (int r = row - 1; r >= 0; --r) {
|
|
|
|
|
if (rowinfo[r].type != LT_NORMAL)
|
|
|
|
|
break;
|
|
|
|
|
rowinfo[r].type = LT_HEAD;
|
|
|
|
|
}
|
|
|
|
|
} else if (t.cs() == "endfirsthead") {
|
|
|
|
|
if (i > 0)
|
|
|
|
|
rowinfo[row].type = LT_FIRSTHEAD;
|
|
|
|
|
for (int r = row - 1; r >= 0; --r) {
|
|
|
|
|
if (rowinfo[r].type != LT_NORMAL)
|
|
|
|
|
break;
|
|
|
|
|
rowinfo[r].type = LT_FIRSTHEAD;
|
|
|
|
|
}
|
|
|
|
|
} else if (t.cs() == "endfoot") {
|
|
|
|
|
if (i > 0)
|
|
|
|
|
rowinfo[row].type = LT_FOOT;
|
|
|
|
|
for (int r = row - 1; r >= 0; --r) {
|
|
|
|
|
if (rowinfo[r].type != LT_NORMAL)
|
|
|
|
|
break;
|
|
|
|
|
rowinfo[r].type = LT_FOOT;
|
|
|
|
|
}
|
|
|
|
|
} else if (t.cs() == "endlastfoot") {
|
|
|
|
|
if (i > 0)
|
|
|
|
|
rowinfo[row].type = LT_LASTFOOT;
|
|
|
|
|
for (int r = row - 1; r >= 0; --r) {
|
|
|
|
|
if (rowinfo[r].type != LT_NORMAL)
|
|
|
|
|
break;
|
|
|
|
|
rowinfo[r].type = LT_LASTFOOT;
|
|
|
|
|
}
|
|
|
|
|
} else if (t.cs() == "newpage") {
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
if (row > 0)
|
|
|
|
|
rowinfo[row - 1].newpage = true;
|
|
|
|
|
else
|
|
|
|
|
cerr << "Ignoring "
|
|
|
|
|
"'\\newpage' "
|
|
|
|
|
"before rows."
|
|
|
|
|
<< endl;
|
|
|
|
|
} else
|
|
|
|
|
rowinfo[row].newpage = 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-10-23 11:46:33 +00:00
|
|
|
|
// Has the last multicolumn cell a rightline?
|
|
|
|
|
bool last_rightline = false;
|
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-09-09 18:27:24 +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
|
|
|
|
|
2003-09-09 18:27:24 +00:00
|
|
|
|
// special cell properties alignment
|
2003-04-17 09:47:21 +00:00
|
|
|
|
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-28 23:50:24 +00:00
|
|
|
|
ostringstream os;
|
2003-08-04 10:26:10 +00:00
|
|
|
|
parse_text_in_inset(p, os, FLAG_ITEM, false, context);
|
2003-07-28 23:50:24 +00:00
|
|
|
|
cellinfo[row][col].content = os.str();
|
2003-10-23 11:46:33 +00:00
|
|
|
|
|
|
|
|
|
// multicolumn cells are tricky: This
|
|
|
|
|
// \multicolumn{2}{|c|}{col1-2}&
|
2003-10-29 19:19:27 +00:00
|
|
|
|
// \multicolumn{2}{|c|}{col3-4} "\\"
|
2003-10-23 11:46:33 +00:00
|
|
|
|
// gives | col1-2 | col3-4 | and not
|
|
|
|
|
// | col1-2 || col3-4 |
|
|
|
|
|
// So:
|
|
|
|
|
if (last_rightline && t.front().leftline) {
|
|
|
|
|
t.front().leftline = false;
|
|
|
|
|
}
|
|
|
|
|
last_rightline = t.front().rightline;
|
|
|
|
|
|
|
|
|
|
// multicolumn lines override normal cell lines
|
|
|
|
|
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;
|
|
|
|
|
|
2003-09-09 18:27:24 +00:00
|
|
|
|
} else {
|
2003-04-23 15:14:43 +00:00
|
|
|
|
// 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-28 23:50:24 +00:00
|
|
|
|
ostringstream os;
|
2003-08-04 10:26:10 +00:00
|
|
|
|
parse_text_in_inset(p, os, FLAG_CELL, false, context);
|
2003-07-28 23:50:24 +00:00
|
|
|
|
cellinfo[row][col].content = os.str();
|
2003-10-23 11:46:33 +00:00
|
|
|
|
last_rightline = false;
|
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()
|
2004-12-15 20:21:43 +00:00
|
|
|
|
<< "\" columns=\"" << colinfo.size() << "\">\n";
|
|
|
|
|
os << "<features"
|
|
|
|
|
<< write_attribute("islongtable", is_long_tabular)
|
|
|
|
|
<< ">\n";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
|
|
|
|
|
//cerr << "// after header\n";
|
|
|
|
|
for (size_t col = 0; col < colinfo.size(); ++col) {
|
2003-07-28 14:06:04 +00:00
|
|
|
|
os << "<column alignment=\""
|
2004-12-15 20:21:43 +00:00
|
|
|
|
<< verbose_align(colinfo[col].align) << "\""
|
|
|
|
|
<< " valignment=\"top\""
|
|
|
|
|
<< write_attribute("leftline", colinfo[col].leftline)
|
|
|
|
|
<< write_attribute("rightline", colinfo[col].rightline)
|
|
|
|
|
<< write_attribute("width", colinfo[col].width)
|
|
|
|
|
<< write_attribute("special", colinfo[col].special)
|
|
|
|
|
<< ">\n";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
//cerr << "// after cols\n";
|
|
|
|
|
|
|
|
|
|
for (size_t row = 0; row < rowinfo.size(); ++row) {
|
2004-12-15 20:21:43 +00:00
|
|
|
|
os << "<row"
|
|
|
|
|
<< write_attribute("topline", rowinfo[row].topline)
|
|
|
|
|
<< write_attribute("bottomline", rowinfo[row].bottomline)
|
|
|
|
|
<< write_attribute("endhead",
|
|
|
|
|
rowinfo[row].type == LT_HEAD)
|
|
|
|
|
<< write_attribute("endfirsthead",
|
|
|
|
|
rowinfo[row].type == LT_FIRSTHEAD)
|
|
|
|
|
<< write_attribute("endfoot",
|
|
|
|
|
rowinfo[row].type == LT_FOOT)
|
|
|
|
|
<< write_attribute("endlastfoot",
|
|
|
|
|
rowinfo[row].type == LT_LASTFOOT)
|
|
|
|
|
<< write_attribute("newpage", rowinfo[row].newpage)
|
|
|
|
|
<< ">\n";
|
2003-04-17 09:47:21 +00:00
|
|
|
|
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-09-09 18:27:24 +00:00
|
|
|
|
os << " alignment=\"" << verbose_align(cell.align)
|
2003-07-28 14:06:04 +00:00
|
|
|
|
<< "\""
|
2004-12-15 20:21:43 +00:00
|
|
|
|
<< " valignment=\"top\""
|
|
|
|
|
<< write_attribute("topline", cell.topline)
|
|
|
|
|
<< write_attribute("bottomline", cell.bottomline)
|
|
|
|
|
<< write_attribute("leftline", cell.leftline)
|
|
|
|
|
<< write_attribute("rightline", cell.rightline);
|
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-07-28 21:58:09 +00:00
|
|
|
|
<< "\n\\begin_inset Text\n"
|
2003-04-17 09:47:21 +00:00
|
|
|
|
<< cell.content
|
2004-08-16 11:27:51 +00:00
|
|
|
|
<< "\n\\end_inset\n"
|
2003-04-17 09:47:21 +00:00
|
|
|
|
<< "</cell>\n";
|
|
|
|
|
}
|
|
|
|
|
os << "</row>\n";
|
|
|
|
|
}
|
2003-09-09 18:27:24 +00:00
|
|
|
|
|
2003-04-17 09:47:21 +00:00
|
|
|
|
os << "</lyxtabular>\n";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }])
|