Skip to content

Commit 49d9b5f

Browse files
authored
Merge branch 'main' into translate-layout/fraction
2 parents d38d848 + 94e3d71 commit 49d9b5f

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

crates/typst-library/src/layout/dir.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ use ecow::EcoString;
33
use crate::foundations::{func, scope, ty, Repr};
44
use crate::layout::{Axis, Side};
55

6-
/// The four directions into which content can be laid out.
6+
/// コンテンツをレイアウトできる4つの向き。
77
///
8-
/// Possible values are:
9-
/// - `{ltr}`: Left to right.
10-
/// - `{rtl}`: Right to left.
11-
/// - `{ttb}`: Top to bottom.
12-
/// - `{btt}`: Bottom to top.
8+
/// 取りうる値は以下の通りです。
9+
/// - `{ltr}`: 左から右。
10+
/// - `{rtl}`: 右から左。
11+
/// - `{ttb}`: 上から下。
12+
/// - `{btt}`: 下から上。
1313
///
14-
/// These values are available globally and
15-
/// also in the direction type's scope, so you can write either of the following
16-
/// two:
14+
/// これらの値はグローバルスコープでも、direction型のスコープでも用いることができます。
15+
/// したがって、以下の2つのどちらでも書くことができます。
1716
/// ```example
1817
/// #stack(dir: rtl)[A][B][C]
1918
/// #stack(dir: direction.rtl)[A][B][C]
@@ -50,8 +49,7 @@ impl Dir {
5049
pub const TTB: Self = Self::TTB;
5150
pub const BTT: Self = Self::BTT;
5251

53-
/// The axis this direction belongs to, either `{"horizontal"}` or
54-
/// `{"vertical"}`.
52+
/// このdirectionが属する軸。`{"horizontal"}`か`{"vertical"}`のいずれかになります。
5553
///
5654
/// ```example
5755
/// #ltr.axis() \
@@ -65,7 +63,7 @@ impl Dir {
6563
}
6664
}
6765

68-
/// The start point of this direction, as an alignment.
66+
/// このdirectionの始点をalignmentとして返します。
6967
///
7068
/// ```example
7169
/// #ltr.start() \
@@ -83,7 +81,7 @@ impl Dir {
8381
}
8482
}
8583

86-
/// The end point of this direction, as an alignment.
84+
/// このdirectionの終点をalignmentとして返します。
8785
///
8886
/// ```example
8987
/// #ltr.end() \
@@ -101,7 +99,7 @@ impl Dir {
10199
}
102100
}
103101

104-
/// The inverse direction.
102+
/// 逆の向き。
105103
///
106104
/// ```example
107105
/// #ltr.inv() \

docs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ fn group_page(
666666
});
667667

668668
let model = PageModel {
669-
route: eco_format!("{parent}{}", group.name),
669+
route: eco_format!("{parent}{}/", group.name),
670670
title: group.title.clone(),
671671
description: eco_format!("Documentation for the {} functions.", group.name),
672672
part: None,

website/translation-status.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"/docs/reference/foundations/auto/": "untranslated",
1919
"/docs/reference/foundations/bool/": "untranslated",
2020
"/docs/reference/foundations/bytes/": "untranslated",
21-
"/docs/reference/foundations/calc": "untranslated",
21+
"/docs/reference/foundations/calc/": "untranslated",
2222
"/docs/reference/foundations/content/": "untranslated",
2323
"/docs/reference/foundations/datetime/": "untranslated",
2424
"/docs/reference/foundations/decimal/": "untranslated",
@@ -38,7 +38,7 @@
3838
"/docs/reference/foundations/selector/": "untranslated",
3939
"/docs/reference/foundations/str/": "untranslated",
4040
"/docs/reference/foundations/symbol/": "untranslated",
41-
"/docs/reference/foundations/sys": "untranslated",
41+
"/docs/reference/foundations/sys/": "untranslated",
4242
"/docs/reference/foundations/target/": "untranslated",
4343
"/docs/reference/foundations/type/": "untranslated",
4444
"/docs/reference/foundations/version/": "untranslated",
@@ -79,23 +79,23 @@
7979
"/docs/reference/text/upper/": "untranslated",
8080
"/docs/reference/math/": "untranslated",
8181
"/docs/reference/math/accent/": "translated",
82-
"/docs/reference/math/attach": "untranslated",
82+
"/docs/reference/math/attach/": "untranslated",
8383
"/docs/reference/math/binom/": "untranslated",
8484
"/docs/reference/math/cancel/": "untranslated",
8585
"/docs/reference/math/cases/": "untranslated",
8686
"/docs/reference/math/class/": "untranslated",
8787
"/docs/reference/math/equation/": "translated",
8888
"/docs/reference/math/frac/": "translated",
89-
"/docs/reference/math/lr": "untranslated",
89+
"/docs/reference/math/lr/": "untranslated",
9090
"/docs/reference/math/mat/": "untranslated",
9191
"/docs/reference/math/primes/": "untranslated",
92-
"/docs/reference/math/roots": "translated",
93-
"/docs/reference/math/sizes": "untranslated",
92+
"/docs/reference/math/roots/": "translated",
93+
"/docs/reference/math/sizes/": "untranslated",
9494
"/docs/reference/math/stretch/": "untranslated",
95-
"/docs/reference/math/styles": "untranslated",
95+
"/docs/reference/math/styles/": "untranslated",
9696
"/docs/reference/math/op/": "untranslated",
97-
"/docs/reference/math/underover": "untranslated",
98-
"/docs/reference/math/variants": "untranslated",
97+
"/docs/reference/math/underover/": "untranslated",
98+
"/docs/reference/math/variants/": "untranslated",
9999
"/docs/reference/math/vec/": "untranslated",
100100
"/docs/reference/symbols/": "untranslated",
101101
"/docs/reference/symbols/sym/": "untranslated",
@@ -108,7 +108,7 @@
108108
"/docs/reference/layout/box/": "translated",
109109
"/docs/reference/layout/colbreak/": "untranslated",
110110
"/docs/reference/layout/columns/": "untranslated",
111-
"/docs/reference/layout/direction/": "untranslated",
111+
"/docs/reference/layout/direction/": "translated",
112112
"/docs/reference/layout/fraction/": "translated",
113113
"/docs/reference/layout/grid/": "untranslated",
114114
"/docs/reference/layout/hide/": "untranslated",

0 commit comments

Comments
 (0)