diff --git a/CHANGELOG.md b/CHANGELOG.md
index 615711684..eb0ba152b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
+## March 2024
+
+### Added
+
+- com.mbeddr.mpsutil.grammarcells: Read-only model accessory cells can now also be used in places where constant cells are supported.
+
## February 2024
### Added
diff --git a/build.gradle b/build.gradle
index d328cd962..3a757fff7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -342,6 +342,8 @@ task packageExtensions(type: Zip, dependsOn: run_tests) {
archiveBaseName = 'de.itemis.mps.extensions'
from artifactsDir
include 'de.itemis.mps.extensions/**'
+ //remove workaround which is required for mbeddr.platform build
+ exclude 'de.itemis.mps.extensions/MPS.ThirdParty.jar'
}
task cleanMps(type: Delete) {
diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml
index e1e53bec5..07f68beee 100644
--- a/code/.mps/modules.xml
+++ b/code/.mps/modules.xml
@@ -192,6 +192,7 @@
+
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps
index 9984d08f5..994b56c4e 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps
@@ -77,9 +77,6 @@
-
-
-
@@ -3265,9 +3262,19 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index fc264e906..6d1e2ff32 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -1,11 +1,13 @@
+
+
@@ -42,6 +44,9 @@
+
+
+
@@ -111,6 +116,9 @@
+
+
+
@@ -168,6 +176,7 @@
+
@@ -193,6 +202,10 @@
+
+
+
+
@@ -200,6 +213,7 @@
+
@@ -929,8 +943,9 @@
-
-
+
+
+
@@ -953,6 +968,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -15477,17 +15518,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -15879,6 +15976,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -20895,6 +21039,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -21124,6 +21278,9 @@
+
+
+
diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
index c9495cba0..2016a289f 100644
--- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
+++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps
@@ -3934,5 +3934,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
index 4e8f015d8..a7d57818c 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
@@ -17,6 +17,9 @@
+
+
+
@@ -112,12 +115,19 @@
+
+
+
+
+
+
+
@@ -128,6 +138,7 @@
+
@@ -2908,5 +2919,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
index 7926c7fc2..f9de828f6 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
@@ -1059,5 +1059,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
index a2fa43ea9..a4fa8b6e3 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
@@ -1,12 +1,13 @@
+
-
+
@@ -49,6 +50,7 @@
+
@@ -56,12 +58,13 @@
+
-
+
@@ -531,7 +534,6 @@
-
@@ -850,6 +852,7 @@
+
@@ -1082,14 +1085,14 @@
-
+
-
+
-
+
@@ -1302,14 +1305,14 @@
-
+
-
+
-
+
@@ -1392,14 +1395,14 @@
-
+
-
+
-
+
@@ -1905,7 +1908,7 @@
-
+
@@ -1915,9 +1918,9 @@
-
+
-
+
@@ -5158,6 +5161,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8983,8 +9000,8 @@
-
+
@@ -9312,7 +9329,7 @@
-
+
@@ -9331,7 +9348,7 @@
-
+
@@ -9390,7 +9407,7 @@
-
+
@@ -9401,7 +9418,7 @@
-
+
@@ -9546,9 +9563,9 @@
-
+
-
+
@@ -9600,7 +9617,7 @@
-
+
@@ -9611,7 +9628,7 @@
-
+
@@ -9642,7 +9659,7 @@
-
+
@@ -10017,7 +10034,7 @@
-
+
@@ -10033,7 +10050,7 @@
-
+
@@ -10159,7 +10176,7 @@
-
+
@@ -10181,7 +10198,7 @@
-
+
@@ -10305,10 +10322,10 @@
-
+
-
+
@@ -12896,14 +12913,14 @@
-
+
-
+
-
+
@@ -12948,14 +12965,14 @@
-
+
-
+
-
+
@@ -13117,14 +13134,14 @@
-
+
-
+
-
+
@@ -13169,14 +13186,14 @@
-
+
-
+
-
+
@@ -13250,7 +13267,6 @@
-
@@ -13291,14 +13307,14 @@
-
+
-
+
-
+
@@ -13322,14 +13338,14 @@
-
+
-
+
-
+
@@ -13534,14 +13550,14 @@
-
+
-
+
-
+
@@ -15776,7 +15792,6 @@
-
@@ -15894,10 +15909,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -16393,6 +16424,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -18214,14 +18262,14 @@
-
+
-
+
-
+
@@ -19727,6 +19775,13 @@
+
+
+
+
+
+
+
@@ -19807,7 +19862,6 @@
-
@@ -19877,8 +19931,8 @@
-
-
+
+
@@ -21260,15 +21314,15 @@
-
+
-
+
-
+
@@ -21276,6 +21330,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21564,15 +21667,15 @@
-
+
-
+
-
+
@@ -21859,6 +21962,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21974,30 +22095,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -22083,8 +22188,8 @@
-
-
+
+
@@ -22875,14 +22980,14 @@
-
+
-
+
-
+
@@ -23346,7 +23451,7 @@
-
+
@@ -23360,9 +23465,9 @@
-
+
-
+
@@ -23403,7 +23508,7 @@
-
+
@@ -23417,9 +23522,9 @@
-
+
-
+
@@ -23474,7 +23579,7 @@
-
+
@@ -23488,9 +23593,9 @@
-
+
-
+
@@ -23515,7 +23620,7 @@
-
+
@@ -23529,9 +23634,9 @@
-
+
-
+
@@ -24206,7 +24311,7 @@
-
+
@@ -24220,9 +24325,9 @@
-
+
-
+
@@ -24273,7 +24378,7 @@
-
+
@@ -24287,9 +24392,9 @@
-
+
-
+
@@ -30028,5 +30133,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps
index c6ddf4b72..f1d2d48b0 100644
--- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps
+++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps
@@ -570,24 +570,36 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps
index f3976431e..5135bb154 100644
--- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps
+++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps
@@ -58,6 +58,7 @@
+
@@ -282,6 +283,9 @@
+
+
+
@@ -4147,5 +4151,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd
index c276069f0..61181aed4 100644
--- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd
+++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd
@@ -1,5 +1,5 @@
-
+
@@ -7,12 +7,18 @@
-
-
+
+
+
+
+
+
+
+
- 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
+ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
diff --git a/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps b/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps
new file mode 100644
index 000000000..ff5b152e4
--- /dev/null
+++ b/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
new file mode 100644
index 000000000..ba53b4e73
--- /dev/null
+++ b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)
+
+
+
+
+
+
+
+
+
+
+
+