summaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
Commit message (Collapse)AuthorAge
...
* DocBook reader: Support <?asciidoc-br?>.John MacFarlane2014-06-17
| | | | | | | | | Closes #1236. Note, this is a bit of a kludge, to work around the fact that xml-light doesn't parse `<?asciidoc-br?>` correctly. We preprocess the input, replacing that instruction with `<br/>`, and then parse that as a line break. Other XML instructions are simply removed from the input stream.
* LaTeX reader: Correctly handle table rows with too few cells.John MacFarlane2014-06-17
| | | | | LaTeX seems to treat them as if they have empty cells at the end. Closes #241.
* Fixed compiler warning.John MacFarlane2014-06-16
|
* Naming: Use Docx instead of DocX.John MacFarlane2014-06-16
| | | | For consistency with the existing writer.
* Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docxJohn MacFarlane2014-06-16
|\
| * Add DocX files to tree.Jesse Rosenthal2014-06-16
| | | | | | | | This introduces Text.Pandoc.DocX, and its exported `readDocX` function.
* | Org reader: make tildes create inline code.John MacFarlane2014-06-16
| | | | | | | | | | | | | | | | | | | | Closes #1345. Also relabeled 'code' and 'verbatim' parsers to accord with the org-mode manual. I'm not sure what the distinction between code and verbatim is supposed to be, but I'm pretty sure both should be represented as Code inlines in pandoc. The previous behavior resulted in the text not appearing in any output format.
* | Small improvement to fix to #1333.John MacFarlane2014-06-16
| | | | | | | | This allows blank lines at end of multiline headers.
* | Markdown reader: fixed #1333 (table parsing bug).John MacFarlane2014-06-16
| |
* | LaTeX reader: handle leading/trailing spaces in emph better.John MacFarlane2014-06-16
| | | | | | | | | | | | | | | | | | | | | | `\emph{ hi }` gets parsed as `[Space, Emph [Str "hi"], Space]` so that we don't get things like `* hi *` in markdown output. Also applies to textbf and some other constructions. Closes #1146. (`--normalize` isn't touched by this, but normalization should not generally be necessary with the changes to the readers.)
* | LaTeX reader: don't assume preamble doesn't contain environments.John MacFarlane2014-06-16
| | | | | | | | Closes #1338.
* | HTML reader: Fixed major parsing problem with HTML tables.John MacFarlane2014-06-16
| | | | | | | | Table cells were being combined into one cell. Closes #1341.
* | Merge pull request #1344 from mpickering/masterJohn MacFarlane2014-06-16
|\ \ | | | | | | Moved extractSpaces to Shared.hs
| * | Moved extractSpaces to Shared.hsmpickering2014-06-16
| |/ | | | | | | | | Generalised and move the extractSpaces function from `HTML.hs` to `Shared.hs` so that the docx reader can also use it.
* / Org reader: fixed #1342.John MacFarlane2014-06-16
|/ | | | | | | | This change rewrites `inlineLaTeXCommand` so that parsec will know when input is being consumed. Previously a run-time error would be produced with some input involving raw latex. (I believe this does not affect the last release, as the inline latex reading was added recently.)
* allow (and discard) optional argument for \captionJames Aspnes2014-06-12
|
* LaTeX reader: Handle comments at the end of tables.John MacFarlane2014-06-03
| | | | | This resolves the issue illustrated in http://stackoverflow.com/questions/24009489/comments-in-latex-break-pandoc-table.
* Markdown writer: Prettier pipe tables.John MacFarlane2014-06-03
| | | | Columns are now aligned. Closes #1323.
* Docx writer: Section numbering carries over from reference.docx.John MacFarlane2014-06-03
| | | | Closes #1305.
* Docx writer: Combine reference.docx numbering with pandoc's.John MacFarlane2014-06-03
| | | | | | | This should have fixed #1305, allowing the reference.docx to define section numbering, but it doesn't. Now the headings appear with proper indentation, but the numbers don't appear. Unclear why. styles.xml and numbering.xml basically match the docx which has the expected result.
* Docx writer: pandoc uses only numIds >= 1000 for lists.John MacFarlane2014-06-03
| | | | | | This opens up the possiblity (with further code changes) of preserving some numbering from the reference.docx (e.g. header numbering.) See #1305.
* Docx writer: Changed abstractNumId numbering scheme.John MacFarlane2014-06-03
| | | | | | | Now the minimum id used by pandoc is 990. All ids start with "99". This gives some room for a reference.docx to define numbering styles. Note: this is not yet possible, since pandoc generates numbering.xml entirely on its own.
* Docx writer: Simplified abstractNumId numbering.John MacFarlane2014-06-03
| | | | | | Instead of sequential numbering, we assign numbers based on the list marker styles. This simplifies some of the code and should make it easier to modify numbering in the future.
* Templates: use ordNum instead of ord.John MacFarlane2014-06-03
| | | | Closes #1022.
* Shared: Added ordNub.John MacFarlane2014-06-03
| | | | API change (adds export).
* Docx writer: Create overrides per-image for media/ in ref docx.John MacFarlane2014-06-02
| | | | | This should be somewhat more robust and cover more types of images.
* Docx writer: Improved entryFromArchive to avoid parse.John MacFarlane2014-06-02
| | | | | No need to parse the XML if we're just going to render it right away!
* Docx writer: Make images work in reference.docx headers/footers.John MacFarlane2014-06-02
| | | | | | | * All media from reference.docx are copied into result. * Added defaults for common image types to [Content Types]. * Avoided redundant XML parse + write for entries taken over from reference.docx, for better performance.
* Templates: Fail informatively on template syntax errors.John MacFarlane2014-06-01
| | | | | | | With the move from parsec to attoparsec, we lost good error reporting. In fact, since we weren't testing for end of input, malformed templates would fail silently. Here we revert back to Parsec for better error messages.
* Docx writer: Improved handling of headers/footers.John MacFarlane2014-06-01
|
* Docx writer: Header and footer are now carried over from reference.docx.John MacFarlane2014-06-01
|
* Minor code reformat.John MacFarlane2014-06-01
|
* Docx writer: Take over document formatting from reference.docx.John MacFarlane2014-05-31
| | | | This includes margins, page size, page orientation.
* PDF writer: Fixed treatment of data uris for images.John MacFarlane2014-05-28
| | | | Closes #1062.
* Merge pull request #1302 from tarleb/inline-latexJohn MacFarlane2014-05-28
|\ | | | | Org reader: support for inline LaTeX
| * Org reader: support for inline LaTeXAlbert Krewinkel2014-05-20
| | | | | | | | | | | | Inline LaTeX is now accepted and parsed by the org-mode reader. Both, math symbols (like \tau) and LaTeX commands (like \cite{Coffee}), can be used without any further escaping.
* | Markdown reader: Handle `c++` and `objective-c` as language identifiersJohn MacFarlane2014-05-27
| | | | | | | | | | | | | | in github-style fenced blocks. Closes #1318. Note: This is special-case handling of these two cases. It would be good to do something more systematic.
* | Markdown reader: inline math must have nonspace before final `$`.John MacFarlane2014-05-27
| | | | | | | | Closes #1313.
* | EPUB writer: Handle multiple dates with OPF `event` attributes.John MacFarlane2014-05-19
| | | | | | | | | | Note: in EPUB3 we can have only one dc:date, so only the first one is used.
* | Avoid `import Prelude hiding (catch)`.John MacFarlane2014-05-19
| | | | | | | | See #1309.
* | Removed dependency on conduit.John MacFarlane2014-05-18
|/ | | | | * http-conduit flag is now https. * Instead of http-conduit, we depend on http-client and http-client-tls.
* EPUB writer: Fixed regression on cover image.John MacFarlane2014-05-15
| | | | | | | | | | In 1.12.4 and 1.12.4.2, the cover image would not appear properly, because the metadata id was not correct. This was introduced by the fix to #1254. Now we derive the id from the actual cover image filename, which we preserve rather than using "cover-image."
* Merge pull request #1293 from tarleb/typoJohn MacFarlane2014-05-14
|\ | | | | Process: Fix minor typo in pipeProcess' docs
| * Process: Fix minor typo in pipeProcess' docsAlbert Krewinkel2014-05-11
| | | | | | | | Replace fullstop with comma, adjust capitalisation.
* | Merge pull request #1297 from tarleb/citationsJohn MacFarlane2014-05-14
|\ \ | | | | | | Org reader: support Pandocs citation extension
| * | Org reader: support Pandocs citation extensionAlbert Krewinkel2014-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Citations are defined via the "normal citation" syntax used in markdown, with the sole difference that newlines are not allowed between "[...]". This is for consistency, as org-mode generally disallows newlines between square brackets. The extension is turned on by default and can be turned off via the default syntax-extension mechanism, i.e. by specifying "org-citation" as the input format. Move `citeKey` from Readers.Markdown into Parsing The function can be used by other readers, so it is made accessible for all parsers.
| * | Move `citeKey` from Readers.Markdown to ParsingAlbert Krewinkel2014-05-14
| | | | | | | | | | | | | | | The function can be used by other readers, so it is made accessible for all parsers.
| * | Introduce class HasLastStrPosition, generalize functionsAlbert Krewinkel2014-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Both `ParserState` and `OrgParserState` keep track of the parser position at which the last string ended. This patch introduces a new class `HasLastStrPosition` and makes the above types instances of that class. This enables the generalization of functions updating the state or checking if one is right after a string.
* | | LaTeX reader: Support `\addbibresource`.John MacFarlane2014-05-12
| | |
* | | Shared addMetaField: if old and new values both lists, concatenate.John MacFarlane2014-05-12
|/ /