Commit graph

6416 commits

Author SHA1 Message Date
John MacFarlane
6532950b26 MediaBag: ensure that / is always used as path separator. 2015-09-26 22:40:58 -07:00
John MacFarlane
90914d2d16 appveyor.yml: revert to non-stack version. 2015-09-26 21:27:34 -07:00
Emily Eisenberg
149f0f6a4b Update KaTeX JS and CSS versions.
Update the default KaTeX JS/CSS links to the current version. KaTeX v0.5.1 has far more functions and symbols than v0.1.0, so it seems like a better default. I think technically this might break compatibility because we released a breaking change due to the greediness of the `\color` function, but this probably has very little impact.
2015-09-26 21:15:13 -07:00
John MacFarlane
be0136230d appveyor.yml: Get submodules. 2015-09-26 18:13:55 -07:00
John MacFarlane
5bff473650 appveyor: Fixed stack.exe path. 2015-09-26 18:11:34 -07:00
John MacFarlane
4e1cfee30a More appveyor fixes. 2015-09-26 18:10:26 -07:00
John MacFarlane
64d683b84b appveyor.yml: changed clone dir. 2015-09-26 18:04:50 -07:00
John MacFarlane
8b65b38dd2 New appveyor.yml using stack.
Copied, mostly, from stack's repo.
2015-09-26 17:58:12 -07:00
John MacFarlane
0a2773bd1b Changes to templates to support handling of bidirectional text.
(LaTeX, ConTeXt, HTML)
2015-09-26 17:07:48 -07:00
John MacFarlane
fdfc961284 Merge pull request #2419 from mb21/bidi
Support bidirectional text output with XeLaTeX, ConTeXt and HTML
2015-09-26 17:06:56 -07:00
John MacFarlane
72bade01f5 Slightly improved description of citation locators in README. 2015-09-26 16:18:32 -07:00
John MacFarlane
22fe3e0b4e Merge pull request #2418 from nickbart1980/patch-3
Give details of locator terms
2015-09-26 16:14:43 -07:00
mb21
7b0c1e0d37 Support bidirectional text output with XeLaTeX, ConTeXt and HTML
closes #2191
2015-09-26 22:22:24 +02:00
nickbart1980
d2bffb098e Give details of locator terms 2015-09-26 17:59:26 +00:00
John MacFarlane
29668552c8 Removed unneeded import. 2015-09-26 10:27:55 -07:00
John MacFarlane
da1b599c96 Correctly recognize book documentclass in metadata.
Closes #2395.
2015-09-25 23:28:38 -07:00
John MacFarlane
dcb0b02aa3 Markdown reader: handle 'id' and 'class' in parsing key/value attrs.
# Header {id="myid" class="foo bar"}

is now equivalent to

    # Header {#myid .foo .bar}

Closes #2396.
2015-09-25 23:01:34 -07:00
John MacFarlane
8a43530380 LaTeX, ConTeXt templates: more specific language variables.
Instead of directly using `lang`, we now use `babel-lang` and
`polyglossia-lang` and `context-lang`.  These variables are set by
the writers to the necessary values, based on the `lang` variable
(which now always takes a value in BCP47 format).
2015-09-25 10:37:12 -07:00
Frerich Raabe
eee992520c Improve text generated for <xref> by employing docbook-xsl heuristics
docbook-xsl, a set of XSLT scripts to generate HMTL out of DocBook,
tries harder to generate a nice xref text. Depending on the element
being linked to, it looks at the title or other descriptive child
elements. Let's do that, too.
2015-09-24 18:28:51 +02:00
Frerich Raabe
35f12b5095 Added proper support for DocBook 'xref' elements
'xref' is used to create cross references to other parts of the
document. It is an empty element - the cross reference text depends on
various attributes. Quoting 'DocBook: The Definitive Guide':

  1. If the endterm attribute is specified on xref, the content of the
  element pointed to by endterm will be used as the text of the
  cross-reference.

  2. Otherwise, if the object pointed to has a specified XRefLabel, the
  content of that attribute will be used as the cross-reference text.
2015-09-24 18:26:55 +02:00
John MacFarlane
0c7d6fbaba Allow syb 0.6. 2015-09-23 12:30:14 -07:00
Frerich Raabe
f6538144f0 Pass the parsed DocBook content along the state of readDocBook
Having access to the entire document will be needed when handling
elements which refer to other elements. This is needed for e.g. <xref>
or <link>, both of which reference other elements (by the 'id'
attribute) for the label text.

I suppose that in practice, the [Content] returned by parseXML always
only contains one 'Elem' value -- the document element. However, I'm not
totally sure about it, so let's just pass all the Content along.
2015-09-23 19:31:25 +02:00
Frerich Raabe
3564cd82ca Minor refactoring to readDocBook
I plan to use the parsed and normalized XML tree read in readDocBook in
other places - prepare that commit by factoring this code out into a
separate, shared, definition.
2015-09-23 19:25:58 +02:00
John MacFarlane
72e71a1dad LaTeX reader: support longtable.
Closes #2411.
2015-09-23 08:34:37 -07:00
John MacFarlane
f232a0a720 Merge pull request #2369 from mb21/language-variables
`lang` variable is now in BCP47 format
2015-09-22 22:21:06 -07:00
John MacFarlane
d25a37c122 Allow aeson 0.10. 2015-09-20 13:19:16 -07:00
John MacFarlane
9b033672e4 Merge pull request #2406 from tarleb/org-verse-fix
Make sure verse blocks can contain empty lines
2015-09-20 13:02:47 -07:00
John MacFarlane
54526665c3 Merge pull request #2405 from lierdakil/rest-normalize-amend
[RST Writer] Don't normalize heading levels below input minimum
2015-09-19 23:32:23 -07:00
Albert Krewinkel
8007dd97b5 Make sure verse blocks can contain empty lines
The previous verse parsing code made the faulty assumption that empty
strings are valid (and empty) inlines.  This isn't the case, so lines
are changed to contain at least a newline.

It would generally be nicer and faster to keep the newlines while
splitting the string.  However, this would require more code, which
seems unjustified for a simple (and fairly rare) block as *verse*.

This fixes #2402.
2015-09-19 22:02:43 +02:00
Nikolay Yakimov
5788f62ef5 [RST Writer] Don't normalize heading levels below input minimum 2015-09-19 17:45:54 +03:00
John MacFarlane
4d49f76dbb Markdown writer: in TOC, add links to headers.
Closes #829.
2015-09-17 11:41:05 -07:00
John MacFarlane
f2f35224f6 sample.lua - define CaptionedImage, add newline at end.
Cloess #2393.
2015-09-15 09:28:18 -07:00
John MacFarlane
6dcfa7e07b Tests: docx writer tests now use "../data" for data directory.
This allows tests  to be run without installing first.
2015-09-09 10:39:20 -07:00
John MacFarlane
bee255cbfe Use user data directory for reference docx archive.
This allows the test suite to work without installing pandoc first.
It also brings the docx writer in line with the odt writer.
2015-09-09 10:16:45 -07:00
John MacFarlane
7f515add58 stack.yaml - bump to latest LTS Stackage. 2015-09-09 09:58:09 -07:00
John MacFarlane
546201cb46 Removed obsolete reference to default.csl.
Closes #2372.

@cinaeco as the pandoc-citeproc man page describes, the current
behavior if no style is specified is to look in
`~/.csl/chicago-author-date.csl`, and if nothing is found there,
to use a default version of chicago-author-date.csl.

You may want to open a separate issue on jgm/pandoc-citeproc
suggesting the use of `default.csl` rather than
`chicago-author-date.csl`.  I agree that this would make sense.
2015-08-25 13:35:21 -07:00
mb21
622df7034c lang variable is now in BCP47 format
strings are converted for LaTeX and ConTeXt output, closes #1614
2015-08-20 23:17:47 +02:00
John MacFarlane
761e1edc30 Merge pull request #2364 from gbataille/bugDoc
[BUG] Haddock : * and ^ to be escaped in docs
2015-08-17 12:15:32 -07:00
Grégory Bataille
0dff30271c [BUG] Haddock : * and ^ to be escaped in docs 2015-08-17 09:03:33 +02:00
John MacFarlane
a0ddabb206 stack-yaml: use lts 3.1 resolver. 2015-08-16 20:48:06 -07:00
John MacFarlane
8883261b6e Merge pull request #2352 from ousia/master
added selectors for nested emphasis (epub.css)
2015-08-16 10:16:03 -07:00
John MacFarlane
1e17922b95 Use cabal-install-head in travis for ghc 7.10.1.
See
https://www.reddit.com/r/haskell/comments/3f4bgr/the_version_of_cabal_being_used_has_changed/

Maybe this will fix the Cabal version mismatch problem?
2015-08-15 11:50:07 -07:00
John MacFarlane
b725b45c83 Travis: removed diagnostics, add cabal path to PATH, back to ghc 7.10.1.
ghc 7.10.2 isn't whitelisted yet.
https://github.com/travis-ci/travis-ci/issues/4478
2015-08-15 11:13:29 -07:00
John MacFarlane
3a9352957a Added some travis diagnostics. 2015-08-15 11:10:29 -07:00
John MacFarlane
cc37c5470d Travis: build with ghc 7.10.2 instead of 7.10.1. 2015-08-15 10:45:24 -07:00
John MacFarlane
8ae0c857f9 Use real jpg (not empty) for docx tests to avoid warning. 2015-08-15 10:40:22 -07:00
John MacFarlane
1f00a5395f RST reader: better handling of indirect roles.
Previously the parser failed on this kind of case

    .. role:: indirect(code)

    .. role:: py(indirect)
       :language: python

    :py:`hi`

Now it currectly recognizes `:py:` as a code role.

The previous test for this didn't work, because the
name of the indirect role was the same as the language
defined its parent, os it didn't really test for this
behavior.  Updated test.
2015-08-15 10:22:47 -07:00
John MacFarlane
8c579a5daa Merge pull request #2360 from jg/issue-2354
Org reader: add auto identifiers if not present on headers
2015-08-15 09:47:56 -07:00
John MacFarlane
388fe3053a Added note to CONTRIBUTING.md about ghc versions and travis. 2015-08-15 09:43:14 -07:00
Juliusz Gonera
f1c87ed164 Org reader: add auto identifiers if not present on headers
Refs #2354

This should also fix the table of contents (--toc) when generating a html file
from org input
2015-08-15 07:57:48 +02:00