diff --git a/drafter_1/annotations/C10_D1_P2.xml b/drafter_1/annotations/C10_D1_P2.xml index 6afbbcac2e373cb117ce7c862d29622f0d06ad87..b85d5d15391b2c96ecb15399f6e0a82c020d8d2c 100644 --- a/drafter_1/annotations/C10_D1_P2.xml +++ b/drafter_1/annotations/C10_D1_P2.xml @@ -57,9 +57,9 @@ 0 972 - 1192 + 1170 1411 - 1583 + 1551 diff --git a/drafter_1/annotations/C12_D1_P1.xml b/drafter_1/annotations/C12_D1_P1.xml index de0734c93b039ecf578fcd018f31fa0ff8c04713..17406bc3d2feccb1bd84c2991a564479f115a00e 100755 --- a/drafter_1/annotations/C12_D1_P1.xml +++ b/drafter_1/annotations/C12_D1_P1.xml @@ -288,6 +288,7 @@ 1498 3484 1663 + 279 @@ -300,6 +301,7 @@ 1493 771 1649 + 273 diff --git a/drafter_1/annotations/C12_D1_P2.xml b/drafter_1/annotations/C12_D1_P2.xml index 2851b861313406086c9e7384fb02bb718a1a9521..492c72ff23db5e1c60aee20131848f48db4294fc 100755 --- a/drafter_1/annotations/C12_D1_P2.xml +++ b/drafter_1/annotations/C12_D1_P2.xml @@ -123,6 +123,7 @@ 1037 787 1167 + 270 @@ -135,6 +136,7 @@ 1022 3552 1157 + 291 diff --git a/drafter_1/annotations/C12_D1_P3.xml b/drafter_1/annotations/C12_D1_P3.xml index 3b1fb6d046c3ac61ef44f5cc8b5edbfc8e301079..83a71797e6681f4750845cdeac9579f435a7e6d2 100755 --- a/drafter_1/annotations/C12_D1_P3.xml +++ b/drafter_1/annotations/C12_D1_P3.xml @@ -186,6 +186,7 @@ 1245 560 1405 + 268 @@ -198,6 +199,7 @@ 1182 3280 1396 + 283 diff --git a/drafter_1/annotations/C12_D1_P4.xml b/drafter_1/annotations/C12_D1_P4.xml index 15a7746d04bc364ac38c1813920eca105da7d740..7cd77ca52dbdbe5393cb5bb8ec0bfa20a745bc16 100755 --- a/drafter_1/annotations/C12_D1_P4.xml +++ b/drafter_1/annotations/C12_D1_P4.xml @@ -290,6 +290,7 @@ 1629 3299 1784 + 281 @@ -302,6 +303,7 @@ 1577 793 1719 + 273 diff --git a/drafter_1/annotations/C12_D2_P1.xml b/drafter_1/annotations/C12_D2_P1.xml index cece3d07cb3b5e9c42d736dedc9d03b21a097380..4ce6e8317e13036efb2bc607fe12133f21ef58d0 100755 --- a/drafter_1/annotations/C12_D2_P1.xml +++ b/drafter_1/annotations/C12_D2_P1.xml @@ -162,6 +162,7 @@ 1229 3573 1376 + 275 @@ -174,6 +175,7 @@ 1143 939 1306 + 275 diff --git a/drafter_1/annotations/C12_D2_P2.xml b/drafter_1/annotations/C12_D2_P2.xml index 180b50ad236c1219b257cf02a2b9cd913ca052ab..f5bdae65a69d26d18b49376736da32b5311ac74d 100755 --- a/drafter_1/annotations/C12_D2_P2.xml +++ b/drafter_1/annotations/C12_D2_P2.xml @@ -291,6 +291,7 @@ 1108 3565 1257 + 279 @@ -303,6 +304,7 @@ 918 988 1061 + 273 diff --git a/drafter_1/annotations/C12_D2_P3.xml b/drafter_1/annotations/C12_D2_P3.xml index b89fafbbe6558f7053c9540dff1ae7b0be74fe8f..a738dbe59db20c237007e5621615021ea0744179 100755 --- a/drafter_1/annotations/C12_D2_P3.xml +++ b/drafter_1/annotations/C12_D2_P3.xml @@ -274,6 +274,7 @@ 810 1149 951 + 271 @@ -286,6 +287,7 @@ 922 3708 1043 + 289 diff --git a/drafter_1/annotations/C12_D2_P4.xml b/drafter_1/annotations/C12_D2_P4.xml index 2187f2a769427e121fa981712e4d3f95a332f0b7..f56a48f91ce98388c555c624301bf2106a82fa3f 100755 --- a/drafter_1/annotations/C12_D2_P4.xml +++ b/drafter_1/annotations/C12_D2_P4.xml @@ -235,6 +235,7 @@ 1184 3382 1351 + 279 @@ -247,6 +248,7 @@ 1067 553 1208 + 268 diff --git a/drafter_1/annotations/C8_D1_P2.xml b/drafter_1/annotations/C8_D1_P2.xml index 271852fb1dfb9fda72e634d9c6ea38e80f01e955..65dc81f3ce8dacd04c54167232636a308e075054 100755 --- a/drafter_1/annotations/C8_D1_P2.xml +++ b/drafter_1/annotations/C8_D1_P2.xml @@ -72,7 +72,7 @@ 545 2631 987 - 179 + 185 diff --git a/drafter_1/annotations/C8_D1_P3.xml b/drafter_1/annotations/C8_D1_P3.xml index a23b94099c46a5bc98c61c1d6fec26b8bd3f8336..1e10dac01656953f25e85cc90d730ad305576b37 100644 --- a/drafter_1/annotations/C8_D1_P3.xml +++ b/drafter_1/annotations/C8_D1_P3.xml @@ -58,7 +58,7 @@ 916 893 1129 - 90 + 83 @@ -71,7 +71,7 @@ 1627 1237 1782 - 81 + 94 diff --git a/drafter_1/annotations/C9_D1_P3.xml b/drafter_1/annotations/C9_D1_P3.xml index c6caee81350b9e058a1d9696565e936315f46112..864f7b12da4a650f64be5b7533d1dd1259773210 100644 --- a/drafter_1/annotations/C9_D1_P3.xml +++ b/drafter_1/annotations/C9_D1_P3.xml @@ -31,9 +31,9 @@ 0 1130 - 385 + 390 1644 - 609 + 565 diff --git a/drafter_1/annotations/C9_D2_P2.xml b/drafter_1/annotations/C9_D2_P2.xml index 9d8fd85810c9e27f452a130c87429904d07327ef..78d72d6e25fa177058e7f57792ca79b5b97a0e23 100755 --- a/drafter_1/annotations/C9_D2_P2.xml +++ b/drafter_1/annotations/C9_D2_P2.xml @@ -56,10 +56,10 @@ 0 2128 - 1375 + 1357 2279 1559 - 85 + 92 diff --git a/drafter_1/annotations/C9_D2_P3.xml b/drafter_1/annotations/C9_D2_P3.xml index bd901058ffcc08ed67dd96ad71abc6e5bd9407af..159c6e4bd34481b6a5a18ce5651e3d0ad3db78d2 100755 --- a/drafter_1/annotations/C9_D2_P3.xml +++ b/drafter_1/annotations/C9_D2_P3.xml @@ -55,11 +55,11 @@ 0 0 - 2133 - 1404 - 2303 + 2141 + 1381 + 2278 1604 - 89 + 98 diff --git a/drafter_1/annotations/C9_D2_P4.xml b/drafter_1/annotations/C9_D2_P4.xml index 85ca61b726ef69fa1d05187df6ac2e3daa7faa62..6431492e37bc9d2fbe2e8d9e94853e70536647d7 100755 --- a/drafter_1/annotations/C9_D2_P4.xml +++ b/drafter_1/annotations/C9_D2_P4.xml @@ -55,10 +55,10 @@ 0 1945 - 1453 - 2131 + 1421 + 2105 1715 - 86 + 100 diff --git a/drafter_10/annotations/C119_D2_P3.xml b/drafter_10/annotations/C119_D2_P3.xml index fa18bf83caf8db072ad835ce883c5f81c3033473..caa41eb2c38c6b8ca9af70da6581137724e25bab 100644 --- a/drafter_10/annotations/C119_D2_P3.xml +++ b/drafter_10/annotations/C119_D2_P3.xml @@ -302,6 +302,7 @@ 323 856 448 + 2 diff --git a/drafter_13/annotations/C146_D1_P4.xml b/drafter_13/annotations/C146_D1_P4.xml index 8ba0118c80deb9abb0ae213c6165a30b5692cf69..4c3d2e9154aa4f7a193bce263b08e6525e79b101 100644 --- a/drafter_13/annotations/C146_D1_P4.xml +++ b/drafter_13/annotations/C146_D1_P4.xml @@ -34,7 +34,7 @@ 1824 2380 1912 - 3 + 8 @@ -47,7 +47,7 @@ 1811 2677 1893 - 360 + 6 @@ -73,7 +73,7 @@ 1699 3172 1794 - 5 + 12 diff --git a/drafter_13/annotations/C146_D2_P1.xml b/drafter_13/annotations/C146_D2_P1.xml index 28096cc9ebd73a75c2c4f0dc107e56090d9991ce..416cc44013f7c7b4346e69cc86184f6a60205391 100644 --- a/drafter_13/annotations/C146_D2_P1.xml +++ b/drafter_13/annotations/C146_D2_P1.xml @@ -34,7 +34,7 @@ 1300 2631 1510 - 12 + 2 diff --git a/drafter_13/annotations/C146_D2_P3.xml b/drafter_13/annotations/C146_D2_P3.xml index 9518a45a034b037d8a948401800e9c663daeb3b8..1689180d22a522efa74aac27a37ccb3f4c55189f 100644 --- a/drafter_13/annotations/C146_D2_P3.xml +++ b/drafter_13/annotations/C146_D2_P3.xml @@ -47,7 +47,7 @@ 2001 2158 2087 - 360 + 10 @@ -73,7 +73,7 @@ 1940 2605 2017 - 360 + 10 @@ -86,7 +86,7 @@ 1912 2794 1979 - 3 + 12 diff --git a/drafter_13/annotations/C146_D2_P4.xml b/drafter_13/annotations/C146_D2_P4.xml index 9e4013a34057585bc501a44188e90c8b7c616ca4..2f918403368c49593931fdc099e1a385e8438b69 100644 --- a/drafter_13/annotations/C146_D2_P4.xml +++ b/drafter_13/annotations/C146_D2_P4.xml @@ -60,7 +60,7 @@ 2187 2556 2271 - 343 + 352 diff --git a/drafter_13/annotations/C149_D1_P1.xml b/drafter_13/annotations/C149_D1_P1.xml index 7f0f805f97baf3a120350ff20a76cfbef18aa1dc..44b6979ea420d206d90b0cc996f56459f20d8854 100644 --- a/drafter_13/annotations/C149_D1_P1.xml +++ b/drafter_13/annotations/C149_D1_P1.xml @@ -21,7 +21,7 @@ 318 1679 444 - 36 + 39 @@ -47,7 +47,7 @@ 536 1655 656 - 321 + 314 diff --git a/drafter_13/annotations/C152_D2_P2.xml b/drafter_13/annotations/C152_D2_P2.xml index 18946c1aa2e5540130d733ad79ec2e091b6c822e..b6f05b8f66a4d9c2cf9de7d5fd8dfd1eb26eca0d 100644 --- a/drafter_13/annotations/C152_D2_P2.xml +++ b/drafter_13/annotations/C152_D2_P2.xml @@ -177,7 +177,7 @@ 835 1242 873 - 193 + 194 diff --git a/drafter_13/annotations/C152_D2_P3.xml b/drafter_13/annotations/C152_D2_P3.xml index c77c23eb99831b859efde5f9749b20f339cc2bfa..b262cbb981fe959f62030c592d06fabd56464e6a 100644 --- a/drafter_13/annotations/C152_D2_P3.xml +++ b/drafter_13/annotations/C152_D2_P3.xml @@ -34,7 +34,7 @@ 1104 2073 1279 - 192 + 183 @@ -125,7 +125,7 @@ 1126 2624 1197 - 175 + 187 diff --git a/drafter_13/annotations/C152_D2_P4.xml b/drafter_13/annotations/C152_D2_P4.xml index 8899063ee9c8fe7305d718cb4cc48ce12d59b1f1..1677d7644d36d142546a15d57ea1ab6cf4ccd54a 100644 --- a/drafter_13/annotations/C152_D2_P4.xml +++ b/drafter_13/annotations/C152_D2_P4.xml @@ -111,7 +111,7 @@ 1121 2575 1190 - 176 + 187 diff --git a/drafter_14/annotations/C157_D1_P1.xml b/drafter_14/annotations/C157_D1_P1.xml index 6ab28acd7bc9eea68128f1f1dae91a64edf38a09..7eceffbf1c55fde2976aba7ff9da9543c2467e00 100644 --- a/drafter_14/annotations/C157_D1_P1.xml +++ b/drafter_14/annotations/C157_D1_P1.xml @@ -21,7 +21,7 @@ 489 1250 621 - 360 + 4 diff --git a/drafter_14/annotations/C160_D2_P1.xml b/drafter_14/annotations/C160_D2_P1.xml index 68b8a8146d0d5bc59fad0fc72c19e5e90a4174ce..23632f2332667e005c322d77190a0929905c767b 100644 --- a/drafter_14/annotations/C160_D2_P1.xml +++ b/drafter_14/annotations/C160_D2_P1.xml @@ -21,6 +21,7 @@ 905 635 1066 + 6 diff --git a/drafter_14/annotations/C160_D2_P2.xml b/drafter_14/annotations/C160_D2_P2.xml index 0dc4fd81a6fe372c8451dfcabce593af8156a5bf..fc30b1834d16aa50fae918959f299f91ab02655a 100644 --- a/drafter_14/annotations/C160_D2_P2.xml +++ b/drafter_14/annotations/C160_D2_P2.xml @@ -125,6 +125,7 @@ 778 538 938 + 2 diff --git a/drafter_14/annotations/C160_D2_P3.xml b/drafter_14/annotations/C160_D2_P3.xml index a1f763589942cd48e215fb946bbbf7987e2b8d01..b988c4890dc578074b527e5bc8b1ad69dd162206 100644 --- a/drafter_14/annotations/C160_D2_P3.xml +++ b/drafter_14/annotations/C160_D2_P3.xml @@ -60,6 +60,7 @@ 934 557 1088 + 4 diff --git a/drafter_14/annotations/C161_D1_P1.xml b/drafter_14/annotations/C161_D1_P1.xml index c4da538bdc2a771e3738e8d6ea7b26d3dc0dafec..7d9172f630f42f9031136b9682b08a8940cc1b43 100644 --- a/drafter_14/annotations/C161_D1_P1.xml +++ b/drafter_14/annotations/C161_D1_P1.xml @@ -33,7 +33,7 @@ 928 668 1121 - 12 + 2 diff --git a/drafter_14/annotations/C162_D2_P2.xml b/drafter_14/annotations/C162_D2_P2.xml index a04d550dfcfcf5ad7937042511e44605bb0ed3ab..cdcd5c86aeada6eac4f7c5796f659f03de3b2e76 100644 --- a/drafter_14/annotations/C162_D2_P2.xml +++ b/drafter_14/annotations/C162_D2_P2.xml @@ -33,7 +33,7 @@ 925 470 1093 - 51 + 46 diff --git a/drafter_14/annotations/C162_D2_P4.xml b/drafter_14/annotations/C162_D2_P4.xml index c9eede9c8f6a8aeab46146750b0f12d8eff30ed4..6cdef676824958d6ab47964bd2d2cd625e62f8c6 100644 --- a/drafter_14/annotations/C162_D2_P4.xml +++ b/drafter_14/annotations/C162_D2_P4.xml @@ -59,7 +59,7 @@ 1106 699 1290 - 290 + 296 @@ -85,7 +85,7 @@ 305 1440 486 - 122 + 127 diff --git a/drafter_14/annotations/C165_D2_P1.xml b/drafter_14/annotations/C165_D2_P1.xml index 4b0068e5798520df0f4c3cbfacb3d3c0b96844fd..e667e7c17e8cfc3095b3070981e10f74f1ffaea3 100644 --- a/drafter_14/annotations/C165_D2_P1.xml +++ b/drafter_14/annotations/C165_D2_P1.xml @@ -33,7 +33,7 @@ 831 2014 1244 - 9 + 358 diff --git a/drafter_14/annotations/C166_D1_P1.xml b/drafter_14/annotations/C166_D1_P1.xml index 202683073d1f84316e27986a330a6c39733d7daf..eb049b984369acd5f6483276704802b2a9a8ae57 100644 --- a/drafter_14/annotations/C166_D1_P1.xml +++ b/drafter_14/annotations/C166_D1_P1.xml @@ -98,7 +98,7 @@ 866 1576 983 - 17 + 33 diff --git a/drafter_14/annotations/C166_D2_P2.xml b/drafter_14/annotations/C166_D2_P2.xml index 884489e71ffea67fbb48d89c3942245e6b5cbcd2..a8e64ac39c5450c50fa8805dd0072f507de2135c 100644 --- a/drafter_14/annotations/C166_D2_P2.xml +++ b/drafter_14/annotations/C166_D2_P2.xml @@ -46,7 +46,7 @@ 1357 2265 1675 - 39 + 46 diff --git a/drafter_14/annotations/C166_D2_P3.xml b/drafter_14/annotations/C166_D2_P3.xml index 24b547a5d728e39c9e307ad820471c2866e82dd3..f3a0a72aed56f123281d4c2924372008e527df4f 100644 --- a/drafter_14/annotations/C166_D2_P3.xml +++ b/drafter_14/annotations/C166_D2_P3.xml @@ -21,7 +21,7 @@ 1457 1749 1705 - 336 + 327 @@ -86,7 +86,7 @@ 2162 1729 2340 - 360 + 345 diff --git a/drafter_14/annotations/C166_D2_P4.xml b/drafter_14/annotations/C166_D2_P4.xml index c996dbf7db1e70704a186dd086414e77c3746a96..b1b9254bdafd15c6ab14c234f9fcaba275e92357 100644 --- a/drafter_14/annotations/C166_D2_P4.xml +++ b/drafter_14/annotations/C166_D2_P4.xml @@ -57,7 +57,7 @@ 1378 1319 1522 - 27 + 35 @@ -96,7 +96,7 @@ 1129 1212 1274 - 163 + 150 diff --git a/drafter_15/annotations/C170_D1_P2.xml b/drafter_15/annotations/C170_D1_P2.xml index 46f4744df484e616a92a04ff9691609570f398c1..71dac1ecc824cbaddb0e82b7016b35ce802fee1f 100644 --- a/drafter_15/annotations/C170_D1_P2.xml +++ b/drafter_15/annotations/C170_D1_P2.xml @@ -745,6 +745,7 @@ 76 1273 122 + 2 diff --git a/drafter_15/annotations/C170_D1_P3.xml b/drafter_15/annotations/C170_D1_P3.xml index b1a9b0f8e95d5ce95087177638a6022d79876ecb..972ff73d0f2565141662fbfca5193a1540bc83d1 100644 --- a/drafter_15/annotations/C170_D1_P3.xml +++ b/drafter_15/annotations/C170_D1_P3.xml @@ -732,6 +732,7 @@ 57 1246 108 + 6 diff --git a/drafter_15/annotations/C170_D2_P3.xml b/drafter_15/annotations/C170_D2_P3.xml index e09d1c3b9a65d987e7296a63f472baae2b2d3a72..7145e2faaa6146f656c7037bb9b5363d83898914 100644 --- a/drafter_15/annotations/C170_D2_P3.xml +++ b/drafter_15/annotations/C170_D2_P3.xml @@ -780,6 +780,7 @@ 40 1157 137 + 12 diff --git a/drafter_15/annotations/C174_D1_P3.xml b/drafter_15/annotations/C174_D1_P3.xml index 6c1c66c7436b78672820d15eff5b11c6f56d3458..4da42d2b3074a9fb9a3eda960522487568b2a2a9 100644 --- a/drafter_15/annotations/C174_D1_P3.xml +++ b/drafter_15/annotations/C174_D1_P3.xml @@ -435,6 +435,7 @@ 350 962 507 + 2 diff --git a/drafter_15/annotations/C174_D1_P4.xml b/drafter_15/annotations/C174_D1_P4.xml index ea970e149c4e54431edf96f04f9495701efe62ca..5c55e69d64f0b7e671f1e903e7b4073ec6cab4b3 100644 --- a/drafter_15/annotations/C174_D1_P4.xml +++ b/drafter_15/annotations/C174_D1_P4.xml @@ -398,6 +398,7 @@ 284 960 431 + 2 diff --git a/drafter_15/annotations/C176_D2_P2.xml b/drafter_15/annotations/C176_D2_P2.xml index 296604762b1933f5801ac4668aa599e66c059017..d7c814373d62df5880bf495b8285f3b9f43fddaa 100644 --- a/drafter_15/annotations/C176_D2_P2.xml +++ b/drafter_15/annotations/C176_D2_P2.xml @@ -1028,9 +1028,9 @@ 0 0 - 788 + 783 632 - 909 + 911 729 diff --git a/drafter_15/annotations/C177_D1_P3.xml b/drafter_15/annotations/C177_D1_P3.xml index c9e064eb2735b2a13ae23d36fef3d32803574659..26c1ca50ac6fe445db050ccc1ff062b87b6efadf 100644 --- a/drafter_15/annotations/C177_D1_P3.xml +++ b/drafter_15/annotations/C177_D1_P3.xml @@ -983,6 +983,7 @@ 461 1370 579 + 2 diff --git a/drafter_15/annotations/C178_D1_P2.xml b/drafter_15/annotations/C178_D1_P2.xml index d6071dc7c7b79e1371c0abf1823f728343f69aa9..0e1780cfd60c49b66bc5e60b1e94c5a5a65a676f 100644 --- a/drafter_15/annotations/C178_D1_P2.xml +++ b/drafter_15/annotations/C178_D1_P2.xml @@ -961,6 +961,7 @@ 905 790 990 + 4 diff --git a/drafter_15/annotations/C180_D1_P1.xml b/drafter_15/annotations/C180_D1_P1.xml index 9f8cf91a887d23caba9bad61bca747ce943b0d1f..1f69ad30850dc7dac6754961b8050fbcc0d14327 100644 --- a/drafter_15/annotations/C180_D1_P1.xml +++ b/drafter_15/annotations/C180_D1_P1.xml @@ -1190,6 +1190,7 @@ 226 114 288 + 270 diff --git a/drafter_15/annotations/C180_D1_P2.xml b/drafter_15/annotations/C180_D1_P2.xml index 8a24bd5173eb506e8a1e8805a27b9cefbc28c84d..de2bd2bf023ca9cb6f1652e8b186b38f43170092 100644 --- a/drafter_15/annotations/C180_D1_P2.xml +++ b/drafter_15/annotations/C180_D1_P2.xml @@ -1461,6 +1461,7 @@ 126 249 171 + 255 diff --git a/drafter_15/annotations/C180_D1_P3.xml b/drafter_15/annotations/C180_D1_P3.xml index 37d86cb44f720894ad957174921f91de0b6fd6ac..257a668222f0157784cd7e1719a80d60b0bfb7d4 100644 --- a/drafter_15/annotations/C180_D1_P3.xml +++ b/drafter_15/annotations/C180_D1_P3.xml @@ -780,6 +780,7 @@ 243 140 304 + 265 diff --git a/drafter_15/annotations/C180_D1_P4.xml b/drafter_15/annotations/C180_D1_P4.xml index d5d72be110f7a35abf714bd8576b4511f5fcab6c..a5cc6c9bae8375f4bad0f350b9ac924aeb9bc26a 100644 --- a/drafter_15/annotations/C180_D1_P4.xml +++ b/drafter_15/annotations/C180_D1_P4.xml @@ -1123,6 +1123,7 @@ 170 146 229 + 265 diff --git a/drafter_15/annotations/C180_D2_P1.xml b/drafter_15/annotations/C180_D2_P1.xml index d2f79e91c4d6a69cdfae215665cdb4d48ba2b328..1b55274dd71f3b54282e20d385718b74715d67d8 100644 --- a/drafter_15/annotations/C180_D2_P1.xml +++ b/drafter_15/annotations/C180_D2_P1.xml @@ -935,6 +935,7 @@ 262 142 346 + 275 diff --git a/drafter_15/annotations/C180_D2_P2.xml b/drafter_15/annotations/C180_D2_P2.xml index a5e45e7be75f6ffe917e1765d301c867fa4674ac..9b0c0d696e5d00c25be6e2ab75c46a70c568bea4 100644 --- a/drafter_15/annotations/C180_D2_P2.xml +++ b/drafter_15/annotations/C180_D2_P2.xml @@ -1212,6 +1212,7 @@ 135 151 201 + 270 diff --git a/drafter_15/annotations/C180_D2_P3.xml b/drafter_15/annotations/C180_D2_P3.xml index de64c58cf6d58aa46f54d38e69beba8097ed1f8e..9de279de76598d3662a01b41c3caabb303c36808 100644 --- a/drafter_15/annotations/C180_D2_P3.xml +++ b/drafter_15/annotations/C180_D2_P3.xml @@ -870,6 +870,7 @@ 255 141 342 + 270 diff --git a/drafter_15/annotations/C180_D2_P4.xml b/drafter_15/annotations/C180_D2_P4.xml index 1eef15cf062384a3c69894f11b3345d9bf057605..a19e2b84f5bc889e0faea8a17269e39cff022033 100644 --- a/drafter_15/annotations/C180_D2_P4.xml +++ b/drafter_15/annotations/C180_D2_P4.xml @@ -1961,6 +1961,7 @@ 254 143 322 + 266 diff --git a/drafter_16/annotations/C184_D1_P3.xml b/drafter_16/annotations/C184_D1_P3.xml index d7af24efc8539d4211912aa2ecfa4c77f35e2f2a..d1751d26d20508d667d433ea41319b48f4a76d5a 100644 --- a/drafter_16/annotations/C184_D1_P3.xml +++ b/drafter_16/annotations/C184_D1_P3.xml @@ -354,6 +354,7 @@ 389 386 430 + 13 diff --git a/drafter_16/annotations/C184_D1_P4.xml b/drafter_16/annotations/C184_D1_P4.xml index 702f780bafc08d3fa6f9500723d02917fd3227e2..f486d7aaa8761a40dcefac36e535db03b17be892 100644 --- a/drafter_16/annotations/C184_D1_P4.xml +++ b/drafter_16/annotations/C184_D1_P4.xml @@ -521,6 +521,7 @@ 549 393 582 + 13 @@ -697,6 +698,7 @@ 391 372 420 + 10 diff --git a/drafter_16/annotations/C184_D2_P3.xml b/drafter_16/annotations/C184_D2_P3.xml index e3796a6fb4310975bfbc29e40bcd2890ce27c698..2a496e51bce0ba0faa08f0b07396bea921d4191a 100644 --- a/drafter_16/annotations/C184_D2_P3.xml +++ b/drafter_16/annotations/C184_D2_P3.xml @@ -385,6 +385,7 @@ 999 1279 1046 + 10 diff --git a/drafter_16/annotations/C186_D1_P1.xml b/drafter_16/annotations/C186_D1_P1.xml index a3d615675ec1e7226cd8a7f8a2628c7827f6045e..601bef2a986106cce48254f02fb9fd122eb0a9fb 100644 --- a/drafter_16/annotations/C186_D1_P1.xml +++ b/drafter_16/annotations/C186_D1_P1.xml @@ -710,6 +710,7 @@ 777 1125 867 + 185 @@ -1018,6 +1019,7 @@ 502 1116 604 + 185 diff --git a/drafter_16/annotations/C186_D1_P2.xml b/drafter_16/annotations/C186_D1_P2.xml index 9bcc162a9a3754402d3f156d98f95d8750cdbe03..d2edce37ea345d92e088b7b1502208a67beff0d3 100644 --- a/drafter_16/annotations/C186_D1_P2.xml +++ b/drafter_16/annotations/C186_D1_P2.xml @@ -189,6 +189,7 @@ 457 804 548 + 2 @@ -264,6 +265,7 @@ 857 1333 892 + 6 @@ -535,6 +537,7 @@ 705 1223 792 + 183 @@ -559,6 +562,7 @@ 447 1214 542 + 183 diff --git a/drafter_16/annotations/C186_D1_P3.xml b/drafter_16/annotations/C186_D1_P3.xml index 48606dd98317b767ddb37a7a9d73535d76d3637f..9ceb28cbfbcd229a31569bf95b5a6cbe624419c5 100644 --- a/drafter_16/annotations/C186_D1_P3.xml +++ b/drafter_16/annotations/C186_D1_P3.xml @@ -550,7 +550,7 @@ 696 1130 788 - 4 + 184 @@ -1017,7 +1017,7 @@ 413 1116 515 - 4 + 187 diff --git a/drafter_16/annotations/C186_D1_P4.xml b/drafter_16/annotations/C186_D1_P4.xml index 9b2a6bb401a2055374801755585c44a998efefb9..e518ae7a9730be6af0b9666f19d3e78712daa15e 100644 --- a/drafter_16/annotations/C186_D1_P4.xml +++ b/drafter_16/annotations/C186_D1_P4.xml @@ -112,7 +112,7 @@ 623 573 704 - 350 + 354 @@ -229,6 +229,7 @@ 820 1051 851 + 4 @@ -302,6 +303,7 @@ 692 953 771 + 185 diff --git a/drafter_16/annotations/C186_D2_P2.xml b/drafter_16/annotations/C186_D2_P2.xml index 451d977221fb69f4b8167ec36cb55e9ef2f64bfa..9a1a1131898d6f3462d8c94711b113faea950e83 100644 --- a/drafter_16/annotations/C186_D2_P2.xml +++ b/drafter_16/annotations/C186_D2_P2.xml @@ -293,6 +293,7 @@ 532 1211 605 + 4 @@ -354,6 +355,7 @@ 652 1211 730 + 4 diff --git a/drafter_16/annotations/C187_D1_P1.xml b/drafter_16/annotations/C187_D1_P1.xml index 4b2b55ed795a2039b8b0b14bff7b86fa91e26859..c602bd9498d4f6859e643d44ef9aa5738f8b9ee8 100644 --- a/drafter_16/annotations/C187_D1_P1.xml +++ b/drafter_16/annotations/C187_D1_P1.xml @@ -490,6 +490,7 @@ 549 1624 586 + 12 diff --git a/drafter_16/annotations/C187_D1_P2.xml b/drafter_16/annotations/C187_D1_P2.xml index 52df49ca5f1d35f37d612b125913b626df3bac92..863e208ced2f0b9f99835207718c7e56344d7d78 100644 --- a/drafter_16/annotations/C187_D1_P2.xml +++ b/drafter_16/annotations/C187_D1_P2.xml @@ -504,6 +504,7 @@ 544 318 588 + 4 diff --git a/drafter_16/annotations/C187_D1_P3.xml b/drafter_16/annotations/C187_D1_P3.xml index 628c3b0f9154a9f1aaf6f79b753eb1c8bdc25b26..515521640573f888e17ef982886a96248c8d671c 100644 --- a/drafter_16/annotations/C187_D1_P3.xml +++ b/drafter_16/annotations/C187_D1_P3.xml @@ -346,6 +346,7 @@ 496 884 548 + 4 diff --git a/drafter_16/annotations/C187_D1_P4.xml b/drafter_16/annotations/C187_D1_P4.xml index 757d7358ea450f8d3d5c114aee9bc548d9a3e17f..59ea2fd4ba399376c8b8ad2deefb68a93277d40d 100644 --- a/drafter_16/annotations/C187_D1_P4.xml +++ b/drafter_16/annotations/C187_D1_P4.xml @@ -456,6 +456,7 @@ 729 403 778 + 19 diff --git a/drafter_16/annotations/C187_D2_P2.xml b/drafter_16/annotations/C187_D2_P2.xml index b00619f40e5dd39095eec55cccf4c50508c31641..d62aef63f2bf1daff9b1349fc7bf4172b85f9e16 100644 --- a/drafter_16/annotations/C187_D2_P2.xml +++ b/drafter_16/annotations/C187_D2_P2.xml @@ -312,6 +312,7 @@ 785 301 823 + 13 @@ -582,6 +583,7 @@ 713 399 748 + 17 diff --git a/drafter_16/annotations/C187_D2_P4.xml b/drafter_16/annotations/C187_D2_P4.xml index 9dfe77a00e0e7ee25f703f127485923dda7948cd..1477698af6837ee0831b0558b412c7c936faf507 100644 --- a/drafter_16/annotations/C187_D2_P4.xml +++ b/drafter_16/annotations/C187_D2_P4.xml @@ -597,6 +597,7 @@ 765 213 806 + 19 diff --git a/drafter_16/annotations/C188_D1_P2.xml b/drafter_16/annotations/C188_D1_P2.xml index 82ab59a7d4de0f55d2d226d364cdf32404388379..ee5e9ce16f1e61e667e3615a29eaec4301538f98 100644 --- a/drafter_16/annotations/C188_D1_P2.xml +++ b/drafter_16/annotations/C188_D1_P2.xml @@ -203,6 +203,7 @@ 638 527 687 + 102 @@ -241,6 +242,7 @@ 610 641 651 + 94 @@ -462,6 +464,7 @@ 634 295 673 + 8 @@ -717,7 +720,8 @@ 1054 665 1093 - 695 + 700 + 8 @@ -803,6 +807,7 @@ 462 1450 498 + 10 @@ -958,6 +963,7 @@ 648 727 677 + 10 diff --git a/drafter_16/annotations/C188_D1_P3.xml b/drafter_16/annotations/C188_D1_P3.xml index 8d6513999780e701cb0d039f27dd397aab1d0299..b47c3463cbf91735024106bbea0c34c0b3684f3a 100644 --- a/drafter_16/annotations/C188_D1_P3.xml +++ b/drafter_16/annotations/C188_D1_P3.xml @@ -803,9 +803,10 @@ 0 1364 - 484 + 485 1401 - 519 + 517 + 6 @@ -1038,6 +1039,7 @@ 637 1599 717 + 8 diff --git a/drafter_16/annotations/C188_D1_P4.xml b/drafter_16/annotations/C188_D1_P4.xml index 8b6b28aa761f1fa9c604e417475fa0a9029fc91a..0748625821781da02028450c1fbe7da00d168a69 100644 --- a/drafter_16/annotations/C188_D1_P4.xml +++ b/drafter_16/annotations/C188_D1_P4.xml @@ -441,6 +441,7 @@ 627 411 670 + 8 diff --git a/drafter_16/annotations/C188_D2_P3.xml b/drafter_16/annotations/C188_D2_P3.xml index 4a7e73e142b9d1b5973998063f989d53ef1b8d8a..f27540f79fbef96d70bdc25eb6795b155598273b 100644 --- a/drafter_16/annotations/C188_D2_P3.xml +++ b/drafter_16/annotations/C188_D2_P3.xml @@ -308,6 +308,7 @@ 606 278 658 + 25 @@ -745,6 +746,7 @@ 814 284 874 + 31 diff --git a/drafter_16/annotations/C188_D2_P4.xml b/drafter_16/annotations/C188_D2_P4.xml index f532ac63999fed00bbbc9b047291fa01c8de4958..f6cd03df628321cf9a5becd671ee8bf4401afe31 100644 --- a/drafter_16/annotations/C188_D2_P4.xml +++ b/drafter_16/annotations/C188_D2_P4.xml @@ -216,6 +216,7 @@ 311 590 349 + 352 diff --git a/drafter_16/annotations/C189_D2_P1.xml b/drafter_16/annotations/C189_D2_P1.xml index dac7e5a1c4c66a7b70351ddcf5638ab26e2253dc..80a09c7e3c0b84179b3d3823a5230ac13f18143a 100644 --- a/drafter_16/annotations/C189_D2_P1.xml +++ b/drafter_16/annotations/C189_D2_P1.xml @@ -545,6 +545,7 @@ 314 971 380 + 2 @@ -837,7 +838,7 @@ 226 978 271 - 88 + 98 @@ -876,6 +877,7 @@ 383 801 451 + 6 @@ -1229,18 +1231,6 @@ 85 - - terminal - Unspecified - 0 - 0 - - 1791 - 1051 - 1829 - 1079 - - text Unspecified @@ -1412,6 +1402,7 @@ 350 1325 425 + 10 @@ -1794,18 +1785,6 @@ 105 - - junction - Unspecified - 0 - 0 - - 783 - 391 - 797 - 400 - - text Unspecified diff --git a/drafter_16/annotations/C189_D2_P3.xml b/drafter_16/annotations/C189_D2_P3.xml index 14042a0c45ceeb199c1dbe934875daae5c9d0ef5..41f1ad962b21686c5448fee3bd749272af63e783 100644 --- a/drafter_16/annotations/C189_D2_P3.xml +++ b/drafter_16/annotations/C189_D2_P3.xml @@ -1518,6 +1518,7 @@ 409 1280 487 + 4 diff --git a/drafter_16/annotations/C189_D2_P4.xml b/drafter_16/annotations/C189_D2_P4.xml index 1abfc7f892e2e56b53f7f81667acb6b76bfe1530..d8b9a10fb9c5699613b7f84d6ba86dcbb1faf94e 100644 --- a/drafter_16/annotations/C189_D2_P4.xml +++ b/drafter_16/annotations/C189_D2_P4.xml @@ -383,7 +383,7 @@ 542 1692 611 - 90 + 94 @@ -1330,6 +1330,7 @@ 409 931 489 + 6 @@ -1357,30 +1358,6 @@ 810 - - junction - Unspecified - 0 - 0 - - 1417 - 378 - 1439 - 400 - - - - junction - Unspecified - 0 - 0 - - 1429 - 397 - 1447 - 416 - - junction Unspecified @@ -1530,6 +1507,7 @@ 377 1449 451 + 6 diff --git a/drafter_16/annotations/C190_D1_P3.xml b/drafter_16/annotations/C190_D1_P3.xml index 011e4551c7394408a5d4780505010c571c635dc3..806b9bc076a00b516a6681ea8a59deb59b3d307f 100644 --- a/drafter_16/annotations/C190_D1_P3.xml +++ b/drafter_16/annotations/C190_D1_P3.xml @@ -853,6 +853,7 @@ 341 848 393 + 15 diff --git a/drafter_16/annotations/C191_D2_P4.xml b/drafter_16/annotations/C191_D2_P4.xml index 5d32ab0a8458c0e626c6066bb4d0b4ad62cbf087..adb43c1fb395e756a99f3dc0e43fbf5c0ab6152c 100644 --- a/drafter_16/annotations/C191_D2_P4.xml +++ b/drafter_16/annotations/C191_D2_P4.xml @@ -264,10 +264,11 @@ 0 0 - 1286 - 606 - 1347 + 1289 + 596 + 1350 685 + 2 diff --git a/drafter_17/annotations/C197_D1_P1.xml b/drafter_17/annotations/C197_D1_P1.xml index 64c84221c20f8e9bffb3654e016a7479e6dd4315..1036ecbba382532657e45d872fd955c24a0cf31e 100644 --- a/drafter_17/annotations/C197_D1_P1.xml +++ b/drafter_17/annotations/C197_D1_P1.xml @@ -551,6 +551,7 @@ 700 929 791 + 92 diff --git a/drafter_17/annotations/C197_D1_P2.xml b/drafter_17/annotations/C197_D1_P2.xml index 62fcf152c0bb8cb46f1dd0bca67c332a89818bc2..d75dcefacc31ab75da47d6114a62264a8376c796 100644 --- a/drafter_17/annotations/C197_D1_P2.xml +++ b/drafter_17/annotations/C197_D1_P2.xml @@ -551,6 +551,7 @@ 1124 785 1233 + 98 diff --git a/drafter_17/annotations/C197_D1_P3.xml b/drafter_17/annotations/C197_D1_P3.xml index af06bc619ec75b9e40efdfcab1545d9ddbbae7d7..a623f2eb8fcb80c137097177b5ed9461f2dcacb5 100644 --- a/drafter_17/annotations/C197_D1_P3.xml +++ b/drafter_17/annotations/C197_D1_P3.xml @@ -475,6 +475,7 @@ 203 523 315 + 90 diff --git a/drafter_17/annotations/C197_D1_P4.xml b/drafter_17/annotations/C197_D1_P4.xml index 4d403e6a8a54f1aa4b82a92ebdcc392d19882c4c..42247c501216b33eeb8f918818e8704bdc388ecf 100644 --- a/drafter_17/annotations/C197_D1_P4.xml +++ b/drafter_17/annotations/C197_D1_P4.xml @@ -512,6 +512,7 @@ 221 491 315 + 90 diff --git a/drafter_17/annotations/C197_D2_P1.xml b/drafter_17/annotations/C197_D2_P1.xml index d48a28eee8a685f432eee6f92ae235f3e913b7a5..3326517e3fb1313d2a41c98373a9eb7fd5e467fb 100644 --- a/drafter_17/annotations/C197_D2_P1.xml +++ b/drafter_17/annotations/C197_D2_P1.xml @@ -500,6 +500,7 @@ 776 1775 1001 + 90 diff --git a/drafter_17/annotations/C197_D2_P2.xml b/drafter_17/annotations/C197_D2_P2.xml index 03db5f072f38d961e0ac629cdc8a81d2667e8bf9..60fac0ee4c949472efe28fe667414a8a65a21926 100644 --- a/drafter_17/annotations/C197_D2_P2.xml +++ b/drafter_17/annotations/C197_D2_P2.xml @@ -525,18 +525,7 @@ 779 1744 980 - - - - capacitor.adjustable - Unspecified - 0 - 0 - - 1572 - 802 - 1727 - 982 + 92 diff --git a/drafter_17/annotations/C197_D2_P4.xml b/drafter_17/annotations/C197_D2_P4.xml index 0903d20fb75906d8ddb08e9a3962c00233dd87bb..1ed83bb0d6bb6129e533587e5acaf13eb9bd2a59 100644 --- a/drafter_17/annotations/C197_D2_P4.xml +++ b/drafter_17/annotations/C197_D2_P4.xml @@ -513,6 +513,7 @@ 778 1433 969 + 104 diff --git a/drafter_17/annotations/C198_D2_P4.xml b/drafter_17/annotations/C198_D2_P4.xml index 568aa80ff15c8e9dbe779da93174159a67c9f428..75b9108d09ed06a565b63bce477650637c4b5f0d 100644 --- a/drafter_17/annotations/C198_D2_P4.xml +++ b/drafter_17/annotations/C198_D2_P4.xml @@ -469,7 +469,7 @@ 664 824 - 860 + 835 1036 185 diff --git a/drafter_17/annotations/C199_D2_P1.xml b/drafter_17/annotations/C199_D2_P1.xml index 106d5ecbe67e00a59b99e12478b1463499b01617..cb966f700eebb1655d5ea268ad7381b9c5480606 100644 --- a/drafter_17/annotations/C199_D2_P1.xml +++ b/drafter_17/annotations/C199_D2_P1.xml @@ -121,9 +121,9 @@ 0 0 - 2712 + 2729 1385 - 2904 + 2892 1673 diff --git a/drafter_17/annotations/C199_D2_P3.xml b/drafter_17/annotations/C199_D2_P3.xml index da58e3ad6dbb780ef1da0d6efeb6d9369d8f4198..350094142d82918697dae084c4047e666e0edda2 100644 --- a/drafter_17/annotations/C199_D2_P3.xml +++ b/drafter_17/annotations/C199_D2_P3.xml @@ -215,6 +215,7 @@ 1325 1410 1501 + 2 @@ -545,6 +546,7 @@ 1746 1097 1893 + 6 diff --git a/drafter_17/annotations/C199_D2_P4.xml b/drafter_17/annotations/C199_D2_P4.xml index b9b62db49c81a2a96f21bea2bf70c3b10f01d19e..8ad1b544923c4b42d0e201bcf21de16b507d94fc 100644 --- a/drafter_17/annotations/C199_D2_P4.xml +++ b/drafter_17/annotations/C199_D2_P4.xml @@ -282,10 +282,11 @@ 0 0 - 1188 + 1206 1203 1341 - 1374 + 1370 + 348 diff --git a/drafter_17/annotations/C200_D1_P1.xml b/drafter_17/annotations/C200_D1_P1.xml index 588da179e225eb5dba656322a0437b3fda6dea7b..37c18a049f284c6dc8b1b78dcc20072f996678de 100644 --- a/drafter_17/annotations/C200_D1_P1.xml +++ b/drafter_17/annotations/C200_D1_P1.xml @@ -17,10 +17,11 @@ 0 0 - 2374 + 2393 1384 2489 1547 + 354 @@ -98,7 +99,7 @@ 477 2534 647 - 91 + 85 @@ -304,6 +305,7 @@ 529 3312 609 + 354 @@ -366,7 +368,7 @@ 896 2341 1014 - 95 + 87 @@ -1157,7 +1159,7 @@ 1191 566 1393 - 272 + 270 diff --git a/drafter_17/annotations/C200_D2_P2.xml b/drafter_17/annotations/C200_D2_P2.xml index 5b656d84ee8da460cf65f993387c0fc7b31d052a..2eb3cbbf8928a4fa8b75302f65020192570d2467 100644 --- a/drafter_17/annotations/C200_D2_P2.xml +++ b/drafter_17/annotations/C200_D2_P2.xml @@ -190,6 +190,7 @@ 2415 1987 2497 + 347 @@ -771,7 +772,7 @@ 996 3073 1120 - 177 + 171 @@ -1326,6 +1327,7 @@ 497 2335 569 + 348 diff --git a/drafter_17/annotations/C200_D2_P4.xml b/drafter_17/annotations/C200_D2_P4.xml index ff65fd8f5679d0354600c311399bcc80bfaeb03d..1f4ddc83ad0694ceb79edd91cada5eb77813748b 100644 --- a/drafter_17/annotations/C200_D2_P4.xml +++ b/drafter_17/annotations/C200_D2_P4.xml @@ -736,6 +736,7 @@ 966 1931 1057 + 352 @@ -829,9 +830,10 @@ 0 3331 - 1157 + 1161 3489 1282 + 354 diff --git a/drafter_17/annotations/C201_D1_P1.xml b/drafter_17/annotations/C201_D1_P1.xml index f878701b595684ccb59ae981afc9fe8a22c7e676..9c96691f498b1407bb57ea6bcefe83555f7c6e4d 100644 --- a/drafter_17/annotations/C201_D1_P1.xml +++ b/drafter_17/annotations/C201_D1_P1.xml @@ -1352,6 +1352,7 @@ 1044 625 1100 + 6 diff --git a/drafter_17/annotations/C201_D1_P4.xml b/drafter_17/annotations/C201_D1_P4.xml index 49b060fc8dfbac85d177b2028f073abbd5113a1c..61ee7712ce1d013ca1eea42607b35591e9227ab7 100644 --- a/drafter_17/annotations/C201_D1_P4.xml +++ b/drafter_17/annotations/C201_D1_P4.xml @@ -740,10 +740,10 @@ 0 2450 - 1247 - 2538 + 1256 + 2518 1361 - 179 + 177 @@ -1315,6 +1315,7 @@ 1261 1766 1340 + 4 diff --git a/drafter_17/annotations/C201_D2_P1.xml b/drafter_17/annotations/C201_D2_P1.xml index 18041fd842ac6a15493cfab5dab632372bc5c749..6d5e4bf6c35132b0285b2279e21f8878783e20f6 100644 --- a/drafter_17/annotations/C201_D2_P1.xml +++ b/drafter_17/annotations/C201_D2_P1.xml @@ -1339,10 +1339,10 @@ 0 0 - 2668 - 743 + 2676 + 733 2744 - 861 + 873 3 diff --git a/drafter_17/annotations/C201_D2_P2.xml b/drafter_17/annotations/C201_D2_P2.xml index 2838bd7eb2432097ea1e19ebd5fe156a1cb1c1c2..9e6db270538cb8ad23377013d8b4df2783f4352a 100644 --- a/drafter_17/annotations/C201_D2_P2.xml +++ b/drafter_17/annotations/C201_D2_P2.xml @@ -807,7 +807,7 @@ 2598 1129 - 2697 + 2687 1256 177 diff --git a/drafter_18/annotations/C206_D1_P1.xml b/drafter_18/annotations/C206_D1_P1.xml index a6b83c107b31d9684298f6043740ba4a80dc7287..14293d7f443de364e521cd6770cbb7bed9fd5c38 100644 --- a/drafter_18/annotations/C206_D1_P1.xml +++ b/drafter_18/annotations/C206_D1_P1.xml @@ -263,6 +263,7 @@ 388 999 439 + 6 diff --git a/drafter_18/annotations/C206_D1_P2.xml b/drafter_18/annotations/C206_D1_P2.xml index 852cf1b2e346b35fdeaf1aad92350908c8eed22e..8af1100d4c0a0287000038a623ea24cc40ea4aff 100644 --- a/drafter_18/annotations/C206_D1_P2.xml +++ b/drafter_18/annotations/C206_D1_P2.xml @@ -227,6 +227,7 @@ 379 971 430 + 10 diff --git a/drafter_18/annotations/C206_D1_P3.xml b/drafter_18/annotations/C206_D1_P3.xml index d2d803fd05c0a020fd3b6153743ace83691ce646..b8e99810fd50327cf8d6a32597f7f3d5f9c810d1 100644 --- a/drafter_18/annotations/C206_D1_P3.xml +++ b/drafter_18/annotations/C206_D1_P3.xml @@ -34,6 +34,7 @@ 338 486 379 + 358 @@ -227,6 +228,7 @@ 333 1002 378 + 8 diff --git a/drafter_18/annotations/C210_D1_P1.xml b/drafter_18/annotations/C210_D1_P1.xml index 8d15c61fb0b2db4c9febe75f35a9e08251da47a8..bc6fb06df147a13aa98fea6fa1c4f8644001d929 100644 --- a/drafter_18/annotations/C210_D1_P1.xml +++ b/drafter_18/annotations/C210_D1_P1.xml @@ -1538,6 +1538,7 @@ 67 83 107 + 89 @@ -1725,6 +1726,7 @@ 220 273 260 + 89 diff --git a/drafter_18/annotations/C210_D1_P2.xml b/drafter_18/annotations/C210_D1_P2.xml index bc55fcd9a23813eac02656ee75d61bc53a81658b..65b7dca08c6691f54edf1b8de280d9eb9242c318 100644 --- a/drafter_18/annotations/C210_D1_P2.xml +++ b/drafter_18/annotations/C210_D1_P2.xml @@ -1439,6 +1439,7 @@ 72 90 111 + 89 @@ -1700,6 +1701,7 @@ 209 53 266 + 90 @@ -1712,6 +1714,7 @@ 222 281 262 + 90 diff --git a/drafter_18/annotations/C210_D1_P3.xml b/drafter_18/annotations/C210_D1_P3.xml index 4c3a6d09b0325af1ad2f92d483ef0c4f603a305b..1c8dfd0576ab7967eec001be52f45c858eca8d55 100644 --- a/drafter_18/annotations/C210_D1_P3.xml +++ b/drafter_18/annotations/C210_D1_P3.xml @@ -95,6 +95,7 @@ 197 267 237 + 90 @@ -1379,6 +1380,7 @@ 68 93 111 + 90 @@ -2201,6 +2203,7 @@ 207 512 245 + 90 @@ -2213,6 +2216,7 @@ 205 534 247 + 90 @@ -2237,6 +2241,7 @@ 171 691 224 + 90 @@ -2249,6 +2254,7 @@ 165 721 222 + 94 @@ -2273,6 +2279,7 @@ 70 48 108 + 90 @@ -2285,6 +2292,7 @@ 200 51 255 + 81 diff --git a/drafter_18/annotations/C210_D1_P4.xml b/drafter_18/annotations/C210_D1_P4.xml index 734969e1ffb9a58eb023a229d57feb086e8fc620..f0000db0a48a8d722cbc3d305a9db6d2b64e9177 100644 --- a/drafter_18/annotations/C210_D1_P4.xml +++ b/drafter_18/annotations/C210_D1_P4.xml @@ -1710,7 +1710,7 @@ - capacitor.polarized + resistor Unspecified 0 0 diff --git a/drafter_18/annotations/C210_D2_P1.xml b/drafter_18/annotations/C210_D2_P1.xml index 7600b35b7df3827199ae3689deee962c8285d674..8b6b03c4220f49eba0593207b4f943489715d358 100644 --- a/drafter_18/annotations/C210_D2_P1.xml +++ b/drafter_18/annotations/C210_D2_P1.xml @@ -1451,6 +1451,7 @@ 97 114 128 + 90 @@ -2093,6 +2094,7 @@ 217 270 256 + 89 diff --git a/drafter_18/annotations/C210_D2_P2.xml b/drafter_18/annotations/C210_D2_P2.xml index 35fc7437f8e549c582cc9e15fb1bbeed8b67b10f..9b372248dcc02eb7b50d2235aed89023a3b43311 100644 --- a/drafter_18/annotations/C210_D2_P2.xml +++ b/drafter_18/annotations/C210_D2_P2.xml @@ -145,6 +145,7 @@ 252 255 292 + 90 @@ -1595,6 +1596,7 @@ 125 91 159 + 90 @@ -1885,6 +1887,7 @@ 271 485 282 + 90 @@ -2409,6 +2412,7 @@ 118 52 166 + 90 @@ -2421,6 +2425,7 @@ 249 56 297 + 94 diff --git a/drafter_18/annotations/C210_D2_P3.xml b/drafter_18/annotations/C210_D2_P3.xml index 78b4609563589e63788e13e309de24624ead0a2c..867b721ca33a1e2a5d7d387599e296b7bca43ca3 100644 --- a/drafter_18/annotations/C210_D2_P3.xml +++ b/drafter_18/annotations/C210_D2_P3.xml @@ -57,7 +57,7 @@ 237 1027 286 - 270 + 283 @@ -120,6 +120,7 @@ 166 316 196 + 90 @@ -391,7 +392,7 @@ 394 1090 428 - 270 + 277 @@ -573,7 +574,7 @@ 202 825 237 - 90 + 98 @@ -599,6 +600,7 @@ 110 1140 159 + 10 @@ -698,7 +700,7 @@ 148 798 164 - 90 + 98 @@ -823,7 +825,7 @@ 216 928 244 - 90 + 100 @@ -1081,7 +1083,7 @@ 124 767 145 - 180 + 189 @@ -1154,7 +1156,7 @@ 209 905 243 - 90 + 96 @@ -1475,6 +1477,7 @@ 58 1115 92 + 8 @@ -1549,6 +1552,7 @@ 73 178 99 + 89 @@ -1753,6 +1757,7 @@ 182 840 191 + 8 @@ -1765,6 +1770,7 @@ 248 911 258 + 12 @@ -1801,6 +1807,7 @@ 270 299 300 + 270 diff --git a/drafter_18/annotations/C210_D2_P4.xml b/drafter_18/annotations/C210_D2_P4.xml index d5e7e235136180cb5c2b262f96391967054d3f26..b44bd1755375dea2239d694909b430adf16cfb1e 100644 --- a/drafter_18/annotations/C210_D2_P4.xml +++ b/drafter_18/annotations/C210_D2_P4.xml @@ -34,6 +34,7 @@ 91 107 123 + 90 @@ -145,6 +146,7 @@ 217 270 254 + 90 @@ -584,6 +586,7 @@ 130 1016 185 + 6 @@ -1533,7 +1536,6 @@ 106 1199 143 - 90 @@ -1603,10 +1605,11 @@ 0 0 - 834 + 835 205 866 249 + 270 @@ -2197,6 +2200,7 @@ 212 218 259 + 90 diff --git a/drafter_18/annotations/C211_D1_P1.xml b/drafter_18/annotations/C211_D1_P1.xml index 5d03e70ff3d22d345bce52d618664a0df0c9be5d..086ae77f39f5c5565e69922eaf9a3092287fa483 100644 --- a/drafter_18/annotations/C211_D1_P1.xml +++ b/drafter_18/annotations/C211_D1_P1.xml @@ -2086,6 +2086,7 @@ 127 129 167 + 185 @@ -2368,6 +2369,7 @@ 205 120 242 + 185 diff --git a/drafter_18/annotations/C211_D1_P2.xml b/drafter_18/annotations/C211_D1_P2.xml index 2a2e578dced430d45b75dcde1b634e9087647557..d330af6b6e08c3249a5d09e7efb48e25a03e4d0a 100644 --- a/drafter_18/annotations/C211_D1_P2.xml +++ b/drafter_18/annotations/C211_D1_P2.xml @@ -122,6 +122,7 @@ 476 118 500 + 6 @@ -807,6 +808,7 @@ 323 138 348 + 4 @@ -1282,6 +1284,7 @@ 421 117 444 + 6 @@ -1670,6 +1673,7 @@ 467 83 508 + 180 @@ -3885,6 +3889,7 @@ 409 80 455 + 183 @@ -3909,6 +3914,7 @@ 361 81 400 + 185 @@ -3921,6 +3927,7 @@ 312 93 356 + 185 diff --git a/drafter_18/annotations/C211_D1_P4.xml b/drafter_18/annotations/C211_D1_P4.xml index 755e7ac34acbdbfe392564fd3d452e97c3b7e244..b98896fe8822250271e91dbdb9ba450a40dbee80 100644 --- a/drafter_18/annotations/C211_D1_P4.xml +++ b/drafter_18/annotations/C211_D1_P4.xml @@ -2289,7 +2289,7 @@ - terminal + integrated_circuit.voltage_regulator Unspecified 0 0 diff --git a/drafter_18/annotations/C211_D2_P1.xml b/drafter_18/annotations/C211_D2_P1.xml index 6419e0e919be897fea65338d3beba82a170febd8..a8994ebbf9d5a140ab4442570321ab88c643ed6c 100644 --- a/drafter_18/annotations/C211_D2_P1.xml +++ b/drafter_18/annotations/C211_D2_P1.xml @@ -2214,6 +2214,7 @@ 328 411 548 + 358 diff --git a/drafter_18/annotations/C211_D2_P2.xml b/drafter_18/annotations/C211_D2_P2.xml index 74811c1a182468b55f8f4e386f85d0f0527fb229..c60a31fa4b89e248e048aa891470f45b5b84d47e 100644 --- a/drafter_18/annotations/C211_D2_P2.xml +++ b/drafter_18/annotations/C211_D2_P2.xml @@ -2197,6 +2197,7 @@ 320 389 554 + 356 diff --git a/drafter_18/annotations/C211_D2_P3.xml b/drafter_18/annotations/C211_D2_P3.xml index 45b58d3831d905911fafc2a05497cb1dfdfa3b66..c6fd700e4559f67197f6c3c58073ea6e37f943f8 100644 --- a/drafter_18/annotations/C211_D2_P3.xml +++ b/drafter_18/annotations/C211_D2_P3.xml @@ -21,6 +21,7 @@ 322 405 548 + 358 diff --git a/drafter_18/annotations/C211_D2_P4.xml b/drafter_18/annotations/C211_D2_P4.xml index b514987ce4f6aa2cd13e9e1274b557abae70d0c2..378fa79dfab61ae4c0b1a8438c46d066ce596d03 100644 --- a/drafter_18/annotations/C211_D2_P4.xml +++ b/drafter_18/annotations/C211_D2_P4.xml @@ -683,6 +683,7 @@ 341 409 559 + 356 diff --git a/drafter_18/annotations/C212_D1_P1.xml b/drafter_18/annotations/C212_D1_P1.xml index ce72ff9b48cde4f1187d508f7614be0b91868727..5db08aa895a322cb85b8be5db76750845b99f057 100644 --- a/drafter_18/annotations/C212_D1_P1.xml +++ b/drafter_18/annotations/C212_D1_P1.xml @@ -47,6 +47,7 @@ 383 1025 434 + 92 @@ -2416,7 +2417,7 @@ 417 892 464 - 15 + 4 @@ -2630,6 +2631,7 @@ 452 762 488 + 85 diff --git a/drafter_18/annotations/C212_D2_P4.xml b/drafter_18/annotations/C212_D2_P4.xml index 217009b66b771489107659fa84d8cebf2f94fc05..2c0708923a622396efdc15699c16590b906f5883 100644 --- a/drafter_18/annotations/C212_D2_P4.xml +++ b/drafter_18/annotations/C212_D2_P4.xml @@ -1551,6 +1551,7 @@ 360 888 392 + 4 diff --git a/drafter_18/annotations/C213_D1_P2.xml b/drafter_18/annotations/C213_D1_P2.xml index d95a7b95c27ae327a25a07b56221c69cd069d245..dff3cf8955e90a55a11704a4e55b2aea00d6ba22 100644 --- a/drafter_18/annotations/C213_D1_P2.xml +++ b/drafter_18/annotations/C213_D1_P2.xml @@ -1176,6 +1176,7 @@ 156 895 190 + 90 diff --git a/drafter_18/annotations/C213_D1_P3.xml b/drafter_18/annotations/C213_D1_P3.xml index 37d8dd48f4ba5e7b8bc55679326e123305cf3541..0b57b744190bac55055c38d26f4103d00524d395 100644 --- a/drafter_18/annotations/C213_D1_P3.xml +++ b/drafter_18/annotations/C213_D1_P3.xml @@ -1035,6 +1035,7 @@ 140 992 187 + 180 diff --git a/drafter_18/annotations/C214_D1_P1.xml b/drafter_18/annotations/C214_D1_P1.xml index 28194724716956dd74551029135de89d3a49b346..f42362a3375351bc2a77a6b902024d681818605f 100644 --- a/drafter_18/annotations/C214_D1_P1.xml +++ b/drafter_18/annotations/C214_D1_P1.xml @@ -1096,6 +1096,7 @@ 279 184 323 + 90 diff --git a/drafter_18/annotations/C214_D1_P2.xml b/drafter_18/annotations/C214_D1_P2.xml index 7cbe9b4478d6ef0314fb411a90d4a4a98e08ffc9..9f250fb719b6f61c8385ccbae75b9267aafa2e3e 100644 --- a/drafter_18/annotations/C214_D1_P2.xml +++ b/drafter_18/annotations/C214_D1_P2.xml @@ -779,6 +779,7 @@ 314 174 350 + 85 @@ -1037,7 +1038,7 @@ 136 374 219 - 15 + 6 diff --git a/drafter_18/annotations/C214_D1_P3.xml b/drafter_18/annotations/C214_D1_P3.xml index 21436ba43350a3145240a9efa0fe788ed228fb45..e779be52d041365d91fe874c95e9fb9f208c3024 100644 --- a/drafter_18/annotations/C214_D1_P3.xml +++ b/drafter_18/annotations/C214_D1_P3.xml @@ -939,6 +939,7 @@ 286 201 325 + 83 @@ -1097,6 +1098,7 @@ 115 441 203 + 6 diff --git a/drafter_18/annotations/C214_D1_P4.xml b/drafter_18/annotations/C214_D1_P4.xml index adc30f1def76900726a11ab821d9251553047716..cd95c72c33d40db37e2bf65595f08ce8f914e931 100644 --- a/drafter_18/annotations/C214_D1_P4.xml +++ b/drafter_18/annotations/C214_D1_P4.xml @@ -750,6 +750,7 @@ 278 280 315 + 85 @@ -996,6 +997,7 @@ 145 562 238 + 356 diff --git a/drafter_18/annotations/C214_D2_P1.xml b/drafter_18/annotations/C214_D2_P1.xml index e1027d88075c980e6c3e7982d2bb920e70a6aaf6..26f3e5e57ebdf8aba5cda88ffe9b216465b6aec6 100644 --- a/drafter_18/annotations/C214_D2_P1.xml +++ b/drafter_18/annotations/C214_D2_P1.xml @@ -974,6 +974,7 @@ 271 279 322 + 90 @@ -1107,6 +1108,7 @@ 57 602 143 + 2 diff --git a/drafter_18/annotations/C214_D2_P2.xml b/drafter_18/annotations/C214_D2_P2.xml index 800bf4683723dc93a32e5b3c95d5f3d880a09edb..d4829fd2c4246470ba11facdab8544fe37d27908 100644 --- a/drafter_18/annotations/C214_D2_P2.xml +++ b/drafter_18/annotations/C214_D2_P2.xml @@ -1181,18 +1181,6 @@ 549 - - capacitor.adjustable - Unspecified - 0 - 0 - - 218 - 282 - 268 - 331 - - junction Unspecified @@ -1228,6 +1216,7 @@ 283 258 329 + 90 diff --git a/drafter_18/annotations/C214_D2_P3.xml b/drafter_18/annotations/C214_D2_P3.xml index 6c6b0782af29c2820de3ae31ece930649a8d6da3..53f44f72b9c5b03fee894ffb777d4b78f1d417fe 100644 --- a/drafter_18/annotations/C214_D2_P3.xml +++ b/drafter_18/annotations/C214_D2_P3.xml @@ -1055,6 +1055,7 @@ 264 276 307 + 85 diff --git a/drafter_18/annotations/C214_D2_P4.xml b/drafter_18/annotations/C214_D2_P4.xml index 10b92b4ce519fe1316904a69d20e2d6491dd9201..f267d83d98345fa0f1441f0b769ede7fe45d9a25 100644 --- a/drafter_18/annotations/C214_D2_P4.xml +++ b/drafter_18/annotations/C214_D2_P4.xml @@ -1022,6 +1022,7 @@ 253 248 299 + 79 diff --git a/drafter_18/annotations/C215_D1_P1.xml b/drafter_18/annotations/C215_D1_P1.xml index 65448583232d875cb47fe45a5fc31a65d9b91da2..cbc43708bbf4b5effe8cdd284b90764288339e9e 100644 --- a/drafter_18/annotations/C215_D1_P1.xml +++ b/drafter_18/annotations/C215_D1_P1.xml @@ -1768,6 +1768,7 @@ 655 761 745 + 2 @@ -2205,10 +2206,11 @@ 0 0 - 1063 + 1064 76 - 1092 + 1091 102 + 8 @@ -2519,6 +2521,7 @@ 589 315 615 + 8 diff --git a/drafter_18/annotations/C215_D1_P2.xml b/drafter_18/annotations/C215_D1_P2.xml index 7975298e2a37555fbd68013d186585a65e9a9672..134f37d0c3866bdb0a8461ba1a4e8176ce430c41 100644 --- a/drafter_18/annotations/C215_D1_P2.xml +++ b/drafter_18/annotations/C215_D1_P2.xml @@ -1344,6 +1344,7 @@ 678 801 773 + 2 @@ -1672,6 +1673,7 @@ 616 326 643 + 12 diff --git a/drafter_18/annotations/C215_D1_P3.xml b/drafter_18/annotations/C215_D1_P3.xml index 1502bd66c3b847a549d3ad45f958248c4937632c..a6a9572bfc1ec100f52a11b2b148047b8e7b5647 100644 --- a/drafter_18/annotations/C215_D1_P3.xml +++ b/drafter_18/annotations/C215_D1_P3.xml @@ -1586,6 +1586,7 @@ 659 1072 685 + 8 @@ -2954,6 +2955,7 @@ 599 310 626 + 10 diff --git a/drafter_18/annotations/C215_D1_P4.xml b/drafter_18/annotations/C215_D1_P4.xml index 0a8ef9832caef96880e537b3ea3c528749e7c71c..bf9a88987f2e7e259532d3625aaef3a2b492e355 100644 --- a/drafter_18/annotations/C215_D1_P4.xml +++ b/drafter_18/annotations/C215_D1_P4.xml @@ -397,6 +397,7 @@ 745 247 773 + 4 @@ -603,6 +604,7 @@ 310 219 460 + 4 @@ -1437,6 +1439,7 @@ 659 768 750 + 2 @@ -1915,6 +1918,7 @@ 257 255 281 + 8 @@ -2420,6 +2424,7 @@ 634 1020 659 + 10 @@ -3092,6 +3097,7 @@ 291 270 305 + 10 @@ -3556,6 +3562,7 @@ 376 82 400 + 4 diff --git a/drafter_18/annotations/C215_D2_P1.xml b/drafter_18/annotations/C215_D2_P1.xml index cedeb16bdca8af6b2dcfc2bf7ff8d66011c871ff..ccde45e842d2fcd7f458c5194c50052be76e5914 100644 --- a/drafter_18/annotations/C215_D2_P1.xml +++ b/drafter_18/annotations/C215_D2_P1.xml @@ -2367,6 +2367,7 @@ 46 234 75 + 4 diff --git a/drafter_18/annotations/C215_D2_P2.xml b/drafter_18/annotations/C215_D2_P2.xml index 3d01ed4e897ee4180cd12aafc9b90cacd314d6e4..a4f04fb79b60acc0b7ff1123e5b798a7636d6df6 100644 --- a/drafter_18/annotations/C215_D2_P2.xml +++ b/drafter_18/annotations/C215_D2_P2.xml @@ -145,6 +145,7 @@ 579 222 680 + 2 diff --git a/drafter_18/annotations/C215_D2_P3.xml b/drafter_18/annotations/C215_D2_P3.xml index 5eefe477e5a3a54418f9f4392a7e16ee20ebf883..be3d7a7e05fd1ff131ab4367c5ac0793b855a21f 100644 --- a/drafter_18/annotations/C215_D2_P3.xml +++ b/drafter_18/annotations/C215_D2_P3.xml @@ -59,6 +59,7 @@ 582 183 688 + 2 diff --git a/drafter_18/annotations/C215_D2_P4.xml b/drafter_18/annotations/C215_D2_P4.xml index 1a8bf6dddfde36b3552e80ceb8fc5cc3526573bb..1b60755c81bf42cbc102abff7b2efa633bdc1007 100644 --- a/drafter_18/annotations/C215_D2_P4.xml +++ b/drafter_18/annotations/C215_D2_P4.xml @@ -34,6 +34,7 @@ 577 197 683 + 2 @@ -1833,6 +1834,7 @@ 680 713 766 + 2 diff --git a/drafter_18/annotations/C216_D1_P1.xml b/drafter_18/annotations/C216_D1_P1.xml index ffce2d36b3d26702592486f7efc057b9186ce309..6b232ae2394c1608d98960e84e357f22cea9bb7c 100644 --- a/drafter_18/annotations/C216_D1_P1.xml +++ b/drafter_18/annotations/C216_D1_P1.xml @@ -461,6 +461,7 @@ 328 980 405 + 2 @@ -1580,6 +1581,7 @@ 274 1205 341 + 2 diff --git a/drafter_18/annotations/C216_D2_P4.xml b/drafter_18/annotations/C216_D2_P4.xml index 6071e9d3e4771c7056acb955975cbac5545a461b..fe71a5bbd4349591fc96a80611c33c5917f4f4e5 100644 --- a/drafter_18/annotations/C216_D2_P4.xml +++ b/drafter_18/annotations/C216_D2_P4.xml @@ -832,6 +832,7 @@ 475 955 622 + 2 diff --git a/drafter_19/annotations/C217_D1_P2.xml b/drafter_19/annotations/C217_D1_P2.xml index 1551d10c69ecd4f450481ee77e46109be76861fa..a656703d9647a4d694c83ee0aaaf0939091db018 100644 --- a/drafter_19/annotations/C217_D1_P2.xml +++ b/drafter_19/annotations/C217_D1_P2.xml @@ -992,6 +992,7 @@ 354 2641 417 + 19 diff --git a/drafter_19/annotations/C217_D1_P3.xml b/drafter_19/annotations/C217_D1_P3.xml index 9fe388c83bb566b8c04cf763ef4f2d773fe86433..6e04454dbd0215dfa2b7cb710fb6bd289a2e368d 100644 --- a/drafter_19/annotations/C217_D1_P3.xml +++ b/drafter_19/annotations/C217_D1_P3.xml @@ -306,6 +306,7 @@ 1135 2829 1228 + 350 @@ -1016,6 +1017,7 @@ 784 2663 844 + 352 diff --git a/drafter_19/annotations/C217_D2_P1.xml b/drafter_19/annotations/C217_D2_P1.xml index 34e4f9374ae260db6bffcdce787bc5d39727c757..fd834734bbdb9db9c94146e428aef3ea8fdad2e7 100644 --- a/drafter_19/annotations/C217_D2_P1.xml +++ b/drafter_19/annotations/C217_D2_P1.xml @@ -582,7 +582,7 @@ 0 1454 - 1838 + 1847 1543 1908 272 @@ -683,7 +683,7 @@ 0 1584 - 1836 + 1848 1676 1914 91 @@ -722,9 +722,9 @@ 0 1361 - 2329 + 2338 1504 - 2424 + 2415 91 diff --git a/drafter_19/annotations/C217_D2_P2.xml b/drafter_19/annotations/C217_D2_P2.xml index cce8f4815b59ce7ab36c9868b87d59d83d3a4fa6..c1386d2e5bf6d5f847fde2aa544e8d40054dbc65 100644 --- a/drafter_19/annotations/C217_D2_P2.xml +++ b/drafter_19/annotations/C217_D2_P2.xml @@ -226,7 +226,7 @@ 0 1205 - 961 + 963 1330 1045 100 @@ -600,9 +600,9 @@ 0 1034 - 984 + 988 1146 - 1078 + 1071 280 @@ -914,7 +914,8 @@ 2347 351 2399 - 407 + 401 + 15 diff --git a/drafter_19/annotations/C217_D2_P3.xml b/drafter_19/annotations/C217_D2_P3.xml index 86470f529c3fe3117ed8108b62fadfb62f58f8a3..356518b39709c21d21f34315e7669083ff42678e 100644 --- a/drafter_19/annotations/C217_D2_P3.xml +++ b/drafter_19/annotations/C217_D2_P3.xml @@ -464,9 +464,9 @@ 0 1241 - 392 + 397 1318 - 455 + 452 257 @@ -514,9 +514,9 @@ 0 1351 - 408 + 413 1430 - 476 + 470 72 diff --git a/drafter_2/annotations/C13_D1_P1.xml b/drafter_2/annotations/C13_D1_P1.xml index 636f843e23f2b14fb1689a6102801bd8aaf6c935..fbd2d8c9f23fc3a4dbb1f0ad4ff10dd9d9e29dcc 100644 --- a/drafter_2/annotations/C13_D1_P1.xml +++ b/drafter_2/annotations/C13_D1_P1.xml @@ -21,7 +21,6 @@ 597 978 975 - 0 @@ -150,11 +149,11 @@ 0 0 - 3064 + 3103 392 - 3285 + 3244 833 - 90 + 85 diff --git a/drafter_2/annotations/C13_D1_P2.xml b/drafter_2/annotations/C13_D1_P2.xml index dec36c959873118243b228c9ed85ee4e382151d2..3d2e778d6ff6fb5b583cb3a7fe1515e500cda8f3 100644 --- a/drafter_2/annotations/C13_D1_P2.xml +++ b/drafter_2/annotations/C13_D1_P2.xml @@ -112,6 +112,7 @@ 1049 1438 1312 + 6 @@ -124,6 +125,7 @@ 966 2047 1233 + 8 @@ -136,6 +138,7 @@ 907 2638 1158 + 6 @@ -148,6 +151,7 @@ 887 3080 1106 + 10 @@ -156,9 +160,9 @@ 0 0 - 3044 + 3082 374 - 3230 + 3205 786 97 diff --git a/drafter_2/annotations/C13_D1_P3.xml b/drafter_2/annotations/C13_D1_P3.xml index 0908aa21c5c0954b90d538e98bae4792c458afe8..c51a8ae2aeef5938b8dfba5e8dd223e85969cc06 100644 --- a/drafter_2/annotations/C13_D1_P3.xml +++ b/drafter_2/annotations/C13_D1_P3.xml @@ -126,9 +126,9 @@ 0 0 - 3144 + 3176 322 - 3364 + 3335 768 90 @@ -156,6 +156,7 @@ 1008 1513 1209 + 6 @@ -168,6 +169,7 @@ 929 2043 1157 + 6 @@ -180,6 +182,7 @@ 879 2634 1121 + 4 @@ -192,6 +195,7 @@ 862 3105 1086 + 8 diff --git a/drafter_2/annotations/C13_D1_P4.xml b/drafter_2/annotations/C13_D1_P4.xml index 44dc83510b56a4cad363e49c149a6847cd955507..7d0dcea0ed9f5603d9f05981d817fc49c53f5060 100644 --- a/drafter_2/annotations/C13_D1_P4.xml +++ b/drafter_2/annotations/C13_D1_P4.xml @@ -30,9 +30,9 @@ 0 0 - 2924 + 2961 452 - 3147 + 3093 803 96 @@ -121,6 +121,7 @@ 1027 1326 1229 + 8 @@ -133,6 +134,7 @@ 952 1901 1175 + 8 @@ -157,6 +159,7 @@ 902 2943 1083 + 8 diff --git a/drafter_2/annotations/C16_D1_P1.xml b/drafter_2/annotations/C16_D1_P1.xml index 7d6b5752d04103b812a1187667e70b2fb194b3f8..044fb47a1a862f0784b22e7cb7b9914b2b543d21 100644 --- a/drafter_2/annotations/C16_D1_P1.xml +++ b/drafter_2/annotations/C16_D1_P1.xml @@ -110,6 +110,7 @@ 950 2425 1193 + 2 diff --git a/drafter_2/annotations/C16_D1_P2.xml b/drafter_2/annotations/C16_D1_P2.xml index 6b394e869e80543196202a757254851ceb5d35ec..72e14c600b35e6019481a379468485d4547990f5 100644 --- a/drafter_2/annotations/C16_D1_P2.xml +++ b/drafter_2/annotations/C16_D1_P2.xml @@ -84,6 +84,7 @@ 1050 2398 1280 + 4 diff --git a/drafter_2/annotations/C16_D1_P3.xml b/drafter_2/annotations/C16_D1_P3.xml index ff0cc970d976c99611be31aec1de266ccedcaf2e..1bc579f083b3b4e99ba02c077304c459c9ad2001 100644 --- a/drafter_2/annotations/C16_D1_P3.xml +++ b/drafter_2/annotations/C16_D1_P3.xml @@ -84,6 +84,7 @@ 1051 2588 1251 + 4 diff --git a/drafter_2/annotations/C16_D1_P4.xml b/drafter_2/annotations/C16_D1_P4.xml index c05c8a8af861be722fe13428d076a79913fdb2f8..ed9da0fbfafde75ba3480514016c578c74663877 100644 --- a/drafter_2/annotations/C16_D1_P4.xml +++ b/drafter_2/annotations/C16_D1_P4.xml @@ -58,6 +58,7 @@ 723 2475 954 + 4 diff --git a/drafter_2/annotations/C16_D2_P1.xml b/drafter_2/annotations/C16_D2_P1.xml index 5eaacbedaaaa0fd9635cf5f169a2e130967ca8aa..6c3db3865a9ddee10818ce8f1af40bccf1b0b8d1 100644 --- a/drafter_2/annotations/C16_D2_P1.xml +++ b/drafter_2/annotations/C16_D2_P1.xml @@ -59,6 +59,7 @@ 867 2272 1097 + 6 diff --git a/drafter_2/annotations/C16_D2_P2.xml b/drafter_2/annotations/C16_D2_P2.xml index 4f84a31cba84255022a853a953f4a276fa86c634..46f2e3e65d0277afa5af3df5c48dc8f8a6a4cd4d 100644 --- a/drafter_2/annotations/C16_D2_P2.xml +++ b/drafter_2/annotations/C16_D2_P2.xml @@ -137,6 +137,7 @@ 797 2252 990 + 6 diff --git a/drafter_2/annotations/C16_D2_P3.xml b/drafter_2/annotations/C16_D2_P3.xml index 7fb0b9cb319ac057df65785a01d18c9dcecf0231..373e363edea86e89ba3898bc8d71db83e9072278 100644 --- a/drafter_2/annotations/C16_D2_P3.xml +++ b/drafter_2/annotations/C16_D2_P3.xml @@ -137,6 +137,7 @@ 890 2161 1093 + 4 diff --git a/drafter_2/annotations/C16_D2_P4.xml b/drafter_2/annotations/C16_D2_P4.xml index d4b8e73e79d6db8dc4f919d109525c12038fee9a..47a1def582303259914d9d68b22232ed95c23712 100644 --- a/drafter_2/annotations/C16_D2_P4.xml +++ b/drafter_2/annotations/C16_D2_P4.xml @@ -59,6 +59,7 @@ 850 1995 1060 + 10 diff --git a/drafter_2/annotations/C22_D1_P1.xml b/drafter_2/annotations/C22_D1_P1.xml index 627dfa33e342704294778a0e8d18f988264d65c9..cf9104a0fa048a9fd0c8ff627d2d3a4684be2457 100644 --- a/drafter_2/annotations/C22_D1_P1.xml +++ b/drafter_2/annotations/C22_D1_P1.xml @@ -86,6 +86,7 @@ 1320 2245 1863 + 356 diff --git a/drafter_2/annotations/C23_D1_P2.xml b/drafter_2/annotations/C23_D1_P2.xml index cd8c3642f8dad022b7771a151357ae0975b816fb..8614fe4fed421ac4d5a9c17b83e1ba4a78d52e43 100644 --- a/drafter_2/annotations/C23_D1_P2.xml +++ b/drafter_2/annotations/C23_D1_P2.xml @@ -60,7 +60,7 @@ 1253 3443 1570 - 5 + 352 diff --git a/drafter_2/annotations/C23_D1_P4.xml b/drafter_2/annotations/C23_D1_P4.xml index d7c220733c5b3891afb82dbf8e6d9cff11a939d5..e9f7a25b8333f544ad8c12799d143eddf86c8d90 100644 --- a/drafter_2/annotations/C23_D1_P4.xml +++ b/drafter_2/annotations/C23_D1_P4.xml @@ -34,6 +34,7 @@ 987 1372 1375 + 354 diff --git a/drafter_2/annotations/C23_D2_P1.xml b/drafter_2/annotations/C23_D2_P1.xml index 4ba26737f10d4bb847b5e8af1fa7cc8a9cccb899..ac9b2bee6c03e9b1eb82d3285c44a042550511c5 100644 --- a/drafter_2/annotations/C23_D2_P1.xml +++ b/drafter_2/annotations/C23_D2_P1.xml @@ -33,6 +33,7 @@ 1527 1425 1947 + 356 diff --git a/drafter_2/annotations/C23_D2_P4.xml b/drafter_2/annotations/C23_D2_P4.xml index cbb78280ebc4014a2f54e5a7d59d0623fd5bf87e..473a17f87d38c2474225f7a85debda5d45070d5e 100644 --- a/drafter_2/annotations/C23_D2_P4.xml +++ b/drafter_2/annotations/C23_D2_P4.xml @@ -34,6 +34,7 @@ 1318 1358 1727 + 354 @@ -46,6 +47,7 @@ 1287 2569 1660 + 356 diff --git a/drafter_20/annotations/C230_D1_P1.xml b/drafter_20/annotations/C230_D1_P1.xml index 273930879075256f7e803380d659376c37f748e7..7483d03230830d31b4f6bd7dffbe669defda7687 100644 --- a/drafter_20/annotations/C230_D1_P1.xml +++ b/drafter_20/annotations/C230_D1_P1.xml @@ -1256,6 +1256,7 @@ 1000 1295 1100 + 6 diff --git a/drafter_20/annotations/C230_D1_P4.xml b/drafter_20/annotations/C230_D1_P4.xml index ae7d1fab9dfa4c52d506f70ea65889ec11403284..700a7e35e5d0ba2fc4e76078372c11ead58d1890 100644 --- a/drafter_20/annotations/C230_D1_P4.xml +++ b/drafter_20/annotations/C230_D1_P4.xml @@ -238,10 +238,11 @@ 0 0 - 1242 + 1249 1283 1320 - 1392 + 1382 + 4 @@ -938,8 +939,8 @@ 0 0 - 662 - 1361 + 676 + 1354 760 1455 6 @@ -1092,6 +1093,7 @@ 1511 368 1574 + 10 @@ -1116,6 +1118,7 @@ 1195 286 1233 + 8 @@ -1253,10 +1256,11 @@ 0 0 - 423 - 1841 - 503 + 433 + 1844 + 493 1885 + 6 diff --git a/drafter_20/annotations/C230_D2_P1.xml b/drafter_20/annotations/C230_D2_P1.xml index 9e11693087c606c3e66c8175d92166b5ccd54aeb..97147dfc019b08551629446b1ad814135a796ca7 100644 --- a/drafter_20/annotations/C230_D2_P1.xml +++ b/drafter_20/annotations/C230_D2_P1.xml @@ -125,6 +125,7 @@ 985 1699 1030 + 10 @@ -404,6 +405,7 @@ 1141 831 1249 + 4 @@ -424,10 +426,11 @@ 0 0 - 743 - 645 + 749 + 642 823 - 768 + 761 + 4 @@ -1014,6 +1017,7 @@ 1332 334 1396 + 6 @@ -1077,6 +1081,7 @@ 1670 471 1727 + 10 diff --git a/drafter_20/annotations/C230_D2_P2.xml b/drafter_20/annotations/C230_D2_P2.xml index 62626692db2d9cffd40fc60608fad1f8e7212474..c895f6aa38341445f51d1ffccf411a105d2af018 100644 --- a/drafter_20/annotations/C230_D2_P2.xml +++ b/drafter_20/annotations/C230_D2_P2.xml @@ -17,10 +17,11 @@ 0 0 - 1153 - 1022 + 1150 + 1027 1279 - 1078 + 1076 + 8 @@ -198,10 +199,10 @@ 0 0 - 700 + 713 1193 793 - 1320 + 1322 3 @@ -1057,7 +1058,7 @@ 1528 980 1593 - 264 + 275 diff --git a/drafter_20/annotations/C230_D2_P3.xml b/drafter_20/annotations/C230_D2_P3.xml index c0d5d34bcf3de7d874c6c61e2ee6d785367d2aef..ed9db240cf9a5ce3d7d0f127fdac2ec88befe1bc 100644 --- a/drafter_20/annotations/C230_D2_P3.xml +++ b/drafter_20/annotations/C230_D2_P3.xml @@ -963,9 +963,10 @@ 0 382 - 1286 + 1288 455 - 1352 + 1348 + 6 diff --git a/drafter_20/annotations/C231_D1_P3.xml b/drafter_20/annotations/C231_D1_P3.xml index d59aee85e5882c5138b6ea7a99ba31beb5fd3fce..3e32d1df3e9010752e595654fc19f5556c6a6b08 100644 --- a/drafter_20/annotations/C231_D1_P3.xml +++ b/drafter_20/annotations/C231_D1_P3.xml @@ -82,10 +82,11 @@ 0 0 - 1153 + 1159 839 1193 - 954 + 970 + 116 @@ -791,10 +792,11 @@ 0 0 - 1144 + 1153 1358 - 1218 + 1215 1485 + 2 @@ -816,9 +818,9 @@ 0 0 - 1397 + 1403 999 - 1469 + 1460 1113 183 diff --git a/drafter_20/annotations/C231_D2_P2.xml b/drafter_20/annotations/C231_D2_P2.xml index a7cc050fd74660e5878560fe41478f9b4f21efc8..98ffcc5d5f387b26b40b01ab967544e129768ad0 100644 --- a/drafter_20/annotations/C231_D2_P2.xml +++ b/drafter_20/annotations/C231_D2_P2.xml @@ -101,6 +101,7 @@ 1241 472 1311 + 2 @@ -482,8 +483,8 @@ 0 526 - 1483 - 592 + 1479 + 583 1591 185 @@ -806,10 +807,10 @@ 0 0 - 827 + 829 1569 - 897 - 1678 + 882 + 1682 185 @@ -957,10 +958,11 @@ 0 0 - 1026 + 1034 1546 - 1091 + 1088 1678 + 2 diff --git a/drafter_20/annotations/C232_D1_P1.xml b/drafter_20/annotations/C232_D1_P1.xml index 660fbcc88e3fdc7297466f089caa32d561220934..eda2e8b61dc21b8f89c1a848114564cbc98b333c 100644 --- a/drafter_20/annotations/C232_D1_P1.xml +++ b/drafter_20/annotations/C232_D1_P1.xml @@ -111,9 +111,10 @@ 0 502 - 1008 + 1015 605 - 1051 + 1050 + 4 @@ -1037,6 +1038,7 @@ 1096 1779 1205 + 4 diff --git a/drafter_20/annotations/C232_D2_P2.xml b/drafter_20/annotations/C232_D2_P2.xml index 4d49df2ec85230767a7e3d08eaa76f6c51f916b7..e83fc880d0bc9aa0e8cecf1f96291762d8a5db67 100644 --- a/drafter_20/annotations/C232_D2_P2.xml +++ b/drafter_20/annotations/C232_D2_P2.xml @@ -1078,6 +1078,7 @@ 1050 1756 1129 + 358 diff --git a/drafter_20/annotations/C232_D2_P4.xml b/drafter_20/annotations/C232_D2_P4.xml index c44da4d730d36bcac8d4dcc4458d6c5bef01f9e2..162c1e7d9da8c6ae0ab8cf64438eb8fb6148a5d7 100644 --- a/drafter_20/annotations/C232_D2_P4.xml +++ b/drafter_20/annotations/C232_D2_P4.xml @@ -522,9 +522,10 @@ 0 944 - 621 + 627 1063 - 669 + 664 + 6 diff --git a/drafter_20/annotations/C233_D1_P1.xml b/drafter_20/annotations/C233_D1_P1.xml index 03d1cf9eaf70feb2de1bf1fc88db49a2c72c8903..0fa40847395b353c5cab7e67e9e6542afd341012 100644 --- a/drafter_20/annotations/C233_D1_P1.xml +++ b/drafter_20/annotations/C233_D1_P1.xml @@ -1119,10 +1119,10 @@ 0 1815 - 1340 + 1343 1871 - 1394 - 94 + 1385 + 87 @@ -1132,10 +1132,10 @@ 0 1721 - 1330 - 1779 - 1385 - 87 + 1333 + 1774 + 1380 + 89 diff --git a/drafter_20/annotations/C233_D2_P3.xml b/drafter_20/annotations/C233_D2_P3.xml index 6d57947cd50383a5d2f9afe89d32c52776bca45d..ca600efb8929f4faf06e076b71ccf115818d2692 100644 --- a/drafter_20/annotations/C233_D2_P3.xml +++ b/drafter_20/annotations/C233_D2_P3.xml @@ -1314,10 +1314,10 @@ 0 0 - 1830 - 1365 - 1869 - 1401 + 1826 + 1367 + 1868 + 1400 89 @@ -1328,7 +1328,7 @@ 0 1899 - 1355 + 1358 1943 1394 92 diff --git a/drafter_20/annotations/C233_D2_P4.xml b/drafter_20/annotations/C233_D2_P4.xml index 4154b23a80142744e5c5e7cbdc3b17048a5d40bf..29a77a16861bbf777e2175fb6bca9d00e0e9b5b0 100644 --- a/drafter_20/annotations/C233_D2_P4.xml +++ b/drafter_20/annotations/C233_D2_P4.xml @@ -886,10 +886,11 @@ 0 0 - 589 + 601 988 657 1105 + 352 @@ -1021,10 +1022,11 @@ 0 0 - 442 + 446 662 - 485 - 752 + 490 + 754 + 356 @@ -1088,6 +1090,7 @@ 641 350 760 + 173 @@ -1224,6 +1227,7 @@ 1519 1123 1597 + 356 @@ -1233,8 +1237,8 @@ 0 1281 - 1475 - 1336 + 1486 + 1329 1566 175 diff --git a/drafter_20/annotations/C234_D2_P4.xml b/drafter_20/annotations/C234_D2_P4.xml index 8d0e296cfb22e1911897eb4e4b9c89e742270820..cc9f5ca1386fae3b0e038bb512558334e77dea5c 100644 --- a/drafter_20/annotations/C234_D2_P4.xml +++ b/drafter_20/annotations/C234_D2_P4.xml @@ -534,10 +534,11 @@ 0 0 - 1492 + 1500 1042 - 1592 + 1581 1149 + 2 diff --git a/drafter_20/annotations/C235_D1_P1.xml b/drafter_20/annotations/C235_D1_P1.xml index d2f68ac4429d2d1cec98a10e59b6cbb1099e8004..bc056e702b7e1b3ea0269ced9fce06d9a099dc89 100644 --- a/drafter_20/annotations/C235_D1_P1.xml +++ b/drafter_20/annotations/C235_D1_P1.xml @@ -1365,6 +1365,7 @@ 958 742 1002 + 90 @@ -1373,9 +1374,9 @@ 0 0 - 1735 + 1737 1034 - 1772 + 1768 1094 90 @@ -1786,10 +1787,10 @@ 0 0 - 1783 - 1236 + 1780 + 1238 1829 - 1283 + 1275 90 @@ -2295,11 +2296,11 @@ 0 0 - 935 - 780 + 934 + 782 976 - 811 - 90 + 806 + 270 @@ -2452,9 +2453,9 @@ 0 0 - 813 + 827 1429 - 884 + 876 1527 @@ -2799,6 +2800,7 @@ 1058 746 1125 + 90 @@ -2860,6 +2862,7 @@ 896 561 950 + 90 diff --git a/drafter_20/annotations/C235_D2_P1.xml b/drafter_20/annotations/C235_D2_P1.xml index 1218cb617bb4e8303445212f083a24f214575886..0365f98d7093a5dcafebe2eafbce8483ec17fa58 100644 --- a/drafter_20/annotations/C235_D2_P1.xml +++ b/drafter_20/annotations/C235_D2_P1.xml @@ -555,7 +555,7 @@ 0 0 - 1271 + 1275 1197 1311 1261 @@ -817,7 +817,8 @@ 274 643 316 - 706 + 700 + 185 @@ -899,10 +900,11 @@ 0 0 - 257 + 263 774 300 853 + 6 @@ -1061,9 +1063,9 @@ 0 463 - 697 - 491 - 751 + 695 + 492 + 742 98 @@ -1150,10 +1152,11 @@ 0 0 - 462 + 456 1541 492 1571 + 6 @@ -1174,10 +1177,11 @@ 0 0 - 365 - 790 - 400 + 361 + 788 + 398 846 + 185 @@ -1211,10 +1215,10 @@ 0 0 - 531 - 1530 - 556 - 1558 + 528 + 1529 + 558 + 1555 @@ -1265,6 +1269,7 @@ 1544 1073 1571 + 180 @@ -1765,6 +1770,7 @@ 1169 1636 1245 + 2 @@ -1812,7 +1818,7 @@ 375 1142 - 428 + 422 1201 193 @@ -1823,9 +1829,9 @@ 0 0 - 292 + 300 1150 - 348 + 341 1228 @@ -1835,9 +1841,9 @@ 0 0 - 324 + 335 1404 - 386 + 374 1480 181 @@ -2067,10 +2073,10 @@ 0 0 - 436 - 1296 - 484 - 1339 + 441 + 1300 + 486 + 1335 92 @@ -3128,6 +3134,7 @@ 1540 1137 1574 + 180 @@ -3285,10 +3292,11 @@ 0 0 - 346 + 352 522 - 374 - 567 + 376 + 571 + 104 @@ -3297,10 +3305,11 @@ 0 0 - 272 + 275 522 - 298 + 292 573 + 90 @@ -3580,10 +3589,11 @@ 0 0 - 425 + 427 771 - 462 + 463 793 + 8 @@ -3631,10 +3641,10 @@ 0 0 - 428 + 435 1098 - 462 - 1143 + 455 + 1150 102 @@ -3784,6 +3794,7 @@ 1244 480 1272 + 180 diff --git a/drafter_20/annotations/C235_D2_P2.xml b/drafter_20/annotations/C235_D2_P2.xml index efa9de61647d839c9281df19e4d7ee14340244a8..6d08dd359476a9ef0b92d212864970a2182bbd8f 100644 --- a/drafter_20/annotations/C235_D2_P2.xml +++ b/drafter_20/annotations/C235_D2_P2.xml @@ -769,6 +769,7 @@ 642 745 697 + 114 @@ -853,11 +854,11 @@ 0 0 - 996 - 695 + 991 + 703 1028 732 - 21 + 13 @@ -892,11 +893,11 @@ 0 0 - 723 + 709 996 763 - 1021 - 17 + 1017 + 25 @@ -1122,10 +1123,11 @@ 0 0 - 882 - 1442 + 887 + 1431 929 1498 + 13 @@ -1164,6 +1166,7 @@ 1692 474 1721 + 12 @@ -1464,7 +1467,7 @@ 555 902 593 - 270 + 275 @@ -1477,6 +1480,7 @@ 599 969 628 + 6 @@ -2369,7 +2373,7 @@ 978 1290 1023 - 1328 + 1324 279 @@ -2647,9 +2651,9 @@ 0 934 - 848 + 852 972 - 893 + 883 275 @@ -3186,6 +3190,7 @@ 713 761 774 + 8 @@ -3741,10 +3746,11 @@ 0 0 - 574 + 582 1028 - 611 + 613 1055 + 10 @@ -3861,4 +3867,17 @@ 1664 + + resistor + Unspecified + 0 + 0 + + 1643 + 839 + 1667 + 884 + 100 + + diff --git a/drafter_20/annotations/C235_D2_P3.xml b/drafter_20/annotations/C235_D2_P3.xml index 81d2b84ae749137ec9a95a9529adc184e81382f9..6b763996fe892df4e22d7a93d592c2186da6d43d 100644 --- a/drafter_20/annotations/C235_D2_P3.xml +++ b/drafter_20/annotations/C235_D2_P3.xml @@ -337,6 +337,7 @@ 1524 1865 1558 + 90 @@ -397,6 +398,7 @@ 1522 1725 1558 + 90 @@ -588,10 +590,11 @@ 0 0 - 1405 + 1415 593 - 1462 - 668 + 1456 + 657 + 2 @@ -734,9 +737,9 @@ 0 0 - 1624 + 1629 1102 - 1657 + 1654 1148 102 @@ -1112,10 +1115,10 @@ 0 0 - 1759 - 601 + 1752 + 602 1793 - 639 + 631 96 @@ -1263,7 +1266,8 @@ 1649 597 1703 - 656 + 658 + 6 @@ -1285,10 +1289,10 @@ 0 0 - 1540 - 598 + 1543 + 601 1583 - 653 + 657 @@ -2129,6 +2133,7 @@ 1464 1858 1502 + 180 @@ -2137,10 +2142,11 @@ 0 0 - 1678 - 1458 - 1726 - 1498 + 1681 + 1461 + 1720 + 1495 + 185 @@ -2149,10 +2155,11 @@ 0 0 - 1699 + 1702 1117 - 1748 + 1745 1196 + 4 @@ -2224,10 +2231,11 @@ 0 0 - 1702 + 1705 770 - 1728 + 1729 811 + 92 @@ -2291,6 +2299,7 @@ 954 1568 976 + 6 @@ -2303,6 +2312,7 @@ 755 1554 780 + 8 @@ -2349,10 +2359,11 @@ 0 0 - 1635 + 1639 982 1661 1007 + 6 @@ -2397,9 +2408,9 @@ 0 0 - 1568 + 1580 1112 - 1628 + 1617 1188 10 diff --git a/drafter_20/annotations/C235_D2_P4.xml b/drafter_20/annotations/C235_D2_P4.xml index 34770cb57e1c6b082e4de70971d228967e8dfa99..5b982deb67327caedd9f88a5c6cb510de61795b1 100644 --- a/drafter_20/annotations/C235_D2_P4.xml +++ b/drafter_20/annotations/C235_D2_P4.xml @@ -536,8 +536,9 @@ 1362 590 - 1411 + 1405 655 + 6 @@ -644,9 +645,9 @@ 0 0 - 1076 + 1078 585 - 1099 + 1103 636 92 @@ -788,15 +789,16 @@ - diode + capacitor.unpolarized Unspecified 0 0 - 810 - 1151 - 844 - 1194 + 815 + 1154 + 842 + 1192 + 4 @@ -873,6 +875,7 @@ 1125 1109 1150 + 13 @@ -948,6 +951,7 @@ 602 1058 627 + 10 @@ -1067,10 +1071,11 @@ 0 0 - 1481 + 1492 592 - 1544 - 659 + 1534 + 650 + 6 @@ -3013,10 +3018,11 @@ 0 0 - 1588 + 1587 1010 1638 1030 + 15 @@ -3168,7 +3174,7 @@ 1017 407 1099 - 440 + 430 6 @@ -3178,10 +3184,11 @@ 0 0 - 1164 + 1170 647 1217 - 710 + 713 + 4 diff --git a/drafter_21/annotations/C241_D1_P2.xml b/drafter_21/annotations/C241_D1_P2.xml index e14ea02f284a59fdd411c5a8e2b4241bbf85351a..9d410ceb9554700542baed6ba89ee358b428887e 100644 --- a/drafter_21/annotations/C241_D1_P2.xml +++ b/drafter_21/annotations/C241_D1_P2.xml @@ -2468,6 +2468,7 @@ 901 1483 1748 + 358 diff --git a/drafter_21/annotations/C242_D1_P1.xml b/drafter_21/annotations/C242_D1_P1.xml index 6edea6e52ee56a3ab4582a9c083013b516452bc5..7d53548793e969413259107dab728ac06e358a59 100644 --- a/drafter_21/annotations/C242_D1_P1.xml +++ b/drafter_21/annotations/C242_D1_P1.xml @@ -1144,8 +1144,9 @@ 3801 872 - 3939 + 3929 976 + 354 diff --git a/drafter_21/annotations/C242_D2_P2.xml b/drafter_21/annotations/C242_D2_P2.xml index 0631539d323b3e38fe2c578b5d18b9e6482e1fe3..3ba7d0951c27b5b5ac59f06c7758a482310332a1 100644 --- a/drafter_21/annotations/C242_D2_P2.xml +++ b/drafter_21/annotations/C242_D2_P2.xml @@ -47,6 +47,7 @@ 2517 1346 2623 + 8 diff --git a/drafter_21/annotations/C243_D1_P2.xml b/drafter_21/annotations/C243_D1_P2.xml index 0ba69d5e9490554101b1b81e4123e8f31385460d..fba0808854aa04c14316e4c686392c8200080128 100644 --- a/drafter_21/annotations/C243_D1_P2.xml +++ b/drafter_21/annotations/C243_D1_P2.xml @@ -358,6 +358,7 @@ 1177 838 1260 + 354 diff --git a/drafter_21/annotations/C243_D1_P4.xml b/drafter_21/annotations/C243_D1_P4.xml index 96a58ece7ade8a5c8d23bf06bb760909afa63546..5209a3f8a467b8a3c7a4e2a5a5c373f36caafdf7 100644 --- a/drafter_21/annotations/C243_D1_P4.xml +++ b/drafter_21/annotations/C243_D1_P4.xml @@ -648,6 +648,7 @@ 1031 897 1124 + 354 diff --git a/drafter_21/annotations/C244_D2_P2.xml b/drafter_21/annotations/C244_D2_P2.xml index fc882b4b55c698af1014cbece54ed4461d0f69db..05c177439b0fd9aaa4d314e6e876accc766c712c 100644 --- a/drafter_21/annotations/C244_D2_P2.xml +++ b/drafter_21/annotations/C244_D2_P2.xml @@ -151,6 +151,7 @@ 2001 1114 2101 + 352 @@ -725,6 +726,7 @@ 2512 4051 2617 + 350 @@ -1314,6 +1316,7 @@ 1598 398 1697 + 354 @@ -1546,6 +1549,7 @@ 1947 2859 2034 + 354 @@ -1584,6 +1588,7 @@ 1883 4305 1983 + 352 diff --git a/drafter_21/annotations/C246_D1_P1.xml b/drafter_21/annotations/C246_D1_P1.xml index b73ac847a7062bf9432dc7cd9975ab1459ab441f..7d97304304e2d59b22ca5cbfaed9e91d6f314029 100644 --- a/drafter_21/annotations/C246_D1_P1.xml +++ b/drafter_21/annotations/C246_D1_P1.xml @@ -1093,6 +1093,7 @@ 1679 1800 2243 + 358 diff --git a/drafter_21/annotations/C246_D1_P2.xml b/drafter_21/annotations/C246_D1_P2.xml index e3f410e5854e2abfd5340b62f258a17528412a67..5be9750d32839d3179a5cfc3eba8be26d4cac040 100644 --- a/drafter_21/annotations/C246_D1_P2.xml +++ b/drafter_21/annotations/C246_D1_P2.xml @@ -738,6 +738,7 @@ 1802 1828 2357 + 358 @@ -1318,6 +1319,7 @@ 1004 3078 1158 + 270 @@ -1502,9 +1504,9 @@ 0 1519 - 1550 + 1564 1555 - 1585 + 1592 diff --git a/drafter_21/annotations/C246_D1_P3.xml b/drafter_21/annotations/C246_D1_P3.xml index dc65f487656615be3615332a907687c3e9ea2020..724fbf05d7536f4d74e6b32a2fe3d3816b01d40b 100644 --- a/drafter_21/annotations/C246_D1_P3.xml +++ b/drafter_21/annotations/C246_D1_P3.xml @@ -164,6 +164,7 @@ 1715 1750 2190 + 358 @@ -1202,6 +1203,7 @@ 960 3007 1129 + 264 @@ -2602,7 +2604,7 @@ 2016 2920 2091 - 265 + 256 diff --git a/drafter_21/annotations/C246_D1_P4.xml b/drafter_21/annotations/C246_D1_P4.xml index 1e46692af52ea229d2fc99143fc62ae028da6d12..ae03392c2e19b123eac9521d4ceb20619e56c97d 100644 --- a/drafter_21/annotations/C246_D1_P4.xml +++ b/drafter_21/annotations/C246_D1_P4.xml @@ -1455,6 +1455,7 @@ 1004 3137 1175 + 268 diff --git a/drafter_21/annotations/C246_D2_P1.xml b/drafter_21/annotations/C246_D2_P1.xml index 28201df98e00afbcf1ec32116fd65566b394f651..048de21c031ab5237049a7b3c989faa38e3336f5 100644 --- a/drafter_21/annotations/C246_D2_P1.xml +++ b/drafter_21/annotations/C246_D2_P1.xml @@ -1875,6 +1875,7 @@ 870 3533 1142 + 268 diff --git a/drafter_21/annotations/C246_D2_P2.xml b/drafter_21/annotations/C246_D2_P2.xml index 3c35c59f70a31d0ce86643bbc0e29308b3c24a3b..3d9ca958e2df1b6a699986f6c7863ea2bc5c034c 100644 --- a/drafter_21/annotations/C246_D2_P2.xml +++ b/drafter_21/annotations/C246_D2_P2.xml @@ -1335,6 +1335,7 @@ 1321 549 1819 + 358 @@ -2512,6 +2513,7 @@ 777 3478 1053 + 271 diff --git a/drafter_21/annotations/C246_D2_P3.xml b/drafter_21/annotations/C246_D2_P3.xml index 98903fcd0bb09b1d0d87793308506a63f6bf65c3..36f85209a60a7f6ba60bbaeb198190a9c7381928 100644 --- a/drafter_21/annotations/C246_D2_P3.xml +++ b/drafter_21/annotations/C246_D2_P3.xml @@ -1374,6 +1374,7 @@ 2242 3407 2381 + 90 @@ -1698,6 +1699,7 @@ 750 3651 1016 + 270 diff --git a/drafter_21/annotations/C246_D2_P4.xml b/drafter_21/annotations/C246_D2_P4.xml index f247f11469c4cdf6576268bba341495be99e6f2e..a5de0cdb87deb1192ca00e42a8d60631a337587e 100644 --- a/drafter_21/annotations/C246_D2_P4.xml +++ b/drafter_21/annotations/C246_D2_P4.xml @@ -1365,6 +1365,7 @@ 2460 3178 2589 + 83 @@ -1754,6 +1755,7 @@ 1010 3521 1282 + 268 diff --git a/drafter_21/annotations/C247_D1_P1.xml b/drafter_21/annotations/C247_D1_P1.xml index 9ef7352ced5149e4bd43bcb7e7d25c7238a6c8af..1d3ee873d70880194ee359847d62cd2e217eae6f 100644 --- a/drafter_21/annotations/C247_D1_P1.xml +++ b/drafter_21/annotations/C247_D1_P1.xml @@ -1421,6 +1421,7 @@ 210 1165 380 + 352 diff --git a/drafter_21/annotations/C247_D1_P2.xml b/drafter_21/annotations/C247_D1_P2.xml index f47d963aa5b1d0eb4cc66149619bb3ab1afd75b9..85de2544cb91663ac7e15fad5e0dbc168be04d17 100644 --- a/drafter_21/annotations/C247_D1_P2.xml +++ b/drafter_21/annotations/C247_D1_P2.xml @@ -1382,6 +1382,7 @@ 502 1202 644 + 356 diff --git a/drafter_21/annotations/C247_D1_P4.xml b/drafter_21/annotations/C247_D1_P4.xml index 50b832d5d23319ffe10f48496f76d54c7e3a13ca..762243df944d2623270873278e432e83c97a0cd0 100644 --- a/drafter_21/annotations/C247_D1_P4.xml +++ b/drafter_21/annotations/C247_D1_P4.xml @@ -3888,6 +3888,7 @@ 423 1269 578 + 350 @@ -4713,6 +4714,7 @@ 328 3787 1309 + 356 diff --git a/drafter_21/annotations/C248_D1_P2.xml b/drafter_21/annotations/C248_D1_P2.xml index 352256135be378e8b168170be696fb37a39c9c84..7a9656628569045ab42d9ab2411b74e8bf8fccf2 100644 --- a/drafter_21/annotations/C248_D1_P2.xml +++ b/drafter_21/annotations/C248_D1_P2.xml @@ -518,6 +518,7 @@ 2843 3415 2903 + 352 @@ -4736,6 +4737,7 @@ 420 3196 557 + 348 diff --git a/drafter_21/annotations/C248_D1_P3.xml b/drafter_21/annotations/C248_D1_P3.xml index 53017b72fee137e8d52022b297e8bf0678fd001c..a690d9f2a7dfe68862ee9d4a081edd3b504377f7 100644 --- a/drafter_21/annotations/C248_D1_P3.xml +++ b/drafter_21/annotations/C248_D1_P3.xml @@ -4127,6 +4127,7 @@ 448 3095 600 + 350 diff --git a/drafter_21/annotations/C248_D1_P4.xml b/drafter_21/annotations/C248_D1_P4.xml index 938826c7d37558a9fa7399513d198631dea32796..090db18b737723d793bd6469bb4daa124c2c8da0 100644 --- a/drafter_21/annotations/C248_D1_P4.xml +++ b/drafter_21/annotations/C248_D1_P4.xml @@ -1755,6 +1755,7 @@ 571 3284 669 + 345 @@ -1815,6 +1816,7 @@ 593 3448 740 + 341 diff --git a/drafter_21/annotations/C248_D2_P1.xml b/drafter_21/annotations/C248_D2_P1.xml index 6a7d0d4a12997650eeac71b22bc966b7a1678ce2..319faa9c3c8d7303648f0b67ce1be4e6e884c50e 100644 --- a/drafter_21/annotations/C248_D2_P1.xml +++ b/drafter_21/annotations/C248_D2_P1.xml @@ -86,6 +86,7 @@ 328 3805 530 + 352 @@ -1986,6 +1987,7 @@ 341 4280 495 + 356 diff --git a/drafter_21/annotations/C249_D2_P2.xml b/drafter_21/annotations/C249_D2_P2.xml index c364db8c126e01f904a4aa130d9e4eb7043678f5..c694e2b088adf669e7b28aabf2cf0b89dc2d4d6a 100644 --- a/drafter_21/annotations/C249_D2_P2.xml +++ b/drafter_21/annotations/C249_D2_P2.xml @@ -86,6 +86,7 @@ 2276 2402 2940 + 356 diff --git a/drafter_21/annotations/C250_D1_P1.xml b/drafter_21/annotations/C250_D1_P1.xml index 12f8aa6f6e52cf8fcfe9d545439f4c86388dc7b0..95f3bc5fd494def26289144bd330e2b75ee1639f 100644 --- a/drafter_21/annotations/C250_D1_P1.xml +++ b/drafter_21/annotations/C250_D1_P1.xml @@ -2007,6 +2007,7 @@ 1666 2639 2398 + 358 diff --git a/drafter_21/annotations/C251_D1_P1.xml b/drafter_21/annotations/C251_D1_P1.xml index d338ed29a5ae65cfd63c9ee0beccdcd9b7f54e27..1d775c7d95424cd4ddca3922c7463f63f5a8665f 100644 --- a/drafter_21/annotations/C251_D1_P1.xml +++ b/drafter_21/annotations/C251_D1_P1.xml @@ -202,6 +202,7 @@ 1099 616 1216 + 354 @@ -377,6 +378,7 @@ 775 1137 874 + 358 @@ -3068,6 +3070,7 @@ 2096 640 2193 + 354 diff --git a/drafter_21/annotations/C251_D1_P3.xml b/drafter_21/annotations/C251_D1_P3.xml index 74cc90fa829b4e9c42161e1c962b6f86747f3da8..828aff14e11571833c3275a2055e2958737ccb4d 100644 --- a/drafter_21/annotations/C251_D1_P3.xml +++ b/drafter_21/annotations/C251_D1_P3.xml @@ -1668,6 +1668,7 @@ 1457 1439 1673 + 356 @@ -1819,6 +1820,7 @@ 2453 762 2566 + 352 diff --git a/drafter_21/annotations/C251_D1_P4.xml b/drafter_21/annotations/C251_D1_P4.xml index a7e4a298183951b17af471f7fc8f6d4481dc7bad..81a4316aeb68338b4b87d21fd4d5a2fecaceba9f 100644 --- a/drafter_21/annotations/C251_D1_P4.xml +++ b/drafter_21/annotations/C251_D1_P4.xml @@ -1500,6 +1500,7 @@ 1529 1503 1739 + 354 diff --git a/drafter_21/annotations/C252_D2_P1.xml b/drafter_21/annotations/C252_D2_P1.xml index 3bb64b93cba7adfb2e4a31ca9321d53289305db1..a8d7cf76e902fcd8e005b4a95d7f112e2a13d208 100644 --- a/drafter_21/annotations/C252_D2_P1.xml +++ b/drafter_21/annotations/C252_D2_P1.xml @@ -543,7 +543,7 @@ 561 803 755 - 90 + 85 diff --git a/drafter_22/annotations/C253_D1_P1.xml b/drafter_22/annotations/C253_D1_P1.xml index e062af85cc2436d3c683c4e7371c7efce70c3d07..a4e4157410215cd7bfd5f3b57cb09f6a22f7c6d5 100644 --- a/drafter_22/annotations/C253_D1_P1.xml +++ b/drafter_22/annotations/C253_D1_P1.xml @@ -2147,6 +2147,7 @@ 334 1435 385 + 90 @@ -3237,6 +3238,7 @@ 284 900 324 + 90 diff --git a/drafter_22/annotations/C253_D1_P2.xml b/drafter_22/annotations/C253_D1_P2.xml index c631997fc173e209971934648554bb267c9dc42a..44080c1b650c6e2f10773b96ef21ddfd6c083b95 100644 --- a/drafter_22/annotations/C253_D1_P2.xml +++ b/drafter_22/annotations/C253_D1_P2.xml @@ -1050,6 +1050,7 @@ 377 3178 482 + 6 @@ -1184,6 +1185,7 @@ 787 3344 889 + 96 @@ -1260,6 +1262,7 @@ 398 2792 501 + 4 @@ -3367,6 +3370,7 @@ 1463 1920 1540 + 90 @@ -3606,6 +3610,7 @@ 761 2235 833 + 92 @@ -3757,6 +3762,7 @@ 444 2268 526 + 2 @@ -3884,6 +3890,7 @@ 738 2974 843 + 4 @@ -4307,6 +4314,7 @@ 582 2655 683 + 2 diff --git a/drafter_22/annotations/C253_D1_P3.xml b/drafter_22/annotations/C253_D1_P3.xml index 66f3c1886e77bcee2e3aa9cce227fa1afcf9b2f6..565ce9451831d62ad20a6e8a824523ced04a08d3 100644 --- a/drafter_22/annotations/C253_D1_P3.xml +++ b/drafter_22/annotations/C253_D1_P3.xml @@ -744,6 +744,7 @@ 458 3519 607 + 354 @@ -1295,6 +1296,7 @@ 417 3077 563 + 354 @@ -1369,6 +1371,7 @@ 638 2863 792 + 354 @@ -1394,6 +1397,7 @@ 1752 479 1809 + 352 @@ -1406,6 +1410,7 @@ 395 2740 442 + 348 @@ -1507,6 +1512,7 @@ 701 595 822 + 352 @@ -1657,6 +1663,7 @@ 927 3171 1058 + 354 @@ -1682,6 +1689,7 @@ 1051 3547 1183 + 85 @@ -1732,6 +1740,7 @@ 881 1901 1027 + 352 @@ -2212,6 +2221,7 @@ 833 1219 966 + 354 @@ -2300,6 +2310,7 @@ 1575 1450 1632 + 356 @@ -2336,6 +2347,7 @@ 1725 1712 1784 + 354 @@ -3726,6 +3738,7 @@ 207 1047 328 + 354 @@ -4088,6 +4101,7 @@ 851 2193 978 + 354 @@ -4515,6 +4529,7 @@ 827 2353 925 + 87 @@ -4649,7 +4664,7 @@ 2146 3343 2282 - 71 + 73 diff --git a/drafter_22/annotations/C253_D1_P4.xml b/drafter_22/annotations/C253_D1_P4.xml index 1e126187b098e806c36d471837f1c24114cd9b69..2a95ed7df264122151a2f15fca35ae86abb182bd 100644 --- a/drafter_22/annotations/C253_D1_P4.xml +++ b/drafter_22/annotations/C253_D1_P4.xml @@ -110,6 +110,7 @@ 604 3496 757 + 352 @@ -1697,6 +1698,7 @@ 517 2414 638 + 352 @@ -1722,6 +1724,7 @@ 1212 3507 1349 + 85 @@ -1747,6 +1750,7 @@ 2817 1760 2860 + 354 @@ -1784,6 +1788,7 @@ 2551 2087 2607 + 83 @@ -1845,6 +1850,7 @@ 310 1022 437 + 356 @@ -2012,6 +2018,7 @@ 802 577 922 + 352 @@ -2639,6 +2646,7 @@ 1077 3119 1211 + 352 @@ -2984,6 +2992,7 @@ 2218 1234 2289 + 354 @@ -3446,6 +3455,7 @@ 2274 3621 2342 + 339 @@ -3971,6 +3981,7 @@ 940 1176 1074 + 356 @@ -4414,6 +4425,7 @@ 957 2295 1057 + 85 diff --git a/drafter_22/annotations/C253_D2_P2.xml b/drafter_22/annotations/C253_D2_P2.xml index 42bcfb0d672c3164e5a801d66bc6655828f7f0a9..ad7b83aad73286e53aad634ac99d97b2d518271a 100644 --- a/drafter_22/annotations/C253_D2_P2.xml +++ b/drafter_22/annotations/C253_D2_P2.xml @@ -1769,6 +1769,7 @@ 922 972 975 + 100 @@ -2084,6 +2085,7 @@ 806 1390 878 + 116 @@ -2096,6 +2098,7 @@ 812 1414 879 + 112 diff --git a/drafter_22/annotations/C253_D2_P3.xml b/drafter_22/annotations/C253_D2_P3.xml index 6327dfc46728f75519ae12d7babe88d26deadc71..dfdce00e294cd440d90b494ea51220c48fa40b5b 100644 --- a/drafter_22/annotations/C253_D2_P3.xml +++ b/drafter_22/annotations/C253_D2_P3.xml @@ -1414,6 +1414,7 @@ 651 1428 677 + 6 @@ -2075,6 +2076,7 @@ 687 1295 756 + 108 @@ -2087,6 +2089,7 @@ 690 1317 755 + 106 diff --git a/drafter_22/annotations/C254_D1_P1.xml b/drafter_22/annotations/C254_D1_P1.xml index e052a35afc215612d954acab799819b292a13125..b007c9c9cf2f0fe7e08a18018f4f72b51247a9cc 100644 --- a/drafter_22/annotations/C254_D1_P1.xml +++ b/drafter_22/annotations/C254_D1_P1.xml @@ -3331,6 +3331,7 @@ 697 346 782 + 180 @@ -3441,6 +3442,7 @@ 330 264 392 + 90 diff --git a/drafter_22/annotations/C254_D1_P2.xml b/drafter_22/annotations/C254_D1_P2.xml index 19b3057558ca2a4e9f3f3afdee5f884076363bc9..fc682735dcdf0cfef24bba133d901dc688af6747 100644 --- a/drafter_22/annotations/C254_D1_P2.xml +++ b/drafter_22/annotations/C254_D1_P2.xml @@ -3530,6 +3530,7 @@ 758 1038 844 + 87 @@ -3706,6 +3707,7 @@ 1302 1032 1443 + 177 diff --git a/drafter_22/annotations/C254_D1_P3.xml b/drafter_22/annotations/C254_D1_P3.xml index e05129e3c238010c4485790c0c4695232ade8a5b..bb4a8a646f4499365b94868d6a92b87d869a418f 100644 --- a/drafter_22/annotations/C254_D1_P3.xml +++ b/drafter_22/annotations/C254_D1_P3.xml @@ -2772,6 +2772,7 @@ 1569 916 1759 + 175 @@ -3277,6 +3278,7 @@ 744 840 879 + 83 diff --git a/drafter_22/annotations/C254_D1_P4.xml b/drafter_22/annotations/C254_D1_P4.xml index 464330a4cbe48d466687a6a2b8fae005a373553a..2995640f3452b9107d87e064ad605bb4b1965160 100644 --- a/drafter_22/annotations/C254_D1_P4.xml +++ b/drafter_22/annotations/C254_D1_P4.xml @@ -2517,6 +2517,7 @@ 823 861 959 + 83 @@ -2883,6 +2884,7 @@ 1650 939 1844 + 175 diff --git a/drafter_22/annotations/C254_D2_P1.xml b/drafter_22/annotations/C254_D2_P1.xml index 44d44bd4b8823fca9c3590c236d866a730d33a48..287ba6d2fb02e6d391c27ded7e205d2e08464502 100644 --- a/drafter_22/annotations/C254_D2_P1.xml +++ b/drafter_22/annotations/C254_D2_P1.xml @@ -1451,6 +1451,7 @@ 296 269 360 + 89 @@ -3501,6 +3502,7 @@ 697 346 762 + 180 diff --git a/drafter_22/annotations/C254_D2_P2.xml b/drafter_22/annotations/C254_D2_P2.xml index 9a8a03d3a207dc7343e1c11d099efe347c84f07b..f6dc04b3b679524d7ad5bf94d8569386f113ecc0 100644 --- a/drafter_22/annotations/C254_D2_P2.xml +++ b/drafter_22/annotations/C254_D2_P2.xml @@ -1703,6 +1703,7 @@ 714 403 775 + 177 @@ -3183,6 +3184,7 @@ 371 353 422 + 87 diff --git a/drafter_22/annotations/C254_D2_P3.xml b/drafter_22/annotations/C254_D2_P3.xml index 4461938daf3765d6b8af9b1c34887d80cf928488..52b4af710393cf7ee05a3e2f6a0d02e50127b238 100644 --- a/drafter_22/annotations/C254_D2_P3.xml +++ b/drafter_22/annotations/C254_D2_P3.xml @@ -1639,6 +1639,7 @@ 226 360 288 + 92 @@ -1961,6 +1962,7 @@ 608 484 672 + 185 diff --git a/drafter_22/annotations/C254_D2_P4.xml b/drafter_22/annotations/C254_D2_P4.xml index 29a0c5f030d91c9647bcd1fd21bb87010b9a3d1d..b4092ea224beeb2612e1f03e263fd5eaca616005 100644 --- a/drafter_22/annotations/C254_D2_P4.xml +++ b/drafter_22/annotations/C254_D2_P4.xml @@ -1359,6 +1359,7 @@ 220 327 284 + 96 @@ -2091,6 +2092,7 @@ 598 463 659 + 185 diff --git a/drafter_22/annotations/C255_D2_P3.xml b/drafter_22/annotations/C255_D2_P3.xml index 76389bb342c9a1401349aed7bda7e85480af03e4..66331ac8bc2baf264a7e8ad1eadeac24ef7c562d 100644 --- a/drafter_22/annotations/C255_D2_P3.xml +++ b/drafter_22/annotations/C255_D2_P3.xml @@ -274,6 +274,7 @@ 407 507 477 + 8 @@ -1155,6 +1156,7 @@ 826 875 843 + 12 diff --git a/drafter_22/annotations/C255_D2_P4.xml b/drafter_22/annotations/C255_D2_P4.xml index 5aaecc5453cb771fc11c69c4bb66f65e25c71290..923e0a785d4dcb619d3db09bae8ae40ec6f93d86 100644 --- a/drafter_22/annotations/C255_D2_P4.xml +++ b/drafter_22/annotations/C255_D2_P4.xml @@ -21,6 +21,7 @@ 480 492 551 + 6 @@ -1044,6 +1045,7 @@ 353 962 378 + 8 @@ -1461,6 +1463,7 @@ 774 1298 801 + 13 diff --git a/drafter_22/annotations/C257_D1_P1.xml b/drafter_22/annotations/C257_D1_P1.xml index 9ed5f42e7f5ec9334c34a55f10717034b295c3a5..e66d3169dbff6c201325aaa20062c74196af522a 100644 --- a/drafter_22/annotations/C257_D1_P1.xml +++ b/drafter_22/annotations/C257_D1_P1.xml @@ -1918,6 +1918,7 @@ 522 667 569 + 180 diff --git a/drafter_22/annotations/C257_D1_P2.xml b/drafter_22/annotations/C257_D1_P2.xml index a70eeb877b56d03ef60cf9b643fd4ad0c865a474..8393ae64c5c94fade4fc6bdbcba5fd739a261745 100644 --- a/drafter_22/annotations/C257_D1_P2.xml +++ b/drafter_22/annotations/C257_D1_P2.xml @@ -1808,6 +1808,7 @@ 1123 1707 1201 + 180 diff --git a/drafter_22/annotations/C257_D1_P3.xml b/drafter_22/annotations/C257_D1_P3.xml index 6e685d3a2c339f903862c5d7fb194c9dd3ca5452..51d8737cf19a4b7147ecdfbfae83c5ff5b62bfd1 100644 --- a/drafter_22/annotations/C257_D1_P3.xml +++ b/drafter_22/annotations/C257_D1_P3.xml @@ -681,6 +681,7 @@ 1386 1669 1498 + 175 @@ -1682,6 +1683,7 @@ 1345 1206 1443 + 356 diff --git a/drafter_22/annotations/C257_D1_P4.xml b/drafter_22/annotations/C257_D1_P4.xml index 69d884b821afac215b3f79dd791adc223132f225..1b322549088e7149e62a277602deefc6ed4ea5a4 100644 --- a/drafter_22/annotations/C257_D1_P4.xml +++ b/drafter_22/annotations/C257_D1_P4.xml @@ -1530,6 +1530,7 @@ 1417 1594 1527 + 175 @@ -1542,6 +1543,7 @@ 1380 1142 1478 + 356 @@ -2200,4 +2202,16 @@ 776 + + junction + Unspecified + 0 + 0 + + 1618 + 1463 + 1640 + 1486 + + diff --git a/drafter_22/annotations/C257_D2_P1.xml b/drafter_22/annotations/C257_D2_P1.xml index 7c1a43a3a15cc790d0e904c5610801b8d23ca705..c05d22a38a9cfd5873bffce277a49d8af0239166 100644 --- a/drafter_22/annotations/C257_D2_P1.xml +++ b/drafter_22/annotations/C257_D2_P1.xml @@ -1239,6 +1239,7 @@ 409 493 441 + 180 diff --git a/drafter_22/annotations/C257_D2_P2.xml b/drafter_22/annotations/C257_D2_P2.xml index c071f572ff59c8184138a27cb9196a80c59a0493..8591e5364f0e1dd32d8f0fe881b9009d122dc259 100644 --- a/drafter_22/annotations/C257_D2_P2.xml +++ b/drafter_22/annotations/C257_D2_P2.xml @@ -1427,6 +1427,7 @@ 590 636 621 + 180 diff --git a/drafter_22/annotations/C257_D2_P3.xml b/drafter_22/annotations/C257_D2_P3.xml index a63b31d2b58803cab2ce9eb8725fe78d0e0337ff..7c1d379a42e893071bac92cca3f48c768d8adc27 100644 --- a/drafter_22/annotations/C257_D2_P3.xml +++ b/drafter_22/annotations/C257_D2_P3.xml @@ -1269,6 +1269,7 @@ 603 500 644 + 13 @@ -1281,6 +1282,7 @@ 585 589 617 + 198 diff --git a/drafter_22/annotations/C257_D2_P4.xml b/drafter_22/annotations/C257_D2_P4.xml index 604e167d7708e3cf1752511331c4209f5dcb414a..93cfa6c10207eaf120b2e1c186991cfdb13d4b90 100644 --- a/drafter_22/annotations/C257_D2_P4.xml +++ b/drafter_22/annotations/C257_D2_P4.xml @@ -829,6 +829,7 @@ 594 475 638 + 8 @@ -1242,6 +1243,7 @@ 804 839 834 + 8 @@ -1692,6 +1694,7 @@ 588 576 621 + 191 diff --git a/drafter_22/annotations/C258_D1_P1.xml b/drafter_22/annotations/C258_D1_P1.xml index cc09bdd9d1861feb6f67b0cbd40173085bb415ab..22156ada468f4ebc4c676736de0bcdde7f9fc97a 100644 --- a/drafter_22/annotations/C258_D1_P1.xml +++ b/drafter_22/annotations/C258_D1_P1.xml @@ -973,6 +973,7 @@ 628 593 736 + 2 @@ -1437,6 +1438,7 @@ 285 1005 332 + 90 @@ -1722,6 +1724,7 @@ 384 1112 436 + 270 diff --git a/drafter_22/annotations/C258_D1_P2.xml b/drafter_22/annotations/C258_D1_P2.xml index 5bbc92b7101f153393565b20ea88834d276bcc33..2fd2702185d6dce35f20bd25d5d35d116d0401bd 100644 --- a/drafter_22/annotations/C258_D1_P2.xml +++ b/drafter_22/annotations/C258_D1_P2.xml @@ -270,6 +270,7 @@ 862 1573 901 + 352 @@ -1463,6 +1464,7 @@ 680 2430 739 + 87 @@ -1475,6 +1477,7 @@ 799 2639 873 + 271 diff --git a/drafter_22/annotations/C258_D1_P3.xml b/drafter_22/annotations/C258_D1_P3.xml index 4637566b4ffdf57df65567cf5a1198d67e7e4e24..f42e5077592969bd2c8c883137ec6f51d4876978 100644 --- a/drafter_22/annotations/C258_D1_P3.xml +++ b/drafter_22/annotations/C258_D1_P3.xml @@ -1382,6 +1382,7 @@ 1059 2725 1193 + 264 @@ -1880,6 +1881,7 @@ 806 2483 917 + 85 diff --git a/drafter_22/annotations/C258_D1_P4.xml b/drafter_22/annotations/C258_D1_P4.xml index ed07c923d438afdd6a3aec3c271ebfab144f3078..202c116db2facca88c763993345bf404754e7d29 100644 --- a/drafter_22/annotations/C258_D1_P4.xml +++ b/drafter_22/annotations/C258_D1_P4.xml @@ -1381,6 +1381,7 @@ 918 2496 1035 + 85 @@ -1596,6 +1597,7 @@ 1175 2729 1304 + 266 diff --git a/drafter_22/annotations/C258_D2_P2.xml b/drafter_22/annotations/C258_D2_P2.xml index 721addc120f8ac0e695273a917afd0089037473e..97dab040ceeb32bd1929719b8c39424ff5ac5c31 100644 --- a/drafter_22/annotations/C258_D2_P2.xml +++ b/drafter_22/annotations/C258_D2_P2.xml @@ -1205,6 +1205,7 @@ 390 739 414 + 270 @@ -1217,6 +1218,7 @@ 352 683 377 + 89 diff --git a/drafter_22/annotations/C258_D2_P3.xml b/drafter_22/annotations/C258_D2_P3.xml index b0bc37f77bb0f77cb8ab25896b455fd81c64da2c..8c99b96226e97f3739a3088c02d85491fe21667d 100644 --- a/drafter_22/annotations/C258_D2_P3.xml +++ b/drafter_22/annotations/C258_D2_P3.xml @@ -415,6 +415,7 @@ 791 248 826 + 15 @@ -1117,6 +1118,7 @@ 380 832 430 + 289 @@ -1129,6 +1131,7 @@ 354 759 391 + 112 diff --git a/drafter_22/annotations/C258_D2_P4.xml b/drafter_22/annotations/C258_D2_P4.xml index fe6e715894a5837e9a35732d77b82e610a46f236..01a83b1c84e2add5f7a56b08904e97de9a1bfa89 100644 --- a/drafter_22/annotations/C258_D2_P4.xml +++ b/drafter_22/annotations/C258_D2_P4.xml @@ -1246,6 +1246,7 @@ 387 838 433 + 285 @@ -1258,6 +1259,7 @@ 357 759 393 + 106 diff --git a/drafter_22/annotations/C259_D1_P3.xml b/drafter_22/annotations/C259_D1_P3.xml index 4dc15649338b740ca0a320228986d0b72eabce5d..b5ff843f54600607d4e964a6d340551f6cadf7a7 100644 --- a/drafter_22/annotations/C259_D1_P3.xml +++ b/drafter_22/annotations/C259_D1_P3.xml @@ -1917,6 +1917,7 @@ 2123 1615 2192 + 354 diff --git a/drafter_22/annotations/C259_D2_P3.xml b/drafter_22/annotations/C259_D2_P3.xml index 2fd28e705741693b6807173ea753ddec623ca137..50e1e3b169ac8338b50fc06ace5c5fa79dfb0012 100644 --- a/drafter_22/annotations/C259_D2_P3.xml +++ b/drafter_22/annotations/C259_D2_P3.xml @@ -839,6 +839,7 @@ 271 1077 302 + 281 @@ -1364,6 +1365,7 @@ 974 601 1004 + 12 @@ -1516,6 +1518,7 @@ 732 868 769 + 102 @@ -1554,6 +1557,7 @@ 560 398 578 + 15 @@ -1866,6 +1870,7 @@ 304 931 335 + 279 @@ -2682,6 +2687,7 @@ 632 476 653 + 98 @@ -2842,6 +2848,7 @@ 509 647 532 + 10 diff --git a/drafter_22/annotations/C259_D2_P4.xml b/drafter_22/annotations/C259_D2_P4.xml index 36e5b303fe0a5ad3d3cad5e0c8cfe9b31863c7ca..7f43baa8c17b1312db80a00ffe71669f845a3bf8 100644 --- a/drafter_22/annotations/C259_D2_P4.xml +++ b/drafter_22/annotations/C259_D2_P4.xml @@ -168,6 +168,7 @@ 1016 602 1048 + 15 @@ -839,7 +840,7 @@ 278 1110 309 - 271 + 283 @@ -864,6 +865,7 @@ 833 394 865 + 8 @@ -1136,7 +1138,7 @@ 311 956 339 - 271 + 275 @@ -1626,7 +1628,7 @@ 333 845 374 - 12 + 8 @@ -1677,6 +1679,7 @@ 579 394 598 + 21 @@ -1860,7 +1863,7 @@ 309 995 331 - 92 + 98 @@ -2358,6 +2361,7 @@ 748 565 772 + 275 @@ -2409,6 +2413,7 @@ 920 692 949 + 8 @@ -3364,6 +3369,7 @@ 292 693 376 + 112 @@ -3376,6 +3382,7 @@ 287 722 373 + 110 diff --git a/drafter_22/annotations/C260_D1_P1.xml b/drafter_22/annotations/C260_D1_P1.xml index ef8fb557847fab34351ac55bfc68a114fe2a520a..e146881f2d85a91f9914d32df9c8ea8755e1041e 100644 --- a/drafter_22/annotations/C260_D1_P1.xml +++ b/drafter_22/annotations/C260_D1_P1.xml @@ -2774,6 +2774,7 @@ 918 1050 966 + 90 diff --git a/drafter_22/annotations/C260_D1_P2.xml b/drafter_22/annotations/C260_D1_P2.xml index aac733ce5d3014df10b113521bc5671b6a6cc705..3065a66e3e5c3e771c75980ffd80e3de7fcba96b 100644 --- a/drafter_22/annotations/C260_D1_P2.xml +++ b/drafter_22/annotations/C260_D1_P2.xml @@ -2540,6 +2540,7 @@ 1835 2626 1941 + 90 diff --git a/drafter_22/annotations/C260_D1_P3.xml b/drafter_22/annotations/C260_D1_P3.xml index 49ccc78afe3bbec9a1d67a76680119a075ba0a08..5ff8d42e567cc917182bc434b2c3b846836817bc 100644 --- a/drafter_22/annotations/C260_D1_P3.xml +++ b/drafter_22/annotations/C260_D1_P3.xml @@ -2910,6 +2910,7 @@ 1841 1091 1904 + 345 @@ -3300,6 +3301,7 @@ 2363 2509 2488 + 87 diff --git a/drafter_22/annotations/C260_D1_P4.xml b/drafter_22/annotations/C260_D1_P4.xml index 625c62d45c6bd22015955e388fde13b4703a1f7c..df931b5f1781296894f666c531196192ad314ee9 100644 --- a/drafter_22/annotations/C260_D1_P4.xml +++ b/drafter_22/annotations/C260_D1_P4.xml @@ -2170,6 +2170,7 @@ 1834 1079 1902 + 345 diff --git a/drafter_22/annotations/C260_D2_P1.xml b/drafter_22/annotations/C260_D2_P1.xml index 47dcffe0650157cd5592a4b6466ab0f0e1c63691..1bdaf06fc42eb89a5a3aefa5f33ed0dbe5fcfa6a 100644 --- a/drafter_22/annotations/C260_D2_P1.xml +++ b/drafter_22/annotations/C260_D2_P1.xml @@ -405,11 +405,12 @@ 0 0 - 908 + 917 426 - 961 - 454 + 960 + 453 + 47K junction @@ -1080,6 +1081,7 @@ 754 936 799 + 90 @@ -1828,4 +1830,90 @@ 720 + + junction + Unspecified + 0 + 0 + + 810 + 343 + 821 + 353 + + + + junction + Unspecified + 0 + 0 + + 808 + 362 + 821 + 373 + + + + junction + Unspecified + 0 + 0 + + 809 + 381 + 819 + 390 + + + + junction + Unspecified + 0 + 0 + + 811 + 401 + 820 + 411 + + + + text + Unspecified + 0 + 0 + + 883 + 433 + 913 + 455 + + R5 + + + text + Unspecified + 0 + 0 + + 1328 + 463 + 1367 + 484 + + R10 + + + junction + Unspecified + 0 + 0 + + 1336 + 453 + 1352 + 466 + + diff --git a/drafter_22/annotations/C260_D2_P2.xml b/drafter_22/annotations/C260_D2_P2.xml index f702f0ce0d8492066c675e656a6c7f55f1d23148..c5bcd6eaa5aa5486f93e69badc07fdbe8fde32dd 100644 --- a/drafter_22/annotations/C260_D2_P2.xml +++ b/drafter_22/annotations/C260_D2_P2.xml @@ -610,11 +610,12 @@ 0 0 - 912 + 932 617 - 977 - 640 + 974 + 638 + 47K crossover @@ -1041,6 +1042,7 @@ 941 969 990 + 90 @@ -1979,4 +1981,68 @@ 602 + + text + Unspecified + 0 + 0 + + 899 + 621 + 929 + 642 + + R5 + + + text + Unspecified + 0 + 0 + + 1338 + 645 + 1379 + 665 + + R10 + + + text + Unspecified + 0 + 0 + + 1321 + 524 + 1357 + 544 + + R11 + + + text + Unspecified + 0 + 0 + + 1326 + 544 + 1364 + 566 + + 33R + + + junction + Unspecified + 0 + 0 + + 1345 + 636 + 1362 + 650 + + diff --git a/drafter_22/annotations/C260_D2_P3.xml b/drafter_22/annotations/C260_D2_P3.xml index 2ba4a267d154170826d81beca93765e09fff0d94..9dfd56721b3d557ebab709e5159fef19655342ff 100644 --- a/drafter_22/annotations/C260_D2_P3.xml +++ b/drafter_22/annotations/C260_D2_P3.xml @@ -995,6 +995,7 @@ 702 968 754 + 102 @@ -1007,6 +1008,7 @@ 746 407 786 + 31 diff --git a/drafter_22/annotations/C260_D2_P4.xml b/drafter_22/annotations/C260_D2_P4.xml index 81e9b4673e4b0b59706c38c6abc626a9c4b6fb77..c7e3db1f9c282aac7cd7d904abc5f94f45fc3bd4 100644 --- a/drafter_22/annotations/C260_D2_P4.xml +++ b/drafter_22/annotations/C260_D2_P4.xml @@ -1006,6 +1006,7 @@ 629 937 682 + 104 @@ -1018,6 +1019,7 @@ 663 400 702 + 31 diff --git a/drafter_22/annotations/C261_D1_P2.xml b/drafter_22/annotations/C261_D1_P2.xml index d6a34d2963fbd833770c7c0adffc5cd0789b280f..2ba084ab67ddea0c202ae2f0f147717c0c96a3ed 100644 --- a/drafter_22/annotations/C261_D1_P2.xml +++ b/drafter_22/annotations/C261_D1_P2.xml @@ -4470,6 +4470,7 @@ 677 1839 715 + 356 @@ -4495,6 +4496,7 @@ 795 1922 889 + 350 @@ -4507,6 +4509,7 @@ 804 2117 900 + 356 @@ -4991,6 +4994,7 @@ 1123 3527 1155 + 193 diff --git a/drafter_22/annotations/C261_D1_P3.xml b/drafter_22/annotations/C261_D1_P3.xml index 5548fa3f5ada7bd67123422ac6d3910e9db6b754..31206e51131a7379baf1c621f1c806ee6444e8be 100644 --- a/drafter_22/annotations/C261_D1_P3.xml +++ b/drafter_22/annotations/C261_D1_P3.xml @@ -1627,7 +1627,7 @@ 2365 889 2440 - 83 + 87 @@ -4421,6 +4421,7 @@ 1016 2114 1173 + 352 @@ -4599,6 +4600,7 @@ 2078 779 2127 + 352 @@ -4736,6 +4738,7 @@ 1819 911 1977 + 79 @@ -5546,6 +5549,7 @@ 2193 777 2279 + 356 @@ -5558,6 +5562,7 @@ 2171 451 2266 + 358 diff --git a/drafter_22/annotations/C261_D1_P4.xml b/drafter_22/annotations/C261_D1_P4.xml index ca68d3b653a6b4f77401762d1d3cf8fa7cbb6b3e..86647d3aaed04ff1f080a6ff5a6f9407848f4ee1 100644 --- a/drafter_22/annotations/C261_D1_P4.xml +++ b/drafter_22/annotations/C261_D1_P4.xml @@ -617,6 +617,7 @@ 1073 1535 1132 + 352 @@ -917,6 +918,7 @@ 2114 509 2177 + 350 @@ -1571,6 +1573,7 @@ 799 1767 878 + 356 @@ -4804,7 +4807,7 @@ 1887 946 2039 - 90 + 85 @@ -4817,6 +4820,7 @@ 2139 833 2190 + 354 @@ -4919,6 +4923,7 @@ 1200 2023 1319 + 90 @@ -5108,6 +5113,7 @@ 1336 3846 1458 + 81 @@ -5120,6 +5126,7 @@ 1334 3733 1459 + 81 @@ -5197,6 +5204,7 @@ 2254 828 2335 + 358 @@ -5209,6 +5217,7 @@ 2235 511 2325 + 358 diff --git a/drafter_22/annotations/C261_D2_P3.xml b/drafter_22/annotations/C261_D2_P3.xml index 954ae22ded53ddc3c57ddd2dd60af8a274182ee5..dada955fd9f81b01b602db8b93cb822f0711ef0d 100644 --- a/drafter_22/annotations/C261_D2_P3.xml +++ b/drafter_22/annotations/C261_D2_P3.xml @@ -91,11 +91,12 @@ 0 0 - 960 + 1000 992 1063 1032 + analog junction @@ -4978,4 +4979,17 @@ 10K + + text + Unspecified + 0 + 0 + + 962 + 1010 + 989 + 1032 + + -5V + diff --git a/drafter_22/annotations/C261_D2_P4.xml b/drafter_22/annotations/C261_D2_P4.xml index 0e3cb55970b640974fd745f3005f7f7dcc891236..182cba8157f6877a851bcaa129d49b105640672d 100644 --- a/drafter_22/annotations/C261_D2_P4.xml +++ b/drafter_22/annotations/C261_D2_P4.xml @@ -317,6 +317,7 @@ 1103 935 + analog text @@ -1540,6 +1541,7 @@ 1274 766 + GRD text @@ -1603,6 +1605,7 @@ 1325 872 + GRD text diff --git a/drafter_22/annotations/C262_D1_P4.xml b/drafter_22/annotations/C262_D1_P4.xml index 91d84c19b3d7189664ca4876c319c31d80367f6f..14aae0461491b65e630c05b5dcfc8398b331c8d5 100644 --- a/drafter_22/annotations/C262_D1_P4.xml +++ b/drafter_22/annotations/C262_D1_P4.xml @@ -967,7 +967,7 @@ 1273 898 1372 - 87 + 85 diff --git a/drafter_22/annotations/C262_D2_P1.xml b/drafter_22/annotations/C262_D2_P1.xml index 1d833b00455621e377395ec5a0632c129bffcc3e..ea9b75eaa14f7c42c32aabfaa36dd7c40a30e2de 100644 --- a/drafter_22/annotations/C262_D2_P1.xml +++ b/drafter_22/annotations/C262_D2_P1.xml @@ -946,7 +946,7 @@ 412 1109 460 - 90 + 81 diff --git a/drafter_22/annotations/C263_D1_P1.xml b/drafter_22/annotations/C263_D1_P1.xml index 4efe68fb8d109b25498a9fe6cedc8761447aa546..5ceeaa58edf19cf8e13946deeaa4add4e1d1dc5a 100644 --- a/drafter_22/annotations/C263_D1_P1.xml +++ b/drafter_22/annotations/C263_D1_P1.xml @@ -1797,6 +1797,7 @@ 163 1386 226 + 90 diff --git a/drafter_22/annotations/C263_D1_P2.xml b/drafter_22/annotations/C263_D1_P2.xml index a844b050342a0dc6c17b7fa73e3baa73b3bfeeaa..46a754da0f7429a51b39b9913559649eba8d9c25 100644 --- a/drafter_22/annotations/C263_D1_P2.xml +++ b/drafter_22/annotations/C263_D1_P2.xml @@ -1256,6 +1256,7 @@ 1022 3393 1115 + 96 diff --git a/drafter_22/annotations/C263_D1_P3.xml b/drafter_22/annotations/C263_D1_P3.xml index e2800060788e0a0a3a958b9b811031fe82bcd577..4cedd2de3fda394badd051b81f6df3f42e4608f6 100644 --- a/drafter_22/annotations/C263_D1_P3.xml +++ b/drafter_22/annotations/C263_D1_P3.xml @@ -1921,6 +1921,7 @@ 790 3501 940 + 85 diff --git a/drafter_22/annotations/C263_D1_P4.xml b/drafter_22/annotations/C263_D1_P4.xml index 9c369f056c49dbc2e13f08a63aefeb5bda9cfb5e..504cabeee1b25f9667b6fbed72cc399b419619ea 100644 --- a/drafter_22/annotations/C263_D1_P4.xml +++ b/drafter_22/annotations/C263_D1_P4.xml @@ -61,6 +61,7 @@ 2271 2415 2349 + 352 @@ -1271,6 +1272,7 @@ 2198 1448 2269 + 356 @@ -1919,6 +1921,7 @@ 1069 3484 1222 + 81 diff --git a/drafter_22/annotations/C264_D1_P1.xml b/drafter_22/annotations/C264_D1_P1.xml index 51b0fb1323d608a3f71c1f4acad99b2767bd10b3..725dc3fcc8a6bbcea94ff92a5e8739c75a8017b8 100644 --- a/drafter_22/annotations/C264_D1_P1.xml +++ b/drafter_22/annotations/C264_D1_P1.xml @@ -1309,6 +1309,7 @@ 40 684 110 + 89 @@ -2007,6 +2008,7 @@ 981 1010 1039 + 270 diff --git a/drafter_22/annotations/C264_D1_P2.xml b/drafter_22/annotations/C264_D1_P2.xml index 6c7f63c1b9acb1425a1986b19f6cf0222046cf02..e494a3329c25f938c69c134a395fcd0a00a604b9 100644 --- a/drafter_22/annotations/C264_D1_P2.xml +++ b/drafter_22/annotations/C264_D1_P2.xml @@ -556,6 +556,7 @@ 699 2088 + INPUT current text @@ -1032,6 +1033,7 @@ 633 1863 727 + 87 @@ -1045,6 +1047,7 @@ 1795 2123 + ClockENABLE junction @@ -1121,6 +1124,7 @@ 1790 2070 + LOAD-Clock text @@ -1343,6 +1347,7 @@ 1688 284 1735 + 352 @@ -2433,6 +2438,7 @@ 1596 2352 + RD2 text @@ -2445,6 +2451,7 @@ 1590 2382 + RD3 text @@ -2457,6 +2464,7 @@ 1579 2408 + AD4 text @@ -2469,6 +2477,7 @@ 1580 2432 + RD5 text @@ -2477,10 +2486,11 @@ 0 1479 - 2425 + 2423 1576 2451 + RD6 text @@ -2493,6 +2503,7 @@ 1570 2477 + RD7 terminal @@ -2705,6 +2716,7 @@ 791 1864 + BATTERY VOLTAGE text @@ -2717,6 +2729,7 @@ 740 2011 + BATTERY CRRENT text @@ -2729,6 +2742,7 @@ 681 2155 + INPUT VOLTAGE terminal @@ -3177,6 +3191,7 @@ 2067 324 2111 + 352 @@ -3201,6 +3216,7 @@ 1745 1407 2478 + 352 @@ -3412,6 +3428,7 @@ 686 774 760 + 348 @@ -5138,6 +5155,7 @@ 986 3334 1067 + 10 diff --git a/drafter_22/annotations/C264_D1_P3.xml b/drafter_22/annotations/C264_D1_P3.xml index 5cc8f90dabaa79cfd382ffca71e405a2f3589c2c..d12b7b5bf2a1438fedc8b0ee6dfc8ec214ff738b 100644 --- a/drafter_22/annotations/C264_D1_P3.xml +++ b/drafter_22/annotations/C264_D1_P3.xml @@ -172,6 +172,7 @@ 773 430 839 + 354 @@ -645,6 +646,7 @@ 1630 2744 1702 + 356 @@ -817,6 +819,7 @@ 612 2307 + INPUT current junction @@ -927,6 +930,7 @@ 748 2119 924 + 356 @@ -1014,7 +1018,7 @@ 887 1083 965 - 270 + 268 @@ -1040,6 +1044,7 @@ 607 2377 + INPUT VOLTAGE text @@ -1434,6 +1439,7 @@ 1048 1647 + CLOCK.ENABLE integrated_circuit.voltage_regulator @@ -1596,6 +1602,7 @@ 635 2225 + BATTERY CRRENT terminal @@ -1645,6 +1652,7 @@ 843 839 942 + 87 @@ -1683,6 +1691,7 @@ 655 2060 + BATTERY VOLTAGE resistor @@ -2331,6 +2340,7 @@ 1761 3207 1823 + 356 @@ -3042,6 +3052,7 @@ 985 3310 1163 + 354 @@ -3054,6 +3065,7 @@ 930 3661 1064 + 358 @@ -4045,6 +4057,7 @@ 258 295 397 + 358 @@ -4057,6 +4070,7 @@ 2761 2419 2828 + 354 @@ -5594,6 +5608,7 @@ 516 2522 562 + 347 @@ -5851,7 +5866,7 @@ 465 1852 517 - 171 + 179 @@ -5876,6 +5891,7 @@ 192 1831 361 + 85 @@ -5888,6 +5904,7 @@ 316 2155 463 + 356 @@ -5939,6 +5956,7 @@ 368 2454 410 + 354 diff --git a/drafter_22/annotations/C264_D1_P4.xml b/drafter_22/annotations/C264_D1_P4.xml index 19e24faf589e9e7580a22743169f6a2b5fd52357..c772f0ec6edde4d343fb9ee56b328d1747d27ac1 100644 --- a/drafter_22/annotations/C264_D1_P4.xml +++ b/drafter_22/annotations/C264_D1_P4.xml @@ -873,6 +873,7 @@ 1973 1904 2031 + 352 @@ -1071,6 +1072,7 @@ 2325 1884 2386 + 352 @@ -1175,6 +1177,7 @@ 694 2241 + BATTERY VOLTAGE text @@ -1338,6 +1341,7 @@ 2131 1897 2206 + 352 @@ -2375,6 +2379,7 @@ 1566 2762 + RD2 text @@ -2385,8 +2390,9 @@ 1475 2760 1561 - 2791 + 2794 + RD3 text @@ -2399,6 +2405,7 @@ 1555 2821 + AD4 text @@ -2411,6 +2418,7 @@ 1558 2850 + RD5 text @@ -2423,6 +2431,7 @@ 1556 2869 + RD6 text @@ -4333,6 +4342,7 @@ 1154 3328 1323 + 352 @@ -5627,6 +5637,7 @@ 2328 2128 2431 + 358 @@ -5639,6 +5650,7 @@ 2136 2143 2230 + 356 @@ -5651,6 +5663,7 @@ 1966 2145 2070 + 356 diff --git a/drafter_22/annotations/C264_D2_P1.xml b/drafter_22/annotations/C264_D2_P1.xml index 922ec3c7d4b2618a629534cc848f7866101568ef..103550d0097b1a753417e67c89f4c224eeadc67a 100644 --- a/drafter_22/annotations/C264_D2_P1.xml +++ b/drafter_22/annotations/C264_D2_P1.xml @@ -2930,6 +2930,7 @@ 12 620 49 + 90 @@ -3643,6 +3644,7 @@ 569 951 609 + 275 diff --git a/drafter_22/annotations/C264_D2_P3.xml b/drafter_22/annotations/C264_D2_P3.xml index f9c138dee1119574091bcf9819af14484af66475..c921695af00c78a6a03bd86790fa02595c4eb5a6 100644 --- a/drafter_22/annotations/C264_D2_P3.xml +++ b/drafter_22/annotations/C264_D2_P3.xml @@ -800,6 +800,7 @@ 414 586 451 + 25 @@ -1120,6 +1121,7 @@ 392 728 415 + 31 @@ -2785,6 +2787,7 @@ 501 623 542 + 27 @@ -2797,6 +2800,7 @@ 430 489 472 + 114 @@ -2872,6 +2876,7 @@ 217 1272 263 + 27 diff --git a/drafter_22/annotations/C264_D2_P4.xml b/drafter_22/annotations/C264_D2_P4.xml index 6783ebc50fcaa8297bac7aceb4f4b275ade5ce6a..15db58f45f22c3b3a531bbdcba58dc5f9acfac48 100644 --- a/drafter_22/annotations/C264_D2_P4.xml +++ b/drafter_22/annotations/C264_D2_P4.xml @@ -945,6 +945,7 @@ 366 962 384 + 15 @@ -996,6 +997,7 @@ 357 686 378 + 35 @@ -2850,6 +2852,7 @@ 384 449 426 + 108 @@ -2862,6 +2865,7 @@ 372 545 408 + 23 @@ -2874,6 +2878,7 @@ 459 576 497 + 23 @@ -3106,6 +3111,7 @@ 209 1234 254 + 23 diff --git a/drafter_23/annotations/C265_D1_P1.xml b/drafter_23/annotations/C265_D1_P1.xml index 3f837a329ba841b06a300be5a59c2718bc84d0ab..81fb4cd36aca10cb3437c863c6574951a12d1c46 100644 --- a/drafter_23/annotations/C265_D1_P1.xml +++ b/drafter_23/annotations/C265_D1_P1.xml @@ -1193,6 +1193,7 @@ 752 556 843 + 2 diff --git a/drafter_23/annotations/C265_D1_P2.xml b/drafter_23/annotations/C265_D1_P2.xml index d43cf26162bf2c8e89d5a7f909b5bddeda6cfda3..29fcc1490b2b4ca6871f9f4772142cd989ce4139 100644 --- a/drafter_23/annotations/C265_D1_P2.xml +++ b/drafter_23/annotations/C265_D1_P2.xml @@ -264,7 +264,7 @@ 595 443 648 - 179 + 183 @@ -1986,6 +1986,7 @@ 225 683 252 + 4 diff --git a/drafter_23/annotations/C266_D1_P3.xml b/drafter_23/annotations/C266_D1_P3.xml index aa156de675c03cc1da9c980cb60dff50963b0195..f4e7eb29a30b9754f3b431d7dad3c4c403dcd8c2 100644 --- a/drafter_23/annotations/C266_D1_P3.xml +++ b/drafter_23/annotations/C266_D1_P3.xml @@ -1095,7 +1095,7 @@ 0 0 - 395 + 382 640 425 655 @@ -2550,4 +2550,28 @@ 590 + + junction + Unspecified + 0 + 0 + + 394 + 507 + 402 + 516 + + + + junction + Unspecified + 0 + 0 + + 376 + 492 + 384 + 499 + + diff --git a/drafter_23/annotations/C267_D1_P1.xml b/drafter_23/annotations/C267_D1_P1.xml index 8394cec95aeff13be8e15c2eb3ad810150837d40..b6bd35d9b5ba18efe2fd76343baaae5df5622eee 100644 --- a/drafter_23/annotations/C267_D1_P1.xml +++ b/drafter_23/annotations/C267_D1_P1.xml @@ -21,7 +21,7 @@ 2001 1021 2231 - 358 + 350 @@ -722,6 +722,7 @@ 1674 2966 2021 + 356 diff --git a/drafter_23/annotations/C267_D1_P2.xml b/drafter_23/annotations/C267_D1_P2.xml index 44e94fac16de330c852a00b92288a1d8b38ef145..6839f49a77c57840b59b1efb342a82eb060fbc41 100644 --- a/drafter_23/annotations/C267_D1_P2.xml +++ b/drafter_23/annotations/C267_D1_P2.xml @@ -709,6 +709,7 @@ 1659 2985 1971 + 356 diff --git a/drafter_23/annotations/C267_D1_P3.xml b/drafter_23/annotations/C267_D1_P3.xml index c5a6de53934486dd66f76871b214a0606578d71f..25d12387e6614facc99b92286bac6c2f74acae69 100644 --- a/drafter_23/annotations/C267_D1_P3.xml +++ b/drafter_23/annotations/C267_D1_P3.xml @@ -746,6 +746,7 @@ 1865 2965 2183 + 352 diff --git a/drafter_23/annotations/C267_D1_P4.xml b/drafter_23/annotations/C267_D1_P4.xml index c6ef3a158fcab18a8eeef89e6649d00dfdd5a7cf..d1af5577ec645d4c7c797790ec1527556454ffdc 100644 --- a/drafter_23/annotations/C267_D1_P4.xml +++ b/drafter_23/annotations/C267_D1_P4.xml @@ -758,6 +758,7 @@ 1839 3008 2151 + 352 diff --git a/drafter_23/annotations/C267_D2_P1.xml b/drafter_23/annotations/C267_D2_P1.xml index 47f239becbeb69cf55544e4e1ea36a630fa9f866..25f12da38f29f4810a6f2bf505f47cd9c6811446 100644 --- a/drafter_23/annotations/C267_D2_P1.xml +++ b/drafter_23/annotations/C267_D2_P1.xml @@ -673,6 +673,7 @@ 1764 2953 2129 + 350 diff --git a/drafter_23/annotations/C267_D2_P2.xml b/drafter_23/annotations/C267_D2_P2.xml index 38a3bc27ca6cb9ba4f7e7fa822131d1a40320ca1..72466f894ec22811d548e7801494cde4bb034db8 100644 --- a/drafter_23/annotations/C267_D2_P2.xml +++ b/drafter_23/annotations/C267_D2_P2.xml @@ -622,6 +622,7 @@ 1348 2843 1700 + 356 diff --git a/drafter_23/annotations/C267_D2_P3.xml b/drafter_23/annotations/C267_D2_P3.xml index fe7fafbb6b35d341c2a01ea27bd2be45f2a886f1..24bbbcce38cc9ec428aa68e106457f3b3353d73a 100644 --- a/drafter_23/annotations/C267_D2_P3.xml +++ b/drafter_23/annotations/C267_D2_P3.xml @@ -624,6 +624,7 @@ 1647 2726 2016 + 345 diff --git a/drafter_23/annotations/C267_D2_P4.xml b/drafter_23/annotations/C267_D2_P4.xml index 9c09e3496fcf7d3ea80d53295ac631256950504d..f1f0751c631f1245796b834a9b525b6d9b6e0048 100644 --- a/drafter_23/annotations/C267_D2_P4.xml +++ b/drafter_23/annotations/C267_D2_P4.xml @@ -733,6 +733,7 @@ 1798 2921 2159 + 350 diff --git a/drafter_23/annotations/C268_D1_P1.xml b/drafter_23/annotations/C268_D1_P1.xml index 01cbce2046b7b4e0111f1040e5e3a230f6ea4917..ee8cd5921a2c1d6cf75d766044f0eeb7f7113ecc 100644 --- a/drafter_23/annotations/C268_D1_P1.xml +++ b/drafter_23/annotations/C268_D1_P1.xml @@ -996,6 +996,7 @@ 2003 2864 2177 + 352 diff --git a/drafter_23/annotations/C268_D1_P3.xml b/drafter_23/annotations/C268_D1_P3.xml index b0af149344964e8c016c5400c5423b1fa2a12da3..bf682e1ed86a5116249d28fcced06fcacb6721d9 100644 --- a/drafter_23/annotations/C268_D1_P3.xml +++ b/drafter_23/annotations/C268_D1_P3.xml @@ -1083,6 +1083,7 @@ 1859 2810 2039 + 350 diff --git a/drafter_23/annotations/C268_D1_P4.xml b/drafter_23/annotations/C268_D1_P4.xml index 8133c795c5cec9dfe77f899c6606b511c858cb86..c3748470e84d9a30c7aa63437ae3046a64b1b28b 100644 --- a/drafter_23/annotations/C268_D1_P4.xml +++ b/drafter_23/annotations/C268_D1_P4.xml @@ -1083,6 +1083,7 @@ 1859 2800 2049 + 350 diff --git a/drafter_23/annotations/C268_D2_P1.xml b/drafter_23/annotations/C268_D2_P1.xml index 7bbf9e2598f664cae3c5d953587389a1941874a8..f4a06bddac1bfbde75e89cd5301c56997c483835 100644 --- a/drafter_23/annotations/C268_D2_P1.xml +++ b/drafter_23/annotations/C268_D2_P1.xml @@ -1000,6 +1000,7 @@ 1953 2880 2208 + 350 diff --git a/drafter_23/annotations/C268_D2_P2.xml b/drafter_23/annotations/C268_D2_P2.xml index 77986e33205e0eab410308258ce8cf9e0cda9489..e55019474d3bbc554836e643f4b9ea89412c252f 100644 --- a/drafter_23/annotations/C268_D2_P2.xml +++ b/drafter_23/annotations/C268_D2_P2.xml @@ -21,6 +21,7 @@ 1611 1937 1852 + 356 @@ -378,6 +379,7 @@ 1476 2531 1658 + 354 @@ -660,6 +662,7 @@ 1557 2705 1749 + 356 @@ -953,6 +956,7 @@ 1796 2883 2065 + 352 diff --git a/drafter_23/annotations/C268_D2_P3.xml b/drafter_23/annotations/C268_D2_P3.xml index e9a0be89c505d278eeb6285e0a9b423827dd00b2..6b1004d741f414d0897d758ebf1a335566ed2993 100644 --- a/drafter_23/annotations/C268_D2_P3.xml +++ b/drafter_23/annotations/C268_D2_P3.xml @@ -21,6 +21,7 @@ 1569 1875 1810 + 352 @@ -276,6 +277,7 @@ 1556 2675 1749 + 350 @@ -635,6 +637,7 @@ 1478 2483 1647 + 352 @@ -828,6 +831,7 @@ 1808 2837 2087 + 348 @@ -1034,6 +1038,7 @@ 2243 1540 2373 + 356 @@ -1046,6 +1051,7 @@ 2016 1578 2152 + 354 diff --git a/drafter_23/annotations/C268_D2_P4.xml b/drafter_23/annotations/C268_D2_P4.xml index 96b2bda9695a357910be175863a4719569ae4c4e..925dfc37ec7e3c22d6366f7962b8644c8143514b 100644 --- a/drafter_23/annotations/C268_D2_P4.xml +++ b/drafter_23/annotations/C268_D2_P4.xml @@ -622,6 +622,7 @@ 1867 2447 2033 + 348 @@ -768,6 +769,7 @@ 1954 2642 2130 + 347 @@ -792,6 +794,7 @@ 2188 2781 2444 + 348 diff --git a/drafter_23/annotations/C269_D1_P1.xml b/drafter_23/annotations/C269_D1_P1.xml index c304b987594621877617e035f953713a6f78c6b3..10aef74761b406cc1a06039d514de3716870ceef 100644 --- a/drafter_23/annotations/C269_D1_P1.xml +++ b/drafter_23/annotations/C269_D1_P1.xml @@ -21,6 +21,7 @@ 1251 1924 1458 + 354 @@ -33,6 +34,7 @@ 1833 1134 2036 + 354 @@ -324,6 +326,7 @@ 1707 709 1949 + 348 @@ -757,6 +760,7 @@ 1944 2171 2161 + 354 diff --git a/drafter_23/annotations/C269_D1_P3.xml b/drafter_23/annotations/C269_D1_P3.xml index b06363e650868c0d6fc0fe502cb4296465b526f4..aa79a754f4a3feb67eeaf32ff7340bdf8df5ce93 100644 --- a/drafter_23/annotations/C269_D1_P3.xml +++ b/drafter_23/annotations/C269_D1_P3.xml @@ -707,6 +707,7 @@ 1715 2188 1925 + 350 diff --git a/drafter_23/annotations/C269_D1_P4.xml b/drafter_23/annotations/C269_D1_P4.xml index 340e290850a4167fbd9d86bd4ecdc3ede31fdfc8..9591fba524ca85c866d2173605fe546e95c09ff6 100644 --- a/drafter_23/annotations/C269_D1_P4.xml +++ b/drafter_23/annotations/C269_D1_P4.xml @@ -732,6 +732,7 @@ 1821 2230 2045 + 352 diff --git a/drafter_23/annotations/C269_D2_P4.xml b/drafter_23/annotations/C269_D2_P4.xml index 2e9c470c2d89d76b71c23164183cea9b7732abb6..09f1b6a9732f098d85e9af1a394fa4cbb143bd92 100644 --- a/drafter_23/annotations/C269_D2_P4.xml +++ b/drafter_23/annotations/C269_D2_P4.xml @@ -34,6 +34,7 @@ 1175 2226 1361 + 354 @@ -93,10 +94,11 @@ 0 0 - 2156 - 1518 - 2216 + 2160 + 1507 + 2213 1677 + 77 @@ -718,7 +720,7 @@ 1668 1238 - 1829 + 1846 1294 diff --git a/drafter_23/annotations/C270_D1_P2.xml b/drafter_23/annotations/C270_D1_P2.xml index 5c32490176d7487bf8c412ea0054de3d5b43082e..642aa6f7092be23e34a29bc4591320f618c8d0ae 100644 --- a/drafter_23/annotations/C270_D1_P2.xml +++ b/drafter_23/annotations/C270_D1_P2.xml @@ -494,6 +494,7 @@ 832 2912 1268 + 2 diff --git a/drafter_23/annotations/C270_D1_P3.xml b/drafter_23/annotations/C270_D1_P3.xml index f5ac85b75489ac55cb06288864d37b598f025245..bfa6e973e98b77083f6f451711b71a445323b883 100644 --- a/drafter_23/annotations/C270_D1_P3.xml +++ b/drafter_23/annotations/C270_D1_P3.xml @@ -247,6 +247,7 @@ 2222 2617 2591 + 354 @@ -320,7 +321,7 @@ 1714 2351 1998 - 2444 + 2451 diff --git a/drafter_23/annotations/C270_D1_P4.xml b/drafter_23/annotations/C270_D1_P4.xml index 98bf22e8a06627c705c7634d6251a92feabc9c79..d391e2c7aafbf3e486f65ac5bae4d19e606e8930 100644 --- a/drafter_23/annotations/C270_D1_P4.xml +++ b/drafter_23/annotations/C270_D1_P4.xml @@ -221,6 +221,7 @@ 2209 2713 2586 + 354 diff --git a/drafter_23/annotations/C270_D2_P2.xml b/drafter_23/annotations/C270_D2_P2.xml index 8662a9486e22ccdae37435188d22c93439726411..c3013cfa9f69cc3ef504109912fe0a58e48036bf 100644 --- a/drafter_23/annotations/C270_D2_P2.xml +++ b/drafter_23/annotations/C270_D2_P2.xml @@ -21,6 +21,7 @@ 2253 2506 2590 + 8 @@ -284,6 +285,7 @@ 1828 1523 1918 + 12 @@ -309,6 +311,7 @@ 2017 1471 2078 + 13 diff --git a/drafter_23/annotations/C271_D1_P1.xml b/drafter_23/annotations/C271_D1_P1.xml index 2761ecde52fe79b1a35b3ad5ab0b1504050fefd1..03a327575b68ebcfae6d9bc8f9c21c11bc9d5cee 100644 --- a/drafter_23/annotations/C271_D1_P1.xml +++ b/drafter_23/annotations/C271_D1_P1.xml @@ -703,6 +703,7 @@ 1584 293 1797 + 358 diff --git a/drafter_23/annotations/C271_D2_P3.xml b/drafter_23/annotations/C271_D2_P3.xml index 8adf4b6879aa6338a7a1591eb45f7a628e15b65a..d5b38fa64a8bd92f796d2b346f3005a10d040972 100644 --- a/drafter_23/annotations/C271_D2_P3.xml +++ b/drafter_23/annotations/C271_D2_P3.xml @@ -214,6 +214,7 @@ 1495 1380 1690 + 358 diff --git a/drafter_23/annotations/C271_D2_P4.xml b/drafter_23/annotations/C271_D2_P4.xml index 635c284ea961a0886fe2bbc76fbeffedb8ea0c23..be2f9becbde1a93b78bc4da7bd34c3bf6e16f421 100644 --- a/drafter_23/annotations/C271_D2_P4.xml +++ b/drafter_23/annotations/C271_D2_P4.xml @@ -72,6 +72,7 @@ 1245 1400 1460 + 358 @@ -122,7 +123,7 @@ 1623 774 1877 - 90 + 98 @@ -522,6 +523,7 @@ 1169 2570 1236 + 8 diff --git a/drafter_23/annotations/C272_D1_P1.xml b/drafter_23/annotations/C272_D1_P1.xml index 189d200ca45214e103c274ccebee59bf1ef77e14..6f316cc21c44e72417d989e5d8407c4ec4d4e66f 100644 --- a/drafter_23/annotations/C272_D1_P1.xml +++ b/drafter_23/annotations/C272_D1_P1.xml @@ -936,6 +936,7 @@ 1852 2181 2006 + 358 diff --git a/drafter_23/annotations/C272_D1_P2.xml b/drafter_23/annotations/C272_D1_P2.xml index 57f75633de9370b6be62c540333987e90f189e1b..d52c106c800ccedd4dc5267fd4aea9f9f69380bd 100644 --- a/drafter_23/annotations/C272_D1_P2.xml +++ b/drafter_23/annotations/C272_D1_P2.xml @@ -911,6 +911,7 @@ 1993 2123 2150 + 4 diff --git a/drafter_23/annotations/C272_D2_P1.xml b/drafter_23/annotations/C272_D2_P1.xml index 6e71d00e242834b44d5c82319abc386dd16260a2..a70a6d62621582d1534957dcc54c117d51feca30 100644 --- a/drafter_23/annotations/C272_D2_P1.xml +++ b/drafter_23/annotations/C272_D2_P1.xml @@ -672,6 +672,7 @@ 813 1114 1363 + 356 @@ -1020,6 +1021,7 @@ 1379 2260 2012 + 358 diff --git a/drafter_23/annotations/C272_D2_P3.xml b/drafter_23/annotations/C272_D2_P3.xml index f1f55939ca9c2fdf52863016fecc870aef8f1cef..0d439aec55a30fad4821465fe25d60a11b61be1a 100644 --- a/drafter_23/annotations/C272_D2_P3.xml +++ b/drafter_23/annotations/C272_D2_P3.xml @@ -972,6 +972,7 @@ 1800 2008 1993 + 356 diff --git a/drafter_23/annotations/C273_D1_P1.xml b/drafter_23/annotations/C273_D1_P1.xml index ca0f823b34d0c1ad51bfc26be3ee161eab9aefaf..f7dade8b22ff904a0867a95aa2710b640afdcec5 100644 --- a/drafter_23/annotations/C273_D1_P1.xml +++ b/drafter_23/annotations/C273_D1_P1.xml @@ -360,7 +360,7 @@ 549 466 789 - 90 + 89 diff --git a/drafter_23/annotations/C274_D1_P4.xml b/drafter_23/annotations/C274_D1_P4.xml index ed1897428bf1ed7edb200e3ad915f56b5c70de86..69815aace980e5c7b63f596f194d693fc90eba49 100644 --- a/drafter_23/annotations/C274_D1_P4.xml +++ b/drafter_23/annotations/C274_D1_P4.xml @@ -21,6 +21,7 @@ 1833 2178 2073 + 354 diff --git a/drafter_23/annotations/C274_D2_P1.xml b/drafter_23/annotations/C274_D2_P1.xml index d6a33e3e8b323a6eb41691ce0264591278cd31be..1bf9896c1e582a37c915d63e45dbe286a3f5167b 100644 --- a/drafter_23/annotations/C274_D2_P1.xml +++ b/drafter_23/annotations/C274_D2_P1.xml @@ -21,7 +21,7 @@ 1055 2115 1253 - 87 + 83 @@ -34,6 +34,7 @@ 1533 2083 1772 + 354 @@ -309,6 +310,7 @@ 1637 1756 1706 + 2 diff --git a/drafter_23/annotations/C274_D2_P2.xml b/drafter_23/annotations/C274_D2_P2.xml index bc5cec8cc6302e93e7e1a7d568b1011fbefd0999..53a2c7703e79e6fb8fcf67e10caf487022754a40 100644 --- a/drafter_23/annotations/C274_D2_P2.xml +++ b/drafter_23/annotations/C274_D2_P2.xml @@ -86,6 +86,7 @@ 2139 2123 2379 + 354 diff --git a/drafter_23/annotations/C275_D1_P1.xml b/drafter_23/annotations/C275_D1_P1.xml index 381bc96f6dfb8077d4ade78a82e43344a7e3d682..9eed2d19f4463285785bbf206ef6eccd1ca4a4d9 100644 --- a/drafter_23/annotations/C275_D1_P1.xml +++ b/drafter_23/annotations/C275_D1_P1.xml @@ -633,6 +633,7 @@ 481 1737 614 + 356 @@ -1464,6 +1465,7 @@ 859 1724 973 + 356 @@ -1524,6 +1526,7 @@ 714 606 767 + 356 diff --git a/drafter_23/annotations/C275_D1_P2.xml b/drafter_23/annotations/C275_D1_P2.xml index b5bfb4ff6d8a761e20b484eb563e21cc3337a69c..4786f53b02e13de5e6c7162d1e3ceff268622525 100644 --- a/drafter_23/annotations/C275_D1_P2.xml +++ b/drafter_23/annotations/C275_D1_P2.xml @@ -1080,6 +1080,7 @@ 2648 526 2684 + 6 diff --git a/drafter_23/annotations/C275_D1_P3.xml b/drafter_23/annotations/C275_D1_P3.xml index 0f1b21e621913c256ec86c3a8ad7b94535ae6563..75780e4c65f6824f4b9b1accefc793f901757447 100644 --- a/drafter_23/annotations/C275_D1_P3.xml +++ b/drafter_23/annotations/C275_D1_P3.xml @@ -1355,6 +1355,7 @@ 2288 1550 2359 + 358 @@ -1480,6 +1481,7 @@ 2214 2187 2265 + 350 @@ -1542,6 +1544,7 @@ 1290 1389 1423 + 354 @@ -1604,6 +1607,7 @@ 1482 1778 1580 + 350 @@ -1641,6 +1645,7 @@ 2070 1225 2209 + 356 @@ -1791,6 +1796,7 @@ 2464 1315 2538 + 358 diff --git a/drafter_23/annotations/C275_D1_P4.xml b/drafter_23/annotations/C275_D1_P4.xml index 201422302012cb13d84f5406f0919452adafae40..a7cfcd42735254e6a54e568c269dd602c6c08375 100644 --- a/drafter_23/annotations/C275_D1_P4.xml +++ b/drafter_23/annotations/C275_D1_P4.xml @@ -906,6 +906,7 @@ 714 1938 757 + 4 @@ -1240,6 +1241,7 @@ 910 1801 1004 + 354 @@ -1597,6 +1599,7 @@ 726 1429 855 + 356 @@ -1633,6 +1636,7 @@ 995 1518 1061 + 85 @@ -1757,6 +1761,7 @@ 1596 2209 1645 + 350 diff --git a/drafter_23/annotations/C275_D2_P1.xml b/drafter_23/annotations/C275_D2_P1.xml index e83e4e51f1ee6e1ab9b4297e7fabb79e9d1362d7..f1ad02b27e292208a224e87552e6dab08c60e525 100644 --- a/drafter_23/annotations/C275_D2_P1.xml +++ b/drafter_23/annotations/C275_D2_P1.xml @@ -1839,6 +1839,7 @@ 1017 1840 1125 + 354 diff --git a/drafter_23/annotations/C275_D2_P2.xml b/drafter_23/annotations/C275_D2_P2.xml index 3926277c6d591f44152fe1231d1d9fc6930772b0..df23626905f5f7c8a3962067f1f558a756161128 100644 --- a/drafter_23/annotations/C275_D2_P2.xml +++ b/drafter_23/annotations/C275_D2_P2.xml @@ -1413,6 +1413,7 @@ 2616 1243 2757 + 354 @@ -1713,6 +1714,7 @@ 1785 1844 1868 + 347 @@ -1910,6 +1912,7 @@ 1565 1487 1687 + 356 diff --git a/drafter_23/annotations/C275_D2_P3.xml b/drafter_23/annotations/C275_D2_P3.xml index 99d760b19adb848b0d2e30fb1eff9fda1e499c7c..56bd8ba10381a62ed39bb1c892470548c3028e46 100644 --- a/drafter_23/annotations/C275_D2_P3.xml +++ b/drafter_23/annotations/C275_D2_P3.xml @@ -1377,6 +1377,7 @@ 2691 2120 2733 + 354 @@ -1742,6 +1743,7 @@ 1143 1777 1250 + 350 @@ -1754,6 +1756,7 @@ 1645 1715 1731 + 354 diff --git a/drafter_23/annotations/C275_D2_P4.xml b/drafter_23/annotations/C275_D2_P4.xml index 0bab7ea48239d436bc345dce2408a60b65991b76..584a0d1fc2495f7925b201f1c3b724cfa82ea27c 100644 --- a/drafter_23/annotations/C275_D2_P4.xml +++ b/drafter_23/annotations/C275_D2_P4.xml @@ -1114,6 +1114,7 @@ 2976 2451 3034 + 354 @@ -1499,6 +1500,7 @@ 2666 2170 2707 + 354 diff --git a/drafter_23/annotations/C276_D1_P3.xml b/drafter_23/annotations/C276_D1_P3.xml index 9722d11246d1c848783ad28f86e3637f11995ce4..c9739a69921af76ad681ef7872d52280432add3e 100644 --- a/drafter_23/annotations/C276_D1_P3.xml +++ b/drafter_23/annotations/C276_D1_P3.xml @@ -326,6 +326,7 @@ 2133 1039 2220 + 94 diff --git a/drafter_24/annotations/C284_D2_P1.xml b/drafter_24/annotations/C284_D2_P1.xml index ccbe350b57cc3852c9f6bb8a55d49f179bef2931..b127ff2467a3261a3a834f2b4c92c0a9b24020d6 100644 --- a/drafter_24/annotations/C284_D2_P1.xml +++ b/drafter_24/annotations/C284_D2_P1.xml @@ -920,6 +920,7 @@ 463 217 517 + 354 diff --git a/drafter_24/annotations/C285_D2_P3.xml b/drafter_24/annotations/C285_D2_P3.xml index 5a2f0c6b071549dc02c55895def8991806baecf9..f231bb294d22467a4d5478c4410dbdfdbcb44cfc 100644 --- a/drafter_24/annotations/C285_D2_P3.xml +++ b/drafter_24/annotations/C285_D2_P3.xml @@ -541,11 +541,11 @@ 0 0 - 2396 - 2078 - 2480 + 2388 + 2066 + 2489 2266 - 90 + 100 @@ -583,7 +583,7 @@ 1807 1738 1945 - 90 + 94 @@ -609,6 +609,7 @@ 1749 2267 1835 + 10 @@ -633,7 +634,7 @@ 2105 1571 2230 - 90 + 94 diff --git a/drafter_24/annotations/C285_D2_P4.xml b/drafter_24/annotations/C285_D2_P4.xml index 9232b3bd0bc1f01ba6013eaaadfdb319b0e4c0fd..53ce485333e60abe0429858415b4f3f8623a519f 100644 --- a/drafter_24/annotations/C285_D2_P4.xml +++ b/drafter_24/annotations/C285_D2_P4.xml @@ -176,7 +176,7 @@ 2347 1666 2554 - 180 + 183 diff --git a/drafter_24/annotations/C286_D2_P1.xml b/drafter_24/annotations/C286_D2_P1.xml index 8a0821325923090f70feb8ce876d2bd1f190deac..a77d7e8dc5d5ccbc760676bef62501dc809a3fe1 100644 --- a/drafter_24/annotations/C286_D2_P1.xml +++ b/drafter_24/annotations/C286_D2_P1.xml @@ -47,7 +47,7 @@ 719 2041 900 - 90 + 94 @@ -701,7 +701,7 @@ 1233 1775 1472 - 270 + 273 diff --git a/drafter_24/annotations/C286_D2_P3.xml b/drafter_24/annotations/C286_D2_P3.xml index db6c8cb9f3db898c4bfc9217903e090771eb25d4..e4527896f5b85e4233c17ffcb88d965b19db4e92 100644 --- a/drafter_24/annotations/C286_D2_P3.xml +++ b/drafter_24/annotations/C286_D2_P3.xml @@ -665,7 +665,7 @@ 2401 1912 2509 - 90 + 92 diff --git a/drafter_24/annotations/C286_D2_P4.xml b/drafter_24/annotations/C286_D2_P4.xml index 431dc40221165a7b4eb3e970161364bd4b8a1b47..361e500d2b60b251a910bdbfe1626865d3d5a12e 100644 --- a/drafter_24/annotations/C286_D2_P4.xml +++ b/drafter_24/annotations/C286_D2_P4.xml @@ -555,7 +555,7 @@ 2482 987 2580 - 270 + 271 @@ -645,7 +645,7 @@ 2603 1675 2801 - 270 + 277 diff --git a/drafter_24/annotations/C287_D1_P3.xml b/drafter_24/annotations/C287_D1_P3.xml index bc2fd2fee30cff1c3a755180bc1d7a7635c9c4e8..a589f6a503fcd03a7c56f9034c62061719c8a581 100644 --- a/drafter_24/annotations/C287_D1_P3.xml +++ b/drafter_24/annotations/C287_D1_P3.xml @@ -465,7 +465,7 @@ 2542 617 2717 - 270 + 266 diff --git a/drafter_25/annotations/C289_D1_P2.xml b/drafter_25/annotations/C289_D1_P2.xml index 8ee9c7affac4e0cb7a7e9dbeda4828c14ee92e07..c90127ec8ffc931c7e826d11238239d6583be1ee 100644 --- a/drafter_25/annotations/C289_D1_P2.xml +++ b/drafter_25/annotations/C289_D1_P2.xml @@ -444,7 +444,7 @@ 1075 410 - 7,5K + 7,5KΩ resistor diff --git a/drafter_25/annotations/C289_D1_P3.xml b/drafter_25/annotations/C289_D1_P3.xml index d530db66a4db4b814508d639fab5f038bb7ad938..fa0bb545c580cb8627d01078d9e678de04d240b0 100644 --- a/drafter_25/annotations/C289_D1_P3.xml +++ b/drafter_25/annotations/C289_D1_P3.xml @@ -191,7 +191,7 @@ 685 253 - 7,5K + 7,5KΩ transistor.bjt diff --git a/drafter_25/annotations/C294_D1_P1.xml b/drafter_25/annotations/C294_D1_P1.xml index 89cfafcd0a3b09f0ccd06e7254bf978a8700a441..b125afa443dad7e8b3c00798a61b0ff1f23f6477 100644 --- a/drafter_25/annotations/C294_D1_P1.xml +++ b/drafter_25/annotations/C294_D1_P1.xml @@ -660,7 +660,7 @@ 222 786 298 - 177 + 185 diff --git a/drafter_25/annotations/C294_D1_P2.xml b/drafter_25/annotations/C294_D1_P2.xml index eafbdb14d7bc7e4e1cde167565386570c7ad845e..6e2505f575febc016266753f9f4c6164e2cd95bd 100644 --- a/drafter_25/annotations/C294_D1_P2.xml +++ b/drafter_25/annotations/C294_D1_P2.xml @@ -400,7 +400,7 @@ 233 775 315 - 179 + 185 diff --git a/drafter_25/annotations/C294_D1_P3.xml b/drafter_25/annotations/C294_D1_P3.xml index 20e9ecf9cd7febeb7849fe2e954bca75271f265e..2496684cbea711a573610db0e98dc9d1568dc383 100644 --- a/drafter_25/annotations/C294_D1_P3.xml +++ b/drafter_25/annotations/C294_D1_P3.xml @@ -534,7 +534,7 @@ 220 788 301 - 180 + 185 @@ -686,7 +686,7 @@ 424 413 508 - 8 + 4 diff --git a/drafter_25/annotations/C298_D2_P3.xml b/drafter_25/annotations/C298_D2_P3.xml index 244c41c5d573ebdd01aa2f54af804fd400e0259c..33dec3da417a557b7a63c43d7b34966751553b20 100644 --- a/drafter_25/annotations/C298_D2_P3.xml +++ b/drafter_25/annotations/C298_D2_P3.xml @@ -1217,7 +1217,7 @@ 136 696 190 - 180 + 175 diff --git a/drafter_25/annotations/C299_D2_P1.xml b/drafter_25/annotations/C299_D2_P1.xml index c7b4a5686e9c2d0974365159bb66e26209b690ba..26766cee223b2395a1c963bb5709150eb0df948d 100644 --- a/drafter_25/annotations/C299_D2_P1.xml +++ b/drafter_25/annotations/C299_D2_P1.xml @@ -435,6 +435,7 @@ 99 491 198 + 4 @@ -484,6 +485,7 @@ 87 972 188 + 10 diff --git a/drafter_25/annotations/C300_D1_P1.xml b/drafter_25/annotations/C300_D1_P1.xml index 2b4933e099fd7328f5f55f4240588ae7943af285..ab588768fe94a355678795bf3fb12c46eba82a27 100644 --- a/drafter_25/annotations/C300_D1_P1.xml +++ b/drafter_25/annotations/C300_D1_P1.xml @@ -265,7 +265,7 @@ 428 589 524 - 91 + 110 diff --git a/drafter_25/annotations/C300_D1_P3.xml b/drafter_25/annotations/C300_D1_P3.xml index e7047f8a6c8d2f8572c78e928675a1a2a51976cc..80613283cf2f1aa380eb79b8b9a370354f68b6e0 100644 --- a/drafter_25/annotations/C300_D1_P3.xml +++ b/drafter_25/annotations/C300_D1_P3.xml @@ -21,6 +21,7 @@ 397 1050 457 + 4 @@ -226,7 +227,7 @@ 303 804 385 - 3 + 8 @@ -239,7 +240,7 @@ 181 1018 241 - 87 + 102 @@ -325,8 +326,8 @@ 754 206 781 - 283 - 93 + 285 + 108 @@ -363,7 +364,7 @@ 246 1032 306 - 2 + 6 @@ -385,9 +386,9 @@ 0 489 - 454 + 458 525 - 482 + 479 90 diff --git a/drafter_25/annotations/C300_D1_P4.xml b/drafter_25/annotations/C300_D1_P4.xml index 449cf5c39d9094bfb78975c65e882f423236ce7a..39b340c57051b92b6018ad2d7a5ba10b586c3820 100644 --- a/drafter_25/annotations/C300_D1_P4.xml +++ b/drafter_25/annotations/C300_D1_P4.xml @@ -112,7 +112,7 @@ 243 613 317 - 92 + 112 @@ -335,11 +335,11 @@ 0 0 - 768 + 767 223 - 798 - 305 - 94 + 794 + 311 + 108 @@ -352,7 +352,7 @@ 200 1034 264 - 89 + 96 @@ -365,7 +365,7 @@ 269 1049 331 - 3 + 6 diff --git a/drafter_25/annotations/C300_D2_P1.xml b/drafter_25/annotations/C300_D2_P1.xml index 51a1b10620f6dc3bff11790755269cb029711a8a..cdeb0e7dd201aca54014316b86d20d9599dec15f 100644 --- a/drafter_25/annotations/C300_D2_P1.xml +++ b/drafter_25/annotations/C300_D2_P1.xml @@ -230,7 +230,7 @@ 256 408 300 - 93 + 87 diff --git a/drafter_25/annotations/C300_D2_P2.xml b/drafter_25/annotations/C300_D2_P2.xml index 870aa90b61326bc200e7d2f76d9159516c87931e..031fc99d83320f3bb0a8396a3d12020b2fafde15 100644 --- a/drafter_25/annotations/C300_D2_P2.xml +++ b/drafter_25/annotations/C300_D2_P2.xml @@ -21,7 +21,7 @@ 361 969 445 - 357 + 350 @@ -215,7 +215,7 @@ 421 727 489 - 92 + 79 diff --git a/drafter_25/annotations/C300_D2_P4.xml b/drafter_25/annotations/C300_D2_P4.xml index f0380553f6470f12c8c40ab97248c423713bd76d..65658e2bc9167aeec7793ed6a280aa6b77bf2150 100644 --- a/drafter_25/annotations/C300_D2_P4.xml +++ b/drafter_25/annotations/C300_D2_P4.xml @@ -46,6 +46,7 @@ 623 1219 729 + 354 @@ -136,7 +137,7 @@ 383 870 459 - 90 + 96 @@ -201,7 +202,7 @@ 375 562 451 - 83 + 90 diff --git a/drafter_3/annotations/C25_D1_P1.xml b/drafter_3/annotations/C25_D1_P1.xml index fa20590d64e622df68f7291de8e22e16ac0d5f21..35adcf594cee3a75bcde025d3e7e0cea7a812a4c 100644 --- a/drafter_3/annotations/C25_D1_P1.xml +++ b/drafter_3/annotations/C25_D1_P1.xml @@ -154,10 +154,10 @@ 0 0 - 421 + 416 772 - 490 - 830 + 492 + 833 diff --git a/drafter_3/annotations/C32_D1_P1.xml b/drafter_3/annotations/C32_D1_P1.xml index ed5028054e3e14ad309d7dde2e898a81e18fd0d3..cfbae903a05696ff2612721d3cd9622a80bdf3fa 100644 --- a/drafter_3/annotations/C32_D1_P1.xml +++ b/drafter_3/annotations/C32_D1_P1.xml @@ -59,6 +59,7 @@ 205 1276 294 + 102 diff --git a/drafter_3/annotations/C32_D1_P2.xml b/drafter_3/annotations/C32_D1_P2.xml index 38f915243d0a64dffba5bcfce0e0c3e9de7c714c..16834140703efb4e5f1aaee2ca328587475c0978 100644 --- a/drafter_3/annotations/C32_D1_P2.xml +++ b/drafter_3/annotations/C32_D1_P2.xml @@ -57,6 +57,7 @@ 80 1311 142 + 104 diff --git a/drafter_3/annotations/C32_D1_P3.xml b/drafter_3/annotations/C32_D1_P3.xml index 493923dec98591adefe279bd73d2da650c569620..b45f2ae3bd8bf70525021ee0f28daf2d0cdc8b52 100644 --- a/drafter_3/annotations/C32_D1_P3.xml +++ b/drafter_3/annotations/C32_D1_P3.xml @@ -86,6 +86,7 @@ 136 1282 237 + 104 diff --git a/drafter_3/annotations/C32_D1_P4.xml b/drafter_3/annotations/C32_D1_P4.xml index 4463eaf5d508915aae2e06e064d97867e4bcb252..a69e9c3aa2c011e50beb88081e2985562943a42c 100644 --- a/drafter_3/annotations/C32_D1_P4.xml +++ b/drafter_3/annotations/C32_D1_P4.xml @@ -96,6 +96,7 @@ 218 1395 305 + 106 diff --git a/drafter_3/annotations/C32_D2_P1.xml b/drafter_3/annotations/C32_D2_P1.xml index 6f2e7bef70a3e41d0d1527d6647ca2deac21403e..119ab721d5cd5c5d9f633aea926cbf85f44f1e7e 100644 --- a/drafter_3/annotations/C32_D2_P1.xml +++ b/drafter_3/annotations/C32_D2_P1.xml @@ -34,6 +34,7 @@ 303 1323 420 + 104 diff --git a/drafter_3/annotations/C32_D2_P2.xml b/drafter_3/annotations/C32_D2_P2.xml index eab950d223daedf55cec93bf743404b2552dbdb8..ae2ad4c3a198ee3a52778abd986c32463e77f5ee 100644 --- a/drafter_3/annotations/C32_D2_P2.xml +++ b/drafter_3/annotations/C32_D2_P2.xml @@ -98,6 +98,7 @@ 147 1274 238 + 106 diff --git a/drafter_3/annotations/C32_D2_P3.xml b/drafter_3/annotations/C32_D2_P3.xml index 006e99b18acf69c64810e84d7e6d98d6bfb1cb02..106c60714a4248d6f26e691a4b3354c160e4dea9 100644 --- a/drafter_3/annotations/C32_D2_P3.xml +++ b/drafter_3/annotations/C32_D2_P3.xml @@ -96,6 +96,7 @@ 112 1200 232 + 104 diff --git a/drafter_3/annotations/C32_D2_P4.xml b/drafter_3/annotations/C32_D2_P4.xml index 6f662244615041b99ea8378223da98dfef8c075b..f3058ba487aa74a76b404c347acc770ca35099e6 100644 --- a/drafter_3/annotations/C32_D2_P4.xml +++ b/drafter_3/annotations/C32_D2_P4.xml @@ -34,6 +34,7 @@ 299 1317 423 + 100 @@ -146,6 +147,7 @@ 246 973 405 + 6 diff --git a/drafter_3/annotations/C34_D1_P4.xml b/drafter_3/annotations/C34_D1_P4.xml index e31a9ac6a7c8f92693f8dff7af496e580eb401a2..140a840560eb53acad3c540c110decee871f9ec2 100644 --- a/drafter_3/annotations/C34_D1_P4.xml +++ b/drafter_3/annotations/C34_D1_P4.xml @@ -106,7 +106,7 @@ 180 1347 345 - 95 + 110 diff --git a/drafter_3/annotations/C34_D2_P3.xml b/drafter_3/annotations/C34_D2_P3.xml index acbc24755183fb4965993b9bf035bb4aa647307f..7c8f8aeaeb28a1af3b029e9a1274f89907fa1d93 100644 --- a/drafter_3/annotations/C34_D2_P3.xml +++ b/drafter_3/annotations/C34_D2_P3.xml @@ -46,7 +46,7 @@ 190 1084 243 - 90 + 94 diff --git a/drafter_3/annotations/C35_D1_P2.xml b/drafter_3/annotations/C35_D1_P2.xml index 9b45736574f67b9f9c0f379e548037b9c30df09b..2211eb6106292332eaefbd8f4cbafb12a351b04f 100644 --- a/drafter_3/annotations/C35_D1_P2.xml +++ b/drafter_3/annotations/C35_D1_P2.xml @@ -343,6 +343,7 @@ 676 1446 813 + 10 @@ -355,6 +356,7 @@ 362 1362 459 + 19 diff --git a/drafter_3/annotations/C35_D1_P3.xml b/drafter_3/annotations/C35_D1_P3.xml index 1c6d0a9590e7f3af9ee1674ab43890a761763249..782dd8ae7f4324592ab4ba6f7519e6526348cfbb 100644 --- a/drafter_3/annotations/C35_D1_P3.xml +++ b/drafter_3/annotations/C35_D1_P3.xml @@ -245,6 +245,7 @@ 282 1363 341 + 17 @@ -257,6 +258,7 @@ 510 1473 610 + 17 diff --git a/drafter_3/annotations/C35_D2_P2.xml b/drafter_3/annotations/C35_D2_P2.xml index d1d26a247380fc007e63d506b1b47ef23427a8fe..4e850be5abcddebb7fea901d5d33c094d0a21a70 100644 --- a/drafter_3/annotations/C35_D2_P2.xml +++ b/drafter_3/annotations/C35_D2_P2.xml @@ -298,6 +298,7 @@ 318 1417 399 + 12 @@ -310,6 +311,7 @@ 605 1533 740 + 8 diff --git a/drafter_3/annotations/C35_D2_P3.xml b/drafter_3/annotations/C35_D2_P3.xml index 537751cb469bbebe6037097b329ad4ee36365903..cb3d113eaaecdfaea3f00ae60be1910fb6ebdecd 100644 --- a/drafter_3/annotations/C35_D2_P3.xml +++ b/drafter_3/annotations/C35_D2_P3.xml @@ -97,6 +97,7 @@ 237 1389 292 + 13 @@ -109,6 +110,7 @@ 441 1515 543 + 10 @@ -319,6 +321,7 @@ 576 1532 661 + 8 @@ -343,6 +346,7 @@ 297 1378 344 + 2 diff --git a/drafter_3/annotations/C35_D2_P4.xml b/drafter_3/annotations/C35_D2_P4.xml index 36aa4f18e08dc0b3529a341261ab2c5ef66d9241..d7bcff92018b7888da301483eeee11ebdb138307 100644 --- a/drafter_3/annotations/C35_D2_P4.xml +++ b/drafter_3/annotations/C35_D2_P4.xml @@ -83,6 +83,7 @@ 182 1167 228 + 6 @@ -320,6 +321,7 @@ 323 1444 390 + 8 @@ -332,6 +334,7 @@ 579 1523 687 + 8 diff --git a/drafter_3/annotations/C36_D2_P2.xml b/drafter_3/annotations/C36_D2_P2.xml index d321bf493489c9503b3066843265334e3512c32d..c9fa359c05b93811ee7d494a34d3692c33dff553 100644 --- a/drafter_3/annotations/C36_D2_P2.xml +++ b/drafter_3/annotations/C36_D2_P2.xml @@ -226,7 +226,7 @@ 296 984 546 - 2 + 4 diff --git a/drafter_4/annotations/C37_D1_P1.xml b/drafter_4/annotations/C37_D1_P1.xml index 41c2039a84f1f96e64a922608e31d980b05c373e..0afb9ae487acffa9b58920788b134d1a8b3f2ae0 100644 --- a/drafter_4/annotations/C37_D1_P1.xml +++ b/drafter_4/annotations/C37_D1_P1.xml @@ -225,6 +225,7 @@ 525 631 625 + 2 @@ -261,6 +262,7 @@ 490 1588 586 + 2 diff --git a/drafter_4/annotations/C40_D1_P4.xml b/drafter_4/annotations/C40_D1_P4.xml index 2ceee79388a5eb249ba498adb0924ad4a169b70d..e3fbdc3b888b8fd9e938591c36c96b555c89da58 100644 --- a/drafter_4/annotations/C40_D1_P4.xml +++ b/drafter_4/annotations/C40_D1_P4.xml @@ -96,7 +96,7 @@ 1055 1402 1146 - 5 + 2 diff --git a/drafter_4/annotations/C41_D1_P4.xml b/drafter_4/annotations/C41_D1_P4.xml index aea32d5fd32e6755cba22824a09903d7f284a015..2736d3186738d2811c15fc186dffd029e6448752 100644 --- a/drafter_4/annotations/C41_D1_P4.xml +++ b/drafter_4/annotations/C41_D1_P4.xml @@ -253,7 +253,7 @@ 1073 932 1127 - 89 + 87 diff --git a/drafter_4/annotations/C44_D2_P4.xml b/drafter_4/annotations/C44_D2_P4.xml index 069b2ada80879cb15c460fce4e5fcd88725afc38..bcc05764e1d5753d12c744b2d768340f1b842521 100644 --- a/drafter_4/annotations/C44_D2_P4.xml +++ b/drafter_4/annotations/C44_D2_P4.xml @@ -701,7 +701,8 @@ 1351 434 1451 - 518 + 512 + 4 diff --git a/drafter_4/annotations/C46_D1_P3.xml b/drafter_4/annotations/C46_D1_P3.xml index 8a36a254bfc141acefd78e7caec44be0136ecc16..4587f494748ae1f16db155424dc7086743d45de9 100644 --- a/drafter_4/annotations/C46_D1_P3.xml +++ b/drafter_4/annotations/C46_D1_P3.xml @@ -253,6 +253,7 @@ 476 894 534 + 358 diff --git a/drafter_4/annotations/C48_D1_P1.xml b/drafter_4/annotations/C48_D1_P1.xml index 511bcbdb803d53a1adfe1657c9746fab0d927109..ce971c6200e350ff0397a90b0768f15febb6952e 100644 --- a/drafter_4/annotations/C48_D1_P1.xml +++ b/drafter_4/annotations/C48_D1_P1.xml @@ -47,6 +47,7 @@ 451 1840 620 + 2 @@ -59,6 +60,7 @@ 616 1332 717 + 4 diff --git a/drafter_4/annotations/C48_D1_P2.xml b/drafter_4/annotations/C48_D1_P2.xml index fd1aa0106276655db2cba88596888f8409d35a5c..8c12f51b4dfec5d8b4ee9e488f70856d8d42b67c 100644 --- a/drafter_4/annotations/C48_D1_P2.xml +++ b/drafter_4/annotations/C48_D1_P2.xml @@ -45,6 +45,7 @@ 601 1302 704 + 4 @@ -107,6 +108,7 @@ 422 1819 602 + 2 @@ -905,7 +907,7 @@ 142 587 198 - 92 + 87 diff --git a/drafter_4/annotations/C48_D1_P3.xml b/drafter_4/annotations/C48_D1_P3.xml index bc2ad4a6683b34210fae52152f4ff885e3a16f8c..c5a52d1f2c32769345e343b54611f8e935ecb168 100644 --- a/drafter_4/annotations/C48_D1_P3.xml +++ b/drafter_4/annotations/C48_D1_P3.xml @@ -33,7 +33,7 @@ 290 1076 396 - 90 + 92 @@ -46,7 +46,7 @@ 286 1148 390 - 90 + 89 diff --git a/drafter_4/annotations/C48_D1_P4.xml b/drafter_4/annotations/C48_D1_P4.xml index 0393a3d90a93f8e0a385018410c35d748706b853..6c12f77252a19eda320c1832d1ff25a0ac3bfc69 100644 --- a/drafter_4/annotations/C48_D1_P4.xml +++ b/drafter_4/annotations/C48_D1_P4.xml @@ -45,6 +45,7 @@ 70 683 130 + 354 @@ -505,6 +506,7 @@ 175 634 208 + 358 diff --git a/drafter_5/annotations/C51_D2_P3.xml b/drafter_5/annotations/C51_D2_P3.xml index 6d3f9990539dd89ed86babf44f3962e3aa8432e5..6092eaac7d84b724767c5d2500f541838934a524 100644 --- a/drafter_5/annotations/C51_D2_P3.xml +++ b/drafter_5/annotations/C51_D2_P3.xml @@ -489,9 +489,9 @@ 0 435 - 226 + 229 519 - 284 + 280 87 diff --git a/drafter_5/annotations/C52_D1_P1.xml b/drafter_5/annotations/C52_D1_P1.xml index dd3bf98ebef83769652d7ff31621d7ed67ecc5d9..f9523196be7e60cd5cebeed20a9922e6aab79445 100644 --- a/drafter_5/annotations/C52_D1_P1.xml +++ b/drafter_5/annotations/C52_D1_P1.xml @@ -17,10 +17,10 @@ 0 0 - 470 - 219 - 554 - 330 + 479 + 222 + 545 + 323 9 @@ -239,9 +239,9 @@ 0 0 - 530 + 532 414 - 573 + 567 503 99 diff --git a/drafter_5/annotations/C52_D1_P2.xml b/drafter_5/annotations/C52_D1_P2.xml index 88d7901b11f5a24551cae77e21b3a7fa08f8f710..ea7b3aee793536e25575de9df57a3629a9371f56 100644 --- a/drafter_5/annotations/C52_D1_P2.xml +++ b/drafter_5/annotations/C52_D1_P2.xml @@ -17,9 +17,9 @@ 0 0 - 467 + 474 209 - 546 + 539 318 2 @@ -82,11 +82,11 @@ 0 0 - 213 - 224 - 282 - 299 - 360 + 219 + 229 + 273 + 294 + 4 diff --git a/drafter_5/annotations/C52_D2_P3.xml b/drafter_5/annotations/C52_D2_P3.xml index 9e7397683a4c5cabb3893dcd6911869b20a3b7e5..c38abb79130ddc66676441022702c1e44a484d82 100644 --- a/drafter_5/annotations/C52_D2_P3.xml +++ b/drafter_5/annotations/C52_D2_P3.xml @@ -386,7 +386,7 @@ 300 623 361 - 5 + 350 diff --git a/drafter_5/annotations/C53_D1_P2.xml b/drafter_5/annotations/C53_D1_P2.xml index 0a0fa6f614f525bf2165223e92e5b2498bbc8aef..f7fc445008caf15db23b46bad6ae42f2669a04a7 100644 --- a/drafter_5/annotations/C53_D1_P2.xml +++ b/drafter_5/annotations/C53_D1_P2.xml @@ -603,11 +603,11 @@ 0 0 - 141 + 145 178 - 198 - 203 - 360 + 195 + 202 + 10 @@ -653,10 +653,10 @@ 0 0 - 173 + 177 272 201 - 302 + 303 14 @@ -666,11 +666,11 @@ 0 0 - 105 + 109 246 - 143 + 139 289 - 180 + 191 diff --git a/drafter_5/annotations/C53_D1_P3.xml b/drafter_5/annotations/C53_D1_P3.xml index 34cc42062bc4304e996832d18ee80b9b42524855..6a5d3f7be5e590c95b4dd585c89e973ec520972d 100644 --- a/drafter_5/annotations/C53_D1_P3.xml +++ b/drafter_5/annotations/C53_D1_P3.xml @@ -382,11 +382,11 @@ 0 0 - 120 + 123 223 - 157 + 152 265 - 180 + 187 diff --git a/drafter_5/annotations/C53_D1_P4.xml b/drafter_5/annotations/C53_D1_P4.xml index 30b56c03219f29077f47d045f63584e44ee8771f..549df6955a3d50d493b9f5185bc585d6ec05007c 100644 --- a/drafter_5/annotations/C53_D1_P4.xml +++ b/drafter_5/annotations/C53_D1_P4.xml @@ -681,9 +681,9 @@ 108 220 - 144 + 139 264 - 180 + 187 @@ -694,9 +694,9 @@ 175 250 - 202 + 199 281 - 3 + 8 diff --git a/drafter_5/annotations/C53_D2_P1.xml b/drafter_5/annotations/C53_D2_P1.xml index 0e2df73785917b8ee789cf1287c186594905e4a7..bf23858f6aa12330b7a915c1ed0900b3aac6fa43 100644 --- a/drafter_5/annotations/C53_D2_P1.xml +++ b/drafter_5/annotations/C53_D2_P1.xml @@ -642,7 +642,7 @@ 200 109 262 - 180 + 183 diff --git a/drafter_5/annotations/C53_D2_P2.xml b/drafter_5/annotations/C53_D2_P2.xml index 1c3e61b99381898d18fd98a4eaee92798322cd20..715e6886c6123f9c6bf9aceea4bb2be94ab7a736 100644 --- a/drafter_5/annotations/C53_D2_P2.xml +++ b/drafter_5/annotations/C53_D2_P2.xml @@ -679,11 +679,11 @@ 0 0 - 203 + 207 254 - 247 - 299 - 12 + 245 + 300 + 8 @@ -696,7 +696,7 @@ 204 147 258 - 180 + 189 diff --git a/drafter_5/annotations/C53_D2_P3.xml b/drafter_5/annotations/C53_D2_P3.xml index c375dab8c5d85a04788ca2161935cf71975aa0c8..e83497ac9ca54097c60dfaa957b0c86e248446e5 100644 --- a/drafter_5/annotations/C53_D2_P3.xml +++ b/drafter_5/annotations/C53_D2_P3.xml @@ -30,9 +30,9 @@ 0 0 - 153 + 157 90 - 193 + 190 111 360 @@ -253,7 +253,7 @@ 141 147 185 - 180 + 187 diff --git a/drafter_5/annotations/C53_D2_P4.xml b/drafter_5/annotations/C53_D2_P4.xml index 9461cb1c511eb066d8e261ef89ca4ff6704cd1a6..6a6c350c6b040bf2d7ccc3eb6840860466d03537 100644 --- a/drafter_5/annotations/C53_D2_P4.xml +++ b/drafter_5/annotations/C53_D2_P4.xml @@ -584,9 +584,9 @@ 50 205 - 104 + 100 260 - 183 + 189 diff --git a/drafter_5/annotations/C56_D1_P1.xml b/drafter_5/annotations/C56_D1_P1.xml index 4b8c989c0acb591b8195a87f2444ebce7936fc68..5b23929e5ece1abe4f6284113f6c03bc2a7ce226 100644 --- a/drafter_5/annotations/C56_D1_P1.xml +++ b/drafter_5/annotations/C56_D1_P1.xml @@ -151,7 +151,7 @@ 185 455 234 - 360 + 6 diff --git a/drafter_5/annotations/C56_D1_P2.xml b/drafter_5/annotations/C56_D1_P2.xml index 72a08f69cf4a8a46d5fc7fd9c03b81c87f4a929c..88868777ecc0850efefadac2895f9087acd247df 100644 --- a/drafter_5/annotations/C56_D1_P2.xml +++ b/drafter_5/annotations/C56_D1_P2.xml @@ -151,7 +151,7 @@ 187 206 215 - 360 + 350 diff --git a/drafter_5/annotations/C56_D2_P3.xml b/drafter_5/annotations/C56_D2_P3.xml index 18d1efc097586fa1969a7a8423cb6830eef06377..c0319eb0a7028c73dd40eb2f01c0c57add1f4471 100644 --- a/drafter_5/annotations/C56_D2_P3.xml +++ b/drafter_5/annotations/C56_D2_P3.xml @@ -235,10 +235,10 @@ 0 314 - 160 + 159 384 234 - 6 + 12 diff --git a/drafter_5/annotations/C57_D1_P2.xml b/drafter_5/annotations/C57_D1_P2.xml index 6cd5b62eb7885cd0c0ef1be6052ac7165f7de33d..e4aea82cceffb91da91707a6e7a65c8773c6f86c 100644 --- a/drafter_5/annotations/C57_D1_P2.xml +++ b/drafter_5/annotations/C57_D1_P2.xml @@ -59,18 +59,6 @@ 635 - - junction - Unspecified - 0 - 0 - - 819 - 581 - 839 - 593 - - junction Unspecified @@ -253,7 +241,7 @@ 528 433 589 - 350 + 4 @@ -351,10 +339,10 @@ 0 826 - 595 + 591 893 687 - 197 + 183 @@ -459,4 +447,16 @@ 4,7k + + junction + Unspecified + 0 + 0 + + 825 + 581 + 840 + 594 + + diff --git a/drafter_5/annotations/C57_D1_P3.xml b/drafter_5/annotations/C57_D1_P3.xml index 959c5095cf623bac6e605e7ad951aeea0e7c09de..44743e5ba93da2f9ba3bd0b8eb274fc410f1a0da 100644 --- a/drafter_5/annotations/C57_D1_P3.xml +++ b/drafter_5/annotations/C57_D1_P3.xml @@ -99,7 +99,7 @@ 428 471 490 - 355 + 6 diff --git a/drafter_5/annotations/C57_D1_P4.xml b/drafter_5/annotations/C57_D1_P4.xml index fc3f293ceea1e64548914fbcb28b0acc8f55d400..3b33515a1d21c8fb0f7e1a7a7550e378f1be91b9 100644 --- a/drafter_5/annotations/C57_D1_P4.xml +++ b/drafter_5/annotations/C57_D1_P4.xml @@ -34,7 +34,7 @@ 385 490 448 - 343 + 360 diff --git a/drafter_5/annotations/C57_D2_P1.xml b/drafter_5/annotations/C57_D2_P1.xml index d653c31698109cc06cb01cf8756a602627e14cd9..132c0c41636937c5b75f63d8bfad74b6593b3b8d 100644 --- a/drafter_5/annotations/C57_D2_P1.xml +++ b/drafter_5/annotations/C57_D2_P1.xml @@ -21,7 +21,7 @@ 411 483 503 - 360 + 6 @@ -155,7 +155,7 @@ 368 606 432 - 360 + 6 @@ -168,7 +168,7 @@ 316 679 379 - 360 + 8 diff --git a/drafter_5/annotations/C58_D1_P2.xml b/drafter_5/annotations/C58_D1_P2.xml index 59c3c4edf0fa561b0742cabc579b089dcfe95422..ac72ebe3fa50fc5180207a01dd5d7cc9eb493afd 100644 --- a/drafter_5/annotations/C58_D1_P2.xml +++ b/drafter_5/annotations/C58_D1_P2.xml @@ -190,7 +190,7 @@ 407 551 477 - 180 + 189 diff --git a/drafter_5/annotations/C59_D2_P4.xml b/drafter_5/annotations/C59_D2_P4.xml index 15f8690c1e3334e59fbfa52eb3a05b3977729205..610e42a4e987858376e859e7255122eb1a0ab5b5 100644 --- a/drafter_5/annotations/C59_D2_P4.xml +++ b/drafter_5/annotations/C59_D2_P4.xml @@ -574,7 +574,7 @@ 251 555 304 - 2 + 8 diff --git a/drafter_6/annotations/C63_D1_P2.xml b/drafter_6/annotations/C63_D1_P2.xml index 06cc3ba64f11e42ec27880fba98c1595c4ce511a..9332ba8a0e26176547dfb87e2f50c9ba0d2e233e 100644 --- a/drafter_6/annotations/C63_D1_P2.xml +++ b/drafter_6/annotations/C63_D1_P2.xml @@ -505,7 +505,7 @@ 195 702 222 - 360 + 352 @@ -518,7 +518,7 @@ 238 644 265 - 360 + 352 @@ -531,7 +531,7 @@ 278 591 305 - 360 + 354 @@ -544,7 +544,7 @@ 309 538 332 - 360 + 352 diff --git a/drafter_6/annotations/C65_D2_P4.xml b/drafter_6/annotations/C65_D2_P4.xml index 7ab3680b7756369b25b21a3f9722442a045eee0d..45499fa269d7fd83ca6f91b72decfc513bed17a0 100644 --- a/drafter_6/annotations/C65_D2_P4.xml +++ b/drafter_6/annotations/C65_D2_P4.xml @@ -422,7 +422,7 @@ 179 283 232 - 95 + 89 diff --git a/drafter_6/annotations/C66_D1_P1.xml b/drafter_6/annotations/C66_D1_P1.xml index 7cc72eb7a5f50ee42be5e7bc5e27a8dffdd079be..f4dbd921d60f2b37f586e2be1239e3124fea33d1 100644 --- a/drafter_6/annotations/C66_D1_P1.xml +++ b/drafter_6/annotations/C66_D1_P1.xml @@ -45,7 +45,7 @@ 288 234 317 - 94 + 83 diff --git a/drafter_6/annotations/C67_D2_P2.xml b/drafter_6/annotations/C67_D2_P2.xml index dbb42acb5d6542082322db53614feadc5c9be033..7c51d7c2da745733990c1f0283464d523b941398 100644 --- a/drafter_6/annotations/C67_D2_P2.xml +++ b/drafter_6/annotations/C67_D2_P2.xml @@ -47,7 +47,7 @@ 726 689 764 - 87 + 79 diff --git a/drafter_6/annotations/C68_D1_P4.xml b/drafter_6/annotations/C68_D1_P4.xml index 5e4d2bda3be3d6553aa1d6563dac276d5c59a241..5b3fad34c158935534f885648e6da3343f480271 100644 --- a/drafter_6/annotations/C68_D1_P4.xml +++ b/drafter_6/annotations/C68_D1_P4.xml @@ -342,7 +342,7 @@ 541 532 601 - 5 + 347 diff --git a/drafter_6/annotations/C68_D2_P2.xml b/drafter_6/annotations/C68_D2_P2.xml index 505e36a9249e1ff6cced456f79b76cece99d5352..cf95bea45addf51119abcbe8dc6de95f2c73eca2 100644 --- a/drafter_6/annotations/C68_D2_P2.xml +++ b/drafter_6/annotations/C68_D2_P2.xml @@ -265,7 +265,7 @@ 585 532 650 - 14 + 4 diff --git a/drafter_6/annotations/C69_D1_P2.xml b/drafter_6/annotations/C69_D1_P2.xml index bcfcf04604c2cb806cd0625b024158624de74ba8..675c30de5617d62cd70876c0bf59bc18ffee023d 100644 --- a/drafter_6/annotations/C69_D1_P2.xml +++ b/drafter_6/annotations/C69_D1_P2.xml @@ -33,7 +33,7 @@ 407 299 456 - 360 + 350 diff --git a/drafter_6/annotations/C70_D1_P3.xml b/drafter_6/annotations/C70_D1_P3.xml index 950b6ef8dab7e65fa9a91bfe2f2229f2b6b19a9b..d5cab5e56965b6da87563c16b611b693dd72a884 100644 --- a/drafter_6/annotations/C70_D1_P3.xml +++ b/drafter_6/annotations/C70_D1_P3.xml @@ -59,7 +59,7 @@ 444 1153 530 - 83 + 79 @@ -96,6 +96,7 @@ 516 1031 559 + 352 @@ -382,7 +383,7 @@ 521 978 550 - 360 + 350 diff --git a/drafter_6/annotations/C70_D2_P3.xml b/drafter_6/annotations/C70_D2_P3.xml index a92f7969a38a7021a89ad7474b46b9fdc31f7c90..a6a8888f36ec644cb4e602a7cb3f5aa2128f4f98 100644 --- a/drafter_6/annotations/C70_D2_P3.xml +++ b/drafter_6/annotations/C70_D2_P3.xml @@ -21,7 +21,7 @@ 672 372 770 - 92 + 90 diff --git a/drafter_6/annotations/C71_D1_P3.xml b/drafter_6/annotations/C71_D1_P3.xml index c1fca41474705a5f169c63bc7f8be7c446218fd5..8105f1a174f6f4a6a886436c5ae37bd96f5d2e00 100644 --- a/drafter_6/annotations/C71_D1_P3.xml +++ b/drafter_6/annotations/C71_D1_P3.xml @@ -149,7 +149,7 @@ 608 609 635 - 90 + 87 diff --git a/drafter_6/annotations/C71_D1_P4.xml b/drafter_6/annotations/C71_D1_P4.xml index 17ec6363503073d0946ac7fac01fa02c2f4efa1d..082176681b00b4e5577fd8a4d6aab5ca042d1d94 100644 --- a/drafter_6/annotations/C71_D1_P4.xml +++ b/drafter_6/annotations/C71_D1_P4.xml @@ -86,7 +86,7 @@ 419 608 532 - 360 + 356 diff --git a/drafter_6/annotations/C72_D1_P2.xml b/drafter_6/annotations/C72_D1_P2.xml index 4318ccef36efaa92012b622d5ca273cc929ecbe3..50800e29ac18bb9c865564b75c806d2e329d94e3 100644 --- a/drafter_6/annotations/C72_D1_P2.xml +++ b/drafter_6/annotations/C72_D1_P2.xml @@ -201,7 +201,7 @@ 469 686 494 - 176 + 187 @@ -214,7 +214,7 @@ 440 684 466 - 177 + 187 diff --git a/drafter_7/annotations/C83_D1_P4.xml b/drafter_7/annotations/C83_D1_P4.xml index 5b456990f957f7fdc11e1bd24234eea399095f3f..c5bc09aa8e46297dbb61ffc51ce8b5ace0692950 100644 --- a/drafter_7/annotations/C83_D1_P4.xml +++ b/drafter_7/annotations/C83_D1_P4.xml @@ -365,7 +365,7 @@ 535 442 625 - 5 + 358 diff --git a/drafter_7/annotations/C83_D2_P1.xml b/drafter_7/annotations/C83_D2_P1.xml index bfd33698b8ca7b810fbcb942b7f91caebac80796..f88bb5886184d9369c89ab14f5f24372e3c09683 100644 --- a/drafter_7/annotations/C83_D2_P1.xml +++ b/drafter_7/annotations/C83_D2_P1.xml @@ -296,9 +296,9 @@ 0 0 - 242 + 247 101 - 286 + 281 175 90 @@ -335,9 +335,9 @@ 0 0 - 236 + 242 346 - 280 + 275 434 90 @@ -365,7 +365,7 @@ 575 431 640 - 5 + 2 @@ -426,10 +426,10 @@ 0 0 - 764 - 422 - 811 - 464 + 770 + 425 + 803 + 459 178 diff --git a/drafter_7/annotations/C83_D2_P2.xml b/drafter_7/annotations/C83_D2_P2.xml index 943f7a5f84e1d559c26f0b8849924eb82975be2d..498afcb7d14e56d07b33f204d19669a8c8897336 100644 --- a/drafter_7/annotations/C83_D2_P2.xml +++ b/drafter_7/annotations/C83_D2_P2.xml @@ -265,9 +265,9 @@ 0 0 - 670 + 676 414 - 716 + 709 451 189 @@ -282,7 +282,7 @@ 625 138 667 - 197 + 193 @@ -295,7 +295,7 @@ 701 155 743 - 204 + 196 diff --git a/drafter_8/annotations/C96_D1_P1.xml b/drafter_8/annotations/C96_D1_P1.xml index 03c01d28e60bbd312ad654caab4f6aac223b495a..0941fcdf9e398761e91d9dd5acfd121462945a2b 100644 --- a/drafter_8/annotations/C96_D1_P1.xml +++ b/drafter_8/annotations/C96_D1_P1.xml @@ -125,7 +125,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D1_P2.xml b/drafter_8/annotations/C96_D1_P2.xml index 18e0949ef12892a1c383d9b87183aa50588c91ff..ba588171255a295ea5bced63ef48bf58c4682059 100644 --- a/drafter_8/annotations/C96_D1_P2.xml +++ b/drafter_8/annotations/C96_D1_P2.xml @@ -490,7 +490,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D1_P3.xml b/drafter_8/annotations/C96_D1_P3.xml index 19dc399b6f929db1143c1fc522e07c63d80db12f..3827f5a6833b300933614cabfc0543baa1f0adc1 100644 --- a/drafter_8/annotations/C96_D1_P3.xml +++ b/drafter_8/annotations/C96_D1_P3.xml @@ -654,7 +654,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D1_P4.xml b/drafter_8/annotations/C96_D1_P4.xml index 874d2aeec839fc78ea2d43b039c44bb50e4b8b60..00ae42cffec23c6899a8aa5a8f319aee5196b8d8 100644 --- a/drafter_8/annotations/C96_D1_P4.xml +++ b/drafter_8/annotations/C96_D1_P4.xml @@ -717,7 +717,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D2_P1.xml b/drafter_8/annotations/C96_D2_P1.xml index ba37901f9ace26f92aa847abf4ea4a757e9df4ff..8f625dc1eb2f464993be664d9f512c11b60c6e3e 100644 --- a/drafter_8/annotations/C96_D2_P1.xml +++ b/drafter_8/annotations/C96_D2_P1.xml @@ -619,7 +619,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D2_P2.xml b/drafter_8/annotations/C96_D2_P2.xml index 8193c3055e4f2c2d8073c2a5218fcc1796cce6b8..1325933b06c6f80f8d4102c2b9593e25f04d7ff4 100644 --- a/drafter_8/annotations/C96_D2_P2.xml +++ b/drafter_8/annotations/C96_D2_P2.xml @@ -700,7 +700,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D2_P3.xml b/drafter_8/annotations/C96_D2_P3.xml index c12b26193e1ae427f232b9d7b2995095049dc8bc..4bd640e6776c46c2045b208894f99608679fe6d8 100644 --- a/drafter_8/annotations/C96_D2_P3.xml +++ b/drafter_8/annotations/C96_D2_P3.xml @@ -790,7 +790,7 @@ - diode + diode.zener Unspecified 0 0 diff --git a/drafter_8/annotations/C96_D2_P4.xml b/drafter_8/annotations/C96_D2_P4.xml index 30a752309c98da74e0cecce8419e0f4ce599899c..431773315458e8ec176234b3d0f709c782db4b29 100644 --- a/drafter_8/annotations/C96_D2_P4.xml +++ b/drafter_8/annotations/C96_D2_P4.xml @@ -593,7 +593,7 @@ - diode + diode.zener Unspecified 0 0