anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: support decimal alignment in tables

Browse Source 
(cherry picked from commit 8ef2558dc2)
This commit is contained in:
Juergen Spitzmueller 2018-08-26 16:17:54 +02:00
parent 8a4a613222
commit 4431ae2505
6 changed files with 130 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tex2lyx/TODO.txt
View File

@ -28,7 +28,6 @@ Format LaTeX feature LyX feature
364 branch file name suffix \filename_suffix
371 automatic mhchem loading \use_mhchem
390 forward/reverse search \forward_search, \forward_macro
391 decimal alignment in tables InsetTabular
399 automatic mathdots loading \use_mathdots
411 support for polyglossia \language_package (the cases of no package, of babel and of custom package is supported)
415 automatic undertilde loading \use_package undertilde

79
src/tex2lyx/table.cpp
View File

@ -37,7 +37,8 @@ namespace {
class ColInfo {
public:
ColInfo() : align('n'), valign('n'), rightlines(0), leftlines(0) {}
ColInfo() : align('n'), valign('n'), rightlines(0), leftlines(0),
decimal_point('\0') {}
/// column alignment
char align;
/// vertical alignment
@ -50,6 +51,8 @@ public:
int rightlines;
/// number of lines on the left
int leftlines;
/// decimal separator
char decimal_point;
};
@ -177,6 +180,8 @@ inline char const * verbose_align(char c)
return "right";
case 'l':
return "left";
case 'd':
return "decimal";
default:
return "none";
}
@ -264,6 +269,17 @@ void ci2special(ColInfo & ci)
// this case.
return;
if (ci.decimal_point != '\0') {
// we only support decimal point natively
// with 'l' alignment in or 'n' alignment
// with width in second row
if (ci.align != 'l' && ci.align != 'n') {
ci.decimal_point = '\0';
return;
} else
ci.special.clear();
}
if (!ci.width.empty()) {
switch (ci.align) {
case 'l':
@ -338,8 +354,17 @@ void handle_colalign(Parser & p, vector<ColInfo> & colinfo,
case 'r':
// new column, horizontal aligned
next.align = t.character();
if (!next.special.empty())
if (!next.special.empty()) {
ci2special(next);
// handle decimal separator
if (next.decimal_point != '\0') {
if (!colinfo.empty() && colinfo.back().align == 'r') {
colinfo.back().align = 'd';
colinfo.back().decimal_point = next.decimal_point;
} else
next.decimal_point = '\0';
}
}
colinfo.push_back(next);
next = ColInfo();
break;
@ -349,8 +374,17 @@ void handle_colalign(Parser & p, vector<ColInfo> & colinfo,
// new column, vertical aligned box
next.valign = t.character();
next.width = p.verbatim_item();
if (!next.special.empty())
if (!next.special.empty()) {
ci2special(next);
// handle decimal separator
if (next.decimal_point != '\0') {
if (!colinfo.empty() && colinfo.back().align == 'r') {
colinfo.back().align = 'd';
colinfo.back().decimal_point = next.decimal_point;
} else
next.decimal_point = '\0';
}
}
colinfo.push_back(next);
next = ColInfo();
break;
@ -426,11 +460,16 @@ void handle_colalign(Parser & p, vector<ColInfo> & colinfo,
}
case '@':
// text instead of the column spacing
case '!':
case '!': {
// text in addition to the column spacing
string const arg = p.verbatim_item();
next.special += t.character();
next.special += '{' + p.verbatim_item() + '}';
next.special += '{' + arg + '}';
string const sarg = arg.size() > 2 ? arg.substr(0, arg.size() - 1) : string();
if (t.character() == '@' && sarg == "\\extracolsep{0pt}")
next.decimal_point = arg.back();
break;
}
default: {
// try user defined column types
// unknown column types (nargs == -1) are
@ -1131,7 +1170,12 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
<< cells[cell] << "'." << endl;
continue;
}
Parser p(cells[cell]);
string cellcont = cells[cell];
// For decimal cells, ass the content of the second one to the first one
// of a pair.
if (colinfo[col].decimal_point != '\0' && colinfo[col].align == 'd' && cell < cells.size() - 1)
cellcont += colinfo[col].decimal_point + cells[cell + 1];
Parser p(cellcont);
p.skip_spaces();
//cells[cell] << "'\n";
if (p.next_token().cs() == "multirow") {
@ -1401,8 +1445,13 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
//cerr << "// output what we have\n";
// output what we have
string const rotate = "0";
size_type cols = colinfo.size();
for (size_t col = 0; col < colinfo.size(); ++col) {
if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
--cols;
}
os << "\n<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
<< "\" columns=\"" << colinfo.size() << "\">\n";
<< "\" columns=\"" << cols << "\">\n";
os << "<features"
<< write_attribute("rotate", rotate)
<< write_attribute("booktabs", booktabs)
@ -1427,9 +1476,13 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
//cerr << "// after header\n";
for (size_t col = 0; col < colinfo.size(); ++col) {
if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
continue;
os << "<column alignment=\""
<< verbose_align(colinfo[col].align) << "\""
<< " valignment=\""
<< verbose_align(colinfo[col].align) << "\"";
if (colinfo[col].decimal_point != '\0')
os << " decimal_point=\"" << colinfo[col].decimal_point << "\"";
os << " valignment=\""
<< verbose_valign(colinfo[col].valign) << "\""
<< write_attribute("width", translate_len(colinfo[col].width))
<< write_attribute("special", colinfo[col].special)
@ -1455,9 +1508,13 @@ void handle_tabular(Parser & p, ostream & os, string const & name,
<< ">\n";
for (size_t col = 0; col < colinfo.size(); ++col) {
CellInfo const & cell = cellinfo[row][col];
if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
// These are the second columns in a salign pair. Skip.
continue;
os << "<cell";
if (cell.multi == CELL_BEGIN_OF_MULTICOLUMN
|| cell.multi == CELL_PART_OF_MULTICOLUMN)
if ((cell.multi == CELL_BEGIN_OF_MULTICOLUMN
|| cell.multi == CELL_PART_OF_MULTICOLUMN)
&& colinfo[col].align != 'd')
os << " multicolumn=\"" << cell.multi << "\"";
if (cell.multi == CELL_BEGIN_OF_MULTIROW
|| cell.multi == CELL_PART_OF_MULTIROW)

16
src/tex2lyx/test/beamer.lyx.lyx
View File

@ -108,6 +108,22 @@ Version
2.3
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
maketitle
\end_layout
\end_inset
\end_layout
\begin_layout Frame
\end_layout

127
src/tex2lyx/test/test-insets-basic.lyx.lyx
View File

@ -5020,16 +5020,13 @@ status open
\begin_layout Standard
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="8">
<lyxtabular version="3" rows="4" columns="5">
<features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top">
<column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<column alignment="decimal" decimal_point="." valignment="top">
<column alignment="decimal" decimal_point="." valignment="top">
<column alignment="decimal" decimal_point="." valignment="top">
<row>
<cell alignment="center" valignment="top" usebox="none">
\begin_inset Text
@ -5049,7 +5046,7 @@ Two
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
<cell alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5058,12 +5055,7 @@ Three
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
<cell alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5072,23 +5064,13 @@ Four
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
<cell alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
Five
\end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
</row>
@ -5111,7 +5093,7 @@ two
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5120,12 +5102,7 @@ three
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5134,23 +5111,13 @@ four
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
five
\end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\begin_inset Text
\end_inset
</cell>
</row>
@ -5173,52 +5140,29 @@ He
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
2
2.77234
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
77234
45672.
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
45672
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
0
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
69
0.69
\end_layout
\end_inset
@ -5243,56 +5187,29 @@ C
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
12537
12537.64
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
64
37.66345
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
37
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
66345
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
86
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
37
86.37
\end_layout
\end_inset

127
src/tex2lyx/test/test-insets.lyx.lyx
View File

@ -5413,16 +5413,13 @@ status open
\begin_layout Standard
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="8">
<lyxtabular version="3" rows="4" columns="5">
<features rotate="0" tabularvalignment="middle" tabularwidth="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top">
<column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<column alignment="right" valignment="top">
<column alignment="none" valignment="top" special="@{\extracolsep{0pt}.}l">
<column alignment="decimal" decimal_point="." valignment="top">
<column alignment="decimal" decimal_point="." valignment="top">
<column alignment="decimal" decimal_point="." valignment="top">
<row>
<cell alignment="center" valignment="top" usebox="none">
\begin_inset Text
@ -5442,7 +5439,7 @@ Two
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
<cell alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5451,12 +5448,7 @@ Three
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
<cell alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5465,23 +5457,13 @@ Four
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" usebox="none" special="c">
<cell alignment="none" valignment="top" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
Five
\end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
</row>
@ -5504,7 +5486,7 @@ two
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5513,12 +5495,7 @@ three
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
@ -5527,23 +5504,13 @@ four
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell multicolumn="1" alignment="none" valignment="top" topline="true" usebox="none" special="c">
<cell alignment="none" valignment="top" topline="true" usebox="none" special="c">
\begin_inset Text
\begin_layout Standard
five
\end_layout
\end_inset
</cell>
<cell multicolumn="2" alignment="center" valignment="top" topline="true" usebox="none">
\begin_inset Text
\end_inset
</cell>
</row>
@ -5566,52 +5533,29 @@ He
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
2
2.77234
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
77234
45672.
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
45672
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
0
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
69
0.69
\end_layout
\end_inset
@ -5636,56 +5580,29 @@ C
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
12537
12537.64
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
64
37.66345
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
<cell alignment="decimal" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
37
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
66345
\end_layout
\end_inset
</cell>
<cell alignment="right" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
86
\end_layout
\end_inset
</cell>
<cell alignment="none" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Standard
37
86.37
\end_layout
\end_inset

2
status.23x
View File

@ -41,6 +41,8 @@ What's new
- Add support for btUnit (multibib).
- Add support for decimal alignment in table cells.
* USER INTERFACE