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

1355 commits

Author SHA1 Message Date
John MacFarlane
bea62bcab8 Textile reader: temporarily removed smartPunctuation. 
The smartPuncutation parser from the markdown parser
was being used, but this creates two problems:

* smart punctuation rules are slightly different in textile,
  for example, a single dash wish space around becomes an
  En dash.
* the following gets parsed as a double quoted string followed
  by a colon, rather than as a link:

  "emphasized text":http://my.url.com

This needs rethinking.
 2010-12-03 23:10:52 -08:00
John MacFarlane
d4e512776d Textile reader: added hrule parser. 2010-12-03 23:10:52 -08:00
John MacFarlane
4bf9d362d2 Textile reader: Turn on smart punctuation by default. 2010-12-03 23:10:52 -08:00
John MacFarlane
0356ad4de6 Textile reader: drop leading, trailing newline in pre block. 
This is consistent with how the other readers work.
 2010-12-03 23:10:52 -08:00
John MacFarlane
36d4aa4a09 Textile reader: modified str to handle acronyms, hyphens. 
* A single hyphen between two word characters is no longer a
  potential strikeout-starter.
* Acronym explanations are dropped.
 2010-12-03 23:10:52 -08:00
John MacFarlane
55e43c4991 Use textile reader by default for .textile extension. 2010-12-03 23:10:52 -08:00
John MacFarlane
f415e9e119 Textile reader: parse raw by default. 
It's part of the textile spec to allow raw HTML,
just as with markdown.
-R is no longer needed in test suite.
 2010-12-03 23:10:52 -08:00
paul.rivier
c3866f3c66 punctuation handling, and more html-specific handling 2010-12-03 23:10:52 -08:00
Paul Rivier
d724c6b568 html inlines and html blocks handling in textile reader 2010-12-03 23:10:51 -08:00
Paul Rivier
fa0866886b textile reader now ignores html/css attributes 2010-12-03 23:10:51 -08:00
Paul Rivier
e6dde36622 removed support for textile Inserted construct 2010-12-03 23:10:51 -08:00
Paul Rivier
593b4f6c94 fix autolink by promoting it in the parser list, fix table parabreak 2010-12-03 23:10:51 -08:00
Paul Rivier
a7da0672dc more support for Textile reader (explicit links, images), tests and cabal entries 2010-12-03 23:10:51 -08:00
paul.rivier
cfc70863a3 simpler table cell handling 2010-12-03 23:10:51 -08:00
paul.rivier
d917db5e42 preliminary material toward table support 2010-12-03 23:10:51 -08:00
paul.rivier
75fa22c300 textile reader now imports import Text.Pandoc.Parsing 2010-12-03 23:10:50 -08:00
paul.rivier
d532c72c5b Basic Textile Reader 2010-12-03 23:10:50 -08:00
John MacFarlane
e578b7f3d3 Added --data-dir to valid options for markdown2pdf. 2010-12-02 22:42:13 -08:00
John MacFarlane
fe39a06e24 Tweaked command-line options allowed by markdown2pdf. 2010-12-02 22:38:26 -08:00
John MacFarlane
4c21c5566d Merge branch 'master' into citeproc 2010-11-28 20:21:07 -08:00
John MacFarlane
3ffd724617 Markdown parser performance improvement. 
Do a quick lookahead to make sure what follows looks like a setext
header before parsing any Inlines.  This gives a 15% performance
boost in one benchmark.  Many thanks to knieriem for finding
the problem (in peg-markdown):

https://github.com/jgm/peg-markdown/issues/issue/3
 2010-11-28 20:19:32 -08:00
John MacFarlane
b10e82c9fa Fixed spacing bug for reference-style citations. 2010-11-28 07:55:33 -08:00
John MacFarlane
f64983f879 Merge branch 'master' into citeproc 2010-11-27 14:58:23 -08:00
John MacFarlane
e9cfbd5adc OpenDocument writer: don't print raw TeX. 2010-11-27 14:57:48 -08:00
John MacFarlane
f15965e205 Merge branch 'master' into citeproc 2010-11-27 11:54:26 -08:00
John MacFarlane
970f63c18a LaTeX writer: Escape curly quotes. 2010-11-27 11:53:30 -08:00
John MacFarlane
eac4abe36f Biblio: If locator ends with ",", add it to the suffix. 2010-11-27 11:28:45 -08:00
John MacFarlane
219853b05e Added procOpts parameter to citeproc call. 2010-11-27 11:28:11 -08:00
John MacFarlane
54397a9e99 Merge branch 'master' into citeproc 2010-11-27 10:58:05 -08:00
John MacFarlane
c989bf028f Merge branch 'textile' 
Conflicts:
	README
	man/man1/pandoc.1.md
	pandoc.cabal
 2010-11-27 10:52:44 -08:00
John MacFarlane
71c9316a59 Use [] for superscripts and subscripts in textile writer. 2010-11-27 10:44:58 -08:00
John MacFarlane
cae3f8edba Fixed spacing problems in textile nested lists. 2010-11-27 10:44:35 -08:00
John MacFarlane
283f1e60cc Use parsec parsers to split locator. 
This is easier to read and maintain.
Also, formatting is now stripped from the locator prefix,
so you can write e.g. '*p.* 33'.
 2010-11-27 07:08:32 -08:00
John MacFarlane
044a9a6157 Added 'stringify' to Text.Pandoc.Shared. 2010-11-27 07:08:06 -08:00
John MacFarlane
0ca84f0d38 Markdown suffix parser fix. 
If suffix doesn't begin with punctuation, include opening
comma and space in result.

Previously,

@item [only a suffix]

would result in something like

Doe (2002only a suffix)

because there was no opening delimiter.
 2010-11-26 22:34:53 -08:00
John MacFarlane
0871a512d7 Split locator and suffix in Biblio rather than Markdown parser. 
Patch from Nathan Gass.
 2010-11-26 12:06:56 -08:00
John MacFarlane
0955a0e329 More flexible handling of --csl. 
Look for csl files in ~/.csl if not found locally.
Add .csl extension if it is not provided.
 2010-11-23 21:40:05 -08:00
John MacFarlane
1b1287e888 Removed citeproc flag and CPP conditionals. 2010-11-23 21:14:31 -08:00
John MacFarlane
b48fa0ea59 Check biblio for all citations, not just textual. 2010-11-22 23:09:30 -08:00
John MacFarlane
7ef7d85b3f HTML reader: Export htmlTag. 2010-11-20 22:10:16 -08:00
John MacFarlane
05f5766abe Biblio: Check for == rather than /=. 
This is more perspicuous.
 2010-11-20 22:00:17 -08:00
John MacFarlane
3eef887dfa Citation related changes. 
* Don't look for bibliography in ~/.pandoc.  Reason:  doing
  this requires a read + parse of the bibliography even when
  the document doesn't use citations.  This is a big performance
  drag on regular pandoc invocations.
* Only look for default.csl if the document contains references.
  Reason:  avoids the need to read and parse csl file when the
  document contains no references anyway.
* Removed findFirstFile from Shared.
 2010-11-20 08:11:30 -08:00
John MacFarlane
46121aa2e1 Use default biblio.{xml,json,bib} in pandoc data dir if none specified. 2010-11-19 22:14:02 -08:00
John MacFarlane
9cb0581de6 Shared: Added findFirstFile, findDataFile, refactored readDataFile. 2010-11-19 22:13:30 -08:00
John MacFarlane
6390103509 Markdown citation parser: small refactoring for clarity. 2010-11-18 14:16:18 -08:00
John MacFarlane
bbb60a2586 If --csl not specified, read from data files or default. 
Thus --csl behaves like --reference-odt, --template, etc.
 2010-11-18 14:15:26 -08:00
John MacFarlane
f3bb3c1ff1 Markdown citation parser improvements and test updates. 
Now we handle a suffix after a bare locator, e.g.
@item1 [p. 30, suffix]
The suffix now includes any punctuation that introduces it.
A few tests fail because of problems with citeproc (extra space
before the suffix, missing space after comma separating multiple
page ranges in the locator).
 2010-11-18 13:22:20 -08:00
John MacFarlane
aaf7de0dda Markdown reader: Revised parser for new citation syntax. 
Suffixes and prefixes are now [Inline].  The locator is separated
from the citation key by a blank space.  The locator consists of
one introductory word and any number of words containing at
least one digit.  The suffix, if any, is separated from the locator
by a comma, and continues til the end of the citation.
 2010-11-18 12:38:45 -08:00
John MacFarlane
dbe0cefc9a Biblio: Removed stringify; pass inline list to citeproc. 2010-11-17 15:36:17 -08:00
John MacFarlane
47c64d4fc4 Don't pass a [Str ""] as citationPrefix. 2010-11-17 15:35:53 -08:00