mirror of
https://github.com/typst/typst
synced 2025-07-28 06:47:53 +08:00
Make pretty much everything locatable
This commit is contained in:
parent
627f5b9d4f
commit
70386c10f7
@ -108,6 +108,9 @@ impl Repr for Location {
|
|||||||
/// Makes this element as locatable through the introspector.
|
/// Makes this element as locatable through the introspector.
|
||||||
pub trait Locatable {}
|
pub trait Locatable {}
|
||||||
|
|
||||||
|
/// Makes this element as not locatable through the introspector.
|
||||||
|
pub trait Unlocatable {}
|
||||||
|
|
||||||
/// Marks this element as not being queryable even though it is locatable for
|
/// Marks this element as not being queryable even though it is locatable for
|
||||||
/// internal reasons.
|
/// internal reasons.
|
||||||
pub trait Unqueriable {}
|
pub trait Unqueriable {}
|
||||||
|
@ -50,6 +50,7 @@ use crate::foundations::{
|
|||||||
NativeElement, Never, NoneValue, Packed, PlainText, Regex, Repr, Resolve, Scope, Set,
|
NativeElement, Never, NoneValue, Packed, PlainText, Regex, Repr, Resolve, Scope, Set,
|
||||||
Smart, StyleChain,
|
Smart, StyleChain,
|
||||||
};
|
};
|
||||||
|
use crate::introspection::Unlocatable;
|
||||||
use crate::layout::{Abs, Axis, Dir, Em, Length, Ratio, Rel};
|
use crate::layout::{Abs, Axis, Dir, Em, Length, Ratio, Rel};
|
||||||
use crate::math::{EquationElem, MathSize};
|
use crate::math::{EquationElem, MathSize};
|
||||||
use crate::visualize::{Color, Paint, RelativeTo, Stroke};
|
use crate::visualize::{Color, Paint, RelativeTo, Stroke};
|
||||||
@ -90,7 +91,7 @@ pub(super) fn define(global: &mut Scope) {
|
|||||||
/// With a function call.
|
/// With a function call.
|
||||||
/// ])
|
/// ])
|
||||||
/// ```
|
/// ```
|
||||||
#[elem(Debug, Construct, PlainText, Repr)]
|
#[elem(Debug, Construct, PlainText, Repr, Unlocatable)]
|
||||||
pub struct TextElem {
|
pub struct TextElem {
|
||||||
/// A font family descriptor or priority list of font family descriptors.
|
/// A font family descriptor or priority list of font family descriptors.
|
||||||
///
|
///
|
||||||
@ -792,6 +793,8 @@ impl PlainText for Packed<TextElem> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Unlocatable for Packed<TextElem> {}
|
||||||
|
|
||||||
/// A lowercased font family like "arial".
|
/// A lowercased font family like "arial".
|
||||||
#[derive(Debug, Clone, PartialEq, Hash)]
|
#[derive(Debug, Clone, PartialEq, Hash)]
|
||||||
pub struct FontFamily {
|
pub struct FontFamily {
|
||||||
|
@ -7,9 +7,12 @@ use crate::foundations::{
|
|||||||
array, cast, dict, elem, Array, Dict, FromValue, Packed, PlainText, Smart, Str,
|
array, cast, dict, elem, Array, Dict, FromValue, Packed, PlainText, Smart, Str,
|
||||||
StyleChain,
|
StyleChain,
|
||||||
};
|
};
|
||||||
|
use crate::introspection::Unlocatable;
|
||||||
use crate::layout::Dir;
|
use crate::layout::Dir;
|
||||||
use crate::text::{Lang, Region, TextElem};
|
use crate::text::{Lang, Region, TextElem};
|
||||||
|
|
||||||
|
impl Unlocatable for Packed<SmartQuoteElem> {}
|
||||||
|
|
||||||
/// A language-aware quote that reacts to its context.
|
/// A language-aware quote that reacts to its context.
|
||||||
///
|
///
|
||||||
/// Automatically turns into an appropriate opening or closing quote based on
|
/// Automatically turns into an appropriate opening or closing quote based on
|
||||||
@ -29,7 +32,7 @@ use crate::text::{Lang, Region, TextElem};
|
|||||||
/// # Syntax
|
/// # Syntax
|
||||||
/// This function also has dedicated syntax: The normal quote characters
|
/// This function also has dedicated syntax: The normal quote characters
|
||||||
/// (`'` and `"`). Typst automatically makes your quotes smart.
|
/// (`'` and `"`). Typst automatically makes your quotes smart.
|
||||||
#[elem(name = "smartquote", PlainText)]
|
#[elem(name = "smartquote", PlainText, Unlocatable)]
|
||||||
pub struct SmartQuoteElem {
|
pub struct SmartQuoteElem {
|
||||||
/// Whether this should be a double quote.
|
/// Whether this should be a double quote.
|
||||||
#[default(true)]
|
#[default(true)]
|
||||||
|
@ -4,9 +4,10 @@ use typst_utils::singleton;
|
|||||||
use crate::foundations::{
|
use crate::foundations::{
|
||||||
elem, Content, NativeElement, Packed, PlainText, Repr, Unlabellable,
|
elem, Content, NativeElement, Packed, PlainText, Repr, Unlabellable,
|
||||||
};
|
};
|
||||||
|
use crate::introspection::Unlocatable;
|
||||||
|
|
||||||
/// A text space.
|
/// A text space.
|
||||||
#[elem(Unlabellable, PlainText, Repr)]
|
#[elem(Unlabellable, PlainText, Repr, Unlocatable)]
|
||||||
pub struct SpaceElem {}
|
pub struct SpaceElem {}
|
||||||
|
|
||||||
impl SpaceElem {
|
impl SpaceElem {
|
||||||
@ -24,6 +25,8 @@ impl Repr for SpaceElem {
|
|||||||
|
|
||||||
impl Unlabellable for Packed<SpaceElem> {}
|
impl Unlabellable for Packed<SpaceElem> {}
|
||||||
|
|
||||||
|
impl Unlocatable for Packed<SpaceElem> {}
|
||||||
|
|
||||||
impl PlainText for Packed<SpaceElem> {
|
impl PlainText for Packed<SpaceElem> {
|
||||||
fn plain_text(&self, text: &mut EcoString) {
|
fn plain_text(&self, text: &mut EcoString) {
|
||||||
text.push(' ');
|
text.push(' ');
|
||||||
|
@ -18,7 +18,7 @@ use typst_library::foundations::{
|
|||||||
RecipeIndex, Selector, SequenceElem, ShowSet, Style, StyleChain, StyledElem, Styles,
|
RecipeIndex, Selector, SequenceElem, ShowSet, Style, StyleChain, StyledElem, Styles,
|
||||||
SymbolElem, Synthesize, TargetElem, Transformation,
|
SymbolElem, Synthesize, TargetElem, Transformation,
|
||||||
};
|
};
|
||||||
use typst_library::introspection::{Locatable, SplitLocator, Tag, TagElem};
|
use typst_library::introspection::{Locatable, SplitLocator, Tag, TagElem, Unlocatable};
|
||||||
use typst_library::layout::{
|
use typst_library::layout::{
|
||||||
AlignElem, BoxElem, HElem, InlineElem, PageElem, PagebreakElem, VElem,
|
AlignElem, BoxElem, HElem, InlineElem, PageElem, PagebreakElem, VElem,
|
||||||
};
|
};
|
||||||
@ -506,7 +506,7 @@ fn verdict<'a>(
|
|||||||
elem.label().is_none()
|
elem.label().is_none()
|
||||||
&& elem.location().is_none()
|
&& elem.location().is_none()
|
||||||
&& !elem.can::<dyn ShowSet>()
|
&& !elem.can::<dyn ShowSet>()
|
||||||
&& !elem.can::<dyn Locatable>()
|
&& !locatable(elem)
|
||||||
&& !elem.can::<dyn Synthesize>()
|
&& !elem.can::<dyn Synthesize>()
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
@ -516,6 +516,10 @@ fn verdict<'a>(
|
|||||||
Some(Verdict { prepared, map, step })
|
Some(Verdict { prepared, map, step })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn locatable(elem: &Content) -> bool {
|
||||||
|
!elem.can::<dyn Unlocatable>()
|
||||||
|
}
|
||||||
|
|
||||||
/// This is only executed the first time an element is visited.
|
/// This is only executed the first time an element is visited.
|
||||||
fn prepare(
|
fn prepare(
|
||||||
engine: &mut Engine,
|
engine: &mut Engine,
|
||||||
@ -531,9 +535,7 @@ fn prepare(
|
|||||||
// The element could already have a location even if it is not prepared
|
// The element could already have a location even if it is not prepared
|
||||||
// when it stems from a query.
|
// when it stems from a query.
|
||||||
let key = typst_utils::hash128(&elem);
|
let key = typst_utils::hash128(&elem);
|
||||||
if elem.location().is_none()
|
if elem.location().is_none() && (locatable(elem) || elem.label().is_some()) {
|
||||||
&& (elem.can::<dyn Locatable>() || elem.label().is_some())
|
|
||||||
{
|
|
||||||
let loc = locator.next_location(engine.introspector, key);
|
let loc = locator.next_location(engine.introspector, key);
|
||||||
elem.set_location(loc);
|
elem.set_location(loc);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user