From 83fa2c075eb8e41bd1a29157eb02f814f7f0ae96 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Mon, 22 Mar 2021 01:14:37 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20bug=20with=20line=20spacing=20after=20hea?= =?UTF-8?q?dings=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/library/markup.rs | 10 ++++------ tests/ref/markup/heading.png | Bin 5288 -> 5205 bytes tests/typ/markup/strong.typ | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/library/markup.rs b/src/library/markup.rs index 12a14d142..2fb38193f 100644 --- a/src/library/markup.rs +++ b/src/library/markup.rs @@ -116,9 +116,9 @@ pub fn heading(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value { ctx.state.font.strong = true; body.exec(ctx); - ctx.push_parbreak(); - ctx.state = snapshot; + + ctx.push_parbreak(); }) } @@ -154,19 +154,17 @@ pub fn raw(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value { let block = args.get(ctx, RawNode::BLOCK).unwrap_or(false); Value::template(Node::RAW, move |ctx| { - let snapshot = ctx.state.clone(); - if block { ctx.push_parbreak(); } + let snapshot = ctx.state.clone(); ctx.set_monospace(); ctx.push_text(&text); + ctx.state = snapshot; if block { ctx.push_parbreak(); } - - ctx.state = snapshot; }) } diff --git a/tests/ref/markup/heading.png b/tests/ref/markup/heading.png index 515788f317014fa24b34d66061c3d4223a256fd5..f95b8c2cda1041cd8e883d2811978f0331fa7054 100644 GIT binary patch literal 5205 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 diff --git a/tests/typ/markup/strong.typ b/tests/typ/markup/strong.typ index 6a6fc04a7..b487d06d1 100644 --- a/tests/typ/markup/strong.typ +++ b/tests/typ/markup/strong.typ @@ -18,5 +18,6 @@ Partly str*ength*ened. *, *! #let strong = 123 + // Error: 1-2 expected function, found integer *