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

3626 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
da87837318 LaTeX reader: Added code to handleIncludes to avoid inf loops. 
e.g. when one file includes another which includes it.
 2012-11-01 10:17:00 -07:00
John MacFarlane
6dff7dccaa LaTeX reader: Improved handling of included files. 
* `\input` now works, as well as `\include`.
* TEXINPUTS is used.
* We now look recursively into included files for more included files.
 2012-11-01 09:42:10 -07:00
John MacFarlane
06300e59d5 Removed citationSuppressParens. 
Makefile: Use citeproc-0.3.6 release.
 2012-10-28 09:36:15 -07:00
John MacFarlane
6f2347635c LaTeX reader: Initialize citationSuppressParens field. 2012-10-22 19:17:00 -07:00
John MacFarlane
a23a8e8b67 Fixed Biblio for extra parameter on Citation. 2012-10-22 09:30:05 -07:00
John MacFarlane
cfab8eaecb Revert "LaTeX reader: Use new suppressParens option for footnote citations." 
This reverts commit 7499499b68.

Conflicts:

	src/Text/Pandoc/Readers/LaTeX.hs
 2012-10-21 23:16:23 -07:00
John MacFarlane
bfddcb46dc Revert "Adjust LaTeX reader test for last change." 
This reverts commit ea34087cde.
 2012-10-21 23:14:42 -07:00
John MacFarlane
d89b74a003 Bumped version bound for template-haskell. 2012-10-21 14:11:03 -07:00
John MacFarlane
ca583a340f Updated lhs-test.latex for new highlighting-kate treatment of `. 2012-10-20 23:54:05 -07:00
John MacFarlane
b63566f09c Fixed bug in fetching CSL files from CSL data directory. 2012-10-18 08:55:11 -07:00
John MacFarlane
c27b8ba5e2 Removed debug print statement left in my mistake. 2012-10-18 08:46:11 -07:00
John MacFarlane
b808655b2b make-pandoc-man-pages: Use MIN_VERSION macro rather than checking GHC version. 
This is more reliable, since directory 1.2.0.1 can be used with
GHC < 1.7.6.
 2012-10-15 21:31:19 -07:00
John MacFarlane
b3ad94bde9 Moved man page creation out of Setup.hs. 
* MakeManPage.hs has been transformed into
  man/make-pandoc-man-pages.hs.
* There is now a cabal stanza for this, so the dependencies are
  handled by cabal.
* Special treatment in Setup.hs ensures that this never gets installed;
  it is built and used to create the man pages.
* Setup.hs cleaned up.
 2012-10-15 21:26:24 -07:00
John MacFarlane
6f9151c64e LaTeX reader: Basic \enquote support. 2012-10-15 20:15:34 -07:00
John MacFarlane
ea34087cde Adjust LaTeX reader test for last change. 2012-10-15 20:01:07 -07:00
John MacFarlane
7499499b68 LaTeX reader: Use new suppressParens option for footnote citations. 
Also changed Biblio, Markdown reader, and LaTeX reader tests because
of new citationSuppressParens field in Citation.
 2012-10-15 19:53:57 -07:00
John MacFarlane
b28630f577 Removed unneeded function from Setup.hs. 2012-10-15 19:53:57 -07:00
John MacFarlane
4cc3801fb0 Whitespace 2012-10-15 19:53:52 -07:00
John MacFarlane
a35b718e7d Re-added Read instance for ReaderOptions. 
Requires dev version of citeproc-hs.
 2012-10-14 22:14:15 -07:00
John MacFarlane
7179163826 Makefile: Back to using citeproc-hs repository. 
The released version lacks some features we need.
 2012-10-14 21:08:41 -07:00
John MacFarlane
19e1d746da LaTeX reader: Use normal citations, not author-in-text, for fn cites. 
Eventually it would be nice to use a "suppress outer parens" variant,
if citeproc-hs provides one.
 2012-10-14 08:44:25 -07:00
John MacFarlane
91c547a0c6 Don't expose Text.Pandoc.Biblio. 
It's no longer necessary for library users, as bibliography
processing occurs in readMarkdown and readLaTeX.
 2012-10-13 11:36:29 -07:00
John MacFarlane
b5dd06d303 Moved bibliography processing into readers. 
Previously this was done in src/pandoc.hs, which made it difficult
for library users.

* Removed readerCitations in ReaderOptions.
* Added readerReferences and readerCitationStyle to ReaderOptions.
* Moved use of processBiblio from main program to the
  markdown and LaTeX readers.
 2012-10-13 11:33:55 -07:00
John MacFarlane
9a77a3f15b Biblio: Make processBiblio take a Maybe Style parameter. 
If Nothing, then nothing is done.
 2012-10-13 11:33:33 -07:00
John MacFarlane
ea8b8114e1 Textile reader: Fixed bug with list items containing line breaks. 
Now pandoc correctly handles hard line breaks inside list items.
Previously they broke list parsing.  Thanks to Pablo
Rodríguez for pointing out the problem.
 2012-10-13 10:44:38 -07:00
John MacFarlane
40128754ab LaTeX reader: Made rawLaTeXInline more flexible. 
Now it will also try to parse block commands.  This is usually
what we want, given how rawLaTeXInline is used in the markdown
and textile readers.  If a block-level LaTeX command is used
in the middle of a paragraph (e.g. `\subtitle` inside a title),
we can treat it as raw inline LaTeX.
 2012-10-11 21:21:09 -07:00
John MacFarlane
cfc2e00b84 LaTeX reader: Make \noindent inline rather than block. 2012-10-11 20:56:44 -07:00
John MacFarlane
1dcd7c66eb Added MIME types for .wof and .eot. 
Closes #640.
i#
 2012-10-11 09:33:10 -07:00
John MacFarlane
01d109e2ef EPUB writer improvements. 
* We now convert to XHTML before cutting into chapter-sized chunks.
  This fixes a number of problems.
* `--number-sections` now works properly.
* A proper three-level table of contents is now used in `toc.ncx`.
  There is no longer a subsidiary table of contents at the beginning
  of each chapter.
* New epub-page template without the `$title$` variable.  Titles are
  left in the chapter bodies as an initial h1.
* Closes #539.
 2012-10-11 09:13:09 -07:00
John MacFarlane
4349097990 LaTeX reader: Better support for citation commands. 
* Make `\cite` etc. an AuthorInText.
* Make `\footcite` etc. into citations in notes.
 2012-10-10 19:41:39 -07:00
John MacFarlane
31435ad3f5 RST reader: Don't create empty definition list for metadata field lists. 
Previously a field list consisting only of metadata fields (author,
title, date) would be parsed as an empty DefinitionList, which is not
legal in LaTeX and not needed in any format.  This patch fixes the
problem, which I learned of from
http://stackoverflow.com/questions/12762767/modify-variable-in-rst-with-pandoc.
 2012-10-06 20:07:32 -07:00
John MacFarlane
b617cce95b Biblio: Changed type of processBiblio. 
* It is no longer in the IO monad.
* setHash uses state rather than Data.Unique.
* It takes a Style argument rather than parameters for CSL
  and abbrev filenames.
* pandoc.hs now calls the functions to parse the style file
  and add abbrevs.
 2012-10-06 09:51:23 -07:00
John MacFarlane
1b68dc3405 Revert "Added stateWarnings to ParserState, added warning function." 
This reverts commit 5419b504ce.
 2012-10-05 19:38:43 -07:00
John MacFarlane
5419b504ce Added stateWarnings to ParserState, added warning function. 
This will be used to provide warnings for things like duplicate
footnote refs and link refs.
 2012-10-05 19:25:26 -07:00
John MacFarlane
f232034ab0 Textile reader: Implemented comment blocks. 2012-10-05 10:23:15 -07:00
John MacFarlane
b1dafe8750 Fixed typo. 2012-10-04 09:24:28 -07:00
John MacFarlane
eea4c9e4d3 Updated mediawiki writer test for <br /> change. 2012-10-04 08:36:00 -07:00
John MacFarlane
6d31d6a79f Merge pull request #636 from byorgey/master 
Remove newline character from LineBreak output
 2012-10-04 08:33:38 -07:00
Brent Yorgey
c85d184668 Remove newline after <br/> in translation of LineBreak 
There's no particular need for a newline (other than making the
generated MediaWiki source look nice to a human), and in fact
sometimes it is incorrect: in particular, inside an enumeration, list
items cannot have embedded newline characters.
 2012-10-04 11:16:54 -04:00
John MacFarlane
3f86127f5a Docx writer: Added nsid to abstractNum elements. 
This helps when merging word documents with numbered or bulleted lists.
Closes #627.
 2012-10-02 19:43:18 -07:00
John MacFarlane
02bb0f051a Use integer ids for bookmarks. 
Closes #626.
 2012-10-02 19:20:51 -07:00
John MacFarlane
f9d76bd666 Makefile: cabal-dev/cabal update. 2012-10-02 16:38:46 -07:00
John MacFarlane
3a3fe2df6c RST reader: Removed 'plain' in blocks, since 'para' includes it. 2012-09-30 22:08:05 -07:00
John MacFarlane
e8260c27e1 RST reader: Consolidate super/subscript, math into interpretedRole. 2012-09-30 20:28:50 -07:00
John MacFarlane
9366d8681d RST reader: Renamed 'image' to 'subst', since it now handles more. 2012-09-30 20:18:14 -07:00
John MacFarlane
9294fc399c Ignore unknown interpreted roles. 
The contents are treated as rst, not literal, which will sometimes
be wrong.
 2012-09-30 14:59:26 -07:00
John MacFarlane
27bd6fb977 RST reader: Removed requirement that directives begin at left margin. 
This was (correctly) not in earlier releases; docutils doesn't
make the requirement.
 2012-09-30 14:58:26 -07:00
John MacFarlane
d9f628fd18 RST reader: Require whitespace after field list field names. 2012-09-30 14:57:55 -07:00
John MacFarlane
946764ccf7 Bumped versions of json and base64-bytestring dependencies. 
Thanks to Dirk Ullirch.
 2012-09-30 11:53:18 -07:00
John MacFarlane
83ad8982e1 Make blaze_html_0_5 default to True. 2012-09-30 11:53:00 -07:00