From 17dfb02b30980c40a5b1227789aff1f070d57948 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 6 Oct 2007 00:45:59 +0100
Subject: param, multi-line parse, fixing @link: header

---
 lib/sisu/v0/param.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v0/param.rb')

diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index e3b42933..8a652fa0 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -367,7 +367,7 @@ module SiSU_Param
             when /^(?:0~comments?|@comments?:?)\s+(.+?)$/m;  @comments=$1                           #% metainfo DC
             when /^(?:0~abstract|@abstract)\s+(.+?)$/m;      @abstract=$1                           #% metainfo DC
             when /^(?:0~tags?|@tags?:)\s+\S/m                                                       #% metainfo
-              tags=para.match(/^(?:0~tags?|@tags?:)\s+(.+)$/m)[1]
+              tags=para.match(/^(?:0~tags?|@tags?:)\s+(.+)\Z/m)[1]
               tags.split(/,|$/).each do |tag|
                 tag.strip!
                 @tags << tag
@@ -387,7 +387,7 @@ module SiSU_Param
             when /^(?:0~class(?:ify)?_pg|@class(?:ify)?_pg)\s+(.+?)$/m;                @cls_pg=$1   #% metainfo
             when /^(?:0~(?:class(?:ify)?_)?isbn|@(?:class(?:ify)?_)?isbn)\s+(\S+?)$/m; @cls_isbn=$1 #% metainfo
             when /^(?:0~images?|@images?:)\s+(.+?)$/m;                                 @image=$1    #% processing
-            when /^(?:0~(?:toc|structure)|@(?:toc|structure):)\s+(.+?)$/m                           #% processing
+            when /^(?:0~(?:toc|structure)|@(?:toc|structure):)\s+(.+?)\Z/m                           #% processing
               doc_toc_str=$1
               @toc=doc_toc_str.split(/;\s*/)
               @toc=[ @toc ] if @toc == String
@@ -405,7 +405,7 @@ module SiSU_Param
               lv6=@toc[5] ||='6~ '
               @lv6=/^#{lv6}\b/
             when /^(?:0~(?:level|page|markup)|@(?:level|page|markup):)\s+(.+?)$/m                   #% processing revisit..., use syntax 0~level new=1,2,3; break=4
-              if para =~/(?:0~|@)(?:markup|level|page):?\s+(.+?)$/m
+              if para =~/(?:0~|@)(?:markup|level|page):?\s+(.+?)\Z/m
                 page_break_str=$1
                 pagebreaks=page_break_str.split(/;\s*/)
                 #pagebreaks=[ pagebreaks ] if pagebreaks == String
@@ -459,7 +459,7 @@ module SiSU_Param
                 @vocabulary=$1                                                   #not actually used by concordance
             when /^(?:0~skin|@skin:)\s+(.+?)$/; @doc_skin=$1.strip                                  #% processing
             when /^(?:0~(?:css|stylesheet)|@(?:css|stylesheet):)\s+(.+?)$/; @doc_css=$1.strip       #% processing
-            when /^(?:0~links|@links:)\s+(.+?)$/m                                                   #% processing
+            when /^(?:0~links|@links:)\s+(.+?)\Z/m                                                   #% processing
               doc_links_str=$1
               @lnk=[]
               if doc_links_str=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
-- 
cgit v1.2.3