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

6235 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
cb2c81b45b Updated pandoc.wxs. 
From @nkalvi with a few modifications (custom variables).

- when per-machine installation is chosen, the system path
  is updated instead of the user's
- an appropriate default is used for per-machine installation directory.
 2015-07-09 22:02:30 -07:00
John MacFarlane
b587acb224 Merge pull request #2266 from PromyLOPh/fieldinline 
RST: Support inline markup for field list names
 2015-07-08 22:45:06 -07:00
John MacFarlane
ac79429a12 PDF: Make sure --latex-engine-opt goes before the filename... 
on the command line.  LaTeX needs the argument to come after
the options.

Closes #1779 - again!  Thanks to squisher for pointing
out the problem.
 2015-07-08 17:37:54 -07:00
John MacFarlane
4667f92987 Merge pull request #2282 from adunning/patch-1 
CommonMark Writer: Correct tags used for superscript/subscript
 2015-07-08 11:20:56 -07:00
Andrew Dunning
4850aaf046 Correct superscript/subscript. 2015-07-08 13:57:04 -04:00
John MacFarlane
9e528f4c0c Fixed email javascript obfuscation with mailto: URLs. 
This fixes a potential security issue.  Because single quotes weren't
being escaped in the link portion, a specially crafted email address
could allow javascript code injection.

    [Jim'+alert('hi')+'OBrien](mailto:me@example.com)

Closes #2280.
 2015-07-07 11:15:40 -07:00
John MacFarlane
7398dea65f Updated context writer test. 2015-07-06 17:20:26 -07:00
John MacFarlane
a72a026d04 ConTeXt template: activate hanging indent for definition lists. 
(mb21)
 2015-07-06 16:56:46 -07:00
John MacFarlane
e042f697a4 Setup.hs: better version detection in older hsb2hs. 
If it returns an error with input `--version`, recover
gracefully.
 2015-07-06 13:38:46 -07:00
John MacFarlane
48cd774714 Changes in WiX installer. 
These should allow a per-user install without elevated
privileges, while still allowing a systemwide install with
privileges.
 2015-07-05 13:59:27 -07:00
John MacFarlane
f1103f8f69 Make cabal require hsb2hs >= 0.3.1. 
This is done by adding `hookedPrograms` in `Setup.hs`,
which allows us to include `hsb2hs` in Build-Tools in cabal.
 2015-07-05 13:50:10 -07:00
John MacFarlane
6e121bfafc Travis: only do sdist with cabal != 1.16. 2015-07-05 10:42:44 -07:00
John MacFarlane
edf55dcee8 Travis: reorder hsb2hs install. 2015-07-05 09:50:03 -07:00
John MacFarlane
923e65ffa8 Travis: install hsb2hs. 2015-07-04 21:50:09 -07:00
John MacFarlane
b74099c052 Makefile: prettier 'download_stats'. 2015-07-04 10:29:52 -07:00
John MacFarlane
12d573db66 Clarified that templates go in templates subdirectory of user data dir. 
Closes #2272.
 2015-07-04 09:29:57 -07:00
John MacFarlane
8763ba188c Setup.hs: Don't require hsb2hs unless embed_data_files flag specified. 2015-07-03 17:07:44 -07:00
John MacFarlane
a27991d398 Try to fix travis build for ghc 7.4.2. 2015-07-03 15:56:02 -07:00
John MacFarlane
0ce6174820 Fixed travis. 2015-07-03 14:26:17 -07:00
John MacFarlane
56c270d697 Travis: build in a directory created by sdist. 
This will catch packaging bugs.
 2015-07-03 12:48:19 -07:00
John MacFarlane
639e275493 Updated changelog. 2015-07-03 11:30:11 -07:00
Lars-Dominik Braun
d9e17cb3f7 Tests.Readers.RST: Test metadata with inline markup too 2015-07-03 16:57:30 +02:00
Lars-Dominik Braun
8577007d9b Tests.Readers.RST: Group field list tests 2015-07-03 16:44:02 +02:00
Lars-Dominik Braun
b2adf44e75 Readers.RST: Factor out inline markup string parsing 2015-07-03 16:42:51 +02:00
Lars-Dominik Braun
68b6b9f652 Readers.RST: Parse field list name 
“Inline markup is parsed in field names.” [1]

[1] http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#field-lists
 2015-07-03 16:41:28 +02:00
John MacFarlane
79764df2d5 Added pandoc.1 to repository. Don't build as part of cabal build. 
The process was too fragile.  It made too many assumptions about
available libraries (which failed sometimes when sandboxes were
used).  This is a low-tech solution.  The only drawback is that
`man/pandoc.1` is a generated file in the repository.  It will need
to be regenerated periodically when README changes.
 2015-07-02 22:12:38 -07:00
John MacFarlane
fbc5384ef8 Bump date on README 2015-07-02 21:37:22 -07:00
John MacFarlane
a945d702c0 Bump version to 1.15.0.4. 2015-07-02 20:48:31 -07:00
John MacFarlane
4df8c32a53 WiX: Set InstallPrivileges to limited. 
Default is "elevated", which requires admin privileges.
 2015-07-02 20:47:56 -07:00
John MacFarlane
608fc273df Make copying of man pages respect --destdir. 
Closes #2262.
 2015-07-02 16:21:11 -07:00
John MacFarlane
5f0b875565 Better error messages for filters: 
- Inform user if filter requires an interpreter that isn't
  found in the path.
- Inform user if filter returns an error status.
 2015-07-02 12:28:46 -07:00
John MacFarlane
9044229531 Bump version to 1.15.0.3, updated changelog. 2015-07-02 09:32:45 -07:00
John MacFarlane
d8cfc255bd Setup.hs: ensure target directory is created when installing man page. 2015-07-02 09:31:33 -07:00
John MacFarlane
f30b2d4629 Version bump to 1.15.0.2, updated changelog. 2015-07-02 08:13:28 -07:00
John MacFarlane
dce8dd6e6b Added man page source files to extra-source-files. 2015-07-02 08:01:22 -07:00
John MacFarlane
49da3e70cd Bump version to 1.15.0.1, update changelog. 2015-07-01 18:05:00 -07:00
John MacFarlane
9ffd1babc7 Install man pages as part of cabal 'copy' phase. 2015-07-01 18:01:21 -07:00
John MacFarlane
28cb50503b Generate man page in cabal build process and include in data/. 
The pandoc.1 man page is generated automatically after the cabal
build process.  It goes in `data/pandoc.1`.  It can be obtained
by the user who installs pandoc via cabal thus:

    pandoc --print-default-data-file pandoc.1 > pandoc.1
 2015-07-01 16:29:44 -07:00
John MacFarlane
958a615b75 Don't use MANDIR in make_deb and make_osx_package. 2015-07-01 12:41:25 -07:00
John MacFarlane
b1f835976d Always rebuild man page in making deb and osx package. 2015-07-01 12:32:55 -07:00
John MacFarlane
dd8a1e5092 Updated make_osx_package.sh for new man page method. 2015-07-01 12:22:21 -07:00
John MacFarlane
1093adfd77 Updated make_deb.sh for new man page method. 2015-07-01 12:21:22 -07:00
John MacFarlane
9f387a353d Updated changelog. 2015-07-01 12:18:39 -07:00
John MacFarlane
e0a88df686 ConTeXt: use \goto for internal links. 2015-07-01 12:11:45 -07:00
John MacFarlane
668833dd0b Ignore sandbox on 'make quick' 2015-07-01 12:11:44 -07:00
John MacFarlane
b5d3b4f608 Merge pull request #2255 from mchladek/odt_linebreak 
Fix #2254 : OpenDocument writer adds space with hard line break
 2015-07-01 11:49:58 -07:00
John MacFarlane
8e747004e6 ConTeXt writer: Added a % at end for \reference to avoid spurious space. 2015-07-01 11:30:28 -07:00
John MacFarlane
a04c15a422 New method for building man pages. 
+ Removed `--man1`, `--man5` options (breaking change).
+ Removed `Text.Pandoc.ManPages` module (breaking API change).
+ Version bump to 1.15 because of the breaking changes, even
  though they involve features that have only been in pandoc
  for a day.
+ Makefile target for `man/man1/pandoc.1`.  This uses pandoc to
  create the man page from README using a custom template and filters.
+ Added `man/` directory with template and filters needed to build
  man page.
+ We no longer have two man pages: pandoc.1 and pandoc_markdown.5.
  Now there is just pandoc.1, which has all the content from README.
  This change was needed because of the extensive cross-references
  between parts of the README.
+ Removed old `data/pandoc.1.template` and
  `data/pandoc_markdown.5.template`.
 2015-07-01 11:27:15 -07:00
Michael Chladek
125b0c7359 Do not add a carriage return after a hard line break in OpenDocument writer and reflect change in tests. 2015-07-01 09:43:36 -05:00
John MacFarlane
6862aa2687 Fixed man page building in make_osx_package.sh. 2015-06-30 22:47:13 -07:00