aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2012-05-12 00:49:57 -0400
committerRalph Amissah <ralph@amissah.com>2012-05-12 00:50:06 -0400
commit5fffe95fbbde7a768853e8674c6d5087aac39967 (patch)
tree73cf1201baf5aabbaad3badb96a6dcab3dce99a8
parentv3: sst_identify_markup, document header SiSU 3.0 (diff)
v3: a few misc fixes
* options, omissions and typo fix * particulars, fix, check * shared_metadata, fix
-rw-r--r--data/doc/sisu/CHANGELOG_v35
-rw-r--r--lib/sisu/v3/options.rb9
-rw-r--r--lib/sisu/v3/particulars.rb10
-rw-r--r--lib/sisu/v3/shared_metadata.rb2
4 files changed, 19 insertions, 7 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index b3f0bb66..fa196362 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -21,6 +21,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.8.orig.tar.xz
sisu_3.2.8-1.dsc
sisu_3.2.8-1.debian.tar.gz
+* v3: misc fixes
+ * options, omissions and typo fix
+ * particulars, fix, check
+ * shared_metadata, fix
+
* v3: sst_identify_markup, introduce document header SiSU 3.0,
pretty much the same as 2.0
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb
index e804d7f7..a193c093 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v3/options.rb
@@ -427,6 +427,9 @@ module SiSU_Commandline
else ''
end
end
+ if cmd !~/u/ #% add urls
+ extra+='u'
+ end
cmd=cmd + extra
cmds=cmd.scan(/CC|\S/)
[cmds.uniq.join,mod]
@@ -695,6 +698,10 @@ module SiSU_Commandline
|| mod.inspect =~/"--git"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
+ act[:zap]=(cmd =~/Z/ \
+ || mod.inspect =~/"--zap"|"--delete"/) \
+ ? { bool: true, set: :on }
+ : { bool: false, set: :na }
act[:hash_digests]=(cmd =~/N/ \
|| mod.inspect =~/"--hash-digests"/) \
? { bool: true, set: :on }
@@ -731,7 +738,7 @@ module SiSU_Commandline
|| mod.inspect =~/"--urls-all"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:urls_seleted]=(cmd =~/u/ \
+ act[:urls_selected]=(cmd =~/u/ \
|| mod.inspect =~/"--urls"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
diff --git a/lib/sisu/v3/particulars.rb b/lib/sisu/v3/particulars.rb
index e183d4c8..36dbd75f 100644
--- a/lib/sisu/v3/particulars.rb
+++ b/lib/sisu/v3/particulars.rb
@@ -163,7 +163,7 @@ module SiSU_Particulars
attr_accessor :opt,:dal_array
def set_dal
begin
- @dal_array=@dal_array=SiSU_DAL::Source.new(@md).get
+ @dal_array=SiSU_DAL::Source.new(@opt).get
self
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
@@ -173,7 +173,7 @@ module SiSU_Particulars
end
def set_sst_idx
begin
- @sst_idx=SiSU_DAL::Source.new(@md).get_idx_sst
+ @sst_idx=SiSU_DAL::Source.new(@opt).get_idx_sst
self
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
@@ -183,7 +183,7 @@ module SiSU_Particulars
end
def set_tex_idx
begin
- @tex_idx=SiSU_DAL::Source.new(@md).get_idx_tex
+ @tex_idx=SiSU_DAL::Source.new(@opt).get_idx_tex
self
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
@@ -193,7 +193,7 @@ module SiSU_Particulars
end
def set_html_idx
begin
- @html_idx=SiSU_DAL::Source.new(@md).get_idx_html
+ @html_idx=SiSU_DAL::Source.new(@opt).get_idx_html
self
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
@@ -203,7 +203,7 @@ module SiSU_Particulars
end
def set_xhtml_idx
begin
- @xhtml_idx=SiSU_DAL::Source.new(@md).get_idx_xhtml
+ @xhtml_idx=SiSU_DAL::Source.new(@opt).get_idx_xhtml
self
rescue
SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do
diff --git a/lib/sisu/v3/shared_metadata.rb b/lib/sisu/v3/shared_metadata.rb
index 14cc885a..5a45a692 100644
--- a/lib/sisu/v3/shared_metadata.rb
+++ b/lib/sisu/v3/shared_metadata.rb
@@ -355,7 +355,7 @@ module SiSU_Metadata
def texpdf_font
if defined? @md.make.texpdf_font \
and @md.make.texpdf_font
- ' :texpdf_font: ' + @md.make.texpdf_font
+ ' :texpdf_font: ' + @md.make.texpdf_font.main
else nil
end
end