Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

RTF writer: fixed headerless tables.

Browse source 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1877 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2010-03-11 03:01:09 +00:00
parent 3b9e7f36eb
commit df9d79cb81
2 changed files with 82 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Writers/RTF.hs
View file

@ -173,7 +173,9 @@ blockToRTF indent _ HorizontalRule =
blockToRTF indent alignment (Header level lst) = rtfPar indent 0 alignment $
"\\b \\fs" ++ (show (40 - (level * 4))) ++ " " ++ inlineListToRTF lst
blockToRTF indent alignment (Table caption aligns sizes headers rows) =
tableRowToRTF True indent aligns sizes headers ++
(if all null headers
then ""
else tableRowToRTF True indent aligns sizes headers) ++
concatMap (tableRowToRTF False indent aligns sizes) rows ++
rtfPar indent 0 alignment (inlineListToRTF caption)

79
tests/tables.rtf
View file

@ -278,4 +278,83 @@
}
\intbl\row}
{\pard \ql \f0 \sa180 \li0 \fi0 \par}
{\pard \ql \f0 \sa180 \li0 \fi0 Table without column headers:\par}
{
\trowd \trgaph120
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}
\cell}
{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 12\par}
\cell}
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
\cell}
}
\intbl\row}
{
\trowd \trgaph120
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}
\cell}
{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 123\par}
\cell}
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
\cell}
}
\intbl\row}
{
\trowd \trgaph120
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}
\cell}
{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 1\par}
\cell}
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
\cell}
}
\intbl\row}
{\pard \ql \f0 \sa180 \li0 \fi0 \par}
{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without column headers:\par}
{
\trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804
\trkeep\intbl
{
{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 First\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}
\cell}
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12.0\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}
\cell}
}
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2484\cellx3888\cellx6804
\trkeep\intbl
{
{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Second\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}
\cell}
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 5.0\par}
\cell}
{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}
\cell}
}
\intbl\row}
{\pard \ql \f0 \sa180 \li0 \fi0 \par}