Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maruku fenced code blocks #1799

Merged
merged 5 commits into from
Dec 11, 2013
Merged

Maruku fenced code blocks #1799

merged 5 commits into from
Dec 11, 2013

Conversation

konklone
Copy link
Contributor

@konklone konklone commented Dec 9, 2013

This adds support for the fenced_code_blocks option in Maruku, and adds a test that verifies that it works.

Note: This test accommodates for the newlines that Maruku 0.7.0 currently puts around the internals of <code> blocks generated by fenced_code_blocks. If my PR fixing this at bhollis/maruku#112 is merged in, and Maruku's version is bumped, I'll follow up with another PR that bumps Jekyll's Maruku version to it, and removes the newlines from this test.


# allow fenced code blocks (new in Maruku 0.7.0)
if @config['maruku']['fenced_code_blocks']
MaRuKu::Globals[:fenced_code_blocks] = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just set the value of the config to the the value of the Globals? i.e.

MaRuKu::Globals[:fenced_code_blocks] = !!@config['maruku']['fenced_code_blocks']

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All right, Captain Picky, I've updated the PR with your suggestion

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😃 ❤️

@parkr
Copy link
Member

parkr commented Dec 10, 2013

LGTM! @mattr-?

@mattr- mattr- merged commit a7d4ee8 into jekyll:master Dec 11, 2013
mattr- added a commit that referenced this pull request Dec 11, 2013
parkr added a commit that referenced this pull request Dec 15, 2013
@bhollis
Copy link
Contributor

bhollis commented Jan 15, 2014

Maruku 0.7.1 has been released, which includes @konklone's patch as well as several other bugfixes. See https://github.com/bhollis/maruku/blob/master/CHANGELOG.md for details.

coreyward added a commit to coreyward/jekyll that referenced this pull request Feb 17, 2014
@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants