Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore glossary page #68

Merged
merged 1 commit into from
Nov 3, 2024
Merged

Restore glossary page #68

merged 1 commit into from
Nov 3, 2024

Conversation

kimushun1101
Copy link
Contributor

  • Merge upstream v0.12.0 #62 のときに、気づけなくてすみません。
  • glossaryのページが消えていたことに気づいたので修正しました。

v0.12.0のマージ前のコミットを見ると以下の通りで、

/// Build documentation pages.
pub fn provide(resolver: &dyn Resolver) -> Vec<PageModel> {
let base = resolver.base();
vec![
md_page(resolver, base, load!("overview.md")).with_route(base),
tutorial_pages(resolver),
md_page(resolver, base, load!("japanese.md")),
reference_pages(resolver),
guide_pages(resolver),
packages_page(resolver),
md_page(resolver, base, load!("changelog.md")),
md_page(resolver, base, load!("roadmap.md")),
md_page(resolver, base, load!("community.md")),
md_page(resolver, base, load!("glossary.md")),
]
}

97行目の

packages_page(resolver), 

までは現在と同じで、
98行目の

md_page(resolver, base, load!("changelog.md")), 

changelog_pages(resolver),

に変更されています。
99, 100行目は #62 (comment) にありますように、削除されていて正常だと思います。

upstreamのv0.12.0をマージした
RoadmapとCommunityのページは typst/typst@cd02ae7#diff-6a17656d764b8e1930354f341cf7f47960b63845c3046edcd8bbf282aaa2f464 で削除された

以上の理解で、

md_page(resolver, base, load!("glossary.md")), 

のみ追記いたしました。

Signed-off-by: Shunsuke Kimura <[email protected]>
@3w36zj6
Copy link
Member

3w36zj6 commented Nov 3, 2024

ご報告ありがとうございます。glossary.mdは本家のリポジトリに存在しないものなので、コンフリクトの解消の際に意図せず削除してしまっていたようです。

@3w36zj6 3w36zj6 changed the title FIX restore glossary page Restore glossary page Nov 3, 2024
@kimushun1101 kimushun1101 merged commit 979cd9d into main Nov 3, 2024
2 checks passed
@kimushun1101 kimushun1101 deleted the restore-glossary branch November 3, 2024 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants