diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+pandoc (1.17.0.3)
+
+ * LaTeX writer: Fixed position of label in figures (#2813).
+ Previously the label wasn't in the right place, and `\ref`
+ wouldn't work properly.
+ * Added .tei test files to pandoc.cabal so they'll be included
+ in tarball (#2811).
+ * Updated copyright dates.
+
pandoc (1.17.0.2)
* Fixed serious regression in `htmlInBalanced`, which caused
diff --git a/man/pandoc.1 b/man/pandoc.1
--- a/man/pandoc.1
+++ b/man/pandoc.1
@@ -1,5 +1,5 @@
.\"t
-.TH PANDOC 1 "January 12, 2016" "pandoc 1.17.0.2"
+.TH PANDOC 1 "January 12, 2016" "pandoc 1.17.0.3"
.SH NAME
pandoc - general markup converter
.SH SYNOPSIS
diff --git a/pandoc.cabal b/pandoc.cabal
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
Name: pandoc
-Version: 1.17.0.2
+Version: 1.17.0.3
Cabal-Version: >= 1.10
Build-Type: Custom
License: GPL
@@ -153,6 +153,7 @@
tests/tables.plain
tests/tables.markdown
tests/tables.mediawiki
+ tests/tables.tei
tests/tables.textile
tests/tables.opendocument
tests/tables.org
@@ -180,6 +181,7 @@
tests/writer.rst
tests/writer.icml
tests/writer.rtf
+ tests/writer.tei
tests/writer.texinfo
tests/writer.fb2
tests/writer.opml
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -409,16 +409,20 @@
capt <- inlineListToLaTeX txt
notes <- gets stNotes
modify $ \st -> st{ stInMinipage = False, stNotes = [] }
+ ref <- text `fmap` toLabel ident
+ internalLinks <- gets stInternalLinks
+
-- We can't have footnotes in the list of figures, so remove them:
captForLof <- if null notes
then return empty
else brackets <$> inlineListToLaTeX (walk deNote txt)
img <- inlineToLaTeX (Image attr txt (src,tit))
let footnotes = notesToLaTeX notes
- figure <- refLabel ident $ cr <>
+ lab <- labelFor ident
+ let caption = "\\caption" <> captForLof <> braces capt <> lab
+ figure <- hypertarget ident (cr <>
"\\begin{figure}[htbp]" $$ "\\centering" $$ img $$
- ("\\caption" <> captForLof <> braces capt) $$
- "\\end{figure}" <> cr
+ caption $$ "\\end{figure}" <> cr)
return $ if inNote
-- can't have figures in notes
then "\\begin{center}" $$ img $+$ capt $$ "\\end{center}"
@@ -755,7 +759,8 @@
-- needed for \paragraph, \subparagraph in quote environment
-- see http://tex.stackexchange.com/questions/169830/
else empty
- stuffing' <- refLabel ident $ text ('\\':sectionType) <> stuffing
+ lab <- labelFor ident
+ stuffing' <- hypertarget ident $ text ('\\':sectionType) <> stuffing <> lab
return $ if level' > 5
then txt
else prefix $$ stuffing'
@@ -765,20 +770,22 @@
braces txtNoNotes
else empty
--- | Append label to x and wrap in hypertarget
-refLabel :: String -> Doc -> State WriterState Doc
-refLabel ident x = do
+hypertarget :: String -> Doc -> State WriterState Doc
+hypertarget ident x = do
ref <- text `fmap` toLabel ident
internalLinks <- gets stInternalLinks
- let hypertarget y = if ident `elem` internalLinks
- then text "\\hypertarget"
- <> braces ref
- <> braces y
- else y
- label = if null ident
- then empty
- else text "\\label" <> braces ref
- return $ hypertarget $ x <> label
+ return $
+ if ident `elem` internalLinks
+ then text "\\hypertarget"
+ <> braces ref
+ <> braces x
+ else x
+
+labelFor :: String -> State WriterState Doc
+labelFor "" = return empty
+labelFor ident = do
+ ref <- text `fmap` toLabel ident
+ return $ text "\\label" <> braces ref
-- | Convert list of inline elements to LaTeX.
inlineListToLaTeX :: [Inline] -- ^ Inlines to convert
diff --git a/tests/tables.tei b/tests/tables.tei
new file mode 100644
--- /dev/null
+++ b/tests/tables.tei
@@ -0,0 +1,171 @@
+
Simple table with caption:
+
+
+
Right
+
Left
+
Center
+
Default
+
+
+
12
+
12
+
12
+
12
+
+
+
123
+
123
+
123
+
123
+
+
+
1
+
1
+
1
+
1
+
+
+
Simple table without caption:
+
+
+
Right
+
Left
+
Center
+
Default
+
+
+
12
+
12
+
12
+
12
+
+
+
123
+
123
+
123
+
123
+
+
+
1
+
1
+
1
+
1
+
+
+
Simple table indented two spaces:
+
+
+
Right
+
Left
+
Center
+
Default
+
+
+
12
+
12
+
12
+
12
+
+
+
123
+
123
+
123
+
123
+
+
+
1
+
1
+
1
+
1
+
+
+
Multiline table with caption:
+
+
+
Centered Header
+
Left Aligned
+
Right Aligned
+
Default aligned
+
+
+
First
+
row
+
12.0
+
Example of a row that spans multiple lines.
+
+
+
Second
+
row
+
5.0
+
Here's another one. Note the blank line between rows.
+
+
+
Multiline table without caption:
+
+
+
Centered Header
+
Left Aligned
+
Right Aligned
+
Default aligned
+
+
+
First
+
row
+
12.0
+
Example of a row that spans multiple lines.
+
+
+
Second
+
row
+
5.0
+
Here's another one. Note the blank line between rows.
+
+
+
Table without column headers:
+
+
+
+
+
+
+
+
+
12
+
12
+
12
+
12
+
+
+
123
+
123
+
123
+
123
+
+
+
1
+
1
+
1
+
1
+
+
+
Multiline table without column headers:
+
+
+
+
+
+
+
+
+
First
+
row
+
12.0
+
Example of a row that spans multiple lines.
+
+
+
Second
+
row
+
5.0
+
Here's another one. Note the blank line between rows.
+
+
diff --git a/tests/writer.tei b/tests/writer.tei
new file mode 100644
--- /dev/null
+++ b/tests/writer.tei
@@ -0,0 +1,861 @@
+
+
+
+
+
+ Pandoc Test Suite
+ John MacFarlane
+ Anonymous
+
+
+
+
+
+
Produced by pandoc.
+
+
+
+
+
+
This is a set of tests for pandoc. Most of them are adapted from John
+Gruber’s markdown test suite.
+
+
+ Headers
+
+ Level 2 with an embedded link
+
+ Level 3 with emphasis
+
+ Level 4
+
+ Level 5
+
+
+
+
+
+
+
+ Level 1
+
+ Level 2 with emphasis
+
+ Level 3
+
with no blank line
+
+
+
+ Level 2
+
with no blank line
+
+
+
+
+ Paragraphs
+
Here’s a regular paragraph.
+
In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
+ item. Because a hard-wrapped line in the middle of a paragraph looked like a
+ list item.
+
Here’s one with a bullet. * criminey.
+
There should be a hard line breakhere.
+
+
+
+ Block Quotes
+
E-mail style:
+
+
This is a block quote. It is pretty short.
+
+
+
Code in a block quote:
+
+sub status {
+ print "working";
+}
+
+
A list:
+
+
+
item one
+
+
+
item two
+
+
+
Nested block quotes:
+
+
nested
+
+
+
nested
+
+
+
This should not be a block quote: 2 > 1.
+
And a following paragraph.
+
+
+
+ Code Blocks
+
Code:
+
+---- (should be four hyphens)
+
+sub status {
+ print "working";
+}
+
+this code block is indented by one tab
+
+
And:
+
+ this code block is indented by two tabs
+
+These should not be escaped: \$ \\ \> \[ \{
+
+
+
+
+ Lists
+
+ Unordered
+
Asterisks tight:
+
+
+
asterisk 1
+
+
+
asterisk 2
+
+
+
asterisk 3
+
+
+
Asterisks loose:
+
+
+
asterisk 1
+
+
+
asterisk 2
+
+
+
asterisk 3
+
+
+
Pluses tight:
+
+
+
Plus 1
+
+
+
Plus 2
+
+
+
Plus 3
+
+
+
Pluses loose:
+
+
+
Plus 1
+
+
+
Plus 2
+
+
+
Plus 3
+
+
+
Minuses tight:
+
+
+
Minus 1
+
+
+
Minus 2
+
+
+
Minus 3
+
+
+
Minuses loose:
+
+
+
Minus 1
+
+
+
Minus 2
+
+
+
Minus 3
+
+
+
+
+ Ordered
+
Tight:
+
+
+
First
+
+
+
Second
+
+
+
Third
+
+
+
and:
+
+
+
One
+
+
+
Two
+
+
+
Three
+
+
+
Loose using tabs:
+
+
+
First
+
+
+
Second
+
+
+
Third
+
+
+
and using spaces:
+
+
+
One
+
+
+
Two
+
+
+
Three
+
+
+
Multiple paragraphs:
+
+
+
Item 1, graf one.
+
Item 1. graf two. The quick brown fox jumped over the lazy dog’s
+ back.
+
+
+
Item 2.
+
+
+
Item 3.
+
+
+
+
+ Nested
+
+
+
Tab
+
+
+
Tab
+
+
+
Tab
+
+
+
+
+
+
+
Here’s another:
+
+
+
First
+
+
+
Second:
+
+
+
Fee
+
+
+
Fie
+
+
+
Foe
+
+
+
+
+
Third
+
+
+
Same thing but with paragraphs:
+
+
+
First
+
+
+
Second:
+
+
+
Fee
+
+
+
Fie
+
+
+
Foe
+
+
+
+
+
Third
+
+
+
+
+ Tabs and spaces
+
+
+
this is a list item indented with tabs
+
+
+
this is a list item indented with spaces
+
+
+
this is an example list item indented with tabs
+
+
+
this is an example list item indented with spaces
+
+
+
+
+
+
+ Fancy list markers
+
+
+
begins with 2
+
+
+
and now 3
+
with a continuation
+
+
+
sublist with roman numerals, starting with 4
+
+
+
more items
+
+
+
a subsublist
+
+
+
a subsublist
+
+
+
+
+
+
+
Nesting:
+
+
+
Upper Alpha
+
+
+
Upper Roman.
+
+
+
Decimal start with 6
+
+
+
Lower alpha with paren
+
+
+
+
+
+
+
+
+
Autonumbering:
+
+
+
Autonumber.
+
+
+
More.
+
+
+
Nested.
+
+
+
+
+
Should not be a list item:
+
M.A. 2007
+
B. Williams
+
+
+
+
+ Definition Lists
+
Tight using spaces:
+
+
+
+
red fruit
+
+
+
+
orange fruit
+
+
+
+
yellow fruit
+
+
+
Tight using tabs:
+
+
+
+
red fruit
+
+
+
+
orange fruit
+
+
+
+
yellow fruit
+
+
+
Loose:
+
+
+
+
red fruit
+
+
+
+
orange fruit
+
+
+
+
yellow fruit
+
+
+
Multiple blocks with italics:
+
+
+
+
red fruit
+
contains seeds, crisp, pleasant to taste
+
+
+
+
orange fruit
+
+{ orange code block }
+
+
+
orange block quote
+
+
+
+
Multiple definitions, tight:
+
+
+
+
red fruit
+
computer
+
+
+
+
orange fruit
+
bank
+
+
+
Multiple definitions, loose:
+
+
+
+
red fruit
+
computer
+
+
+
+
orange fruit
+
bank
+
+
+
Blank line after term, indented marker, alternate markers:
+
+
+
+
red fruit
+
computer
+
+
+
+
orange fruit
+
+
+
sublist
+
+
+
sublist
+
+
+
+
+
+
+ HTML Blocks
+
Simple block on one line:
+
foo
+
And nested without indentation:
+
foo
+
bar
+
Interpreted markdown in a table:
+
This is emphasized
+
And this is strong
+
Here’s a simple block:
+
foo
+
This should be a code block, though:
+
+<div>
+ foo
+</div>
+
+
As should this:
+
+<div>foo</div>
+
+
Now, nested:
+
foo
+
This should just be an HTML comment:
+
Multiline:
+
Code block:
+
+<!-- Comment -->
+
+
Just plain comment, with trailing spaces on the line:
+
Code:
+
+<hr />
+
+
Hr’s:
+
+
+
+ Inline Markup
+
This is emphasized, and so
+ is this.
+
This is strong, and so
+ is this.
+
An emphasized
+ link.
+
This is strong
+ and em.
+
So is
+ this
+ word.
+
This is strong
+ and em.
+
So is
+ this
+ word.
+
This is code: >, $,
+ \, \$,
+ <html>.
+
This is
+ strikeout.
+
Superscripts: abcd
+ ahello
+ ahello there.
+
Subscripts: H2O,
+ H23O,
+ Hmany of themO.
+
These should not be superscripts or subscripts, because of the unescaped
+ spaces: a^b c^d, a~b c~d.
+
+
+
+ Smart quotes, ellipses, dashes
+
Hello, said the spider. Shelob is my
+ name.
+
A, B, and C are letters.
+
Oak,elm, and beech are
+ names of trees. So is pine.
+
He said, I want to go. Were you alive in
+ the 70’s?
+
Here is some quoted code and a
+ quoted
+ link.
+
Some dashes: one—two — three—four — five.
+
Dashes between numbers: 5–7, 255–66, 1987–1999.
+
Ellipses…and…and….
+
+
+
+ LaTeX
+
+
+
+
+
+
2+2=4
+
+
+
x \in y
+
+
+
\alpha \wedge \omega
+
+
+
223
+
+
+
p-Tree
+
+
+
Here’s some display math:
+ \frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}
+
+
+
+
Here’s one that has a line break in it:
+ \alpha + \omega \times x^2.
+
+
+
These shouldn’t be math:
+
+
+
To get the famous equation, write
+ $e = mc^2$.
+
+
+
$22,000 is a lot of money. So is
+ $34,000. (It worked if lot is emphasized.)