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

997 commits

Author SHA1 Message Date
John MacFarlane
82ddec698e LaTeX reader: Added LPState. 
Plan is to use this instead of ParserState in LP.
 2014-03-25 15:38:30 -07:00
John MacFarlane
6992050161 Parsing: Added HasMacros, simplified other typeclasses. 
Removed updateHeaderMap, setHeaderMap, getHeaderMap,
updateIdentifierList, setIdentifierList, getIdentifierList.
 2014-03-25 14:55:18 -07:00
John MacFarlane
08d1404b31 API changes to HasReaderOptions, HasHeaderMap, HasIdentifierList. 
Previously these were typeclasses of monads.  They've been changed
to be typeclasses of states.  This ismplifies the instance definitions
and provides more flexibility.

This is an API change!  However, it should be backwards compatible
unless you're defining instances of HasReaderOptions, HasHeaderMap,
or HasIdentifierList.  The old getOption function should work as
before (albeit with a more general type).

The function askReaderOption has been removed.
extractReaderOptions has been added.
getOption has been given a default definition.

In HasHeaderMap, extractHeaderMap and updateHeaderMap have been added.
Default definitions have been given for getHeaderMap, putHeaderMap,
and modifyHeaderMap.

In HasIdentifierList, extractIdentifierList and updateIdentifierList
have been added.  Default definitions have been given for
getIdentifierList, putIdentifierList, and modifyIdentifierList.

The ultimate goal here is to allow different parsers to use their
own, tailored parser states (instead of ParserState) while still
using shared functions.
 2014-03-25 13:43:34 -07:00
John MacFarlane
5e69f845d5 LaTeX reader: Better handling of "table" environment. 
Positioning options no longer rendered verbatim.
Partially addresses #1204.
 2014-03-25 12:04:25 -07:00
John MacFarlane
b9cc29e15a Merge pull request #1068 from jaimeMF/mw-images-langs 
MediaWiki reader: Accept image links in more languages
 2014-03-24 10:39:49 -07:00
John MacFarlane
dd058b38b0 Markdown reader: Fixed regression on line breaks in strict mode. 
Closes #1203.
 2014-03-24 09:56:16 -07:00
Albert Krewinkel
24b2ac43b0 Add a simple Emacs Org-mode reader 
The basic structure of org-mode documents is recognized; however,
org-mode features like todo markers, tags etc. are not supported yet.
 2014-03-04 10:40:40 +01:00
John MacFarlane
4d0bf3c5d6 Markdown reader: Improved parsing of nested divs. 
Formerly a closing div tag would be missed if it came right
after other block-level tags.
 2014-02-26 22:53:12 -08:00
John MacFarlane
a208a972c3 Markdown parser: avoid backtracking when closing </div> not found. 2014-02-26 22:46:38 -08:00
John MacFarlane
581075a0ca Markdown reader: small efficiency improvement. 
Switched `notFollewdBy' rawHtmlBlocks` ->
`notFollowedBy' (htmlTag isBlockTag)`, which is more
efficient.
 2014-02-26 22:24:50 -08:00
John MacFarlane
69f7b1dbf3 Added readerTrace to ReaderOptions, --trace command line opt. 
This is to debug backtracking-related parsing bugs.
So far it is only implemented for markdown, but it would
be good to extend it to latex and html readers.
 2014-02-25 22:43:58 -08:00
John MacFarlane
a826d3936d Fixed bug in reference link parsing in markdown_mmd. 
The bug was triggered by:

Link to [Google][]. Link to [twitter][].

[Google]: http://google.com
[twitter]: http://twitter.com
 2014-02-21 17:32:02 -08:00
John MacFarlane
f3a062d5f9 Make rst figures true figures. Closes #1168. 
Thanks to CasperVector.
 2014-02-19 09:11:15 -08:00
Merijn Verstraaten
fe246ce01c Enhanced Pandoc's support for rST roles. 
rST parser now supports:
    - All built-in rST roles
    - New role definition
    - Role inheritance

Issues/TODO:
    - Silently ignores illegal fields on roles
    - Silently drops class annotations for roles
    - Only supports :format: fields with a single format for :raw: roles,
      requires a change to Text.Pandoc.Definition.Format to support multiple
      formats.
    - Allows direct use of :raw: role, rST only allows indirect (i.e.,
      inherited use of :raw:).
 2014-02-15 17:51:33 +01:00
John MacFarlane
3127ab2b5e Slight code reorganization in endline. 2014-02-04 10:05:52 -08:00
John MacFarlane
9f3b2f6f5d Fixed mediawiki ordered list parsing. 
Closes #1122.
 2014-01-22 22:07:13 -08:00
John MacFarlane
6c59f060a7 HTML reader: Fixed bug reading inline math with $$. 
See #225.
 2014-01-20 11:09:44 -08:00
John MacFarlane
1bc9cb4105 Merge pull request #974 from merijn/master 
Added support for LaTeX style literate Haskell code blocks in rST.
 2014-01-16 12:32:44 -08:00
John MacFarlane
b9b1546ed2 Markdown parser: be more permissive about citation keys. 
Keys may now start with an underscore as well as a letter.
Underscores do not count as internal punctuation, but are
treated like alphanumerics, so "key:_2008" will work, as
it did not before.  (This change was necessary to use keys
generated by zotero.)

Closes #1111, closes #1011.
 2014-01-09 11:25:24 -08:00
John MacFarlane
d9eff99f27 Markdown reader: Allow hard line breaks in table cells. 
The \-newline form must be used; the two-space+newline form
won't work, since in a table cell nearly every line ends with
two spaces.
 2014-01-07 23:39:49 -08:00
John MacFarlane
f3ee82373b HTML reader: Parse name/content pairs from meta tags as metadata. 
Closes #1106.
 2014-01-01 09:22:37 -08:00
Henry de Valence
3d70059a48 HLint: use fromMaybe 
Replace uses of `maybe x id` with `fromMaybe x`.
 2013-12-19 21:07:09 -05:00
Henry de Valence
f6d151889c HLint: redundant parens 
Remove parens enclosing a single element.
 2013-12-19 20:43:25 -05:00
Henry de Valence
0c5e7cf8cb HLint: use elem and notElem 
Replaces long conditional chains with calls to `elem` and `notElem`.
 2013-12-19 20:19:24 -05:00
John MacFarlane
0132f6fcb7 LaTeX reader: Support babel-style quoting: ` "..."' ``. 2013-12-17 16:03:43 -08:00
John MacFarlane
826443926f Docbook reader: Avoid failure if tbody contains no tr or row elements. 2013-12-16 13:58:54 -08:00
John MacFarlane
2f00f5c7c2 Properly handle script blocks in strict mode. 
(That is, markdown-markdown_in_html_blocks.)
Previously a spurious `<p>` tag was being added.

Closes #1093.
 2013-12-15 12:27:29 -08:00
Jeff Arnold
5adbe7b365 LaTeX reader: add support for Verb macro 2013-12-13 19:16:04 -05:00
John MacFarlane
6d0cd9203c Markdown reader: Fixed regression in title blocks. 
If author field was empty, date was being ignored.  Closes #1089.
 2013-12-12 22:34:56 -08:00
John MacFarlane
8e255fad98 Another small performance improvement. 2013-12-07 19:56:54 -08:00
John MacFarlane
e2c4156c20 Small performance improvement in list parsing. 2013-12-07 19:41:42 -08:00
John MacFarlane
e5a7c31a32 Markdown reader: Fixed bug with literal </div> in lists. 
Closes #1078.
 2013-12-07 17:12:52 -08:00
John MacFarlane
def05d3504 HTML reader: Parse LaTeX math if appropriate options are set. 
* Moved inlineMath, displayMath from Markdown reader to Parsing.
* Export them from Parsing.  (API change.)
* Generalize their types.
 2013-12-06 17:15:13 -08:00
John MacFarlane
5314df51f3 Stop parsing "list lines" when we hit a block tag. 
This fixes exponential slowdown in certain input, e.g.
a series of lists followed by `</div>`.
 2013-12-04 10:18:05 -08:00
Jaime Marquínez Ferrándiz
303e42a94f MediaWiki reader: Accept image links in more languages 
In some of the Wikipedia versions the local version of 'File' is used (for example 'Archivo' in Spanish)
 2013-11-24 15:28:57 +01:00
John MacFarlane
cf149fcf38 Fixed bug with intraword emphasis. 
Closes #1066.
 2013-11-22 19:41:08 -08:00
John MacFarlane
a3eba6ee84 LaTeX reader: Parse contents of curly quotes or matched " as quotes. 2013-11-18 20:28:27 -08:00
John MacFarlane
e690c87dc4 LaTeX reader: Support \textnormal as span with class "nodecor". 
This is needed for pandoc-citeproc.
 2013-11-17 09:07:25 -08:00
John MacFarlane
0fd2176e29 MediaWiki reader: Add automatic header identifiers. 2013-11-17 08:47:14 -08:00
MinRK
01fed75b8f recognize svg tag in HTML Reader 
avoids adding lots of `<p>` tags in embedded SVG content,
for instance in markdown to HTML.
 2013-11-07 22:25:44 -08:00
John MacFarlane
4301fa4a27 Markdown reader: Correctly handle empty bullet list items. 
For example:

    - one
    -
    - two

This should NOT be parsed as a setext header followed by a list.
 2013-11-03 21:16:47 -08:00
John MacFarlane
732f6abe15 HTML reader: Use pandoc Div and Span for raw "<div>", "<span>". 
Only if --parse-raw.
 2013-11-03 11:20:32 -08:00
John MacFarlane
0d95c15e83 TexMath: Export readTeXMath', which attends to display/inline. 
Deprecate readTeXMath, and use readTeXMath' in all the writers.
Require texmath >= 0.6.5.
 2013-11-01 14:28:24 -07:00
John MacFarlane
ab0ffe6549 Markdown reader: Yaml block must start immediately after ---. 
If there's a blank line after `---`, we interpreted it as
a horizontal rule.
 2013-10-29 10:57:48 -07:00
John MacFarlane
416dad86dc DocBook reader: Handle numerical attributes starting with decimal. 
Also use safeRead instead of read.
 2013-10-22 12:34:18 -07:00
John MacFarlane
75ea0c4d0d LaTeX reader: Improved citation parsing. 
This fixes a run-time error that occured with `\citet{}` (empty
list of keys).  It also ensures that empty keys don't get produced.
 2013-10-21 09:33:10 -07:00
John MacFarlane
e5feed00f7 MediaWiki reader: Trim contents of <math> tags. 
Otherwise we get problems when converting to markdown.

Closes #1027.
 2013-10-18 17:50:43 -07:00
John MacFarlane
1a55c8f5de LaTeX reader: Ensure that preamble doesn't contribute to text of doc. 2013-10-11 22:43:47 -07:00
John MacFarlane
25e43d1c89 LaTeX reader: Fixed character escaping in \url{}. 
Previously `\~` wasn't handled properly, among others.
 2013-10-11 10:43:07 -07:00
John MacFarlane
9e7072cf1b LaTeX reader: Parse {groups} as Span. 
This is needed for accurate conversion of bibtex titles,
since we need to know what was protected from titlecase conversions.
 2013-09-28 11:53:34 -07:00