diff options
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 103 |
1 files changed, 60 insertions, 43 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index f1dfdb16..f54b3f26 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -8,7 +8,7 @@ * Author: Ralph Amissah * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved. + 2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -284,10 +284,10 @@ module SiSU_Env end def rc_path_options @rc_path=[ - "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}", - "#{$sisu_document_markup_directory}/.sisu", - "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}", - "#{$sisu_document_markup_directory}/_sisu", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu", "#{@@home}/.sisu/#{SiSU_version_dir}", "#{@@home}/.sisu", "#{@@sisu_etc}/#{SiSU_version_dir}", @@ -361,10 +361,10 @@ module SiSU_Env tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:' if @markup_dir_changed_ @ad_path=[ - "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}/skin/yml", - "#{$sisu_document_markup_directory}/.sisu/skin/yml", - "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}/skin/yml", - "#{$sisu_document_markup_directory}/_sisu/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml", "#{@@home}/.sisu/#{SiSU_version_dir}/skin/yml", "#{@@home}/.sisu/skin/yml", "#{@@sisu_etc}/#{SiSU_version_dir}/skin/yml", @@ -3584,7 +3584,9 @@ WOK @env_rc ||=SiSU_Env::InfoEnv.new(@md.fns) end def doc_rc #document rc, make instructions - @md.make + (defined? @md.make) \ + ? @md.make + : nil end def cmd_rc_act #command-line rc @cmd_rc_act=@md.opt.opt_act @@ -3595,8 +3597,9 @@ WOK true elsif cmd_rc_act[:ocn][:set]==:off false - elsif defined? @md.make.ocn? \ - and @md.make.ocn? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.ocn? \ + and doc_rc.toc? ==:off false elsif env_rc.build.ocn? ==:off false @@ -3609,8 +3612,9 @@ WOK true elsif cmd_rc_act[:toc][:set]==:off false - elsif defined? @md.make.toc? \ - and @md.make.toc? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.toc? \ + and doc_rc.toc? ==:off false elsif env_rc.build.toc? ==:off false @@ -3623,8 +3627,9 @@ WOK true elsif cmd_rc_act[:manifest][:set]==:off false - elsif defined? @md.make.manifest? \ - and @md.make.manifest? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.manifest? \ + and doc_rc.manifest? ==:off false elsif env_rc.build.manifest? ==:off false @@ -3637,8 +3642,9 @@ WOK true elsif cmd_rc_act[:links_to_manifest][:set]==:off false - elsif defined? @md.make.links_to_manifest? \ - and @md.make.links_to_manifest? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.links_to_manifest? \ + and doc_rc.links_to_manifest? ==:off false elsif env_rc.build.links_to_manifest? ==:off false @@ -3651,8 +3657,9 @@ WOK true elsif cmd_rc_act[:metadata][:set]==:off false - elsif defined? @md.make.metadata? \ - and @md.make.metadata? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.metadata? \ + and doc_rc.metadata? ==:off false elsif env_rc.build.metadata? ==:off false @@ -3667,8 +3674,9 @@ WOK true elsif cmd_rc_act[:minitoc][:set]==:off false - elsif defined? @md.make.minitoc? \ - and @md.make.minitoc? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.minitoc? \ + and doc_rc.minitoc? ==:off false elsif env_rc.build.minitoc? ==:off false @@ -3685,9 +3693,10 @@ WOK elsif cmd_rc_act[:manifest_minitoc][:set]==:off \ || cmd_rc_act[:minitoc][:set]==:off false - elsif defined? @md.make.manifest_minitoc? \ - and (@md.make.manifest_minitoc? ==:off \ - || @md.make.minitoc? ==:off) + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.manifest_minitoc? \ + and (doc_rc.manifest_minitoc? ==:off \ + || doc_rc.minitoc? ==:off) false elsif env_rc.build.manifest_minitoc? ==:off \ || env_rc.build.minitoc? ==:off @@ -3707,9 +3716,10 @@ WOK elsif cmd_rc_act[:html_minitoc][:set]==:off \ || cmd_rc_act[:minitoc][:set]==:off false - elsif defined? @md.make.html_minitoc? \ - and (@md.make.html_minitoc? ==:off \ - || @md.make.minitoc? ==:off) + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_minitoc? \ + and (doc_rc.html_minitoc? ==:off \ + || doc_rc.minitoc? ==:off) false elsif env_rc.build.html_minitoc? ==:off \ || env_rc.build.minitoc? ==:off @@ -3725,8 +3735,9 @@ WOK true elsif cmd_rc_act[:html_top_band][:set]==:off false - elsif defined? @md.make.html_top_band? \ - and @md.make.html_top_band? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_top_band? \ + and doc_rc.html_top_band? ==:off false elsif env_rc.build.html_top_band? ==:off false @@ -3739,8 +3750,9 @@ WOK true elsif cmd_rc_act[:html_navigation][:set]==:off false - elsif defined? @md.make.html_navigation? \ - and @md.make.html_navigation? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_navigation? \ + and doc_rc.html_navigation? ==:off false elsif env_rc.build.html_navigation? ==:off false @@ -3753,8 +3765,9 @@ WOK true elsif cmd_rc_act[:html_navigation_bar][:set]==:off false - elsif defined? @md.make.html_navigation_bar? \ - and @md.make.html_navigation_bar? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_navigation_bar? \ + and doc_rc.html_navigation_bar? ==:off false elsif env_rc.build.html_navigation_bar? ==:off false @@ -3767,8 +3780,9 @@ WOK true elsif cmd_rc_act[:search_form][:set]==:off false - elsif defined? @md.make.html_search_form? \ - and @md.make.search_form? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_search_form? \ + and doc_rc.search_form? ==:off false elsif env_rc.build.search_form? ==:off false @@ -3783,9 +3797,10 @@ WOK elsif cmd_rc_act[:html_search_form][:set]==:off \ || cmd_rc_act[:search_form][:set]==:off false - elsif defined? @md.make.html_search_form? \ - and (@md.make.html_search_form? ==:off \ - || @md.make.search_form? ==:off) + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_search_form? \ + and (doc_rc.html_search_form? ==:off \ + || doc_rc.search_form? ==:off) false elsif env_rc.build.html_search_form? ==:off \ || env_rc.build.search_form? ==:off @@ -3801,8 +3816,9 @@ WOK true elsif cmd_rc_act[:html_right_pane][:set]==:off false - elsif defined? @md.make.html_right_pane? \ - and @md.make.html_right_pane? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.html_right_pane? \ + and doc_rc.html_right_pane? ==:off false elsif env_rc.build.html_right_pane? ==:off false @@ -3815,8 +3831,9 @@ WOK true elsif cmd_rc_act[:segsubtoc][:set]==:off false - elsif defined? @md.make.segsubtoc? \ - and @md.make.segsubtoc? ==:off + elsif doc_rc.is_a?(Method) \ + and defined? doc_rc.segsubtoc? \ + and doc_rc.segsubtoc? ==:off false elsif env_rc.build.segsubtoc? ==:off false |