dev/null |binary extras/source/templates/presnt/Metropolis/META-INF/manifest.xml | 1 extras/source/templates/presnt/Metropolis/content.xml | 22 extras/source/templates/presnt/Metropolis/meta.xml | 5 extras/source/templates/presnt/Metropolis/styles.xml | 221 +--------- extras/template_files.mk | 1 6 files changed, 43 insertions(+), 207 deletions(-)
New commits: commit c7344d039b07d474b11493af70152369d5430826 Author: Laurent Balland <laurent.ball...@mailo.fr> AuthorDate: Wed Jul 31 18:33:24 2024 +0200 Commit: Laurent Balland <laurent.ball...@mailo.fr> CommitDate: Sun Sep 1 10:13:06 2024 +0200 Update Metropolis Impress template - remove PNG image to keep only SVG image - protect position and size of background image - simplify definition of font names - remove unused styles - add licence and initial creator in meta.xml according to https://github.com/dohliam/libreoffice-impress-templates/tree/master/lo-cft - remove text:span empty tags Change-Id: Ib4879f38113182a7bbae60e4be456c7a189ffb94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171331 Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr> Tested-by: Jenkins diff --git a/extras/source/templates/presnt/Metropolis/META-INF/manifest.xml b/extras/source/templates/presnt/Metropolis/META-INF/manifest.xml index 2d93ed75584e..ebc5168620d8 100644 --- a/extras/source/templates/presnt/Metropolis/META-INF/manifest.xml +++ b/extras/source/templates/presnt/Metropolis/META-INF/manifest.xml @@ -4,7 +4,6 @@ <manifest:file-entry manifest:full-path="Thumbnails/thumbnail.png" manifest:media-type="image/png"/> <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/> <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/> - <manifest:file-entry manifest:full-path="Pictures/10000201000003AF000002126A94207C4902B60B.png" manifest:media-type="image/png"/> <manifest:file-entry manifest:full-path="Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg" manifest:media-type="image/svg+xml"/> <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/> </manifest:manifest> diff --git a/extras/source/templates/presnt/Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png b/extras/source/templates/presnt/Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png deleted file mode 100644 index 28ecad78f0b6..000000000000 Binary files a/extras/source/templates/presnt/Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png and /dev/null differ diff --git a/extras/source/templates/presnt/Metropolis/content.xml b/extras/source/templates/presnt/Metropolis/content.xml index 20b822a8d197..652265fc32d4 100644 --- a/extras/source/templates/presnt/Metropolis/content.xml +++ b/extras/source/templates/presnt/Metropolis/content.xml @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document-content 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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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" x mlns: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" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation: names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2"> - <office:scripts/> - <office:font-face-decls> - <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable"/> - </office:font-face-decls> <office:automatic-styles> <style:style style:name="dp1" style:family="drawing-page"> <style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" presentation:display-footer="true" presentation:display-page-number="false" presentation:display-date-time="true"/> @@ -14,33 +10,21 @@ <style:style style:name="gr1" style:family="graphic"> <style:graphic-properties style:protect="size"/> </style:style> - <style:style style:name="pr1" style:family="presentation" style:parent-style-name="Metropolis-title"> - <style:graphic-properties fo:min-height="2cm"/> - </style:style> - <style:style style:name="pr2" style:family="presentation" style:parent-style-name="Metropolis-subtitle"> - <style:graphic-properties draw:fill-color="#ffffff" draw:auto-grow-height="true" fo:min-height="10.548cm"/> - </style:style> - <style:style style:name="pr3" style:family="presentation" style:parent-style-name="Metropolis-notes"> - <style:graphic-properties draw:fill-color="#ffffff" draw:auto-grow-height="true" fo:min-height="14cm"/> - </style:style> - <style:style style:name="P1" style:family="paragraph"> - <loext:graphic-properties draw:fill-color="#ffffff"/> - </style:style> </office:automatic-styles> <office:body> <office:presentation> <draw:page draw:name="page1" draw:style-name="dp1" draw:master-page-name="Metropolis" presentation:presentation-page-layout-name="AL1T0"> <office:forms form:automatic-focus="false" form:apply-design-mode="false"/> - <draw:frame presentation:style-name="pr1" draw:layer="layout" svg:width="14.8cm" svg:height="2cm" svg:x="6.6cm" svg:y="0.6cm" presentation:class="title" presentation:placeholder="true" presentation:user-transformed="true"> + <draw:frame presentation:style-name="Metropolis-title" draw:layer="layout" svg:width="14.8cm" svg:height="2cm" svg:x="6.6cm" svg:y="0.6cm" presentation:class="title" presentation:placeholder="true" presentation:user-transformed="true"> <draw:text-box/> </draw:frame> - <draw:frame presentation:style-name="pr2" draw:text-style-name="P1" draw:layer="layout" svg:width="25.2cm" svg:height="10.548cm" svg:x="1.4cm" svg:y="3.8cm" presentation:class="subtitle" presentation:placeholder="true"> + <draw:frame presentation:style-name="Metropolis-subtitle" draw:layer="layout" svg:width="25.2cm" svg:height="10.548cm" svg:x="1.4cm" svg:y="3.8cm" presentation:class="subtitle" presentation:placeholder="true"> <draw:text-box/> </draw:frame> <presentation:notes draw:style-name="dp2"> <office:forms form:automatic-focus="false" form:apply-design-mode="false"/> <draw:page-thumbnail draw:style-name="gr1" draw:layer="layout" svg:width="17cm" svg:height="9.56cm" svg:x="2cm" svg:y="2.5cm" draw:page-number="1" presentation:class="page"/> - <draw:frame presentation:style-name="pr3" draw:text-style-name="P1" draw:layer="layout" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true" presentation:user-transformed="true"> + <draw:frame presentation:style-name="Metropolis-notes" draw:layer="layout" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true" presentation:user-transformed="true"> <draw:text-box/> </draw:frame> </presentation:notes> diff --git a/extras/source/templates/presnt/Metropolis/meta.xml b/extras/source/templates/presnt/Metropolis/meta.xml index 38f87355711e..79ba78e3f018 100644 --- a/extras/source/templates/presnt/Metropolis/meta.xml +++ b/extras/source/templates/presnt/Metropolis/meta.xml @@ -2,8 +2,9 @@ <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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.2"> <office:meta> <meta:creation-date>2017-11-26T15:11:21.557030589</meta:creation-date> - <meta:editing-duration>PT1M14S</meta:editing-duration> - <meta:editing-cycles>2</meta:editing-cycles> + <meta:initial-creator>Alexander Wilms</meta:initial-creator> + <dc:description>This work is licensed under a Creative Commons 0 License. +It makes use of the works of Alexander Wilms.</dc:description> <meta:generator>LibreOffice/5.4.2.2$Linux_X86_64 LibreOffice_project/22b09f6418e8c2d508a9eaf86b2399209b0990f4</meta:generator> <dc:title>Metropolis</dc:title> <dc:date>2017-11-26T15:12:36.105102306</dc:date> diff --git a/extras/source/templates/presnt/Metropolis/styles.xml b/extras/source/templates/presnt/Metropolis/styles.xml index 6a7a14efca6c..24590547d7fb 100644 --- a/extras/source/templates/presnt/Metropolis/styles.xml +++ b/extras/source/templates/presnt/Metropolis/styles.xml @@ -1,17 +1,14 @@ <?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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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" xm lns: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" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:css3t="http://www .w3.org/TR/css3-text/" office:version="1.2"> <office:font-face-decls> - <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable"/> + <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> <style:font-face style:name="Noto Sans CJK" svg:font-family="'Noto Sans CJK JP:palt','Noto Sans CJK KR','Noto Sans CJK SC','Noto Sans CJK TC','Noto Sans CJK HK'" style:font-family-generic="swiss" style:font-pitch="variable" /> <style:font-face style:name="Noto Sans" svg:font-family="Noto Sans" style:font-family-generic="swiss" style:font-pitch="variable" /> </office:font-face-decls> <office:styles> - <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/> <style:default-style style:family="graphic"> <style:graphic-properties svg:stroke-color="#808080" draw:fill-color="#cfe7f5" fo:wrap-option="no-wrap"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" style:font-independent-line-spacing="false"> - <style:tab-stops/> - </style:paragraph-properties> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" style:font-independent-line-spacing="false"/> <style:text-properties style:use-window-font-color="true" style:font-name="Liberation Sans" fo:font-size="24pt" style:font-size-asian="24pt" style:font-name-asian="Noto Sans CJK" style:font-size-complex="24pt" style:font-name-complex="Noto Sans" /> </style:default-style> <style:style style:name="standard" style:family="graphic"> @@ -60,7 +57,7 @@ </text:list-style> </style:graphic-properties> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" fo:line-height="100%" fo:text-indent="0cm"/> - <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> + <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> <style:style style:name="objectwithoutfill" style:family="graphic" style:parent-style-name="standard"> <style:graphic-properties svg:stroke-color="#000000" draw:fill="none"/> @@ -71,12 +68,12 @@ </style:style> <style:style style:name="Metropolis-backgroundobjects" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-image-width="0cm" draw:fill-image-height="0cm" draw:textarea-horizontal-align="justify" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/> - <style:text-properties fo:color="#ffffff" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt" style:letter-kerning="true"/> + <style:text-properties fo:color="#ffffff" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt" style:letter-kerning="true"/> </style:style> <style:style style:name="Metropolis-notes" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none"/> <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm" fo:text-indent="0cm"/> - <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> + <style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> <style:style style:name="Metropolis-outline1" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="true"> @@ -124,7 +121,7 @@ </text:list-style> </style:graphic-properties> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.374cm" fo:text-indent="0cm"/> - <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> + <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> <style:style style:name="Metropolis-outline2" style:family="presentation" style:parent-style-name="Metropolis-outline1"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.299cm" fo:text-indent="0cm"/> @@ -204,7 +201,7 @@ </text:list-style> </style:graphic-properties> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" fo:text-indent="0cm"/> - <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="32pt" style:font-size-asian="32pt" style:font-size-complex="32pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> + <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="32pt" style:font-size-asian="32pt" style:font-size-complex="32pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> <style:style style:name="Metropolis-title" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle" draw:fit-to-size="false" style:shrink-to-fit="true"> @@ -252,7 +249,7 @@ </text:list-style> </style:graphic-properties> <style:paragraph-properties fo:text-align="center"/> - <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="33pt" style:font-size-asian="33pt" style:font-size-complex="33pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> + <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="33pt" style:font-size-asian="33pt" style:font-size-complex="33pt" fo:font-style="normal" style:font-style-asian="normal" style:font-style-complex="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal" style:letter-kerning="true" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> <style:presentation-page-layout style:name="AL0T26"> <presentation:placeholder presentation:object="handout" svg:x="2.058cm" svg:y="1.743cm" svg:width="10.556cm" svg:height="-0.233cm"/> @@ -287,155 +284,28 @@ <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> <style:style style:name="Mgr3" style:family="graphic" style:parent-style-name="standard"> - <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%" draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:image-opacity="100%" style:mirror="none"/> - </style:style> - <style:style style:name="Mpr1" style:family="presentation" style:parent-style-name="Metropolis-backgroundobjects"> - <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.449cm"/> - </style:style> - <style:style style:name="Mpr2" style:family="presentation" style:parent-style-name="Metropolis-backgroundobjects"> - <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.485cm"/> + <style:graphic-properties draw:stroke="none" draw:fill="none" style:protect="position size" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%" draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:image-opacity="100%" style:mirror="none"/> </style:style> <style:style style:name="Mpr3" style:family="presentation" style:parent-style-name="Metropolis-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> - <style:style style:name="MP1" style:family="paragraph"> - <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> <style:style style:name="MP2" style:family="paragraph"> <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> </style:style> - <style:style style:name="MP3" style:family="paragraph"> - <style:paragraph-properties fo:text-align="end"/> - <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> <style:style style:name="MP4" style:family="paragraph"> <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> <style:paragraph-properties fo:text-align="end"/> <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> </style:style> - <style:style style:name="MP5" style:family="paragraph"> - <loext:graphic-properties draw:fill="none"/> - <style:paragraph-properties fo:text-align="center"/> - </style:style> - <style:style style:name="MP6" style:family="paragraph"> - <style:paragraph-properties fo:text-align="center"/> - <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> <style:style style:name="MP7" style:family="paragraph"> <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> <style:paragraph-properties fo:text-align="center"/> <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> </style:style> - <style:style style:name="MP8" style:family="paragraph"> - <style:text-properties fo:color="#000000" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> - <style:style style:name="MP9" style:family="paragraph"> - <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> - <style:text-properties fo:color="#000000" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> - <style:style style:name="MP10" style:family="paragraph"> - <style:paragraph-properties fo:text-align="end"/> - <style:text-properties fo:color="#000000" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> - <style:style style:name="MP11" style:family="paragraph"> - <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/> - <style:paragraph-properties fo:text-align="end"/> - <style:text-properties fo:color="#000000" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> - <style:style style:name="MT1" style:family="text"> - <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> - <style:style style:name="MT2" style:family="text"> - <style:text-properties fo:color="#ffffff" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> - </style:style> <style:style style:name="MT3" style:family="text"> - <style:text-properties fo:color="#000000" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> + <style:text-properties fo:color="#000000"/> </style:style> - <text:list-style style:name="ML1"> - <text:list-level-style-bullet text:level="1" text:bullet-char="●"> - <style:list-level-properties text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="2" text:bullet-char="●"> - <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="3" text:bullet-char="●"> - <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="4" text:bullet-char="●"> - <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="5" text:bullet-char="●"> - <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="6" text:bullet-char="●"> - <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="7" text:bullet-char="●"> - <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="8" text:bullet-char="●"> - <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="9" text:bullet-char="●"> - <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="10" text:bullet-char="●"> - <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - </text:list-style> - <text:list-style style:name="ML2"> - <text:list-level-style-bullet text:level="1" text:bullet-char="●"> - <style:list-level-properties text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="2" text:bullet-char="●"> - <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="3" text:bullet-char="●"> - <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="4" text:bullet-char="●"> - <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="5" text:bullet-char="●"> - <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="6" text:bullet-char="●"> - <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="7" text:bullet-char="●"> - <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="8" text:bullet-char="●"> - <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="9" text:bullet-char="●"> - <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - <text:list-level-style-bullet text:level="10" text:bullet-char="●"> - <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/> - <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> - </text:list-level-style-bullet> - </text:list-style> </office:automatic-styles> <office:master-styles> <draw:layer-set> @@ -448,37 +318,29 @@ <style:handout-master presentation:presentation-page-layout-name="AL0T26" style:page-layout-name="PM0" draw:style-name="Mdp2"> <draw:frame draw:style-name="Mgr1" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header"> <draw:text-box> - <text:p text:style-name="MP1"> - <text:span text:style-name="MT1"> - <presentation:header/> - </text:span> + <text:p> + <presentation:header/> </text:p> </draw:text-box> </draw:frame> <draw:frame draw:style-name="Mgr1" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm" presentation:class="date-time"> <draw:text-box> - <text:p text:style-name="MP3"> - <text:span text:style-name="MT1"> - <presentation:date-time/> - </text:span> + <text:p> + <presentation:date-time/> </text:p> </draw:text-box> </draw:frame> <draw:frame draw:style-name="Mgr2" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="28.215cm" presentation:class="footer"> <draw:text-box> - <text:p text:style-name="MP1"> - <text:span text:style-name="MT1"> - <presentation:footer/> - </text:span> + <text:p> + <presentation:footer/> </text:p> </draw:text-box> </draw:frame> <draw:frame draw:style-name="Mgr2" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number"> <draw:text-box> - <text:p text:style-name="MP3"> - <text:span text:style-name="MT1"> - <text:page-number/> - </text:span> + <text:p> + <text:page-number/> </text:p> </draw:text-box> </draw:frame> @@ -490,11 +352,8 @@ <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="5.061cm" svg:x="11cm" svg:y="20.894cm"/> </style:handout-master> <style:master-page style:name="Metropolis" style:page-layout-name="PM1" draw:style-name="Mdp1"> - <draw:frame draw:style-name="Mgr3" draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="28cm" svg:height="15.75cm" svg:x="0cm" svg:y="0cm"> - <draw:image xlink:href="Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"> - <text:p/> - </draw:image> - <draw:image xlink:href="Pictures/10000201000003AF000002126A94207C4902B60B.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + <draw:frame draw:style-name="Mgr3" draw:layer="backgroundobjects" svg:width="28cm" svg:height="15.75cm" svg:x="0cm" svg:y="0cm"> + <draw:image xlink:href="Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> </draw:frame> <draw:frame presentation:style-name="Metropolis-title" draw:layer="backgroundobjects" svg:width="14.8cm" svg:height="2cm" svg:x="6.6cm" svg:y="0.6cm" presentation:class="title" presentation:placeholder="true"> <draw:text-box/> @@ -502,30 +361,24 @@ <draw:frame presentation:style-name="Metropolis-outline1" draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="10.548cm" svg:x="1.4cm" svg:y="3.8cm" presentation:class="outline" presentation:placeholder="true"> <draw:text-box/> </draw:frame> - <draw:frame presentation:style-name="Mpr1" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="0.634cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time"> + <draw:frame presentation:style-name="Metropolis-backgroundobjects" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="0.634cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time"> <draw:text-box> - <text:p text:style-name="MP1"> - <text:span text:style-name="MT2"> - <presentation:date-time/> - </text:span> + <text:p> + <presentation:date-time/> </text:p> </draw:text-box> </draw:frame> - <draw:frame presentation:style-name="Mpr1" draw:text-style-name="MP7" draw:layer="backgroundobjects" svg:width="8.875cm" svg:height="0.634cm" svg:x="9.576cm" svg:y="14.8cm" presentation:class="footer"> + <draw:frame presentation:style-name="Metropolis-backgroundobjects" draw:text-style-name="MP7" draw:layer="backgroundobjects" svg:width="8.875cm" svg:height="0.634cm" svg:x="9.576cm" svg:y="14.8cm" presentation:class="footer"> <draw:text-box> - <text:p text:style-name="MP6"> - <text:span text:style-name="MT2"> - <presentation:footer/> - </text:span> + <text:p> + <presentation:footer/> </text:p> </draw:text-box> </draw:frame> - <draw:frame presentation:style-name="Mpr1" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="0.634cm" svg:x="20.076cm" svg:y="14.8cm" presentation:class="page-number"> + <draw:frame presentation:style-name="Metropolis-backgroundobjects" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="0.634cm" svg:x="20.076cm" svg:y="14.8cm" presentation:class="page-number"> <draw:text-box> - <text:p text:style-name="MP3"> - <text:span text:style-name="MT2"> - <text:page-number/> - </text:span> + <text:p> + <text:page-number/> </text:p> </draw:text-box> </draw:frame> @@ -534,36 +387,36 @@ <draw:frame presentation:style-name="Metropolis-notes" draw:layer="backgroundobjects" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true"> <draw:text-box/> </draw:frame> - <draw:frame presentation:style-name="Mpr2" draw:text-style-name="MP9" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header"> + <draw:frame presentation:style-name="Metropolis-backgroundobjects" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header"> <draw:text-box> - <text:p text:style-name="MP8"> + <text:p> <text:span text:style-name="MT3"> <presentation:header/> </text:span> </text:p> </draw:text-box> </draw:frame> - <draw:frame presentation:style-name="Mpr2" draw:text-style-name="MP11" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm" presentation:class="date-time"> + <draw:frame presentation:style-name="Metropolis-backgroundobjects" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.887cm" svg:y="0cm" presentation:class="date-time"> <draw:text-box> - <text:p text:style-name="MP10"> + <text:p> <text:span text:style-name="MT3"> <presentation:date-time/> </text:span> </text:p> </draw:text-box> </draw:frame> - <draw:frame presentation:style-name="Mpr3" draw:text-style-name="MP9" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="28.215cm" presentation:class="footer"> + <draw:frame presentation:style-name="Mpr3" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.485cm" svg:x="0cm" svg:y="28.215cm" presentation:class="footer"> <draw:text-box> - <text:p text:style-name="MP8"> + <text:p> <text:span text:style-name="MT3"> <presentation:footer/> </text:span> </text:p> </draw:text-box> </draw:frame> - <draw:frame presentation:style-name="Mpr3" draw:text-style-name="MP11" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number"> + <draw:frame presentation:style-name="Mpr3" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.485cm" svg:x="11.887cm" svg:y="28.215cm" presentation:class="page-number"> <draw:text-box> - <text:p text:style-name="MP10"> + <text:p> <text:span text:style-name="MT3"> <text:page-number/> </text:span> diff --git a/extras/template_files.mk b/extras/template_files.mk index 83f1c20011e8..5c8f22518784 100644 --- a/extras/template_files.mk +++ b/extras/template_files.mk @@ -101,7 +101,6 @@ extra_files_PRESENTATIONS := \ presnt/Growing_Liberty/Thumbnails/thumbnail.png \ presnt/Inspiration/Thumbnails/thumbnail.png \ presnt/Lights/Thumbnails/thumbnail.png \ - presnt/Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png \ presnt/Metropolis/Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg \ presnt/Metropolis/Thumbnails/thumbnail.png \ presnt/Midnightblue/Thumbnails/thumbnail.png \