fix layout render

Author: dariubs

scripts/build_pdf.py

@@ -87,13 +87,10 @@ def setup_fonts():
     registerFontFamily("Inter", normal="Inter", bold="Inter-B",
                        italic="Inter-I", boldItalic="Inter-BI")
 
-    pd = "/usr/share/fonts/truetype/ibm-plex"
-    if not os.path.isdir(pd):
-        pd = sd
-    pdfmetrics.registerFont(TTFont("Plex",    os.path.join(pd, "IBMPlexMono-Regular.ttf")))
-    pdfmetrics.registerFont(TTFont("Plex-B",  os.path.join(pd, "IBMPlexMono-Bold.ttf")))
-    pdfmetrics.registerFont(TTFont("Plex-I",  os.path.join(pd, "IBMPlexMono-Italic.ttf")))
-    pdfmetrics.registerFont(TTFont("Plex-BI", os.path.join(pd, "IBMPlexMono-BoldItalic.ttf")))
+    pdfmetrics.registerFont(TTFont("Plex",    os.path.join(sd, "IBMPlexMono-Regular.ttf")))
+    pdfmetrics.registerFont(TTFont("Plex-B",  os.path.join(sd, "IBMPlexMono-Bold.ttf")))
+    pdfmetrics.registerFont(TTFont("Plex-I",  os.path.join(sd, "IBMPlexMono-Italic.ttf")))
+    pdfmetrics.registerFont(TTFont("Plex-BI", os.path.join(sd, "IBMPlexMono-BoldItalic.ttf")))
     registerFontFamily("Plex", normal="Plex", bold="Plex-B",
                        italic="Plex-I", boldItalic="Plex-BI")
 
@@ -204,6 +201,7 @@ def tokenize(code, lang):
 
 class CodeBlock(Flowable):
     FS = 7.8; LH = 12; PAD = 8*mm
+    MAX_LINES = 45  # max lines per block before splitting
 
     def __init__(self, code, lang="", T=None):
         super().__init__()
@@ -242,6 +240,20 @@ def draw(self):
             y -= self.LH
 
 
+def make_code_blocks(code, lang, T):
+    """Split a code string into one or more CodeBlock flowables that fit on a page."""
+    lines = code.rstrip("\n").split("\n")
+    limit = CodeBlock.MAX_LINES
+    if len(lines) <= limit:
+        return [CodeBlock(code, lang, T)]
+    blocks = []
+    for i in range(0, len(lines), limit):
+        chunk = "\n".join(lines[i:i+limit])
+        # Only show language badge on the first chunk
+        blocks.append(CodeBlock(chunk, lang if i == 0 else "", T))
+    return blocks
+
+
 class TipBox(Flowable):
     def __init__(self, text, kind="tip", T=None):
         super().__init__()
@@ -438,7 +450,8 @@ def md2fl(md, S, T, chnum=None):
                 cl.append(lines[i]); i+=1
             i+=1
             fl.append(Spacer(1,2*mm))
-            fl.append(CodeBlock("\n".join(cl), lang, T))
+            for cb in make_code_blocks("\n".join(cl), lang, T):
+                fl.append(cb)
             fl.append(Spacer(1,3*mm)); continue
         # Blockquote
         if st.startswith(">"):
@@ -618,11 +631,20 @@ def build_pdf(output, dark=False):
         if is_ch: cn += 1
         with open(full, "r", encoding="utf-8") as f:
             md = f.read()
-        story.extend(md2fl(md, S, T, chnum=cn if is_ch else None))
+        try:
+            chapter_fl = md2fl(md, S, T, chnum=cn if is_ch else None)
+            story.extend(chapter_fl)
+            print(f"  ✓ {fp} ({len(chapter_fl)} flowables)")
+        except Exception as e:
+            print(f"  ✗ {fp} FAILED: {e}")
         story.append(PageBreak())
 
-    print(f"  Building {output} ({mode}) ...")
-    doc.build(story)
+    print(f"  Building {output} ({mode}), {len(story)} total flowables ...")
+    try:
+        doc.build(story)
+    except Exception as e:
+        print(f"  ✗ doc.build FAILED: {e}")
+        raise
     print(f"  ✅  {output}  ({os.path.getsize(output)/1024:.0f} KB)")
 
 

scripts/convert_fonts.py

@@ -1,33 +1,35 @@
 #!/usr/bin/env python3
 """
-Convert Inter OTF fonts (CFF outlines) to TTF (TrueType outlines).
+Prepare fonts for the PDF build.
 
-ReportLab cannot read CFF-based OpenType fonts directly. This script
-converts the CFF cubic curves to TrueType quadratic curves and fixes
-the sfntVersion and maxp table so ReportLab accepts them.
+1. Convert Inter OTF (CFF outlines) → TTF (TrueType outlines)
+   because ReportLab cannot read CFF-based OpenType fonts.
 
-Run once before build_pdf.py — idempotent (skips if already converted).
+2. Copy IBM Plex Mono TTF files into scripts/fonts/ so the project
+   is self-contained and works both locally and in CI.
+
+Run once before build_pdf.py — idempotent (skips if already done).
+
+System font packages needed (CI installs these):
+  sudo apt install fonts-inter fonts-ibm-plex
 """
 
 import os
 import sys
+import shutil
 
-def convert_inter_fonts():
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-    out_dir = os.path.join(script_dir, "fonts")
-    os.makedirs(out_dir, exist_ok=True)
 
-    # Check if already converted
+def ensure_inter(out_dir):
+    """Convert Inter OTF → TTF if not already present."""
     target = os.path.join(out_dir, "Inter-Regular.ttf")
     if os.path.exists(target) and os.path.getsize(target) > 10000:
-        # Quick check: is it actually TrueType?
         with open(target, "rb") as f:
             sig = f.read(4)
         if sig == b'\x00\x01\x00\x00':
-            print("Inter TTF fonts already present, skipping conversion.")
-            return
+            print("  Inter TTF fonts already present, skipping conversion.")
+            return True
 
-    # Find Inter OTF source
+    # Find Inter OTF source (installed via fonts-inter)
     search_dirs = [
         "/usr/share/fonts/opentype/inter",
         "/usr/share/fonts/OTF",
@@ -40,24 +42,19 @@ def convert_inter_fonts():
             break
 
     if src_dir is None:
-        # Try installing
-        print("Inter fonts not found. Install with: sudo apt install fonts-inter")
-        sys.exit(1)
+        print("  ✗ Inter OTF fonts not found.")
+        print("    Install with: sudo apt install fonts-inter")
+        print("    Or download from: https://rsms.me/inter/")
+        return False
 
     from fontTools.ttLib import TTFont
     from fontTools.pens.cu2quPen import Cu2QuPen
     from fontTools.pens.ttGlyphPen import TTGlyphPen
     from fontTools.ttLib.tables._g_l_y_f import table__g_l_y_f
     from fontTools.ttLib.tables._l_o_c_a import table__l_o_c_a
 
-    variants = [
-        "Inter-Regular.otf",
-        "Inter-Bold.otf",
-        "Inter-Italic.otf",
-        "Inter-BoldItalic.otf",
-    ]
-
-    for name in variants:
+    for name in ["Inter-Regular.otf", "Inter-Bold.otf",
+                 "Inter-Italic.otf", "Inter-BoldItalic.otf"]:
         src = os.path.join(src_dir, name)
         out_name = name.replace(".otf", ".ttf")
         dst = os.path.join(out_dir, out_name)
@@ -69,37 +66,32 @@ def convert_inter_fonts():
         print(f"  Converting {name} → {out_name} ...", end=" ", flush=True)
 
         font = TTFont(src)
-
         if "CFF " not in font:
-            print("(no CFF table, copying as-is)")
             font.save(dst)
+            print("(no CFF, copied)")
             continue
 
         gs = font.getGlyphSet()
         glyph_order = font.getGlyphOrder()
 
-        # Convert CFF cubic curves → TrueType quadratic curves
         glyphs = {}
         for gname in glyph_order:
             ttpen = TTGlyphPen(None)
             cu2qupen = Cu2QuPen(ttpen, max_err=1.0, reverse_direction=True)
             gs[gname].draw(cu2qupen)
             glyphs[gname] = ttpen.glyph()
 
-        # Replace CFF with glyf + loca
         glyf_table = table__g_l_y_f()
         glyf_table.glyphs = glyphs
         glyf_table.glyphOrder = glyph_order
         font["glyf"] = glyf_table
         font["loca"] = table__l_o_c_a()
         font["head"].glyphDataFormat = 0
 
-        # Remove CFF-specific tables
         for tag in ["CFF ", "VORG"]:
             if tag in font:
                 del font[tag]
 
-        # Fix maxp for TrueType (version 1.0 = 0x00010000)
         maxp = font["maxp"]
         maxp.tableVersion = 0x00010000
         for attr, default in [
@@ -114,15 +106,68 @@ def convert_inter_fonts():
                 setattr(maxp, attr, default)
         maxp.recalc(font)
 
-        # Set TrueType sfntVersion
         font.sfntVersion = "\x00\x01\x00\x00"
-
         font.save(dst)
-        size_kb = os.path.getsize(dst) / 1024
-        print(f"OK ({size_kb:.0f} KB)")
+        print(f"OK ({os.path.getsize(dst)/1024:.0f} KB)")
+
+    return True
+
+
+def ensure_plex_mono(out_dir):
+    """Copy IBM Plex Mono TTFs into fonts dir if not already there."""
+    needed = [
+        "IBMPlexMono-Regular.ttf",
+        "IBMPlexMono-Bold.ttf",
+        "IBMPlexMono-Italic.ttf",
+        "IBMPlexMono-BoldItalic.ttf",
+    ]
+
+    # Check if already present
+    if all(os.path.exists(os.path.join(out_dir, n)) for n in needed):
+        print("  IBM Plex Mono fonts already present, skipping.")
+        return True
+
+    # Find system install (installed via fonts-ibm-plex)
+    search_dirs = [
+        "/usr/share/fonts/truetype/ibm-plex",
+        "/usr/share/fonts/TTF",
+        "/usr/share/fonts/truetype",
+    ]
+    src_dir = None
+    for d in search_dirs:
+        if os.path.exists(os.path.join(d, "IBMPlexMono-Regular.ttf")):
+            src_dir = d
+            break
 
-    print("  Done.")
+    if src_dir is None:
+        print("  ✗ IBM Plex Mono fonts not found.")
+        print("    Install with: sudo apt install fonts-ibm-plex")
+        print("    Or download from: https://github.com/IBM/plex/releases")
+        return False
+
+    for name in needed:
+        src = os.path.join(src_dir, name)
+        dst = os.path.join(out_dir, name)
+        if os.path.exists(src):
+            shutil.copy2(src, dst)
+            print(f"  Copied {name}")
+        else:
+            print(f"  ⚠  {name} not found in {src_dir}")
+
+    return True
 
 
 if __name__ == "__main__":
-    convert_inter_fonts()
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    out_dir = os.path.join(script_dir, "fonts")
+    os.makedirs(out_dir, exist_ok=True)
+
+    print("Preparing fonts...")
+    ok1 = ensure_inter(out_dir)
+    ok2 = ensure_plex_mono(out_dir)
+
+    if ok1 and ok2:
+        print("All fonts ready ✅")
+    else:
+        print("Some fonts missing — PDF build may fail.")
+        sys.exit(1)