Merge branch 'upstream' into debian/sid

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index f5085d50..9d1f03e9 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -798,7 +798,16 @@ module SiSU_Param
                 @man_section=(defined? @make.manpage.section) ? @make.manpage.section : 1
               end
             when /^@links:\s+(.+?)\Z/m                                                                                 #% processing
-              Md.new($1.strip).links
+              doc_links=Md.new($1.strip).links
+              count=1
+              @lnk=[]
+              doc_links.each do |doc_link|
+                if doc_link=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+                  @lnk[count]={}
+                  @lnk[count][:say],@lnk[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(doc_link)[1,2]
+                  count +=1
+                end
+              end
             when /^@notes?:\s(.+)/                                                                               #% metainfo
               Md.new($1.strip).notes
             when /^@base_program:\s+(.+?)$/; @base_program=$1                                                          #% processing