v3: epub, param, (defaults) epub tuning

* include levels A - C as individual sections
  (xhtml file with consistent opf & ncx)
* sync ncx with sisu internal structural logic
  (correct depth, include level A, place sisu toc)

1 files changed, 33 insertions, 6 deletions

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index c33bab75..58d3aba9 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -1150,18 +1150,45 @@ module SiSU_Param
             @lv5 ||=/^5~/
             @lv6 ||=/^6~/
           else                                                                 #% *
+            l_0=l_1=l_2=l_3=l_4=l_5=''
+            if defined? @make.headings[0]
+              l_0=if defined? @make.headings[0][0] \
+              and @make.headings[0][0] =~/\S+/
+                "|^#{@make.headings[0][0]}"
+              end
+              l_1=if defined? @make.headings[0][1] \
+              and @make.headings[0][1] =~/\S+/
+                "|^#{@make.headings[0][1]}"
+              end
+              l_2=if defined? @make.headings[0][2] \
+              and @make.headings[0][2] =~/\S+/
+                "|^#{@make.headings[0][2]}"
+              end
+              l_3=if defined? @make.headings[0][3] \
+              and @make.headings[0][3] =~/\S+/
+                "|^#{@make.headings[0][3]}"
+              end
+              l_4=if defined? @make.headings[0][4] \
+              and @make.headings[0][4] =~/\S+/
+                "|^#{@make.headings[0][4]}"
+              end
+              l_5=if defined? @make.headings[0][5] \
+              and @make.headings[0][5] =~/\S+/
+                "|^#{@make.headings[0][5]}"
+              end
+            end
             case para
-            when /^:?A~/
+            when /^:?A~#{l_0}/
               @lvs[1]=1
-            when /^:?B~/
+            when /^:?B~#{l_1}/
               @lvs[2]=1
-            when /^:?C~/
+            when /^:?C~#{l_2}/
               @lvs[3]=1
-            when /^1~/
+            when /^1~#{l_3}/
               @lvs[4]=1
-            when /^2~/
+            when /^2~#{l_4}/
               @lvs[5]=1
-            when /^3~/
+            when /^3~#{l_5}/
               @lvs[6]=1
             end
             if para =~ /^:A~/                                                  #% processing