diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-03-12 18:51:21 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-03-12 18:51:21 -0400 |
| commit | 1b7b1b2aec62cf261faa94ce2fbc05e9c28c83e2 (patch) | |
| tree | 52b39f3a8e625db1678c3353a2a88a271379d81f /lib/sisu/v3dv/html.rb | |
| parent | debian/changelog (3.1.14-1) (diff) | |
| parent | v3dv: documentation sisu_commands, add sqlite3 discreet (diff) | |
Merge tag 'sisu_3.1.15' into debian/sid
Diffstat (limited to 'lib/sisu/v3dv/html.rb')
| -rw-r--r-- | lib/sisu/v3dv/html.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sisu/v3dv/html.rb b/lib/sisu/v3dv/html.rb index 75d89382..fee51f2c 100644 --- a/lib/sisu/v3dv/html.rb +++ b/lib/sisu/v3dv/html.rb @@ -510,6 +510,7 @@ WOK def initialize(md='',toc='',links_guide_toc='') @md,@toc,@links_guide_toc=md,toc,links_guide_toc @vz=SiSU_Env::GetInit.instance.skin + @make=SiSU_Env::ProcessingSettings.new(@md) end def in_common toc_shared=[] @@ -566,8 +567,9 @@ WOK if defined? @md.prefix_b toc_shared << prefix_b end - #Table of Contents added/appended here - toc_shared << @toc[:scr] + scr_toc=if @make.build.toc? #Table of Contents added/appended here + toc_shared << @toc[:scr] + end @segtoc << @links_guide_toc @segtoc << @toc[:seg] if defined? @md.rights.all \ @@ -608,7 +610,7 @@ WOK def initialize(data='',md='') @data,@md=data,md @file=SiSU_Env::FileOp.new(md) - @o_str ||=SiSU_Env::OutputStructure.new(md).output_dir_structure + @o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure end def scroll begin |