resolves #1604 configure headings to inherit font style from theme (PR #1606)

5 files changed, 148 insertions, 149 deletions

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 175a5336..c8eb7903 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -38,6 +38,7 @@ Bug Fixes::
 * applying double border style to thematic break should honor border width
 * warn once instead of crashing if cache-uri is set but library is not available
 * sanitize values of PDF info values (#1594)
+* configure headings to inherit font styles from theme (#1604)
 
 Compliance::
 
diff --git a/data/themes/default-theme.yml b/data/themes/default-theme.yml
index ececeefb..72968902 100644
--- a/data/themes/default-theme.yml
+++ b/data/themes/default-theme.yml
@@ -62,8 +62,9 @@ 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)
diff --git a/examples/chronicles-example.pdf b/examples/chronicles-example.pdf
index bddea8d3..5e28a58b 100644
--- a/examples/chronicles-example.pdf
+++ b/examples/chronicles-example.pdf
@@ -6138,7 +6138,7 @@ ET
 
 BT
 225.108 551.126 Td
-/F5.0 18 Tf
+/F7.0 18 Tf
 <436f6465> Tj
 ET
 
@@ -6549,6 +6549,7 @@ endobj
 /F5.0 35 0 R
 /F9.0 65 0 R
 /F10.0 66 0 R
+/F7.0 47 0 R
 >>
 /XObject << /I9 8 0 R
 /Stamp1 145 0 R
@@ -13025,8 +13026,8 @@ ET
 0.0 0.0 0.0 SCN
 0.0 0.0 0.0 scn
 q
-0.5 w
 0.9333 0.9333 0.9333 SCN
+0.5 w
 48.24 376.51 m
 547.04 376.51 l
 S
@@ -14240,9 +14241,9 @@ q
 0 j
 [] 0 d
 q
-0.25 w
 /DeviceRGB CS
 0.8667 0.8667 0.8667 SCN
+0.25 w
 48.24 32.4 m
 547.04 32.4 l
 S
@@ -14268,9 +14269,9 @@ q
 0 j
 [] 0 d
 q
-0.25 w
 /DeviceRGB CS
 0.8667 0.8667 0.8667 SCN
+0.25 w
 48.24 32.4 m
 547.04 32.4 l
 S
@@ -15044,146 +15045,146 @@ xref
 0000121012 00000 n 
 0000121056 00000 n 
 0000132663 00000 n 
-0000133081 00000 n 
-0000133125 00000 n 
-0000133304 00000 n 
-0000133478 00000 n 
-0000133522 00000 n 
-0000133572 00000 n 
-0000147047 00000 n 
-0000147439 00000 n 
-0000147614 00000 n 
-0000183922 00000 n 
-0000184325 00000 n 
-0000184448 00000 n 
-0000184577 00000 n 
-0000195759 00000 n 
-0000196151 00000 n 
-0000199850 00000 n 
-0000200216 00000 n 
-0000200260 00000 n 
-0000209940 00000 n 
-0000210358 00000 n 
-0000213200 00000 n 
-0000213566 00000 n 
-0000213610 00000 n 
-0000214013 00000 n 
-0000214529 00000 n 
-0000214573 00000 n 
-0000214617 00000 n 
-0000214661 00000 n 
-0000214705 00000 n 
-0000214749 00000 n 
-0000219655 00000 n 
-0000220058 00000 n 
-0000220102 00000 n 
-0000220278 00000 n 
-0000220455 00000 n 
-0000223207 00000 n 
-0000223623 00000 n 
-0000223668 00000 n 
-0000223795 00000 n 
-0000223920 00000 n 
-0000224048 00000 n 
-0000224176 00000 n 
-0000224305 00000 n 
-0000224440 00000 n 
-0000224577 00000 n 
-0000224706 00000 n 
-0000224837 00000 n 
-0000224956 00000 n 
-0000225077 00000 n 
-0000225260 00000 n 
-0000225444 00000 n 
-0000225581 00000 n 
-0000225720 00000 n 
-0000225852 00000 n 
-0000225986 00000 n 
-0000226125 00000 n 
-0000226265 00000 n 
-0000226398 00000 n 
-0000226536 00000 n 
-0000226672 00000 n 
-0000226806 00000 n 
-0000226939 00000 n 
-0000227072 00000 n 
-0000227192 00000 n 
-0000227313 00000 n 
-0000227430 00000 n 
-0000227549 00000 n 
-0000227627 00000 n 
-0000228024 00000 n 
-0000228216 00000 n 
-0000228505 00000 n 
-0000228687 00000 n 
-0000228972 00000 n 
-0000229394 00000 n 
-0000229614 00000 n 
-0000229858 00000 n 
-0000230155 00000 n 
-0000230351 00000 n 
-0000230595 00000 n 
-0000230795 00000 n 
-0000230925 00000 n 
-0000231225 00000 n 
-0000231496 00000 n 
-0000231767 00000 n 
-0000243869 00000 n 
-0000244085 00000 n 
-0000245448 00000 n 
-0000246365 00000 n 
-0000254503 00000 n 
-0000254729 00000 n 
-0000256092 00000 n 
-0000257008 00000 n 
-0000263357 00000 n 
-0000263587 00000 n 
-0000264950 00000 n 
-0000265865 00000 n 
-0000276135 00000 n 
-0000276356 00000 n 
-0000277719 00000 n 
-0000278635 00000 n 
-0000282780 00000 n 
-0000282996 00000 n 
-0000283332 00000 n 
-0000284248 00000 n 
-0000289707 00000 n 
-0000289922 00000 n 
-0000291285 00000 n 
-0000292200 00000 n 
-0000293521 00000 n 
-0000293745 00000 n 
-0000294066 00000 n 
-0000295204 00000 n 
-0000299994 00000 n 
-0000300206 00000 n 
-0000301569 00000 n 
-0000302484 00000 n 
-0000306105 00000 n 
-0000306326 00000 n 
-0000306629 00000 n 
-0000307544 00000 n 
-0000308643 00000 n 
-0000308869 00000 n 
-0000309170 00000 n 
-0000310308 00000 n 
-0000312764 00000 n 
-0000312983 00000 n 
-0000314346 00000 n 
-0000315261 00000 n 
-0000317772 00000 n 
-0000317986 00000 n 
-0000319349 00000 n 
-0000320264 00000 n 
-0000322473 00000 n 
-0000322688 00000 n 
-0000323000 00000 n 
+0000133094 00000 n 
+0000133138 00000 n 
+0000133317 00000 n 
+0000133491 00000 n 
+0000133535 00000 n 
+0000133585 00000 n 
+0000147060 00000 n 
+0000147452 00000 n 
+0000147627 00000 n 
+0000183935 00000 n 
+0000184338 00000 n 
+0000184461 00000 n 
+0000184590 00000 n 
+0000195772 00000 n 
+0000196164 00000 n 
+0000199863 00000 n 
+0000200229 00000 n 
+0000200273 00000 n 
+0000209953 00000 n 
+0000210371 00000 n 
+0000213213 00000 n 
+0000213579 00000 n 
+0000213623 00000 n 
+0000214026 00000 n 
+0000214542 00000 n 
+0000214586 00000 n 
+0000214630 00000 n 
+0000214674 00000 n 
+0000214718 00000 n 
+0000214762 00000 n 
+0000219668 00000 n 
+0000220071 00000 n 
+0000220115 00000 n 
+0000220291 00000 n 
+0000220468 00000 n 
+0000223220 00000 n 
+0000223636 00000 n 
+0000223681 00000 n 
+0000223808 00000 n 
+0000223933 00000 n 
+0000224061 00000 n 
+0000224189 00000 n 
+0000224318 00000 n 
+0000224453 00000 n 
+0000224590 00000 n 
+0000224719 00000 n 
+0000224850 00000 n 
+0000224969 00000 n 
+0000225090 00000 n 
+0000225273 00000 n 
+0000225457 00000 n 
+0000225594 00000 n 
+0000225733 00000 n 
+0000225865 00000 n 
+0000225999 00000 n 
+0000226138 00000 n 
+0000226278 00000 n 
+0000226411 00000 n 
+0000226549 00000 n 
+0000226685 00000 n 
+0000226819 00000 n 
+0000226952 00000 n 
+0000227085 00000 n 
+0000227205 00000 n 
+0000227326 00000 n 
+0000227443 00000 n 
+0000227562 00000 n 
+0000227640 00000 n 
+0000228037 00000 n 
+0000228229 00000 n 
+0000228518 00000 n 
+0000228700 00000 n 
+0000228985 00000 n 
+0000229407 00000 n 
+0000229627 00000 n 
+0000229871 00000 n 
+0000230168 00000 n 
+0000230364 00000 n 
+0000230608 00000 n 
+0000230808 00000 n 
+0000230938 00000 n 
+0000231238 00000 n 
+0000231509 00000 n 
+0000231780 00000 n 
+0000243882 00000 n 
+0000244098 00000 n 
+0000245461 00000 n 
+0000246378 00000 n 
+0000254516 00000 n 
+0000254742 00000 n 
+0000256105 00000 n 
+0000257021 00000 n 
+0000263370 00000 n 
+0000263600 00000 n 
+0000264963 00000 n 
+0000265878 00000 n 
+0000276148 00000 n 
+0000276369 00000 n 
+0000277732 00000 n 
+0000278648 00000 n 
+0000282793 00000 n 
+0000283009 00000 n 
+0000283345 00000 n 
+0000284261 00000 n 
+0000289720 00000 n 
+0000289935 00000 n 
+0000291298 00000 n 
+0000292213 00000 n 
+0000293534 00000 n 
+0000293758 00000 n 
+0000294079 00000 n 
+0000295217 00000 n 
+0000300007 00000 n 
+0000300219 00000 n 
+0000301582 00000 n 
+0000302497 00000 n 
+0000306118 00000 n 
+0000306339 00000 n 
+0000306642 00000 n 
+0000307557 00000 n 
+0000308656 00000 n 
+0000308882 00000 n 
+0000309183 00000 n 
+0000310321 00000 n 
+0000312777 00000 n 
+0000312996 00000 n 
+0000314359 00000 n 
+0000315274 00000 n 
+0000317785 00000 n 
+0000317999 00000 n 
+0000319362 00000 n 
+0000320277 00000 n 
+0000322486 00000 n 
+0000322701 00000 n 
+0000323013 00000 n 
 trailer
 << /Size 199
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-323918
+323931
 %%EOF
diff --git a/lib/asciidoctor/pdf/converter.rb b/lib/asciidoctor/pdf/converter.rb
index 887ca0ab..3e3aa31e 100644
--- a/lib/asciidoctor/pdf/converter.rb
+++ b/lib/asciidoctor/pdf/converter.rb
@@ -2784,7 +2784,7 @@ module Asciidoctor
         outdent_section opts.delete :outdent do
           margin_top top_margin
           # QUESTION should we move inherited styles to typeset_text?
-          if (inherited = apply_text_decoration ::Set.new, :heading, hlevel).empty?
+          if (inherited = apply_text_decoration font_styles, :heading, hlevel).empty?
             inline_format_opts = true
           else
             inline_format_opts = [{ inherited: inherited }]
diff --git a/spec/section_spec.rb b/spec/section_spec.rb
index 26987bd8..39938a3e 100644
--- a/spec/section_spec.rb
+++ b/spec/section_spec.rb
@@ -49,19 +49,15 @@ describe 'Asciidoctor::PDF::Converter - Section' do
     (expect pdf.text.map {|it| it.values_at :string, :font_name }).to eql expected_text
   end
 
-  it 'should not apply bold to italic text if headings are bold in theme' do
-    pdf_theme = {
-      heading_font_style: 'bold',
-    }
-
-    pdf = to_pdf <<~'EOS', pdf_theme: pdf_theme, analyze: true
+  it 'should add text formatting styles to styles defined in theme' do
+    pdf = to_pdf <<~'EOS', pdf_theme: { heading_font_style: 'bold' }, analyze: true
     == Get Started _Quickly_
     EOS
 
     text = pdf.text
     (expect text).to have_size 2
     (expect text[0][:font_name]).to eql 'NotoSerif-Bold'
-    (expect text[1][:font_name]).to eql 'NotoSerif-Italic'
+    (expect text[1][:font_name]).to eql 'NotoSerif-BoldItalic'
   end
 
   it 'should not partition section title by default' do