3 files changed, 25 insertions, 19 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f7ef6d79..ac283a21 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2908,7 +2908,7 @@ static size_t linkOrdinalFromKey_DocumentWidget_(const iDocumentWidget *d, int k
 static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t ord) {
     if (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode) {
         if (ord < 9) {
-            return 0x278a + ord;
+            return '1' + ord;
         }
 #if defined (iPlatformApple)
         if (ord < 9 + 22) {
@@ -2917,17 +2917,17 @@ static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t or
             if (key >= 'm') key++;
             if (key >= 'q') key++;
             if (key >= 'w') key++;
-            return 0x24b6 + key - 'a';
+            return 'A' + key - 'a';
         }
 #else
         if (ord < 9 + 26) {
-            return 0x24b6 + ord - 9;
+            return 'A' + ord - 9;
         }
 #endif
     }
     else {
         if (ord < iElemCount(homeRowKeys_)) {
-            return 0x24b6 + homeRowKeys_[ord] - 'a';
+            return 'A' + homeRowKeys_[ord] - 'a';
         }
     }
     return 0;
@@ -3818,10 +3818,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 const iChar ordChar =
                     linkOrdinalChar_DocumentWidget_(d->widget, ord - d->widget->ordinalBase);
                 if (ordChar) {
-                    drawString_Text(run->font,
-                                    init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
-                                    tmQuote_ColorId,
-                                    collect_String(newUnicodeN_String(&ordChar, 1)));
+                    const char *circle = "\u25ef"; /* Large Circle */
+                    iRect nbArea = { init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
+                                     init_I2(4 * gap_UI, lineHeight_Text(run->font)) };
+                    drawRange_Text(run->font, topLeft_Rect(nbArea), tmQuote_ColorId,
+                                   range_CStr(circle));
+                    drawCentered_Text(run->font, nbArea, iTrue, tmQuote_ColorId, "%lc", (int) ordChar);
                     goto runDrawn;
                 }
             }
diff --git a/src/ui/text.c b/src/ui/text.c
index 54b0a9da..980f15bd 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1341,13 +1341,16 @@ void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, con
         vprintf_Block(&chars, format, args);
         va_end(args);
     }
-    const iRangecc text       = range_Block(&chars);
-    iRect          textBounds = alignVisual ? visualBounds_Text(fontId, text)
+    drawCenteredRange_Text(fontId, rect, alignVisual, color, range_Block(&chars));
+    deinit_Block(&chars);
+}
+
+void drawCenteredRange_Text(int fontId, iRect rect, iBool alignVisual, int color, iRangecc text) {
+    iRect textBounds = alignVisual ? visualBounds_Text(fontId, text)
                                    : (iRect){ zero_I2(), advanceRange_Text(fontId, text) };
     textBounds.pos = sub_I2(mid_Rect(rect), mid_Rect(textBounds));
     textBounds.pos.x = iMax(textBounds.pos.x, left_Rect(rect)); /* keep left edge visible */
     draw_Text_(fontId, textBounds.pos, color, text);
-    deinit_Block(&chars);
 }
 
 SDL_Texture *glyphCache_Text(void) {
diff --git a/src/ui/text.h b/src/ui/text.h
index 3dc38238..0007b264 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -157,14 +157,15 @@ void    setOpacity_Text     (float opacity);
 
 void    cache_Text          (int fontId, iRangecc text); /* pre-render glyphs */
 
-void    draw_Text           (int fontId, iInt2 pos, int color, const char *text, ...);
-void    drawAlign_Text      (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
-void    drawCentered_Text   (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
-void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
-void    drawRange_Text      (int fontId, iInt2 pos, int color, iRangecc text);
-void    drawRangeN_Text     (int fontId, iInt2 pos, int color, iRangecc text, size_t maxLen);
-void    drawBoundRange_Text (int fontId, iInt2 pos, int boundWidth, int color, iRangecc text); /* bound does not wrap */
-int     drawWrapRange_Text  (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */
+void    draw_Text               (int fontId, iInt2 pos, int color, const char *text, ...);
+void    drawAlign_Text          (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
+void    drawCentered_Text       (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
+void    drawCenteredRange_Text  (int fontId, iRect rect, iBool alignVisual, int color, iRangecc text);
+void    drawString_Text         (int fontId, iInt2 pos, int color, const iString *text);
+void    drawRange_Text          (int fontId, iInt2 pos, int color, iRangecc text);
+void    drawRangeN_Text         (int fontId, iInt2 pos, int color, iRangecc text, size_t maxLen);
+void    drawBoundRange_Text     (int fontId, iInt2 pos, int boundWidth, int color, iRangecc text); /* bound does not wrap */
+int     drawWrapRange_Text      (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */
 
 SDL_Texture *   glyphCache_Text     (void);