@hanology/cham-browser 0.4.1 → 0.4.2

package/dist/cli.js

@@ -3,7 +3,7 @@ import { readFileSync, writeFileSync, readdirSync, existsSync, mkdirSync, statSy
 import { join, resolve, dirname, basename, sep } from 'path';
 import { fileURLToPath } from 'url';
 import { parse as parseYaml } from 'yaml';
-import { buildPieceFromCham, buildBookData, buildLibraryIndex, buildAuthorsJson, buildDynastiesJson, } from './pipeline.js';
+import { buildPieceFromCham, buildBookData, buildLibraryIndex, buildDynastiesJson, } from './pipeline.js';
 function loadConfig(configPath) {
     const raw = parseYaml(readFileSync(configPath, 'utf-8'));
     return {
@@ -15,7 +15,6 @@ function loadConfig(configPath) {
         logoDark: raw.logoDark,
         aboutFile: raw.aboutFile,
         libraryDir: raw.libraryDir || 'library/content',
-        authorsFile: raw.authorsFile,
         outputDir: raw.outputDir || 'dist',
         publicDir: raw.publicDir,
         pretty: raw.pretty ?? true,
@@ -39,14 +38,77 @@ function loadBookConfig(bookDir) {
     };
 }
 // ─── I/O Adapters ─────────────────────────────────────────────
-function loadAuthors(config, configDir) {
-    const defaultPath = join(configDir, 'library', 'data', 'authors.yaml');
-    const authorsPath = config.authorsFile
-        ? resolve(configDir, config.authorsFile)
-        : defaultPath;
-    if (!existsSync(authorsPath))
+function loadAuthors(configDir) {
+    const authorsDir = join(configDir, 'library', 'authors');
+    const indexPath = join(authorsDir, '_index.yaml');
+    if (!existsSync(indexPath)) {
+        console.warn('No authors/_index.yaml found, authors will be empty');
         return {};
-    return parseYaml(readFileSync(authorsPath, 'utf-8'));
+    }
+    const indexData = parseYaml(readFileSync(indexPath, 'utf-8'));
+    const personIndex = indexData.authors;
+    // Build dynasty label → gbCode lookup
+    const dynastyToGbCode = new Map();
+    const dynastiesPath = join(configDir, 'library', 'register', 'dynasties.yaml');
+    if (existsSync(dynastiesPath)) {
+        const dynasties = parseYaml(readFileSync(dynastiesPath, 'utf-8'));
+        for (const d of dynasties) {
+            if (d.gb_code) {
+                dynastyToGbCode.set(d.label, d.gb_code);
+                if (d.names)
+                    for (const n of d.names)
+                        dynastyToGbCode.set(n, d.gb_code);
+            }
+        }
+    }
+    const seenDirs = new Set();
+    const records = {};
+    for (const [ref, dirName] of Object.entries(personIndex)) {
+        if (seenDirs.has(dirName))
+            continue;
+        seenDirs.add(dirName);
+        const yamlPath = join(authorsDir, dirName, 'author.yaml');
+        if (!existsSync(yamlPath))
+            continue;
+        const data = parseYaml(readFileSync(yamlPath, 'utf-8'));
+        const era = data.dynasty || data.era || '';
+        const eraCode = dynastyToGbCode.get(era) || '';
+        let bio = '';
+        const bioSources = data.bio_sources;
+        if (bioSources?.length) {
+            const bioFile = join(authorsDir, dirName, bioSources[0].file);
+            if (existsSync(bioFile)) {
+                bio = readFileSync(bioFile, 'utf-8').replace(/^---\n[\s\S]*?\n---\n/, '').trim();
+            }
+        }
+        const ctextId = typeof data['@id'] === 'string' && data['@id'].startsWith('ctext:')
+            ? data['@id'].replace('ctext:', '') : undefined;
+        records[ref] = {
+            name: data.label || ref,
+            dynasty: era,
+            era,
+            eraCode: eraCode || undefined,
+            bio: bio || undefined,
+            born: data['cprop:born']?.['@value'],
+            died: data['cprop:died']?.['@value'],
+            courtesyName: data['cprop:name-style'],
+            artName: data['cprop:name-art'],
+            wikidata: data['cprop:authority-wikidata'],
+            ctextId,
+            wikipediaZh: data['cprop:link-wikipedia_zh'],
+            wikipediaEn: data['cprop:link-wikipedia_en'],
+        };
+    }
+    // Map alias refs to the same record
+    for (const [ref, dirName] of Object.entries(personIndex)) {
+        if (!records[ref]) {
+            const canonical = Object.entries(personIndex).find(([r, d]) => d === dirName && records[r]);
+            if (canonical)
+                records[ref] = records[canonical[0]];
+        }
+    }
+    console.log(`Authors: ${seenDirs.size} directories, ${Object.keys(records).length} refs`);
+    return records;
 }
 function loadAboutHtml(config, configDir) {
     const candidates = [
@@ -105,7 +167,7 @@ function scanBooks(libraryDir) {
 // ─── Data Generation ──────────────────────────────────────────
 function generateData(config, configDir) {
     const libraryDir = resolve(configDir, config.libraryDir);
-    const authors = loadAuthors(config, configDir);
+    const authors = loadAuthors(configDir);
     const books = scanBooks(libraryDir);
     const allPieces = [];
     const bookMetas = [];
@@ -133,16 +195,102 @@ function generateData(config, configDir) {
     const dataDir = join(outputDir, 'data');
     mkdirSync(dataDir, { recursive: true });
     mkdirSync(join(dataDir, 'books'), { recursive: true });
+    mkdirSync(join(dataDir, 'pieces'), { recursive: true });
+    mkdirSync(join(dataDir, 'authors'), { recursive: true });
     const indent = config.pretty ? 2 : 0;
+    // library.json
     writeFileSync(join(dataDir, 'library.json'), JSON.stringify(library, null, indent), 'utf-8');
+    // Per-book data (full + meta)
     for (const bd of bookDataList) {
         writeFileSync(join(dataDir, 'books', `${bd.meta.id}.json`), JSON.stringify(bd, null, indent), 'utf-8');
+        writeFileSync(join(dataDir, 'books', `${bd.meta.id}.meta.json`), JSON.stringify(bd.meta, null, indent), 'utf-8');
+    }
+    // Piece index (lightweight summaries for ALL pieces)
+    const pieceIndex = allPieces.map(p => ({
+        id: `${p.bookId}/${p.num}`,
+        t: p.title,
+        a: p.author,
+        ar: p.authorId,
+        e: p.era || p.dynasty,
+        ec: p.eraCode || '',
+        b: p.bookId,
+        g: p.genre,
+        n: p.num,
+        v1: p.verses[0]?.text?.slice(0, 20) || '',
+    }));
+    writeFileSync(join(dataDir, 'index.json'), JSON.stringify(pieceIndex, null, indent), 'utf-8');
+    // Per-piece JSON files
+    for (const piece of allPieces) {
+        const pieceDir = join(dataDir, 'pieces', piece.bookId);
+        mkdirSync(pieceDir, { recursive: true });
+        writeFileSync(join(pieceDir, `${piece.num}.json`), JSON.stringify(piece, null, indent), 'utf-8');
+    }
+    // Per-author split data
+    const workCounts = new Map();
+    for (const p of allPieces) {
+        if (!workCounts.has(p.authorId)) {
+            const author = authors[p.authorId];
+            workCounts.set(p.authorId, {
+                works: [],
+                era: author?.era || author?.dynasty || p.era || p.dynasty,
+                eraCode: author?.eraCode || p.eraCode || '',
+            });
+        }
+        workCounts.get(p.authorId).works.push(`${p.bookId}/${p.num}`);
+    }
+    const authorIndex = [];
+    for (const [ref, data] of Object.entries(authors)) {
+        if (!data.name)
+            continue;
+        const wc = workCounts.get(ref);
+        const entry = {
+            id: ref,
+            name: data.name,
+            era: wc?.era || data.era || data.dynasty || '',
+            eraCode: wc?.eraCode || data.eraCode || '',
+            workCount: wc?.works.length || 0,
+        };
+        authorIndex.push(entry);
+        // Per-author detail JSON
+        writeFileSync(join(dataDir, 'authors', `${ref}.json`), JSON.stringify({
+            ...entry,
+            names: [],
+            bio: data.bio || '',
+            bioSource: '',
+            ctext: data.ctextId ? Number(data.ctextId) : undefined,
+            wikidata: data.wikidata,
+            wikipediaZh: data.wikipediaZh,
+            wikipediaEn: data.wikipediaEn,
+            works: wc?.works || [],
+        }, null, indent), 'utf-8');
     }
-    const authorsJson = buildAuthorsJson(authors, allPieces);
-    writeFileSync(join(dataDir, 'authors.json'), JSON.stringify(authorsJson, null, indent), 'utf-8');
+    writeFileSync(join(dataDir, 'authors', 'index.json'), JSON.stringify(authorIndex, null, indent), 'utf-8');
+    // Flat authors.json for template useData (full Author objects)
+    const authorsFlat = authorIndex.map(entry => {
+        const data = authors[entry.id];
+        return {
+            '@id': `author:${encodeURIComponent(entry.name)}`,
+            '@type': 'Person',
+            name: entry.name,
+            era: entry.era,
+            eraCode: entry.eraCode,
+            workCount: entry.workCount,
+            bio: data?.bio || '',
+            born: data?.born,
+            died: data?.died,
+            courtesyName: data?.courtesyName,
+            artName: data?.artName,
+            wikidata: data?.wikidata,
+            ctextId: data?.ctextId,
+            wikipediaZh: data?.wikipediaZh,
+            wikipediaEn: data?.wikipediaEn,
+        };
+    });
+    writeFileSync(join(dataDir, 'authors.json'), JSON.stringify(authorsFlat, null, indent), 'utf-8');
+    // Dynasties/eras (using era field)
     const dynastiesJson = buildDynastiesJson(allPieces);
     writeFileSync(join(dataDir, 'dynasties.json'), JSON.stringify(dynastiesJson, null, indent), 'utf-8');
-    console.log(`Data: ${bookMetas.length} book(s), ${allPieces.length} piece(s)`);
+    console.log(`Data: ${bookMetas.length} book(s), ${allPieces.length} piece(s), ${authorIndex.length} author(s)`);
     return { bookMetas, allPieces };
 }
 // ─── Shared Vite Config ───────────────────────────────────────
@@ -273,7 +421,7 @@ async function buildSite(config, configDir) {
         includedRoutes(paths, routes) {
             const result = ['/'];
             const library = JSON.parse(readFileSync(join(outputDir, 'data', 'library.json'), 'utf-8'));
-            const authors = JSON.parse(readFileSync(join(outputDir, 'data', 'authors.json'), 'utf-8'));
+            const authors = JSON.parse(readFileSync(join(outputDir, 'data', 'authors', 'index.json'), 'utf-8'));
             for (const book of library.books) {
                 result.push(`/${book.id}`);
                 const bookData = JSON.parse(readFileSync(join(outputDir, 'data', 'books', `${book.id}.json`), 'utf-8'));

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanology/cham-browser",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "CHAM — browser-compatible parser, serializer, and site generator for Classical Han Annotated Markdown",
   "type": "module",
   "main": "dist/index.js",

package/template/src/components/AnnotationTooltip.vue

@@ -11,6 +11,7 @@ const props = defineProps<{
   annotations: Annotation[]
   layerLabels?: Record<string, string>
   style?: Record<string, string>
+  vertical?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -30,7 +31,6 @@ const mode = computed<DisplayMode>(() => {
   return 'popup'
 })
 
-// Pane/sheet modes: stay visible until explicitly dismissed
 const stickyVisible = ref(false)
 
 watch(() => props.visible, (v) => {
@@ -77,10 +77,22 @@ function kindLabel(ann: Annotation): string {
   return map[ann.kind] || ann.kind
 }
 
+const hasOverlap = computed(() =>
+  props.annotations.some(a => {
+    const seg = annotationToPronSegment(a)
+    return !seg && props.annotations.filter(b =>
+      b.range.scope === a.range.scope &&
+      b.range.verseIndex === a.range.verseIndex &&
+      (b.range.start ?? 0) !== (a.range.start ?? 0) ||
+      (b.range.end ?? 0) !== (a.range.end ?? 0)
+    ).length > 0
+  })
+)
+
 function onDocClick(e: MouseEvent) {
   if (!stickyVisible.value) return
   const el = (e.target as HTMLElement)
-  if (el.closest('.ann-left-pane, .ann-bottom-sheet, .ann-popup')) return
+  if (el.closest('.ann-left-pane, .ann-right-pane, .ann-bottom-sheet, .ann-popup')) return
   if (el.closest('.ann-target')) return
   dismiss()
 }
@@ -107,11 +119,11 @@ onBeforeUnmount(() => {
 
 <template>
   <Teleport to="body">
-    <!-- Desktop left pane (>= 1024px) -->
-    <Transition name="ann-slide-right">
+    <!-- Desktop pane: LEFT for horizontal, RIGHT for vertical -->
+    <Transition :name="vertical ? 'ann-slide-left' : 'ann-slide-right'">
       <div
         v-if="mode === 'pane' && stickyVisible && annotations.length"
-        class="ann-left-pane"
+        :class="vertical ? 'ann-right-pane' : 'ann-left-pane'"
         @mouseenter="emit('tooltipEnter')"
         @mouseleave="emit('tooltipLeave')"
       >
@@ -133,11 +145,12 @@ onBeforeUnmount(() => {
       </div>
     </Transition>
 
-    <!-- Tablet popup (768–1023px) -->
+    <!-- Tablet popup -->
     <Transition name="ann-fade">
       <div
         v-if="mode === 'popup' && visible && annotations.length"
         class="ann-popup"
+        :class="{ 'ann-popup--vertical': vertical }"
         :style="style"
         @mouseenter="emit('tooltipEnter')"
         @mouseleave="emit('tooltipLeave')"
@@ -153,7 +166,7 @@ onBeforeUnmount(() => {
       </div>
     </Transition>
 
-    <!-- Mobile bottom sheet (< 768px) -->
+    <!-- Mobile bottom sheet -->
     <Transition name="ann-sheet">
       <div
         v-if="mode === 'sheet' && stickyVisible && annotations.length"
@@ -242,7 +255,7 @@ onBeforeUnmount(() => {
   white-space: pre-line;
 }
 
-/* ─── Desktop Left Pane ─── */
+/* ─── Desktop Left Pane (horizontal mode) ─── */
 .ann-left-pane {
   position: fixed;
   top: 72px;
@@ -258,6 +271,22 @@ onBeforeUnmount(() => {
   overscroll-behavior: contain;
 }
 
+/* ─── Desktop Right Pane (vertical mode) ─── */
+.ann-right-pane {
+  position: fixed;
+  top: 72px;
+  right: 20px;
+  width: 300px;
+  max-height: calc(100vh - 100px);
+  background: var(--surface-warm);
+  border: 1px solid var(--border);
+  border-radius: 12px;
+  box-shadow: 0 8px 40px rgba(var(--shadow-rgb), 0.12);
+  z-index: 1000;
+  overflow-y: auto;
+  overscroll-behavior: contain;
+}
+
 .ann-pane-close {
   position: absolute;
   top: 10px;
@@ -340,7 +369,7 @@ onBeforeUnmount(() => {
 
 /* ─── Transitions ─── */
 
-/* Left pane slide from left */
+/* Left pane slide from left (horizontal mode) */
 .ann-slide-right-enter-active {
   transition: opacity 0.2s ease, transform 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
 }
@@ -356,6 +385,22 @@ onBeforeUnmount(() => {
   transform: translateX(-16px);
 }
 
+/* Right pane slide from right (vertical mode) */
+.ann-slide-left-enter-active {
+  transition: opacity 0.2s ease, transform 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+}
+.ann-slide-left-leave-active {
+  transition: opacity 0.15s ease, transform 0.15s ease;
+}
+.ann-slide-left-enter-from {
+  opacity: 0;
+  transform: translateX(24px);
+}
+.ann-slide-left-leave-to {
+  opacity: 0;
+  transform: translateX(16px);
+}
+
 /* Popup fade */
 .ann-fade-enter-active {
   transition: opacity 0.15s ease, transform 0.25s cubic-bezier(0.34, 1.56, 0.64, 1);
@@ -385,7 +430,7 @@ onBeforeUnmount(() => {
 }
 
 @media (max-width: 1023px) {
-  .ann-left-pane { display: none; }
+  .ann-left-pane, .ann-right-pane { display: none; }
 }
 
 @media (min-width: 1024px) {

package/template/src/components/HorizontalDisplay.vue

@@ -79,6 +79,10 @@ function onTap(event: MouseEvent) {
   cursor: help;
   transition: background 0.15s;
 }
+:deep(.ann-target.ann-overlap) {
+  border-bottom-width: 3px;
+  border-bottom-style: double;
+}
 :deep(.ann-target:hover) {
   background: rgba(194, 58, 43, 0.08);
 }

package/template/src/components/PartBlock.vue

@@ -129,6 +129,10 @@ const sourceLabel = (() => {
   cursor: help;
   transition: background 0.15s;
 }
+:deep(.ann-target.ann-overlap) {
+  border-bottom-width: 3px;
+  border-bottom-style: double;
+}
 
 :deep(.ann-target:hover) {
   background: rgba(194, 58, 43, 0.08);
@@ -157,6 +161,11 @@ const sourceLabel = (() => {
   border-left: 2px solid var(--vermillion);
   padding-left: 2px;
 }
+.part-block--vertical :deep(.ann-target.ann-overlap) {
+  border-left-width: 3px;
+  border-left-style: double;
+  padding-left: 3px;
+}
 
 .part-block--vertical :deep(.ann-target.pronunciation) {
   border-left-color: var(--jade);

package/template/src/components/VerticalScroll.vue

@@ -96,6 +96,11 @@ function onTap(event: MouseEvent) {
   cursor: help;
   transition: background 0.15s;
 }
+:deep(.ann-target.ann-overlap) {
+  border-left-width: 3px;
+  border-left-style: double;
+  padding-left: 3px;
+}
 :deep(.ann-num) {
   font-size: 0.45em;
   font-family: var(--sans);

package/template/src/composables/useAnnotationRenderer.ts

@@ -7,6 +7,7 @@ export interface AnnSpan {
   start: number
   end: number
   annotations: Annotation[]
+  overlapping: boolean
 }
 
 export function esc(s: string): string {
@@ -17,27 +18,41 @@ export function buildVerseAnnotations(annotations: Annotation[], verseIndex: num
   const anns = annotations.filter(a =>
     a.range.scope === 'verse' && a.range.verseIndex === verseIndex
   )
-  const spanMap = new Map<string, Annotation[]>()
+  if (!anns.length) return []
+
+  const points = new Set<number>()
   for (const a of anns) {
-    const key = `${a.range.start ?? 0}:${a.range.end ?? 0}`
-    if (!spanMap.has(key)) spanMap.set(key, [])
-    spanMap.get(key)!.push(a)
+    points.add(a.range.start ?? 0)
+    points.add(a.range.end ?? 0)
+  }
+  const sorted = [...points].sort((a, b) => a - b)
+
+  const segments: AnnSpan[] = []
+  for (let i = 0; i < sorted.length - 1; i++) {
+    const start = sorted[i]
+    const end = sorted[i + 1]
+    const covering = anns.filter(a =>
+      (a.range.start ?? 0) <= start && (a.range.end ?? 0) >= end
+    )
+    if (covering.length === 0) continue
+
+    const rangeKeys = new Set(
+      covering.map(a => `${a.range.start ?? 0}:${a.range.end ?? 0}`)
+    )
+
+    segments.push({
+      start,
+      end,
+      annotations: covering,
+      overlapping: rangeKeys.size > 1,
+    })
   }
-  return Array.from(spanMap.entries()).map(([k, matched]) => {
-    const [start, end] = k.split(':').map(Number)
-    return { start, end, annotations: matched }
-  }).sort((a, b) => a.start - b.start)
+
+  return segments
 }
 
 export function countVerseSpans(annotations: Annotation[], verseIndex: number): number {
-  const anns = annotations.filter(a =>
-    a.range.scope === 'verse' && a.range.verseIndex === verseIndex
-  )
-  const keys = new Set<string>()
-  for (const a of anns) {
-    keys.add(`${a.range.start ?? 0}:${a.range.end ?? 0}`)
-  }
-  return keys.size
+  return buildVerseAnnotations(annotations, verseIndex).length
 }
 
 export function renderAnnotatedText(text: string, spans: AnnSpan[], useRuby = false, startNum = 0): string {
@@ -53,13 +68,14 @@ export function renderAnnotatedText(text: string, spans: AnnSpan[], useRuby = fa
     annCounter++
     const ids = span.annotations.map(a => a.id).join(',')
     const kinds = [...new Set(span.annotations.map(a => a.kind))].join(' ')
+    const overlapCls = span.overlapping ? ' ann-overlap' : ''
     const numText = toChineseNumber(annCounter)
     const body = esc(text.slice(span.start, span.end))
     if (useRuby) {
       const rtCls = numText.length > 1 ? 'ann-num ann-num-long' : 'ann-num'
-      html += `<ruby class="ann-target ${kinds}" data-ann-ids="${ids}">${body}<rp></rp><rt class="${rtCls}">${numText}</rt><rp></rp></ruby>`
+      html += `<ruby class="ann-target${overlapCls} ${kinds}" data-ann-ids="${ids}">${body}<rp></rp><rt class="${rtCls}">${numText}</rt><rp></rp></ruby>`
     } else {
-      html += `<span class="ann-target ${kinds}" data-ann-ids="${ids}">${body}<sup class="ann-num">${numText}</sup></span>`
+      html += `<span class="ann-target${overlapCls} ${kinds}" data-ann-ids="${ids}">${body}<sup class="ann-num">${numText}</sup></span>`
     }
     cursor = span.end
   }
@@ -89,7 +105,8 @@ export function renderVerseGutter(text: string, spans: AnnSpan[], startNum = 0):
     annCounter++
     const ids = span.annotations.map(a => a.id).join(',')
     const kinds = [...new Set(span.annotations.map(a => a.kind))].join(' ')
-    textHtml += `<span class="ann-target ${kinds}" data-ann-ids="${ids}">${esc(text.slice(span.start, span.end))}</span>`
+    const overlapCls = span.overlapping ? ' ann-overlap' : ''
+    textHtml += `<span class="ann-target${overlapCls} ${kinds}" data-ann-ids="${ids}">${esc(text.slice(span.start, span.end))}</span>`
     gutter[span.start] = `<span class="ann-gutter-num ${kinds}" data-ann-ids="${ids}">${toChineseNumber(annCounter)}</span>`
     cursor = span.end
   }
@@ -123,11 +140,27 @@ export function useAnnotationTooltip() {
     const rect = (el ?? event.target as HTMLElement).getBoundingClientRect()
 
     if (layout.value === 'vertical') {
-      const left = rect.left - 12
-      style.value = {
-        right: Math.max(8, window.innerWidth - left) + 'px',
-        top: '50%',
-        transform: 'translateY(-50%)',
+      const isMobile = window.innerWidth < 768
+      if (isMobile) {
+        style.value = {
+          left: '4vw',
+          right: '4vw',
+          bottom: '0',
+          maxWidth: 'none',
+        }
+      } else if (window.innerWidth >= 1024) {
+        style.value = {
+          right: '20px',
+          top: '72px',
+          maxHeight: 'calc(100vh - 100px)',
+        }
+      } else {
+        const right = window.innerWidth - rect.left + 8
+        style.value = {
+          right: Math.min(right, window.innerWidth - 40) + 'px',
+          top: '50%',
+          transform: 'translateY(-50%)',
+        }
       }
     } else {
       const isMobile = window.innerWidth < 768
@@ -156,7 +189,6 @@ export function useAnnotationTooltip() {
       const currentIds = items.value.map(a => a.id).sort().join(',')
       const newIds = annotations.map(a => a.id).sort().join(',')
       if (currentIds === newIds) {
-        // Same annotation: dismiss on mobile only (desktop uses hover to manage)
         if (window.innerWidth < 768) hide()
       } else {
         show(event, annotations)

package/template/src/composables/useI18n.ts

@@ -37,7 +37,7 @@ const messages: Record<Locale, Record<string, string>> = {
     'author.biography': '作者簡介',
     'author.collectedWorks': '收錄作品',
     'author.worksCount': '{count} 篇收錄作品',
-    'author.unknownDynasty': '未知朝代',
+    'author.unknownEra': '未知朝代',
     'annotation.pronunciation': '音',
     'annotation.semantic': '義',
     'annotation.notes': '注釋',
@@ -92,7 +92,7 @@ const messages: Record<Locale, Record<string, string>> = {
     'author.biography': '作者简介',
     'author.collectedWorks': '收录作品',
     'author.worksCount': '{count} 篇收录作品',
-    'author.unknownDynasty': '未知朝代',
+    'author.unknownEra': '未知朝代',
     'annotation.pronunciation': '音',
     'annotation.semantic': '义',
     'annotation.notes': '注释',
@@ -147,7 +147,7 @@ const messages: Record<Locale, Record<string, string>> = {
     'author.biography': 'Biography',
     'author.collectedWorks': 'Collected Works',
     'author.worksCount': '{count} collected works',
-    'author.unknownDynasty': 'Unknown dynasty',
+    'author.unknownEra': 'Unknown era',
     'annotation.pronunciation': 'Pron',
     'annotation.semantic': 'Def',
     'annotation.notes': 'Notes',

package/template/src/types.ts

@@ -140,7 +140,7 @@ export interface Piece {
   title: string
   author: string
   authorId: string
-  dynasty: string
+  era: string
   genre: BookGenre
   verses: VerseLine[]
   sections: Record<string, string>
@@ -162,8 +162,8 @@ export interface Author {
   '@id': string
   '@type': string
   name: string
-  dynasty: string
-  poemCount: number
+  era: string
+  workCount: number
   bio?: string
   born?: string
   died?: string
@@ -180,5 +180,5 @@ export interface Dynasty {
   '@type': string
   name: string
   authors: string[]
-  poemCount: number
+  workCount: number
 }

package/template/src/views/AuthorView.vue

@@ -50,7 +50,7 @@ function goHome() { router.push('/') }
         <section class="v-author-info">
           <div class="v-seal">{{ authorName.charAt(0) }}</div>
           <h1 class="v-name">{{ authorName }}</h1>
-          <span v-if="author.dynasty" class="v-dynasty">{{ author.dynasty }}</span>
+          <span v-if="author.era" class="v-era">{{ author.era }}</span>
           <span class="v-count">{{ authorPieces.length }} 篇收錄作品</span>
         </section>
 
@@ -83,7 +83,7 @@ function goHome() { router.push('/') }
               <span class="h-author-name">{{ authorName }}</span>
             </div>
             <div class="h-controls">
-              <span class="h-tag">{{ author.dynasty || '未知朝代' }}</span>
+              <span class="h-tag">{{ author.era || '未知朝代' }}</span>
               <span class="h-tag">{{ authorPieces.length }} 篇</span>
             </div>
           </div>
@@ -95,7 +95,7 @@ function goHome() { router.push('/') }
             <div class="h-info">
               <h1 class="h-name">{{ authorName }}</h1>
               <div class="h-meta">
-                <span v-if="author.dynasty" class="h-dynasty">{{ author.dynasty }}</span>
+                <span v-if="author.era" class="h-era">{{ author.era }}</span>
                 <span class="h-count">{{ authorPieces.length }} 篇收錄作品</span>
               </div>
             </div>
@@ -174,7 +174,7 @@ function goHome() { router.push('/') }
   letter-spacing: 10px; color: var(--ink);
   margin-left: 20px;
 }
-.v-dynasty {
+.v-era {
   font-size: 20px; color: var(--gold);
   font-weight: 600; letter-spacing: 4px;
   margin-left: 12px;
@@ -286,7 +286,7 @@ function goHome() { router.push('/') }
 }
 .h-name { font-size: 36px; font-weight: 900; letter-spacing: 6px; color: var(--ink); }
 .h-meta { display: flex; gap: 16px; margin-top: 8px; font-family: var(--sans); font-size: 14px; }
-.h-dynasty { color: var(--gold); font-weight: 600; letter-spacing: 2px; }
+.h-era { color: var(--gold); font-weight: 600; letter-spacing: 2px; }
 .h-count { color: var(--ink-faint); letter-spacing: 1px; }
 
 .h-bio {

package/template/src/views/PieceView.vue

@@ -228,16 +228,16 @@ const selectedAuthorBio = computed(() => {
   return a?.bio || piece.value?.sections?.author_bio || ''
 })
 
-const selectedAuthorDynasty = computed(() => {
+const selectedAuthorEra = computed(() => {
   const name = selectedAuthorName.value
   const a = getAuthor(name)
-  return a?.dynasty || piece.value?.dynasty || ''
+  return a?.era || piece.value?.era || ''
 })
 
-const selectedAuthorPoemCount = computed(() => {
+const selectedAuthorWorkCount = computed(() => {
   const name = selectedAuthorName.value
   const a = getAuthor(name)
-  return a?.poemCount || 0
+  return a?.workCount || 0
 })
 
 const selectedAuthorData = computed(() => {
@@ -435,6 +435,7 @@ function tcy(n: number): string {
         :annotations="interaction.items"
         :layer-labels="layerLabels"
         :style="interaction.style"
+        :vertical="true"
         @close="interaction.dismiss"
         @tooltip-enter="interaction.onTooltipEnter"
         @tooltip-leave="interaction.onTooltipLeave"
@@ -448,9 +449,9 @@ function tcy(n: number): string {
               <div class="v-pane-header">
                 <div class="v-pane-name">{{ selectedAuthorName }}</div>
                 <div class="v-pane-meta">
-                  <span v-if="selectedAuthorDynasty">{{ selectedAuthorDynasty }}</span>
+                  <span v-if="selectedAuthorEra">{{ selectedAuthorEra }}</span>
                   <span v-if="authorLifespan">{{ authorLifespan }}</span>
-                  <span v-if="selectedAuthorPoemCount" class="v-pane-count">{{ t('stat.pieceCount', { count: selectedAuthorPoemCount }) }}</span>
+                  <span v-if="selectedAuthorWorkCount" class="v-pane-count">{{ t('stat.pieceCount', { count: selectedAuthorWorkCount }) }}</span>
                 </div>
                 <div v-if="selectedAuthorData?.courtesyName || selectedAuthorData?.artName" class="v-pane-names">
                   <span v-if="selectedAuthorData?.courtesyName">字{{ selectedAuthorData.courtesyName }}</span>
@@ -483,7 +484,7 @@ function tcy(n: number): string {
           <div class="h-nav-inner">
             <button class="h-back" @click="goBack">← {{ t('nav.back') }}</button>
             <div class="h-nav-title-row">
-              <span v-if="piece.dynasty" class="h-dynasty">{{ piece.dynasty }}</span>
+              <span v-if="piece.era" class="h-era">{{ piece.era }}</span>
               <span class="h-breadcrumb">
                 <span v-if="piece.source?.textRef" class="h-source-link" @click="router.push(`/${piece.source.textRef}`)">
                   {{ meta?.title }} →
@@ -602,6 +603,7 @@ function tcy(n: number): string {
         :annotations="interaction.items"
         :layer-labels="layerLabels"
         :style="interaction.style"
+        :vertical="false"
         @close="interaction.dismiss"
         @tooltip-enter="interaction.onTooltipEnter"
         @tooltip-leave="interaction.onTooltipLeave"
@@ -618,9 +620,9 @@ function tcy(n: number): string {
                 <div>
                   <div class="h-pane-name">{{ selectedAuthorName }}</div>
                   <div class="h-pane-meta">
-                    <span v-if="selectedAuthorDynasty" class="h-pane-dynasty">{{ selectedAuthorDynasty }}</span>
+                    <span v-if="selectedAuthorEra" class="h-pane-era">{{ selectedAuthorEra }}</span>
                     <span v-if="authorLifespan" class="h-pane-lifespan">{{ authorLifespan }}</span>
-                    <span v-if="selectedAuthorPoemCount" class="h-pane-count">{{ t('piece.collected', { count: selectedAuthorPoemCount }) }}</span>
+                    <span v-if="selectedAuthorWorkCount" class="h-pane-count">{{ t('piece.collected', { count: selectedAuthorWorkCount }) }}</span>
                   </div>
                   <div v-if="selectedAuthorData?.courtesyName || selectedAuthorData?.artName" class="h-pane-alt-names">
                     <span v-if="selectedAuthorData?.courtesyName">字 {{ selectedAuthorData.courtesyName }}</span>
@@ -838,7 +840,7 @@ function tcy(n: number): string {
   min-width: 0;
 }
 
-.h-dynasty {
+.h-era {
   display: inline-flex;
   align-items: center;
   padding: 2px 8px;
@@ -1024,7 +1026,7 @@ function tcy(n: number): string {
 }
 .h-pane-name { font-size: 28px; font-weight: 900; letter-spacing: 4px; color: var(--ink); }
 .h-pane-meta { font-size: 14px; color: var(--ink-faint); letter-spacing: 2px; margin-top: 6px; display: flex; align-items: center; gap: 8px; }
-.h-pane-dynasty {
+.h-pane-era {
   display: inline-flex;
   padding: 2px 8px;
   background: var(--vermillion);
@@ -1262,7 +1264,7 @@ function tcy(n: number): string {
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  .h-dynasty { font-size: 10px; padding: 1px 6px; }
+  .h-era { font-size: 10px; padding: 1px 6px; }
   .h-sep { margin: 0 4px; }
   .h-controls {
     margin-left: 0;