Commit Graph

188 Commits

Author SHA1 Message Date
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
Brandon Mathis
ca470417e5 Markdown/Textile escape system is more flexible and strips goofy parsing glitches much better. Fixes #500 2012-05-21 20:16:06 -05:00
Brandon Mathis
adc4e1f2ef removed an unnecessary whitespace indent adjustment from backtick codeblock 2012-05-21 20:13:43 -05:00
Brandon Mathis
eb075cbd33 removed faulty string join from code_block plugin 2012-05-21 20:13:40 -05:00
Brandon Mathis
9fbc46abd9 Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:07:01 -05:00
Brandon Mathis
8753a6b00c Octopress filters are now limited to html producing templating languages, Fixes #536 2012-05-21 16:06:52 -05:00
Brandon Mathis
de38449d78 added 404.html to sitemap.xml exclude list. Closes #569 2012-05-21 11:29:20 -05:00
Brandon Mathis
c06ba58466 removed some duplication from category url generation 2012-05-20 16:43:06 -05:00
Brandon Mathis
5e666bfe6b Category directory can be set to root directory. Closes #331 #369 2012-05-20 16:36:53 -05:00
Brandon Mathis
ecb1748c4e fixed issue where category layouts were using category feed xml instead of html layout 2012-05-20 16:23:08 -05:00
Avery Yen
19320018b2 Re-encoding of input string rather than force encoding. This is safer/more valid
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 16:12:14 -05:00
Avery Yen
dd5f3d3fef Force code blocks to be UTF. This fixes ASCII/UTF incompatabilities.
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 16:12:14 -05:00
Jeffrey Tratner
7025a1a90a changed pullquote to reflect multi-line pullquotes
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-19 17:00:01 -05:00
Brandon Mathis
f954689bb6 Improved styling for linklog along with other scss refactoring.
Feed urls are more flexible with linklog items
2012-04-29 19:03:52 -05:00
Brandon Mathis
c26aa7e9a0 now per category feeds are optional (default to off) this should improve speed for the many people who don't use this feature 2012-02-19 16:27:45 -06:00
Brandon Mathis
107a4af528 moved the category_feed out of _includes/custom to _layouts/ 2012-02-18 15:28:06 -06:00
Brandon Mathis
aed317d92b added puts plugin for easily logging from liquid templates to the terminal 2012-02-12 17:00:36 -06:00
Brandon Mathis
ba98467538 removed poorly implemented monkey patch for compiling draft posts 2012-02-12 17:00:01 -06:00
Brandon Mathis
4e0fec0e0f Added a space between author and site to be sure it looked good in feed readers and places where the site CSS wasn't being loaded 2011-12-11 16:24:46 -06:00
Brandon Mathis
d5a02a78f6 Added RubyPants (the ruby port of John Gruber's smarty pants) to intelligently replace primes with smart quotes in the pullquote plugin, fixes #316 2011-12-11 16:24:39 -06:00
Frederic Hemberger
cb61146264 Merge pull request #295 from jbrains/master
Capitalize word after '!' and '?'.
2011-12-10 03:24:16 -08:00
Frederic Hemberger
6714e5c7f5 Set flag in preview mode and re-generate files before deployment if necessary 2011-11-29 15:13:50 +01:00
J. B. Rainsberger
343e0f1409 Improved, I think, the Titlecase plugin 2011-11-28 00:25:50 +01:00
Frederic Hemberger
f1ebf35869 Introduce distinction between preview/productive site generation
Posts which contain the YAML attribute `published: false` are usually
not generated by Jekyll. With this patch they can be previewed just
like published posts on localhost using `rake watch`or `rake preview`.

NOTICE: Before pushing to the productive environment, use `rake generate`
to update the public directory and remove posts which are flagged not to be
published.
2011-11-23 14:37:30 +01:00
Frederic Hemberger
4feeecfdef Date format: Remove unnecessary escapement 2011-11-04 08:40:41 +01:00
Frederic Hemberger
142681489f Add custom date format %o for ordinal representation of the day 2011-11-04 08:11:16 +01:00
Frederic Hemberger
987dccee76 Add custom date format to pages, add 'updated' field again
Reverts changes of c2a68cc where I accidentally removed support for 'updated' field, see comments of issue #164 for details.
2011-11-03 20:32:38 +01:00
Frederic Hemberger
a81ef5e28b Improve handling of meta description 2011-10-21 15:00:32 +02:00
Frederic Hemberger
2043c543d2 Add utf-8 encoding option to Pygments highlighter, fixes #232 2011-10-21 09:23:56 +02:00
Frederic Hemberger
d2755dc082 Merge branch 'master' of github.com:imathis/octopress 2011-10-18 17:46:36 +02:00
Frederic Hemberger
c2a68cc2a9 Make post's date output configurable via _config.yml, closes #164
A new config variable 'date_format' is introduced in _config.yml.
It can either be set to "ordinal" to use the current format or it
can be given a string complying to strftime() format identifiers.
2011-10-18 17:25:31 +02:00
mattn
92f57ad15b support proxy. 2011-10-18 17:36:45 +09:00
Frederic Hemberger
d84daa2a88 Merge pull request #201 from mikl/category-feeds
Adds per-category Atom feeds.
2011-10-16 04:58:14 -07:00
Frederic Hemberger
21803814bc Adds parameter for left aligned pullquotes, fixes #215 2011-10-16 13:37:06 +02:00
Frederic Hemberger
2dedad6176 Merge branch 'master' of https://github.com/strand/octopress into strand/octopress 2011-10-16 13:19:42 +02:00
Frederic Hemberger
1772a8af8f Removes also leading tab from backtick codeblock 2011-10-16 12:02:14 +02:00
B Strand
d983e3eb31 Reverted previous commit to separate that change to a different pull request. 2011-10-13 11:30:25 -07:00
B Strand
f6fb11a375 Added class='citation' to blockquotes generated by the blockquote plugin to differentiate their style from the style of an html or markdown blockquote. 2011-10-12 13:25:51 -07:00
B Strand
cae964e875 Updated pullquote.rb to use a vernacular similar to the image tag. 2011-10-12 11:14:07 -07:00
strand
8897083cf7 Implemented pullquoteleft functionality 2011-10-11 15:59:25 -07:00
Frederic Hemberger
9909f16d80 Codeblock: Output source even if 'pygments_prefix' or 'pygments_suffix' is nil. Fixes #182 2011-10-11 15:46:20 +02:00
Mikkel Hoegh
66916f57a7 First attempt at creating per-category Atom feeds. 2011-10-05 00:27:17 +02:00
Frederic Hemberger
6315527b2f Adds CDATA sections to atom.xml, fixes #198 2011-10-04 19:18:40 +02:00
Brandon Mathis
a35c780616 Merge pull request #180 from victor/patch-1
Allow capitalization after a period.
2011-09-28 13:35:42 -07:00
Brandon Mathis
3bd4ed026e Merge branch 'master' of github.com:imathis/octopress into compass 2011-09-28 14:51:24 -05:00
Victor Jalencas
f75f17b05c Allow capitalization after a period. 2011-09-28 10:08:55 +03:00
Frederic Hemberger
fdf6af1d25 Fixes img tag properties 2011-09-26 15:58:14 +02:00
Frederic Hemberger
19a646b5e9 Escapes double quotes in img tag 2011-09-26 11:55:43 +02:00
Frederic Hemberger
9bd572ffdc Adds jsFiddle plugin 2011-09-26 11:51:44 +02:00
Frederic Hemberger
50eaf98c24 Makes img tag more flexible, adds support for relative paths. Includes pull request #145, fixes #161 2011-09-26 11:00:35 +02:00
Frederic Hemberger
ab61a62d30 Removes compass_compiler.rb 2011-09-22 11:43:33 +02:00
Frederic Hemberger
3dbc379caa Updated regex to select less content on posts 2011-09-21 11:41:55 +02:00
Frederic Hemberger
0b5215c0f5 Adds first 150 chars of content as meta description, if no page.description specified. Fixes #162 2011-09-21 10:08:38 +02:00
Frederic Hemberger
44e4a991cf Fixes styling of <figure> code header 2011-09-18 21:27:42 +02:00
Frederic Hemberger
347e855ddc Fixes HTML validation issues with code highlighting 2011-09-18 13:55:35 +02:00
Frederic Hemberger
f6bf894387 Aligns naming of .pygments-cache, .gist-cache and .sass-cache 2011-09-18 13:45:25 +02:00
Brandon Mathis
a289c90909 improved backtick codeblock's handling of the raw option 2011-09-07 23:30:09 -05:00
Brandon Mathis
3d2d1a8be4 1. Vastly improved backtick code blocks and added support for Textile
2. Refactored Octopress filters into Liquid filters and pre/post render filters (using post_filters plugin)
3. Added methods to raw plugin to prevent Markdown and Textile from parsing blocks
4. Updated render partial to invoke the pre_render method of post_filters
5. Moved Rubypants filter out of default.html into Octopress post_render filters
6. Added raw's safe_wrapper method to codeblock and include_code filters
2011-09-07 18:34:21 -05:00
Brandon Mathis
b25db54f93 Merge branch 'post_filters' 2011-09-07 18:34:17 -05:00
Brandon Mathis
9d2c76e189 Added {% raw %} liquid block, allowing for blocks of code which are not parsed by Liquid 2011-09-07 17:49:20 -05:00
Brandon Mathis
fd99f9f7cf Merge branch 'post_filters_plugin' of https://github.com/tedkulp/octopress into post_filters 2011-09-05 23:18:47 -05:00
Brandon Mathis
31b5388402 Downcased category urls 2011-09-05 08:07:08 -05:00
Chun-wei Kuo
7e976cbc60 Improved support for non Latin characters in category names. Fixes #128 2011-09-05 18:07:40 +08:00
Ted Kulp
5eea47c8d6 Added post_filters plugin
Plugins that extend PostFilter will get three
additional methods: pre_render, post_render and
post_write. These will be called when every page
or post is processed and allows for the plugin to
modify the post/page object directly to modify
the output beyond what can be done with just
markup.
2011-09-04 09:56:27 -04:00
Brandon Mathis
ed0c220523 Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts:
	plugins/category_generator.rb
2011-09-04 08:37:22 -05:00
fhemberger
80f8a609f6 Improved support for non Latin characters in category names. Fixes #128 2011-09-04 12:56:54 +02:00
Brandon Mathis
17301879cd reverted back to \W in category_generator. Tracking on #128 2011-09-03 09:18:43 -05:00
Brandon Mathis
4f9c45f24a Improved support for non Latin characters in category names. Fixes #128 2011-09-03 08:15:01 -05:00
masukomi
e20e68139c sitemap_generator dies if public dir doesn't exist yet
this tests for the presence of the public dir and creates
it if needed. This situation can arise in a new install.
2011-08-25 12:35:06 -04:00
Brandon Mathis
11c6e1f7a7 include_code now defaults to relative urls for easy testing on a development server 2011-08-21 16:16:03 -04:00
Brandon Mathis
089af26b02 improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace. 2011-08-21 10:31:58 -04:00
Brandon Mathis
83d87f98cc added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108 2011-08-20 20:25:07 -04:00
Brandon Mathis
358d02a4a7 centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes #108 2011-08-20 18:39:47 -04:00
Brandon Mathis
596ec87c37 now only excerpted articles show the "read on" link. Also the text for that link can be set in the _config.yml 2011-08-20 16:02:50 -04:00
Brandon Mathis
cf31601d4b reordered arguments in pagination 2011-08-18 14:30:59 -04:00
Brandon Mathis
ef4a42f977 Codeblock regex improved to better detect extensions fixes #96, added support for tableizing non highlighted code blocks from liquid codeblock tag and backtick code blocks 2011-08-16 02:41:28 -04:00
Brandon Mathis
1c555116be Added support for pagination with a blog index in any directory (helps with landing pages). Added configuration for pagination directory base 2011-08-16 00:43:22 -04:00