Move layout traits into library

1 files changed, 7 insertions, 6 deletions

diff --git a/src/library/prelude.rs b/src/library/prelude.rs
index 756904f0..66e35e68 100644
--- a/src/library/prelude.rs
+++ b/src/library/prelude.rs
@@ -7,19 +7,20 @@ pub use std::num::NonZeroUsize;
 pub use std::sync::Arc;
 
 pub use comemo::Tracked;
-pub use typst_macros::node;
 
-pub use super::{ContentExt, StyleMapExt};
+pub use super::ext::{ContentExt, StyleMapExt};
+pub use super::layout::{Layout, LayoutBlock, LayoutInline, Regions};
+pub use super::text::TextNode;
+pub use super::{RawAlign, RawStroke};
 pub use crate::diag::{
     with_alternative, At, FileError, FileResult, SourceError, SourceResult, StrResult,
 };
 pub use crate::frame::*;
 pub use crate::geom::*;
-pub use crate::library::text::TextNode;
 pub use crate::model::{
-    Arg, Args, Array, Cast, Content, Dict, Dynamic, Fold, Func, Key, Layout, Level, Node,
-    RawAlign, RawStroke, Regions, Resolve, Scope, Selector, Show, Smart, Str, StyleChain,
-    StyleMap, StyleVec, Value, Vm,
+    capability, node, Arg, Args, Array, Capability, Cast, Content, Dict, Dynamic, Fold,
+    Func, Key, Node, Resolve, Scope, Selector, Show, Smart, Str, StyleChain, StyleMap,
+    StyleVec, Value, Vm,
 };
 pub use crate::syntax::{Span, Spanned};
 pub use crate::util::EcoString;