Merge pull request #67 from YDX-2147483647/cron

Author: YDX-2147483647

README.en.md

@@ -149,7 +149,7 @@ A simple typst example.
 
   🙈 hidden from the source, but still 🚀 executed in preview.
 
-- Lines starting with `<<<`:
+- Lines starting with `<<< `:
 
   👀 shown as the source, but 🛑 not executed in the preview.
 
@@ -171,6 +171,8 @@ As a result:
 
   For example, the default `text.cjk-latin-spacing` is typically `auto`, but here it is `none`.
 
+- The styles for headings etc. are affected by the global style of the document.
+
 - …
 
 If you require advanced features or 100% accuracy, please write a page example instead.
@@ -196,7 +198,7 @@ A standalone typst example compiled in a page.
 ````
 `````
 
-The meanings of `<<<` and `>>>` are the same as those in simple examples.
+The meanings of `<<< ` and `>>>` are the same as those in simple examples.
 
 #### Bibliography examples (`example-bib`)
 

README.md

@@ -148,7 +148,7 @@ pnpm dev --open # ⇒ http://localhost:3000
 
   🙈 在源代码中隐藏，但仍然 🚀 执行成预览结果。
 
-- `<<<`打头的行：
+- `<<< `打头的行：
 
   👀 显示到源代码，但 🛑 不会执行成预览结果。
 
@@ -170,6 +170,8 @@ simple example 执行于容器中，且会在整篇文档中共享状态。
 
   例如，`text.cjk-latin-spacing`一般默认为`auto`，但这里是`none`。
 
+- 标题等样式会受文档全局样式影响。
+
 - ……
 
 如需高级功能或 100% 准确，请换用 page example。
@@ -195,7 +197,7 @@ simple example 执行于容器中，且会在整篇文档中共享状态。
 ````
 `````
 
-`<<<`与`>>>`的意义与 simple example 相同。
+`<<< `与`>>>`的意义与 simple example 相同。
 
 #### Bibliography examples (`example-bib`)
 

main.typ

@@ -85,6 +85,7 @@
 
 #level.advanced
 #issue("typst#5908")
+#pull("typst#7399", rejected: true)
 
 // Ref: https://www.w3.org/TR/clreq/#writing_modes_in_chinese_composition
 #babel(en: [There are two writing modes in Chinese composition:], zh: [中文有两种行文模式：])
@@ -314,6 +315,47 @@ $ f(x) = y "（定义8）" $
 // This example would emit a warning: variable fonts are not currently supported and may render incorrectly.
 // To avoid receiving the message repeatedly when running `pnpm dev`, we use `example-page` instead of `example`.
 
+=== #bbl(
+  en: [Unable to infer the writing script across elements, making `locl` sometimes ineffective],
+  zh: [无法跨越元素推断文字种类，导致`locl`特性有时失效],
+)
+
+#level.basic
+#issue("typst#7396")
+
+#babel(
+  en: [
+    Typographical rules may have regional differences. For example, when writing Chinese horizontally, #unichar("。") is placed at the _lower left_ corner in the square space in Chinese Mainland, but placed at the _center_ in Taiwan and Hong Kong.
+    Some fonts handle these differences with the #link("https://learn.microsoft.com/typography/opentype/spec/features_ko#tag-locl")[OpenType `locl` (Localized Forms) feature], which requires the text to be properly tagged with both the language system and the writing script.
+    However, typst does not infer the script across elements, making `locl` sometimes ineffective.
+  ],
+  zh: [
+    排版规则可能存在地区差异。例如横排中文时，中国大陆把 #unichar("。") 放在字面的左下角，而港台则放在中央。有些字体使用 #link("https://learn.microsoft.com/typography/opentype/spec/features_ko#tag-locl")[OpenType 特性`locl` (Localized Forms)] 处理这种差异，而这要求文本同时正确标注了语言和文字。然而，typst 不会跨元素推断文字种类，导致`locl`特性有时失效。
+  ],
+)
+
+#babel(
+  en: [
+    In the example below, typst infers the script of the first `。` from its surrounding Han texts, and uses the correct localized glyph. However, typst fails to do so for the second `。`, whose both sides are `ref` elements, and uses the wrong default glyph.
+  ],
+  zh: [
+    在下例中，typst 从相邻汉字推断出了第一个`。`的文字种类，选用了正确的本地化字形；可是未能应对夹在两个`ref`元素中间的第二个`。`，选用了错误的默认字形。
+  ],
+)
+
+```example-page
+#set text(lang: "zh", region: "TW", font: "Noto Serif CJK SC")
+#set heading(numbering: "1")
+<<< #hide[= 何故 <a>]
+>>> #place(hide[= 何故 <a>])
+
+>>> Current: \
+句號。@a。@a
+
+>>> Expected: \
+>>> 句號。小節 1。小節 1
+```
+
 == Context-based shaping and positioning
 
 #prompt(from-w3c: "https://www.w3.org/TR/clreq-gap/#glyphs")[
@@ -679,7 +721,7 @@ $ f(x) = y "（定义8）" $
 
 #babel(
   en: [According to #link("https://www.w3.org/TR/clreq/#prohibition_rules_for_line_start_end")[prohibition rules for line start and line end] (basic), #unichar("·") should not appear at the line start.],
-  zh: [按照#link("https://www.w3.org/TR/clreq/#prohibition_rules_for_line_start_end")[行首行尾禁则]（基本处理），#unichar("·")不能出现在一行的开头。],
+  zh: [按照#link("https://www.w3.org/TR/clreq/#prohibition_rules_for_line_start_end")[行首行尾禁则]（基本处理），#unichar("·") 不能出现在一行的开头。],
 )
 
 ```example
@@ -892,10 +934,10 @@ $ f(x) = y "（定义8）" $
 第二天我起得非常迟，午饭之后，出去看了朋友。
 
 // Expected to be possible:
-<<<#set text(overhang: ("、": 1.0, "，": 1.0, "。": 1.0))
+<<< #set text(overhang: ("、": 1.0, "，": 1.0, "。": 1.0))
 >>> = Expected
 >>> #set par(justify: false)
-<<<第二天我起得非常迟，午饭之后，出去看了朋友。
+<<< 第二天我起得非常迟，午饭之后，出去看了朋友。
 >>> 第二天我起得非常迟，午饭之后，#h(-1em)出去看了朋友。
 ```
 
@@ -1130,8 +1172,8 @@ $ integral f dif x $
 >>> #set box(fill: aqua.lighten(50%))
 >>> Current: \
 >>> // Default: cap-height to baseline.
-<<<Typst 国王 \
-<<<Typst 国王
+<<< Typst 国王 \
+<<< Typst 国王
 >>> #box[Typst 国王] \
 >>> #box[Typst 国王]
 
@@ -1785,6 +1827,7 @@ $ integral f dif x $
 === #bbl(en: [Failed to load some CSL styles], zh: [无法加载某些 CSL 样式])
 
 #level.advanced
+#issue("citationberg#35", closed: true)
 #issue("hayagriva#405")
 #workaround("https://typst-doc-cn.github.io/guide/FAQ/bib-csl.html")
 #workaround("https://typst-doc-cn.github.io/csl-sanitizer/", note: "csl-sanitizer")
@@ -1984,6 +2027,15 @@ $ integral f dif x $
 
 = #bbl(en: [Addendum], zh: [附录])
 
+== #bbl(en: [List of sites], zh: [站点列表])
+
+- #bbl(en: [Main site], zh: [主站]) \
+  #link("https://typst-doc-cn.github.io/clreq/")[typst-doc-cn.github.io/clreq]
+- #bbl(en: [Mirror site], zh: [镜像站]) \
+  #link("https://gap.zhtyp.art")[gap.zhtyp.art]
+- #bbl(en: [Test site], zh: [测试站]) \
+  #link("https://clreq-gap-typst.netlify.app")[clreq-gap-typst.netlify.app]
+
 == #bbl(en: [Environment of the examples], zh: [例子的环境信息])
 
 - #bbl(en: [Update date], zh: [更新日期]) \

typ/show-example.typ

@@ -1,4 +1,3 @@
-#import "@preview/tidy:0.4.3": show-example as tidy-example
 #import "@preview/digestify:0.1.0": bytes-to-hex, md5
 
 #import "templates/html-toolkit.typ": div-frame
@@ -69,6 +68,42 @@
   /// -> any
   body,
 ) = {
+  /// - raw (str): The source of a simple or page example.
+  /// -> dictionary `(displayed, executed)`
+  let parse-example(raw) = {
+    let lines = raw
+      .split("\n")
+      .map(x => if x.starts-with(">>>") {
+        (
+          displayed: none,
+          executed: x.trim(">>>", at: start),
+        )
+      } else if x.starts-with("<<<") {
+        (
+          displayed: if x == "<<<" {
+            "" // Support displaying an empty line
+          } else {
+            // The space after `<<<` is intentional. It is consistent with the official, but different with tidy.
+            assert(
+              x.starts-with("<<< "),
+              message: "this line in the example is ambiguous; consider adding a space after `<<<`:\n" + x,
+            )
+            x.trim("<<< ", at: start)
+          },
+          executed: none,
+        )
+      } else {
+        // Regular lines
+        (displayed: x, executed: x)
+      })
+
+
+    let displayed = lines.map(x => x.displayed).filter(x => x != none).join("\n")
+    let executed = lines.map(x => x.executed).filter(x => x != none).join("\n")
+
+    (displayed: displayed, executed: executed)
+  }
+
   let fix-scaling(it) = {
     // This reverts the default style for `raw`, making the result of `#context 1em.to-absolute()` in simple examples consistent with that in regular documents.
     //
@@ -86,29 +121,29 @@
 
   // Simple example, directly evaluated in main.typ.
   show raw.where(lang: "example"): it => {
-    show: fix-scaling
+    let (displayed, executed) = parse-example(it.text)
+
+    let full-executed = ````typ
+    // Some browsers hide the border. Therefore, the inset is necessary.
+    #show: block.with(inset: 0.5em)
+    {GENERAL-PREAMBLE}
 
-    tidy-example.show-example(
-      raw(it.text, block: true, lang: "typ"),
-      mode: "markup",
-      preamble: ```typ
-      // Some browsers hide the border. Therefore, the inset is necessary.
-      #show: block.with(inset: 0.5em)
-      {GENERAL-PREAMBLE}
-      ```
-        .text
-        .replace("{GENERAL-PREAMBLE}", GENERAL-PREAMBLE)
-        + "\n",
-      layout: layout-example,
+    {executed}
+    ````
+      .text
+      .replace("{GENERAL-PREAMBLE}", GENERAL-PREAMBLE)
+      .replace("{executed}", executed)
+
+    show: fix-scaling
+    layout-example(
+      optional-map(raw.with(block: true, lang: "typ"), displayed),
+      [#eval(full-executed, mode: "markup")],
     )
   }
 
   // Page example, compiled by scripts/compile.ts.
   show raw.where(lang: "example-page"): it => {
-    let lines = it.text.split("\n")
-
-    let displayed = lines.filter(x => not x.starts-with(">>>")).map(x => x.trim("<<<", at: start)).join("\n")
-    let executed = lines.filter(x => not x.starts-with("<<<")).map(x => x.trim(">>>", at: start)).join("\n")
+    let (displayed, executed) = parse-example(it.text)
 
     let full-executed = ````typ
     // Some browsers hide the border. Therefore, the margin is necessary.