dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified the yaml regex to accept both \r\n and \n

This commit is contained in:
Chris Van Pelt 2008-11-23 14:53:45 -08:00
parent e2678114d9
commit b9cdfc8824
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jekyll/convertible.rb
View File

@ -13,7 +13,7 @@ module Jekyll
def read_yaml(base, name) def read_yaml(base, name)
self.content = File.read(File.join(base, name)) self.content = File.read(File.join(base, name))
if self.content =~ /^(---\n.*?)\n---\n/m if self.content =~ /^(---.*\n.*?)\n---.*\n/m
self.content = self.content[($1.size + 5)..-1] self.content = self.content[($1.size + 5)..-1]
self.data = YAML.load($1) self.data = YAML.load($1)
@ -24,9 +24,13 @@ module Jekyll
# #
# Returns nothing # Returns nothing
def transform def transform
if self.ext == ".textile" case self.ext
when ".textile":
self.ext = ".html" self.ext = ".html"
self.content = RedCloth.new(self.content).to_html self.content = RedCloth.new(self.content).to_html
when ".markdown":
self.ext = ".html"
self.content = RDiscount.new(self.content).to_html
end end
end end
@ -41,6 +45,7 @@ module Jekyll
# render content # render content
self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters]) self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
self.transform
# output keeps track of what will finally be written # output keeps track of what will finally be written
self.output = self.content self.output = self.content