From dc51608775f87b03ed41defb5a2f4ea682a07982 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 22 Jul 2014 21:34:52 -0400
Subject: v5 v6: options, sisupod parsing, fix
---
lib/sisu/v5/options.rb | 8 +++++---
lib/sisu/v6/options.rb | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
(limited to 'lib')
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}
--
cgit v1.2.3