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

768 commits

Author SHA1 Message Date
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
John MacFarlane
ce9fc2a37d Updated for changes in Citaiton type. 
citationPrefix now [Inline] rather than String;
citationSuffix added.

This change presupposes no changes in citeproc-hs.
It passes a string for these values to citeproc-hs.
Eventually, citeproc-hs should use an [Inline] for
these as well.
 2010-11-16 20:31:22 -08:00
John MacFarlane
55e991614d Removed unneeded format argument in call to readBiblioFile. 2010-11-16 07:16:38 -08:00
John MacFarlane
d73a531d89 Biblio: don't add footnote if empty. 2010-11-16 07:15:30 -08:00
John MacFarlane
b158ae21a2 Improve handling of bibliography not found error. 2010-11-13 08:50:04 -08:00
John MacFarlane
7aecddd0f7 Replaced --biblio-file with --bibliography, removed --biblio-format. 
Bibliography format is guessed from the file extension of the
bibliography.

Also, the bibliography entries are now read during option parsing.
 2010-11-13 08:42:09 -08:00
John MacFarlane
1fa2973da6 Repairs to citation parser + citation test suite. 2010-11-12 19:30:59 -08:00
John MacFarlane
e88daeba11 Merge branch 'master' into citeproc 2010-11-12 18:57:37 -08:00
John MacFarlane
c2636e61d7 Treat argument as URI only if it has http(s) scheme. 
Previously pandoc would treat the c: in some windowns filespecs
as a URI scheme and try to download... Thanks to Peter Wang for
pointing this out.
 2010-11-12 18:30:50 -08:00
John MacFarlane
79bab2d210 Revised citation parsers for markdown reader. 
Added a form for in-text citations:

@doe99 [30; see also @smith99].
 2010-11-12 00:37:44 -08:00
John MacFarlane
5c6dc5767d Biblio: Use a Map for the lookup table. 2010-11-11 22:35:04 -08:00
John MacFarlane
1bfd8110af Merge branch 'master' into citeproc 2010-11-11 21:31:15 -08:00
John MacFarlane
36d4e649a6 Added support for textual citations (but not yet markdown syntax). 
Patch from Andrea Rossato.
 2010-11-11 21:30:34 -08:00
John MacFarlane
ca51bbbf16 HTML reader: don't parse raw HTML inside <code> tag. 
Previously '<code><a>x</a></code>' would be parsed as
Code "<a>x</a>", which is not what you want.
 2010-11-11 20:02:37 -08:00
John MacFarlane
83e6c01e4d Merge branch 'master' into citeproc 2010-11-09 22:52:36 -08:00
John MacFarlane
21556e37f4 Allow HTML comments as inline elements in markdown. 
So,
aaa <!-- comment --> bbb
can be a single paragraph.
 2010-11-09 22:51:02 -08:00
John MacFarlane
23c6f56bc5 Removed CITEPROC CPP conditionals from library code. 
By Cabal policy, the API should not change depending on flags.
 2010-11-06 14:58:54 -07:00
John MacFarlane
f7f6b2427d Changes to use citeproc-hs 0.3. 2010-11-06 14:43:23 -07:00
John MacFarlane
db03741847 Removed Text.Pandoc.Definition, bump version to 1.7. 
We now get Text.Pandoc.Definition from the new pandoc-types package.
This will make it possible for other programs to supply output
in Pandoc format, without depending on the whole pandoc package.
 2010-11-05 17:06:47 -07:00
John MacFarlane
5871c4d51f Biblio: small fix to detection of punctuation (A. Rossato). 2010-11-04 09:11:15 -07:00
John MacFarlane
5e1dc6adda Biblio: Improve footnote generation. 
Patch from Andrea Rossato.
 2010-11-03 12:58:29 -07:00
John MacFarlane
075840231b Improve footnote generation of in-text citations w/ note styles. 
Patch from Andrea Rossato.
 2010-11-02 21:10:33 -07:00
John MacFarlane
bd24e83c81 --mathjax: Use mathjax with raw latex rather than mathml. 
It seems to work better, and the default config can be used.
 2010-10-31 18:55:35 -07:00
John MacFarlane
ac06ca2b00 Changes to use citeproc 0.3. 
Patch from Andrea Rossato.
Note: the markdown syntax is preliminary and will probably change.
 2010-10-27 18:25:59 -07:00
John MacFarlane
9cf27c92c1 Added support for MathJax for displaying math in HTML. 
Added --mathjax option.
Added MathJax to HTMLMathMethod.
Supported MathJax in HTML writer.

Resolves Issue #259.
 2010-10-26 21:07:51 -07:00
John MacFarlane
f870777c36 Parse blanklines after macro definitions. 2010-10-26 19:52:12 -07:00
John MacFarlane
6b722d1b45 Process LaTeX macros in markdown, and apply to TeX math. 
Example:
\newcommand{\plus}[2]{#1 + #2}

$\plus{3}{4}$

yields:

3+4
 2010-10-26 09:03:03 -07:00
John MacFarlane
7e9e959548 LaTeX & ConTeXt writers: escape [ and ] as {[} and {]}. 
This avoids unwanted interpretation as optional arguments
in some contexts, which caused the brackets to silently
disappear!
 2010-10-24 19:38:16 -07:00
John MacFarlane
220a20bf92 Changed --help message for --variable to KEY:VALUE. 
Was previously FILENAME.
 2010-10-24 19:17:03 -07:00
John MacFarlane
4d08bc38a9 TeXMath: handle variables modified with \acute, \bar, etc. 
Complete list: \acute, \grave, \breve, \check, \dot,
\mathring, \vec, \overrightarrow, \overleftarrow, \hat,
\tilde, \bar.
 2010-10-19 15:03:30 -07:00
John MacFarlane
11672c4987 TeXMath reader: handle \textit, \textbf, etc. 2010-10-19 13:22:50 -07:00
John MacFarlane
ca5217881d Encode filenames as UTF8. 
Resolves Issue #252 (pandoc doesn't properly handle unicode filenames).
 2010-09-10 19:53:45 -07:00
John MacFarlane
6ccdde5571 gladTeX HTML - specify ENV for display or inline. 
Thanks to Jonathan Daugherty for the patch.

The gladTeX program gives finer control over the LaTeX environment
used to render its input.  The latest version (1.1) uses the
"displaymath" environment by default, which is nice for large,
block-level equations, but it isn't so nice for inline math (where
"math" is more appropriate).  This patch causes the HTML writer to
differentiate between the two by explicitly setting the LaTeX
environment on the generated EQ tag.
 2010-08-01 08:30:04 -07:00
John MacFarlane
8fe468463e --offline implies --standalone. 2010-07-24 00:49:10 -07:00
John MacFarlane
01a191709e Moved Text.Pandoc.Writers.S5 -> Text.Pandoc.S5. 
Now it doesn't export a writer, just some CSS and JS.
 2010-07-22 23:37:06 -07:00
John MacFarlane
851d39f8f8 Improved cutUp function, removed extra </div> 2010-07-22 23:23:47 -07:00
John MacFarlane
a11b530935 Moved s5 writing from S5 module to HTML. 
Now s5 is handled in more or less the same way as slidy,
as a variant of HTML.
 2010-07-22 22:58:48 -07:00