Commit graph

223 commits

Author SHA1 Message Date
John MacFarlane
22e36e1040 LaTeX reader: Made \nocite work.
This adds nocite citations to a metadata field, `nocite`.
These will appear in the bibliography but not in the text
(unless you use a `$nocite$` variable in your template, of
course).
2014-04-26 12:14:42 -07:00
John MacFarlane
fcddd0e4bd LaTeX reader: handle @{} and p{length} in tabular.
The length is not actually recorded, but at least we get a table.

Closes #1180.
2014-04-06 15:11:49 -07:00
John MacFarlane
69a7c9f634 LaTeX reader: Better handling of figure and table with caption.
We now look for a \caption inside the environment; if one is
found, it is attached to the graphic or tabular found there.

Closes #1204.
2014-03-25 23:10:43 -07:00
John MacFarlane
994597f071 Revert "LaTeX reader: Added LPState."
This reverts commit 82ddec698e.
2014-03-25 22:40:18 -07:00
John MacFarlane
82ddec698e LaTeX reader: Added LPState.
Plan is to use this instead of ParserState in LP.
2014-03-25 15:38:30 -07:00
John MacFarlane
5e69f845d5 LaTeX reader: Better handling of "table" environment.
Positioning options no longer rendered verbatim.
Partially addresses #1204.
2014-03-25 12:04:25 -07:00
Henry de Valence
0c5e7cf8cb HLint: use elem and notElem
Replaces long conditional chains with calls to `elem` and `notElem`.
2013-12-19 20:19:24 -05:00
John MacFarlane
0132f6fcb7 LaTeX reader: Support babel-style quoting: ` "..."' ``. 2013-12-17 16:03:43 -08:00
Jeff Arnold
5adbe7b365 LaTeX reader: add support for Verb macro 2013-12-13 19:16:04 -05:00
John MacFarlane
def05d3504 HTML reader: Parse LaTeX math if appropriate options are set.
* Moved inlineMath, displayMath from Markdown reader to Parsing.
* Export them from Parsing.  (API change.)
* Generalize their types.
2013-12-06 17:15:13 -08:00
John MacFarlane
a3eba6ee84 LaTeX reader: Parse contents of curly quotes or matched " as quotes. 2013-11-18 20:28:27 -08: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
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
1a55c8f5de LaTeX reader: Ensure that preamble doesn't contribute to text of doc. 2013-10-11 22:43:47 -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
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
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
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
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
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
ab8c0dcd41 LaTeX reader: parse label after section command and set id.
Closes #951.
2013-08-16 12:40:38 -07:00
Scott Morrison
d3ebca6f55 LaTeX reader missing \oe and \OE characters 2013-08-16 14:48:24 +10:00
Scott Morrison
c45bd6d468 adding support for breve accents via \u{} while reading LaTeX 2013-08-16 10:03:54 +10: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
cbfa932106 Adjustments for new Format newtype. 2013-08-10 17:24:54 -07:00
John MacFarlane
fb9f2e4bd5 LaTeX reader: Support \v{} for hacek.
Closes #926.
2013-07-25 10:00:11 -07:00
John MacFarlane
800c5490ec LaTeX reader: Don't add spurious ", " to citation suffixes.
This is added when needed in Text.Pandoc.Biblio anyway.
2013-07-21 11:44:49 -07:00
John MacFarlane
82e46bf385 LaTeX reader: Support alltt environment.
Closes  #892.
2013-06-27 18:54:31 -07:00
John MacFarlane
f869f7e08d Use new flexible metadata type.
* Depend on pandoc 1.12.
* Added yaml dependency.
* `Text.Pandoc.XML`: Removed `stripTags`.  (API change.)
* `Text.Pandoc.Shared`:  Added `metaToJSON`.
  This will be used in writers to create a JSON object for use
  in the templates from the pandoc metadata.
* Revised readers and writers to use the new Meta type.
* `Text.Pandoc.Options`: Added `Ext_yaml_title_block`.
* Markdown reader:  Added support for YAML metadata block.
  Note that it must come at the beginning of the document.
* `Text.Pandoc.Parsing.ParserState`:  Replace `stateTitle`,
  `stateAuthors`, `stateDate` with `stateMeta`.
* RST reader:  Improved metadata.
  Treat initial field list as metadata when standalone specified.
  Previously ALL fields "title", "author", "date" in field lists
  were treated as metadata, even if not at the beginning.
  Use `subtitle` metadata field for subtitle.
* `Text.Pandoc.Templates`:  Export `renderTemplate'` that takes a string
  instead of a compiled template..
* OPML template:  Use 'for' loop for authors.
* Org template: '#+TITLE:' is inserted before the title.
  Previously the writer did this.
2013-06-24 20:29:41 -07:00
John MacFarlane
d097734189 LaTeX reader: Skip positional options after \begin{figure}. 2013-05-12 16:11:35 -07:00
John MacFarlane
af6f216c96 Treat \textsl as emphasized text in LaTeX reader.
Closes #850.
2013-05-09 15:29:27 -07:00
John MacFarlane
7e4290561d LaTeX reader: Support \textasciitilde, \textasciicircum.
Closes #810.
2013-03-31 21:08:19 -07:00
John MacFarlane
cae52ecc31 Revert "LaTeX reader: citation handling changes."
This reverts commit f7229b1473.
2013-03-17 08:48:29 -07:00
John MacFarlane
f7229b1473 LaTeX reader: citation handling changes.
Previously, a LaTeX citation would always be parsed as a Citation
element, with the raw LaTeX in the [Inline] part.

Now, the LaTeX citation is parsed as a Citation element only if
`--biblio` was specified (i.e. only if there is a nonempty set
of references in readerReferences).  Otherwise it is parsed as
raw LaTeX.

This will make it possible to simplify some things in the markdown
writer.  It also makes the LaTeX reader behave more like the Markdown
reader.
2013-03-09 10:33:25 -08:00
John MacFarlane
48be39ae2a Support :number-lines: in RST code output. 2013-03-06 10:13:12 -08:00
John MacFarlane
f7d37c97bb LaTeX reader: Better support for Verbatim and minted environments.
Closes #763.
2013-03-06 09:58:47 -08:00
John MacFarlane
8b3a81e4dd LaTeX reader: Handle language attribute for lstlistings.
Convert it to a highlighting-kate language name.
2013-03-05 22:43:27 -08:00
John MacFarlane
3692e371a7 LaTeX reader: Read optional attributes in lstlisting environment.
We convert these to pandoc standard names, e.g. "numberLines"
for "numbers=left", "startFrom=100" from "firstnumber=100".

Still need to add code to convert the language names.
2013-03-04 09:50:11 -08:00
John MacFarlane
f449dfd55d LaTeX reader: Add "fig:" as title for images with captions.
This is needed for them to be rendered as figures.
Closes #766.
2013-03-01 12:22:01 -08:00
John MacFarlane
52ee09608a LaTeX reader: Handle \caption for images in figures.
Closes #766.
2013-02-26 22:16:03 -08:00
John MacFarlane
7a97369d01 LaTeX reader: Don't emit empty paragraph.
See #761.
2013-02-20 13:01:50 -08:00
John MacFarlane
3f2dd98f45 LaTeX reader: Parse \section*, etc. as unnumbered sections. 2013-02-20 09:59:31 -08:00
John MacFarlane
0e03962615 LaTeX reader: Parse \hrule as HorizontalRule.
Closes #746.
2013-02-11 17:39:52 -08:00