git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: don't put surrounding Div around Table.
8f40b4bJohn MacFarlane
src/Text/Pandoc/Readers/LaTeX.hs+5−2
compare with master
unifiedsplit
@@ -2417,8 +2417,11 @@ addTableCaption = walkM go
2417 (sLabels st) }
2417 (sLabels st) }
2418 return $ caption Nothing (plain ils) -- add number??
2418 return $ caption Nothing (plain ils) -- add number??
2419 (Nothing, _) -> return c
2419 (Nothing, _) -> return c
2420− return $ maybe id (\ident -> Div (ident, [], []) . (:[])) mblabel $
2420+ let attr' = case (attr, mblabel) of
2421+ ((_,classes,kvs), Just ident) ->
2422+ (ident,classes,kvs)
2423+ _ -> attr
2421− Table attr capt spec th tb tf
2424+ return $ Table attr' capt spec th tb tf
2422 go x = return x
2425 go x = return x
2423
2426
2424block :: PandocMonad m => LP m Blocks
2427block :: PandocMonad m => LP m Blocks
test/command/6137.md+25−26
@@ -16,32 +16,31 @@ This reference to Figure \ref{fig:label} works fine.
16\end{figure}
16\end{figure}
17^D
17^D
18[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."]
18[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
19+,Table ("tbl:label",[],[]) (Caption Nothing
21− [Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]])
20+ [Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]])
22− [(AlignLeft,ColWidthDefault)
21+ [(AlignLeft,ColWidthDefault)
23− ,(AlignCenter,ColWidthDefault)
22+ ,(AlignCenter,ColWidthDefault)
24− ,(AlignRight,ColWidthDefault)]
23+ ,(AlignRight,ColWidthDefault)]
25− (TableHead ("",[],[])
24+ (TableHead ("",[],[])
26− [])
25+ [])
27− [(TableBody ("",[],[]) (RowHeadColumns 0)
26+ [(TableBody ("",[],[]) (RowHeadColumns 0)
28− []
27+ []
29− [Row ("",[],[])
28+ [Row ("",[],[])
30− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
29+ [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
31− [Plain [Str "\8212\8212\8211"]]
30+ [Plain [Str "\8212\8212\8211"]]
32− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
31+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
33− [Plain [Str "\8212\8212\8211"]]
32+ [Plain [Str "\8212\8212\8211"]]
34− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
33+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
35− [Plain [Str "\8212\8212\8211"]]]
34+ [Plain [Str "\8212\8212\8211"]]]
36− ,Row ("",[],[])
35+ ,Row ("",[],[])
37− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
36+ [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
38− [Plain [Str "\8212\8212\8211"]]
37+ [Plain [Str "\8212\8212\8211"]]
39− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
38+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
40− [Plain [Str "\8212\8212\8211"]]
39+ [Plain [Str "\8212\8212\8211"]]
41− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
40+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
42− [Plain [Str "\8212\8212\8211"]]]])]
41+ [Plain [Str "\8212\8212\8211"]]]])]
43− (TableFoot ("",[],[])
42+ (TableFoot ("",[],[])
44− [])]
43+ [])
45,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."]
44,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."]
46,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:")]]
45,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:")]]
47```
46```