Reducing bullet indentation and also avoid hardcoded value for

it

Author: jessp01

mdtopdf.go

@@ -130,6 +130,8 @@ type PdfRenderer struct {
 	Extensions                parser.Extensions
 	ColumnWidths              map[ast.Node][]float64
 
+	BulletIndentation float64
+
 	tocLinks map[string]*int
 }
 
@@ -372,6 +374,7 @@ func NewPdfRenderer(params PdfRendererParams) *PdfRenderer {
 	r.Theme = params.Theme
 
 	r.Pdf = fpdf.New(r.orientation, r.units, r.papersize, r.fontdir)
+	r.BulletIndentation = 0.1
 
 	r.Pdf.SetHeaderFunc(func() {
 		r.SetPageBackground("", r.BackgroundColor)
@@ -392,7 +395,7 @@ func NewPdfRenderer(params PdfRendererParams) *PdfRenderer {
 	r.setStyler(r.Normal)
 	r.mleft, r.mtop, r.mright, r.mbottom = r.Pdf.GetMargins()
 	r.em = r.Pdf.GetStringWidth("m")
-	r.IndentValue = 3 * r.em
+	r.IndentValue = 2.5 * r.em
 
 	r.cs = states{stack: make([]*containerState, 0)}
 	initcurrent := &containerState{

nodeProcessing.go

@@ -259,19 +259,19 @@ func (r *PdfRenderer) processItem(node ast.ListItem, entering bool) {
 				bulletChar = tr("▪")
 				r.Pdf.SetFont("", "", 25)
 			}
-			r.Pdf.CellFormat(4*r.em, r.Normal.Size+r.Normal.Spacing,
+			r.Pdf.CellFormat(r.BulletIndentation * r.em, r.Normal.Size+r.Normal.Spacing,
 				bulletChar,
 				"", 0, "RB", false, 0, "")
 			r.Pdf.SetFont("", "", currFontSize)
 		} else if r.cs.peek().listkind == ordered {
-			r.Pdf.CellFormat(4*r.em, r.Normal.Size+r.Normal.Spacing,
+			r.Pdf.CellFormat(r.BulletIndentation * r.em, r.Normal.Size+r.Normal.Spacing,
 				fmt.Sprintf("%v.", r.cs.peek().itemNumber),
 				"", 0, "RB", false, 0, "")
 		}
 		// with the bullet done, now set the left margin for the text
-		r.Pdf.SetLeftMargin(r.cs.peek().leftMargin + (4 * r.em))
+		r.Pdf.SetLeftMargin(r.cs.peek().leftMargin + (r.BulletIndentation * r.em))
 		// set the cursor to this point
-		r.Pdf.SetX(r.cs.peek().leftMargin + (4 * r.em))
+		r.Pdf.SetX(r.cs.peek().leftMargin + (r.BulletIndentation * r.em))
 	} else {
 		r.tracer(fmt.Sprintf("%v Item (leaving)",
 			r.cs.peek().listkind),

testdata/Amps and angle encoding.pdf

@@ -35,18 +35,18 @@
     Paragraph
       Text 'It should.'
 
-[... List Left Margin] set to 58.338
+[... List Left Margin] set to 53.34
 -[Unordered Item (entering) #1] Container
   Paragraph
     Text 'In a list?'
 
 -[cr()] LH=14
 --[Paragraph (entering)] 
---[... Margins (left, top, right, bottom:] 98.322 28.35 28.35 56.7
+--[... Margins (left, top, right, bottom:] 54.339600000000004 28.35 28.35 56.7
 --[First Para within a list] breaking
 --[Text] In a list?
 --[Paragraph (leaving)] 
---[... Margins (left, top, right, bottom:] 98.322 28.35 28.35 56.7
+--[... Margins (left, top, right, bottom:] 54.339600000000004 28.35 28.35 56.7
 --[Unordered Item (leaving)] Container
   Paragraph
     Text 'In a list?'
@@ -60,15 +60,15 @@
 
 -[cr()] LH=14
 --[Paragraph (entering)] 
---[... Margins (left, top, right, bottom:] 98.322 28.35 28.35 56.7
+--[... Margins (left, top, right, bottom:] 54.339600000000004 28.35 28.35 56.7
 --[First Para within a list] breaking
 --[Text] 
 ---[Link (entering)] Destination[http://example.com/] Title[]
 ---[Text] http://example.com/
 ---[Link (leaving)] 
 --[Text] 
 --[Paragraph (leaving)] 
---[... Margins (left, top, right, bottom:] 98.322 28.35 28.35 56.7
+--[... Margins (left, top, right, bottom:] 54.339600000000004 28.35 28.35 56.7
 --[Unordered Item (leaving)] Container
   Paragraph
     Text
@@ -82,11 +82,11 @@
 
 -[cr()] LH=14
 --[Paragraph (entering)] 
---[... Margins (left, top, right, bottom:] 98.322 28.35 28.35 56.7
+--[... Margins (left, top, right, bottom:] 54.339600000000004 28.35 28.35 56.7
 --[First Para within a list] breaking
 --[Text] It should.
 --[Paragraph (leaving)] 
---[... Margins (left, top, right, bottom:] 98.322 28.35 28.35 56.7
+--[... Margins (left, top, right, bottom:] 54.339600000000004 28.35 28.35 56.7
 --[Unordered Item (leaving)] Container
   Paragraph
     Text 'It should.'
@@ -109,14 +109,14 @@
 [cr()] LH=14
 [BlockQuote (entering)] 
 -[Paragraph (entering)] 
--[... Margins (left, top, right, bottom:] 58.338 28.35 28.35 56.7
+-[... Margins (left, top, right, bottom:] 53.34 28.35 28.35 56.7
 -[cr()] LH=14
 -[Text] Blockquoted: 
 --[Link (entering)] Destination[http://example.com/] Title[]
 --[Text] http://example.com/
 --[Link (leaving)] 
 -[Paragraph (leaving)] 
--[... Margins (left, top, right, bottom:] 58.338 28.35 28.35 56.7
+-[... Margins (left, top, right, bottom:] 53.34 28.35 28.35 56.7
 -[cr()] LH=14
 -[BlockQuote (leaving)] 
 [cr()] LH=14

testdata/Auto links.log

@@ -2,21 +2,21 @@
 [Document] Not Handled
 [BlockQuote (entering)] 
 -[Paragraph (entering)] 
--[... Margins (left, top, right, bottom:] 58.338 28.35 28.35 56.7
+-[... Margins (left, top, right, bottom:] 53.34 28.35 28.35 56.7
 -[cr()] LH=14
 -[Text] Example:
 -[Paragraph (leaving)] 
--[... Margins (left, top, right, bottom:] 58.338 28.35 28.35 56.7
+-[... Margins (left, top, right, bottom:] 53.34 28.35 28.35 56.7
 -[cr()] LH=14
 -[Codeblock] Leaf 'sub status {\n    print "working";\n}\n'
 
 -[cr()] LH=14
 -[Paragraph (entering)] 
--[... Margins (left, top, right, bottom:] 58.338 28.35 28.35 56.7
+-[... Margins (left, top, right, bottom:] 53.34 28.35 28.35 56.7
 -[cr()] LH=14
 -[Text] Or:
 -[Paragraph (leaving)] 
--[... Margins (left, top, right, bottom:] 58.338 28.35 28.35 56.7
+-[... Margins (left, top, right, bottom:] 53.34 28.35 28.35 56.7
 -[cr()] LH=14
 -[Codeblock] Leaf 'sub status {\n    return "working";\n…'