Commit graph

3201 commits

Author SHA1 Message Date
John MacFarlane
92d48fa65b Updated readers and writers for new image attribute parameter.
(mb21)
2015-08-07 12:37:12 +02:00
John MacFarlane
9deb335ca5 ICML writer: changed type of writeICML.
API change:  It is now `WriterOptions -> Pandoc -> IO String`.

Also handle new image attributes.

(mb21)
2015-08-05 16:08:46 +02:00
John MacFarlane
4391c5f34c ICML writer: Add Cite style to citations.
(mb21)
2015-08-05 16:08:46 +02:00
John MacFarlane
12df4054ad PDF: Modified for new image size attributes parameter.
(mb21)
2015-08-05 16:08:46 +02:00
John MacFarlane
76f0708ef5 Parsing: Add extractIdClass, modified type of KeyTable.
(mb21)
2015-08-05 16:08:46 +02:00
John MacFarlane
878ab00233 ImageSize: Added functions for converting between image dimensions.
(mb21)
2015-08-05 16:08:46 +02:00
John MacFarlane
5df099957e Text.Pandoc.Options: modifications for image attributes.
* Added `Ext_common_link_attributes` constructor to `Extension`
  (for link and image attributes).
* Added this to `pandocExtensions` and `phpMarkdownExtraExtensions`.
* Added `writerDpi` to `WriterOptions`.
* pandoc.hs:  Added `--dpi` option.
* Updated README for `--dpi` and `common_link_attributes` extension.

Patch due to mb21, with some modifications: `writerDpi` is now an
`Int` rather than a `Double`.
2015-07-27 21:52:43 +02:00
John MacFarlane
2e8064346d Pretty: comment fix (mb21). 2015-07-25 15:51:55 +02:00
MarLinn
f068093555 Added odt reader
Fully implemented features:

* Paragraphs
* Headers
* Basic styling
* Unordered lists
* Ordered lists
* External Links
* Internal Links
* Footnotes, Endnotes
* Blockquotes

Partly implemented features:

* Citations
  Very basic, but pandoc can't do much more
* Tables
  No headers, no sizing, limited styling
2015-07-23 15:37:01 -07:00
John MacFarlane
8390d935d8 Updated tests and removed a skipSpaces....
we no longer need it with the change to toKey, and it
is expensive to skip spaces after every inline.
2015-07-23 15:35:18 -07:00
John MacFarlane
35e6c893ec Parsing: toKey: strip off outer brackets.
This makes keys with extra space at the beginning and end
work:  e.g.

    [foo]: bar

    [ foo ]

will now be a link to bar (it wasn't before).
2015-07-23 15:34:27 -07:00
John MacFarlane
5db4787330 Merge pull request #2323 from hftf/implicit-header-refs
Fix implicit header refs for headers with extra spaces
2015-07-23 14:46:38 -07:00
John MacFarlane
66a72b8eec LaTeX reader: support abstract environment.
The abstract populates an "abstract" metadata field.
2015-07-23 09:31:46 -07:00
Ophir Lifshitz
42c139d302 Markdown Reader: Skip spaces in headers 2015-07-23 02:29:37 -04:00
John MacFarlane
fa2c008ae5 Fix regression: allow HTML comments containing --.
Technically this isn't allowed in an HTML comment, but
we've always allowed it, and so do most other implementations.
It is handy if e.g. you want to put command line arguments
in HTML comments.
2015-07-21 22:44:18 -07:00
John MacFarlane
ec5960ab11 Use newManager instead of withManager in recent http-client.
This avoids a deprecation warning.
2015-07-21 16:32:44 -07:00
John MacFarlane
450bef90e0 DZSlides: Add role="note" for speaker notes.
Closes #1693.
2015-07-21 14:54:43 -07:00
John MacFarlane
da0842b5b5 HTML reader: handle type attribute on ol.
E.g. `<ol type="i">`.

Closes #2313.
2015-07-21 13:07:52 -07:00
John MacFarlane
f6ad9e263f LaTeX reader: properly handle booktabs lines.
Lines aren't part of the pandoc table model, but we can just
ignore them.

Closes #2307.
2015-07-21 10:26:29 -07:00
John MacFarlane
6166cd7559 Removed unneeded import. 2015-07-16 17:06:57 -07:00
John MacFarlane
075ad9a406 LaTeX writer: Fixed detection of 'chapters' from template.
If a documentclass isn't specified in metadata, but the
template has a hardwired bookish documentclass, act as if
`--chapters` was used.  This was the default in earlier
versions, but it has been broken for a little while.
2015-07-16 15:52:38 -07:00
John MacFarlane
c2ab44af84 --self-contained: Fixed overaggressive CSS minimization.
Previously `--self-contained` wiped out all spaces in CSS,
including semantically significant spaces!

Closes #2301.
Closes #2286.
2015-07-15 08:16:42 -07:00
John MacFarlane
6c32afc3c4 Updated to use cmark >= 0.4. 2015-07-14 22:51:23 -07:00
John MacFarlane
9e0fb844a9 Markdown reader: don't allow bare URI links or autolinks in link label.
Added test cases.

Closes #2300.
2015-07-14 13:16:40 -07:00
John MacFarlane
9cdfd4f649 Improved bare autolink detection.
Previously we disallowed `-` at the end of an autolink,
and disallowed the combination `=-`.

This commit liberalizes the rules for allowing punctuation in
a bare URI.

Added test cases.

One potential drawback is that you can no longer put a bare
URI in em dashes like this

    this uri---http://example.com---is an example.

But in this respect we now match github's treatment of bare URIs.

Closes #2299.
2015-07-14 10:24:39 -07:00
John MacFarlane
b8634b9f75 HTML writer: support speaker notes in dzslides.
With this change `<div class="notes">` and also `<div class="notes"
role="note">` will be output if `-t dzslides` is used. So we can
have speaker notes in dzslides too.

Thanks to maybegeek.
2015-07-13 22:50:17 -07:00
Tiziano Müller
f464e49142 DokuWiki: write $..$ instead of <math>..</math>
MathJax seems currently to be the only maintained math rendering
extension for DokuWiki and it uses $..$ instead of <math>..</math>.
2015-07-13 14:19:48 +02:00
John MacFarlane
2df3dfe883 Changed hierarchicalize so it treats references div as top-level header.
Fixes a bug with `--section-divs`, where the final references section
added by pandoc-citeproc, enclosed in its own div, got put in the
div for the section previous to it.

This fixes #2294.  Longer term, we might think about how hierarchicalize
should interact with Div elements.
2015-07-12 13:58:28 -07:00
John MacFarlane
99fe8594d9 Avoid parsing partial URLs as HTML tags.
Closes #2277.
2015-07-10 10:33:27 -07:00
John MacFarlane
b587acb224 Merge pull request #2266 from PromyLOPh/fieldinline
RST: Support inline markup for field list names
2015-07-08 22:45:06 -07:00
John MacFarlane
ac79429a12 PDF: Make sure --latex-engine-opt goes before the filename...
on the command line.  LaTeX needs the argument to come after
the options.

Closes #1779 - again!  Thanks to squisher for pointing
out the problem.
2015-07-08 17:37:54 -07:00
Andrew Dunning
4850aaf046 Correct superscript/subscript. 2015-07-08 13:57:04 -04:00
John MacFarlane
9e528f4c0c Fixed email javascript obfuscation with mailto: URLs.
This fixes a potential security issue.  Because single quotes weren't
being escaped in the link portion, a specially crafted email address
could allow javascript code injection.

    [Jim'+alert('hi')+'OBrien](mailto:me@example.com)

Closes #2280.
2015-07-07 11:15:40 -07:00
Lars-Dominik Braun
b2adf44e75 Readers.RST: Factor out inline markup string parsing 2015-07-03 16:42:51 +02:00
Lars-Dominik Braun
68b6b9f652 Readers.RST: Parse field list name
“Inline markup is parsed in field names.” [1]

[1] http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#field-lists
2015-07-03 16:41:28 +02:00
John MacFarlane
e0a88df686 ConTeXt: use \goto for internal links. 2015-07-01 12:11:45 -07:00
John MacFarlane
b5d3b4f608 Merge pull request #2255 from mchladek/odt_linebreak
Fix #2254 : OpenDocument writer adds space with hard line break
2015-07-01 11:49:58 -07:00
John MacFarlane
8e747004e6 ConTeXt writer: Added a % at end for \reference to avoid spurious space. 2015-07-01 11:30:28 -07:00
John MacFarlane
a04c15a422 New method for building man pages.
+ Removed `--man1`, `--man5` options (breaking change).
+ Removed `Text.Pandoc.ManPages` module (breaking API change).
+ Version bump to 1.15 because of the breaking changes, even
  though they involve features that have only been in pandoc
  for a day.
+ Makefile target for `man/man1/pandoc.1`.  This uses pandoc to
  create the man page from README using a custom template and filters.
+ Added `man/` directory with template and filters needed to build
  man page.
+ We no longer have two man pages: pandoc.1 and pandoc_markdown.5.
  Now there is just pandoc.1, which has all the content from README.
  This change was needed because of the extensive cross-references
  between parts of the README.
+ Removed old `data/pandoc.1.template` and
  `data/pandoc_markdown.5.template`.
2015-07-01 11:27:15 -07:00
Michael Chladek
125b0c7359 Do not add a carriage return after a hard line break in OpenDocument writer and reflect change in tests. 2015-07-01 09:43:36 -05:00
John MacFarlane
226a5cd6a9 Merge pull request #2250 from PromyLOPh/rsttarget
Fix RST reference names with special characters
2015-06-29 10:21:40 -07:00
John MacFarlane
754d1cef7b LaTeX reader: Allow _ and ^ as regular inline text.
Normally these will cause an error in LaTeX, but there
are contexts (e.g. `alltt` environments) where they are
okay.  Now that we aren't treating them as super/subscript
outside of math mode, it seems okay to parse them as regular
text.
2015-06-29 10:20:08 -07:00
John MacFarlane
457fbebabc LaTeX reader: don't parse _,^ as super/sub outside math mode. 2015-06-29 09:46:57 -07:00
Lars-Dominik Braun
3b2c50ed93 Fix RST reference names with special characters 2015-06-29 18:34:45 +02:00
John MacFarlane
27754e170b Removed unneeded import. 2015-06-28 23:59:10 -07:00
John MacFarlane
7c6277d2c1 Added a needed import in Shared. 2015-06-28 23:43:17 -07:00
John MacFarlane
36baded572 Make sure we use dist version of reference.docx for some things.
Taking some values from a user-supplied reference.docx
tends to lead to corruption.

This fixes a regression from the last release. Closes #2249.
2015-06-28 23:25:55 -07:00
John MacFarlane
de184a80ec Let reference.docx/odt behave as if they are virtual data files.
Now they are constructed on the fly from their components,
but we now allow them to be printed with `--print-default-data-file`
and to override the defaults if placed in the user data directory.

Shared now exports getDefaultReferenceDocx and getDefaultReferenceODT
(API change).

These functions have been removed from the Docx and ODT writers.

Shared.readDataFile has been modified so that requests to read
a reference.odt or reference.docx will use these functions to
generate the files.
2015-06-28 22:38:13 -07:00
John MacFarlane
7bbb007359 Minor fixes to previous commit.
* Instead of defining readmeFile in Text.Pandoc.Data (which we forgot
  to export anyway), we simply add a record for "README" to the
  `dataFiles` lookup table.  This allows simplifying some of the code
  for `readDefaultDataFile` in SHared.

* As a bonus, `pandoc --print-default-data-file README` now works.
2015-06-28 20:59:18 -07:00
John MacFarlane
fe625e053d New method for producing man pages.
This change adds `--man1` and `--man5` options to pandoc, so
pandoc can generate its own man pages.

It removes the old overly complex method of building a separate
executable (but not installing it) just to create the man pages.

The man pages are no longer automatically created in the build
process.

The man/ directory has been removed.  The man page templates
have been moved to data/.

New unexported module:  Text.Pandoc.ManPages.

Text.Pandoc.Data now exports readmeFile, and `readDataFile`
knows how to find README.

Closes #2190.
2015-06-28 14:39:17 -07:00