Mercurial > hg > Papers > 2016 > masa-master

changeset 107:efdc04a5746c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Fri, 19 Feb 2016 14:30:11 +0900
parents 5bf012313690
children 199561d48b97
files paper/images/image.graffle slide/s6/images/regex/sc.svg slide/s6/index.html
diffstat 3 files changed, 718 insertions(+), 195 deletions(-) [+]
line wrap: on
line diff
--- a/paper/images/image.graffle	Fri Feb 19 13:19:29 2016 +0900
+++ b/paper/images/image.graffle	Fri Feb 19 14:30:11 2016 +0900
@@ -26,7 +26,7 @@
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2016-02-18 10:38:26 +0000</string>
+	<string>2016-02-19 04:55:01 +0000</string>
 	<key>Modifier</key>
 	<string>MasaKoha</string>
 	<key>NotesVisible</key>
@@ -84991,12 +84991,401 @@
 			<array>
 				<dict>
 					<key>Class</key>
-					<string>Group</string>
-					<key>Graphics</key>
-					<array>
-						<dict>
-							<key>Bounds</key>
-							<string>{{259.54358089393656, 501.26476815178637}, {61.543125962953582, 30}}</string>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>818</integer>
+					<key>Points</key>
+					<array>
+						<string>{311.87795771327558, 600.69862164738072}</string>
+						<string>{392.01181288826183, 638.37293251729591}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>Pattern</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>815</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>817</integer>
+					<key>Points</key>
+					<array>
+						<string>{311.87795771327558, 600.69862164738072}</string>
+						<string>{396.01181288826183, 600.69862164738072}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>Pattern</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>815</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>816</integer>
+					<key>Points</key>
+					<array>
+						<string>{311.87795771327558, 600.69862164738072}</string>
+						<string>{389.01181288826183, 559.37293251729591}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>Pattern</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>815</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{283.39764232184962, 583.6907474773177}, {56.960630782851922, 34.015748340126095}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Color</key>
+						<dict>
+							<key>b</key>
+							<string>0</string>
+							<key>g</key>
+							<string>0</string>
+							<key>r</key>
+							<string>0</string>
+						</dict>
+						<key>Size</key>
+						<real>18</real>
+					</dict>
+					<key>ID</key>
+					<integer>815</integer>
+					<key>Shape</key>
+					<string>Circle</string>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg932\cocoartf1404\cocoasubrtf340
+{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc\partightenfactor0
+
+\f0\fs36 \cf0 4,16}</string>
+						<key>VerticalPad</key>
+						<real>0.0</real>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>814</integer>
+					<key>Points</key>
+					<array>
+						<string>{143.38189316513973, 600.69862164738072}</string>
+						<string>{202.7755943190395, 635.37293251729591}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>Pattern</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>810</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>813</integer>
+					<key>Points</key>
+					<array>
+						<string>{143.38189316513973, 600.69862164738072}</string>
+						<string>{213.01181288826194, 600.69862164738072}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>Pattern</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>810</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>812</integer>
+					<key>Points</key>
+					<array>
+						<string>{143.38189316513973, 600.69862164738072}</string>
+						<string>{202.7755943190395, 562.37293251729591}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>Pattern</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+					<key>Tail</key>
+					<dict>
+						<key>ID</key>
+						<integer>810</integer>
+					</dict>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{114.90157777371375, 583.6907474773177}, {56.960630782851922, 34.015748340126095}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Color</key>
+						<dict>
+							<key>b</key>
+							<string>0</string>
+							<key>g</key>
+							<string>0</string>
+							<key>r</key>
+							<string>0</string>
+						</dict>
+						<key>Size</key>
+						<real>18</real>
+					</dict>
+					<key>ID</key>
+					<integer>810</integer>
+					<key>Shape</key>
+					<string>Circle</string>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg932\cocoartf1404\cocoasubrtf340
+{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc\partightenfactor0
+
+\f0\fs36 \cf0 2,8}</string>
+						<key>VerticalPad</key>
+						<real>0.0</real>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>LineGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>809</integer>
+					<key>Points</key>
+					<array>
+						<string>{254.95669533098777, 471.96850821924954}</string>
+						<string>{254.9566953309878, 525}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+				</dict>
+				<dict>
+					<key>Class</key>
+					<string>Group</string>
+					<key>Graphics</key>
+					<array>
+						<dict>
+							<key>Bounds</key>
+							<string>{{236.14978957042382, 300.87106618130389}, {61.543125962953582, 30}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FitText</key>
@@ -85066,8 +85455,8 @@
 							<integer>797</integer>
 							<key>Points</key>
 							<array>
-								<string>{190.96859593911176, 555.88021918859056}</string>
-								<string>{369.02362495994009, 514.77785661093833}</string>
+								<string>{167.57480461559902, 355.48651721810813}</string>
+								<string>{345.62983363642735, 314.3841546404559}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -85096,7 +85485,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{340.54330956851413, 497.76998244087531}, {56.960630782851922, 34.015748340126095}}</string>
+							<string>{{317.14951824500139, 297.37628047039283}, {56.960630782851922, 34.015748340126095}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FontInfo</key>
@@ -85140,7 +85529,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{260.08670685689015, 542.88809335865358}, {61, 30}}</string>
+							<string>{{236.6929155333774, 342.4943913881711}, {61, 30}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FitText</key>
@@ -85214,8 +85603,8 @@
 							<integer>800</integer>
 							<key>Points</key>
 							<array>
-								<string>{190.96859593911176, 555.88021918859056}</string>
-								<string>{360.00796760601042, 581.68169341021644}</string>
+								<string>{167.57480461559902, 355.48651721810813}</string>
+								<string>{336.61417628249762, 381.28799143973401}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -85244,7 +85633,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{342.29143201219472, 564.67381924015342}, {35.433071187631356, 34.015748340126095}}</string>
+							<string>{{318.89764068868197, 364.28011726967094}, {35.433071187631356, 34.015748340126095}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FontInfo</key>
@@ -85305,8 +85694,8 @@
 							<integer>802</integer>
 							<key>Points</key>
 							<array>
-								<string>{190.96859593911176, 555.88021918859056}</string>
-								<string>{369.02362495994009, 648.58553020949455}</string>
+								<string>{167.57480461559902, 355.48651721810813}</string>
+								<string>{345.62983363642735, 448.19182823901224}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -85335,7 +85724,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{340.54330956851413, 631.57765603943153}, {56.960630782851922, 34.015748340126095}}</string>
+							<string>{{317.14951824500139, 431.18395406894916}, {56.960630782851922, 34.015748340126095}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FontInfo</key>
@@ -85379,7 +85768,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{260.08670685689015, 577.69970404224114}, {61.543125962953582, 30}}</string>
+							<string>{{236.6929155333774, 377.3060020717586}, {61.543125962953582, 30}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FitText</key>
@@ -85432,7 +85821,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{255.50393871819887, 459.64144294491905}, {61.543125962953582, 30}}</string>
+							<string>{{232.11014739468612, 259.24774097443657}, {61.543125962953582, 30}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FitText</key>
@@ -85502,8 +85891,8 @@
 							<integer>806</integer>
 							<key>Points</key>
 							<array>
-								<string>{190.96859593911176, 555.88021918859056}</string>
-								<string>{358.25984516232984, 447.87401981166022}</string>
+								<string>{167.57480461559902, 355.48651721810813}</string>
+								<string>{334.86605383881704, 247.48031784117777}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -85532,7 +85921,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{340.54330956851413, 430.8661456415972}, {35.433071187631356, 34.015748340126095}}</string>
+							<string>{{317.14951824500139, 230.47244367111472}, {35.433071187631356, 34.015748340126095}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FontInfo</key>
@@ -85576,7 +85965,7 @@
 						</dict>
 						<dict>
 							<key>Bounds</key>
-							<string>{{160.19703295763497, 538.87234501852754}, {61.543125962953582, 34.015748340126095}}</string>
+							<string>{{136.80324163412223, 338.47864304804506}, {61.543125962953582, 34.015748340126095}}</string>
 							<key>Class</key>
 							<string>ShapedGraphic</string>
 							<key>FontInfo</key>
@@ -85624,7 +86013,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{359.75590889388212, 227.36220692339839}, {20, 30}}</string>
+					<string>{{351.25197180885056, 95.551182105409794}, {20, 30}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -85681,7 +86070,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{350.75590889388212, 135.82677315811469}, {38, 30}}</string>
+					<string>{{342.25197180885056, 4.0157483401260592}, {38, 30}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -85738,7 +86127,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{115.16141885312521, 238.11023838088266}, {41, 30}}</string>
+					<string>{{106.65748176809365, 106.29921356289407}, {41, 30}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -85795,7 +86184,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{125.66141885312521, 177.16535593815675}, {20, 30}}</string>
+					<string>{{117.15748176809365, 45.354331120168126}, {20, 30}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -85852,7 +86241,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{114.16141885312521, 133.81889898805167}, {43, 30}}</string>
+					<string>{{105.65748176809365, 2.0078741700630474}, {43, 30}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -85926,8 +86315,8 @@
 					<integer>777</integer>
 					<key>Points</key>
 					<array>
-						<string>{81.496063731552113, 205.94488407589341}</string>
-						<string>{200.55118292199344, 264.055120823609}</string>
+						<string>{72.992126646520575, 74.133859257904817}</string>
+						<string>{192.04724583696188, 132.24409600562043}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -85973,8 +86362,8 @@
 					<integer>776</integer>
 					<key>Points</key>
 					<array>
-						<string>{81.496063731552113, 205.94488407589341}</string>
-						<string>{200.55118292199344, 206.43700990583034}</string>
+						<string>{72.992126646520575, 74.133859257904817}</string>
+						<string>{192.04724583696188, 74.625985087841741}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -86020,8 +86409,8 @@
 					<integer>775</integer>
 					<key>Points</key>
 					<array>
-						<string>{81.496063731552113, 205.94488407589341}</string>
-						<string>{200.55118292199344, 148.81889898805167}</string>
+						<string>{72.992126646520575, 74.133859257904817}</string>
+						<string>{192.04724583696188, 17.007874170063047}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -86050,7 +86439,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{182.83464732817777, 247.04724665354595}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{174.3307102431462, 115.23622183555739}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86094,7 +86483,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{182.83464732817777, 189.42913573576729}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{174.3307102431462, 57.618110917778694}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86138,7 +86527,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{182.83464732817777, 131.81102481798862}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{174.3307102431462, 0}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86194,32 +86583,32 @@
 					<integer>768</integer>
 					<key>Points</key>
 					<array>
-						<string>{263.46063241601939, 320.31496353618741}</string>
-						<string>{263.46063241601939, 399.82422038316724}</string>
-					</array>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>HeadArrow</key>
-							<string>FilledArrow</string>
-							<key>Legacy</key>
-							<false/>
-							<key>LineType</key>
-							<integer>1</integer>
-							<key>TailArrow</key>
-							<string>0</string>
-						</dict>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{252.96063241601937, 188.44488407589338}, {22, 35}}</string>
+						<string>{254.9566953309878, 137.48031620800964}</string>
+						<string>{254.9566953309878, 216.98957305498948}</string>
+					</array>
+					<key>Style</key>
+					<dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>stroke</key>
+						<dict>
+							<key>HeadArrow</key>
+							<string>FilledArrow</string>
+							<key>Legacy</key>
+							<false/>
+							<key>LineType</key>
+							<integer>1</integer>
+							<key>TailArrow</key>
+							<string>0</string>
+						</dict>
+					</dict>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{244.4566953309878, 56.633859257904788}, {22, 35}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -86295,8 +86684,8 @@
 					<integer>763</integer>
 					<key>Points</key>
 					<array>
-						<string>{327.37008191004531, 207.95275824595646}</string>
-						<string>{445.55512980602896, 266.06299499367208}</string>
+						<string>{318.86614482501375, 76.141733427967836}</string>
+						<string>{437.05119272099739, 134.25197017568345}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -86342,8 +86731,8 @@
 					<integer>762</integer>
 					<key>Points</key>
 					<array>
-						<string>{327.37008191004531, 207.95275824595646}</string>
-						<string>{445.55512980602896, 150.82677315811472}</string>
+						<string>{318.86614482501375, 76.141733427967836}</string>
+						<string>{437.05119272099739, 19.015748340126095}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -86372,7 +86761,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{427.83859421221325, 249.055120823609}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{419.33465712718169, 117.24409600562041}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86414,7 +86803,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{427.83859421221325, 133.81889898805167}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{419.33465712718169, 2.0078741700630474}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86458,7 +86847,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{309.65354631622961, 190.94488407589341}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{301.14960923119804, 59.133859257904788}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86502,7 +86891,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{63.779528137736428, 188.93700990583037}, {35.433071187631356, 34.015748340126095}}</string>
+					<string>{{55.275591052704904, 57.125985087841769}, {35.433071187631356, 34.015748340126095}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -86691,14 +87080,14 @@
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<integer>4</integer>
+		<integer>20</integer>
 		<key>Expanded_Canvases</key>
 		<array>
 			<string>キャンバス 7</string>
 			<string>cctree</string>
 		</array>
 		<key>Frame</key>
-		<string>{{805, 278}, {1279, 1139}}</string>
+		<string>{{0, 38}, {1279, 1139}}</string>
 		<key>ShowInfo</key>
 		<true/>
 		<key>ShowRuler</key>
@@ -86710,9 +87099,9 @@
 		<key>TopSlabHeight</key>
 		<real>682</real>
 		<key>VisibleRegion</key>
-		<string>{{1028.688524590164, -10.000000000000037}, {495.90163934426209, 804.09836065573768}}</string>
+		<string>{{0, -99}, {605, 981}}</string>
 		<key>Zoom</key>
-		<real>1.22</real>
+		<real>1</real>
 		<key>ZoomValues</key>
 		<array>
 			<array>
@@ -86732,8 +87121,8 @@
 			</array>
 			<array>
 				<string>キャンバス 8</string>
+				<real>1.2200000286102295</real>
 				<real>1.22</real>
-				<real>1.25</real>
 			</array>
 			<array>
 				<string>charclass merge</string>
--- a/slide/s6/images/regex/sc.svg	Fri Feb 19 13:19:29 2016 +0900
+++ b/slide/s6/images/regex/sc.svg	Fri Feb 19 14:30:11 2016 +0900
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1269pt" height="1671pt" viewBox="0 0 1269 1671" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1266pt" height="1983pt" viewBox="0 0 1266 1983" version="1.1">
 <defs>
 <g>
 <symbol overflow="visible" id="glyph0-0">
@@ -77,145 +77,170 @@
 </g>
 </defs>
 <g id="surface1">
-<rect x="0" y="0" width="1269" height="1671" style="fill:rgb(100%,100%,100%);fill-opacity:1;stroke:none;"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 126.070312 221.757812 C 146.828125 241.679688 146.828125 273.988281 126.070312 293.914062 C 105.3125 313.839844 71.660156 313.839844 50.90625 293.914062 C 30.148438 273.988281 30.148438 241.679688 50.90625 221.757812 C 71.660156 201.828125 105.3125 201.828125 126.070312 221.757812 "/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 94.023438 193.917969 C 100.942708 200.559896 100.942708 211.329427 94.023438 217.971354 C 87.104167 224.613281 75.886719 224.613281 68.96875 217.971354 C 62.049479 211.329427 62.049479 200.559896 68.96875 193.917969 C 75.886719 187.276042 87.104167 187.276042 94.023438 193.917969 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M -132 33 L 3222 33 L 3222 2382 L -132 2382 Z M -132 33 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 124.558594 219.320312 C 145.316406 239.246094 145.316406 271.554688 124.558594 291.480469 C 103.800781 311.40625 70.148438 311.40625 49.394531 291.480469 C 28.636719 271.554688 28.636719 239.246094 49.394531 219.320312 C 70.148438 199.394531 103.800781 199.394531 124.558594 219.320312 "/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 85.519531 62.108073 C 92.438802 68.75 92.438802 79.518229 85.519531 86.160156 C 78.60026 92.802083 67.382812 92.802083 60.464844 86.160156 C 53.545573 79.518229 53.545573 68.75 60.464844 62.108073 C 67.382812 55.464844 78.60026 55.464844 85.519531 62.108073 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="73.47619" y="276.579003"/>
+  <use xlink:href="#glyph0-1" x="71.96438" y="274.146003"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 863.691406 227.777344 C 884.449219 247.703125 884.449219 280.011719 863.691406 299.9375 C 842.9375 319.863281 809.285156 319.863281 788.527344 299.9375 C 767.773438 280.011719 767.773438 247.703125 788.527344 227.777344 C 809.285156 207.851562 842.9375 207.851562 863.691406 227.777344 "/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 339.897135 195.925781 C 346.816406 202.56901 346.816406 213.33724 339.897135 219.979167 C 332.979167 226.621094 321.761719 226.621094 314.842448 219.979167 C 307.923177 213.33724 307.923177 202.56901 314.842448 195.925781 C 321.761719 189.283854 332.979167 189.283854 339.897135 195.925781 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 331.393229 64.115885 C 338.3125 70.757812 338.3125 81.526042 331.393229 88.167969 C 324.47526 94.809896 313.257812 94.809896 306.338542 88.167969 C 299.419271 81.526042 299.419271 70.757812 306.338542 64.115885 C 313.257812 57.473958 324.47526 57.473958 331.393229 64.115885 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="811.0982" y="282.602003"/>
+  <use xlink:href="#glyph0-2" x="809.5864" y="280.169003"/>
 </g>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458.082031 138.800781 C 465.001302 145.442708 465.001302 156.210938 458.082031 162.852865 C 451.164062 169.494792 439.946615 169.494792 433.027344 162.852865 C 426.109375 156.210938 426.109375 145.442708 433.027344 138.800781 C 439.946615 132.158854 451.164062 132.158854 458.082031 138.800781 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 449.578125 6.989583 C 456.497396 13.63151 456.497396 24.39974 449.578125 31.041667 C 442.660156 37.683594 431.442708 37.683594 424.523438 31.041667 C 417.605469 24.39974 417.605469 13.63151 424.523438 6.989583 C 431.442708 0.347656 442.660156 0.347656 449.578125 6.989583 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-3" x="1165.653" y="111.224003"/>
+  <use xlink:href="#glyph0-3" x="1164.142" y="108.791003"/>
 </g>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 458.082031 254.036458 C 465.001302 260.678385 465.001302 271.447917 458.082031 278.089844 C 451.164062 284.731771 439.946615 284.731771 433.027344 278.089844 C 426.109375 271.447917 426.109375 260.678385 433.027344 254.036458 C 439.946615 247.394531 451.164062 247.394531 458.082031 254.036458 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 449.578125 122.22526 C 456.497396 128.867188 456.497396 139.636719 449.578125 146.278646 C 442.660156 152.920573 431.442708 152.920573 424.523438 146.278646 C 417.605469 139.636719 417.605469 128.867188 424.523438 122.22526 C 431.442708 115.583333 442.660156 115.583333 449.578125 122.22526 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-1" x="1153.977" y="455.517003"/>
-  <use xlink:href="#glyph1-2" x="1180.665" y="455.517003"/>
+  <use xlink:href="#glyph1-1" x="1152.466" y="453.084003"/>
+  <use xlink:href="#glyph1-2" x="1179.154" y="453.084003"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 343.197917 200.302083 L 420.813802 162.786458 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 428.016927 159.304688 L 419.507812 160.084635 L 422.11849 165.486979 Z M 428.016927 159.304688 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 343.143229 215.708333 L 420.898438 253.938802 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 428.076823 257.46875 L 422.221354 251.247396 L 419.574219 256.63151 Z M 428.076823 257.46875 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 334.69401 68.490885 L 412.309896 30.97526 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 1126.535156 115.480469 L 1101.011719 117.820312 L 1108.847656 134.027344 Z M 1126.535156 115.480469 "/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 419.511719 27.49349 L 411.003906 28.273438 L 413.614583 33.675781 Z M 419.511719 27.49349 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 334.639323 83.897135 L 412.394531 122.128906 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 419.572917 125.658854 L 413.717448 119.436198 L 411.070312 124.820312 Z M 419.572917 125.658854 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph2-1" x="617.8819" y="279.495003"/>
+  <use xlink:href="#glyph2-1" x="616.3701" y="277.062003"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 263.460938 320.315104 L 263.460938 389.924479 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 263.460938 397.924479 L 266.460938 389.924479 L 260.460938 389.924479 Z M 263.460938 397.924479 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 213.078125 136.792969 C 219.997396 143.434896 219.997396 154.203125 213.078125 160.845052 C 206.160156 167.486979 194.942708 167.486979 188.023438 160.845052 C 181.105469 154.203125 181.105469 143.434896 188.023438 136.792969 C 194.942708 130.151042 206.160156 130.151042 213.078125 136.792969 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 254.957031 137.480469 L 254.957031 207.089844 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 254.957031 215.089844 L 257.957031 207.089844 L 251.957031 207.089844 Z M 254.957031 215.089844 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204.574219 4.981771 C 211.49349 11.623698 211.49349 22.391927 204.574219 29.033854 C 197.65625 35.675781 186.438802 35.675781 179.519531 29.033854 C 172.601562 22.391927 172.601562 11.623698 179.519531 4.981771 C 186.438802 -1.660156 197.65625 -1.660156 204.574219 4.981771 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-4" x="430.6415" y="105.201003"/>
+  <use xlink:href="#glyph0-4" x="429.1297" y="102.768003"/>
 </g>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 213.078125 194.410156 C 219.997396 201.052083 219.997396 211.821615 213.078125 218.463542 C 206.160156 225.105469 194.942708 225.105469 188.023438 218.463542 C 181.105469 211.821615 181.105469 201.052083 188.023438 194.410156 C 194.942708 187.768229 206.160156 187.768229 213.078125 194.410156 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204.574219 62.60026 C 211.49349 69.242188 211.49349 80.010417 204.574219 86.652344 C 197.65625 93.294271 186.438802 93.294271 179.519531 86.652344 C 172.601562 80.010417 172.601562 69.242188 179.519531 62.60026 C 186.438802 55.957031 197.65625 55.957031 204.574219 62.60026 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="430.6415" y="278.055003"/>
+  <use xlink:href="#glyph0-2" x="429.1297" y="275.622003"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 483.234375 396.085938 C 503.992188 416.011719 503.992188 448.320312 483.234375 468.242188 C 462.480469 488.171875 428.828125 488.171875 408.070312 468.242188 C 387.316406 448.320312 387.316406 416.011719 408.070312 396.085938 C 428.828125 376.160156 462.480469 376.160156 483.234375 396.085938 "/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 213.078125 252.028646 C 219.997396 258.670573 219.997396 269.440104 213.078125 276.082031 C 206.160156 282.723958 194.942708 282.723958 188.023438 276.082031 C 181.105469 269.440104 181.105469 258.670573 188.023438 252.028646 C 194.942708 245.386719 206.160156 245.386719 213.078125 252.028646 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204.574219 120.217448 C 211.49349 126.859375 211.49349 137.628906 204.574219 144.270833 C 197.65625 150.91276 186.438802 150.91276 179.519531 144.270833 C 172.601562 137.628906 172.601562 126.859375 179.519531 120.217448 C 186.438802 113.575521 197.65625 113.575521 204.574219 120.217448 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-3" x="430.6415" y="450.909003"/>
+  <use xlink:href="#glyph0-3" x="429.1297" y="448.476003"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 97.347656 198.338542 L 175.773438 160.708333 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 182.986979 157.247396 L 174.476562 158.002604 L 177.071615 163.41276 Z M 182.986979 157.247396 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 99.21224 206.018229 L 172.934896 206.322917 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 180.934896 206.355469 L 172.947917 203.322917 L 172.921875 209.322917 Z M 180.934896 206.355469 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 97.292969 213.654948 L 175.858073 252.002604 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 183.046875 255.511719 L 177.173177 249.30599 L 174.541667 254.697917 Z M 183.046875 255.511719 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 88.84375 66.527344 L 167.269531 28.897135 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 174.483073 25.436198 L 165.972656 26.191406 L 168.567708 31.601562 Z M 174.483073 25.436198 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 90.708333 74.207031 L 164.43099 74.511719 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 385.292969 256.636719 L 361.328125 247.535156 L 361.253906 265.535156 Z M 385.292969 256.636719 "/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 172.43099 74.544271 L 164.442708 71.511719 L 164.417969 77.511719 Z M 172.43099 74.544271 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 88.789062 81.84375 L 167.354167 120.191406 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 174.542969 123.700521 L 168.669271 117.494792 L 166.03776 122.886719 Z M 174.542969 123.700521 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="201.4843" y="103.785003"/>
-  <use xlink:href="#glyph1-4" x="213.9163" y="103.785003"/>
-  <use xlink:href="#glyph1-5" x="239.6923" y="103.785003"/>
-  <use xlink:href="#glyph1-6" x="258.3643" y="103.785003"/>
-  <use xlink:href="#glyph1-7" x="286.8283" y="103.785003"/>
+  <use xlink:href="#glyph1-3" x="199.9724" y="101.352003"/>
+  <use xlink:href="#glyph1-4" x="212.4044" y="101.352003"/>
+  <use xlink:href="#glyph1-5" x="238.1804" y="101.352003"/>
+  <use xlink:href="#glyph1-6" x="256.8524" y="101.352003"/>
+  <use xlink:href="#glyph1-7" x="285.3164" y="101.352003"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-8" x="235.9843" y="233.824003"/>
+  <use xlink:href="#glyph1-8" x="234.4724" y="231.391003"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="204.4843" y="416.659003"/>
-  <use xlink:href="#glyph1-9" x="216.9163" y="416.659003"/>
-  <use xlink:href="#glyph1-5" x="241.7803" y="416.659003"/>
-  <use xlink:href="#glyph1-10" x="260.4523" y="416.659003"/>
-  <use xlink:href="#glyph1-7" x="283.4923" y="416.659003"/>
+  <use xlink:href="#glyph1-3" x="202.9724" y="414.226003"/>
+  <use xlink:href="#glyph1-9" x="215.4044" y="414.226003"/>
+  <use xlink:href="#glyph1-5" x="240.2684" y="414.226003"/>
+  <use xlink:href="#glyph1-10" x="258.9404" y="414.226003"/>
+  <use xlink:href="#glyph1-7" x="281.9804" y="414.226003"/>
+</g>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph1-3" x="909.7559" y="107.375003"/>
+  <use xlink:href="#glyph1-11" x="922.1879" y="107.375003"/>
+  <use xlink:href="#glyph1-5" x="947.9639" y="107.375003"/>
+  <use xlink:href="#glyph1-12" x="966.6359" y="107.375003"/>
+  <use xlink:href="#glyph1-7" x="980.8439" y="107.375003"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="911.2677" y="109.808003"/>
-  <use xlink:href="#glyph1-11" x="923.6997" y="109.808003"/>
-  <use xlink:href="#glyph1-5" x="949.4757" y="109.808003"/>
-  <use xlink:href="#glyph1-12" x="968.1477" y="109.808003"/>
-  <use xlink:href="#glyph1-7" x="982.3557" y="109.808003"/>
+  <use xlink:href="#glyph1-8" x="936.7559" y="381.982003"/>
 </g>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 189.333333 343.459635 C 201.35026 350.101562 201.35026 360.871094 189.333333 367.513021 C 177.316406 374.154948 157.833333 374.154948 145.816406 367.513021 C 133.799479 360.871094 133.799479 350.101562 145.816406 343.459635 C 157.833333 336.817708 177.316406 336.817708 189.333333 343.459635 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-8" x="938.2677" y="384.415003"/>
+  <use xlink:href="#glyph0-1" x="333.1944" y="1118.203603"/>
+  <use xlink:href="#glyph0-5" x="363.2184" y="1118.203603"/>
+  <use xlink:href="#glyph0-2" x="378.2304" y="1118.203603"/>
 </g>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 212.727865 543.854167 C 224.744792 550.496094 224.744792 561.264323 212.727865 567.90625 C 200.710938 574.548177 181.226562 574.548177 169.209635 567.90625 C 157.192708 561.264323 157.192708 550.496094 169.209635 543.854167 C 181.226562 537.21224 200.710938 537.21224 212.727865 543.854167 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 347.393229 235.454427 C 354.3125 242.096354 354.3125 252.864583 347.393229 259.50651 C 340.47526 266.148438 329.257812 266.148438 322.338542 259.50651 C 315.419271 252.864583 315.419271 242.096354 322.338542 235.454427 C 329.257812 228.8125 340.47526 228.8125 347.393229 235.454427 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-1" x="379.3758" y="1326.384703"/>
-  <use xlink:href="#glyph0-5" x="409.3998" y="1326.384703"/>
-  <use xlink:href="#glyph0-2" x="424.4118" y="1326.384703"/>
-</g>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 370.78776 435.847656 C 377.705729 442.489583 377.705729 453.257812 370.78776 459.901042 C 363.86849 466.542969 352.651042 466.542969 345.731771 459.901042 C 338.813802 453.257812 338.813802 442.489583 345.731771 435.847656 C 352.651042 429.205729 363.86849 429.205729 370.78776 435.847656 " transform="matrix(3,0,0,3,-156,-360)"/>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-4" x="903.7675" y="1002.366103"/>
+  <use xlink:href="#glyph0-4" x="857.5862" y="794.185003"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 210.981771 542.959635 L 335.238281 462.736979 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 341.959635 458.397135 L 333.611979 460.216146 L 336.865885 465.257812 Z M 341.959635 458.397135 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 187.58724 342.566406 L 311.845052 262.34375 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318.566406 258.003906 L 310.217448 259.822917 L 313.472656 264.863281 Z M 318.566406 258.003906 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="653.9385" y="1081.252303"/>
-  <use xlink:href="#glyph1-4" x="666.3705" y="1081.252303"/>
-  <use xlink:href="#glyph1-5" x="692.1465" y="1081.252303"/>
-  <use xlink:href="#glyph1-13" x="710.8185" y="1081.252303"/>
-  <use xlink:href="#glyph1-7" x="739.2825" y="1081.252303"/>
+  <use xlink:href="#glyph1-3" x="607.7571" y="873.071003"/>
+  <use xlink:href="#glyph1-4" x="620.1891" y="873.071003"/>
+  <use xlink:href="#glyph1-5" x="645.9651" y="873.071003"/>
+  <use xlink:href="#glyph1-13" x="664.6371" y="873.071003"/>
+  <use xlink:href="#glyph1-7" x="693.1011" y="873.071003"/>
 </g>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-8" x="702.7988" y="1435.427103"/>
+  <use xlink:href="#glyph1-8" x="656.6174" y="1227.246003"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1011.488281 1549.675781 C 1044.855469 1569.601562 1044.855469 1601.910156 1011.488281 1621.835938 C 978.121094 1641.761719 924.023438 1641.761719 890.65625 1621.835938 C 857.289062 1601.910156 857.289062 1569.601562 890.65625 1549.675781 C 924.023438 1529.75 978.121094 1529.75 1011.488281 1549.675781 "/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 389.16276 636.558594 C 400.283854 643.200521 400.283854 653.970052 389.16276 660.611979 C 378.040365 667.253906 360.007812 667.253906 348.885417 660.611979 C 337.763021 653.970052 337.763021 643.200521 348.885417 636.558594 C 360.007812 629.916667 378.040365 629.916667 389.16276 636.558594 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 365.768229 436.165365 C 376.890625 442.807292 376.890625 453.576823 365.768229 460.21875 C 354.645833 466.860677 336.613281 466.860677 325.490885 460.21875 C 314.36849 453.576823 314.36849 442.807292 325.490885 436.165365 C 336.613281 429.523438 354.645833 429.523438 365.768229 436.165365 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-2" x="898.5289" y="1604.500593"/>
-  <use xlink:href="#glyph0-5" x="928.5529" y="1604.500593"/>
-  <use xlink:href="#glyph0-1" x="943.5649" y="1604.500593"/>
-  <use xlink:href="#glyph0-6" x="973.5889" y="1604.500593"/>
+  <use xlink:href="#glyph0-2" x="852.3475" y="1396.319503"/>
+  <use xlink:href="#glyph0-5" x="882.3715" y="1396.319503"/>
+  <use xlink:href="#glyph0-1" x="897.3835" y="1396.319503"/>
+  <use xlink:href="#glyph0-6" x="927.4075" y="1396.319503"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 213.367188 567.541667 L 338.77474 632.835938 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 345.871094 636.53125 L 340.160156 630.175781 L 337.389323 635.497396 Z M 345.871094 636.53125 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 372.535156 569.654948 C 379.454427 576.296875 379.454427 587.066406 372.535156 593.708333 C 365.617188 600.35026 354.39974 600.35026 347.480469 593.708333 C 340.561198 587.066406 340.561198 576.296875 347.480469 569.654948 C 354.39974 563.013021 365.617188 563.013021 372.535156 569.654948 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 189.973958 367.148438 L 315.38151 432.442708 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 322.476562 436.136719 L 316.766927 429.78125 L 313.996094 435.102865 Z M 322.476562 436.136719 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 915.425781 1140.785156 C 936.179688 1160.710938 936.179688 1193.015625 915.425781 1212.941406 C 894.667969 1232.867188 861.015625 1232.867188 840.261719 1212.941406 C 819.503906 1193.015625 819.503906 1160.710938 840.261719 1140.785156 C 861.015625 1120.859375 894.667969 1120.859375 915.425781 1140.785156 "/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 349.141927 369.261719 C 356.059896 375.903646 356.059896 386.671875 349.141927 393.313802 C 342.222656 399.957031 331.005208 399.957031 324.08724 393.313802 C 317.167969 386.671875 317.167969 375.903646 324.08724 369.261719 C 331.005208 362.619792 342.222656 362.619792 349.141927 369.261719 " transform="matrix(3,0,0,3,-132,33)"/>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph0-3" x="862.8305" y="1195.608003"/>
+</g>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 197.240885 360.014323 L 309.329427 377.123698 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 317.238281 378.330729 L 309.782552 374.157552 L 308.876302 380.088542 Z M 317.238281 378.330729 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-3" x="909.0119" y="1403.789103"/>
+  <use xlink:href="#glyph1-3" x="593.0787" y="1122.811203"/>
+  <use xlink:href="#glyph1-14" x="605.5107" y="1122.811203"/>
+  <use xlink:href="#glyph1-5" x="631.2867" y="1122.811203"/>
+  <use xlink:href="#glyph1-12" x="649.9587" y="1122.811203"/>
+  <use xlink:href="#glyph1-9" x="664.1667" y="1122.811203"/>
+  <use xlink:href="#glyph1-5" x="689.0307" y="1122.811203"/>
+  <use xlink:href="#glyph1-10" x="707.7027" y="1122.811203"/>
+  <use xlink:href="#glyph1-7" x="730.7427" y="1122.811203"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 220.635417 560.408854 L 332.722656 577.516927 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 865.894531 1376.171875 L 843.527344 1363.65625 L 840.8125 1381.449219 Z M 865.894531 1376.171875 "/>
-<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 340.63151 578.723958 L 333.175781 574.550781 L 332.270833 580.483073 Z M 340.63151 578.723958 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 365.768229 302.358073 C 376.890625 309 376.890625 319.768229 365.768229 326.410156 C 354.645833 333.052083 336.613281 333.052083 325.490885 326.410156 C 314.36849 319.768229 314.36849 309 325.490885 302.358073 C 336.613281 295.716146 354.645833 295.716146 365.768229 302.358073 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="639.2601" y="1330.992303"/>
-  <use xlink:href="#glyph1-14" x="651.6921" y="1330.992303"/>
-  <use xlink:href="#glyph1-5" x="677.4681" y="1330.992303"/>
-  <use xlink:href="#glyph1-12" x="696.1401" y="1330.992303"/>
-  <use xlink:href="#glyph1-9" x="710.3481" y="1330.992303"/>
-  <use xlink:href="#glyph1-5" x="735.2121" y="1330.992303"/>
-  <use xlink:href="#glyph1-10" x="753.8841" y="1330.992303"/>
-  <use xlink:href="#glyph1-7" x="776.9241" y="1330.992303"/>
+  <use xlink:href="#glyph0-4" x="867.3595" y="994.896003"/>
+  <use xlink:href="#glyph0-5" x="897.3835" y="994.896003"/>
+  <use xlink:href="#glyph0-3" x="912.3955" y="994.896003"/>
 </g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1011.488281 1148.253906 C 1044.855469 1168.179688 1044.855469 1200.488281 1011.488281 1220.414062 C 978.121094 1240.339844 924.023438 1240.339844 890.65625 1220.414062 C 857.289062 1200.488281 857.289062 1168.179688 890.65625 1148.253906 C 924.023438 1128.328125 978.121094 1128.328125 1011.488281 1148.253906 "/>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 389.16276 502.751302 C 400.283854 509.393229 400.283854 520.16276 389.16276 526.804688 C 378.040365 533.446615 360.007812 533.446615 348.885417 526.804688 C 337.763021 520.16276 337.763021 509.393229 348.885417 502.751302 C 360.007812 496.109375 378.040365 496.109375 389.16276 502.751302 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195.976562 348.929688 L 309.41276 322.744792 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 317.207031 320.945312 L 308.736979 319.821615 L 310.08724 325.667969 Z M 317.207031 320.945312 " transform="matrix(3,0,0,3,-132,33)"/>
+<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
+  <use xlink:href="#glyph1-3" x="619.8761" y="997.941003"/>
+  <use xlink:href="#glyph1-11" x="632.3081" y="997.941003"/>
+  <use xlink:href="#glyph1-5" x="658.0841" y="997.941003"/>
+  <use xlink:href="#glyph1-6" x="676.7561" y="997.941003"/>
+  <use xlink:href="#glyph1-7" x="705.2201" y="997.941003"/>
+</g>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 254.957031 471.96875 L 254.957031 515.10026 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 254.957031 523.10026 L 257.957031 515.10026 L 251.957031 515.10026 Z M 254.957031 523.10026 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 163.520833 588.671875 C 174.643229 595.313802 174.643229 606.083333 163.520833 612.72526 C 152.398438 619.367188 134.365885 619.367188 123.24349 612.72526 C 112.121094 606.083333 112.121094 595.313802 123.24349 588.671875 C 134.365885 582.029948 152.398438 582.029948 163.520833 588.671875 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph0-4" x="913.5409" y="1203.077603"/>
-  <use xlink:href="#glyph0-5" x="943.5649" y="1203.077603"/>
-  <use xlink:href="#glyph0-3" x="958.5769" y="1203.077603"/>
+  <use xlink:href="#glyph0-4" x="260.6157" y="1853.839903"/>
+  <use xlink:href="#glyph0-5" x="290.6397" y="1853.839903"/>
+  <use xlink:href="#glyph0-3" x="305.6517" y="1853.839903"/>
 </g>
-<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 219.371094 549.324219 L 332.80599 523.138021 " transform="matrix(3,0,0,3,-156,-360)"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 340.601562 521.338542 L 332.13151 520.214844 L 333.480469 526.061198 Z M 340.601562 521.338542 " transform="matrix(3,0,0,3,-156,-360)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:4,4;stroke-miterlimit:10;" d="M 162.726562 588.216146 L 194.457031 567.740885 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201.179688 563.403646 L 192.830729 565.220052 L 196.083333 570.261719 Z M 201.179688 563.403646 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:4,4;stroke-miterlimit:10;" d="M 171.861979 600.699219 L 203.111979 600.699219 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 211.111979 600.699219 L 203.111979 597.699219 L 203.111979 603.699219 Z M 211.111979 600.699219 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:4,4;stroke-miterlimit:10;" d="M 163.747396 612.588542 L 194.22526 630.38151 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201.135417 634.415365 L 195.738281 627.790365 L 192.713542 632.972656 Z M 201.135417 634.415365 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 332.016927 588.671875 C 343.139323 595.313802 343.139323 606.083333 332.016927 612.72526 C 320.894531 619.367188 302.861979 619.367188 291.739583 612.72526 C 280.617188 606.083333 280.617188 595.313802 291.739583 588.671875 C 302.861979 582.029948 320.894531 582.029948 332.016927 588.671875 " transform="matrix(3,0,0,3,-132,33)"/>
 <g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
-  <use xlink:href="#glyph1-3" x="666.0574" y="1206.122303"/>
-  <use xlink:href="#glyph1-11" x="678.4894" y="1206.122303"/>
-  <use xlink:href="#glyph1-5" x="704.2654" y="1206.122303"/>
-  <use xlink:href="#glyph1-6" x="722.9374" y="1206.122303"/>
-  <use xlink:href="#glyph1-7" x="751.4014" y="1206.122303"/>
+  <use xlink:href="#glyph0-2" x="751.0919" y="1853.839903"/>
+  <use xlink:href="#glyph0-5" x="781.1159" y="1853.839903"/>
+  <use xlink:href="#glyph0-1" x="796.1279" y="1853.839903"/>
+  <use xlink:href="#glyph0-6" x="826.1519" y="1853.839903"/>
 </g>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:4,4;stroke-miterlimit:10;" d="M 333.078125 589.341146 L 380.285156 564.048177 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 387.33724 560.270833 L 378.86849 561.403646 L 381.701823 566.692708 Z M 387.33724 560.270833 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:4,4;stroke-miterlimit:10;" d="M 340.358073 600.699219 L 386.111979 600.699219 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 394.111979 600.699219 L 386.111979 597.699219 L 386.111979 603.699219 Z M 394.111979 600.699219 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-dasharray:4,4;stroke-miterlimit:10;" d="M 334.257812 611.220052 L 383.052083 634.160156 " transform="matrix(3,0,0,3,-132,33)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 390.292969 637.565104 L 384.329427 631.445312 L 381.776042 636.876302 Z M 390.292969 637.565104 " transform="matrix(3,0,0,3,-132,33)"/>
 </g>
 </svg>
--- a/slide/s6/index.html	Fri Feb 19 13:19:29 2016 +0900
+++ b/slide/s6/index.html	Fri Feb 19 14:30:11 2016 +0900
@@ -256,10 +256,15 @@
     FileMapReduce *fmp =
         new FileMapReduce(manager,TASK_EXEC,TASK_EXEC_DATA_PARALLEL,TASK_PRINT);
     filename = fmp->init(argc, argv);
+
+
     if (filename < 0) {
         return -1;
     }
-    fmp->division_out_size = sizeof(unsigned long long)*4;
+
+    fmp->w->global = (void*)DATA;
+    fmp->division_out_size = sizeof(unsigned long long)*DATA_NUM;
+
     task_init();
     fmp->run_start(manager, filename);
     return 0;
@@ -280,11 +285,71 @@
     run_start で計算を行う Task とファイル読み込みを行う Task が生成される。さらに依存関係が設定される。
     </p>
     <p>
+    Task にデータを渡したい場合、fmp->w->global にセットすればよい。
+    </p>
+    <p>
 計算を行う Task と結果の整合や表示を行う Print Task をそれぞれ決められたフォーマットに沿って記述すればよい。
     </p>
       </div>
 
       <div class='slide'>
+    <h2>FileMapReduce を利用した Task の記述 </h2>
+<pre>
+SchedDefineTask1(Exec,task_exec);
+
+static int
+task_exec(SchedTask *s, void *rbuf, void *wbuf)
+{
+    //get_input
+    unsigned char *i_data = (unsigned char *)s->get_input(0);
+    int length = (int)s->get_inputSize(0);
+    MapReduce *w = (MapReduce*)s->get_param(4);
+
+    (STRUCTPtr) DATA = (STRUCTPtr)w->global;
+
+    // Word Count, Boyer-Moore Search, grep
+
+    o_data[0] = SET_RESULT0;
+    o_data[1] = SET_RESULT1;
+
+    return 0;
+}
+</pre>
+    <p>
+    Task の生成で渡された DATA を w->global で受け取ることができる。
+    </p>
+    <p>
+    o_data にはTask の結果を格納する。これは、Print Task に渡される data である。
+    </p>
+      </div>
+
+      <div class='slide'>
+    <h2>Print の記述 </h2>
+<pre>
+SchedDefineTask1(Print,run_print);
+
+static int
+run_print(SchedTask *s, void *rbuf, void *wbuf)
+{
+    MapReduce *w = (MapReduce*)s->get_input(0);
+    int out_size = w->division_out_size / sizeof(unsigned long long);
+    int out_task_num = w->task_num;
+
+    // printf(w->o_data[i*out_size+0]);
+
+    return 0;
+}
+</pre>
+    <p>
+    Task の o_data で渡されたデータを Print Task で集計する。
+    </p>
+    <p>
+    例題によって分割された部分の処理が必要である。その処理もここに記述する。
+    </p>
+      </div>
+
+
+      <div class='slide'>
     <h2>Word Count</h2>
     <object data="images/example/wordcount.svg" width="70%"  type="image/svg+xml"></object><br>
     <li>
@@ -314,16 +379,17 @@
     </p>
     <ul>
 <li>pattern に含まれていない文字で不一致した場合は、 pattern の長さだけ後ろにずらす。</li>
+    <object data="images/example/bmsearchthink.svg" width="50%"  type="image/svg+xml"></object><br>
 <li>pattern に含まれている文字の場合は、pattern の長さから pattern に含まれている文字の位置を引いた数だけ後ろにずらす。</li>
+    <object data="images/example/bmsearchinclude.svg" width="50%"  type="image/svg+xml"></object><br>
 <li>pattern に含まれている文字でその文字が pattern に複数含まれている場合は後ろにずらす量も複数現れる。その中の最小の値だけ後ろにずらす。</li>
     </ul>
-    <object data="images/example/bmsearchinclude.svg" width="50%"  type="image/svg+xml"></object><br>
     <object data="images/example/bmsearchsame.svg" width="50%"  type="image/svg+xml"></object><br>
-    <object data="images/example/bmsearchthink.svg" width="50%"  type="image/svg+xml"></object><br>
       </div>
 
       <div class='slide'>
     <h2>正規表現マッチャの実装</h2>
+    今回実装した正規表現マッチャのアルゴリズムは以下の通りである。
     <ul>
 <li>与えられた正規表現を構文解析し、正規表現木に変換</li>
 <li>正規表現木への状態の割当</li>
@@ -360,6 +426,7 @@
 
       <div class='slide'>
     <h2>正規表現から正規表現木の生成</h2>
+    <p>正規表現木を二分木で構成する。</p>
     <object data="images/regex/parser.svg" width="50%"  type="image/svg+xml"></object><br>
 <pre>
 static
@@ -412,10 +479,7 @@
 </pre>
 <ul>
 <li>
-正規表現木を二分木で生成する。
-</li>
-<li>
-文字列を token で一文字ずつ読み込み、文字によってノードの結合方法が変わる。
+文字列を token で一文字ずつ読み込み、文字の種類によってノードの結合方法を変える。
 </li>
 <li>
 regexAtom で文字を一文字読み込む。
@@ -583,6 +647,20 @@
     </ul>
       </div>
 
+      <div class='slide'>
+    <h2>Subset Construction</h2>
+    <li>
+組み合わされた状態からそれぞれの状態の場合分けをたどって、さらに別な組み合われた状態が生成される。
+    </li>
+    <li>
+新しい状態の組み合わせが出てこなくなるまでこれを繰り返す。
+    </li>
+    <object data="images/regex/sc.svg" width="50%"  type="image/svg+xml"></object><br>
+    <ul>
+    </ul>
+      </div>
+
+
 
       <div class='slide'>
     <h2>Bit Pattern での状態の表現</h2>
@@ -603,18 +681,6 @@
     </ul>
       </div>
 
-      <div class='slide'>
-    <h2>Subset Construction</h2>
-    <object data="images/regex/sc.svg" width="50%"  type="image/svg+xml"></object><br>
-    <ul>
-    <li>
-組み合わされた状態からそれぞれの状態の場合分けをたどって、さらに別な組み合われた状態が生成される。
-    </li>
-    <li>
-新しい状態の組み合わせが出てこなくなるまでこれを繰り返す。
-    </li>
-    </ul>
-      </div>
 
       <div class='slide'>
     <h2>並列処理時の正規表現のマッチング</h2>
@@ -676,6 +742,9 @@
 tState は新しい状態に遷移するときに初めて生成される。<br>
 thread ごとに on the fly で生成されるので、使わない状態は生成されない。
 </li>
+<li>
+文字列処理する前に初期状態からの遷移先だけは生成しておき、それを並列処理の Task に渡す。
+</li>
 </ul>
       </div>
 
@@ -717,12 +786,52 @@
     return tsv;
 }
 </pre>
+    <ul>
+    <li>
+    </li>
+    <li>
+    </li>
+    </ul>
       </div>
 
 
   <div class='slide'>
-<h2>正規表現の整合性</h2>
+<h2>マッチング結果の Print</h2>
+<pre>
+typedef struct result {
+    unsigned char *begin;
+    unsigned char *end;
+    bool continued;
+    struct result *next;
+} Result, *ResultPtr;
+</pre>
+<ul>
+<li>
+Result はマッチした結果を保存するための構造体である。
+</li>
+<li>
+マッチングの始まりと終わりの位置を保存する。
+</li>
+<li>
+マッチングの数だけこの構造体が生成される。これらは List 構造として結果をまとめていく。
+</li>
+<li>
+全ての分割されたファイルに対してマッチングが終了すると、Print Task にてまとめてマッチした部分を表示する。
+</li>
+</ul>
+</div>
+
+<div class='slide'>
+<h2>ファイル分割時の処理</h2>
+正規表現をファイル分割して並列処理をする際、本来マッチングする文章がファイル分割によってマッチングしない場合がある。
 <object data="images/regex/regexdivide.svg" width="50%"  type="image/svg+xml"></object><br>
+<p>
+並列処理時、分割されたファイルに対してパターンマッチさせるので、分割された1つ目のファイルの末尾の abb 、2つ目のファイルの先頭に bbc はマッチングしない。
+本来分割される前はマッチングする文字列だが、この場合見逃してしまう。
+それを解決するために、正規表現にマッチングし始めたファイルの場所を覚えておく。
+
+そして、1つ目のファイルの末尾が状態遷移の途中で終わっていた場合(状態 1 でない場合)は、結果を集計する際に再度マッチングし始めた場所から正規表現をマッチングさせる。
+<p>
   </div>
 
       <div class='slide'>