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

4414 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
John MacFarlane
d39f527b07 Fixed bug retrieving default template for markdown variants. 2013-07-02 09:04:07 -07:00
John MacFarlane
1f7ce4a2cd Write full metadata in MMD style title blocks. 2013-07-02 09:03:54 -07:00
John MacFarlane
0fa5792790 Markdown reader: Ignore fields ending with _ in YAML headers. 2013-07-01 22:39:56 -07:00
John MacFarlane
f3f557d988 Emit warning instead of failing on invalid YAML header. 2013-07-01 22:29:04 -07:00
John MacFarlane
9009a7e4a8 Markdown writer: Commas are okay in plain yaml scalars. 
It's just commas with brackets that can cause problems.
 2013-07-01 21:00:46 -07:00
John MacFarlane
e7a68fc7e8 Markdown writer: Render yaml title block fields in alpha order. 
This makes the output predictable; previously it varied across
implementations.
 2013-07-01 20:56:27 -07:00
John MacFarlane
7f83d88a65 Added Text.Pandoc.Writers.Shared to repository. 
This should have been in last commit.
 2013-07-01 20:49:22 -07:00
John MacFarlane
956425709d Created Text.Pandoc.Writers.Shared, improved metaToJSON. 
* Text.Pandoc.Writers.Shared contains shared functions used
  only in writers.
* metaToJSON now takes a WriterOptions parameter, and will
  return an empty object if standalone is not specified.
 2013-07-01 20:47:26 -07:00
John MacFarlane
19ad69b1c6 Improvements to yaml title block writer. 2013-07-01 16:28:34 -07:00
John MacFarlane
55c8003e22 Shared: Export getField. 2013-07-01 16:28:22 -07:00
John MacFarlane
21a9b44609 Switched order of fields in yaml header (writer test). 2013-07-01 14:38:32 -07:00
John MacFarlane
2d46828b1c Revert "Markdown writer: Don't include variables in metadata." 
This reverts commit 0ec8573347.
 2013-07-01 14:17:04 -07:00
John MacFarlane
0ec8573347 Markdown writer: Don't include variables in metadata. 2013-07-01 12:48:13 -07:00
John MacFarlane
5d01e9a117 Markdown writer: Support yaml title block. 2013-06-30 23:37:27 -07:00
John MacFarlane
a1f010de78 Metadata changes: Variables now completely shadow metadata. 
Previously if you set a value both in metadata and with a variable,
they'd be combined into a list.  Now the variable replaces the
value in document metadata.  If many variables with the same
name are set, a list is created.

Shared:  metaToJSON now has an argument for a variable list.
 2013-06-29 22:14:01 -07:00
John MacFarlane
5cb0f0bbf1 ConTeXt writer: Properly handle tables without captions. 
The old output only worked in MkII. This should work in MkIV
as well.

Closes #837.
 2013-06-28 21:30:27 -07:00
John MacFarlane
644e3239a9 Custom writer: Pass full metadata, not just tit/auth/date. 2013-06-27 22:55:10 -07:00
John MacFarlane
899a65b7d1 Writers: Use defField for defaults. 
This way explicitly specified fields not overridden.

Fixes a problem e.g. with specifying a documentclass via
the command line using -V.
 2013-06-27 22:42:55 -07:00
John MacFarlane
9ab60a4d15 Shared: Added defField. 
`defField` is like `setField`, but does nothing if the
field already has a value.
 2013-06-27 21:13:18 -07:00
John MacFarlane
dd96213c05 Man writer: give more fine-grained control in template. 
Now the `title`, `section`, `header`, and `footer` can all be set
individually in metadata.  The `description` variable has been
removed.

Quotes have been added so that spaces are allowed in the title.

If you have a title that begins

    COMMAND(1) footer here | header here

pandoc will parse it as before into a title, section, header, and
footer.  But you can also specify these elements explicitly.

Closes #885.
 2013-06-27 19:32:28 -07:00
John MacFarlane
82e46bf385 LaTeX reader: Support alltt environment. 
Closes  #892.
 2013-06-27 18:54:31 -07:00
John MacFarlane
79a4ea03e2 Stop escaping | in LaTeX math. 
This caused problems with array environments.  Closes #891.
 2013-06-26 20:54:31 -07:00
John MacFarlane
f939dbdcc5 Require highlighting-kate 0.5.4. 2013-06-26 20:53:38 -07:00
John MacFarlane
f7f32af293 Use latest chicago-author-date.csl. 2013-06-25 22:37:03 -07:00
John MacFarlane
243c56a880 Fixed 'authors' metadata parsing in reST. 
Semicolons separate different authors.
 2013-06-25 22:32:50 -07:00
John MacFarlane
70eeeb82b5 Fixed regression with RTF table of contents. 2013-06-25 22:32:50 -07:00
John MacFarlane
08631ef1a3 Some test suite fixes for new metadata. 2013-06-25 22:32:50 -07:00
John MacFarlane
3aa5733f30 Revised benchmark for new metadata. 2013-06-25 18:17:32 -07:00
John MacFarlane
16d6005ed9 Fixed merge bugs in Shared. 2013-06-25 18:15:22 -07:00
John MacFarlane
f34232c934 Removed 'Functor' constraint. 2013-06-25 17:41:15 -07:00
John MacFarlane
cdf356a331 Merge pull request #886 from aaronwolen/master 
Document the `citecolor` variable added to the latex template
 2013-06-25 11:16:33 -07:00
John MacFarlane
aee3f3f8f3 Updated Makefile. 2013-06-25 10:39:08 -07:00
John MacFarlane
f869f7e08d Use new flexible metadata type. 
* Depend on pandoc 1.12.
* Added yaml dependency.
* `Text.Pandoc.XML`: Removed `stripTags`.  (API change.)
* `Text.Pandoc.Shared`:  Added `metaToJSON`.
  This will be used in writers to create a JSON object for use
  in the templates from the pandoc metadata.
* Revised readers and writers to use the new Meta type.
* `Text.Pandoc.Options`: Added `Ext_yaml_title_block`.
* Markdown reader:  Added support for YAML metadata block.
  Note that it must come at the beginning of the document.
* `Text.Pandoc.Parsing.ParserState`:  Replace `stateTitle`,
  `stateAuthors`, `stateDate` with `stateMeta`.
* RST reader:  Improved metadata.
  Treat initial field list as metadata when standalone specified.
  Previously ALL fields "title", "author", "date" in field lists
  were treated as metadata, even if not at the beginning.
  Use `subtitle` metadata field for subtitle.
* `Text.Pandoc.Templates`:  Export `renderTemplate'` that takes a string
  instead of a compiled template..
* OPML template:  Use 'for' loop for authors.
* Org template: '#+TITLE:' is inserted before the title.
  Previously the writer did this.
 2013-06-24 20:29:41 -07:00
John MacFarlane
e32a8f5981 Revised Text.Pandoc.Templates to accept JSON contexts. 
Currently the library is set up with a shim for association
lists, for compatibility, but this can change when the writers
are changed.

New export: `varListToJSON`.

Removed `Empty`.

Simplified template type to a newtype.
 2013-06-24 20:27:37 -07:00
John MacFarlane
5f4a32e465 Use aeson for json. 
Benchmarked:  about twice as slow as json!
 2013-06-24 20:27:37 -07:00
John MacFarlane
a578a490ee Parsing: Generalized state type on readWith. 2013-06-24 20:27:36 -07:00
Aaron Wolen
1364fb3f00 Documented citecolor variable 2013-06-24 17:49:06 -03:00
John MacFarlane
a2b98ba218 Added test for #882. 2013-06-19 09:27:11 -07:00
John MacFarlane
e3b8b89d31 Markdown reader: Check for blank lines first in blocks. 
(And skip them.  This might speed things up in some cases.)
 2013-06-19 09:22:57 -07:00