4 files changed, 35 insertions, 17 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 6c66451c..4132a15e 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -22,6 +22,7 @@ enum iGmLineType {
     header1_GmLineType,
     header2_GmLineType,
     header3_GmLineType,
+    link_GmLineType,
     max_GmLineType,
 };
 
@@ -29,16 +30,19 @@ static enum iGmLineType lineType_Rangecc_(const iRangecc *line) {
     if (isEmpty_Range(line)) {
         return text_GmLineType;
     }
-    if (startsWithSc_Rangecc(line, "###", &iCaseSensitive)) {
+    if (startsWith_Rangecc(line, "=>")) {
+        return link_GmLineType;
+    }
+    if (startsWith_Rangecc(line, "###")) {
         return header3_GmLineType;
     }
-    if (startsWithSc_Rangecc(line, "##", &iCaseSensitive)) {
+    if (startsWith_Rangecc(line, "##")) {
         return header2_GmLineType;
     }
-    if (startsWithSc_Rangecc(line, "#", &iCaseSensitive)) {
+    if (startsWith_Rangecc(line, "#")) {
         return header1_GmLineType;
     }
-    if (startsWithSc_Rangecc(line, "```", &iCaseSensitive)) {
+    if (startsWith_Rangecc(line, "```")) {
         return preformatted_GmLineType;
     }
     if (*line->start == '>') {
@@ -51,7 +55,7 @@ static enum iGmLineType lineType_Rangecc_(const iRangecc *line) {
 }
 
 static void trimLine_Rangecc_(iRangecc *line, enum iGmLineType type) {
-    static const unsigned int skip[max_GmLineType] = { 0, 2, 3, 1, 1, 2, 3 };
+    static const unsigned int skip[max_GmLineType] = { 0, 2, 3, 1, 1, 2, 3, 0 };
     line->start += skip[type];
     trim_Rangecc(line);
 }
@@ -98,16 +102,27 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         quote_FontId,
         header1_FontId,
         header2_FontId,
-        header3_FontId
+        header3_FontId,
+        default_FontId,
+    };
+    static const int colors[max_GmLineType] = {
+        gray75_ColorId,
+        gray75_ColorId,
+        orange_ColorId,
+        orange_ColorId,
+        white_ColorId,
+        white_ColorId,
+        white_ColorId,
+        white_ColorId,
     };
     static const int indents[max_GmLineType] = {
-        4, 10, 4, 10, 0, 0, 0
+        4, 10, 4, 10, 0, 0, 0, 0
     };
     static const float topMargin[max_GmLineType] = {
-        0.0f, 0.5f, 1.0f, 0.5f, 2.0f, 1.5f, 1.0f
+        0.0f, 0.5f, 1.0f, 0.5f, 2.0f, 2.0f, 1.5f, 1.0f
     };
     static const float bottomMargin[max_GmLineType] = {
-        0.0f, 0.5f, 1.0f, 0.5f, 1.0f, 1.0f, 1.0f
+        0.0f, 0.5f, 1.0f, 0.5f, 1.0f, 1.0f, 1.0f, 1.0f
     };
     static const char *bullet = "\u2022";
     iRangecc preAltText = iNullRange;
@@ -169,6 +184,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             }
         }
         /* List bullet. */
+        run.color = colors[type];
         if (type == bullet_GmLineType) {
             run.bounds.pos = addX_I2(pos, indent * gap_UI);
             run.bounds.size = advance_Text(run.font, bullet);
@@ -179,6 +195,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         /* Special formatting for the first paragraph (e.g., subtitle, introduction, or lede). */
         if (type == text_GmLineType && isFirstText) {
             run.font = firstParagraph_FontId;
+            run.color = orange_ColorId;
             isFirstText = iFalse;
         }
         else if (type != header1_GmLineType) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index eae7c00a..56726320 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -195,7 +195,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             d->scrollY = 0;
         }
         const int scrollMax =
-            size_GmDocument(d->doc).y - height_Rect(bounds_Widget(w)) + d->pageMargin * gap_UI;
+            size_GmDocument(d->doc).y - height_Rect(bounds_Widget(w)) + 2 * d->pageMargin * gap_UI;
         if (scrollMax > 0) {
             d->scrollY = iMin(d->scrollY, scrollMax);
         }
@@ -245,7 +245,7 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     ctx.bounds.size.x = documentWidth_DocumentWidget_(d);
     ctx.bounds.pos.x = bounds_Widget(w).size.x / 2 - ctx.bounds.size.x / 2;
     init_Paint(&ctx.paint);
-    drawRect_Paint(&ctx.paint, ctx.bounds, teal_ColorId);
+//    drawRect_Paint(&ctx.paint, ctx.bounds, teal_ColorId);
     render_GmDocument(
         d->doc,
         (iRangei){ d->scrollY - margin, d->scrollY + height_Rect(ctx.bounds) + margin },
diff --git a/src/ui/text.c b/src/ui/text.c
index e5045899..d4f46116 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -118,13 +118,13 @@ void init_Text(SDL_Renderer *render) {
     /* Load the fonts. */ {
         const struct { const iBlock *ttf; int size; } fontData[max_FontId] = {
             { &fontFiraSansRegular_Embedded, fontSize_UI },
-            { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.85f },
-            { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.65f },
-            { &fontFiraSansRegular_Embedded, fontSize_UI * 1.35f },
+            { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.866f },
+            { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.666f },
+            { &fontFiraSansRegular_Embedded, fontSize_UI * 1.333f },
             { &fontFiraSansLightItalic_Embedded, fontSize_UI },
             { &fontFiraSansBold_Embedded, fontSize_UI },
-            { &fontFiraSansBold_Embedded, fontSize_UI * 1.35f },
-            { &fontFiraSansBold_Embedded, fontSize_UI * 1.7f },
+            { &fontFiraSansBold_Embedded, fontSize_UI * 1.333f },
+            { &fontFiraSansBold_Embedded, fontSize_UI * 1.666f },
             { &fontFiraSansBold_Embedded, fontSize_UI * 2.0f },
         };
         iForIndices(i, fontData) {
@@ -366,6 +366,7 @@ static void cache_Font_(iFont *d, iGlyph *glyph, int hoff) {
     /* Update cache cursor. */
     txt->cachePos.x += glRect->size.x;
     txt->cacheRowHeight = iMax(txt->cacheRowHeight, glRect->size.y);
+    iAssert(txt->cachePos.y + txt->cacheRowHeight <= txt->cacheSize.y);
 }
 
 static const iGlyph *glyph_Font_(iFont *d, iChar ch) {
diff --git a/src/ui/text.h b/src/ui/text.h
index 29fc34a4..2181fa34 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -26,7 +26,7 @@ enum iFontId {
     quote_FontId             = italic_FontId,
     header1_FontId           = hugeBold_FontId,
     header2_FontId           = largeBold_FontId,
-    header3_FontId           = mediumBold_FontId,
+    header3_FontId           = medium_FontId,
     uiShortcuts_FontId       = default_FontId,
 };