Commit graph

4565 commits

Author SHA1 Message Date
John MacFarlane
7d0082aa0b LaTeX reader: allow hspace and vspace to count as raw block or inline.
Previously we would refuse to parse anything as raw inline if
it was in the blockCommands list.  Now we allow exceptions
if they're listed under ignoreInlines in inlineCommands.

This should make it easier e.g. to include an \hspace
between two side-by-side raw LaTeX tables.
2017-02-25 12:43:00 +01:00
John MacFarlane
f1cf8273d5 Revert "LaTeX reader: don't treat \vspace and \hspace as block commands."
This reverts commit 2873cd8288.
2017-02-25 12:43:00 +01:00
John MacFarlane
a3741a45ab Removed unnecessary import. 2017-02-24 15:57:10 +01:00
John MacFarlane
d3e5725cbc Use catchError instead of runExceptT. 2017-02-24 15:55:40 +01:00
John MacFarlane
0448b7d1fc Implemented \graphicspath in LaTeX reader.
Closes #736.
2017-02-24 15:34:41 +01:00
John MacFarlane
b8674519d5 Removed useless TEXINPUTS stuff for context2pdf.
mkiv context doesn't use TEXINPUTS.
2017-02-24 14:34:58 +01:00
John MacFarlane
72af7b4ee5 Shared: remove 'warn'.
PDF writer: Use 'report' instead of 'warn', make it sensitive
to verbosity settings.
2017-02-24 14:29:56 +01:00
John MacFarlane
887d0b70fe Logging: Remove UsingResourceFrom, add CouldNotConvertImage 2017-02-24 14:29:54 +01:00
John MacFarlane
1c84855aab Class: Add stResourcePath to CommonState, getResourcePath, setResourcePath.
To be used in implementing `\graphicspath` in LaTeX, and possibly
in things like PDF production via context.

Use resource path in fetchItem.

Issue an info message if we get a resource from somewhere other
than ".".

Added UsingResourceFrom to log message.
2017-02-24 14:15:10 +01:00
John MacFarlane
6936747794 EPUB reader: minor refactoring, avoiding explicit MediaBag handling.
This all works behind the scenes in CommonState plumbing.
2017-02-24 13:39:20 +01:00
John MacFarlane
ce647d1cd8 Some fixes to the preceding revisions in SelfContained.
Make sure we don't duplicate end tags for script or link.
2017-02-24 13:11:29 +01:00
John MacFarlane
7c0a80c323 SelfContained: don't use data URIs for script or style.
Instead, just use script or style tags with the content inside.
The old method with data URIs prevents certain optimizations
outside pandoc.

Exception: data URIs are still used when a script contains
`</script>` or a style contains `</`.

Closes #3423.

Also, in MIME, use application/javascript (not
application/x-javascript).
2017-02-24 11:55:50 +01:00
John MacFarlane
0e8b19e709 Refactored getData from getDataURI in SelfContained. 2017-02-24 11:27:52 +01:00
John MacFarlane
f3d81056d6 Removed \strut at beginning of table cells.
This fixes a problem with alignment of lists in table cells
(closes #3436).  The `\strut` at the end seems to be enough
to avoid the too-close spacing that motivated addition of
the strut  in #1573.
2017-02-23 22:25:08 +01:00
John MacFarlane
35922ffa32 Removed unnecessary import. 2017-02-23 21:54:03 +01:00
John MacFarlane
4739620afe Special-case .stretch class for images in reveal.js.
Now in reveal.js, an image with class `stretch` in a paragraph
by itself will stretch to fill the whole screen, with no
caption or figure environment.

Closes #1291.
2017-02-23 21:16:45 +01:00
John MacFarlane
ad2e19a41f Fix compiler warning for older GHC versions. 2017-02-23 21:00:35 +01:00
John MacFarlane
61d3376a45 Restore "Fetching..." message with openURL if --verbose. 2017-02-23 16:24:20 +01:00
John MacFarlane
e08e93e844 Use PandocIOError in Class. 2017-02-23 16:21:59 +01:00
John MacFarlane
de5102a22c Error: Changed PandocFileReadError to PandocIOError 2017-02-23 16:21:49 +01:00
John MacFarlane
4a9069130f Shared.openURL: Changed type from an Either.
Now it will just raise an exception to be trapped later.
2017-02-23 16:21:03 +01:00
John MacFarlane
2d964dd4ee PDF: make sure that verbosity is respected when we fetch items. 2017-02-23 15:06:49 +01:00
John MacFarlane
2bbf98a613 Put makeSelfContained in PandocMonad instead of IO.
This removes the need to pass MediaBag around and improves
exceptions.  It also opens up the possibility of using
makeSelfContained purely.
2017-02-23 15:06:25 +01:00
John MacFarlane
86d8e1ef89 Pretty: simplified definition of realLength. 2017-02-23 09:54:31 +01:00
John MacFarlane
9614835ea7 Added emf to mimeTypes with type application/x-msmetafile.
See #1713.
2017-02-22 21:20:40 +01:00
John MacFarlane
f4a452f891 When parsing raw LaTeX commands, include trailing space.
Otherwise things like `\noindent foo` break and turn into
`\noindentfoo`.

Affects `-f latex+raw_tex` and `-f markdown` (and other formats
that allow `raw_tex`).

Closes #1773.
2017-02-22 21:15:25 +01:00
mb21
3f6b50e525 imageSize interface change
`imageSize img` is now `imageSize opts img`
2017-02-22 15:34:53 +01:00
mb21
b312ac6d2d make imageSize recognize basic SVG dimensions, see #3462 2017-02-22 15:34:53 +01:00
John MacFarlane
5d71e37f26 MediaWiki reader: ensure that list starts begin at left margin.
Including when they're in tables or other list items.

Closes #2606.
2017-02-21 23:41:32 +01:00
John MacFarlane
f90b82d3d9 MediaWiki writer: Remove newline before </ref>.
Closes #2652.
2017-02-21 23:03:10 +01:00
John MacFarlane
e462f80d74 MediaWiki writer: add display attribute on <math> tags.
This allows display math to be rendered properly.

Closes #3452.
2017-02-21 22:57:48 +01:00
John MacFarlane
5269724ad3 MediaWiki reader: fixed more table issues.
Closes #2649.
2017-02-21 21:28:24 +01:00
John MacFarlane
1d06e8c5a5 MediaWiki reader: Allow blank line after table start.
See #2649.
2017-02-21 18:34:21 +01:00
John MacFarlane
598ffa3a94 MediaWiki tables: allow extra hyphens after |- in tables.
I didn't see this documented anywhere, but it seems to be allowed
(and common).

See #2649.  This addresses some of the cases there, but not all.
2017-02-21 17:30:13 +01:00
John MacFarlane
7af3d90ae1 MediaWiki writer: Updated list of syntax highlighting languages.
Now 'r' gets you `<source>` rather than `<code>` (among others).

Closes #3461.
2017-02-21 17:13:59 +01:00
John MacFarlane
612f1238aa Use lazy loading for reveal.js slide shows.
* In HTML writer, with reveal.js we use data-src instead of src
  for images.
* In SelfContained, we also load resources from data-src.

Closes #2283.
2017-02-20 22:21:20 +01:00
John MacFarlane
172320ac66 Added Functor constraint to keep ghc 7.8.4 happy. 2017-02-20 16:34:33 +01:00
John MacFarlane
547c32939b Tighten up HasQuoteContext instance in HTML reader.
We constrain it to the state used in the HTML reader.
Otherwise we can get overlap with the general instance
for ParserState m.
2017-02-20 15:51:49 +01:00
John MacFarlane
b246e8e9af Revert "Refined constraint for HasQuoteContext instance."
This reverts commit 3c427fc17d.
2017-02-20 15:44:33 +01:00
John MacFarlane
3c427fc17d Refined constraint for HasQuoteContext instance.
in hopes that this will help the ghc 7.8.4 build...
2017-02-20 15:25:47 +01:00
John MacFarlane
3ccf3fad2c Removed redundant constraint. 2017-02-20 15:12:20 +01:00
John MacFarlane
3165e14b17 Error: added PandocMakePDFError 2017-02-19 09:53:24 +01:00
John MacFarlane
3c3138b133 Added warnings for non-rendered blocks to some writers. 2017-02-17 23:11:31 +01:00
John MacFarlane
aee10a719b FB2 writer: don't render RawBlock as code. 2017-02-17 21:41:47 +01:00
John MacFarlane
1e43e3767e Markdown reader: Use logMessage instead of report. 2017-02-17 19:59:54 +01:00
John MacFarlane
a3412354a4 Fixed repeated log messages in RST reader.
See #3447.  To complete fixes on this issue, we need to
do the same for the other readers.  Note that the changes
required are minimal -- add reportLogMessages to the end
of the main parser, and replace report with logMessage.
(except for trace)
2017-02-17 13:01:55 +01:00
John MacFarlane
38daf9de68 Parsing: Added HasLogMessages, logMessage, reportLogMessages.
We need to do logging by updating parser state, or we'll get
inappropriate and repeated log messages when there is parser
backtracking.

See #3447.
2017-02-17 12:56:07 +01:00
John MacFarlane
575014975e Fix indirect hyperlink targets. Closes #512. 2017-02-15 17:36:16 +01:00
John MacFarlane
ebe4072bd9 Add CircularReference constructor to LogMessage. 2017-02-15 17:35:29 +01:00
Alex Ivkin
93f0a9c2e5 ZimWiki writer: removed internal formatting from note and table cells, because ZimWiki does not support it (#3446) 2017-02-15 11:28:02 +01:00