Commit graph

4677 commits

Author SHA1 Message Date
John MacFarlane
2ba7873086 LaTeX reader: Fixed regression introduced with last commit.
Tests now pass again.
2014-05-03 18:34:23 -07:00
John MacFarlane
743dac493f LaTeX reader: Better error messages with include files.
Closes #1274.

Rewrote handleIncludes.

We now report the actual source file and position where the error
occurs, even if it is included.  We do this by inserting special
commands, `\PandocStartInclude` and `\PandocEndInclude`, that encode
this information in the preprocessing phase.

Also generalized the types of a couple functions from
`Text.Pandoc.Parsing`.
2014-05-03 17:37:54 -07:00
John MacFarlane
4c43824203 Fixed empty reference links. Closes #1186.
Includes test.
2014-05-02 22:58:47 -07:00
John MacFarlane
007eb96e06 Markdown reader: Make one-column pipe tables work.
Closes #1218.
2014-05-01 09:23:21 -07:00
John MacFarlane
b306405caa Merge pull request #1272 from tarleb/link-types
Org reader: add support for custom link types
2014-05-01 08:44:05 -07:00
Albert Krewinkel
8726eebcd3 Org reader: Add support for custom link types
Org allows users to define their own custom link types.  E.g., in a
document with a lot of links to Wikipedia articles, one can define a
custom wikipedia link-type via

    #+LINK: wp https://en.wikipedia.org/wiki/

This allows to write [[wp:Org_mode][Org-mode]] instead of the
equivallent [[https://en.wikipedia.org/wiki/Org_mode][Org-mode]].
2014-05-01 11:50:32 +02:00
John MacFarlane
ac104c4fdb Updated tests for new LaTeX template. 2014-04-30 23:29:10 -07:00
John MacFarlane
9ea9b916af Use \setkeys{Gin}{} to set appropriate defaults for \includegraphics.
In pandoc and beamer templates. Thanks to Yihui Xie.
2014-04-30 23:25:07 -07:00
John MacFarlane
eaba340b93 RST reader: Some fixes to last change, and use "author" not "authors".
(in metadata)
2014-04-30 11:28:18 -07:00
John MacFarlane
81bf82c258 RST reader: Better handling of directives.
* We now correctly handle field lists that are indented more than
  3 spaces.
* We treat an "aafig" directive as a code block with attributes,
  so it can be processed in a filter.  (Closes #1212.)
2014-04-30 09:59:36 -07:00
John MacFarlane
093229dc35 ConTeXt writer: Improved autolinks.
Closes #1270.
2014-04-30 08:58:10 -07:00
Albert Krewinkel
a22b3a218d gitignore: Ignore cabal's sandbox files 2014-04-30 11:21:29 +02:00
John MacFarlane
7f86f95f36 Require pandoc-types 1.12.3.3.
Fixes #1269.
2014-04-29 22:25:46 -07:00
John MacFarlane
f8a34f1694 Added Cite to Arbitrary instance.
See #1269.  This reveals some test failures.
2014-04-29 18:32:42 -07:00
John MacFarlane
b6ae5d5e99 ADded SmallCaps to Arbitrary instance. 2014-04-29 18:14:39 -07:00
John MacFarlane
d6ef7a465e Merge pull request #1268 from tarleb/copyright-housekeeping
Copyright housekeeping
2014-04-28 22:51:46 -07:00
John MacFarlane
5dfeb5d52f Allow html4 as synonym of html as reader.
It already worked for writer.
2014-04-27 21:01:30 -07:00
John MacFarlane
c8f97d3d41 Fix #1267.
We now check the writerName for a lua script in pandoc.hs, so that
lowercasing and format parsing aren't done.  Note this behavior
change: getWriter in Text.Pandoc no longer returns a custom writer on
input "foo.lua".
2014-04-27 20:56:50 -07:00
John MacFarlane
f80678df7f A bit of refactoring that shouldn't change any semantics.
In preparation for a fix to #1267.
2014-04-27 20:38:15 -07:00
Albert Krewinkel
a76869ced5 README: Update variable defaults documentation
The documented default values of variables now agree with their true
default values as defined in Writer/HTML.hs.
2014-04-27 21:21:20 +02:00
Albert Krewinkel
6cf60f2f8e COPYRIGHT: Remove outdated copyright statements
Some files are no longer distributed with pandoc, the respective
copyright and licensing information is removed.
2014-04-27 21:21:16 +02:00
Albert Krewinkel
fb24888f52 COPYRIGHT: Specifiy the version of the GPL
All code in pandoc licensed under the GPL version 2 or later is just
marked as being licensed under the GPL.  There are multiple versions of
the GPL, most notably version 2, version 3 and the Affero GPL.  As to
avoid possible confusion, licensing info is updated to be more specific
about the GPL and its version.
2014-04-27 19:51:14 +02:00
John MacFarlane
f81fc6c3bd Update latex reader test for change in latex reader.
We use 'author' for metadata, not 'authors'.
2014-04-26 12:32:22 -07:00
John MacFarlane
22e36e1040 LaTeX reader: Made \nocite work.
This adds nocite citations to a metadata field, `nocite`.
These will appear in the bibliography but not in the text
(unless you use a `$nocite$` variable in your template, of
course).
2014-04-26 12:14:42 -07:00
John MacFarlane
35ea8de369 HTML writer: improved detection of image links.
Previously image links with queries were not recognized,
leading to use of an embed tag rather than an img tag.
2014-04-26 12:04:08 -07:00
John MacFarlane
2b3926d63a Updated changelog. 2014-04-25 21:41:39 -07:00
John MacFarlane
a744e3868e Bump version to 1.12.4. 2014-04-25 20:14:39 -07:00
John MacFarlane
60297089f6 Merge pull request #1265 from tarleb/org-links
Improvements handling of internal links
2014-04-25 08:08:00 -07:00
Albert Krewinkel
b09412d852 LaTeX writer: Mark span contents with label if span has an ID
Prepend `\label{span-id}` to span contents iff `span-id` is defined.
2014-04-25 16:17:24 +02:00
Albert Krewinkel
2eec20d92f Org reader: Enable internal links
Internal links in Org are possible by using an anchor-name as the target
of a link:

[[some-anchor][This]] is an internal link.

It links <<some-anchor>> here.
2014-04-25 15:29:28 +02:00
John MacFarlane
cbeb3bb213 EPUB writer: Fixed some idrefs to match changes in ids. 2014-04-24 17:37:10 -07:00
John MacFarlane
aeec883e0e Merge pull request #1260 from joehillen/tabs-in-cabalfile
change tabs to spaces in pandoc.cabal
2014-04-24 16:48:02 -07:00
John MacFarlane
e6333a9d7c Markdown writer: Use proper escapes to avoid unwanted lists.
Previously we used 0-width spaces, an ugly hack.

Closes #980.
2014-04-24 16:44:49 -07:00
John MacFarlane
58c9946cda Bumped upper bounds for http-conduit and network. 2014-04-24 13:16:10 -07:00
John MacFarlane
b08de8fe35 Require aeson >= 0.7. 2014-04-24 11:55:20 -07:00
John MacFarlane
d16775e1c7 Render numbers in YAML metadata without decimals when possible.
The change to aeson > 0.7 caused numbers to be rendered with
decimals.  This change causes them to be rendered without decimals
wehn possible.
2014-04-24 11:09:07 -07:00
Albert Krewinkel
2f724aaaa4 Org reader: Read anchors as empty spans
Anchors (like <<this>>) are parsed as empty spans.
2014-04-24 17:57:06 +02:00
Albert Krewinkel
c128daba9d Org reader: Recognize plain and angle links
This adds support for plain links (like http://zeitlens.com) and angle
links (like <http://moltkeplatz.de>).
2014-04-24 17:55:24 +02:00
Albert Krewinkel
ec24f9761c RST reader: Remove duplicate 'http' in PEP links
The generated link to PEPs had a duplicate 'http://' in its URL.
2014-04-24 17:55:22 +02:00
John MacFarlane
e0688711fd EPUB writer: include extension in epub ids.
This fixes a problem with duplicate extensions for fonts and
images with the same base name but different extensions.

Closes #1254.
2014-04-23 10:23:02 -07:00
Joe Hillenbrand
8b0279b4ac change tabs to spaces in pandoc.cabal 2014-04-22 10:50:22 -07:00
John MacFarlane
bf0c725647 Merge pull request #1257 from tarleb/mathmlinhtml-deprecation-warning
MathMLinHTML: Fix deprecation warning
2014-04-21 12:32:57 -07:00
gwern
17d105a8a4 MathMLinHTML: Fix deprecation warning
The use of `nodeValue` on `Attr` objects causes a deprecation warning in
Firefox since version 7.  This patch causes calls to `value` instead of
`nodeValue` for all `Attr` objects.

This closes #362.
2014-04-20 08:53:59 +02:00
John MacFarlane
6a2361c457 Merge pull request #1256 from tarleb/org-reader-improvements
Org reader improvements
2014-04-19 20:35:41 -07:00
Albert Krewinkel
d44815c79b Add license statement for org reader files
This adds a brief note to the COPYRIGHT file, declaring the code in the
org-reader files to be licensed under the GPL.
2014-04-19 15:26:59 +02:00
Albert Krewinkel
8276449520 Org reader: Allow for compact definition lists
Use `Text.Pandoc.Shared.compactify'DL` to allow for compact definition
lists.
2014-04-19 15:13:16 +02:00
Albert Krewinkel
efebade38b Move compactify'DL from Markdown reader into Shared
The function `compactify'DL`, used to change the final definition item of a
definition list into a `Plain` iff all other items are `Plain`s as well, is
useful in many parsers and hence moved into Text.Pandoc.Shared.
2014-04-19 15:03:33 +02:00
Albert Krewinkel
8e91d362a3 Org reader: Fix parsing of footnotes
Footnotes can consist of multiple blocks and end only at a header or at
the beginning of another footnote.  This fixes the previous behavior,
which restricted notes to a single paragraph.
2014-04-19 14:40:46 +02:00
Albert Krewinkel
a69416091b Org reader: Fix distinction of images and normal links
Fixed a false assumption about the precedence of (&&) vs (||).
2014-04-19 11:25:39 +02:00
Albert Krewinkel
6ded3d41d9 Org reader: Apply captions to code blocks and tables
The `Table` blocktype already takes the caption as an argument, while code
blocks are wrapped in a `Div` block together with a labelling `Span`.
2014-04-19 10:41:45 +02:00