You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by mb...@apache.org on 2019/11/07 00:27:50 UTC
[incubator-daffodil] branch master updated: Setup so tutorials are
deployed to daffodil-site.
This is an automated email from the ASF dual-hosted git repository.
mbeckerle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 1b1483c Setup so tutorials are deployed to daffodil-site.
1b1483c is described below
commit 1b1483c26584e9f8eda0be760b8e351171181d88
Author: Michael Beckerle <mb...@tresys.com>
AuthorDate: Thu Oct 10 18:03:46 2019 -0400
Setup so tutorials are deployed to daffodil-site.
The XSLT and other infrastructure are now maintained as part of
daffodil-site.
release-candidate script copies tutorial files from daffodil tree
to daffodil-site tree.
Assumes daffodil-site changes which put tutorial infrastructure and
asciidoc capability into deployed site.
DAFFODIL-2004
---
scripts/release-candidate.sh | 12 +
.../src/main/resources/DFDLTutorialStylesheet.css | 85 ----
.../src/main/resources/DFDLTutorialStylesheet.xsl | 224 ----------
tutorials/src/main/resources/README.txt | 57 ---
.../main/resources/bitOrder.tutorial.drawing01.svg | 456 +++++++++++++++++++++
.../src/main/resources/bitorder.tutorial.tdml.xml | 440 +-------------------
...ortTemplate.tdml => bugReportTemplate.tdml.xml} | 2 +-
...l.xml => exampleTDMLTutorial.tutorial.tdml.xml} | 2 +-
tutorials/src/main/resources/tdmlTutorial.tdml.xml | 2 +-
.../apache/daffodil/tutorials/TestTutorials.scala | 6 +-
10 files changed, 476 insertions(+), 810 deletions(-)
diff --git a/scripts/release-candidate.sh b/scripts/release-candidate.sh
index 43464c3..bc51061 100755
--- a/scripts/release-candidate.sh
+++ b/scripts/release-candidate.sh
@@ -57,6 +57,17 @@ if [ -d "$DAFFODIL_DOCS_DIR" ]; then
fi
fi
+DAFFODIL_TUTORIALS_DIR=$DAFFODIL_SITE_DIR/tutorials/
+if [ -d "$DAFFODIL_TUTORIALS_DIR" ]; then
+ read -p "Daffodil site tutorials directory already exists: '$DAFFODIL_TUTORIAL_DIR'. Remove it? (Y/n) " REMOVE
+ if [[ -z "$REMOVE" || "$REMOVE" == "Y" || "$REMOVE" == "y" ]]; then
+ rm -rf "$DAFFODIL_TUTORIALS_DIR"
+ else
+ echo "Exiting."
+ exit
+ fi
+fi
+
read -p "Signing Key ID (long format): " PGP_SIGNING_KEY_ID
read -p "Apache Username: " APACHE_USERNAME
read -s -p "Apache Password: " APACHE_PASSWD
@@ -100,6 +111,7 @@ chmod -x $DAFFODIL_RELEASE_DIR/bin/$MSI_NAME
cp -R daffodil-japi/target/scala-2.12/genjavadoc-api/* $DAFFODIL_DOCS_DIR/javadoc/
cp -R daffodil-sapi/target/scala-2.12/api/* $DAFFODIL_DOCS_DIR/scaladoc/
+cp -R tutorials/src/main/resources/* $DAFFODIL_TUTORIALS_DIR
echo "Calculating Checksums..."
for i in src/ bin/
diff --git a/tutorials/src/main/resources/DFDLTutorialStylesheet.css b/tutorials/src/main/resources/DFDLTutorialStylesheet.css
deleted file mode 100644
index abd633c..0000000
--- a/tutorials/src/main/resources/DFDLTutorialStylesheet.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@media print {
- a[href]:after {
- content: " (" attr(href) ") ";
- }
-}
-
-body {
- font-size: 12px;
- font-family: 'Segoe UI Semibold', Arial, 'Arial Unicode MS', Helvetica, Sans-Serif;
- font-weight: normal;
- font-style: normal;
- text-align: justify;
- cursor:default;
- background: #FFFFFF;
-}
-
-#logo {
- float:right;
- verical-align: top;
-}
-
-p ~ p, br ~ p {
- margin-bottom:1.0em
-}
-
-blockquote
-{
- background: WhiteSmoke no-repeat scroll;
- border:1px dotted #F76E75;
- padding:15px 15px 15px 48px;
- margin:0 0 0 15px;
- color: #2E2E2E;
- font-family: Georgia, 'Times New Roman', Times, Serif;
- font-weight: normal;
- font-style: italic;
- text-align: left;
- /* makes block not to align behind the image if they are in the same line */
- overflow: auto;
- clear:both;
-}
-
-blockquote a
-{
- color: #2E2E2E;
- font-family: 'Segoe UI Semibold', Arial, 'Arial Unicode MS', Helvetica, Sans-Serif;
- font-weight: normal;
- font-style: italic;
- text-align: left;
-}
-
-/*
- ========================================
- Clearfix
- ========================================
-*/
-.group:before,
-.group:after {
- content: "";
- display: table;
-}
-.group:after {
- clear: both;
-}
-.group {
- clear: both;
- *zoom: 1;
-}
-
diff --git a/tutorials/src/main/resources/DFDLTutorialStylesheet.xsl b/tutorials/src/main/resources/DFDLTutorialStylesheet.xsl
deleted file mode 100644
index d0bf86d..0000000
--- a/tutorials/src/main/resources/DFDLTutorialStylesheet.xsl
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp " "> ]>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
- xmlns="http://www.w3.org/1999/xhtml">
-
-
-
- <xsl:output method="html" doctype-system="about:legacy-compat"/>
-
- <xsl:template match="tdml:tutorial">
- <p>
- <xsl:copy-of select="."/> <!-- Needs to be copy-of to preserve the html -->
- </p>
- </xsl:template>
-
- <xsl:template match="tdml:testSuite/tdml:parserTestCase[@tdml:tutorialInclude='no']"/>
- <xsl:template match="tdml:testSuite/tdml:parserTestCase[not(@tdml:tutorialInclude)]">
- <h2>Parse Test: <xsl:value-of select="@name"/></h2>
- <p><xsl:value-of select="@description"/></p>
- <xsl:apply-templates select="*"/>
- </xsl:template>
-
- <xsl:template match="tdml:testSuite/tdml:unparserTestCase[@tdml:tutorialInclude='no']"/>
- <xsl:template match="tdml:testSuite/tdml:unparserTestCase[not(@tdml:tutorialInclude)]">
- <h2>Unparse Test: <xsl:value-of select="@name"/></h2>
- <p><xsl:value-of select="@description"/></p>
- <xsl:apply-templates select="*"/>
- </xsl:template>
-
- <xsl:template match="tdml:document[@tdml:tutorialInclude='no']"/>
- <xsl:template match="tdml:document[not(@tdml:tutorialInclude)]">
- <xsl:variable name="nodestring">
- <xsl:apply-templates select="../tdml:document" mode="serialize"/>
- </xsl:variable>
- <b>Data Stream:</b>
- <table>
- <tr>
- <td>
- <pre class="prettyprint linenums">
- <xsl:value-of select="$nodestring"/>
- </pre>
- </td>
- </tr>
- </table>
- </xsl:template>
-
- <xsl:template match="tdml:infoset[@tdml:tutorialInclude='no']"/>
- <xsl:template match="tdml:infoset[not(@tdml:tutorialInclude)]">
- <xsl:variable name="nodestring">
- <xsl:apply-templates select="./tdml:dfdlInfoset/*" mode="serialize"/>
- </xsl:variable>
- <b>Infoset:</b>
- <table>
- <tr>
- <td>
- <pre class="prettyprint linenums">
- <xsl:value-of select="$nodestring"/>
- </pre>
- </td>
- </tr>
- </table>
- </xsl:template>
-
- <xsl:template match="*" mode="serialize">
- <xsl:text><</xsl:text>
- <xsl:value-of select="name()"/>
- <xsl:apply-templates select="@*" mode="serialize"/>
- <xsl:choose>
- <xsl:when test="node()">
- <xsl:text>></xsl:text>
- <xsl:apply-templates mode="serialize"/>
- <xsl:text></</xsl:text>
- <xsl:value-of select="name()"/>
- <xsl:text>></xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text> /></xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="@*" mode="serialize">
- <xsl:text> </xsl:text>
- <xsl:value-of select="name()"/>
- <xsl:text>="</xsl:text>
- <xsl:value-of select="."/>
- <xsl:text>"</xsl:text>
- </xsl:template>
-
- <xsl:template match="text()" mode="serialize">
- <xsl:value-of select="."/>
- </xsl:template>
-
-<!-- These match nodes containing the don't include in tutorial indicator, and
- also, all-whitespace nodes that precede them. -->
-
- <xsl:template mode="serialize" match="text()[string-length(translate(., ' 	

', '')) = 0 and
- following-sibling::node()[1][@tdml:tutorialInclude='no']]"/>
-
- <xsl:template mode="serialize" match="node()[@tdml:tutorialInclude='no']"/>
-
- <xsl:template match="tdml:testSuite/tdml:defineSchema[@tdml:tutorialInclude='no']"/>
-
- <xsl:template match="tdml:testSuite/tdml:defineSchema[not(@tdml:tutorialInclude)]">
- <xsl:variable name="nodestring">
- <xsl:apply-templates select="node()" mode="serialize"/>
- </xsl:variable>
- <b>DFDL Schema:</b>
- <table>
- <tr>
- <td>
- <pre class="prettyprint linenums">
- <xsl:value-of select="$nodestring"/>
- </pre>
- </td>
- </tr>
- </table>
- <br/>
- </xsl:template>
-
-
- <xsl:template match="/">
- <html>
- <head>
- <link rel="stylesheet" href="DFDLTutorialStylesheet.css" media="all"/>
- <!-- This li.L0, li.L1 etc. is about turning on line numbering for all lines.
- The default was to put a line number only every 5 lines. -->
- <style>
- li.L0, li.L1, li.L2, li.L3,
- li.L5, li.L6, li.L7, li.L8
- { list-style-type: decimal !important }
- li.L0,
- li.L2,
- li.L4,
- li.L6,
- li.L8 { background: #f5f5f5 }
- </style>
- <title>
- <xsl:value-of select="tdml:testSuite/@suiteName"/>
- </title>
- </head>
- <body id="main">
- <header>
- <div id="headerText">
- <hr/>
- <h1>
- <xsl:value-of select="tdml:testSuite/@suiteName"/>
- </h1>
- <p>
- For quick reference here is the
- <a href="https://daffodil.apache.org/docs/dfdl/">DFDL Specification (HTML)</a>
- </p>
- <hr/>
- </div>
- </header>
- <section>
- <xsl:apply-templates select="*"/>
- </section>
- <footer class="pt-footer">
- <div>
- <hr/>
- <h4>About this DFDL Tutorial</h4>
- <p>
- This tutorial page is written in Test Data Markup Language (TDML), which is an XML-based language providing a way of creating a single-file, fully self contained test (or set of tests) for a DFDL processor. A TDML file contains the DFDL schema directly (if it is small enough for that
- to make sense), the test data, and the expected results for one or more tests. A tutorial can be created by inserting prose into the TDML file in special elements that contain
- <a href="http://www.w3.org/TR/html5/the-xhtml-syntax.html">XHTML5</a>
- markup for formatting.
- </p>
- <p>The result is that the TDML file can be used as a test of a DFDL processor, or it can be used to create a tutorial web page. The ability to execute the same file insures that the examples contained in the tutorial actually work as described.
- </p>
- <p>A TDML file is the ideal way to discuss how a particular feature of DFDL works or is supposed to work. Once a feature has been understood, examples and prose can be added that turn the TDML into a tutorial that can save others in the DFDL community a great deal of time and effort.
- </p>
- <p>TDML is also perfect for bug reports where the DFDL processor is not behaving as expected as they contain everything necessary to reproduce the bug.
- </p>
- <h4>About Putting Graphics In Tutorials</h4>
- <p>An important characteristic of TDML-based tutorials is that they are self-contained. By using a few HTML techniques and some free tools that run directly in the web browser, we can insure that the images and diagrams needed for a tutorial can be embedded directly in the TDML file.
- </p>
- <ul>
- <li>
- <a href="https://svg-edit.github.io/svgedit/releases/svg-edit-2.8.1/svg-editor.html">SVG-Edit</a>
- - lets you draw/edit SVG format - which is really the preferred thing for embedding in these tutorials since SVG is part of HTML. Once you have the SVG for your diagram, you can copy it into the HTML tutorial content of the HTML file.
- </li>
- <li>
- <a href='http://freeonlinetools24.com/base64-image'>Base64 image encoder decoder</a>
- can be used to embed images directly into the TDML file, so you can take images, or draw diagrams with your favorite drawing tool, and embed them in the TDML file while still keeping the TDML file self-contained. This tool can also convert the base64 encoding back into an editable
- file if you need to edit the image.
- </li>
- <li>
- This
- <a href="http://www.online-image-editor.com/">Online graphics editor</a>
- can edit PNGs JPG, etc.
- </li>
- </ul>
- <hr/>
- <br/>
- </div>
- </footer>
- </body>
-
- <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
-
- </html>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tutorials/src/main/resources/README.txt b/tutorials/src/main/resources/README.txt
deleted file mode 100644
index 30b36b8..0000000
--- a/tutorials/src/main/resources/README.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-About the tutorials-from-tdml.
-
-The XSD for tdml has been modified to allow tdml:tutorial elements containing XHTML5 markup.
-
-This allows a tdml file to generate a nice XHTML5 web page describing the content using an XSLT stylesheet.
-
-A CSS stylesheet provides the visual characteristics.
-
-The file remains a runnable TDML test file - thereby allowing you to keep the tests functional and
-in synch with the tutorial content.
-
-NOTE: using Firefox on 2016-01-06 you can just use a file:// URL to open the tdml file. It then accesses the xsl
-and css from the same directory.
-
-Chrome does not work the same. It refuses to allow opening files on the local file system for security reasons.
-Chrome also doesn't look inside the tdml file to guess that it is XML content. It can only guess based on the extension, and
-it knows nothing of .tdml extension.
-
-To win with Chrome you must serve the page from a web server.
-
-Fortunately, there's a near trivial way to do this.
-
-Below is a shell script that runs (on linux anyway), and starts a simple web server that is
-built in to python implementations.
-
-If you run this shell script in this directory (where bitorder.tut.tdml and the related xsl and css files are),
-then when the page is served, Chrome will both recognize that .tdml is XML, and also will allow the
-tdml file to trigger the XSLT transform using the stylesheet.
-
-You would browse the example tutorial here via http://localhost:8000/bitorder.tut.tdml
-
-(Once you have this server started, you can also use this same URL from Firefox.)
-
-#!/usr/bin/python
-
-# Note: You can just view the .tdml.xml file directly using a file explorer and "open with..." and choose Firefox.
-# Firefox will display it, and use the stylesheets.
-# (True as of firefox version 54.0)
-
-#This script is only needed for chrome.
-
-import SimpleHTTPServer
-import SocketServer
-
-PORT = 8000
-
-Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-Handler.extensions_map.update({
- '.tdml': 'application/xml',
-});
-
-httpd = SocketServer.TCPServer(("", PORT), Handler)
-
-print "Serving at port", PORT
-httpd.serve_forever()
-
-
diff --git a/tutorials/src/main/resources/bitOrder.tutorial.drawing01.svg b/tutorials/src/main/resources/bitOrder.tutorial.drawing01.svg
new file mode 100644
index 0000000..be04960
--- /dev/null
+++ b/tutorials/src/main/resources/bitOrder.tutorial.drawing01.svg
@@ -0,0 +1,456 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ svg from a slide created in LibreOffice Impress.
+ Have to tweek the width/height to 50% and the viewBox which is width then
+ height of the view port into the slide
+ -->
+<svg version="1.2" baseProfile="tiny" width="50%" height="50%" viewBox="0 5000 28000 10000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
+ <defs class="ClipPathGroup">
+ <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+ <rect x="0" y="0" width="28000" height="21000"/>
+ </clipPath>
+ </defs>
+ <defs>
+ <font id="EmbeddedFont_1" horiz-adv-x="2048">
+ <font-face font-family="Liberation Sans embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1852" descent="450"/>
+ <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
+ <glyph unicode="y" horiz-adv-x="1033" d="M 604,1 C 579,-64 553,-123 527,-175 500,-227 471,-272 438,-309 405,-346 369,-374 329,-394 289,-413 243,-423 191,-423 168,-423 147,-423 128,-423 109,-423 88,-420 67,-414 L 67,-279 C 80,-282 94,-284 110,-284 126,-284 140,-284 151,-284 204,-284 253,-264 298,-225 343,-186 383,-123 417,-37 L 434,6 5,1082 197,1082 425,484 C 432,466 440,442 451,412 461,382 471,352 482,322 492,292 501,265 509,241 517,217 522,202 523,196 525,203 530,218 538,240 545,261 [...]
+ <glyph unicode="x" horiz-adv-x="1006" d="M 801,0 L 510,444 217,0 23,0 408,556 41,1082 240,1082 510,661 778,1082 979,1082 612,558 1002,0 801,0 Z"/>
+ <glyph unicode="v" horiz-adv-x="1033" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,173 522,194 528,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z"/>
+ <glyph unicode="u" horiz-adv-x="874" d="M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,231 C 997,208 997,185 998,160 998,135 998,111 999,89 1000,66 1000,47 1001,31 1002,15 1002,5 1003,0 L 833,0 C 832,3 832,12 831,27 830,42 830,59 829,78 828,97 827,116 826,136 825,155 825,172 825,185 L 822,185 C 8 [...]
+ <glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324 336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z"/>
+ <glyph unicode="r" horiz-adv-x="530" d="M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 636,930 622,933 606,935 590,936 5 [...]
+ <glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 381,912 355,879 329,846 3 [...]
+ <glyph unicode="n" horiz-adv-x="874" d="M 825,0 L 825,686 C 825,739 821,783 814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 559,963 521,956 487,941 452,926 423,904 399,876 374,847 355,812 342,771 329,729 322,681 322,627 L 322,0 142,0 142,851 C 142,874 142,898 142,923 141,948 141,971 140,994 139,1016 139,1035 138,1051 137,1067 137,1077 136,1082 L 306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 312,966 313,947 314,927 314,910 314, [...]
+ <glyph unicode="m" horiz-adv-x="1457" d="M 768,0 L 768,686 C 768,739 765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 327,729 321,681 321,627 L 321,0 142,0 142,851 C 142,874 142,898 142,923 141,948 141,971 140,994 139,1016 139,1035 138,1051 137,1067 137,1077 136,1082 L 306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 312,966 313,947 314,927 314,910 314 [...]
+ <glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z"/>
+ <glyph unicode="k" horiz-adv-x="901" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,0 816,0 Z"/>
+ <glyph unicode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z"/>
+ <glyph unicode="h" horiz-adv-x="874" d="M 317,897 C 337,934 359,965 382,991 405,1016 431,1037 459,1054 487,1071 518,1083 551,1091 584,1098 622,1102 663,1102 732,1102 789,1093 834,1074 878,1055 913,1029 939,996 964,962 982,922 992,875 1001,828 1006,777 1006,721 L 1006,0 825,0 825,686 C 825,732 822,772 817,807 811,842 800,871 784,894 768,917 745,934 716,946 687,957 649,963 602,963 559,963 521,955 487,940 452,925 423,903 399,875 374,847 355,813 342,773 329,733 322,688 322,638 L 322,0 142 [...]
+ <glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1243 185,1280 192,1314 199,1347 213,1377 233,1402 252,1427 279,1446 313,1461 347,1475 391,1482 445,1482 466,1482 489,1481 512,1479 535,1477 555,1474 572,1470 L 572,1333 C 561,1335 548,1337 533,1339 518,1340 504,1341 492,1341 465,1341 444,1337 427,1330 410,1323 396,1312 387,1299 377,1285 370,1268 367,1248 363,1228 361,1205 361,1179 L 361,1082 572,1082 572,951 361,951 Z"/>
+ <glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,446 282,394 294,347 305,299 323,258 348,224 372,189 403,163 441,144 479,125 525,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 1008,206 992,176 972,146 951,115 924,88 890,64 856,39 814,19 763,4 712,-12 650,-20 578,-20 418,-20 296,28 213,123 129,218 87,360 87,548 87,649 100,735 125,806 150,876 185,933 229,977 273,1021 324,1053 383,1073 442,1092 504,1102 571,1102 662,1102 738,1087 799,1058 860,1029 909,988 [...]
+ <glyph unicode="d" horiz-adv-x="927" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 C 823,921 823,931 823,946 822,960 822,975 822,991 821,1006 821,1021 821,1035 821,1049 821,1059 821,1065 L 821,1484 1001,1484 1001,223 C 1001,197 1001,172 1002,148 1002,124 1002,102 1003,82 1004,62 1004,45 1005,31 1006,16 1006,6 1007,0 L 835,0 C 834,7 833,16 83 [...]
+ <glyph unicode="c" horiz-adv-x="901" d="M 275,546 C 275,484 280,427 289,375 298,323 313,278 334,241 355,203 384,174 419,153 454,132 497,122 548,122 612,122 666,139 709,173 752,206 778,258 788,328 L 970,328 C 964,283 951,239 931,197 911,155 884,118 850,86 815,54 773,28 724,9 675,-10 618,-20 553,-20 468,-20 396,-6 337,23 278,52 230,91 193,142 156,192 129,251 112,320 95,388 87,462 87,542 87,615 93,679 105,735 117,790 134,839 156,881 177,922 203,957 232,986 261,1014 293,1037 328,1054 362, [...]
+ <glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,124 87,203 87,303 87,375 101,434 128,480 155,526 190,562 234,588 277,614 327,632 383,642 439,652 496,657 554,657 L 797,657 797,717 C 797,762 792,800 783,832 774,863 759,889 740,908 721,928 697,942 668,951 639,960 604,965 565,965 530,965 499,963 471,958 443,953 419,944 398,931 377,918 361,900 348,878 335,855 327,827 323,793 L 135,810 C 142,853 154,892 173,928 192,963 218,994 253,1020 287,1046 330,1066 382,108 [...]
+ <glyph unicode="T" horiz-adv-x="1192" d="M 720,1253 L 720,0 530,0 530,1253 46,1253 46,1409 1204,1409 1204,1253 720,1253 Z"/>
+ <glyph unicode="S" horiz-adv-x="1192" d="M 1272,389 C 1272,330 1261,275 1238,225 1215,175 1179,132 1131,96 1083,59 1023,31 950,11 877,-10 790,-20 690,-20 515,-20 378,11 280,72 182,133 120,222 93,338 L 278,375 C 287,338 302,305 321,275 340,245 367,219 400,198 433,176 473,159 522,147 571,135 629,129 697,129 754,129 806,134 853,144 900,153 941,168 975,188 1009,208 1036,234 1055,266 1074,297 1083,335 1083,379 1083,425 1073,462 1052,491 1031,520 1001,543 963,562 925,581 880,596 827,609 774 [...]
+ <glyph unicode="O" horiz-adv-x="1430" d="M 1495,711 C 1495,601 1479,501 1448,411 1416,321 1370,244 1310,180 1250,116 1177,67 1090,32 1003,-3 905,-20 795,-20 679,-20 577,-2 490,35 403,71 330,122 272,187 214,252 170,329 141,418 112,507 97,605 97,711 97,821 112,920 143,1009 174,1098 219,1173 278,1236 337,1298 411,1346 498,1380 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300, [...]
+ <glyph unicode="L" horiz-adv-x="927" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z"/>
+ <glyph unicode="F" horiz-adv-x="1006" d="M 359,1253 L 359,729 1145,729 1145,571 359,571 359,0 168,0 168,1409 1169,1409 1169,1253 359,1253 Z"/>
+ <glyph unicode="C" horiz-adv-x="1324" d="M 792,1274 C 712,1274 641,1261 580,1234 518,1207 466,1169 425,1120 383,1071 351,1011 330,942 309,873 298,796 298,711 298,626 310,549 333,479 356,408 389,348 432,297 475,246 527,207 590,179 652,151 722,137 800,137 855,137 905,144 950,159 995,173 1035,193 1072,219 1108,245 1140,276 1169,312 1198,347 1223,387 1245,430 L 1401,352 C 1376,299 1344,250 1307,205 1270,160 1226,120 1176,87 1125,54 1068,28 1005,9 941,-10 870,-20 791,-20 677,-20 577,-2 492 [...]
+ <glyph unicode="B" horiz-adv-x="1112" d="M 1258,397 C 1258,326 1244,265 1216,215 1188,164 1150,123 1103,92 1056,60 1001,37 938,22 875,7 809,0 740,0 L 168,0 168,1409 680,1409 C 758,1409 828,1403 889,1390 950,1377 1002,1356 1045,1328 1088,1300 1120,1265 1143,1222 1165,1179 1176,1127 1176,1067 1176,1028 1171,991 1160,956 1149,921 1132,890 1110,862 1087,833 1059,809 1026,789 992,768 953,753 908,743 965,736 1015,723 1059,704 1102,685 1139,660 1168,630 1197,600 1220,565 1235,526 1250,486 12 [...]
+ <glyph unicode="9" horiz-adv-x="980" d="M 1042,733 C 1042,608 1030,498 1007,404 983,309 949,231 905,168 861,105 808,58 745,27 682,-4 611,-20 532,-20 478,-20 429,-14 386,-4 343,8 304,25 270,48 236,71 207,102 183,139 159,176 140,221 125,274 L 297,301 C 316,240 345,196 385,168 424,139 474,125 535,125 584,125 628,137 669,160 709,183 743,217 772,263 800,309 822,367 838,436 854,505 863,587 864,680 850,649 831,621 807,596 782,571 755,551 724,534 693,517 659,504 623,495 587,486 551,481 514,48 [...]
+ <glyph unicode="8" horiz-adv-x="980" d="M 1050,393 C 1050,333 1041,278 1022,228 1003,177 974,134 935,97 896,60 846,32 785,11 724,-10 653,-20 570,-20 487,-20 416,-10 356,11 295,32 245,60 206,97 166,133 137,176 118,227 99,277 89,332 89,391 89,442 97,488 113,528 128,568 149,603 176,632 202,661 232,684 266,702 299,719 334,731 370,737 L 370,741 C 331,750 296,765 265,786 234,807 208,832 187,861 166,890 150,922 139,957 128,992 122,1030 122,1069 122,1118 132,1165 151,1209 170,1252 198,1291 23 [...]
+ <glyph unicode="7" horiz-adv-x="954" d="M 1036,1263 C 965,1155 900,1051 841,952 782,852 731,752 688,651 645,550 612,446 589,340 565,233 553,120 553,0 L 365,0 C 365,113 378,223 405,332 432,440 468,546 513,651 558,755 611,857 671,958 731,1059 795,1158 862,1256 L 105,1256 105,1409 1036,1409 1036,1263 Z"/>
+ <glyph unicode="6" horiz-adv-x="980" d="M 1049,461 C 1049,390 1039,326 1020,267 1000,208 971,157 933,115 894,72 847,39 790,16 733,-8 668,-20 594,-20 512,-20 440,-4 379,27 318,58 267,104 226,163 185,222 155,294 135,380 114,465 104,563 104,672 104,797 116,907 139,1002 162,1097 195,1176 238,1239 281,1302 334,1350 397,1382 459,1414 529,1430 608,1430 656,1430 701,1425 743,1415 785,1405 823,1389 858,1367 892,1344 922,1315 948,1278 974,1241 995,1196 1010,1143 L 838,1112 C 819,1173 790,1217 7 [...]
+ <glyph unicode="5" horiz-adv-x="980" d="M 1053,459 C 1053,388 1042,324 1021,265 1000,206 968,156 926,114 884,71 832,38 770,15 707,-8 635,-20 553,-20 479,-20 415,-11 360,6 305,23 258,47 220,78 182,108 152,143 130,184 107,225 91,268 82,315 L 264,336 C 271,309 282,284 295,259 308,234 327,211 350,192 373,172 401,156 435,145 468,133 509,127 557,127 604,127 646,134 684,149 722,163 755,184 782,212 809,240 829,274 844,315 859,356 866,402 866,455 866,498 859,538 845,575 831,611 811,642 785,669 [...]
+ <glyph unicode="4" horiz-adv-x="1060" d="M 881,319 L 881,0 711,0 711,319 47,319 47,459 692,1409 881,1409 881,461 1079,461 1079,319 881,319 Z M 711,1206 C 710,1203 706,1196 701,1187 696,1177 690,1166 683,1154 676,1142 670,1130 663,1118 656,1105 649,1095 644,1087 L 283,555 C 280,550 275,543 269,534 262,525 256,517 249,508 242,499 236,490 229,481 222,472 217,466 213,461 L 711,461 711,1206 Z"/>
+ <glyph unicode="3" horiz-adv-x="1006" d="M 1049,389 C 1049,324 1039,267 1018,216 997,165 966,123 926,88 885,53 835,26 776,8 716,-11 648,-20 571,-20 484,-20 410,-9 351,13 291,34 242,63 203,99 164,134 135,175 116,221 97,266 84,313 78,362 L 264,379 C 269,342 279,308 294,277 308,246 327,220 352,198 377,176 407,159 443,147 479,135 522,129 571,129 662,129 733,151 785,196 836,241 862,307 862,395 862,447 851,489 828,521 805,552 776,577 742,595 707,612 670,624 630,630 589,636 552,639 518,639 L [...]
+ <glyph unicode="2" horiz-adv-x="954" d="M 103,0 L 103,127 C 137,205 179,274 228,334 277,393 328,447 382,496 436,544 490,589 543,630 596,671 643,713 686,754 729,795 763,839 790,884 816,929 829,981 829,1038 829,1078 823,1113 811,1144 799,1174 782,1199 759,1220 736,1241 709,1256 678,1267 646,1277 611,1282 572,1282 536,1282 502,1277 471,1267 439,1257 411,1242 386,1222 361,1202 341,1177 326,1148 310,1118 300,1083 295,1044 L 111,1061 C 117,1112 131,1159 153,1204 175,1249 205,1288 244,1322 2 [...]
+ <glyph unicode="1" horiz-adv-x="927" d="M 156,0 L 156,153 515,153 515,1237 197,1010 197,1180 530,1409 696,1409 696,153 1039,153 1039,0 156,0 Z"/>
+ <glyph unicode="0" horiz-adv-x="980" d="M 1059,705 C 1059,570 1046,456 1021,364 995,271 960,197 916,140 871,83 819,42 759,17 699,-8 635,-20 567,-20 498,-20 434,-8 375,17 316,42 264,82 221,139 177,196 143,270 118,363 93,455 80,569 80,705 80,847 93,965 118,1058 143,1151 177,1225 221,1280 265,1335 317,1374 377,1397 437,1419 502,1430 573,1430 640,1430 704,1419 763,1397 822,1374 873,1335 917,1280 961,1225 996,1151 1021,1058 1046,965 1059,847 1059,705 Z M 876,705 C 876,817 869,910 856,985 8 [...]
+ <glyph unicode=" " horiz-adv-x="556"/>
+ </font>
+ </defs>
+ <defs>
+ <font id="EmbeddedFont_2" horiz-adv-x="2048">
+ <font-face font-family="Liberation Serif embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1826" descent="450"/>
+ <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
+ <glyph unicode="u" horiz-adv-x="980" d="M 313,268 C 313,213 326,170 351,141 376,111 416,96 473,96 510,96 549,99 589,104 629,109 668,116 705,127 L 705,870 563,895 563,940 870,940 870,70 989,45 989,0 715,0 707,76 C 688,65 665,54 638,43 611,32 584,21 555,12 526,3 496,-5 467,-11 438,-17 411,-20 387,-20 351,-20 318,-15 289,-5 260,5 235,21 214,43 193,65 176,94 165,129 153,164 147,206 147,256 L 147,870 27,895 27,940 313,940 313,268 Z"/>
+ <glyph unicode="r" horiz-adv-x="636" d="M 664,965 L 664,711 621,711 563,821 C 544,821 524,820 503,817 482,814 460,811 439,807 418,802 397,797 378,791 358,785 341,779 326,772 L 326,70 487,45 487,0 41,0 41,45 160,70 160,870 41,895 41,940 315,940 324,823 C 339,836 360,850 387,867 414,883 443,898 474,913 505,928 536,940 567,950 598,960 625,965 649,965 L 664,965 Z"/>
+ <glyph unicode="n" horiz-adv-x="980" d="M 324,864 C 343,875 365,886 391,898 416,910 443,921 471,931 499,941 527,949 555,956 583,962 609,965 633,965 669,965 702,960 732,950 762,940 788,924 810,902 831,880 848,851 861,816 873,781 879,738 879,688 L 879,70 993,45 993,0 588,0 588,45 713,70 713,670 C 713,725 700,769 673,801 646,832 604,848 547,848 528,848 509,847 488,845 467,843 447,841 427,838 407,835 388,832 371,829 353,825 338,822 326,819 L 326,70 453,45 453,0 47,0 47,45 160,70 160,870 4 [...]
+ <glyph unicode="m" horiz-adv-x="1536" d="M 326,864 C 345,875 367,886 393,898 418,910 445,921 472,931 499,941 527,949 555,956 583,962 609,965 633,965 679,965 722,956 761,939 800,922 829,894 848,856 869,868 895,881 925,894 955,907 986,918 1019,929 1051,940 1083,948 1115,955 1146,962 1175,965 1200,965 1236,965 1269,960 1298,950 1327,940 1353,924 1374,902 1395,880 1411,851 1423,816 1434,781 1440,738 1440,688 L 1440,70 1561,45 1561,0 1134,0 1134,45 1274,70 1274,670 C 1274,725 1262,768 1237 [...]
+ <glyph unicode="e" horiz-adv-x="769" d="M 260,473 L 260,455 C 260,406 264,360 271,315 278,270 292,231 313,197 334,162 363,135 401,115 439,94 489,84 551,84 571,84 592,85 614,87 636,88 658,90 680,93 702,96 723,99 744,102 765,105 784,109 801,113 L 801,57 C 786,47 767,38 746,29 724,20 700,11 674,4 648,-3 620,-9 591,-14 562,-18 532,-20 502,-20 424,-20 358,-9 305,12 251,33 207,65 174,107 141,149 117,201 102,263 87,325 80,396 80,477 80,641 114,763 183,844 252,925 350,965 477,965 527,965 574, [...]
+ <glyph unicode="b" horiz-adv-x="954" d="M 766,496 C 766,564 760,621 748,668 735,714 718,751 695,780 672,809 644,829 612,842 579,854 543,860 504,860 488,860 471,859 453,858 434,857 416,855 398,852 380,849 363,845 346,841 329,837 315,832 303,827 L 303,82 C 331,77 363,73 399,70 435,67 470,66 504,66 596,66 663,102 704,174 745,246 766,353 766,496 Z M 137,1352 L 0,1376 0,1421 303,1421 303,1085 C 303,1072 303,1058 303,1042 302,1025 302,1008 302,991 301,973 301,955 300,938 299,920 298,903 297 [...]
+ <glyph unicode=">" horiz-adv-x="980" d="M 104,186 L 104,289 913,680 104,1071 104,1174 1057,705 1057,655 104,186 Z"/>
+ <glyph unicode="<" horiz-adv-x="980" d="M 102,655 L 102,705 1055,1174 1055,1071 246,680 1055,289 1055,186 102,655 Z"/>
+ </font>
+ </defs>
+ <defs>
+ <font id="EmbeddedFont_3" horiz-adv-x="2048">
+ <font-face font-family="StarSymbol embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1879" descent="661"/>
+ <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
+ <glyph unicode="●" horiz-adv-x="1191" d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+ <glyph unicode="–" horiz-adv-x="1165" d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+ </font>
+ </defs>
+ <defs class="TextShapeIndex">
+ <g ooo:slide="id1" ooo:id-list="id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+ <g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+ </g>
+ <g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+ </g>
+ <g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+ </g>
+ <g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+ </g>
+ <g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+ </g>
+ <g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+ </g>
+ <g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+ </g>
+ <g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+ </g>
+ <g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+ </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g>
+ <g id="id2" class="Master_Slide">
+ <g id="bg-id2" class="Background"/>
+ <g id="bo-id2" class="BackgroundObjects">
+ <g class="Date/Time">
+ <g id="id3"/>
+ </g>
+ <g class="Footer">
+ <g id="id4"/>
+ </g>
+ <g visibility="hidden" class="Slide_Number">
+ <g id="id5">
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Serif, serif" font-size="493px" font-weight="400"><tspan class="TextPosition" x="24551" y="19571"/><tspan class="TextPosition" x="24551" y="19571"><tspan class="PlaceholderText" fill="rgb(0,0,0)" stroke="none"><number></tspan></tspan></tspan></text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g class="SlideGroup">
+ <g>
+ <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+ <g class="Page">
+ <g class="Group">
+ <g class="Group">
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id6">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 2937,11430 L 2286,11430 2286,9164 3588,9164 3588,11430 2937,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 2937,11430 L 2286,11430 2286,9164 3588,9164 3588,11430 2937,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="2743" y="10420"/><tspan class="TextPosition" x="2743" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">16</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id7">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 6841,11430 L 6190,11430 6190,9164 7491,9164 7491,11430 6841,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 6841,11430 L 6190,11430 6190,9164 7491,9164 7491,11430 6841,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="6646" y="10420"/><tspan class="TextPosition" x="6646" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">13</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id8">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 5540,11430 L 4889,11430 4889,9164 6191,9164 6191,11430 5540,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 5540,11430 L 4889,11430 4889,9164 6191,9164 6191,11430 5540,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="5346" y="10420"/><tspan class="TextPosition" x="5346" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">14</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id9">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 4238,11430 L 3587,11430 3587,9164 4888,9164 4888,11430 4238,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 4238,11430 L 3587,11430 3587,9164 4888,9164 4888,11430 4238,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="4043" y="10420"/><tspan class="TextPosition" x="4043" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">15</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id10">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 2937,9925 L 2286,9925 2286,7658 3588,7658 3588,9925 2937,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 2937,9925 L 2286,9925 2286,7658 3588,7658 3588,9925 2937,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="2762" y="9012"/><tspan class="TextPosition" x="2762" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id11">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 6841,9925 L 6190,9925 6190,7658 7491,7658 7491,9925 6841,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 6841,9925 L 6190,9925 6190,7658 7491,7658 7491,9925 6841,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="6665" y="9012"/><tspan class="TextPosition" x="6665" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id12">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 5540,9925 L 4889,9925 4889,7658 6191,7658 6191,9925 5540,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 5540,9925 L 4889,9925 4889,7658 6191,7658 6191,9925 5540,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="5365" y="9012"/><tspan class="TextPosition" x="5365" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id13">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 4238,9925 L 3587,9925 3587,7658 4888,7658 4888,9925 4238,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 4238,9925 L 3587,9925 3587,7658 4888,7658 4888,9925 4238,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="4062" y="9012"/><tspan class="TextPosition" x="4062" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ </g>
+ <g class="Group">
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id14">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 8577,11430 L 7926,11430 7926,9164 9228,9164 9228,11430 8577,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 8577,11430 L 7926,11430 7926,9164 9228,9164 9228,11430 8577,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="8383" y="10420"/><tspan class="TextPosition" x="8383" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">12</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id15">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 12481,11430 L 11830,11430 11830,9164 13131,9164 13131,11430 12481,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 12481,11430 L 11830,11430 11830,9164 13131,9164 13131,11430 12481,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="12383" y="10420"/><tspan class="TextPosition" x="12383" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">9</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id16">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 11180,11430 L 10529,11430 10529,9164 11831,9164 11831,11430 11180,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 11180,11430 L 10529,11430 10529,9164 11831,9164 11831,11430 11180,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="10986" y="10420"/><tspan class="TextPosition" x="10986" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">10</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id17">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 9878,11430 L 9227,11430 9227,9164 10528,9164 10528,11430 9878,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 9878,11430 L 9227,11430 9227,9164 10528,9164 10528,11430 9878,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="9683" y="10420"/><tspan class="TextPosition" x="9683" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">11</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id18">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 8577,9925 L 7926,9925 7926,7658 9228,7658 9228,9925 8577,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 8577,9925 L 7926,9925 7926,7658 9228,7658 9228,9925 8577,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="8402" y="9012"/><tspan class="TextPosition" x="8402" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id19">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 12481,9925 L 11830,9925 11830,7658 13131,7658 13131,9925 12481,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 12481,9925 L 11830,9925 11830,7658 13131,7658 13131,9925 12481,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="12305" y="9012"/><tspan class="TextPosition" x="12305" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id20">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 11180,9925 L 10529,9925 10529,7658 11831,7658 11831,9925 11180,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 11180,9925 L 10529,9925 10529,7658 11831,7658 11831,9925 11180,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="11005" y="9012"/><tspan class="TextPosition" x="11005" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id21">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 9878,9925 L 9227,9925 9227,7658 10528,7658 10528,9925 9878,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 9878,9925 L 9227,9925 9227,7658 10528,7658 10528,9925 9878,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="9702" y="9012"/><tspan class="TextPosition" x="9702" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ </g>
+ <g class="Group">
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id22">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 15518,11430 L 14867,11430 14867,9164 16168,9164 16168,11430 15518,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 15518,11430 L 14867,11430 14867,9164 16168,9164 16168,11430 15518,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="15420" y="10420"/><tspan class="TextPosition" x="15420" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">8</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id23">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 19423,11430 L 18772,11430 18772,9164 20074,9164 20074,11430 19423,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 19423,11430 L 18772,11430 18772,9164 20074,9164 20074,11430 19423,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="19326" y="10420"/><tspan class="TextPosition" x="19326" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">5</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id24">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 18121,11430 L 17470,11430 17470,9164 18771,9164 18771,11430 18121,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 18121,11430 L 17470,11430 17470,9164 18771,9164 18771,11430 18121,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="18023" y="10420"/><tspan class="TextPosition" x="18023" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">6</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id25">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 16820,11430 L 16169,11430 16169,9164 17471,9164 17471,11430 16820,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 16820,11430 L 16169,11430 16169,9164 17471,9164 17471,11430 16820,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="16723" y="10420"/><tspan class="TextPosition" x="16723" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">7</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id26">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 15518,9925 L 14867,9925 14867,7658 16168,7658 16168,9925 15518,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 15518,9925 L 14867,9925 14867,7658 16168,7658 16168,9925 15518,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="15342" y="9012"/><tspan class="TextPosition" x="15342" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id27">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 19423,9925 L 18772,9925 18772,7658 20074,7658 20074,9925 19423,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 19423,9925 L 18772,9925 18772,7658 20074,7658 20074,9925 19423,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="19248" y="9012"/><tspan class="TextPosition" x="19248" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id28">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 18121,9925 L 17470,9925 17470,7658 18771,7658 18771,9925 18121,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 18121,9925 L 17470,9925 17470,7658 18771,7658 18771,9925 18121,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="17945" y="9012"/><tspan class="TextPosition" x="17945" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id29">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 16820,9925 L 16169,9925 16169,7658 17471,7658 17471,9925 16820,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 16820,9925 L 16169,9925 16169,7658 17471,7658 17471,9925 16820,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="16645" y="9012"/><tspan class="TextPosition" x="16645" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ </g>
+ <g class="Group">
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id30">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 21158,11430 L 20507,11430 20507,9164 21808,9164 21808,11430 21158,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 21158,11430 L 20507,11430 20507,9164 21808,9164 21808,11430 21158,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="21060" y="10420"/><tspan class="TextPosition" x="21060" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">4</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id31">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 25063,11430 L 24412,11430 24412,9164 25714,9164 25714,11430 25063,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 25063,11430 L 24412,11430 24412,9164 25714,9164 25714,11430 25063,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="24966" y="10420"/><tspan class="TextPosition" x="24966" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id32">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 23761,11430 L 23110,11430 23110,9164 24411,9164 24411,11430 23761,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 23761,11430 L 23110,11430 23110,9164 24411,9164 24411,11430 23761,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="23663" y="10420"/><tspan class="TextPosition" x="23663" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id33">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 22460,11430 L 21809,11430 21809,9164 23111,9164 23111,11430 22460,11430 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 22460,11430 L 21809,11430 21809,9164 23111,9164 23111,11430 22460,11430 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="22363" y="10420"/><tspan class="TextPosition" x="22363" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">3</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id34">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 21158,9925 L 20507,9925 20507,7658 21808,7658 21808,9925 21158,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 21158,9925 L 20507,9925 20507,7658 21808,7658 21808,9925 21158,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="20982" y="9012"/><tspan class="TextPosition" x="20982" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id35">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 25063,9925 L 24412,9925 24412,7658 25714,7658 25714,9925 25063,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 25063,9925 L 24412,9925 24412,7658 25714,7658 25714,9925 25063,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="24888" y="9012"/><tspan class="TextPosition" x="24888" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id36">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 23761,9925 L 23110,9925 23110,7658 24411,7658 24411,9925 23761,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 23761,9925 L 23110,9925 23110,7658 24411,7658 24411,9925 23761,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="23585" y="9012"/><tspan class="TextPosition" x="23585" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id37">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 22460,9925 L 21809,9925 21809,7658 23111,7658 23111,9925 22460,9925 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 22460,9925 L 21809,9925 21809,7658 23111,7658 23111,9925 22460,9925 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="22285" y="9012"/><tspan class="TextPosition" x="22285" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id38">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 7575,7092 L 6924,7092 6924,6604 8225,6604 8225,7092 7575,7092 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 7575,7092 L 6924,7092 6924,6604 8225,6604 8225,7092 7575,7092 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="6675" y="7069"/><tspan class="TextPosition" x="6675" y="7069"><tspan fill="rgb(0,0,0)" stroke="none">Byte 2</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id39">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 20157,7092 L 19506,7092 19506,6604 20808,6604 20808,7092 20157,7092 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 20157,7092 L 19506,7092 19506,6604 20808,6604 20808,7092 20157,7092 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="19257" y="7069"/><tspan class="TextPosition" x="19257" y="7069"><tspan fill="rgb(0,0,0)" stroke="none">Byte 1</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id40">
+ <path fill="none" stroke="rgb(52,101,164)" d="M 2461,11006 C 2466,11261 2672,11510 2874,11506 L 4486,11472 C 4687,11468 4894,11718 4900,11972 4894,11718 5091,11460 5292,11456 L 6904,11422 C 7106,11418 7302,11159 7297,10904"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 2482,12023 L 2482,12023 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 7297,10904 L 7297,10904 Z"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id41">
+ <path fill="none" stroke="rgb(52,101,164)" d="M 20683,11022 C 20688,11277 20894,11526 21096,11522 L 22708,11488 C 22909,11484 23116,11734 23122,11988 23116,11734 23313,11476 23514,11472 L 25126,11438 C 25328,11434 25524,11175 25519,10920"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 20704,12039 L 20704,12039 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 25519,10920 L 25519,10920 Z"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id42">
+ <path fill="none" stroke="rgb(52,101,164)" d="M 8101,10921 C 8106,11176 8312,11425 8514,11421 L 10126,11387 C 10327,11383 10534,11633 10540,11887 10534,11633 10731,11375 10932,11371 L 12544,11337 C 12746,11333 12942,11074 12937,10819"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 8122,11938 L 8122,11938 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 12937,10819 L 12937,10819 Z"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id43">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 17471,13207 L 16820,13207 16820,12038 18121,12038 18121,13207 17471,13207 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 17471,13207 L 16820,13207 16820,12038 18121,12038 18121,13207 17471,13207 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="17157" y="13012"/><tspan class="TextPosition" x="17157" y="13012"><tspan fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id44">
+ <path fill="none" stroke="rgb(52,101,164)" d="M 15043,11022 C 15048,11277 15254,11526 15456,11522 L 17068,11488 C 17269,11484 17476,11734 17482,11988 17476,11734 17673,11476 17874,11472 L 19486,11438 C 19688,11434 19884,11175 19879,10920"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 15064,12039 L 15064,12039 Z"/>
+ <path fill="none" stroke="rgb(52,101,164)" d="M 19879,10920 L 19879,10920 Z"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id45">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 23111,13207 L 22460,13207 22460,12038 23761,12038 23761,13207 23111,13207 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 23111,13207 L 22460,13207 22460,12038 23761,12038 23761,13207 23111,13207 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="22797" y="13012"/><tspan class="TextPosition" x="22797" y="13012"><tspan fill="rgb(0,0,0)" stroke="none">4</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id46">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 4889,13106 L 4238,13106 4238,11937 5539,11937 5539,13106 4889,13106 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 4889,13106 L 4238,13106 4238,11937 5539,11937 5539,13106 4889,13106 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="4575" y="12911"/><tspan class="TextPosition" x="4575" y="12911"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.CustomShape">
+ <g id="id47">
+ <path fill="rgb(255,255,255)" stroke="none" d="M 10529,13106 L 9878,13106 9878,11937 11179,11937 11179,13106 10529,13106 Z"/>
+ <path fill="none" stroke="rgb(255,255,255)" d="M 10529,13106 L 9878,13106 9878,11937 11179,11937 11179,13106 10529,13106 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="10215" y="12911"/><tspan class="TextPosition" x="10215" y="12911"><tspan fill="rgb(0,0,0)" stroke="none">8</tspan></tspan></tspan></text>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
+
diff --git a/tutorials/src/main/resources/bitorder.tutorial.tdml.xml b/tutorials/src/main/resources/bitorder.tutorial.tdml.xml
index 1ab287e..f2db9d3 100644
--- a/tutorials/src/main/resources/bitorder.tutorial.tdml.xml
+++ b/tutorials/src/main/resources/bitorder.tutorial.tdml.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="DFDLTutorialStylesheet.xsl"?>
+<?xml-stylesheet type="text/xsl" href="http://daffodil.apache.org/assets/tutorials/DFDLTutorialStylesheet.xsl"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -89,441 +89,7 @@ diagrams in the specs that are about data with leastSignificantbitFirst are numb
Let's consider looking at a hex dump or hex editor displaying "2408", but the data is least-significant-bit first. To visualize this data, just number the bytes starting from the right. Then look at each byte, and type the two hex digits for it, most-significant first, then least-significant. Notice how the bits within the bytes are numbered increasing from right to left as well.
</p>
<p>
- <!-- svg from a slide created in LibreOffice Impress. Have to tweek the width/height to 50% and the viewBox which is width then height of the view port into the slide -->
-<svg version="1.2" baseProfile="tiny" width="50%" height="50%" viewBox="0 5000 28000 10000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
- <defs class="ClipPathGroup">
- <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
- <rect x="0" y="0" width="28000" height="21000"/>
- </clipPath>
- </defs>
- <defs>
- <font id="EmbeddedFont_1" horiz-adv-x="2048">
- <font-face font-family="Liberation Sans embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1852" descent="450"/>
- <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
- <glyph unicode="y" horiz-adv-x="1033" d="M 604,1 C 579,-64 553,-123 527,-175 500,-227 471,-272 438,-309 405,-346 369,-374 329,-394 289,-413 243,-423 191,-423 168,-423 147,-423 128,-423 109,-423 88,-420 67,-414 L 67,-279 C 80,-282 94,-284 110,-284 126,-284 140,-284 151,-284 204,-284 253,-264 298,-225 343,-186 383,-123 417,-37 L 434,6 5,1082 197,1082 425,484 C 432,466 440,442 451,412 461,382 471,352 482,322 492,292 501,265 509,241 517,217 522,202 523,196 525,203 530,218 538,240 545,261 [...]
- <glyph unicode="x" horiz-adv-x="1006" d="M 801,0 L 510,444 217,0 23,0 408,556 41,1082 240,1082 510,661 778,1082 979,1082 612,558 1002,0 801,0 Z"/>
- <glyph unicode="v" horiz-adv-x="1033" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,173 522,194 528,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z"/>
- <glyph unicode="u" horiz-adv-x="874" d="M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,231 C 997,208 997,185 998,160 998,135 998,111 999,89 1000,66 1000,47 1001,31 1002,15 1002,5 1003,0 L 833,0 C 832,3 832,12 831,27 830,42 830,59 829,78 828,97 827,116 826,136 825,155 825,172 825,185 L 822,185 C 8 [...]
- <glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324 336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z"/>
- <glyph unicode="r" horiz-adv-x="530" d="M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 636,930 622,933 606,935 590,936 5 [...]
- <glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 381,912 355,879 329,846 3 [...]
- <glyph unicode="n" horiz-adv-x="874" d="M 825,0 L 825,686 C 825,739 821,783 814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 559,963 521,956 487,941 452,926 423,904 399,876 374,847 355,812 342,771 329,729 322,681 322,627 L 322,0 142,0 142,851 C 142,874 142,898 142,923 141,948 141,971 140,994 139,1016 139,1035 138,1051 137,1067 137,1077 136,1082 L 306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 312,966 313,947 314,927 314,910 314, [...]
- <glyph unicode="m" horiz-adv-x="1457" d="M 768,0 L 768,686 C 768,739 765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 327,729 321,681 321,627 L 321,0 142,0 142,851 C 142,874 142,898 142,923 141,948 141,971 140,994 139,1016 139,1035 138,1051 137,1067 137,1077 136,1082 L 306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 312,966 313,947 314,927 314,910 314 [...]
- <glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z"/>
- <glyph unicode="k" horiz-adv-x="901" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,0 816,0 Z"/>
- <glyph unicode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z"/>
- <glyph unicode="h" horiz-adv-x="874" d="M 317,897 C 337,934 359,965 382,991 405,1016 431,1037 459,1054 487,1071 518,1083 551,1091 584,1098 622,1102 663,1102 732,1102 789,1093 834,1074 878,1055 913,1029 939,996 964,962 982,922 992,875 1001,828 1006,777 1006,721 L 1006,0 825,0 825,686 C 825,732 822,772 817,807 811,842 800,871 784,894 768,917 745,934 716,946 687,957 649,963 602,963 559,963 521,955 487,940 452,925 423,903 399,875 374,847 355,813 342,773 329,733 322,688 322,638 L 322,0 142 [...]
- <glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1243 185,1280 192,1314 199,1347 213,1377 233,1402 252,1427 279,1446 313,1461 347,1475 391,1482 445,1482 466,1482 489,1481 512,1479 535,1477 555,1474 572,1470 L 572,1333 C 561,1335 548,1337 533,1339 518,1340 504,1341 492,1341 465,1341 444,1337 427,1330 410,1323 396,1312 387,1299 377,1285 370,1268 367,1248 363,1228 361,1205 361,1179 L 361,1082 572,1082 572,951 361,951 Z"/>
- <glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,446 282,394 294,347 305,299 323,258 348,224 372,189 403,163 441,144 479,125 525,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 1008,206 992,176 972,146 951,115 924,88 890,64 856,39 814,19 763,4 712,-12 650,-20 578,-20 418,-20 296,28 213,123 129,218 87,360 87,548 87,649 100,735 125,806 150,876 185,933 229,977 273,1021 324,1053 383,1073 442,1092 504,1102 571,1102 662,1102 738,1087 799,1058 860,1029 909,988 [...]
- <glyph unicode="d" horiz-adv-x="927" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 C 823,921 823,931 823,946 822,960 822,975 822,991 821,1006 821,1021 821,1035 821,1049 821,1059 821,1065 L 821,1484 1001,1484 1001,223 C 1001,197 1001,172 1002,148 1002,124 1002,102 1003,82 1004,62 1004,45 1005,31 1006,16 1006,6 1007,0 L 835,0 C 834,7 833,16 83 [...]
- <glyph unicode="c" horiz-adv-x="901" d="M 275,546 C 275,484 280,427 289,375 298,323 313,278 334,241 355,203 384,174 419,153 454,132 497,122 548,122 612,122 666,139 709,173 752,206 778,258 788,328 L 970,328 C 964,283 951,239 931,197 911,155 884,118 850,86 815,54 773,28 724,9 675,-10 618,-20 553,-20 468,-20 396,-6 337,23 278,52 230,91 193,142 156,192 129,251 112,320 95,388 87,462 87,542 87,615 93,679 105,735 117,790 134,839 156,881 177,922 203,957 232,986 261,1014 293,1037 328,1054 362, [...]
- <glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,124 87,203 87,303 87,375 101,434 128,480 155,526 190,562 234,588 277,614 327,632 383,642 439,652 496,657 554,657 L 797,657 797,717 C 797,762 792,800 783,832 774,863 759,889 740,908 721,928 697,942 668,951 639,960 604,965 565,965 530,965 499,963 471,958 443,953 419,944 398,931 377,918 361,900 348,878 335,855 327,827 323,793 L 135,810 C 142,853 154,892 173,928 192,963 218,994 253,1020 287,1046 330,1066 382,108 [...]
- <glyph unicode="T" horiz-adv-x="1192" d="M 720,1253 L 720,0 530,0 530,1253 46,1253 46,1409 1204,1409 1204,1253 720,1253 Z"/>
- <glyph unicode="S" horiz-adv-x="1192" d="M 1272,389 C 1272,330 1261,275 1238,225 1215,175 1179,132 1131,96 1083,59 1023,31 950,11 877,-10 790,-20 690,-20 515,-20 378,11 280,72 182,133 120,222 93,338 L 278,375 C 287,338 302,305 321,275 340,245 367,219 400,198 433,176 473,159 522,147 571,135 629,129 697,129 754,129 806,134 853,144 900,153 941,168 975,188 1009,208 1036,234 1055,266 1074,297 1083,335 1083,379 1083,425 1073,462 1052,491 1031,520 1001,543 963,562 925,581 880,596 827,609 774 [...]
- <glyph unicode="O" horiz-adv-x="1430" d="M 1495,711 C 1495,601 1479,501 1448,411 1416,321 1370,244 1310,180 1250,116 1177,67 1090,32 1003,-3 905,-20 795,-20 679,-20 577,-2 490,35 403,71 330,122 272,187 214,252 170,329 141,418 112,507 97,605 97,711 97,821 112,920 143,1009 174,1098 219,1173 278,1236 337,1298 411,1346 498,1380 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300, [...]
- <glyph unicode="L" horiz-adv-x="927" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z"/>
- <glyph unicode="F" horiz-adv-x="1006" d="M 359,1253 L 359,729 1145,729 1145,571 359,571 359,0 168,0 168,1409 1169,1409 1169,1253 359,1253 Z"/>
- <glyph unicode="C" horiz-adv-x="1324" d="M 792,1274 C 712,1274 641,1261 580,1234 518,1207 466,1169 425,1120 383,1071 351,1011 330,942 309,873 298,796 298,711 298,626 310,549 333,479 356,408 389,348 432,297 475,246 527,207 590,179 652,151 722,137 800,137 855,137 905,144 950,159 995,173 1035,193 1072,219 1108,245 1140,276 1169,312 1198,347 1223,387 1245,430 L 1401,352 C 1376,299 1344,250 1307,205 1270,160 1226,120 1176,87 1125,54 1068,28 1005,9 941,-10 870,-20 791,-20 677,-20 577,-2 492 [...]
- <glyph unicode="B" horiz-adv-x="1112" d="M 1258,397 C 1258,326 1244,265 1216,215 1188,164 1150,123 1103,92 1056,60 1001,37 938,22 875,7 809,0 740,0 L 168,0 168,1409 680,1409 C 758,1409 828,1403 889,1390 950,1377 1002,1356 1045,1328 1088,1300 1120,1265 1143,1222 1165,1179 1176,1127 1176,1067 1176,1028 1171,991 1160,956 1149,921 1132,890 1110,862 1087,833 1059,809 1026,789 992,768 953,753 908,743 965,736 1015,723 1059,704 1102,685 1139,660 1168,630 1197,600 1220,565 1235,526 1250,486 12 [...]
- <glyph unicode="9" horiz-adv-x="980" d="M 1042,733 C 1042,608 1030,498 1007,404 983,309 949,231 905,168 861,105 808,58 745,27 682,-4 611,-20 532,-20 478,-20 429,-14 386,-4 343,8 304,25 270,48 236,71 207,102 183,139 159,176 140,221 125,274 L 297,301 C 316,240 345,196 385,168 424,139 474,125 535,125 584,125 628,137 669,160 709,183 743,217 772,263 800,309 822,367 838,436 854,505 863,587 864,680 850,649 831,621 807,596 782,571 755,551 724,534 693,517 659,504 623,495 587,486 551,481 514,48 [...]
- <glyph unicode="8" horiz-adv-x="980" d="M 1050,393 C 1050,333 1041,278 1022,228 1003,177 974,134 935,97 896,60 846,32 785,11 724,-10 653,-20 570,-20 487,-20 416,-10 356,11 295,32 245,60 206,97 166,133 137,176 118,227 99,277 89,332 89,391 89,442 97,488 113,528 128,568 149,603 176,632 202,661 232,684 266,702 299,719 334,731 370,737 L 370,741 C 331,750 296,765 265,786 234,807 208,832 187,861 166,890 150,922 139,957 128,992 122,1030 122,1069 122,1118 132,1165 151,1209 170,1252 198,1291 23 [...]
- <glyph unicode="7" horiz-adv-x="954" d="M 1036,1263 C 965,1155 900,1051 841,952 782,852 731,752 688,651 645,550 612,446 589,340 565,233 553,120 553,0 L 365,0 C 365,113 378,223 405,332 432,440 468,546 513,651 558,755 611,857 671,958 731,1059 795,1158 862,1256 L 105,1256 105,1409 1036,1409 1036,1263 Z"/>
- <glyph unicode="6" horiz-adv-x="980" d="M 1049,461 C 1049,390 1039,326 1020,267 1000,208 971,157 933,115 894,72 847,39 790,16 733,-8 668,-20 594,-20 512,-20 440,-4 379,27 318,58 267,104 226,163 185,222 155,294 135,380 114,465 104,563 104,672 104,797 116,907 139,1002 162,1097 195,1176 238,1239 281,1302 334,1350 397,1382 459,1414 529,1430 608,1430 656,1430 701,1425 743,1415 785,1405 823,1389 858,1367 892,1344 922,1315 948,1278 974,1241 995,1196 1010,1143 L 838,1112 C 819,1173 790,1217 7 [...]
- <glyph unicode="5" horiz-adv-x="980" d="M 1053,459 C 1053,388 1042,324 1021,265 1000,206 968,156 926,114 884,71 832,38 770,15 707,-8 635,-20 553,-20 479,-20 415,-11 360,6 305,23 258,47 220,78 182,108 152,143 130,184 107,225 91,268 82,315 L 264,336 C 271,309 282,284 295,259 308,234 327,211 350,192 373,172 401,156 435,145 468,133 509,127 557,127 604,127 646,134 684,149 722,163 755,184 782,212 809,240 829,274 844,315 859,356 866,402 866,455 866,498 859,538 845,575 831,611 811,642 785,669 [...]
- <glyph unicode="4" horiz-adv-x="1060" d="M 881,319 L 881,0 711,0 711,319 47,319 47,459 692,1409 881,1409 881,461 1079,461 1079,319 881,319 Z M 711,1206 C 710,1203 706,1196 701,1187 696,1177 690,1166 683,1154 676,1142 670,1130 663,1118 656,1105 649,1095 644,1087 L 283,555 C 280,550 275,543 269,534 262,525 256,517 249,508 242,499 236,490 229,481 222,472 217,466 213,461 L 711,461 711,1206 Z"/>
- <glyph unicode="3" horiz-adv-x="1006" d="M 1049,389 C 1049,324 1039,267 1018,216 997,165 966,123 926,88 885,53 835,26 776,8 716,-11 648,-20 571,-20 484,-20 410,-9 351,13 291,34 242,63 203,99 164,134 135,175 116,221 97,266 84,313 78,362 L 264,379 C 269,342 279,308 294,277 308,246 327,220 352,198 377,176 407,159 443,147 479,135 522,129 571,129 662,129 733,151 785,196 836,241 862,307 862,395 862,447 851,489 828,521 805,552 776,577 742,595 707,612 670,624 630,630 589,636 552,639 518,639 L [...]
- <glyph unicode="2" horiz-adv-x="954" d="M 103,0 L 103,127 C 137,205 179,274 228,334 277,393 328,447 382,496 436,544 490,589 543,630 596,671 643,713 686,754 729,795 763,839 790,884 816,929 829,981 829,1038 829,1078 823,1113 811,1144 799,1174 782,1199 759,1220 736,1241 709,1256 678,1267 646,1277 611,1282 572,1282 536,1282 502,1277 471,1267 439,1257 411,1242 386,1222 361,1202 341,1177 326,1148 310,1118 300,1083 295,1044 L 111,1061 C 117,1112 131,1159 153,1204 175,1249 205,1288 244,1322 2 [...]
- <glyph unicode="1" horiz-adv-x="927" d="M 156,0 L 156,153 515,153 515,1237 197,1010 197,1180 530,1409 696,1409 696,153 1039,153 1039,0 156,0 Z"/>
- <glyph unicode="0" horiz-adv-x="980" d="M 1059,705 C 1059,570 1046,456 1021,364 995,271 960,197 916,140 871,83 819,42 759,17 699,-8 635,-20 567,-20 498,-20 434,-8 375,17 316,42 264,82 221,139 177,196 143,270 118,363 93,455 80,569 80,705 80,847 93,965 118,1058 143,1151 177,1225 221,1280 265,1335 317,1374 377,1397 437,1419 502,1430 573,1430 640,1430 704,1419 763,1397 822,1374 873,1335 917,1280 961,1225 996,1151 1021,1058 1046,965 1059,847 1059,705 Z M 876,705 C 876,817 869,910 856,985 8 [...]
- <glyph unicode=" " horiz-adv-x="556"/>
- </font>
- </defs>
- <defs>
- <font id="EmbeddedFont_2" horiz-adv-x="2048">
- <font-face font-family="Liberation Serif embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1826" descent="450"/>
- <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
- <glyph unicode="u" horiz-adv-x="980" d="M 313,268 C 313,213 326,170 351,141 376,111 416,96 473,96 510,96 549,99 589,104 629,109 668,116 705,127 L 705,870 563,895 563,940 870,940 870,70 989,45 989,0 715,0 707,76 C 688,65 665,54 638,43 611,32 584,21 555,12 526,3 496,-5 467,-11 438,-17 411,-20 387,-20 351,-20 318,-15 289,-5 260,5 235,21 214,43 193,65 176,94 165,129 153,164 147,206 147,256 L 147,870 27,895 27,940 313,940 313,268 Z"/>
- <glyph unicode="r" horiz-adv-x="636" d="M 664,965 L 664,711 621,711 563,821 C 544,821 524,820 503,817 482,814 460,811 439,807 418,802 397,797 378,791 358,785 341,779 326,772 L 326,70 487,45 487,0 41,0 41,45 160,70 160,870 41,895 41,940 315,940 324,823 C 339,836 360,850 387,867 414,883 443,898 474,913 505,928 536,940 567,950 598,960 625,965 649,965 L 664,965 Z"/>
- <glyph unicode="n" horiz-adv-x="980" d="M 324,864 C 343,875 365,886 391,898 416,910 443,921 471,931 499,941 527,949 555,956 583,962 609,965 633,965 669,965 702,960 732,950 762,940 788,924 810,902 831,880 848,851 861,816 873,781 879,738 879,688 L 879,70 993,45 993,0 588,0 588,45 713,70 713,670 C 713,725 700,769 673,801 646,832 604,848 547,848 528,848 509,847 488,845 467,843 447,841 427,838 407,835 388,832 371,829 353,825 338,822 326,819 L 326,70 453,45 453,0 47,0 47,45 160,70 160,870 4 [...]
- <glyph unicode="m" horiz-adv-x="1536" d="M 326,864 C 345,875 367,886 393,898 418,910 445,921 472,931 499,941 527,949 555,956 583,962 609,965 633,965 679,965 722,956 761,939 800,922 829,894 848,856 869,868 895,881 925,894 955,907 986,918 1019,929 1051,940 1083,948 1115,955 1146,962 1175,965 1200,965 1236,965 1269,960 1298,950 1327,940 1353,924 1374,902 1395,880 1411,851 1423,816 1434,781 1440,738 1440,688 L 1440,70 1561,45 1561,0 1134,0 1134,45 1274,70 1274,670 C 1274,725 1262,768 1237 [...]
- <glyph unicode="e" horiz-adv-x="769" d="M 260,473 L 260,455 C 260,406 264,360 271,315 278,270 292,231 313,197 334,162 363,135 401,115 439,94 489,84 551,84 571,84 592,85 614,87 636,88 658,90 680,93 702,96 723,99 744,102 765,105 784,109 801,113 L 801,57 C 786,47 767,38 746,29 724,20 700,11 674,4 648,-3 620,-9 591,-14 562,-18 532,-20 502,-20 424,-20 358,-9 305,12 251,33 207,65 174,107 141,149 117,201 102,263 87,325 80,396 80,477 80,641 114,763 183,844 252,925 350,965 477,965 527,965 574, [...]
- <glyph unicode="b" horiz-adv-x="954" d="M 766,496 C 766,564 760,621 748,668 735,714 718,751 695,780 672,809 644,829 612,842 579,854 543,860 504,860 488,860 471,859 453,858 434,857 416,855 398,852 380,849 363,845 346,841 329,837 315,832 303,827 L 303,82 C 331,77 363,73 399,70 435,67 470,66 504,66 596,66 663,102 704,174 745,246 766,353 766,496 Z M 137,1352 L 0,1376 0,1421 303,1421 303,1085 C 303,1072 303,1058 303,1042 302,1025 302,1008 302,991 301,973 301,955 300,938 299,920 298,903 297 [...]
- <glyph unicode=">" horiz-adv-x="980" d="M 104,186 L 104,289 913,680 104,1071 104,1174 1057,705 1057,655 104,186 Z"/>
- <glyph unicode="<" horiz-adv-x="980" d="M 102,655 L 102,705 1055,1174 1055,1071 246,680 1055,289 1055,186 102,655 Z"/>
- </font>
- </defs>
- <defs>
- <font id="EmbeddedFont_3" horiz-adv-x="2048">
- <font-face font-family="StarSymbol embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1879" descent="661"/>
- <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
- <glyph unicode="●" horiz-adv-x="1191" d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
- <glyph unicode="–" horiz-adv-x="1165" d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
- </font>
- </defs>
- <defs class="TextShapeIndex">
- <g ooo:slide="id1" ooo:id-list="id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47"/>
- </defs>
- <defs class="EmbeddedBulletChars">
- <g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
- </g>
- <g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
- </g>
- <g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
- </g>
- <g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
- </g>
- <g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
- </g>
- <g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
- </g>
- <g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
- </g>
- <g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
- </g>
- <g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
- <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
- </g>
- </defs>
- <defs class="TextEmbeddedBitmaps"/>
- <g>
- <g id="id2" class="Master_Slide">
- <g id="bg-id2" class="Background"/>
- <g id="bo-id2" class="BackgroundObjects">
- <g class="Date/Time">
- <g id="id3"/>
- </g>
- <g class="Footer">
- <g id="id4"/>
- </g>
- <g visibility="hidden" class="Slide_Number">
- <g id="id5">
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Serif, serif" font-size="493px" font-weight="400"><tspan class="TextPosition" x="24551" y="19571"/><tspan class="TextPosition" x="24551" y="19571"><tspan class="PlaceholderText" fill="rgb(0,0,0)" stroke="none"><number></tspan></tspan></tspan></text>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g class="SlideGroup">
- <g>
- <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
- <g class="Page">
- <g class="Group">
- <g class="Group">
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id6">
- <path fill="rgb(255,255,255)" stroke="none" d="M 2937,11430 L 2286,11430 2286,9164 3588,9164 3588,11430 2937,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 2937,11430 L 2286,11430 2286,9164 3588,9164 3588,11430 2937,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="2743" y="10420"/><tspan class="TextPosition" x="2743" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">16</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id7">
- <path fill="rgb(255,255,255)" stroke="none" d="M 6841,11430 L 6190,11430 6190,9164 7491,9164 7491,11430 6841,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 6841,11430 L 6190,11430 6190,9164 7491,9164 7491,11430 6841,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="6646" y="10420"/><tspan class="TextPosition" x="6646" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">13</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id8">
- <path fill="rgb(255,255,255)" stroke="none" d="M 5540,11430 L 4889,11430 4889,9164 6191,9164 6191,11430 5540,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 5540,11430 L 4889,11430 4889,9164 6191,9164 6191,11430 5540,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="5346" y="10420"/><tspan class="TextPosition" x="5346" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">14</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id9">
- <path fill="rgb(255,255,255)" stroke="none" d="M 4238,11430 L 3587,11430 3587,9164 4888,9164 4888,11430 4238,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 4238,11430 L 3587,11430 3587,9164 4888,9164 4888,11430 4238,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="4043" y="10420"/><tspan class="TextPosition" x="4043" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">15</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id10">
- <path fill="rgb(255,255,255)" stroke="none" d="M 2937,9925 L 2286,9925 2286,7658 3588,7658 3588,9925 2937,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 2937,9925 L 2286,9925 2286,7658 3588,7658 3588,9925 2937,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="2762" y="9012"/><tspan class="TextPosition" x="2762" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id11">
- <path fill="rgb(255,255,255)" stroke="none" d="M 6841,9925 L 6190,9925 6190,7658 7491,7658 7491,9925 6841,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 6841,9925 L 6190,9925 6190,7658 7491,7658 7491,9925 6841,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="6665" y="9012"/><tspan class="TextPosition" x="6665" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id12">
- <path fill="rgb(255,255,255)" stroke="none" d="M 5540,9925 L 4889,9925 4889,7658 6191,7658 6191,9925 5540,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 5540,9925 L 4889,9925 4889,7658 6191,7658 6191,9925 5540,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="5365" y="9012"/><tspan class="TextPosition" x="5365" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id13">
- <path fill="rgb(255,255,255)" stroke="none" d="M 4238,9925 L 3587,9925 3587,7658 4888,7658 4888,9925 4238,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 4238,9925 L 3587,9925 3587,7658 4888,7658 4888,9925 4238,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="4062" y="9012"/><tspan class="TextPosition" x="4062" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- </g>
- <g class="Group">
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id14">
- <path fill="rgb(255,255,255)" stroke="none" d="M 8577,11430 L 7926,11430 7926,9164 9228,9164 9228,11430 8577,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 8577,11430 L 7926,11430 7926,9164 9228,9164 9228,11430 8577,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="8383" y="10420"/><tspan class="TextPosition" x="8383" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">12</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id15">
- <path fill="rgb(255,255,255)" stroke="none" d="M 12481,11430 L 11830,11430 11830,9164 13131,9164 13131,11430 12481,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 12481,11430 L 11830,11430 11830,9164 13131,9164 13131,11430 12481,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="12383" y="10420"/><tspan class="TextPosition" x="12383" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">9</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id16">
- <path fill="rgb(255,255,255)" stroke="none" d="M 11180,11430 L 10529,11430 10529,9164 11831,9164 11831,11430 11180,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 11180,11430 L 10529,11430 10529,9164 11831,9164 11831,11430 11180,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="10986" y="10420"/><tspan class="TextPosition" x="10986" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">10</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id17">
- <path fill="rgb(255,255,255)" stroke="none" d="M 9878,11430 L 9227,11430 9227,9164 10528,9164 10528,11430 9878,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 9878,11430 L 9227,11430 9227,9164 10528,9164 10528,11430 9878,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="9683" y="10420"/><tspan class="TextPosition" x="9683" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">11</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id18">
- <path fill="rgb(255,255,255)" stroke="none" d="M 8577,9925 L 7926,9925 7926,7658 9228,7658 9228,9925 8577,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 8577,9925 L 7926,9925 7926,7658 9228,7658 9228,9925 8577,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="8402" y="9012"/><tspan class="TextPosition" x="8402" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id19">
- <path fill="rgb(255,255,255)" stroke="none" d="M 12481,9925 L 11830,9925 11830,7658 13131,7658 13131,9925 12481,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 12481,9925 L 11830,9925 11830,7658 13131,7658 13131,9925 12481,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="12305" y="9012"/><tspan class="TextPosition" x="12305" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id20">
- <path fill="rgb(255,255,255)" stroke="none" d="M 11180,9925 L 10529,9925 10529,7658 11831,7658 11831,9925 11180,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 11180,9925 L 10529,9925 10529,7658 11831,7658 11831,9925 11180,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="11005" y="9012"/><tspan class="TextPosition" x="11005" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id21">
- <path fill="rgb(255,255,255)" stroke="none" d="M 9878,9925 L 9227,9925 9227,7658 10528,7658 10528,9925 9878,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 9878,9925 L 9227,9925 9227,7658 10528,7658 10528,9925 9878,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="9702" y="9012"/><tspan class="TextPosition" x="9702" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- </g>
- <g class="Group">
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id22">
- <path fill="rgb(255,255,255)" stroke="none" d="M 15518,11430 L 14867,11430 14867,9164 16168,9164 16168,11430 15518,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 15518,11430 L 14867,11430 14867,9164 16168,9164 16168,11430 15518,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="15420" y="10420"/><tspan class="TextPosition" x="15420" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">8</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id23">
- <path fill="rgb(255,255,255)" stroke="none" d="M 19423,11430 L 18772,11430 18772,9164 20074,9164 20074,11430 19423,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 19423,11430 L 18772,11430 18772,9164 20074,9164 20074,11430 19423,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="19326" y="10420"/><tspan class="TextPosition" x="19326" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">5</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id24">
- <path fill="rgb(255,255,255)" stroke="none" d="M 18121,11430 L 17470,11430 17470,9164 18771,9164 18771,11430 18121,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 18121,11430 L 17470,11430 17470,9164 18771,9164 18771,11430 18121,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="18023" y="10420"/><tspan class="TextPosition" x="18023" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">6</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id25">
- <path fill="rgb(255,255,255)" stroke="none" d="M 16820,11430 L 16169,11430 16169,9164 17471,9164 17471,11430 16820,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 16820,11430 L 16169,11430 16169,9164 17471,9164 17471,11430 16820,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="16723" y="10420"/><tspan class="TextPosition" x="16723" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">7</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id26">
- <path fill="rgb(255,255,255)" stroke="none" d="M 15518,9925 L 14867,9925 14867,7658 16168,7658 16168,9925 15518,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 15518,9925 L 14867,9925 14867,7658 16168,7658 16168,9925 15518,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="15342" y="9012"/><tspan class="TextPosition" x="15342" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id27">
- <path fill="rgb(255,255,255)" stroke="none" d="M 19423,9925 L 18772,9925 18772,7658 20074,7658 20074,9925 19423,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 19423,9925 L 18772,9925 18772,7658 20074,7658 20074,9925 19423,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="19248" y="9012"/><tspan class="TextPosition" x="19248" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id28">
- <path fill="rgb(255,255,255)" stroke="none" d="M 18121,9925 L 17470,9925 17470,7658 18771,7658 18771,9925 18121,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 18121,9925 L 17470,9925 17470,7658 18771,7658 18771,9925 18121,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="17945" y="9012"/><tspan class="TextPosition" x="17945" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id29">
- <path fill="rgb(255,255,255)" stroke="none" d="M 16820,9925 L 16169,9925 16169,7658 17471,7658 17471,9925 16820,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 16820,9925 L 16169,9925 16169,7658 17471,7658 17471,9925 16820,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="16645" y="9012"/><tspan class="TextPosition" x="16645" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- </g>
- <g class="Group">
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id30">
- <path fill="rgb(255,255,255)" stroke="none" d="M 21158,11430 L 20507,11430 20507,9164 21808,9164 21808,11430 21158,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 21158,11430 L 20507,11430 20507,9164 21808,9164 21808,11430 21158,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="21060" y="10420"/><tspan class="TextPosition" x="21060" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">4</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id31">
- <path fill="rgb(255,255,255)" stroke="none" d="M 25063,11430 L 24412,11430 24412,9164 25714,9164 25714,11430 25063,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 25063,11430 L 24412,11430 24412,9164 25714,9164 25714,11430 25063,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="24966" y="10420"/><tspan class="TextPosition" x="24966" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id32">
- <path fill="rgb(255,255,255)" stroke="none" d="M 23761,11430 L 23110,11430 23110,9164 24411,9164 24411,11430 23761,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 23761,11430 L 23110,11430 23110,9164 24411,9164 24411,11430 23761,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="23663" y="10420"/><tspan class="TextPosition" x="23663" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id33">
- <path fill="rgb(255,255,255)" stroke="none" d="M 22460,11430 L 21809,11430 21809,9164 23111,9164 23111,11430 22460,11430 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 22460,11430 L 21809,11430 21809,9164 23111,9164 23111,11430 22460,11430 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="352px" font-weight="400"><tspan class="TextPosition" x="22363" y="10420"/><tspan class="TextPosition" x="22363" y="10420"><tspan fill="rgb(0,0,0)" stroke="none">3</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id34">
- <path fill="rgb(255,255,255)" stroke="none" d="M 21158,9925 L 20507,9925 20507,7658 21808,7658 21808,9925 21158,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 21158,9925 L 20507,9925 20507,7658 21808,7658 21808,9925 21158,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="20982" y="9012"/><tspan class="TextPosition" x="20982" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id35">
- <path fill="rgb(255,255,255)" stroke="none" d="M 25063,9925 L 24412,9925 24412,7658 25714,7658 25714,9925 25063,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 25063,9925 L 24412,9925 24412,7658 25714,7658 25714,9925 25063,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="24888" y="9012"/><tspan class="TextPosition" x="24888" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id36">
- <path fill="rgb(255,255,255)" stroke="none" d="M 23761,9925 L 23110,9925 23110,7658 24411,7658 24411,9925 23761,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 23761,9925 L 23110,9925 23110,7658 24411,7658 24411,9925 23761,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="23585" y="9012"/><tspan class="TextPosition" x="23585" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id37">
- <path fill="rgb(255,255,255)" stroke="none" d="M 22460,9925 L 21809,9925 21809,7658 23111,7658 23111,9925 22460,9925 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 22460,9925 L 21809,9925 21809,7658 23111,7658 23111,9925 22460,9925 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="22285" y="9012"/><tspan class="TextPosition" x="22285" y="9012"><tspan fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
- </g>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id38">
- <path fill="rgb(255,255,255)" stroke="none" d="M 7575,7092 L 6924,7092 6924,6604 8225,6604 8225,7092 7575,7092 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 7575,7092 L 6924,7092 6924,6604 8225,6604 8225,7092 7575,7092 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="6675" y="7069"/><tspan class="TextPosition" x="6675" y="7069"><tspan fill="rgb(0,0,0)" stroke="none">Byte 2</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id39">
- <path fill="rgb(255,255,255)" stroke="none" d="M 20157,7092 L 19506,7092 19506,6604 20808,6604 20808,7092 20157,7092 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 20157,7092 L 19506,7092 19506,6604 20808,6604 20808,7092 20157,7092 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="19257" y="7069"/><tspan class="TextPosition" x="19257" y="7069"><tspan fill="rgb(0,0,0)" stroke="none">Byte 1</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id40">
- <path fill="none" stroke="rgb(52,101,164)" d="M 2461,11006 C 2466,11261 2672,11510 2874,11506 L 4486,11472 C 4687,11468 4894,11718 4900,11972 4894,11718 5091,11460 5292,11456 L 6904,11422 C 7106,11418 7302,11159 7297,10904"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 2482,12023 L 2482,12023 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 7297,10904 L 7297,10904 Z"/>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id41">
- <path fill="none" stroke="rgb(52,101,164)" d="M 20683,11022 C 20688,11277 20894,11526 21096,11522 L 22708,11488 C 22909,11484 23116,11734 23122,11988 23116,11734 23313,11476 23514,11472 L 25126,11438 C 25328,11434 25524,11175 25519,10920"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 20704,12039 L 20704,12039 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 25519,10920 L 25519,10920 Z"/>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id42">
- <path fill="none" stroke="rgb(52,101,164)" d="M 8101,10921 C 8106,11176 8312,11425 8514,11421 L 10126,11387 C 10327,11383 10534,11633 10540,11887 10534,11633 10731,11375 10932,11371 L 12544,11337 C 12746,11333 12942,11074 12937,10819"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 8122,11938 L 8122,11938 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 12937,10819 L 12937,10819 Z"/>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id43">
- <path fill="rgb(255,255,255)" stroke="none" d="M 17471,13207 L 16820,13207 16820,12038 18121,12038 18121,13207 17471,13207 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 17471,13207 L 16820,13207 16820,12038 18121,12038 18121,13207 17471,13207 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="17157" y="13012"/><tspan class="TextPosition" x="17157" y="13012"><tspan fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id44">
- <path fill="none" stroke="rgb(52,101,164)" d="M 15043,11022 C 15048,11277 15254,11526 15456,11522 L 17068,11488 C 17269,11484 17476,11734 17482,11988 17476,11734 17673,11476 17874,11472 L 19486,11438 C 19688,11434 19884,11175 19879,10920"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 15064,12039 L 15064,12039 Z"/>
- <path fill="none" stroke="rgb(52,101,164)" d="M 19879,10920 L 19879,10920 Z"/>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id45">
- <path fill="rgb(255,255,255)" stroke="none" d="M 23111,13207 L 22460,13207 22460,12038 23761,12038 23761,13207 23111,13207 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 23111,13207 L 22460,13207 22460,12038 23761,12038 23761,13207 23111,13207 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="22797" y="13012"/><tspan class="TextPosition" x="22797" y="13012"><tspan fill="rgb(0,0,0)" stroke="none">4</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id46">
- <path fill="rgb(255,255,255)" stroke="none" d="M 4889,13106 L 4238,13106 4238,11937 5539,11937 5539,13106 4889,13106 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 4889,13106 L 4238,13106 4238,11937 5539,11937 5539,13106 4889,13106 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="4575" y="12911"/><tspan class="TextPosition" x="4575" y="12911"><tspan fill="rgb(0,0,0)" stroke="none">0</tspan></tspan></tspan></text>
- </g>
- </g>
- <g class="com.sun.star.drawing.CustomShape">
- <g id="id47">
- <path fill="rgb(255,255,255)" stroke="none" d="M 10529,13106 L 9878,13106 9878,11937 11179,11937 11179,13106 10529,13106 Z"/>
- <path fill="none" stroke="rgb(255,255,255)" d="M 10529,13106 L 9878,13106 9878,11937 11179,11937 11179,13106 10529,13106 Z"/>
- <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="1128px" font-weight="400"><tspan class="TextPosition" x="10215" y="12911"/><tspan class="TextPosition" x="10215" y="12911"><tspan fill="rgb(0,0,0)" stroke="none">8</tspan></tspan></tspan></text>
- </g>
- </g>
- </g>
- </g>
- </g>
- </g>
- </g>
-</svg>
+<img src="bitOrder.tutorial.drawing01.svg" alt="SVG bitOrder diagram" style="width:50%;height:50%;"/>
</p>
<p>
So at this point it should be clear that there is never any operation needed which flips bits backward or otherwise shuffles bits around. It's all about our interpretation of the bits, and the way we choose to number and look at them.
@@ -594,12 +160,12 @@ style='color:red'>45678 12</span><span style='color:#00B050'>3456</span><span
style='color:#7030A0'>78</span>
Byte Position ----1--- ----2---
Hex 6 2 5 5</pre>
+</div>
<p >As presented here, the bits corresponding to each element
appear left to right, and all bits for an individual element are visually adjacent as you see them.
Within the bits of an individual element the most significant bit is on the
left, least significant on the right. We also put the bytes in order with byte 1 on the left, and byte 2 to the right.</p>
-</div>
<p>
Let's run this example. Here's the schema:
</p>
diff --git a/tutorials/src/main/resources/bugReportTemplate.tdml b/tutorials/src/main/resources/bugReportTemplate.tdml.xml
similarity index 96%
rename from tutorials/src/main/resources/bugReportTemplate.tdml
rename to tutorials/src/main/resources/bugReportTemplate.tdml.xml
index f5c3575..b8c5dd6 100644
--- a/tutorials/src/main/resources/bugReportTemplate.tdml
+++ b/tutorials/src/main/resources/bugReportTemplate.tdml.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="DFDLTutorialStylesheet.xsl"?>
+<?xml-stylesheet type="text/xsl" href="http://daffodil.apache.org/assets/tutorials/DFDLTutorialStylesheet.xsl"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/tutorials/src/main/resources/test1.tutorial.tdml.xml b/tutorials/src/main/resources/exampleTDMLTutorial.tutorial.tdml.xml
similarity index 99%
rename from tutorials/src/main/resources/test1.tutorial.tdml.xml
rename to tutorials/src/main/resources/exampleTDMLTutorial.tutorial.tdml.xml
index 8f57282..0dc814e 100644
--- a/tutorials/src/main/resources/test1.tutorial.tdml.xml
+++ b/tutorials/src/main/resources/exampleTDMLTutorial.tutorial.tdml.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="DFDLTutorialStylesheet.xsl"?>
+<?xml-stylesheet type="text/xsl" href="http://daffodil.apache.org/assets/tutorials/DFDLTutorialStylesheet.xsl"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/tutorials/src/main/resources/tdmlTutorial.tdml.xml b/tutorials/src/main/resources/tdmlTutorial.tdml.xml
index a5e2258..acdfa43 100644
--- a/tutorials/src/main/resources/tdmlTutorial.tdml.xml
+++ b/tutorials/src/main/resources/tdmlTutorial.tdml.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<?xml-stylesheet type="text/xsl" href="DFDLTutorialStylesheet.xsl"?>
+<?xml-stylesheet type="text/xsl" href="http://daffodil.apache.org/assets/tutorials/DFDLTutorialStylesheet.xsl"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
diff --git a/tutorials/src/test/scala/org/apache/daffodil/tutorials/TestTutorials.scala b/tutorials/src/test/scala/org/apache/daffodil/tutorials/TestTutorials.scala
index 5597b56..88bc288 100644
--- a/tutorials/src/test/scala/org/apache/daffodil/tutorials/TestTutorials.scala
+++ b/tutorials/src/test/scala/org/apache/daffodil/tutorials/TestTutorials.scala
@@ -23,15 +23,13 @@ import org.junit.AfterClass
object TestTutorials {
val runner1 = Runner("/", "bitorder.tutorial.tdml.xml")
- val runner2 = Runner("/", "test1.tutorial.tdml.xml")
- val runner3 = Runner("/", "testTDMLTutorialFile2.tutorial.tdml.xml")
+ val runner2 = Runner("/", "exampleTDMLTutorial.tutorial.tdml.xml")
val runner4 = Runner("/", "tdmlTutorial.tdml.xml")
- val runner5 = Runner("/", "bugReportTemplate.tdml")
+ val runner5 = Runner("/", "bugReportTemplate.tdml.xml")
@AfterClass def shutDown {
runner1.reset
runner2.reset
- runner3.reset
runner4.reset
runner5.reset
}