fix: extract end markers from raw <B> tags instead of sections (works per-page, not proximity guess)

webapp/tipitaka-api/app/schemas.py

@@ -18,6 +18,7 @@ class PageResponse(BaseModel):
     content_html_formatted: str = ""
     title: Optional[str] = None
     sections: List[SectionInfo] = Field(default_factory=list)
+    end_markers: List[str] = Field(default_factory=list)
     requested_page: Optional[int] = None
     is_blank: Optional[bool] = False
     skipped_from: Optional[int] = None

webapp/tipitaka-api/app/services/page_service.py

@@ -95,6 +95,16 @@ class PageService:
             sections.sort(key=lambda s: s["level"])
             cleaned = self.search_service.clean_text(row["content_text"])
             is_blank = self._is_blank_page(cleaned)
+
+            # Extract end markers from raw content_html: <B> tags containing "จบ"
+            raw_html = row["content_html"] or ""
+            end_markers = []
+            if not is_blank and raw_html:
+                for m in re.finditer(r'<B>(.*?จบ.*?)</B>', raw_html, re.IGNORECASE):
+                    tm = m.group(1).strip()
+                    if tm and tm not in end_markers:
+                        end_markers.append(tm)
+
             return {
                 "id": row["id"],
                 "volume_id": row["volume_id"],
@@ -102,10 +112,11 @@ class PageService:
                 "page_number": row["page_number"],
                 "total_pages": row["total_pages"] or 0,
                 "content_text": "" if is_blank else cleaned,
-                "content_html": "" if is_blank else (row["content_html"] or ""),
-                "content_html_formatted": "" if is_blank else self.format_content_html(row["content_html"] or ""),
+                "content_html": "" if is_blank else raw_html,
+                "content_html_formatted": "" if is_blank else self.format_content_html(raw_html),
                 "title": row["title"],
                 "sections": sections,
+                "end_markers": end_markers,
                 "is_blank": is_blank,
             }
 

webapp/tipitaka-web/src/components/layout/ReaderPanel.tsx

@@ -17,21 +17,7 @@ const SHELL_STYLES: Record<string, string> = {
   classic: 'bg-[#f5edd8]',
 };
 
-const renderContent = (html: string, fontSize: number, sections: {title: string; level: number; page_number?: number}[], currentPage?: number) => {
-  // Sections with "จบ" → end marker below content
-  // Only if section's page_number is close to current page (within 5 pages)
-  const endMarkers = sections.filter(s => {
-    const title = s.title.trim();
-    if (!(title.endsWith('จบ') || title.includes('จบ'))) return false;
-    // Skip if this end marker belongs to a faraway page
-    if (s.page_number !== undefined && currentPage !== undefined) {
-      if (currentPage - s.page_number > 5) return false;
-    }
-    // Skip if already rendered as <h4> inside content body (from <B> tag)
-    if (html && html.includes(title)) return false;
-    return true;
-  });
-
+const renderContent = (html: string, fontSize: number, endMarkers: string[]) => {
   return (
     <div
       style={{ fontSize: `${fontSize}px`, lineHeight: '2.1' }}
@@ -45,12 +31,12 @@ const renderContent = (html: string, fontSize: number, sections: {title: string;
       ) : (
         <p className="text-[#888] italic text-center py-10">ไม่มีข้อความในหน้านี้</p>
       )}
-      {/* End markers — sections containing "จบ" at bottom */}
+      {/* End markers from raw <B> tags containing "จบ" */}
       {endMarkers.length > 0 && (
         <div className="space-y-1 pt-2">
-          {endMarkers.map((s, i) => (
+          {endMarkers.map((title, i) => (
             <p key={i} className="text-xs text-[#888] tracking-widest">
-              --------- {s.title} ---------
+              --------- {title} ---------
             </p>
           ))}
         </div>
@@ -198,7 +184,7 @@ const ReaderPanel: React.FC = () => {
                     ))}
                   </header>
                   <div className="border-b border-[#c8860a]/15 mb-5" />
-                  {renderContent(content.content_html_formatted || content.content_html || '', fontSize, content.sections || [], content.page_number)}
+                  {renderContent(content.content_html_formatted || content.content_html || '', fontSize, content.end_markers || [])}
                 </>
               )}