diff --git a/themes/riscv-pdf.yml b/themes/riscv-pdf.yml
index 9a32790..9a9705c 100644
--- a/themes/riscv-pdf.yml
+++ b/themes/riscv-pdf.yml
@@ -3,15 +3,13 @@ extends: default
font:
catalog:
merge: true
-# sans-serif: GEM_FONTS_DIR/mplus1p-regular-fallback.ttf
- #Petrona
+ sans-serif: GEM_FONTS_DIR/mplus1p-regular-fallback.ttf
body:
normal: Petrona-Light.ttf
bold: Petrona-Medium.ttf
italic: Petrona-LightItalic.ttf
bold_italic: Petrona-MediumItalic.ttf
header_thin: Petrona-Thin.ttf
- #Montserrat
headings:
normal: Montserrat-Regular.ttf
italic: Montserrat-Italic.ttf
@@ -22,7 +20,6 @@ font:
bold: cmunbtl.ttf
italic: cmunbto.ttf
bold_italic: cmunbto.ttf
- # M+ 1mn supports ASCII and the circled numbers used for conums
M+ 1mn:
normal: mplus-1mn-regular.ttf
bold: mplus-1mn-bold.ttf
@@ -38,8 +35,6 @@ font:
italic: droid-sans-fallback.ttf
bold: droid-sans-fallback.ttf
bold_italic: droid-sans-fallback.ttf
- # 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
fallbacks:
- M+ 1p Fallback
- Droid Fallback
@@ -48,8 +43,11 @@ font:
page:
background_color: ffffff
layout: portrait
- 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:
+ - 0.5in
+ - 0.67in
+ - 0.67in
+ - 0.67in
margin_inner: 0.75in
margin_outer: 0.59in
size: A4
@@ -65,30 +63,27 @@ base:
border_width: 0.25
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
- # codespan is currently used for inline monospaced in prose and table cells
codespan:
- font-color: 000000
- #font_family: code
- #font_family: Droid Fallback
+ font-color: 0
font_family: M+ 1mn
font_style: normal
- font-size: 11.5
menu_caret_content: ' › '
heading:
align: left
- font_color: 3e058e
+ margin_bottom: $block_margin_bottom
+ margin_top: $block_margin_bottom
+ min_height_after: auto
+ font_color: 0
font_family: headings
- font_style: light
+ font_style: bold
h1_font_size: floor($base_font_size * 2.8)
- # 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
+ h2-font-size: 11.5
+ h3-font-size: 11.5
+ h4-font-size: 11.5
+ h5-font-size: 11.5
h6_font_size: $base_font_size_small
title_page:
align: center
@@ -104,6 +99,7 @@ title_page:
font_family: headings
font_style: light
font_size: floor($base_font_size * 1.2)
+ margin-top: 25
authors:
font_family: headings
font_color: 3e058e
@@ -118,9 +114,7 @@ caption:
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 / 4
margin_outside: 0
lead:
font_size: $base_font_size_large
@@ -151,19 +145,22 @@ sidebar-title:
align: left
admonition:
font-style: italic
- #column_rule_color: $base_border_color
column_rule_width: $base_border_width
- padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm]
+ padding:
+ - 0
+ - $horizontal_rhythm
+ - 0
+ - $horizontal_rhythm
icon:
note:
name: far-edit
stroke_color: 6489b3
tip:
- name: comments-o
- stroke_color: 646b74
- size: 24
+ name: far-comments
+ stroke_color: 646b74
+ size: 24
important:
- name: info
+ name: fas-info-circle
stroke_color: 5f8c8b
warning:
stroke_color: 9c4d4b
@@ -172,48 +169,38 @@ admonition:
label:
text_transform: uppercase
font_style: bold
-#blockquote:
-# font_color: $base_font_color
-# font_size: $base_font_size_large
-# border_color: $base_border_color
-# border_width: 2
-# FIXME disable negative padding bottom once margin collapsing is implemented
-# padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2]
-# cite_font_size: $base_font_size_small
-# cite_font_color: 51278d
-# code is used for source blocks (perhaps change to source or listing?)
code:
-# font_color: $base_font_color
+ font-color: 0
font_family: $codespan_font_family
- #font_size: ceil($base_font_size)
- font-size: 9
+ font-size: 11
padding: $code_font_size
line_height: 1.15
- # 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: f4f4fb
- border_color: cccccc
- border_radius: $base_border_radius
- border_width: 0.2
+ fackgroud_color: ffffff
+ caption:
+ end: bottom
conum:
font_family: M+ 1mn
font_color: $codespan_font_color
font_size: $base_font_size
line_height: 4 / 3
example:
-# border_color: $base_border_color
border_radius: $base_border_radius
border_width: 0.2
background_color: ffffff
- # FIXME reenable padding bottom once margin collapsing is implemented
- padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
+ padding:
+ - $vertical_rhythm
+ - $horizontal_rhythm
+ - 0
+ - $horizontal_rhythm
image:
align: left
+ caption:
+ align: center
prose:
margin_top: $block_margin_top
margin_bottom: $block_margin_bottom
thematic_break:
-# border_color: $base_border_color
border_style: solid
border_width: $base_border_width
margin_top: $vertical_rhythm * 0.5
@@ -224,16 +211,11 @@ description_list:
description_indent: $horizontal_rhythm * 1.25
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
table:
background_color: $page_background_color
- #head_background_color:
- #head_font_color: $base_font_color
head_font_style: bold
- font-size: 11.5
- #body_background_color:
+ font-size: 9
body_stripe_background_color: d7d7d7
foot_background_color: f0f0f0
border_color: dddddd
@@ -247,67 +229,44 @@ table:
toc:
indent: $horizontal_rhythm
line_height: 1.4
- dot_leader:
- #content: ". "
- font_color: a9a9a9
- #levels: 2 3
-# NOTE in addition to footer, header is also supported
+ dot-leader:
+ content: '. '
+ font_color: a9a9a9
+ font-style: bold
+ h2-font-style: bold
header:
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.35
height: $base_line_height_length * 2.6
line_height: 1
- padding: [$base_line_height_length / 1.3, 1, 0, 1]
+ padding:
+ - $base_line_height_length / 1
+ - 1
+ - 0.5
+ - 1
vertical_align: margin_inside
- #image_vertical_align: or
- # additional attributes for content:
- # * {page-count}
- # * {page-number}
- # * {document-title}
- # * {document-subtitle}
- # * {chapter-title}
- # * {section-title}
- # * {section-or-chapter-title}
recto:
right:
content: '{section-or-chapter-title} | Page {page-number}'
verso:
left:
content: '{section-or-chapter-title} | Page {page-number}'
- # left: 'Page {page-number} | {section-or-chapter-title}'
footer:
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
+ border_width: 0.35
+ height: $base_line_height_length * 2.6
line_height: 1
- padding: [$base_line_height_length / 2, 1, 0, 1]
+ padding:
+ - $base_line_height_length / 1
+ - 1
+ - 0.5
+ - 1
vertical_align: top
- #image_vertical_align: or
- # additional attributes for content:
- # content: '{company}'
- # * {page-count}
- # * {page-number}
- #center:
- #content: '{document-title}'
- # * {document-subtitle}
- # * {chapter-title}
- # * {section-title}
- # * {section-or-chapter-title}
recto:
- #columns: "<50% =0% >50%"
right:
- #content: '{page-number}'
content: '{document-title} | © RISC-V International'
- #content: '{document-title} | © RISC-V'
- #center: '{page-number}'
- #content: '{revdate}'
verso:
- #columns: $footer_recto_columns
left:
content: $footer_recto_right_content
- #center: '{page-number}'
- #content: '{page-number}'