diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v7 | 11 | ||||
| -rw-r--r-- | data/sisu/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/ao_doc_str.rb | 37 | ||||
| -rw-r--r-- | lib/sisu/hub_options.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/se_processing.rb | 6 | ||||
| -rw-r--r-- | setup/sisu_version.rb | 2 |
6 files changed, 43 insertions, 29 deletions
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 5ec1b588..c16edc5f 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -20,6 +20,17 @@ Reverse Chronological: --- HEAD --- +* sisu_7.1.11.orig.tar.xz (2017-07-14:28/5) + 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)) + + * command flag --no-metadata turns off appending metadata to documents + (Closes: #746742) + * 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/data/sisu/version.yml b/data/sisu/version.yml index 67b4f804..6647b926 100644 --- a/data/sisu/version.yml +++ b/data/sisu/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 7.1.10 -:date_stamp: 2017w26/7 -:date: "2017-07-02" +:version: 7.1.11 +:date_stamp: 2017w28/5 +:date: "2017-07-14" diff --git a/lib/sisu/ao_doc_str.rb b/lib/sisu/ao_doc_str.rb index ced4c833..1dbcf9e8 100644 --- a/lib/sisu/ao_doc_str.rb +++ b/lib/sisu/ao_doc_str.rb @@ -68,6 +68,7 @@ module SiSU_AO_DocumentStructureExtract @pbn=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) @pbl=SiSU_AO_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_line]) @per=SiSU_AO_Persist::PersistDocStructExt.new + @make=SiSU_Env::ProcessingSettings.new(@md) end def ln_get(lv) case lv @@ -1229,23 +1230,25 @@ module SiSU_AO_DocumentStructureExtract } end tuned_file << @pb - h={ - ln: 1, - lc: 1, - obj: 'Metadata', - autonum_: false, - ocn_: false, - } - tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h) - h={ - ln: 4, - lc: 2, - obj: 'SiSU Metadata, document information', - name: 'metadata', - autonum_: false, - ocn_: false, - } - tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h) + if @make.build.metadata? + h={ + ln: 1, + lc: 1, + obj: 'Metadata', + autonum_: false, + ocn_: false, + } + tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h) + h={ + ln: 4, + lc: 2, + obj: 'SiSU Metadata, document information', + name: 'metadata', + autonum_: false, + ocn_: false, + } + tuned_file << SiSU_AO_DocumentStructure::ObjectHeading.new.heading_insert(h) + end h={ obj: 'eof', } diff --git a/lib/sisu/hub_options.rb b/lib/sisu/hub_options.rb index e0832553..194858f7 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,10 +902,10 @@ 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"/ + =~/"--metadata"|"--inc-metadata"/ { bool: true, set: :on } elsif select_arr.inspect \ =~/"--(?:exc|no)-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? diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb index c361825d..1a4388fc 100644 --- a/setup/sisu_version.rb +++ b/setup/sisu_version.rb @@ -1,6 +1,6 @@ #% constants module SiSUversion - SiSU_version = '7.1.10' + SiSU_version = '7.1.11' end module Dev GPGpubKey = '1BB4B289' |