Titles in code plugins can have slashes in them. Closes #892
This commit is contained in:
parent
48d3e75ff5
commit
c18de55875
@ -2,7 +2,7 @@ require './plugins/pygments_code'
|
|||||||
|
|
||||||
module BacktickCodeBlock
|
module BacktickCodeBlock
|
||||||
include HighlightCode
|
include HighlightCode
|
||||||
AllOptions = /([^\s]+)\s+(.+?)(https?:\/\/\S+|\/\S+)\s*(.+)?/i
|
AllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
|
||||||
LangCaption = /([^\s]+)\s*(.+)?/i
|
LangCaption = /([^\s]+)\s*(.+)?/i
|
||||||
def render_code_block(input)
|
def render_code_block(input)
|
||||||
@options = nil
|
@options = nil
|
||||||
|
@ -49,8 +49,8 @@ module Jekyll
|
|||||||
class CodeBlock < Liquid::Block
|
class CodeBlock < Liquid::Block
|
||||||
include HighlightCode
|
include HighlightCode
|
||||||
include TemplateWrapper
|
include TemplateWrapper
|
||||||
CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/)(\S+)\s+(.+)/i
|
CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
|
||||||
CaptionUrl = /(\S[\S\s]*)\s+(https?:\/\/)(\S+)/i
|
CaptionUrl = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)/i
|
||||||
Caption = /(\S[\S\s]*)/
|
Caption = /(\S[\S\s]*)/
|
||||||
def initialize(tag_name, markup, tokens)
|
def initialize(tag_name, markup, tokens)
|
||||||
@title = nil
|
@title = nil
|
||||||
@ -63,10 +63,10 @@ module Jekyll
|
|||||||
end
|
end
|
||||||
if markup =~ CaptionUrlTitle
|
if markup =~ CaptionUrlTitle
|
||||||
@file = $1
|
@file = $1
|
||||||
@caption = "<figcaption><span>#{$1}</span><a href='#{$2 + $3}'>#{$4}</a></figcaption>"
|
@caption = "<figcaption><span>#{$1}</span><a href='#{$2}'>#{$3}</a></figcaption>"
|
||||||
elsif markup =~ CaptionUrl
|
elsif markup =~ CaptionUrl
|
||||||
@file = $1
|
@file = $1
|
||||||
@caption = "<figcaption><span>#{$1}</span><a href='#{$2 + $3}'>link</a></figcaption>"
|
@caption = "<figcaption><span>#{$1}</span><a href='#{$2}'>link</a></figcaption>"
|
||||||
elsif markup =~ Caption
|
elsif markup =~ Caption
|
||||||
@file = $1
|
@file = $1
|
||||||
@caption = "<figcaption><span>#{$1}</span></figcaption>\n"
|
@caption = "<figcaption><span>#{$1}</span></figcaption>\n"
|
||||||
|
BIN
source/images/icon-sdc231d6676.png
Normal file
BIN
source/images/icon-sdc231d6676.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
Loading…
Reference in New Issue
Block a user