diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2012-10-10 19:41:39 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-10-10 19:41:39 -0700 |
| commit | 434909799033af7141201860292e684e83f5f8d8 (patch) | |
| tree | c26ed6a7c150614d4ea84ee22f43cc124e01eb86 /src | |
| parent | 31435ad3f50ed4c3ab8dcb3bceb40a25846db45e (diff) | |
| download | pandoc-434909799033af7141201860292e684e83f5f8d8.tar.gz | |
LaTeX reader: Better support for citation commands.
* Make `\cite` etc. an AuthorInText.
* Make `\footcite` etc. into citations in notes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Readers/LaTeX.hs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 1f85c3d61..c733bbb88 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -423,17 +423,17 @@ inlineCommands = M.fromList $ pure (link url "" lab)) , ("includegraphics", skipopts *> (unescapeURL <$> braced) >>= (\src -> pure (image src "" (str "image")))) - , ("cite", citation "cite" NormalCitation False) + , ("cite", citation "cite" AuthorInText False) , ("citep", citation "citep" NormalCitation False) , ("citep*", citation "citep*" NormalCitation False) , ("citeal", citation "citeal" NormalCitation False) , ("citealp", citation "citealp" NormalCitation False) , ("citealp*", citation "citealp*" NormalCitation False) , ("autocite", citation "autocite" NormalCitation False) - , ("footcite", citation "footcite" NormalCitation False) + , ("footcite", inNote <$> citation "footcite" AuthorInText False) , ("parencite", citation "parencite" NormalCitation False) , ("supercite", citation "supercite" NormalCitation False) - , ("footcitetext", citation "footcitetext" NormalCitation False) + , ("footcitetext", inNote <$> citation "footcitetext" AuthorInText False) , ("citeyearpar", citation "citeyearpar" SuppressAuthor False) , ("citeyear", citation "citeyear" SuppressAuthor False) , ("autocite*", citation "autocite*" SuppressAuthor False) @@ -447,15 +447,15 @@ inlineCommands = M.fromList $ , ("textcites", citation "textcites" AuthorInText True) , ("cites", citation "cites" NormalCitation True) , ("autocites", citation "autocites" NormalCitation True) - , ("footcites", citation "footcites" NormalCitation True) + , ("footcites", inNote <$> citation "footcites" AuthorInText True) , ("parencites", citation "parencites" NormalCitation True) , ("supercites", citation "supercites" NormalCitation True) - , ("footcitetexts", citation "footcitetexts" NormalCitation True) + , ("footcitetexts", inNote <$> citation "footcitetexts" AuthorInText True) , ("Autocite", citation "Autocite" NormalCitation False) , ("Footcite", citation "Footcite" NormalCitation False) , ("Parencite", citation "Parencite" NormalCitation False) , ("Supercite", citation "Supercite" NormalCitation False) - , ("Footcitetext", citation "Footcitetext" NormalCitation False) + , ("Footcitetext", inNote <$> citation "Footcitetext" NormalCitation False) , ("Citeyearpar", citation "Citeyearpar" SuppressAuthor False) , ("Citeyear", citation "Citeyear" SuppressAuthor False) , ("Autocite*", citation "Autocite*" SuppressAuthor False) @@ -468,7 +468,7 @@ inlineCommands = M.fromList $ , ("Footcites", citation "Footcites" NormalCitation True) , ("Parencites", citation "Parencites" NormalCitation True) , ("Supercites", citation "Supercites" NormalCitation True) - , ("Footcitetexts", citation "Footcitetexts" NormalCitation True) + , ("Footcitetexts", inNote <$> citation "Footcitetexts" NormalCitation True) , ("citetext", complexNatbibCitation NormalCitation) , ("citeauthor", (try (tok *> optional sp *> controlSeq "citetext") *> complexNatbibCitation AuthorInText) @@ -478,6 +478,10 @@ inlineCommands = M.fromList $ -- in which case they will appear as raw latex blocks: [ "index", "nocite" ] +inNote :: Inlines -> Inlines +inNote ils = + note $ para $ ils <> str "." + unescapeURL :: String -> String unescapeURL ('\\':x:xs) | isEscapable x = x:unescapeURL xs where isEscapable '%' = True |