opensource/pandoc
3
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-28 17:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

RTF Reader: nested table support (#11790)

Browse Source 
Closes #11218.
This commit is contained in:
Alex
2026-08-18 19:24:49 +02:00
committed by GitHub
parent 5f37c6781b
commit 6658e94511
6 changed files with 389 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Tests/Readers/RTF.hs
+2
View File
@@ -40,4 +40,6 @@ tests = map rtfTest [ "footnote"
, "bookmark"
, "table_simple"
, "table_error_codes"
, "table_nested"
, "table_nested_malformed_itap"
]
test/rtf/table_nested.native
+129
View File
@@ -0,0 +1,129 @@
Pandoc
Meta { unMeta = fromList [] }
[ Table
( "" , [] , [] )
(Caption Nothing [])
[ ( AlignDefault , ColWidthDefault ) ]
(TableHead ( "" , [] , [] ) [])
[ TableBody
( "" , [] , [] )
(RowHeadColumns 0)
[]
[ Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Table
( "" , [] , [] )
(Caption Nothing [])
[ ( AlignDefault , ColWidthDefault ) ]
(TableHead ( "" , [] , [] ) [])
[ TableBody
( "" , [] , [] )
(RowHeadColumns 0)
[]
[ Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Level"
, Space
, Str "two"
, Space
, Str "before"
]
, Table
( "" , [] , [] )
(Caption Nothing [])
[ ( AlignDefault
, ColWidthDefault
)
, ( AlignDefault
, ColWidthDefault
)
]
(TableHead ( "" , [] , [] ) [])
[ TableBody
( "" , [] , [] )
(RowHeadColumns 0)
[]
[ Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Deep"
, Space
, Str "A"
]
]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Deep"
, Space
, Str "B"
]
]
]
, Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Deep"
, Space
, Str "C"
]
]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Deep"
, Space
, Str "D"
]
]
]
]
]
(TableFoot ( "" , [] , [] ) [])
, Para
[ Str "Level"
, Space
, Str "two"
, Space
, Str "after"
]
]
]
]
]
(TableFoot ( "" , [] , [] ) [])
, Para [ Str "Outer" , Space , Str "after" ]
]
]
]
]
(TableFoot ( "" , [] , [] ) [])
, Para [ Str "Outside" , Space , Str "table" ]
]
test/rtf/table_nested.rtf
+16
View File
@@ -0,0 +1,16 @@
{\rtf1\ansi
\trowd\cellx5000
\pard\intbl\itap2 Level two before\par
\pard\intbl\itap3 Deep A\nestcell Deep B\nestcell
{\*\nesttableprops\trowd\cellx2000\cellx4000\nestrow}
{\nonesttables NESTED FALLBACK ONE\par}
\pard\intbl\itap3 Deep C\nestcell Deep D\nestcell
{\*\nesttableprops\trowd\cellx2000\cellx4000\nestrow}
{\nonesttables NESTED FALLBACK TWO\par}
\pard\intbl\itap2 Level two after\nestcell
{\*\nesttableprops\trowd\cellx4000\nestrow}
{\nonesttables PARENT FALLBACK\par}
\pard\intbl\itap1 Outer after\cell
\row
\pard\itap0 Outside table\par
}
test/rtf/table_nested_malformed_itap.native
+89
View File
@@ -0,0 +1,89 @@
Pandoc
Meta { unMeta = fromList [] }
[ Table
( "" , [] , [] )
(Caption Nothing [])
[ ( AlignDefault , ColWidthDefault ) ]
(TableHead ( "" , [] , [] ) [])
[ TableBody
( "" , [] , [] )
(RowHeadColumns 0)
[]
[ Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Table
( "" , [] , [] )
(Caption Nothing [])
[ ( AlignDefault , ColWidthDefault ) ]
(TableHead ( "" , [] , [] ) [])
[ TableBody
( "" , [] , [] )
(RowHeadColumns 0)
[]
[ Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Parent"
, Space
, Str "before"
]
, Table
( "" , [] , [] )
(Caption Nothing [])
[ ( AlignDefault
, ColWidthDefault
)
]
(TableHead ( "" , [] , [] ) [])
[ TableBody
( "" , [] , [] )
(RowHeadColumns 0)
[]
[ Row
( "" , [] , [] )
[ Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Str "Child"
, Space
, Str "at"
, Space
, Str "skipped"
, Space
, Str "level"
]
]
]
]
]
(TableFoot ( "" , [] , [] ) [])
, Para
[ Str "Parent"
, Space
, Str "after"
]
]
]
]
]
(TableFoot ( "" , [] , [] ) [])
, Para [ Str "Outer" , Space , Str "cell" ]
]
]
]
]
(TableFoot ( "" , [] , [] ) [])
]
test/rtf/table_nested_malformed_itap.rtf
+10
View File
@@ -0,0 +1,10 @@
{\rtf1\ansi
\trowd\cellx5000
\pard\intbl\itap2 Parent before\par
\pard\intbl\itap5 Child at skipped level\nestcell
{\*\nesttableprops\trowd\cellx4000\nestrow}
\pard\intbl\itap2 Parent after\nestcell
{\*\nesttableprops\trowd\cellx4000\nestrow}
\pard\intbl\itap1 Outer cell\cell
\row
}