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

6976 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
d5f67829dc Added some entity tests in Markdown reader tests. 2016-01-08 17:33:37 -08:00
John MacFarlane
5884ff6994 Work around tagsoup bug - not allowing uppercase x in hex entities. 
Issue submitted at tagsoup.
 2016-01-08 17:33:32 -08:00
John MacFarlane
12a5bd3c8d Entity handling fixes: 
- Text.Pandoc.XML.fromEntities:  handle entities without a
  semicolon. Always lookup character references with the
  trailing ';', even if it wasn't present.  And never add
  it when looking up numerical entities.  (This is what
  tagsoup seems to require.)
- Text.Pandoc.Parsing.characterReference:  Always lookup
  character references with the trailing ';', and leave off
  the ';' when looking up numerical entities.

This fixes a regression for e.g. `⟨`.
 2016-01-08 17:08:01 -08:00
John MacFarlane
52d95ddde1 Merge pull request #2632 from matt-e/fix-stack-build 
Fix typo in stack build files
 2016-01-07 17:41:33 -08:00
Matthew Eddey
1730e63950 Update stack.yaml 
Another typo?
 2016-01-07 16:22:53 -08:00
Matthew Eddey
dbff1d1f38 Update stack.full.yaml 2016-01-07 16:20:46 -08:00
John MacFarlane
c30ad6f1ce stack.yaml - use older aeson to avoid excessive memory use on compile. 2016-01-07 14:16:37 -08:00
John MacFarlane
0602a22071 deb/stack.yaml - use older aeson to avoid excessive memory use in compile. 
With aeson 0.10 I was getting an out of memory error on a 2GB Ubuntu
64-bit VM.
 2016-01-07 14:14:58 -08:00
John MacFarlane
eadf5ad2c1 deb/Makefile - make DEBPKGVER work. 2016-01-07 13:43:57 -08:00
John MacFarlane
f010b39999 debpkg - back to lts-3.20. 
We get memory exhaustion on lts-4.0.  My guess is that it's
due to aeson-0.10.
 2016-01-07 12:22:17 -08:00
John MacFarlane
6cf610d811 More deb packaging tweaks. 2016-01-07 11:40:01 -08:00
John MacFarlane
6cb94d593f Minor tweak in how make_deb.sh is called. 2016-01-07 11:37:31 -08:00
John MacFarlane
8a5950a674 deb/make_deb.sh - removed 'stack clean'. 2016-01-07 11:37:31 -08:00
John MacFarlane
9320d359a2 Merge pull request #2629 from tarleb/org-noexport-fix 
Fix function dropping subtrees tagged :noexport:
 2016-01-07 11:34:27 -08:00
John MacFarlane
d2dfaccb99 make_deb.sh - use --install-ghc flag instead of stack setup. 2016-01-07 11:33:22 -08:00
John MacFarlane
646ef17e55 deb pkg generation improvements. 
Allow setting DEBPKGVER.
Bump to stack lts-4.0.
Make output verbose.
 2016-01-07 11:24:51 -08:00
John MacFarlane
669153eace deb/Makefile: Renamed COMMIT -> TREE 2016-01-07 11:13:06 -08:00
John MacFarlane
af706bc477 make_deb.sh - added --stack-setup-yaml. 2016-01-07 11:12:59 -08:00
John MacFarlane
510a539009 Upgrade hsb2hs.yaml lts resolver. 2016-01-07 11:12:52 -08:00
Albert Krewinkel
b3b00da43d Fix function dropping subtrees tagged :noexport: 
Continue scanning for comment subtrees beyond only the first block.

Note to self: when writing an recursive function, don't forget to, you
know, actually recurse.

Shout to @mrvdb for noticing this.

This fixes #2628.
 2016-01-07 19:56:44 +01:00
John MacFarlane
c4fdf28815 Markdown reader: renormalize table column widths if they exceed 100%. 
Closes #2626.
 2016-01-07 10:40:30 -08:00
John MacFarlane
a5efd2af11 Improved default template lookup for custom lua scripts. 
Previously, if you tried to do `pandoc -s -t /path/to/lua/script.lua`,
pandoc would look for the template in
`~/.pandoc/templates/default./path/to/lua/script.lua`.
With this change it will look in the more reasonable
`~/.pandoc/templates/default.script.lua`.

This makes it possible to store default templates for custom
writers.

Closes #2625.
 2016-01-06 15:47:09 -08:00
John MacFarlane
f6fe430400 stack.yaml, stack.full.yaml - use lts-4.0 resolver. 2016-01-06 14:52:30 -08:00
John MacFarlane
197f301795 Revert "Make file globbing work on windows." 
This reverts commit 363ecfebc3.
 2016-01-06 11:11:59 -08:00
John MacFarlane
363ecfebc3 Make file globbing work on windows. 
Windows cmd doesn't expand wildcards; the application has to
do this.  So on windows we use 'glob' to expand.
 2016-01-06 10:44:56 -08:00
John MacFarlane
73d1175838 stack.yaml: bump pandoc-types version to 1.16.0.1. 2016-01-06 10:44:38 -08:00
John MacFarlane
2aee5a3660 Merge pull request #2622 from conklech/ignore-stack 
Add .stack-work to gitignore
 2016-01-05 20:59:35 -08:00
Christian Conkle
45f5fc99e9 Add .stack-work to gitignore 
The .stack-work directory is analogous to a cabal sandbox;
it comprises temporary build artifacts.
 2016-01-05 19:05:54 -08:00
John MacFarlane
a796538d84 RST, Markdown writers: Fixed rendering of grid tables with blank rows. 
Closes #2615.
 2016-01-05 14:04:10 -08:00
John MacFarlane
a81b0932e5 Go back to testing with ghc 7.10.2. 
Avoids the dreaded "the version of cabal being used has
changed" error.

https://www.reddit.com/r/haskell/comments/3f4bgr/the_version_of_cabal_being_used_has_changed/
 2016-01-05 13:57:35 -08:00
John MacFarlane
e792920d4a Regenerated .travis.yml to include 7.10.3. 2016-01-05 11:28:42 -08:00
John MacFarlane
51a415edab Added 7.10.3 to make_travis_yml.hs known versions. 2016-01-05 11:28:18 -08:00
John MacFarlane
694eb87b48 Updated .travis.yml, added ghc 7.10.3 to tested-with. 2016-01-05 10:51:16 -08:00
John MacFarlane
4990350fc7 Fixed v1.16 reversion with --latex-engine. 
In 1.16 --latex-engine raises an error if a full path is
given. This commit fixes this reversion. Closes #2618.
 2016-01-04 22:44:50 -08:00
John MacFarlane
a6d20b32c7 windows/stack.yaml - use local pandoc-citeproc. 
I'm not sure why this is needed, but it is. Otherwise
the build fails.
 2016-01-04 07:59:07 -08:00
John MacFarlane
1cee48158e Updated binary package stack.yamls to ensure pandoc-citeproc... 
is built with embed_data_files. This fixes a problem with
the original 1.16 binary packages.
 2016-01-03 20:52:59 -08:00
John MacFarlane
97c9691696 Textile reader: don't allow block HTML tags in inline contexts. 
The reader previously did allow this, following redcloth,
which happily parses

    Html blocks can be <div>inlined</div> as well.

as

    <p>Html blocks can be <div>inlined</div> as well.</p>

This is invalid HTML, and this kind of thing can lead
to parsing problems (stack overflows) as well.  So this
commit undoes this behavior.  The above sample now produces;

    <p>Html blocks can be</p>
    <div>
    <p>inlined</p>
    </div>
    <p>as well.</p>
 2016-01-02 22:34:06 -08:00
John MacFarlane
90a2df3f7c Fixed debpkg target. 2016-01-02 16:54:45 -08:00
John MacFarlane
13f04ce1cc Fixed windows stack.yaml. 2016-01-02 15:54:23 -08:00
John MacFarlane
1c0ebe600c Updated man page. 2016-01-02 15:52:49 -08:00
John MacFarlane
b5d9798618 Updated filter for man pages. 2016-01-02 15:52:33 -08:00
John MacFarlane
4edd1a7873 Updated stack.yaml files. 
Use latest resolver.
Use latest pandoc-citeproc and pandoc-types release.
 2016-01-02 12:37:23 -08:00
John MacFarlane
44c762e305 Updated changelog. 2016-01-02 12:28:49 -08:00
John MacFarlane
75695b1817 MediaWiki reader: interpret markup inside <tt>, <code>. 
Closes #2607.
 2016-01-02 12:26:16 -08:00
John MacFarlane
a68e072bac MediaWiki writer: fix spacing issues. 
+ Start cell on new line unless it's a single Para or Plain.
+ For single Para or Plain, insert a space after the `|` to
  avoid problems when the text begins with a character like
  `-`.

Closes #2604, closes #2606.
 2016-01-02 12:14:12 -08:00
John MacFarlane
6ed41cbdcc Tweaks to changelog. 2016-01-01 20:59:12 -08:00
John MacFarlane
f81c09848c Updated changelog. 2016-01-01 20:52:52 -08:00
John MacFarlane
8908205fab Allow process 1.4 2016-01-01 20:36:58 -08:00
John MacFarlane
cfa6f9f3ab Allow binary 0.8 2016-01-01 20:35:38 -08:00
John MacFarlane
54f4faa76c HTML slide templates: add toc. (Andrew Dunning) 2016-01-01 20:33:43 -08:00