Gather.

partials/doc/doc-fonts.xml

@@ -1,12 +1,42 @@
+{{!
+  The w:fonts node contains font setup information for the Word document,
+  including the default font as well as optional descriptions of fonts via
+  the <w:font> element.
+
+  This node is optional, but if omitted, Word will create a default <w:fonts>
+  section on save, with defaults (like Times New Roman) that are probably not
+  ideal for a specific use case. So we include this section by default, and set
+  the fonts to the theme's declared typography settings.
+}}
+
 <w:fonts>
-  <w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
-  <w:font w:name="Times New Roman">
+  {{!
+    The defaultFonts element defines the font to use when no other font or
+    formatting is specified. It's optional, but if not specified, Word will
+    fill it in to a default value. (Usually, it sets all four font families
+    to "Times New Roman").
+  }}
+  <w:defaultFonts w:ascii="{{{fontFace 'default'}}}" w:fareast="{{{fontFace 'default'}}}" w:h-ansi="{{{fontFace 'default'}}}" w:cs="{{{fontFace 'default'}}}"/>
+
+  {{!
+    Here go individual <w:font> entries. These are not required to actually use
+    any fonts, but are used by Word when it has to reconstruct a missing font.
+    Since fonts are not embedded into Word documents, this allows Word to
+    display the document without losing too much visual fidelity.
+
+    In a standard Word document, this first entry would also be set to Times
+    New Roman.
+  }}
+
+  <w:font w:name="{{{fontFace 'default'}}}">
     <w:panose-1 w:val="02020603050405020304"/>
     <w:charset w:val="00"/>
     <w:family w:val="Roman"/>
     <w:pitch w:val="variable"/>
     <w:sig w:usb-0="E0002AFF" w:usb-1="C0007841" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="000001FF" w:csb-1="00000000"/>
   </w:font>
+
+
   <w:font w:name="Calibri">
     <w:panose-1 w:val="020F0502020204030204"/>
     <w:charset w:val="00"/>
@@ -14,4 +44,5 @@
     <w:pitch w:val="variable"/>
     <w:sig w:usb-0="A00002EF" w:usb-1="4000207B" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="0000009F" w:csb-1="00000000"/>
   </w:font>
+
 </w:fonts>

partials/doc/doc-styles.xml

@@ -3,8 +3,8 @@
     <w:name w:val="Normal"/>
     <w:rsid w:val="002743C8"/>
     <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
-      <wx:font wx:val="Calibri"/>
+      <w:rFonts w:ascii="{{{fontFace 'default'}}}" w:h-ansi="{{{fontFace 'default'}}}"/>
+      <wx:font wx:val="{{{fontFace 'default'}}}"/>
       <w:sz-cs w:val="24"/>
       <w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
     </w:rPr>
@@ -26,7 +26,8 @@
       </w:pBdr>
     </w:pPr>
     <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'heading1'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading1'}}}" w:h-ansi="{{{fontFace 'heading1'}}}"/>      
       <w:color w:val="AEAAAA"/>
       <w:kern w:val="36"/>
       <w:sz w:val="40"/>
@@ -44,7 +45,8 @@
       <w:outlineLvl w:val="1"/>
     </w:pPr>
     <w:rPr>
-      <wx:font wx:val="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'heading2'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading2'}}}" w:h-ansi="{{{fontFace 'heading2'}}}"/>
       <w:b/>
       <w:b-cs/>
       <w:caps/>
@@ -117,7 +119,8 @@
     <w:link w:val="Heading2"/>
     <w:rsid w:val="00505903"/>
     <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'heading2'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading2'}}}" w:h-ansi="{{{fontFace 'heading2'}}}"/>
       <w:b/>
       <w:b-cs/>
       <w:caps/>
@@ -152,7 +155,8 @@
     <w:link w:val="Heading1"/>
     <w:rsid w:val="00505903"/>
     <w:rPr>
-      <w:rFonts w:ascii="Calibri" w:h-ansi="Calibri"/>
+      <wx:font wx:val="{{{fontFace 'heading1'}}}"/>
+      <w:rFonts w:ascii="{{{fontFace 'heading1'}}}" w:h-ansi="{{{fontFace 'heading1'}}}"/>
       <w:color w:val="AEAAAA"/>
       <w:kern w:val="36"/>
       <w:sz w:val="40"/>