Commit graph

5874 commits

Author SHA1 Message Date
Jesse Rosenthal
f703198bc9 Docx Writer: Update reference.docx
This updates reference.docx to make BodyText a quick style, and inherit
from it appropriately.
2015-02-11 15:06:48 -05:00
Jesse Rosenthal
96d5c8a5dc Docx Writer: Add "BodyText" Style
We apply a "BodyText" style to all unstyled paragraphs. This is,
essentially, the same as "Normal" up until now -- except that since not
everything inherits from "BodyText" (the metadata won't, for example, or
the headers or footnote numbers) we can change the text in the body
without having to make exceptions for everything.

This will still inherit from Normal, so if we want to
change *everything*, we can do it through "Normal".
2015-02-11 15:06:36 -05:00
Jesse Rosenthal
25ef68d266 Docx Writer: Use FirstParagraph style at beginning.
Before we had used `FirstParagraph` style after Headings, BlockQuotes,
and other blocks a user might not want an indentation after. We hadn't
actually used it for the first paragraph -- i.e. the opening of the
body. This makes sure the first body paragraph gets that style.
2015-02-10 21:05:13 -05:00
Jesse Rosenthal
d623a5c7e9 Added FirstParagraph to docx templates. 2015-02-09 23:22:59 -05:00
Jesse Rosenthal
daab4c3f22 Docx Writer: Implement FirstParagraph Style
Following the odt writer, we make the first text paragraph following an
image, blockquote, table, or heading into a "FirstParagraph" style. This
allows it to be styled differently, if the user wishes. The default is
for it to be the same as "Normal"
2015-02-09 23:22:52 -05:00
John MacFarlane
6a6392d393 Travis: comment out ghc 7.10 until we have the dependencies. 2015-02-07 21:17:53 -08:00
John MacFarlane
12962e2332 Merge pull request #1927 from freephile/master
update syntax for Images/Media files in MediaWiki
2015-02-07 20:33:33 -08:00
John MacFarlane
24f379ebd7 Merge pull request #1915 from mpickering/travisupdate
Update travis file (for GHC 7.10)
2015-02-07 20:32:42 -08:00
John MacFarlane
20b3dea3fe Merge branch 'timtylin-patch/fixTexinfoWrap' 2015-02-07 20:31:33 -08:00
John MacFarlane
bd7cf8dbd5 Merge branch 'patch/fixTexinfoWrap' of https://github.com/timtylin/scholdoc into timtylin-patch/fixTexinfoWrap
Conflicts:
	src/Text/Pandoc/Writers/Texinfo.hs
2015-02-07 20:28:56 -08:00
John MacFarlane
0a1cd25312 Merge pull request #1925 from timtylin/patch/prettyLineBreaks
Append newline to the LineBreak of various writers
2015-02-07 20:21:58 -08:00
Tim Lin
858ebf99eb Texinfo writer: fix wrapping by using breakable spaces 2015-02-06 01:16:40 -08:00
Greg Rundlett
218f28af6d update syntax for Images/Media files in MediaWiki
The preferred syntax for Images and other media is [[File:Foo.jpg]] in MediaWiki since v1.14 (2008).  [[Image:Foo.jpg]] is deprecated but still works as an alias to the File namespace.  I don't think this would break any existing wikis since talk of switching the syntax/namespace for images started back in 2002 (https://phabricator.wikimedia.org/T2044).  NS_FILE became the new namespace for Files in v 1.14 in late 2008. (https://www.mediawiki.org/wiki/Release_notes/1.14)  There is still a namespace alias so '[[Image:]]' still works today.  It's just that MediaWiki supports other media as well, and so the name and syntax used in documentation (see https://www.mediawiki.org/wiki/Help:Images) has long been '[[File:foo.jpg]]'
2015-02-05 17:07:50 -05:00
Greg Rundlett
13c4757057 update syntax for Images/Media files in MediaWiki
The preferred syntax for Images and other media is [[File:Foo.jpg]] in MediaWiki since v1.14 (2008).  [[Image:Foo.jpg]] is deprecated but still works as an alias to the File namespace.
2015-02-05 17:03:20 -05:00
Tim Lin
0c18f3a854 Append newline to the LineBreak of various writers
This change improves output formatting of content with a large amount of force line breaks, such as line-blocks. The following writers are affected:

* Dokuwiki
* HTML
* EPUB (via HTML)
* LaTeX
* MediaWiki
* OpenDocument
* Texinfo

This commit resolves #1924
2015-02-04 22:42:22 -08:00
John MacFarlane
fb7a03dcda Textile reader: table improvements.
* Handle newlines in cells.
* Handle empty cells.
* Closes #1919.
2015-02-02 10:45:50 -08:00
Matthew Pickering
2a3df35423 Update travis file 2015-02-02 10:44:34 +00:00
John MacFarlane
7050c26abc LaTeX writer: Don't escape $ in URL. Closes #1913. 2015-02-01 11:19:55 -08:00
John MacFarlane
6a0d4da382 HTML writer: Add "inline" or "display" class to math spans.
This allows inline and display math to be styled differently.

Closes #1914.
2015-02-01 11:08:27 -08:00
Matthew Pickering
5073758bb8 Merge pull request #1912 from zudov/missing_alt
Fixed issue #1131 + small refactoring
2015-01-30 00:35:16 +00:00
Konstantin Zudov
92e762c2d6 Refactored if x then [] else y to [y | not x] 2015-01-29 22:36:23 +02:00
Konstantin Zudov
b5cc01e976 Do not ommit missing alt attribute on img tag
Fixes #1131
2015-01-29 22:16:38 +02:00
John MacFarlane
82c04a28ce Fixed list-style-type for numbered example lists.
Should be "decimal," not "example."  Closes #1902.
2015-01-27 16:56:56 -08:00
John MacFarlane
4e03796f14 Add Installed-Size to debian package control file.
This should help with warnings from Ubuntu 14.04 Software Center.
See #1900.
2015-01-26 14:34:32 -08:00
John MacFarlane
33d1c8cc01 Merge pull request #1885 from mb21/html-reader-tables
fixes HTML Reader: tables
2015-01-25 10:46:47 -08:00
mb21
b40d33b174 fixes #1859 HTML Reader table parsing 2015-01-25 09:41:12 +01:00
John MacFarlane
d90dc6b8b5 LaTeX reader: don't limit includes to .tex extension.
Previously `\input` and `\include` would only work if the
included files had the extension `.tex`.  This change relaxes
that restriction, though if the extension is not `.tex`, it
must be given explicitly in the `\input` or `\include`.

Closes #1882.
2015-01-22 23:17:25 -08:00
Jesse Rosenthal
e88119f2d1 Docx Reader: Add test for VML images.
Since images are often visually (not structurally) placed on the page,
people might not always get the results they're looking for here.
2015-01-21 13:41:16 -05:00
Jesse Rosenthal
eb11c61182 Docx: Parse images in deprecated vml format.
Some older versions of word use vml (vector markup language) and put
their images in a "v:imagedata" tag inside a "w:pict". We read those as
we read the more modern "blip" inside a "w:drawing".

Note that this does not mean the reader knows anything about vml. It
just looks for a `v:imagdata`. It's possible that, with more complicated
uses of images in vml, it won't do the right thing.
2015-01-21 13:41:16 -05:00
John MacFarlane
24573b6a5a revealjs template - link to non-minified css, js.
The minified versions no longer ship with the library.
2015-01-20 17:20:01 -08:00
John MacFarlane
8a7db5cc9d Use CPP to avoid unneeded import warning for blaze-markup >= 0.6.3.
See https://github.com/jgm/pandoc/pull/1888#issuecomment-70470409
2015-01-19 10:29:57 -08:00
John MacFarlane
030d3b597d Custom writer: Raise PandocLuaException instead of using 'error'.
Eventually we'll change the return type so that no exception
is involved, but at least this can be trapped.
2015-01-18 22:04:42 -08:00
John MacFarlane
ab8b00ea0c Custom writer: raise error if loadstring returns an error status.
This will make debugging custom scripts much easier.
2015-01-18 21:48:04 -08:00
John MacFarlane
6e7a76c800 Merge pull request #1888 from mpickering/errormsg
Better warning when trying to read multiple binary files
2015-01-18 19:55:33 -08:00
Matthew Pickering
da93181d06 Better warning when trying to read multiple binary files 2015-01-19 02:44:04 +00:00
John MacFarlane
25e12ca7b2 EPUB writer: properly handle internal links to IDs in spans, divs.
Closes #1884.
2015-01-17 11:27:49 -08:00
John MacFarlane
c63020d5f2 Remove SourceCode style from reference.docx.
This is added automatically by the docx writer.

If it's in the template, we'll get two copies.

See #1872.
2015-01-12 08:32:37 -08:00
Matthew Pickering
519b80f06d Merge pull request #1870 from mb21/fix-xelatex-recommendation
Don't log "Try xelatex..." if xelatex already in use
2015-01-11 22:14:56 +00:00
mb21
6aa41b86d0 don't log Try xelatex if xelatex already in use, closes #1832 2015-01-11 15:24:04 +01:00
John MacFarlane
e2d86dfe28 Merge pull request #1856 from markwright/master
Allow compilation with ghc 7.10.1 RC1 and haddock-library 1.2
2015-01-04 20:26:52 -08:00
Mark Wright
9c68017786 ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:48:01 +11:00
Mark Wright
dbe1b38816 ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:47:33 +11:00
Mark Wright
5ea3856bb0 ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies 2015-01-05 14:46:57 +11:00
Mark Wright
c80c9ac9da ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:46:40 +11:00
Mark Wright
8b9bded796 ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:46:15 +11:00
Mark Wright
e4c7894d01 ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies 2015-01-05 14:42:45 +11:00
Mark Wright
2a6f68f4bf ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies 2015-01-05 14:42:26 +11:00
Mark Wright
4e3281c550 ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:41:54 +11:00
Mark Wright
cd5b1fe5e3 ghc 7.10.1 RC1 requires specifying the type of String literals https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... 2015-01-05 14:41:35 +11:00
Mark Wright
ed7606da9a ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies 2015-01-05 14:40:59 +11:00