From 50d45c6deb0afd2e4222d2e33a45487a9d1fa676 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 23 Sep 2007 05:16:21 +0100
Subject: primarily todo with sisu documentation, changelog reproduced below:

* start documenting sisu using sisu
  * sisu markup source files in
    data/doc/sisu/sisu_markup_samples/sisu_manual/
    /usr/share/doc/sisu/sisu_markup_samples/sisu_manual/
  * default output [sisu -3] in
    data/doc/manuals_generated/sisu_manual/
    /usr/share/doc/manuals_generated/sisu_manual/
    (adds substantially to the size of sisu package!)

* help related edits

* manpage, work on ability to generate manpages, improved

* param, exclude footnote mark count when occurs within code block

* plaintext changes made

* shared_txt, line wrap visited

* file:// link option introduced (in addition to existing https?:// and
  ftp://) a bit arbitrarily, diff here, [double check changes in sysenv and
  hub]

* minor adjustments
  * html url match refinement
  * css added tiny_center

* plaintext
  * endnotes fix
  * footnote adjustment to make more easily distinguishable from substantive
    text
  * flag -a only [flags -A -e -E dropped]
    controlled by modifiers --unix/msdos --footnote/endnote

* defaults, homepage
  * renamed homepage (instead of index) implications for modifying skins,
    which need likewise to have any homepage entry renamed
  * added link to sisu_manual in homepage

* css the css for the default homepage is renamed homepage.css (instead of
  index.css) [consider removing this and relying on html.css]

* ruby version < ruby1.9
  * place stop on installation and working with for now [ruby String.strip
    broken in ruby 1.9.0 (2007-09-10 patchlevel 0) [i486-linux],
    2007-09-18:38/2]
  * debian/control restrict use to ruby > 1.8.4 and ruby < 1.9

* debian
  * debian/control restrict use to ruby > 1.8.4 and ruby < 1.9
  * sisu-doc new sub-package for sisu documentation
    debian/control and sisu-doc.install
---
 lib/sisu/v0/param.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

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

diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb
index f4bf6a3f..446c2d46 100644
--- a/lib/sisu/v0/param.rb
+++ b/lib/sisu/v0/param.rb
@@ -459,12 +459,12 @@ module SiSU_Param
             when /^(?:0~links|@links:)\s+(.+?)$/m                                                   #% processing
               doc_links_str=$1
               @lnk=[]
-              if doc_links_str=~/\{.+?\}(?:(?:https?|ftp):\/|\.\.)\/\S+(?:\s|$)/
-                doc_links=doc_links_str.scan(/\{.+?\}(?:(?:https?|ftp):\/|\.\.)\/\S+/)
+              if doc_links_str=~/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+(?:\s|$)/
+                doc_links=doc_links_str.scan(/\{.+?\}(?:(?:https?|file|ftp):\/|\.\.)\/\S+/)
                 count=1
                 doc_links.each do |x|
                   @lnk[count]={}
-                  @lnk[count][:say],@lnk[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|ftp):\/|\.\.)\/\S+)/im.match(x)[1,2]
+                  @lnk[count][:say],@lnk[count][:url]=/\{\s*(.+?)\s*\}((?:(?:https?|file|ftp):\/|\.\.)\/\S+)/im.match(x)[1,2]
                   count +=1
                 end
               else
@@ -473,7 +473,7 @@ module SiSU_Param
                 count=1
                 lnks.each do |x|
                   @lnk[count]={}
-                  if x =~/^\s*(?:(?:https?|ftp):\/\/|\.\.\/)/; @lnk[count][:url]=x
+                  if x =~/^\s*(?:(?:https?|file|ftp):\/\/|\.\.\/)/; @lnk[count][:url]=x
                   else
                     @lnk[count][:say]=x
                     count +=1
@@ -536,14 +536,16 @@ module SiSU_Param
                 end
               end
             end
-            case para
-            when /~\{\s+.+?\}~/                                                                     #% processing
-              en=para.scan(/~\{.+?\}~/)
-              en.each { |e| @en[:sum] +=1 }
-            when /~\^(?:\s|$)/                                                                        #% processing
-              mk=para.scan(/~\^(?:\s|$)/)
-              mk.each { |e| @en[:mark] +=1 }
-            when /^\^~\s+\S/; @en[:note] +=1                                                        #% processing
+            unless @code_flag
+              case para
+              when /~\{\s+.+?\}~/                                                                     #% processing
+                en=para.scan(/~\{.+?\}~/)
+                en.each { |e| @en[:sum] +=1 }
+              when /~\^(?:\s|$)/                                                                        #% processing
+                mk=para.scan(/~\^(?:\s|$)/)
+                mk.each { |e| @en[:mark] +=1 }
+              when /^\^~\s+\S/; @en[:note] +=1                                                        #% processing
+              end
             end
             if para =~/~\{|\^~ |~\^|<:ee>/; @flag_auto_endnotes,@flag_endnotes=true,true
             end
-- 
cgit v1.2.3