dev/null |binary extras/source/templates/presnt/Piano/META-INF/manifest.xml | 2 extras/source/templates/presnt/Piano/content.xml | 1 extras/source/templates/presnt/Piano/styles.xml | 234 +++++++++---- extras/template_files.mk | 2 5 files changed, 176 insertions(+), 63 deletions(-)
New commits: commit c83afed32fbcec2a22862d97e8974ba202029051 Author: Laurent Balland <laurent.ball...@mailo.fr> AuthorDate: Mon Aug 12 10:34:05 2024 +0200 Commit: Laurent Balland <laurent.ball...@mailo.fr> CommitDate: Sun Sep 1 21:08:34 2024 +0200 Piano template: replace pictures with shapes Pictures in Piano Impress template can be replaced by simple shapes. Illustrations are now sharper. User may modifiy colors or adds music notes. Set font color to black for Handout and Notes elements Remove text:span empty tags Change-Id: Icf91ce91eb51e3871be23f1d901b510a781aa43e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171752 Tested-by: Jenkins Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr> diff --git a/extras/source/templates/presnt/Piano/META-INF/manifest.xml b/extras/source/templates/presnt/Piano/META-INF/manifest.xml index 87a66ca68c2d..c3e1aec9147d 100644 --- a/extras/source/templates/presnt/Piano/META-INF/manifest.xml +++ b/extras/source/templates/presnt/Piano/META-INF/manifest.xml @@ -4,7 +4,5 @@ <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/100002010000033A0000006EDD62437E1CC42053.png" manifest:media-type="image/png"/> - <manifest:file-entry manifest:full-path="Pictures/100000000000035400000120266623530F1969D0.png" manifest:media-type="image/png"/> <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/> </manifest:manifest> diff --git a/extras/source/templates/presnt/Piano/Pictures/100000000000035400000120266623530F1969D0.png b/extras/source/templates/presnt/Piano/Pictures/100000000000035400000120266623530F1969D0.png deleted file mode 100644 index 4755736ed78b..000000000000 Binary files a/extras/source/templates/presnt/Piano/Pictures/100000000000035400000120266623530F1969D0.png and /dev/null differ diff --git a/extras/source/templates/presnt/Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png b/extras/source/templates/presnt/Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png deleted file mode 100644 index ac02144966db..000000000000 Binary files a/extras/source/templates/presnt/Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png and /dev/null differ diff --git a/extras/source/templates/presnt/Piano/content.xml b/extras/source/templates/presnt/Piano/content.xml index a2e379644148..ffdc1109ea3b 100644 --- a/extras/source/templates/presnt/Piano/content.xml +++ b/extras/source/templates/presnt/Piano/content.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document-content xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" 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:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:rpt="http://openoffice.org/2005/report" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" x mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" 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: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: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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:presentat ion="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.2"> - <office:scripts/> <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"/> diff --git a/extras/source/templates/presnt/Piano/styles.xml b/extras/source/templates/presnt/Piano/styles.xml index f0394089267c..dbea4e3302b0 100644 --- a/extras/source/templates/presnt/Piano/styles.xml +++ b/extras/source/templates/presnt/Piano/styles.xml @@ -13,6 +13,14 @@ <draw:gradient draw:name="Filled_20_Yellow" draw:display-name="Filled Yellow" draw:style="linear" draw:start-color="#ffde59" draw:end-color="#b47804" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/> <draw:gradient draw:name="Gradient_20_1" draw:display-name="Gradient 1" draw:style="linear" draw:start-color="#3465a4" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/> <draw:gradient draw:name="Shapes" draw:style="rectangular" draw:cx="50%" draw:cy="50%" draw:start-color="#cccccc" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/> + <draw:gradient draw:name="Gradient_20_16" draw:display-name="Gradient 16" draw:style="linear" draw:start-color="#ffffff" draw:end-color="#c9c9c9" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="270deg" draw:border="50%"> + <loext:gradient-stop svg:offset="0" loext:color-type="rgb" loext:color-value="#ffffff"/> + <loext:gradient-stop svg:offset="1" loext:color-type="rgb" loext:color-value="#c9c9c9"/> + </draw:gradient> + <draw:gradient draw:name="Gradient_20_21" draw:display-name="Gradient 21" draw:style="linear" draw:start-color="#000000" draw:end-color="#cccccc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="90deg" draw:border="20%"> + <loext:gradient-stop svg:offset="0" loext:color-type="rgb" loext:color-value="#000000"/> + <loext:gradient-stop svg:offset="1" loext:color-type="rgb" loext:color-value="#cccccc"/> + </draw:gradient> <draw:hatch draw:name="Hatching_20_1" draw:display-name="Hatching 1" draw:style="single" draw:color="#3465a4" draw:distance="0.02cm" draw:rotation="0"/> <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/> <draw:stroke-dash draw:name="Dashed_20__28_var_29__20_2" draw:display-name="Dashed (var) 2" draw:style="rect" draw:dots1="1" draw:dots1-length="0.02cm" draw:dots2="1" draw:dots2-length="0.02cm" draw:distance="0.02cm"/> @@ -561,18 +569,24 @@ <style:style style:name="Mgr2" style:family="graphic" style:parent-style-name="standard"> <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-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="Mgr4" style:family="graphic" style:parent-style-name="standard"> <style:graphic-properties draw:stroke="none" draw:fill-color="#ffffff" draw:opacity="30%" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/> </style:style> - <style:style style:name="Mgr5" style:family="graphic" style:parent-style-name="standard"> - <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle" draw:color-mode="greyscale" 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="Mgr6" style:family="graphic" style:parent-style-name="Filled"> <style:graphic-properties draw:stroke="none" draw:fill="solid" draw:fill-color="#000000" draw:textarea-vertical-align="middle"/> </style:style> + <style:style style:name="Mgr7" style:family="graphic" style:parent-style-name="standard"> + <style:graphic-properties svg:stroke-width="0.035cm" svg:stroke-color="#7b7b7b" draw:marker-start-width="0.252cm" draw:marker-end-width="0.252cm" draw:fill="gradient" draw:fill-gradient-name="Gradient_20_16" draw:gradient-step-count="0" loext:fill-use-slide-background="false" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:min-height="6.699cm" fo:min-width="1.332cm" fo:padding-top="0.142cm" fo:padding-bottom="0.142cm" fo:padding-left="0.267cm" fo:padding-right="0.267cm" loext:decorative="false"/> + </style:style> + <style:style style:name="Mgr8" style:family="graphic" style:parent-style-name="standard"> + <style:graphic-properties svg:stroke-width="0.053cm" svg:stroke-color="#000000" draw:marker-start-width="0.279cm" draw:marker-end-width="0.279cm" draw:fill="gradient" draw:fill-color="#000000" draw:fill-gradient-name="Gradient_20_21" draw:gradient-step-count="0" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:min-height="3.728cm" fo:min-width="0.546cm" fo:padding-top="0.151cm" fo:padding-bottom="0.151cm" fo:padding-left="0.276cm" fo:padding-right="0.276cm" loext:decorative="false"/> + </style:style> + <style:style style:name="Mgr9" style:family="graphic" style:parent-style-name="standard"> + <style:graphic-properties svg:stroke-width="0.053cm" svg:stroke-color="#000000" draw:marker-start-width="0.279cm" draw:marker-end-width="0.279cm" draw:fill-color="#000000" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" fo:min-height="0.007cm" fo:min-width="0.546cm" fo:padding-top="0.151cm" fo:padding-bottom="0.151cm" fo:padding-left="0.276cm" fo:padding-right="0.276cm" loext:decorative="false"/> + </style:style> + <style:style style:name="Mgr10" style:family="graphic" style:parent-style-name="standard"> + <style:graphic-properties draw:stroke="none" draw:fill="solid" draw:fill-color="#cacaca"/> + </style:style> <style:style style:name="Mpr5" style:family="presentation" style:parent-style-name="Piano-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> @@ -609,36 +623,28 @@ <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:span text:style-name="MT1"> - <presentation:header/> - </text:span> + <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:span text:style-name="MT1"> - <presentation:date-time/> - </text:span> + <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:span text:style-name="MT1"> - <presentation:footer/> - </text:span> + <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:span text:style-name="MT1"> - <text:page-number/> - </text:span> + <text:page-number/> </text:p> </draw:text-box> </draw:frame> @@ -651,12 +657,136 @@ </style:handout-master> <style:master-page style:name="Piano" style:page-layout-name="PM1" draw:style-name="Mdp1"> <office:forms form:automatic-focus="false" form:apply-design-mode="false"/> - <draw:custom-shape draw:style-name="Mgr6" draw:layer="backgroundobjects" svg:width="28cm" svg:height="8.65cm" svg:x="0cm" svg:y="0cm"> + <draw:g> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="26.133cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.866cm" svg:height="7cm" svg:x="24.267cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="22.4cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="20.533cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.866cm" svg:height="7cm" svg:x="18.667cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="16.8cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="14.933cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.866cm" svg:height="7cm" svg:x="13.067cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="11.2cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="9.333cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.866cm" svg:height="7cm" svg:x="7.467cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="5.6cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="3.733cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.866cm" svg:height="7cm" svg:x="1.867cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr7" draw:layer="layout" svg:width="1.867cm" svg:height="7cm" svg:x="0cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="1.316cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="1.316cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="3.182cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="3.182cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="6.916cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="6.916cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="8.782cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="8.782cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="10.649cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="10.649cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="14.382cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="14.382cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="16.249cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="16.249cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="19.982cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="19.982cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="21.849cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="21.849cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + <draw:g> + <draw:custom-shape draw:style-name="Mgr8" draw:layer="layout" svg:width="1.098cm" svg:height="4.03cm" svg:x="23.716cm" svg:y="9.059cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + <draw:custom-shape draw:style-name="Mgr9" draw:layer="layout" svg:width="1.098cm" svg:height="0.309cm" svg:x="23.716cm" svg:y="8.75cm"> + <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> + </draw:custom-shape> + </draw:g> + </draw:g> + <draw:custom-shape draw:style-name="Mgr6" draw:layer="backgroundobjects" svg:width="28cm" svg:height="8.75cm" svg:x="0cm" svg:y="0cm"> <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> </draw:custom-shape> - <draw:frame draw:style-name="Mgr3" draw:layer="backgroundobjects" svg:width="28cm" svg:height="7.1cm" svg:x="0cm" svg:y="8.65cm"> - <draw:image xlink:href="Pictures/100000000000035400000120266623530F1969D0.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" loext:mime-type="image/png"/> - </draw:frame> <draw:custom-shape draw:style-name="Mgr4" draw:layer="backgroundobjects" svg:width="24.5cm" svg:height="2.1cm" svg:x="1.75cm" svg:y="0.85cm"> <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/> </draw:custom-shape> @@ -669,27 +799,21 @@ <draw:frame presentation:style-name="Piano-backgroundobjects" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="1.086cm" svg:x="1cm" svg:y="14.35cm" presentation:class="date-time"> <draw:text-box> <text:p> - <text:span> - <presentation:date-time/> - </text:span> + <presentation:date-time/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Piano-backgroundobjects" draw:text-style-name="MP10" draw:layer="backgroundobjects" svg:width="8.875cm" svg:height="1.086cm" svg:x="9.563cm" svg:y="14.348cm" presentation:class="footer"> <draw:text-box> <text:p> - <text:span> - <presentation:footer/> - </text:span> + <presentation:footer/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Piano-backgroundobjects" draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="1.086cm" svg:x="20.477cm" svg:y="14.35cm" presentation:class="page-number"> <draw:text-box> <text:p> - <text:span> - <text:page-number/> - </text:span> + <text:page-number/> </text:p> </draw:text-box> </draw:frame> @@ -702,36 +826,28 @@ <draw:frame presentation:style-name="Piano-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:span text:style-name="MT1"> - <presentation:header/> - </text:span> + <presentation:header/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Piano-backgroundobjects" 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:span text:style-name="MT1"> - <presentation:date-time/> - </text:span> + <presentation:date-time/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Mpr5" 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:span text:style-name="MT1"> - <presentation:footer/> - </text:span> + <presentation:footer/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Mpr5" 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:span text:style-name="MT1"> - <text:page-number/> - </text:span> + <text:page-number/> </text:p> </draw:text-box> </draw:frame> @@ -778,9 +894,19 @@ </text:p> </draw:text-box> </draw:frame> - <draw:frame draw:style-name="Mgr5" draw:layer="backgroundobjects" svg:width="17.5cm" svg:height="2.33cm" svg:x="10cm" svg:y="12cm"> - <draw:image xlink:href="Pictures/100002010000033A0000006EDD62437E1CC42053.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" loext:mime-type="image/png"/> - </draw:frame> + <draw:g> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="1.245cm" svg:height="1.22cm" svg:x="9.983cm" svg:y="13.018cm" svg:viewBox="0 0 1246 1221" svg:d="M496 996c4 35-4 70-23 103-19 32-47 61-83 82s-78 35-121 39c-44 4-88-1-127-14-39-14-73-36-98-64s-40-62-43-97c-4-35 4-70 23-103 19-32 47-61 83-82s78-35 122-39c37-4 75-1 110 9v-444-271-1l907-114v271h-2v650c0 2 0 4 0 7 4 35-4 70-23 103-19 32-47 61-83 82s-78 35-121 39c-44 4-88-1-127-14-39-14-73-36-98-64s-40-62-43-97c-4-35 4-70 23-103 19-32 47-61 83-82s78-35 122-39c38-4 76 0 112 10v-472l-594 75v617c0 4 1 8 1 13z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="1.245cm" svg:height="1.22cm" svg:x="12.071cm" svg:y="12.108cm" svg:viewBox="0 0 1246 1221" svg:d="M496 996c4 35-4 70-23 103-19 32-47 61-83 82s-78 35-121 39c-44 4-88-1-127-14-39-14-73-36-98-64s-40-62-43-97c-4-35 4-70 23-103 19-32 47-61 83-82s78-35 122-39c37-4 75-1 110 9v-444-271-1l907-114v271h-2v650c0 2 0 4 0 7 4 35-4 70-23 103-19 32-47 61-83 82s-78 35-121 39c-44 4-88-1-127-14-39-14-73-36-98-64s-40-62-43-97c-4-35 4-70 23-103 19-32 47-61 83-82s78-35 122-39c38-4 76 0 112 10v-472l-594 75v617c0 4 1 8 1 13z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="0.813cm" svg:height="0.813cm" svg:x="13.566cm" svg:y="12.277cm" svg:viewBox="0 0 814 814" svg:d="M324 664c3 23-3 47-15 69-12 21-31 40-54 54-24 14-51 24-79 26-29 3-58 0-83-9-26-9-48-24-64-43-17-18-26-41-28-64-3-24 2-47 15-69 12-21 30-41 54-55 23-14 51-23 80-26 24-2 49 0 71 6v-296-180-1l593-76v181h-1v433c0 1 0 3 0 5 2 23-3 46-15 68-13 22-31 41-55 55-23 14-51 23-79 26s-57-1-83-9c-25-10-47-24-64-43-16-19-26-41-28-65-2-23 3-46 15-68 13-22 31-41 55-55 23-14 51-23 79-26 25-3 50 0 73 7v-315l-388 50v411c0 3 1 6 1 9z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="1.051cm" svg:height="1.077cm" svg:x="15.061cm" svg:y="12.859cm" svg:viewBox="0 0 1052 1078" svg:d="M419 879c3 31-4 62-20 91s-39 54-70 73c-30 18-66 31-102 34-37 4-74-1-107-12-33-13-62-32-83-57-21-24-34-54-36-85-4-31 3-62 19-91s40-54 70-73c31-18 66-31 103-34 32-4 64-1 93 8v-392-239-1l766-101v239h-2v574c0 2 0 4 0 6 4 31-3 62-19 91s-40 54-70 73c-31 18-66 31-102 34-37 4-75-1-108-12-32-13-61-32-82-57s-34-55-37-85c-3-31 4-62 20-91s39-54 70-73c30-18 66-31 103-34 32-4 64 0 94 9v-417l-501 66v545c0 3 1 7 1 11z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="1.051cm" svg:height="1.077cm" svg:x="16.902cm" svg:y="12cm" svg:viewBox="0 0 1052 1078" svg:d="M419 879c3 31-4 62-20 91s-39 54-70 73c-30 18-66 31-102 34-37 4-74-1-107-12-33-13-62-32-83-57-21-24-34-54-36-85-4-31 3-62 19-91s40-54 70-73c31-18 66-31 103-34 32-4 64-1 93 8v-392-239-1l766-101v239h-2v574c0 2 0 4 0 6 4 31-3 62-19 91s-40 54-70 73c-31 18-66 31-102 34-37 4-75-1-108-12-32-13-61-32-82-57s-34-55-37-85c-3-31 4-62 20-91s39-54 70-73c30-18 66-31 103-34 32-4 64 0 94 9v-417l-501 66v545c0 3 1 7 1 11z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="0.971cm" svg:height="0.925cm" svg:x="19.031cm" svg:y="12.396cm" svg:viewBox="0 0 972 926" svg:d="M387 755c3 27-3 53-18 78s-37 47-65 63-61 26-94 29c-34 3-69-1-99-10-31-11-57-28-77-49-19-21-31-47-33-73-3-27 3-54 18-79 15-24 36-46 64-62 29-16 61-26 96-29 29-3 58-1 85 6v-336-206-1l708-86v206h-2v492c0 2 0 4 0 6 4 26-3 53-17 78-15 24-37 46-65 62s-61 27-95 30-68-1-99-11c-30-11-57-27-76-48-20-22-31-48-34-74-3-27 3-53 18-78 15-24 37-46 65-62s61-27 95-30c30-3 59 0 88 8v-358l-464 57v468c0 3 1 6 1 9z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="0.971cm" svg:height="0.925cm" svg:x="20.142cm" svg:y="13.044cm" svg:viewBox="0 0 972 926" svg:d="M387 755c3 27-3 53-18 78s-37 47-65 63-61 26-94 29c-34 3-69-1-99-10-31-11-57-28-77-49-19-21-31-47-33-73-3-27 3-54 18-79 15-24 36-46 64-62 29-16 61-26 96-29 29-3 58-1 85 6v-336-206-1l708-86v206h-2v492c0 2 0 4 0 6 4 26-3 53-17 78-15 24-37 46-65 62s-61 27-95 30-68-1-99-11c-30-11-57-27-76-48-20-22-31-48-34-74-3-27 3-53 18-78 15-24 37-46 65-62s61-27 95-30c30-3 59 0 88 8v-358l-464 57v468c0 3 1 6 1 9z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="1.051cm" svg:height="1.077cm" svg:x="21.377cm" svg:y="12.837cm" svg:viewBox="0 0 1052 1078" svg:d="M419 879c3 31-4 62-20 91s-39 54-70 73c-30 18-66 31-102 34-37 4-74-1-107-12-33-13-62-32-83-57-21-24-34-54-36-85-4-31 3-62 19-91s40-54 70-73c31-18 66-31 103-34 32-4 64-1 93 8v-392-239-1l766-101v239h-2v574c0 2 0 4 0 6 4 31-3 62-19 91s-40 54-70 73c-31 18-66 31-102 34-37 4-75-1-108-12-32-13-61-32-82-57s-34-55-37-85c-3-31 4-62 20-91s39-54 70-73c30-18 66-31 103-34 32-4 64 0 94 9v-417l-501 66v545c0 3 1 7 1 11z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="0.604cm" svg:height="0.582cm" svg:x="23.026cm" svg:y="13.735cm" svg:viewBox="0 0 605 583" svg:d="M241 476c2 16-2 33-11 49-10 15-23 29-41 39-17 10-38 17-58 19-22 1-43-1-62-7-19-7-35-17-48-31-12-13-19-29-21-46-1-17 2-33 12-49 9-15 22-29 40-39 17-10 38-17 59-19 18-2 37 0 54 4v-212-129-1l440-54v129h-1v311c0 1 0 2 0 3 2 17-2 34-11 49-9 16-23 29-40 39-18 10-38 17-59 19-22 2-43 0-62-7-19-6-35-17-47-30-13-14-20-30-21-47-2-16 2-33 11-49 9-15 23-29 40-39 18-10 38-17 59-18 19-2 37 0 55 4v-225l-289 36v294c0 2 1 4 1 7z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="0.642cm" svg:height="0.652cm" svg:x="24.991cm" svg:y="12.934cm" svg:viewBox="0 0 643 653" svg:d="M256 533c2 18-2 37-12 55-10 17-24 32-43 44-18 11-40 18-62 20-23 3-46 0-66-7-20-8-37-19-50-34s-21-33-22-52c-3-19 2-38 11-55 10-17 25-33 43-44 19-11 40-19 63-21 19-2 39 0 57 5v-238-144-1l468-61v145h-1v348c0 1 0 2 0 3 2 19-2 38-12 55-10 18-24 33-43 44-18 11-40 19-62 21-23 2-46 0-66-7-20-8-37-20-50-35s-21-33-22-51c-3-19 2-38 11-56 10-17 25-32 43-43 19-12 40-19 63-21 20-2 39 0 58 5v-252l-307 40v330c0 2 1 4 1 7z"/> + <draw:path draw:style-name="Mgr10" draw:layer="layout" svg:width="1.261cm" svg:height="1.26cm" svg:x="26.238cm" svg:y="12.502cm" svg:viewBox="0 0 1262 1261" svg:d="M502 1029c4 36-4 72-23 106-19 33-48 63-84 85-36 21-79 36-123 40s-89-1-128-14c-40-15-74-38-99-67-26-29-41-64-44-100-4-36 4-72 23-106 20-33 48-63 84-85 37-22 79-36 124-40 37-4 76-1 111 9v-458-280-1l919-118v280h-2v671c0 2 0 4 0 7 4 37-4 73-23 107-20 33-48 63-84 84-37 22-79 37-123 41-45 4-89-1-129-15-39-14-74-37-99-66s-40-64-43-100c-4-36 4-72 23-106 19-33 48-63 84-85s79-36 124-40c38-4 77 0 113 10v-487l-602 77v637c0 4 1 8 1 14z"/> + </draw:g> <presentation:notes style:page-layout-name="PM0"> <office:forms form:automatic-focus="false" form:apply-design-mode="false"/> <draw:page-thumbnail presentation:style-name="Piano1-title" draw:layer="backgroundobjects" svg:width="17cm" svg:height="9.56cm" svg:x="2cm" svg:y="2.5cm" presentation:class="page"/> @@ -790,36 +916,28 @@ <draw:frame presentation:style-name="Piano1-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:span text:style-name="MT1"> - <presentation:header/> - </text:span> + <presentation:header/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Piano1-backgroundobjects" 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:span text:style-name="MT1"> - <presentation:date-time/> - </text:span> + <presentation:date-time/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Mpr9" 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:span text:style-name="MT1"> - <presentation:footer/> - </text:span> + <presentation:footer/> </text:p> </draw:text-box> </draw:frame> <draw:frame presentation:style-name="Mpr9" 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:span text:style-name="MT1"> - <text:page-number/> - </text:span> + <text:page-number/> </text:p> </draw:text-box> </draw:frame> diff --git a/extras/template_files.mk b/extras/template_files.mk index f96675384cc9..d1d10c7e9d97 100644 --- a/extras/template_files.mk +++ b/extras/template_files.mk @@ -106,8 +106,6 @@ extra_files_PRESENTATIONS := \ presnt/Midnightblue/Thumbnails/thumbnail.png \ presnt/Nature_Illustration/Thumbnails/thumbnail.png \ presnt/Pencil/Thumbnails/thumbnail.png \ - presnt/Piano/Pictures/100000000000035400000120266623530F1969D0.png \ - presnt/Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png \ presnt/Piano/Thumbnails/thumbnail.png \ presnt/Portfolio/Thumbnails/thumbnail.png \ presnt/Progress/Thumbnails/thumbnail.png \