From 3f8e74ad4754c6f97d1b731ab367b5ade7cb64b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Launay?= <jerome@projet-libre.org>
Date: Wed, 17 Dec 2025 12:33:08 +0100
Subject: [PATCH] Format note indicator

---
 .../Epub/parsers/ChapterHtmlSlimParser.cpp    | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
index 3431e67..a87e1b9 100644
--- a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
+++ b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
@@ -261,6 +261,24 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
 
     if (isNoteref) {
       Serial.printf("[%lu] [NOTEREF] Found noteref: href=%s\n", millis(), href ? href : "null");
+
+      // Flush any pending word before starting noteref collection
+      // This ensures proper word order in the text flow
+      if (self->partWordBufferIndex > 0) {
+        EpdFontStyle fontStyle = REGULAR;
+        if (self->boldUntilDepth < self->depth && self->italicUntilDepth < self->depth) {
+          fontStyle = BOLD_ITALIC;
+        } else if (self->boldUntilDepth < self->depth) {
+          fontStyle = BOLD;
+        } else if (self->italicUntilDepth < self->depth) {
+          fontStyle = ITALIC;
+        }
+
+        self->partWordBuffer[self->partWordBufferIndex] = '\0';
+        self->currentTextBlock->addWord(std::move(replaceHtmlEntities(self->partWordBuffer)), fontStyle);
+        self->partWordBufferIndex = 0;
+      }
+
       self->insideNoteref = true;
       self->currentNoterefTextLen = 0;
       self->currentNoterefText[0] = '\0';
@@ -506,7 +524,7 @@ void XMLCALL ChapterHtmlSlimParser::endElement(void* userData, const XML_Char* n
     return;
   }
 
-  // Rest of endElement logic for pass 2 - UNCHANGED
+  // Rest of endElement logic for pass 2 - MODIFIED
   if (strcmp(name, "a") == 0 && self->insideNoteref) {
     self->insideNoteref = false;
 
@@ -531,6 +549,25 @@ void XMLCALL ChapterHtmlSlimParser::endElement(void* userData, const XML_Char* n
 
         self->noterefCallback(noteref);
       }
+
+      // Ensure [1] appears inline after the word it references
+      EpdFontStyle fontStyle = REGULAR;
+      if (self->boldUntilDepth < self->depth && self->italicUntilDepth < self->depth) {
+        fontStyle = BOLD_ITALIC;
+      } else if (self->boldUntilDepth < self->depth) {
+        fontStyle = BOLD;
+      } else if (self->italicUntilDepth < self->depth) {
+        fontStyle = ITALIC;
+      }
+
+      // Format the noteref text with brackets
+      char formattedNoteref[32];
+      snprintf(formattedNoteref, sizeof(formattedNoteref), "[%s]", self->currentNoterefText);
+
+      // Add it as a word to the current text block
+      if (self->currentTextBlock) {
+        self->currentTextBlock->addWord(formattedNoteref, fontStyle);
+      }
     }
 
     self->currentNoterefTextLen = 0;