muwu 3.2.0 → 5.0.0

data/lib/muwu/render_html_partial/render_navigator.rb

@@ -10,19 +10,19 @@ module Muwu
         :href_document_next,
         :href_document_prev
       )
-      
-      
+
+
       def render
         @destination.margin_to_zero
         @destination.padding_vertical(1) do
-          write_tag_div_open
+          # write_tag_div_open
           # render_heading
           write_tag_nav_open
           render_prev
           render_home
           render_next
           write_tag_nav_close
-          write_tag_div_close
+          # write_tag_div_close
         end
       end
 
@@ -30,23 +30,23 @@ module Muwu
       def render_heading
         write_tag_heading
       end
-      
-      
+
+
       def render_prev
         write_tag_a_prev
       end
-      
-      
+
+
       def render_home
         write_tag_a_home
       end
-      
-      
+
+
       def render_next
         write_tag_a_next
       end
-      
-      
+
+
       def write_tag_a_home
         @destination.write_line tag_a_home
       end
@@ -60,37 +60,37 @@ module Muwu
       def write_tag_a_prev
         @destination.write_line tag_a_prev
       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_heading
         @destination.write_line tag_heading
       end
-      
-      
+
+
       def write_tag_nav_open
         @destination.write_line tag_nav_open
       end
-      
-      
+
+
       def write_tag_nav_close
         @destination.write_line tag_nav_close
       end
-      
-      
-      
+
+
+
       private
-      
-      
+
+
       def tag_a_home
         "<a class='document_link' href='#{@href_document_home}'>[home]</a>"
       end
@@ -104,33 +104,33 @@ module Muwu
       def tag_a_prev
         "<a class='document_link' href='#{@href_document_prev}'>[prev]</a>"
       end
-      
-      
+
+
       def tag_div_close
         "</div>"
       end
-      
-      
+
+
       def tag_div_open
         "<div class='navigator'>"
       end
-      
-      
+
+
       def tag_heading
         "<h1>#{@heading}</h1>"
       end
-    
-    
+
+
       def tag_nav_close
         "</nav>"
       end
-      
-      
+
+
       def tag_nav_open
-        "<nav class='document_links'>"
+        "<nav data-document-block='navigator' class='document_links'>"
       end
 
 
     end
   end
-end
+end

data/lib/muwu/render_html_partial/render_subcontents.rb

@@ -1,16 +1,14 @@
 module Muwu
   module RenderHtmlPartial
     class Subcontents
-  
-      
+
+
       include Muwu
-      
-      
+
+
       attr_accessor(
         :destination,
-        :href_helper,
         :html_attr_id,
-        :item_depth_max,
         :project,
         :sections,
         :text_root_block,
@@ -18,11 +16,11 @@ module Muwu
         :text_root_name,
         :will_render_section_numbers
       )
-      
-      
+
+
 
       public
-  
+
 
       def render
         @destination.margin_to_zero
@@ -30,178 +28,178 @@ module Muwu
           write_tag_div_open
           render_project_title
           @text_root_blocks.each do |text_root_block|
-            render_contents_element(text_root_block.sections)
+            render_contents_element(text_root_block.topics)
           end
           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_ol(sections)
+
+
+      def render_ol(topics)
         write_tag_ol_open
-        @destination.margin_indent do 
-          sections.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(section)
-        if task_depth_is_within_range(section)
-          case section
-          when ManifestTask::TextReadfile
-            write_tag_li_open
-            render_ol_li_heading(section)
-            write_tag_li_close_inline
-          when ManifestTask::TextGroup
-            write_tag_li_open
-            @destination.margin_indent do 
-              render_ol_li_heading_and_text_item(section)
+
+
+      def render_ol_li(topic)
+        if topic.is_distinct
+          html_id = Helper::HrefHelper.id_subcontents_item(topic)
+          if topic.is_parent_heading
+            write_tag_li_open(html_id)
+            @destination.margin_indent do
+              render_ol_li_heading_and_topics(topic)
             end
             write_tag_li_close_outline
+          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_text_item(text_item)
-        render_tag_a_section_heading(text_item, trailing_line_feed: true)
-        render_ol(text_item.sections)
+
+
+      def render_ol_li_heading_and_topics(topic)
+        render_tag_a_section_heading(topic, trailing_line_feed: true)
+        render_ol(topic.subtopics)
       end
-      
-      
+
+
       def render_project_title
         write_tag_h1_title
       end
 
 
-      def render_table(sections)
+      def render_table(topics)
         write_tag_table_open
-        @destination.margin_indent do 
-          sections.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 = ['subcontents', @text_root_name, section.numbering.join('_')].join('_')
+      def render_table_tr(topic)
+        if topic.is_distinct
+          html_id = Helper::HrefHelper.id_subcontents_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_text_item(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_topic(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-subcontents='table-topic'")
+        render_tag_a_section_heading(topic)
         write_tag_td_close_inline
       end
-  
 
-      def render_table_tr_td_heading_and_text_item(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_topic(topic)
+        write_tag_td_open(attr_list: "data-subcontents='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-subcontents='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: :subcontents)
         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_object, attr_list: nil)
-        href = @href_helper.to_text_item(text_object)
+
+      def render_tag_a_section_number(topic, attr_list: nil)
+        href = Helper::HrefHelper.link_to_topic_header(topic, from: :subcontents)
         write_tag_a_open(href, attr_list: attr_list)
-        write_text_section_number(text_object)
+        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)
+
+
+      def write_tag_a_open(href, attr_list: nil)
+        @destination.write_inline tag_a_open(href, 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_title
         @destination.write_line tag_h1_title
       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
@@ -210,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
@@ -240,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)
@@ -260,59 +258,59 @@ 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(text_item)
-        @destination.write_inline text_item.heading
+
+
+      def write_text_section_heading(topic)
+        @destination.write_inline topic.heading
       end
-  
-  
-      def write_text_section_number(text_item)
-        @destination.write_inline text_item.numbering.join('.')
+
+
+      def write_text_section_number(topic)
+        @destination.write_inline topic.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('>')
       end
-  
-  
+
+
       def tag_div_close
         "</div>"
       end
 
 
       def tag_div_open
-        "<div class='subcontents' data-text_root_name='#{@text_root_name}' id='#{@html_attr_id}'>"
+        "<div data-document-block='subcontents' data-text_root_name='#{@text_root_name}' id='#{@html_attr_id}'>"
       end
 
 
       def tag_h1_title
-        "<h1>#{@project.title}</h1>"
+        "<h1 data-subcontents='heading'>#{@project.title}</h1>"
       end
-      
+
 
       def tag_li_close
         "</li>"
       end
 
 
-      def tag_li_open
-        "<li>"
+      def tag_li_open(html_id)
+        "<li data-subcontents='list-topic' id='#{html_id}'>"
       end
 
 
@@ -322,7 +320,7 @@ module Muwu
 
 
       def tag_ol_open
-        "<ol>"
+        "<ol data-subcontents='list'>"
       end
 
 
@@ -332,10 +330,10 @@ module Muwu
 
 
       def tag_table_open
-        "<table class='document_links'>"
+        "<table data-subcontents='table'>"
       end
-  
-  
+
+
       def tag_td_close
         "</td>"
       end
@@ -354,21 +352,8 @@ module Muwu
       def tag_tr_open(html_id)
         "<tr id='#{html_id}'>"
       end
-  
-  
-      def task_depth_is_within_range(text_item)
-        result = nil
-        if @item_depth_max == nil
-          result = true
-        elsif text_item.section_depth <= @item_depth_max
-          result = true
-        elsif text_item.section_depth > @item_depth_max
-          result = false
-        end
-        result
-      end
-  
-  
+
+
     end
   end
 end

data/lib/muwu/render_html_partial/render_text.rb

@@ -4,32 +4,32 @@ module Muwu
 
 
       include Muwu
-      
-      
+
+
       attr_accessor(
-        :destination, 
+        :destination,
         :html_attr_id,
         :project,
         :text_root_name,
-        :sections,
+        :topics,
         :will_render_end_links,
         :will_render_section_numbers
       )
-    
+
 
       def render
         @destination.padding_vertical(1) do
           render_tag_div_open
-          render_sections
+          render_topics
           render_tag_div_close
         end
       end
 
 
-      def render_sections
+      def render_topics
         @destination.padding_vertical(1) do
-          @sections.each do |section|
-            section.render
+          @topics.each do |topic|
+            topic.render
           end
         end
       end
@@ -65,8 +65,8 @@ module Muwu
 
 
       def tag_div_open
-        "<div class='text' data-text_root_name='#{@text_root_name}' id='#{@html_attr_id}'>"
-      end            
+        "<div data-document-block='text' data-text_root_name='#{@text_root_name}' id='#{@html_attr_id}'>"
+      end
 
 
     end