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
38bc3f2316
More documentation for citeproc features (still incomplete).
2010-12-03 23:05:20 -08:00
John MacFarlane
becd9a81cc
Added --bibliography, --csl, --data-dir to markdown2pdf man page.
2010-12-02 22:42:25 -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
dd0ce8120d
Added --bibliography and --csl to pandoc man page.
2010-12-02 22:36:22 -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
68d38db194
Revamped tests, using markdown output instead of HTML.
...
This is easier to inspect.
2010-11-28 10:03:05 -08:00
John MacFarlane
61b16116ce
Citation tests: removed spurious double-spaces.
2010-11-28 08:12:32 -08:00
John MacFarlane
b2e9f64984
Updated citation tests to use en-dash between ranges.
2010-11-28 08:10:01 -08:00
John MacFarlane
b10e82c9fa
Fixed spacing bug for reference-style citations.
2010-11-28 07:55:33 -08:00
John MacFarlane
e2e107cbed
Fixed spacing in ieee citation test.
...
(Test now fails pending citeproc update.)
2010-11-27 19:20:06 -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
8f1aed168b
Removed extra line break from citation test output.
2010-11-27 11:27:52 -08:00
John MacFarlane
54397a9e99
Merge branch 'master' into citeproc
2010-11-27 10:58:05 -08:00
John MacFarlane
1ffbb59823
Minor adjustment in textile test suite.
2010-11-27 10:56:46 -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
e8516ff337
Set HOME in RunTests.
...
Patch from Nathan Gass.
2010-11-26 11:48:22 -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
be909d2bfc
Fixed eol mistake in test.
2010-11-22 23:10:00 -08:00
John MacFarlane
b48fa0ea59
Check biblio for all citations, not just textual.
2010-11-22 23:09:30 -08:00
John MacFarlane
3c7c1d8574
Changed markdown citation tests.
...
Now the tests are produced in HTML format (so we can see all
formatting). Also, we produce them in three different style,
chicago-author-date, ieee, and mhra.
2010-11-22 22:54:40 -08:00
John MacFarlane
8e71b5b279
Updated markdown-citations test for new citeproc changes.
2010-11-21 09:30:32 -08:00
John MacFarlane
7ef7d85b3f
HTML reader: Export htmlTag.
2010-11-20 22:10:16 -08:00
John MacFarlane
254c67a4fb
Made citeproc flag default to True.
2010-11-20 22:00:57 -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
482b4b8d73
Added default.csl to data files.
2010-11-18 14:14:20 -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