aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2014-06-19Merge pull request #1354 from jkr/literalTabJohn MacFarlane2-2/+20
Parse literal tabs in docx
2014-06-19Introduce blockNormalizeJesse Rosenthal1-1/+14
This will help take care of spaces introduced at the beginning of strings.
2014-06-19Have Docx reader properly interpret tabs.Jesse Rosenthal1-0/+2
2014-06-19Add literal tabs to parser.Jesse Rosenthal1-1/+4
2014-06-19ImageSize: ignore unknown exif header tag rather than crashing.John MacFarlane1-1/+2
Some images seem to have tag type of 256, which was causing a runtime error.
2014-06-19Haddock writer: Use _____ for hrule.John MacFarlane1-2/+2
Avoids interpretation as list.
2014-06-18Haddock writer: Only use Decimal list style.John MacFarlane1-2/+2
2014-06-18Small fix to haddock "tables".John MacFarlane1-2/+2
2014-06-18More polish on Haddock reader/writer.John MacFarlane2-22/+47
2014-06-18Finished first draft of Haddock writer.John MacFarlane3-2/+371
2014-06-18Rewrote haddock reader to use haddock-library.John MacFarlane1-22/+102
This brings pandoc's rendering of haddock markup in line with the new haddock. Note that we preserve line breaks in `@` code blocks, unlike the earlier version. Modified tests pass. More tests would be good.
2014-06-18Removed old haddock reader code. Add dependency on haddock-library.John MacFarlane3-360/+21
This also removes the dependency on alex and happy.
2014-06-17Highlighting: Let .numberLines work even if no language given.John MacFarlane1-1/+6
Closes #1287, jgm/highlighting-kate#40.
2014-06-17DocBook reader: Support <?asciidoc-br?>.John MacFarlane1-2/+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.
2014-06-17LaTeX reader: Correctly handle table rows with too few cells.John MacFarlane1-3/+7
LaTeX seems to treat them as if they have empty cells at the end. Closes #241.
2014-06-16Fixed compiler warning.John MacFarlane1-1/+3
2014-06-16Naming: Use Docx instead of DocX.John MacFarlane4-47/+47
For consistency with the existing writer.
2014-06-16Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docxJohn MacFarlane4-20/+1327
2014-06-16Org reader: make tildes create inline code.John MacFarlane1-4/+4
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.
2014-06-16Small improvement to fix to #1333.John MacFarlane1-4/+1
This allows blank lines at end of multiline headers.
2014-06-16Markdown reader: fixed #1333 (table parsing bug).John MacFarlane1-5/+6
2014-06-16LaTeX reader: handle leading/trailing spaces in emph better.John MacFarlane1-17/+17
`\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.)
2014-06-16LaTeX reader: don't assume preamble doesn't contain environments.John MacFarlane1-1/+1
Closes #1338.
2014-06-16HTML reader: Fixed major parsing problem with HTML tables.John MacFarlane1-15/+11
Table cells were being combined into one cell. Closes #1341.
2014-06-16Merge pull request #1344 from mpickering/masterJohn MacFarlane2-13/+20
Moved extractSpaces to Shared.hs
2014-06-16Org reader: fixed #1342.John MacFarlane1-9/+5
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.)
2014-06-16Moved extractSpaces to Shared.hsmpickering2-13/+20
Generalised and move the extractSpaces function from `HTML.hs` to `Shared.hs` so that the docx reader can also use it.
2014-06-16Integrated the docx reader into the main pandoc program.mpickering1-20/+36
Changes also include generalising the types of reader allowed. The mechanism now mimics the more general output mechanism.
2014-06-16Add DocX files to tree.Jesse Rosenthal3-0/+1291
This introduces Text.Pandoc.DocX, and its exported `readDocX` function.
2014-06-12allow (and discard) optional argument for \captionJames Aspnes1-1/+1
2014-06-03LaTeX reader: Handle comments at the end of tables.John MacFarlane1-0/+1
This resolves the issue illustrated in http://stackoverflow.com/questions/24009489/comments-in-latex-break-pandoc-table.
2014-06-03Markdown writer: Prettier pipe tables.John MacFarlane1-8/+16
Columns are now aligned. Closes #1323.
2014-06-03Docx writer: Section numbering carries over from reference.docx.John MacFarlane1-1/+6
Closes #1305.
2014-06-03Docx writer: Combine reference.docx numbering with pandoc's.John MacFarlane1-6/+6
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.
2014-06-03Docx writer: pandoc uses only numIds >= 1000 for lists.John MacFarlane1-3/+8
This opens up the possiblity (with further code changes) of preserving some numbering from the reference.docx (e.g. header numbering.) See #1305.
2014-06-03Docx writer: Changed abstractNumId numbering scheme.John MacFarlane1-3/+3
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.
2014-06-03Docx writer: Simplified abstractNumId numbering.John MacFarlane1-19/+30
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.
2014-06-03Templates: use ordNum instead of ord.John MacFarlane1-3/+3
Closes #1022.
2014-06-03Shared: Added ordNub.John MacFarlane1-0/+9
API change (adds export).
2014-06-02Docx writer: Create overrides per-image for media/ in ref docx.John MacFarlane1-13/+8
This should be somewhat more robust and cover more types of images.
2014-06-02Docx writer: Improved entryFromArchive to avoid parse.John MacFarlane1-2/+3
No need to parse the XML if we're just going to render it right away!
2014-06-02Docx writer: Make images work in reference.docx headers/footers.John MacFarlane1-8/+20
* 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.
2014-06-01Templates: Fail informatively on template syntax errors.John MacFarlane1-32/+38
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.
2014-06-01Docx writer: Improved handling of headers/footers.John MacFarlane1-52/+53
2014-06-01Docx writer: Header and footer are now carried over from reference.docx.John MacFarlane1-16/+38
2014-06-01Minor code reformat.John MacFarlane1-5/+5
2014-05-31Docx writer: Take over document formatting from reference.docx.John MacFarlane1-17/+30
This includes margins, page size, page orientation.
2014-05-28PDF writer: Fixed treatment of data uris for images.John MacFarlane1-2/+2
Closes #1062.
2014-05-28Merge pull request #1302 from tarleb/inline-latexJohn MacFarlane2-1/+32
Org reader: support for inline LaTeX
2014-05-27Markdown reader: Handle `c++` and `objective-c` as language identifiersJohn MacFarlane1-1/+8
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.