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

1604 commits

Author SHA1 Message Date
Nikolay Yakimov
65c80822e7 Code cleanup 2015-03-03 13:08:52 +03:00
Nikolay Yakimov
409111f647 Started moving StyleMap out of writer code 2015-03-01 22:57:35 +03:00
John MacFarlane
47bfdca049 Markdown reader: check for tex macros after indented code. 
Closes #1973.
 2015-02-25 08:33:42 -08:00
Hans-Peter Deifel
2ca5101113 Org reader: Allow image links with non-image targets 
Org-Mode's own html exporter converts the following org link:

  [[http://example.com][https://www.haskell.org/static/img/logo.png]]

to

  <a href="http://example.com">
  <img src="https://www.haskell.org/static/img/logo.png" alt="logo.png" />
  </a>

but pandoc generates:

  <a href="http://example.com">
  <a href="https://www.haskell.org/static/img/logo.png" class="uri">
   https://www.haskell.org/static/img/logo.png
  </a>
  </a>

which is useless. With this patch, it generates:

  <a href="http://example.com">
  <img src="https://www.haskell.org/static/img/logo.png" alt="" />
  </a>
 2015-02-25 16:58:48 +01:00
Jesse Rosenthal
a7c67c897e Docx reader: Minor cleanup. 
The previous commits had some code repetition. This just makes it a bit
easier to read.
 2015-02-21 09:18:53 -05:00
Jesse Rosenthal
55d2ce751a Docx reader: allow sub/superscript verbatims. 
Verbatim usually shuts off all other run styles, but we don't want it to
shut off sub/superscript.
 2015-02-21 08:41:09 -05:00
Jesse Rosenthal
a01913b45c Docx reader: Allow numbering in the style file. 
This allows inherited styles with numbering (lists). It works like this:

 1. check to see if the style has numbering info.
 2. if the paragraph has explicit numbering info in the doc that takes
 precedence.
 3. if not we use the numbering info in the style, if it's there.
 4. otherwise normal paragraph.

We no longer assume it's not a numbering element if it doesn't have an
explicit level---we just set that level to 1. (In the style files, the
examples I've seen don't have that explicit level.)
 2015-02-19 00:17:04 -05:00
Matthew Pickering
ad39bc7009 Move utility error functions to Text.Pandoc.Shared 2015-02-18 21:09:07 +00:00
Matthew Pickering
b02b5b9d5e Change return type of Txt2Tags reader 2015-02-18 21:09:07 +00:00
Matthew Pickering
6de6eae737 Change return type of Textile reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
f61db38290 Change return type of TWiki reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
2b7073860b Change return type of RST reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
4c91049345 Change return type of Org reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
db6baab217 Change return type of OPML reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
ef2a8107e2 Change return type of Native reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
41d9527533 Change return type of Mediawiki reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
acefbe99a9 Change return type of Markdown reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
b8acb9f541 Change return type of LaTeX reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
9f6a92d664 Change return type of Haddock reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
b9e04825cf Change return type of HTML reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
b935ef6de5 Change return type of EPUB reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
1b12340859 Change return type of Docx reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
dcb4951aad Change return type of DocBook reader 2015-02-18 21:09:05 +00:00
Matthew Pickering
9cd0bdb41a Factor out "returnState" into Parsing module 2015-02-18 12:50:21 +00:00
Matthew Pickering
febe5112af HLint changes 2015-02-18 12:50:21 +00:00
Matthew Pickering
13fb1d6101 Remove F Monad from Markdown reader 2015-02-18 12:50:21 +00:00
Matthew Pickering
2b58060007 Remove F monad from Parsing 2015-02-18 12:50:21 +00:00
Matthew Pickering
9d77206827 Changed parseWithWarnings to the more general returnWarnings parser transformer 2015-02-18 12:50:21 +00:00
Matthew Pickering
e8677bae78 Remove F monad from Org Reader. 2015-02-18 12:50:21 +00:00
Jesse Rosenthal
24fd0ad04d Docx reader: Handle lists correctly inside table cells. 
Previously we didn't transform lists inside table cells.
 2015-02-13 09:02:16 -05:00
John MacFarlane
fb7a03dcda Textile reader: table improvements. 
* Handle newlines in cells.
* Handle empty cells.
* Closes #1919.
 2015-02-02 10:45:50 -08:00
John MacFarlane
33d1c8cc01 Merge pull request #1885 from mb21/html-reader-tables 
fixes HTML Reader: tables
 2015-01-25 10:46:47 -08:00
mb21
b40d33b174 fixes #1859 HTML Reader table parsing 2015-01-25 09:41:12 +01:00
John MacFarlane
d90dc6b8b5 LaTeX reader: don't limit includes to .tex extension. 
Previously `\input` and `\include` would only work if the
included files had the extension `.tex`.  This change relaxes
that restriction, though if the extension is not `.tex`, it
must be given explicitly in the `\input` or `\include`.

Closes #1882.
 2015-01-22 23:17:25 -08:00
Jesse Rosenthal
eb11c61182 Docx: Parse images in deprecated vml format. 
Some older versions of word use vml (vector markup language) and put
their images in a "v:imagedata" tag inside a "w:pict". We read those as
we read the more modern "blip" inside a "w:drawing".

Note that this does not mean the reader knows anything about vml. It
just looks for a `v:imagdata`. It's possible that, with more complicated
uses of images in vml, it won't do the right thing.
 2015-01-21 13:41:16 -05:00
Mark Wright
ed7606da9a ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies 2015-01-05 14:40:59 +11:00
Mark Wright
b748833889 ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies ; ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:40:30 +11:00
Mark Wright
10d53989d8 ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies ; ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:40:06 +11:00
Mark Wright
f18ceb1b5e ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:38:06 +11:00
Mark Wright
693f9abb18 Allow haddock-library 1.2, by calling the Documentation.Haddock.Types.MetaDoc record accessor function _doc :: MetaDoc mod id -> DocH mod id 2015-01-05 14:35:31 +11:00
John MacFarlane
e7187fa3bb LaTeX reader: handle tabular* environment. 
This change allows pandoc not to choke on the table-width parameter
of `tabular*`.  Note that the table width is not actually parsed
or taken into account, but this should give tolerable results in
many cases.

Closes #1850.
 2015-01-01 08:46:45 -08:00
John MacFarlane
2c3310a592 Added Text.Pandoc.Compat.Locale to assist with transition to time 1.5. 2014-12-19 16:13:38 -08:00
John MacFarlane
7e41d0b1ee LaTeX reader: parse math environments as inline when possible. 
Closes #1821.
 2014-12-16 12:27:04 -08:00
John MacFarlane
58ea1ce5f1 LaTeX reader: parse label after caption into a span... 
instead of inserting an additional paragraph of bracketed text.
Closes #1747.
 2014-12-15 21:50:10 -08:00
John MacFarlane
8a3363a269 Merge branch 'patch-1' of https://github.com/Wikiwide/pandoc into Wikiwide-patch-1 
Conflicts:
	src/Text/Pandoc/Readers/LaTeX.hs
 2014-12-15 20:27:42 -08:00
John MacFarlane
a5cac0a0c4 Don't treat a citation as a reference link label. 
Closes #1763.
 2014-12-15 10:54:12 -08:00
John MacFarlane
9bf76fa5a2 LaTeX reader: better handling of \noindent and \greektext. 
Closes #1783.
 2014-12-15 10:34:59 -08:00
John MacFarlane
47c360e079 Improved texorpdfstring patch #1148. 
* Make LaTeX reader recognize texorpdfstring.
* Don't use texorpdfstring unless it's actually needed.
* Fix tests.
 2014-12-15 10:06:03 -08:00
John MacFarlane
a864e9a348 Merge pull request #1805 from bergey/rst 
RST Reader - Improved Role Support
 2014-12-15 09:06:45 -08:00
John MacFarlane
9e75b9b84b DocBook readers: Include id on section headers. 
Closes #1818.
 2014-12-14 23:46:25 -08:00