aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-16Bump version to 1.13John MacFarlane1-1/+1
2014-06-16Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docxJohn MacFarlane27-33/+1511
2014-06-16Org reader: make tildes create inline code.John MacFarlane2-7/+7
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-16Updated HTML reader table test - should be simple table.John MacFarlane1-1/+1
2014-06-16Added failing HTML reader test for table.John MacFarlane2-2/+31
See #1341.
2014-06-16Merge pull request #1344 from mpickering/masterJohn MacFarlane2-13/+20
Moved extractSpaces to Shared.hs
2014-06-16Merge pull request #1339 from dfc/patch-1John MacFarlane1-1/+1
input fmt is org-citations its plural not singular
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-16Updated README to reflect docx reader.Jesse Rosenthal1-9/+9
2014-06-16Add DocX tests to test-pandoc.hsJesse Rosenthal1-0/+3
2014-06-16Reference new DocX tests in cabal file.Jesse Rosenthal1-1/+20
2014-06-16Add DocX automated tests.Jesse Rosenthal19-0/+139
Note this makes use of input and output files in the tests/ dir.
2014-06-16Integrated the docx reader into the main pandoc program.mpickering2-23/+46
Changes also include generalising the types of reader allowed. The mechanism now mimics the more general output mechanism.
2014-06-16Add files to cabal.Jesse Rosenthal1-0/+3
Note there is a build warning for unused `makeImagesSelfContained` function, since there isn't yet a command-line-option to make use of it.
2014-06-16Add DocX files to tree.Jesse Rosenthal3-0/+1291
This introduces Text.Pandoc.DocX, and its exported `readDocX` function.
2014-06-13input fmt is org-citations its plural not singularDouglas Calvert1-1/+1
2014-06-12Merge pull request #1336 from aspnes/masterJohn MacFarlane1-1/+1
allow (and discard) optional argument for \caption
2014-06-12allow (and discard) optional argument for \captionJames Aspnes1-1/+1
2014-06-09Updated default latex template so `\subtitle` works properly.John MacFarlane1-12/+6
Closes #1327.
2014-06-06Require aeson >= 0.7.0.5 to avoid build problems.John MacFarlane1-1/+1
2014-06-06make_osx_package: don't cabal update at beginning.John MacFarlane1-2/+2
2014-06-04Reformatted nocite example in README.John MacFarlane1-2/+2
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-03Require texmath >= 0.6.6.3. Closes #1324.John MacFarlane1-1/+1
This fixes \tilde{E}, especially in docx.
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-03Version bump to 1.12.5.John MacFarlane1-1/+1
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-02Require latest texmath. Closes #1319.John MacFarlane1-1/+1
This allows `\left` to be used with `]`, `)`, etc.
2014-06-01Templates: Fail informatively on template syntax errors.John MacFarlane2-33/+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-01Updated tests for c8bc70a6bb12e0fbfadadb9480efafb3be4f11a5.John MacFarlane2-0/+2
2014-06-01Updated README on reference.docx.John MacFarlane1-1/+2
2014-06-01Docx writer: Improved handling of headers/footers.John MacFarlane1-52/+53
2014-06-01Removed header1.xml, footer1.xml from reference.docx.John MacFarlane1-0/+0
2014-06-01Docx writer: Header and footer are now carried over from reference.docx.John MacFarlane2-16/+38
2014-06-01Minor code reformat.John MacFarlane1-5/+5
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 16:34:17 +0000