diff --git a/drafter_11/annotations/C121_D1_P1.xml b/drafter_11/annotations/C121_D1_P1.xml
index 80aa4f983448aabc453cc5c55b7926109ceaae4b..dc0fa3ac0379d847ac47272904ba05f815bdbed7 100644
--- a/drafter_11/annotations/C121_D1_P1.xml
+++ b/drafter_11/annotations/C121_D1_P1.xml
@@ -217,7 +217,7 @@
687
436
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D1_P2.xml b/drafter_11/annotations/C121_D1_P2.xml
index 9e375b75a096950669d4c7ba6aab4afefed37195..f5a749b27751a8e87ca4ff24ae479f47854caa28 100644
--- a/drafter_11/annotations/C121_D1_P2.xml
+++ b/drafter_11/annotations/C121_D1_P2.xml
@@ -74,7 +74,7 @@
689
469
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D1_P3.xml b/drafter_11/annotations/C121_D1_P3.xml
index 2f4c27946702bfbbc34510029fea6f63be5cf572..3b8f6c6940753eb455ac4dda1418f1c121818a2c 100644
--- a/drafter_11/annotations/C121_D1_P3.xml
+++ b/drafter_11/annotations/C121_D1_P3.xml
@@ -165,7 +165,7 @@
707
452
- C1µFIN40007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D1_P4.xml b/drafter_11/annotations/C121_D1_P4.xml
index 5d23c59820783588a168ee49a213dc8e32c90aea..61fce41f1652ffaff8e8c5f8ecde81e7bc564bf4 100644
--- a/drafter_11/annotations/C121_D1_P4.xml
+++ b/drafter_11/annotations/C121_D1_P4.xml
@@ -61,7 +61,7 @@
682
550
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D2_P1.xml b/drafter_11/annotations/C121_D2_P1.xml
index 16d7e627367e5a6c4395285ad4fd6f4386c33b0f..41ac0937b6717433038d1c3a4dcdceb18d06e4de 100644
--- a/drafter_11/annotations/C121_D2_P1.xml
+++ b/drafter_11/annotations/C121_D2_P1.xml
@@ -319,7 +319,7 @@
598
526
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D2_P2.xml b/drafter_11/annotations/C121_D2_P2.xml
index 21b241757b5c1b3f3c31dc86d64321e8c9ebb48d..3ba75b8ebd4373da60178e1a4c39bfd700535db0 100644
--- a/drafter_11/annotations/C121_D2_P2.xml
+++ b/drafter_11/annotations/C121_D2_P2.xml
@@ -178,7 +178,7 @@
540
416
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D2_P3.xml b/drafter_11/annotations/C121_D2_P3.xml
index d3f61078784d1532a500b3d7c7a991dfb4dcc2f1..ff03a7099a9cde24fa47eb4b243b25d1dcdf3567 100644
--- a/drafter_11/annotations/C121_D2_P3.xml
+++ b/drafter_11/annotations/C121_D2_P3.xml
@@ -277,7 +277,7 @@
714
446
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C121_D2_P4.xml b/drafter_11/annotations/C121_D2_P4.xml
index f26ccc6680fa83441e4acd07ca41879ea8d7c4fa..dc6258d2ef24ed88c6589bbf83d3754df5e78209 100644
--- a/drafter_11/annotations/C121_D2_P4.xml
+++ b/drafter_11/annotations/C121_D2_P4.xml
@@ -279,7 +279,7 @@
523
497
- IN4007
+ 1N4007
+
+
+
diff --git a/drafter_11/annotations/C122_D1_P1.xml b/drafter_11/annotations/C122_D1_P1.xml
index 0286f94573ce80b2e72d16f05d6824a0bbbecbe6..950005804ee57b8980325c97f2b987a2eb7bcf7a 100644
--- a/drafter_11/annotations/C122_D1_P1.xml
+++ b/drafter_11/annotations/C122_D1_P1.xml
@@ -161,7 +161,7 @@
941
316
- capnF
+ cap470nF
diff --git a/drafter_11/annotations/C124_D1_P1.xml b/drafter_11/annotations/C124_D1_P1.xml
index 824374243c0c7e8b69a5e91becf7e7ad7f802f11..ad3aa465e199e07fbcc11c249f1c420a74e5655a 100644
--- a/drafter_11/annotations/C124_D1_P1.xml
+++ b/drafter_11/annotations/C124_D1_P1.xml
@@ -946,6 +946,7 @@
193
810
217
+ 270
diff --git a/drafter_11/annotations/C124_D1_P2.xml b/drafter_11/annotations/C124_D1_P2.xml
index c2b7a26b2702159a34c8bb6de463fe688dd29469..95c4119e3549b5f96df5f90598f6d1d2e89de720 100644
--- a/drafter_11/annotations/C124_D1_P2.xml
+++ b/drafter_11/annotations/C124_D1_P2.xml
@@ -125,7 +125,7 @@
415
459
472
- 5
+ 352
+
+
+
diff --git a/drafter_11/annotations/C125_D1_P2.xml b/drafter_11/annotations/C125_D1_P2.xml
index 6804fe0790c916ab6c6d377504557028b7f4880e..e3ccfb1bfe15fc36f781c6c62a3c938def0e2830 100644
--- a/drafter_11/annotations/C125_D1_P2.xml
+++ b/drafter_11/annotations/C125_D1_P2.xml
@@ -549,6 +549,7 @@
650
923
805
+ 356
+
+
+
diff --git a/drafter_11/annotations/C125_D1_P3.xml b/drafter_11/annotations/C125_D1_P3.xml
index 332f6f0e5d98515ac843076ee8b9813b9c6c53aa..a8c65acf1ac27b3050ead6e8cdd29b34d73b95fa 100644
--- a/drafter_11/annotations/C125_D1_P3.xml
+++ b/drafter_11/annotations/C125_D1_P3.xml
@@ -549,6 +549,7 @@
544
992
704
+ 356
+
+
+
diff --git a/drafter_11/annotations/C125_D1_P4.xml b/drafter_11/annotations/C125_D1_P4.xml
index 8fe8674562cecb8c4be48882b7bb26ae6805b8fb..41951bcf6e511decf8bcd2b91b08e9a8ab2147ab 100644
--- a/drafter_11/annotations/C125_D1_P4.xml
+++ b/drafter_11/annotations/C125_D1_P4.xml
@@ -300,7 +300,7 @@
507
647
548
- 360
+ 356
+
+
+
diff --git a/drafter_11/annotations/C125_D2_P1.xml b/drafter_11/annotations/C125_D2_P1.xml
index 5ba08c5743883c0391e7309a572d078bf574570c..ae60035259dda43d8e0d29f759cfafd76a530eab 100644
--- a/drafter_11/annotations/C125_D2_P1.xml
+++ b/drafter_11/annotations/C125_D2_P1.xml
@@ -177,7 +177,7 @@
573
561
600
- 90
+ 94
+
+
+
diff --git a/drafter_11/annotations/C125_D2_P2.xml b/drafter_11/annotations/C125_D2_P2.xml
index 5c9421c8d6cd2ba591adeede5dd9d1017940cd62..e4b95566e2db404b9cc46222fef014a8bbf1c52e 100644
--- a/drafter_11/annotations/C125_D2_P2.xml
+++ b/drafter_11/annotations/C125_D2_P2.xml
@@ -113,7 +113,7 @@
598
567
- 1µF
+ 1µf
+
+
+
diff --git a/drafter_11/annotations/C125_D2_P3.xml b/drafter_11/annotations/C125_D2_P3.xml
index 92687736a9d721665f69a26f0d1e2ce58f093921..ab5a0dabd8ff1d1294ee9361ac9694fc70687e31 100644
--- a/drafter_11/annotations/C125_D2_P3.xml
+++ b/drafter_11/annotations/C125_D2_P3.xml
@@ -127,7 +127,7 @@
650
540
- 1µf
+ 1uf
+
+
+
diff --git a/drafter_11/annotations/C125_D2_P4.xml b/drafter_11/annotations/C125_D2_P4.xml
index 3290edb0c2a9cd713709937069ddf7e06859f815..b2c1f2e5bdcf5456888e8923e56fdc483696b7bf 100644
--- a/drafter_11/annotations/C125_D2_P4.xml
+++ b/drafter_11/annotations/C125_D2_P4.xml
@@ -48,7 +48,7 @@
531
524
- 1µF
+ 1µf
+
+
+
diff --git a/drafter_11/annotations/C126_D1_P1.xml b/drafter_11/annotations/C126_D1_P1.xml
index c5c3ea439227291e254971662347c266189e2da7..4ab08f60dd79c4fa2ca1f039f585cf54c42ca5b7 100644
--- a/drafter_11/annotations/C126_D1_P1.xml
+++ b/drafter_11/annotations/C126_D1_P1.xml
@@ -472,4 +472,67 @@
L
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D1_P2.xml b/drafter_11/annotations/C126_D1_P2.xml
index 7993c2f3d24ce3dd49fe4f477ed33e15c9644611..5eb0f6ee03b0f7572bda29197e071fe4f3fbdb1c 100644
--- a/drafter_11/annotations/C126_D1_P2.xml
+++ b/drafter_11/annotations/C126_D1_P2.xml
@@ -446,6 +446,7 @@
435
432
527
+ 4
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D1_P3.xml b/drafter_11/annotations/C126_D1_P3.xml
index e441326a7a19884a114fc0d309184377c7df9106..9e2713d72cf6892ab1a652feafde2e82b89b5628 100644
--- a/drafter_11/annotations/C126_D1_P3.xml
+++ b/drafter_11/annotations/C126_D1_P3.xml
@@ -472,4 +472,67 @@
424
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D1_P4.xml b/drafter_11/annotations/C126_D1_P4.xml
index 355e8985157b637d304b4da4a7203e435d50846b..0dc9173070d4299d10c5db8858986624317cc008 100644
--- a/drafter_11/annotations/C126_D1_P4.xml
+++ b/drafter_11/annotations/C126_D1_P4.xml
@@ -474,4 +474,67 @@
L
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D2_P1.xml b/drafter_11/annotations/C126_D2_P1.xml
index bfe73a9bedcd22c04492d2a44f193f389bdcd72b..8c76441ee6391dc30c7a62937dac327171bb1030 100644
--- a/drafter_11/annotations/C126_D2_P1.xml
+++ b/drafter_11/annotations/C126_D2_P1.xml
@@ -446,4 +446,67 @@
273
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D2_P2.xml b/drafter_11/annotations/C126_D2_P2.xml
index 906e8165ff69cb1c0f1791bb42281ef059c60a52..3e8b8c17611aa10ba6149bfbfa7f3465f140c237 100644
--- a/drafter_11/annotations/C126_D2_P2.xml
+++ b/drafter_11/annotations/C126_D2_P2.xml
@@ -446,4 +446,67 @@
242
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D2_P3.xml b/drafter_11/annotations/C126_D2_P3.xml
index 940fa536ea8cb55303aa24c305f93e11a8105440..123af24f634ce7e8831b4f437c6f2923424d7021 100644
--- a/drafter_11/annotations/C126_D2_P3.xml
+++ b/drafter_11/annotations/C126_D2_P3.xml
@@ -446,4 +446,67 @@
172
+
+
+
+
+
diff --git a/drafter_11/annotations/C126_D2_P4.xml b/drafter_11/annotations/C126_D2_P4.xml
index c93b4b08f5da6b6f429f51624cba2f365ff3d1ee..f096c9e4b237fecb7edcc5da7fd182782daa471e 100644
--- a/drafter_11/annotations/C126_D2_P4.xml
+++ b/drafter_11/annotations/C126_D2_P4.xml
@@ -321,6 +321,7 @@
182
935
218
+ 350
+
+
+
+
+
diff --git a/drafter_11/annotations/C127_D1_P1.xml b/drafter_11/annotations/C127_D1_P1.xml
index ea3b340604521f9f43770110f65c0f4b0f4cbcac..9cf8676c9ae4bce0abb8eae095cd5f7d61b74c98 100644
--- a/drafter_11/annotations/C127_D1_P1.xml
+++ b/drafter_11/annotations/C127_D1_P1.xml
@@ -334,4 +334,42 @@
C
+
+
+
diff --git a/drafter_11/annotations/C127_D1_P2.xml b/drafter_11/annotations/C127_D1_P2.xml
index f24b1b5b87727151e0ce727b85165b7339011979..8a59a71e959237dc6abfc30fd84a929689030ec9 100644
--- a/drafter_11/annotations/C127_D1_P2.xml
+++ b/drafter_11/annotations/C127_D1_P2.xml
@@ -281,6 +281,7 @@
203
952
276
+ 15
+
+
+
diff --git a/drafter_11/annotations/C127_D1_P3.xml b/drafter_11/annotations/C127_D1_P3.xml
index 5cfb472f922cfa223dd392e775448569b1b4c758..cb2ff0fce1e9a70d7ca1672c8d2da575526b3dcc 100644
--- a/drafter_11/annotations/C127_D1_P3.xml
+++ b/drafter_11/annotations/C127_D1_P3.xml
@@ -334,4 +334,42 @@
C
+
+
+
diff --git a/drafter_11/annotations/C127_D1_P4.xml b/drafter_11/annotations/C127_D1_P4.xml
index 70ba164afd3f2737780d0977128a47022b6e2334..5efd1acf03f1877c1c9c1aabc5564b4123d468a2 100644
--- a/drafter_11/annotations/C127_D1_P4.xml
+++ b/drafter_11/annotations/C127_D1_P4.xml
@@ -255,6 +255,7 @@
205
880
282
+ 15
+
+
+
diff --git a/drafter_11/annotations/C127_D2_P1.xml b/drafter_11/annotations/C127_D2_P1.xml
index 7dffbe7b189ad35895312fd0f0b12569b81ff129..1ea962b3cd1b1f77fa68fbd908eba7378b99ec5d 100644
--- a/drafter_11/annotations/C127_D2_P1.xml
+++ b/drafter_11/annotations/C127_D2_P1.xml
@@ -334,4 +334,42 @@
L
+
+
+
diff --git a/drafter_11/annotations/C127_D2_P2.xml b/drafter_11/annotations/C127_D2_P2.xml
index f642532e207db375f79c8e7a79adb28884cdb3a7..3a4073b6d1922c122c6c9568e9c4b49899793dee 100644
--- a/drafter_11/annotations/C127_D2_P2.xml
+++ b/drafter_11/annotations/C127_D2_P2.xml
@@ -282,7 +282,7 @@
235
675
273
- 360
+ 8
+
+
+
diff --git a/drafter_11/annotations/C127_D2_P3.xml b/drafter_11/annotations/C127_D2_P3.xml
index be2c2731c3a47423fc81484c1b570d8bd0bdd160..15afd0e640382e5062ff4795777fd1197eb6d0dc 100644
--- a/drafter_11/annotations/C127_D2_P3.xml
+++ b/drafter_11/annotations/C127_D2_P3.xml
@@ -255,6 +255,7 @@
83
941
159
+ 25
+
+
+
diff --git a/drafter_11/annotations/C127_D2_P4.xml b/drafter_11/annotations/C127_D2_P4.xml
index 5aea354a0d78fcf4b17ebefcf72ff9ff33425bfa..0b71d878ce646174d249edc4bc1a52834f1f6352 100644
--- a/drafter_11/annotations/C127_D2_P4.xml
+++ b/drafter_11/annotations/C127_D2_P4.xml
@@ -319,6 +319,7 @@
227
987
265
+ 347
+
+
+
diff --git a/drafter_11/annotations/C128_D1_P1.xml b/drafter_11/annotations/C128_D1_P1.xml
index 78032d38a0a0386a63bda02ac15414779cb0902e..c8fd639170aafb23fd5f6dd94a401a31ffa9ea85 100644
--- a/drafter_11/annotations/C128_D1_P1.xml
+++ b/drafter_11/annotations/C128_D1_P1.xml
@@ -352,7 +352,7 @@
0
0
- 536
+ 549
385
566
405
@@ -456,6 +456,7 @@
563
1064
704
+ 4
@@ -618,6 +619,7 @@
542
1062
741
+ 6
@@ -618,6 +618,7 @@
535
1042
706
+ 8
@@ -448,6 +449,7 @@
299
827
338
+ 83
diff --git a/drafter_11/annotations/C131_D1_P4.xml b/drafter_11/annotations/C131_D1_P4.xml
index f4f5a8ab0db39cd2fce66e21019371549e07e2af..5f3ce2061ac4c764fbe7b1ad6698cb9db435e704 100644
--- a/drafter_11/annotations/C131_D1_P4.xml
+++ b/drafter_11/annotations/C131_D1_P4.xml
@@ -397,6 +397,7 @@
288
1206
316
+ 90
S1
@@ -499,6 +500,7 @@
360
935
390
+ 90
diff --git a/drafter_11/annotations/C131_D2_P3.xml b/drafter_11/annotations/C131_D2_P3.xml
index 7f0439cd5529604e9afd07ff7810bd89dc281a28..244fe64048232a5b86203f0868fe467fb49d7da6 100644
--- a/drafter_11/annotations/C131_D2_P3.xml
+++ b/drafter_11/annotations/C131_D2_P3.xml
@@ -423,6 +423,7 @@
300
951
352
+ 85
diff --git a/drafter_12/annotations/C135_D2_P1.xml b/drafter_12/annotations/C135_D2_P1.xml
index e7861832c97a2a0b331b85f40a2614d771fbf1d4..1c72baa0fa31e267b75dc5ae4ee092137f557c00 100644
--- a/drafter_12/annotations/C135_D2_P1.xml
+++ b/drafter_12/annotations/C135_D2_P1.xml
@@ -333,5 +333,6 @@
897
508
+ -
diff --git a/drafter_12/annotations/C137_D1_P2.xml b/drafter_12/annotations/C137_D1_P2.xml
index d33a2ef8c6dc88e00bcf3b7c1504d31b2f0af8e3..8a64afe45f8eaba0f3fb57fd9ab4c53c61b7fdef 100644
--- a/drafter_12/annotations/C137_D1_P2.xml
+++ b/drafter_12/annotations/C137_D1_P2.xml
@@ -135,7 +135,7 @@
373
1015
411
- 360
+ 347
diff --git a/drafter_12/annotations/C140_D2_P3.xml b/drafter_12/annotations/C140_D2_P3.xml
index 16b544e0edf880bec169c614a23d4111993bbe82..2b6ec64bcf70f96b7f80dee5e73ce4505e52cbe4 100644
--- a/drafter_12/annotations/C140_D2_P3.xml
+++ b/drafter_12/annotations/C140_D2_P3.xml
@@ -267,6 +267,7 @@
250
928
378
+ 356
diff --git a/drafter_12/annotations/C141_D1_P2.xml b/drafter_12/annotations/C141_D1_P2.xml
index 8ca0509bbcbc637c875cf23a38089131de7338c1..13b6a3a6370d2cf700a948a1c3bcbb9abbf3dee0 100644
--- a/drafter_12/annotations/C141_D1_P2.xml
+++ b/drafter_12/annotations/C141_D1_P2.xml
@@ -307,6 +307,7 @@
312
1539
430
+ 4
diff --git a/drafter_12/annotations/C141_D2_P1.xml b/drafter_12/annotations/C141_D2_P1.xml
index b2b4a3111d645199528894f37f92ebb9e51eacde..3dec0990c57e1861e46ef83b5cadc1c43c6e3940 100644
--- a/drafter_12/annotations/C141_D2_P1.xml
+++ b/drafter_12/annotations/C141_D2_P1.xml
@@ -342,6 +342,7 @@
630
832
688
+ 356
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D1_P2.xml b/drafter_13/annotations/C149_D1_P2.xml
index 2dea616e4e8251d2362ea9abd3dd7f3298f9c4e5..9de2d1d0500ae83783b715491e607ff076bd75e3 100644
--- a/drafter_13/annotations/C149_D1_P2.xml
+++ b/drafter_13/annotations/C149_D1_P2.xml
@@ -1596,4 +1596,153 @@
1823
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D1_P3.xml b/drafter_13/annotations/C149_D1_P3.xml
index 883346b70ca4d27be4ebb7fa85b4b82bafb77376..8fb4f1f3fc7e592e82b82f852646f730ed70a016 100644
--- a/drafter_13/annotations/C149_D1_P3.xml
+++ b/drafter_13/annotations/C149_D1_P3.xml
@@ -314,10 +314,10 @@
0
0
- 2248
- 1260
- 2556
- 1387
+ 2251
+ 1264
+ 2549
+ 1383
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D1_P4.xml b/drafter_13/annotations/C149_D1_P4.xml
index 8144f130f1ef76d52258d1fa549c73f09c1f0a9f..c7c2ee4dfa93ba498cd1f36fa9b5b6879f2ca6bd 100644
--- a/drafter_13/annotations/C149_D1_P4.xml
+++ b/drafter_13/annotations/C149_D1_P4.xml
@@ -1596,4 +1596,153 @@
1237
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D2_P1.xml b/drafter_13/annotations/C149_D2_P1.xml
index 5619a05a1913d47a6e371ffe733924e43184c7a3..18fd51d83abb7bdf612eded80779ffae72017ef0 100644
--- a/drafter_13/annotations/C149_D2_P1.xml
+++ b/drafter_13/annotations/C149_D2_P1.xml
@@ -1608,4 +1608,153 @@
1183
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D2_P2.xml b/drafter_13/annotations/C149_D2_P2.xml
index adc0937402047b47b6ab189485c28713e991e0d3..a48309d58ef5257641f3bfc9d47d59442428c06a 100644
--- a/drafter_13/annotations/C149_D2_P2.xml
+++ b/drafter_13/annotations/C149_D2_P2.xml
@@ -1608,4 +1608,153 @@
C1
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D2_P3.xml b/drafter_13/annotations/C149_D2_P3.xml
index 7220073e242a970628f311c74128c8d3269c3133..5fe3838be76b541d28f57bb7ab4c238842588b6b 100644
--- a/drafter_13/annotations/C149_D2_P3.xml
+++ b/drafter_13/annotations/C149_D2_P3.xml
@@ -1608,4 +1608,153 @@
1694
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C149_D2_P4.xml b/drafter_13/annotations/C149_D2_P4.xml
index 99fc638755fbad543ecdea970eb94d2af3248f12..b41631efcfe79841abbb38a8170d74aee7c4c19d 100644
--- a/drafter_13/annotations/C149_D2_P4.xml
+++ b/drafter_13/annotations/C149_D2_P4.xml
@@ -1608,4 +1608,153 @@
1560
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drafter_13/annotations/C150_D1_P1.xml b/drafter_13/annotations/C150_D1_P1.xml
index c24f16a968bf143cdb429bd9dd49af32edc39092..38a3cbb78080c123fba17137a00e54d9f7369e2a 100644
--- a/drafter_13/annotations/C150_D1_P1.xml
+++ b/drafter_13/annotations/C150_D1_P1.xml
@@ -21,6 +21,7 @@
1469
1087
1935
+ 2
@@ -300,4 +301,42 @@
1061
+
+
+
diff --git a/drafter_13/annotations/C150_D1_P2.xml b/drafter_13/annotations/C150_D1_P2.xml
index e9145c8a9dbbf1fde4c90d9e024e59cde3b21263..aed979e4da3c4e89b00b2e7af5e1699bb0f02e77 100644
--- a/drafter_13/annotations/C150_D1_P2.xml
+++ b/drafter_13/annotations/C150_D1_P2.xml
@@ -21,6 +21,7 @@
1503
1517
1787
+ 2
+
+
+
diff --git a/drafter_13/annotations/C150_D1_P3.xml b/drafter_13/annotations/C150_D1_P3.xml
index c8c93016e94bbaf0cffddfaebef659dc50e4a371..05a24f40ab99c54b6f2199495e5f2089dc36e998 100644
--- a/drafter_13/annotations/C150_D1_P3.xml
+++ b/drafter_13/annotations/C150_D1_P3.xml
@@ -21,6 +21,7 @@
1701
1681
1913
+ 15
+
+
+
diff --git a/drafter_13/annotations/C150_D1_P4.xml b/drafter_13/annotations/C150_D1_P4.xml
index 04f893b4568d1f79d6b061ed39ecb5dc88745260..8adaebab30d21c8a48f8cac5a615fb3b5eb28ae2 100644
--- a/drafter_13/annotations/C150_D1_P4.xml
+++ b/drafter_13/annotations/C150_D1_P4.xml
@@ -300,4 +300,42 @@
1218
+
+
+
diff --git a/drafter_13/annotations/C150_D2_P1.xml b/drafter_13/annotations/C150_D2_P1.xml
index aa29bea9d26d15c6fb821b81b1f1cdb8261a8f55..ac91552ed6ac8a5407b11c4f9ede28f925cf6776 100644
--- a/drafter_13/annotations/C150_D2_P1.xml
+++ b/drafter_13/annotations/C150_D2_P1.xml
@@ -301,4 +301,42 @@
I2
+
+
+
diff --git a/drafter_13/annotations/C150_D2_P2.xml b/drafter_13/annotations/C150_D2_P2.xml
index 55d034ab9b6cdc63da3b8ba48003e4872b701c19..665e55044ec6e5ce3a07899e05973a6ac7b663b8 100644
--- a/drafter_13/annotations/C150_D2_P2.xml
+++ b/drafter_13/annotations/C150_D2_P2.xml
@@ -33,6 +33,7 @@
1676
1494
1916
+ 8
+
+
+
diff --git a/drafter_13/annotations/C150_D2_P3.xml b/drafter_13/annotations/C150_D2_P3.xml
index 0d126413170ecdeb2213d6265e74f01a44a28006..2aac6ba1ebfdc955857b115a4902518f4357a46a 100644
--- a/drafter_13/annotations/C150_D2_P3.xml
+++ b/drafter_13/annotations/C150_D2_P3.xml
@@ -33,6 +33,7 @@
1676
2130
1817
+ 19
+
+
+
diff --git a/drafter_13/annotations/C150_D2_P4.xml b/drafter_13/annotations/C150_D2_P4.xml
index bc9adcd264435b4f0cbb46d0d28ce8d1b04bcda6..175a7553106ea661f723edaae10dea832fe1ee03 100644
--- a/drafter_13/annotations/C150_D2_P4.xml
+++ b/drafter_13/annotations/C150_D2_P4.xml
@@ -21,6 +21,7 @@
1690
1574
1846
+ 15
+
+
+
diff --git a/drafter_13/annotations/C151_D1_P1.xml b/drafter_13/annotations/C151_D1_P1.xml
index 8591485b1227aebaf3f73f8664fafe74094992cb..3fb85819f18aaf38c57082e3f17ea3cb3297d844 100644
--- a/drafter_13/annotations/C151_D1_P1.xml
+++ b/drafter_13/annotations/C151_D1_P1.xml
@@ -58,6 +58,7 @@
1162
1699
1250
+ 15
+
+
+
diff --git a/drafter_13/annotations/C153_D1_P2.xml b/drafter_13/annotations/C153_D1_P2.xml
index 422a1cf6cb7c8c44b0e5842f49a841db71bada14..b99cbbe6780a5977de41ec6ddaa76ad482d4c8e4 100644
--- a/drafter_13/annotations/C153_D1_P2.xml
+++ b/drafter_13/annotations/C153_D1_P2.xml
@@ -54,9 +54,9 @@
0
912
- 841
+ 830
1083
- 991
+ 1018
+
+
+
diff --git a/drafter_13/annotations/C153_D1_P3.xml b/drafter_13/annotations/C153_D1_P3.xml
index 9b042587d3ccefaa94045f37e4f55cbe0cca0601..c2faa912ded73e85b4386f40125190576fc4e176 100644
--- a/drafter_13/annotations/C153_D1_P3.xml
+++ b/drafter_13/annotations/C153_D1_P3.xml
@@ -18,9 +18,9 @@
0
1380
- 1485
+ 1444
1694
- 1741
+ 1816
+
+
+
diff --git a/drafter_13/annotations/C153_D1_P4.xml b/drafter_13/annotations/C153_D1_P4.xml
index 5baa293f50d8e562a01a08475643cd2a7476ad01..16f8a88d6c5eade26745fd00152fd71f5de71339 100644
--- a/drafter_13/annotations/C153_D1_P4.xml
+++ b/drafter_13/annotations/C153_D1_P4.xml
@@ -18,9 +18,9 @@
0
1751
- 1376
+ 1339
2009
- 1585
+ 1662
+
+
+
+
diff --git a/drafter_13/annotations/C153_D2_P1.xml b/drafter_13/annotations/C153_D2_P1.xml
index 7990c0cc247f87bc93075acf133a9008f59f9473..6d633f8d59ed70b81cfa6ada110d60bcdcf03f73 100644
--- a/drafter_13/annotations/C153_D2_P1.xml
+++ b/drafter_13/annotations/C153_D2_P1.xml
@@ -93,9 +93,9 @@
0
844
- 963
+ 911
1008
- 1179
+ 1248
+
+
+
diff --git a/drafter_13/annotations/C153_D2_P2.xml b/drafter_13/annotations/C153_D2_P2.xml
index 0d3805a07b7ff86107187a3b0d51ea1efbe169fc..81318328aa42598f1fa1904affbebb2d77efb119 100644
--- a/drafter_13/annotations/C153_D2_P2.xml
+++ b/drafter_13/annotations/C153_D2_P2.xml
@@ -54,9 +54,9 @@
0
942
- 1022
+ 993
1038
- 1145
+ 1187
+
+
+
diff --git a/drafter_13/annotations/C153_D2_P3.xml b/drafter_13/annotations/C153_D2_P3.xml
index eb7a2b0c92be0c83002e245b257c3b5cff457083..956fab4af5422c8b00f2b8e95377c2344e5f697e 100644
--- a/drafter_13/annotations/C153_D2_P3.xml
+++ b/drafter_13/annotations/C153_D2_P3.xml
@@ -18,9 +18,9 @@
0
1862
- 1906
+ 1841
2078
- 2209
+ 2310
+
+
+
diff --git a/drafter_13/annotations/C153_D2_P4.xml b/drafter_13/annotations/C153_D2_P4.xml
index 99ca4051b992097c61f19c067fcae47960cd8635..1eea655a410dc2ff54161c6b96b8d8cac34a39f9 100644
--- a/drafter_13/annotations/C153_D2_P4.xml
+++ b/drafter_13/annotations/C153_D2_P4.xml
@@ -18,9 +18,9 @@
0
1686
- 1690
+ 1642
1886
- 1926
+ 1985
+
+
+
diff --git a/drafter_13/annotations/C154_D1_P1.xml b/drafter_13/annotations/C154_D1_P1.xml
index d168a0f5251f611a82efb748e1959a12099a1aed..5cc06bb9a185b88abd021ccf8a7e25637239b7f2 100644
--- a/drafter_13/annotations/C154_D1_P1.xml
+++ b/drafter_13/annotations/C154_D1_P1.xml
@@ -425,4 +425,55 @@
405
+
+
+
+
diff --git a/drafter_13/annotations/C154_D1_P2.xml b/drafter_13/annotations/C154_D1_P2.xml
index 590c84674aa560642487fe6e38e1a8a7f78dfb28..c9f576b6e4cf253a59fc4a4b3ece5717c31d512a 100644
--- a/drafter_13/annotations/C154_D1_P2.xml
+++ b/drafter_13/annotations/C154_D1_P2.xml
@@ -96,7 +96,7 @@
869
611
- 1019
+ 1021
876
@@ -396,8 +396,8 @@
994
741
- 1013
- 758
+ 1011
+ 753
+
+
+
+
diff --git a/drafter_13/annotations/C154_D1_P3.xml b/drafter_13/annotations/C154_D1_P3.xml
index a1053a9840bf1f652ef462b776a34973f7d2341f..b839d95240ba058f43fb4782a0b42aed7a8174d5 100644
--- a/drafter_13/annotations/C154_D1_P3.xml
+++ b/drafter_13/annotations/C154_D1_P3.xml
@@ -21,6 +21,7 @@
831
2008
1007
+ 341
+
+
+
+
diff --git a/drafter_13/annotations/C154_D1_P4.xml b/drafter_13/annotations/C154_D1_P4.xml
index 73e6e98768c0fec05167136587fcb917f293a0c9..556275d8b11f4ab4d4847779da6f1cc4ad82d99b 100644
--- a/drafter_13/annotations/C154_D1_P4.xml
+++ b/drafter_13/annotations/C154_D1_P4.xml
@@ -133,9 +133,9 @@
0
0
- 2000
+ 1984
878
- 2353
+ 2355
1552
@@ -424,4 +424,55 @@
1538
+
+
+
+
diff --git a/drafter_13/annotations/C154_D2_P1.xml b/drafter_13/annotations/C154_D2_P1.xml
index de43c2486bc8a12518bad2d9d0e4050dc050dc33..27789a4f4f7a3489e9546ecb329683df6dac8bd1 100644
--- a/drafter_13/annotations/C154_D2_P1.xml
+++ b/drafter_13/annotations/C154_D2_P1.xml
@@ -18,7 +18,7 @@
0
802
- 409
+ 389
1048
773
@@ -463,4 +463,55 @@
L1
+
+
+
+
diff --git a/drafter_13/annotations/C154_D2_P2.xml b/drafter_13/annotations/C154_D2_P2.xml
index 39e50336b23455ec8cbad2f95cb8c8c6dd241a04..eb72bf4783c1e3637342e60426ccb21ed19445d8 100644
--- a/drafter_13/annotations/C154_D2_P2.xml
+++ b/drafter_13/annotations/C154_D2_P2.xml
@@ -21,6 +21,7 @@
632
736
716
+ 2
+
+
+
+
diff --git a/drafter_13/annotations/C154_D2_P3.xml b/drafter_13/annotations/C154_D2_P3.xml
index b771592c795dfaba9eb0ad1cf1a404ebe23eaf93..86d41d210f9720d1748f7c9e617a35f6ae72613f 100644
--- a/drafter_13/annotations/C154_D2_P3.xml
+++ b/drafter_13/annotations/C154_D2_P3.xml
@@ -18,8 +18,8 @@
0
2096
- 1372
- 2439
+ 1349
+ 2446
1856
@@ -463,4 +463,55 @@
L1
+
+
+
+
diff --git a/drafter_13/annotations/C154_D2_P4.xml b/drafter_13/annotations/C154_D2_P4.xml
index e86c9bb0da34514be0f0ab073c80fd6f5a9bf972..9128164d6c756108a6bea9fe8caade572761ae7a 100644
--- a/drafter_13/annotations/C154_D2_P4.xml
+++ b/drafter_13/annotations/C154_D2_P4.xml
@@ -17,10 +17,10 @@
0
0
- 1856
+ 1853
1497
- 2189
- 1939
+ 2195
+ 1952
+
+
+
+
diff --git a/drafter_13/annotations/C155_D1_P1.xml b/drafter_13/annotations/C155_D1_P1.xml
index 1899a8374329d90d104f24744ff1cdbbeaf82061..a971b93c1ce8406958dd18961608c170ad5de19d 100644
--- a/drafter_13/annotations/C155_D1_P1.xml
+++ b/drafter_13/annotations/C155_D1_P1.xml
@@ -47,6 +47,7 @@
624
957
694
+ 17
+
+
+
diff --git a/drafter_13/annotations/C155_D1_P2.xml b/drafter_13/annotations/C155_D1_P2.xml
index a4c1b85d6d1192c9c69b4b0ce71d9199a2e8979d..6837e61b2e08be0fb4d08884bf7f5c7fc3651d5b 100644
--- a/drafter_13/annotations/C155_D1_P2.xml
+++ b/drafter_13/annotations/C155_D1_P2.xml
@@ -59,6 +59,7 @@
607
884
638
+ 19
+
+
+
diff --git a/drafter_13/annotations/C155_D1_P3.xml b/drafter_13/annotations/C155_D1_P3.xml
index 1749cdc26b8b96ddf387a090ab4ec7fdf6c62462..9f6de0f151a4cf5ce245d8b3627b19b6c70b0125 100644
--- a/drafter_13/annotations/C155_D1_P3.xml
+++ b/drafter_13/annotations/C155_D1_P3.xml
@@ -18,9 +18,9 @@
0
2124
- 1287
+ 1283
2417
- 1552
+ 1555
+
+
+
diff --git a/drafter_13/annotations/C155_D1_P4.xml b/drafter_13/annotations/C155_D1_P4.xml
index e150840c8db054533b75a656d9920623171231fc..be74dd59e61d1ce799d3379edd8d0db683ff601a 100644
--- a/drafter_13/annotations/C155_D1_P4.xml
+++ b/drafter_13/annotations/C155_D1_P4.xml
@@ -70,6 +70,7 @@
1612
2131
1760
+ 35
+
+
+
diff --git a/drafter_13/annotations/C155_D2_P1.xml b/drafter_13/annotations/C155_D2_P1.xml
index 98bd37818c1f122d7a2d10310d158b832926c875..b0e719dd1898c9056d7c8ff99bfdb8713e1b29b7 100644
--- a/drafter_13/annotations/C155_D2_P1.xml
+++ b/drafter_13/annotations/C155_D2_P1.xml
@@ -300,4 +300,42 @@
1033
+
+
+
diff --git a/drafter_13/annotations/C155_D2_P2.xml b/drafter_13/annotations/C155_D2_P2.xml
index 4fecf9f9fad86a215f6f6ea07bdee4c7583a5e75..92f8b2c0d7908d365d3a02855c9ebd213104c849 100644
--- a/drafter_13/annotations/C155_D2_P2.xml
+++ b/drafter_13/annotations/C155_D2_P2.xml
@@ -43,8 +43,8 @@
994
669
- 1119
- 804
+ 1124
+ 808
@@ -299,4 +302,42 @@
635
+
+
+
diff --git a/drafter_13/annotations/C155_D2_P3.xml b/drafter_13/annotations/C155_D2_P3.xml
index 49474409ec806201ba236d55a00c6ba8884a523b..ce84d4950f20d6909fe0b75527baf0e016665514 100644
--- a/drafter_13/annotations/C155_D2_P3.xml
+++ b/drafter_13/annotations/C155_D2_P3.xml
@@ -18,9 +18,9 @@
0
2006
- 1375
+ 1374
2311
- 1675
+ 1692
@@ -299,4 +302,42 @@
R1
+
+
+
diff --git a/drafter_13/annotations/C155_D2_P4.xml b/drafter_13/annotations/C155_D2_P4.xml
index da715625a8fa3c5580828ae2f8b916cf77270287..a6430f58fb15e42b0fd845cacee53eb562098c5f 100644
--- a/drafter_13/annotations/C155_D2_P4.xml
+++ b/drafter_13/annotations/C155_D2_P4.xml
@@ -60,6 +60,7 @@
1599
3025
1661
+ 350
+
+
+
diff --git a/drafter_13/annotations/C156_D2_P1.xml b/drafter_13/annotations/C156_D2_P1.xml
index 377dac007211b0ec820c09d8431343c1e2036157..0b4ca2bb13ebdff2c59368bf0067f42904f2218e 100644
--- a/drafter_13/annotations/C156_D2_P1.xml
+++ b/drafter_13/annotations/C156_D2_P1.xml
@@ -263,4 +263,28 @@
R2
+
+
diff --git a/drafter_13/annotations/C156_D2_P2.xml b/drafter_13/annotations/C156_D2_P2.xml
index e74e5f5d78b12974996f1968104216d6e9fedfab..bda4748a90763332506de6fc6bad6cab23fe5648 100644
--- a/drafter_13/annotations/C156_D2_P2.xml
+++ b/drafter_13/annotations/C156_D2_P2.xml
@@ -262,4 +262,28 @@
R2
+
+
diff --git a/drafter_13/annotations/C156_D2_P3.xml b/drafter_13/annotations/C156_D2_P3.xml
index a9d92ee7f23fb22e79f60ba54dcffc7f6118e37e..32d42fb0bc7fe9dfa0c149b93dbbf86b345b70a4 100644
--- a/drafter_13/annotations/C156_D2_P3.xml
+++ b/drafter_13/annotations/C156_D2_P3.xml
@@ -262,4 +262,28 @@
1541
+
+
diff --git a/drafter_13/annotations/C156_D2_P4.xml b/drafter_13/annotations/C156_D2_P4.xml
index 5487bfa592eb1c4c9b8044e3f8a76e63b9d8878d..6a862a65a08fa4d63b640d1855903fa0278e3de6 100644
--- a/drafter_13/annotations/C156_D2_P4.xml
+++ b/drafter_13/annotations/C156_D2_P4.xml
@@ -262,4 +262,28 @@
2696
+
+
diff --git a/drafter_13/instances/C145_D1_P1.json b/drafter_13/instances/C145_D1_P1.json
index 065f47c9ab5bcee493827056609359345d9e55e2..74ccfc27f1bceb2c47efe2c13576093036d2a39d 100644
--- a/drafter_13/instances/C145_D1_P1.json
+++ b/drafter_13/instances/C145_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -51,6 +52,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -77,6 +79,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -103,6 +106,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -129,6 +133,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -155,6 +160,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -181,6 +187,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -207,6 +214,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -233,6 +241,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -259,6 +268,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -285,6 +295,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C147_D1_P1.json b/drafter_13/instances/C147_D1_P1.json
index 23993aa5e2789120e494835cfeacff7cf9c57881..775ada4c6aef75d3ae263f80e9b22d4719bb3aa7 100644
--- a/drafter_13/instances/C147_D1_P1.json
+++ b/drafter_13/instances/C147_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -51,6 +52,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -77,6 +79,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -103,6 +106,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -129,6 +133,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -155,6 +160,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -181,6 +187,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -207,6 +214,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -233,6 +241,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -259,6 +268,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -285,6 +295,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -311,6 +322,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -337,6 +349,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -363,6 +376,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -393,6 +407,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -419,6 +434,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -445,6 +461,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -471,6 +488,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -497,6 +515,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -523,6 +542,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -549,6 +569,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -575,6 +596,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -601,6 +623,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -627,6 +650,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C148_D1_P1.json b/drafter_13/instances/C148_D1_P1.json
index 457b541aae192dfdd41fc31c2184a6c40e370f16..6aa87456bc82e0353ad4cdcefedebb31dd0b66ae 100644
--- a/drafter_13/instances/C148_D1_P1.json
+++ b/drafter_13/instances/C148_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -37,6 +37,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -75,6 +76,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -113,6 +115,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -139,6 +142,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -165,6 +169,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -191,6 +196,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -217,6 +223,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -243,6 +250,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -269,6 +277,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -295,6 +304,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -321,6 +331,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -347,6 +358,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -373,6 +385,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -399,6 +412,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -425,6 +439,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -455,6 +470,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -481,6 +497,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -507,6 +524,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -533,6 +551,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -559,6 +578,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -585,6 +605,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -611,6 +632,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -637,6 +659,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -663,6 +686,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -689,6 +713,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -715,6 +740,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -741,6 +767,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -767,6 +794,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -797,6 +825,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -823,6 +852,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -849,6 +879,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -875,6 +906,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -901,6 +933,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -927,6 +960,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -953,6 +987,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -979,6 +1014,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1005,6 +1041,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1031,6 +1068,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1057,6 +1095,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1083,6 +1122,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1109,6 +1149,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1135,6 +1176,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1161,6 +1203,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1187,6 +1230,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1213,6 +1257,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1239,6 +1284,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1265,6 +1311,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1291,6 +1338,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1317,6 +1365,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1343,6 +1392,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1369,6 +1419,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1395,6 +1446,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1421,6 +1473,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1447,6 +1500,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1473,6 +1527,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1499,6 +1554,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1525,6 +1581,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1551,6 +1608,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1577,6 +1635,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1603,6 +1662,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1629,6 +1689,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1655,6 +1716,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1681,6 +1743,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1707,6 +1770,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1733,6 +1797,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1759,6 +1824,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1785,6 +1851,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1811,6 +1878,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1837,6 +1905,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1863,6 +1932,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1889,6 +1959,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1915,6 +1986,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1941,6 +2013,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C150_D2_P1.json b/drafter_13/instances/C150_D2_P1.json
index 2bc1f655fc07625da920841b4ad9ea5d4deb8023..bdab933734a14929af5c5577a3b5cd2547ecf688 100644
--- a/drafter_13/instances/C150_D2_P1.json
+++ b/drafter_13/instances/C150_D2_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -8,16 +8,44 @@
"label": "transformer",
"points": [
[
- 1599.0,
- 1172.0
+ 1735.2307692307693,
+ 1170.4615384615386
],
[
- 1599.0,
- 1913.0
+ 1586.0000000000002,
+ 1215.076923076923
],
[
- 2375.0,
- 1913.0
+ 1609.0769230769233,
+ 1432.0
+ ],
+ [
+ 1642.9230769230771,
+ 1750.4615384615386
+ ],
+ [
+ 1656.769230769231,
+ 1916.6153846153848
+ ],
+ [
+ 1850.6153846153848,
+ 1907.3846153846155
+ ],
+ [
+ 1881.3846153846155,
+ 1844.3076923076924
+ ],
+ [
+ 2164.4615384615386,
+ 1881.2307692307693
+ ],
+ [
+ 2201.3846153846152,
+ 1924.3076923076924
+ ],
+ [
+ 2373.6923076923076,
+ 1936.6153846153848
],
[
2384.090909090909,
@@ -33,6 +61,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -59,6 +88,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -85,6 +115,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -111,6 +142,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -137,6 +169,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -163,6 +196,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -189,6 +223,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -215,6 +250,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -241,6 +277,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -267,6 +304,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -293,6 +331,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -319,6 +358,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -345,6 +385,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -371,6 +412,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -397,6 +439,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -423,6 +466,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -449,6 +493,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -475,6 +520,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -501,6 +547,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -527,6 +574,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -553,6 +601,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -579,6 +628,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -605,6 +655,100 @@
]
],
"group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "magnetic",
+ "points": [
+ [
+ 1812.1538461538462,
+ 1193.5384615384617
+ ],
+ [
+ 2121.3846153846152,
+ 1187.3846153846155
+ ],
+ [
+ 2166.0,
+ 1862.769230769231
+ ],
+ [
+ 1882.9230769230771,
+ 1828.923076923077
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 2169.076923076923,
+ 1185.846153846154
+ ],
+ [
+ 2359.846153846154,
+ 1182.769230769231
+ ],
+ [
+ 2347.5384615384614,
+ 1407.3846153846155
+ ],
+ [
+ 2373.6923076923076,
+ 1581.2307692307693
+ ],
+ [
+ 2361.3846153846152,
+ 1918.1538461538462
+ ],
+ [
+ 2215.230769230769,
+ 1905.846153846154
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 1596.769230769231,
+ 1228.9230769230771
+ ],
+ [
+ 1736.769230769231,
+ 1195.076923076923
+ ],
+ [
+ 1806.0000000000002,
+ 1484.3076923076924
+ ],
+ [
+ 1839.846153846154,
+ 1887.3846153846155
+ ],
+ [
+ 1672.1538461538462,
+ 1902.769230769231
+ ]
+ ],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C153_D1_P1.json b/drafter_13/instances/C153_D1_P1.json
index efe96e129d8b210576c022d7ecedf2e149fd8a4c..184920674554a609742cd762b17aaa8ec96de77b 100644
--- a/drafter_13/instances/C153_D1_P1.json
+++ b/drafter_13/instances/C153_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -8,59 +8,64 @@
"label": "transformer",
"points": [
[
- 812.2340425531914,
- 892.0212765957447
+ 795.9601769911504,
+ 890.7079646017698
],
[
- 790.4255319148936,
- 859.0425531914893
+ 791.0929203539823,
+ 855.3097345132743
],
[
- 748.4042553191489,
- 861.1702127659574
+ 752.5973451327434,
+ 859.7345132743362
],
[
- 730.3191489361702,
- 889.8936170212766
+ 753.0398230088496,
+ 884.5132743362831
],
[
- 649.2673992673992,
- 891.3919413919414
+ 649.5,
+ 901.3274336283185
],
[
651.5555555555555,
947.5555555555555
],
[
- 685.7777777777778,
- 1070.6666666666667
+ 672.066371681416,
+ 979.646017699115
],
[
- 743.0851063829787,
- 1079.255319148936
+ 689.3230088495576,
+ 1074.7787610619469
],
[
- 767.5531914893617,
- 1120.7446808510638
+ 761.4469026548672,
+ 1075.6637168141592
],
[
- 811.7021276595744,
- 1117.0212765957447
+ 767.1991150442478,
+ 1123.4513274336282
],
[
- 830.3191489361701,
- 1067.0212765957447
+ 814.1017699115044,
+ 1120.3539823008848
],
[
- 879.0,
- 1070.0
+ 810.1194690265487,
+ 1053.0973451327432
],
[
- 877.659574468085,
- 889.8936170212766
+ 881.358407079646,
+ 1052.2123893805308
+ ],
+ [
+ 862.3318584070796,
+ 885.3982300884954
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -87,6 +92,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -117,6 +123,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -143,6 +150,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -169,6 +177,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -195,6 +204,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -221,6 +231,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -247,6 +258,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -277,6 +289,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -303,6 +316,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -329,6 +343,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -355,6 +370,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -385,6 +401,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -411,6 +428,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -437,6 +455,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -463,6 +482,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -501,6 +521,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -527,6 +548,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -553,6 +575,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -579,6 +602,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -605,6 +629,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -631,6 +656,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -657,6 +683,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -683,6 +710,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -709,6 +737,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -735,6 +764,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -761,6 +791,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -787,6 +818,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -813,6 +845,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -839,6 +872,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -865,6 +899,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -891,6 +926,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -917,6 +953,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -943,6 +980,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -969,6 +1007,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -995,6 +1034,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1021,6 +1061,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1047,6 +1088,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1073,6 +1115,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1127,6 +1170,96 @@
]
],
"group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 654.3672566371682,
+ 906.6371681415928
+ ],
+ [
+ 748.6150442477876,
+ 891.150442477876
+ ],
+ [
+ 762.3318584070797,
+ 1067.2566371681414
+ ],
+ [
+ 692.4203539823009,
+ 1069.4690265486724
+ ],
+ [
+ 677.3761061946904,
+ 976.5486725663716
+ ],
+ [
+ 655.6946902654868,
+ 942.0353982300884
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "magnetic",
+ "points": [
+ [
+ 757.9070796460177,
+ 865.4867256637167
+ ],
+ [
+ 785.783185840708,
+ 862.8318584070796
+ ],
+ [
+ 807.0221238938053,
+ 1116.371681415929
+ ],
+ [
+ 773.8362831858408,
+ 1117.6991150442477
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 800.3849557522124,
+ 896.0176991150441
+ ],
+ [
+ 857.4646017699115,
+ 889.8230088495575
+ ],
+ [
+ 874.278761061947,
+ 1047.3451327433627
+ ],
+ [
+ 820.2964601769912,
+ 1045.1327433628317
+ ]
+ ],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C154_D1_P1.json b/drafter_13/instances/C154_D1_P1.json
index 143054b99752ee974bd8e2ad8593480209e7402a..38fd4dbab9246e8168f9b277d570a432e683bb78 100644
--- a/drafter_13/instances/C154_D1_P1.json
+++ b/drafter_13/instances/C154_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -51,6 +52,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -77,6 +79,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -103,6 +106,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -133,6 +137,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -159,6 +164,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -185,6 +191,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -211,6 +218,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -237,6 +245,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -263,6 +272,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -272,23 +282,24 @@
"label": "text",
"points": [
[
- 706.0,
+ 699.5483870967743,
451.0
],
[
- 706.0,
+ 699.5483870967743,
526.0
],
[
- 759.0,
+ 752.5483870967743,
526.0
],
[
- 759.0,
+ 752.5483870967743,
451.0
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -315,6 +326,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -324,23 +336,24 @@
"label": "text",
"points": [
[
- 1004.0,
- 376.0
+ 1005.4598540145985,
+ 370.8905109489051
],
[
- 1004.0,
- 442.0
+ 1006.2043795620438,
+ 435.33576642335765
],
[
- 1065.0,
- 442.0
+ 1066.4598540145985,
+ 436.8905109489051
],
[
- 1065.0,
- 376.0
+ 1066.4598540145985,
+ 370.8905109489051
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -367,6 +380,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -376,23 +390,24 @@
"label": "text",
"points": [
[
- 1012.0,
- 614.0
+ 1011.270072992701,
+ 619.1094890510949
],
[
- 1012.0,
- 686.0
+ 1019.7080291970802,
+ 692.2700729927008
],
[
- 1079.0,
- 686.0
+ 1078.2700729927005,
+ 691.1094890510949
],
[
- 1079.0,
- 614.0
+ 1078.2700729927005,
+ 619.1094890510949
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -423,6 +438,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -449,6 +465,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -475,6 +492,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -484,32 +502,36 @@
"label": "transformer",
"points": [
[
- 847.3469387755101,
- 353.87755102040813
+ 865.1685393258426,
+ 359.5505617977528
],
[
- 845.5102040816325,
- 415.1020408163265
+ 868.6131386861313,
+ 417.0875912408759
],
[
- 758.9795918367346,
- 425.91836734693874
+ 756.4516129032257,
+ 424.72043010752685
],
[
- 758.8495575221239,
- 655.3097345132743
+ 754.8387096774193,
+ 543.5376344086021
],
[
- 861.504424778761,
- 654.4247787610619
+ 776.3440860215053,
+ 660.2043010752687
],
[
- 859.29203539823,
- 828.3185840707964
+ 872.2627737226277,
+ 652.4890510948906
],
[
- 972.8723404255319,
- 827.6595744680851
+ 872.9927007299269,
+ 824.7518248175182
+ ],
+ [
+ 924.4525547445255,
+ 807.2335766423357
],
[
972.8723404255319,
@@ -532,23 +554,28 @@
521.4285714285714
],
[
- 1007.7551020408163,
- 518.5714285714286
+ 1004.0145985401459,
+ 515.6277372262774
],
[
- 1002.8571428571428,
- 381.63265306122446
+ 1007.2992700729926,
+ 470.37226277372264
],
[
- 959.5918367346939,
- 381.2244897959183
+ 997.8102189781021,
+ 379.1313868613139
],
[
- 959.5918367346939,
- 355.3061224489796
+ 952.919708029197,
+ 376.94160583941607
+ ],
+ [
+ 910.2189781021897,
+ 350.2992700729927
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -575,6 +602,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -601,6 +629,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -627,6 +656,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -653,6 +683,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -679,6 +710,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -705,6 +737,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -731,6 +764,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -757,6 +791,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -783,6 +818,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -809,6 +845,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -835,6 +872,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -861,6 +899,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -887,6 +926,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -913,6 +953,139 @@
]
],
"group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "magnetic",
+ "points": [
+ [
+ 872.661870503597,
+ 365.46762589928056
+ ],
+ [
+ 905.0359712230215,
+ 355.3956834532374
+ ],
+ [
+ 919.4244604316546,
+ 803.5971223021583
+ ],
+ [
+ 877.6978417266187,
+ 818.705035971223
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 760.2150537634408,
+ 431.7096774193548
+ ],
+ [
+ 818.2795698924731,
+ 423.64516129032256
+ ],
+ [
+ 839.7849462365591,
+ 510.2043010752688
+ ],
+ [
+ 853.763440860215,
+ 603.2150537634409
+ ],
+ [
+ 830.6451612903226,
+ 650.5268817204301
+ ],
+ [
+ 780.6451612903226,
+ 653.2150537634409
+ ],
+ [
+ 758.6021505376343,
+ 541.9247311827957
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 1000.7299270072992,
+ 513.07299270073
+ ],
+ [
+ 964.2335766423357,
+ 510.88321167883214
+ ],
+ [
+ 937.5912408759124,
+ 399.2043795620438
+ ],
+ [
+ 952.5547445255473,
+ 383.1459854014599
+ ],
+ [
+ 994.890510948905,
+ 383.5109489051095
+ ],
+ [
+ 1004.0145985401459,
+ 470.37226277372264
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 961.6788321167883,
+ 625.4817518248175
+ ],
+ [
+ 1005.1094890510948,
+ 624.021897810219
+ ],
+ [
+ 1015.6934306569342,
+ 706.5036496350365
+ ],
+ [
+ 1022.2627737226277,
+ 772.5620437956204
+ ],
+ [
+ 974.0875912408758,
+ 774.3868613138686
+ ]
+ ],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C155_D1_P1.json b/drafter_13/instances/C155_D1_P1.json
index 31c2de07a825286453c32bf6380ebc0f98b10d51..ce1d52eedf6878d4a4bfecbc90c893a4b87d72f8 100644
--- a/drafter_13/instances/C155_D1_P1.json
+++ b/drafter_13/instances/C155_D1_P1.json
@@ -1,11 +1,11 @@
{
- "version": "3.16.7",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
- "label": "resistor",
"line_color": null,
"fill_color": null,
+ "label": "resistor",
"points": [
[
398.0,
@@ -24,13 +24,15 @@
650.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "resistor",
"line_color": null,
"fill_color": null,
+ "label": "resistor",
"points": [
[
1317.0,
@@ -49,13 +51,15 @@
570.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "inductor",
"line_color": null,
"fill_color": null,
+ "label": "inductor",
"points": [
[
722.0,
@@ -78,13 +82,15 @@
624.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "inductor",
"line_color": null,
"fill_color": null,
+ "label": "inductor",
"points": [
[
1576.0,
@@ -111,38 +117,42 @@
557.2368421052631
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "transformer",
"line_color": null,
"fill_color": null,
+ "label": "transformer",
"points": [
[
- 1022.0,
- 719.0
+ 1024.4979919678715,
+ 721.2128514056225
],
[
- 1049.4705882352941,
- 936.7647058823529
+ 1057.8313253012047,
+ 935.6706827309237
],
[
- 1245.0,
- 935.0
+ 1252.610441767068,
+ 920.8112449799197
],
[
- 1245.0,
- 719.0
+ 1229.718875502008,
+ 710.7710843373494
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "resistor",
"line_color": null,
"fill_color": null,
+ "label": "resistor",
"points": [
[
1776.0,
@@ -161,13 +171,15 @@
645.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
289.0,
@@ -186,42 +198,46 @@
842.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
- 974.0088105726873,
- 789.4273127753304
+ 972.4023848698761,
+ 786.2144613697079
],
[
- 973.568281938326,
- 829.0748898678414
+ 971.9618562355148,
+ 825.862038462219
],
[
- 978.4140969162995,
- 884.1409691629956
+ 976.8076712134883,
+ 880.9281177573731
],
[
- 1040.0,
- 885.0
+ 1038.393574297189,
+ 881.7871485943775
],
[
- 1040.0,
- 789.0
+ 1027.3092369477913,
+ 795.9116465863455
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
545.0,
@@ -240,13 +256,15 @@
559.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
903.0,
@@ -265,13 +283,15 @@
549.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1252.0,
@@ -290,13 +310,15 @@
755.8823529411765
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1675.0,
@@ -315,13 +337,15 @@
725.3687315634218
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1441.0,
@@ -340,13 +364,15 @@
492.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1710.0,
@@ -365,13 +391,15 @@
494.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1804.9079754601225,
@@ -390,13 +418,15 @@
676.0736196319018
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "terminal",
"line_color": null,
"fill_color": null,
+ "label": "terminal",
"points": [
[
215.0,
@@ -415,13 +445,15 @@
701.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "terminal",
"line_color": null,
"fill_color": null,
+ "label": "terminal",
"points": [
[
273.6714975845411,
@@ -440,13 +472,15 @@
1065.9420289855072
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1010.0,
@@ -465,13 +499,15 @@
629.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1192.0,
@@ -490,13 +526,15 @@
606.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1063.0,
@@ -515,13 +553,15 @@
1021.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1217.0,
@@ -540,13 +580,15 @@
1000.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1809.0,
@@ -565,13 +607,15 @@
954.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1790.1315789473683,
@@ -590,10 +634,101 @@
569.0
]
],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "magnetic",
+ "points": [
+ [
+ 1109.2369477911645,
+ 726.8353413654619
+ ],
+ [
+ 1148.59437751004,
+ 718.0
+ ],
+ [
+ 1178.7148594377509,
+ 923.6224899598394
+ ],
+ [
+ 1141.3654618473895,
+ 918.4016064257028
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 1156.6265060240962,
+ 750.128514056225
+ ],
+ [
+ 1173.8955823293172,
+ 727.6385542168675
+ ],
+ [
+ 1226.5060240963855,
+ 722.0160642570281
+ ],
+ [
+ 1244.5783132530119,
+ 879.847389558233
+ ],
+ [
+ 1194.7791164658634,
+ 886.2730923694779
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 1028.9156626506024,
+ 734.8674698795181
+ ],
+ [
+ 1094.3775100401606,
+ 725.2289156626506
+ ],
+ [
+ 1136.9477911646586,
+ 925.2289156626506
+ ],
+ [
+ 1063.0522088353412,
+ 931.2530120481928
+ ]
+ ],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
],
+ "imagePath": "../segmentation/C155_D1_P1.jpg",
+ "imageData": null,
+ "imageHeight": 1536,
+ "imageWidth": 2049,
"lineColor": [
0,
255,
@@ -605,9 +740,5 @@
0,
0,
128
- ],
- "imagePath": "../segmentation/C155_D1_P1.jpg",
- "imageData": null,
- "imageHeight": 1536,
- "imageWidth": 2049
+ ]
}
\ No newline at end of file
diff --git a/drafter_13/instances/C155_D2_P1.json b/drafter_13/instances/C155_D2_P1.json
index 9c0c8d5090b16c9704b59ac9b59ac2e2c5c0bbb0..d98023b0b27126e1035b7d82595d6959e1a9d62c 100644
--- a/drafter_13/instances/C155_D2_P1.json
+++ b/drafter_13/instances/C155_D2_P1.json
@@ -1,11 +1,11 @@
{
- "version": "3.16.7",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
- "label": "resistor",
"line_color": null,
"fill_color": null,
+ "label": "resistor",
"points": [
[
238.0,
@@ -24,13 +24,15 @@
434.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "resistor",
"line_color": null,
"fill_color": null,
+ "label": "resistor",
"points": [
[
1285.0,
@@ -49,13 +51,15 @@
451.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "resistor",
"line_color": null,
"fill_color": null,
+ "label": "resistor",
"points": [
[
1846.0,
@@ -74,13 +78,15 @@
572.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "inductor",
"line_color": null,
"fill_color": null,
+ "label": "inductor",
"points": [
[
615.0,
@@ -99,13 +105,15 @@
450.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "inductor",
"line_color": null,
"fill_color": null,
+ "label": "inductor",
"points": [
[
1556.0,
@@ -124,38 +132,66 @@
446.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "transformer",
"line_color": null,
"fill_color": null,
+ "label": "transformer",
"points": [
[
- 934.0,
- 638.0
+ 1061.4469026548672,
+ 664.6017699115043
],
[
- 934.0,
- 872.0
+ 1052.5973451327434,
+ 643.8053097345132
],
[
- 1150.0,
- 872.0
+ 939.3230088495575,
+ 650.8849557522124
],
[
- 1150.0,
- 638.0
+ 936.6681415929204,
+ 883.1858407079645
+ ],
+ [
+ 997.287610619469,
+ 878.7610619469026
+ ],
+ [
+ 1003.9247787610619,
+ 860.1769911504424
+ ],
+ [
+ 1048.6150442477876,
+ 880.5309734513273
+ ],
+ [
+ 1095.5176991150443,
+ 863.2743362831858
+ ],
+ [
+ 1150.8274336283187,
+ 859.7345132743362
+ ],
+ [
+ 1146.845132743363,
+ 658.8495575221239
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "terminal",
"line_color": null,
"fill_color": null,
+ "label": "terminal",
"points": [
[
68.0,
@@ -174,13 +210,15 @@
478.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "terminal",
"line_color": null,
"fill_color": null,
+ "label": "terminal",
"points": [
[
78.0,
@@ -199,13 +237,15 @@
1005.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
396.0,
@@ -224,13 +264,15 @@
356.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
765.0,
@@ -249,13 +291,15 @@
367.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
72.0,
@@ -282,13 +326,15 @@
731.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
855.0,
@@ -307,13 +353,15 @@
712.6530612244898
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1161.0,
@@ -332,13 +380,15 @@
694.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1400.0,
@@ -357,13 +407,15 @@
377.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1705.0,
@@ -382,13 +434,15 @@
373.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1757.0,
@@ -411,13 +465,15 @@
672.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "text",
"line_color": null,
"fill_color": null,
+ "label": "text",
"points": [
[
1874.0,
@@ -436,13 +492,15 @@
603.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
931.0,
@@ -461,13 +519,15 @@
481.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1111.0,
@@ -486,13 +546,15 @@
484.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1114.0,
@@ -511,13 +573,15 @@
998.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
934.0,
@@ -536,13 +600,15 @@
992.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1869.0,
@@ -561,13 +627,15 @@
465.0
]
],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
- "label": "junction",
"line_color": null,
"fill_color": null,
+ "label": "junction",
"points": [
[
1878.0,
@@ -586,10 +654,97 @@
985.0
]
],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "magnetic",
+ "points": [
+ [
+ 1005.2522123893805,
+ 655.7522123893805
+ ],
+ [
+ 1049.0575221238937,
+ 650.4424778761062
+ ],
+ [
+ 1047.7300884955753,
+ 875.221238938053
+ ],
+ [
+ 1003.4823008849557,
+ 853.9823008849556
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 1086.6681415929204,
+ 666.8141592920354
+ ],
+ [
+ 1143.3053097345132,
+ 665.0442477876105
+ ],
+ [
+ 1144.632743362832,
+ 854.4247787610618
+ ],
+ [
+ 1096.4026548672566,
+ 857.5221238938052
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 942.862831858407,
+ 655.7522123893805
+ ],
+ [
+ 991.9778761061947,
+ 654.8672566371681
+ ],
+ [
+ 992.862831858407,
+ 874.3362831858407
+ ],
+ [
+ 940.6504424778761,
+ 876.9911504424778
+ ]
+ ],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
],
+ "imagePath": "../segmentation/C155_D2_P1.jpg",
+ "imageData": null,
+ "imageHeight": 1536,
+ "imageWidth": 2049,
"lineColor": [
0,
255,
@@ -601,9 +756,5 @@
0,
0,
128
- ],
- "imagePath": "../segmentation/C155_D2_P1.jpg",
- "imageData": null,
- "imageHeight": 1536,
- "imageWidth": 2049
+ ]
}
\ No newline at end of file
diff --git a/drafter_13/instances/C156_D1_P1.json b/drafter_13/instances/C156_D1_P1.json
index 421fc6cb7ad1a26bc095e62e74e50f8bd1a3a095..806d617606d9de5563a25ba808f615404e763c2c 100644
--- a/drafter_13/instances/C156_D1_P1.json
+++ b/drafter_13/instances/C156_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -33,6 +33,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -59,6 +60,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -93,6 +95,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -123,6 +126,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -149,6 +153,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -175,6 +180,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -201,6 +207,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -227,6 +234,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -253,6 +261,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -279,6 +288,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -305,6 +315,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -331,6 +342,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -357,6 +369,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -383,6 +396,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -413,6 +427,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -439,6 +454,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -465,6 +481,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -495,6 +512,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -521,6 +539,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -547,6 +566,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -573,6 +593,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_13/instances/C156_D2_P1.json b/drafter_13/instances/C156_D2_P1.json
index d7277a05bb8f8dc723f90f23a655f0ea0baea32e..ea563a77e58238fe0f8f08c1388cffb725955587 100644
--- a/drafter_13/instances/C156_D2_P1.json
+++ b/drafter_13/instances/C156_D2_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -33,6 +33,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -59,6 +60,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -93,6 +95,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -123,6 +126,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -149,6 +153,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -191,6 +196,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -217,6 +223,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -243,6 +250,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -273,6 +281,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -299,6 +308,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -325,6 +335,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -351,6 +362,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -377,6 +389,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -403,6 +416,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -429,6 +443,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -455,6 +470,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -481,6 +497,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -507,6 +524,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -533,6 +551,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -559,6 +578,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -585,6 +605,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -611,6 +632,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/annotations/C157_D1_P1.xml b/drafter_14/annotations/C157_D1_P1.xml
index ad4f74882e93c6dbfe07a9d8fa75e7b452e81b0f..6ab28acd7bc9eea68128f1f1dae91a64edf38a09 100644
--- a/drafter_14/annotations/C157_D1_P1.xml
+++ b/drafter_14/annotations/C157_D1_P1.xml
@@ -212,7 +212,7 @@
1862
932
- 2192
+ 2200
1142
@@ -384,4 +384,40 @@
VS
+
+
+
diff --git a/drafter_14/annotations/C157_D1_P2.xml b/drafter_14/annotations/C157_D1_P2.xml
index 26c1274c16dc8e35f414560997022a685800d8cf..68d841fc1ca7c618dd4dc61dd4b04c961469bae8 100644
--- a/drafter_14/annotations/C157_D1_P2.xml
+++ b/drafter_14/annotations/C157_D1_P2.xml
@@ -56,7 +56,7 @@
1960
974
- 2299
+ 2309
1210
@@ -70,6 +70,7 @@
1190
2674
1424
+ 94
+
+
+
diff --git a/drafter_14/annotations/C157_D1_P3.xml b/drafter_14/annotations/C157_D1_P3.xml
index 73dd080b446fad74b1d8fd42ece77e1337ba7eab..5ef730d27ee6bab13761b2036c3625d6f9481ee3 100644
--- a/drafter_14/annotations/C157_D1_P3.xml
+++ b/drafter_14/annotations/C157_D1_P3.xml
@@ -21,7 +21,7 @@
888
1135
1017
- 360
+ 6
@@ -83,6 +83,7 @@
1505
2421
1691
+ 85
+
+
+
diff --git a/drafter_14/annotations/C157_D1_P4.xml b/drafter_14/annotations/C157_D1_P4.xml
index 8c2c7544adcfe7805cb1ee970d2121df332ae8a1..53a96da3360d51e2dded9763586a5ffef5f76428 100644
--- a/drafter_14/annotations/C157_D1_P4.xml
+++ b/drafter_14/annotations/C157_D1_P4.xml
@@ -44,7 +44,7 @@
1942
1188
- 2240
+ 2248
1429
@@ -58,6 +58,7 @@
1359
2560
1588
+ 92
+
+
+
diff --git a/drafter_14/annotations/C157_D2_P1.xml b/drafter_14/annotations/C157_D2_P1.xml
index c5d41ac977d9c7fc91c6390313ab4f180639caff..db3bbb59b3066ead1493022bd89eac176ac0e9eb 100644
--- a/drafter_14/annotations/C157_D2_P1.xml
+++ b/drafter_14/annotations/C157_D2_P1.xml
@@ -70,7 +70,7 @@
1518
1649
1779
- 99
+ 92
+
+
+
diff --git a/drafter_14/annotations/C157_D2_P2.xml b/drafter_14/annotations/C157_D2_P2.xml
index c9049d16bbc0aac38e4e111fa4dea4845cc73118..86beb6d34d0537721f468bb8a8786f136a111bc5 100644
--- a/drafter_14/annotations/C157_D2_P2.xml
+++ b/drafter_14/annotations/C157_D2_P2.xml
@@ -21,7 +21,7 @@
405
1200
551
- 360
+ 358
+
+
+
diff --git a/drafter_14/annotations/C157_D2_P3.xml b/drafter_14/annotations/C157_D2_P3.xml
index cc05b3466542cbdc16314295b453d158e6a21325..5c35b0e17a752a71769006221e39e693b95129d5 100644
--- a/drafter_14/annotations/C157_D2_P3.xml
+++ b/drafter_14/annotations/C157_D2_P3.xml
@@ -58,6 +58,7 @@
1181
2335
1448
+ 89
+
+
+
diff --git a/drafter_14/annotations/C157_D2_P4.xml b/drafter_14/annotations/C157_D2_P4.xml
index 90681ead870ee3963cd4513a4b70d41db2ae11de..b3f371efdcc7241c5cb49a47b977b3da4b9bab81 100644
--- a/drafter_14/annotations/C157_D2_P4.xml
+++ b/drafter_14/annotations/C157_D2_P4.xml
@@ -21,7 +21,7 @@
476
1160
602
- 360
+ 6
+
+
+
diff --git a/drafter_14/annotations/C158_D1_P1.xml b/drafter_14/annotations/C158_D1_P1.xml
index ef5c53e2a675558f8880e56832cb2025ecaf0ba5..58bf3dcae2f6c1ac440644109cb6022c3ca3b064 100644
--- a/drafter_14/annotations/C158_D1_P1.xml
+++ b/drafter_14/annotations/C158_D1_P1.xml
@@ -217,7 +217,7 @@
1743
412
- 220Ω
+ 220
@@ -279,7 +281,7 @@
842
1210
- MOV
+ 140V
@@ -422,7 +424,7 @@
1741
1345
- 1000µF
+ 1000uF
+
+
+
+
diff --git a/drafter_14/annotations/C160_D1_P2.xml b/drafter_14/annotations/C160_D1_P2.xml
index f8eab8de3a98d8e0f50e5a353bd37147a88c36a4..a667930a3fcc02541634f31da1bc4b152baf9ea5 100644
--- a/drafter_14/annotations/C160_D1_P2.xml
+++ b/drafter_14/annotations/C160_D1_P2.xml
@@ -21,6 +21,7 @@
691
472
891
+ 6
@@ -290,7 +292,7 @@
812
934
- MOV
+ 140V
+
+
+
diff --git a/drafter_14/annotations/C160_D1_P3.xml b/drafter_14/annotations/C160_D1_P3.xml
index fc77b97beddbe2a05f919bbca978b61b59e85afc..088ef7e1158bf66be9750580c675c52655b65ac3 100644
--- a/drafter_14/annotations/C160_D1_P3.xml
+++ b/drafter_14/annotations/C160_D1_P3.xml
@@ -21,6 +21,7 @@
615
551
851
+ 4
+
+
+
diff --git a/drafter_14/annotations/C160_D1_P4.xml b/drafter_14/annotations/C160_D1_P4.xml
index 0f7c71509cb7664d52384de12226fc097ba11e31..c7b3d779d812647919153d3c54ff1ba1f8d0d079 100644
--- a/drafter_14/annotations/C160_D1_P4.xml
+++ b/drafter_14/annotations/C160_D1_P4.xml
@@ -46,6 +46,7 @@
848
875
1116
+ 90
@@ -266,7 +267,7 @@
658
1238
- 120RΩ
+ 120R
+
+
+
diff --git a/drafter_14/annotations/C160_D2_P1.xml b/drafter_14/annotations/C160_D2_P1.xml
index 7dc2c444fdbb91bc411bddbf2d7cc7adfa104a16..68b8a8146d0d5bc59fad0fc72c19e5e90a4174ce 100644
--- a/drafter_14/annotations/C160_D2_P1.xml
+++ b/drafter_14/annotations/C160_D2_P1.xml
@@ -33,6 +33,7 @@
885
1015
1158
+ 90
@@ -394,7 +395,7 @@
2092
1055
- 100RΩ
+ 100R
+
+
diff --git a/drafter_14/annotations/C160_D2_P2.xml b/drafter_14/annotations/C160_D2_P2.xml
index 23acc34b303bc2ce1d06c2140919658aad0a7e4b..0dc4fd81a6fe372c8451dfcabce593af8156a5bf 100644
--- a/drafter_14/annotations/C160_D2_P2.xml
+++ b/drafter_14/annotations/C160_D2_P2.xml
@@ -47,6 +47,7 @@
758
899
1024
+ 90
@@ -303,7 +304,7 @@
735
900
- MOV
+ 140V
+
+
diff --git a/drafter_14/annotations/C160_D2_P3.xml b/drafter_14/annotations/C160_D2_P3.xml
index a25d88f367239edcbe18eda6633adae33728d108..a1f763589942cd48e215fb946bbbf7987e2b8d01 100644
--- a/drafter_14/annotations/C160_D2_P3.xml
+++ b/drafter_14/annotations/C160_D2_P3.xml
@@ -47,6 +47,7 @@
911
952
1178
+ 90
@@ -958,7 +959,7 @@
1131
516
- C1µF
+ C1
+
+
diff --git a/drafter_14/annotations/C160_D2_P4.xml b/drafter_14/annotations/C160_D2_P4.xml
index 26ca7b48a8e9e5e6d014837844efcbf811a8d1e3..e6756b563a724041f84bf6e5d806eb677815aad0 100644
--- a/drafter_14/annotations/C160_D2_P4.xml
+++ b/drafter_14/annotations/C160_D2_P4.xml
@@ -34,6 +34,7 @@
898
2080
1008
+ 15
@@ -317,9 +318,9 @@
902
183
1582
- 387
+ 305
- Polyester Capacitor474k/400v c1µF
+ Polyester Capacitor
+
+
+
+
+
diff --git a/drafter_14/annotations/C161_D1_P1.xml b/drafter_14/annotations/C161_D1_P1.xml
index e1cd19ad8cca0c456c2d8b337aa69431b455127b..c4da538bdc2a771e3738e8d6ea7b26d3dc0dafec 100644
--- a/drafter_14/annotations/C161_D1_P1.xml
+++ b/drafter_14/annotations/C161_D1_P1.xml
@@ -562,7 +562,7 @@
1599
494
- 1.2KΩ
+ 1.2K
@@ -532,6 +542,7 @@
2442
1045
2665
+ 270
IN4001
@@ -545,6 +556,7 @@
2621
1726
2973
+ 270
BC547
@@ -558,6 +570,7 @@
1947
1253
2053
+ 270
T2
@@ -623,6 +636,7 @@
2559
2376
2797
+ 270
+12V
@@ -924,6 +938,7 @@
2523
1744
2663
+ 270
T3
diff --git a/drafter_14/annotations/C162_D1_P1.xml b/drafter_14/annotations/C162_D1_P1.xml
index a6d79d29c96e6d23b7f9e706aff6453552f4c432..b4df0f18623c426605fcb4a896d75f3a0cc15a5e 100644
--- a/drafter_14/annotations/C162_D1_P1.xml
+++ b/drafter_14/annotations/C162_D1_P1.xml
@@ -182,12 +182,12 @@
0
0
- 272
- 1477
+ 373
+ 1489
536
- 1566
+ 1548
- R1Ω 22KΩ
+ 22K
+
diff --git a/drafter_14/annotations/C162_D1_P2.xml b/drafter_14/annotations/C162_D1_P2.xml
index d08328377a87b55a6feda414744b29a267a612e7..6ee74f9054aa3cf3bd6e50e408a88f91219ce745 100644
--- a/drafter_14/annotations/C162_D1_P2.xml
+++ b/drafter_14/annotations/C162_D1_P2.xml
@@ -123,6 +123,7 @@
1223
2373
1413
+ 4
+
diff --git a/drafter_14/annotations/C162_D1_P3.xml b/drafter_14/annotations/C162_D1_P3.xml
index 725ec065f0da918a90a796af883a74fffb25b0ac..083b586d65852ab9cb718df7dbdf438b13455e0c 100644
--- a/drafter_14/annotations/C162_D1_P3.xml
+++ b/drafter_14/annotations/C162_D1_P3.xml
@@ -98,6 +98,7 @@
1156
2193
1353
+ 35
+
diff --git a/drafter_14/annotations/C162_D1_P4.xml b/drafter_14/annotations/C162_D1_P4.xml
index 001d174aa752710f0489af71dc551ec8c231b1e5..b8c85a1b6be42e4d22c02aad4e9b3724dc039409 100644
--- a/drafter_14/annotations/C162_D1_P4.xml
+++ b/drafter_14/annotations/C162_D1_P4.xml
@@ -170,12 +170,12 @@
0
0
- 188
- 1474
+ 302
+ 1492
485
1568
- R1Ω 22K
+ 22K
+
diff --git a/drafter_14/annotations/C162_D2_P1.xml b/drafter_14/annotations/C162_D2_P1.xml
index 7e2e9e9908b3b1b51b0e5260d6fd42f59287a790..787735d18e6b372682fe7b258cff07ca0362b630 100644
--- a/drafter_14/annotations/C162_D2_P1.xml
+++ b/drafter_14/annotations/C162_D2_P1.xml
@@ -124,6 +124,7 @@
1331
1714
1574
+ 8
-
+
diff --git a/drafter_14/annotations/C162_D2_P2.xml b/drafter_14/annotations/C162_D2_P2.xml
index a55068e7b1b2d7e6c8915647815f9addc1e03b79..a04d550dfcfcf5ad7937042511e44605bb0ed3ab 100644
--- a/drafter_14/annotations/C162_D2_P2.xml
+++ b/drafter_14/annotations/C162_D2_P2.xml
@@ -110,6 +110,7 @@
1504
1692
1708
+ 337
+
diff --git a/drafter_14/annotations/C162_D2_P3.xml b/drafter_14/annotations/C162_D2_P3.xml
index 86658fa61d62fd757273f30a9bdf0521e7e8c0f3..d65a99af862de2a2b8dc21a4d7dfe05b6c05009b 100644
--- a/drafter_14/annotations/C162_D2_P3.xml
+++ b/drafter_14/annotations/C162_D2_P3.xml
@@ -98,6 +98,7 @@
909
1856
1138
+ 27
+
diff --git a/drafter_14/annotations/C162_D2_P4.xml b/drafter_14/annotations/C162_D2_P4.xml
index e2869359f446884285264d8d609f065d07063ac2..c9eede9c8f6a8aeab46146750b0f12d8eff30ed4 100644
--- a/drafter_14/annotations/C162_D2_P4.xml
+++ b/drafter_14/annotations/C162_D2_P4.xml
@@ -98,6 +98,7 @@
786
1506
960
+ 31
+
diff --git a/drafter_14/annotations/C163_D1_P1.xml b/drafter_14/annotations/C163_D1_P1.xml
index 77502e4d003d3043bd8f1ada659f11993ac6e473..5aaab36ec13001a219d2c20b0299aad04de11b8e 100644
--- a/drafter_14/annotations/C163_D1_P1.xml
+++ b/drafter_14/annotations/C163_D1_P1.xml
@@ -133,6 +133,7 @@
646
1598
907
+ 2
@@ -447,4 +447,41 @@
9V
+
+
+
diff --git a/drafter_14/annotations/C164_D1_P2.xml b/drafter_14/annotations/C164_D1_P2.xml
index 4bae197d1d7507171c12de5365c1eb4c898c74fb..cc7cdba8dd2799fa8ec7ce5c9e038ed13105248c 100644
--- a/drafter_14/annotations/C164_D1_P2.xml
+++ b/drafter_14/annotations/C164_D1_P2.xml
@@ -70,8 +70,8 @@
1361
895
- 1680
- 1163
+ 1845
+ 1230
+
+
+
diff --git a/drafter_14/annotations/C164_D1_P3.xml b/drafter_14/annotations/C164_D1_P3.xml
index 9925349c579b112376e77978dde8e5eb0ddaa4bc..4677bee4bdf362836ee3d8aaebbaa78aa18c5f39 100644
--- a/drafter_14/annotations/C164_D1_P3.xml
+++ b/drafter_14/annotations/C164_D1_P3.xml
@@ -69,9 +69,9 @@
0
1146
- 479
- 1467
- 750
+ 382
+ 1578
+ 795
+
+
+
diff --git a/drafter_14/annotations/C164_D1_P4.xml b/drafter_14/annotations/C164_D1_P4.xml
index 29539fe45fc34579541c64a108f2b94a3fc0069a..9c7a34194a5a3d530c337617ae658f96afdc7f5a 100644
--- a/drafter_14/annotations/C164_D1_P4.xml
+++ b/drafter_14/annotations/C164_D1_P4.xml
@@ -42,9 +42,9 @@
0
2034
- 411
- 2275
- 632
+ 413
+ 2421
+ 635
+
+
+
diff --git a/drafter_14/annotations/C164_D2_P1.xml b/drafter_14/annotations/C164_D2_P1.xml
index ab325aa30eb4c55ba541686b7d422c0b142ed939..c517f5b75ddf8e09916be3e17bd1a1a713990cc4 100644
--- a/drafter_14/annotations/C164_D2_P1.xml
+++ b/drafter_14/annotations/C164_D2_P1.xml
@@ -116,9 +116,9 @@
0
1268
- 1054
- 1546
- 1415
+ 1051
+ 1720
+ 1423
+
+
+
diff --git a/drafter_14/annotations/C164_D2_P2.xml b/drafter_14/annotations/C164_D2_P2.xml
index 4ca649e3a16c6df15a0b5f5c5556e9f9c2291227..8d05110c25aa64143558051cae78bda4883101ab 100644
--- a/drafter_14/annotations/C164_D2_P2.xml
+++ b/drafter_14/annotations/C164_D2_P2.xml
@@ -57,8 +57,8 @@
1363
676
- 1706
- 968
+ 1827
+ 1081
+
+
+
diff --git a/drafter_14/annotations/C164_D2_P3.xml b/drafter_14/annotations/C164_D2_P3.xml
index 84f6572f95dead7b95239ab6b4054c5fd4d08d1e..3c0f0472bf8a88efdc831283e095c66c0f067df9 100644
--- a/drafter_14/annotations/C164_D2_P3.xml
+++ b/drafter_14/annotations/C164_D2_P3.xml
@@ -43,8 +43,8 @@
0
1245
- 461
- 1592
+ 369
+ 1678
718
@@ -450,4 +450,41 @@
Q2
+
+
+
diff --git a/drafter_14/annotations/C164_D2_P4.xml b/drafter_14/annotations/C164_D2_P4.xml
index cad36bc99cef803a95130ff76cb04c94e413cd1b..93a6cf51bffe4ae85e2d2bcd86bccc4fcd1c5729 100644
--- a/drafter_14/annotations/C164_D2_P4.xml
+++ b/drafter_14/annotations/C164_D2_P4.xml
@@ -56,8 +56,8 @@
0
2314
- 751
- 2533
+ 745
+ 2644
1015
@@ -448,4 +448,41 @@
Q2
+
+
+
diff --git a/drafter_14/annotations/C165_D1_P2.xml b/drafter_14/annotations/C165_D1_P2.xml
index 71805b60283bd9837a30f6cbca7d9567092129ae..05de194ddecd9ce06c14b7ba1a3d2224506a1376 100644
--- a/drafter_14/annotations/C165_D1_P2.xml
+++ b/drafter_14/annotations/C165_D1_P2.xml
@@ -190,6 +190,7 @@
233
1615
317
+ 25
+
diff --git a/drafter_14/annotations/C165_D2_P1.xml b/drafter_14/annotations/C165_D2_P1.xml
index b6db6acb7520e0aaf9411faf6abf9726101d421d..4b0068e5798520df0f4c3cbfacb3d3c0b96844fd 100644
--- a/drafter_14/annotations/C165_D2_P1.xml
+++ b/drafter_14/annotations/C165_D2_P1.xml
@@ -143,7 +143,7 @@
1365
1564
- 1660
+ 1685
1726
LED1
diff --git a/drafter_14/annotations/C165_D2_P2.xml b/drafter_14/annotations/C165_D2_P2.xml
index 89a2dfff34a3acfd93313e80cf451bccdb6694d7..f000f05cc8d7f38fef8d72bede1d10302e2f465c 100644
--- a/drafter_14/annotations/C165_D2_P2.xml
+++ b/drafter_14/annotations/C165_D2_P2.xml
@@ -111,6 +111,7 @@
324
1344
413
+ 33
+
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D1_P2.xml b/drafter_14/annotations/C168_D1_P2.xml
index 98fe2a5b7a22abc30c4c3a3cd0044bf8d2ab8ae5..84f8e8552391c55c39f1dc84db6de0772e490832 100644
--- a/drafter_14/annotations/C168_D1_P2.xml
+++ b/drafter_14/annotations/C168_D1_P2.xml
@@ -135,8 +135,8 @@
1341
148
1445
- 224
- 177
+ 221
+ 8
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D1_P3.xml b/drafter_14/annotations/C168_D1_P3.xml
index 2cac3478e535de12ea51409db49cbae014bf209f..7b9231d1931ea051293583553b9083d29fe8edfe 100644
--- a/drafter_14/annotations/C168_D1_P3.xml
+++ b/drafter_14/annotations/C168_D1_P3.xml
@@ -212,7 +212,7 @@
1516
1061
1639
- 86
+ 98
+
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D1_P4.xml b/drafter_14/annotations/C168_D1_P4.xml
index 39d8cbd7163b639ffcae59d25d172a4fa4aa8f2d..5a5b3b1dd1c155a90bcf031b41f755220e5dec78 100644
--- a/drafter_14/annotations/C168_D1_P4.xml
+++ b/drafter_14/annotations/C168_D1_P4.xml
@@ -437,10 +437,10 @@
1546
1800
- 1804
+ 1667
1860
- 10KΩ 7W
+ 10K
+
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D2_P1.xml b/drafter_14/annotations/C168_D2_P1.xml
index 92fec5b6acdf1074fe3e52bba6eb01615a2c86c7..7385d75f29f05d6aff186d5e27317b669f0fccb8 100644
--- a/drafter_14/annotations/C168_D2_P1.xml
+++ b/drafter_14/annotations/C168_D2_P1.xml
@@ -142,7 +142,7 @@
1549
762
1693
- 84
+ 96
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D2_P2.xml b/drafter_14/annotations/C168_D2_P2.xml
index b6f86ca590d6358628c923b0dfe00931a198cace..004a324af1aa2b90a632bf4795b9990cd088b205 100644
--- a/drafter_14/annotations/C168_D2_P2.xml
+++ b/drafter_14/annotations/C168_D2_P2.xml
@@ -233,7 +233,7 @@
1176
1109
1300
- 271
+ 279
+
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D2_P3.xml b/drafter_14/annotations/C168_D2_P3.xml
index cddebb6f1177297de6faac0e90a8ae97653d2658..284a9f85518bc79b33e61f8862f58ec46a747290 100644
--- a/drafter_14/annotations/C168_D2_P3.xml
+++ b/drafter_14/annotations/C168_D2_P3.xml
@@ -282,11 +282,11 @@
0
1504
- 1482
- 1773
+ 1503
+ 1623
1567
- 10KΩ-7W
+ 10K
+
+
+
+
+
+
+
+
diff --git a/drafter_14/annotations/C168_D2_P4.xml b/drafter_14/annotations/C168_D2_P4.xml
index 141ba4445db559cfac964dcd102e9197b3026700..52e3f3de1145fa2ac431aac9ab77e18f7bf93714 100644
--- a/drafter_14/annotations/C168_D2_P4.xml
+++ b/drafter_14/annotations/C168_D2_P4.xml
@@ -108,7 +108,7 @@
1450
1390
1536
- 79
+ 98
+
+
+
+
+
+
+
diff --git a/drafter_14/instances/C158_D1_P1.json b/drafter_14/instances/C158_D1_P1.json
index 1b1bec9c469307fc8f8c335e05be5c49827f668c..7bbe7bada25eee7779953ae2fd5d3a41c0fe4b99 100644
--- a/drafter_14/instances/C158_D1_P1.json
+++ b/drafter_14/instances/C158_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -51,6 +52,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -77,6 +79,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -103,6 +106,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -137,6 +141,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -163,6 +168,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -201,6 +207,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -251,6 +258,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -277,6 +285,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -303,6 +312,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -329,6 +339,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -355,6 +366,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -381,6 +393,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -407,6 +420,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -433,6 +447,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -459,6 +474,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -485,6 +501,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -511,6 +528,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -537,6 +555,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -575,6 +594,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -601,6 +621,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -627,6 +648,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -653,6 +675,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -679,6 +702,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -705,6 +729,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -731,6 +756,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -757,6 +783,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -783,6 +810,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -809,6 +837,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -835,6 +864,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -861,6 +891,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/instances/C160_D2_P4.json b/drafter_14/instances/C160_D2_P4.json
index 715862563834ee89d34429db54273dfc53d67398..40f6f10249f4d3a18b1c2384c9dafb1f76efffc9 100644
--- a/drafter_14/instances/C160_D2_P4.json
+++ b/drafter_14/instances/C160_D2_P4.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -29,6 +29,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -55,6 +56,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -85,6 +87,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -115,6 +118,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -149,6 +153,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -203,6 +208,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -241,6 +247,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -271,6 +278,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -305,6 +313,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -335,6 +344,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -361,6 +371,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -391,6 +402,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -429,6 +441,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -463,6 +476,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -501,6 +515,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -539,6 +554,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -565,6 +581,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -603,6 +620,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -633,6 +651,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -659,6 +678,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -685,6 +705,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -711,6 +732,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -741,6 +763,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -807,6 +830,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -833,6 +857,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -859,6 +884,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -885,6 +911,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -927,6 +954,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -961,6 +989,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -987,6 +1016,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1013,6 +1043,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1039,6 +1070,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1069,6 +1101,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1095,6 +1128,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1121,6 +1155,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1147,6 +1182,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1177,6 +1213,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1203,6 +1240,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1229,6 +1267,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1255,6 +1294,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1281,6 +1321,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1315,6 +1356,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1341,6 +1383,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1367,6 +1410,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1393,6 +1437,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1419,6 +1464,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1445,6 +1491,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1471,6 +1518,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1497,6 +1545,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1523,6 +1572,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1549,6 +1599,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1575,6 +1626,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1601,6 +1653,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1627,6 +1680,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1653,6 +1707,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1679,6 +1734,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1705,6 +1761,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1731,6 +1788,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1757,6 +1815,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1783,6 +1842,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1809,6 +1869,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1835,6 +1896,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1861,6 +1923,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1887,6 +1950,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1913,6 +1977,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1951,6 +2016,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1977,6 +2043,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2003,6 +2070,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2029,6 +2097,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2055,10 +2124,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -2091,10 +2163,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -2135,10 +2210,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -2223,6 +2301,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2257,6 +2336,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2291,6 +2371,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2317,6 +2398,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2347,6 +2429,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2373,6 +2456,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2399,6 +2483,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/instances/C162_D2_P1.json b/drafter_14/instances/C162_D2_P1.json
index 8dd9160df08922f912251611ac7ff411aa2f7e7e..e02327c1d551afd7ff999ca3415f98e80151e5fd 100644
--- a/drafter_14/instances/C162_D2_P1.json
+++ b/drafter_14/instances/C162_D2_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -59,6 +60,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -93,6 +95,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -127,6 +130,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -153,6 +157,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -179,6 +184,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -213,6 +219,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -239,6 +246,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -281,6 +289,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -311,6 +320,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -337,6 +347,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -399,6 +410,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -425,6 +437,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -451,6 +464,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -477,6 +491,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -503,6 +518,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -529,6 +545,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -555,6 +572,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -581,6 +599,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -607,6 +626,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -633,6 +653,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -659,6 +680,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -685,6 +707,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -711,6 +734,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -737,6 +761,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -763,6 +788,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -789,6 +815,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -815,6 +842,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -841,6 +869,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -867,6 +896,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -893,6 +923,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -919,6 +950,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -945,6 +977,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -971,6 +1004,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -997,6 +1031,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1023,6 +1058,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1049,6 +1085,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1075,6 +1112,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1101,6 +1139,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1127,6 +1166,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1153,6 +1193,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1179,6 +1220,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1205,6 +1247,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1231,6 +1274,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1257,6 +1301,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1283,6 +1328,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1309,6 +1355,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1335,6 +1382,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1361,6 +1409,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1387,6 +1436,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1413,6 +1463,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1439,6 +1490,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1465,6 +1517,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1499,6 +1552,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1525,6 +1579,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1563,6 +1618,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1589,6 +1645,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1615,6 +1672,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1641,6 +1699,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/instances/C165_D1_P2.json b/drafter_14/instances/C165_D1_P2.json
index 8c4d9d86f2849f22f2669b751f5ec5dd7a3a45b8..537ced684d365f2100a1c69fe01e9ff25c593844 100644
--- a/drafter_14/instances/C165_D1_P2.json
+++ b/drafter_14/instances/C165_D1_P2.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -41,6 +41,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -83,6 +84,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -121,6 +123,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -147,6 +150,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -173,6 +177,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -199,6 +204,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -225,6 +231,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -251,6 +258,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -297,6 +305,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -335,6 +344,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -361,6 +371,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -387,6 +398,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -413,6 +425,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -435,6 +448,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -461,6 +475,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -487,6 +502,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -513,6 +529,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -539,6 +556,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -565,6 +583,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -591,6 +610,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -617,6 +637,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -643,10 +664,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -679,6 +703,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -705,10 +730,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -745,6 +773,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/instances/C166_D1_P1.json b/drafter_14/instances/C166_D1_P1.json
index d7a7888cd9aa55c2842449d0b8e0d39ce992be8a..ed3b98ac919d7e73faf538e3dd6e13d08c693bfd 100644
--- a/drafter_14/instances/C166_D1_P1.json
+++ b/drafter_14/instances/C166_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -55,6 +56,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -97,6 +99,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -123,6 +126,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -149,6 +153,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -175,6 +180,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -229,6 +235,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -263,6 +270,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -289,6 +297,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -319,6 +328,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -345,6 +355,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -371,6 +382,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -397,6 +409,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -451,6 +464,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -477,6 +491,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -503,6 +518,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -529,6 +545,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -555,6 +572,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -585,6 +603,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -611,6 +630,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -637,6 +657,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -663,6 +684,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -689,6 +711,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -715,6 +738,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -741,6 +765,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -767,10 +792,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -791,10 +819,13 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
{
+ "line_color": null,
+ "fill_color": null,
"label": "text",
"points": [
[
@@ -815,6 +846,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/instances/C167_D2_P1.json b/drafter_14/instances/C167_D2_P1.json
index 9485d4c2b09379a6478c8508b15e496d3b8e8995..342c893c72e7bc1c387dafbd08f7e294138ce5f8 100644
--- a/drafter_14/instances/C167_D2_P1.json
+++ b/drafter_14/instances/C167_D2_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -53,6 +53,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -79,6 +80,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -105,6 +107,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -143,6 +146,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -169,6 +173,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -195,6 +200,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -221,6 +227,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -247,6 +254,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -273,6 +281,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -299,6 +308,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -325,6 +335,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -351,6 +362,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_14/instances/C168_D1_P1.json b/drafter_14/instances/C168_D1_P1.json
index 950af3ebd027f75be727d540a0d68cee8ecbf64a..3bd266671ab66c35e3c228502246f8acf7f81d99 100644
--- a/drafter_14/instances/C168_D1_P1.json
+++ b/drafter_14/instances/C168_D1_P1.json
@@ -1,5 +1,5 @@
{
- "version": "5.0.1",
+ "version": "5.2.0",
"flags": {},
"shapes": [
{
@@ -25,6 +25,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -59,6 +60,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -85,6 +87,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -111,6 +114,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -137,6 +141,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -163,6 +168,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -189,6 +195,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -223,6 +230,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -249,6 +257,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -275,6 +284,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -317,6 +327,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -343,6 +354,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -373,6 +385,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -399,6 +412,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -429,6 +443,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -463,6 +478,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -489,6 +505,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -515,6 +532,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -541,6 +559,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -567,6 +586,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -576,23 +596,24 @@
"label": "transformer",
"points": [
[
- 2176.0,
- 1020.0
+ 2175.87037037037,
+ 1026.388888888889
],
[
- 2176.0,
- 1333.0
+ 2173.555555555555,
+ 1333.7962962962963
],
[
- 2405.0,
- 1333.0
+ 2402.259259259259,
+ 1322.2222222222222
],
[
- 2405.0,
- 1020.0
+ 2387.907407407407,
+ 1028.2407407407406
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -623,6 +644,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -665,6 +687,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -699,6 +722,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -729,6 +753,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -755,6 +780,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -781,6 +807,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -807,6 +834,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -853,6 +881,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -879,6 +908,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -905,6 +935,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -939,6 +970,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -965,6 +997,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -991,6 +1024,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1021,6 +1055,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1047,6 +1082,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1073,6 +1109,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1099,6 +1136,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1125,6 +1163,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1151,6 +1190,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1181,6 +1221,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1211,6 +1252,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1237,6 +1279,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1275,6 +1318,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1301,6 +1345,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1339,6 +1384,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1369,6 +1415,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1399,6 +1446,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1429,6 +1477,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1455,6 +1504,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1485,6 +1535,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1511,6 +1562,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1541,6 +1593,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1575,6 +1628,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1601,6 +1655,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1627,6 +1682,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1653,6 +1709,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1679,6 +1736,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1705,6 +1763,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1731,6 +1790,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1757,6 +1817,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1791,6 +1852,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1821,6 +1883,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1855,6 +1918,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1889,6 +1953,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1915,6 +1980,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1941,6 +2007,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1967,6 +2034,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -1993,6 +2061,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2019,6 +2088,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2045,6 +2115,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2071,6 +2142,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2097,6 +2169,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2123,6 +2196,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2149,6 +2223,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2175,6 +2250,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2201,6 +2277,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2227,6 +2304,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2253,6 +2331,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2279,6 +2358,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2305,6 +2385,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2331,6 +2412,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2357,6 +2439,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2383,6 +2466,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2409,6 +2493,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2435,6 +2520,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2461,6 +2547,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2487,6 +2574,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2513,6 +2601,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2539,6 +2628,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2565,6 +2655,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2591,6 +2682,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2617,6 +2709,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2643,6 +2736,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2669,6 +2763,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2695,6 +2790,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2721,6 +2817,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2747,6 +2844,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2773,6 +2871,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2799,6 +2898,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2825,6 +2925,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2851,6 +2952,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2877,6 +2979,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2903,6 +3006,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2937,6 +3041,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2963,6 +3068,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -2989,6 +3095,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3015,6 +3122,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3041,6 +3149,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3067,6 +3176,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3093,6 +3203,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3119,6 +3230,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3145,6 +3257,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3171,6 +3284,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3197,6 +3311,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3223,6 +3338,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3249,6 +3365,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3291,6 +3408,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3353,6 +3471,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3383,6 +3502,7 @@
]
],
"group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
},
@@ -3421,6 +3541,96 @@
]
],
"group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "magnetic",
+ "points": [
+ [
+ 2262.264150943396,
+ 1045.2830188679245
+ ],
+ [
+ 2307.5471698113206,
+ 1038.2075471698113
+ ],
+ [
+ 2318.396226415094,
+ 1314.1509433962262
+ ],
+ [
+ 2270.2830188679245,
+ 1315.0943396226414
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 2318.4629629629626,
+ 1039.8148148148148
+ ],
+ [
+ 2315.222222222222,
+ 1125.4629629629628
+ ],
+ [
+ 2335.592592592592,
+ 1316.2037037037037
+ ],
+ [
+ 2398.555555555555,
+ 1315.7407407407406
+ ],
+ [
+ 2384.2037037037035,
+ 1033.3333333333333
+ ]
+ ],
+ "group_id": null,
+ "description": null,
+ "shape_type": "polygon",
+ "flags": {}
+ },
+ {
+ "line_color": null,
+ "fill_color": null,
+ "label": "inductor",
+ "points": [
+ [
+ 2182.3518518518517,
+ 1031.4814814814815
+ ],
+ [
+ 2259.2037037037035,
+ 1031.0185185185185
+ ],
+ [
+ 2267.074074074074,
+ 1081.0185185185185
+ ],
+ [
+ 2246.2407407407404,
+ 1329.6296296296296
+ ],
+ [
+ 2178.1851851851848,
+ 1328.7037037037037
+ ]
+ ],
+ "group_id": null,
+ "description": null,
"shape_type": "polygon",
"flags": {}
}
diff --git a/drafter_15/annotations/C169_D1_P1.xml b/drafter_15/annotations/C169_D1_P1.xml
index 94c8c67e14c4ebac20ac51afa00dfd8e7c74e078..913eedd77a4c0b0d2f8178afc776e577eb5763f9 100644
--- a/drafter_15/annotations/C169_D1_P1.xml
+++ b/drafter_15/annotations/C169_D1_P1.xml
@@ -1604,4 +1604,30 @@
708
+
+
diff --git a/drafter_15/annotations/C169_D1_P2.xml b/drafter_15/annotations/C169_D1_P2.xml
index 2ba57adabda423c3c8c321d7342843e4e5e19b87..4c4a5693663e5d87dd9f1164c18ec1085c7304cb 100644
--- a/drafter_15/annotations/C169_D1_P2.xml
+++ b/drafter_15/annotations/C169_D1_P2.xml
@@ -1593,4 +1593,30 @@
946
+
+
diff --git a/drafter_15/annotations/C169_D1_P3.xml b/drafter_15/annotations/C169_D1_P3.xml
index 022fe8ef4638f79e9f01ac75f324fb2306ba3877..547a9c760a0e88be3b2e01ae6a6caf686d100c2d 100644
--- a/drafter_15/annotations/C169_D1_P3.xml
+++ b/drafter_15/annotations/C169_D1_P3.xml
@@ -1594,4 +1594,30 @@
1003
+
+
diff --git a/drafter_15/annotations/C169_D1_P4.xml b/drafter_15/annotations/C169_D1_P4.xml
index 26ac29ba587700b26c7e3ca90105a853df97ab69..c36b6641d648778d6539d16257981c294f6d9f73 100644
--- a/drafter_15/annotations/C169_D1_P4.xml
+++ b/drafter_15/annotations/C169_D1_P4.xml
@@ -126,7 +126,7 @@
710
808
- 100Ω
+ 100ohm
+
+
diff --git a/drafter_15/annotations/C169_D2_P1.xml b/drafter_15/annotations/C169_D2_P1.xml
index f8cdf37cd635fc4f5efdc523157a0c2b4abb42fb..3b654856cef9f493e57028c738aa5331dd9a8806 100644
--- a/drafter_15/annotations/C169_D2_P1.xml
+++ b/drafter_15/annotations/C169_D2_P1.xml
@@ -22,7 +22,7 @@
431
694
- 220Ω
+ 220ohm
+
+
diff --git a/drafter_15/annotations/C169_D2_P2.xml b/drafter_15/annotations/C169_D2_P2.xml
index 550fd35ad450cb788ceef715b708c2f4fca21f1d..f2ff9827e7fd32acfb4c0a69d1e061ba82e9de0c 100644
--- a/drafter_15/annotations/C169_D2_P2.xml
+++ b/drafter_15/annotations/C169_D2_P2.xml
@@ -1284,7 +1284,7 @@
0
0
- 705
+ 702
880
769
967
@@ -1300,6 +1300,7 @@
268
214
324
+ 6
+
+
diff --git a/drafter_15/annotations/C169_D2_P3.xml b/drafter_15/annotations/C169_D2_P3.xml
index 655f9a9caf723ad0547dd61990aa6e22287b805a..2e2c2637aafe51bac7e60fdd4b136dfd806abcdb 100644
--- a/drafter_15/annotations/C169_D2_P3.xml
+++ b/drafter_15/annotations/C169_D2_P3.xml
@@ -22,7 +22,7 @@
816
107
- .033µF
+ .033uF
+
+
diff --git a/drafter_15/annotations/C169_D2_P4.xml b/drafter_15/annotations/C169_D2_P4.xml
index 281d4206a8bec55bcf43c9617bc5757a7e4b9361..c42c6d36e71a207bae208017f1f68b426931a555 100644
--- a/drafter_15/annotations/C169_D2_P4.xml
+++ b/drafter_15/annotations/C169_D2_P4.xml
@@ -74,7 +74,7 @@
591
859
- 10Ω
+ 10ohm
+
+
diff --git a/drafter_15/annotations/C170_D1_P1.xml b/drafter_15/annotations/C170_D1_P1.xml
index a96c3e321a618200a6655ed7f62fad133500452f..176f49b2ef19b852bda61af8fe09b42c5788a271 100644
--- a/drafter_15/annotations/C170_D1_P1.xml
+++ b/drafter_15/annotations/C170_D1_P1.xml
@@ -292,7 +292,7 @@
628
298
724
- 90
+ 96
@@ -1110,7 +1110,7 @@
634
262
- R29Ω
+ R29
+
+
+
diff --git a/drafter_15/annotations/C176_D1_P2.xml b/drafter_15/annotations/C176_D1_P2.xml
index db9a33d512d7c3f429d1ff878721177115b8f04d..059febf3bccb5bf4134a3a89d7a6ec0c5b9c3fa7 100644
--- a/drafter_15/annotations/C176_D1_P2.xml
+++ b/drafter_15/annotations/C176_D1_P2.xml
@@ -333,7 +333,7 @@
807
1494
872
- 81
+ 98
+
+
+
diff --git a/drafter_15/annotations/C176_D1_P3.xml b/drafter_15/annotations/C176_D1_P3.xml
index 978be69fd6ec3e0ecfdf87a652be221070c95e8d..08cb09ab20b70ed573519cebc9289812c792b182 100644
--- a/drafter_15/annotations/C176_D1_P3.xml
+++ b/drafter_15/annotations/C176_D1_P3.xml
@@ -345,7 +345,7 @@
807
1501
869
- 91
+ 102
+
+
+
diff --git a/drafter_15/annotations/C176_D1_P4.xml b/drafter_15/annotations/C176_D1_P4.xml
index ea98047cf454d5a117f91622f30567becc567b05..e82e90a11a0421ab6822d6c083d404503709a59c 100644
--- a/drafter_15/annotations/C176_D1_P4.xml
+++ b/drafter_15/annotations/C176_D1_P4.xml
@@ -35,7 +35,7 @@
602
840
- 47,000µF
+ 47,000u
+
+
+
diff --git a/drafter_15/annotations/C176_D2_P1.xml b/drafter_15/annotations/C176_D2_P1.xml
index 5b6290c671cca16a5bbac22051deaf414c53bbca..8669a19b63d3b9c160b1ed5991636007e3706aa7 100644
--- a/drafter_15/annotations/C176_D2_P1.xml
+++ b/drafter_15/annotations/C176_D2_P1.xml
@@ -113,7 +113,7 @@
501
807
- 47,000µF
+ 47000u
+
+
+
diff --git a/drafter_15/annotations/C176_D2_P2.xml b/drafter_15/annotations/C176_D2_P2.xml
index 4754d97938a341e187cd7f198c6374956a93942e..296604762b1933f5801ac4668aa599e66c059017 100644
--- a/drafter_15/annotations/C176_D2_P2.xml
+++ b/drafter_15/annotations/C176_D2_P2.xml
@@ -243,7 +243,7 @@
510
772
- 47000µF
+ 47000u
+
+
+
diff --git a/drafter_15/annotations/C176_D2_P3.xml b/drafter_15/annotations/C176_D2_P3.xml
index 524b59f769a3cb5ddad3d5ea28d50c423793626b..69876ec0f7c01e3515d51c290e8ff9727ce0e827 100644
--- a/drafter_15/annotations/C176_D2_P3.xml
+++ b/drafter_15/annotations/C176_D2_P3.xml
@@ -345,7 +345,7 @@
761
1522
823
- 100
+ 79
+
+
+
diff --git a/drafter_15/annotations/C176_D2_P4.xml b/drafter_15/annotations/C176_D2_P4.xml
index 76a34c3a94d777097a36d8158ddaf36119dd6b49..82de35bb2d43ad9064036d0557b4d17c9781e6d1 100644
--- a/drafter_15/annotations/C176_D2_P4.xml
+++ b/drafter_15/annotations/C176_D2_P4.xml
@@ -255,7 +255,7 @@
674
1536
737
- 91
+ 102
+
+
+
diff --git a/drafter_15/annotations/C177_D1_P1.xml b/drafter_15/annotations/C177_D1_P1.xml
index 2dd42ea6dca5840f36dfb03ecbd400a3fd80d331..c0740da75739ccc55e59854f06d31d290254c97f 100644
--- a/drafter_15/annotations/C177_D1_P1.xml
+++ b/drafter_15/annotations/C177_D1_P1.xml
@@ -984,6 +984,7 @@
63
1372
93
+ 6
+
+
+
diff --git a/drafter_15/annotations/C177_D1_P2.xml b/drafter_15/annotations/C177_D1_P2.xml
index c7bec139a8f31db0c7e7415b92d2ba1d563ad26f..593054e994c87817dbd75c125b1a3c5bdfe825e4 100644
--- a/drafter_15/annotations/C177_D1_P2.xml
+++ b/drafter_15/annotations/C177_D1_P2.xml
@@ -935,6 +935,7 @@
48
1344
85
+ 10
+
+
+
diff --git a/drafter_15/annotations/C177_D1_P3.xml b/drafter_15/annotations/C177_D1_P3.xml
index 37b95ae70b8f54bd0cd532befdc29ea37bf21384..c9e064eb2735b2a13ae23d36fef3d32803574659 100644
--- a/drafter_15/annotations/C177_D1_P3.xml
+++ b/drafter_15/annotations/C177_D1_P3.xml
@@ -243,7 +243,7 @@
1546
743
- 1.0µF
+ 1.0u
+
+
+
diff --git a/drafter_15/annotations/C177_D1_P4.xml b/drafter_15/annotations/C177_D1_P4.xml
index 2436d77b3f7beabca18ec20b896b537e0d2e33c6..38e74ddbcbf63ee6bc0cdf152f01743dc5ff9766 100644
--- a/drafter_15/annotations/C177_D1_P4.xml
+++ b/drafter_15/annotations/C177_D1_P4.xml
@@ -217,7 +217,7 @@
1532
715
- 1.0µF
+ 1.0u
+
+
+
diff --git a/drafter_15/annotations/C177_D2_P1.xml b/drafter_15/annotations/C177_D2_P1.xml
index 30829aa93090ac2cc732ac5f00d01e7ffc32ee73..b184dd7ab733d7ace360a08467cc34278ae41592 100644
--- a/drafter_15/annotations/C177_D2_P1.xml
+++ b/drafter_15/annotations/C177_D2_P1.xml
@@ -230,7 +230,7 @@
1579
730
- 1.0µF
+ 1.0u
+
+
+
diff --git a/drafter_15/annotations/C177_D2_P2.xml b/drafter_15/annotations/C177_D2_P2.xml
index 3579826fee735fa6be26e5bafa27aea3d3ac46c3..373a45910d2374425c992b8a418fdeaf86c0c63a 100644
--- a/drafter_15/annotations/C177_D2_P2.xml
+++ b/drafter_15/annotations/C177_D2_P2.xml
@@ -61,7 +61,7 @@
1106
600
- 100.0µF
+ 100.0n
+
+
+
diff --git a/drafter_15/annotations/C177_D2_P3.xml b/drafter_15/annotations/C177_D2_P3.xml
index 59cd08f7f8fcac13601b6614acef07c7a71f3240..50f6b254f3150fbf0dac81781d07ce91eeccf628 100644
--- a/drafter_15/annotations/C177_D2_P3.xml
+++ b/drafter_15/annotations/C177_D2_P3.xml
@@ -139,7 +139,7 @@
558
540
- 2000µF
+ 2000uF
+
+
+
diff --git a/drafter_15/annotations/C177_D2_P4.xml b/drafter_15/annotations/C177_D2_P4.xml
index 1ba5ef6bc4248a575f7bb1dd72f9ea980c7f24d6..44490dab70d60df27fc54885f89a55dd0ca1c0bb 100644
--- a/drafter_15/annotations/C177_D2_P4.xml
+++ b/drafter_15/annotations/C177_D2_P4.xml
@@ -947,6 +947,7 @@
183
603
216
+ 356
+
+
+
diff --git a/drafter_15/annotations/C178_D1_P1.xml b/drafter_15/annotations/C178_D1_P1.xml
index 62b771a112aa503c158f057b279b7f9da750d71f..8a2248d310bd1c1c0d0ced09cf909ba398988048 100644
--- a/drafter_15/annotations/C178_D1_P1.xml
+++ b/drafter_15/annotations/C178_D1_P1.xml
@@ -1093,7 +1093,7 @@
+
+
+
+
diff --git a/drafter_15/annotations/C178_D1_P2.xml b/drafter_15/annotations/C178_D1_P2.xml
index 90c10904513f9ddc3735209af3c19490f0d91c6e..d6071dc7c7b79e1371c0abf1823f728343f69aa9 100644
--- a/drafter_15/annotations/C178_D1_P2.xml
+++ b/drafter_15/annotations/C178_D1_P2.xml
@@ -86,7 +86,7 @@
129
835
192
- 87
+ 94
+
+
+
+
diff --git a/drafter_15/annotations/C178_D1_P3.xml b/drafter_15/annotations/C178_D1_P3.xml
index 6f2359c9b5eee6e1b33e15e9690c041998fe4449..175d26e16aabc7ee47ec2fc7f7377a7aec1b229b 100644
--- a/drafter_15/annotations/C178_D1_P3.xml
+++ b/drafter_15/annotations/C178_D1_P3.xml
@@ -112,7 +112,7 @@
377
466
432
- 96
+ 81
+
+
+
+
diff --git a/drafter_15/annotations/C178_D1_P4.xml b/drafter_15/annotations/C178_D1_P4.xml
index ce5e3e68bb19b44b2f54e3c883f36be3e02b6965..011f6334dc9ab609fb8e50d730acf25a7060b0a7 100644
--- a/drafter_15/annotations/C178_D1_P4.xml
+++ b/drafter_15/annotations/C178_D1_P4.xml
@@ -279,6 +279,7 @@
241
671
518
+ 356
+
+
+
+
diff --git a/drafter_15/annotations/C178_D2_P1.xml b/drafter_15/annotations/C178_D2_P1.xml
index 63fdbd443398b80dd3fb3181c01d48f289ad4d28..73ab44469b364df50486cd2a6608723141ffb2c6 100644
--- a/drafter_15/annotations/C178_D2_P1.xml
+++ b/drafter_15/annotations/C178_D2_P1.xml
@@ -22,7 +22,7 @@
640
973
- 470µF
+ 470u
+
+
+
+
diff --git a/drafter_15/annotations/C178_D2_P2.xml b/drafter_15/annotations/C178_D2_P2.xml
index ed0ea143717afddb8fcc8f099a297a4be13d3daa..bc7b241968166ad90d37b4ebdda60e4332473903 100644
--- a/drafter_15/annotations/C178_D2_P2.xml
+++ b/drafter_15/annotations/C178_D2_P2.xml
@@ -320,7 +320,7 @@
947
937
- 22µF
+ 22u
+
+
+
+
diff --git a/drafter_15/annotations/C178_D2_P3.xml b/drafter_15/annotations/C178_D2_P3.xml
index dbaa0ddced72274a0b955f1474e36cd5de42e193..2b656a085e23896c9909d31ffb1768f183264a24 100644
--- a/drafter_15/annotations/C178_D2_P3.xml
+++ b/drafter_15/annotations/C178_D2_P3.xml
@@ -35,7 +35,7 @@
173
339
- 1MΩ
+ 1M
+
+
+
+
diff --git a/drafter_15/annotations/C178_D2_P4.xml b/drafter_15/annotations/C178_D2_P4.xml
index 43a85b971b587f50662d49581504f2f5f536adb6..d31afefc6e5526dff0e58545a896a53195bbe42d 100644
--- a/drafter_15/annotations/C178_D2_P4.xml
+++ b/drafter_15/annotations/C178_D2_P4.xml
@@ -113,7 +113,7 @@
1238
107
- 10KΩ
+ 10K
+
+
+
+
+
+
diff --git a/drafter_15/annotations/C179_D1_P1.xml b/drafter_15/annotations/C179_D1_P1.xml
index d6a6db3853c972637a73a108079ee6bd0efaeb15..16d1d4066244fb686c9bd7a18a2d83bd7d38502f 100644
--- a/drafter_15/annotations/C179_D1_P1.xml
+++ b/drafter_15/annotations/C179_D1_P1.xml
@@ -557,7 +557,7 @@
1430
362
- 2KW
+ 2kW