diff options
| author | Ralph Amissah <ralph@amissah.com> | 2017-07-14 07:04:18 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2017-07-14 07:04:21 -0400 |
| commit | 90e27c85d9054799e071cb6f601c8dbc3236272d (patch) | |
| tree | 903541de6be900c45c631c85c0873738e49ae192 | |
| parent | version & changelog, open commit window (diff) | |
html, minitoc, default off
* default where no instruction given changed to false
(requested, as minitoc is sub-optimal for viewing with
smaller devices (when present minitoc is placed on left
part of screen together with content to its right))
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v7 | 5 | ||||
| -rw-r--r-- | lib/sisu/hub_options.rb | 8 | ||||
| -rw-r--r-- | lib/sisu/se_processing.rb | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 76b4f01d..1db85b4e 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -23,6 +23,11 @@ Reverse Chronological: * sisu_7.1.11.orig.tar.xz (Open commit window: 2017-07-14; Pre-Release) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.11 + * html, minitoc, set default off + (requested, as minitoc is sub-optimal for viewing with smaller devices + (when present minitoc is placed on left part of screen together with + content to its right)) + * sisu_7.1.10.orig.tar.xz (2017-07-02:26/7) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.10 diff --git a/lib/sisu/hub_options.rb b/lib/sisu/hub_options.rb index e0832553..fe371bd1 100644 --- a/lib/sisu/hub_options.rb +++ b/lib/sisu/hub_options.rb @@ -871,13 +871,13 @@ module SiSU_Commandline else { bool: true, set: :na } end act[:minitoc]=if select_arr.inspect \ - =~/"--inc-minitoc"/ + =~/"--minitoc"|"--inc-minitoc"/ { bool: true, set: :on } elsif select_arr.inspect \ =~/"--(?:exc|no)-minitoc"/ \ || act[:switch][:off].inspect =~/"minitoc"/ { bool: false, set: :off } - else { bool: true, set: :na } + else { bool: false, set: :na } end act[:links_to_manifest]=if select_arr.inspect \ =~/"--inc-links-to-manifest"|"--inc-manifest-links"/ @@ -902,7 +902,7 @@ module SiSU_Commandline =~/"--(?:exc|no)-manifest-minitoc"|"--(?:exc|no)-minitoc"/ \ || act[:switch][:off].inspect =~/"manifest_minitoc"|"minitoc"/ { bool: false, set: :off } - else { bool: true, set: :na } + else { bool: false, set: :na } end act[:metadata]=if select_arr.inspect \ =~/"--inc-metadata"/ @@ -920,7 +920,7 @@ module SiSU_Commandline =~/"--(?:exc|no)-html-minitoc"|"--(?:exc|no)-minitoc"/ \ || act[:switch][:off].inspect =~/"html_minitoc"|"minitoc"/ { bool: false, set: :off } - else { bool: true, set: :na } + else { bool: false, set: :na } end act[:html_navigation]=if select_arr.inspect \ =~/"--inc-html-navigation"|"--inc-navigation"/ diff --git a/lib/sisu/se_processing.rb b/lib/sisu/se_processing.rb index eba98ed0..5aa2d45a 100644 --- a/lib/sisu/se_processing.rb +++ b/lib/sisu/se_processing.rb @@ -210,7 +210,7 @@ module SiSU_Processing_Settings elsif env_rc.build.minitoc? ==:off false else - true + false end end def manifest_minitoc? @@ -233,7 +233,7 @@ module SiSU_Processing_Settings elsif minitoc? == false false else - true + false end end def html_minitoc? @@ -256,7 +256,7 @@ module SiSU_Processing_Settings elsif minitoc? == false false else - true + false end end def html_top_band? |