ODT/opendocument writers: properly handle highlighting styles.

These styles were going into an office:styles element in content.xml,
but this is invalid.  Instead they must go in styles.xml. See #9287.

The variable `highlighting-styles` no longer has any effect on
the default opendocument template, and highlighting styles are
not included in opendocument output.

2 files changed, 0 insertions, 190 deletions

diff --git a/test/command/6792.md b/test/command/6792.md
index ad7d5591e..d0d284f5d 100644
--- a/test/command/6792.md
+++ b/test/command/6792.md
@@ -21,101 +21,6 @@
   <office:font-face-decls>
     <style:font-face style:name="Courier New" style:font-family-generic="modern" style:font-pitch="fixed" svg:font-family="'Courier New'" />
   </office:font-face-decls>
-  <office:styles>
-    <style:style style:name="KeywordTok" style:family="text">
-      <style:text-properties fo:color="#007020" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="DataTypeTok" style:family="text">
-      <style:text-properties fo:color="#902000" />
-    </style:style>
-    <style:style style:name="DecValTok" style:family="text">
-      <style:text-properties fo:color="#40a070" />
-    </style:style>
-    <style:style style:name="BaseNTok" style:family="text">
-      <style:text-properties fo:color="#40a070" />
-    </style:style>
-    <style:style style:name="FloatTok" style:family="text">
-      <style:text-properties fo:color="#40a070" />
-    </style:style>
-    <style:style style:name="ConstantTok" style:family="text">
-      <style:text-properties fo:color="#880000" />
-    </style:style>
-    <style:style style:name="CharTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="SpecialCharTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="StringTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="VerbatimStringTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="SpecialStringTok" style:family="text">
-      <style:text-properties fo:color="#bb6688" />
-    </style:style>
-    <style:style style:name="ImportTok" style:family="text">
-      <style:text-properties fo:color="#008000" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="CommentTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" />
-    </style:style>
-    <style:style style:name="DocumentationTok" style:family="text">
-      <style:text-properties fo:color="#ba2121" fo:font-style="italic" />
-    </style:style>
-    <style:style style:name="AnnotationTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="CommentVarTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="OtherTok" style:family="text">
-      <style:text-properties fo:color="#007020" />
-    </style:style>
-    <style:style style:name="FunctionTok" style:family="text">
-      <style:text-properties fo:color="#06287e" />
-    </style:style>
-    <style:style style:name="VariableTok" style:family="text">
-      <style:text-properties fo:color="#19177c" />
-    </style:style>
-    <style:style style:name="ControlFlowTok" style:family="text">
-      <style:text-properties fo:color="#007020" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="OperatorTok" style:family="text">
-      <style:text-properties fo:color="#666666" />
-    </style:style>
-    <style:style style:name="BuiltInTok" style:family="text">
-      <style:text-properties fo:color="#008000" />
-    </style:style>
-    <style:style style:name="ExtensionTok" style:family="text">
-      <style:text-properties />
-    </style:style>
-    <style:style style:name="PreprocessorTok" style:family="text">
-      <style:text-properties fo:color="#bc7a00" />
-    </style:style>
-    <style:style style:name="AttributeTok" style:family="text">
-      <style:text-properties fo:color="#7d9029" />
-    </style:style>
-    <style:style style:name="RegionMarkerTok" style:family="text">
-      <style:text-properties />
-    </style:style>
-    <style:style style:name="InformationTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="WarningTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="AlertTok" style:family="text">
-      <style:text-properties fo:color="#ff0000" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="ErrorTok" style:family="text">
-      <style:text-properties fo:color="#ff0000" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="NormalTok" style:family="text">
-      <style:text-properties />
-    </style:style>
-  </office:styles>
   <office:automatic-styles>
     <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" style:wrap="none" /></style:style>
     <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" /></style:style>
diff --git a/test/command/8256.md b/test/command/8256.md
index 5ba6b39cc..76398f607 100644
--- a/test/command/8256.md
+++ b/test/command/8256.md
@@ -15,101 +15,6 @@ Testing.
   <office:font-face-decls>
     <style:font-face style:name="Courier New" style:font-family-generic="modern" style:font-pitch="fixed" svg:font-family="'Courier New'" />
   </office:font-face-decls>
-  <office:styles>
-    <style:style style:name="KeywordTok" style:family="text">
-      <style:text-properties fo:color="#007020" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="DataTypeTok" style:family="text">
-      <style:text-properties fo:color="#902000" />
-    </style:style>
-    <style:style style:name="DecValTok" style:family="text">
-      <style:text-properties fo:color="#40a070" />
-    </style:style>
-    <style:style style:name="BaseNTok" style:family="text">
-      <style:text-properties fo:color="#40a070" />
-    </style:style>
-    <style:style style:name="FloatTok" style:family="text">
-      <style:text-properties fo:color="#40a070" />
-    </style:style>
-    <style:style style:name="ConstantTok" style:family="text">
-      <style:text-properties fo:color="#880000" />
-    </style:style>
-    <style:style style:name="CharTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="SpecialCharTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="StringTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="VerbatimStringTok" style:family="text">
-      <style:text-properties fo:color="#4070a0" />
-    </style:style>
-    <style:style style:name="SpecialStringTok" style:family="text">
-      <style:text-properties fo:color="#bb6688" />
-    </style:style>
-    <style:style style:name="ImportTok" style:family="text">
-      <style:text-properties fo:color="#008000" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="CommentTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" />
-    </style:style>
-    <style:style style:name="DocumentationTok" style:family="text">
-      <style:text-properties fo:color="#ba2121" fo:font-style="italic" />
-    </style:style>
-    <style:style style:name="AnnotationTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="CommentVarTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="OtherTok" style:family="text">
-      <style:text-properties fo:color="#007020" />
-    </style:style>
-    <style:style style:name="FunctionTok" style:family="text">
-      <style:text-properties fo:color="#06287e" />
-    </style:style>
-    <style:style style:name="VariableTok" style:family="text">
-      <style:text-properties fo:color="#19177c" />
-    </style:style>
-    <style:style style:name="ControlFlowTok" style:family="text">
-      <style:text-properties fo:color="#007020" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="OperatorTok" style:family="text">
-      <style:text-properties fo:color="#666666" />
-    </style:style>
-    <style:style style:name="BuiltInTok" style:family="text">
-      <style:text-properties fo:color="#008000" />
-    </style:style>
-    <style:style style:name="ExtensionTok" style:family="text">
-      <style:text-properties />
-    </style:style>
-    <style:style style:name="PreprocessorTok" style:family="text">
-      <style:text-properties fo:color="#bc7a00" />
-    </style:style>
-    <style:style style:name="AttributeTok" style:family="text">
-      <style:text-properties fo:color="#7d9029" />
-    </style:style>
-    <style:style style:name="RegionMarkerTok" style:family="text">
-      <style:text-properties />
-    </style:style>
-    <style:style style:name="InformationTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="WarningTok" style:family="text">
-      <style:text-properties fo:color="#60a0b0" fo:font-style="italic" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="AlertTok" style:family="text">
-      <style:text-properties fo:color="#ff0000" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="ErrorTok" style:family="text">
-      <style:text-properties fo:color="#ff0000" fo:font-weight="bold" />
-    </style:style>
-    <style:style style:name="NormalTok" style:family="text">
-      <style:text-properties />
-    </style:style>
-  </office:styles>
   <office:automatic-styles>
     <style:style style:name="T1" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="fr2" style:family="graphic" style:parent-style-name="Formula"><style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" style:wrap="none" /></style:style>