Commits

petermr  committed da3f650 Draft

fixed failing tests

  • Participants
  • Parent commits 5c76b53

Comments (0)

Files changed (7)

File src/main/java/org/xmlcml/svgplus/action/DocumentIteratorActionX.java

 				outdir = (infile.isDirectory()) ? infile : infile.getParentFile();
 			}
 		} else {
+			outfile.mkdirs();
 			outdir = (outfile.isDirectory()) ? outfile : outfile.getParentFile();
 		}
 	}

File src/main/java/org/xmlcml/svgplus/analyzer/WhitespaceChunkerAnalyzerX.java

 import nu.xom.Attribute;
 
 import org.apache.log4j.Logger;
+import org.xmlcml.cml.base.CMLUtil;
 import org.xmlcml.graphics.svg.SVGElement;
 import org.xmlcml.graphics.svg.SVGUtil;
 import org.xmlcml.svgplus.action.SemanticDocumentActionX;
 				subSubSubChunkList.addAll(cc);
 			}
 		}
+		topChunk.debug("TOP");
 		removeEmptyChunks(topChunk);
 		return subSubSubChunkList;
 	}

File src/test/resources/org/xmlcml/svgplus/action/chunkAnalyzeTst.xml

 <semanticDocument xmlns="http://www.xml-cml.org/schema/ami2">
-  <documentIterator filename="src/test/resources/org/xmlcml/svgplus/action/pdf/policies.pdf" outfile="target/chunkAnalyzer">
+  <documentIterator filename="src/test/resources/org/xmlcml/svgplus/action/pdf/policies.pdf">
     <pageIterator>
-      <assert name="d.outputDir" value="target/chunkAnalyzer" fail="true"/>
       <variable name="p.root" value="${d.outputDir}/whitespace_${p.page}" type="file"/>
-      <assert name="p.root" value="target/chunkAnalyzer/whitespace_1" fail="true"/>
       <whitespaceChunker depth="3" />
-      <pageWriter filename="target/chunked.svg" />
+      <pageWriter filename="${p.root}_start.svg" />
       <chunkAnalyzer/>
       <pageWriter filename="${p.root}_end.svg" />
     </pageIterator>

File src/test/resources/org/xmlcml/svgplus/action/chunkAnalyzeTst0.xml

 <semanticDocument xmlns="http://www.xml-cml.org/schema/ami2">
-  <documentIterator filename="src/test/resources/org/xmlcml/svgplus/action/pdf/twoChunks.pdf" outfile="target/chunkAnalyzer">
+  <documentIterator filename="src/test/resources/org/xmlcml/svgplus/action/pdf/twoChunks.pdf" outfile="target/chunkAnalyzer/">
     <pageIterator>
       <assert name="d.outputDir" value="target/chunkAnalyzer" fail="true"/>
       <variable name="p.root" value="${d.outputDir}/whitespace_${p.page}" type="file"/>

File src/test/resources/org/xmlcml/svgplus/action/pdf/twoChunks.docx

Binary file modified.

File src/test/resources/org/xmlcml/svgplus/action/pdf/twoChunks.pdf

Binary file modified.

File twochunks-page1.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="600.0" height="800.0" stroke="none" stroke-width="0.0" xmlns="http://www.w3.org/2000/svg" xmlns:svgx="http://www.xml-cml.org/schema/svgx">
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="487.0" x="72.024" y="81.52" font-size="11.04">T</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="77.424" y="81.52" font-size="11.04">h</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="230.0" x="83.187" y="81.52" font-size="11.04">i</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="391.0" x="85.726" y="81.52" font-size="11.04">s</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="90.043" y="81.52" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="230.0" x="92.544" y="81.52" font-size="11.04">i</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="391.0" x="95.083" y="81.52" font-size="11.04">s</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="99.4" y="81.52" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="101.895" y="81.52" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="106.565" y="81.52" font-size="11.04">h</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="112.361" y="81.52" font-size="11.04">u</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="118.102" y="81.52" font-size="11.04">n</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="455.0" x="123.864" y="81.52" font-size="11.04">k</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="507.0" x="128.788" y="81.52" font-size="11.04">0</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="134.3" y="81.52" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="487.0" x="72.024" y="106.86" font-size="11.04">T</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="77.4" y="106.86" font-size="11.04">h</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="230.0" x="83.196" y="106.86" font-size="11.04">i</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="391.0" x="85.736" y="106.86" font-size="11.04">s</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="90.052" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="230.0" x="92.547" y="106.86" font-size="11.04">i</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="391.0" x="95.087" y="106.86" font-size="11.04">s</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="99.403" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="101.898" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="106.568" y="106.86" font-size="11.04">h</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="112.364" y="106.86" font-size="11.04">u</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="118.105" y="106.86" font-size="11.04">n</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="455.0" x="123.868" y="106.86" font-size="11.04">k</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="507.0" x="128.792" y="106.86" font-size="11.04">1</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="252.0" x="134.422" y="106.86" font-size="11.04">.</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="137.204" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="142.492" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="147.747" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="153.036" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="158.324" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="163.612" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="168.9" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="174.144" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="179.432" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="184.72" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="189.865" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="479.0" x="195.153" y="106.86" font-size="11.04">a</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="200.441" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="202.936" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="208.732" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="214.462" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="220.225" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="225.988" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="231.751" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="237.514" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="243.276" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="249.039" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="254.802" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="260.565" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="266.438" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="272.201" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="277.964" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="283.727" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="289.49" y="106.86" font-size="11.04">b</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="295.253" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="297.748" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="302.44" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="307.11" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="311.78" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="316.45" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="321.153" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="325.823" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="330.492" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="335.162" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="339.755" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="344.47" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="349.14" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="353.81" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="358.391" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="363.061" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="367.731" y="106.86" font-size="11.04">c</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="372.401" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="374.94" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="380.703" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="386.466" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="392.229" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="397.992" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="403.75" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="409.513" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="415.276" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="421.039" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="426.802" y="106.86" font-size="11.04">d</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="432.564" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="435.059" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="440.59" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="446.088" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="451.509" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="457.007" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="462.428" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="467.926" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="473.457" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="478.855" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="484.353" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="489.774" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="498.0" x="495.272" y="106.86" font-size="11.04">e</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="500.803" y="106.86" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="72.024" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="75.384" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="78.744" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="82.104" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="85.464" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="88.824" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="92.184" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="95.544" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="98.904" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="102.264" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="105.624" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="108.984" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="112.344" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="115.704" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="305.0" x="119.064" y="122.46" font-size="11.04">f</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="122.424" y="122.46" font-size="11.04"> </text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="124.912" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="130.104" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="135.264" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="140.457" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="145.583" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="150.776" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="155.902" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="161.095" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="166.221" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="171.38" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="176.536" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="181.691" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="186.847" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="192.113" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="197.269" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="202.425" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="207.58" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="212.736" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="217.892" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="223.047" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="228.203" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="233.359" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="238.625" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="243.78" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="248.936" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="254.092" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="259.247" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="264.403" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="269.559" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="274.825" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="279.981" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="285.136" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="290.292" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="295.448" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="300.603" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="305.759" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="311.025" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="316.181" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="321.336" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="471.0" x="326.492" y="122.46" font-size="11.04">g</text>
- <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="331.99" y="122.46" font-size="11.04"> </text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="72.024" y="81.52" font-size="11.04">c</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="76.694" y="81.52" font-size="11.04">h</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="82.49" y="81.52" font-size="11.04">u</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="88.22" y="81.52" font-size="11.04">n</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="455.0" x="93.983" y="81.52" font-size="11.04">k</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="507.0" x="99.006" y="81.52" font-size="11.04">0</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="104.54" y="81.52" font-size="11.04"> </text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="423.0" x="72.024" y="106.98" font-size="11.04">c</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="76.694" y="106.98" font-size="11.04">h</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="82.49" y="106.98" font-size="11.04">u</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="525.0" x="88.22" y="106.98" font-size="11.04">n</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="455.0" x="93.983" y="106.98" font-size="11.04">k</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="507.0" x="99.006" y="106.98" font-size="11.04">1</text>
+ <text clip-path="url(#clipPath1)" stroke="#000000" font-family="Calibri" svgx:fontName="ABCDEE+Calibri" svgx:width="226.0" x="104.54" y="106.98" font-size="11.04"> </text>
  <defs id="defs1">
   <clipPath id="clipPath1">
    <path stroke="black" stroke-width="0.5" fill="none" d="M0.0 0.0 L595.0 0.0 L595.0 841.0 L0.0 841.0 L0.0 0.0 Z"/>