@kensnzk/koyu 0.15.0 → 0.17.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.
- package/README.ja.md +14 -10
- package/README.md +16 -13
- package/dist/cli.js +162 -84
- package/dist/cli.js.map +1 -1
- package/dist/core/derive.d.ts +264 -0
- package/dist/core/derive.d.ts.map +1 -0
- package/dist/core/derive.js +576 -0
- package/dist/core/derive.js.map +1 -0
- package/dist/{check.d.ts → core/diagnose.d.ts} +15 -15
- package/dist/core/diagnose.d.ts.map +1 -0
- package/dist/{check.js → core/diagnose.js} +269 -223
- package/dist/core/diagnose.js.map +1 -0
- package/dist/{diff.d.ts → core/diff.d.ts} +3 -2
- package/dist/core/diff.d.ts.map +1 -0
- package/dist/{diff.js → core/diff.js} +89 -43
- package/dist/core/diff.js.map +1 -0
- package/dist/{fabric.d.ts → core/fabric.d.ts} +5 -3
- package/dist/core/fabric.d.ts.map +1 -0
- package/dist/{fabric.js → core/fabric.js} +12 -11
- package/dist/core/fabric.js.map +1 -0
- package/dist/{graph.d.ts → core/graph.d.ts} +2 -4
- package/dist/core/graph.d.ts.map +1 -0
- package/dist/{graph.js → core/graph.js} +53 -54
- package/dist/core/graph.js.map +1 -0
- package/dist/core/light.d.ts +24 -0
- package/dist/core/light.d.ts.map +1 -0
- package/dist/{light.js → core/light.js} +17 -12
- package/dist/core/light.js.map +1 -0
- package/dist/{model.d.ts → core/model.d.ts} +178 -18
- package/dist/core/model.d.ts.map +1 -0
- package/dist/{model.js → core/model.js} +307 -68
- package/dist/core/model.js.map +1 -0
- package/dist/core/parse.d.ts.map +1 -0
- package/dist/{parse.js → core/parse.js} +546 -133
- package/dist/core/parse.js.map +1 -0
- package/dist/{poly.d.ts → core/poly.d.ts} +3 -6
- package/dist/core/poly.d.ts.map +1 -0
- package/dist/{poly.js → core/poly.js} +8 -13
- package/dist/core/poly.js.map +1 -0
- package/dist/core/site.d.ts.map +1 -0
- package/dist/{site.js → core/site.js} +2 -2
- package/dist/core/site.js.map +1 -0
- package/dist/core/tolerance.d.ts +26 -0
- package/dist/core/tolerance.d.ts.map +1 -0
- package/dist/core/tolerance.js +48 -0
- package/dist/core/tolerance.js.map +1 -0
- package/dist/{vertical.d.ts → core/vertical.d.ts} +48 -12
- package/dist/core/vertical.d.ts.map +1 -0
- package/dist/{vertical.js → core/vertical.js} +53 -105
- package/dist/core/vertical.js.map +1 -0
- package/dist/core/vocabulary.d.ts +40 -0
- package/dist/core/vocabulary.d.ts.map +1 -0
- package/dist/core/vocabulary.js +176 -0
- package/dist/core/vocabulary.js.map +1 -0
- package/dist/{axo.d.ts → draw/axo.d.ts} +1 -1
- package/dist/draw/axo.d.ts.map +1 -0
- package/dist/{axo.js → draw/axo.js} +53 -81
- package/dist/draw/axo.js.map +1 -0
- package/dist/draw/index.d.ts +3 -0
- package/dist/draw/index.d.ts.map +1 -0
- package/dist/draw/index.js +11 -0
- package/dist/draw/index.js.map +1 -0
- package/dist/draw/plan.d.ts +10 -0
- package/dist/draw/plan.d.ts.map +1 -0
- package/dist/draw/plan.js +284 -0
- package/dist/draw/plan.js.map +1 -0
- package/dist/index.d.ts +16 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +55 -12
- package/dist/index.js.map +1 -1
- package/dist/mcp.js +112 -50
- package/dist/mcp.js.map +1 -1
- package/dist/parse-file.d.ts +1 -1
- package/dist/parse-file.d.ts.map +1 -1
- package/dist/parse-file.js +19 -4
- package/dist/parse-file.js.map +1 -1
- package/dist/validate/access.d.ts +6 -0
- package/dist/validate/access.d.ts.map +1 -0
- package/dist/validate/access.js +248 -0
- package/dist/validate/access.js.map +1 -0
- package/dist/validate/envelope.d.ts +4 -0
- package/dist/validate/envelope.d.ts.map +1 -0
- package/dist/validate/envelope.js +55 -0
- package/dist/validate/envelope.js.map +1 -0
- package/dist/validate/index.d.ts +60 -0
- package/dist/validate/index.d.ts.map +1 -0
- package/dist/validate/index.js +77 -0
- package/dist/validate/index.js.map +1 -0
- package/dist/validate/light.d.ts +6 -0
- package/dist/validate/light.d.ts.map +1 -0
- package/dist/validate/light.js +28 -0
- package/dist/validate/light.js.map +1 -0
- package/dist/validate/runs.d.ts +16 -0
- package/dist/validate/runs.d.ts.map +1 -0
- package/dist/validate/runs.js +60 -0
- package/dist/validate/runs.js.map +1 -0
- package/dist/validate/site.d.ts +6 -0
- package/dist/validate/site.d.ts.map +1 -0
- package/dist/validate/site.js +63 -0
- package/dist/validate/site.js.map +1 -0
- package/editors/vscode/.vscodeignore +2 -0
- package/editors/vscode/README.md +28 -0
- package/editors/vscode/extension.js +150 -0
- package/editors/vscode/language-configuration.json +19 -0
- package/editors/vscode/package.json +57 -0
- package/editors/vscode/syntaxes/koyu.tmLanguage.json +226 -0
- package/examples/basement/main.muro +3 -3
- package/examples/complex/main.muro +1 -1
- package/examples/complex/podium.muro +1 -1
- package/examples/complex/site.muro +6 -6
- package/examples/house/L2.muro +1 -1
- package/examples/house/main.muro +2 -2
- package/examples/house/site.muro +4 -4
- package/examples/house.muro +7 -7
- package/examples/mansion.muro +3 -3
- package/examples/office.muro +4 -4
- package/examples/steps/01-one-room.muro +1 -1
- package/examples/steps/02-two-rooms.muro +1 -1
- package/examples/steps/03-door.muro +1 -1
- package/examples/steps/04-exterior.muro +2 -2
- package/examples/steps/05-two-storeys.muro +2 -2
- package/examples/steps/06-finished.muro +3 -3
- package/examples/tower/L2.muro +1 -1
- package/examples/tower/main.muro +1 -1
- package/examples/tower/site.muro +4 -4
- package/examples/twin/main.muro +2 -2
- package/examples/twin/podium.muro +4 -4
- package/examples/twin/site.muro +8 -8
- package/examples/two-rooms.canonical.json +6 -4
- package/examples/two-rooms.muro +3 -3
- package/package.json +18 -3
- package/src/cli.ts +173 -83
- package/src/core/derive.ts +869 -0
- package/src/{check.ts → core/diagnose.ts} +313 -235
- package/src/{diff.ts → core/diff.ts} +91 -43
- package/src/{fabric.ts → core/fabric.ts} +22 -12
- package/src/{graph.ts → core/graph.ts} +64 -63
- package/src/core/light.ts +69 -0
- package/src/{model.ts → core/model.ts} +361 -74
- package/src/{parse.ts → core/parse.ts} +618 -135
- package/src/{poly.ts → core/poly.ts} +8 -16
- package/src/{site.ts → core/site.ts} +2 -2
- package/src/core/tolerance.ts +55 -0
- package/src/{vertical.ts → core/vertical.ts} +73 -116
- package/src/core/vocabulary.ts +210 -0
- package/src/{axo.ts → draw/axo.ts} +51 -94
- package/src/draw/index.ts +11 -0
- package/src/draw/plan.ts +344 -0
- package/src/index.ts +201 -34
- package/src/mcp.ts +119 -50
- package/src/parse-file.ts +19 -5
- package/src/validate/access.ts +291 -0
- package/src/validate/envelope.ts +59 -0
- package/src/validate/index.ts +107 -0
- package/src/validate/light.ts +43 -0
- package/src/validate/runs.ts +87 -0
- package/src/validate/site.ts +84 -0
- package/dist/axo.d.ts.map +0 -1
- package/dist/axo.js.map +0 -1
- package/dist/check.d.ts.map +0 -1
- package/dist/check.js.map +0 -1
- package/dist/diff.d.ts.map +0 -1
- package/dist/diff.js.map +0 -1
- package/dist/fabric.d.ts.map +0 -1
- package/dist/fabric.js.map +0 -1
- package/dist/graph.d.ts.map +0 -1
- package/dist/graph.js.map +0 -1
- package/dist/light.d.ts +0 -15
- package/dist/light.d.ts.map +0 -1
- package/dist/light.js.map +0 -1
- package/dist/model.d.ts.map +0 -1
- package/dist/model.js.map +0 -1
- package/dist/parse.d.ts.map +0 -1
- package/dist/parse.js.map +0 -1
- package/dist/plan.d.ts +0 -10
- package/dist/plan.d.ts.map +0 -1
- package/dist/plan.js +0 -354
- package/dist/plan.js.map +0 -1
- package/dist/poly.d.ts.map +0 -1
- package/dist/poly.js.map +0 -1
- package/dist/site.d.ts.map +0 -1
- package/dist/site.js.map +0 -1
- package/dist/vertical.d.ts.map +0 -1
- package/dist/vertical.js.map +0 -1
- package/src/light.ts +0 -63
- package/src/plan.ts +0 -472
- /package/dist/{parse.d.ts → core/parse.d.ts} +0 -0
- /package/dist/{site.d.ts → core/site.d.ts} +0 -0
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type Model } from "../core/model.js";
|
|
2
|
+
import { type Finding } from "./index.js";
|
|
3
|
+
/** 接道長の下限 mm — 法43条 (接道義務) の粗い写し */
|
|
4
|
+
export declare const FRONTAGE_MIN = 2000;
|
|
5
|
+
export declare function siteFindings(model: Model): Finding[];
|
|
6
|
+
//# sourceMappingURL=site.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"AAYA,OAAO,EAA2D,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvG,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAMnD,oCAAoC;AACpC,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE,CA4DpD"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
// 検証 — 敷地に対する建物の判断 (ADR-0009 / ADR-0011)
|
|
2
|
+
//
|
|
3
|
+
// 敷地形状そのものの健全性 (重複頂点・自己交差・対応ゾーンの不在) は **core に残る** —
|
|
4
|
+
// 与件が壊れていれば形が作れないので、あれは読解の一部である。
|
|
5
|
+
//
|
|
6
|
+
// ここが持つのは建物と敷地の**関係についての判断**の二つだけ:
|
|
7
|
+
// - 建物が敷地からはみ出していないか (形は一意に出る。出た形が法に触れるかは別の話)
|
|
8
|
+
// - 測量値として書かれた面積と、多角形から導出される面積が食い違わないか
|
|
9
|
+
//
|
|
10
|
+
// 建蔽率・容積率は**数**なので core の siteReport が返す。上限と較べるのは、
|
|
11
|
+
// 用途地域という原本の外の事実を要するので、ここでも持たない — 持てるようになったら足す。
|
|
12
|
+
import { isOutside, polygonAreaM2, regionOf, shapeEscapesPolygon } from "../core/model.js";
|
|
13
|
+
import { siteReport } from "../core/site.js";
|
|
14
|
+
import { finding } from "./index.js";
|
|
15
|
+
/** 敷地の許容 mm — 境界上は内側扱い */
|
|
16
|
+
const EPS_SITE = 1;
|
|
17
|
+
/** 面積照合の許容 ㎡ */
|
|
18
|
+
const AREA_TOLERANCE = 0.05;
|
|
19
|
+
/** 接道長の下限 mm — 法43条 (接道義務) の粗い写し */
|
|
20
|
+
export const FRONTAGE_MIN = 2000;
|
|
21
|
+
export function siteFindings(model) {
|
|
22
|
+
const out = [];
|
|
23
|
+
const withRect = [...model.spaces.values()].filter((s) => s.rects.length > 0);
|
|
24
|
+
// 接道 — core が返すのは接道長という数だけで、2m という下限は建築の側の規則である。
|
|
25
|
+
//
|
|
26
|
+
// **敷地が宣言されていなければ問わない。**接道長は「敷地と道路が共有する境界の長さ」なので、
|
|
27
|
+
// site:1 のゾーンが無い模型では 0 が導かれるが、それは「接道が無い」ではなく
|
|
28
|
+
// 「導けていない」である。地下の断面だけを書いた例のように、道路は書くが敷地は書かない
|
|
29
|
+
// 模型は現にある — 導けていない数に線を引くと、書いていないことが違反になる。
|
|
30
|
+
const report = siteReport(model);
|
|
31
|
+
for (const road of report.siteZone ? report.roads : []) {
|
|
32
|
+
if (road.frontage >= FRONTAGE_MIN)
|
|
33
|
+
continue;
|
|
34
|
+
out.push(finding("site.frontage", `Road frontage is too short: ${road.road.path} — ${road.frontage}mm (needs at least ${FRONTAGE_MIN}mm)`, { line: road.road.line, file: road.road.file, path: [road.road.path] }));
|
|
35
|
+
}
|
|
36
|
+
for (const poly of model.polygons.values()) {
|
|
37
|
+
const zone = model.zones.get(poly.path);
|
|
38
|
+
// 形の健全性と対応ゾーンの不在は core が既に言っている — ここでは黙って飛ばす
|
|
39
|
+
if (!zone || zone.attrs["site"] !== 1)
|
|
40
|
+
continue;
|
|
41
|
+
const declared = zone.attrs["area"];
|
|
42
|
+
if (typeof declared === "number") {
|
|
43
|
+
const derived = polygonAreaM2(poly.points);
|
|
44
|
+
if (Math.abs(declared - derived) >= AREA_TOLERANCE) {
|
|
45
|
+
out.push(finding("site.area", `Declared and derived site areas disagree: declared ${declared} m2 / derived ${derived.toFixed(2)} m2`, { line: zone.line, file: zone.file, path: [zone.path] }));
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
for (const s of withRect) {
|
|
49
|
+
if (isOutside(s) || s.path.startsWith(poly.path + "/"))
|
|
50
|
+
continue;
|
|
51
|
+
// 照合するのは割付ではなく**導出された領域** — 敷地なりに切った外形はここで通る
|
|
52
|
+
for (const r of regionOf(s)) {
|
|
53
|
+
const esc = shapeEscapesPolygon(r, poly.points, EPS_SITE);
|
|
54
|
+
if (esc) {
|
|
55
|
+
out.push(finding("site.escape", `${s.path} escapes the site shape (near ${Math.round(esc.x)},${Math.round(esc.y)})`, { line: s.line, file: s.file, path: [s.path] }));
|
|
56
|
+
break;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return out;
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=site.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../src/validate/site.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
# koyu — VS Code 拡張
|
|
2
|
+
|
|
3
|
+
`.muro` (建築をテキストで書く記法 [koyu](https://github.com/kensnzk/koyu)) に色を付け、保存のたびに `koyu check` を走らせて診断を問題パネルに出す。
|
|
4
|
+
|
|
5
|
+
- **色** — `syntaxes/koyu.tmLanguage.json`。Shiki (Docusaurus) と共有する唯一の文法である。
|
|
6
|
+
- **赤** — `koyu check --json` を呼んで写すだけ。この拡張はパーサも規則も持たない ([ADR-0031](../../docs/decisions/0031-editor-support.md))。
|
|
7
|
+
|
|
8
|
+
台帳の★ (ツールが解釈する属性 — [spec/vocabulary.md](../../spec/vocabulary.md)) と自由な `k:v` は色が分かれる。
|
|
9
|
+
|
|
10
|
+
## 入れる
|
|
11
|
+
|
|
12
|
+
```sh
|
|
13
|
+
ln -s "$PWD/editors/vscode" ~/.vscode/extensions/koyu
|
|
14
|
+
```
|
|
15
|
+
|
|
16
|
+
ビルドは無い。VS Code を再起動すれば効く。手順の全体と設定は [guide/howto/editor.md](../../guide/howto/editor.md)。
|
|
17
|
+
|
|
18
|
+
## 設定
|
|
19
|
+
|
|
20
|
+
| 設定 | 既定 | 意味 |
|
|
21
|
+
|---|---|---|
|
|
22
|
+
| `koyu.check.enabled` | `true` | 保存時と開いたときに check を走らせる |
|
|
23
|
+
| `koyu.cliPath` | `""` | CLI の場所。空なら `node_modules/.bin/koyu` → `dist/cli.js` → PATH の順に探す |
|
|
24
|
+
| `koyu.entry` | `""` | 合成の起点。空なら同じディレクトリの `main.muro`、無ければ開いているファイル自身 |
|
|
25
|
+
|
|
26
|
+
## 直すとき
|
|
27
|
+
|
|
28
|
+
語の一覧は文法と実装の二箇所にあり、`test/grammar.test.ts` が一致を縛っている。行頭の語を足したら `src/parse.ts` と文法の両方を直す — 片方だけでは `npm test` が落ちる。
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
// koyu の VS Code 拡張 — 色は文法 (syntaxes/) が、赤は CLI が持つ (ADR-0031)。
|
|
2
|
+
// ここは翻訳しかしない: `koyu check --json` の Diagnostic[] を VS Code の診断に写す。
|
|
3
|
+
// パーサも規則もこの拡張には無い — 門番は一つである (掟1)。
|
|
4
|
+
// 依存ゼロ・ビルド無しの素の CommonJS。
|
|
5
|
+
|
|
6
|
+
const vscode = require("vscode");
|
|
7
|
+
const cp = require("node:child_process");
|
|
8
|
+
const fs = require("node:fs");
|
|
9
|
+
const path = require("node:path");
|
|
10
|
+
|
|
11
|
+
/** entry ごとに、前回どの URI へ診断を置いたか (次の実行で消すため) */
|
|
12
|
+
const owned = new Map();
|
|
13
|
+
let collection;
|
|
14
|
+
let output;
|
|
15
|
+
let warnedMissingCli = false;
|
|
16
|
+
|
|
17
|
+
function activate(context) {
|
|
18
|
+
collection = vscode.languages.createDiagnosticCollection("koyu");
|
|
19
|
+
output = vscode.window.createOutputChannel("koyu");
|
|
20
|
+
context.subscriptions.push(collection, output);
|
|
21
|
+
|
|
22
|
+
context.subscriptions.push(
|
|
23
|
+
vscode.commands.registerCommand("koyu.check", () => {
|
|
24
|
+
const doc = vscode.window.activeTextEditor?.document;
|
|
25
|
+
if (doc) runCheck(doc, true);
|
|
26
|
+
}),
|
|
27
|
+
vscode.workspace.onDidSaveTextDocument((doc) => runCheck(doc)),
|
|
28
|
+
vscode.workspace.onDidOpenTextDocument((doc) => runCheck(doc)),
|
|
29
|
+
vscode.workspace.onDidCloseTextDocument((doc) => {
|
|
30
|
+
if (doc.languageId === "koyu" && doc.uri.scheme === "file") collection.delete(doc.uri);
|
|
31
|
+
}),
|
|
32
|
+
);
|
|
33
|
+
|
|
34
|
+
for (const doc of vscode.workspace.textDocuments) runCheck(doc);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function deactivate() {
|
|
38
|
+
owned.clear();
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** 開いている層から、合成の起点 (entry) を決める */
|
|
42
|
+
function resolveEntry(docPath) {
|
|
43
|
+
const configured = vscode.workspace.getConfiguration("koyu").get("entry", "").trim();
|
|
44
|
+
if (configured) {
|
|
45
|
+
if (path.isAbsolute(configured)) return configured;
|
|
46
|
+
const root = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
|
|
47
|
+
if (root) return path.resolve(root, configured);
|
|
48
|
+
return path.resolve(path.dirname(docPath), configured);
|
|
49
|
+
}
|
|
50
|
+
// 層を単体で check すると grid も level も見えない — 同じディレクトリの main.muro を起点にする
|
|
51
|
+
const main = path.join(path.dirname(docPath), "main.muro");
|
|
52
|
+
if (path.basename(docPath) !== "main.muro" && fs.existsSync(main)) return main;
|
|
53
|
+
return docPath;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** CLI の場所。設定 → ワークスペースの node_modules/.bin → 開発中の dist/cli.js → PATH */
|
|
57
|
+
function resolveCli(fromDir) {
|
|
58
|
+
const configured = vscode.workspace.getConfiguration("koyu").get("cliPath", "").trim();
|
|
59
|
+
if (configured) {
|
|
60
|
+
return configured.endsWith(".js")
|
|
61
|
+
? { command: process.execPath, args: [configured] }
|
|
62
|
+
: { command: configured, args: [] };
|
|
63
|
+
}
|
|
64
|
+
let dir = fromDir;
|
|
65
|
+
for (;;) {
|
|
66
|
+
const bin = path.join(dir, "node_modules", ".bin", "koyu");
|
|
67
|
+
if (fs.existsSync(bin)) return { command: bin, args: [] };
|
|
68
|
+
const built = path.join(dir, "dist", "cli.js");
|
|
69
|
+
if (fs.existsSync(built) && fs.existsSync(path.join(dir, "src", "parse.ts"))) {
|
|
70
|
+
return { command: process.execPath, args: [built] };
|
|
71
|
+
}
|
|
72
|
+
const up = path.dirname(dir);
|
|
73
|
+
if (up === dir) break;
|
|
74
|
+
dir = up;
|
|
75
|
+
}
|
|
76
|
+
return { command: "koyu", args: [] };
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
function runCheck(doc, force = false) {
|
|
80
|
+
if (doc.languageId !== "koyu" || doc.uri.scheme !== "file") return;
|
|
81
|
+
if (!force && !vscode.workspace.getConfiguration("koyu").get("check.enabled", true)) return;
|
|
82
|
+
|
|
83
|
+
const entry = resolveEntry(doc.uri.fsPath);
|
|
84
|
+
const cwd = path.dirname(entry);
|
|
85
|
+
const { command, args } = resolveCli(cwd);
|
|
86
|
+
|
|
87
|
+
cp.execFile(
|
|
88
|
+
command,
|
|
89
|
+
[...args, "check", entry, "--json"],
|
|
90
|
+
{ cwd, timeout: 60_000, maxBuffer: 32 * 1024 * 1024 },
|
|
91
|
+
(err, stdout, stderr) => {
|
|
92
|
+
if (err && err.code === "ENOENT") return reportMissingCli(command);
|
|
93
|
+
let diags;
|
|
94
|
+
try {
|
|
95
|
+
diags = JSON.parse(stdout);
|
|
96
|
+
} catch {
|
|
97
|
+
// 終了コード2 (使い方) や想定外の落ち方 — 黙って緑にしない
|
|
98
|
+
output.appendLine(`koyu check ${entry}`);
|
|
99
|
+
output.appendLine(String(stderr || err?.message || stdout).trim());
|
|
100
|
+
vscode.window.setStatusBarMessage("koyu: check が走りませんでした (出力パネル: koyu)", 5000);
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
apply(entry, diags);
|
|
104
|
+
},
|
|
105
|
+
);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** Diagnostic[] を、出所 (file) ごとに VS Code の診断へ写す */
|
|
109
|
+
function apply(entry, diags) {
|
|
110
|
+
const byFile = new Map();
|
|
111
|
+
for (const d of diags) {
|
|
112
|
+
// 位置を持たない診断 (モデル全体に関わるもの) は entry の1行目に置く
|
|
113
|
+
const file = d.file ? path.resolve(path.dirname(entry), d.file) : entry;
|
|
114
|
+
const line = Math.max(0, (d.line ?? 1) - 1);
|
|
115
|
+
const diag = new vscode.Diagnostic(
|
|
116
|
+
new vscode.Range(line, 0, line, Number.MAX_SAFE_INTEGER),
|
|
117
|
+
d.message,
|
|
118
|
+
d.severity === "warning"
|
|
119
|
+
? vscode.DiagnosticSeverity.Warning
|
|
120
|
+
: vscode.DiagnosticSeverity.Error,
|
|
121
|
+
);
|
|
122
|
+
diag.code = d.code;
|
|
123
|
+
diag.source = "koyu";
|
|
124
|
+
if (d.path?.length) diag.message = `${d.message} [${d.path.join(" | ")}]`;
|
|
125
|
+
if (!byFile.has(file)) byFile.set(file, []);
|
|
126
|
+
byFile.get(file).push(diag);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
// 前回この entry が置いた診断のうち、今回消えたものを取り下げる
|
|
130
|
+
for (const file of owned.get(entry) ?? []) {
|
|
131
|
+
if (!byFile.has(file)) collection.delete(vscode.Uri.file(file));
|
|
132
|
+
}
|
|
133
|
+
for (const [file, list] of byFile) collection.set(vscode.Uri.file(file), list);
|
|
134
|
+
owned.set(entry, [...byFile.keys()]);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
function reportMissingCli(command) {
|
|
138
|
+
if (warnedMissingCli) return;
|
|
139
|
+
warnedMissingCli = true;
|
|
140
|
+
vscode.window
|
|
141
|
+
.showWarningMessage(
|
|
142
|
+
`koyu CLI が見つかりません (${command})。色は出ますが、整合の検査は走りません。`,
|
|
143
|
+
"設定を開く",
|
|
144
|
+
)
|
|
145
|
+
.then((pick) => {
|
|
146
|
+
if (pick) vscode.commands.executeCommand("workbench.action.openSettings", "koyu.cliPath");
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
module.exports = { activate, deactivate };
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
{
|
|
2
|
+
"comments": {
|
|
3
|
+
"lineComment": "#"
|
|
4
|
+
},
|
|
5
|
+
"brackets": [],
|
|
6
|
+
"autoClosingPairs": [{ "open": "\"", "close": "\"" }],
|
|
7
|
+
"surroundingPairs": [{ "open": "\"", "close": "\"" }],
|
|
8
|
+
"wordPattern": "(\\/[^\\s#\"]+)|([A-Za-z_][A-Za-z0-9_.+-]*)|(-?[0-9]+(?:\\.[0-9]+)?)",
|
|
9
|
+
"indentationRules": {
|
|
10
|
+
"increaseIndentPattern": "^(boundary|band)\\b.*$",
|
|
11
|
+
"decreaseIndentPattern": "^(?!\\s).*$"
|
|
12
|
+
},
|
|
13
|
+
"onEnterRules": [
|
|
14
|
+
{
|
|
15
|
+
"beforeText": "^(boundary|band)\\b.*$",
|
|
16
|
+
"action": { "indent": "indent" }
|
|
17
|
+
}
|
|
18
|
+
]
|
|
19
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "koyu",
|
|
3
|
+
"displayName": "koyu (.muro)",
|
|
4
|
+
"description": "空間を一次要素とするテキストネイティブ建築記述 — 色と、門番 (check) をエディタに",
|
|
5
|
+
"version": "0.1.0",
|
|
6
|
+
"publisher": "kensnzk",
|
|
7
|
+
"license": "Apache-2.0",
|
|
8
|
+
"engines": { "vscode": "^1.75.0" },
|
|
9
|
+
"categories": ["Programming Languages", "Linters"],
|
|
10
|
+
"keywords": ["koyu", "muro", "architecture", "BIM", "DSL"],
|
|
11
|
+
"repository": { "type": "git", "url": "git+https://github.com/kensnzk/koyu.git" },
|
|
12
|
+
"main": "./extension.js",
|
|
13
|
+
"activationEvents": ["onLanguage:koyu"],
|
|
14
|
+
"contributes": {
|
|
15
|
+
"languages": [
|
|
16
|
+
{
|
|
17
|
+
"id": "koyu",
|
|
18
|
+
"aliases": ["koyu", "muro"],
|
|
19
|
+
"extensions": [".muro"],
|
|
20
|
+
"configuration": "./language-configuration.json"
|
|
21
|
+
}
|
|
22
|
+
],
|
|
23
|
+
"grammars": [
|
|
24
|
+
{
|
|
25
|
+
"language": "koyu",
|
|
26
|
+
"scopeName": "source.koyu",
|
|
27
|
+
"path": "./syntaxes/koyu.tmLanguage.json"
|
|
28
|
+
}
|
|
29
|
+
],
|
|
30
|
+
"commands": [
|
|
31
|
+
{
|
|
32
|
+
"command": "koyu.check",
|
|
33
|
+
"title": "koyu: 整合を確かめる (check)"
|
|
34
|
+
}
|
|
35
|
+
],
|
|
36
|
+
"configuration": {
|
|
37
|
+
"title": "koyu",
|
|
38
|
+
"properties": {
|
|
39
|
+
"koyu.check.enabled": {
|
|
40
|
+
"type": "boolean",
|
|
41
|
+
"default": true,
|
|
42
|
+
"description": "保存時と開いたときに koyu check を走らせ、診断を問題パネルに出す。"
|
|
43
|
+
},
|
|
44
|
+
"koyu.cliPath": {
|
|
45
|
+
"type": "string",
|
|
46
|
+
"default": "",
|
|
47
|
+
"description": "koyu CLI の場所。空なら node_modules/.bin/koyu → dist/cli.js → PATH の koyu の順に探す。"
|
|
48
|
+
},
|
|
49
|
+
"koyu.entry": {
|
|
50
|
+
"type": "string",
|
|
51
|
+
"default": "",
|
|
52
|
+
"description": "合成の起点となる .muro (ワークスペースからの相対)。空なら、開いている層と同じディレクトリの main.muro があればそれを、無ければ開いている層そのものを起点にする。"
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
|
|
3
|
+
"name": "koyu",
|
|
4
|
+
"scopeName": "source.koyu",
|
|
5
|
+
"fileTypes": ["muro"],
|
|
6
|
+
"information_for_contributors": [
|
|
7
|
+
"koyu (.muro) の TextMate 文法。VS Code と Shiki (Docusaurus) が同じこの一枚を読む — ADR-0031。",
|
|
8
|
+
"語彙は spec/vocabulary.md の台帳が契約であり、この文法はその写しである。",
|
|
9
|
+
"test/grammar.test.ts が src/parse.ts の語と台帳の★に対する一致を検査する — 手で足すときは台帳を先に直す。"
|
|
10
|
+
],
|
|
11
|
+
"patterns": [
|
|
12
|
+
{ "include": "#string" },
|
|
13
|
+
{ "include": "#comment" },
|
|
14
|
+
{ "include": "#line-version" },
|
|
15
|
+
{ "include": "#line-unit" },
|
|
16
|
+
{ "include": "#line-name" },
|
|
17
|
+
{ "include": "#line-import" },
|
|
18
|
+
{ "include": "#line-asset" },
|
|
19
|
+
{ "include": "#line-grid" },
|
|
20
|
+
{ "include": "#line-level" },
|
|
21
|
+
{ "include": "#line-stack" },
|
|
22
|
+
{ "include": "#line-band" },
|
|
23
|
+
{ "include": "#line-boundary" },
|
|
24
|
+
{ "include": "#line-zone" },
|
|
25
|
+
{ "include": "#line-polygon" },
|
|
26
|
+
{ "include": "#keyword-edit" },
|
|
27
|
+
{ "include": "#line-space" },
|
|
28
|
+
{ "include": "#line-opening" },
|
|
29
|
+
{ "include": "#keyword-child" },
|
|
30
|
+
{ "include": "#keyword-directive" },
|
|
31
|
+
{ "include": "#path" },
|
|
32
|
+
{ "include": "#attr-ledger" },
|
|
33
|
+
{ "include": "#attr-free" },
|
|
34
|
+
{ "include": "#gridref" },
|
|
35
|
+
{ "include": "#range" },
|
|
36
|
+
{ "include": "#union" },
|
|
37
|
+
{ "include": "#number" }
|
|
38
|
+
],
|
|
39
|
+
"repository": {
|
|
40
|
+
"string": {
|
|
41
|
+
"comment": "引用符の中は空白も # も保たれる (tokenize) — コメントより先に食う",
|
|
42
|
+
"name": "string.quoted.double.koyu",
|
|
43
|
+
"begin": "\"",
|
|
44
|
+
"end": "\"",
|
|
45
|
+
"patterns": [{ "match": "." }]
|
|
46
|
+
},
|
|
47
|
+
"comment": {
|
|
48
|
+
"comment": "引用符の外の # 以降は行末までコメント",
|
|
49
|
+
"match": "#.*$",
|
|
50
|
+
"name": "comment.line.number-sign.koyu"
|
|
51
|
+
},
|
|
52
|
+
"line-version": {
|
|
53
|
+
"match": "^(koyu)[ \\t]+([0-9][0-9.]*)",
|
|
54
|
+
"captures": {
|
|
55
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
56
|
+
"2": { "name": "constant.numeric.version.koyu" }
|
|
57
|
+
}
|
|
58
|
+
},
|
|
59
|
+
"line-unit": {
|
|
60
|
+
"match": "^(unit)[ \\t]+([^\\s#]+)",
|
|
61
|
+
"captures": {
|
|
62
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
63
|
+
"2": { "name": "constant.language.koyu" }
|
|
64
|
+
}
|
|
65
|
+
},
|
|
66
|
+
"line-name": {
|
|
67
|
+
"comment": "建物の名 — 行の残りが自由語 (日本語可)",
|
|
68
|
+
"match": "^(name)[ \\t]+([^#\\n]*)",
|
|
69
|
+
"captures": {
|
|
70
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
71
|
+
"2": { "name": "string.unquoted.koyu" }
|
|
72
|
+
}
|
|
73
|
+
},
|
|
74
|
+
"line-import": {
|
|
75
|
+
"match": "^(import)[ \\t]+([^\\s#]+)",
|
|
76
|
+
"captures": {
|
|
77
|
+
"1": { "name": "keyword.control.import.koyu" },
|
|
78
|
+
"2": { "name": "string.unquoted.path.koyu" }
|
|
79
|
+
}
|
|
80
|
+
},
|
|
81
|
+
"line-asset": {
|
|
82
|
+
"comment": "asset <名> door|window ...",
|
|
83
|
+
"match": "^(asset)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)[ \\t]+(door|window)\\b",
|
|
84
|
+
"captures": {
|
|
85
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
86
|
+
"2": { "name": "entity.name.function.asset.koyu" },
|
|
87
|
+
"3": { "name": "support.type.koyu" }
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
"line-grid": {
|
|
91
|
+
"match": "^(grid)[ \\t]+([XY])\\b",
|
|
92
|
+
"captures": {
|
|
93
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
94
|
+
"2": { "name": "constant.language.axis.koyu" }
|
|
95
|
+
}
|
|
96
|
+
},
|
|
97
|
+
"line-level": {
|
|
98
|
+
"comment": "level <名|等差範囲> <z> ... — 名はモデル全体の参照子",
|
|
99
|
+
"match": "^(level)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)",
|
|
100
|
+
"captures": {
|
|
101
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
102
|
+
"2": { "name": "entity.name.type.level.koyu" }
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
"line-stack": {
|
|
106
|
+
"match": "^(stack)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)",
|
|
107
|
+
"captures": {
|
|
108
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
109
|
+
"2": { "name": "entity.name.function.stack.koyu" }
|
|
110
|
+
}
|
|
111
|
+
},
|
|
112
|
+
"line-band": {
|
|
113
|
+
"match": "^(band)[ \\t]+([XY])\\b",
|
|
114
|
+
"captures": {
|
|
115
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
116
|
+
"2": { "name": "constant.language.axis.koyu" }
|
|
117
|
+
}
|
|
118
|
+
},
|
|
119
|
+
"line-boundary": {
|
|
120
|
+
"comment": "boundary <パス> <パス> — 壁は物ではなく二つの空間の関係である",
|
|
121
|
+
"match": "^(boundary)[ \\t]+(/[^\\s#\"]+)[ \\t]+(/[^\\s#\"]+)",
|
|
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" }
|
|
126
|
+
}
|
|
127
|
+
},
|
|
128
|
+
"line-zone": {
|
|
129
|
+
"match": "^(zone)[ \\t]+(/[^\\s#\"]+)",
|
|
130
|
+
"captures": {
|
|
131
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
132
|
+
"2": { "name": "entity.name.type.path.koyu" }
|
|
133
|
+
}
|
|
134
|
+
},
|
|
135
|
+
"line-polygon": {
|
|
136
|
+
"match": "^(polygon)[ \\t]+(/[^\\s#\"]+)",
|
|
137
|
+
"captures": {
|
|
138
|
+
"1": { "name": "keyword.control.directive.koyu" },
|
|
139
|
+
"2": { "name": "entity.name.type.path.koyu" }
|
|
140
|
+
}
|
|
141
|
+
},
|
|
142
|
+
"line-space": {
|
|
143
|
+
"comment": "space <パス> <型> ... — 字下げした space は帯 (band) の要素。型は開かれた語彙",
|
|
144
|
+
"match": "^([ \\t]*)(space)[ \\t]+(/[^\\s#\"]+)(?:[ \\t]+(?![^\\s#\"]*:)([^\\s#]+))?",
|
|
145
|
+
"captures": {
|
|
146
|
+
"2": { "name": "keyword.control.directive.koyu" },
|
|
147
|
+
"3": { "name": "entity.name.type.path.koyu" },
|
|
148
|
+
"4": { "name": "support.type.koyu" }
|
|
149
|
+
}
|
|
150
|
+
},
|
|
151
|
+
"line-opening": {
|
|
152
|
+
"comment": "door/window の第1トークンが k:v でなければアセット参照 (ADR-0010)",
|
|
153
|
+
"match": "^([ \\t]+)(door|window)[ \\t]+(?![^\\s#\"]*:)([^\\s#]+)",
|
|
154
|
+
"captures": {
|
|
155
|
+
"2": { "name": "keyword.other.child.koyu" },
|
|
156
|
+
"3": { "name": "entity.name.function.asset.koyu" }
|
|
157
|
+
}
|
|
158
|
+
},
|
|
159
|
+
"keyword-child": {
|
|
160
|
+
"comment": "字下げして書く語 — src/core/parse.ts の indented 分岐。+ / - / = は over の下の集合編集 (ADR-0035)",
|
|
161
|
+
"match": "^[ \\t]+(door|window|seg|line|area|space)\\b",
|
|
162
|
+
"captures": { "1": { "name": "keyword.other.child.koyu" } }
|
|
163
|
+
},
|
|
164
|
+
"keyword-edit": {
|
|
165
|
+
"comment": "over の下の集合編集 — + 追加 / - 削除 / = 置換 (ADR-0035)",
|
|
166
|
+
"match": "^[ \\t]+([+=-])(?=[ \\t])",
|
|
167
|
+
"captures": { "1": { "name": "keyword.operator.edit.koyu" } }
|
|
168
|
+
},
|
|
169
|
+
"keyword-directive": {
|
|
170
|
+
"comment": "行頭に書く語 — src/core/parse.ts の switch (head)",
|
|
171
|
+
"match": "^(koyu|import|over|drop|asset|polygon|name|unit|grid|level|column|band|space|boundary|zone|stack)\\b",
|
|
172
|
+
"captures": { "1": { "name": "keyword.control.directive.koyu" } }
|
|
173
|
+
},
|
|
174
|
+
"path": {
|
|
175
|
+
"comment": "空間・ゾーンのパス — /L1/a /out /L2..L9/A",
|
|
176
|
+
"match": "(?:^|[ \\t])(/[^\\s#\"]*)",
|
|
177
|
+
"captures": { "1": { "name": "entity.name.type.path.koyu" } }
|
|
178
|
+
},
|
|
179
|
+
"attr-ledger": {
|
|
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
|
+
"match": "\\b(underground|escalator|daylight|ceiling|landing|outside|hinge|level|riser|slope|stair|style|swing|tread|pitch|entry|lane|lift|form|road|slab|site|area|turn|type|edge|name|ramp|void|uid|air|use|at|h|w|t|d|x|y)(:)",
|
|
182
|
+
"captures": {
|
|
183
|
+
"1": { "name": "entity.other.attribute-name.koyu" },
|
|
184
|
+
"2": { "name": "punctuation.separator.key-value.koyu" }
|
|
185
|
+
}
|
|
186
|
+
},
|
|
187
|
+
"attr-free": {
|
|
188
|
+
"comment": "台帳に無い k:v — 運ばれるが解釈されない (規則2・3)",
|
|
189
|
+
"match": "\\b([A-Za-z_][A-Za-z0-9_-]*)(:)",
|
|
190
|
+
"captures": {
|
|
191
|
+
"1": { "name": "variable.other.property.koyu" },
|
|
192
|
+
"2": { "name": "punctuation.separator.key-value.koyu" }
|
|
193
|
+
}
|
|
194
|
+
},
|
|
195
|
+
"gridref": {
|
|
196
|
+
"comment": "通り芯参照とオフセット — X2 / X2+600 / X1..X2 / X1+3200..X2+3200",
|
|
197
|
+
"match": "\\b([XY][0-9]+)((?:[+-][0-9]+)?)(?:(\\.\\.)([XY][0-9]+)((?:[+-][0-9]+)?))?",
|
|
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" }
|
|
204
|
+
}
|
|
205
|
+
},
|
|
206
|
+
"range": {
|
|
207
|
+
"comment": "レベルの範囲 — B2..L5 L14..L19",
|
|
208
|
+
"match": "\\b([A-Za-z][A-Za-z0-9_]*)(\\.\\.)([A-Za-z][A-Za-z0-9_]*)\\b",
|
|
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" }
|
|
213
|
+
}
|
|
214
|
+
},
|
|
215
|
+
"union": {
|
|
216
|
+
"comment": "領域の合併 — L字は矩形を + でつなぐ",
|
|
217
|
+
"match": "(?<=[ \\t])\\+(?=[ \\t])",
|
|
218
|
+
"name": "keyword.operator.union.koyu"
|
|
219
|
+
},
|
|
220
|
+
"number": {
|
|
221
|
+
"comment": "長さはmm、面積は㎡、比率は0..1。名の中の数字 (南区画01) は数値ではないので、前後が区切りのときだけ採る",
|
|
222
|
+
"match": "(?<![^\\s,:])-?[0-9]+(?:\\.[0-9]+)?(?![^\\s,#])",
|
|
223
|
+
"name": "constant.numeric.koyu"
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
# * 地下は level の underground:1 という宣言。zの負値からは推定しない (ADR-0022)。
|
|
12
12
|
# * 土に接する壁は spec 語彙 (spec:RC土圧壁)。境界の型は増やさない — 物の名は spec である。
|
|
13
13
|
|
|
14
|
-
koyu
|
|
14
|
+
koyu 1.1
|
|
15
15
|
name 地下駐車場 — 縦動線の最小例
|
|
16
16
|
unit mm
|
|
17
17
|
|
|
@@ -48,8 +48,8 @@ boundary /B2..B1/st /B2..B1/mech t:250 spec:RC
|
|
|
48
48
|
boundary /B2..B1/ev /B2..B1/mech t:250 spec:RC
|
|
49
49
|
|
|
50
50
|
# 外周は土。物の名は spec 語彙が運ぶ (境界の型を増やさない)
|
|
51
|
-
space /out
|
|
52
|
-
space /road
|
|
51
|
+
space /out name:外部 outside:1
|
|
52
|
+
space /road road:12000 name:前面道路 outside:1
|
|
53
53
|
|
|
54
54
|
boundary /B2..B1/park /out edge:W t:500 spec:RC土圧壁
|
|
55
55
|
boundary /B2..B1/park /out edge:S t:500 spec:RC土圧壁
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
# 吹抜けは**床の不在**である。区画の扉を吹抜けに開くと、そこは床の無い所なので出られない。
|
|
14
14
|
# 西列の区画は回廊に面させ、回廊がモールへ回り込む — 吹抜けの縁は手すりになる
|
|
15
15
|
space /L2..L5/wgal corridor X2..X2+2400 Y1..Y6 + X2+2400..X3 Y2..Y2+3600 name:西回廊 use:common floor:石張り
|
|
16
|
-
space /L2..L5/atrium
|
|
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
17
|
space /L2..L5/mall corridor X3..X8 Y2..Y2+3600 name:モール use:common floor:石張り
|
|
18
18
|
space /L2..L5/north backyard X4..X7 Y5..Y6 name:北側サービス use:common
|
|
19
19
|
space /L2..L5/bohW backyard X3..X4 Y4-3200..Y6 name:バックヤード西 use:common
|
|
@@ -6,12 +6,12 @@
|
|
|
6
6
|
zone /site name:敷地 site:1
|
|
7
7
|
polygon /site -6000,-8000 26000,-8000 34000,-11000 64000,-11000 68000,-5000 68000,22000 60000,34000 44000,48000 6000,48000 -6000,28000
|
|
8
8
|
|
|
9
|
-
space /out
|
|
10
|
-
space /road-s
|
|
11
|
-
space /road-e
|
|
12
|
-
space /site/walk
|
|
13
|
-
space /site/plaza
|
|
14
|
-
space /site/east
|
|
9
|
+
space /out name:外部 outside:1
|
|
10
|
+
space /road-s road:22000 name:南側道路 outside:1
|
|
11
|
+
space /road-e road:16000 name:東側道路 outside:1
|
|
12
|
+
space /site/walk X1..X8 Y1-6000..Y1 level:L1 name:歩道状空地 outside:1
|
|
13
|
+
space /site/plaza X1-4000..X1 Y1..Y6 level:L1 name:西側広場 outside:1
|
|
14
|
+
space /site/east X8..X8+6000 Y1..Y6 level:L1 name:東側歩道状空地 outside:1
|
|
15
15
|
|
|
16
16
|
# 接道は「敷地と道路が接する長さ」— 建物の外壁が道路に面していても接道ではない
|
|
17
17
|
boundary /site/walk /road-s edge:S type:open
|
package/examples/house/L2.muro
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# 2階の層 — 上階の外壁は方角別のexteriorに面する。
|
|
2
2
|
|
|
3
3
|
space /home/bed1 bedroom X1..X2 Y1..Y3 level:L2 name:主寝室 daylight:1
|
|
4
|
-
space /home/void
|
|
4
|
+
space /home/void X2..X3 Y1..Y2 level:L2 name:リビング上部 void:1
|
|
5
5
|
space /home/hall2 hall X2..X3 Y2..Y3 level:L2 name:2階ホール
|
|
6
6
|
|
|
7
7
|
boundary /home/bed1 /out/road edge:S t:150 spec:EW
|
package/examples/house/main.muro
CHANGED
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
# 合成時にコンフリクト (パス・アセット・グリッドの重複) が検査され、一棟としてビルドされる。
|
|
5
5
|
# koyu check examples/house/main.muro がそのビルドの門番になる。
|
|
6
6
|
|
|
7
|
-
koyu
|
|
7
|
+
koyu 1.1
|
|
8
8
|
name 小さな戸建住宅
|
|
9
9
|
unit mm
|
|
10
10
|
|
|
11
11
|
grid X 0 3640 7280
|
|
12
12
|
grid Y 0 3640 7280
|
|
13
13
|
|
|
14
|
-
level L1 0 h:2400
|
|
14
|
+
level L1 0 h:2400 slab:400
|
|
15
15
|
level L2 2900 h:2400 slab:500
|
|
16
16
|
level R 5800 slab:500
|
|
17
17
|
|