lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-12 02:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,211 Commits 87 Branches 298 Tags
b70079fbfa73dff4a3d94de1aa3d8b804fc9520b
Commit Graph
10211 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John MacFarlane 869e800bbb Merge pull request #2432 from hftf/hyphens 
Docx Reader: Parse soft and non-breaking hyphen elements
 2015-10-04 21:56:29 -07:00
John MacFarlane e32ab441be Updated tests for changes to latex template. 2015-10-04 21:52:08 -07:00
John MacFarlane 15a5993f2e Updated latex template to work better with tufte... 
and other packages that include hyperref or color.

Thanks to Xavier Olive.
 2015-10-04 21:44:07 -07:00
John MacFarlane cddd99ccb2 Merge pull request #115 from xoolive/pr-tufte 
Deal with conflicts with tufte-handout.cls
 2015-10-04 21:42:43 -07:00
Xavier Olive def68fce50 Keep the same options when color is already passed 
Use `\PassOptionsToPackage` instead of `\usepackage` when package color
is already loaded.

Resolves: #116
See also: #107
 2015-10-04 21:03:26 +02:00
Xavier Olive f73de97de9 Deal with conflicts with tufte-handout.cls 
There are several conflicts that are raised when you use tufte-handout
layout with the default.latex template, namely hyperref and color, which
are already loaded by the class.

This commit enables to only load `hyperref` and `color` packages if they
are not already loaded (by Tufte).
 2015-10-04 21:03:26 +02:00
Ophir Lifshitz dfd06467ea Docx Reader: Create special punctuation test 2015-10-04 06:11:07 -04:00
Ophir Lifshitz 0b899ce7ef Docx Reader: Parse soft, no-break hyphen elements 2015-10-04 06:11:07 -04:00
John MacFarlane 6d0e586b2d Template updates. 
Beamer:  added `innertheme`, `outertheme` variables.

LaTeX:  added `mainfontoptions`, `sansfontoptions`,
`monofontoptions`, `mathfontoptions`, `fontfamilyoptions`.
 2015-10-03 17:01:01 -07:00
John MacFarlane 229ec44bb6 Merge pull request #122 from adunning/patch-1 
Allow for font options in LaTeX.
 2015-10-03 16:57:09 -07:00
John MacFarlane 747a7a4cf8 Allow HUnit 1.3 2015-10-03 16:19:53 -07:00
John MacFarlane 421845202d FIxed typo: Ext_superscript, Ext_subscript. 2015-10-03 16:03:40 -07:00
John MacFarlane 68c02e1d01 For markdown_mmd, add: implicit_figures, superscripts, subscripts. 
See #2401.
 2015-10-03 15:32:01 -07:00
Alex Vong 8a4bf5f764 Add a comment stating the man page is 
`Automatically generated by Pandoc $pandoc-version$`.

* default.man: Add comment.
 2015-10-01 02:28:17 +08:00
Alex Vong 304c65f73f Add new template variables $adjusting$ and $hyphenate$ for default.man. 
$adjusting$ takes the values "l", "r", "c" or "b",
which adjusts text to left, right, center or both margins respectively.

$hyphenate$ is set to "true" by default,
setting it to "false" will turn off hyphenation.

* default.man: Add new variables $adjusting$ and $hyphenate$.
 2015-10-01 02:28:17 +08:00
Alex Vong 319832cc19 Set the template variable $pandoc-version$ to pandocVersion by default. 
* src/Text/Pandoc/Writers/Man.hs: Set $pandoc-version$ to be pandocVersion.
 2015-10-01 02:24:34 +08:00
Alex Vong d7a19c22be Move the variable pandocVersion from src/Text/Pandoc.hs to 
`src/Text/Pandoc/Shared.hs`, so that all Writers can access this variable
without importing `src/Text/Pandoc.hs`, preventing circular import.

* pandoc.hs: Import pandocVersion from `Text.Pandoc.Shared`.
* src/Text/Pandoc.hs: Remove the definition of pandocVersion
 and relevant import.
* src/Text/Pandoc/Shared.hs: Add the definition of pandocVersion
 and relevant import.
 2015-10-01 02:24:34 +08:00
Alex Vong f5e33e0dce Set the template variable $hyphenate$ to true by default 
* src/Text/Pandoc/Writers/Man.hs: Set $hyphenate$ to be true.
 2015-10-01 02:24:34 +08:00
Andrew Dunning 1d728214e8 Allow for font options. 2015-09-29 16:55:50 -04:00
John MacFarlane 4443af4d8d Beamer template: allow setting outer/inner theme. 2015-09-29 10:00:57 -07:00
John MacFarlane 2f5f539605 Merge pull request #121 from gbonnefille/inner-outer 
Add support for inner/outer theme
 2015-09-29 10:00:22 -07:00
Guilhem Bonnefille 9787605ff6 Addd support for inner/outer theme 2015-09-29 11:51:59 +02:00
John MacFarlane eb27ef89bc appveyor.yml: removed part that builds the package. 2015-09-27 23:01:56 -07:00
John MacFarlane 06b761be5b appveyor.yml: Fixed another multiline statement. 2015-09-27 21:56:20 -07:00
John MacFarlane 01ddeda11f appveyor.yml: Another attempt to set VERSION. 2015-09-27 21:16:03 -07:00
John MacFarlane 057c75465d appveyor.yml: put whole for loop on one line. 2015-09-27 20:37:39 -07:00
John MacFarlane 3dcadf7ed9 appveyor.yml: another try in version extraction. 2015-09-27 18:46:34 -07:00
John MacFarlane 15512a6c10 appveyor.yml: removed :next label. 2015-09-27 18:28:28 -07:00
John MacFarlane 80fc5bcdf0 appveyor.yml: Tried another approach to get pandoc version. 2015-09-27 16:26:13 -07:00
John MacFarlane f7e02b16d4 appveyor.yml: don't run tests for pandoc-citeproc. 
They won't work til we upgrade HP version, because of
minor changes in aeson.
 2015-09-27 15:34:06 -07:00
John MacFarlane 7ed18d4c37 appveyor.yml: use cmd instead of ps. 2015-09-27 12:04:23 -07:00
John MacFarlane a66f683b3d appveyor.yml: Build pandoc-citeproc after main test. 2015-09-27 11:26:07 -07:00
John MacFarlane 360e35459f appveyor: cache Haskell Platform. 2015-09-27 09:40:44 -07:00
John MacFarlane a3295f57d5 Merge pull request #2420 from xymostech/patch-1 
Update KaTeX JS and CSS versions.
 2015-09-27 09:32:02 -07:00
John MacFarlane 013b143427 appveyor.yml: fixed cabal flag. 2015-09-27 09:27:56 -07:00
John MacFarlane 4a7eaa71d0 appveyor: attempt to create msi package after build. 2015-09-27 09:13:37 -07:00
John MacFarlane af8fb5e792 Removed unneeded imports. 2015-09-26 22:56:13 -07:00
John MacFarlane 6532950b26 MediaBag: ensure that / is always used as path separator. 2015-09-26 22:40:58 -07:00
John MacFarlane 90914d2d16 appveyor.yml: revert to non-stack version. 2015-09-26 21:27:34 -07:00
Emily Eisenberg 149f0f6a4b Update KaTeX JS and CSS versions. 
Update the default KaTeX JS/CSS links to the current version. KaTeX v0.5.1 has far more functions and symbols than v0.1.0, so it seems like a better default. I think technically this might break compatibility because we released a breaking change due to the greediness of the `\color` function, but this probably has very little impact.
 2015-09-26 21:15:13 -07:00
John MacFarlane be0136230d appveyor.yml: Get submodules. 2015-09-26 18:13:55 -07:00
John MacFarlane 5bff473650 appveyor: Fixed stack.exe path. 2015-09-26 18:11:34 -07:00
John MacFarlane 4e1cfee30a More appveyor fixes. 2015-09-26 18:10:26 -07:00
John MacFarlane 64d683b84b appveyor.yml: changed clone dir. 2015-09-26 18:04:50 -07:00
John MacFarlane 8b65b38dd2 New appveyor.yml using stack. 
Copied, mostly, from stack's repo.
 2015-09-26 17:58:12 -07:00
John MacFarlane 0a2773bd1b Changes to templates to support handling of bidirectional text. 
(LaTeX, ConTeXt, HTML)
 2015-09-26 17:07:48 -07:00
John MacFarlane fdfc961284 Merge pull request #2419 from mb21/bidi 
Support bidirectional text output with XeLaTeX, ConTeXt and HTML
 2015-09-26 17:06:56 -07:00
John MacFarlane e5aacec789 Merge pull request #120 from mb21/bidi 
Support bidirectional text output with XeLaTeX, ConTeXt and HTML
 2015-09-26 17:06:42 -07:00
John MacFarlane 72bade01f5 Slightly improved description of citation locators in README. 2015-09-26 16:18:32 -07:00
John MacFarlane 22fe3e0b4e Merge pull request #2418 from nickbart1980/patch-3 
Give details of locator terms
 2015-09-26 16:14:43 -07:00