Merge pull request #2693 from ivantsepp/2142_partial_liquid_output_tag_in_include_tag

This commit is contained in:
Parker Moore
2014-08-06 15:28:07 -04:00
4 changed files with 20 additions and 1 deletions

View File

@@ -14,7 +14,7 @@ module Jekyll
SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"
VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
VARIABLE_SYNTAX = /(?<variable>\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\})(?<params>.*)/
VARIABLE_SYNTAX = /(?<variable>[^{]*\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\}[^\s}]*)(?<params>.*)/
INCLUDES_DIR = '_includes'