muwu 3.2.0 → 4.0.0

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_subcontents.scss

@@ -1,58 +1,36 @@
-body >div.subcontents {
-  margin: ($muwu-root-line-height * 4) 0;
-  >h1 {
-    font-size: ($muwu-root-font-size * 1.75);
-    margin: 0 0 ($muwu-root-line-height * 2) 0;
-    text-align: left;
-  }
-  .compiler_warning {
-    background-color: #ffa;
-    td {
-      a {
-        color: #A00;
-      }
-    }
-  }
-  >table {
-    border-collapse: collapse;
-    tr {
-      td {
-        vertical-align: top;
-        padding: 0.3rem 0.4rem;
-        table {
-          border-collapse: collapse;
-          margin-top: 0.2rem;
-          margin-bottom: -0.2rem;
-        }
-      }
-      td:first-child {
-        padding-left: 0rem;
-      }
-      td:last-child {
-        padding-right: 0rem;
-      }
-      td.heading {
-        text-align: left;
-      }
-      td.number {
-        text-align: right;
-      }
-    }
-  }
-  >ol {
-    list-style-type: none;
-    display: block;
-    margin: 0rem 0.5rem;
-    li {
-      margin: ($muwu-root-line-height * 0.5) 0rem;
-      a {
-        display: inline;
-      }
-      ol {
-        list-style-type: none;
-        display: block;
-        margin: 0rem 1.5rem;
-      }
-    }
-  }
+[data-document-block='subcontents'] {
+  margin: $margin-triple 0;
+}
+[data-subcontents='heading'] {
+  font-size: 2.0em;
+  margin-bottom: $margin;
+  text-align: left;
+}
+[data-subcontents='list'] {
+  list-style-type: none;
+  display: block;
+  margin: 0rem;
+}
+[data-subcontents='list-topic'] {
+  margin: $margin-half 0rem;
+}
+[data-subcontents='list-topic'] > [data-subcontents='list'] {
+  margin: 0 $margin-half;
+}
+[data-subcontents='table'] {
+  border-collapse: collapse;
+}
+[data-subcontents='table-number'] {
+  padding: $margin-quarter;
+  text-align: right;
+  vertical-align: top;
+}
+[data-subcontents='table-topic'] {
+  padding: $margin-quarter;
+  text-align: left;
+}
+[data-subcontents='table-topic'] > [data-subcontents='table'] {
+  border-collapse: collapse;
+  margin-top: $margin-contents-subtable;
+  margin-bottom: -($margin-contents-subtable);
 }

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_text.scss

@@ -1,49 +1,3 @@
-@import 'mixin_text_section_heading';
-
-body >div.text {
-  margin: ($muwu-root-line-height * 6) 0rem;
-  ol {
-    padding-left: 1rem;
-  }
-  ul {
-    padding-left: 1rem;
-  }
-
-  section[data-section_depth] {
-    >.section_number {
-      font-weight: bold;
-      display: block;
-      margin-bottom: none;
-      text-decoration: none;
-    }
-    nav.document_links {
-      width: 100%;
-      margin: ($muwu-root-line-height * 2) 0rem ($muwu-root-line-height * 4) 0rem;
-      text-align: right;
-      a.document_link {
-        font-size: ($muwu-root-font-size * 0.75);
-        margin: 0rem 0.5rem
-      }
-    }
-  }
-
-  section[data-section_depth='1'] {
-    margin: ($muwu-root-line-height * 6) 0;
-    @include text_section_heading(($muwu-root-font-size * 1.5), ($muwu-root-line-height * 2));
-  }
-
-  section[data-section_depth='2'] {
-    margin: ($muwu-root-line-height * 4) 0;
-    @include text_section_heading(($muwu-root-font-size * 1.375), ($muwu-root-line-height * 1.5));
-  }
-
-  section[data-section_depth='3'] {
-    margin: ($muwu-root-line-height * 2) 0;
-    @include text_section_heading(($muwu-root-font-size * 1.25), ($muwu-root-line-height * 1.5));
-    section[data-section_depth] {
-      margin: ($muwu-root-line-height * 2) 0;
-      @include text_section_heading(($muwu-root-font-size * 1), ($muwu-root-line-height * 1.5));
-    }
-  }
-
+[data-document-block='text'] {
+  margin: $margin-triple 0rem;
 }

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_title.scss

@@ -1,25 +1,20 @@
-body >div.title {
-  margin: ($muwu-root-line-height * 4) 0;
+[data-document-block='title'] {
+  margin: $margin-triple 0;
   text-align: left;
-  h1 {
-    display: block;
-    font-weight: bold;
-    margin: ($muwu-root-line-height * 0.5) 0;
-  }
-  [data-metadata_key='title'] {
-    font-size: ($muwu-root-font-size * 2);
-    line-height: ($muwu-root-line-height * 2);
-  }
-  [data-metadata_key='subtitle'] {
-    font-size: ($muwu-root-font-size * 1.5);
-    line-height: ($muwu-root-line-height * 1.5);
-  }
-  [data-metadata_key='author'] {
-    font-size: ($muwu-root-font-size * 1.25);
-    line-height: ($muwu-root-line-height * 1.25);
-    margin: ($muwu-root-line-height * 2) 0rem;
-  }
-  h1:first-child {
-    margin-top: 0;
-  }
+}
+[data-title-attr='title'] {
+  display: block;
+  font-size: 2.0em;
+  font-weight: bold;
+}
+[data-title-attr='subtitle'] {
+  display: block;
+  font-size: 1.5em;
+  font-weight: bold;
+}
+[data-title-attr='author'] {
+  display: block;
+  font-size: 1.25em;
+  font-weight: bold;
+  margin: $margin-double 0rem;
 }

data/lib/muwu/project_builder/assets/config/css/base/section_muwu_topic.scss

@@ -0,0 +1,38 @@
+[data-document-block='topic'] {
+  margin: $margin-triple 0rem;
+}
+[data-topic='section-number'] {
+  font-weight: bold;
+  margin-bottom: $margin-half;
+}
+[data-topic='section-heading'] {
+  font-weight: bold;
+  margin-bottom: $margin;
+  margin-top: $margin-half;
+}
+[data-depth='1'][data-topic='section-heading'] {
+  font-size: $font-size-h1;
+}
+[data-depth='1'][data-topic='section-number'] {
+  font-size: $font-size-h1;
+}
+[data-depth='2'][data-topic='section-heading'] {
+  font-size: 1.375em;
+}
+[data-depth='2'][data-topic='section-number'] {
+  font-size: 1.375em;
+}
+[data-depth='3'][data-topic='section-heading'] {
+  font-size: 1.25em;
+}
+[data-depth='3'][data-topic='section-number'] {
+  font-size: 1.25em;
+}
+[data-topic='navigation'] {
+  margin: $margin 0;
+  text-align: right;
+}
+[data-topic='navigation-link'] {
+  font-size: 0.8em;
+  margin: 0 $margin-half;
+}

data/lib/muwu/project_builder/assets/config/css/colors/dark.scss

@@ -1,32 +1,34 @@
-html {
-  color: #fffff8;
-  background-color: #101010;
+@media (prefers-color-scheme: dark) {
+  body {
+    background-color: #141414;
+    color: #e4e4e4;
+  }
+  *:focus {
+    background-color: rgba(255, 255, 0, 0.1);
+    outline-color: rgba(255, 255, 0, 0.2);
+    outline-style: solid;
+    outline-width: 1px;
+  }
+  a {
+    color: #ccddff;
+  }
+  a:visited {
+    color: #ddccff;
+  }
+  a:active {
+    color: #ffddcc;
+  }
+  img {
+    background-color: #0b0b0b;
+    border-width: 0px;
+    border-color: #7f7f7f;
+    border-style: solid;
+  }
+  pre {
+    background-color: #0b0b0b;
+    border-color: #333333;
+    border-style: solid;
+    border-width: 0px;
+    scrollbar-color: #666666 #2c2c2c;
+  }
 }
-
-div.contents .document_link {
-  color: #f8fff0;
-}
-div.navigator .document_link {
-  color: #f0f8ff;
-}
-div.subcontents .document_link {
-  color: #f8fff0;
-}
-div.text .document_link {
-  color: #f8fff0;
-}
-
-//  a {
-//    color: inherit;
-//  }
-
-img {
-  border-width: 0px;
-  border-color: #7f7f7f;
-  border-style: solid;
-}
-
-pre {
-  background-color: #000000;
-  border: 1px #7f7f7f solid;
-}

data/lib/muwu/project_builder/assets/config/css/colors/index.scss

@@ -1 +1,2 @@
-@import 'light';
+@import 'dark';
+@import 'light';

data/lib/muwu/project_builder/assets/config/css/colors/light.scss

@@ -1,34 +1,34 @@
-html {
-  background-color: #f4f4f0;
-  color: #080808;
+@media (prefers-color-scheme: light) {
+  body {
+    background-color: #f4f4f0;
+    color: #080808;
+  }
+  *:focus {
+    background-color: rgba(196, 196, 0, 0.25);
+    outline-color: rgba(196, 196, 0, 0.5);
+    outline-style: solid;
+    outline-width: 1px;
+  }
+  a {
+    color: #003377;
+  }
+  a:visited {
+    color: #330077;
+  }
+  a:active {
+    color: #773300;
+  }
+  img {
+    background-color: #e8e8e8;
+    border-width: 0px;
+    border-color: #000000;
+    border-style: solid;
+  }
+  pre {
+    background-color: #e8e8e8;
+    border-color: #d0d0d0;
+    border-style: solid;
+    border-width: 0px;
+    scrollbar-color: #808080 #bababa;
+  }
 }
-
-div.contents .document_link {
-  color: #002040;
-}
-div.navigator .document_link {
-  color: #204000;
-}
-div.subcontents .document_link {
-  color: #002040;
-}
-div.text .document_link {
-  color: #002040;
-}
-
-//  a {
-//    color: inherit;
-//  }
-
-img {
-  border-width: 0px;
-  border-color: #000000;
-  border-style: solid;
-}
-
-pre {
-  background-color: #fcfcfc;
-  border: 1px #e0e0e0 solid;
-}
-
-

data/lib/muwu/project_builder/project_validator.rb

@@ -139,31 +139,31 @@ module Muwu
     end
 
 
-    def validate_task_text_item(task)
+    def validate_task_topic(task)
       if task.is_parent_heading
-        return validate_task_text_item_parent_heading(task)
+        return validate_task_topic_parent_heading(task)
       elsif task.is_not_parent_heading
-        return validate_task_text_item_child_heading(task)
+        return validate_task_topic_child_heading(task)
       end
     end
 
 
-    def validate_task_text_item_child_heading(task)
+    def validate_task_topic_child_heading(task)
       if task.source_file_does_exist
         return true
       else
-        @project.exceptions_add ProjectException::TextSourceFileNotFound.new(task)
+        @project.exceptions_add ProjectException::TopicSourceFileNotFound.new(task)
         return false
       end
     end
 
 
-    def validate_task_text_item_parent_heading(task)
+    def validate_task_topic_parent_heading(task)
       if task.source_file_does_exist
         return true
       else
         if @project.options.warning_if_parent_heading_lacks_source
-          @project.exceptions_add ProjectException::TextSourceFileNotFound.new(task)
+          @project.exceptions_add ProjectException::TopicSourceFileNotFound.new(task)
           return false
         end
       end

data/lib/muwu/project_exception/{lynx_not_available.rb → no_html_viewer_configured.rb}

@@ -1,6 +1,6 @@
 module Muwu
   module ProjectException
-    class LynxNotAvailable
+    class NoHTMLViewerConfigured
 
 
       def initialize
@@ -9,7 +9,7 @@ module Muwu
 
 
       def report
-        "lynx is not available"
+        "No HTML viewer configued to run from the 'open' command."
       end
 
 

data/lib/muwu/project_exception/{text_source_file_not_found.rb → topic_source_file_not_found.rb}

@@ -1,15 +1,15 @@
 module Muwu
   module ProjectException
-    class TextSourceFileNotFound
-      
-      
+    class TopicSourceFileNotFound
+
+
       def initialize(text_readfile)
         @filename = text_readfile.source_filename
         @numbering = text_readfile.numbering
         @text_root_name = text_readfile.text_root_name
       end
-      
-      
+
+
       def report
         "file not found  `#{@filename}`  (#{@text_root_name} #{@numbering})"
       end
@@ -22,5 +22,4 @@ module Muwu
 
     end
   end
-end    
-    
+end

data/lib/muwu/project_options/project_options.rb

@@ -5,11 +5,11 @@ module Muwu
     attr_accessor(
       :generate_navigators_automatically,
       :generate_subcontents_automatically,
+      :generate_topic_inner_identifiers,
       :html_head_includes_metadata_tags,
       :html_lang,
       :html_uses_javascript_navigation,
       :markdown_allows_raw_html,
-      :markdown_renderer,
       :outline_text_pathnames,
       :output_destination,
       :output_file_css_basename,
@@ -45,6 +45,9 @@ module Muwu
     end
 
 
+    public
+
+
     def set_option(key, value)
       if Default::PROJECT_OPTIONS.has_key?(key)
         key_ivsym = "@#{key.to_s}"

data/lib/muwu/project_options_builder/project_option_validator_key.rb

@@ -1,10 +1,10 @@
 module Muwu
   class ProjectOptionValidatorKey
-   
-   
+
+
     include Muwu
-   
- 
+
+
     def initialize(key_as_provided, value_as_provided, project)
       @project = project
       @key_as_provided = key_as_provided
@@ -13,26 +13,24 @@ module Muwu
       @key_validated = validate_key
       @value_validated = validate_value
     end
-    
-    
-    
+
+
     public
-    
-    
+
+
     def validated_key
       @key_validated
     end
-    
-    
+
+
     def validated_value
       @value_validated
     end
-        
-    
-        
+
+
     private
-    
-    
+
+
     def validate_key
       key = @key_as_provided.downcase.gsub(/\W/,'_').to_sym
       key_is_valid = Default::PROJECT_OPTIONS.keys.include?(key)
@@ -50,7 +48,7 @@ module Muwu
         ProjectOptionValidatorValue.new(@key_validated, @value_as_provided, @project).validated_value
       end
     end
-    
-    
+
+
   end
-end
+end