Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
4830 commits 2 branches 0 tags 65 MiB
Commit graph

4830 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
bec9f3c641 Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docx 2014-06-16 22:16:45 -07:00
John MacFarlane
78ee2416d1 Org reader: make tildes create inline code. 
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-16 22:03:26 -07:00
John MacFarlane
f9b97e6bfb Small improvement to fix to #1333. 
This allows blank lines at end of multiline headers.
 2014-06-16 21:26:50 -07:00
John MacFarlane
9da5d8955e Markdown reader: fixed #1333 (table parsing bug). 2014-06-16 21:18:24 -07:00
John MacFarlane
87c08be58f LaTeX reader: handle leading/trailing spaces in emph better. 
`\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-16 19:18:33 -07:00
John MacFarlane
459805de4c LaTeX reader: don't assume preamble doesn't contain environments. 
Closes #1338.
 2014-06-16 17:43:56 -07:00
John MacFarlane
31fd843133 HTML reader: Fixed major parsing problem with HTML tables. 
Table cells were being combined into one cell.  Closes #1341.
 2014-06-16 15:45:20 -07:00
John MacFarlane
e7d6b2e6ad Updated HTML reader table test - should be simple table. 2014-06-16 15:15:35 -07:00
John MacFarlane
9090c549aa Added failing HTML reader test for table. 
See #1341.
 2014-06-16 15:12:10 -07:00
John MacFarlane
2b364b34bb Merge pull request #1344 from mpickering/master 
Moved extractSpaces to Shared.hs
 2014-06-16 14:43:43 -07:00
John MacFarlane
577eb2b1ae Merge pull request #1339 from dfc/patch-1 
input fmt is org-citations its plural not singular
 2014-06-16 14:21:59 -07:00
John MacFarlane
01ef573ac2 Org reader: fixed #1342. 
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-16 14:18:06 -07:00
mpickering
7807564d44 Moved extractSpaces to Shared.hs 
Generalised and move the extractSpaces function from `HTML.hs` to
`Shared.hs` so that the docx reader can also use it.
 2014-06-16 20:45:54 +01:00
Jesse Rosenthal
c709cec0bd Updated README to reflect docx reader. 2014-06-16 07:18:52 -04:00
Jesse Rosenthal
6b939134e7 Add DocX tests to test-pandoc.hs 2014-06-16 07:18:52 -04:00
Jesse Rosenthal
cfd5290fc5 Reference new DocX tests in cabal file. 2014-06-16 07:18:52 -04:00
Jesse Rosenthal
f928e4c8dc Add DocX automated tests. 
Note this makes use of input and output files in the tests/ dir.
 2014-06-16 07:18:40 -04:00
mpickering
3bc818d2d3 Integrated the docx reader into the main pandoc program. 
Changes also include generalising the types of reader allowed. The
mechanism now mimics the more general output mechanism.
 2014-06-16 07:18:40 -04:00
Jesse Rosenthal
7f4668d871 Add files to cabal. 
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-16 07:18:40 -04:00
Jesse Rosenthal
293e4cfdc3 Add DocX files to tree. 
This introduces Text.Pandoc.DocX, and its exported `readDocX` function.
 2014-06-16 07:18:34 -04:00
Douglas Calvert
2604045420 input fmt is org-citations its plural not singular 2014-06-13 21:13:38 -04:00
John MacFarlane
4b6e279e3a Merge pull request #1336 from aspnes/master 
allow (and discard) optional argument for \caption
 2014-06-12 22:49:19 -07:00
James Aspnes
abbf33ae7d allow (and discard) optional argument for \caption 2014-06-12 21:19:00 -04:00
John MacFarlane
e78db3caf6 Updated default latex template so \subtitle works properly. 
Closes #1327.
 2014-06-09 22:33:56 -07:00
John MacFarlane
f011d24165 Require aeson >= 0.7.0.5 to avoid build problems. 2014-06-06 22:20:21 -07:00
John MacFarlane
b2d75c67e4 make_osx_package: don't cabal update at beginning. 2014-06-06 22:19:59 -07:00
John MacFarlane
ff25cf079c Reformatted nocite example in README. 2014-06-04 08:18:24 -07:00
John MacFarlane
9681574661 LaTeX reader: Handle comments at the end of tables. 
This resolves the issue illustrated in
http://stackoverflow.com/questions/24009489/comments-in-latex-break-pandoc-table.
 2014-06-03 23:17:42 -07:00
John MacFarlane
ab5dda7a60 Markdown writer: Prettier pipe tables. 
Columns are now aligned.  Closes #1323.
 2014-06-03 23:17:03 -07:00
John MacFarlane
aff6ba921b Require texmath >= 0.6.6.3. Closes #1324. 
This fixes \tilde{E}, especially in docx.
 2014-06-03 17:17:33 -07:00
John MacFarlane
45f3851611 Docx writer: Section numbering carries over from reference.docx. 
Closes #1305.
 2014-06-03 16:46:55 -07:00
John MacFarlane
0ddb4cd2e8 Docx writer: Combine reference.docx numbering with pandoc's. 
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-03 13:14:32 -07:00
John MacFarlane
ec047aaa8c Docx writer: pandoc uses only numIds >= 1000 for lists. 
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-03 12:13:31 -07:00
John MacFarlane
2842ad5a97 Docx writer: Changed abstractNumId numbering scheme. 
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-03 11:33:09 -07:00
John MacFarlane
05355ac57b Docx writer: Simplified abstractNumId numbering. 
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-03 11:03:40 -07:00
John MacFarlane
356a32e938 Version bump to 1.12.5. 2014-06-03 11:02:11 -07:00
John MacFarlane
9b4e772718 Templates: use ordNum instead of ord. 
Closes #1022.
 2014-06-03 11:01:23 -07:00
John MacFarlane
2a627f85fe Shared: Added ordNub. 
API change (adds export).
 2014-06-03 11:00:54 -07:00
John MacFarlane
cbfde5cb50 Docx writer: Create overrides per-image for media/ in ref docx. 
This should be somewhat more robust and cover more types
of images.
 2014-06-02 20:39:27 -07:00
John MacFarlane
326d7fa8f8 Docx writer: Improved entryFromArchive to avoid parse. 
No need to parse the XML if we're just going to render it
right away!
 2014-06-02 20:20:16 -07:00
John MacFarlane
bf915da6cd Docx writer: Make images work in reference.docx headers/footers. 
* 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-02 20:07:41 -07:00
John MacFarlane
4552555625 Require latest texmath. Closes #1319. 
This allows `\left` to be used with `]`, `)`, etc.
 2014-06-02 13:50:58 -07:00
John MacFarlane
e1cf47efa0 Templates: Fail informatively on template syntax errors. 
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-01 23:45:05 -07:00
John MacFarlane
0bd8d5f86b Updated tests for c8bc70a6bb. 2014-06-01 23:39:15 -07:00
John MacFarlane
455072bdf2 Updated README on reference.docx. 2014-06-01 23:38:27 -07:00
John MacFarlane
7242165bed Docx writer: Improved handling of headers/footers. 2014-06-01 22:29:13 -07:00
John MacFarlane
438ccbe2e6 Removed header1.xml, footer1.xml from reference.docx. 2014-06-01 21:32:15 -07:00
John MacFarlane
6848f642e8 Docx writer: Header and footer are now carried over from reference.docx. 2014-06-01 21:17:00 -07:00
John MacFarlane
6327ccf523 Minor code reformat. 2014-06-01 15:29:27 -07:00
John MacFarlane
c8bc70a6bb LaTeX/Beamer templates: remove conditional around date. 
Closes #1321.
 2014-06-01 15:28:10 -07:00