diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/options.rb | 8 | ||||
| -rw-r--r-- | lib/sisu/v6/options.rb | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index dc6b32da..217ffed4 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -42,6 +42,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.2.orig.tar.xz * html_lite_shared, issue fix +* options, sisupod parsing fix + %% 5.5.1.orig.tar.xz (2014-07-15:28/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.1-1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index be9f36a0..c0be7704 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -32,6 +32,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.2.orig.tar.xz * html_lite_shared, issue fix +* options, sisupod parsing fix + %% 6.1.1.orig.tar.xz (2014-07-15:28/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.1-1 diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb index c3cfa8c7..7645c48e 100644 --- a/lib/sisu/v5/options.rb +++ b/lib/sisu/v5/options.rb @@ -70,7 +70,7 @@ module SiSU_Commandline require_relative 'sysenv' # sysenv.rb require_relative 'param_make' # param_make.rb class HeaderCommon - def sisu_document_make_instructions + def sisu_document_make_instructions(make_instruct_array=:nil) @pagenew= @pagebreak= @pageline= @@ -87,7 +87,9 @@ module SiSU_Commandline @home_button_links= @links= nil - make_instruct_array=SiSU_Env::GetInit.new.sisu_document_make.makefile_read + make_instruct_array=make_instruct_array==:nil \ + ? SiSU_Env::GetInit.new.sisu_document_make.makefile_read + : make_instruct_array @makeset=false if make_instruct_array make_instruct_array.each do |para| #% scan document @@ -334,7 +336,7 @@ module SiSU_Commandline pod_make_path=fullname + '/sisupod/doc/_sisu' make_instruct_array=sisu_document_make_pod.makefile_read(pod_make_path) @make_instructions_pod= - HeaderCommon.new(make_instruct_array).sisu_document_make_instructions + HeaderCommon.new.sisu_document_make_instructions(make_instruct_array) Dir.chdir(pt.realpath) system(" chdir #{fullname} diff --git a/lib/sisu/v6/options.rb b/lib/sisu/v6/options.rb index 6bf3fa0f..ae641be4 100644 --- a/lib/sisu/v6/options.rb +++ b/lib/sisu/v6/options.rb @@ -70,7 +70,7 @@ module SiSU_Commandline require_relative 'sysenv' # sysenv.rb require_relative 'param_make' # param_make.rb class HeaderCommon - def sisu_document_make_instructions + def sisu_document_make_instructions(make_instruct_array=:nil) @pagenew= @pagebreak= @pageline= @@ -87,7 +87,9 @@ module SiSU_Commandline @home_button_links= @links= nil - make_instruct_array=SiSU_Env::GetInit.new.sisu_document_make.makefile_read + make_instruct_array=make_instruct_array==:nil \ + ? SiSU_Env::GetInit.new.sisu_document_make.makefile_read + : make_instruct_array @makeset=false if make_instruct_array make_instruct_array.each do |para| #% scan document @@ -334,7 +336,7 @@ module SiSU_Commandline pod_make_path=fullname + '/sisupod/doc/_sisu' make_instruct_array=sisu_document_make_pod.makefile_read(pod_make_path) @make_instructions_pod= - HeaderCommon.new(make_instruct_array).sisu_document_make_instructions + HeaderCommon.new.sisu_document_make_instructions(make_instruct_array) Dir.chdir(pt.realpath) system(" chdir #{fullname} |