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

5863 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
743b680649 Merge branch 'master' of github.com:jgm/pandoc 2015-03-28 13:10:32 -07:00
John MacFarlane
c6aaeb3c4f Fixed typo in lhs-test.html. 2015-03-28 13:02:59 -07:00
John MacFarlane
b74af6762d Merge branch 'mpickering-errortype' 2015-03-28 12:15:09 -07:00
John MacFarlane
6f4018f8d3 Fixed lhs writer tests (overflow-x, not x-overflow). 2015-03-28 12:13:27 -07:00
John MacFarlane
6a3a04c428 Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype 
Conflicts:
	benchmark/benchmark-pandoc.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
	tests/Tests/Readers/LaTeX.hs
 2015-03-28 12:12:48 -07:00
Nikolay Yakimov
d744b83b61 Create reference files from unpacked archives with helper program 2015-03-28 10:36:53 -07:00
Nikolay Yakimov
1710c4bd8b Add unpacked reference data 2015-03-28 10:26:08 -07:00
Nikolay Yakimov
f10a8a3239 Remove pre-built reference files 2015-03-28 10:26:08 -07:00
John MacFarlane
5f74db8605 Updated tests for new highlighting-kate behavior. 2015-03-28 10:10:33 -07:00
John MacFarlane
b5b11f31a6 Fixed ghc-prof-options. 2015-03-28 10:10:14 -07:00
John MacFarlane
3f89e3f332 Require highlighting-kate >= 0.5.14 
This ensures that all code blocks will be wrapped in a div
with class sourceCode.  Also, the default highlighting CSS
now adds `div.sourceCode { x-overflow: auto; }`, which means
that code blocks (even with line numbers) will acquire a scroll
bar on screens too small to display them (e.g. mobile phones).

See #1903 and jgm/highlighting-kate#65.
 2015-03-28 08:18:01 -07:00
John MacFarlane
12c9aa00de pandoc.cabal: changed default profiling options. 
Removed `-auto-all` and `-caf-all` at cabal's suggestion.
Use `-auto-exported` instead.
 2015-03-27 22:12:42 -07:00
John MacFarlane
86a44422c1 Merge pull request #2030 from lierdakil/issue2026 
Fixes for #2026
 2015-03-27 21:30:25 -07:00
John MacFarlane
3a4ef013d8 travis script: build with ghc 7.10.1. 
For now -Werror is turned of for 7.10.1.
 2015-03-27 21:14:32 -07:00
Nikolay Yakimov
5f7639a0d6 Markdown Reader: Require nonempty value in mmd title block 
`many1Till` will gobble up newline, and then whole following line will
match, so I had to use guard here.
 2015-03-28 07:07:03 +03:00
Nikolay Yakimov
7091002966 Markdown Reader: Req. " " after key in mmd title block 
Require space after key-value delimiter colon in mmd title block.
Issue #2026
Amend: parsec's `spaces` include newlines, but we don't want that. Had
to make custom `spaceNoNewline` parser here
 2015-03-28 07:05:02 +03:00
Nikolay Yakimov
6960b2a4cc Markdown Reader: Disable meta exts for meta values 
Disable all metadata block extensions when parsing metadata field
values. Issue #2026
 2015-03-28 02:53:33 +03:00
John MacFarlane
dd5d3379e8 Require highlighting-kate 0.5.13. 
Closes #1903.
 2015-03-27 13:45:22 -07:00
John MacFarlane
49e1b83ac6 README: make defn lists for options all "loose" for consistency. 2015-03-27 10:58:43 -07:00
Matthew Pickering
3341c7851a Merge pull request #2023 from lierdakil/fix-stylemap 
Docx Writer: Fix StyleMap
 2015-03-24 17:31:17 +00:00
Nikolay Yakimov
d09b7593f6 Docx Writer: Fix StyleMap 
I've messed up badly with it, so it didn't work properly most of the
time. At the plus side, fallback mechanic is working wonderfully.
 2015-03-24 19:24:29 +03:00
John MacFarlane
75a2a7ba69 Allow pipe tables with header but no body. 
Closes #2017.
 2015-03-23 20:26:56 -07:00
John MacFarlane
c302bdcdbe Merge pull request #1947 from mpickering/Fmonad 
Remove F Monad from Markdown and Org readers.
 2015-03-22 22:40:20 -07:00
Matthew Pickering
65d67dcb51 Fix accidently usage of list monad instance 2015-03-23 00:14:02 +00:00
Matthew Pickering
84d6703ea7 Add missing import 2015-03-22 23:31:08 +00:00
Matthew Pickering
4ce6471c12 Factor out "returnState" into Parsing module 2015-03-22 21:47:28 +00:00
Matthew Pickering
9e150dd7cf HLint changes 2015-03-22 21:47:28 +00:00
Matthew Pickering
17b317268b Remove F Monad from Markdown reader 2015-03-22 21:47:28 +00:00
Matthew Pickering
7690e1d17f Generalise signature of addWarning 2015-03-22 20:11:30 +00:00
Matthew Pickering
9ca34cc9a9 Add check to see whether in a footnote to ParserState (to avoid circular footnotes) 2015-03-22 20:11:30 +00:00
Matthew Pickering
de093b4e6e Remove F monad from Parsing 2015-03-22 20:11:30 +00:00
Matthew Pickering
5dc902cbcc Changed parseWithWarnings to the more general returnWarnings parser transformer 2015-03-22 20:11:30 +00:00
Matthew Pickering
f6419a2691 Remove F monad from Org Reader. 2015-03-22 20:11:29 +00:00
Matthew Pickering
8271fb574e Added generalize function which can be used to lift specialised parsers. 
Monad m => Parsec s st a -> Parsec T s st m a
 2015-03-22 18:57:36 +00:00
John MacFarlane
b983adf0d0 Markdown writer: fixes for GHC 7.10. 2015-03-19 11:48:05 -07:00
John MacFarlane
8b8a613cd4 Bumped upper bounds for filepath, QuickCheck. 
Bumped lower bounds for highlighting-kate, texmath.
 2015-03-19 11:47:20 -07:00
John MacFarlane
787664d5fc Merge pull request #2013 from ShabbyX/master 
Derive from Data and Typeable for libpandoc
 2015-03-19 09:16:54 -07:00
Shahbaz Youssefi
e952d6633f Derive from Data and Typeable for libpandoc 
This commit derives a few types from Data and Typeable used by
libpandoc.

Requires corresponding pull-request for Highlighting-Kate:

    https://github.com/jgm/highlighting-kate/pull/64

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
 2015-03-19 17:07:18 +01:00
John MacFarlane
0a82e7e4b1 Fixed a compiler warning. 2015-03-17 17:06:19 -07:00
John MacFarlane
e0d234e54d Added CommonMark reader using cmark (libcmark bindings). 
- Added commonmark as an input format.
- Added `Text.Pandoc.Readers.CommonMark.readCommonMark`.
- For now, we use the markdown writer to generate benchmark
  text for the CommonMark reader.  We can change this when we
  get a writer.
 2015-03-17 16:15:57 -07:00
John MacFarlane
5721a5d34b Bump criterion version bound. 2015-03-17 16:15:56 -07:00
John MacFarlane
619b2e8ca2 Merge pull request #1968 from lierdakil/issue1607 
Fixes for multiple docx writer style bugs.
 2015-03-16 12:02:40 -07:00
John MacFarlane
6fc578b79a Merge pull request #2008 from tomleese/fix-github-phrasing 
Replace occurrences of 'Github' with 'GitHub'
 2015-03-16 08:26:46 -07:00
Tom Leese
3dba66bf5d Replace occurrences of 'Github' with 'GitHub' 
The website is called 'GitHub' afterall.
 2015-03-16 09:28:45 +00:00
John MacFarlane
fcf1cd2f31 AsciiDoc writer: avoid wrapping after list marker. 
Closes #1858.
 2015-03-15 15:43:05 -07:00
John MacFarlane
451019290b AsciiDoc writer: insert some needed blank lines. 
Closes #1860.
 2015-03-15 14:48:01 -07:00
John MacFarlane
f6e46b7146 Moved and rewrote documentation for shortcut_reference_links ext. 2015-03-15 12:01:14 -07:00
John MacFarlane
0deb7c507d Merge pull request #1989 from zudov/shortcut_ref_link_pr 
Support shortcut reference links in markdown writer
 2015-03-15 11:58:30 -07:00
John MacFarlane
967c13560e Really fix #1394. 
This closes #1394, which actually wasn't fixed by the earlier commit.
This ensures that lists in speaker notes don't add "fragment" classes,
which can cause additional keypresses to be needed to advance a slide.
 2015-03-14 23:32:35 -07:00
John MacFarlane
3b962a5277 Properly gobble spaces after \\. 
Closes #2007.
 2015-03-14 23:12:04 -07:00