void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
{
int version;
- int i, j;
+ int i;
+ int j;
int rows_arg = 0;
int columns_arg = 0;
int is_long_tabular_arg = false;
InsetText * inset = GetCellInset(cell);
int row;
+#ifndef NEW_INSETS
for (int i = 0; i < par->Last(); ++i) {
+#else
+ for (int i = 0; i < par->size(); ++i) {
+#endif
if (par->IsNewline(i)) {
++cell;
if (cell > GetNumberOfCells()) {
}
}
par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
+#ifndef NEW_INSETS
inset->par->InsertFromMinibuffer(inset->par->Last());
+#else
+ inset->par->InsertFromMinibuffer(inset->par->size());
+#endif
}
delete par;
Reinit();
}
-string const LyXTabular::GetDocBookAlign(int cell, bool isColumn) const
-{
- int const i = isColumn ? cell : column_of_cell(cell);
-
- if (!isColumn && IsMultiColumn(cell)) {
- if (!cellinfo_of_cell(cell)->align_special.empty()) {
- return cellinfo_of_cell(cell)->align_special;
- } else {
- switch (GetAlignment(cell)) {
- case LYX_ALIGN_LEFT:
- return "left";
- case LYX_ALIGN_RIGHT:
- return "right";
- default:
- return "center";
- }
- }
- } else {
- if (!column_info[i].align_special.empty()) {
- return column_info[i].align_special;
- }
-#ifdef IGNORE_THIS_FOR_NOW
- else if (!column_info[i].p_width.empty()) {
- file += "p{";
- file += column_info[i].p_width;
- file += '}';
- }
-#endif
- else {
- switch (column_info[i].alignment) {
- case LYX_ALIGN_LEFT:
- return "left";
- case LYX_ALIGN_RIGHT:
- return "right";
- default:
- return "center";
- }
- }
- }
-}
-
-
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::DocBookEndOfCell(ostream & os, int cell, int & depth) const
-{
- int ret = 0;
- if (IsLastCell(cell)) {
- os << newlineAndDepth(--depth)
- << "</ENTRY>"
- << newlineAndDepth(--depth)
- << "</ROW>"
- << newlineAndDepth(--depth)
- << "</TBODY>"
- << newlineAndDepth(--depth);
- if (is_long_tabular)
- os << "</TGROUP>";
- else
- os << "</TGROUP>"
- << newlineAndDepth(--depth);
- ret += 4;
- } else {
- if (cell < 0) {
- // preamble
- if (is_long_tabular)
- os << "<TGROUP ";
- else
- os << "<TGROUP ";
- os << "COLS='"
- << columns_
- << "' COLSEP='1' ROWSEP='1'>"
- << newlineAndDepth(++depth);
- ++ret;
- for (int i = 0; i < columns_; ++i) {
- os << "<COLSPEC ALIGN='"
- << GetDocBookAlign(i, true)
- << "' COLNAME='col"
- << i + 1
- << "' COLNUM='"
- << i + 1
- << "' COLSEP='";
- if (i == (columns_-1)) {
- os << '1';
- } else {
- if (column_info[i].right_line ||
- column_info[i+1].left_line)
- os << '1';
- else
- os << '0';
- }
- os << "'>"
- << newlineAndDepth(depth);
- ++ret;
-#ifdef NOT_HANDLED_YET_AS_I_DONT_KNOW_HOW
- if (column_info[i].left_line)
- os << '|';
-#endif
- }
- os << "<TBODY>"
- << newlineAndDepth(++depth)
- << "<ROW>"
- << newlineAndDepth(++depth)
- << "<ENTRY ALIGN='"
- << GetDocBookAlign(0)
- << "'";
- if (IsMultiColumn(0)) {
- os << " NAMEST='col1' NAMEEND='col"
- << cells_in_multicolumn(0)
- << "'";
- }
- os << ">"
- << newlineAndDepth(++depth);
- ret += 3;
- } else {
- if (IsLastCellInRow(cell)) {
- os << newlineAndDepth(--depth)
- << "</ENTRY>"
- << newlineAndDepth(--depth)
- << "</ROW>"
- << newlineAndDepth(depth)
- << "<ROW>"
- << newlineAndDepth(++depth)
- << "<ENTRY ALIGN='"
- << GetDocBookAlign(cell + 1)
- << "' VALIGN='middle'";
- if (IsMultiColumn(cell + 1)) {
- os << " NAMEST='col"
- << column_of_cell(cell + 1) + 1
- << "' NAMEEND='col"
- << column_of_cell(cell + 1) +
- cells_in_multicolumn(cell + 1)
- << "'";
- }
- os << ">"
- << newlineAndDepth(++depth);
- ret += 4;
- } else {
- os << newlineAndDepth(--depth)
- << "</ENTRY>"
- << newlineAndDepth(depth)
- << "<ENTRY ALIGN='"
- << GetDocBookAlign(cell + 1)
- << "' VALIGN='middle'";
- if (IsMultiColumn(cell + 1)) {
- os << " NAMEST='col"
- << column_of_cell(cell + 1) + 1
- << "' NAMEEND='col"
- << column_of_cell(cell + 1) +
- cells_in_multicolumn(cell + 1)
- << "'";
- }
- os << ">"
- << newlineAndDepth(++depth);
- ret += 3;
- }
- }
- }
- return ret;
-}
-
-
bool LyXTabular::IsMultiColumn(int cell, bool real) const
{
return ((!real || (column_of_cell(cell) != right_column_of_cell(cell))) &&
InsetText * inset = GetCellInset(cell);
bool rtl = inset->par->isRightToLeftPar(buf->params) &&
+#ifndef NEW_INSETS
inset->par->Last() > 0 && GetPWidth(cell).empty();
+#else
+ inset->par->size() > 0 && GetPWidth(cell).empty();
+#endif
if (rtl)
os << "\\R{";
ret += inset->Latex(buf, os, fragile, fp);
}
+#ifndef NEW_INSETS
LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
{
LyXParagraph * par = GetCellInset(cell)->par;
- for (; par; par = par->next) {
+ for (; par; par = par->next_) {
for (int i = 0; i < par->Last(); ++i) {
if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
return BOX_PARBOX;
}
return BOX_NONE;
}
+#else
+LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
+{
+ LyXParagraph * par = GetCellInset(cell)->par;
+
+ for (; par; par = par->next()) {
+ for (int i = 0; i < par->size(); ++i) {
+ if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+ return BOX_PARBOX;
+ }
+ }
+ return BOX_NONE;
+}
+#endif