actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-03-14 06:07:36 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

feat: don't add redundant 'height' to images

Browse Source
This commit is contained in:
Johan Fagerberg 2026-02-25 21:50:56 +01:00 committed by Manuel Rüger
parent ec6a718c76
commit 6f18a47ed0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renderer/fencedcodeblock.go
View File

@ -139,11 +139,11 @@ func (r *ConfluenceFencedCodeBlockRenderer) renderFencedCodeBlock(writer util.Bu
return ast.WalkStop, err return ast.WalkStop, err
} }
r.Attachments.Attach(attachment) r.Attachments.Attach(attachment)
effectiveAlign := calculateAlign(r.MarkConfig.ImageAlign, attachment.Width) effectiveAlign := calculateAlign(r.MarkConfig.ImageAlign, attachment.Width)
effectiveLayout := calculateLayout(effectiveAlign, attachment.Width) effectiveLayout := calculateLayout(effectiveAlign, attachment.Width)
displayWidth := calculateDisplayWidth(attachment.Width, effectiveLayout) displayWidth := calculateDisplayWidth(attachment.Width, effectiveLayout)
err = r.Stdlib.Templates.ExecuteTemplate( err = r.Stdlib.Templates.ExecuteTemplate(
writer, writer,
"ac:image", "ac:image",
@ -164,7 +164,7 @@ func (r *ConfluenceFencedCodeBlockRenderer) renderFencedCodeBlock(writer util.Bu
attachment.Width, attachment.Width,
attachment.Height, attachment.Height,
displayWidth, displayWidth,
attachment.Height, "",
attachment.Name, attachment.Name,
"", "",
attachment.Filename, attachment.Filename,
@ -183,11 +183,11 @@ func (r *ConfluenceFencedCodeBlockRenderer) renderFencedCodeBlock(writer util.Bu
return ast.WalkStop, err return ast.WalkStop, err
} }
r.Attachments.Attach(attachment) r.Attachments.Attach(attachment)
effectiveAlign := calculateAlign(r.MarkConfig.ImageAlign, attachment.Width) effectiveAlign := calculateAlign(r.MarkConfig.ImageAlign, attachment.Width)
effectiveLayout := calculateLayout(effectiveAlign, attachment.Width) effectiveLayout := calculateLayout(effectiveAlign, attachment.Width)
displayWidth := calculateDisplayWidth(attachment.Width, effectiveLayout) displayWidth := calculateDisplayWidth(attachment.Width, effectiveLayout)
err = r.Stdlib.Templates.ExecuteTemplate( err = r.Stdlib.Templates.ExecuteTemplate(
writer, writer,
"ac:image", "ac:image",
@ -208,7 +208,7 @@ func (r *ConfluenceFencedCodeBlockRenderer) renderFencedCodeBlock(writer util.Bu
attachment.Width, attachment.Width,
attachment.Height, attachment.Height,
displayWidth, displayWidth,
attachment.Height, "",
attachment.Name, attachment.Name,
"", "",
attachment.Filename, attachment.Filename,

2
renderer/image.go
View File

@ -170,7 +170,7 @@ func (r *ConfluenceImageRenderer) renderImage(writer util.BufWriter, source []by
attachments[0].Width, attachments[0].Width,
attachments[0].Height, attachments[0].Height,
displayWidth, displayWidth,
attachments[0].Height, "",
string(n.Title), string(n.Title),
string(nodeToHTMLText(n, source)), string(nodeToHTMLText(n, source)),
attachments[0].Filename, attachments[0].Filename,