summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2009-07-01 17:43:41 +0000
committerRalph Amissah <ralph@amissah.com>2009-07-01 17:43:41 +0000
commit643cc5c5e8ac2d279d84c60f532c8d430387e985 (patch)
tree9096af03a92a822a4d582a11b43a1f317c179739
parentsha256 for 0.70.5 (diff)
downloadsisu-643cc5c5e8ac2d279d84c60f532c8d430387e985.zip
sisu-643cc5c5e8ac2d279d84c60f532c8d430387e985.tar.xz
minor fixes and touches
-rw-r--r--lib/sisu/v0/concordance.rb2
-rw-r--r--lib/sisu/v0/constants.rb1
-rw-r--r--lib/sisu/v0/dal_metadata.rb2
-rw-r--r--lib/sisu/v0/harvest.rb4
-rw-r--r--lib/sisu/v0/odf.rb1
-rw-r--r--lib/sisu/v0/shared_html_lite.rb7
-rw-r--r--lib/sisu/v0/xml_dom.rb2
7 files changed, 8 insertions, 11 deletions
diff --git a/lib/sisu/v0/concordance.rb b/lib/sisu/v0/concordance.rb
index 4b6530a..3c2b832 100644
--- a/lib/sisu/v0/concordance.rb
+++ b/lib/sisu/v0/concordance.rb
@@ -125,7 +125,7 @@ WOK
<html>
<head>
<title>
- SiSU created WordIndex for: #{@md.full_title}
+ SiSU created Concordance (WordIndex) for: #{@md.full_title}
</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="Description" content="&nbsp;SiSU created">
diff --git a/lib/sisu/v0/constants.rb b/lib/sisu/v0/constants.rb
index 8929a0b..5c93d54 100644
--- a/lib/sisu/v0/constants.rb
+++ b/lib/sisu/v0/constants.rb
@@ -57,6 +57,7 @@
** Description: system environment, resource control and configuration details
=end
+Sfx={:txt=>'.txt',:html=>'.html',:xhtml=>'.xhtml',:xml=>'.xml',:epub=>'.epub',:epub_xhtml=>'.xhtml',:odt=>'.odt',:pdf=>'.pdf'}
Mx,Rx={},{}
Mx[:meta_o],Mx[:meta_c]='〔@','〕'
Mx[:lv_o_1],Mx[:lv_o_2],Mx[:lv_o_3],Mx[:lv_o_4],Mx[:lv_o_5],Mx[:lv_o_6],Mx[:lv_o_7],Mx[:lv_o_8],Mx[:lv_o_9]=
diff --git a/lib/sisu/v0/dal_metadata.rb b/lib/sisu/v0/dal_metadata.rb
index 2555829..bdf0dac 100644
--- a/lib/sisu/v0/dal_metadata.rb
+++ b/lib/sisu/v0/dal_metadata.rb
@@ -142,7 +142,7 @@ module SiSU_metadata
"\n#{@tr.comments}: #{Mx[:fa_underscore_o]}#{@md.comments}#{Mx[:fa_underscore_c]} #{Mx[:id_o]}~0;m#{ocnm};d#{ocnd}#{Mx[:id_c]}"
when /^#{Mx[:meta_o]}cls_loc#{Mx[:meta_c]}/
"\n#{@cls_dewey}: #{Mx[:fa_underscore_o]}#{@md.cls_dewey}#{Mx[:fa_underscore_c]} #{Mx[:id_o]}~0;m#{ocnm};d#{ocnd}#{Mx[:id_c]}"
- when /^#{Mx[:meta_o]}cls_dewey#{Mx[:meta_c]}/
+ when /^#{Mx[:meta_o]}cls_loc#{Mx[:meta_c]}/
"\n#{@tr.cls_dewey}: #{Mx[:fa_underscore_o]}#{@md.cls_dewey}#{Mx[:fa_underscore_c]} #{Mx[:id_o]}~0;m#{ocnm};d#{ocnd}#{Mx[:id_c]}"
when /^#{Mx[:meta_o]}(?:cls_gutenberg|cls_pg)#{Mx[:meta_c]}/
"\n#{@tr.cls_gutenberg}: #{Mx[:fa_underscore_o]}#{@md.cls_gutenberg}#{Mx[:fa_underscore_c]} #{Mx[:id_o]}~0;m#{ocnm};d#{ocnd}#{Mx[:id_c]}"
diff --git a/lib/sisu/v0/harvest.rb b/lib/sisu/v0/harvest.rb
index 8f262ac..1e390c5 100644
--- a/lib/sisu/v0/harvest.rb
+++ b/lib/sisu/v0/harvest.rb
@@ -24,7 +24,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -87,8 +87,6 @@ def cases(opt)
help
end
end
-branch='v0'
-SiSU_lib="sisu/#{branch}"
require "#{SiSU_lib}/options"
require "#{SiSU_lib}/harvest_topics"
require "#{SiSU_lib}/harvest_authors"
diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb
index 62dd1f4..e4873a1 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v0/odf.rb
@@ -363,7 +363,6 @@ module SiSU_ODF
end
def odf_structure(md,t_o)
@md,@t_o=md,t_o
- @md,@t_o=md,t_o
if t_o.class == Hash
para =t_o[:txt] || nil
lv =t_o[:lv] || nil
diff --git a/lib/sisu/v0/shared_html_lite.rb b/lib/sisu/v0/shared_html_lite.rb
index d1e312e..7fe77e0 100644
--- a/lib/sisu/v0/shared_html_lite.rb
+++ b/lib/sisu/v0/shared_html_lite.rb
@@ -22,7 +22,7 @@
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License along with
@@ -65,7 +65,7 @@ module SiSU_Format_Shared
@@fns=nil
def initialize(md,t_o)
@md,@t_o=md,t_o
- if t_o.class == Hash
+ if t_o.class==Hash
@txt =t_o[:txt] #|| nil #s/@content/@txt/
@col =t_o[:col] #|| nil
@notenumber =t_o[:endnote_nr] || nil
@@ -79,9 +79,8 @@ module SiSU_Format_Shared
p t_o.class
p caller
end
-
@txt.gsub!(/#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}/,'')
- @id=@ocn=@col[:id]
+ @id=@ocn=@col[:ocn]
@ocnd,@ocns=@col[:ocnd],@col[:ocns]
@lv=@col[:lev].to_s
@@hname=if @md.fns != @@fns
diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v0/xml_dom.rb
index 7e1945b..5145be9 100644
--- a/lib/sisu/v0/xml_dom.rb
+++ b/lib/sisu/v0/xml_dom.rb
@@ -356,7 +356,7 @@ WOK
end
if @rcdc==false \
and (para =~/~metadata/ \
- or para =~/#{Mx[:lv_o]}1:meta#{Mx[:lv_x]}\s*Document Information/)
+ or para =~/#{Mx[:lv_o]}1:meta#{Mx[:lv_c]}\s*Document Information/)
@rcdc=true
end
if para !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/