13123 Commits
Author SHA1 Message Date
John MacFarlane 87b9ee87e6 Use pandoc-citeproc 0.17. 2.9.2 2020-02-15 21:51:39 -08:00
John MacFarlane 0010d15bcf Update README.md. 2020-02-15 21:28:53 -08:00
John MacFarlane cdbb14de5b Update changelog and man page. 2020-02-15 21:26:29 -08:00
John MacFarlane 33fcac40d5 Use latest texmath. 2020-02-15 09:12:56 -08:00
John MacFarlane 4a5e7b2ada make pandoc-templates: copy README and styles.*. 2020-02-14 09:07:10 -08:00
Ethan Riley daf770c1e9 Fixes: group biblatex citations even with prefix and suffix (#6058)
Closes #5849.  Previously biblatex citations were only grouped if
there was no prefix.  This patch allows them to be grouped in
subgroups split by prefixes and suffixes, which allows better citation
sorting.
2020-02-14 08:44:40 -08:00
Joseph C. Sible 652ed0b82c A bit more cleanup (#6141)
* Remove unnecessary fmaps and only do toMilliseconds once

* Share the input tuple intead of making a new one

* Lift return out of if

* Simplify case statements

* Lift DottedNum out of the case statements

* Use st instead of mbs

* Use setState instead of updateState now that we have the whole state around
2020-02-13 22:52:51 -08:00
Lucas Escot 29c2670da2 Add highlight directive to the rST reader (#6140) 2020-02-13 10:27:34 -08:00
John MacFarlane 3a181f0a97 Add Text.Pandoc.Image with unexported svgToPng. 2020-02-12 21:57:00 -08:00
Albert Krewinkel f5ea5f0aad Introduce new format variants for JATS (#6067)
New formats:

- `jats_archiving` for the "Archiving and Interchange Tag Set",
- `jats_publishing` for the "Journal Publishing Tag Set", and
- `jats_articleauthoring` for the "Article Authoring Tag Set."

The "jats" output format is now an alias for "jats_archiving".

Closes: #6014
2020-02-12 20:36:02 -08:00
John MacFarlane e9cb08e74c sample.lua - fix error message.
image_format not img_format.

Closes #6135.
2020-02-12 20:34:20 -08:00
John MacFarlane 3a79f37d88 LaTeX reader: improve caption and label parsing.
- Don't emit empty Span elements for labels.
- Put tables with labels in a surrounding Div.
2020-02-12 17:43:55 -08:00
John MacFarlane 1433aaa4c3 HTML reader: don't parse data-id as id attribute.
And similarly don't parse any `data-X` as `X` when `X`
is a valid HTML attribute.

Reported in comment on #5415.
2020-02-12 08:47:32 -08:00
John MacFarlane fae8ea36f0 Moved html5Attributes, html4Attributes, rdfaAttributes...
from T.P.Writers.HTML (where they were unexported) to
T.P.XML (where they are now exported).

[API change: new exported functions]

This allows these sets to be used elsewhere, e.g.
in the HTML reader.
2020-02-12 08:45:59 -08:00
John MacFarlane 3fbee8c6ed LaTeX reader: resolve \ref to table numbers.
Closes #6137.
2020-02-11 22:28:06 -08:00
Caleb Maclennan 4bd8a35e8f sample.lua: Fix typo in descriptive comments (#6136) 2020-02-11 09:30:48 -08:00
John MacFarlane 114d77c2ab Fix spurious dots in markdown_mmd metadata output
Closes #6133 (regression).
2020-02-10 09:00:21 -08:00
Albert Krewinkel 689cb7128f Org reader: simplify parsing of sub- and superscripts
Speeds up parsing of single-word, markup-less sub- and superscripts.

Fixes: #6127
2020-02-08 21:07:57 +01:00
John MacFarlane 5f0bd52221 reveal.js: ensure that pauses work even in title slides.
Closes #5819.
2020-02-08 09:38:07 -08:00
Joseph C. Sible f2f559003e Factor out a findM function (#6125)
This adds a new function to the API: Text.Pandoc.Shared.findM.
2020-02-08 09:12:30 -08:00
Joseph C. Sible 12c75701be Use <$> instead of >>= and return (#6128) 2020-02-08 09:12:01 -08:00
Joseph C. Sible e97a99616e Clean up after "hlint --refactor" (#6129)
HLint's automatic refactoring isn't quite perfect, so some of its
changes were overcomplicated, wrong, or created new findings.
Clean these up.
2020-02-08 09:11:00 -08:00
Joseph C. Sible 02ff42b178 More cleanup (#6130)
* Use an infix operator normally instead of immediately applying an operator section

* Use M.fromList
2020-02-08 09:09:33 -08:00
John MacFarlane 4c3db9273f Apply linter suggestions. Add fix_spacing to lint target in Makefile. 2020-02-07 09:08:22 -08:00
Albert Krewinkel 6cd77d4c63 Resolve HLint warnings
All warnings are either fixed or, if more appropriate, HLint is
configured to ignore them. HLint suggestions remain.

  * Ignore "Use camelCase" warnings in Lua and legacy code
  * Fix or ignore remaining HLint warnings
  * Remove redundant brackets
  * Remove redundant `return`s
  * Remove redundant as-pattern
  * Fuse mapM_/map
  * Use `.` to shorten code
  * Remove redundant `fmap`
  * Remove unused LANGUAGE pragmas
  * Hoist `not` in Text.Pandoc.App
  * Use fewer imports for `Text.DocTemplates`
  * Remove redundant `do`s
  * Remove redundant `$`s
  * Jira reader: remove unnecessary parentheses
2020-02-07 10:17:24 +01:00
Joseph C. Sible 60a3158bf9 More in-depth refactoring and cleanup (#6123)
* Avoid duplicating the dash case

* Pull common functions out of case branches

* Make sure list lengths are only calculated once

* Use unless

* Simplify parseURIReference' and avoid an unnecessary call to length

* Use <$> instead of reimplementing it

* Use swap instead of reimplementing it

* Remove eta-expansion that's been unnecessary since 90f5dd8

* Use tailDef instead of reimplementing it

* Use second instead of fmap, per @tarleb
2020-02-07 08:42:46 +01:00
Joseph C. Sible a5a3ac9946 Various minor cleanups and refactoring (#6117)
* Use concatMap instead of reimplementing it

* Replace an unnecessary multi-way if with a regular if

* Use sortOn instead of sortBy and comparing

* Use guards instead of lots of indents for if and else

* Remove redundant do blocks

* Extract common functions from both branches of maybe

Whenever both the Nothing and the Just branch of maybe do the same
function, do that function on the result of maybe instead.

* Use fmap instead of reimplementing it from maybe

* Use negative forms instead of negating the positive forms

* Use mapMaybe instead of mapping and then using catMaybes

* Use zipWith instead of mapping over the result of zip

* Use unwords instead of reimplementing it

* Use <$ instead of <$> and const

* Replace case of Bool with if and else

* Use find instead of listToMaybe and filter

* Use zipWithM instead of mapM and zip

* Inline lambda wrappers into the real functions

* We get zipWithM from Text.Pandoc.Writers.Shared

* Use maybe instead of fromMaybe and fmap

I'm not sure how this one slipped past me.

* Increase a bit of indentation
2020-02-07 08:38:24 +01:00
Joseph C. Sible 013a1647a7 Use traverse instead of reimplementing it (#6124) 2020-02-06 23:10:09 -08:00
Joseph C. Sible 30c8980883 Simplify an overcomplicated filtering function (#6115)
There's no need to use `catMaybes`, `uncurry`, `bool`, etc., just
to get elements where the second element of a tuple is True.
2020-02-05 17:22:53 -08:00
John MacFarlane 9c12024e07 Fix --number-offset with HTML TOC.
Eventually it would be worth adding a parameter to
makeSections so this could be done at that level;
then it would also affect other writers that construct
TOC manually.
2020-02-05 17:20:52 -08:00
John MacFarlane 0a4f49d370 MediaWiki writer: prevent triple [[[.
This confuses mediawiki's parser.  So we insert a `<nowiki/>`
no-op between a literal `[` and a link.  Closes #6119.
2020-02-05 10:08:18 -08:00
John MacFarlane 9c4dc8b49b LaTeX reader: skip comments in more places where this is needed.
Closes #6114.
2020-02-05 09:48:42 -08:00
Joseph C. Sible b018028ee9 Remove our bool function (#6116)
Data.Bool already provides a bool function identical to this one.
2020-02-04 22:38:49 -08:00
John MacFarlane fd9c03febe Add timing info for filters in --verbose mode.
+ Add RunningFilter, FilterCompleted constructors to LogMessage
+ When verbose mode is specified (verbosity == INFO), print a
  notice when running a filter and when a filter completes (including
  timing).

Closes #6112.
2020-02-04 09:38:53 -08:00
John MacFarlane 30962e2e9d Allow & in LaTeX citation keys.
Closes #6110.
2020-02-03 20:38:49 -08:00
Joseph C. Sible 1ea5b18020 Swap suboptimal uses of maybe and fromMaybe (#6111)
Anywhere "maybe" is used with "id" as its second argument, using
"fromMaybe" instead will simplify the code. Conversely, anywhere
"fromMaybe" is used with the result of "fmap" or "<$>" as its second
argument, using "maybe" instead will simplify the code.
2020-02-03 20:31:05 -08:00
John MacFarlane d9b1776336 Fix duplicate frame classes in LaTeX/Beamer output.
Close #6107.
2020-02-03 08:52:07 -08:00
Joseph C. Sible 6371ec241d Clean up overcomplicated maybe logic (#6105)
We're using maybe in redundant ways. Remove it altogether in one case and
simplify it to fromMaybe in another.
2020-02-03 08:26:00 -08:00
Joseph C. Sible 8d6fac1253 Clean up a confusing triple negative (#6102)
There's currently `unless`, `not`, and `notParaOrPlain` in the same
expression, which is a rather confusing triple negative. Replace
`notParaOrPlain` with `paraOrPlain` and switch to `all` from `any`
to clean this up.
2020-02-03 08:14:22 -08:00
John MacFarlane b47a3cdcb6 Text.Pandoc.Readers.CSV - reuse CSV parser from Text.Pandoc.CSV. 2020-02-01 07:34:15 -08:00
John MacFarlane 4b1f8584a5 Fix bug in Text.Pandoc.CSV.
Previously an extra blank record would sometimes be inserted at the
end.
2020-02-01 07:33:55 -08:00
John MacFarlane 22f484e9a9 Support 'bibliography' and 'csl' fields in defaults file.
Move addMeta from T.P.App.CommandLineOptions to T.P.App.Opt.
(not an api change because modules not exported)
2020-01-31 21:56:28 -08:00
John MacFarlane fb3df6cf19 csv reader: allow empty cells. 2020-01-31 21:43:19 -08:00
John MacFarlane f9514ccb9e Add Text.Pandoc.Readers.CSV (readCSV).
This adds csv as an input format.
The CSV table is converted into a pandoc simple table.

Closes #6100.
2020-01-31 21:14:21 -08:00
John MacFarlane cef30e7384 LaTeX template: add space option to xeCJK with PassOptionsToPackage.
Otherwise we can get a clash with documentclasses that
already load the package.  Closes #6002.
2020-01-29 21:47:24 -08:00
John MacFarlane e6399d162a Added a try that was needed for the commit fc78be1.
The intent of that commit was to parse unknown LaTeX
enivronments as verbatim if they can't be parsed normally,
avoiding crashes on environments that allow unescaped
underscores and the like.  But the fix didn't completely
work: it worked for raw TeX in markdown but not when
reading LaTeX. This change fixes that.

See #6034. Closes #6093.
2020-01-28 21:32:30 -08:00
Salim B 34eba446a0 Update URLs and use HTTP**S** wherever possible (#6090)
I've changed _all_ `http:` URLs in the file to their `https` equivalents if the respective sites have properly configured HTTPS.
2020-01-27 15:46:33 -08:00
John MacFarlane 05a217091f Fix test suite for new skylighting.
Closes #6086.
2020-01-27 08:25:25 -08:00
John MacFarlane 3b4dc3a2b0 Use skylighting 0.8.3.2. 2020-01-21 17:57:23 -08:00
John MacFarlane 761ece90c9 Windows rc: Create the release dir. 2020-01-21 17:56:31 -08:00