Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Markdown code blocks are one shaded box in a monospace font (#406)

KnifeLemonbc982bce2408
diff --git a/src/Filee.Engines/Hwp/Hwpx/MarkdownReader.cs b/src/Filee.Engines/Hwp/Hwpx/MarkdownReader.cs
index aa1d9fde..506fa73a 100644
--- a/src/Filee.Engines/Hwp/Hwpx/MarkdownReader.cs
+++ b/src/Filee.Engines/Hwp/Hwpx/MarkdownReader.cs
@@ -3,7 +3,8 @@
// Mirrors PandocAstReader: headings (with their ids as bookmarks), paragraphs, bold / italic / strike / sub- and
// superscript / inserted / marked text, code, lists (1. / a. / i. / A. / I. with the start number, nested levels),
// task lists, block quotes, pipe and grid tables with spans, definition lists, links, images, footnotes and math.
-// The YAML front matter's "title" becomes the document title. Raw HTML is skipped, except <br>.
+// The YAML front matter's "title" becomes the document title. Raw HTML is skipped, except <br>. A code block is one
+// shaded box in a monospace font: a borderless one-column table with a row per line, so it can break across pages.
using Markdig;
using Markdig.Extensions.DefinitionLists;
@@ -31,6 +32,19 @@ internal sealed class MarkdownReader
private static readonly HCharFormat Plain = default;
private static readonly HCharFormat CodeFormat = new(Shade: "#F1F0F5");
+
+ /// <summary>Monospace fonts for code blocks, the first installed one wins (Windows, macOS, Linux).</summary>
+ private static readonly string[] MonospaceFonts = ["Consolas", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Courier New"];
+
+ private static readonly Lazy<HCharFormat> CodeBlockFormat = new(() =>
+ {
+ var font = MonospaceFonts.FirstOrDefault(f => RhwpFonts.Find(f) is { Usable: true }) ?? "Courier New";
+ return new HCharFormat(Font: font);
+ });
+
+ /// <summary>Padding inside a code box: 2 mm at the sides, 1.5 mm above the first line and below the last.</summary>
+ private const int CodeSidePadding = 567;
+ private const int CodeEndPadding = 425;
private readonly string _baseFolder;
private readonly string? _resourceRoot;
@@ -89,7 +103,7 @@ internal sealed class MarkdownReader
CodeLines(math, output, context, Plain with { Italic = true });
break;
case CodeBlock code:
- CodeLines(code, output, context, CodeFormat);
+ output.Add(CodeBox(code, context));
break;
case ThematicBreakBlock:
output.Add(NewParagraph(context));
@@ -140,6 +154,38 @@ internal sealed class MarkdownReader
}
}
+ /// <summary>
+ /// A code block as one shaded box (#406): before, each line was a paragraph with shaded text, which left a strip per
+ /// line, gaps between them and none on empty lines.
+ /// </summary>
+ private static HTable CodeBox(LeafBlock code, Context context)
+ {
+ var lines = code.Lines.ToString().Replace("\r\n", "\n").Split('\n');
+ // The sides are padded by the table; the first line's cell is padded above and the last one's below.
+ var single = lines.Length == 1;
+ var table = new HTable
+ {
+ ColumnCount = 1,
+ Indent = context.Indent,
+ Borders = HBorders.Empty,
+ CellMargin = new HInsets(CodeSidePadding, CodeSidePadding, single ? CodeEndPadding : 0, single ? CodeEndPadding : 0),
+ };
+ for (var i = 0; i < lines.Length; i++)
+ {
+ var cell = new HCell { Fill = CodeFormat.Shade, Borders = HBorders.Empty };
+ if (!single && (i == 0 || i == lines.Length - 1))
+ cell.CellMargin = new HInsets(CodeSidePadding, CodeSidePadding, i == 0 ? CodeEndPadding : 0, i == 0 ? 0 : CodeEndPadding);
+ var paragraph = new HParagraph();
+ if (lines[i].Length > 0)
+ paragraph.Inlines.Add(new HText(lines[i], CodeBlockFormat.Value));
+ cell.Blocks.Add(paragraph);
+ var row = new HRow();
+ row.Cells.Add(cell);
+ table.Rows.Add(row);
+ }
+ return table;
+ }
+
private static HNumbering Numbering(ListBlock list)
{
string[] bullets = ["●", "○", "■"];
diff --git a/tests/Filee.Engines.Tests/MarkdownTests.cs b/tests/Filee.Engines.Tests/MarkdownTests.cs
index 635de50c..d8f25342 100644
--- a/tests/Filee.Engines.Tests/MarkdownTests.cs
+++ b/tests/Filee.Engines.Tests/MarkdownTests.cs
@@ -120,6 +120,24 @@ public class MarkdownTests(EngineFixture fx) : IClassFixture<EngineFixture>
Assert.Single(HwpxAssert.Xml(hwpx).Descendants(HwpxAssert.Hp + "tbl"));
}
+ [Fact]
+ public void A_code_block_is_one_shaded_box_in_a_monospace_font()
+ {
+ // Issue #406: each line used to be a paragraph with shaded text, a strip per line with gaps and none on empty lines.
+ var document = Filee.Engines.Hwp.Hwpx.MarkdownReader.Read("Before\n\n```\nint main()\n\n return 0;\n```\n\nAfter", fx.NewFolder());
+
+ var blocks = document.Sections.Single().Blocks;
+ var box = Assert.IsType<Filee.Engines.Hwp.Hwpx.HTable>(blocks[1]);
+ Assert.Equal(3, box.Rows.Count);
+ Assert.All(box.Rows, r => Assert.Equal("#F1F0F5", Assert.Single(r.Cells).Fill));
+ var texts = box.Rows.SelectMany(r => r.Cells[0].Blocks.OfType<Filee.Engines.Hwp.Hwpx.HParagraph>())
+ .SelectMany(p => p.Inlines.OfType<Filee.Engines.Hwp.Hwpx.HText>()).ToList();
+ Assert.Equal(["int main()", " return 0;"], texts.Select(t => t.Text));
+ Assert.All(texts, t => Assert.Null(t.Format.Shade));
+ Assert.All(texts, t => Assert.False(string.IsNullOrEmpty(t.Format.Font)));
+ Assert.Equal(box.Rows[0].Cells[0].CellMargin!.Value.Top, box.Rows[2].Cells[0].CellMargin!.Value.Bottom);
+ }
+
[Fact]
public async Task Markdown_to_pdf_with_built_in_engines()
{