aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2014-08-30Merge branch 'mime' of https://github.com/Aelve/John into Aelve-mimeJohn MacFarlane8-51/+67
Conflicts: src/Text/Pandoc/Writers/Docx.hs
2014-08-30Merge pull request #1580 from jkr/stringCellDokuWikiJohn MacFarlane1-10/+36
DokuWiki writer: Backslash newlines in table cells
2014-08-30DokuWiki writer: Use backslash newlines in table cells.Jesse Rosenthal1-10/+36
Write out strings in table cells with backslash linebreaks in place of newlines. We also want to remove the first two spaces of an indent in lists.
2014-08-29Merge pull request #1574 from jlduran/latex-horizontal-ruleJohn MacFarlane1-1/+1
LaTeX writer: Make Horizontal Rules more flexible
2014-08-29Merge branch 'ugly-tables' of https://github.com/jlduran/pandoc into ↵John MacFarlane1-5/+13
jlduran-ugly-tables
2014-08-29LaTeX writer: Add `\strut` to fix multiline tablesJose Luis Duran1-1/+2
See: http://tex.stackexchange.com/questions/34971
2014-08-28Docx Reader: Read single para in table cell as plainJesse Rosenthal1-1/+12
This makes to docx reader's native output fit with the way the markdown reader understands its markdown output. Ie, as far as table cells go: docx -> native == docx -> native -> markdown -> native (This identity isn't true for other things outside of table cells, of course).
2014-08-28LaTeX writer: Make Horizontal Rules more flexibleJose Luis Duran1-1/+1
Currently, pandoc has hard-coded the following in order to make horizontal rules in LaTeX: ```hs "\\begin{center}\\rule{3in}{0.4pt}\\end{center}" ``` Which is fine, but does not allow customizations. It also does not take into consideration the current line width. I'm proposing this change: ```diff @@ In Writers/LaTeX.hs: -"\\begin{center}\\rule{3in}{0.4pt}\\end{center}" +"\\begin{center}\\rule{0.5\\linewidth}{\\linethickness}\\end{center}" ```
2014-08-28LaTeX writer: Fix tablesJose Luis Duran1-4/+11
- [x] Fix a bug introduced in 66378062b622b0815a1a2ddce5d557e3ad13330c, which causes the table caption to repeat across all pages - [x] Address the issues discussed [here](https://groups.google.com/forum/#!msg/pandoc-discuss/qMu6_5lYy0o/ZAU7lzAIKw0J) regarding the extra vertical space. - [ ] NOTE: This will cause multiline table cells to appear unpadded. See http://tex.stackexchange.com/questions/34971 - [x] Use [`\tabularnewline`](http://tex.stackexchange.com/questions/78796) instead of `\\`.
2014-08-27DokuWiki Writer: Refactor to use Reader monadMatthew Pickering1-47/+56
2014-08-27DokuWiki Writer: Hlint cleanupMatthew Pickering1-27/+27
2014-08-27DokuWiki Writer: Qualified all importsMatthew Pickering1-5/+10
2014-08-26Merge pull request #1564 from jkr/trackChangesWriterJohn MacFarlane1-11/+57
Docx writer: write track changes.
2014-08-26Fixed exampleLine parser to accept example lines which have indentation at ↵Calvin Beck1-1/+1
the start of the line.
2014-08-26Docx writer: Accomodate GHC 7.4 (no lookupEnv)Jesse Rosenthal1-1/+1
2014-08-25Docx writer: Default to user login and time of change if not given.Jesse Rosenthal1-6/+21
2014-08-25Docx writer: Implement track changes.Jesse Rosenthal1-9/+40
These have default authors and dates of "unknown" and timestamp-zero, respectively.
2014-08-24Hlint changes to Docx writer.John MacFarlane1-22/+19
2014-08-23Docx writer: Bibliography entries get Bibliography style.John MacFarlane1-2/+6
Closes #1559.
2014-08-22Fixed --self-contained with Windows paths.John MacFarlane1-1/+2
Previously C:\foo.js was being wrongly interpreted as a URI. Closes #1558.
2014-08-21Txt2Tags Reader: Fixed crash when reading from stdinmpickering1-3/+5
2014-08-21Txt2Tags Reader: Corrected formatting of %%mtime macrompickering1-1/+1
2014-08-21Txt2Tags Reader: Parse Meta informationmpickering1-10/+36
The header is now parsed as meta information. The first line is the `title`, the second is the `author` and third line is the `date`.
2014-08-20Txt2Tags reader: Header is now parsed only if standalone flag is setmpickering1-1/+4
2014-08-19EPUB writer: don't use page-progression-direction in EPUB2.John MacFarlane1-16/+14
Also, if page-progression-direction not specified in metadata, don't include the attribute even in EPUB3; not including it is the same as including it with the value "default", as we did before. Closes #1550.
2014-08-18Merge pull request #1547 from jkr/styleparseJohn MacFarlane2-36/+110
Docx reader: parsing styles
2014-08-18HTML reader: improved handling of tags that can be block or inline.John MacFarlane1-5/+13
Previously a section like this would be enclosed in a paragraph, with RawInline for the video tags (since video is a tag that can be either block or inline): <video controls="controls"> <source src="../videos/test.mp4" type="video/mp4" /> <source src="../videos/test.webm" type="video/webm" /> <p> The videos can not be played back on your system.<br/> Try viewing on Youtube (requires Internet connection): <a href="http://youtu.be/etE5urBps_w">Relative Velocity on Youtube</a>. </p> </video> This change will cause the video and source tags to be parsed as RawBlock instead, giving better output. The general change is this: when we're parsing a "plain" sequence of inlines, we don't parse anything that COULD be a block-level tag.
2014-08-17Docx reader: whitespace fix.Jesse Rosenthal1-6/+6
2014-08-17Docx reader: remove emph styles and strong styles list.Jesse Rosenthal1-6/+0
We no longer need the explicit lists since we're deriving them from the ground up.
2014-08-17Docx reader: Add "Hyperlink" to blacklisted styles.Jesse Rosenthal1-2/+2
This is the only one so far. We'll add others as they show up.
2014-08-17Docx reader: Use style resolver.Jesse Rosenthal1-23/+9
We now no longer check against explicit styles.
2014-08-17Docx Reader: Introduce function for resolving dependent run styles.Jesse Rosenthal1-0/+31
We always favor an explicit positive or negative in a style in a descendent, and only turn to the ancestor if nothing is set. We also introduce an (empty) list of styles that are black-listed. We won't check them. (Think underlines in hyperlinks).
2014-08-17Merge pull request #1536 from considerate/masterJohn MacFarlane1-0/+3
Add row width to tables in Docx XML
2014-08-17Merge pull request #1543 from jkr/superSubVertJohn MacFarlane2-16/+17
Docx reader: Change behavior of Super/Subscript
2014-08-17Docx writer: Fixed regression, bungled list numbering.John MacFarlane1-3/+10
In pandoc 1.13, all lists come out as basic ordered lists. This fixes that bad regression. Closes #1544.
2014-08-17Docx Parse: build a bottom-up style tree.Jesse Rosenthal1-6/+31
Two points here: (1) We're going bottom-up, from styles not based on anything, to avoid circular dependencies or any other sort of maliciousness/incompetence. And (2) each style points to its parent. That way, we don't need the whole tree to pass a style over to Docx.hs
2014-08-17Remove an unnecessary import.Artyom Kazak1-1/+1
2014-08-17Update Reader.EPUB to use `MimeType`.Artyom Kazak1-8/+7
2014-08-17MIME cleanup.Artyom Kazak7-42/+59
* Create a type synonym for MIME type (instead of `String`). * Add `getMimeTypeDef` function. * Avoid recreating MIME type `Map`s every time. * Move “Formula-...” case handling into `getMimeType`.
2014-08-17Alias string and runStyle to CharStyle type.Jesse Rosenthal1-7/+10
2014-08-17Docx Style parser: Basic one now just takes a parent style.Jesse Rosenthal1-13/+15
This will make it easier to build the style map from the bottom up (to avoid any infinite references).
2014-08-17Docx reader: work with new rStyle.Jesse Rosenthal1-4/+4
Just discards info at the moment, so at least it works the same.
2014-08-17Parser: Framework for parsing styles.Jesse Rosenthal1-11/+44
We want to be able to read user-defined styles. Eventually we'll be able to figure out styles in terms of inheritance as well. The actual cascading will happen in the docx reader.
2014-08-17Docx reader: Change behavior of Super/SubscriptJesse Rosenthal2-16/+17
In docx, super- and subscript are attributes of Vertalign. It makes more sense to follow this, and have different possible values of Vertalign in runStyle. This is mainly a preparatory step for real style parsing, since it can distinguish between vertical align being explicitly turned off and it not being set. In addition, it makes parsing a bit clearer, and makes sure we don't do docx-impossible things like being simultaneously super and sub.
2014-08-16HTML reader: Parse appropriately styled span as SmallCaps.John MacFarlane1-1/+6
2014-08-17Simplify row width calculation.Viktor Kronvall1-2/+2
2014-08-17Include row width in table rows.Christoffer Ackelman1-0/+3
Added a property to all table rows where the sum of column widths is specified in pct (fraction of 5000).
2014-08-16Markdown writer: don't escape $, ^, ~ when extensions are deactivated.John MacFarlane1-5/+16
`tex_math_dollars`, `superscript`, and `subscript` extensions, respectively. Closes #1127.
2014-08-16Docx reader: Remove unnecessary plural functionsJesse Rosenthal1-11/+5
functions like runElemsToInlines and parPartsToInlines are just defined in terms of concatting and mapping their singular version (e.g. `runElemToInlines`). Having two functions with almost identical names makes it easier to introduce errors. It's easy enough to just concat and map inline, and it makes it clearer what is going on in the code.
2014-08-16Docx reader: Fix bug in character styles.Jesse Rosenthal1-2/+2
Style handling has been cleaned up, but introduced a bug here. There wasn't previously a test to catch it.