Commit graph

2688 commits

Author SHA1 Message Date
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
Merijn Verstraaten
56f56e5e15 Added support for LaTeX style literate Haskell code blocks in rST. 2013-09-07 18:58:16 +01: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