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/dal.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index c2c92485..f5da8b05 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -264,7 +264,7 @@ module SiSU_DAL
       end
       data.each do |para|
         para.strip!
-        if para =~/\{\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?\}(?:(?:https?|ftp):\S+|image)/
+        if para =~/\{\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?\}(?:(?:https?|file|ftp):\S+|image)/
           if para !~/\{\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+\s+/
             m=/\{\s*(\S+\.(?:png|jpg|gif))/
             if @rmgk
@@ -295,7 +295,7 @@ module SiSU_DAL
                     end
                   end
                   para.gsub!(/(#{image})/,"#{image} #{img_col}x#{img_row}")
-                else para.gsub!(/\{\s*(\S+)\.(png|jpg|gif).+?\}((?:https?|ftp):\S+|image)/,'[ \1 (\2 missing) ]')
+                else para.gsub!(/\{\s*(\S+)\.(png|jpg|gif).+?\}((?:https?|file|ftp):\S+|image)/,'[ \1 (\2 missing) ]')
                 end
               end
             else
@@ -306,7 +306,7 @@ module SiSU_DAL
             end
           end
         end
-        para.gsub!(/\{\s+(\S+\.(?:png|jpg|gif))\s+/i,'{\1 ') if para =~/\{\s+\S+\.(?:png|jpg|gif).+?\}(?:(?:https?|ftp):\S+|image)/
+        para.gsub!(/\{\s+(\S+\.(?:png|jpg|gif))\s+/i,'{\1 ') if para =~/\{\s+\S+\.(?:png|jpg|gif).+?\}(?:(?:https?|file|ftp):\S+|image)/
         tuned_file << para unless para.nil?
       end
       tuned_file
@@ -329,6 +329,8 @@ module SiSU_DAL
       end
       file_type_names <<= if cmd_list =~ /p/; ['landscape.pdf', 'portrait.pdf']
       end
+      #file_type_names <<= if cmd_list =~ /i/; 'manpage.1'
+      #end
       file_type_names <<= if cmd_list =~ /o/; 'opendocument.odt'
       end
       file_type_names <<= if cmd_list =~ /b/; 'scroll.xhtml'
@@ -406,6 +408,7 @@ module SiSU_DAL
             when /sax.xml/;            ' xml, sax'
             when /dom.xml/;            ' xml, dom'
             when /plain.txt/;          ' plain text utf-8'
+            #when /manpage.1/;          ' man, 1'
             when /wiki.txt/;           ' wiki text'
             when /concordance.html/;   ' concordance'
             when /digest.txt/;         ' dcc, document content certificate (digests)'
@@ -1069,7 +1072,7 @@ module SiSU_DAL
       #s=s.gsub(/¡¡\d+¡/,' ')                                                  # tables
       #s=s.gsub(/¡/,' ')                                                       # tables tidy later
       #s=s.gsub(/<.+?>/,'')
-      s=s.gsub(/\{.+?\.(?:png|jpg|gif).+?\}(?:https?|ftp)\\\:\S+ /,' [image] ')             # else image names found in search
+      s=s.gsub(/\{.+?\.(?:png|jpg|gif).+?\}(?:https?|file|ftp)\\\:\S+ /,' [image] ')             # else image names found in search
       s=s.gsub(/\s\s+/,' ')
       s=s.strip
     end
-- 
cgit v1.2.3