j1-template 2021.0.6 → 2021.0.7

data/lib/j1/commands/generate.rb

@@ -140,12 +140,13 @@ module J1
             system_path = result[1]
             if options['system']
               J1.logger.info "Install patches on path #{system_path} ..."
+              dest = system_path + '/gems/' + patch_gem + '/lib'
             else
               J1.logger.info "Install patches on path #{user_path} ..."
-              src = patch_source_path
               dest = user_path + '/gems/' + patch_gem + '/lib'
-              FileUtils.cp_r(src, dest)
             end
+            src = patch_source_path
+            FileUtils.cp_r(src, dest)
           end
         end
 

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.0.6'
+  VERSION = '2021.0.7'
 end

data/lib/starter_web/Gemfile

@@ -54,7 +54,7 @@ gem 'jekyll', '~> 4.2'
 
 # Theme Rubies, default: J1 Template
 #
-gem 'j1-template', '~> 2021.0.6'
+gem 'j1-template', '~> 2021.0.7'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2021.0.6
+version:                                2021.0.7
 
 # version
 # ------------------------------------------------------------------------------
@@ -386,7 +386,7 @@ exclude:                                [
                                           '.sass-cache', '.vscode',
                                           '.idea', '*.ignore',
                                           '*.bat', '*.sh', '*.tmp', 'dot.*',
-                                          '*.txt', '*.log', '*.ppt*',
+                                          '*.txt', '*.log', '*.ppt*', '*.pdf',
                                           '*.zip', '*.7z', '*.tgz', '*.tar',
                                           '*.a2p', '*.asciidoc'
                                         ]

data/lib/starter_web/_data/asciidoc2pdf/themes/j1-theme.yml

@@ -19,46 +19,48 @@
 # ------------------------------------------------------------------------------
 font:
   catalog:
-    # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols
+    # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A,
+    # Greek, Cyrillic, Vietnamese & an assortment of symbols
     Noto Serif:
-      normal: GEM_FONTS_DIR/notoserif-regular-subset.ttf
-      bold: GEM_FONTS_DIR/notoserif-bold-subset.ttf
-      italic: GEM_FONTS_DIR/notoserif-italic-subset.ttf
-      bold_italic: GEM_FONTS_DIR/notoserif-bold_italic-subset.ttf
+      normal:                           GEM_FONTS_DIR/notoserif-regular-subset.ttf
+      bold:                             GEM_FONTS_DIR/notoserif-bold-subset.ttf
+      italic:                           GEM_FONTS_DIR/notoserif-italic-subset.ttf
+      bold_italic:                      GEM_FONTS_DIR/notoserif-bold_italic-subset.ttf
     # M+ 1mn supports ASCII and the circled numbers used for conums
     M+ 1mn:
-      normal: GEM_FONTS_DIR/mplus1mn-regular-subset.ttf
-      bold: GEM_FONTS_DIR/mplus1mn-bold-subset.ttf
-      italic: GEM_FONTS_DIR/mplus1mn-italic-subset.ttf
-      bold_italic: GEM_FONTS_DIR/mplus1mn-bold_italic-subset.ttf
+      normal:                           GEM_FONTS_DIR/mplus1mn-regular-subset.ttf
+      bold:                             GEM_FONTS_DIR/mplus1mn-bold-subset.ttf
+      italic:                           GEM_FONTS_DIR/mplus1mn-italic-subset.ttf
+      bold_italic:                      GEM_FONTS_DIR/mplus1mn-bold_italic-subset.ttf
     # j1 is using roboto for default
     Roboto:
-      normal: ../fonts/Roboto-Regular.ttf
-      bold: ../fonts/Roboto-Bold.ttf
-      italic: ../fonts/Roboto-Italic.ttf
-      bold_italic: ../fonts/Roboto-BoldItalic.ttf
+      normal:                           ../fonts/Roboto-Regular.ttf
+      bold:                             ../fonts/Roboto-Bold.ttf
+      italic:                           ../fonts/Roboto-Italic.ttf
+      bold_italic:                      ../fonts/Roboto-BoldItalic.ttf
 
 page:
-  background_color: FFFFFF
-  layout: portrait
-# layout: landscape
-  initial_zoom: FitH
-  margin: [0.5in, 0.67in, 0.67in, 0.67in]
-  # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress
-  margin_inner: 0.75in
-  margin_outer: 0.59in
-  size: A4
+  background_color:                     FFFFFF
+  layout:                               portrait                                # landscape
+  initial_zoom:                         FitH
+  margin:                               [0.5in, 0.67in, 0.67in, 0.67in]
+  # margin_inner and margin_outer keys are used for recto/verso print
+  # margins when media=prepress
+  margin_inner:                         0.75in
+  margin_outer:                         0.59in
+  size:                                 A4
+
 base:
-  align: justify
+  align:                                justify
   # color as hex string (leading # is optional)
-  font_color: 333333
+  font_color:                           333333
   # color as RGB array
   #font_color: [51, 51, 51]
   # color as CMYK array (approximated)
   #font_color: [0, 0, 0, 0.92]
   #font_color: [0, 0, 0, 92%]
   # font_family: Noto Serif
-  font_family: Roboto
+  font_family:                          Roboto
   # choose one of these font_size/line_height_length combinations
   #font_size: 14
   #line_height_length: 20
@@ -66,250 +68,285 @@ base:
   #line_height_length: 18
   #font_size: 11.2
   #line_height_length: 16
-  font_size: 10.5
+  font_size:                            10.5
   #line_height_length: 15
   # correct line height for Noto Serif metrics
   line_height_length: 12
   #font_size: 11.25
   #line_height_length: 18
-  line_height: $base_line_height_length / $base_font_size
-  font_size_large: round($base_font_size * 1.25)
-  font_size_small: round($base_font_size * 0.85)
-  font_size_min: $base_font_size * 0.75
-  font_style: normal
-  border_color: EEEEEE
-  border_radius: 4
-  border_width: 0.5
+  line_height:                          $base_line_height_length / $base_font_size
+  font_size_large:                      round($base_font_size * 1.25)
+  font_size_small:                      round($base_font_size * 0.85)
+  font_size_min:                        $base_font_size * 0.75
+  font_style:                           normal
+  border_color:                         EEEEEE
+  border_radius:                        4
+  border_width:                         0.5
+
 role:
   line-through:
-    text_decoration: line-through
+    text_decoration:                    line-through
   underline:
-    text_decoration: underline
+    text_decoration:                    underline
   big:
-    font_size: $base_font_size_large
+    font_size:                          $base_font_size_large
   small:
-    font_size: $base_font_size_small
+    font_size:                          $base_font_size_small
   subtitle:
-    font_color: 999999
-    font_size: 0.8em
-    font_style: normal_italic
+    font_color:                         999999
+    font_size:                          0.8em
+    font_style:                         normal_italic
+
 # FIXME vertical_rhythm is weird; we should think in terms of ems
 #vertical_rhythm: $base_line_height_length * 2 / 3
 # correct line height for Noto Serif metrics (comes with built-in line height)
-vertical_rhythm: $base_line_height_length
-horizontal_rhythm: $base_line_height_length
+vertical_rhythm:                        $base_line_height_length
+horizontal_rhythm:                      $base_line_height_length
+
 link:
-  font_color: 428BCA
+  font_color:                           428BCA
+
 # literal is currently used for inline monospaced in prose and table cells
 literal:
-  font_color: B12146
-  font_family: M+ 1mn
+  font_color:                           B12146
+  font_family:                          M+ 1mn
+
 button:
-  content: "[\u2009%s\u2009]"
-  font_style: bold
+  content:                              "[\u2009%s\u2009]"
+  font_style:                           bold
+
 key:
-  background_color: F5F5F5
-  border_color: CCCCCC
-  border_offset: 2
-  border_radius: 2
-  border_width: 0.5
-  font_family: $literal_font_family
-  separator: "\u202f+\u202f"
+  background_color:                     F5F5F5
+  border_color:                         CCCCCC
+  border_offset:                        2
+  border_radius:                        2
+  border_width:                         0.5
+  font_family:                          $literal_font_family
+  separator:                            "\u202f+\u202f"
+
 mark:
-  background_color: FFFF00
-  border_offset: 1
+  background_color:                     FFFF00
+  border_offset:                        1
+
 menu:
-  caret_content: " <font size=\"1.15em\" color=\"#B12146\">\u203a</font> "
+  caret_content:                        " <font size=\"1.15em\" color=\"#B12146\">\u203a</font> "
+
 heading:
-  align: left
+  align:                                left
 # font-family: Roboto-Bold
-  font_color: $base_font_color
-  font_style: bold
+  font_color:                           $base_font_color
+  font_style:                           bold
   # h1 is used for part titles (book doctype) or the doctitle (article doctype)
-  h1_font_size: floor($base_font_size * 2.6)
+  h1_font_size:                         floor($base_font_size * 2.6)
   # h2 is used for chapter titles (book doctype only)
-  h2_font_size: floor($base_font_size * 2.15)
-  h3_font_size: round($base_font_size * 1.7)
-  h4_font_size: $base_font_size_large
-  h5_font_size: $base_font_size
-  h6_font_size: $base_font_size_small
+  h2_font_size:                         floor($base_font_size * 2.15)
+  h3_font_size:                         round($base_font_size * 1.7)
+  h4_font_size:                         $base_font_size_large
+  h5_font_size:                         $base_font_size
+  h6_font_size:                         $base_font_size_small
   #line_height: 1.4
   # correct line height for Noto Serif metrics (comes with built-in line height)
-  line_height: 1
-  margin_top: $vertical_rhythm * 0.4
-  margin_bottom: $vertical_rhythm * 0.9
-  min_height_after: $base_line_height_length * 1.5
+  line_height:                          1
+  margin_top:                           $vertical_rhythm * 0.4
+  margin_bottom:                        $vertical_rhythm * 0.9
+  min_height_after:                     $base_line_height_length * 1.5
+
 title_page:
-  align: right
+  align:                                right
   logo:
-    top: 10%
+    top:                                10%
   title:
-    top: 55%
-    font_size: $heading_h1_font_size
-    font_color: $role_subtitle_font_color
-    line_height: 0.9
+    top:                                55%
+    font_size:                          $heading_h1_font_size
+    font_color:                         $role_subtitle_font_color
+    line_height:                        0.9
   subtitle:
-    font_size: $heading_h3_font_size
-    font_style: bold_italic
-    line_height: 1
+    font_size:                          $heading_h3_font_size
+    font_style:                         bold_italic
+    line_height:                        1
   authors:
-    margin_top: $base_font_size * 1.25
-    font_size: $base_font_size_large
-    font_color: 181818
+    margin_top:                         $base_font_size * 1.25
+    font_size:                          $base_font_size_large
+    font_color:                         181818
   revision:
-    margin_top: $base_font_size * 1.25
+    margin_top:                         $base_font_size * 1.25
+
 block:
-  margin_bottom: $vertical_rhythm
+  margin_bottom:                        $vertical_rhythm
+
 caption:
-  align: left
-  font_size: $base_font_size * 0.95
-  font_style: italic
+  align:                                left
+  font_size:                            $base_font_size * 0.95
+  font_style:                           italic
   # FIXME perhaps set line_height instead of / in addition to margins?
-  margin_inside: $vertical_rhythm / 3
+  margin_inside:                        $vertical_rhythm / 3
   #margin_inside: $vertical_rhythm / 4
-  margin_outside: 0
+  margin_outside:                       0
+
 lead:
-  font_size: $base_font_size_large
-  line_height: 1.4
+  font_size:                            $base_font_size_large
+  line_height:                          1.4
+
 abstract:
-  font_color: 5C6266
-  font_size: $lead_font_size
-  line_height: $lead_line_height
-  font_style: italic
-  first_line_font_style: bold
+  font_color:                           5C6266
+  font_size:                            $lead_font_size
+  line_height:                          $lead_line_height
+  font_style:                           italic
+  first_line_font_style:                bold
   title:
-    align: center
-    font_color: $heading_font_color
-    font_size: $heading_h4_font_size
-    font_style: $heading_font_style
+    align:                              center
+    font_color:                         $heading_font_color
+    font_size:                          $heading_h4_font_size
+    font_style:                         $heading_font_style
+
 admonition:
-  column_rule_color: $base_border_color
-  column_rule_width: $base_border_width
-  padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm]
+  column_rule_color:                    $base_border_color
+  column_rule_width:                    $base_border_width
+  padding:                              [0, $horizontal_rhythm, 0, $horizontal_rhythm]
   #icon:
   #  tip:
   #    name: far-lightbulb
   #    stroke_color: 111111
   #    size: 24
   label:
-    text_transform: uppercase
-    font_style: bold
+    text_transform:                     uppercase
+    font_style:                         bold
+
 blockquote:
-  font_size: $base_font_size_large
-  border_color: $base_border_color
-  border_width: 0
-  border_left_width: 5
+  font_size:                            $base_font_size_large
+  border_color:                         $base_border_color
+  border_width:                         0
+  border_left_width:                    5
   # FIXME disable negative padding bottom once margin collapsing is implemented
-  padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_left_width / 2]
+  padding:                              [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_left_width / 2]
   cite:
-    font_size: $base_font_size_small
-    font_color: $role_subtitle_font_color
+    font_size:                          $base_font_size_small
+    font_color:                         $role_subtitle_font_color
+
 verse:
-  font_size: $blockquote_font_size
-  border_color: $blockquote_border_color
-  border_width: $blockquote_border_width
-  border_left_width: $blockquote_border_left_width
-  padding: $blockquote_padding
+  font_size:                            $blockquote_font_size
+  border_color:                         $blockquote_border_color
+  border_width:                         $blockquote_border_width
+  border_left_width:                    $blockquote_border_left_width
+  padding:                              $blockquote_padding
   cite:
-    font_size: $blockquote_cite_font_size
-    font_color: $blockquote_cite_font_color
+    font_size:                          $blockquote_cite_font_size
+    font_color:                         $blockquote_cite_font_color
+
 # code is used for source blocks (perhaps change to source or listing?)
 code:
-  font_color: $base_font_color
-  font_family: $literal_font_family
-  font_size: ceil($base_font_size)
-  padding: $code_font_size
-  line_height: 1.25
-  # line_gap is an experimental property to control how a background color is applied to an inline block element
-  line_gap: 3.8
-  background_color: F5F5F5
-  border_color: CCCCCC
-  border_radius: $base_border_radius
-  border_width: 0.75
+  font_color:                           $base_font_color
+  font_family:                          $literal_font_family
+  font_size:                            ceil($base_font_size)
+  padding:                              $code_font_size
+  line_height:                          1.25
+  # line_gap is an experimental property to control how a background
+  # color is applied to an inline block element
+  line_gap:                             3.8
+  background_color:                     F5F5F5
+  border_color:                         CCCCCC
+  border_radius:                        $base_border_radius
+  border_width:                         0.75
+
 conum:
-  font_family: $literal_font_family
-  font_color: $literal_font_color
-  font_size: $base_font_size
-  line_height: 4 / 3
-  glyphs: circled
+  font_family:                          $literal_font_family
+  font_color:                           $literal_font_color
+  font_size:                            $base_font_size
+  line_height:                          4 / 3
+  glyphs:                               circled
+
 example:
-  border_color: $base_border_color
-  border_radius: $base_border_radius
-  border_width: 0.75
-  background_color: $page_background_color
-  # FIXME reenable padding bottom once margin collapsing is implemented
-  padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
+  border_color:                         $base_border_color
+  border_radius:                        $base_border_radius
+  border_width:                         0.75
+  background_color:                     $page_background_color
+  # FIXME reenable padding bottom once margin collapsing
+  # is implemented
+  padding:                              [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
+
 image:
-  align: left
+  align:                                left
+
 prose:
-  margin_bottom: $block_margin_bottom
+  margin_bottom:                        $block_margin_bottom
+
 sidebar:
-  background_color: EEEEEE
-  border_color: E1E1E1
-  border_radius: $base_border_radius
-  border_width: $base_border_width
+  background_color:                     EEEEEE
+  border_color:                         E1E1E1
+  border_radius:                        $base_border_radius
+  border_width:                         $base_border_width
   # FIXME reenable padding bottom once margin collapsing is implemented
-  padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25]
+  padding:                              [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25]
   title:
-    align: center
-    font_color: $heading_font_color
-    font_size: $heading_h4_font_size
-    font_style: $heading_font_style
+    align:                              center
+    font_color:                         $heading_font_color
+    font_size:                          $heading_h4_font_size
+    font_style:                         $heading_font_style
+
 thematic_break:
-  border_color: $base_border_color
-  border_style: solid
-  border_width: $base_border_width
-  margin_top: $vertical_rhythm * 0.5
-  margin_bottom: $vertical_rhythm * 1.5
+  border_color:                         $base_border_color
+  border_style:                         solid
+  border_width:                         $base_border_width
+  margin_top:                           $vertical_rhythm * 0.5
+  margin_bottom:                        $vertical_rhythm * 1.5
+
 description_list:
-  term_font_style: bold
-  term_spacing: $vertical_rhythm / 4
-  description_indent: $horizontal_rhythm * 1.25
+  term_font_style:                      bold
+  term_spacing:                         $vertical_rhythm / 4
+  description_indent:                   $horizontal_rhythm * 1.25
+
 outline_list:
-  indent: $horizontal_rhythm * 1.5
+  indent:                               $horizontal_rhythm * 1.5
   #marker_font_color: 404040
-  # NOTE outline_list_item_spacing applies to list items that do not have complex content
-  item_spacing: $vertical_rhythm / 2
+  # NOTE outline_list_item_spacing applies to list items that
+  # do not have complex content
+  item_spacing:                         $vertical_rhythm / 2
+
 table:
-  background_color: $page_background_color
-  border_color: DDDDDD
-  border_width: $base_border_width
-  cell_padding: 3
+  background_color:                     $page_background_color
+  border_color:                         DDDDDD
+  border_width:                         $base_border_width
+  cell_padding:                         3
   head:
-    font_style: bold
-    border_bottom_width: $base_border_width * 2.5
+    font_style:                         bold
+    border_bottom_width:                $base_border_width * 2.5
   body:
-    stripe_background_color: F9F9F9
+    stripe_background_color:            F9F9F9
   foot:
-    background_color: F0F0F0
+    background_color:                   F0F0F0
+
 toc:
-  indent: $horizontal_rhythm
-  line_height: 1.4
+  indent:                               $horizontal_rhythm
+  line_height:                          1.4
   dot_leader:
     #content: ". "
-    font_color: A9A9A9
+    font_color:                         A9A9A9
     #levels: 2 3
+
 footnotes:
-  font_size: round($base_font_size * 0.75)
-  item_spacing: $outline_list_item_spacing / 2
+  font_size:                            round($base_font_size * 0.75)
+  item_spacing:                         $outline_list_item_spacing / 2
+
 header:
-  font_size: $base_font_size_small
-  line_height: 1
-  vertical_align: middle
+  font_size:                            $base_font_size_small
+  line_height:                          1
+  vertical_align:                       middle
+
 footer:
-  font_size: $base_font_size_small
-  # NOTE if background_color is set, background and border will span width of page
-  border_color: DDDDDD
+  font_size:                            $base_font_size_small
+  # NOTE if background_color is set, background and border
+  # will span width of page
+  border_color:                         DDDDDD
   border_width: 0.25
-  height: $base_line_height_length * 2.5
+  height:                               $base_line_height_length * 2.5
   line_height: 1
-  padding: [$base_line_height_length / 2, 1, 0, 1]
-  vertical_align: top
+  padding:                              [$base_line_height_length / 2, 1, 0, 1]
+  vertical_align:                       top
   recto:
     #columns: "<50% =0% >50%"
     right:
-      content: '{page-number}'
+      content:                          '{page-number}'
   verso:
     #columns: $footer_recto_columns
     left:
-      content: $footer_recto_right_content
+      content:                          $footer_recto_right_content