asciidoctor-pdf 1.6.2 → 2.0.0.alpha.1

data/data/themes/base-theme.yml

@@ -1,6 +1,4 @@
 # NOTE file is read "as is"; variables are not parsed; key layout must be flat
-# QUESTION should vertical_spacing be block_spacing instead?
-vertical_spacing: 12
 page_background_color: 'FFFFFF'
 page_layout: portrait
 page_initial_zoom: FitH
@@ -21,6 +19,7 @@ base_font_style: normal
 base_line_height: 1.15
 base_border_color: 'EEEEEE'
 base_border_width: 0.5
+role_lead_font_size: 13.5
 role_line-through_text_decoration: line-through
 role_underline_text_decoration: underline
 role_big_font_size: 14
@@ -29,12 +28,13 @@ role_subtitle_font_size: 0.8em
 button_content: '[%s]'
 button_font_family: Courier
 button_font_style: bold
-key_font_family: Courier
-key_font_style: italic
-mark_background_color: ffff00
+kbd_font_family: Courier
+kbd_font_style: italic
+mark_background_color: 'FFFF00'
 mark_border_offset: 1
+menu_font_style: bold
 link_font_color: '0000EE'
-literal_font_family: Courier
+codespan_font_family: Courier
 heading_font_style: bold
 heading_h1_font_size: 24
 heading_h2_font_size: 18
@@ -53,12 +53,12 @@ title_page_title_top: 40%
 title_page_title_font_size: 18
 title_page_subtitle_font_size: 14
 title_page_authors_margin_top: 12
-outline_list_indent: 30
-outline_list_item_spacing: 6
+list_indent: 30
+list_item_spacing: 6
 description_list_description_indent: 30
 description_list_term_font_style: bold
 description_list_term_spacing: 4
-block_margin_top: 0
+callout_list_margin_top_after_code: -6
 block_margin_bottom: 12
 caption_align: left
 caption_font_style: italic
@@ -71,15 +71,15 @@ abstract_title_align: center
 abstract_title_font_style: bold
 admonition_column_rule_color: 'EEEEEE'
 admonition_column_rule_width: 0.5
-admonition_padding: [0, 12, 0, 12]
+admonition_padding: [4, 12, 4, 12]
 admonition_label_font_style: bold
 admonition_label_text_transform: uppercase
-blockquote_border_color: 'EEEEEE'
-blockquote_border_left_width: 4
-blockquote_padding: [6, 12, -6, 14]
+quote_border_color: 'EEEEEE'
+quote_border_left_width: 4
+quote_padding: [6, 12, 6, 14]
 verse_border_color: 'EEEEEE'
 verse_border_left_width: 4
-verse_padding: [6, 12, -6, 14]
+verse_padding: [6, 12, 6, 14]
 code_font_family: Courier
 code_font_size: 10.8
 code_line_height: 1.2
@@ -91,16 +91,11 @@ conum_glyphs: circled
 example_background_color: 'FFFFFF'
 example_border_color: 'EEEEEE'
 example_border_width: 0.5
-# FIXME reenable margin bottom once margin collapsing is implemented
-example_padding: [12, 12, 0, 12]
+example_padding: 12
 image_align: left
-lead_font_size: 13.5
-lead_line_height: 1.4
-prose_margin_top: 0
 prose_margin_bottom: 12
 sidebar_background_color: 'EEEEEE'
-# FIXME reenable margin bottom once margin collapsing is implemented
-sidebar_padding: [12, 12, 0, 12]
+sidebar_padding: 12
 sidebar_title_align: center
 sidebar_title_font_style: bold
 table_border_color: '000000'
@@ -113,9 +108,10 @@ table_body_stripe_background_color: 'EEEEEE'
 thematic_break_border_color: 'EEEEEE'
 thematic_break_border_style: solid
 thematic_break_border_width: 0.5
+thematic_break_margin_bottom: 12
 toc_indent: 15
 toc_line_height: 1.4
 footnotes_font_size: 9
-footnotes_item_space: 3
+footnotes_item_spacing: 3
 footer_recto_right_content: '{page-number}'
 footer_verso_left_content: '{page-number}'

data/data/themes/default-for-print-theme.yml

@@ -0,0 +1,24 @@
+extends: default
+base_border_color: BBBBBB
+base_font_color: 000000
+role_subtitle_font_color: 666666
+link_font_color: ~
+literal_font_color: ~
+mark_background_color: CCCCCC
+menu_caret_content: " <font size=\"1.15em\">\u203a</font> "
+heading_font_color: $base_font_color
+title_page_title_font_color: $role_subtitle_font_color
+abstract_font_color: 2C2C2C
+abstract_title_font_color: $heading_font_color
+admonition_column_rule_color: $base_border_color
+blockquote_border_color: $base_border_color
+blockquote_cite_font_color: $role_subtitle_font_color
+verse_border_color: $base_border_color
+verse_cite_font_color: $blockquote_cite_font_color
+code_font_color: $base_font_color
+conum_font_color: $base_font_color
+example_border_color: $base_border_color
+sidebar_title_font_color: $heading_font_color
+thematic_break_border_color: $base_border_color
+toc_dot_leader_font_color: ~
+footer_border_color: CCCCCC

data/data/themes/default-for-print-with-fallback-font-theme.yml

@@ -0,0 +1,3 @@
+extends:
+- default-for-print
+- default-with-fallback-font

data/data/themes/default-theme.yml

@@ -2,16 +2,16 @@ font:
   catalog:
     # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols
     Noto Serif:
-      normal: notoserif-regular-subset.ttf
-      bold: notoserif-bold-subset.ttf
-      italic: notoserif-italic-subset.ttf
-      bold_italic: 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: mplus1mn-regular-subset.ttf
-      bold: mplus1mn-bold-subset.ttf
-      italic: mplus1mn-italic-subset.ttf
-      bold_italic: 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
 page:
   background_color: FFFFFF
   layout: portrait
@@ -53,6 +53,8 @@ base:
   border_radius: 4
   border_width: 0.5
 role:
+  lead:
+    font_size: $base_font_size_large
   line-through:
     text_decoration: line-through
   underline:
@@ -62,37 +64,37 @@ role:
   small:
     font_size: $base_font_size_small
   subtitle:
-    font_size: 0.8em
     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
-# QUESTION should vertical_spacing be block_spacing instead?
-vertical_spacing: $vertical_rhythm
 link:
   font_color: 428BCA
-# literal is currently used for inline monospaced in prose and table cells
-literal:
+# codespan is currently used for monospaced phrases and table cells
+codespan:
   font_color: B12146
   font_family: M+ 1mn
 button:
   content: "[\u2009%s\u2009]"
   font_style: bold
-key:
+kbd:
   background_color: F5F5F5
   border_color: CCCCCC
   border_offset: 2
   border_radius: 2
   border_width: 0.5
-  font_family: $literal_font_family
+  font_family: $codespan_font_family
   separator: "\u202f+\u202f"
 mark:
   background_color: FFFF00
   border_offset: 1
 menu:
-  caret_content: " <font size=\"1.15em\"><color rgb=\"b12146\">\u203a</color></font> "
+  caret_content: " <font size=\"1.15em\" color=\"#B12146\">\u203a</font> "
+  font_style: bold
 heading:
   align: left
   font_color: $base_font_color
@@ -118,7 +120,7 @@ title_page:
   title:
     top: 55%
     font_size: $heading_h1_font_size
-    font_color: 999999
+    font_color: $role_subtitle_font_color
     line_height: 0.9
   subtitle:
     font_size: $heading_h3_font_size
@@ -131,7 +133,6 @@ title_page:
   revision:
     margin_top: $base_font_size * 1.25
 block:
-  margin_top: 0
   margin_bottom: $vertical_rhythm
 caption:
   align: left
@@ -139,15 +140,11 @@ caption:
   font_style: italic
   # FIXME perhaps set line_height instead of / in addition to margins?
   margin_inside: $vertical_rhythm / 3
-  #margin_inside: $vertical_rhythm / 4
   margin_outside: 0
-lead:
-  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_size: $role_lead_font_size
+  line_height: 1.4
   font_style: italic
   first_line_font_style: bold
   title:
@@ -158,7 +155,7 @@ abstract:
 admonition:
   column_rule_color: $base_border_color
   column_rule_width: $base_border_width
-  padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm]
+  padding: [$vertical_rhythm / 3.0, $horizontal_rhythm, $vertical_rhythm / 3.0, $horizontal_rhythm]
   #icon:
   #  tip:
   #    name: far-lightbulb
@@ -167,27 +164,28 @@ admonition:
   label:
     text_transform: uppercase
     font_style: bold
-blockquote:
+quote:
   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]
-  cite_font_size: $base_font_size_small
-  cite_font_color: 999999
+  padding: [0, $horizontal_rhythm, $block_margin_bottom * 0.25, $horizontal_rhythm + $quote_border_left_width / 2]
+  cite:
+    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
-  cite_font_size: $blockquote_cite_font_size
-  cite_font_color: $blockquote_cite_font_color
-# code is used for source blocks (perhaps change to source or listing?)
+  font_size: $quote_font_size
+  border_color: $quote_border_color
+  border_width: $quote_border_width
+  border_left_width: $quote_border_left_width
+  padding: $quote_padding
+  cite:
+    font_size: $quote_cite_font_size
+    font_color: $quote_cite_font_color
+# code is used for literal, listing, and source blocks and literal table cells
 code:
   font_color: $base_font_color
-  font_family: $literal_font_family
+  font_family: $codespan_font_family
   font_size: ceil($base_font_size)
   padding: $code_font_size
   line_height: 1.25
@@ -198,8 +196,8 @@ code:
   border_radius: $base_border_radius
   border_width: 0.75
 conum:
-  font_family: $literal_font_family
-  font_color: $literal_font_color
+  font_family: $codespan_font_family
+  font_color: $codespan_font_color
   font_size: $base_font_size
   line_height: 4 / 3
   glyphs: circled
@@ -208,20 +206,17 @@ example:
   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]
+  padding: [$vertical_rhythm, $horizontal_rhythm, $vertical_rhythm, $horizontal_rhythm]
 image:
   align: left
 prose:
-  margin_top: $block_margin_top
   margin_bottom: $block_margin_bottom
 sidebar:
   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, $vertical_rhythm, $vertical_rhythm * 1.25]
   title:
     align: center
     font_color: $heading_font_color
@@ -233,15 +228,17 @@ thematic_break:
   border_width: $base_border_width
   margin_top: $vertical_rhythm * 0.5
   margin_bottom: $vertical_rhythm * 1.5
+list:
+  indent: $horizontal_rhythm * 1.5
+  #marker_font_color: 404040
+  # NOTE list_item_spacing only applies to list items that do not have complex content
+  item_spacing: $vertical_rhythm / 2
 description_list:
   term_font_style: bold
   term_spacing: $vertical_rhythm / 4
   description_indent: $horizontal_rhythm * 1.25
-outline_list:
-  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
+callout_list:
+  margin_top_after_code: -$block_margin_bottom / 2
 table:
   background_color: $page_background_color
   border_color: DDDDDD
@@ -263,7 +260,7 @@ toc:
     #levels: 2 3
 footnotes:
   font_size: round($base_font_size * 0.75)
-  item_spacing: $outline_list_item_spacing / 2
+  item_spacing: $list_item_spacing / 2
 header:
   font_size: $base_font_size_small
   line_height: 1
@@ -278,10 +275,8 @@ footer:
   padding: [$base_line_height_length / 2, 1, 0, 1]
   vertical_align: top
   recto:
-    #columns: "<50% =0% >50%"
     right:
       content: '{page-number}'
   verso:
-    #columns: $footer_recto_columns
     left:
       content: $footer_recto_right_content

data/data/themes/default-with-fallback-font-theme.yml

@@ -4,6 +4,6 @@ font:
     merge: true
     # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
     # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
-    M+ 1p Fallback: mplus1p-regular-fallback.ttf
-    Noto Emoji: notoemoji-subset.ttf
+    M+ 1p Fallback: GEM_FONTS_DIR/mplus1p-regular-fallback.ttf
+    Noto Emoji: GEM_FONTS_DIR/notoemoji-subset.ttf
   fallbacks: [M+ 1p Fallback, Noto Emoji]

data/data/themes/sans-with-fallback-font-theme.yml

@@ -0,0 +1,10 @@
+extends: default-with-fallback-font
+font:
+  catalog:
+    merge: true
+    Noto Sans:
+      normal: GEM_FONTS_DIR/notosans-regular-subset.ttf
+      bold: GEM_FONTS_DIR/notosans-bold-subset.ttf
+      italic: GEM_FONTS_DIR/notosans-italic-subset.ttf
+      bold_italic: GEM_FONTS_DIR/notosans-bold_italic-subset.ttf
+base_font_family: Noto Sans