aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2015-07-12Changed hierarchicalize so it treats references div as top-level header.John MacFarlane1-0/+5
Fixes a bug with `--section-divs`, where the final references section added by pandoc-citeproc, enclosed in its own div, got put in the div for the section previous to it. This fixes #2294. Longer term, we might think about how hierarchicalize should interact with Div elements.
2015-07-10Avoid parsing partial URLs as HTML tags.John MacFarlane1-1/+8
Closes #2277.
2015-07-08Merge pull request #2266 from PromyLOPh/fieldinlineJohn MacFarlane1-15/+11
RST: Support inline markup for field list names
2015-07-08PDF: Make sure `--latex-engine-opt` goes before the filename...John MacFarlane1-1/+1
on the command line. LaTeX needs the argument to come after the options. Closes #1779 - again! Thanks to squisher for pointing out the problem.
2015-07-08Correct superscript/subscript.Andrew Dunning1-3/+3
2015-07-07Fixed email javascript obfuscation with mailto: URLs.John MacFarlane1-2/+2
This fixes a potential security issue. Because single quotes weren't being escaped in the link portion, a specially crafted email address could allow javascript code injection. [Jim'+alert('hi')+'OBrien](mailto:me@example.com) Closes #2280.
2015-07-03Readers.RST: Factor out inline markup string parsingLars-Dominik Braun1-15/+11
2015-07-03Readers.RST: Parse field list nameLars-Dominik Braun1-1/+1
“Inline markup is parsed in field names.” [1] [1] http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#field-lists
2015-07-01ConTeXt: use `\goto` for internal links.John MacFarlane1-7/+2
2015-07-01Merge pull request #2255 from mchladek/odt_linebreakJohn MacFarlane1-1/+1
Fix #2254 : OpenDocument writer adds space with hard line break
2015-07-01ConTeXt writer: Added a % at end for `\reference` to avoid spurious space.John MacFarlane1-2/+2
2015-07-01New method for building man pages.John MacFarlane1-101/+0
+ Removed `--man1`, `--man5` options (breaking change). + Removed `Text.Pandoc.ManPages` module (breaking API change). + Version bump to 1.15 because of the breaking changes, even though they involve features that have only been in pandoc for a day. + Makefile target for `man/man1/pandoc.1`. This uses pandoc to create the man page from README using a custom template and filters. + Added `man/` directory with template and filters needed to build man page. + We no longer have two man pages: pandoc.1 and pandoc_markdown.5. Now there is just pandoc.1, which has all the content from README. This change was needed because of the extensive cross-references between parts of the README. + Removed old `data/pandoc.1.template` and `data/pandoc_markdown.5.template`.
2015-07-01Do not add a carriage return after a hard line break in OpenDocument writer ↵Michael Chladek1-1/+1
and reflect change in tests.
2015-06-29Merge pull request #2250 from PromyLOPh/rsttargetJohn MacFarlane1-1/+1
Fix RST reference names with special characters
2015-06-29LaTeX reader: Allow `_` and `^` as regular inline text.John MacFarlane1-1/+1
Normally these will cause an error in LaTeX, but there are contexts (e.g. `alltt` environments) where they are okay. Now that we aren't treating them as super/subscript outside of math mode, it seems okay to parse them as regular text.
2015-06-29LaTeX reader: don't parse `_`,`^` as super/sub outside math mode.John MacFarlane1-2/+0
2015-06-29Fix RST reference names with special charactersLars-Dominik Braun1-1/+1
2015-06-28Removed unneeded import.John MacFarlane1-1/+1
2015-06-28Added a needed import in Shared.John MacFarlane1-0/+1
2015-06-28Make sure we use dist version of reference.docx for some things.John MacFarlane1-2/+2
Taking some values from a user-supplied reference.docx tends to lead to corruption. This fixes a regression from the last release. Closes #2249.
2015-06-28Let reference.docx/odt behave as if they are virtual data files.John MacFarlane3-44/+74
Now they are constructed on the fly from their components, but we now allow them to be printed with `--print-default-data-file` and to override the defaults if placed in the user data directory. Shared now exports getDefaultReferenceDocx and getDefaultReferenceODT (API change). These functions have been removed from the Docx and ODT writers. Shared.readDataFile has been modified so that requests to read a reference.odt or reference.docx will use these functions to generate the files.
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.