Commit graph

2158 commits

Author SHA1 Message Date
Henry de Valence
3d70059a48 HLint: use fromMaybe
Replace uses of `maybe x id` with `fromMaybe x`.
2013-12-19 21:07:09 -05:00
Henry de Valence
c8fc0a0374 HLint: use /= 2013-12-19 20:46:11 -05:00
Henry de Valence
f6d151889c HLint: redundant parens
Remove parens enclosing a single element.
2013-12-19 20:43:25 -05:00
Henry de Valence
c35f5ba42d HLint: Remove lambdas. 2013-12-19 20:28:53 -05:00
Henry de Valence
0c5e7cf8cb HLint: use elem and notElem
Replaces long conditional chains with calls to `elem` and `notElem`.
2013-12-19 20:19:24 -05:00
Henry de Valence
1ed2c467c9 HLint: Use all
Replace `and . map` with `all`.
2013-12-19 17:06:27 -05:00
John MacFarlane
8053ba2123 LaTeX writer: Better treatment of footnotes in tables.
Notes now appear in the regular sequence, rather than in the
table cell.  (This was a regression in 1.10.)
2013-12-17 20:53:59 -08:00
John MacFarlane
a3f6f2827c LaTeX writer: Factored out function for table cell creation. 2013-12-17 20:10:09 -08:00
John MacFarlane
0132f6fcb7 LaTeX reader: Support babel-style quoting: ` "..."' ``. 2013-12-17 16:03:43 -08:00
John MacFarlane
826443926f Docbook reader: Avoid failure if tbody contains no tr or row elements. 2013-12-16 13:58:54 -08:00
John MacFarlane
2f00f5c7c2 Properly handle script blocks in strict mode.
(That is, markdown-markdown_in_html_blocks.)
Previously a spurious `<p>` tag was being added.

Closes #1093.
2013-12-15 12:27:29 -08:00
Jeff Arnold
5adbe7b365 LaTeX reader: add support for Verb macro 2013-12-13 19:16:04 -05:00
John MacFarlane
ca3c292f30 EPUB writer: Fixed bug with --epub-stylesheet.
Now the contents of `writerEpubStylesheet` (set by `--epub-stylesheet`)
should again work, and take precedence over a stylesheet specified
in the metadata.
2013-12-13 11:10:04 -08:00
John MacFarlane
6d0cd9203c Markdown reader: Fixed regression in title blocks.
If author field was empty, date was being ignored.  Closes #1089.
2013-12-12 22:34:56 -08:00
John MacFarlane
142f81889b Added withSocketsDo around http conduit code in openURL.
This should address #1080, but further testing on Windows is needed
before we can close the bug.
2013-12-09 22:35:57 -08:00
John MacFarlane
f966295770 Don't use tilde code blocks with braced attributes in gfm output.
A consequence of this change is that the backtick form will be
preferred in general if both are enabled.  I think that is good,
as it is much more widespread than the tilde form.

Closes #1084.
2013-12-09 20:31:47 -08:00
John MacFarlane
8e255fad98 Another small performance improvement. 2013-12-07 19:56:54 -08:00
John MacFarlane
e2c4156c20 Small performance improvement in list parsing. 2013-12-07 19:41:42 -08:00
John MacFarlane
e5a7c31a32 Markdown reader: Fixed bug with literal </div> in lists.
Closes #1078.
2013-12-07 17:12:52 -08:00
John MacFarlane
4a14467055 Text.Pandoc: Don't default to pandocExtensions for all writers.
In particular, we don't want to default to math parsing for the
HTML writer.
2013-12-06 17:31:47 -08:00
John MacFarlane
def05d3504 HTML reader: Parse LaTeX math if appropriate options are set.
* Moved inlineMath, displayMath from Markdown reader to Parsing.
* Export them from Parsing.  (API change.)
* Generalize their types.
2013-12-06 17:15:13 -08:00
John MacFarlane
5314df51f3 Stop parsing "list lines" when we hit a block tag.
This fixes exponential slowdown in certain input, e.g.
a series of lists followed by `</div>`.
2013-12-04 10:18:05 -08:00
John MacFarlane
e3d19bf1cd Merge pull request #1076 from jlduran/booktabs
Add booktabs package for LaTeX tables
2013-12-03 20:55:14 -08:00
Jose Luis Duran
fdaeec0c48 Add booktabs package for LaTeX tables
[ci skip]
2013-12-04 04:26:22 +00:00
John MacFarlane
bd96f2bdcc EPUB writer: Allow 'stylesheet' in metadata.
The value is a path to the stylesheet.
2013-12-03 10:32:25 -08:00
John MacFarlane
1f6238f3ba EPUB writer: Allow partial dates: YYYY, YYYY-MM.
Improves on #1074, since now we don't default to January 1.
2013-12-01 10:17:14 -08:00
Shaun Attfield
82813b5585 normalizeDate: Allow dates with year only (%Y) 2013-12-01 10:19:08 +02:00
John MacFarlane
0e158d8d8d EPUB writer: Insert "svg" property as needed in opf (EPUB 3). 2013-11-30 20:20:18 -08:00
John MacFarlane
a7067ab22b EPUB writer: Simplify imageTypeOf using getMimeType. 2013-11-30 19:43:42 -08:00
John MacFarlane
4501344d45 MIME: Add entry for jfif. 2013-11-30 19:43:12 -08:00
John MacFarlane
37569f30ed EPUB writer: Add properties attribute to cover-image item for EPUB v3. 2013-11-30 19:33:02 -08:00
John MacFarlane
7f09c1834d Markdown writer: Fix rendering of tight sublists.
E.g.

    - foo
        - bar
    - baz

Previously a spurious blank line was included before the last item.
Closes #1050.
2013-11-30 17:59:28 -08:00
John MacFarlane
7aa4d51968 ODT writer: Add draw:name attribute to draw:frame elements.
This is reported to be necessary to avoid an error from recent
versions of Libre Office when files contain more than one image.

Closes #1069.

Thanks to wmanley for reporting and diagnosing the problem.
2013-11-30 17:00:58 -08:00
John MacFarlane
bb0f299165 ConTeXt writer: Don't hardcode figure/table placement.
Instead, let this be set in the template, using `\setupfloat`.
Thanks to Aditya Mahajan for the suggestion.
2013-11-30 16:16:35 -08:00
John MacFarlane
17ef39d157 Fixed cover-image in EPUB YAML metadata. 2013-11-30 15:25:28 -08:00
John MacFarlane
96b678d823 Allow specification of epub-cover-image in YAML metadata. 2013-11-30 15:17:38 -08:00
John MacFarlane
659596876b EPUB writer: Improved metadata handling.
* Metadata may now be included in YAML blocks in a markdown document.
  For example,

        ---
        title:
        - type: main
          text: My Book
        - type: subtitle
          text: An investigation of metadata
        creator:
        - role: author
          text: John Smith
        - role: editor
          text: Sarah Jones
        identifier:
        - scheme: DOI
          text: doi:10.234234.234/33
        publisher:  My Press
        rights:  (c) 2007 John Smith, CC BY-NC
        ...

* Metadata may still be provided using `--epub-metadata`; it will
  be merged with the metadata in YAML blocks.
* meta tags are used instead of opf attributes for EPUB3.
2013-11-30 11:32:47 -08:00
John MacFarlane
e1a9a61774 Docx writer: Implemented csl flipflopping spans. 2013-11-23 14:52:14 -08:00
John MacFarlane
b82ef0e29a LaTeX writer: Handle csl flipflopping spans (csl-no-emph, etc.) 2013-11-23 14:41:22 -08:00
John MacFarlane
c1ff65e5ef HTML writer: Handle csl flipflopping spans (csl-no-emph, etc.) 2013-11-23 14:24:33 -08:00
John MacFarlane
56277bacea EPUB writer: Don't include node for cover.xhtml if no cover! 2013-11-22 23:40:46 -08:00
John MacFarlane
4321a09b7f EPUB writer: Ensure that same identifier is used throughout.
If dc:identifier is given in metadata, we use that; otherwise
we use a random uuid.

Closes #1044.
2013-11-22 23:36:19 -08:00
John MacFarlane
526762bf22 ConTeXt writer: Use setupcaption to separate style from content.
Instead of adding 'nunumber' every time we place a figure...

Closes #1067.
2013-11-22 19:51:07 -08:00
John MacFarlane
cf149fcf38 Fixed bug with intraword emphasis.
Closes #1066.
2013-11-22 19:41:08 -08:00
John MacFarlane
3d453f096c Docx writer: Use mime type info returned by fetchItem. 2013-11-19 13:16:31 -08:00
John MacFarlane
83b9a66bf4 Shared: Fixed bug in openURL with data: URIs.
Previously the base-64 encoded bytestring was returned.
We now decode it so it's a proper image!

This should fix parsing of data: URLs.
2013-11-19 13:15:24 -08:00
John MacFarlane
e290d91c93 MIME: In looking up extensions, drop the encoding info.
E.g. for 'image/jpg;base64' we should lookup 'image/jpg'.
2013-11-19 13:09:34 -08:00
John MacFarlane
c226a57eaa Docbook writer: Hierarchicalize block content in metadata.
Previously headers just disappeared from block-level metadata
when it was used in templates.

Now we apply the 'hierarchicalize' transformation.

Note that a block headed by a level-2 header will turn into
a `<sect1>` element.
2013-11-19 12:01:52 -08:00
John MacFarlane
4566309dd5 Merge pull request #1061 from heurist/epub_coverLinear
Epub Writer: Refactor unnecessary list ++
2013-11-19 09:24:44 -08:00
Shaun Attfield (shaun@victor)
5b27480e54 Epub Writer: Add cover reference to guide element (v2)
Avoiding an unnecessary list concatenation.

Fixes an issue with calibre http://calibre-ebook.com/ putting the
cover at the end of the book if the spine has linear="no".

Apparently this is best practice for other converters as well.

http://www.idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.6
2013-11-19 08:20:27 +02:00