@kensnzk/koyu 0.19.0 → 0.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (92) hide show
  1. package/README.ja.md +7 -5
  2. package/README.md +8 -6
  3. package/dist/analysis/contracts.d.ts +11 -1
  4. package/dist/analysis/contracts.d.ts.map +1 -1
  5. package/dist/analysis/contracts.js +11 -1
  6. package/dist/analysis/contracts.js.map +1 -1
  7. package/dist/cli.js +48 -9
  8. package/dist/cli.js.map +1 -1
  9. package/dist/core/diagnose.d.ts +2 -0
  10. package/dist/core/diagnose.d.ts.map +1 -1
  11. package/dist/core/diagnose.js +20 -1
  12. package/dist/core/diagnose.js.map +1 -1
  13. package/dist/core/diff.d.ts.map +1 -1
  14. package/dist/core/diff.js +4 -1
  15. package/dist/core/diff.js.map +1 -1
  16. package/dist/core/model.d.ts +171 -8
  17. package/dist/core/model.d.ts.map +1 -1
  18. package/dist/core/model.js +219 -15
  19. package/dist/core/model.js.map +1 -1
  20. package/dist/core/parse.d.ts.map +1 -1
  21. package/dist/core/parse.js +42 -11
  22. package/dist/core/parse.js.map +1 -1
  23. package/dist/core/vocabulary.d.ts +16 -0
  24. package/dist/core/vocabulary.d.ts.map +1 -1
  25. package/dist/core/vocabulary.js +11 -2
  26. package/dist/core/vocabulary.js.map +1 -1
  27. package/dist/form.d.ts +1 -0
  28. package/dist/form.d.ts.map +1 -1
  29. package/dist/form.js +5 -0
  30. package/dist/form.js.map +1 -1
  31. package/dist/index.d.ts +1 -1
  32. package/dist/index.d.ts.map +1 -1
  33. package/dist/index.js +4 -1
  34. package/dist/index.js.map +1 -1
  35. package/dist/mcp.js +49 -12
  36. package/dist/mcp.js.map +1 -1
  37. package/dist/model.d.ts +1 -1
  38. package/dist/model.d.ts.map +1 -1
  39. package/dist/model.js +1 -1
  40. package/dist/model.js.map +1 -1
  41. package/dist/validate/builtin/access.js +30 -6
  42. package/dist/validate/builtin/access.js.map +1 -1
  43. package/dist/validate/contracts.d.ts +6 -1
  44. package/dist/validate/contracts.d.ts.map +1 -1
  45. package/dist/validate/contracts.js +6 -1
  46. package/dist/validate/contracts.js.map +1 -1
  47. package/editors/vscode/package.json +1 -1
  48. package/editors/vscode/syntaxes/koyu.tmLanguage.json +55 -55
  49. package/examples/basement/main.muro +9 -9
  50. package/examples/complex/L1.muro +22 -22
  51. package/examples/complex/basement.muro +4 -4
  52. package/examples/complex/core.muro +9 -9
  53. package/examples/complex/hotel.muro +14 -14
  54. package/examples/complex/main.muro +1 -1
  55. package/examples/complex/office.muro +3 -3
  56. package/examples/complex/plant.muro +4 -4
  57. package/examples/complex/podium.muro +23 -23
  58. package/examples/house/main.muro +2 -2
  59. package/examples/house.muro +2 -2
  60. package/examples/mansion.muro +27 -27
  61. package/examples/office.muro +16 -16
  62. package/examples/steps/06-finished.muro +1 -1
  63. package/examples/tower/L1.muro +12 -12
  64. package/examples/tower/L11.muro +4 -4
  65. package/examples/tower/L2.muro +10 -10
  66. package/examples/tower/main.muro +1 -1
  67. package/examples/tower/typical.muro +10 -10
  68. package/examples/twin/L1.muro +29 -29
  69. package/examples/twin/L5.muro +14 -14
  70. package/examples/twin/basement.muro +9 -9
  71. package/examples/twin/core.muro +49 -49
  72. package/examples/twin/hotel.muro +15 -15
  73. package/examples/twin/main.muro +1 -1
  74. package/examples/twin/office.muro +10 -10
  75. package/examples/twin/podium.muro +73 -73
  76. package/examples/twin/residence.muro +10 -10
  77. package/examples/two-rooms.canonical.json +2 -2
  78. package/examples/two-rooms.muro +1 -1
  79. package/package.json +17 -2
  80. package/src/analysis/contracts.ts +11 -1
  81. package/src/cli.ts +50 -10
  82. package/src/core/diagnose.ts +24 -1
  83. package/src/core/diff.ts +4 -1
  84. package/src/core/model.ts +231 -15
  85. package/src/core/parse.ts +57 -9
  86. package/src/core/vocabulary.ts +30 -2
  87. package/src/form.ts +13 -0
  88. package/src/index.ts +5 -0
  89. package/src/mcp.ts +56 -12
  90. package/src/model.ts +7 -1
  91. package/src/validate/builtin/access.ts +32 -6
  92. package/src/validate/contracts.ts +6 -1
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
3
- "name": "koyu",
4
- "scopeName": "source.koyu",
3
+ "name": "muro",
4
+ "scopeName": "source.muro",
5
5
  "fileTypes": ["muro"],
6
6
  "information_for_contributors": [
7
7
  "koyu (.muro) の TextMate 文法。VS Code と Shiki (Docusaurus) が同じこの一枚を読む — ADR-0031。",
@@ -39,7 +39,7 @@
39
39
  "repository": {
40
40
  "string": {
41
41
  "comment": "引用符の中は空白も # も保たれる (tokenize) — コメントより先に食う",
42
- "name": "string.quoted.double.koyu",
42
+ "name": "string.quoted.double.muro",
43
43
  "begin": "\"",
44
44
  "end": "\"",
45
45
  "patterns": [{ "match": "." }]
@@ -47,180 +47,180 @@
47
47
  "comment": {
48
48
  "comment": "引用符の外の # 以降は行末までコメント",
49
49
  "match": "#.*$",
50
- "name": "comment.line.number-sign.koyu"
50
+ "name": "comment.line.number-sign.muro"
51
51
  },
52
52
  "line-version": {
53
- "match": "^(koyu)[ \\t]+([0-9][0-9.]*)",
53
+ "match": "^(koyu|muro)[ \\t]+([0-9][0-9.]*)",
54
54
  "captures": {
55
- "1": { "name": "keyword.control.directive.koyu" },
56
- "2": { "name": "constant.numeric.version.koyu" }
55
+ "1": { "name": "keyword.control.directive.muro" },
56
+ "2": { "name": "constant.numeric.version.muro" }
57
57
  }
58
58
  },
59
59
  "line-unit": {
60
60
  "match": "^(unit)[ \\t]+([^\\s#]+)",
61
61
  "captures": {
62
- "1": { "name": "keyword.control.directive.koyu" },
63
- "2": { "name": "constant.language.koyu" }
62
+ "1": { "name": "keyword.control.directive.muro" },
63
+ "2": { "name": "constant.language.muro" }
64
64
  }
65
65
  },
66
66
  "line-name": {
67
67
  "comment": "建物の名 — 行の残りが自由語 (日本語可)",
68
68
  "match": "^(name)[ \\t]+([^#\\n]*)",
69
69
  "captures": {
70
- "1": { "name": "keyword.control.directive.koyu" },
71
- "2": { "name": "string.unquoted.koyu" }
70
+ "1": { "name": "keyword.control.directive.muro" },
71
+ "2": { "name": "string.unquoted.muro" }
72
72
  }
73
73
  },
74
74
  "line-import": {
75
75
  "match": "^(import)[ \\t]+([^\\s#]+)",
76
76
  "captures": {
77
- "1": { "name": "keyword.control.import.koyu" },
78
- "2": { "name": "string.unquoted.path.koyu" }
77
+ "1": { "name": "keyword.control.import.muro" },
78
+ "2": { "name": "string.unquoted.path.muro" }
79
79
  }
80
80
  },
81
81
  "line-asset": {
82
82
  "comment": "asset <名> door|window ...",
83
83
  "match": "^(asset)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)[ \\t]+(door|window)\\b",
84
84
  "captures": {
85
- "1": { "name": "keyword.control.directive.koyu" },
86
- "2": { "name": "entity.name.function.asset.koyu" },
87
- "3": { "name": "support.type.koyu" }
85
+ "1": { "name": "keyword.control.directive.muro" },
86
+ "2": { "name": "entity.name.function.asset.muro" },
87
+ "3": { "name": "support.type.muro" }
88
88
  }
89
89
  },
90
90
  "line-grid": {
91
91
  "match": "^(grid)[ \\t]+([XY])\\b",
92
92
  "captures": {
93
- "1": { "name": "keyword.control.directive.koyu" },
94
- "2": { "name": "constant.language.axis.koyu" }
93
+ "1": { "name": "keyword.control.directive.muro" },
94
+ "2": { "name": "constant.language.axis.muro" }
95
95
  }
96
96
  },
97
97
  "line-level": {
98
98
  "comment": "level <名|等差範囲> <z> ... — 名はモデル全体の参照子",
99
99
  "match": "^(level)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)",
100
100
  "captures": {
101
- "1": { "name": "keyword.control.directive.koyu" },
102
- "2": { "name": "entity.name.type.level.koyu" }
101
+ "1": { "name": "keyword.control.directive.muro" },
102
+ "2": { "name": "entity.name.type.level.muro" }
103
103
  }
104
104
  },
105
105
  "line-stack": {
106
106
  "match": "^(stack)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)",
107
107
  "captures": {
108
- "1": { "name": "keyword.control.directive.koyu" },
109
- "2": { "name": "entity.name.function.stack.koyu" }
108
+ "1": { "name": "keyword.control.directive.muro" },
109
+ "2": { "name": "entity.name.function.stack.muro" }
110
110
  }
111
111
  },
112
112
  "line-band": {
113
113
  "match": "^(band)[ \\t]+([XY])\\b",
114
114
  "captures": {
115
- "1": { "name": "keyword.control.directive.koyu" },
116
- "2": { "name": "constant.language.axis.koyu" }
115
+ "1": { "name": "keyword.control.directive.muro" },
116
+ "2": { "name": "constant.language.axis.muro" }
117
117
  }
118
118
  },
119
119
  "line-boundary": {
120
120
  "comment": "boundary <パス> <パス> — 壁は物ではなく二つの空間の関係である",
121
121
  "match": "^(boundary)[ \\t]+(/[^\\s#\"]+)[ \\t]+(/[^\\s#\"]+)",
122
122
  "captures": {
123
- "1": { "name": "keyword.control.directive.koyu" },
124
- "2": { "name": "entity.name.type.path.koyu" },
125
- "3": { "name": "entity.name.type.path.koyu" }
123
+ "1": { "name": "keyword.control.directive.muro" },
124
+ "2": { "name": "entity.name.type.path.muro" },
125
+ "3": { "name": "entity.name.type.path.muro" }
126
126
  }
127
127
  },
128
128
  "line-zone": {
129
129
  "match": "^(zone)[ \\t]+(/[^\\s#\"]+)",
130
130
  "captures": {
131
- "1": { "name": "keyword.control.directive.koyu" },
132
- "2": { "name": "entity.name.type.path.koyu" }
131
+ "1": { "name": "keyword.control.directive.muro" },
132
+ "2": { "name": "entity.name.type.path.muro" }
133
133
  }
134
134
  },
135
135
  "line-polygon": {
136
136
  "match": "^(polygon)[ \\t]+(/[^\\s#\"]+)",
137
137
  "captures": {
138
- "1": { "name": "keyword.control.directive.koyu" },
139
- "2": { "name": "entity.name.type.path.koyu" }
138
+ "1": { "name": "keyword.control.directive.muro" },
139
+ "2": { "name": "entity.name.type.path.muro" }
140
140
  }
141
141
  },
142
142
  "line-space": {
143
143
  "comment": "space <パス> <型> ... — 字下げした space は帯 (band) の要素。型は開かれた語彙",
144
144
  "match": "^([ \\t]*)(space)[ \\t]+(/[^\\s#\"]+)(?:[ \\t]+(?![^\\s#\"]*:)([^\\s#]+))?",
145
145
  "captures": {
146
- "2": { "name": "keyword.control.directive.koyu" },
147
- "3": { "name": "entity.name.type.path.koyu" },
148
- "4": { "name": "support.type.koyu" }
146
+ "2": { "name": "keyword.control.directive.muro" },
147
+ "3": { "name": "entity.name.type.path.muro" },
148
+ "4": { "name": "support.type.muro" }
149
149
  }
150
150
  },
151
151
  "line-opening": {
152
152
  "comment": "door/window の第1トークンが k:v でなければアセット参照 (ADR-0010)",
153
153
  "match": "^([ \\t]+)(door|window)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)",
154
154
  "captures": {
155
- "2": { "name": "keyword.other.child.koyu" },
156
- "3": { "name": "entity.name.function.asset.koyu" }
155
+ "2": { "name": "keyword.other.child.muro" },
156
+ "3": { "name": "entity.name.function.asset.muro" }
157
157
  }
158
158
  },
159
159
  "keyword-child": {
160
160
  "comment": "字下げして書く語 — src/core/parse.ts の indented 分岐。+ / - / = は over の下の集合編集 (ADR-0035)",
161
161
  "match": "^[ \\t]+(door|window|seg|line|area|space)\\b",
162
- "captures": { "1": { "name": "keyword.other.child.koyu" } }
162
+ "captures": { "1": { "name": "keyword.other.child.muro" } }
163
163
  },
164
164
  "keyword-edit": {
165
165
  "comment": "over の下の集合編集 — + 追加 / - 削除 / = 置換 (ADR-0035)",
166
166
  "match": "^[ \\t]+([+=-])(?=[ \\t])",
167
- "captures": { "1": { "name": "keyword.operator.edit.koyu" } }
167
+ "captures": { "1": { "name": "keyword.operator.edit.muro" } }
168
168
  },
169
169
  "keyword-directive": {
170
170
  "comment": "行頭に書く語 — src/core/parse.ts の switch (head)",
171
- "match": "^(koyu|import|over|drop|asset|polygon|origin|azimuth|name|unit|grid|level|column|band|space|boundary|zone|stack)\\b",
172
- "captures": { "1": { "name": "keyword.control.directive.koyu" } }
171
+ "match": "^(koyu|muro|import|over|drop|asset|polygon|origin|azimuth|name|unit|grid|level|column|band|space|boundary|zone|stack)\\b",
172
+ "captures": { "1": { "name": "keyword.control.directive.muro" } }
173
173
  },
174
174
  "path": {
175
175
  "comment": "空間・ゾーンのパス — /L1/a /out /L2..L9/A",
176
176
  "match": "(?:^|[ \\t])(/[^\\s#\"]*)",
177
- "captures": { "1": { "name": "entity.name.type.path.koyu" } }
177
+ "captures": { "1": { "name": "entity.name.type.path.muro" } }
178
178
  },
179
179
  "attr-ledger": {
180
180
  "comment": "The ledger keys that are not carrier-tier — the attributes the tools act on. ATTR_LEDGER in src/core/vocabulary.ts is the contract; free k:v gets a different colour",
181
181
  "match": "\\b(underground|escalator|elevation|daylight|northing|vertical|ceiling|landing|outside|easting|hinge|level|riser|slope|stair|style|swing|tread|pitch|entry|lane|lift|form|road|slab|site|area|turn|type|edge|name|ramp|void|epsg|uid|air|use|at|h|w|t|d|x|y)(:)",
182
182
  "captures": {
183
- "1": { "name": "entity.other.attribute-name.koyu" },
184
- "2": { "name": "punctuation.separator.key-value.koyu" }
183
+ "1": { "name": "entity.other.attribute-name.muro" },
184
+ "2": { "name": "punctuation.separator.key-value.muro" }
185
185
  }
186
186
  },
187
187
  "attr-free": {
188
188
  "comment": "台帳に無い k:v — 運ばれるが解釈されない (規則2・3)",
189
189
  "match": "\\b([A-Za-z_][A-Za-z0-9_-]*)(:)",
190
190
  "captures": {
191
- "1": { "name": "variable.other.property.koyu" },
192
- "2": { "name": "punctuation.separator.key-value.koyu" }
191
+ "1": { "name": "variable.other.property.muro" },
192
+ "2": { "name": "punctuation.separator.key-value.muro" }
193
193
  }
194
194
  },
195
195
  "gridref": {
196
196
  "comment": "通り芯参照とオフセット — X2 / X2+600 / X1..X2 / X1+3200..X2+3200",
197
197
  "match": "\\b([XY][0-9]+)((?:[+-][0-9]+)?)(?:(\\.\\.)([XY][0-9]+)((?:[+-][0-9]+)?))?",
198
198
  "captures": {
199
- "1": { "name": "constant.language.gridref.koyu" },
200
- "2": { "name": "constant.numeric.offset.koyu" },
201
- "3": { "name": "keyword.operator.range.koyu" },
202
- "4": { "name": "constant.language.gridref.koyu" },
203
- "5": { "name": "constant.numeric.offset.koyu" }
199
+ "1": { "name": "constant.language.gridref.muro" },
200
+ "2": { "name": "constant.numeric.offset.muro" },
201
+ "3": { "name": "keyword.operator.range.muro" },
202
+ "4": { "name": "constant.language.gridref.muro" },
203
+ "5": { "name": "constant.numeric.offset.muro" }
204
204
  }
205
205
  },
206
206
  "range": {
207
207
  "comment": "レベルの範囲 — B2..L5 L14..L19",
208
208
  "match": "\\b([A-Za-z][A-Za-z0-9_]*)(\\.\\.)([A-Za-z][A-Za-z0-9_]*)\\b",
209
209
  "captures": {
210
- "1": { "name": "entity.name.type.level.koyu" },
211
- "2": { "name": "keyword.operator.range.koyu" },
212
- "3": { "name": "entity.name.type.level.koyu" }
210
+ "1": { "name": "entity.name.type.level.muro" },
211
+ "2": { "name": "keyword.operator.range.muro" },
212
+ "3": { "name": "entity.name.type.level.muro" }
213
213
  }
214
214
  },
215
215
  "union": {
216
216
  "comment": "領域の合併 — L字は矩形を + でつなぐ",
217
217
  "match": "(?<=[ \\t])\\+(?=[ \\t])",
218
- "name": "keyword.operator.union.koyu"
218
+ "name": "keyword.operator.union.muro"
219
219
  },
220
220
  "number": {
221
221
  "comment": "長さはmm、面積は㎡、比率は0..1。名の中の数字 (南区画01) は数値ではないので、前後が区切りのときだけ採る",
222
222
  "match": "(?<![^\\s,:])-?[0-9]+(?:\\.[0-9]+)?(?![^\\s,#])",
223
- "name": "constant.numeric.koyu"
223
+ "name": "constant.numeric.muro"
224
224
  }
225
225
  }
226
226
  }
@@ -11,7 +11,7 @@
11
11
  # * 地下は level の underground:1 という宣言。zの負値からは推定しない (ADR-0022)。
12
12
  # * 土に接する壁は spec 語彙 (spec:RC土圧壁)。境界の型は増やさない — 物の名は spec である。
13
13
 
14
- koyu 1.1
14
+ muro 1.3
15
15
  name 地下駐車場 — 縦動線の最小例
16
16
  unit mm
17
17
 
@@ -29,11 +29,11 @@ level R 4900 slab:500
29
29
  column 800 B2..L1
30
30
 
31
31
  # ---- 地下2層 (同じ割付を一度だけ書く) ----
32
- space /B2..B1/park parking X1..X3 Y1..Y3 name:駐車場 use:parking
33
- space /B2..B1/ramp ramp X3..X5 Y1..Y2 name:車路 use:parking ramp:E form:return slope:6
34
- space /B2..B1/st stair X3..X3+2600 Y2..Y2+5400 name:避難階段 use:common stair:N form:return
35
- space /B2..B1/ev shaft X3+2600..X3+5200 Y2..Y2+5400 name:EV use:common lift:1
36
- space /B2..B1/mech machine X3+5200..X5 Y2..Y3 + X3..X3+5200 Y2+5400..Y3 name:機械室 use:common
32
+ space /B2..B1/park parking X1..X3 Y1..Y3 name:駐車場
33
+ space /B2..B1/ramp ramp X3..X5 Y1..Y2 name:車路 ramp:E form:return slope:6
34
+ space /B2..B1/st stair X3..X3+2600 Y2..Y2+5400 name:避難階段 lease.category:common stair:N form:return
35
+ space /B2..B1/ev shaft X3+2600..X3+5200 Y2..Y2+5400 name:EV lease.category:common lift:1
36
+ space /B2..B1/mech machine X3+5200..X5 Y2..Y3 + X3..X3+5200 Y2+5400..Y3 name:機械室 lease.category:common
37
37
 
38
38
  boundary /B2..B1/park /B2..B1/ramp type:open
39
39
  boundary /B2..B1/park /B2..B1/st t:250 spec:RC
@@ -60,9 +60,9 @@ boundary /B2..B1/mech /out edge:N t:500 spec:RC土圧壁
60
60
  boundary /B2..B1/mech /out edge:E t:500 spec:RC土圧壁
61
61
 
62
62
  # ---- 1F: 車路の出口と階段の出口だけ ----
63
- space /L1/ramp parking X3..X5 Y1..Y2 name:車路出口 use:parking
64
- space /L1/st stair X3..X3+2600 Y2..Y2+5400 name:避難階段1F use:common
65
- space /L1/ev shaft X3+2600..X3+5200 Y2..Y2+5400 name:EV use:common lift:1
63
+ space /L1/ramp parking X3..X5 Y1..Y2 name:車路出口
64
+ space /L1/st stair X3..X3+2600 Y2..Y2+5400 name:避難階段1F lease.category:common
65
+ space /L1/ev shaft X3+2600..X3+5200 Y2..Y2+5400 name:EV lease.category:common lift:1
66
66
 
67
67
  boundary /L1/ramp /L1/st t:250 spec:RC
68
68
  door FD1 name:階段防火戸
@@ -8,36 +8,36 @@
8
8
  #
9
9
  # 区画は帯 (band) が割る (ADR-0019)。幅の数字を書き換えれば隣の位置は自動で動く。
10
10
 
11
- space /L1/ramp parking X1..X2 Y1..Y1+7000 name:車路出口 use:parking
12
- space /L1/atrium corridor X2..X2+2400 Y1..Y6 + X2+5600..X3 Y1..Y6 + X2+2400..X2+5600 Y1..Y4 + X2+2400..X2+5600 Y4+12000..Y6 name:貫通通路 use:common floor:石張り
13
- space /L1/mall corridor X3..X8 Y2..Y2+3600 name:モール use:common floor:石張り
14
- space /L1/bohW backyard X3..X4 Y4-3200..Y6 name:バックヤード西 use:common
15
- space /L1/bohE backyard X7..X8 Y4-3200..Y6 name:荷捌き・搬入 use:common
16
- space /L1/north backyard X4..X7 Y5..Y6 name:北側サービス use:common
11
+ space /L1/ramp parking X1..X2 Y1..Y1+7000 name:車路出口
12
+ space /L1/atrium corridor X2..X2+2400 Y1..Y6 + X2+5600..X3 Y1..Y6 + X2+2400..X2+5600 Y1..Y4 + X2+2400..X2+5600 Y4+12000..Y6 name:貫通通路 lease.category:common floor:石張り
13
+ space /L1/mall corridor X3..X8 Y2..Y2+3600 name:モール lease.category:common floor:石張り
14
+ space /L1/bohW backyard X3..X4 Y4-3200..Y6 name:バックヤード西 lease.category:common
15
+ space /L1/bohE backyard X7..X8 Y4-3200..Y6 name:荷捌き・搬入 lease.category:common
16
+ space /L1/north backyard X4..X7 Y5..Y6 name:北側サービス lease.category:common
17
17
  # エスカレーターは吹抜けの中に立つ — 客はモールと貫通通路から乗る。
18
18
  # バックヤードの奥に置くと、平面としては閉じていても客は辿り着けない
19
- space /L1/es escalator X2+2400..X2+5600 Y4..Y4+12000 name:エスカレーター use:common escalator:N
19
+ space /L1/es escalator X2+2400..X2+5600 Y4..Y4+12000 name:エスカレーター lease.category:common escalator:N
20
20
 
21
21
  band Y X1..X2 Y1+7000..Y6
22
- space /L1/w01 shop w:8000 name:西区画01 use:rentable
23
- space /L1/w02 shop w:8000 name:西区画02 use:rentable
24
- space /L1/w03 shop w:8000 name:西区画03 use:rentable
25
- space /L1/w04 shop w:rest name:西区画04 use:rentable
22
+ space /L1/w01 shop w:8000 name:西区画01 lease.category:rentable
23
+ space /L1/w02 shop w:8000 name:西区画02 lease.category:rentable
24
+ space /L1/w03 shop w:8000 name:西区画03 lease.category:rentable
25
+ space /L1/w04 shop w:rest name:西区画04 lease.category:rentable
26
26
 
27
27
  band X X3..X8 Y1..Y2
28
- space /L1/s01 shop w:8000 name:南区画01 use:rentable
29
- space /L1/s02 shop w:8000 name:南区画02 use:rentable
30
- space /L1/s03 shop w:8000 name:南区画03 use:rentable
31
- space /L1/s04 shop w:8000 name:南区画04 use:rentable
32
- space /L1/s05 shop w:rest name:南区画05 use:rentable
28
+ space /L1/s01 shop w:8000 name:南区画01 lease.category:rentable
29
+ space /L1/s02 shop w:8000 name:南区画02 lease.category:rentable
30
+ space /L1/s03 shop w:8000 name:南区画03 lease.category:rentable
31
+ space /L1/s04 shop w:8000 name:南区画04 lease.category:rentable
32
+ space /L1/s05 shop w:rest name:南区画05 lease.category:rentable
33
33
 
34
34
  band X X3..X8 Y2+3600..Y4-3200
35
- space /L1/n01 shop w:8000 name:北区画01 use:rentable
36
- space /L1/n02 shop w:6000 name:北区画02 use:rentable
37
- space /L1/ncorr corridor w:4000 name:北連絡通路 use:common floor:石張り # モールとコアを結ぶ — 避難は他人の区画を通らない
38
- space /L1/n03 shop w:8000 name:北区画03 use:rentable
39
- space /L1/n04 shop w:8000 name:北区画04 use:rentable
40
- space /L1/n05 shop w:rest name:北区画05 use:rentable
35
+ space /L1/n01 shop w:8000 name:北区画01 lease.category:rentable
36
+ space /L1/n02 shop w:6000 name:北区画02 lease.category:rentable
37
+ space /L1/ncorr corridor w:4000 name:北連絡通路 lease.category:common floor:石張り # モールとコアを結ぶ — 避難は他人の区画を通らない
38
+ space /L1/n03 shop w:8000 name:北区画03 lease.category:rentable
39
+ space /L1/n04 shop w:8000 name:北区画04 lease.category:rentable
40
+ space /L1/n05 shop w:rest name:北区画05 lease.category:rentable
41
41
 
42
42
  # ---- 所与の斜め: 隣地境界なりの隅切り ----
43
43
  boundary /L1/w04 /out t:300 spec:カーテンウォール
@@ -5,10 +5,10 @@
5
5
  # 土に接する壁は spec 語彙が運ぶ (spec:RC土圧壁)。境界の型は増やさない — 物の名は spec である。
6
6
  # 採光は daylight:1 を書いた室にしか掛からないので、地下は自動的に判定の外にある。
7
7
 
8
- space /B2..B1/ramp ramp X1..X4 Y1..Y1+7000 name:車路 use:parking ramp:E form:return slope:6
9
- space /B2..B1/park parking X4..X8 Y1..Y1+7000 + X1..X8 Y1+7000..Y4-3200 name:駐車場 use:parking
10
- space /B2..B1/mech machine X1..X4 Y4-3200..Y5 name:機械室 use:common
11
- space /B2..B1/store backyard X7..X8 Y4-3200..Y5 name:荷捌き・倉庫 use:common
8
+ space /B2..B1/ramp ramp X1..X4 Y1..Y1+7000 name:車路 ramp:E form:return slope:6
9
+ space /B2..B1/park parking X4..X8 Y1..Y1+7000 + X1..X8 Y1+7000..Y4-3200 name:駐車場
10
+ space /B2..B1/mech machine X1..X4 Y4-3200..Y5 name:機械室 lease.category:common
11
+ space /B2..B1/store backyard X7..X8 Y4-3200..Y5 name:荷捌き・倉庫 lease.category:common
12
12
 
13
13
  boundary /B2..B1/park /B2..B1/ramp type:open
14
14
  boundary /B2..B1/park /B2..B1/mech t:250 spec:RC
@@ -14,15 +14,15 @@
14
14
  # 基壇では37段、事務所では24段、ホテルでは19段が入る。踏面は300mmに揃い、
15
15
  # 余りが踊り場になる。段数も踏面も踊り場も、ここには書かれていない (ADR-0021)。
16
16
 
17
- space /B2..L19/ps shaft X4..X4+1400 Y4..Y5 name:PS・EPS use:common
18
- space /B2..L19/st1 stair X4+1400..X4+4100 Y4..Y5 name:階段1 use:common stair:N form:return
19
- space /B2..L19/ev1 shaft X4+4100..X4+8900 Y4..Y5 name:EVバンク1 use:common lift:1
20
- space /B2..L19/ev2 shaft X4+8900..X4+13700 Y4..Y5 name:EVバンク2 use:common lift:1
21
- space /B2..L19/wcm service X4+13700..X4+16900 Y4..Y5 name:男子便所 use:common
22
- space /B2..L19/wcw service X4+16900..X4+19900 Y4..Y5 name:女子便所 use:common
23
- space /B2..L19/tea service X4+19900..X4+21300 Y4..Y5 name:給湯室 use:common
24
- space /B2..L19/st2 stair X4+21300..X7 Y4..Y5 name:階段2 use:common stair:N form:return
25
- space /B2..L19/hall corridor X4..X7 Y4-3200..Y4 name:EVホール use:common
17
+ space /B2..L19/ps shaft X4..X4+1400 Y4..Y5 name:PS・EPS lease.category:common
18
+ space /B2..L19/st1 stair X4+1400..X4+4100 Y4..Y5 name:階段1 lease.category:common stair:N form:return
19
+ space /B2..L19/ev1 shaft X4+4100..X4+8900 Y4..Y5 name:EVバンク1 lease.category:common lift:1
20
+ space /B2..L19/ev2 shaft X4+8900..X4+13700 Y4..Y5 name:EVバンク2 lease.category:common lift:1
21
+ space /B2..L19/wcm service X4+13700..X4+16900 Y4..Y5 name:男子便所 lease.category:common
22
+ space /B2..L19/wcw service X4+16900..X4+19900 Y4..Y5 name:女子便所 lease.category:common
23
+ space /B2..L19/tea service X4+19900..X4+21300 Y4..Y5 name:給湯室 lease.category:common
24
+ space /B2..L19/st2 stair X4+21300..X7 Y4..Y5 name:階段2 lease.category:common stair:N form:return
25
+ space /B2..L19/hall corridor X4..X7 Y4-3200..Y4 name:EVホール lease.category:common
26
26
 
27
27
  boundary /B2..L19/hall /B2..L19/ps t:250 spec:RC
28
28
  door w:700 at:0.72 name:PS点検口
@@ -14,26 +14,26 @@
14
14
  # ホテルの客室なら対象外になる。**判断は設計者が書き、処理系はそれに従う。**
15
15
  # (この割付を共同住宅として宣言し直すと、light は 78室中66室の不足を報告する — 実測)
16
16
 
17
- space /L14..L19/corridor corridor X2..X8 Y2+9000..Y4-3200 name:客室廊下 use:common
17
+ space /L14..L19/corridor corridor X2..X8 Y2+9000..Y4-3200 name:客室廊下 lease.category:common
18
18
 
19
19
  band X X2..X8 Y2..Y2+9000
20
- space /L14..L19/r01 room w:6000 name:客室01 use:rentable daylight:0
21
- space /L14..L19/r02 room w:6000 name:客室02 use:rentable daylight:0
22
- space /L14..L19/r03 room w:6000 name:客室03 use:rentable daylight:0
23
- space /L14..L19/r04 room w:6000 name:客室04 use:rentable daylight:0
24
- space /L14..L19/r05 room w:6000 name:客室05 use:rentable daylight:0
25
- space /L14..L19/r06 room w:6000 name:客室06 use:rentable daylight:0
26
- space /L14..L19/r07 room w:6000 name:客室07 use:rentable daylight:0
27
- space /L14..L19/r08 room w:rest name:客室08 use:rentable daylight:0
20
+ space /L14..L19/r01 room w:6000 name:客室01 lease.category:rentable daylight:0
21
+ space /L14..L19/r02 room w:6000 name:客室02 lease.category:rentable daylight:0
22
+ space /L14..L19/r03 room w:6000 name:客室03 lease.category:rentable daylight:0
23
+ space /L14..L19/r04 room w:6000 name:客室04 lease.category:rentable daylight:0
24
+ space /L14..L19/r05 room w:6000 name:客室05 lease.category:rentable daylight:0
25
+ space /L14..L19/r06 room w:6000 name:客室06 lease.category:rentable daylight:0
26
+ space /L14..L19/r07 room w:6000 name:客室07 lease.category:rentable daylight:0
27
+ space /L14..L19/r08 room w:rest name:客室08 lease.category:rentable daylight:0
28
28
 
29
29
  band X X2..X4 Y4-3200..Y5
30
- space /L14..L19/s01 room w:5000 name:スイート01 use:rentable daylight:0
31
- space /L14..L19/s02 room w:5000 name:スイート02 use:rentable daylight:0
32
- space /L14..L19/s03 room w:rest name:スイート03 use:rentable daylight:0
30
+ space /L14..L19/s01 room w:5000 name:スイート01 lease.category:rentable daylight:0
31
+ space /L14..L19/s02 room w:5000 name:スイート02 lease.category:rentable daylight:0
32
+ space /L14..L19/s03 room w:rest name:スイート03 lease.category:rentable daylight:0
33
33
 
34
34
  band X X7..X8 Y4-3200..Y5
35
- space /L14..L19/s04 room w:4000 name:スイート04 use:rentable daylight:0
36
- space /L14..L19/s05 room w:rest name:スイート05 use:rentable daylight:0
35
+ space /L14..L19/s04 room w:4000 name:スイート04 lease.category:rentable daylight:0
36
+ space /L14..L19/s05 room w:rest name:スイート05 lease.category:rentable daylight:0
37
37
 
38
38
  # ---- 客室と廊下 ----
39
39
  boundary /L14..L19/r01 /L14..L19/corridor t:180 spec:戸境RC
@@ -16,7 +16,7 @@
16
16
  # koyu site examples/complex/main.muro 敷地・接道
17
17
  # koyu plan examples/complex/main.muro -l L1 -o out/c-L1.svg
18
18
 
19
- koyu 1.1
19
+ muro 1.3
20
20
  name 特大複合建築 — 商業・事務所・ホテル
21
21
  unit mm
22
22
 
@@ -7,9 +7,9 @@
7
7
  # 事務室に daylight は書かない。法28条1項の採光義務が事務所の居室に無いので、
8
8
  # 1/7 を掛ける意味が無いからである (ADR-0020 — 属性は法概念ではなく判定を名指す)。
9
9
 
10
- space /L7..L13/officeW office X1..X4 Y2..Y5 name:事務室西 use:rentable
11
- space /L7..L13/officeS office X4..X7 Y2..Y4-3200 name:事務室南 use:rentable
12
- space /L7..L13/officeE office X7..X8 Y2..Y5 name:事務室東 use:rentable
10
+ space /L7..L13/officeW office X1..X4 Y2..Y5 name:事務室西 lease.category:rentable
11
+ space /L7..L13/officeS office X4..X7 Y2..Y4-3200 name:事務室南 lease.category:rentable
12
+ space /L7..L13/officeE office X7..X8 Y2..Y5 name:事務室東 lease.category:rentable
13
13
 
14
14
  boundary /L7..L13/officeW /L7..L13/officeS type:open
15
15
  boundary /L7..L13/officeS /L7..L13/officeE type:open
@@ -2,11 +2,11 @@
2
2
  #
3
3
  # 重厚な複合建築の断面には、用途の層と層の間に「使わない階」がある。空調機・受変電・
4
4
  # 受水槽が集まるこの階は、賃貸面積にも居室にも数えられないが、床面積には数えられる。
5
- # use:common がそれを言い、daylight を書かないことで採光の判定からも外れる。
5
+ # lease.category:common がそれを言い、daylight を書かないことで採光の判定からも外れる。
6
6
 
7
- space /L6/ahu machine X1..X4 Y2..Y5 name:空調機械室 use:common
8
- space /L6/elec machine X4..X7 Y2..Y4-3200 name:電気室・受変電 use:common
9
- space /L6/tank machine X7..X8 Y2..Y5 name:受水槽・ポンプ室 use:common
7
+ space /L6/ahu machine X1..X4 Y2..Y5 name:空調機械室 lease.category:common
8
+ space /L6/elec machine X4..X7 Y2..Y4-3200 name:電気室・受変電 lease.category:common
9
+ space /L6/tank machine X7..X8 Y2..Y5 name:受水槽・ポンプ室 lease.category:common
10
10
 
11
11
  boundary /L6/ahu /L6/elec t:250 spec:RC
12
12
  door MD1
@@ -12,39 +12,39 @@
12
12
 
13
13
  # 吹抜けは**床の不在**である。区画の扉を吹抜けに開くと、そこは床の無い所なので出られない。
14
14
  # 西列の区画は回廊に面させ、回廊がモールへ回り込む — 吹抜けの縁は手すりになる
15
- space /L2..L5/wgal corridor X2..X2+2400 Y1..Y6 + X2+2400..X3 Y2..Y2+3600 name:西回廊 use:common floor:石張り
15
+ space /L2..L5/wgal corridor X2..X2+2400 Y1..Y6 + X2+2400..X3 Y2..Y2+3600 name:西回廊 lease.category:common floor:石張り
16
16
  space /L2..L5/atrium X2+2400..X3 Y1..Y2 + X2+2400..X3 Y2+3600..Y4 + X2+5600..X3 Y4..Y4+12000 + X2+2400..X3 Y4+12000..Y6 name:吹抜け void:1
17
- space /L2..L5/mall corridor X3..X8 Y2..Y2+3600 name:モール use:common floor:石張り
18
- space /L2..L5/north backyard X4..X7 Y5..Y6 name:北側サービス use:common
19
- space /L2..L5/bohW backyard X3..X4 Y4-3200..Y6 name:バックヤード西 use:common
20
- space /L2..L5/bohE backyard X7..X8 Y4-3200..Y6 name:バックヤード東 use:common
21
- space /L2..L4/es escalator X2+2400..X2+5600 Y4..Y4+12000 name:エスカレーター use:common escalator:N
22
- space /L5/es corridor X2+2400..X2+5600 Y4..Y4+12000 name:エスカレーター上部 use:common
17
+ space /L2..L5/mall corridor X3..X8 Y2..Y2+3600 name:モール lease.category:common floor:石張り
18
+ space /L2..L5/north backyard X4..X7 Y5..Y6 name:北側サービス lease.category:common
19
+ space /L2..L5/bohW backyard X3..X4 Y4-3200..Y6 name:バックヤード西 lease.category:common
20
+ space /L2..L5/bohE backyard X7..X8 Y4-3200..Y6 name:バックヤード東 lease.category:common
21
+ space /L2..L4/es escalator X2+2400..X2+5600 Y4..Y4+12000 name:エスカレーター lease.category:common escalator:N
22
+ space /L5/es corridor X2+2400..X2+5600 Y4..Y4+12000 name:エスカレーター上部 lease.category:common
23
23
 
24
24
  # ---- 西列: 吹抜けに面する区画 (南→北に5区画) ----
25
25
  band Y X1..X2 Y1..Y6
26
- space /L2..L5/w01 shop w:8000 name:西区画01 use:rentable
27
- space /L2..L5/w02 shop w:8000 name:西区画02 use:rentable
28
- space /L2..L5/w03 shop w:8000 name:西区画03 use:rentable
29
- space /L2..L5/w04 shop w:8000 name:西区画04 use:rentable
30
- space /L2..L5/w05 shop w:rest name:西区画05 use:rentable
26
+ space /L2..L5/w01 shop w:8000 name:西区画01 lease.category:rentable
27
+ space /L2..L5/w02 shop w:8000 name:西区画02 lease.category:rentable
28
+ space /L2..L5/w03 shop w:8000 name:西区画03 lease.category:rentable
29
+ space /L2..L5/w04 shop w:8000 name:西区画04 lease.category:rentable
30
+ space /L2..L5/w05 shop w:rest name:西区画05 lease.category:rentable
31
31
 
32
32
  # ---- モールの南列 (西→東に5区画) ----
33
33
  band X X3..X8 Y1..Y2
34
- space /L2..L5/s01 shop w:8000 name:南区画01 use:rentable
35
- space /L2..L5/s02 shop w:8000 name:南区画02 use:rentable
36
- space /L2..L5/s03 shop w:8000 name:南区画03 use:rentable
37
- space /L2..L5/s04 shop w:8000 name:南区画04 use:rentable
38
- space /L2..L5/s05 shop w:rest name:南区画05 use:rentable
34
+ space /L2..L5/s01 shop w:8000 name:南区画01 lease.category:rentable
35
+ space /L2..L5/s02 shop w:8000 name:南区画02 lease.category:rentable
36
+ space /L2..L5/s03 shop w:8000 name:南区画03 lease.category:rentable
37
+ space /L2..L5/s04 shop w:8000 name:南区画04 lease.category:rentable
38
+ space /L2..L5/s05 shop w:rest name:南区画05 lease.category:rentable
39
39
 
40
40
  # ---- モールの北列 (西→東に5区画) ----
41
41
  band X X3..X8 Y2+3600..Y4-3200
42
- space /L2..L5/n01 shop w:8000 name:北区画01 use:rentable
43
- space /L2..L5/n02 shop w:6000 name:北区画02 use:rentable
44
- space /L2..L5/ncorr corridor w:4000 name:北連絡通路 use:common floor:石張り # モールとコアを結ぶ — 避難は他人の区画を通らない
45
- space /L2..L5/n03 shop w:8000 name:北区画03 use:rentable
46
- space /L2..L5/n04 shop w:8000 name:北区画04 use:rentable
47
- space /L2..L5/n05 shop w:rest name:北区画05 use:rentable
42
+ space /L2..L5/n01 shop w:8000 name:北区画01 lease.category:rentable
43
+ space /L2..L5/n02 shop w:6000 name:北区画02 lease.category:rentable
44
+ space /L2..L5/ncorr corridor w:4000 name:北連絡通路 lease.category:common floor:石張り # モールとコアを結ぶ — 避難は他人の区画を通らない
45
+ space /L2..L5/n03 shop w:8000 name:北区画03 lease.category:rentable
46
+ space /L2..L5/n04 shop w:8000 name:北区画04 lease.category:rentable
47
+ space /L2..L5/n05 shop w:rest name:北区画05 lease.category:rentable
48
48
 
49
49
  # ---- 区画はモールに面して開く (自動ドア) ----
50
50
  boundary /L2..L5/s01 /L2..L5/mall t:120 spec:店舗サッシ
@@ -4,7 +4,7 @@
4
4
  # 合成時にコンフリクト (パス・アセット・グリッドの重複) が検査され、一棟としてビルドされる。
5
5
  # koyu check examples/house/main.muro がそのビルドの門番になる。
6
6
 
7
- koyu 1.1
7
+ muro 1.3
8
8
  name 小さな戸建住宅
9
9
  unit mm
10
10
 
@@ -20,7 +20,7 @@ import ./site.muro
20
20
  import ./L1.muro
21
21
  import ./L2.muro
22
22
 
23
- zone /home name:住戸 use:exclusive
23
+ zone /home name:住戸 lease.category:exclusive
24
24
 
25
25
  # ---- 垂直: 階を跨ぐ関係は base 層が持つ (内部階段と部分吹抜け) ----
26
26
  boundary /home/hall1 /home/hall2 type:stair
@@ -7,7 +7,7 @@
7
7
  # 敷地 = zone site:1 (宣言面積と導出面積を site コマンドが突き合わせる)。
8
8
  # L1の平面図はそのまま配置図兼用になる。
9
9
 
10
- koyu 1.1
10
+ muro 1.3
11
11
  name 小さな戸建住宅
12
12
  unit mm
13
13
 
@@ -31,7 +31,7 @@ space /site/west yard X1-1500..X1 Y1..Y3+1000 level:L1 name:西側通
31
31
  space /site/east yard X3..X3+1500 Y1..Y3+1000 level:L1 name:東側通路
32
32
  space /site/north yard X1..X3 Y3..Y3+1000 level:L1 name:北側通路
33
33
 
34
- zone /home name:住戸 use:exclusive
34
+ zone /home name:住戸 lease.category:exclusive
35
35
 
36
36
  space /home/ldk ldk X1..X2 Y1..Y3 + X2..X3 Y1..Y2 level:L1 name:LDK floor:オーク daylight:1
37
37
  space /home/hall1 hall X2..X3 Y2..Y3 level:L1 name:玄関・階段