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

4203 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
85cc140744 Textile reader: Improved handling of <pre> blocks. 
* Closed #927 (a bug in which `<pre>` in certain contexts was
  not recognized as a code block).
* Remove internal HTML tags in code blocks, rather than printing
  them verbatim.
* Parse attributes on `<pre>` tag for code blocks.
 2013-07-25 09:45:23 -07:00
John MacFarlane
2e5edbb278 Revert "Added --filter option." 
This reverts commit 85dacbb282.
 2013-07-23 23:17:07 -07:00
John MacFarlane
85dacbb282 Added --filter option. 
This makes it easier to use JSON filters.  Instead of
doing

    pandoc -t json | ./filter | pandoc -f json

you can just do

    pandoc --filter ./filter
 2013-07-23 23:02:47 -07:00
John MacFarlane
5592666ca4 Text.Pandoc: Added readJSON, writeJSON to the API. 
Closes #817.
 2013-07-23 22:31:50 -07:00
John MacFarlane
af5705308a Test suite changes for new highlighting-kate version. 2013-07-23 20:31:49 -07:00
John MacFarlane
7f15d888f6 Require highlighting-kate 0.5.5. 
0.5.4 has a serious memory leak that affects the mandoc parser.
See highlighting-kate#34.
 2013-07-22 16:14:47 -07:00
John MacFarlane
6f99ad8013 Biblio: Tweaks to improve default behavior. 
* A suffix beginning with a digit gets 'p' inserted before it
  before passing to citeproc-hs, so that bare numbers are treated
  as page numbers by default.
* A suffix not beginning with punctuation has a space added at
  the beginning (rather than a comma and space, as was done before).
* This adding occurs not just in author-in-text citations, but in
  all citations.

The result of these changes (and the last commit) is that
`\citep[23]{item1}` in LaTeX will be interpreted properly,
with '23' treated as a locator of type 'page'.
 2013-07-21 12:16:52 -07:00
John MacFarlane
800c5490ec LaTeX reader: Don't add spurious ", " to citation suffixes. 
This is added when needed in Text.Pandoc.Biblio anyway.
 2013-07-21 11:44:49 -07:00
John MacFarlane
bd1979f1b7 Markdown reader: Improved strong/emph parsing. 
Using technique from github.com/jgm/Markdown.

The new parsing algorithm requires no backtracking, and no keeping
track of nesting levels.

It will give different results in some edge cases but should not
affect most people.
 2013-07-20 21:14:38 -07:00
John MacFarlane
7102254e24 PDF generation improvements. 
* `Text.Pandoc.PDF` exports `makePDF` instead of `tex2pdf`.
  (API change.)
* `makePDF` walks the pandoc AST and checks for the existence of
  images in the local directory.  If they are not found, it attempts
  to find them, either in the directory containing the first source
  file, or at an absolute URL, or at a URL relative to the base URL
  of the first command line argument.
* Closes #917.
 2013-07-20 12:14:43 -07:00
John MacFarlane
93877e5a22 Added info about CABALDIR. 
Modified from a patch by achalddave.
 2013-07-20 11:06:58 -07:00
John MacFarlane
a5df042e28 LaTeX template: Added biblio-style variable. 
Closes #920.
 2013-07-20 10:53:11 -07:00
John MacFarlane
2add613aec Merge pull request #924 from drothlis/patch-1 
README: Fix minor typo
 2013-07-20 10:47:15 -07:00
David Röthlisberger
df3546068e README: Fix minor typo 2013-07-20 13:02:35 +01:00
John MacFarlane
fd0f8c1a8a Text.Pandoc.PDF: put temporary output directory in TEXINPUTS. 
This will help later when we try to download external resources.
We can put them in the temp directory.  See #917.
 2013-07-18 21:53:34 -07:00
John MacFarlane
93e096fe1d Fixed warning. 2013-07-18 21:51:11 -07:00
John MacFarlane
7c980f39bf Improved fetching of external resources. 
* In Shared, openURL and fetchItem now return an Either, for
  better error handling. (API change.)
* Better error message when fetching a URL fails with
  `--self-contained`.
* EPUB writer: If resource not found, skip it, as in Docx writer.
* Closes #916.
 2013-07-18 20:58:14 -07:00
John MacFarlane
6c2e76ac61 Added ignore_line_breaks markdown extension. 
This causes intra-paragraph line breaks to be ignored,
rather than being treated as hard line breaks or spaces.
This is useful for some East Asian languages, where spaces
aren't used between words, but text is separated into lines
for readability.
 2013-07-17 15:38:56 -07:00
John MacFarlane
7d75b913bd LaTeX/Beamer template: Added classoption variable. 
This is intended for class options like `oneside`; it may
be repeated with different options.  Thanks to Oliver Matthews.
 2013-07-17 15:06:43 -07:00
John MacFarlane
b2385d0e9b Text.Pandoc.ImageSize: Handle EPS. 
Closes #903.  This change will make EPS images properly sized
on conversion to Word.
 2013-07-16 22:04:59 -07:00
John MacFarlane
94c9825468 HTML reader: read widths from col tags if present. 
Closes #893.
 2013-07-16 17:03:28 -07:00
John MacFarlane
8483b5756f HTML reader: Handle non-simple tables (#893). 
Column widths are divided equally.

TODO:  Get column widths from col tags if present.
 2013-07-16 15:50:39 -07:00
John MacFarlane
0bd5830ad4 HTML reader: Generalized table parser. 
This commit doesn't change the present behavior at all, but
it will make it easier to support non-simple tables in the future.
 2013-07-16 15:37:15 -07:00
John MacFarlane
595149a9bc Fixed YAML code block in README. 2013-07-15 19:32:08 -07:00
John MacFarlane
cd399d1b9d Updated sample.lua for new metadata. 2013-07-14 20:43:21 -07:00
John MacFarlane
359ce379cc Updated changelog for pending release. 2013-07-14 16:12:28 -07:00
John MacFarlane
22699a979d Updated authors in README. 2013-07-14 16:12:06 -07:00
Alexander Kondratskiy
0b49f810f4 Fixing wrong numbered-list indentation in open document format 2013-07-14 14:33:58 -04:00
John MacFarlane
15984adaaa Another attempt at .travis.yml. 2013-07-13 15:15:43 -07:00
John MacFarlane
3b1898dec9 Another attempt at the travis build spec. 2013-07-13 15:08:36 -07:00
John MacFarlane
a5882bd587 Tweaked travis script to use cabal-dev. 2013-07-13 15:06:25 -07:00
John MacFarlane
f7c7672c40 Makefile: --enable-benchmarks no longer works with cabal install. 2013-07-13 15:06:09 -07:00
John MacFarlane
851703044e Simplified margin fields in default epub CSS file. 2013-07-13 14:48:14 -07:00
John MacFarlane
7445fc5382 Default epub CSS: Removed highlighting styles. 
These are added automatically to individual chapter files,
depending on the highlighting style selected on the command line.
 2013-07-13 14:45:12 -07:00
John MacFarlane
f42095b7b7 Docx writer: Make --no-highlight work properly. 2013-07-13 13:48:50 -07:00
John MacFarlane
35e2caa058 Updated a test whose output changed due to last commit. 2013-07-13 13:47:09 -07:00
John MacFarlane
837a9bf87a Merge pull request #907 from KholdStare/fix-no-highlight 
Checking options before applying syntax highlighting for HTML output
 2013-07-13 13:29:28 -07:00
Alexander Kondratskiy
6a235ba606 Checking options before applying syntax highlighting for HTML output 2013-07-13 02:23:27 -04:00
John MacFarlane
bd1079e48e Docx writer: Ignore most components of reference.docx. 
We take the word/styles.xml, docProps/app.xml, word/theme/theme1.xml,
and word/fontTable.xml from reference.docx, ignoring everything else.

Perhaps this will help with the corruption problems caused when
different versions of Word resave the reference.docx and
reorganize things.
 2013-07-12 20:58:15 +01:00
John MacFarlane
ed714b1b52 cabal: Added http-conduit flag, which allows fetching https resources. 
It also brings in a large number of dependencies (http-conduit and its
dependencies), which is why for now it is an optional flag.

Closes #820.
 2013-07-04 23:13:37 -07:00
John MacFarlane
e7b5f2deb5 Docx writer: Use w:br with w:type 'textWrapping' for linebreaks. 
Previously we used w:cr.

I don't see a difference between these in my version of Word,
but apparently some do.  Closes #873.
 2013-07-04 16:37:44 -07:00
John MacFarlane
aab4c47da5 Text.Pandoc.UTF8: Use strict bytestrings in reading. 
The use of lazy bytestrings seemed to cause problems using
pandoc on Windows 7/8 64-bit machines.

Closes #874.
 2013-07-04 15:43:42 -07:00
John MacFarlane
3f1937f78e LaTeX writer: Don't use ligatures in escaping inline code. 2013-07-04 15:06:23 -07:00
John MacFarlane
9d9390a75a default.latex: Use tex-ansi mapping for monofont. 
This ensures that straight quotes appear as straight, rather than
being treated as curly.  See #889.
 2013-07-04 14:50:14 -07:00
John MacFarlane
7e584dade0 make-windows-installer.bat: Removed explicit paths for executables. 2013-07-04 10:37:20 -07:00
John MacFarlane
1de55ecbbd --toc-level no longer implies --toc. 
Reason: EPUB users who don't want a visible TOC may still want
to set the TOC level for in the book navigation.
 2013-07-03 12:47:35 -07:00
John MacFarlane
3deab5d8e3 Document YAML metadata blocks. 2013-07-02 22:54:36 -07:00
John MacFarlane
3cd62d7c35 Rename Ext_yaml_title_block -> Ext_yaml_metadata_block. 2013-07-02 20:54:30 -07:00
John MacFarlane
0da863f951 Markdown writer: Changed condition for rendering title block. 
Previously it was only rendered if title, author, or date set.
Now any metadata field can be set.
 2013-07-02 20:44:19 -07:00
John MacFarlane
e973bbbbc8 Markdown reader: Better error messages for yaml headers. 2013-07-02 09:23:43 -07:00