Robin Dupret
cab9047de1
Set the wrap option to false when using Rouge
...
Since Rouge yields the pre tag with a class attribute but we don't want
it, we should set the wrap parameter to false when instantiating a new
formatter object.
Also use Rouge::Formatter#format instead of #render which is deprecated
and will be removed in the near future.
2013-12-23 13:03:24 +01:00
Robin Dupret
bd442680ea
Rely on the Redcarpet plugin instead of hard-coding
...
To avoid code duplication and have to keep tracking of the API change of
Rouge, let's rely on the Redcarpet plugin and customize the output on
our needs.
2013-12-22 18:45:46 +01:00
Robin Dupret
4bf716c2ad
Set highlighter to pygments when upgrading
...
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
2013-12-22 18:45:46 +01:00
Robin Dupret
0831d2b0f8
Add support for the Rouge syntax highlighter
...
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
Robin Dupret
92064134d6
Rename the pygments option to highlighter
...
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.
It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
Robin Dupret
903cce2745
Fix the highlight tag feature
...
Previously, the assertion made wasn't enough to check whether the code
block was correctly parsed through Pygments (and it was not the case).
This commit simply ensure there is a div with the "highlight" class and
fix the test to correctly invoke the Liquid tag rendering.
2013-12-22 12:29:19 +01:00
Parker Moore
354b4b9c54
Update history to reflect merge of #1854
2013-12-19 19:58:36 -05:00
Parker Moore
8c2da13096
Merge pull request #1854 from EricDobson/docs_datafiles_typo
2013-12-19 16:57:53 -08:00
Eric Dobson
c79f170687
Fix typo in docs.
2013-12-19 14:39:23 -07:00
Parker Moore
8cb1dc47d9
Update history to reflect merge of #1848
2013-12-19 15:20:51 -05:00
Parker Moore
94e96d325b
Merge pull request #1848 from afeld/sort-pages
2013-12-19 12:19:49 -08:00
Aidan Feldman
45ee9f814a
clarify page sorting test
2013-12-19 13:46:43 -05:00
Aidan Feldman
a6e1c40051
link to Stack Overflow answer re: Dir sorting
2013-12-19 01:05:00 -05:00
Aidan Feldman
3c1d45f45f
Sort pages by name by default
...
The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact.
2013-12-19 01:02:25 -05:00
Parker Moore
12a55b86ac
Update history to reflect merge of #1836
2013-12-16 20:32:28 -05:00
Parker Moore
eaa8c8de29
Merge pull request #1836 from jekyll/update-history-with-v1.4.x
...
Update `master` with v1.4.x changes
2013-12-16 17:31:45 -08:00
Parker Moore
cb31e9c2db
Rakefile's site:releases:new should use 'release' variable instead of 'version' function to specify version in YAML front-matter
2013-12-16 20:31:21 -05:00
Parker Moore
f6e7e5cc76
Add link to 'a regression' in 1.4.2 release post
2013-12-16 20:30:06 -05:00
Parker Moore
8690edcae4
Add 1.4.2 release post
2013-12-16 20:26:52 -05:00
Parker Moore
6b5ce3a9f0
Add v1.4.2 to History.markdown
2013-12-16 20:26:43 -05:00
Parker Moore
b7bdcb19ca
Update history to reflect merge of #1818
2013-12-11 18:31:13 -05:00
Parker Moore
53721dce03
Merge pull request #1818 from jekyll/windows-docs
2013-12-11 15:26:15 -08:00
Parker Moore
c295060f69
Use Markdown, silly
2013-12-11 18:25:02 -05:00
Matt Rogers
3e2c229e97
Merge pull request #1817 from jekyll/move-to-jekyll-jekyll
...
mojombo/jekyll ~> jekyll/jekyll
2013-12-11 14:50:21 -08:00
Matt Rogers
6d0a168d6d
Update history to reflect merge of #1817
2013-12-11 16:47:37 -06:00
Parker Moore
6195192bcf
mojombo/jekyll ~> jekyll/jekyll
2013-12-11 17:44:33 -05:00
Matt Rogers
379093f940
Update history to reflect merge of #1815
2013-12-11 16:00:47 -06:00
Matt Rogers
85fcd0e757
Merge pull request #1815 from mojombo/redcarpet-3
2013-12-11 14:00:42 -08:00
Parker Moore
827c4b9bda
Update history to reflect merge of #1812
2013-12-11 16:53:39 -05:00
Parker Moore
7b23fca86e
Merge pull request #1812 from mojombo/openshift-cartridge
2013-12-11 13:53:16 -08:00
Parker Moore
1c22b3f751
Bump RedCarpet dependency to ~> 3.0
2013-12-11 16:51:57 -05:00
Parker Moore
1b8e6facd3
Add note about deployment on OpenShift using @developercorey's Jekyll cartridge.
2013-12-11 16:05:35 -05:00
Matt Rogers
e5c8c94cd1
Update history to reflect merge of #1780
2013-12-11 08:08:14 -06:00
Matt Rogers
39b6fe732f
Merge pull request #1780 from mojombo/kill-1-8
2013-12-11 06:08:10 -08:00
Matt Rogers
fc760c1604
Update history to reflect merge of #1706
2013-12-10 23:16:44 -06:00
Matt Rogers
58159389b8
Merge pull request #1706 from mojombo/drop-commander
2013-12-10 21:16:42 -08:00
Matt Rogers
b49c6508f5
Update history to reflect merge of #1805
2013-12-10 22:58:48 -06:00
Matt Rogers
6efb726e2b
Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar
2013-12-10 20:58:45 -08:00
Matt Rogers
48834891ac
Update history to reflect merge of #1799
2013-12-10 22:30:55 -06:00
Matt Rogers
a7d4ee8bfb
Merge pull request #1799 from konklone/maruku_fenced_code_blocks
2013-12-10 20:30:44 -08:00
Ivan Tse
b18f6505dd
Remove margin-top of .site to prevent collapsing margins.
2013-12-10 18:39:16 -05:00
Parker Moore
8d44fa913b
Update history to reflect merge of #1803
2013-12-10 17:49:44 -05:00
Parker Moore
a1efc105d2
Merge pull request #1803 from penibelst/site-unminify-css
2013-12-10 14:49:17 -08:00
Anatol Broder
1033b4c1e7
Add comments and site.GH_ENV
2013-12-10 22:30:59 +01:00
Parker Moore
01ee2ada7c
Update history to reflect merge of #1804
2013-12-10 16:14:25 -05:00
Parker Moore
8ebe19b835
Merge pull request #1804 from penibelst/site-fix-postv141
2013-12-10 13:13:59 -08:00
Anatol Broder
b91ab3b334
Fix repo
2013-12-10 22:01:06 +01:00
Anatol Broder
59eaeed6e7
Fix version
2013-12-10 22:00:27 +01:00
Anatol Broder
288d2a8c6b
Unminify css
2013-12-10 21:13:19 +01:00
Parker Moore
6e74ec2f71
Update history to reflect merge of #1788
2013-12-10 11:49:44 -05:00
