Commit Graph

3111 Commits

Author SHA1 Message Date
Parker Moore 0ebec0b03f Update history to reflect merge of #1872 2013-12-26 01:06:02 -05:00
Parker Moore 5c4831af49 Merge pull request #1872 from jekyll/gjtorikian-steal-envygeeks-custom-markdown-processors 2013-12-25 22:05:31 -08:00
Parker Moore 58ae137945 Fix quick site bugs. 2013-12-26 01:02:13 -05:00
Parker Moore 88612bf7ce Add docs for custom markdown processors. 2013-12-26 00:52:20 -05:00
Parker Moore ab95cca434 Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class? 2013-12-26 00:33:34 -05:00
Parker Moore 7b9984699c Fix error in exception message in Markdown Converter [ci skip] 2013-12-26 00:14:24 -05:00
Parker Moore 60b43104ee Extract checks for acceptable custom markdown processors to method.
We should probably write more about what it does and how it works in a TomDoc block above.
@envygeeks, want to give that a shot?
2013-12-26 00:02:56 -05:00
Jordon Bedwell a206dc1a8f Use downcase. 2013-12-25 23:55:20 -05:00
Parker Moore c70350e275 Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
  Depend on Jekyll.logger.error, not $stderr
  Allow custom Markdown processors.
  New is implied by `raise`, 2nd is the message.
  Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00
Garen Torikian 31bebf0f9e Depend on Jekyll.logger.error, not $stderr 2013-12-25 19:36:49 -06:00
Jordon c759a7a75f Allow custom Markdown processors. 2013-12-25 19:36:25 -06:00
Jordon 626d54a812 New is implied by `raise`, 2nd is the message. 2013-12-25 19:36:25 -06:00
Jordon 4d017b4fed Use $stderr, not STDERR, $stderr points to STDERR. 2013-12-25 19:36:25 -06:00
Robin Dupret 036cbda2f6 Require at least 1.3.0 for Rouge
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.

An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
Parker Moore 1550c60278 Update history to reflect merge of #1847 2013-12-24 14:05:54 -05:00
Parker Moore 9d5785cead Merge pull request #1847 from schneems/schneems/better-bat-time-error 2013-12-24 11:05:34 -08:00
Parker Moore 169e526f2f Update history to reflect merge of #1867 2013-12-24 14:05:00 -05:00
Parker Moore ec68acf958 Merge pull request #1867 from pootsbook/patch-2 2013-12-24 11:02:47 -08:00
Philip Poots 5491da9511 Add closing <code> tag.
Earlier PR omitted </code>. Thanks to @ivantsepp for spotting.
2013-12-24 09:42:47 +00:00
Colin Dean 88686e759e Add `path` to required methods
The error messages in this module call `#path`, but the module does not require the `path` method to be implemented. This change documents that classes which include `Convertible` must define `path`.

See #1846 for discussion.
2013-12-23 12:56:02 -05:00
Robin Dupret 5647a902de Remove a useless given step
Since the highlighter configuration option should default to pygments,
we don't have to explicitly set it in the step testing the output with
pygments.
2013-12-23 13:03:29 +01:00
Robin Dupret 3ca2cb0119 Fix various typos and improve the doc 2013-12-23 13:03:29 +01:00
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
Parker Moore 42aef79ab3 Update history to reflect merge of #1864 2013-12-22 22:15:09 -05:00
Parker Moore 3d09b144f9 Merge pull request #1864 from pootsbook/patch-1 2013-12-22 19:14:35 -08:00
Aidan Feldman 9d7c524530 fix file sorting test 2013-12-22 19:33:00 -05:00
Aidan Feldman fa8618879d Merge remote-tracking branch 'upstream/master' into sort-attributes 2013-12-22 19:31:56 -05:00
Philip Poots e17f997e75 Clarify how to access `site`
I was unable to access the config at `context.registers.config`. Everything seems to point towards the `site` variable being accessed via `context.registers[:site]`.
2013-12-22 23:01:13 +00: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
Aidan Feldman 2bfafb3b33 make non-data properties/methods accessible to Liquid
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
2013-12-22 03:38:32 -05: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
Aidan Feldman c2b750448e allow data attribute access by Liquid on Convertible items 2013-12-19 17:14:51 -05:00
Eric Dobson c79f170687 Fix typo in docs. 2013-12-19 14:39:23 -07:00
Parker Moore c29ffb9dd9 Add in 1.4.1 and 1.4.2 changelog 2013-12-19 15:21:42 -05: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
Jens Nazarenus 412fe8b8de edited documentation for include tag 2013-12-19 18:29:40 +01:00
Jens Nazarenus 10ee83d680 edited raise message when validating included file 2013-12-19 18:23:21 +01:00
Jens Nazarenus f9ffbe0d6a removed duplicate test scenario 2013-12-19 18:23:07 +01:00
Aidan Feldman 8c1706b66e clean up custom variable sort feature 2013-12-19 03:36:48 -05:00
Aidan Feldman 35712dcadc add failing test for sorting pages by custom variables 2013-12-19 03:35:57 -05:00
Aidan Feldman 396aa16f99 refactor step to support page creation 2013-12-19 02:27:23 -05:00
Aidan Feldman 5b2480c8ba refactor file+matter creation in cucumber steps 2013-12-19 01:58:46 -05:00
Aidan Feldman a6e1c40051 link to Stack Overflow answer re: Dir sorting 2013-12-19 01:05:00 -05:00