MOD Typst ver 0.12

Signed-off-by: Shunsuke Kimura <[email protected]>
kimushun1101 · Nov 2, 2024 · 42746b0 · 42746b0
1 parent 9eec84b
commit 42746b0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 # typst-jp-conf-template
 
-**このソースコードはTypst version 0.11に対応しています．**  
+**このソースコードはTypst version 0.12で作成しました．**  
 Typst で日本語論文を書くときのテンプレートです．
 Typst の概要について知りたい方は，https://github.com/kimushun1101/How-to-use-typst-for-paper-jp をご覧ください．
 

diff --git a/libs/mscs/lib.typ b/libs/mscs/lib.typ
@@ -26,8 +26,7 @@
   )
   set text(size: 10pt, font: mincho)
   // show regex("[0-9a-zA-Z]"): set text(font: "New Computer Modern Math")
-  set par(leading: 0.55em, first-line-indent: 1em, justify: true)
-  show par: set block(spacing: 0.55em)
+  set par(leading: 0.55em, first-line-indent: 1em, justify: true, spacing: 0.55em)
 
   // Configure equation numbering and spacing.
   set math.equation(numbering: "(1)")
@@ -53,9 +52,9 @@
 
   // Configure headings.
   set heading(numbering: "1.")
-  show heading: it => locate(loc => {
+  show heading: it => {
     // Find out the final number of the heading counter.
-    let levels = counter(heading).at(loc)
+    let levels = counter(heading).get()
     let deepest = if levels != () {
       levels.last()
     } else {
@@ -86,7 +85,7 @@
       #it.body
       #v(10pt, weak: true)
     ]
-  })
+  }
 
   // Configure figures.
   show figure.where(kind: table): set figure(placement: top, supplement: [Table])

diff --git a/libs/rengo/lib.typ b/libs/rengo/lib.typ
@@ -26,8 +26,7 @@
   )
   set text(size: 10pt, font: mincho)
   // show regex("[0-9a-zA-Z]"): set text(font: "New Computer Modern Math")
-  set par(leading: 0.55em, first-line-indent: 1em, justify: true)
-  show par: set block(spacing: 0.55em)
+  set par(leading: 0.55em, first-line-indent: 1em, justify: true, spacing: 0.55em)
 
   // Configure equation numbering and spacing.
   set math.equation(numbering: "(1)")
@@ -53,9 +52,9 @@
 
   // Configure headings.
   set heading(numbering: "1.")
-  show heading: it => locate(loc => {
+  show heading: it => {
     // Find out the final number of the heading counter.
-    let levels = counter(heading).at(loc)
+    let levels = counter(heading).get()
     let deepest = if levels != () {
       levels.last()
     } else {
@@ -86,7 +85,7 @@
       #it.body
       #v(10pt, weak: true)
     ]
-  })
+  }
 
   // Configure figures.
   show figure.where(kind: table): set figure(placement: top, supplement: [Table])

diff --git a/libs/rsj-conf/lib.typ b/libs/rsj-conf/lib.typ
@@ -24,8 +24,7 @@
 
   set text(size: 10pt, font: mincho)
   // show regex("[0-9a-zA-Z]"): set text(font: english)
-  set par(leading: 0.55em, first-line-indent: 1em, justify: true)
-  show par: set block(spacing: 0.55em)
+  set par(leading: 0.55em, first-line-indent: 1em, justify: true, spacing: 0.55em)
 
   // Configure equation numbering and spacing.
   set math.equation(numbering: "(1)")
@@ -51,9 +50,9 @@
 
   // Configure headings.
   set heading(numbering: "1.")
-  show heading: it => locate(loc => {
+  show heading: it => {
     // Find out the final number of the heading counter.
-    let levels = counter(heading).at(loc)
+    let levels = counter(heading).get()
     let deepest = if levels != () {
       levels.last()
     } else {
@@ -71,7 +70,7 @@
         h(8pt, weak: true)
       }
       #it.body
-      #v(13.75pt, weak: true)
+      #v(10pt, weak: true)
     ] else [
       // The other level headings are run-ins.
       #set par(first-line-indent: 0pt)
@@ -84,7 +83,7 @@
       #it.body
       #v(10pt, weak: true)
     ]
-  })
+  }
 
   show figure.where(kind: table): set figure(placement: top, supplement: [表])
   show figure.where(kind: table): set figure.caption(position: top, separator: [ ])

diff --git a/main.typ b/main.typ
@@ -36,8 +36,8 @@
 // #import "libs/sourcerer-0.2.1/src/lib.typ": code // 2.3.1 を参照
 
 // 定理環境
-#import "@preview/ctheorems:1.1.2": thmplain, thmproof, thmrules
-// #import "libs/ctheorems-1.1.2/lib.typ": thmplain, thmproof, thmrules  // 2.3.1 を参照
+#import "@preview/ctheorems:1.1.3": thmplain, thmproof, thmrules
+// #import "libs/ctheorems-1.1.3/lib.typ": thmplain, thmproof, thmrules  // 2.3.1 を参照
 #let thmjp = thmplain.with(base: {}, separator: [#h(0.5em)], titlefmt: strong, inset: (top: 0em, left: 0em))
 #let definition = thmjp("definition", text(font: gothic)[定義])
 #let lemma = thmjp("lemma",text(font: gothic)[補題])
@@ -126,8 +126,8 @@ VS Code の拡張機能である Tinymist Typst をインストールすれば
     #import "libs/sourcerer-0.2.1/src/lib.typ": code // 2.3.1 を参照
 
     // 定理環境
-    // #import "@preview/ctheorems:1.1.2": thmplain, thmproof, thmrules
-    #import "libs/ctheorems-1.1.2/lib.typ": thmplain, thmproof, thmrules  // 2.3.1 を参照
+    // #import "@preview/ctheorems:1.1.3": thmplain, thmproof, thmrules
+    #import "libs/ctheorems-1.1.3/lib.typ": thmplain, thmproof, thmrules  // 2.3.1 を参照
   ```
 )
 
@@ -391,7 +391,7 @@ table の columns の数に応じて，文字列の配列が自動的に整列
 #code(
   ```typ
     // Theorem environment
-    #import "@preview/ctheorems:1.1.2": thmplain, thmproof, thmrules
+    #import "@preview/ctheorems:1.1.3": thmplain, thmproof, thmrules
     #let thmjp = thmplain.with(base: {}, separator: [#h(0.5em)], titlefmt: strong, inset: (top: 0em, left: 0em))
     #let definition = thmjp("definition", text(font: gothic)[定義])
     #let lemma = thmjp("lemma",text(font: gothic)[補題])