muwu 3.2.0 → 4.0.0

data/lib/muwu/render_html_partial/render_contents.rb

@@ -7,199 +7,199 @@ module Muwu
 
 
       include Muwu
-        
-        
+
+
       attr_accessor(
         :destination,
-        :href_helper,
         :html_attr_id,
         :item_depth_max,
         :project,
-        :sections,
+        :topics,
         :text_root_name,
         :will_render_section_numbers
       )
-      
-      
-      
+
+
+
       public
-  
+
 
       def render
         @destination.margin_to_zero
         @destination.padding_vertical(1) do
           write_tag_div_open
           render_contents_heading
-          render_contents_element(@sections)
+          render_contents_element(@topics)
           write_tag_div_close
         end
         @destination.margin_to_zero
       end
 
-  
-      def render_contents_element(sections)
+
+      def render_contents_element(topics)
         @destination.margin_indent do
           case @will_render_section_numbers
           when false
-            render_ol(sections)
+            render_ol(topics)
           when true
-            render_table(sections)
+            render_table(topics)
           end
         end
       end
-      
-      
+
+
       def render_contents_heading
         write_tag_h1_contents_heading
       end
-    
-    
-      def render_ol(text_item)
+
+
+      def render_ol(topics)
         write_tag_ol_open
-        @destination.margin_indent do 
-          text_item.each do |section|
-            render_ol_li(section)
+        @destination.margin_indent do
+          topics.each do |topic|
+            render_ol_li(topic)
           end
         end
         write_tag_ol_close
       end
-  
-  
-      def render_ol_li(text_item)
-        if task_depth_is_within_range(text_item)
-          if text_item.is_parent_heading
-            write_tag_li_open
-            @destination.margin_indent do 
-              render_ol_li_heading_and_subsections(text_item)
+
+
+      def render_ol_li(topic)
+        if task_depth_is_within_range(topic)
+          html_id = Helper::HrefHelper.id_contents_item(topic)
+          if topic.is_parent_heading
+            write_tag_li_open(html_id)
+            @destination.margin_indent do
+              render_ol_li_heading_and_subsections(topic)
             end
             write_tag_li_close_outline
-          elsif text_item.is_not_parent_heading
-            write_tag_li_open
-            render_ol_li_heading(text_item)
+          elsif topic.is_not_parent_heading
+            write_tag_li_open(html_id)
+            render_ol_li_heading(topic)
             write_tag_li_close_inline
           end
         end
       end
-  
-  
-      def render_ol_li_heading(text_item)
-        render_tag_a_section_heading(text_item)
+
+
+      def render_ol_li_heading(topic)
+        render_tag_a_section_heading(topic)
       end
-  
-  
-      def render_ol_li_heading_and_subsections(text_item)
-        render_tag_a_section_heading(text_item, trailing_line_feed: true)
-        render_ol(text_item.sections)
+
+
+      def render_ol_li_heading_and_subsections(topic)
+        render_tag_a_section_heading(topic, trailing_line_feed: true)
+        render_ol(topic.subtopics)
       end
 
 
-      def render_table(text_item)
+      def render_table(topics)
         write_tag_table_open
-        @destination.margin_indent do 
-          text_item.each do |section|
-            render_table_tr(section)
+        @destination.margin_indent do
+          topics.each do |topic|
+            render_table_tr(topic)
           end
         end
         write_tag_table_close
       end
 
 
-      def render_table_tr(section)
-        if task_depth_is_within_range(section)
-          html_id = ['contents', @text_root_name, section.numbering.join('_')].join('_')
+      def render_table_tr(topic)
+        if task_depth_is_within_range(topic)
+          html_id = Helper::HrefHelper.id_contents_item(topic)
           write_tag_tr_open(html_id)
-          @destination.margin_indent do 
-            if section.is_parent_heading
-              render_table_tr_td_number(section)
-              render_table_tr_td_heading_and_subsections(section)
-            elsif section.is_not_parent_heading
-              render_table_tr_td_number(section)
-              render_table_tr_td_heading(section)
+          @destination.margin_indent do
+            if topic.is_parent_heading
+              render_table_tr_td_number(topic)
+              render_table_tr_td_heading_and_subsections(topic)
+            elsif topic.is_not_parent_heading
+              render_table_tr_td_number(topic)
+              render_table_tr_td_heading(topic)
             end
           end
           write_tag_tr_close
         end
       end
-  
 
-      def render_table_tr_td_heading(text_item)
-        write_tag_td_open(attr_list: "class='heading'")
-        render_tag_a_section_heading(text_item)
+
+      def render_table_tr_td_heading(topic)
+        write_tag_td_open(attr_list: "data-contents='table-topic'")
+        render_tag_a_section_heading(topic)
         write_tag_td_close_inline
       end
-  
 
-      def render_table_tr_td_heading_and_subsections(text_item)
-        write_tag_td_open(attr_list: "class='heading'")
-        render_tag_a_section_heading(text_item, trailing_line_feed: true)
+
+      def render_table_tr_td_heading_and_subsections(topic)
+        write_tag_td_open(attr_list: "data-contents='table-topic'")
+        render_tag_a_section_heading(topic, trailing_line_feed: true)
         @destination.margin_indent do
-          render_table(text_item.sections)
+          render_table(topic.subtopics)
         end
         write_tag_td_close_outline
       end
 
 
-      def render_table_tr_td_number(text_item)
-        write_tag_td_open(attr_list: "class='number'")
-        render_tag_a_section_number(text_item, attr_list: "tabindex='-1'")
+      def render_table_tr_td_number(topic)
+        write_tag_td_open(attr_list: "data-contents='table-number'")
+        render_tag_a_section_number(topic, attr_list: "tabindex='-1'")
         write_tag_td_close_inline
       end
-  
 
-      def render_tag_a_section_heading(text_item, trailing_line_feed: false)
-        href = @href_helper.to_text_item(text_item)
+
+      def render_tag_a_section_heading(topic, trailing_line_feed: false)
+        href = Helper::HrefHelper.link_to_topic_header(topic, from: :contents)
         write_tag_a_open(href)
-        write_text_section_heading(text_item)
+        write_text_section_heading(topic)
         write_tag_a_close
         if trailing_line_feed
           write_lf
         end
       end
-  
 
-      def render_tag_a_section_number(text_item, attr_list: nil)
-        href = @href_helper.to_text_item(text_item)
+
+      def render_tag_a_section_number(topic, attr_list: nil)
+        href = Helper::HrefHelper.link_to_topic_header(topic, from: :contents)
         write_tag_a_open(href, attr_list: attr_list)
-        write_text_section_number(text_item)
+        write_text_section_number(topic)
         write_tag_a_close
       end
-  
-  
+
+
       def write_lf
         @destination.write_lf
       end
-      
-      
+
+
       def write_tag_a_close
         @destination.write_inline tag_a_close
       end
-  
-  
+
+
       def write_tag_a_open(href_id, attr_list: nil)
         @destination.write_inline tag_a_open(href_id, attr_list: attr_list)
       end
-  
-  
+
+
       def write_tag_div_close
         @destination.write_line tag_div_close
       end
-  
-  
+
+
       def write_tag_div_open
         @destination.write_line tag_div_open
       end
-      
-      
+
+
       def write_tag_h1_contents_heading
         @destination.write_line tag_h1_contents_heading
       end
-  
-  
+
+
       def write_tag_li_close
         write_tag_li_close_outline
       end
-  
-  
+
+
       def write_tag_li_close_inline
         @destination.write_inline_end tag_li_close
       end
@@ -208,28 +208,28 @@ module Muwu
       def write_tag_li_close_outline
         @destination.write_line tag_li_close
       end
-        
-  
-      def write_tag_li_open
-        @destination.write_inline_indented tag_li_open
+
+
+      def write_tag_li_open(html_id)
+        @destination.write_inline_indented tag_li_open(html_id)
       end
-  
-  
+
+
       def write_tag_ol_close
         @destination.write_line tag_ol_close
       end
-  
-  
+
+
       def write_tag_ol_open
         @destination.write_line tag_ol_open
       end
-  
-  
+
+
       def write_tag_table_close
         @destination.write_line tag_table_close
       end
-  
-  
+
+
       def write_tag_table_open
         @destination.write_line tag_table_open
       end
@@ -238,17 +238,17 @@ module Muwu
       def write_tag_td_close
         write_tag_td_close_outline
       end
-  
+
 
       def write_tag_td_close_inline
         @destination.write_inline_end tag_td_close
       end
-  
+
 
       def write_tag_td_close_outline
         @destination.write_line tag_td_close
       end
-  
+
 
       def write_tag_td_open(attr_list: nil)
         @destination.write_inline_indented tag_td_open(attr_list: attr_list)
@@ -258,49 +258,49 @@ module Muwu
       def write_tag_tr_close
         @destination.write_line tag_tr_close
       end
-  
-  
+
+
       def write_tag_tr_open(html_id)
         @destination.write_line tag_tr_open(html_id)
       end
-  
-  
+
+
       def write_text_section_heading(textobject)
         @destination.write_inline CGI::escape_html(textobject.heading)
       end
-  
-  
+
+
       def write_text_section_number(textobject)
         @destination.write_inline textobject.numbering.join('.')
       end
-  
+
 
 
       private
-          
-  
+
+
       def tag_a_close
         "</a>"
       end
-  
-  
-      def tag_a_open(href_id, attr_list: nil)
-        ["<a", "class='document_link'", "href='#{href_id}'", attr_list].compact.join(' ').concat('>')
+
+
+      def tag_a_open(href, attr_list: nil)
+        ["<a", "class='document_link'", "href='#{href}'", attr_list].compact.join(' ').concat('>')
       end
-  
-  
+
+
       def tag_div_close
         "</div>"
       end
 
 
       def tag_div_open
-        "<div class='contents' data-text_root_name='#{@text_root_name}' id='#{@html_attr_id}'>"
+        "<div data-document-block='contents' data-text-root-name='#{@text_root_name}' id='#{@html_attr_id}'>"
       end
-      
-      
+
+
       def tag_h1_contents_heading
-        "<h1>Contents</h1>"
+        "<h1 data-contents='heading'>Contents</h1>"
       end
 
 
@@ -309,8 +309,8 @@ module Muwu
       end
 
 
-      def tag_li_open
-        "<li>"
+      def tag_li_open(html_id)
+        "<li data-contents='list-topic' id='#{html_id}'>"
       end
 
 
@@ -320,7 +320,7 @@ module Muwu
 
 
       def tag_ol_open
-        "<ol>"
+        "<ol data-contents='list'>"
       end
 
 
@@ -330,10 +330,10 @@ module Muwu
 
 
       def tag_table_open
-        "<table class='document_links'>"
+        "<table data-contents='table'>"
       end
-  
-  
+
+
       def tag_td_close
         "</td>"
       end
@@ -342,7 +342,7 @@ module Muwu
       def tag_td_open(attr_list: nil)
         ["<td", attr_list].compact.join(' ').concat('>')
       end
-      
+
 
       def tag_tr_close
         "</tr>"
@@ -352,21 +352,21 @@ module Muwu
       def tag_tr_open(html_id)
         "<tr id='#{html_id}'>"
       end
-  
-  
-      def task_depth_is_within_range(textobject)
+
+
+      def task_depth_is_within_range(topic)
         result = nil
         if @item_depth_max == nil
           result = true
-        elsif textobject.section_depth <= @item_depth_max
+        elsif topic.topic_depth <= @item_depth_max
           result = true
-        elsif textobject.section_depth > @item_depth_max
+        elsif topic.topic_depth > @item_depth_max
           result = false
         end
         result
       end
-  
-  
+
+
     end
   end
 end

data/lib/muwu/render_html_partial/render_document_html.rb

@@ -293,12 +293,12 @@ module Muwu
 
 
       def tag_body_close
-        "</body>"
+        "</main></body>"
       end
 
 
       def tag_body_open
-        "<body>"
+        "<body><main>"
       end
 
 

data/lib/muwu/render_html_partial/render_metadata.rb

@@ -1,46 +1,46 @@
 module Muwu
   module RenderHtmlPartial
     class Metadata
-  
+
 
       include Muwu
-      
-      
+
+
       attr_accessor(
         :destination,
         :metadata
       )
-  
+
 
       def render
         @destination.margin_to_zero
-        @destination.padding_vertical(1) do 
+        @destination.padding_vertical(1) do
           write_tag_div_open
           render_dl
           write_tag_div_close
         end
         @destination.margin_to_zero
       end
-  
+
 
       def render_dl
-        @destination.margin_indent do 
+        @destination.margin_indent do
           write_tag_dl_open
           render_dl_metadata_div
           write_tag_dl_close
         end
       end
-  
-  
+
+
       def render_dl_metadata_div
-        @destination.margin_indent do 
+        @destination.margin_indent do
           @metadata.each_pair do |key, value|
             write_tag_div_metadata(key, value)
           end
         end
       end
-    
-  
+
+
       def write_tag_div_close
         @destination.write_line tag_div_close
       end
@@ -59,62 +59,50 @@ module Muwu
       def write_tag_dl_open
         @destination.write_line tag_dl_open
       end
-  
+
 
       def write_tag_div_metadata(key, value)
-        @destination.write_line tag_dl_div_open
         @destination.margin_indent do
           @destination.write_line tag_dt_key(key)
           @destination.write_line tag_dd_value(value)
         end
-        @destination.write_line tag_dl_div_close
       end
-  
-  
+
+
 
       private
-          
-  
+
+
       def tag_dd_value(value)
         "<dd>#{value}</dd>"
       end
-  
-  
+
+
       def tag_div_close
         "</div>"
       end
-  
-  
+
+
       def tag_div_open
-        "<div class='metadata'>"
-      end            
+        "<div data-document-block='metadata'>"
+      end
 
 
       def tag_dl_close
         "</dl>"
       end
-  
-
-      def tag_dl_div_close
-        tag_div_close
-      end
 
 
-      def tag_dl_div_open
-        "<div>"
-      end
-  
-  
       def tag_dl_open
         "<dl>"
-      end            
+      end
 
 
       def tag_dt_key(key)
         "<dt>#{key}</dt>"
       end
 
-  
+
     end
   end
 end