Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
8745 commits 2 branches 0 tags 65 MiB
Commit graph

8745 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
e3e52aa4c1 Removed unused import. 2017-04-03 10:20:51 +02:00
John MacFarlane
7daea9d8c1 Removed unused imports from Setup.hs. 2017-04-03 09:50:44 +02:00
John MacFarlane
e62fbc1c3c Merge pull request #3550 from tarleb/lua-readers-submodule 
Lua module: add readers submodule
 2017-04-03 09:47:16 +02:00
John MacFarlane
e281a7cda0 Make sure docx/_rels/.rels gets into data files. 
embedDir in file-embed excludes hidden files, so we need
to add this manually.
 2017-04-02 23:29:58 +02:00
John MacFarlane
b474a23296 MANUAL: document highlighting support in ms. 2017-04-02 23:10:42 +02:00
John MacFarlane
ff991d1e21 Revert "Revert "Use file-embed instead of hsb2hs to embed data files."" 
This reverts commit 1fa15c225b.
 2017-04-02 23:10:10 +02:00
John MacFarlane
913db947a9 Text.Pandoc.App: Throw errors rather than exiting. 
These are caught (and lead to exit) in pandoc.hs, but
other uses of Text.Pandoc.App may want to recover in another
way.

Added PandocAppError to PandocError (API change).
This is a stopgap:  later we should have a separate constructor
for each type of error.

Also fixed uses of 'exit' in Shared.readDataFile, and
removed 'err' from Shared (API change).

Finally, removed the dependency on extensible-exceptions.

See #3548.
 2017-04-02 23:04:48 +02:00
Albert Krewinkel
e7eb21ecca
Lua module: add readers submodule 
Plain text readers are exposed to lua scripts via the `pandoc.reader`
submodule, which is further subdivided by format.  Converting e.g. a
markdown string into a pandoc document is possible from within lua:

    doc = pandoc.reader.markdown.read_doc("Hello, World!")

A `read_block` convenience function is provided for all formats,
although it will still parse the whole string but return only the first
block as the result.

Custom reader options are not supported yet, default options are used
for all parsing operations.
 2017-04-02 17:28:07 +02:00
John MacFarlane
9e78a9d26b Added data/default.theme to repository. 2017-04-01 22:59:10 +02:00
John MacFarlane
420e3eb26e Allow a theme file as argument to --highlight-style. 
Also include a sample, `default.theme`, in `data/`.
 2017-04-01 22:27:00 +02:00
John MacFarlane
1c84a03509 Ms writer: added syntax highlighting. 
Closes #3547.

Macro definitions are inserted in the template when there is highlighted
code.

Limitations: background colors and underline currently not
supported.
 2017-04-01 22:05:38 +02:00
John MacFarlane
1c7f4e97e2 Use latest skylighting. 
This means we no longer need language.dtd when loading
custom highlighting definitions.

See #3334.
 2017-04-01 12:54:26 +02:00
John MacFarlane
34b9bee5a4 OpenDocument writer: wider labels for lists. 
This avoids overly narrow labels for ordered lists with
() delimiters.

However, arguably it creates overly wide labels for bullets.

Also, lists now start flush with the margin, rather than
indented.

Fixes #2421.
 2017-04-01 12:27:40 +02:00
John MacFarlane
8761d57750 Change MathJax CDN default since old one is shutting down. 
New URL: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js
Announcement: https://www.mathjax.org/cdn-shutting-down/

NOTE:  The new URL requires a version number, which we'll have
to update manually in subsequent pandoc releases in order to
take advantage of mathjax improvements.

Closes #3544.
 2017-04-01 11:05:12 +02:00
John MacFarlane
80c3c93273 JATS writer: don't include jats.csl in metadata if csl already specified. 2017-03-31 15:15:49 +02:00
John MacFarlane
8a3ef99882 JATS template: always include <back> element even if empty. 2017-03-31 15:15:34 +02:00
John MacFarlane
3217bc192e JATS writer: put references in <back>. 
Modified template to include a `<back>` and `<body>` section.
This should give authors more flexibility, e.g. to put
acknowledgements metadata in `<back>`.  References are
automatically extracted and put into `<back>`.
 2017-03-31 11:07:09 +02:00
John MacFarlane
136a53edc8 Fix compiler warning. 2017-03-30 23:03:57 +02:00
John MacFarlane
48039a1d80 Add JATS to description in pandoc.cabal. 2017-03-30 23:00:12 +02:00
John MacFarlane
560cfadb92 jats template: added xml-stylesheet variable. 2017-03-30 22:49:22 +02:00
John MacFarlane
80d093843b Allow dynamic loading of syntax definitions. 
See #3334.

* Add writerSyntaxMap to WriterOptions.
* Highlighting: added parameter for SyntaxMap to highlight.
* Implemented --syntax-definition option.

TODO:

[ ] Figure out whether we want to have the xml parsing
    depend on the dtd (it currently does, and fails unless
    the language.dtd is found in the same directory).
[ ] Add an option to read a KDE syntax highlighting theme
    as a custom style.
[ ] Add tests.
 2017-03-30 22:36:36 +02:00
John MacFarlane
ea84cd0842 ZimWiki writer: put in PandocMonad, added warnings for raw. 2017-03-30 21:43:22 +02:00
John MacFarlane
d8a3228617 Textile writer: moved into PandocMonad. 
Warnings for omitted raw content.
 2017-03-30 21:37:13 +02:00
John MacFarlane
b27836666f Org writer: move everything into PandocMonad. 2017-03-30 21:31:43 +02:00
John MacFarlane
8d50f37d53 Don't read jats.csl unless we actually need it. 2017-03-30 17:23:16 +02:00
John MacFarlane
6ad486c3c3 Automatically include URI-encoded jats.csl for jats output. 
This way people can do

    pandoc -s -t jats --filter pandoc-citeproc

and it will just work.  If they want to specify a stylesheet,
they still can.
 2017-03-30 16:43:17 +02:00
John MacFarlane
2f19b5daac SelfContained: export makeDataURI 2017-03-30 16:43:12 +02:00
John MacFarlane
e5e2a6e0a5 JATS writer: use both tex and mml alternatives for math when possible. 2017-03-30 16:22:54 +02:00
John MacFarlane
bf651b966b Compile with latest pandoc-citeproc. 2017-03-30 15:39:52 +02:00
John MacFarlane
0d06c632b1 JATS writer: Fixed bibliography handling. 2017-03-30 15:39:21 +02:00
John MacFarlane
9575dfc970 Merge branch 'jats' 2017-03-30 01:17:36 +02:00
John MacFarlane
831e1c5edd Added JATS writer. 
* New module Text.Pandoc.Writer.JATS exporting writeJATS.
* New output format `jats`.
* Added tests.
* Revised manual.
 2017-03-30 01:16:34 +02:00
schrieveslaach
5fe734d452 lstinline with braces can be used (verb cannot be used with braces) (#3535) 
* Fix lstinline handling: lstinline with braces can be used (verb cannot be used with braces)

* Use codeWith and determine the language from lstinline

* Improve code

* Add another test: convert lstinline without language option
 2017-03-29 14:49:46 +02:00
Albert Krewinkel
5cb18e5dc2
Custom writer: remove old preprocesesor conditionals 
The minimum required hslua version is 0.4.0, the conditionals inserted
to support hslua-0.3.* can hence be removed.
 2017-03-28 19:49:49 +02:00
John MacFarlane
64fe39c255 Added default.jats template. 
This is copied from Martin Fenner's pandoc-jats project:
https://github.com/mfenner/pandoc-jats
 2017-03-28 09:38:00 +02:00
John MacFarlane
b2f3d8e759 Add auxiliary files for command test for #3530 to pandoc.cabal. 
Otherwise builds fail.
 2017-03-27 22:03:38 +02:00
schrieveslaach
49d72444d7 LaTeX reader: add support for LaTeX subfiles package. 
Closes #3530.
 2017-03-27 21:20:27 +02:00
John MacFarlane
e3472f0df5 MANUAL: document that html4 is technically XHTML 1.0 transitional. 2017-03-27 21:14:18 +02:00
John MacFarlane
306dadc901 default.ms template: move header-includes and .1C up. 2017-03-26 23:47:38 +02:00
John MacFarlane
fddd6ffdd0 Add blank lines to #3531 command test. 2017-03-26 20:48:54 +02:00
John MacFarlane
1fa15c225b Revert "Use file-embed instead of hsb2hs to embed data files." 
This reverts commit 10d91c1479.
 2017-03-26 20:48:17 +02:00
John MacFarlane
d0447151cf Revert "Setup.hs - removed unneeded imports." 
This reverts commit 5354b44170.
 2017-03-26 20:41:49 +02:00
John MacFarlane
b7782cf8d3 Revert "Text.Pandoc.Data: ensure it compiles even without embed_data_files." 
This reverts commit 453970c6b3.
 2017-03-26 20:41:35 +02:00
John MacFarlane
358dfba8f4 MediaWiki writer: don't softbreak lines inside list items. 
Closes #3531.
 2017-03-26 20:41:09 +02:00
John MacFarlane
51ab1bf270 Ms writer: update TODO comments. 2017-03-26 20:04:46 +02:00
John MacFarlane
0eb62f03fe Ms writer: Hyperlink table of contents and other improvements. 2017-03-26 20:03:37 +02:00
John MacFarlane
0ae448e638 PDF: when running pdfroff, don't do second pass to relocate toc. 2017-03-26 20:00:40 +02:00
John MacFarlane
453970c6b3 Text.Pandoc.Data: ensure it compiles even without embed_data_files. 
In this case we don't depend on file-embed or use TH.
 2017-03-26 19:19:54 +02:00
John MacFarlane
bd99d9f6af Ms writer: Add PDF outline bookmarks. 2017-03-26 18:06:15 +02:00
John MacFarlane
5354b44170 Setup.hs - removed unneeded imports. 2017-03-26 17:27:14 +02:00