diff options
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | data/odt/META-INF/manifest.xml | 22 | ||||
| -rw-r--r-- | data/odt/Thumbnails/thumbnail.png | bin | 1943 -> 0 bytes | |||
| -rw-r--r-- | data/odt/meta.xml | 1 | ||||
| -rw-r--r-- | data/odt/mimetype | 1 | ||||
| -rw-r--r-- | data/odt/settings.xml | 2 | ||||
| -rw-r--r-- | data/odt/styles.xml | 1062 | ||||
| -rw-r--r-- | man/man1/pandoc.1.md | 11 | ||||
| -rw-r--r-- | pandoc.cabal | 9 | ||||
| -rw-r--r-- | reference.odt | bin | 0 -> 9572 bytes | |||
| -rw-r--r-- | src/Text/Pandoc/ODT.hs | 29 | ||||
| -rw-r--r-- | src/pandoc.hs | 14 | 
12 files changed, 52 insertions, 1110 deletions
| @@ -324,6 +324,17 @@ For further documentation, see the `pandoc(1)` man page.      repeatedly to include multiple files. They will be included in the      order specified. +`--reference-odt` *filename* +:   uses the specified file as a style reference in producing an ODT. +    For best results, the reference ODT should be a modified version +    of an ODT produced using pandoc.  The contents of the reference ODT +    are ignored, but its stylesheets are used in the new ODT. If no +    reference ODT is specified on the command line, pandoc will look +    for `$HOME/.pandoc/reference.odt` (on unix) or +    `C:\Documents And Settings\USERNAME\Application Data\pandoc\reference.odt` +    (on Windows). If this is not found either, sensible defaults will be +    used. +  `-D` or `--print-default-template` *format*  :   prints the default template for an output *format*. (See `-t`      for a list of possible *format*s.) diff --git a/data/odt/META-INF/manifest.xml b/data/odt/META-INF/manifest.xml deleted file mode 100644 index 5ecd5d892..000000000 --- a/data/odt/META-INF/manifest.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"> - <manifest:file-entry manifest:media-type="application/vnd.oasis.opendocument.text" manifest:full-path="/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/statusbar/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/accelerator/current.xml"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/accelerator/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/floater/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/popupmenu/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/progressbar/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/menubar/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/toolbar/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/images/Bitmaps/"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/images/"/> - <manifest:file-entry manifest:media-type="application/vnd.sun.xml.ui.configuration" manifest:full-path="Configurations2/"/> - <manifest:file-entry manifest:media-type="application/binary" manifest:full-path="layout-cache"/> - <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="content.xml"/> - <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="styles.xml"/> - <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="meta.xml"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Thumbnails/thumbnail.png"/> - <manifest:file-entry manifest:media-type="" manifest:full-path="Thumbnails/"/> - <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="settings.xml"/> -</manifest:manifest>
\ No newline at end of file diff --git a/data/odt/Thumbnails/thumbnail.png b/data/odt/Thumbnails/thumbnail.pngBinary files differ deleted file mode 100644 index 4e213b6b3..000000000 --- a/data/odt/Thumbnails/thumbnail.png +++ /dev/null diff --git a/data/odt/meta.xml b/data/odt/meta.xml deleted file mode 100644 index 93363b77e..000000000 --- a/data/odt/meta.xml +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.1"><office:meta><meta:generator></meta:generator><dc:title></dc:title><dc:subject></dc:subject><meta:creation-date></meta:creation-date><dc:date></dc:date><meta:editing-cycles></meta:editing-cycles><meta:editing-duration></meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="0" meta:paragraph-count="0" meta:word-count="0" meta:character-count="0"/></office:meta></office:document-meta>
\ No newline at end of file diff --git a/data/odt/mimetype b/data/odt/mimetype deleted file mode 100644 index 2e95b81c9..000000000 --- a/data/odt/mimetype +++ /dev/null @@ -1 +0,0 @@ -application/vnd.oasis.opendocument.text
\ No newline at end of file diff --git a/data/odt/settings.xml b/data/odt/settings.xml deleted file mode 100644 index bb6998b79..000000000 --- a/data/odt/settings.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<office:document-settings xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.1"><office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item config:name="ViewAreaTop" config:type="int">40640</config:config-item><config:config-item config:name="ViewAreaLeft" config:type="int">-1058</config:config-item><config:config-item config:name="ViewAreaWidth" config:type="int">25693</config:config-item><config:config-item config:name="ViewAreaHeight" config:type="int">15242</config:config-item><config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item><config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry><config:config-item config:name="ViewId" config:type="string">view2</config:config-item><config:config-item config:name="ViewLeft" config:type="int">8936</config:config-item><config:config-item config:name="ViewTop" config:type="int">54975</config:config-item><config:config-item config:name="VisibleLeft" config:type="int">-1058</config:config-item><config:config-item config:name="VisibleTop" config:type="int">40640</config:config-item><config:config-item config:name="VisibleRight" config:type="int">24633</config:config-item><config:config-item config:name="VisibleBottom" config:type="int">55880</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomFactor" config:type="short">100</config:config-item><config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set><config:config-item-set config:name="ooo:configuration-settings"><config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item><config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item><config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item><config:config-item config:name="PrintEmptyPages" config:type="boolean">true</config:config-item><config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item><config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item><config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item><config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item><config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item><config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item><config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/><config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item><config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item><config:config-item config:name="PrinterSetup" config:type="base64Binary"/><config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" config:type="boolean">false</config:config-item><config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item><config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item><config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item><config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item><config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item><config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item><config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item><config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item><config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item><config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/><config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item><config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item><config:config-item config:name="PrinterName" config:type="string"/><config:config-item config:name="PrintFaxName" config:type="string"/><config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item><config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item><config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item><config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item><config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item><config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item><config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item><config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item><config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item><config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item><config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item><config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommand" config:type="string"/><config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item><config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item><config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item></config:config-item-set></office:settings></office:document-settings>
\ No newline at end of file diff --git a/data/odt/styles.xml b/data/odt/styles.xml deleted file mode 100644 index 58cdd671f..000000000 --- a/data/odt/styles.xml +++ /dev/null @@ -1,1062 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" -xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" -xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" -xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" -xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" -xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" -xmlns:xlink="http://www.w3.org/1999/xlink" -xmlns:dc="http://purl.org/dc/elements/1.1/" -xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" -xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" -xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" -xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" -xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" -xmlns:math="http://www.w3.org/1998/Math/MathML" -xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" -xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" -xmlns:ooo="http://openoffice.org/2004/office" -xmlns:ooow="http://openoffice.org/2004/writer" -xmlns:oooc="http://openoffice.org/2004/calc" -xmlns:dom="http://www.w3.org/2001/xml-events" office:version="1.1"> -  <office:font-face-decls> -    <style:font-face style:name="StarSymbol" -    svg:font-family="StarSymbol" /> -    <style:font-face style:name="Tahoma1" -    svg:font-family="Tahoma" /> -    <style:font-face style:name="Courier New" -    svg:font-family="'Courier New'" -    style:font-family-generic="modern" style:font-pitch="fixed" /> -    <style:font-face style:name="Times New Roman" -    svg:font-family="'Times New Roman'" -    style:font-family-generic="roman" -    style:font-pitch="variable" /> -    <style:font-face style:name="Arial" svg:font-family="Arial" -    style:font-family-generic="swiss" -    style:font-pitch="variable" /> -    <style:font-face style:name="Lucida Sans Unicode" -    svg:font-family="'Lucida Sans Unicode'" -    style:font-family-generic="system" -    style:font-pitch="variable" /> -    <style:font-face style:name="Tahoma" svg:font-family="Tahoma" -    style:font-family-generic="system" -    style:font-pitch="variable" /> -  </office:font-face-decls> -  <office:styles> -    <style:default-style style:family="graphic"> -      <style:graphic-properties draw:shadow-offset-x="0.1181in" -      draw:shadow-offset-y="0.1181in" -      draw:start-line-spacing-horizontal="0.1114in" -      draw:start-line-spacing-vertical="0.1114in" -      draw:end-line-spacing-horizontal="0.1114in" -      draw:end-line-spacing-vertical="0.1114in" -      style:flow-with-text="false" /> -      <style:paragraph-properties style:text-autospace="ideograph-alpha" -      style:line-break="strict" style:writing-mode="lr-tb" -      style:font-independent-line-spacing="false"> -        <style:tab-stops /> -      </style:paragraph-properties> -      <style:text-properties style:use-window-font-color="true" -      fo:font-size="12pt" fo:language="en" fo:country="US" -      style:letter-kerning="true" style:font-size-asian="12pt" -      style:language-asian="zxx" style:country-asian="none" -      style:font-size-complex="12pt" style:language-complex="zxx" -      style:country-complex="none" /> -    </style:default-style> -    <style:default-style style:family="paragraph"> -      <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" -      style:text-autospace="ideograph-alpha" -      style:punctuation-wrap="hanging" style:line-break="strict" -      style:tab-stop-distance="0.4925in" -      style:writing-mode="page" /> -      <style:text-properties style:use-window-font-color="true" -      style:font-name="Times New Roman" fo:font-size="12pt" -      fo:language="en" fo:country="US" style:letter-kerning="true" -      style:font-name-asian="Lucida Sans Unicode" -      style:font-size-asian="12pt" style:language-asian="zxx" -      style:country-asian="none" style:font-name-complex="Tahoma" -      style:font-size-complex="12pt" style:language-complex="zxx" -      style:country-complex="none" fo:hyphenate="false" -      fo:hyphenation-remain-char-count="2" -      fo:hyphenation-push-char-count="2" /> -    </style:default-style> -    <style:default-style style:family="table"> -      <style:table-properties table:border-model="collapsing" /> -    </style:default-style> -    <style:default-style style:family="table-row"> -      <style:table-row-properties fo:keep-together="auto" /> -    </style:default-style> -    <style:style style:name="Standard" style:family="paragraph" -    style:class="text" /> -    <style:style style:name="Heading" style:family="paragraph" -    style:parent-style-name="Standard" -    style:next-style-name="Text_20_body" style:class="text"> -      <style:paragraph-properties fo:margin-top="0.1665in" -      fo:margin-bottom="0.0835in" fo:keep-with-next="always" /> -      <style:text-properties style:font-name="Arial" -      fo:font-size="14pt" -      style:font-name-asian="Lucida Sans Unicode" -      style:font-size-asian="14pt" style:font-name-complex="Tahoma" -      style:font-size-complex="14pt" /> -    </style:style> -    <style:style style:name="Text_20_body" -    style:display-name="Text body" style:family="paragraph" -    style:parent-style-name="Standard" style:class="text"> -      <style:paragraph-properties fo:margin-top="0.0598in" -      fo:margin-bottom="0.0598in" /> -    </style:style> -    <style:style style:name="List" style:family="paragraph" -    style:parent-style-name="Text_20_body" style:class="list"> -      <style:text-properties style:font-name-complex="Tahoma1" /> -    </style:style> -    <style:style style:name="Caption" style:family="paragraph" -    style:parent-style-name="Standard" style:class="extra"> -      <style:paragraph-properties fo:margin-top="0.0835in" -      fo:margin-bottom="0.0835in" text:number-lines="false" -      text:line-number="0" /> -      <style:text-properties fo:font-size="12pt" -      fo:font-style="italic" style:font-size-asian="12pt" -      style:font-style-asian="italic" -      style:font-name-complex="Tahoma1" -      style:font-size-complex="12pt" -      style:font-style-complex="italic" /> -    </style:style> -    <style:style style:name="Index" style:family="paragraph" -    style:parent-style-name="Standard" style:class="index"> -      <style:paragraph-properties text:number-lines="false" -      text:line-number="0" /> -      <style:text-properties style:font-name-complex="Tahoma1" /> -    </style:style> -    <style:style style:name="Heading_20_1" -    style:display-name="Heading 1" style:family="paragraph" -    style:parent-style-name="Heading" -    style:next-style-name="Text_20_body" style:class="text" -    style:default-outline-level="1"> -      <style:text-properties fo:font-size="115%" -      fo:font-weight="bold" style:font-size-asian="115%" -      style:font-weight-asian="bold" style:font-size-complex="115%" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Heading_20_2" -    style:display-name="Heading 2" style:family="paragraph" -    style:parent-style-name="Heading" -    style:next-style-name="Text_20_body" style:class="text" -    style:default-outline-level="2"> -      <style:text-properties fo:font-size="14pt" -      fo:font-style="italic" fo:font-weight="bold" -      style:font-size-asian="14pt" style:font-style-asian="italic" -      style:font-weight-asian="bold" style:font-size-complex="14pt" -      style:font-style-complex="italic" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Heading_20_3" -    style:display-name="Heading 3" style:family="paragraph" -    style:parent-style-name="Heading" -    style:next-style-name="Text_20_body" style:class="text" -    style:default-outline-level="3"> -      <style:text-properties fo:font-size="14pt" -      fo:font-weight="bold" style:font-size-asian="14pt" -      style:font-weight-asian="bold" style:font-size-complex="14pt" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Heading_20_4" -    style:display-name="Heading 4" style:family="paragraph" -    style:parent-style-name="Heading" -    style:next-style-name="Text_20_body" style:class="text" -    style:default-outline-level="4"> -      <style:text-properties fo:font-size="85%" -      fo:font-style="italic" fo:font-weight="bold" -      style:font-size-asian="85%" style:font-style-asian="italic" -      style:font-weight-asian="bold" style:font-size-complex="85%" -      style:font-style-complex="italic" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Heading_20_5" -    style:display-name="Heading 5" style:family="paragraph" -    style:parent-style-name="Heading" -    style:next-style-name="Text_20_body" style:class="text" -    style:default-outline-level="5"> -      <style:text-properties fo:font-size="85%" -      fo:font-weight="bold" style:font-size-asian="85%" -      style:font-weight-asian="bold" style:font-size-complex="85%" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Heading_20_6" -    style:display-name="Heading 6" style:family="paragraph" -    style:parent-style-name="Heading" -    style:next-style-name="Text_20_body" style:class="text" -    style:default-outline-level="6"> -      <style:text-properties fo:font-size="75%" -      fo:font-weight="bold" style:font-size-asian="75%" -      style:font-weight-asian="bold" style:font-size-complex="75%" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Quotations" style:family="paragraph" -    style:parent-style-name="Standard" style:class="html"> -      <style:paragraph-properties fo:margin-left="0.3937in" -      fo:margin-right="0.3937in" fo:margin-top="0.1in" -      fo:margin-bottom="0.1in" fo:text-indent="0in" -      style:auto-text-indent="false" /> -    </style:style> -    <style:style style:name="Preformatted_20_Text" -    style:display-name="Preformatted Text" style:family="paragraph" -    style:parent-style-name="Standard" style:class="html"> -      <style:paragraph-properties fo:margin-top="0in" -      fo:margin-bottom="0in" /> -      <style:text-properties style:font-name="Courier New" -      fo:font-size="10pt" style:font-name-asian="Courier New" -      style:font-size-asian="10pt" -      style:font-name-complex="Courier New" -      style:font-size-complex="10pt" /> -    </style:style> -    <style:style style:name="Definition_20_Term" -    style:display-name="Definition Term" style:family="paragraph" -    style:parent-style-name="Standard" -    style:next-style-name="Definition_20_Definition"> -      <style:paragraph-properties fo:margin-top="0.0598in" -      fo:margin-bottom="0.0598in" /> -    </style:style> -    <style:style style:name="Definition_20_Definition" -    style:display-name="Definition Definition" -    style:family="paragraph" style:parent-style-name="Standard" -    style:next-style-name="Text_20_body"> -      <style:paragraph-properties fo:margin-left="0.5in" -      fo:margin-right="0in" fo:text-indent="0in" -      style:auto-text-indent="false" /> -    </style:style> -    <style:style style:name="Table_20_Contents" -    style:display-name="Table Contents" style:family="paragraph" -    style:parent-style-name="Standard" style:class="extra"> -      <style:paragraph-properties fo:margin-left="0.0299in" -      fo:margin-right="0.0299in" fo:text-indent="0in" -      style:auto-text-indent="false" text:number-lines="false" -      text:line-number="0" /> -    </style:style> -    <style:style style:name="Table_20_Heading" -    style:display-name="Table Heading" style:family="paragraph" -    style:parent-style-name="Table_20_Contents" -    style:class="extra"> -      <style:paragraph-properties fo:margin-left="0.0299in" -      fo:margin-right="0.0299in" fo:text-align="start" -      style:justify-single-word="false" fo:text-indent="0in" -      style:auto-text-indent="false" style:shadow="none" -      text:number-lines="false" text:line-number="0" /> -      <style:text-properties fo:font-weight="bold" -      style:font-weight-asian="bold" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Footnote" style:family="paragraph" -    style:parent-style-name="Standard" style:class="extra"> -      <style:paragraph-properties fo:margin-left="0.1965in" -      fo:margin-right="0in" fo:text-indent="-0.1965in" -      style:auto-text-indent="false" text:number-lines="false" -      text:line-number="0" /> -      <style:text-properties fo:font-size="10pt" -      style:font-size-asian="10pt" -      style:font-size-complex="10pt" /> -    </style:style> -    <style:style style:name="Footer" style:family="paragraph" -    style:parent-style-name="Standard" style:class="extra"> -      <style:paragraph-properties text:number-lines="false" -      text:line-number="0"> -        <style:tab-stops> -          <style:tab-stop style:position="3.25in" -          style:type="center" /> -          <style:tab-stop style:position="6.5in" -          style:type="right" /> -        </style:tab-stops> -      </style:paragraph-properties> -    </style:style> -    <style:style style:name="Definition_20_Term_20_Tight" -    style:display-name="Definition Term Tight" -    style:family="paragraph" style:parent-style-name="Standard" -    style:next-style-name="Definition_20_Definition_20_Tight"> -      <style:paragraph-properties fo:margin-top="0.0799in" -      fo:margin-bottom="0.0799in" /> -    </style:style> -    <style:style style:name="Definition_20_Definition_20_Tight" -    style:display-name="Definition Definition Tight" -    style:family="paragraph" style:parent-style-name="Standard"> -      <style:paragraph-properties fo:margin-left="0.5in" -      fo:margin-right="0in" fo:margin-top="0in" -      fo:margin-bottom="0in" fo:text-indent="0in" -      style:auto-text-indent="false" /> -    </style:style> -    <style:style style:name="Date" style:family="paragraph" -    style:parent-style-name="Standard" -    style:next-style-name="Text_20_body"> -      <style:text-properties fo:font-style="italic" /> -    </style:style> -    <style:style style:name="Author" style:family="paragraph" -    style:parent-style-name="Standard" style:next-style-name="Date" -    style:master-page-name=""> -      <style:paragraph-properties style:page-number="auto" /> -      <style:text-properties fo:font-style="italic" /> -    </style:style> -    <style:style style:name="Numbering_20_Symbols" -    style:display-name="Numbering Symbols" style:family="text" /> -    <style:style style:name="Bullet_20_Symbols" -    style:display-name="Bullet Symbols" style:family="text"> -      <style:text-properties style:font-name="StarSymbol" -      fo:font-size="9pt" style:font-name-asian="StarSymbol" -      style:font-size-asian="9pt" -      style:font-name-complex="StarSymbol" -      style:font-size-complex="9pt" /> -    </style:style> -    <style:style style:name="Emphasis" 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="Strong_20_Emphasis" -    style:display-name="Strong Emphasis" style:family="text"> -      <style:text-properties fo:font-weight="bold" -      style:font-weight-asian="bold" -      style:font-weight-complex="bold" /> -    </style:style> -    <style:style style:name="Strikeout" style:family="text"> -      <style:text-properties style:text-line-through-style="solid" /> -    </style:style> -    <style:style style:name="Superscript" style:family="text"> -      <style:text-properties style:text-position="super 58%" /> -    </style:style> -    <style:style style:name="Subscript" style:family="text"> -      <style:text-properties style:text-position="sub 58%" /> -    </style:style> -    <style:style style:name="Citation" 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="Teletype" style:family="text"> -      <style:text-properties style:font-name="Courier New" -      style:font-name-asian="Courier New" -      style:font-name-complex="Courier New" /> -    </style:style> -    <style:style style:name="Internet_20_link" -    style:display-name="Internet link" style:family="text"> -      <style:text-properties fo:color="#000080" -      style:text-underline-style="solid" -      style:text-underline-width="auto" -      style:text-underline-color="font-color" /> -    </style:style> -    <style:style style:name="Footnote_20_Symbol" -    style:display-name="Footnote Symbol" style:family="text" /> -    <style:style style:name="Footnote_20_anchor" -    style:display-name="Footnote anchor" style:family="text"> -      <style:text-properties style:text-position="super 58%" /> -    </style:style> -    <style:style style:name="Definition" style:family="text" /> -    <text:outline-style> -      <text:outline-level-style text:level="1" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="2" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="3" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="4" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="5" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="6" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="7" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="8" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="9" style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -      <text:outline-level-style text:level="10" -      style:num-format=""> -        <style:list-level-properties text:min-label-distance="0.15in" /> -      </text:outline-level-style> -    </text:outline-style> -    <text:list-style style:name="Numbering_20_1" -    style:display-name="Numbering 1"> -      <text:list-level-style-number text:level="1" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="2" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="0.1972in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="3" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="0.3937in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="4" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="0.5909in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="5" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="0.7874in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="6" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="0.9846in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="7" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="1.1815in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="8" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="1.3787in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="9" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="1.5752in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="10" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:space-before="1.7724in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -    </text:list-style> -    <text:list-style style:name="Numbering_20_2" -    style:display-name="Numbering 2"> -      <text:list-level-style-number text:level="1" -      text:style-name="Numbering_20_Symbols" style:num-format="1"> -        <style:list-level-properties text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="2" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="2"> -        <style:list-level-properties text:space-before="0.1965in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="3" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="3"> -        <style:list-level-properties text:space-before="0.3929in" -        text:min-label-width="0.3937in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="4" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="4"> -        <style:list-level-properties text:space-before="0.7866in" -        text:min-label-width="0.4925in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="5" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="5"> -        <style:list-level-properties text:space-before="1.2791in" -        text:min-label-width="0.5902in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="6" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="6"> -        <style:list-level-properties text:space-before="1.8693in" -        text:min-label-width="0.7091in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="7" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="7"> -        <style:list-level-properties text:space-before="2.5783in" -        text:min-label-width="0.9055in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="8" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="8"> -        <style:list-level-properties text:space-before="3.4839in" -        text:min-label-width="1.0236in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="9" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="9"> -        <style:list-level-properties text:space-before="4.5075in" -        text:min-label-width="1.1028in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="10" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="10"> -        <style:list-level-properties text:space-before="5.6102in" -        text:min-label-width="1.2209in" /> -      </text:list-level-style-number> -    </text:list-style> -    <text:list-style style:name="Numbering_20_3" -    style:display-name="Numbering 3"> -      <text:list-level-style-number text:level="1" -      text:style-name="Numbering_20_Symbols" style:num-format="1"> -        <style:list-level-properties text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="2" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="2"> -        <style:list-level-properties text:space-before="1.1815in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="3" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="3"> -        <style:list-level-properties text:space-before="2.3626in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="4" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="4"> -        <style:list-level-properties text:space-before="3.5441in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="5" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="5"> -        <style:list-level-properties text:space-before="4.7252in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="6" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="6"> -        <style:list-level-properties text:space-before="5.9063in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="7" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="7"> -        <style:list-level-properties text:space-before="7.0878in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="8" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="8"> -        <style:list-level-properties text:space-before="8.2689in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="9" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="9"> -        <style:list-level-properties text:space-before="9.45in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="10" -      text:style-name="Numbering_20_Symbols" style:num-format="1" -      text:start-value="10"> -        <style:list-level-properties text:space-before="10.6315in" -        text:min-label-width="1.1811in" /> -      </text:list-level-style-number> -    </text:list-style> -    <text:list-style style:name="Numbering_20_4" -    style:display-name="Numbering 4"> -      <text:list-level-style-number text:level="1" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I"> -        <style:list-level-properties text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="2" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="2"> -        <style:list-level-properties text:space-before="0.1972in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="3" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="3"> -        <style:list-level-properties text:space-before="0.3937in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="4" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="4"> -        <style:list-level-properties text:space-before="0.5909in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="5" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="5"> -        <style:list-level-properties text:space-before="0.7874in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="6" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="6"> -        <style:list-level-properties text:space-before="0.9846in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="7" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="7"> -        <style:list-level-properties text:space-before="1.1815in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="8" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="8"> -        <style:list-level-properties text:space-before="1.3787in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="9" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="9"> -        <style:list-level-properties text:space-before="1.5752in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="10" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="I" text:start-value="10"> -        <style:list-level-properties text:space-before="1.7724in" -        text:min-label-width="0.1965in" /> -      </text:list-level-style-number> -    </text:list-style> -    <text:list-style style:name="Numbering_20_5" -    style:display-name="Numbering 5"> -      <text:list-level-style-number text:level="1" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1"> -        <style:list-level-properties text:min-label-width="0.1575in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="2" -      text:style-name="Numbering_20_Symbols" style:num-suffix="." -      style:num-format="1" text:start-value="2" -      text:display-levels="2"> -        <style:list-level-properties text:space-before="0.1772in" -        text:min-label-width="0.2563in" /> -      </text:list-level-style-number> -      <text:list-level-style-number text:level="3" -      text:style-name="Numbering_20_Symbols" style:num-suffix=")" -      style:num-format="a" text:start-value="3"> -        <style:list-level-properties text:space-before="0.4331in" -        text:min-label-width="0.1772in" /> -      </text:list-level-style-number> -      <text:list-level-style-bullet text:level="4" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.6319in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="5" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.7874in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="6" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.9429in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="7" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.0988in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="8" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.2543in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="9" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.4098in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="10" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.5654in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -    </text:list-style> -    <text:list-style style:name="List_20_1" -    style:display-name="List 1"> -      <text:list-level-style-bullet text:level="1" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="2" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.1579in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="3" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.3146in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="4" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.4724in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="5" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.6299in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="6" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.7878in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="7" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="0.9445in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="8" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.1024in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="9" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.2598in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="10" -      text:style-name="Numbering_20_Symbols" text:bullet-char="•"> -        <style:list-level-properties text:space-before="1.4177in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -    </text:list-style> -    <text:list-style style:name="List_20_2" -    style:display-name="List 2"> -      <text:list-level-style-bullet text:level="1" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="2" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.1181in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="3" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.2362in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="4" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.3539in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="5" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.472in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="6" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.5902in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="7" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.7091in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="8" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.8272in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="9" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="0.9453in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="10" -      text:style-name="Numbering_20_Symbols" text:bullet-char="–"> -        <style:list-level-properties text:space-before="1.063in" -        text:min-label-width="0.1181in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -    </text:list-style> -    <text:list-style style:name="List_20_3" -    style:display-name="List 3"> -      <text:list-level-style-bullet text:level="1" -      text:style-name="Numbering_20_Symbols" text:bullet-char="☑"> -        <style:list-level-properties text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="2" -      text:style-name="Numbering_20_Symbols" text:bullet-char="□"> -        <style:list-level-properties text:space-before="0.1555in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="3" -      text:style-name="Numbering_20_Symbols" text:bullet-char="☑"> -        <style:list-level-properties text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="4" -      text:style-name="Numbering_20_Symbols" text:bullet-char="□"> -        <style:list-level-properties text:space-before="0.1555in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="5" -      text:style-name="Numbering_20_Symbols" text:bullet-char="☑"> -        <style:list-level-properties text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="6" -      text:style-name="Numbering_20_Symbols" text:bullet-char="□"> -        <style:list-level-properties text:space-before="0.1555in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="7" -      text:style-name="Numbering_20_Symbols" text:bullet-char="☑"> -        <style:list-level-properties text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="8" -      text:style-name="Numbering_20_Symbols" text:bullet-char="□"> -        <style:list-level-properties text:space-before="0.1555in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="9" -      text:style-name="Numbering_20_Symbols" text:bullet-char="☑"> -        <style:list-level-properties text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="10" -      text:style-name="Numbering_20_Symbols" text:bullet-char="□"> -        <style:list-level-properties text:space-before="0.1555in" -        text:min-label-width="0.1555in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -    </text:list-style> -    <text:list-style style:name="List_20_4" -    style:display-name="List 4"> -      <text:list-level-style-bullet text:level="1" -      text:style-name="Numbering_20_Symbols" text:bullet-char="➢"> -        <style:list-level-properties text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="2" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="0.1579in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="3" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="0.3146in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="4" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="0.4724in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="5" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="0.6299in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="6" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="0.7878in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="7" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="0.9445in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="8" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="1.1024in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="9" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="1.2598in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="10" -      text:style-name="Numbering_20_Symbols" text:bullet-char=""> -        <style:list-level-properties text:space-before="1.4177in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -    </text:list-style> -    <text:list-style style:name="List_20_5" -    style:display-name="List 5"> -      <text:list-level-style-bullet text:level="1" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="2" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="0.1579in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="3" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="0.3146in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="4" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="0.4724in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="5" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="0.6299in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="6" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="0.7878in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="7" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="0.9445in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="8" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="1.1024in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="9" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="1.2598in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -      <text:list-level-style-bullet text:level="10" -      text:style-name="Numbering_20_Symbols" text:bullet-char="✗"> -        <style:list-level-properties text:space-before="1.4177in" -        text:min-label-width="0.1575in" /> -        <style:text-properties style:font-name="StarSymbol" /> -      </text:list-level-style-bullet> -    </text:list-style> -    <text:notes-configuration text:note-class="footnote" -    text:citation-style-name="Footnote_20_Symbol" -    text:citation-body-style-name="Footnote_20_anchor" -    style:num-format="1" text:start-value="0" -    text:footnotes-position="page" -    text:start-numbering-at="document" /> -    <text:notes-configuration text:note-class="endnote" -    style:num-format="i" text:start-value="0" /> -    <text:linenumbering-configuration text:number-lines="false" -    text:offset="0.1965in" style:num-format="1" -    text:number-position="left" text:increment="5" /> -    <style:style style:name="Horizontal_20_Line" -    style:display-name="Horizontal Line" style:family="paragraph" -    style:parent-style-name="Standard" -    style:next-style-name="Text_20_body" style:class="html"> -      <style:paragraph-properties fo:margin-top="0in" -      fo:margin-bottom="0.1965in" -      style:border-line-width-bottom="0.0008in 0.0138in 0.0008in" -      fo:padding="0in" fo:border-left="none" fo:border-right="none" -      fo:border-top="none" -      fo:border-bottom="0.0154in double #808080" -      text:number-lines="false" text:line-number="0" -      style:join-border="false" /> -      <style:text-properties fo:font-size="6pt" -      style:font-size-asian="6pt" style:font-size-complex="6pt" /> -    </style:style> -  </office:styles> -  <office:automatic-styles> -    <style:style style:name="P1" style:family="paragraph" -    style:parent-style-name="Footer"> -      <style:paragraph-properties fo:text-align="center" -      style:justify-single-word="false" /> -    </style:style> -    <style:page-layout style:name="pm1"> -      <style:page-layout-properties fo:page-width="8.5in" -      fo:page-height="11in" style:num-format="1" -      style:print-orientation="portrait" fo:margin-top="1in" -      fo:margin-bottom="1in" fo:margin-left="1in" -      fo:margin-right="1in" style:writing-mode="lr-tb" -      style:footnote-max-height="0in"> -        <style:footnote-sep style:width="0.0071in" -        style:distance-before-sep="0.0398in" -        style:distance-after-sep="0.0398in" style:adjustment="left" -        style:rel-width="25%" style:color="#000000" /> -      </style:page-layout-properties> -      <style:header-style /> -      <style:footer-style> -        <style:header-footer-properties fo:min-height="0.4in" -        fo:margin-left="0in" fo:margin-right="0in" -        fo:margin-top="0.2in" style:dynamic-spacing="false" /> -      </style:footer-style> -    </style:page-layout> -  </office:automatic-styles> -  <office:master-styles> -    <style:master-page style:name="Standard" -    style:page-layout-name="pm1"> -      <style:footer> -        <text:p text:style-name="P1"> -          <text:page-number text:select-page="current"> -          1</text:page-number> -        </text:p> -      </style:footer> -    </style:master-page> -  </office:master-styles> -</office:document-styles> diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md index 692f502d0..59b50fbd5 100644 --- a/man/man1/pandoc.1.md +++ b/man/man1/pandoc.1.md @@ -203,6 +203,17 @@ to Pandoc.  Or use `html2markdown`(1), a wrapper around `pandoc`.      Implies `-s`. Note: This option is deprecated. Users should      transition to using `--template` instead. +\--reference-odt=*filename* +:   Use the specified file as a style reference in producing an ODT. +    For best results, the reference ODT should be a modified version +    of an ODT produced using pandoc.  The contents of the reference ODT +    are ignored, but its stylesheets are used in the new ODT. If no +    reference ODT is specified on the command line, pandoc will look +    for `$HOME/.pandoc/reference.odt` (on unix) or +    `C:\Documents And Settings\USERNAME\Application Data\pandoc\reference.odt` +    (on Windows). If this is not found either, sensible defaults will be +    used. +  -D *FORMAT*, \--print-default-template=*FORMAT*  :   Print the default template for an output *FORMAT*. (See `-t`      for a list of possible *FORMAT*s.) diff --git a/pandoc.cabal b/pandoc.cabal index 0c9458aac..91d769e22 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -43,12 +43,7 @@ Data-Files:                   templates/rst.template,                   templates/mediawiki.template, templates/rtf.template,                   -- data for ODT writer -                 data/odt/meta.xml, -                 data/odt/settings.xml, -                 data/odt/META-INF/manifest.xml, -                 data/odt/Thumbnails/thumbnail.png, -                 data/odt/styles.xml, -                 data/odt/mimetype, +                 reference.odt,                   -- data for LaTeXMathML writer                   data/LaTeXMathML.js.comment,                   data/LaTeXMathML.js.packed, @@ -151,7 +146,7 @@ Library                   parsec >= 2.1 && < 3, xhtml >= 3000.0,                   mtl >= 1.1, network >= 2, filepath >= 1.1,                   process >= 1, directory >= 1, template-haskell >= 2.2, -                 bytestring >= 0.9, zip-archive >= 0.1.1, +                 bytestring >= 0.9, zip-archive >= 0.1.1.4,                   utf8-string >= 0.3, old-time >= 1    if impl(ghc >= 6.10)      Build-depends: base >= 4 && < 5, syb diff --git a/reference.odt b/reference.odtBinary files differ new file mode 100644 index 000000000..64a74493b --- /dev/null +++ b/reference.odt diff --git a/src/Text/Pandoc/ODT.hs b/src/Text/Pandoc/ODT.hs index 01390cbbf..7b5fe9daa 100644 --- a/src/Text/Pandoc/ODT.hs +++ b/src/Text/Pandoc/ODT.hs @@ -37,24 +37,27 @@ import Codec.Archive.Zip  import Control.Applicative ( (<$>) )  import Text.ParserCombinators.Parsec  import System.Time -import Text.Pandoc.Shared ( inDirectory )  import Paths_pandoc ( getDataFileName )  import System.Directory +import Control.Monad (liftM)  -- | Produce an ODT file from OpenDocument XML. -saveOpenDocumentAsODT :: FilePath    -- ^ Pathname of ODT file to be produced. -                      -> FilePath    -- ^ Relative directory of source file. -                      -> String      -- ^ OpenDocument XML contents. +saveOpenDocumentAsODT :: FilePath      -- ^ Pathname of ODT file to be produced. +                      -> FilePath      -- ^ Relative directory of source file. +                      -> Maybe FilePath -- ^ Path specified by --reference-odt +                      -> String        -- ^ OpenDocument XML contents.                        -> IO () -saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do -  userDir <- getAppUserDataDirectory "pandoc" -  userOdtExists <- doesFileExist $ -                      userDir </> "data" </> "odt" </> "styles.xml" -  refArchivePath <- if userOdtExists -                       then return $ userDir </> "data" </> "odt" -                       else getDataFileName $ "data" </> "odt" -  refArchive <- inDirectory refArchivePath $ -                  addFilesToArchive [OptRecursive] emptyArchive ["."] +saveOpenDocumentAsODT destinationODTPath sourceDirRelative mbRefOdt xml = do +  refArchive <- liftM toArchive $ +       case mbRefOdt of +             Just f -> B.readFile f +             Nothing -> do +               userDataDir <- getAppUserDataDirectory "pandoc"  +               let userRefOdt = userDataDir </> "reference.odt" +               userRefOdtExists <- doesFileExist userRefOdt +               if userRefOdtExists +                  then B.readFile userRefOdt +                  else getDataFileName "reference.odt" >>= B.readFile    -- handle pictures    let (newContents, pics) =           case runParser pPictures [] "OpenDocument XML contents" xml of diff --git a/src/pandoc.hs b/src/pandoc.hs index e85553141..9f402ede8 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -151,6 +151,7 @@ data Opt = Opt      , optXeTeX             :: Bool    -- ^ Format latex for xetex      , optSmart             :: Bool    -- ^ Use smart typography      , optHTMLMathMethod    :: HTMLMathMethod -- ^ Method to print HTML math +    , optReferenceODT      :: Maybe FilePath -- ^ Path of reference.odt      , optDumpArgs          :: Bool    -- ^ Output command-line arguments      , optIgnoreArgs        :: Bool    -- ^ Ignore command-line arguments      , optStrict            :: Bool    -- ^ Use strict markdown syntax @@ -188,6 +189,7 @@ defaultOpts = Opt      , optXeTeX             = False      , optSmart             = False      , optHTMLMathMethod    = PlainMath +    , optReferenceODT      = Nothing      , optDumpArgs          = False      , optIgnoreArgs        = False      , optStrict            = False @@ -429,6 +431,13 @@ options =                    "STRING")                   "" -- "String to prefix to HTML window title" +    , Option "" ["reference-odt"] +                 (ReqArg +                  (\arg opt -> do +                    return opt { optReferenceODT = Just arg }) +                  "FILENAME") +                 "" -- "Path of custom reference.odt" +      , Option "D" ["print-default-template"]                   (ReqArg                    (\arg _ -> do @@ -582,6 +591,7 @@ main = do                , optXeTeX             = xetex                , optSmart             = smart                , optHTMLMathMethod    = mathMethod +              , optReferenceODT      = referenceODT                , optDumpArgs          = dumpArgs                , optIgnoreArgs        = ignoreArgs                , optStrict            = strict @@ -717,9 +727,9 @@ main = do  #endif    let writerOutput = writer writerOptions doc' ++ "\n" - +     case writerName' of -       "odt"   -> saveOpenDocumentAsODT outputFile sourceDirRelative writerOutput +       "odt"   -> saveOpenDocumentAsODT outputFile sourceDirRelative referenceODT writerOutput         _       -> if outputFile == "-"                       then putStr writerOutput                       else writeFile outputFile writerOutput | 
