Merge pull request #2303 from hftf/h6

Add missing Heading 6 style in reference Docx
jgm · Jul 16, 2015 · 47a2dab · 47a2dab
2 parents e944c03 + 126d6f5
commit 47a2dab
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/data/docx/word/styles.xml b/data/docx/word/styles.xml
@@ -176,7 +176,7 @@
       <w:keepNext />
       <w:keepLines />
       <w:spacing w:before="200" w:after="0" />
-      <w:outlineLvl w:val="1" />
+      <w:outlineLvl w:val="2" />
     </w:pPr>
     <w:rPr>
       <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi" />
@@ -198,7 +198,7 @@
       <w:keepNext />
       <w:keepLines />
       <w:spacing w:before="200" w:after="0" />
-      <w:outlineLvl w:val="1" />
+      <w:outlineLvl w:val="3" />
     </w:pPr>
     <w:rPr>
       <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi" />
@@ -220,7 +220,7 @@
       <w:keepNext />
       <w:keepLines />
       <w:spacing w:before="200" w:after="0" />
-      <w:outlineLvl w:val="1" />
+      <w:outlineLvl w:val="4" />
     </w:pPr>
     <w:rPr>
       <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi" />
@@ -231,6 +231,26 @@
       <w:szCs w:val="24" />
     </w:rPr>
   </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading6">
+    <w:name w:val="Heading 6" />
+    <w:basedOn w:val="Normal" />
+    <w:next w:val="BodyText" />
+    <w:uiPriority w:val="9" />
+    <w:unhideWhenUsed />
+    <w:qFormat />
+    <w:pPr>
+      <w:keepNext />
+      <w:keepLines />
+      <w:spacing w:before="200" w:after="0" />
+      <w:outlineLvl w:val="5" />
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi" />
+      <w:color w:val="4F81BD" w:themeColor="accent1" />
+      <w:sz w:val="24" />
+      <w:szCs w:val="24" />
+    </w:rPr>
+  </w:style>
   <w:style w:type="paragraph" w:styleId="BlockText">
     <w:name w:val="Block Text" />
     <w:basedOn w:val="BodyText" />

diff --git a/tests/docx/headers.docx b/tests/docx/headers.docx
diff --git a/tests/docx/headers.native b/tests/docx/headers.native
@@ -2,4 +2,12 @@
 ,Header 2 ("second-level",[],[]) [Str "Second",Space,Str "Level"]
 ,Para [Str "Some",Space,Str "plain",Space,Str "text."]
 ,Header 3 ("third-level",[],[]) [Str "Third",Space,Str "level"]
-,Para [Str "Some",Space,Str "more",Space,Str "plain",Space,Str "text."]]
+,Para [Str "Some",Space,Str "more",Space,Str "plain",Space,Str "text."]
+,Header 4 ("fourth-level",[],[]) [Str "Fourth",Space,Str "level"]
+,Para [Str "Some",Space,Str "more",Space,Str "plain",Space,Str "text."]
+,Header 5 ("fifth-level",[],[]) [Str "Fifth",Space,Str "level"]
+,Para [Str "Some",Space,Str "more",Space,Str "plain",Space,Str "text."]
+,Header 6 ("sixth-level",[],[]) [Str "Sixth",Space,Str "level"]
+,Para [Str "Some",Space,Str "more",Space,Str "plain",Space,Str "text."]
+,Para [Str "Seventh",Space,Str "level"]
+,Para [Str "Since",Space,Str "no",Space,Str "Heading",Space,Str "7",Space,Str "style",Space,Str "exists",Space,Str "in",Space,Str "styles.xml,",Space,Str "this",Space,Str "gets",Space,Str "converted",Space,Str "to",Space,Str "Span."]]