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

2158 commits

Author SHA1 Message Date
John MacFarlane
a3eba6ee84 LaTeX reader: Parse contents of curly quotes or matched " as quotes. 2013-11-18 20:28:27 -08:00
Shaun Attfield (shaun@victor)
d07dc971da Epub Writer: Add cover reference to guide element 
Fixes an issue with calibre http://calibre-ebook.com/ putting the
cover at the end of the book if the spine has linear="no".

Apparently this is best practice for other converters as well.

http://www.idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.6
 2013-11-18 11:53:13 +02:00
John MacFarlane
e690c87dc4 LaTeX reader: Support \textnormal as span with class "nodecor". 
This is needed for pandoc-citeproc.
 2013-11-17 09:07:25 -08:00
John MacFarlane
0fd2176e29 MediaWiki reader: Add automatic header identifiers. 2013-11-17 08:47:14 -08:00
John MacFarlane
d5660275a3 Parsing: Generalized type of registerHeader, using new typeclasses. 
New type classes HasReadeOptions, HasIdentifierList, HasHeaderMap.
These allow certain common functions to be reused even in parsers
that use custom state (instead of ParserState), such as the MediaWiki
reader.

Minor API bump.
 2013-11-17 08:45:21 -08:00
John MacFarlane
9b0378b939 OpenDocument: Skip raw HTML. 
Previously it was erroneously included as verbatim text.

Closes #1035.
 2013-11-16 22:49:15 -08:00
John MacFarlane
892ba2dd16 LaTeX writer: Properly escape pdftitle, pdfauthor. 
Closes #1059.
 2013-11-16 14:09:09 -08:00
John MacFarlane
b4441c940d HTML/EPUB footnotes: Put <sup> tag inside <a> tags. 
This allows better control of formatting, since the `<a>`
tags have a distinguishing class.

Closes #1049.
 2013-11-12 18:48:06 -08:00
MinRK
01fed75b8f recognize svg tag in HTML Reader 
avoids adding lots of `<p>` tags in embedded SVG content,
for instance in markdown to HTML.
 2013-11-07 22:25:44 -08:00
John MacFarlane
2efd0951d3 Docx writer: fixed core metadata. 
- Don't create empty date nodes if no date given.
- Don't create multiple dc:creator nodes; instead separate by
  semicolons.

Closes #1046.
 2013-11-07 08:48:59 -08:00
John MacFarlane
5b99112f22 Docx writer: Fix URL for core-properties in _rels/.rels. 
Partially addresses #1046.
 2013-11-06 19:18:47 -08:00
John MacFarlane
6b24b1afca Don't print <span> tags in 'plain' output. 2013-11-06 09:25:50 -08:00
John MacFarlane
4301fa4a27 Markdown reader: Correctly handle empty bullet list items. 
For example:

    - one
    -
    - two

This should NOT be parsed as a setext header followed by a list.
 2013-11-03 21:16:47 -08:00
John MacFarlane
732f6abe15 HTML reader: Use pandoc Div and Span for raw "<div>", "<span>". 
Only if --parse-raw.
 2013-11-03 11:20:32 -08:00
John MacFarlane
0d95c15e83 TexMath: Export readTeXMath', which attends to display/inline. 
Deprecate readTeXMath, and use readTeXMath' in all the writers.
Require texmath >= 0.6.5.
 2013-11-01 14:28:24 -07:00
John MacFarlane
ab0ffe6549 Markdown reader: Yaml block must start immediately after ---. 
If there's a blank line after `---`, we interpreted it as
a horizontal rule.
 2013-10-29 10:57:48 -07:00
John MacFarlane
a6aaff102e Slides: Preserve <div class="references"> in references slide. 2013-10-29 10:40:40 -07:00
John MacFarlane
ac7714ca39 Text.Pandoc.Writer.Shared: fixed bug in tagWithAttrs. 
A space was omitted before key-value attributes, leading
to invalid HTML.
 2013-10-26 18:22:59 -07:00
John MacFarlane
416dad86dc DocBook reader: Handle numerical attributes starting with decimal. 
Also use safeRead instead of read.
 2013-10-22 12:34:18 -07:00
John MacFarlane
e63aafd620 Fix definition lists with internal links in terms (closes #1032). 
This fix puts braces around a term that contains an internal
link, to avoid problems with square brackets.
 2013-10-21 17:33:42 -07:00
John MacFarlane
0b16b08543 Templates: Changed how array variables are resolved. 
Previously if `foo` is an array (which might be because multiple
values were set on the command line), `$foo$` would resolve to
the concatenation of the elements of foo.  This is rarely useful
behavior.  It has been changed so that the first value is rendered.
Of course, you can still iterate over the values using
`$for(foo)$`.

This has the result that you can override earlier settings using
-V by putting new values later on the command line.  That's useful
for many purposes.
 2013-10-21 12:33:20 -07:00
John MacFarlane
75ea0c4d0d LaTeX reader: Improved citation parsing. 
This fixes a run-time error that occured with `\citet{}` (empty
list of keys).  It also ensures that empty keys don't get produced.
 2013-10-21 09:33:10 -07:00
John MacFarlane
1ce875a010 Fixed '. . .' (pause) on HTML slide formats. Closes #1029. 
The old version caused a pause to be inserted before the first
material on a slide. This has been fixed.
 2013-10-20 09:56:50 -07:00
John MacFarlane
e5feed00f7 MediaWiki reader: Trim contents of <math> tags. 
Otherwise we get problems when converting to markdown.

Closes #1027.
 2013-10-18 17:50:43 -07:00
John MacFarlane
1f29f4678e LaTeX writer: Specially escape non-ascii characters in labels. 
Otherwise we can get compile errors and other bugs when
compiled with pdflatex.  Closes #1007.

Thanks to begemotv2718 for the fix.
 2013-10-17 22:06:39 -07:00
John MacFarlane
80c1967e75 PDF: Minor code cleanup. 2013-10-17 13:36:43 -07:00
John MacFarlane
6e1c24da8e LaTeX writer: Add link anchors for code blocks with identifiers. 
Closes #1025.
 2013-10-17 13:23:38 -07:00
John MacFarlane
386e933432 Use isURI instead of isAbsoluteURI. 
It allows fragments identifiers.
 2013-10-16 09:48:11 -07:00
John MacFarlane
0df7cce37d Treat div with class "notes" as speaker notes in slide formats. 
Currently beamer goes to `\note{}`, revealjs to `<aside class="notes">`,
and the notes are simply suppressed in other formats.

Closes #925.
 2013-10-13 15:37:25 -07:00
John MacFarlane
2ae7f5e2a0 HTML writer: Insert command to typeset mathjax for slideous output. 
Closes #966.
 2013-10-13 11:31:33 -07:00
John MacFarlane
1a55c8f5de LaTeX reader: Ensure that preamble doesn't contribute to text of doc. 2013-10-11 22:43:47 -07:00
John MacFarlane
de10b1653e RST writer: Skip spaces after display math. 
Otherwise we get indentation problems, and part of the next
paragraph may be rendered as part of the math.
 2013-10-11 22:01:58 -07:00
John MacFarlane
25e43d1c89 LaTeX reader: Fixed character escaping in \url{}. 
Previously `\~` wasn't handled properly, among others.
 2013-10-11 10:43:07 -07:00
John MacFarlane
dbd4aee730 Removed code that forces MathJax to typeset. 
Closes #1012.  Reopens #966.  A better solution for #966 will just
affect slideous, not the other slide writers.
 2013-10-06 17:21:33 -07:00
John MacFarlane
9e7072cf1b LaTeX reader: Parse {groups} as Span. 
This is needed for accurate conversion of bibtex titles,
since we need to know what was protected from titlecase conversions.
 2013-09-28 11:53:34 -07:00
John MacFarlane
d76a6e2372 OpenDocument writer: don't use font-face-decls variable. 2013-09-24 18:41:43 -07:00
Václav Zeman
e149d4e138 src/Text/Pandoc/Writers/OpenDocument.hs: Fix formatting of strikeout code. 2013-09-25 01:18:39 +02:00
John MacFarlane
255037a091 Markdown reader: small code improvement. 2013-09-19 10:09:32 -07:00
John MacFarlane
e135955b1e LaTeX writer: Don't print biblio if --natbib or --biblatex option used. 2013-09-19 10:08:49 -07:00
John MacFarlane
d27e5a6ff0 DOCX writer: Add missing settings.xml to the zip container. 
Closes #990.
 2013-09-19 09:48:02 -07:00
John MacFarlane
464b174d0f Fixed reference slides. 
The Div container around references messed up the procedure
for carving a document into slides.  So we now remove the surrounding
Div in prepSlides.
 2013-09-18 09:13:37 -07:00
John MacFarlane
21f1bcb280 Markdown reader: unresolved citations fall back to original text. 
Not ???.

Reason:  Less surprising, especially for people using @ as
in twitter.
 2013-09-14 22:28:37 -07:00
John MacFarlane
3747104178 Markdown writer: Print references if output is 'plain'. 2013-09-12 11:23:57 -07:00
John MacFarlane
ca6842349e HTML writer: Ensure proper escaping in header metadata. 2013-09-12 09:25:15 -07:00
John MacFarlane
71841de0f3 Mediawiki: Parse an image + caption in a para by itself as a figure. 2013-09-11 09:31:41 -07:00
John MacFarlane
a9f3abc653 Markdown: don't parse citation right after alphanumeric. 
An `@` after an alphanumeric is probably an email address.
 2013-09-09 11:19:37 -07:00
John MacFarlane
81e2df32c9 Made . . . for pause work in all slide show formats except slideous. 2013-09-08 15:47:50 -07:00
John MacFarlane
c78557f3ca Templates: more consistent behavior of $for$. 
When `foo` is not a list, `$for(foo)$...$endfor$` should behave like
$if(foo)$...$endif$.  So if `foo` resolves to "", no output should
be produced.

See pandoc-templates#39.
 2013-09-08 12:04:47 -07:00
John MacFarlane
777226296b markdown+list_without_preceding_blankline:+Interpret text before list as paragraph. 2013-09-08 11:49:44 -07:00
John MacFarlane
cf2506acdc Markdown: Allow backtick code blocks not to be preceded by blank line. 
Closes #975.
 2013-09-08 11:43:46 -07:00
John MacFarlane
2c13b6f6dc MedaWiki reader: Implement some mathjax extensions. 
* `:<math>` for display math
* `\(..\)` for inline math
* `\[..\]` for display math

We omit the `$` forms as the heuristics are harder.
 2013-09-07 22:43:56 -07:00
John MacFarlane
5afd373ae4 Added lists_without_preceding_blankline extension. 
* Added `Ext_lists_without_preceding_blankline` to
  `Extension` in `Options`.  Added this option to
  `githubMarkdownExtensions`.
* Made markdown reader sensitive to this.
* Closes #972.
 2013-09-07 09:36:37 -07:00
John MacFarlane
8d43e08ce7 Markdown writer: Fixed bugs in YAML header output. 2013-09-06 22:26:38 -07:00
John MacFarlane
728e47ae15 MediaWiki reader: Allow Image: for images. 
Closes #971.
 2013-09-06 15:40:08 -07:00
John MacFarlane
9b0b9b6e03 Markdown reader: Don't autolink a bare URI that is followed by </a>. 
Closes #937.
 2013-09-01 15:18:56 -07:00
John MacFarlane
8b0052ba5b Mathjax in HTML slide shows: include explicit "Typeset" instruction. 
This seems to be needed for some formats (e.g. slideous) and won't
hurt in others.

Closes #966.
 2013-09-01 15:05:51 -07:00
John MacFarlane
90c49b0aae Use registerHeader in Textile reader. 
This produces automatic header identifiers, unless `auto_identifiers`
extension is disabled.

Closes #967.
 2013-09-01 09:22:55 -07:00
John MacFarlane
9282f63278 Use registerHeader in RST and LaTeX readers. 
This will give automatic unique identifiers, unless
`-auto_identifiers` is specified.
 2013-09-01 09:13:31 -07:00
John MacFarlane
6ed41fdfcc Factored out registerHeader from markdown reader, added to Parsing. 
Text.Pandoc.Parsing now exports registerHeader, which can be
used in other readers.
 2013-09-01 08:54:10 -07:00
John MacFarlane
940515a00b LaTeX reader: allow spaces in alignment spec in tables. 
E.g. `{ l r c }`.
 2013-08-28 16:54:37 -07:00
John MacFarlane
dd5cb82348 Generalized type of stringify. 2013-08-28 08:43:51 -07:00
John MacFarlane
8014809578 LaTeX reader: Allow accents with combining characters. 
accent now returns [Char], not Char.
 2013-08-27 20:12:21 -07:00
John MacFarlane
ad9447cf92 Merge branch 'master' of github.com:jgm/pandoc 2013-08-27 19:56:21 -07:00
John MacFarlane
e7a4bcc6fe Merge pull request #961 from nougad/add_latex_listings_label 
Write id for code block to label attr in latex when listing is used
 2013-08-25 20:48:38 -07:00
John MacFarlane
deb59b6235 Removed dependency on citeproc-hs. 
Going forward we'll use pandoc-citeproc, as an external filter.

The `--bibliography`, `--csl`, and `--citation-abbreviation` fields
have been removed.  Instead one must include `bibliography`, `csl`,
or `csl-abbrevs` fields in the document's YAML metadata.  The filter
can then be used as follows:

    pandoc --filter pandoc-citeproc

The `Text.Pandoc.Biblio` module has been removed.  Henceforth,
`Text.CSL.Pandoc` from pandoc-citations can be used by library users.

The Markdown and LaTeX readers now longer format bibliographies and
citations.  That must be done using `processCites` or `processCites'`
from Text.CSL.Pandoc.

All bibliography-related fields have been removed from `ReaderOptions`
and `WriterOptions`: `writerBiblioFiles`, `readerReferences`,
`readerCitationStyle`.

API change.
 2013-08-24 22:33:01 -07:00
John MacFarlane
74250b6c35 Moved most of Text.Pandoc.Readers.TeXMath to texmath 0.6.4. 2013-08-24 16:10:13 -07:00
Florian Eitel
5f09cf7ff0 Write id for code block to label attr in latex when listing is used 
The code:

    ~~~{#test}
    asdf
    ~~~

gets compiled to html:

    <pre id="test">
    asdf
    </pre>

So it is possible to link to the identifier `test`

But this doesn't happen on latex

When using the listings package (`--listings`) it is possible to set the
identifier using the `label=test` property:

    \begin{lstlisting}[label=id]
    hi
    \end{lstlisting}

And this is exactly what this patch is doing.

Modified LaTeX Reader/Writer and added tests for this.
 2013-08-22 20:15:36 +02:00
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