From 3a79f37d8814d3870f7243a23b54f899a1e67065 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 12 Feb 2020 17:43:10 -0800 Subject: LaTeX reader: improve caption and label parsing. - Don't emit empty Span elements for labels. - Put tables with labels in a surrounding Div. --- test/command/2118.md | 2 +- test/command/6137.md | 23 ++++++++++++----------- test/command/refs.md | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) (limited to 'test/command') diff --git a/test/command/2118.md b/test/command/2118.md index 9730dd383..b38f48c80 100644 --- a/test/command/2118.md +++ b/test/command/2118.md @@ -7,5 +7,5 @@ \label{fig:setminus} \end{figure} ^D -[Para [Image ("fig:setminus",[],[("width","80%")]) [Str "Set",Space,Str "subtraction",Span ("",[],[("label","fig:setminus")]) []] ("setminus.png","fig:")]] +[Para [Image ("fig:setminus",[],[("width","80%")]) [Str "Set",Space,Str "subtraction"] ("setminus.png","fig:")]] ``` diff --git a/test/command/6137.md b/test/command/6137.md index 9c5b71d0c..c1e0ac01c 100644 --- a/test/command/6137.md +++ b/test/command/6137.md @@ -16,16 +16,17 @@ This reference to Figure \ref{fig:label} works fine. \end{figure} ^D [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."] -,Table [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number.",Span ("",[],[("label","tbl:label")]) []] [AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "\8212\8212\8211"]] - ,[Plain [Str "\8212\8212\8211"]] - ,[Plain [Str "\8212\8212\8211"]]] - ,[[Plain [Str "\8212\8212\8211"]] - ,[Plain [Str "\8212\8212\8211"]] - ,[Plain [Str "\8212\8212\8211"]]]] +,Div ("tbl:label",[],[]) + [Table [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."] [AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0] + [[] + ,[] + ,[]] + [[[Plain [Str "\8212\8212\8211"]] + ,[Plain [Str "\8212\8212\8211"]] + ,[Plain [Str "\8212\8212\8211"]]] + ,[[Plain [Str "\8212\8212\8211"]] + ,[Plain [Str "\8212\8212\8211"]] + ,[Plain [Str "\8212\8212\8211"]]]]] ,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."] -,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.",Span ("",[],[("label","fig:label")]) []] ("example.png","fig:")]] +,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:")]] ``` diff --git a/test/command/refs.md b/test/command/refs.md index 8b58ea6d7..320d63e17 100644 --- a/test/command/refs.md +++ b/test/command/refs.md @@ -42,7 +42,7 @@ Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all Figure \ref{fig:Logo} illustrated the SVG logo ^D -[Para [Image ("fig:Logo",[],[]) [Str "Logo",Span ("",[],[("label","fig:Logo")]) []] ("command/SVG_logo.svg","fig:")] +[Para [Image ("fig:Logo",[],[]) [Str "Logo"] ("command/SVG_logo.svg","fig:")] ,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo")]) [Str "1"] ("#fig:Logo",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"]] ``` @@ -78,11 +78,11 @@ Figure \ref{fig:Logo2} illustrated the SVG logo Figure \ref{fig:Logo3} illustrated the SVG logo ^D [Header 1 ("one",[],[]) [Str "One"] -,Para [Image ("fig:Logo",[],[]) [Str "Logo",Span ("",[],[("label","fig:Logo")]) []] ("command/SVG_logo.svg","fig:")] -,Para [Image ("fig:Logo2",[],[]) [Str "Logo2",Span ("",[],[("label","fig:Logo2")]) []] ("command/SVG_logo2.svg","fig:")] +,Para [Image ("fig:Logo",[],[]) [Str "Logo"] ("command/SVG_logo.svg","fig:")] +,Para [Image ("fig:Logo2",[],[]) [Str "Logo2"] ("command/SVG_logo2.svg","fig:")] ,Header 1 ("two",[],[]) [Str "Two"] ,Header 2 ("subone",[],[]) [Str "Subone"] -,Para [Image ("fig:Logo3",[],[]) [Str "Logo3",Span ("",[],[("label","fig:Logo3")]) []] ("command/SVG_logo3.svg","fig:")] +,Para [Image ("fig:Logo3",[],[]) [Str "Logo3"] ("command/SVG_logo3.svg","fig:")] ,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo")]) [Str "1.1"] ("#fig:Logo",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"] ,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo2")]) [Str "1.2"] ("#fig:Logo2",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"] ,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo3")]) [Str "2.1"] ("#fig:Logo3",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"]] -- cgit v1.2.3