pandoc 2.2.2 → 2.2.2.1
raw patch · 9 files changed
+85/−26 lines, 9 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- AUTHORS.md +6/−0
- MANUAL.txt +9/−9
- changelog +22/−0
- data/templates/default.revealjs +4/−0
- man/pandoc.1 +9/−11
- pandoc.cabal +1/−1
- src/Text/Pandoc/App.hs +1/−3
- src/Text/Pandoc/Readers/LaTeX.hs +11/−2
- test/command/4781.md +22/−0
AUTHORS.md view
@@ -11,6 +11,7 @@ - Alexander Sulfrian - Alexander V Vershilov - Alfred Wechselberger+- Anders Waldenborg - Andreas Lööw - Andrew Dunning - Antoine Latter@@ -71,6 +72,7 @@ - Henrik Tramberend - Henry de Valence - Hubert Plociniczak+- Igor Khorlo - Ilya V. Portnov - Ivo Clarysse - J. Lewis Muir@@ -148,6 +150,7 @@ - Puneeth Chaganti - Ralf Stephan - Raniere Silva+- Raymond Ehlers - Recai Oktaş - Roland Hieber - RyanGlScott@@ -189,6 +192,8 @@ - d-dorazio - iandol - infinity0x+- kaizshang91+- lux-lth - lwolfsonkin - nkalvi - oltolm@@ -202,3 +207,4 @@ - takahashim - tgkokk - thsutton+- wiefling
MANUAL.txt view
@@ -1,6 +1,6 @@ % Pandoc User's Guide % John MacFarlane-% July 15, 2018+% July 19, 2018 Synopsis ========@@ -225,9 +225,9 @@ - `epub` ([EPUB]) - `fb2` ([FictionBook2] e-book) - `gfm` ([GitHub-Flavored Markdown]),- or `markdown_github`, which provides deprecated and less accurate- support for Github-Flavored Markdown; please use `gfm` instead,- unless you need to use extensions other than `smart`.+ or the deprecated and less accurate `markdown_github`;+ use [`markdown_github`](#markdown-variants) only+ if you need extensions not supported in [`gfm`](#markdown-variants). - `haddock` ([Haddock markup]) - `html` ([HTML]) - `jats` ([JATS] XML)@@ -274,9 +274,9 @@ - `epub2` (EPUB v2) - `fb2` ([FictionBook2] e-book) - `gfm` ([GitHub-Flavored Markdown]),- or `markdown_github`, which provides deprecated and less accurate- support for Github-Flavored Markdown; please use `gfm` instead,- unless you use extensions that do not work with `gfm`.+ or the deprecated and less accurate `markdown_github`;+ use [`markdown_github`](#markdown-variants) only+ if you need extensions not supported in [`gfm`](#markdown-variants). - `haddock` ([Haddock markup]) - `html` or `html5` ([HTML], i.e. [HTML5]/XHTML [polyglot markup]) - `html4` ([XHTML] 1.0 Transitional)@@ -3082,7 +3082,7 @@ author: - Author One - Author Two- tags: [nothing, nothingness]+ keywords: [nothing, nothingness] abstract: | This is the abstract. @@ -4186,7 +4186,7 @@ Also, `raw_tex` only affects `gfm` output, not input. `gfm` (GitHub-Flavored Markdown)-: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `auto_identifiers`,+: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `gfm_auto_identifiers`, `ascii_identifiers`, `backtick_code_blocks`, `autolink_bare_uris`, `intraword_underscores`, `strikeout`, `hard_line_breaks`, `emoji`, `shortcut_reference_links`, `angle_brackets_escapable`.
changelog view
@@ -1,3 +1,25 @@+pandoc (2.2.2.1)++ * Fix regression finding templates in user data directory (#4777).+ Under version 2.2.1 and prior pandoc found latex templates in the+ templates directory under the data directory, but this broke in 2.2.2.++ * Fix for bug in parsing `\input` in `rawLaTeXBlock` and+ `rawLaTeXInline` (#4781). (This primarily affects the markdown+ reader, and other readers that accept raw tex.)+ Starting in 2.2.2, everything after an `\input` (or `\include`)+ in a markdown file would be parsed as raw LaTeX.++ * MANUAL:++ + Clarify `gfm` vs `markdown_github` (#4783, Mauro Bieg).+ * Use `keywords` instead of `tags` in YAML metadata example (#4779).+ Unlike `tags`, `keywords` is used in some of the writers+ and default templates.++ * Add missing `rollingLinks` option to revealjs template (#4778,+ Igor Khorlo).+ pandoc (2.2.2) * Use HsYAML instead of yaml for translations and YAML metadata (#4747).
data/templates/default.revealjs view
@@ -170,6 +170,10 @@ // Enable slide navigation via mouse wheel mouseWheel: $mouseWheel$, $endif$+$if(rollingLinks)$+ // Apply a 3D roll to links on hover+ rollingLinks: $rollingLinks$,+$endif$ $if(hideAddressBar)$ // Hides the address bar on mobile devices hideAddressBar: $hideAddressBar$,
man/pandoc.1 view
@@ -1,5 +1,5 @@ .\"t-.TH PANDOC 1 "July 15, 2018" "pandoc 2.2.2"+.TH PANDOC 1 "July 19, 2018" "pandoc 2.2.2.1" .SH NAME pandoc - general markup converter .SH SYNOPSIS@@ -231,10 +231,9 @@ .IP \[bu] 2 \f[C]fb2\f[] (FictionBook2 e\-book) .IP \[bu] 2-\f[C]gfm\f[] (GitHub\-Flavored Markdown), or \f[C]markdown_github\f[],-which provides deprecated and less accurate support for Github\-Flavored-Markdown; please use \f[C]gfm\f[] instead, unless you need to use-extensions other than \f[C]smart\f[].+\f[C]gfm\f[] (GitHub\-Flavored Markdown), or the deprecated and less+accurate \f[C]markdown_github\f[]; use \f[C]markdown_github\f[] only if+you need extensions not supported in \f[C]gfm\f[]. .IP \[bu] 2 \f[C]haddock\f[] (Haddock markup) .IP \[bu] 2@@ -312,10 +311,9 @@ .IP \[bu] 2 \f[C]fb2\f[] (FictionBook2 e\-book) .IP \[bu] 2-\f[C]gfm\f[] (GitHub\-Flavored Markdown), or \f[C]markdown_github\f[],-which provides deprecated and less accurate support for Github\-Flavored-Markdown; please use \f[C]gfm\f[] instead, unless you use extensions-that do not work with \f[C]gfm\f[].+\f[C]gfm\f[] (GitHub\-Flavored Markdown), or the deprecated and less+accurate \f[C]markdown_github\f[]; use \f[C]markdown_github\f[] only if+you need extensions not supported in \f[C]gfm\f[]. .IP \[bu] 2 \f[C]haddock\f[] (Haddock markup) .IP \[bu] 2@@ -3810,7 +3808,7 @@ author: \-\ Author\ One \-\ Author\ Two-tags:\ [nothing,\ nothingness]+keywords:\ [nothing,\ nothingness] abstract:\ | \ \ This\ is\ the\ abstract. @@ -5241,7 +5239,7 @@ .TP .B \f[C]gfm\f[] (GitHub\-Flavored Markdown) \f[C]pipe_tables\f[], \f[C]raw_html\f[], \f[C]fenced_code_blocks\f[],-\f[C]auto_identifiers\f[], \f[C]ascii_identifiers\f[],+\f[C]gfm_auto_identifiers\f[], \f[C]ascii_identifiers\f[], \f[C]backtick_code_blocks\f[], \f[C]autolink_bare_uris\f[], \f[C]intraword_underscores\f[], \f[C]strikeout\f[], \f[C]hard_line_breaks\f[], \f[C]emoji\f[],
pandoc.cabal view
@@ -1,5 +1,5 @@ name: pandoc-version: 2.2.2+version: 2.2.2.1 cabal-version: 2.0 build-type: Custom license: GPL-2
src/Text/Pandoc/App.hs view
@@ -83,7 +83,6 @@ import System.FilePath import System.IO (nativeNewline, stdout) import qualified System.IO as IO (Newline (..))-import System.IO.Error (isDoesNotExistError) import Text.Pandoc import Text.Pandoc.BCP47 (Lang (..), parseBCP47) import Text.Pandoc.Builder (setMeta, deleteMeta)@@ -383,8 +382,7 @@ ((fst <$> fetchItem tp') `catchError` (\e -> case e of- PandocIOError _ e' |- isDoesNotExistError e' ->+ PandocResourceNotFound _ -> readDataFile ("templates" </> tp') _ -> throwError e))
src/Text/Pandoc/Readers/LaTeX.hs view
@@ -286,8 +286,14 @@ rawLaTeXBlock = do lookAhead (try (char '\\' >> letter)) snd <$> (rawLaTeXParser False macroDef blocks+ <|> (rawLaTeXParser True+ (do choice (map controlSeq+ ["include", "input", "subfile", "usepackage"])+ skipMany opt+ braced+ return mempty) blocks) <|> rawLaTeXParser True- (environment <|> macroDef <|> blockCommand)+ (environment <|> blockCommand) (mconcat <$> (many (block <|> beginOrEndCommand)))) -- See #4667 for motivation; sometimes people write macros@@ -308,7 +314,10 @@ => ParserT String s m String rawLaTeXInline = do lookAhead (try (char '\\' >> letter))- snd <$> rawLaTeXParser True (inlineEnvironment <|> inlineCommand') inlines+ snd <$> ( rawLaTeXParser True+ (mempty <$ (controlSeq "input" >> skipMany opt >> braced))+ inlines+ <|> rawLaTeXParser True (inlineEnvironment <|> inlineCommand') inlines) inlineCommand :: PandocMonad m => ParserT String ParserState m Inlines inlineCommand = do
+ test/command/4781.md view
@@ -0,0 +1,22 @@+```+% pandoc -t native+Markdown parsed *here*++\include{command/bar}++*But not here*+^D+[Para [Str "Markdown",Space,Str "parsed",Space,Emph [Str "here"]]+,RawBlock (Format "latex") "\\include{command/bar}"+,Para [Emph [Str "But",Space,Str "not",Space,Str "here"]]]+```++```+% pandoc -t native+*here* \input{command/bar}++*But not here*+^D+[Para [Emph [Str "here"],Space,RawInline (Format "tex") "\\input{command/bar}"]+,Para [Emph [Str "But",Space,Str "not",Space,Str "here"]]]+```