git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: don't put surrounding Div around Table.

This reverts a change in the last release; the Div is no longer needed, because we can now put the id right in the Table's attributes. However, writers may still need to be modified to do something with the id in a Table (e.g. create an anchor), so in the short term we may lose the ability to link to tables in some writers.

commit8f40b4ba14fce10199a059a281c9bd10c884241d authorJohn MacFarlane <jgm@berkeley.edu> dateFri 17 Apr 2020, 13:04 (7 years ago) parent2877ca7
2 files changed+30−28
compare with master
unifiedsplit
src/Text/Pandoc/Readers/LaTeX.hs+5−2 test/command/6137.md+25−26
src/Text/Pandoc/Readers/LaTeX.hs+5−2
@@ -2417,8 +2417,11 @@ addTableCaption = walkM go
24172417 (sLabels st) }
24182418 return $ caption Nothing (plain ils) -- add number??
24192419 (Nothing, _) -> return c
2420− return $ maybe id (\ident -> Div (ident, [], []) . (:[])) mblabel $
2421− Table attr capt spec th tb tf
2420+ let attr' = case (attr, mblabel) of
2421+ ((_,classes,kvs), Just ident) ->
2422+ (ident,classes,kvs)
2423+ _ -> attr
2424+ return $ Table attr' capt spec th tb tf
24222425 go x = return x
24232426
24242427block :: PandocMonad m => LP m Blocks
test/command/6137.md+25−26
@@ -16,32 +16,31 @@ This reference to Figure \ref{fig:label} works fine.
1616\end{figure}
1717^D
1818[Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Table",Space,Link ("",[],[("reference-type","ref"),("reference","tbl:label")]) [Str "1"] ("#tbl:label",""),Space,Str "doesn\8217t",Space,Str "work."]
19−,Div ("tbl:label",[],[])
20− [Table ("",[],[]) (Caption Nothing
21− [Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]])
22− [(AlignLeft,ColWidthDefault)
23− ,(AlignCenter,ColWidthDefault)
24− ,(AlignRight,ColWidthDefault)]
25− (TableHead ("",[],[])
26− [])
27− [(TableBody ("",[],[]) (RowHeadColumns 0)
28− []
29− [Row ("",[],[])
30− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
31− [Plain [Str "\8212\8212\8211"]]
32− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
33− [Plain [Str "\8212\8212\8211"]]
34− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
35− [Plain [Str "\8212\8212\8211"]]]
36− ,Row ("",[],[])
37− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
38− [Plain [Str "\8212\8212\8211"]]
39− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
40− [Plain [Str "\8212\8212\8211"]]
41− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
42− [Plain [Str "\8212\8212\8211"]]]])]
43− (TableFoot ("",[],[])
44− [])]
19+,Table ("tbl:label",[],[]) (Caption Nothing
20+ [Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]])
21+ [(AlignLeft,ColWidthDefault)
22+ ,(AlignCenter,ColWidthDefault)
23+ ,(AlignRight,ColWidthDefault)]
24+ (TableHead ("",[],[])
25+ [])
26+ [(TableBody ("",[],[]) (RowHeadColumns 0)
27+ []
28+ [Row ("",[],[])
29+ [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
30+ [Plain [Str "\8212\8212\8211"]]
31+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
32+ [Plain [Str "\8212\8212\8211"]]
33+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
34+ [Plain [Str "\8212\8212\8211"]]]
35+ ,Row ("",[],[])
36+ [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
37+ [Plain [Str "\8212\8212\8211"]]
38+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
39+ [Plain [Str "\8212\8212\8211"]]
40+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
41+ [Plain [Str "\8212\8212\8211"]]]])]
42+ (TableFoot ("",[],[])
43+ [])
4544,Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:label")]) [Str "1"] ("#fig:label",""),Space,Str "works",Space,Str "fine."]
4645,Para [Image ("fig:label",[],[("width","\\textwidth")]) [Str "A",Space,Str "numbered",Space,Str "caption,",Space,Str "if",Space,Str "I",Space,Str "use",Space,Str "pandoc-crossref."] ("example.png","fig:")]]
4746```