Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make reference.docx pass validation #9263

Merged
merged 11 commits into from
Dec 17, 2023
4 changes: 1 addition & 3 deletions data/docx/word/document.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ Date
</w:p>
<w:p>
<w:pPr>
<w:pStyle w:val="Compact" />
<w:pStyle w:val="Abstract" />
</w:pPr>
<w:r>
Expand Down Expand Up @@ -266,14 +265,13 @@ Table caption.
<w:tbl>
<w:tblPr>
<w:tblStyle w:val="Table" />
<w:tblW w:type="pct" w:w="0.0" />
<w:tblLook w:firstRow="1" />
<w:tblCaption w:val="Table caption." />
</w:tblPr>
<w:tblGrid />
<w:tr>
<w:trPr>
<w:cnfStyle w:firstRow="1" />
<w:cnfStyle w:firstRow="1" w:val="100000000000" />
</w:trPr>
<w:tc>
<w:tcPr>
Expand Down
8 changes: 4 additions & 4 deletions data/docx/word/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
<w:embedSystemFonts />
<w:proofState w:spelling="clean" w:grammar="clean" />
<w:stylePaneFormatFilter w:val="0004" />
<w:footnotePr>
<w:footnote w:id="-1" />
<w:footnote w:id="0" />
</w:footnotePr>
<w:doNotTrackMoves />
<w:defaultTabStop w:val="720" />
<w:drawingGridHorizontalSpacing w:val="360" />
Expand All @@ -16,6 +12,10 @@
<w:displayVerticalDrawingGridEvery w:val="0" />
<w:characterSpacingControl w:val="doNotCompress" />
<w:savePreviewPicture />
<w:footnotePr>
<w:footnote w:id="-1" />
<w:footnote w:id="0" />
</w:footnotePr>
<w:rsids>
</w:rsids>
<m:mathPr>
Expand Down
12 changes: 6 additions & 6 deletions data/docx/word/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<w:name w:val="Body Text" />
<w:basedOn w:val="Normal" />
<w:link w:val="BodyTextChar" />
<w:qFormat />
<w:pPr>
<w:spacing w:before="180" w:after="180" />
</w:pPr>
<w:qFormat />
</w:style>
<w:style w:type="paragraph" w:customStyle="1" w:styleId="FirstParagraph">
<w:name w:val="First Paragraph" />
Expand Down Expand Up @@ -107,14 +107,14 @@
<w:pPr>
<w:keepNext />
<w:keepLines />
<w:jc w:val="center" />
<w:spacing w:before="300" w:after="0" />
<w:jc w:val="center" />
</w:pPr>
<w:rPr>
<w:b />
<w:color w:val="345A8A" />
<w:sz w:val="20" />
<w:szCs w:val="20" />
<w:b />
<w:color w:val="345A8A" />>
</w:rPr>
</w:style>
<w:style w:type="paragraph" w:customStyle="1" w:styleId="Abstract">
Expand Down Expand Up @@ -220,8 +220,8 @@
</w:pPr>
<w:rPr>
<w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi" />
<w:i />
<w:bCs />
<w:i />
<w:color w:val="4F81BD" w:themeColor="accent1" />
<w:sz w:val="24" />
<w:szCs w:val="24" />
Expand Down Expand Up @@ -389,10 +389,10 @@
<w:jc w:val="left"/>
</w:trPr>
<w:tcPr>
<w:vAlign w:val="bottom"/>
<w:tcBorders>
<w:bottom w:val="single"/>
</w:tcBorders>
<w:vAlign w:val="bottom"/>
</w:tcPr>
</w:tblStylePr>
</w:style>
Expand Down
Binary file modified test/docx/golden/block_quotes.docx
Binary file not shown.
Binary file modified test/docx/golden/codeblock.docx
Binary file not shown.
Binary file modified test/docx/golden/comments.docx
Binary file not shown.
Binary file modified test/docx/golden/custom_style_no_reference.docx
Binary file not shown.
Binary file modified test/docx/golden/custom_style_preserve.docx
Binary file not shown.
Binary file modified test/docx/golden/custom_style_reference.docx
Binary file not shown.
Binary file modified test/docx/golden/definition_list.docx
Binary file not shown.
Binary file modified test/docx/golden/document-properties-short-desc.docx
Binary file not shown.
Binary file modified test/docx/golden/document-properties.docx
Binary file not shown.
Binary file modified test/docx/golden/headers.docx
Binary file not shown.
Binary file modified test/docx/golden/image.docx
Binary file not shown.
Binary file modified test/docx/golden/inline_code.docx
Binary file not shown.
Binary file modified test/docx/golden/inline_formatting.docx
Binary file not shown.
Binary file modified test/docx/golden/inline_images.docx
Binary file not shown.
Binary file modified test/docx/golden/link_in_notes.docx
Binary file not shown.
Binary file modified test/docx/golden/links.docx
Binary file not shown.
Binary file modified test/docx/golden/lists.docx
Binary file not shown.
Binary file modified test/docx/golden/lists_continuing.docx
Binary file not shown.
Binary file modified test/docx/golden/lists_div_bullets.docx
Binary file not shown.
Binary file modified test/docx/golden/lists_multiple_initial.docx
Binary file not shown.
Binary file modified test/docx/golden/lists_restarting.docx
Binary file not shown.
Binary file modified test/docx/golden/nested_anchors_in_header.docx
Binary file not shown.
Binary file modified test/docx/golden/notes.docx
Binary file not shown.
Binary file modified test/docx/golden/raw-blocks.docx
Binary file not shown.
Binary file modified test/docx/golden/raw-bookmarks.docx
Binary file not shown.
Binary file modified test/docx/golden/table_one_row.docx
Binary file not shown.
Binary file modified test/docx/golden/table_with_list_cell.docx
Binary file not shown.
Binary file modified test/docx/golden/tables-default-widths.docx
Binary file not shown.
Binary file modified test/docx/golden/tables.docx
Binary file not shown.
Binary file modified test/docx/golden/tables_separated_with_rawblock.docx
Binary file not shown.
Binary file modified test/docx/golden/track_changes_deletion.docx
Binary file not shown.
Binary file modified test/docx/golden/track_changes_insertion.docx
Binary file not shown.
Binary file modified test/docx/golden/track_changes_move.docx
Binary file not shown.
Binary file modified test/docx/golden/track_changes_scrubbed_metadata.docx
Binary file not shown.
Binary file modified test/docx/golden/unicode.docx
Binary file not shown.
Binary file modified test/docx/golden/verbatim_subsuper.docx
Binary file not shown.