aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2015-06-28Minor fixes to previous commit.John MacFarlane2-12/+4
* Instead of defining readmeFile in Text.Pandoc.Data (which we forgot to export anyway), we simply add a record for "README" to the `dataFiles` lookup table. This allows simplifying some of the code for `readDefaultDataFile` in SHared. * As a bonus, `pandoc --print-default-data-file README` now works.
2015-06-28New method for producing man pages.John MacFarlane3-6/+118
This change adds `--man1` and `--man5` options to pandoc, so pandoc can generate its own man pages. It removes the old overly complex method of building a separate executable (but not installing it) just to create the man pages. The man pages are no longer automatically created in the build process. The man/ directory has been removed. The man page templates have been moved to data/. New unexported module: Text.Pandoc.ManPages. Text.Pandoc.Data now exports readmeFile, and `readDataFile` knows how to find README. Closes #2190.
2015-06-28Fixed regression in CSS parsing with `--self-contained`.John MacFarlane1-39/+47
In 1b44acf0c59b70cc63f48a23c6f77e45a982aaf9 we replaced some hackish CSS parsing with css-text, which I thought was a complete CSS parser. It turns out that it is very buggy, which results in lots of things being silently dropped from CSS when `--self-contained` is used (#2224). This commit replaces the use of css-text with a small but more principled css preprocessor, which only removes whitespace and replaces URLs with base 64 data when possible. Closes #2224.
2015-06-27Removed unused import.John MacFarlane1-1/+0
2015-06-27Textile writer: escape `+` and `-` as entities.John MacFarlane1-0/+2
Closes #2225.
2015-06-27Plain writer: don't use symbols for super/subscript.John MacFarlane2-15/+11
Simplified code by using plainExtensions from Options. Closes #2237.
2015-06-27Options: Export `plainExtensions`.John MacFarlane1-0/+19
These are the extensions used in `plain` output.
2015-06-21DocBook reader mediaobjects and figures, closes #2184mb211-11/+20
2015-06-09Fix InDesign crash with URLs containing more than one colon charactergohai1-2/+9
Colons are valid characters in URLs, and used e.g. by the Internet Archive's Wayback Machine - a popular resource amongst researchers. When InDesign encounters a HyperlinkURLDestination with more than one colon character in it, it crashes when placing the ICML. (This was tested against CS6.) The IDML specification hints at this requirement in section 6.4.1: "The colon apppears in the Name attribute of the style, but is encoded as %3a when it appears in the Self attribute". Follow this example for all colon characters in URLs.
2015-06-07DokuWiki writer: Use proper `<code>` tags for code blocks.John MacFarlane1-4/+4
Closes #2213.
2015-06-04HTML reader: allow `<body>` to close `<head>`.John MacFarlane1-0/+1
2015-05-31Custom writer: fixed some compiler warnings for ghc < 7.10.John MacFarlane1-12/+17
2015-05-31Allow building with hslua 0.4.John MacFarlane1-0/+20
2015-05-28Better fix for #2187.John MacFarlane2-15/+57
* Reverted kludgy change to make-windows-installer.bat. * Removed make-reference-fiels.hs. * Moved the individual ingredients of reference.docx and reference.odt to the data directory. * Removed reference.docx and reference.odt from data directory. * We now build the reference archives from their ingredient pieces in the docx and odt writers, instead of having a reference.docx or reference.odt intermediary. This should fix #2187. It also simplifies the bulid procedure. The one thing users may notice is different is that you can no longer get the reference.docx or reference.odt using `--print-default-data-file`. Instead, simply generate a docx or odt using pandoc with a blank or minimal input, and use that (or a customized version) with `--reference-docx` or `--reference-odt`.
2015-05-28ConTeXt writer: Add reference anchors to Div with ids.John MacFarlane1-1/+7
This is useful for pandoc-citeproc linked citations.
2015-05-28Removed tab chars in Textile reader source.John MacFarlane1-2/+2
2015-05-28Texinfo writer: Removed tabs from source.John MacFarlane1-3/+3
2015-05-27LaTeX/beamer: added `setotherlanguages` in polyglossia.John MacFarlane1-3/+7
This uses an `otherlang` variable that takes a list of languages. As requseted in #2174.
2015-05-27LaTeX writer: Make `mainlang` work when `lang` is in metadata.John MacFarlane1-2/+3
Closes #2174.
2015-05-27Fixed svg handling in EPUB writer.John MacFarlane2-1/+4
This is a crude workaroud for #2183. A correct fix would require having openURL and fetchItem return a content encoding as well as a content type.
2015-05-27Fixed compiler warning.John MacFarlane1-1/+1
2015-05-27Revealjs: allow 'center' to be set to false.John MacFarlane1-0/+3
2015-05-27EPUB writer: Improved chapter splitting and internal link rewriting.John MacFarlane1-53/+34
Closes #1887. Closes #2163. Closes #2162.
2015-05-26Merge pull request #2170 from tarleb/org-generalize-result-blockJohn MacFarlane1-16/+21
Org generalize result block
2015-05-26Merge pull request #2169 from tarleb/org-header-tagsJohn MacFarlane1-6/+31
Org reader: put header tags into empty spans
2015-05-26Merge pull request #2141 from DigitalPublishingToolkit/icml-imagesJohn MacFarlane1-1/+3
Fix image URIs in ICML output
2015-05-23Org reader: drop trees with a :noexport: tagAlbert Krewinkel1-4/+12
Trees having a `:noexport:` tag set are not exported. This mirrors default Emacs Org-Mode behavior.
2015-05-23Org reader: put header tags into empty spansAlbert Krewinkel1-2/+19
Org mode allows headers to be tagged: ``` org-mode * Headline :TAG1:TAG2: ``` Instead of being interpreted as part of the headline, the tags are now put into the attributes of empty spans. Spans without textual content won't be visible by default, but they are detectable by filters. They can also be styled using CSS when written as HTML. This fixes #2160.
2015-05-23Org reader: generalize code block result parsingAlbert Krewinkel1-3/+3
Code blocks can be followed by optional result blocks, representing the output generated by running the code in the code block. It is possible to choose whether one wants to export the code, the result, both or none. This patch allows any kind of `Block` as the result. Previously, only example code blocks were recognized.
2015-05-23Reorder block arguments parsing codeAlbert Krewinkel1-13/+18
Group code used to parse block arguments together in one place. This seems better than having part of the code mixed between unrelated parsing state changing functions.
2015-05-21EPUB writer: Split references into separate chapter.John MacFarlane1-0/+4
Previously the div-enclosed reference section produced by pandoc-citeproc would not be split into its own chapter, which caused various problems. See #2162, #2163. I'm not sure this is a complete fix. I note that the bibliography doesn't appear in nav or toc, which seems bad.
2015-05-20PDF writer: Print temp dir on `--verbose`.John MacFarlane1-0/+2
This might help diagnose #777.
2015-05-20DocBook writer: add id to para if in Div with id element.John MacFarlane1-0/+8
This makes the writer work properly with linked bibliographic items with pandoc-citeproc. Closes jgm/pandoc-citeproc#132.
2015-05-13Markdown reader: Made implicit header references case-insensitive.John MacFarlane2-12/+26
Added `stateHeaderKeys` to `ParserState`; this is a `KeyTable` like `stateKeys`, but it only gets consulted if we don't find a match in `stateKeys`, and if `Ext_implicit_header_references` is enabled. Closes #1606.
2015-05-13HTML reader: Support base tag.John MacFarlane1-7/+28
We only support the href attribute, as there's no place for "target" in the Pandoc document model for links. Added HTML reader test module, with tests for this feature. Closes #1751.
2015-05-13Beamer: mark slide as `[fragile]` if header has `fragile` class.John MacFarlane1-2/+3
Closes #2119.
2015-05-13EPUB writer: Properly handle image URLs without an extension.John MacFarlane1-36/+42
We now look at the mime type from the server and attach an appropriate extension. Closes #1855.
2015-05-13Fixed regression in charsInBalancedBrackets.John MacFarlane1-1/+2
Introduced by e9d7504. This regression caused link and image references containing raw tex not to parse correctly. Added test. Closes #2150.
2015-05-11Don't use sup element for epub footnotes.John MacFarlane1-2/+4
Instead, just use an a element with class `footnoteRef`. This allows more styling options, and provides better results in some readers (e.g. iBooks, where anything inside the a tag breaks popup footnotes). Closes #1995.
2015-05-11HTML reader: Fixed detection of self-closing tags.John MacFarlane2-3/+3
Earlier versions had a bug and would wrongly think opening tags containing attributes with slashes in them were self-closing. Closes #2146.
2015-05-11Fix image URIs in ICML output (v2)gohai1-1/+3
InDesign expects LinkResourceURI to start with "file:" for local filenames, and won't render/link the image without.
2015-05-10ImageSize: fixed some exif parsing bugs.John MacFarlane1-22/+26
Closes #1834. The image originally supplied works fine now with pandoc.
2015-05-09Improved warnings when image size can't be determined.John MacFarlane3-5/+13
Closes #1834.
2015-05-09ImageSize: Use runGetOrFail with binary 0.7+.John MacFarlane1-2/+13
2015-05-09ImageSize: make jpeg header parsing routines return Either.John MacFarlane1-29/+34
See #1834.
2015-05-09ImageSize: make imageSize return an Either, not a Maybe.John MacFarlane4-16/+22
This will give us better error reporting options. This is part of a fix for #1834.
2015-05-09Revert "EPUB writer: stylesheet changes. Closes #2040."John MacFarlane1-26/+18
This reverts commit 1c2951dfd9ee72e5270cb974a06098adb9178f89. See #2040. The semantics was too squishy. `--css` takes a URL, but for EPUB we need files that we can read. I prefer keeping the old system for now, with `--epub-stylesheet`.
2015-05-08EPUB writer: stylesheet changes. Closes #2040.John MacFarlane1-18/+26
* Allow `--css` to be used to specify stylesheets. * Deprecated `--epub-stylesheet` and made it a synoynym of `--css`. * If a code block with class "css" is given as contents of the `stylesheet` metadata field, use its literal code as contents of the epub stylesheet. Otherwise, treat it as a filename and read the file. * Note: `--css` and `stylesheet` in metadata are not compatible. `stylesheet` takes precedence.
2015-05-05Deal with deprecation warning in Custom.John MacFarlane1-2/+10
2015-05-05UTF8: Better handling of bare CRs in input files.John MacFarlane1-2/+8
Previously we just stripped them out; now we convert other line ending styles to LF line endings. Closes #2132.