Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
6527 commits 2 branches 0 tags 65 MiB
Commit graph

6527 commits

This branch
This branch
All branches
Author SHA1 Message Date
nickbart1980
143093eabd Added de-CH-1901, fixed el-polyton 
el-polyton, not el-poly, see http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
 2015-10-26 10:34:32 +00:00
John MacFarlane
89d399b6b1 Merge pull request #2481 from mb21/textarabic 
LaTeX writer: \textarabic fix
 2015-10-25 12:42:41 -07:00
John MacFarlane
7d4f174047 Template improvements (Andrew Dunning). 
- Added `keywords` to HTML templates and fixed alignment.
- Updated dzslides template from source.
- Added `lang`, `dir`, `quotes` to HTML templates;
  always make author and date display conditional.
- Fixed `author` and `date` in asciidoc; added `keywords`, `abstract`.
- Updated tests.
 2015-10-25 12:28:28 -07:00
John MacFarlane
45df87cf15 Merge pull request #2477 from tarleb/org-toggling-header-args 
Org reader: allow toggling header args
 2015-10-25 12:10:07 -07:00
mb21
f3f6483510 LaTeX writer: \textarabic fix 2015-10-25 18:31:35 +01:00
Albert Krewinkel
27a8603278 Org reader: allow toggling header args 
Org-mode allows to skip the argument of a code block header argument if
it's toggling a value.  Argument-less headers are now recognized,
avoiding weird parsing errors.

The fixes are not exactly pretty, but neither is the code that was
fixed.  So I guess it's about par for the course.  However, a rewrite of
the header parsing code wouldn't hurt in the long run.

Thanks to @jo-tham for filing the bug report.

This fixes #2269.
 2015-10-25 08:54:00 +01:00
John MacFarlane
f3e559c43c deb/Makefile: added 'clean'. 2015-10-24 22:58:59 -07:00
John MacFarlane
c9693ae1f4 deb/Vagrantfile: share .., so we can put the deb there. 2015-10-24 22:57:16 -07:00
John MacFarlane
31e46c1cc1 Added Vagrantfile for building deb in vm. 
This should help in automating binary package creation.

'make package' will make the package.
'make package COMMIT=blah' will make the package from commit blah.
 2015-10-24 22:52:41 -07:00
John MacFarlane
34bcaed62a Fixed typo. 2015-10-24 22:18:13 -07:00
John MacFarlane
ac1c0a9334 Fixed typo. 2015-10-24 22:12:58 -07:00
John MacFarlane
a777c6e2ae Added Paths_pandoc to other-modules for executable stanza. 2015-10-24 22:11:46 -07:00
John MacFarlane
0914f7f713 make_deb: changed path for man page. 
stack doesn't install it as cabal did.
 2015-10-24 22:06:53 -07:00
John MacFarlane
f8e58dea02 Improved fetching of pandoc-citeproc man page. 2015-10-24 22:00:44 -07:00
John MacFarlane
797ec7cb75 Moved PATH setting in make_deb, make_osx_package. 
Otherwise 'which hsb2hs' won't find the local one.
 2015-10-24 21:23:40 -07:00
John MacFarlane
d7e6a95a3a Set paths in make_deb and make_osx_package. 
This is needed to include a locally installed hsb2hs.
 2015-10-24 21:22:24 -07:00
John MacFarlane
d355163b7d Changed path . to .. in deb/osx stack.yaml. 2015-10-24 21:17:05 -07:00
John MacFarlane
aafccdb0bd Changes for deb and osx package generators. 
- Use stack for make_deb.sh.
- Use osx/stack.yaml or deb/stack.yaml.
- deb/stack.yaml doesn't want the same ghc-options.
 2015-10-24 21:12:43 -07:00
John MacFarlane
68ca646e65 Added stack.hsb2hs.yaml, for easy installation of hsb2hs. 2015-10-24 16:59:05 -07:00
John MacFarlane
69178d5b0b make_osx_package: don't create man5. 2015-10-24 16:53:49 -07:00
John MacFarlane
8aa9e839c7 Merge pull request #2475 from tarleb/org-paragraph-before-list 
Org reader: fix paragraph/list interaction
 2015-10-24 15:18:42 -07:00
Albert Krewinkel
b27366780f Org reader: fix paragraph/list interaction 
Paragraphs can be followed by lists, even if there is no blank line
between the two blocks.  However, this should only be true if the
paragraph is not within a list, were the preceding block should be
parsed as a plain instead of paragraph (to allow for compact lists).

Thanks to @rgaiacs for bringing this up.

This fixes #2464.
 2015-10-24 19:05:56 +02:00
Andrew Dunning
7c20cf11cf Note expanded support for abstract, keywords. 
Based on <https://github.com/jgm/pandoc-templates/pull/144>, <https://github.com/jgm/pandoc-templates/pull/142>.
 2015-10-23 09:03:53 -04:00
John MacFarlane
a7150bb6b6 Fixed over-eager raw HTML inline parsing. 
Tightened up the inline HTML parser so it disallows
TagWarnings.

This only affects the markdown reader when the `markdown_in_html_blocks`
option is disabled.

Closes #2469.
 2015-10-22 21:18:06 -07:00
John MacFarlane
a21833b638 Avoid compiler warning for unused identifier. 2015-10-22 21:05:52 -07:00
John MacFarlane
317d9eea17 Changed § to % in operators from Odt.Arrows.Utils. 
This prevents problems building haddocks with "C" locale.

Closes #2457.
 2015-10-22 17:54:58 -07:00
John MacFarlane
48b68aac43 Textile writer: support start number in ordered lists. 
e.g. `#3`.

Partially addresses #2465.
TBD: reader support.
 2015-10-22 12:37:40 -07:00
Andrew Dunning
52e03308b8 Update LaTeX/ConTeXt variable usage in README. 
Accounts for changes in https://github.com/jgm/pandoc-templates/pull/141.
 2015-10-22 14:22:28 -04:00
John MacFarlane
652b60f141 Updated tests for latex/context template changes. 2015-10-20 15:22:52 -07:00
John MacFarlane
ece2a6c1a7 Merge pull request #2467 from adunning/patch-1 
Add new variables for ConTeXt template to README.
 2015-10-20 15:17:54 -07:00
Andrew Dunning
3ad6e586f8 Add new variables for ConTeXt template to README. 2015-10-20 18:07:45 -04:00
John MacFarlane
273853d5b8 LaTeX template: simplify hyperref usage. 
Andrew Dunning.  #139.
 2015-10-20 14:59:54 -07:00
John MacFarlane
eae24903ba ConTeXt template: link color to black, define all sections. 
Andrew Dunning.
 2015-10-20 13:39:01 -07:00
John MacFarlane
9f4faa5ea5 Update date on README. 2015-10-20 10:17:57 -07:00
John MacFarlane
8193ebcd99 Allow use of ConTeXt to generate PDFs. 
pandoc my.md -t context -o my.pdf

will now create a PDF using ConTeXt rather than LaTeX.

Closes #2463.
 2015-10-20 08:16:17 -07:00
John MacFarlane
82d2719e68 Fixed one test case. 2015-10-19 23:06:33 -07:00
John MacFarlane
48aaf1bced Updated latex, beamer templates to support language divs/spans. 
Mainly this adds a template variable that can be filled
by commands that make babel understand the polyglossia-style
language directives.

Thanks to mb21.
 2015-10-19 23:03:26 -07:00
John MacFarlane
b49ab06e96 Merge pull request #2458 from mb21/lang-inlines 
LaTeX and ConTeXt writers: support lang attribute on divs and spans
 2015-10-19 23:02:08 -07:00
John MacFarlane
5062e03a40 Use MarLinn's real name in changelog. 2015-10-19 09:49:15 -07:00
John MacFarlane
d028dcb8a9 Updated tests for template changes. 2015-10-18 21:58:10 -07:00
John MacFarlane
b2bf8608db HTML-based templates: Use en dash between title prefix & title. 
Instead of a hyphen.
(Andrew Dunning.)
 2015-10-18 21:51:49 -07:00
John MacFarlane
88099bb59a Merge pull request #2461 from classeur/master 
Fixed auto_identifiers examples
 2015-10-18 21:25:35 -07:00
John MacFarlane
448f5b151e Tests: Unset pandoc-version so we don't get the comment... 
in the man writer test.  Otherwise this needs updating
every version bump.
 2015-10-18 11:52:32 -07:00
John MacFarlane
3b8793304e Man template: make "generated by" comment conditional. 
This allows it to be disabled for automated tests, so
they needn't be updated every version bump.
 2015-10-18 11:51:30 -07:00
John MacFarlane
ea8da02cc7 stack.yaml : use 3.10 resolver. 2015-10-18 11:30:45 -07:00
mb21
fa2b26ddcb Added writers-lang-and-dir test, fixed ConTeXt writer test 
The writers-lang-and-dir testGroup tests LaTeX and ConTeXt
writers' language and directionality output
 2015-10-18 17:01:38 +02:00
mb21
9328f4cd3d LaTeX and ConTeXt writers: support lang attribute on divs and spans 
For LaTeX, also collect lang and dir attributes on spans and divs to set the lang,
otherlangs and dir variables if they aren’t set already. See #895.
 2015-10-18 17:01:37 +02:00
Benoit Schweblin
5f25cf7c9b Fixed auto_identifiers examples 2015-10-18 11:40:49 +01:00
John MacFarlane
7f5a677bbf Version bump to 1.15.1.1, updated changelog. 2015-10-17 22:23:37 -07:00
John MacFarlane
7f4b78c064 Text.Pandoc.Data: store paths in dataFiles using posix separators. 
This way we have uniform separators, whether on Windows or Linux.

This should solve a problem where on some Windows versions
the data files weren't being found.

Closes #2459.
 2015-10-17 22:04:02 -07:00