deplate 0.7.3 → 0.8

data/lib/deplate/fmt/htmlsite.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     17-M�r-2004.
-# @Last Change: 01-Nov-2005.
-# @Revision:    0.910
+# @Last Change: 25-Apr-2006.
+# @Revision:    0.1008
 
 require "deplate/fmt/html"
 
@@ -16,28 +16,28 @@ require "deplate/fmt/html"
 # 
 
 class Deplate::Formatter::HTML_Site < Deplate::Formatter::HTML
-    self.myname = "htmlsite"
+    self.myname = 'htmlsite'
     self.rx     = /html?|htmlwebsite/i
 
     def hook_pre_body_flush_html_pager
-        title = @deplate.get_clip("title")
+        title = @deplate.get_clip('title')
         title = title.elt if title
         top   = @deplate.output.top_heading
         if top
             top_title = top.description
             if top_title
-                title = clean_tags([title, top_title].compact.join(" -- "))
+                title = clean_tags([title, top_title].compact.join(' -- '))
                 set_at(:pre, :head_title, %{<title>%s</title>} % title) unless title.empty?
             end
         end
         
         invoker = nil
-        navbar  = @deplate.variables["docNavbar"]
+        navbar  = @variables['docNavbar']
         if navbar
             case navbar
-            when "top"
+            when 'top'
                 format_navigation_bar(invoker, :body, :navbar_top,    :top)
-            when "bottom"
+            when 'bottom'
                 format_navigation_bar(invoker, :body, :navbar_bottom, :bottom)
             else
                 format_navigation_bar(invoker, :body, :navbar_top,    :top)
@@ -45,15 +45,16 @@ class Deplate::Formatter::HTML_Site < Deplate::Formatter::HTML
             end
         end
 
-        set_relation(:htmlsite_prev, "Prev", "previous")
-        set_relation(:htmlsite_next, "Next", "next")
-        set_relation(:htmlsite_up,   "Home", "up") if @variables["@idx"].to_i > 0
+        idx = @deplate.output_index - 1
+        set_relation(:htmlsite_prev, 'Prev', 'previous')
+        set_relation(:htmlsite_next, 'Next', 'next')
+        set_relation(:htmlsite_up,   'Home', 'up') if idx > 0
     end
 
     def set_relation(slot, service_infix, tag)
-        url = @deplate.invoke_service("page#{service_infix}Dest")
+        url = invoke_service("page#{service_infix}Dest")
         if url
-            title = @deplate.invoke_service("page#{service_infix}Title") || tag
+            title = invoke_service("page#{service_infix}Title") || tag
             title = clean_tags(title)
             set_at(:pre, slot, head_link_tag(%{rel="#{tag}" href="#{url}" title="#{title}"}))
         end
@@ -77,105 +78,145 @@ class Deplate::Formatter::HTML_Site < Deplate::Formatter::HTML
         end
     end
 
-end
-
-class Deplate::Core
-    def formatter_initialize_htmlsite
-        @max_headings = nil
-        @doc_services["tabBarNote"]            = :htmlsite_tabBarNote
-        @doc_services["tabBarLeft"]            = :htmlsite_tabBarLeft
-        @doc_services["tabBarRight"]           = :htmlsite_tabBarRight
-        @doc_services["tabBarTop"]             = :htmlsite_tabBarTop
-        @doc_services["tabBarBottom"]          = :htmlsite_tabBarBottom
-        @doc_services["progressPercent"]       = :htmlsite_progressPercent
-        @doc_services["progressPages"]         = :htmlsite_progressPages
-        @doc_services["progressFirst"]         = :htmlsite_progressFirst
-        @doc_services["progressLast"]          = :htmlsite_progressLast
-        @doc_services["progressBar"]           = :htmlsite_progressBar
-        @doc_services["progressBarHorizontal"] = :htmlsite_progressBarHorizontal
-        @doc_services["progressBarVertical"]   = :htmlsite_progressBarVertical
-        @doc_services["pageNextDest"]          = :htmlsite_pageNextDest
-        @doc_services["pageNextTitle"]         = :htmlsite_pageNextTitle
-        @doc_services["pagePrevDest"]          = :htmlsite_pagePrevDest
-        @doc_services["pagePrevTitle"]         = :htmlsite_pagePrevTitle
-        @doc_services["pageHomeDest"]          = :htmlsite_pageHomeDest
-        @doc_services["pageHomeTitle"]         = :htmlsite_pageHomeTitle
-        # @doc_services["<+TBD+>"]             = :htmlsite_<+TBD+>
+    def format_heading(invoker)
+        output_at(:body, :inner_body_end, %{</div>\n})
+        [super, %{<div class="pagebody">\n}].join
     end
 
-    # def htmlsite_<+TBD+>
-    # end
 
-    def htmlsite_tabBarNote(args, text)
+    def_service('tab_bar_note') do |args, text|
         unless defined?(@htmlsite_sliding_tabbar_note)
-            @htmlsite_sliding_tabbar_note = msg(:htmlsite_tabbar_note)
-            # @htmlsite_sliding_tabbar_note ||= <<-EON
-            #     <p class="htmlnavigationnote" />In order to pin down the sliding menu, click on the 
-            #     small square on the top left.</p>
-            # EON
+            @htmlsite_sliding_tabbar_note = @deplate.msg(:htmlsite_tabbar_note)
         end
-        return @htmlsite_sliding_tabbar_note
+        @htmlsite_sliding_tabbar_note
+    end
+
+    def_service('tab_bar_left') do |args, text|
+        htmlsite_tabbar(args, text, 'tabBarLeft', false)
+    end
+    
+    def_service('tab_bar_right') do |args, text|
+        htmlsite_tabbar(args, text, 'tabBarRight', false)
     end
 
-    def htmlsite_tabBarLeft(args, text)
-        htmlsite_tabBar(args, text, "tabBarLeft", false)
+    def_service('tab_bar_top') do |args, text|
+        htmlsite_tabbar(args, text, 'tabBarTop', true)
+    end
+
+    def_service('tab_bar_bottom') do |args, text|
+        htmlsite_tabbar(args, text, 'tabBarBottom', true)
+    end
+
+    def_service('progress_bar') do |args, text|
+        horizontal = !args['vertical']
+        htmlsite_progress_bar(args, horizontal)
     end
     
-    def htmlsite_tabBarRight(args, text)
-        htmlsite_tabBar(args, text, "tabBarRight", false)
+    def_service('progress_bar_horizontal') do |args, text|
+        htmlsite_progress_bar(args, true)
+    end
+    
+    def_service('progress_bar_vertical') do |args, text|
+        htmlsite_progress_bar(args, false)
+    end
+    
+    def_service('progress_percent') do |args, text|
+        idx     = @deplate.output_index
+        percent = 100 * idx / @deplate.top_heading_idx
+        %{<span class="progress">#{percent}%</span>}
+    end
+   
+    def_service('progress_pages') do |args, text|
+        idx = @deplate.output_index
+        max = @deplate.top_heading_idx
+        %{<span class="progress">#{idx}/#{max}</span>}
     end
 
-    def htmlsite_tabBarTop(args, text)
-        htmlsite_tabBar(args, text, "tabBarTop", true)
+    def_service('progress_first') do |args, text|
+        idx = @deplate.output_index
+        idx == 0 ? '1' : '0'
     end
 
-    def htmlsite_tabBarBottom(args, text)
-        htmlsite_tabBar(args, text, "tabBarBottom", true)
+    def_service('progress_last') do |args, text|
+        idx = @deplate.output_index
+        max = @deplate.top_heading_idx
+        idx == max ? '1' : '0'
     end
 
-    def htmlsite_tabBar(args, text, style, horizontal)
+    def_service('page_next_dest') do |args, text|
+        hd = delta_heading(1)
+        pagedest_relpath(hd)
+    end
+    
+    def_service('page_next_title') do |args, text|
+        hd = delta_heading(1)
+        pagedest_relpath(hd)
+    end
+    
+    def_service('page_prev_dest') do |args, text|
+        hd = delta_heading(-1)
+        pagedest_relpath(hd)
+    end
+    
+    def_service('page_prev_title') do |args, text|
+        hd = delta_heading(-1)
+        hd && hd.description
+    end
+    
+    def_service('page_home_dest') do |args, text|
+        hd = @deplate.top_heading_by_idx(@deplate.home_index)
+        pagedest_relpath(hd)
+    end
+    
+    def_service('page_home_title') do |args, text|
+        hd = @deplate.top_heading_by_idx(@deplate.home_index)
+        (hd && hd.description) || @deplate.msg('Frontpage')
+    end
+   
+    def htmlsite_tabbar(args, text, style, horizontal)
         if horizontal
-            tagsl0 = "table"
-            tagsl1 = ["tr"]
-            tagsl2 = ["td"]
+            tagsl0 = 'table'
+            tagsa0 = 'cellspacing="0"'
+            tagsl1 = ['tr']
+            tagsl2 = ['td']
             # tagsl1 = []
-            # tagsl2 = ["span"]
-            width  = args["width"]  || "100%"
-            heigth = args["heigth"] || "20px"
+            # tagsl2 = ['span']
+            width  = args['width']  || '100%'
+            heigth = args['heigth'] || '20px'
         else
-            tagsl0 = "table"
+            tagsl0 = 'table'
+            tagsa0 = 'cellspacing="0"'
             tagsl1 = []
-            tagsl2 = ["tr", "td"]
-            width  = args["width"] || "140px"
-            heigth = args["heigth"]
+            tagsl2 = ['tr', 'td']
+            width  = args['width']  || '20px'
+            heigth = args['heigth'] || '140px'
         end
         
-        curr = @variables["@idx"]
-        idx  = curr.to_i
-        type = @variables["navBarType"] || :top
-        urlp, prv = @formatter.navbar_button_prev(nil, nil, idx, type, idx > 0)
-        url, home = @formatter.navbar_button_home(nil, nil, idx, type, idx > 0)
-        urln, nxt = @formatter.navbar_button_next(nil, nil, idx, type, idx < top_heading_idx)
+        idx  = @deplate.output_index
+        type = @variables['navBarType'] || :top
+        urlp, prv = navbar_button_prev(nil, nil, idx, type, idx > @deplate.home_index)
+        url, home = navbar_button_home(nil, nil, idx, type, idx > @deplate.home_index)
+        urln, nxt = navbar_button_next(nil, nil, idx, type, idx < @deplate.top_heading_idx)
  
         tabbar = []
-        tabbar << html_navigation_keys({"next" => urln}, "") if args["nextKey"]
+        tabbar << invoke_service('navigation_keys', {'next' => urln}) if args['nextKey']
         # tabbar << %{<#{tagsl0} width="#{width}" class="#{style}" summary="Navigation bar">} if tagsl0
-        tabbar << %{<#{tagsl0} class="#{style}" summary="Navigation bar">} if tagsl0
-        tabbar << htmlsite_tabBar_accum_tags(tagsl1, style, true)
+        tabbar << %{<#{tagsl0} #{tagsa0} class="#{style}" summary="Navigation bar">} if tagsl0
+        tabbar << htmlsite_tabbar_accum_tags(tagsl1, style, true)
       
-        if !@variables["noTabBarButtons"]
+        if !@variables['noTabBarButtons']
             s = "#{style}Buttons"
-            o = htmlsite_tabBar_accum_tags(tagsl2, s, true)
-            c = htmlsite_tabBar_accum_tags(tagsl2, s, false)
-            if @variables["tabBarButtons"]
+            o = htmlsite_tabbar_accum_tags(tagsl2, s, true)
+            c = htmlsite_tabbar_accum_tags(tagsl2, s, false)
+            if @variables['tabBarButtons']
                 buttons = []
-                for b in @variables["tabBarButtons"].split(/[ ,;]/)
+                for b in @variables['tabBarButtons'].split(/[ ,;]/)
                     case b
-                    when "home", "h"
+                    when 'home', 'h'
                         buttons << home
-                    when "next", "n"
+                    when 'next', 'n'
                         buttons << nxt
-                    when "prev", "previous", "p"
+                    when 'prev', 'previous', 'p'
                         buttons << prv
                     end
                 end
@@ -187,24 +228,24 @@ class Deplate::Core
             tabbar << [o, buttons.join(%{&nbsp;}), c].join
         end
 
-        depth = args["depth"]
-        depth = depth ? depth.to_i : 1
-        inactivedepth = args["depthInactive"]
+        depth = args['depth']
+        depth = depth ? depth.to_i : @deplate.options.split_level
+        inactivedepth = args['depthInactive']
         inactivedepth = inactivedepth ? inactivedepth.to_i : depth
        
-        tabbarsep   = @variables["tabBarSep"] || "|"
+        tabbarsep   = @variables['tabBarSep'] || '|'
         tabbarsep   = /\s*#{Regexp.escape(tabbarsep)}\s*/
-        tabbarextra = @variables["tabBar"] || ["[auto]"]
+        tabbarextra = @variables['tabBar'] || ['[auto]']
         tabbarextra = tabbarextra.split(/\n/) if tabbarextra.kind_of?(String)
-        if @variables["tabEqualWidths"] || @variables["equalTabs"]
-            tabsize = top_heading_idx + tabbarextra.size
+        if @variables['tabEqualWidths'] || @variables['equalTabs']
+            tabsize = @deplate.top_heading_idx + tabbarextra.size
             tabsize = 100 / tabsize
             tabsize = %{ #{horizontal ? "width" : "heigth"}="#{tabsize}%"}
         else
             tabsize = nil
         end
         for e in tabbarextra
-            if e == "[auto]"
+            if e == '[auto]'
                 tabbar_auto_entries(tabbar, idx, style, depth, inactivedepth, tagsl2, tabsize)
             else
                 title, url = e.split(tabbarsep)
@@ -213,57 +254,44 @@ class Deplate::Core
             end
         end
         
-        if args["spacer"]
+        if args['spacer']
             if horizontal
-                spacer = %{<img width="1px" height="#{height}" src="%s" alt="" />} % args["spacer"]
+                spacer = %{<img width="1px" height="#{height}" src="%s" alt="" />} % args['spacer']
             else
-                spacer = %{<img width="#{width}" height="1px" src="%s" alt="" />} % args["spacer"]
+                spacer = %{<img width="#{width}" height="1px" src="%s" alt="" />} % args['spacer']
             end
         else
             spacer = nil
         end
         
-        if args["progressBar"]
+        if args['progressBar']
             if horizontal
-                pb = invoke_service("progressBarVertical")
+                pb = invoke_service('progressBarVertical')
             else
-                pb = invoke_service("progressBarHorizontal")
+                pb = invoke_service('progressBarHorizontal')
             end
             s = "#{style}Buttons"
-            o = htmlsite_tabBar_accum_tags(tagsl2, s, true)
-            c = htmlsite_tabBar_accum_tags(tagsl2, s, false)
-            i = invoke_service("progressPercent")
+            o = htmlsite_tabbar_accum_tags(tagsl2, s, true)
+            c = htmlsite_tabbar_accum_tags(tagsl2, s, false)
+            i = invoke_service('progressPercent')
             tabbar << [o, spacer, pb, i, c].compact.join
         end
         
-        tabbar << htmlsite_tabBar_accum_tags(tagsl1, style, false)
+        tabbar << htmlsite_tabbar_accum_tags(tagsl1, style, false)
         tabbar << %{</#{tagsl0}>} if tagsl0
         return tabbar.compact.join("\n")
     end
     
-    def htmlsite_progressBar(args, text)
-        horizontal = !args["vertical"]
-        htmlsite_progress_bar(args, horizontal)
-    end
-    
-    def htmlsite_progressBarHorizontal(args, text)
-        htmlsite_progress_bar(args, true)
-    end
-    
-    def htmlsite_progressBarVertical(args, text)
-        htmlsite_progress_bar(args, false)
-    end
-    
     def htmlsite_progress_bar(args, horizontal)
-        idx     = @variables["@idx"].to_i
-        percent = 100 * idx / top_heading_idx
+        idx     = @deplate.output_index
+        percent = 100 * idx / @deplate.top_heading_idx
         anti    = 100 - percent
         all     = percent + anti
         if all != 100
             anti += 100 - all
         end
-        height  = args["h"] || args["height"] || (horizontal ? "10pt"  : "100pt")
-        width   = args["w"] || args["width"]  || (horizontal ? "100pt" : "10pt")
+        height  = args['h'] || args['height'] || (horizontal ? '10pt'  : '100pt')
+        width   = args['w'] || args['width']  || (horizontal ? '100pt' : '10pt')
         pb      = []
         # pb << %{<div class="progressBar">}
         pb << %{<table align="center" class="progressBar" width="#{width}" style="height:#{height}">}
@@ -281,66 +309,12 @@ class Deplate::Core
         return pb.join
     end
 
-    def htmlsite_progressPercent(args, text)
-        idx     = @variables["@idx"].to_i
-        percent = 100 * idx / top_heading_idx
-        return %{<span class="progress">#{percent}%</span>}
-    end
-   
-    def htmlsite_progressPages(args, text)
-        idx = @variables["@idx"].to_i
-        max = top_heading_idx
-        return %{<span class="progress">#{idx}/#{max}</span>}
-    end
-
-    def htmlsite_progressFirst(args, text)
-        idx = @variables["@idx"].to_i
-        idx == 0 ? "1" : "0"
-    end
-
-    def htmlsite_progressLast(args, text)
-        idx = @variables["@idx"].to_i
-        max = top_heading_idx
-        idx == max ? "1" : "0"
-    end
-
-    def htmlsite_pageNextDest(args, text)
-        hd = delta_heading(1)
-        pagedest_relpath(hd)
-    end
-    
-    def htmlsite_pageNextTitle(args, text)
-        hd = delta_heading(1)
-        pagedest_relpath(hd)
-    end
-    
-    def htmlsite_pagePrevDest(args, text)
-        hd = delta_heading(-1)
-        pagedest_relpath(hd)
-    end
-    
-    def htmlsite_pagePrevTitle(args, text)
-        hd = delta_heading(-1)
-        hd && hd.description
-    end
-    
-    def htmlsite_pageHomeDest(args, text)
-        hd = top_heading_by_idx(0)
-        pagedest_relpath(hd)
-    end
-    
-    def htmlsite_pageHomeTitle(args, text)
-        hd = top_heading_by_idx(0)
-        (hd && hd.description) || msg("Frontpage")
-    end
-   
     def delta_heading(delta)
-        idx = @variables["@idx"]
+        idx = @deplate.output_index
         if idx
-            idx = idx.to_i + delta + 1
+            idx = idx.to_i + delta
             if idx >= 0
-                rv = top_heading_by_idx(idx)
-                return rv
+                return @deplate.top_heading_by_idx(idx)
             end
         end
         return nil
@@ -349,51 +323,64 @@ class Deplate::Core
     private
     def pagedest_relpath(hd)
         if hd
-            idx   = @variables["@idx"].to_i
-            curr  = top_heading_by_idx(idx)
-            return relative_path(hd.output_location, File.dirname(curr.output_location))
+            curr = @deplate.top_heading_by_idx(@deplate.top_heading_idx)
+            rv   = @deplate.relative_path(hd.output_location, File.dirname(curr.output_location))
+            return rv
         end
     end
     
     def tabbar_auto_entries(tabbar, idx, style, depth, inactivedepth, tags, tabsize)
-        if @variables["tabBarHomeName"]
-            s     = idx == 0 ? "#{style}Active" : "#{style}Inactive"
-            title = @variables["tabBarHomeName"]
-            file  = @formatter.navbar_guess_file_name(0, idx, :navbar)
+        if @variables['tabBarHomeName']
+            hidx  = @deplate.home_index
+            s     = idx == hidx ? "#{style}Active" : "#{style}Inactive"
+            title = @variables['tabBarHomeName']
+            file  = navbar_guess_file_name(hidx, idx, :navbar)
             tabbar << tabbar_entry(%{<a class="tabBarEntry" href="#{file}">#{title}</a>}, tags, s, tabsize)
         end
 
-        each_heading(depth) do |hd, title|
-            lstr = hd.level_as_string
-            lnr  = hd.top_heading_idx
+        @deplate.each_heading(depth) do |hd, title|
+            t1 = @deplate.top_heading_by_idx(idx)
+            t2 = hd.top_heading
+            # if t1 == t2 or 
+            #     (t1.kind_of?(Deplate::Element::Heading) and
+            #      t2.kind_of?(Deplate::Element::Heading) and
+            #      t1.level_heading[0] == t2.level_heading[0])
+            if t1.level_heading[0] == t2.level_heading[0]
+                s = ["#{style}Active #{style}Active-Level#{hd.level}"]
+            elsif hd.level > inactivedepth
+                next
+            else
+                s = ["#{style}Inactive #{style}Inactive-Level#{hd.level}"]
+            end
+            # s << "#{style}-Level#{hd.level}"
+
+            # lstr = hd.level_as_string
+            # lnr  = hd.top_heading_idx
             file = hd.output_file_name(:basename => true)
-            if hd.level > 1
+            file = escape_filename(file)
+            if hd.level > @deplate.options.split_level
                 anchor = hd.args[:id] || hd.label.first
                 if anchor
-                    file = [file, "#", anchor].join
-                end
-            end
-
-            if top_heading_by_idx(idx) == hd.top_heading
-                s = "#{style}Active"
-            else
-                s = "#{style}Inactive"
-                if hd.level > inactivedepth
-                    next
+                    file = [file, '#', anchor].join
                 end
             end
 
-            tabbar << tabbar_entry(%{<a class="tabBarEntry" href="#{file}">#{title}</a>}, tags, s, tabsize)
+            tabbar << tabbar_entry(
+                                   %{<a class="tabBarEntry" href="#{file}">#{title}</a>}, 
+                                   tags, 
+                                   s.join(' '), 
+                                   tabsize
+                                  )
         end
     end
 
     def tabbar_entry(html, tags, html_class, tabsize)
-        o = htmlsite_tabBar_accum_tags(tags, html_class, true,  tabsize)
-        c = htmlsite_tabBar_accum_tags(tags, html_class, false, tabsize)
+        o = htmlsite_tabbar_accum_tags(tags, html_class, true,  tabsize)
+        c = htmlsite_tabbar_accum_tags(tags, html_class, false, tabsize)
         [o, html, c].join
     end
 
-    def htmlsite_tabBar_accum_tags(tags, htmlClass, open_tags, extra=nil)
+    def htmlsite_tabbar_accum_tags(tags, htmlClass, open_tags, extra=nil)
         acc = []
         unless open_tags
             tags = tags.reverse
@@ -416,4 +403,10 @@ class Deplate::Core
     end
 end
 
+# class Deplate::Core
+#     def formatter_initialize_htmlsite
+#         @max_headings = nil
+#     end
+# end
+
 # vim: ff=unix