Commit graph

6957 commits

Author SHA1 Message Date
John MacFarlane
e32ab441be Updated tests for changes to latex template. 2015-10-04 21:52:08 -07:00
John MacFarlane
15a5993f2e Updated latex template to work better with tufte...
and other packages that include hyperref or color.

Thanks to Xavier Olive.
2015-10-04 21:44:07 -07:00
Ophir Lifshitz
dfd06467ea Docx Reader: Create special punctuation test 2015-10-04 06:11:07 -04:00
Ophir Lifshitz
0b899ce7ef Docx Reader: Parse soft, no-break hyphen elements 2015-10-04 06:11:07 -04:00
John MacFarlane
6d0e586b2d Template updates.
Beamer:  added `innertheme`, `outertheme` variables.

LaTeX:  added `mainfontoptions`, `sansfontoptions`,
`monofontoptions`, `mathfontoptions`, `fontfamilyoptions`.
2015-10-03 17:01:01 -07:00
John MacFarlane
747a7a4cf8 Allow HUnit 1.3 2015-10-03 16:19:53 -07:00
John MacFarlane
421845202d FIxed typo: Ext_superscript, Ext_subscript. 2015-10-03 16:03:40 -07:00
John MacFarlane
68c02e1d01 For markdown_mmd, add: implicit_figures, superscripts, subscripts.
See #2401.
2015-10-03 15:32:01 -07:00
Alex Vong
319832cc19 Set the template variable $pandoc-version$ to pandocVersion by default.
* src/Text/Pandoc/Writers/Man.hs: Set $pandoc-version$ to be pandocVersion.
2015-10-01 02:24:34 +08:00
Alex Vong
d7a19c22be Move the variable pandocVersion from src/Text/Pandoc.hs to
`src/Text/Pandoc/Shared.hs`, so that all Writers can access this variable
without importing `src/Text/Pandoc.hs`, preventing circular import.

* pandoc.hs: Import pandocVersion from `Text.Pandoc.Shared`.
* src/Text/Pandoc.hs: Remove the definition of pandocVersion
 and relevant import.
* src/Text/Pandoc/Shared.hs: Add the definition of pandocVersion
 and relevant import.
2015-10-01 02:24:34 +08:00
Alex Vong
f5e33e0dce Set the template variable $hyphenate$ to true by default
* src/Text/Pandoc/Writers/Man.hs: Set $hyphenate$ to be true.
2015-10-01 02:24:34 +08:00
John MacFarlane
4443af4d8d Beamer template: allow setting outer/inner theme. 2015-09-29 10:00:57 -07:00
John MacFarlane
eb27ef89bc appveyor.yml: removed part that builds the package. 2015-09-27 23:01:56 -07:00
John MacFarlane
06b761be5b appveyor.yml: Fixed another multiline statement. 2015-09-27 21:56:20 -07:00
John MacFarlane
01ddeda11f appveyor.yml: Another attempt to set VERSION. 2015-09-27 21:16:03 -07:00
John MacFarlane
057c75465d appveyor.yml: put whole for loop on one line. 2015-09-27 20:37:39 -07:00
John MacFarlane
3dcadf7ed9 appveyor.yml: another try in version extraction. 2015-09-27 18:46:34 -07:00
John MacFarlane
15512a6c10 appveyor.yml: removed :next label. 2015-09-27 18:28:28 -07:00
John MacFarlane
80fc5bcdf0 appveyor.yml: Tried another approach to get pandoc version. 2015-09-27 16:26:13 -07:00
John MacFarlane
f7e02b16d4 appveyor.yml: don't run tests for pandoc-citeproc.
They won't work til we upgrade HP version, because of
minor changes in aeson.
2015-09-27 15:34:06 -07:00
John MacFarlane
7ed18d4c37 appveyor.yml: use cmd instead of ps. 2015-09-27 12:04:23 -07:00
John MacFarlane
a66f683b3d appveyor.yml: Build pandoc-citeproc after main test. 2015-09-27 11:26:07 -07:00
John MacFarlane
360e35459f appveyor: cache Haskell Platform. 2015-09-27 09:40:44 -07:00
John MacFarlane
a3295f57d5 Merge pull request #2420 from xymostech/patch-1
Update KaTeX JS and CSS versions.
2015-09-27 09:32:02 -07:00
John MacFarlane
013b143427 appveyor.yml: fixed cabal flag. 2015-09-27 09:27:56 -07:00
John MacFarlane
4a7eaa71d0 appveyor: attempt to create msi package after build. 2015-09-27 09:13:37 -07:00
John MacFarlane
af8fb5e792 Removed unneeded imports. 2015-09-26 22:56:13 -07:00
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