From c18de558759dff2c77e6e0fc3ce2ad7a9f3fea99 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Wed, 26 Dec 2012 17:18:29 -0600
Subject: [PATCH] Titles in code plugins can have slashes in them. Closes #892

---
 plugins/backtick_code_block.rb     |   2 +-
 plugins/code_block.rb              |   8 ++++----
 source/images/icon-sdc231d6676.png | Bin 0 -> 1513 bytes
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 source/images/icon-sdc231d6676.png

diff --git a/plugins/backtick_code_block.rb b/plugins/backtick_code_block.rb
index 0e7cee4..8e2c114 100644
--- a/plugins/backtick_code_block.rb
+++ b/plugins/backtick_code_block.rb
@@ -2,7 +2,7 @@ require './plugins/pygments_code'
 
 module BacktickCodeBlock
   include HighlightCode
-  AllOptions = /([^\s]+)\s+(.+?)(https?:\/\/\S+|\/\S+)\s*(.+)?/i
+  AllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
   LangCaption = /([^\s]+)\s*(.+)?/i
   def render_code_block(input)
     @options = nil
diff --git a/plugins/code_block.rb b/plugins/code_block.rb
index 44e3494..62c551a 100644
--- a/plugins/code_block.rb
+++ b/plugins/code_block.rb
@@ -49,8 +49,8 @@ module Jekyll
   class CodeBlock < Liquid::Block
     include HighlightCode
     include TemplateWrapper
-    CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/)(\S+)\s+(.+)/i
-    CaptionUrl = /(\S[\S\s]*)\s+(https?:\/\/)(\S+)/i
+    CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
+    CaptionUrl = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)/i
     Caption = /(\S[\S\s]*)/
     def initialize(tag_name, markup, tokens)
       @title = nil
@@ -63,10 +63,10 @@ module Jekyll
       end
       if markup =~ CaptionUrlTitle
         @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
         @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
         @file = $1
         @caption = "<figcaption><span>#{$1}</span></figcaption>\n"
diff --git a/source/images/icon-sdc231d6676.png b/source/images/icon-sdc231d6676.png
new file mode 100644
index 0000000000000000000000000000000000000000..38ef928f78e5684b25350ca827535045008ae8bc
GIT binary patch
literal 1513
zcmeAS@N?(olHy`uVBq!ia0vp^3P7B|!3-q5|1_*(U|?Jx;1l8s<PIJn)U{t|(rMu-
z=R~Jn6rFQJblxrTnO7w`wn_BtmRN9GdhuPk)sGY=?N?m>KxN$%wN(#wXC5}*@!D+9
zTk|#7t+zk5U2xQQ<r%-|xmc0^u}^WQzr?RUpSS0B?SWghm%r3s`O<gd{=5s1=3RU`
z@6I<MT5$LKhDSg4J^gz2%o)<qn_uT%em?*D+xa&?FTDMAH^Q1EbpP|84?q8W`t|oe
z4&Zjxnh6+By(K|@!3>-{{G!rwD(YGW#+Ej&fl;vu$(cF%6^+y8FI};E-Ns#qkDWYo
z{?hG-Pd<G9`3Gj;yLbQpe}3@)^ZyICZy!Cif1`p!Lc{+1@Bbg#Hh)Uv{DlPxNp+2#
z72yI31`YuU1r7c4*Y7_Ml#ViR3QIs24Cl9JX6NA-k&xF2pRdBgz`&g1>EaktaqH|f
zdmrIInd9~E@9o|FTK?ab2nW_V9x^<ghIx6jG<<ygnjA!g+1WKFco`_F9^^<ZaY$Yu
z>mv~(qjKcr)eRPsa~25j_%85TTK>JN{N7jj>)&h(E_k%>K3zS(=6Ch}_wT>&7JfKo
z{*U+u#+eKev!*df7){GfaEK~-Z$D+OcF+>Xi3hyh9VfNL9+?nRBT&OI^WP3$4h7zH
zVbueVg^W`|dK?cid$(?Ne8Oaq;^mn1e}k0%nw_FXoa_rKJtoNo&RSv9zxO@EuAm93
zEON6&9TrVse|aK2N{}UNQOZH5Gb*!O4+z}&ogl*4Taa@?v~g)-C+~$xk=;3mI;P*f
z;xkjQtt`hpFe1I8m?uN0Q91me%Ddm$9JwcB15ek=1$9cS*Yeh5{A(BUFgeus+i9Uy
zpLX)tY_L5fn#%Ahdwb-rpsCAZ%61+)yJM~XG*O>bN3(w&ihFtZM&CiBGZxDWh0@nl
zu5NrWrMSP&@W@mRAHxR!^6)pmkIz4`XX~wFK?dek>wRs1#-y81x^Rlg$z<p4*(F-h
zS?NsG4~!=}?R&jjEyCftl@Qn7cJ&#{GcxaKPjk}#J!4|^jtiH6yoxScw2sB>^0|L!
z3zs>S{GIEzhoSNH8!@p~X=~5lEz|ejQjwm~a+AAk<&#4-o0aO1=5;b${ppZ=VluPg
zY_H9XSHk9dtx_<LS#x_^goE|Hu(yc|mtI}=O_%M$i`yAHOFCFD@7{j(=8Uu}hvzje
z(93U|$aR&;<(_zR>+@xQ|9)->W9Hg=YOa1%$iklFRm&dC%MNYuny~ZowCf%(J64!7
zTxH($%k&1*Z+kw)1;K6?x7B5@FTcmt-Y|Q=@uvxSFK$e0J|~=cdRgSmJFi~&+|+b?
zKFip1nfSFdg_QG2mOH8s6n}p3z-9MgF1Hhsd7pC>-ds<2`*Wk?lh&!`kO+yj#~<rk
zIM{XF*t{w+T5!qbUt%+C6x2^Cb1O(pVVC*2!Con9Caau4vtc0Py*j%#%NcCvIl>v;
zI5!D=Ykz+8K*#hKU&O;UOkey!c=P$U)i?TY3N7L|XLrVa>Q2L+vrp~k`1tWm`Jq&m
z6QU&9cgV*jXi8?c+_8#!L+%3iEw2~;W;PGpeo|A|?Z;%vrEBLht(m*v!ef&({u!%n
u7{u*9t-1V6MZV(x+n96TR{xyOyq_^Wg&}c<dgN?Sf$iz)=d#Wzp$P!RfW7zt

literal 0
HcmV?d00001