Commit graph

2466 commits

Author SHA1 Message Date
John MacFarlane
1d91e2cdb3 LaTeX reader: Added o-cedilla. 2013-08-21 20:07:36 -07:00
John MacFarlane
f7c14eddd8 Merge pull request #960 from semorrison/master
Processing some additional cedilla accents while reading LaTeX
2013-08-21 20:05:49 -07:00
Scott Morrison
5b97b150cc cedilla-o breaks the compile, removing again 2013-08-21 16:10:42 +10:00
Scott Morrison
0b5156cc7e adding some cedilla characters to the LaTeX reader 2013-08-21 16:04:06 +10:00
John MacFarlane
b1d08a8aa8 Merge branch 'altcite' 2013-08-20 22:00:39 -07:00
John MacFarlane
7048c130ec Create Cite element even if no matching reference in the biblio.
* Add ??? as fallback text for non-resolved citations.
* Biblio:  Put references (including a header at the end of
  the document, if one exists) inside a Div with class "references".
  This gives some control over styling of references, and allows
  scripts to manipulate them.
* Markdown writer:  Print markdown citation codes, and disable
  printing of references, if `citations` extension is enabled.

NOTE:  It would be good to improve what citeproc-hs does for
a nonexistent key.
2013-08-20 20:47:06 -07:00
John MacFarlane
e8ddcfd997 Scale LaTeX tables so they don't exceed columnwidth. 2013-08-19 16:03:22 -07:00
John MacFarlane
0e2605ffdf Allow multiple YAML metadata blocks in document. 2013-08-18 18:39:04 -07:00
John MacFarlane
af786829a0 Parsing: Added stateMeta' to ParserState. 2013-08-18 16:22:56 -07:00
John MacFarlane
8d441af3da Adjusted writers and tests for change in parsing of div/span.
Textile, MediaWiki, Markdown, Org, RST will emit raw HTML div tags for divs.
Otherwise Div and Span are "transparent" block containers.
2013-08-18 14:36:40 -07:00
John MacFarlane
3117c668a7 Markdown reader: Parse span, div tags as Span, Div elements.
Assuming markdown_in_html extension is set.
2013-08-17 17:11:51 -07:00
John MacFarlane
5a5a252216 Markdown reader: Don't generate blank title, author, date elements. 2013-08-17 10:29:12 -07:00
John MacFarlane
89a7703260 Shared: Changed stringify so it ignores notes.
Also documented this in README.
2013-08-16 13:22:27 -07:00
John MacFarlane
399c75da44 Revert "Shared: stringify now skips over footnotes."
This reverts commit 19591df739.

This change didn't work; query has already written the contents
of the note by the time it gets to Note.
2013-08-16 13:08:39 -07:00
John MacFarlane
19591df739 Shared: stringify now skips over footnotes.
That is usually the right thing to do for section labels, etc.
2013-08-16 13:05:06 -07:00
John MacFarlane
441a7aebf8 LaTeX writer: Avoid problem with footnotes in unnumbered headers.
Closes #940.
Added test case.
2013-08-16 13:03:38 -07:00
John MacFarlane
ab8c0dcd41 LaTeX reader: parse label after section command and set id.
Closes #951.
2013-08-16 12:40:38 -07:00
John MacFarlane
d0f6b8eaf8 Merge pull request #950 from semorrison/master
LaTeX reader missing \oe and \OE characters
2013-08-15 22:53:01 -07:00
Scott Morrison
d3ebca6f55 LaTeX reader missing \oe and \OE characters 2013-08-16 14:48:24 +10:00
John MacFarlane
e21d548948 Merge branch 'master' of https://github.com/semorrison/pandoc 2013-08-15 17:23:26 -07:00
John MacFarlane
172f020bc5 Shared: Better error message when default data file not found.
Listing the full path can confuse people who are using
`--self-contained`:  they might have intended the file to be
found locally.  So now we just list the data file name.
2013-08-15 17:21:56 -07:00
Scott Morrison
c45bd6d468 adding support for breve accents via \u{} while reading LaTeX 2013-08-16 10:03:54 +10:00
John MacFarlane
3e8bd8aa15 Updated for removed unMeta, unFormat in pandoc-types. 2013-08-14 23:24:45 -07:00
John MacFarlane
3ebdc5b5f0 Text.Pandoc.Compat.Monoid: Small improvements to the (<>) definition. 2013-08-12 16:21:24 -07:00
John MacFarlane
eb0c0b86ed ODT/OpenDocument writer: Minor changes for ODF 1.2 conformance.
See #939.  We leave the nonconforming contextual-spacing attribute,
which is provided by LibreOffice itself and seems to be supported.
2013-08-11 17:13:46 -07:00
John MacFarlane
7b975c2bcc PDF: Add suggestion to use --latex-engine=xelatex on encoding error. 2013-08-11 16:16:24 -07:00
John MacFarlane
e279175ea5 Options: Changed writerSourceDir to writerSourceURL (now a Maybe).
Previously we used to store the directory of the first input file,
even if it was local, and used this as a base directory for
finding images in ODT, EPUB, Docx, and PDF.

This has been confusing to many users.  It seems better to look for
images relative to the current working directory, even if the first
file argument is in another directory.

writerSourceURL is set to 'Just url' when the first command-line
argument is an absolute URL.  (So, relative links will be resolved
in relation to the first page.)  Otherwise, 'Nothing'.

The ODT, EPUB, Docx, and PDF writers have been modified accordingly.

Note that this change may break some existing workflows.  If you
have been assuming that relative links will be interpreted relative
to the directory of the first file argument, you'll need to
make that the current directory before running pandoc.

Closes #942.
2013-08-11 15:58:09 -07:00
John MacFarlane
02a125d0aa Use walk, walkM in place of bottomUp, bottomUpM when possible.
They are significantly faster.
2013-08-10 18:45:00 -07:00
John MacFarlane
9152fa1a95 Use query instead of queryWith. 2013-08-10 18:13:38 -07:00
John MacFarlane
cbfa932106 Adjustments for new Format newtype. 2013-08-10 17:24:54 -07:00
John MacFarlane
e9de0f0e22 Preliminary support for new Div and Span elements in writers.
Currently these are "transparent" containers, except in HTML,
where they produce div and span elements with attributes.
2013-08-08 23:14:12 -07:00
John MacFarlane
99bb066bb9 Pass writename as argument to filters.
This way filters can figure out what the target format is
and react appropriately.

Example:

    #!/usr/bin/env runghc
    import Text.Pandoc.JSON
    import Data.Char

    main = toJSONFilter cap
      where cap (Just "html") (Str xs) = Str $ map toUpper xs
            cap _ x = x

This capitalizes text only for html output.
2013-08-08 15:15:58 -07:00
John MacFarlane
83f263110f Use pipeProcess in Text.Pandoc.PDF. 2013-08-08 15:15:20 -07:00
John MacFarlane
7d694e1569 Added Text.Pandoc.Process (pipeProcess).
A souped up version of readProcessWithErrorCode that uses lazy bytestrings
and allows setting environment.
2013-08-08 15:15:12 -07:00
John MacFarlane
9aa9d5cf68 Revert "Textile reader: Removed raw LaTeX parsing."
This reverts commit bb61624bb2.
Apparently someone put this there for a reason, since it's in
the test suite.
2013-08-08 10:52:59 -07:00
John MacFarlane
12e7ec4070 Added Text.Pandoc.Compat.TagSoupEntity.
This allows pandoc to compile with tagsoup 0.13.x.
Thanks to Dirk Ullrich for the patch.
2013-08-08 10:42:52 -07:00
John MacFarlane
802dc9a8b9 Added Text.Pandoc.Compat.Monoid.
This allows pandoc to compile with base < 4.5, where Data.Monoid
doesn't export `<>`.  Thanks to Dirk Ullirch for the patch.
2013-08-08 10:41:39 -07:00
John MacFarlane
bb61624bb2 Textile reader: Removed raw LaTeX parsing.
This isn't part of Textile.
2013-08-07 14:30:47 -07:00
John MacFarlane
d44d166431 Allow YAML title blocks to contain only comments. 2013-08-07 08:43:42 -07:00
John MacFarlane
7d18770b00 Added support for MetaBool. 2013-08-06 23:31:16 -07:00
John MacFarlane
52c5cdb04e Biblio: Capitalize citation note only if it has a prefix.
So, author names or titles that aren't capitalized will stay
uncapitalized.
2013-08-06 16:20:45 -07:00
John MacFarlane
2d6e0b1530 Remove CPP from default-extensions; add pragmas to modules as needed. 2013-08-04 14:12:13 -07:00
John MacFarlane
5050cff37c Removed comment that chokes recent cpp.
Closes #933.
2013-08-03 23:16:54 -07:00
John MacFarlane
4a84b78100 MediaWiki writer: Use native mediawiki tables instead of HTML.
Closes #720.
2013-08-03 23:05:14 -07:00
John MacFarlane
97b2be599e Text.Pandoc: Don't reexport ToJSONFilter.
It's better just to import this from Text.Pandoc.JSON.
That way, compiled filters will be smaller in size.
2013-08-03 17:02:35 -07:00
John MacFarlane
1567d291a3 Text.Pandoc.JSON: Use To/FromJSON instances from pandoc-types.
* These use GHC generics rather than syb, and are faster.
* toJsonFilter is now a deprecated synonym of toJSONFilter from
  Text.Pandoc.JSON.
* The deprecated jsonFilter function has been removed.
2013-08-03 16:39:43 -07:00
John MacFarlane
a32417378e Biblio: Don't interfere with Notes that aren't citation notes.
Closes #898: notes not generated from citations were being
adjusted (first letter capitalized, for example, against author's
intentions).
2013-08-02 15:37:09 -07:00
John MacFarlane
dceffeb043 Biblio: Override citeproc-hs's endWithPunct.
The new version correctly sees a sentence ending in '.)' as ending
with punctuation.  This fixes a bug which led such sentences to receive
an extra period at the end: '.).'.  Thanks to Steve Petersen for
reporting.
2013-08-02 14:20:44 -07:00
John MacFarlane
7024664dda Fixed compilation with http-conduit flag False. 2013-07-30 08:38:13 -07:00
John MacFarlane
3c06e2692a Markdown atx headers: Allow . or ) after # if no fancy_lists. 2013-07-29 08:38:46 -07:00