merge from dev

koka-lang · Jul 3, 2023 · 0649baa · 0649baa
2 parents b167030 + 3360ddf
commit 0649baa
Show file tree

Hide file tree

Showing 238 changed files with 15,400 additions and 6,280 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,9 @@ package-lock.json
 test.kk
 *.pdb
 *.pdn
+*.vcxproj.user
+*.vcxproj.interactive
+*.
 *~
 *.exe
 *.vsix

diff --git a/doc/spec/book.kk.md b/doc/spec/book.kk.md
@@ -25,10 +25,16 @@ body {
   .colored
 }
 
-~bar          : before='|'
-~many         : before='{ ' after=' }'
-~opt          : before='[ ' after=' ]'
-
+bar: [|]{padding:0ex 0.25ex}
+
+~many         : before='{ '; after=' }'
+~manyn        : before='{ '; after=' }~_n_~'
+~manyx        : before='{ '; after=' }'
+~opt          : before='[ '; after=' ]'
+~diff {
+  before: '~[<!]{padding-right:0.5ex}';
+  after : '>~'
+}
 
 [koka-logo]: images/koka-logo-filled.png { max-height: 120px; padding:1rem 1rem 1rem 1.5rem; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,9 @@ package-lock.json @@
     test.kk
     *.pdb
     *.pdn
+    *.vcxproj.user
+    *.vcxproj.interactive
+    *.
     *~
     *.exe
     *.vsix
@@ Expand Down @@