From a8dbd88268a7ef5c4cf5e118eeb48fa83a07e3ed Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 1 Oct 2010 23:35:36 -0400
Subject: texpdf_format, remove a few commented out lines

---
 lib/sisu/v2/texpdf_format.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb
index ea34a390..8eff07b9 100644
--- a/lib/sisu/v2/texpdf_format.rb
+++ b/lib/sisu/v2/texpdf_format.rb
@@ -967,11 +967,6 @@ WOK
           and w=~/\/\S+?\// \
           and w.length > 6
             w.gsub!(/([_.\/])/,'\1\-')
-         #elsif w !~/http:/ \
-         #and w=~/([_,.;:\/|=])/ \
-         #and w.length > 10
-         #  w.gsub!(/([_,.;:\/|=])/,'\1\-')
-         #  w.gsub!(/(--)(\S{4,})/,'\1\-\2')
           end
           w.gsub!(/#{Mx[:gl_o]}#lt#{Mx[:gl_c]}/,'<'); w.gsub!(/#{Mx[:gl_o]}#gt#{Mx[:gl_c]}/,'>')
           w.gsub!(/[\\]?~/,'<=tilde>')
-- 
cgit v1.2.3


From 1d30e1a8a2f937d3fd6030097f86e13f05c10f96 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 1 Oct 2010 23:38:09 -0400
Subject: epub, fix breakage where angle brackets used in used metadata header

---
 lib/sisu/v2/epub_format.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/v2/epub_format.rb b/lib/sisu/v2/epub_format.rb
index 28fe7357..761d771e 100644
--- a/lib/sisu/v2/epub_format.rb
+++ b/lib/sisu/v2/epub_format.rb
@@ -1031,12 +1031,16 @@ WOK
       def metadata #metadata dc
         author=if defined? @md.creator.author \
         and @md.creator.author =~/\S+/
-          %{\n    <dc:creator opf:file-as="#{@md.creator.author}" opf:role="aut">#{@md.creator.author}</dc:creator>}
+          x=@md.creator.author.gsub!(/</,'&lt;'); @md.creator.author.gsub!(/>/,'&gt;')
+          @md.creator.author.gsub!(/&lt;br(?: \/)?&gt;/,'<br />')
+          %{\n    <dc:creator opf:file-as="#{x}" opf:role="aut">#{x}</dc:creator>}
         else ''
         end
         illustrator=if defined? @md.creator.illustrator \
         and @md.creator.illustrator =~/\S+/
-          %{\n    <dc:creator opf:file-as="#{@md.creator.illustrator}" opf:role="ill">#{@md.creator.illustrator}</dc:creator>}
+          x=@md.creator.illustrator.gsub!(/</,'&lt;'); @md.creator.illustrator.gsub!(/>/,'&gt;')
+          @md.creator.illustrator.gsub!(/&lt;br(?: \/)?&gt;/,'<br />')
+          %{\n    <dc:creator opf:file-as="#{x}" opf:role="ill">#{x}</dc:creator>}
         else ''
         end
         rights=if defined? @md.rights.all \
@@ -1588,7 +1592,7 @@ WOK
 #{@vz.js_top}}
     end
     def toc_metadata
-      @metalink=%{./#{@md.fn[:meatadata]}}
+      @metalink=%{./#{@md.fn[:metadata]}}
       toc_metadata
     end
     def title_banner(title,subtitle,creator)
-- 
cgit v1.2.3


From 13b9e561fef7718cd73cdb360948d75f441510d5 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 1 Oct 2010 23:38:50 -0400
Subject: hub, test whether user name set, fix

(requested fix)
---
 lib/sisu/v2/hub.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb
index 85009d75..4b06a45c 100644
--- a/lib/sisu/v2/hub.rb
+++ b/lib/sisu/v2/hub.rb
@@ -490,6 +490,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.cmd =~/q/
         @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty?
         if defined? @@env.path.processing \
+        and @@env.user \
         and FileTest.directory?(@@env.path.processing) \
         and @@env.path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area
           cd(@@env.path.processing_base_tmp) do
-- 
cgit v1.2.3