Mercurial > hg > syncopation-dataset
changeset 54:0dd1b89b5943
updating images and framework tex
author | christopherh <christopher.harte@eecs.qmul.ac.uk> |
---|---|
date | Mon, 27 Apr 2015 11:20:52 +0100 |
parents | 101e930b4cd3 |
children | 093ad287e130 |
files | SMC2015latex/definitions.tex SMC2015latex/images/general3.pdf SMC2015latex/images/general3.svg SMC2015latex/images/meter_hierarchy7.pdf SMC2015latex/images/meter_hierarchy7.svg SMC2015latex/section/framework.tex SMC2015latex/syncopation_toolkit.tex |
diffstat | 7 files changed, 346 insertions(+), 1077 deletions(-) [+] |
line wrap: on
line diff
--- a/SMC2015latex/definitions.tex Mon Apr 27 10:00:26 2015 +0100 +++ b/SMC2015latex/definitions.tex Mon Apr 27 11:20:52 2015 +0100 @@ -1,6 +1,6 @@ %\usepackage{algorithmic} %\usepackage{algpseudocode} -\usepackage{epsfig} % This package allows encapsulated postscript +%\usepackage{epsfig} % This package allows encapsulated postscript %\usepackage{subfigure} % This package allows subfigures \usepackage{amsmath} \usepackage{amssymb}
--- a/SMC2015latex/images/general3.svg Mon Apr 27 10:00:26 2015 +0100 +++ b/SMC2015latex/images/general3.svg Mon Apr 27 11:20:52 2015 +0100 @@ -22,16 +22,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.4142136" - inkscape:cx="358.17918" - inkscape:cy="453.39826" + inkscape:zoom="2.8284272" + inkscape:cx="318.15763" + inkscape:cy="399.10381" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1440" - inkscape:window-height="770" + inkscape:window-height="776" inkscape:window-x="0" - inkscape:window-y="22" + inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" /> @@ -446,14 +446,15 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> <g - inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1"> + id="layer2" + inkscape:label="Layer" + sodipodi:insensitive="true"> <rect style="fill:#ffffff;fill-opacity:1;stroke:none" id="rect4244" @@ -461,6 +462,11 @@ height="79.17157" x="153.65686" y="606.19061" /> + </g> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> <text xml:space="preserve" style="font-size:20.3653965px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:WinSongTTF;-inkscape-font-specification:WinSongTTF" @@ -610,7 +616,7 @@ sodipodi:role="line" /></text> <text xml:space="preserve" - style="font-size:3.11747265px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="212.1713" y="616.55035" id="text4429-6" @@ -619,7 +625,7 @@ id="tspan4431-8" x="212.1713" y="616.55035" - style="font-size:4.05666971px;font-style:normal;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">s</tspan></text> + style="font-size:6px;font-style:normal;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">s</tspan></text> <text xml:space="preserve" style="font-size:5.7280426px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" @@ -887,264 +893,251 @@ id="tspan3137-8" sodipodi:role="line" /></text> </g> + <text + sodipodi:linespacing="125%" + id="text5292" + y="616.55035" + x="292.77206" + style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-size:6px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" + y="616.55035" + x="292.77206" + id="tspan5294" + sodipodi:role="line">d</tspan></text> + <text + sodipodi:linespacing="125%" + id="text5296" + y="616.0932" + x="290.27625" + style="font-size:5.7280426px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-size:8.11333942px;font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10" + y="616.0932" + x="290.27625" + id="tspan5298" + sodipodi:role="line">t</tspan></text> <g - id="g4102" - transform="matrix(0.79000265,0,0,0.79000265,33.023468,132.72964)"> + style="fill:#000080" + transform="matrix(1.9916472,0,0,1.9916472,-186.14365,-656.1151)" + id="g5300"> <text xml:space="preserve" - style="font-size:3.94615483px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="328.79459" - y="612.4292" - id="text5292" + style="font-size:7.06003046px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="235.44333" + y="640.53943" + id="text5302" sodipodi:linespacing="125%"><tspan sodipodi:role="line" - id="tspan5294" - x="328.79459" - y="612.4292" - style="font-size:5.13500786px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">d</tspan></text> + id="tspan5304" + x="235.44333" + y="640.53943" + style="font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10">y</tspan></text> + <text + sodipodi:linespacing="125%" + id="text5306" + y="641.25629" + x="249.75513" + style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" + y="641.25629" + x="249.75513" + id="tspan5308" + sodipodi:role="line" /></text> + </g> + <g + id="g5310" + transform="matrix(1.9916472,0,0,1.9916472,-180.3234,-656.1151)" + style="fill:#000080"> + <text + sodipodi:linespacing="125%" + id="text5312" + y="641.58972" + x="236.18245" + style="font-size:4.35891438px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-size:3.46183419px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" + y="641.58972" + x="236.18245" + id="tspan5314" + sodipodi:role="line">0</tspan></text> <text xml:space="preserve" - style="font-size:7.25066233px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="325.63535" - y="611.85059" - id="text5296" + style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="249.75513" + y="641.25629" + id="text5316" sodipodi:linespacing="125%"><tspan sodipodi:role="line" - id="tspan5298" - x="325.63535" - y="611.85059" - style="font-size:10.27001572px;font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10">t</tspan></text> - <g - id="g5300" - transform="matrix(2.5210639,0,0,2.5210639,-277.4258,-998.53429)" - style="fill:#000080"> - <text - sodipodi:linespacing="125%" - id="text5302" + id="tspan5318" + x="249.75513" + y="641.25629" + style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" /></text> + </g> + <text + sodipodi:linespacing="125%" + id="text4339" + y="640.29504" + x="293.38904" + style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-size:6px;font-style:normal;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" + y="640.29504" + x="293.38904" + id="tspan4341" + sodipodi:role="line">s</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4343" + y="639.83795" + x="290.89319" + style="font-size:5.7280426px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-size:8.11333942px;font-style:normal;fill:#800000;fill-opacity:1;font-family:cmmi10;-inkscape-font-specification:cmmi10" + y="639.83795" + x="290.89319" + id="tspan4345" + sodipodi:role="line">t</tspan></text> + <g + style="fill:#800000;fill-opacity:1" + transform="matrix(1.9916472,0,0,1.9916472,-185.52666,-632.37034)" + id="g4347"> + <text + xml:space="preserve" + style="font-size:7.06003046px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="235.44333" + y="640.53943" + id="text4349" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4351" + x="235.44333" + y="640.53943" + style="font-style:normal;fill:#800000;fill-opacity:1;font-family:cmmi10;-inkscape-font-specification:cmmi10">y</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4353" + y="641.25629" + x="249.75513" + style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-style:italic;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" + y="641.25629" + x="249.75513" + id="tspan4355" + sodipodi:role="line" /></text> + </g> + <g + id="g4357" + transform="matrix(1.9916472,0,0,1.9916472,-179.70641,-632.37034)" + style="fill:#800000;fill-opacity:1"> + <text + sodipodi:linespacing="125%" + id="text4359" + y="641.58972" + x="236.18245" + style="font-size:4.35891438px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-size:3.46183419px;font-style:normal;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" + y="641.58972" + x="236.18245" + id="tspan4361" + sodipodi:role="line">1</tspan></text> + <text + xml:space="preserve" + style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="249.75513" + y="641.25629" + id="text4363" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4365" + x="249.75513" + y="641.25629" + style="font-style:italic;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" /></text> + </g> + <text + xml:space="preserve" + style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="359.65128" + y="640.29504" + id="text4367" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4369" + x="359.65128" + y="640.29504" + style="font-size:6px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">d</tspan></text> + <text + xml:space="preserve" + style="font-size:5.7280426px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="357.15543" + y="639.83795" + id="text4371" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4373" + x="357.15543" + y="639.83795" + style="font-size:8.11333942px;font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10">t</tspan></text> + <g + id="g4375" + transform="matrix(1.9916472,0,0,1.9916472,-119.26446,-632.37034)" + style="fill:#000080;stroke-width:0.19832897;stroke-miterlimit:4;stroke-dasharray:0.5949869, 0.5949869;stroke-dashoffset:0"> + <text + sodipodi:linespacing="125%" + id="text4377" + y="640.53943" + x="235.44333" + style="font-size:7.06003046px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10" y="640.53943" x="235.44333" - style="font-size:7.06003046px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="640.53943" - x="235.44333" - id="tspan5304" - sodipodi:role="line">y</tspan></text> - <text - xml:space="preserve" - style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + id="tspan4379" + sodipodi:role="line">y</tspan></text> + <text + xml:space="preserve" + style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="249.75513" + y="641.25629" + id="text4381" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4383" x="249.75513" y="641.25629" - id="text5306" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan5308" - x="249.75513" - y="641.25629" - style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" /></text> - </g> - <g - style="fill:#000080" - transform="matrix(2.5210639,0,0,2.5210639,-270.05842,-998.53429)" - id="g5310"> - <text - xml:space="preserve" - style="font-size:4.35891438px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" /></text> + </g> + <g + style="fill:#000080;stroke-width:0.19832897;stroke-miterlimit:4;stroke-dasharray:0.5949869, 0.5949869;stroke-dashoffset:0" + transform="matrix(1.9916472,0,0,1.9916472,-113.44421,-632.37034)" + id="g4385"> + <text + xml:space="preserve" + style="font-size:4.35891438px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="236.18245" + y="641.58972" + id="text4387" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4389" x="236.18245" y="641.58972" - id="text5312" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan5314" - x="236.18245" - y="641.58972" - style="font-size:3.46183419px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">0</tspan></text> - <text - sodipodi:linespacing="125%" - id="text5316" + style="font-size:3.46183419px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">1</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4391" + y="641.25629" + x="249.75513" + style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" y="641.25629" x="249.75513" - style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - y="641.25629" - x="249.75513" - id="tspan5318" - sodipodi:role="line" /></text> - </g> - </g> - <g - id="g4118" - transform="matrix(0.79000265,0,0,0.79000265,33.843718,129.54412)"> - <text - xml:space="preserve" - style="font-size:3.94615483px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="328.53726" - y="646.51801" - id="text4339" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4341" - x="328.53726" - y="646.51801" - style="font-size:5.13500786px;font-style:normal;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">s</tspan></text> - <text - xml:space="preserve" - style="font-size:7.25066233px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="325.37799" - y="645.93939" - id="text4343" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4345" - x="325.37799" - y="645.93939" - style="font-size:10.27001572px;font-style:normal;fill:#800000;fill-opacity:1;font-family:cmmi10;-inkscape-font-specification:cmmi10">t</tspan></text> - <g - id="g4347" - transform="matrix(2.5210639,0,0,2.5210639,-277.68309,-964.44545)" - style="fill:#800000;fill-opacity:1"> - <text - sodipodi:linespacing="125%" - id="text4349" - y="640.53943" - x="235.44333" - style="font-size:7.06003046px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-style:normal;fill:#800000;fill-opacity:1;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="640.53943" - x="235.44333" - id="tspan4351" - sodipodi:role="line">y</tspan></text> - <text - xml:space="preserve" - style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="249.75513" - y="641.25629" - id="text4353" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4355" - x="249.75513" - y="641.25629" - style="font-style:italic;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" /></text> - </g> - <g - style="fill:#800000;fill-opacity:1" - transform="matrix(2.5210639,0,0,2.5210639,-270.31571,-964.44545)" - id="g4357"> - <text - xml:space="preserve" - style="font-size:4.35891438px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="236.18245" - y="641.58972" - id="text4359" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4361" - x="236.18245" - y="641.58972" - style="font-size:3.46183419px;font-style:normal;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">1</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4363" - y="641.25629" - x="249.75513" - style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-style:italic;fill:#800000;fill-opacity:1;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - y="641.25629" - x="249.75513" - id="tspan4365" - sodipodi:role="line" /></text> - </g> - </g> - <g - id="g4134" - transform="matrix(0.79000265,0,0,0.79000265,22.399099,129.54412)" - style="stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:1.5, 1.5;stroke-dashoffset:0"> - <text - sodipodi:linespacing="125%" - id="text4367" - y="646.51801" - x="426.90005" - style="font-size:3.94615483px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-size:5.13500786px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - y="646.51801" - x="426.90005" - id="tspan4369" - sodipodi:role="line">d</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4371" - y="645.93939" - x="423.74078" - style="font-size:7.25066233px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-size:10.27001572px;font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="645.93939" - x="423.74078" - id="tspan4373" - sodipodi:role="line">t</tspan></text> - <g - style="fill:#000080;stroke-width:0.19832897;stroke-miterlimit:4;stroke-dasharray:0.5949869, 0.5949869;stroke-dashoffset:0" - transform="matrix(2.5210639,0,0,2.5210639,-179.32036,-964.44545)" - id="g4375"> - <text - xml:space="preserve" - style="font-size:7.06003046px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="235.44333" - y="640.53943" - id="text4377" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4379" - x="235.44333" - y="640.53943" - style="font-style:normal;fill:#000080;font-family:cmmi10;-inkscape-font-specification:cmmi10">y</tspan></text> - <text - sodipodi:linespacing="125%" - id="text4381" - y="641.25629" - x="249.75513" - style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - y="641.25629" - x="249.75513" - id="tspan4383" - sodipodi:role="line" /></text> - </g> - <g - id="g4385" - transform="matrix(2.5210639,0,0,2.5210639,-171.95298,-964.44545)" - style="fill:#000080;stroke-width:0.19832897;stroke-miterlimit:4;stroke-dasharray:0.5949869, 0.5949869;stroke-dashoffset:0"> - <text - sodipodi:linespacing="125%" - id="text4387" - y="641.58972" - x="236.18245" - style="font-size:4.35891438px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve"><tspan - style="font-size:3.46183419px;font-style:normal;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - y="641.58972" - x="236.18245" - id="tspan4389" - sodipodi:role="line">1</tspan></text> - <text - xml:space="preserve" - style="font-size:2.68604851px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - x="249.75513" - y="641.25629" - id="text4391" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4393" - x="249.75513" - y="641.25629" - style="font-style:italic;fill:#000080;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" /></text> - </g> + id="tspan4393" + sodipodi:role="line" /></text> </g> <path style="fill:#000000;stroke:#000000;stroke-width:1.31799996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
--- a/SMC2015latex/images/meter_hierarchy7.svg Mon Apr 27 10:00:26 2015 +0100 +++ b/SMC2015latex/images/meter_hierarchy7.svg Mon Apr 27 11:20:52 2015 +0100 @@ -10,7 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="319.28561" - height="423.83514" + height="289.48486" id="svg2" version="1.1" inkscape:version="0.48.2 r9819" @@ -23,8 +23,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4142136" - inkscape:cx="285.18616" - inkscape:cy="492.97279" + inkscape:cx="225.68797" + inkscape:cy="228.87771" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -50,11 +50,11 @@ type="xygrid" /> <sodipodi:guide orientation="1,0" - position="166.5,366" + position="166.5,227.02672" id="guide5244" /> <sodipodi:guide orientation="1,0" - position="269.40768,166.8772" + position="269.40768,27.903918" id="guide5246" /> </sodipodi:namedview> <defs @@ -172,12 +172,12 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> <g - transform="translate(-91.247124,-93.97184)" + transform="translate(-91.247124,-89.348839)" id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1"> @@ -185,70 +185,40 @@ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect15063" width="319.28561" - height="429.492" + height="289.48486" x="91.247124" y="89.348839" /> <path inkscape:connector-curvature="0" id="path14341" - d="m 318.78936,440.2386 -0.0805,27.00965" + d="m 318.78936,294.57461 -0.0805,27.00965" style="fill:none;stroke:#800000;stroke-width:1.2674762;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> <path sodipodi:nodetypes="cc" style="fill:none;stroke:#800000;stroke-width:1.2674762;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 325.50029,440.2386 32.19592,27.00965" + d="m 325.50029,294.57461 32.19592,27.00965" id="path14343" inkscape:connector-curvature="0" /> <path inkscape:connector-curvature="0" id="path14345" - d="m 312.55907,440.2386 -32.19594,27.00965" + d="m 312.55907,294.57461 -32.19594,27.00965" style="fill:none;stroke:#800000;stroke-width:1.2674762;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> <path sodipodi:nodetypes="cc" style="fill:none;stroke:#800000;stroke-width:1.26987612;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 193.67611,440.2386 -0.0807,27.00965" + d="m 193.67611,294.57461 -0.0807,27.00965" id="path14339" inkscape:connector-curvature="0" /> <path inkscape:connector-curvature="0" id="path14337" - d="m 200.63764,440.2386 32.31797,27.00965" + d="m 200.63764,294.57461 32.31797,27.00965" style="fill:none;stroke:#800000;stroke-width:1.26987612;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> <path - sodipodi:nodetypes="cc" - style="fill:none;stroke:#800000;stroke-width:1.32583654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 341.56962,294.52408 19.97284,27.00965" - id="path14116" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path14118" - d="M 338.05825,294.52408 318.0854,321.53373" - style="fill:none;stroke:#800000;stroke-width:1.32583654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path14112" - d="m 258.98087,294.52408 19.97284,27.00965" - style="fill:none;stroke:#800000;stroke-width:1.32583654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - style="fill:none;stroke:#800000;stroke-width:1.32583654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 255.46949,294.52408 -19.97284,27.00965" - id="path14114" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="cc" - style="fill:none;stroke:#800000;stroke-width:1.32583654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 175.58336,294.52408 19.97284,27.00965" - id="path14080" - inkscape:connector-curvature="0" /> - <path inkscape:connector-curvature="0" id="path13599" d="m 309.24884,154.03645 -20.57192,22.64048" @@ -329,166 +299,7 @@ y="464.50504" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara id="flowPara4827-2" - style="font-size:16px">root</flowPara></flowRoot> <path - sodipodi:nodetypes="cc" - style="fill:none;stroke:#800000;stroke-width:1.31679344;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 258.43389,245.707 -80.07161,37.25165" - id="path4110" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path4112" - d="m 258.05158,245.707 80.07162,37.25165" - style="fill:none;stroke:#800000;stroke-width:1.31679344;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path4114" - d="m 172.07198,294.52408 -19.97284,27.00965" - style="fill:none;stroke:#800000;stroke-width:1.32583654;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cc" /> - <flowRoot - transform="matrix(0.56758162,0,0,0.56758162,182.53748,-24.073927)" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot4122" - xml:space="preserve"><flowRegion - id="flowRegion4124"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4126" /></flowRegion><flowPara - style="font-size:16px" - id="flowPara4128">root</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4130" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,90.384642,17.641103)"><flowRegion - id="flowRegion4132"><rect - id="rect4134" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara4136" - style="font-size:16px">strong</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4138" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,218.47561,72.848043)" - inkscape:transform-center-x="62.289279"><flowRegion - id="flowRegion4140"><rect - id="rect4142" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara4144" - style="font-size:16px">weak</flowPara></flowRoot> <flowRoot - inkscape:transform-center-x="62.289276" - transform="matrix(0.56758162,0,0,0.56758162,178.68295,17.641103)" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot4146" - xml:space="preserve"><flowRegion - id="flowRegion4148"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4150" /></flowRegion><flowPara - style="font-size:16px" - id="flowPara4152">weak</flowPara></flowRoot> <flowRoot - transform="matrix(0.56758162,0,0,0.56758162,91.702154,72.848043)" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot4154" - xml:space="preserve"><flowRegion - id="flowRegion4156"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4158" /></flowRegion><flowPara - style="font-size:16px" - id="flowPara4160">strong</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4162" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,135.20007,72.848043)" - inkscape:transform-center-x="62.289267"><flowRegion - id="flowRegion4164"><rect - id="rect4166" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara4168" - style="font-size:16px">weak</flowPara></flowRoot> <flowRoot - transform="matrix(0.56758162,0,0,0.56758162,174.97768,72.848043)" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot4170" - xml:space="preserve"><flowRegion - id="flowRegion4172"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4174" /></flowRegion><flowPara - style="font-size:16px" - id="flowPara4176">strong</flowPara></flowRoot> <flowRoot - inkscape:transform-center-x="62.289267" - transform="matrix(0.56758162,0,0,0.56758162,301.75114,72.848043)" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot4250" - xml:space="preserve"><flowRegion - id="flowRegion4252"><rect - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4254" /></flowRegion><flowPara - style="font-size:16px" - id="flowPara4256">weak</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4258" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,258.6473,17.641103)" - inkscape:transform-center-x="62.289273"><flowRegion - id="flowRegion4260"><rect - id="rect4262" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara4264" - style="font-size:16px">weak</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4266" - style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,258.25322,72.848043)"><flowRegion - id="flowRegion4268"><rect - id="rect4270" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara4272" - style="font-size:16px">strong</flowPara></flowRoot> <path - sodipodi:nodetypes="cc" - style="fill:none;stroke:#800000;stroke-width:1.31679344;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 258.05158,245.707 -0.18411,37.25165" - id="path4274" - inkscape:connector-curvature="0" /> - <flowRoot + style="font-size:16px">root</flowPara></flowRoot> <flowRoot xml:space="preserve" id="flowRoot4609-0" style="font-size:14.02638626px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" @@ -514,20 +325,7 @@ width="137.14285" id="rect4618" /></flowRegion><flowPara style="font-size:14.02638626px;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara4620">(b)</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4622" - style="font-size:14.02638626px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.8555304,0,0,0.8555304,175.99823,101.87462)"><flowRegion - id="flowRegion4624"><rect - id="rect4626" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:14.02638626px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara4628" - style="font-size:14.02638626px;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">(c)</flowPara></flowRoot> <text + id="flowPara4620">(b)</flowPara></flowRoot> <text xml:space="preserve" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="53.285545" @@ -547,7 +345,7 @@ sodipodi:cy="44.396919" sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" transform="matrix(1.3564067,0,0,1.3564067,20.012634,43.854443)" /> <path sodipodi:type="arc" @@ -557,11 +355,11 @@ sodipodi:cy="44.396919" sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" transform="matrix(1.3564067,0,0,1.3564067,-31.77308,86.890153)" /> <path transform="matrix(1.3564067,0,0,1.3564067,76.798349,86.890153)" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" sodipodi:cy="44.396919" @@ -571,7 +369,7 @@ sodipodi:type="arc" /> <path transform="matrix(1.3564067,0,0,1.3564067,-61.058795,122.96158)" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" sodipodi:cy="44.396919" @@ -587,11 +385,11 @@ sodipodi:cy="44.396919" sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" transform="matrix(1.3564067,0,0,1.3564067,47.512634,122.96158)" /> <path transform="matrix(1.3564067,0,0,1.3564067,-4.8087937,122.96158)" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" sodipodi:cy="44.396919" @@ -607,7 +405,7 @@ sodipodi:cy="44.396919" sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" transform="matrix(1.3564067,0,0,1.3564067,107.33407,122.96158)" /> <flowRoot xml:space="preserve" @@ -771,63 +569,10 @@ inkscape:original-d="m 110.91713,99.495933 0,88.675407" inkscape:connector-curvature="0" /> <flowRoot - transform="matrix(0.86212912,0,0,0.86212912,43.349386,-158.1834)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot13848" - xml:space="preserve"><flowRegion - id="flowRegion13850"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect13852" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - id="flowPara13854">0</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-33.881654" - xml:space="preserve" - id="flowRoot13856" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.86212912,0,0,0.86212912,43.349386,-118.62158)"><flowRegion - id="flowRegion13858"><rect - id="rect13860" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara - id="flowPara13862" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial"><flowSpan - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - id="flowSpan13864">1</flowSpan></flowPara></flowRoot> <flowRoot - transform="matrix(0.86212912,0,0,0.86212912,43.349386,-79.123559)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot13866" - xml:space="preserve" - inkscape:transform-center-y="-33.881659"><flowRegion - id="flowRegion13868"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect13870" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - id="flowPara13872"><flowSpan - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - id="flowSpan13874">2</flowSpan></flowPara></flowRoot> <path - inkscape:connector-curvature="0" - inkscape:original-d="m 110.91713,244.82153 0,88.67541" - inkscape:path-effect="#path-effect13886" - id="path13884" - d="m 110.91713,244.82153 0,88.67541" - style="fill:none;stroke:#676767;stroke-width:1.04543769;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#TriangleOutMc)" - sodipodi:nodetypes="cc" /> - <flowRoot xml:space="preserve" id="flowRoot13888" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.86212912,0,0,0.86212912,43.349386,-14.776587)"><flowRegion + transform="matrix(0.86212912,0,0,0.86212912,43.349386,-160.44058)"><flowRegion id="flowRegion13890"><rect id="rect13892" width="137.14285" @@ -837,7 +582,7 @@ style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara id="flowPara13894" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial">0</flowPara></flowRoot> <flowRoot - transform="matrix(0.86212912,0,0,0.86212912,43.349386,24.785243)" + transform="matrix(0.86212912,0,0,0.86212912,43.349386,-120.87875)" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="flowRoot13896" xml:space="preserve" @@ -857,7 +602,7 @@ xml:space="preserve" id="flowRoot13906" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.86212912,0,0,0.86212912,43.349386,64.283263)"><flowRegion + transform="matrix(0.86212912,0,0,0.86212912,43.349386,-81.38073)"><flowRegion id="flowRegion13908"><rect id="rect13910" width="137.14285" @@ -871,134 +616,34 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial">2</flowSpan></flowPara></flowRoot> <path sodipodi:nodetypes="cc" style="fill:none;stroke:#676767;stroke-width:1.04543769;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#TriangleOutMc)" - d="m 110.91713,388.22836 0,88.67541" + d="m 110.91713,242.56437 0,88.67541" id="path13924" inkscape:path-effect="#path-effect13926" - inkscape:original-d="m 110.91713,388.22836 0,88.67541" + inkscape:original-d="m 110.91713,242.56437 0,88.67541" inkscape:connector-curvature="0" /> <path - sodipodi:type="arc" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path13420-6-9" - sodipodi:cx="175.26785" - sodipodi:cy="44.396919" - sodipodi:rx="6.3392859" - sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,20.31249,186.78983)" /> - <path - transform="matrix(1.3564067,0,0,1.3564067,-63.107242,228.46574)" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - sodipodi:ry="6.3392859" - sodipodi:rx="6.3392859" - sodipodi:cy="44.396919" - sodipodi:cx="175.26785" - id="path13577-2" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path13587-9" - sodipodi:cx="175.26785" - sodipodi:cy="44.396919" - sodipodi:rx="6.3392859" - sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,101.89276,228.46574)" /> - <path - transform="matrix(1.3564067,0,0,1.3564067,20.285627,228.46574)" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - sodipodi:ry="6.3392859" - sodipodi:rx="6.3392859" - sodipodi:cy="44.396919" - sodipodi:cx="175.26785" - id="path13603-8" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path14018" - sodipodi:cx="175.26785" - sodipodi:cy="44.396919" - sodipodi:rx="6.3392859" - sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,-85.428671,267.93003)" /> - <path - transform="matrix(1.3564067,0,0,1.3564067,81.57133,267.93003)" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - sodipodi:ry="6.3392859" - sodipodi:rx="6.3392859" - sodipodi:cy="44.396919" - sodipodi:cx="175.26785" - id="path14028" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path14038" - sodipodi:cx="175.26785" - sodipodi:cy="44.396919" - sodipodi:rx="6.3392859" - sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,-1.928673,267.93003)" /> - <path - transform="matrix(1.3564067,0,0,1.3564067,-43.678668,267.93003)" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - sodipodi:ry="6.3392859" - sodipodi:rx="6.3392859" - sodipodi:cy="44.396919" - sodipodi:cx="175.26785" - id="path14082" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path14092" - sodipodi:cx="175.26785" - sodipodi:cy="44.396919" - sodipodi:rx="6.3392859" - sodipodi:ry="6.3392859" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,123.32133,267.93003)" /> - <path - transform="matrix(1.3564067,0,0,1.3564067,39.82133,267.93003)" - d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - sodipodi:ry="6.3392859" - sodipodi:rx="6.3392859" - sodipodi:cy="44.396919" - sodipodi:cx="175.26785" - id="path14102" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - sodipodi:type="arc" /> - <path inkscape:connector-curvature="0" id="path14149" - d="m 256.3251,392.12863 -59.13015,35.83744" + d="m 256.3251,246.46464 -59.13015,35.83744" style="fill:none;stroke:#800000;stroke-width:1.36404502;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="cc" /> <path sodipodi:nodetypes="cc" style="fill:none;stroke:#800000;stroke-width:1.36404502;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 256.04447,390.71441 58.77665,37.25165" + d="m 256.04447,245.05042 58.77665,37.25165" id="path14151" inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="cc" style="fill:none;stroke:#800000;stroke-width:1.26987612;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 186.66459,440.2386 -32.31798,27.00965" + d="m 186.66459,294.57461 -32.31798,27.00965" id="path14153" inkscape:connector-curvature="0" /> <flowRoot xml:space="preserve" id="flowRoot14155" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,180.07991,121.64058)"><flowRegion + transform="matrix(0.56758162,0,0,0.56758162,180.07991,-24.023413)"><flowRegion id="flowRegion14157"><rect id="rect14159" width="137.14285" @@ -1008,7 +653,7 @@ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" /></flowRegion><flowPara id="flowPara14161" style="font-size:16px">root</flowPara></flowRoot> <flowRoot - transform="matrix(0.56758162,0,0,0.56758162,110.19338,163.61995)" + transform="matrix(0.56758162,0,0,0.56758162,110.19338,17.955957)" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="flowRoot14163" xml:space="preserve"><flowRegion @@ -1024,7 +669,7 @@ xml:space="preserve" id="flowRoot14187" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,91.258354,218.92496)"><flowRegion + transform="matrix(0.56758162,0,0,0.56758162,91.258354,73.260967)"><flowRegion id="flowRegion14189"><rect id="rect14191" width="137.14285" @@ -1037,7 +682,7 @@ xml:space="preserve" id="flowRoot14211" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,260.00459,218.92496)" + transform="matrix(0.56758162,0,0,0.56758162,260.00459,73.260967)" inkscape:transform-center-x="62.289267"><flowRegion id="flowRegion14213"><rect id="rect14215" @@ -1049,7 +694,7 @@ id="flowPara14217" style="font-size:16px">weak</flowPara></flowRoot> <flowRoot inkscape:transform-center-x="62.289273" - transform="matrix(0.56758162,0,0,0.56758162,238.43066,163.61995)" + transform="matrix(0.56758162,0,0,0.56758162,238.43066,17.955957)" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="flowRoot14219" xml:space="preserve"><flowRegion @@ -1062,8 +707,8 @@ id="rect14223" /></flowRegion><flowPara style="font-size:16px" id="flowPara14225">weak</flowPara></flowRoot> <path - transform="matrix(1.3564067,0,0,1.3564067,20.012634,332.50435)" - d="m 181.60714,44.396919 a 6.3392859,6.3392859 0 1 1 -12.67857,0 6.3392859,6.3392859 0 1 1 12.67857,0 z" + transform="matrix(1.3564067,0,0,1.3564067,20.012634,186.84036)" + d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" sodipodi:cy="44.396919" @@ -1080,9 +725,9 @@ sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,-43.9196,374.18026)" /> + transform="matrix(1.3564067,0,0,1.3564067,-43.9196,228.51627)" /> <path - transform="matrix(1.3564067,0,0,1.3564067,80.92503,374.18026)" + transform="matrix(1.3564067,0,0,1.3564067,80.92503,228.51627)" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" @@ -1092,7 +737,7 @@ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:0.92155254;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" sodipodi:type="arc" /> <path - transform="matrix(1.3564067,0,0,1.3564067,-85.428671,413.64455)" + transform="matrix(1.3564067,0,0,1.3564067,-85.428671,267.98056)" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" @@ -1110,9 +755,9 @@ sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,81.467663,413.64455)" /> + transform="matrix(1.3564067,0,0,1.3564067,81.467663,267.98056)" /> <path - transform="matrix(1.3564067,0,0,1.3564067,-1.980522,413.64455)" + transform="matrix(1.3564067,0,0,1.3564067,-1.980522,267.98056)" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" @@ -1130,9 +775,9 @@ sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,-43.704594,413.64455)" /> + transform="matrix(1.3564067,0,0,1.3564067,-43.704594,267.98056)" /> <path - transform="matrix(1.3564067,0,0,1.3564067,123.19171,413.64455)" + transform="matrix(1.3564067,0,0,1.3564067,123.19171,267.98056)" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" sodipodi:ry="6.3392859" sodipodi:rx="6.3392859" @@ -1150,9 +795,9 @@ sodipodi:rx="6.3392859" sodipodi:ry="6.3392859" d="m 181.60714,44.396919 c 0,3.501091 -2.8382,6.339286 -6.33929,6.339286 -3.50109,0 -6.33928,-2.838195 -6.33928,-6.339286 0,-3.501091 2.83819,-6.339286 6.33928,-6.339286 3.50109,0 6.33929,2.838195 6.33929,6.339286 z" - transform="matrix(1.3564067,0,0,1.3564067,39.74357,413.64455)" /> + transform="matrix(1.3564067,0,0,1.3564067,39.74357,267.98056)" /> <flowRoot - transform="matrix(0.56758162,0,0,0.56758162,216.42291,218.92496)" + transform="matrix(0.56758162,0,0,0.56758162,216.42291,73.260967)" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="flowRoot14163-7" xml:space="preserve"><flowRegion @@ -1166,7 +811,7 @@ style="font-size:16px" id="flowPara14169-3">strong</flowPara></flowRoot> <flowRoot inkscape:transform-center-x="62.289267" - transform="matrix(0.56758162,0,0,0.56758162,301.72612,218.92496)" + transform="matrix(0.56758162,0,0,0.56758162,301.72612,73.260967)" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="flowRoot14374" xml:space="preserve"><flowRegion @@ -1180,7 +825,7 @@ style="font-size:16px" id="flowPara14380">weak</flowPara></flowRoot> <flowRoot inkscape:transform-center-x="62.289267" - transform="matrix(0.56758162,0,0,0.56758162,134.84004,218.92496)" + transform="matrix(0.56758162,0,0,0.56758162,134.84004,73.260967)" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="flowRoot14382" xml:space="preserve"><flowRegion @@ -1196,7 +841,7 @@ xml:space="preserve" id="flowRoot14390" style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0.56758162,0,0,0.56758162,176.56155,218.92496)" + transform="matrix(0.56758162,0,0,0.56758162,176.56155,73.260967)" inkscape:transform-center-x="62.289267"><flowRegion id="flowRegion14392"><rect id="rect14394" @@ -1396,277 +1041,7 @@ id="rect3532" /></flowRegion><flowPara style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" id="flowPara3534">2</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3536" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,151.76285,-312.99047)"><flowRegion - id="flowRegion3538"><rect - id="rect3540" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3542" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,219.4527,22.739683)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3544" - xml:space="preserve" - inkscape:transform-center-y="-13.760438"><flowRegion - id="flowRegion3546"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3548" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara3550">0</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,67.920189,-271.57422)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3582" - xml:space="preserve"><flowRegion - id="flowRegion3584"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3586" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowPara3588">w</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.760438" - xml:space="preserve" - id="flowRoot3590" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,135.61004,64.155933)"><flowRegion - id="flowRegion3592"><rect - id="rect3594" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3596" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">0</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3598" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,45.696833,-231.67319)"><flowRegion - id="flowRegion3600"><rect - id="rect3602" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3604" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,113.38668,104.05696)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3606" - xml:space="preserve" - inkscape:transform-center-y="-13.760438"><flowRegion - id="flowRegion3608"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3610" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara3612">0</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3614" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,151.63658,-271.57422)"><flowRegion - id="flowRegion3616"><rect - id="rect3618" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3620" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,219.32643,64.155933)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3622" - xml:space="preserve" - inkscape:transform-center-y="-13.760438"><flowRegion - id="flowRegion3624"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3626" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara3628">1</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,233.33267,-271.57422)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3630" - xml:space="preserve"><flowRegion - id="flowRegion3632"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3634" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowPara3636">w</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.760438" - xml:space="preserve" - id="flowRoot3638" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,301.02252,64.155933)"><flowRegion - id="flowRegion3640"><rect - id="rect3642" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3644" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">1</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,87.618164,-231.67319)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3646" - xml:space="preserve"><flowRegion - id="flowRegion3648"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3650" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowPara3652">w</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.760438" - xml:space="preserve" - id="flowRoot3654" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,155.30801,104.05696)"><flowRegion - id="flowRegion3656"><rect - id="rect3658" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3660" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">2</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3662" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,129.03442,-231.67319)"><flowRegion - id="flowRegion3664"><rect - id="rect3666" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3668" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,196.72426,104.05696)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3670" - xml:space="preserve" - inkscape:transform-center-y="-13.760438"><flowRegion - id="flowRegion3672"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3674" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara3676">1</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot3678" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,171.08202,-231.67319)"><flowRegion - id="flowRegion3680"><rect - id="rect3682" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3684" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,238.77186,104.05696)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3686" - xml:space="preserve" - inkscape:transform-center-y="-13.760438"><flowRegion - id="flowRegion3688"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3690" /></flowRegion><flowPara - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara3692">2</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,254.54588,-231.67319)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3694" - xml:space="preserve"><flowRegion - id="flowRegion3696"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3698" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowPara3700">w</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.760438" - xml:space="preserve" - id="flowRoot3702" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,322.23572,104.05696)"><flowRegion - id="flowRegion3704"><rect - id="rect3706" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3708" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">2</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,212.24871,-231.67319)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot3710" - xml:space="preserve"><flowRegion - id="flowRegion3712"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3714" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowPara3716">w</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.760438" - xml:space="preserve" - id="flowRoot3718" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,279.93855,104.05696)"><flowRegion - id="flowRegion3720"><rect - id="rect3722" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara3724" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">1</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,151.50986,-167.27618)" + transform="matrix(1.1835302,0,0,1.1835302,151.50986,-312.94017)" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3756" xml:space="preserve"><flowRegion @@ -1683,7 +1058,7 @@ xml:space="preserve" id="flowRoot3764" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,219.19971,168.45397)"><flowRegion + transform="matrix(0.48067,0,0,0.48067,219.19971,22.789977)"><flowRegion id="flowRegion3766"><rect id="rect3768" width="137.14285" @@ -1696,7 +1071,7 @@ xml:space="preserve" id="flowRoot3772" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,87.209283,-125.84761)"><flowRegion + transform="matrix(1.1835302,0,0,1.1835302,87.209283,-271.5116)"><flowRegion id="flowRegion3774"><rect id="rect3776" width="137.14285" @@ -1706,7 +1081,7 @@ style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara id="flowPara3778" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,154.89913,209.88254)" + transform="matrix(0.48067,0,0,0.48067,154.89913,64.218547)" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3780" xml:space="preserve" @@ -1720,7 +1095,7 @@ id="rect3784" /></flowRegion><flowPara style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" id="flowPara3786">0</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,45.780712,-85.84761)" + transform="matrix(1.1835302,0,0,1.1835302,45.780712,-231.5116)" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3788" xml:space="preserve"><flowRegion @@ -1737,7 +1112,7 @@ xml:space="preserve" id="flowRoot3796" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,113.47056,249.88254)"><flowRegion + transform="matrix(0.48067,0,0,0.48067,113.47056,104.21855)"><flowRegion id="flowRegion3798"><rect id="rect3800" width="137.14285" @@ -1747,7 +1122,7 @@ style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara id="flowPara3802" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">0</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,212.4325,-125.84761)" + transform="matrix(1.1835302,0,0,1.1835302,212.4325,-271.5116)" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3804" xml:space="preserve"><flowRegion @@ -1764,7 +1139,7 @@ xml:space="preserve" id="flowRoot3812" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,280.12234,209.88254)"><flowRegion + transform="matrix(0.48067,0,0,0.48067,280.12234,64.218547)"><flowRegion id="flowRegion3814"><rect id="rect3816" width="137.14285" @@ -1777,7 +1152,7 @@ xml:space="preserve" id="flowRoot3820" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,87.387855,-85.84761)"><flowRegion + transform="matrix(1.1835302,0,0,1.1835302,87.387855,-231.5116)"><flowRegion id="flowRegion3822"><rect id="rect3824" width="137.14285" @@ -1787,7 +1162,7 @@ style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara id="flowPara3826" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,155.0777,249.88254)" + transform="matrix(0.48067,0,0,0.48067,155.0777,104.21855)" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3828" xml:space="preserve" @@ -1801,7 +1176,7 @@ id="rect3832" /></flowRegion><flowPara style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" id="flowPara3834">2</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,129.35214,-85.84761)" + transform="matrix(1.1835302,0,0,1.1835302,129.35214,-231.5116)" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3836" xml:space="preserve"><flowRegion @@ -1818,7 +1193,7 @@ xml:space="preserve" id="flowRoot3844" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,197.04199,249.88254)"><flowRegion + transform="matrix(0.48067,0,0,0.48067,197.04199,104.21855)"><flowRegion id="flowRegion3846"><rect id="rect3848" width="137.14285" @@ -1831,7 +1206,7 @@ xml:space="preserve" id="flowRoot3852" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,170.78071,-85.84761)"><flowRegion + transform="matrix(1.1835302,0,0,1.1835302,170.78071,-231.5116)"><flowRegion id="flowRegion3854"><rect id="rect3856" width="137.14285" @@ -1841,7 +1216,7 @@ style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara id="flowPara3858" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,238.47056,249.88254)" + transform="matrix(0.48067,0,0,0.48067,238.47056,104.21855)" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3860" xml:space="preserve" @@ -1855,7 +1230,7 @@ id="rect3864" /></flowRegion><flowPara style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" id="flowPara3866">1</flowPara></flowRoot> <flowRoot - transform="matrix(1.1835302,0,0,1.1835302,212.56642,-85.84761)" + transform="matrix(1.1835302,0,0,1.1835302,212.56642,-231.5116)" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3868" xml:space="preserve"><flowRegion @@ -1872,7 +1247,7 @@ xml:space="preserve" id="flowRoot3876" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.48067,0,0,0.48067,280.25627,249.88254)"><flowRegion + transform="matrix(0.48067,0,0,0.48067,280.25627,104.21855)"><flowRegion id="flowRegion3878"><rect id="rect3880" width="137.14285" @@ -1885,7 +1260,7 @@ xml:space="preserve" id="flowRoot3884" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(1.1835302,0,0,1.1835302,254.35213,-85.84761)"><flowRegion + transform="matrix(1.1835302,0,0,1.1835302,254.35213,-231.5116)"><flowRegion id="flowRegion3886"><rect id="rect3888" width="137.14285" @@ -1895,7 +1270,7 @@ style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara id="flowPara3890" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">w</flowPara></flowRoot> <flowRoot - transform="matrix(0.48067,0,0,0.48067,322.04198,249.88254)" + transform="matrix(0.48067,0,0,0.48067,322.04198,104.21855)" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot3892" xml:space="preserve" @@ -1909,25 +1284,10 @@ id="rect3896" /></flowRegion><flowPara style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" id="flowPara3898">2</flowPara></flowRoot> <flowRoot - transform="matrix(0,-0.86212912,0.86212912,0,-306.7678,399.26386)" - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - id="flowRoot3902" - xml:space="preserve"><flowRegion - id="flowRegion3904"><rect - style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect3906" /></flowRegion><flowPara - style="font-size:12.1262331px" - id="flowPara3908">Metrical Level <flowSpan - id="flowSpan3910" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10">L</flowSpan></flowPara></flowRoot> <flowRoot xml:space="preserve" id="flowRoot3912" style="font-size:12.1262331px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" - transform="matrix(0,-0.86212912,0.86212912,0,-306.7678,539.97815)"><flowRegion + transform="matrix(0,-0.86212912,0.86212912,0,-306.7678,394.31416)"><flowRegion id="flowRegion3914"><rect id="rect3916" width="137.14285" @@ -1939,88 +1299,7 @@ style="font-size:12.1262331px">Metrical Level <flowSpan style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowSpan3920">L</flowSpan></flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.090771" - xml:space="preserve" - id="flowRoot4070" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.45727763,0,0,0.45727763,346.54328,30.747111)"><flowRegion - id="flowRegion4072"><rect - id="rect4074" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara4076" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">0</flowPara></flowRoot> <flowRoot - transform="matrix(1.1259323,0,0,1.1259323,294.8326,-286.92005)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Athelas;-inkscape-font-specification:Athelas" - id="flowRoot4086" - xml:space="preserve"><flowRegion - id="flowRegion4088"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Athelas;-inkscape-font-specification:Athelas" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4090" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara4092">= 1</flowPara></flowRoot> <flowRoot - transform="matrix(0.45727763,0,0,0.45727763,346.54328,72.888387)" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - id="flowRoot4094" - xml:space="preserve" - inkscape:transform-center-y="-13.090771"><flowRegion - id="flowRegion4096"><rect - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4098" /></flowRegion><flowPara - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara4100">1</flowPara></flowRoot> <flowRoot - xml:space="preserve" - id="flowRoot4110" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Athelas;-inkscape-font-specification:Athelas" - transform="matrix(1.1259323,0,0,1.1259323,294.8326,-244.77878)"><flowRegion - id="flowRegion4112"><rect - id="rect4114" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Athelas;-inkscape-font-specification:Athelas" /></flowRegion><flowPara - id="flowPara4116" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">= 3</flowPara></flowRoot> <flowRoot - inkscape:transform-center-y="-13.090774" - xml:space="preserve" - id="flowRoot4118" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.45727763,0,0,0.45727763,346.54328,113.72072)"><flowRegion - id="flowRegion4120"><rect - id="rect4122" - width="137.14285" - height="104.28574" - x="85" - y="464.50504" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara - id="flowPara4124" - style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">2</flowPara></flowRoot> <flowRoot - transform="matrix(1.1259323,0,0,1.1259323,294.8326,-203.94644)" - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Athelas;-inkscape-font-specification:Athelas" - id="flowRoot4134" - xml:space="preserve"><flowRegion - id="flowRegion4136"><rect - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Athelas;-inkscape-font-specification:Athelas" - y="464.50504" - x="85" - height="104.28574" - width="137.14285" - id="rect4138" /></flowRegion><flowPara - style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" - id="flowPara4140">= 2</flowPara></flowRoot> <flowRoot - transform="matrix(0.45727763,0,0,0.45727763,346.54328,175.31502)" + transform="matrix(0.45727763,0,0,0.45727763,346.54328,29.651027)" style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot4142" xml:space="preserve" @@ -2037,7 +1316,7 @@ xml:space="preserve" id="flowRoot4158" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Athelas;-inkscape-font-specification:Athelas" - transform="matrix(1.1259323,0,0,1.1259323,294.8326,-142.35215)"><flowRegion + transform="matrix(1.1259323,0,0,1.1259323,294.8326,-288.01614)"><flowRegion id="flowRegion4160"><rect id="rect4162" width="137.14285" @@ -2051,7 +1330,7 @@ xml:space="preserve" id="flowRoot4166" style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" - transform="matrix(0.45727763,0,0,0.45727763,346.54328,218.55204)"><flowRegion + transform="matrix(0.45727763,0,0,0.45727763,346.54328,72.888047)"><flowRegion id="flowRegion4168"><rect id="rect4170" width="137.14285" @@ -2061,7 +1340,7 @@ style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:cmmi10;-inkscape-font-specification:cmmi10" /></flowRegion><flowPara id="flowPara4172" style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman">1</flowPara></flowRoot> <flowRoot - transform="matrix(1.1259323,0,0,1.1259323,294.8326,-99.115126)" + transform="matrix(1.1259323,0,0,1.1259323,294.8326,-244.77912)" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Athelas;-inkscape-font-specification:Athelas" id="flowRoot4182" xml:space="preserve"><flowRegion @@ -2074,7 +1353,7 @@ id="rect4186" /></flowRegion><flowPara style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Times New Roman;-inkscape-font-specification:Times New Roman" id="flowPara4188">= 2</flowPara></flowRoot> <flowRoot - transform="matrix(0.45727763,0,0,0.45727763,346.54328,259.31419)" + transform="matrix(0.45727763,0,0,0.45727763,346.54328,113.6502)" style="font-size:16.64343452px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:cmmi10;-inkscape-font-specification:cmmi10" id="flowRoot4190" xml:space="preserve" @@ -2091,7 +1370,7 @@ xml:space="preserve" id="flowRoot4206" style="font-size:10.98408794px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Athelas;-inkscape-font-specification:Athelas" - transform="matrix(1.1259323,0,0,1.1259323,294.8326,-58.352975)"><flowRegion + transform="matrix(1.1259323,0,0,1.1259323,294.8326,-204.01697)"><flowRegion id="flowRegion4208"><rect id="rect4210" width="137.14285" @@ -2200,26 +1479,8 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccczcszzzsaszzcc" /> <path - sodipodi:nodetypes="cccczcszzzsaszzcc" - inkscape:connector-curvature="0" - id="path4395" - d="m 382.45746,245.21264 -2.99916,3.45605 c -0.52942,0.57788 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83845 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65867 -0.73045,-0.66805 -0.20508,-0.005 -0.29398,-0.3473 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66959 0.21547,0.4485 2.66523,6.84547 2.76388,7.1009 0.0987,0.25545 0.16441,0.43642 0.26794,0.60066 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22672 -1.23662,-3.25178 -1.23662,-3.25178 z" - style="fill:#000000;stroke:none" /> - <path style="fill:#000000;stroke:none" - d="m 382.45746,287.18591 -2.99916,3.45606 c -0.52942,0.57787 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83846 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65868 -0.73045,-0.66806 -0.20508,-0.005 -0.29398,-0.34729 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66958 0.21547,0.44851 2.66523,6.84548 2.76388,7.10091 0.0987,0.25544 0.16441,0.43642 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22673 -1.23662,-3.25179 -1.23662,-3.25179 z" - id="path4397" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccczcszzzsaszzcc" /> - <path - sodipodi:nodetypes="cccczcszzzsaszzcc" - inkscape:connector-curvature="0" - id="path4399" - d="m 382.45746,328.18625 -2.99916,3.45606 c -0.52942,0.57787 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83846 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65868 -0.73045,-0.66806 -0.20508,-0.005 -0.29398,-0.34729 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66958 0.21547,0.44851 2.66523,6.84548 2.76388,7.10091 0.0987,0.25544 0.16441,0.43642 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22673 -1.23662,-3.25179 -1.23662,-3.25179 z" - style="fill:#000000;stroke:none" /> - <path - style="fill:#000000;stroke:none" - d="m 382.45746,389.49004 -2.99916,3.45605 c -0.52942,0.57788 -1.11744,-0.19264 -0.65856,-0.62672 l 3.47033,-3.33305 c 0,0 -1.14423,-2.83846 -1.42878,-3.52604 -0.28454,-0.68758 -0.70548,-0.65867 -0.73045,-0.66805 -0.20508,-0.005 -0.29398,-0.3473 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66959 0.21547,0.4485 2.66523,6.84547 2.76388,7.10091 0.0987,0.25544 0.16441,0.43641 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22672 -1.23662,-3.25178 -1.23662,-3.25178 z" + d="m 382.45746,243.82605 -2.99916,3.45605 c -0.52942,0.57788 -1.11744,-0.19264 -0.65856,-0.62672 l 3.47033,-3.33305 c 0,0 -1.14423,-2.83846 -1.42878,-3.52604 -0.28454,-0.68758 -0.70548,-0.65867 -0.73045,-0.66805 -0.20508,-0.005 -0.29398,-0.3473 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66959 0.21547,0.4485 2.66523,6.84547 2.76388,7.10091 0.0987,0.25544 0.16441,0.43641 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22672 -1.23662,-3.25178 -1.23662,-3.25178 z" id="path4401" inkscape:connector-curvature="0" sodipodi:nodetypes="cccczcszzzsaszzcc" /> @@ -2227,11 +1488,11 @@ sodipodi:nodetypes="cccczcszzzsaszzcc" inkscape:connector-curvature="0" id="path4403" - d="m 382.45746,432.89506 -2.99916,3.45606 c -0.52942,0.57787 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83845 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65868 -0.73045,-0.66806 -0.20508,-0.005 -0.29398,-0.34729 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66958 0.21547,0.44851 2.66523,6.84548 2.76388,7.10091 0.0987,0.25544 0.16441,0.43642 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22673 -1.23662,-3.25179 -1.23662,-3.25179 z" + d="m 382.45746,287.23107 -2.99916,3.45606 c -0.52942,0.57787 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83845 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65868 -0.73045,-0.66806 -0.20508,-0.005 -0.29398,-0.34729 0.0248,-0.33938 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66958 0.21547,0.44851 2.66523,6.84548 2.76388,7.10091 0.0987,0.25544 0.16441,0.43642 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22673 -1.23662,-3.25179 -1.23662,-3.25179 z" style="fill:#000000;stroke:none" /> <path style="fill:#000000;stroke:none" - d="m 382.45746,473.65721 -2.99916,3.45606 c -0.52942,0.57788 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83845 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65868 -0.73045,-0.66806 -0.20508,-0.005 -0.29398,-0.34729 0.0248,-0.33937 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66958 0.21547,0.44851 2.66523,6.84548 2.76388,7.10091 0.0987,0.25544 0.16441,0.43642 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22673 -1.23662,-3.25179 -1.23662,-3.25179 z" + d="m 382.45746,327.99322 -2.99916,3.45606 c -0.52942,0.57788 -1.11744,-0.19265 -0.65856,-0.62672 l 3.47033,-3.33306 c 0,0 -1.14423,-2.83845 -1.42878,-3.52603 -0.28454,-0.68759 -0.70548,-0.65868 -0.73045,-0.66806 -0.20508,-0.005 -0.29398,-0.34729 0.0248,-0.33937 0.32302,0.008 0.46199,0.009 0.78209,0.0371 0.32011,0.0286 0.6918,0.22107 0.90727,0.66958 0.21547,0.44851 2.66523,6.84548 2.76388,7.10091 0.0987,0.25544 0.16441,0.43642 0.26794,0.60065 0.0385,0.0611 0.11037,0.11164 0.0963,0.17887 -0.01,0.0447 -0.0374,0.0763 -0.1052,0.0782 -0.2128,0.006 -0.54898,0.004 -0.67981,0.004 -0.13081,5e-5 -0.36885,-0.15342 -0.47413,-0.38014 -0.10528,-0.22673 -1.23662,-3.25179 -1.23662,-3.25179 z" id="path4405" inkscape:connector-curvature="0" sodipodi:nodetypes="cccczcszzzsaszzcc" />
--- a/SMC2015latex/section/framework.tex Mon Apr 27 10:00:26 2015 +0100 +++ b/SMC2015latex/section/framework.tex Mon Apr 27 11:20:52 2015 +0100 @@ -6,6 +6,16 @@ \caption{Module hierarchy in the synpy toolkit: The top-level module provides a simple interface for the user to test different syncopation models. Musical constructs such as bars, velocity and note sequences, notes and time signatures are defined in the `music objects' module while support for common procedures such as sequence concatenation and subdivision is provided in `basic functions'. Models and file reading components can be interchanged as required by the user.\label{fig:framework}} \end{figure} +The architecture of the toolkit is relatively simple (see Figure~\ref{fig:framework}). At the top level, syncopation values can be calculated for each bar in a given source of rhythm data; the user specifies which model to use and supplies any special parameters that are required. Sources of rhythm data can be a bar object or a list of bars (detailed below in section\ref{sec:musicobjects}) or, alternatively, the name of a file containing music data. Where a model is unable to calculate a value for a given rhythm pattern, a “None” value is recorded for that bar and the indices of unmeasured bars reported in the output. Output can optionally be saved directly to XML or JSON files. + +\subsection{Music objects} +\label{sec:musicobjects} +The `music objects' module provides classes to represent musical constructs such as bars, velocity and note sequences, time signatures, and individual notes. A \code{Bar} object holds the rhythm information for a single bar of music along with its associated time signature and optional tempo and ticks-per-quarternote values. \code{Bar} objects may be initialised with either a note sequence or velocity sequence and can be chained together in the form of a doubly-linked \code{BarList} allowing syncopation models to access next and previous bars where appropriate\footnote{Several models \cite{LHL84,Keith91,Pressing97,Gomez05} implemented in the toolkit require knowledge of the contents of previous and/or next bars in order to calculate the syncopation of the current bar.}. The note sequence and velocity sequence classes are direct implementations of the sequences described in section~\ref{sec:background}. Common low-level procedures such as sequence concatenation and subdivision are provided in `basic functions'. + +\subsection{File Input} +\label{sec:fileinput} +Two file reader modules are currently provided: one for for reading plain text rhythm annotation (\code{.rhy}) files and one for reading standard MIDI files (\code{.mid}). These modules open their respective file types and return a \code{BarList} object ready for processing. + \begin{figure} \footnotesize{ \begin{minted}[frame=single,framesep=10pt]{python} @@ -17,9 +27,14 @@ V{1,0,0,0.5,0,0,1,0,0,0,0.5,0,0.5,0,0,0} \end{minted} } -\caption{Example rhythm annotation \code{.rhy} file containing two bars of the Son Clave rhythm. The first is expressed as a note sequence with resolution of four ticks per quarternote; the second is the same rhythm expressed as a velocity sequence (see section~\ref{sec:background}.} +\caption{Example rhythm annotation \code{.rhy} file containing two bars of the Son Clave rhythm. The first is expressed as a note sequence with resolution of four ticks per quarternote; the second is the same rhythm expressed as a velocity sequence (see section~\ref{sec:background}).} \label{ta:clave} \end{figure} +Our \code{.rhy} annotation format is a light text syntax for descibing rhtyhm patterns directly in terms of note and velocity sequences (see Figure~\ref{ta:clave}). + +\subsection{Plugin architecture} +The system architecture has been designed to allow new models to be added easily. Models have a common interface, exposing a single function that will return the syncopation value for a bar of music. Optional parameters may be supplied as a Python dictionary if the user wishes to specify settings different from the those given in the literature for a specific model. + \begin{figure} \footnotesize{ \begin{minted}[frame=single,framesep=10pt]{python} @@ -36,15 +51,12 @@ 'syncopation_by_bar': [8.625, 8.625]} \end{minted} } -\caption{To use the library, the top level \code{synpy} module is imported along with a model (in this example Pressing \cite{pressing}); calling \code{calculate\_syncopation()} gives the syncopation results as shown. +\caption{To use the toolkit, the top level \code{synpy} module is imported along with a model (in this example Pressing \cite{Pressing97}); calling \code{calculate\_syncopation()} gives the syncopation results as shown. \label{ta:example} } \end{figure} -The architecture of the toolkit is relatively simple (see Figure~\ref{fig:framework}); syncopation values are calculated for each bar in a given source of rhythm data with the user specifying which model to use and supplying any special parameters that are required. Output can optionally be saved directly to XML or JSON files. Sources of rhythm data can be the name of a file containing rhythm data or a bar or list of bar objects as defined in section~\ref{sec:?}. Where a model is unable to calculate a value for a given rhythm pattern, a “None” value is recorded for that bar and the indices of unmeasured bars reported in the output. -Musical constructs such as bars, velocity and note sequences, notes and time signatures are defined in the `music objects' module with support for common procedures such as sequence concatenation and subdivision being provided in `basic functions'. Two file reader modules are currently provided; one for reading standard MIDI files and one for reading plain text rhythm annotation \code{.rhy} files. These modules open their respective file types and return a list of bar objects that the syncopation models can process. -The system architecture has been designed to allow new models to be added easily. Models have a common interface, exposing a single function that will return the syncopation value for a bar of music. Optional parameters may be supplied as a Python dictionary if the user wishes to specify settings different from the those given in the literature for a specific model.
--- a/SMC2015latex/syncopation_toolkit.tex Mon Apr 27 10:00:26 2015 +0100 +++ b/SMC2015latex/syncopation_toolkit.tex Mon Apr 27 11:20:52 2015 +0100 @@ -13,6 +13,8 @@ \newcommand{\code}[1]{{\small\texttt{#1}}} +\input{definitions} + %%%%%%%%%%%%%%%%%%%%%%%% Some useful packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%% See related documentation %%%%%%%%%%%%%%%%%%%%%%%%%% %\usepackage{amsmath} % popular packages from Am. Math. Soc. Please use the @@ -60,7 +62,7 @@ \usepackage[pdftex]{graphicx} % declare the path(s) where your graphic files are and their extensions so %you won't have to specify these with every instance of \includegraphics - \graphicspath{{./figures/}} + %\graphicspath{{./figures/}} \DeclareGraphicsExtensions{.pdf,.jpeg,.png} \usepackage[figure,table]{hypcap} @@ -135,14 +137,15 @@ % \begin{abstract} -talk about a syncopation toolkit +SynPy is an open-source software toolkit for quantifying syncopation. It provides reference implementations for seven widely known syncopation models; and to achieve an easy and fast platform to measure syncopation for a piece of monophonic music. + \end{abstract} % -\input{section/introduction} +%\input{section/introduction} -\input{section/background} +%\input{section/background} \input{section/framework}