diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/src/basics/mod.rs | 14 | ||||
| -rw-r--r-- | library/src/layout/enum.rs (renamed from library/src/basics/enum.rs) | 2 | ||||
| -rw-r--r-- | library/src/layout/list.rs (renamed from library/src/basics/list.rs) | 2 | ||||
| -rw-r--r-- | library/src/layout/mod.rs | 10 | ||||
| -rw-r--r-- | library/src/layout/table.rs (renamed from library/src/basics/table.rs) | 2 | ||||
| -rw-r--r-- | library/src/layout/terms.rs (renamed from library/src/basics/terms.rs) | 2 | ||||
| -rw-r--r-- | library/src/lib.rs | 17 | ||||
| -rw-r--r-- | library/src/meta/heading.rs (renamed from library/src/basics/heading.rs) | 2 | ||||
| -rw-r--r-- | library/src/meta/mod.rs | 6 | ||||
| -rw-r--r-- | library/src/meta/outline.rs | 2 |
10 files changed, 26 insertions, 33 deletions
diff --git a/library/src/basics/mod.rs b/library/src/basics/mod.rs deleted file mode 100644 index 7520c42d..00000000 --- a/library/src/basics/mod.rs +++ /dev/null @@ -1,14 +0,0 @@ -//! Common document elements. - -#[path = "enum.rs"] -mod enum_; -mod heading; -mod list; -mod table; -mod terms; - -pub use self::enum_::*; -pub use self::heading::*; -pub use self::list::*; -pub use self::table::*; -pub use self::terms::*; diff --git a/library/src/basics/enum.rs b/library/src/layout/enum.rs index 2bff7133..b1b18680 100644 --- a/library/src/basics/enum.rs +++ b/library/src/layout/enum.rs @@ -80,7 +80,7 @@ use crate::prelude::*; /// ``` /// /// ## Category -/// basics +/// layout #[func] #[capable(Layout)] #[derive(Debug, Hash)] diff --git a/library/src/basics/list.rs b/library/src/layout/list.rs index 4b9fdafb..8bdbe737 100644 --- a/library/src/basics/list.rs +++ b/library/src/layout/list.rs @@ -63,7 +63,7 @@ use crate::text::TextNode; /// ``` /// /// ## Category -/// basics +/// layout #[func] #[capable(Layout)] #[derive(Debug, Hash)] diff --git a/library/src/layout/mod.rs b/library/src/layout/mod.rs index d3a9370b..ab5ebaf8 100644 --- a/library/src/layout/mod.rs +++ b/library/src/layout/mod.rs @@ -3,9 +3,12 @@ mod align; mod columns; mod container; +#[path = "enum.rs"] +mod enum_; mod flow; mod grid; mod hide; +mod list; mod pad; mod page; mod par; @@ -13,14 +16,18 @@ mod place; mod repeat; mod spacing; mod stack; +mod table; +mod terms; mod transform; pub use self::align::*; pub use self::columns::*; pub use self::container::*; +pub use self::enum_::*; pub use self::flow::*; pub use self::grid::*; pub use self::hide::*; +pub use self::list::*; pub use self::pad::*; pub use self::page::*; pub use self::par::*; @@ -28,6 +35,8 @@ pub use self::place::*; pub use self::repeat::*; pub use self::spacing::*; pub use self::stack::*; +pub use self::table::*; +pub use self::terms::*; pub use self::transform::*; use std::mem; @@ -40,7 +49,6 @@ use typst::model::{ StyleVecBuilder, StyledNode, }; -use crate::basics::{EnumNode, ListNode, TermItem, TermsNode}; use crate::math::{FormulaNode, LayoutMath}; use crate::meta::DocumentNode; use crate::prelude::*; diff --git a/library/src/basics/table.rs b/library/src/layout/table.rs index 56df2cea..12d2455f 100644 --- a/library/src/basics/table.rs +++ b/library/src/layout/table.rs @@ -57,7 +57,7 @@ use crate::prelude::*; /// See the [grid documentation]($func/grid) for more information on gutters. /// /// ## Category -/// basics +/// layout #[func] #[capable(Layout)] #[derive(Debug, Hash)] diff --git a/library/src/basics/terms.rs b/library/src/layout/terms.rs index 2e52c87d..cf214084 100644 --- a/library/src/basics/terms.rs +++ b/library/src/layout/terms.rs @@ -53,7 +53,7 @@ use crate::text::{SpaceNode, TextNode}; /// ``` /// /// ## Category -/// basics +/// layout #[func] #[capable(Layout)] #[derive(Debug, Hash)] diff --git a/library/src/lib.rs b/library/src/lib.rs index a195c717..412ebd41 100644 --- a/library/src/lib.rs +++ b/library/src/lib.rs @@ -1,6 +1,5 @@ //! Typst's standard library. -pub mod basics; pub mod compute; pub mod layout; pub mod math; @@ -28,13 +27,6 @@ pub fn build() -> Library { fn global(math: Module, calc: Module) -> Module { let mut global = Scope::deduplicating(); - // Basics. - global.def_func::<basics::HeadingNode>("heading"); - global.def_func::<basics::ListNode>("list"); - global.def_func::<basics::EnumNode>("enum"); - global.def_func::<basics::TermsNode>("terms"); - global.def_func::<basics::TableNode>("table"); - // Text. global.def_func::<text::TextNode>("text"); global.def_func::<text::LinebreakNode>("linebreak"); @@ -63,6 +55,10 @@ fn global(math: Module, calc: Module) -> Module { global.def_func::<layout::HNode>("h"); global.def_func::<layout::BoxNode>("box"); global.def_func::<layout::BlockNode>("block"); + global.def_func::<layout::ListNode>("list"); + global.def_func::<layout::EnumNode>("enum"); + global.def_func::<layout::TermsNode>("terms"); + global.def_func::<layout::TableNode>("table"); global.def_func::<layout::StackNode>("stack"); global.def_func::<layout::GridNode>("grid"); global.def_func::<layout::ColumnsNode>("columns"); @@ -89,6 +85,7 @@ fn global(math: Module, calc: Module) -> Module { global.def_func::<meta::RefNode>("ref"); global.def_func::<meta::LinkNode>("link"); global.def_func::<meta::OutlineNode>("outline"); + global.def_func::<meta::HeadingNode>("heading"); // Symbols. global.define("sym", symbols::sym()); @@ -185,11 +182,11 @@ fn items() -> LangItems { }, link: |url| meta::LinkNode::from_url(url).pack(), ref_: |target| meta::RefNode(target).pack(), - heading: |level, body| basics::HeadingNode { level, title: body }.pack(), + heading: |level, body| meta::HeadingNode { level, title: body }.pack(), list_item: |body| layout::ListItem::List(body).pack(), enum_item: |number, body| layout::ListItem::Enum(number, body).pack(), term_item: |term, description| { - layout::ListItem::Term(basics::TermItem { term, description }).pack() + layout::ListItem::Term(layout::TermItem { term, description }).pack() }, formula: |body, block| math::FormulaNode { body, block }.pack(), math_align_point: || math::AlignPointNode.pack(), diff --git a/library/src/basics/heading.rs b/library/src/meta/heading.rs index 7ae76920..8da5cd6e 100644 --- a/library/src/basics/heading.rs +++ b/library/src/meta/heading.rs @@ -47,7 +47,7 @@ use crate::text::{SpaceNode, TextNode, TextSize}; /// The logical nesting depth of the heading, starting from one. /// /// ## Category -/// basics +/// meta #[func] #[capable(Prepare, Show, Finalize)] #[derive(Debug, Hash)] diff --git a/library/src/meta/mod.rs b/library/src/meta/mod.rs index 4612274c..fd72a8cb 100644 --- a/library/src/meta/mod.rs +++ b/library/src/meta/mod.rs @@ -1,11 +1,13 @@ //! Interaction between document parts. mod document; +mod heading; mod link; -mod reference; mod outline; +mod reference; pub use self::document::*; -pub use self::outline::*; +pub use self::heading::*; pub use self::link::*; +pub use self::outline::*; pub use self::reference::*; diff --git a/library/src/meta/outline.rs b/library/src/meta/outline.rs index 8a8bc57c..01aa7ee9 100644 --- a/library/src/meta/outline.rs +++ b/library/src/meta/outline.rs @@ -1,4 +1,4 @@ -use crate::basics::HeadingNode; +use super::HeadingNode; use crate::layout::{BlockNode, HNode, HideNode, RepeatNode, Spacing}; use crate::prelude::*; use crate::text::{LinebreakNode, SpaceNode, TextNode}; |