diff options
| author | Laurenz <laurmaedje@gmail.com> | 2021-09-15 12:29:42 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2021-09-15 13:05:00 +0200 |
| commit | c18321a4c24b1bae9b935e3434aa114f930ca5f5 (patch) | |
| tree | e6b0aa69c6c7a2855ca498d7c7e8aabe0347297c /src/library | |
| parent | 87e776fcebd40cb9628124c19e7e9190b1bd24a5 (diff) | |
Bugfix and tidying
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/text.rs | 25 | ||||
| -rw-r--r-- | src/library/utility.rs | 3 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/library/text.rs b/src/library/text.rs index 863586f6..b8b3afcd 100644 --- a/src/library/text.rs +++ b/src/library/text.rs @@ -1,6 +1,5 @@ -use crate::layout::{Decoration, LineDecoration, LineKind, Paint}; - use super::*; +use crate::layout::{Decoration, LineDecoration, LineKind, Paint}; /// `font`: Configure the font. pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> { @@ -163,22 +162,22 @@ fn lang_dir(iso: &str) -> Dir { } } -/// `strike`: Set striken-through text. -pub fn strike(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - line_impl(ctx, args, LineKind::Strikethrough) +/// `strike`: Typeset striken-through text. +pub fn strike(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { + line_impl(args, LineKind::Strikethrough) } -/// `underline`: Set underlined text. -pub fn underline(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - line_impl(ctx, args, LineKind::Underline) +/// `underline`: Typeset underlined text. +pub fn underline(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { + line_impl(args, LineKind::Underline) } -/// `overline`: Set text with an overline. -pub fn overline(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - line_impl(ctx, args, LineKind::Overline) +/// `overline`: Typeset text with an overline. +pub fn overline(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { + line_impl(args, LineKind::Overline) } -fn line_impl(_: &mut EvalContext, args: &mut Args, kind: LineKind) -> TypResult<Value> { +fn line_impl(args: &mut Args, kind: LineKind) -> TypResult<Value> { let stroke = args.named("stroke")?.or_else(|| args.eat()); let thickness = args.named::<Linear>("thickness")?.or_else(|| args.eat()); let offset = args.named("offset")?; @@ -196,7 +195,7 @@ fn line_impl(_: &mut EvalContext, args: &mut Args, kind: LineKind) -> TypResult< Ok(Value::Template(body)) } -/// `link`: Set a link. +/// `link`: Typeset text as a link. pub fn link(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { let url = args.expect::<Str>("url")?; diff --git a/src/library/utility.rs b/src/library/utility.rs index f5fab6ee..e6d5476f 100644 --- a/src/library/utility.rs +++ b/src/library/utility.rs @@ -1,9 +1,8 @@ use std::cmp::Ordering; use std::str::FromStr; -use crate::color::{Color, RgbaColor}; - use super::*; +use crate::color::{Color, RgbaColor}; /// `type`: The name of a value's type. pub fn type_(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { |
