Skip to content

Commit

Permalink
Merge pull request #2352 from mbeddr/bugfix/doc_improvements_dec_2023…
Browse files Browse the repository at this point in the history 
…_2022_2
  • Loading branch information
@alexanderpann
alexanderpann authored Dec 18, 2023
2 parents 8b657ac + 45520b4 commit 5efe184
Show file tree
Hide file tree
Showing 10 changed files with 245 additions and 569 deletions.
2 changes: 1 addition & 1 deletion ...n_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/main@generator.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2515,7 +2515,7 @@
</node>
</node>
<node concept="3aamgX" id="2HzhasNyu8V" role="3acgRq">
<ref role="30HIoZ" to="2c95:2HzhasNytLD" resolve="Invisble" />
<ref role="30HIoZ" to="2c95:2HzhasNytLD" resolve="Invisible" />
<node concept="gft3U" id="2HzhasNyua8" role="1lVwrX">
<node concept="1jVumR" id="2HzhasNyuab" role="gfFT$">
<node concept="1jVIKM" id="2HzhasNyuaf" role="1jVumL" />
Expand Down
22 changes: 21 additions & 1 deletion ...n_xhtml/generator/template/com/mbeddr/doc/gen_xhtml/generator/template/main@generator.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,26 @@
</registry>
<node concept="bUwia" id="2TZO3DbvUtD">
<property role="TrG5h" value="main" />
<node concept="3aamgX" id="38Vsfq8or5d" role="3acgRq">
<ref role="30HIoZ" to="2c95:1q0W02ZOmHb" resolve="ToDoCommentWord" />
<node concept="b5Tf3" id="38Vsfq8orde" role="1lVwrX" />
</node>
<node concept="3aamgX" id="38Vsfq8ordi" role="3acgRq">
<ref role="30HIoZ" to="2c95:1q0W02ZIK0$" resolve="InformationRequiredWord" />
<node concept="b5Tf3" id="38Vsfq8orn0" role="1lVwrX" />
</node>
<node concept="3aamgX" id="38Vsfq8ornu" role="3acgRq">
<ref role="30HIoZ" to="2c95:1q0W02ZGGTg" resolve="FixMeWord" />
<node concept="b5Tf3" id="38Vsfq8oryh" role="1lVwrX" />
</node>
<node concept="3aamgX" id="38Vsfq8orz9" role="3acgRq">
<ref role="30HIoZ" to="2c95:1q0W02ZLKtJ" resolve="FeedbackRequiredWord" />
<node concept="b5Tf3" id="38Vsfq8orE7" role="1lVwrX" />
</node>
<node concept="3aamgX" id="38Vsfq8orEZ" role="3acgRq">
<ref role="30HIoZ" to="2c95:1q0W02ZOszT" resolve="ConfidenceWord" />
<node concept="b5Tf3" id="38Vsfq8orNf" role="1lVwrX" />
</node>
<node concept="1puMqW" id="6ec5ny8ew4B" role="1puA0r">
<ref role="1puQsG" node="6ec5ny8448w" resolve="createNestedItemLists" />
</node>
Expand Down Expand Up @@ -3357,7 +3377,7 @@
</node>
<node concept="3aamgX" id="5yxqZJwyGI7" role="3acgRq">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="2c95:2HzhasNytLD" resolve="Invisble" />
<ref role="30HIoZ" to="2c95:2HzhasNytLD" resolve="Invisible" />
<node concept="gft3U" id="5yxqZJwyGI8" role="1lVwrX">
<node concept="2pNNFK" id="5yxqZJwyGIB" role="gfFT$">
<property role="2pNNFO" value="div" />
Expand Down
10 changes: 0 additions & 10 deletions code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/actions.mps
View file

This file was deleted.

61 changes: 14 additions & 47 deletions code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,20 @@
</node>
</node>
</node>
<node concept="13i0hz" id="38Vsfq8kIQE" role="13h7CS">
<property role="TrG5h" value="allowNonIdentifierNames" />
<property role="2Ki8OM" value="true" />
<ref role="13i0hy" to="hwgx:5HxjapwgqKm" resolve="allowNonIdentifierNames" />
<node concept="3Tm1VV" id="38Vsfq8kIQF" role="1B3o_S" />
<node concept="3clFbS" id="38Vsfq8kIQK" role="3clF47">
<node concept="3clFbF" id="38Vsfq8kIWO" role="3cqZAp">
<node concept="3clFbT" id="38Vsfq8kIWN" role="3clFbG">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="10P_77" id="38Vsfq8kIQL" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="2TZO3Dbvd_K">
<property role="3GE5qa" value="paragraphs" />
Expand Down Expand Up @@ -3559,13 +3573,6 @@
<node concept="3Tm1VV" id="519ky_SnIs7" role="1B3o_S" />
</node>
</node>
<node concept="13h7C7" id="5mf_X_LaxtJ">
<property role="3GE5qa" value="words.formatted" />
<ref role="13h7C2" to="2c95:3RseghIdgYi" resolve="CodeFormattedText" />
<node concept="13hLZK" id="5mf_X_LaxtK" role="13h7CW">
<node concept="3clFbS" id="5mf_X_LaxtL" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="5mf_X_La_NP">
<property role="3GE5qa" value="words.formatted" />
<ref role="13h7C2" to="2c95:5mf_X_La_N$" resolve="FormattedText" />
Expand Down Expand Up @@ -5587,20 +5594,6 @@
</node>
</node>
</node>
<node concept="13h7C7" id="2U5fsQejoWj">
<property role="3GE5qa" value="config" />
<ref role="13h7C2" to="2c95:2U5fsQei4zf" resolve="IDocConfigItem" />
<node concept="13hLZK" id="2U5fsQejoWk" role="13h7CW">
<node concept="3clFbS" id="2U5fsQejoWl" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="3JD5OqKQc7j">
<property role="3GE5qa" value="config.scaling" />
<ref role="13h7C2" to="2c95:3JD5OqKQc7d" resolve="ScaleDownNotUp100" />
<node concept="13hLZK" id="3JD5OqKQc7k" role="13h7CW">
<node concept="3clFbS" id="3JD5OqKQc7l" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="5Hxjapwcewu">
<ref role="13h7C2" to="2c95:2TZO3DbvhA_" resolve="SectRefWord" />
<node concept="13i0hz" id="QRmqzHnS67" role="13h7CS">
Expand Down Expand Up @@ -5721,12 +5714,6 @@
<node concept="3Tqbb2" id="3mn43GPhKlC" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="5Hxjapwcex4">
<ref role="13h7C2" to="2c95:3OiIliPRDR0" resolve="EmphFormattedText" />
<node concept="13hLZK" id="5Hxjapwcex5" role="13h7CW">
<node concept="3clFbS" id="5Hxjapwcex6" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="5HxjapwcexO">
<ref role="13h7C2" to="2c95:3RseghIemTs" resolve="ShortcutRefWord" />
<node concept="13hLZK" id="5HxjapwcexP" role="13h7CW">
Expand Down Expand Up @@ -5826,12 +5813,6 @@
<node concept="3Tqbb2" id="3mn43GPhHVi" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="5Hxjapwceyf">
<ref role="13h7C2" to="2c95:3RseghIeCP3" resolve="ShortcutArgRef" />
<node concept="13hLZK" id="5Hxjapwceyg" role="13h7CW">
<node concept="3clFbS" id="5Hxjapwceyh" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="1uL8CIttCBh">
<property role="3GE5qa" value="export" />
<ref role="13h7C2" to="2c95:5gTlpaky6t5" resolve="IncludableExport" />
Expand Down Expand Up @@ -6523,13 +6504,6 @@
<node concept="17QB3L" id="627_yy3Sp4h" role="3clF45" />
</node>
</node>
<node concept="13h7C7" id="3DAECxFssLW">
<property role="3GE5qa" value="embed" />
<ref role="13h7C2" to="2c95:3DAECxFssLS" resolve="NameAnnotation" />
<node concept="13hLZK" id="3DAECxFssLX" role="13h7CW">
<node concept="3clFbS" id="3DAECxFssLY" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="2mOlJ4sbKN1">
<property role="3GE5qa" value="modelContentPointer" />
<ref role="13h7C2" to="2c95:1YUFCeG6lqR" resolve="ModelContentPointer" />
Expand Down Expand Up @@ -8030,13 +8004,6 @@
</node>
</node>
</node>
<node concept="13h7C7" id="aiIotWBg4O">
<property role="3GE5qa" value="structure" />
<ref role="13h7C2" to="2c95:3DAECxG6nQE" resolve="Chapter" />
<node concept="13hLZK" id="aiIotWBg4P" role="13h7CW">
<node concept="3clFbS" id="aiIotWBg4Q" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="6TjoDcE5T6A">
<property role="3GE5qa" value="modelContent" />
<ref role="13h7C2" to="2c95:1SYZy6Qh7iS" resolve="AbstractModelContentRemoval" />
Expand Down
24 changes: 1 addition & 23 deletions code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/constraints.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,10 @@
<concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
<reference id="1147467295099" name="applicableProperty" index="EomxK" />
<child id="1147468630220" name="propertyGetter" index="EtsB7" />
<child id="1212097481299" name="propertyValidator" index="QCWH9" />
<child id="1152963095733" name="propertySetter" index="1LXaQT" />
</concept>
<concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
<concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
<concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
<concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
<concept id="1163200647017" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_referenceNode" flags="nn" index="3kakTB" />
<concept id="1152959968041" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertySetter" flags="in" index="1LLf8_" />
Expand Down Expand Up @@ -975,7 +973,7 @@
</node>
<node concept="1M2fIO" id="2HzhasNyR9S">
<property role="3GE5qa" value="structure" />
<ref role="1M2myG" to="2c95:2HzhasNytLD" resolve="Invisble" />
<ref role="1M2myG" to="2c95:2HzhasNytLD" resolve="Invisible" />
<node concept="EnEH3" id="2HzhasNzuac" role="1MhHOB">
<ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
<node concept="Eqf_E" id="2HzhasNzuad" role="EtsB7">
Expand Down Expand Up @@ -1431,10 +1429,6 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="627_yy34G1E">
<property role="3GE5qa" value="modelContent" />
<ref role="1M2myG" to="2c95:627_yy34G14" resolve="AbstractModelContentParagraph" />
</node>
<node concept="1M2fIO" id="627_yy34G1F">
<property role="3GE5qa" value="modelContent" />
<ref role="1M2myG" to="2c95:627_yy34G1o" resolve="NodeModelContentRemoval" />
Expand Down Expand Up @@ -1527,22 +1521,6 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="2i$odZByCaR">
<property role="3GE5qa" value="config" />
<ref role="1M2myG" to="2c95:5JlMPDXMgjR" resolve="DefaultImagePath" />
<node concept="EnEH3" id="2i$odZByCaS" role="1MhHOB">
<ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
<node concept="QB0g5" id="2i$odZByCaT" role="QCWH9">
<node concept="3clFbS" id="2i$odZByCaU" role="2VODD2">
<node concept="3clFbF" id="2i$odZByCi1" role="3cqZAp">
<node concept="3clFbT" id="2i$odZByCi0" role="3clFbG">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1M2fIO" id="2T4ELtZQGZ">
<property role="3GE5qa" value="words" />
<ref role="1M2myG" to="2c95:2T4ELtZGU8" resolve="DocRefWord" />
Expand Down
Loading

0 comments on commit 5efe184

Please sign in to comment.