Commit graph

63 commits

Author SHA1 Message Date
Albert Krewinkel
24b2ac43b0 Add a simple Emacs Org-mode reader
The basic structure of org-mode documents is recognized; however,
org-mode features like todo markers, tags etc. are not supported yet.
2014-03-04 10:40:40 +01:00
John MacFarlane
69f7b1dbf3 Added readerTrace to ReaderOptions, --trace command line opt.
This is to debug backtracking-related parsing bugs.
So far it is only implemented for markdown, but it would
be good to extend it to latex and html readers.
2014-02-25 22:43:58 -08:00
John MacFarlane
9ae10b4352 The --bibliography option now sets the biblio-files variable.
So, if you're using `--natbib` or `--biblatex`, you can just use
`--bibliography=foo.bib` instead of `-V bibliofiles=foo`.
2014-01-03 10:11:21 -08:00
John MacFarlane
36cda45d70 Merge pull request #1005 from nougad/consistent_bibliography
Don't add pandoc-citeproc filter if natbib or biblatex is used
2014-01-02 21:15:41 -08:00
Henry de Valence
f6d151889c HLint: redundant parens
Remove parens enclosing a single element.
2013-12-19 20:43:25 -05:00
Henry de Valence
0c5e7cf8cb HLint: use elem and notElem
Replaces long conditional chains with calls to `elem` and `notElem`.
2013-12-19 20:19:24 -05:00
John MacFarlane
9b6f1fc495 Allow https: to work in pandoc command line arguments.
(Use openURL from Shared instead of simpleHTTP.)
2013-12-05 11:28:22 -08:00
John MacFarlane
bc6bb3be5c Allow "epub2" as synonym for "epub", "html4" for "html". 2013-11-30 15:36:18 -08:00
John MacFarlane
f2f8ddabc8 Don't look for slidy files in data files w/ --self-contained. 2013-10-21 11:24:25 -07:00
Florian Eitel
e24963ade6 Fixed stupid copy&paste error
How could this happend? sry
2013-09-30 16:56:31 +02:00
Florian Eitel
a26d25a80b Don't add pandoc-citeproc filter if natbib or biblatex is used
See https://github.com/jgm/pandoc-templates/issues/42
2013-09-30 15:55:59 +02:00
John MacFarlane
652f9a88f4 Handle Boolean values in --metadata.
Note that anything not parseable as a YAML boolean or string
is treated as a literal string.

Note that you can still get a string value with "yes" or any
of the strings interpretable as booleans:

    -M boolvalue=yes -M stringvalue='"yes"'
2013-09-19 20:21:35 -07:00
John MacFarlane
3397af30e4 More informative error when a filter is not found in path.
No more "resource vanished (broken pipe)"!
2013-09-17 21:38:34 -07:00
John MacFarlane
32afe85754 Allow --metadata to be repeated for the same key to form a list.
This also has the effect that `--bibliography` can be repeated,
as before.
2013-09-17 21:04:27 -07:00
John MacFarlane
479cefa4c2 More robust check for '-F pandoc-filters', allowing pathnames. 2013-09-14 16:01:41 -07:00
John MacFarlane
d47eadaf56 --bibliography again implies -F pandoc-citeproc.
But only if pandoc-citeproc isn't already specified as a filter.
2013-09-10 20:23:03 -07:00
John MacFarlane
4381c37b10 --bibliography no longer implies -F pandoc-citeproc.
This could lead to double filtering if the user specifies `-F`
too.
2013-09-08 22:46:30 -07:00
John MacFarlane
8977b2aaed Changed --metadata to return Boolean True if no value.
Also documented in README.
2013-09-01 16:22:40 -07:00
John MacFarlane
1240edbc3b Change for latest pandoc-citeproc. 2013-09-01 16:09:00 -07:00
John MacFarlane
39cdafd505 Restore --bibliography, --csl, --citation-abbreviations.
These are now implemented as:

--bibliography FILE => --metadata bibliography=FILE --filter pandoc-citeproc
--csl FILE          => --metadata csl=FILE
--citation-abbreviations FILE => --metadata csl-abbreviations=FILE
2013-09-01 15:54:48 -07:00
John MacFarlane
53f61019e2 Added --metadata/-M option.
This is like `--variable/-V`, but actually adds to metadata, not
just variables.
2013-09-01 15:40:28 -07:00
John MacFarlane
a68805bebd Added -F as shortcut for --filter. 2013-08-25 07:47:22 -07:00
John MacFarlane
deb59b6235 Removed dependency on citeproc-hs.
Going forward we'll use pandoc-citeproc, as an external filter.

The `--bibliography`, `--csl`, and `--citation-abbreviation` fields
have been removed.  Instead one must include `bibliography`, `csl`,
or `csl-abbrevs` fields in the document's YAML metadata.  The filter
can then be used as follows:

    pandoc --filter pandoc-citeproc

The `Text.Pandoc.Biblio` module has been removed.  Henceforth,
`Text.CSL.Pandoc` from pandoc-citations can be used by library users.

The Markdown and LaTeX readers now longer format bibliographies and
citations.  That must be done using `processCites` or `processCites'`
from Text.CSL.Pandoc.

All bibliography-related fields have been removed from `ReaderOptions`
and `WriterOptions`: `writerBiblioFiles`, `readerReferences`,
`readerCitationStyle`.

API change.
2013-08-24 22:33:01 -07:00
John MacFarlane
6e222ce225 Improved error reporting on filters.
Avoid showing spurious output and avoid double error messages.
2013-08-24 12:54:39 -07:00
John MacFarlane
8926230175 Print stderr output of filters to stderr. 2013-08-14 13:02:54 -07:00
John MacFarlane
f6b5735d09 Added module for writing python scripts, with several examples.
See scripts subdirectory.
2013-08-13 23:11:33 -07:00
John MacFarlane
bd73d73a28 Removed --print-sample-lua-writer, added --print-default-data-file.
Closes #943.
2013-08-13 18:29:57 -07:00
John MacFarlane
e279175ea5 Options: Changed writerSourceDir to writerSourceURL (now a Maybe).
Previously we used to store the directory of the first input file,
even if it was local, and used this as a base directory for
finding images in ODT, EPUB, Docx, and PDF.

This has been confusing to many users.  It seems better to look for
images relative to the current working directory, even if the first
file argument is in another directory.

writerSourceURL is set to 'Just url' when the first command-line
argument is an absolute URL.  (So, relative links will be resolved
in relation to the first page.)  Otherwise, 'Nothing'.

The ODT, EPUB, Docx, and PDF writers have been modified accordingly.

Note that this change may break some existing workflows.  If you
have been assuming that relative links will be interpreted relative
to the directory of the first file argument, you'll need to
make that the current directory before running pandoc.

Closes #942.
2013-08-11 15:58:09 -07:00
John MacFarlane
99bb066bb9 Pass writename as argument to filters.
This way filters can figure out what the target format is
and react appropriately.

Example:

    #!/usr/bin/env runghc
    import Text.Pandoc.JSON
    import Data.Char

    main = toJSONFilter cap
      where cap (Just "html") (Str xs) = Str $ map toUpper xs
            cap _ x = x

This capitalizes text only for html output.
2013-08-08 15:15:58 -07:00
John MacFarlane
2677e84663 Revert "Revert "Added --filter option.""
This reverts commit 2e5edbb278.
2013-08-08 11:09:00 -07:00
John MacFarlane
2e5edbb278 Revert "Added --filter option."
This reverts commit 85dacbb282.
2013-07-23 23:17:07 -07:00
John MacFarlane
85dacbb282 Added --filter option.
This makes it easier to use JSON filters.  Instead of
doing

    pandoc -t json | ./filter | pandoc -f json

you can just do

    pandoc --filter ./filter
2013-07-23 23:02:47 -07:00
John MacFarlane
7102254e24 PDF generation improvements.
* `Text.Pandoc.PDF` exports `makePDF` instead of `tex2pdf`.
  (API change.)
* `makePDF` walks the pandoc AST and checks for the existence of
  images in the local directory.  If they are not found, it attempts
  to find them, either in the directory containing the first source
  file, or at an absolute URL, or at a URL relative to the base URL
  of the first command line argument.
* Closes #917.
2013-07-20 12:14:43 -07:00
John MacFarlane
1de55ecbbd --toc-level no longer implies --toc.
Reason: EPUB users who don't want a visible TOC may still want
to set the TOC level for in the book navigation.
2013-07-03 12:47:35 -07:00
John MacFarlane
4edc97a921 pandoc --help now says something about pdf output.
Closes #720.
2013-04-26 21:13:42 -07:00
John MacFarlane
4fa2a94759 Added Text.Pandoc.Writers.Custom, --print-custom-lua-writer.
pandoc -t data/sample.lua

will load the script sample.lua and use it as a custom writer.
data/sample.lua is provided as an example.

Added `--print-custom-lua-writer` option to print the sample
script.
2013-04-14 00:31:39 -05:00
John MacFarlane
333deac26b Have --help print in and out formats in alphabetical order. 2013-04-08 09:44:23 -07:00
John MacFarlane
da1e38893a Reveal.js improvements.
Changed name to revealjs (from reveal_js).
Set revealjs-url template variable to 'reveal.js' by default.
2013-03-23 21:48:34 -04:00
Jamie F. Olson
6b53a905c4 Added basic support for reveal.js.
Support unordered and ordered lists with "fragment" elements.

Modified by JGM to remove the --reveal_js-url command-line option.
Instead use -V reveal_js-url=... as with slidy and the other slide
formats.  Also cleaned up the list code in the HTML writer.
2013-03-21 14:54:17 -07:00
John MacFarlane
69acb47a34 Added Text.Pandoc.Writers.OPML.
TODO:

* Document in README
* Add tests
* Add template (and add template to cabal file)
2013-03-19 22:49:44 -07:00
John MacFarlane
74d53f4347 Added Text.Pandoc.Readers.OPML, exporting readOPML.
The _note attribute is supported.  This is unofficial, but
used e.g. in OmniOutliner and supported by multimarkdown.
We treat the contents as markdown blocks under a section
header.

Added to documentation and tests.
2013-03-19 20:22:14 -07:00
John MacFarlane
f8fec87f09 Fixed numbering mismatch between TOC and sections in HTML.
Also made `--number-offset` affect TOC numbering as well
as section numbering, as it should have all along.

Closes #789.
2013-03-16 14:48:37 -07:00
John MacFarlane
3b63cb0903 Hide Text.Pandoc.Highlighting.
* Moved code for translating listings language names to
  highlighting-kate names and back from LaTeX reader to Highlighting.
* Text.Pandoc.Highlighting no longer exposed (API change)
* Text.Pandoc.Highlighting exports toListingsLang, fromListingsLang
2013-03-05 22:09:42 -08:00
John MacFarlane
756c8d492a --number-from -> --number-offset
Also `writerNumberFrom` -> `writeNumberOffset`.
The offset is a list of numbers (0 by default).
These are added to the section, subsection, etc.
numbers that would have been generated automatically.
2013-02-23 18:11:05 -08:00
John MacFarlane
91f507d393 --number-from implies --number-sections. 2013-02-22 19:42:11 -08:00
John MacFarlane
8df380486c Added --number-from option and writerNumberFrom.
These still aren't hooked up to anything in the writers.
2013-02-21 21:40:06 -08:00
John MacFarlane
ec5dc431de Changes to --version.
Print default user data directory.
Put language names in lowercase and omit 'alert' and 'alert_indent'.
2013-02-07 20:06:30 -08:00
John MacFarlane
7f4e1075be Changes to --version.
Print default user data directory.
Put language names in lowercase and omit 'alert' and 'alert_indent'.
2013-02-07 19:58:28 -08:00
John MacFarlane
c5f1a8ad2d Added --default-image-extension and readerDefaultImageExtension.
Note: Currently this only affects the markdown reader.
2013-02-05 20:08:00 -08:00
John MacFarlane
ce3d60d98e Updated copyright dates. 2013-01-19 11:11:45 -08:00