diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v3/options.rb | 9 | ||||
| -rw-r--r-- | lib/sisu/v3/particulars.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/v3/shared_metadata.rb | 2 |
3 files changed, 14 insertions, 7 deletions
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 |