Merge remote-tracking branch 'upstream/master'

iliakan · iliakan · commit a023496e2bca · 2019-07-31T17:48:19.000+03:00
diff --git a/1-js/06-advanced-functions/03-closure/lexenv-nested-makecounter-2.svg b/1-js/06-advanced-functions/03-closure/lexenv-nested-makecounter-2.svg
@@ -57,11 +57,11 @@
                 <tspan x="675" y="67">null</tspan>
             </text>
             <polyline id="Rectangle-1-Copy" fill="#EC6B4E" points="3 39.7741935 3 27 12 33.3870968"></polyline>
-            <text id="global-Lexical-Envir" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#8A704D">
-                <tspan x="440" y="15">global Lexical Environment</tspan>
+            <text id="global-LexicalEnviro" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#8A704D">
+                <tspan x="440" y="15">global LexicalEnvironment</tspan>
             </text>
-            <text id="Lexical-Environment" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#8A704D">
-                <tspan x="275" y="15">Lexical Environment</tspan>
+            <text id="LexicalEnvironment-o" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#8A704D">
+                <tspan x="275" y="15">LexicalEnvironment</tspan>
                 <tspan x="275" y="29">of makeCounter() call</tspan>
             </text>
         </g>
diff --git a/1-js/06-advanced-functions/03-closure/lexenv-nested-makecounter-4.svg b/1-js/06-advanced-functions/03-closure/lexenv-nested-makecounter-4.svg
@@ -51,7 +51,7 @@
                     <tspan x="4" y="19">count: 0</tspan>
                 </text>
             </g>
-            <g id="Group" transform="translate(606.000000, 48.000000)">
+            <g id="Group" transform="translate(612.000000, 48.000000)">
                 <path id="Line" d="M16.5,21.5 L2.5,21.5 L2.5,19.5 L16.5,19.5 L16.5,13.5 L30.5,20.5 L16.5,27.5 L16.5,21.5 Z" fill="#EE6B47" fill-rule="nonzero"></path>
                 <text id="outer" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#8A704D">
                     <tspan x="0" y="11">outer</tspan>
@@ -64,7 +64,7 @@
                 </text>
             </g>
             <text id="null" font-family="PTMono-Regular, PT Mono" font-size="14" font-weight="normal" fill="#8A704D">
-                <tspan x="651" y="71">null</tspan>
+                <tspan x="657" y="71">null</tspan>
             </text>
             <text id="[[Environment]]" font-family="PTMono-Regular, PT Mono" font-size="14" font-weight="normal" fill="#8A704D">
                 <tspan x="184" y="192">[[Environment]]</tspan>
diff --git a/1-js/06-advanced-functions/03-closure/lexical-environment-global.svg b/1-js/06-advanced-functions/03-closure/lexical-environment-global.svg
@@ -31,7 +31,7 @@
                 <path d="M50.694,39.25 C50.694,39.1659996 50.6916667,39.056334 50.687,38.921 C50.6823333,38.785666 50.6753334,38.6456674 50.666,38.501 C50.6566666,38.3563326 50.6450001,38.2140007 50.631,38.074 C50.6169999,37.9339993 50.6006668,37.8126672 50.582,37.71 L49.644,37.71 L49.644,36.8 L51.506,36.8 L51.646,37.78 L51.716,37.78 C51.9680013,37.4533317 52.2876647,37.1803344 52.675,36.961 C53.0623353,36.7416656 53.5359972,36.632 54.096,36.632 C55.0946717,36.632 55.8459975,36.9073306 56.35,37.458 C56.8540025,38.0086694 57.106,38.9093271 57.106,40.16 C57.106,40.7480029 57.0196675,41.2776643 56.847,41.749 C56.6743325,42.2203357 56.4293349,42.6193317 56.112,42.946 C55.7946651,43.2726683 55.4120022,43.5246658 54.964,43.702 C54.5159978,43.8793342 54.021336,43.968 53.48,43.968 C53.283999,43.968 53.1090008,43.9610001 52.955,43.947 C52.8009992,43.9329999 52.6610006,43.9143334 52.535,43.891 C52.4089994,43.8676665 52.2853339,43.8373335 52.164,43.8 C52.0426661,43.7626665 51.9120007,43.7160003 51.772,43.66 L51.772,46.6 L50.694,46.6 L50.694,39.25 Z M53.914,37.654 C53.6339986,37.654 53.3703346,37.7053328 53.123,37.808 C52.8756654,37.9106672 52.6563343,38.0459992 52.465,38.214 C52.2736657,38.3820008 52.1173339,38.5686656 51.996,38.774 C51.8746661,38.9793344 51.8000001,39.1846656 51.772,39.39 L51.772,42.582 C51.9773344,42.7220007 52.2083321,42.8316663 52.465,42.911 C52.721668,42.9903337 53.0599979,43.03 53.48,43.03 C54.2266704,43.03 54.8239978,42.7850024 55.272,42.295 C55.7200022,41.8049975 55.944,41.0886714 55.944,40.146 C55.944,39.3526627 55.7876682,38.7390022 55.475,38.305 C55.1623318,37.8709978 54.6420036,37.654 53.914,37.654 Z M57.806,34 L59.99,34 L59.99,37.668 L60.06,37.668 C60.3493348,37.3413317 60.6853314,37.0870009 61.068,36.905 C61.4506686,36.7229991 61.9266638,36.632 62.496,36.632 C62.9440022,36.632 63.333665,36.6786662 63.665,36.772 C63.996335,36.8653338 64.266999,37.0286655 64.477,37.262 C64.6870011,37.4953345 64.8433328,37.814998 64.946,38.221 C65.0486672,38.627002 65.1,39.1426635 65.1,39.768 L65.1,43.8 L64.008,43.8 L64.008,39.978 C64.008,39.5766647 63.9846669,39.2266682 63.938,38.928 C63.8913331,38.6293318 63.800334,38.3796677 63.665,38.179 C63.529666,37.9783323 63.3453345,37.8266672 63.112,37.724 C62.8786655,37.6213328 62.5800018,37.57 62.216,37.57 C61.9639987,37.57 61.7166679,37.6143329 61.474,37.703 C61.2313321,37.7916671 61.0096677,37.9129992 60.809,38.067 C60.6083323,38.2210008 60.4356674,38.4076656 60.291,38.627 C60.1463326,38.8463344 60.0460003,39.0866654 59.99,39.348 L59.99,43.8 L58.912,43.8 L58.912,34.938 L57.806,34.938 L57.806,34 Z M67.074,43.8 L67.074,42.862 L68.964,42.862 L68.964,37.738 L67.074,37.738 L67.074,36.8 L69.692,36.8 L69.916,37.71 L69.986,37.71 C70.3033349,37.4206652 70.657998,37.1733344 71.05,36.968 C71.442002,36.7626656 71.908664,36.66 72.45,36.66 C72.7673349,36.66 73.0216657,36.7206661 73.213,36.842 C73.4043343,36.9633339 73.5536661,37.1406655 73.661,37.374 C73.7683339,37.6073345 73.8406665,37.889665 73.878,38.221 C73.9153335,38.552335 73.934,38.9279979 73.934,39.348 L72.954,39.362 C72.954,38.7646637 72.8956673,38.3260014 72.779,38.046 C72.6623328,37.7659986 72.4500015,37.626 72.142,37.626 C71.8526652,37.626 71.5913345,37.6679996 71.358,37.752 C71.1246655,37.8360004 70.9216675,37.9386661 70.749,38.06 C70.5763325,38.1813339 70.4293339,38.3026661 70.308,38.424 C70.1866661,38.5453339 70.0980003,38.6479996 70.042,38.732 L70.042,42.862 L72.73,42.862 L72.73,43.8 L67.074,43.8 Z M76.062,37.346 C76.4633353,37.1126655 76.9159975,36.9446672 77.42,36.842 C77.9240025,36.7393328 78.4186642,36.688 78.904,36.688 C79.3800024,36.688 79.7696652,36.7626659 80.073,36.912 C80.3763349,37.0613341 80.6143325,37.2549988 80.787,37.493 C80.9596675,37.7310012 81.076333,38.0016651 81.137,38.305 C81.197667,38.6083348 81.228,38.9139985 81.228,39.222 C81.228,39.5766684 81.2186668,39.9546647 81.2,40.356 C81.1813332,40.7573353 81.1673334,41.1586647 81.158,41.56 C81.158,42.026669 81.1859997,42.4699979 81.242,42.89 L82.18,42.89 L82.18,43.8 L80.318,43.8 L80.192,42.75 L80.122,42.75 C80.0659997,42.8340004 79.9820006,42.9413327 79.87,43.072 C79.7579994,43.2026673 79.6110009,43.3309994 79.429,43.457 C79.2469991,43.5830006 79.0253346,43.6926662 78.764,43.786 C78.5026654,43.8793338 78.1946684,43.926 77.84,43.926 C77.1493299,43.926 76.6033353,43.7486684 76.202,43.394 C75.8006647,43.0393316 75.6,42.5540031 75.6,41.938 C75.6,41.4619976 75.704999,41.0653349 75.915,40.748 C76.1250011,40.4306651 76.425998,40.188 76.818,40.02 C77.210002,39.8519992 77.6836639,39.7540001 78.239,39.726 C78.7943361,39.6979999 79.4173299,39.7353328 80.108,39.838 C80.1546669,39.4086645 80.1616668,39.0516681 80.129,38.767 C80.0963332,38.4823319 80.0216673,38.2560008 79.905,38.088 C79.7883328,37.9199992 79.6250011,37.8010003 79.415,37.731 C79.204999,37.6609996 78.9460015,37.626 78.638,37.626 C78.2179979,37.626 77.8166686,37.6843327 77.434,37.801 C77.0513314,37.9176672 76.7106682,38.0366661 76.412,38.158 L76.062,37.346 Z M78.12,42.988 C78.3813346,42.988 78.6239989,42.9460004 78.848,42.862 C79.0720011,42.7779996 79.2679992,42.6706673 79.436,42.54 C79.6040008,42.4093327 79.7439994,42.2670008 79.856,42.113 C79.9680006,41.9589992 80.0519997,41.8120007 80.108,41.672 L80.108,40.692 C79.6226642,40.6079996 79.1746687,40.566 78.764,40.566 C78.3533313,40.566 77.9986682,40.6103329 77.7,40.699 C77.4013318,40.7876671 77.1680008,40.9253324 77,41.112 C76.8319992,41.2986676 76.748,41.5413318 76.748,41.84 C76.748,42.1480015 76.852999,42.4163322 77.063,42.645 C77.2730011,42.8736678 77.6253309,42.988 78.12,42.988 Z M89.082,41.91 C89.082,41.6113318 88.9653345,41.3803341 88.732,41.217 C88.4986655,41.0536658 88.2093351,40.9230005 87.864,40.825 C87.5186649,40.7269995 87.143002,40.6360004 86.737,40.552 C86.330998,40.4679996 85.9553351,40.3560007 85.61,40.216 C85.2646649,40.0759993 84.9753345,39.8870012 84.742,39.649 C84.5086655,39.4109988 84.392,39.0773355 84.392,38.648 C84.392,38.2933316 84.4689992,37.9900013 84.623,37.738 C84.7770008,37.4859987 84.9799987,37.2783341 85.232,37.115 C85.4840013,36.9516658 85.7779983,36.8303337 86.114,36.751 C86.4500017,36.6716663 86.7999982,36.632 87.164,36.632 C87.8173366,36.632 88.3796643,36.7136658 88.851,36.877 C89.3223357,37.0403341 89.6979986,37.2106658 89.978,37.388 L89.53,38.27 C89.2219985,38.1019992 88.8883351,37.9410008 88.529,37.787 C88.1696649,37.6329992 87.719336,37.556 87.178,37.556 C86.9726656,37.556 86.7696677,37.5769998 86.569,37.619 C86.3683323,37.6610002 86.1863342,37.7239996 86.023,37.808 C85.8596659,37.8920004 85.7290005,38.001666 85.631,38.137 C85.5329995,38.272334 85.484,38.437999 85.484,38.634 C85.484,38.8766679 85.6006655,39.0633327 85.834,39.194 C86.0673345,39.3246673 86.3566649,39.4343329 86.702,39.523 C87.0473351,39.6116671 87.422998,39.6956663 87.829,39.775 C88.235002,39.8543337 88.6106649,39.9686659 88.956,40.118 C89.3013351,40.2673341 89.5906655,40.4679987 89.824,40.72 C90.0573345,40.9720013 90.174,41.3126645 90.174,41.742 C90.174,42.3860032 89.9196692,42.9179979 89.411,43.338 C88.9023308,43.7580021 88.1393384,43.968 87.122,43.968 C86.8139985,43.968 86.5106682,43.9400003 86.212,43.884 C85.9133318,43.8279997 85.6333346,43.7533338 85.372,43.66 C85.1106654,43.5666662 84.8726677,43.4616672 84.658,43.345 C84.4433323,43.2283327 84.2660007,43.1093339 84.126,42.988 L84.686,42.078 C84.7980006,42.1900006 84.9473324,42.3043327 85.134,42.421 C85.3206676,42.5376672 85.5259989,42.6426662 85.75,42.736 C85.9740011,42.8293338 86.2143321,42.9039997 86.471,42.96 C86.727668,43.0160003 86.9866654,43.044 87.248,43.044 C87.5000013,43.044 87.7356656,43.0230002 87.955,42.981 C88.1743344,42.9389998 88.3679992,42.8736671 88.536,42.785 C88.7040008,42.6963329 88.8369995,42.5796674 88.935,42.435 C89.0330005,42.2903326 89.082,42.1153344 89.082,41.91 Z M98.756,42.918 C98.5879992,43.0673341 98.3896678,43.2073327 98.161,43.338 C97.9323322,43.4686673 97.682668,43.5806662 97.412,43.674 C97.141332,43.7673338 96.8590015,43.8396664 96.565,43.891 C96.2709985,43.9423336 95.9746682,43.968 95.676,43.968 C95.1159972,43.968 94.6213355,43.8816675 94.192,43.709 C93.7626645,43.5363325 93.4033348,43.2890016 93.114,42.967 C92.8246652,42.6449984 92.6053341,42.2600022 92.456,41.812 C92.3066659,41.3639978 92.232,40.8600028 92.232,40.3 C92.232,39.7119971 92.3136659,39.1893356 92.477,38.732 C92.6403342,38.2746644 92.8759985,37.8920015 93.184,37.584 C93.4920015,37.2759985 93.8653311,37.0403341 94.304,36.877 C94.7426689,36.7136658 95.232664,36.632 95.774,36.632 C96.166002,36.632 96.5533314,36.6833328 96.936,36.786 C97.3186686,36.8886672 97.6569985,37.0823319 97.951,37.367 C98.2450015,37.6516681 98.4713325,38.0436642 98.63,38.543 C98.7886675,39.0423358 98.8446669,39.6886627 98.798,40.482 L93.38,40.482 C93.38,41.3220042 93.6063311,41.9496646 94.059,42.365 C94.5116689,42.7803354 95.1159962,42.988 95.872,42.988 C96.1240013,42.988 96.3736654,42.957667 96.621,42.897 C96.8683346,42.836333 97.1039989,42.7640004 97.328,42.68 C97.5520011,42.5959996 97.7503325,42.5026672 97.923,42.4 C98.0956675,42.2973328 98.2286662,42.2040004 98.322,42.12 L98.756,42.918 Z M95.802,37.556 C95.4939985,37.556 95.2023347,37.5886663 94.927,37.654 C94.6516653,37.7193337 94.4090011,37.8289992 94.199,37.983 C93.988999,38.1370008 93.816334,38.3376654 93.681,38.585 C93.545666,38.8323346 93.4593335,39.1379982 93.422,39.502 L97.776,39.502 C97.7293331,38.8859969 97.5310018,38.4076684 97.181,38.067 C96.8309983,37.7263316 96.3713362,37.556 95.802,37.556 Z" id="phrase" fill="#000000"></path>
                 <path d="M101.752,45.802 C102.200002,45.7086662 102.645664,45.5430012 103.089,45.305 C103.532336,45.0669988 103.933665,44.7356688 104.293,44.311 C104.652335,43.8863312 104.941666,43.3543365 105.161,42.715 C105.380334,42.0756635 105.49,41.3033379 105.49,40.398 C105.49,39.5019955 105.399001,38.7390032 105.217,38.109 C105.034999,37.4789969 104.778335,36.9516688 104.447,36.527 C104.115665,36.1023312 103.721336,35.761668 103.264,35.505 C102.806664,35.248332 102.302669,35.0406675 101.752,34.882 L102.102,34 C102.70867,34.1306673 103.284997,34.3523318 103.831,34.665 C104.377003,34.9776682 104.855331,35.3929974 105.266,35.911 C105.676669,36.4290026 106.003332,37.0589963 106.246,37.801 C106.488668,38.5430037 106.61,39.4086617 106.61,40.398 C106.61,41.3966717 106.491001,42.2599964 106.253,42.988 C106.014999,43.7160036 105.693002,44.3319975 105.287,44.836 C104.880998,45.3400025 104.405003,45.7483318 103.859,46.061 C103.312997,46.3736682 102.727336,46.6093325 102.102,46.768 L101.752,45.802 Z M111.356,43.03 C111.356,42.7499986 111.446999,42.5236675 111.629,42.351 C111.811001,42.1783325 112.046665,42.092 112.336,42.092 C112.690668,42.092 112.965999,42.2156654 113.162,42.463 C113.358001,42.7103346 113.456,43.0579978 113.456,43.506 C113.456,43.8700018 113.395334,44.1896653 113.274,44.465 C113.152666,44.7403347 113.001001,44.9736657 112.819,45.165 C112.636999,45.3563343 112.441001,45.5103327 112.231,45.627 C112.020999,45.7436673 111.827334,45.8299997 111.65,45.886 L111.3,45.34 C111.636002,45.2093327 111.925332,45.0226679 112.168,44.78 C112.410668,44.5373321 112.532,44.2433351 112.532,43.898 C112.401333,43.9260001 112.298667,43.94 112.224,43.94 C111.953332,43.94 111.741001,43.8630008 111.587,43.709 C111.432999,43.5549992 111.356,43.3286682 111.356,43.03 Z M111.482,37.528 C111.482,37.2293318 111.565999,36.9983341 111.734,36.835 C111.902001,36.6716659 112.125999,36.59 112.406,36.59 C112.704668,36.59 112.937999,36.6716659 113.106,36.835 C113.274001,36.9983341 113.358,37.2293318 113.358,37.528 C113.358,37.798668 113.274001,38.0226658 113.106,38.2 C112.937999,38.3773342 112.704668,38.466 112.406,38.466 C112.125999,38.466 111.902001,38.3773342 111.734,38.2 C111.565999,38.0226658 111.482,37.798668 111.482,37.528 Z" id=");" fill="#999999"></path>
             </g>
-            <text id="LexicalEnvironment" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#9B9B9B">
+            <text id="LexicalEnvironment" font-family="PTMono-Regular, PT Mono" font-size="12" font-weight="normal" fill="#666666">
                 <tspan x="251" y="13">LexicalEnvironment</tspan>
             </text>
             <path d="M198.5,36.5 L238.5,36.5" id="Line" stroke="#9B9B9B" stroke-linecap="square" stroke-dasharray="2,4,2,4"></path>
diff --git a/1-js/06-advanced-functions/03-closure/lexical-environment-simple.svg b/1-js/06-advanced-functions/03-closure/lexical-environment-simple.svg
