Merge branch 'upstream' into debian/sid

4 files changed, 7 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 125fc91a..563fb8bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,9 +72,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.60.0.orig.tar.gz
     from git history as it increases the size of the scm repository by so
     much...]
 
-  * debian, 0.60 sorts issues with 0.59 branch, 0.60 should be debian ready but
-    is all dressed up and not uploadable anywhere before 2007-10-02 when back
-    online
+  * debian, 0.60 sorts issues with 0.59 branch
 
 %% sisu_0.59.1.orig.tar.gz (2007-09-25:39/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.59.1.orig.tar.gz
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
index 2a16ac4a..fb5d5574 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_work_needed_and_wishlist.ssi
@@ -55,6 +55,8 @@ _* Internationalisation always. SiSU is utf-8 and for those parts that are utf-8
 
 _* Refinements and improvements to output representations, some are fairly mature, others (such as manpages and info files (and even ODF) remain young.
 
+_* Simple extension to contain, link and share included audio and multi-media files, (including sisupod.zip)
+
 1~sisu_wishlist Wishlist
 
 SiSU provides a lot of "plumbing" and is readily usable as a tool by those comfortable with marking up documents with an editor. The syntax is fairly easy to learn, especially the subset required to start using SiSU effectively.
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb
index a5c82aac..4880807d 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v0/hub.rb
@@ -298,7 +298,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
     def actions
       if @opt.mod.inspect =~/--convert|--to|--from/; require "#{SiSU_lib}/sst_convert_markup"
       end
-      if @opt.cmd =~/([AabCcDdEeFfgGHhIiJjLMmNnOopQqrRSsTtUuVvwWXxYyZ_0-9])/ and
+      if @opt.cmd =~/([abCcDdFfgGHhIiJjLMmNnOopQqrRSsTtUuVvwWXxYyZ_0-9])/ and
          @opt.cmd =~/^-/ and
          @opt.mod.inspect !~/--(?:sitemaps|query|identify)/ or
          @opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/ #and
@@ -307,7 +307,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         flag=SiSU_Env::Info_processing_flag.new
         extra=''
         if @opt.cmd !~/[mn]/
-          extra+=if @opt.cmd =~/[abeghHhIiJjNOoptTwXxz]/ and @opt.cmd !~/[mn]/; 'm'           #% add dal
+          extra+=if @opt.cmd =~/[abghHhIiJjNOoptTwXxz]/ and @opt.cmd !~/[mn]/; 'm'           #% add dal
           elsif ((@opt.cmd =~/[Dd]/ or (@opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \
           and @opt.mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \
           and @opt.cmd !~/[mn]/
@@ -467,7 +467,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         end
         if @opt.cmd =~/[hHz]/; op('html','html')               #% -h -H -z html css
         end
-        if @opt.cmd =~/[aAfeE]/; op('plaintext','plaintext')   #% -a -A -f -e -E plaintext -a creates ms-dos type; -A creates unix type, plaintext file
+        if @opt.cmd =~/a/; op('plaintext','plaintext')   #% -a #-A -f -e -E plaintext -a creates ms-dos type; -A creates unix type, plaintext file
         end
         if @opt.cmd =~/g/; op('wikispeak','wikispeak')         #% -g wiki
         end
diff --git a/lib/sisu/v0/termsheet.rb b/lib/sisu/v0/termsheet.rb
index ee8b1d17..e65e5961 100644
--- a/lib/sisu/v0/termsheet.rb
+++ b/lib/sisu/v0/termsheet.rb
@@ -70,7 +70,7 @@ def talent(termsheet,flag)
   @@info=termsheet.gsub(/(.+?)\.termsheet\.rb/,'../facility_data/\1.html')
   @env=SiSU_Env::Info_env.new
   @dir_fd="#{@env.path.output}/facility_data"
-  Dir.mkdir(@dir_fd) unless FileTest.directory?(@dir_fd)==true
+  File.mkpath(@dir_fd) unless FileTest.directory?(@dir_fd)==true
   html_output=[]
   case termsheet
   when /.+?\.(termsheet)\.rb$/