Commit graph

4695 commits

Author SHA1 Message Date
John MacFarlane
7524e8e1f0 Windows package script: use cabal sandbox, not cabal-dev. 2014-05-05 07:08:57 -07:00
John MacFarlane
f31e002726 make_osx_package: Use cpphs to avoid problems with clang cpp.
See https://github.com/jgm/pandoc/issues/1172
2014-05-04 18:48:38 -07:00
John MacFarlane
0edbb5597c Updated changelog. 2014-05-04 16:34:36 -07:00
John MacFarlane
dbd6c1540f Fixed the fix to #1154.
We need to strip off up to 4 spaces, not up to 3.
2014-05-04 16:21:18 -07:00
John MacFarlane
51aa304834 LaTeX writer: Fixed inconsistencies with reference escaping.
- toLabel is now monadic, and it does the needed string escaping.
- Closes #1130.
2014-05-04 14:43:05 -07:00
John MacFarlane
9fe669976c README: Clarified citation key syntax. 2014-05-04 12:21:34 -07:00
John MacFarlane
26dc79cdd1 Clarified use of --natbib and --biblatex.
Not for use with pandoc-citeproc.
2014-05-04 12:18:44 -07:00
John MacFarlane
0c7e084342 Docx writer: Fall back on distribution reference.docx.
* Undid changes to parseXml in last commit.
* Instead of a string fallback, we have parseXml fall back
  on the reference.docx that comes with pandoc if the user's
  reference.docx does not contain a needed file.
* Closes #1185.
2014-05-04 10:54:45 -07:00
John MacFarlane
d728715981 Docx writer: Added ability to give fallback in parseXml. 2014-05-04 10:45:20 -07:00
John MacFarlane
1e50424892 Added test for #1154. 2014-05-04 08:19:48 -07:00
John MacFarlane
3e42f08e87 Markdown reader: Fixed bug with unwanted code in lists.
Closes #1154.

When reading a raw list item, we now strip off nonindent
spaces.
2014-05-04 08:07:17 -07:00
John MacFarlane
6b532c2131 Added Tests.Writer.AsciiDoc to repository. 2014-05-03 22:33:36 -07:00
John MacFarlane
9625cf6f40 README: Note about unnumbered being added to final 'References' sect. 2014-05-03 22:05:24 -07:00
John MacFarlane
96c0c950ca AsciiDoc writer: Handle multiblock table cells.
Closes #1246.
2014-05-03 21:31:53 -07:00
John MacFarlane
41c89d51c7 AsciiDoc writer: Added test for empty table cells. 2014-05-03 21:24:20 -07:00
John MacFarlane
fde52c25a6 AsciiDoc writer: Correctly handle empty table cells.
Closes #1245.
2014-05-03 21:08:45 -07:00
John MacFarlane
abd3a039b9 DocBook writer: Small tweaks to last commit.
* Use isTightList from Shared.
* Adjust writer test, since isTightList is a bit different from what
  was used before.

Closes #1250.
2014-05-03 20:45:38 -07:00
Neil Mayhew
ccbf4fc9c2 Distinguish tight and loose lists in Docbook output
Determined by the first block of the first item being Plain.
2014-05-03 18:37:02 -07:00
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