Commit Graph

164 Commits

Author SHA1 Message Date
Brandon Mathis
a25787a204 Fixes for Redcarpet
- Removed unnecessary content filtering for escaping markdown
- Escaping codeblocks defaults to false and can be enabled by passing escape:true
- Backtick codeblocks are automatically escaped when using Textile
- Scoped styling of .highlight divs to figure elements
2013-01-03 11:36:51 -06:00
Brandon Mathis
277dc6a558 Merge pull request #916 from Keithbsmiley/2.1
Fix nil path when not using gist cache
2013-01-03 08:18:15 -08:00
Brandon Mathis
8c0aa043fe Added safe_wrap (escaping markdown and textile) to cached gists. Closes #917 2013-01-03 09:45:16 -06:00
Keith Smiley
fb27cae6be fix nil path when not using gist cache 2013-01-03 08:45:59 -05:00
Keith Smiley
5442c90e48 Fix crash with nil passes 2013-01-02 14:42:18 -05:00
Brandon Mathis
234e92852f Category Archive now supports category slugs and titles
For example, in the YAML header set categories like this

categories:
 - awesome [Awesome Posts]
 - news

Octopress will parse out '[Awesome Posts]' and 'news' as the title and display it in
the category list, but the category index urls will be awesome/ and news/

Fixes #902
2012-12-31 13:43:58 -06:00
David Tchepak
1b9fc7901e added category link method #408 2012-12-29 02:10:59 -06:00
Brandon Mathis
5b99bbb004 updated gems and removed albino support for code plugins since the latest Jekyll uses pygments.rb 2012-12-29 01:52:38 -06:00
Brandon Mathis
50105a6049 Merge pull request #896 from parkr/remove-jsfiddle
Remove jsFiddle plugin from default selection
2012-12-28 08:32:46 -08:00
Parker Moore
1b7b6467db Remove jsFiddle plugin from default selection 2012-12-28 02:22:16 -05:00
Brandon Mathis
10bd1cf27b updated code plugins to support slashes in titles #892 2012-12-26 17:31:51 -06:00
Brandon Mathis
be53372e20 Upgraded to pygments.rb 0.3.3 and fixed an issue where Gists wouldn't output cached files
I'm actually done. #888. For now.
2012-12-24 22:11:11 -06:00
Brandon Mathis
8eac9cf471 Further simplified code plugins
- The highlight function now accepts only to variables: code, options.
- Extracting part of a code snippet is now a method of pygments_code.rb.
- Options assignment has been simplified for all code plugins.
2012-12-24 15:59:48 -06:00
Brandon Mathis
66a883f2af Improved highlighted code caching and performance
- Pygments caching is broken into a couple utility functions for greater flexibility.
- Now Gist cache files are hashed against their gist id and parameters.
- Raw gists are no longer cached, only processed gists.
- Gist caches are still stored in .gist-cache/ for more atomic cleanup.

Note: For the docs, caching speeds up generation by about 1800 milliseconds on my machine.
2012-12-24 13:51:05 -06:00
Brandon Mathis
ed186b18a2 More code snippet refactoring
- Each code snippet's html is now cached (before only pygments output was cached and html was being processed each time)
- Caching MD5 is based on code snippets as well as options.
- Fixed an issue where gist tags weren't specifying a default start line

Note: The caching change shaved 800 milliseconds off of the render time for the docs. For code heavy sites this should be a nice change.
2012-12-24 00:23:48 -06:00
Brandon Mathis
e686f8544e fixed stupid mistake with find-and-replace 2012-12-23 00:44:40 -06:00
Brandon Mathis
0fcbc225e4 Code plugin refactoring
- Unified handling of key, value options
- Added url, link_text, and title options
- Gists can now accept start, end, range, title, url, link_text, linenos and marks options
- Code accessibility improvements (hiding line numbers) #864
2012-12-23 00:38:52 -06:00
Brandon Mathis
977be3adea Fixed issue with stripping whitespace on code captions. Sleepy code. 2012-12-20 23:50:42 -06:00
Brandon Mathis
1a4119a039 Code blocks are now more accessible to screen readers. Fixes #864 2012-12-20 23:38:03 -06:00
Brandon Mathis
fad262d3c1 Merge pull request #880 from lucisferre/adds-cs-filetype-to-pygments-processing
Adds 'cs' filetype to pygments
2012-12-20 10:06:55 -08:00
Chris Nicola
72accb4e5d Fixes gist processing of 'cs' files 2012-12-20 09:11:51 -08:00
Brandon Mathis
6a964fec8f Improved code snippet support
- Static Gist embeds show titles and link to the Gist
- Stylesheets refactored to remove !important and references to Gist classes
- Renamed links for include code
- Removed sometimes incorrect title attribute on code snippet links
2012-12-20 00:37:27 -06:00
Liang Sun
9864898610 To support url without domain name like /path/file
You need to know if you would like to support this, each word in the title can not start with "/".
2012-12-20 00:00:31 -06:00
Brandon Mathis
54ffce5611 added figcaption with source link to embeded gist code snippets 2012-12-19 00:17:47 -06:00
Parker Moore
a81765facb Gist plugin uses raw text instead of gist JS. 2012-12-17 15:20:29 -05:00
Brandon Mathis
1a96b235fc Now code blocks automatically escape liquid {{ and {% characters fixes #745 2012-09-06 11:10:32 -05:00
Brandon Mathis
318e348163 Removed include_array plugin, replaced it with include_sidebar plugin and reorganized sidebars 2012-06-16 17:17:33 -05:00
Brandon Mathis
28e99b3c38 Added plugins/config.rb for reading and writing _config.yml. Added option to use Albino and default Python Pygments by setting pygments:true in _config.yml 2012-06-15 12:50:44 -05:00
Brandon Mathis
0ce6655e02 Added escape for liquid tags {{ and {% so that Liquid doesn't barf when a language uses these characters. Closes #466 2012-06-11 01:08:12 -05:00
Brandon Mathis
6b38214a33 Added support for blockquotes with only Author but now cited work. Closes #470 2012-06-11 00:44:23 -05:00
Brandon Mathis
64b2d2355d Fixed issue where gists wouldn't get line numbers added. Fixed issue where backtick code blocks were getting empty figcaptions 2012-06-05 00:35:50 -05:00
Brandon Mathis
35d2077ccc fixed the embedded example in include_code plugin 2012-06-05 00:09:01 -05:00
Brandon Mathis
d4649f7f8f Merge branch 'master' into 2.1
Conflicts:
	plugins/code_block.rb
	plugins/pullquote.rb
2012-06-03 09:52:10 -05:00
Brandon Mathis
cf0d5b80cf Improvements to code plugins
- Range options are now properly stripped out of code plugin markup
- Markers now add start and end class names for more style control
- code_block plugin properly passes markings in highlight options
- Deprecated title before file name syntax for include_code
2012-06-03 00:19:06 -05:00
Brandon Mathis
b867b0877d Refactored code plugins so that shared regexes are mixed in methods
Added option to mark one line or groups of lines in a code block

Relates to issue #584
2012-05-28 04:29:18 -05:00
Brandon Mathis
e16844af29 Improvements to Code embedding features
1. Removed lots of duplication
2. Added warnings and fixed some dim regex
3. New: set a start line number for any code snippet
4. New: set a start, end, or range for include_code
5. New: added option to disable line numbers linenos:false

Fixes #478 #484
2012-05-27 02:30:17 -05:00
Brandon Mathis
e53b26ad30 updated plugins to work with latest version of Liquid 2012-05-24 10:28:32 -05:00
Brandon Mathis
af40b0aa13 Removed unnecessary line breaks from beginning and end of blockquotes 2012-05-24 10:24:37 -05:00
Brandon Mathis
4de8189651 Fixed collision with render on pygments_code.rb 2012-05-24 10:18:44 -05:00
Brandon Mathis
ba8edf37a7 updated pullquote plugin to work better with latest Liquid version 2012-05-22 16:30:27 -05:00
Brandon Mathis
8e41dd777b updated puts.rb to work with latest liquid and added different output based on character width 2012-05-22 16:29:43 -05:00
Brandon Mathis
8c7b727abf Made image tag regex smarter, fixes #239 2012-05-22 15:20:15 -05:00
Brandon Mathis
dd896741c9 fixed an issue where blockquotes would fail in recent versions of Liquid 2012-05-22 11:30:26 -05:00
Robert Wijas
1ac51f0950 render_partial always converts the content
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-22 11:24:40 -05:00
Robert Wijas
82f8142cc4 render_partial - content coverting
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-22 11:24:40 -05:00
akira yamada
590b35ce4e apply "o" option to regexps to improve process time
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-22 00:59:32 -05:00
Brandon Mathis
33073156bc removed some duplication in the pygments highlight method. Ensured the backtick codeblock would match newline characters in regex 2012-05-22 00:00:15 -05:00
Brandon Mathis
b52536d72c Merge branch '2.1' of github.com:imathis/octopress into 2.1 2012-05-21 23:57:07 -05:00
Brandon Mathis
b07e533d4a Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description
Conflicts:

	.themes/classic/source/_includes/head.html
2012-05-21 23:54:21 -05:00
Hong Xu
6cd00d865e Fix the EXCLUDED_FILES list in sitemap_generator.rb 2012-05-22 11:21:57 +08:00