' +
selectHtml(a) +
'' +
titleHtml(a, 'mag-toc-title') +
diff --git a/static/style.css b/static/style.css
index 34cd6f3..7d0d590 100644
--- a/static/style.css
+++ b/static/style.css
@@ -4912,6 +4912,11 @@ input[list="lang-codes"] {
padding: 10px 12px; border: 1px solid var(--border); border-radius: var(--radius);
background: var(--surface); margin-bottom: 6px; }
.mag-toc-row.is-approved { border-left: 3px solid var(--green); }
+/* Not reviewed yet: blue background and edge (approved keeps the green edge). */
+.mag-toc-row.is-unreviewed { border-left: 3px solid #2563eb; background: color-mix(in srgb, #2563eb 10%, var(--surface)); }
+.mag-pill.unreviewed { background: rgba(37,99,235,.14); color: #1d4ed8; border-color: transparent; }
+:root[data-theme="dark"] .mag-pill.unreviewed { color: #93c5fd; }
+@media (prefers-color-scheme: dark) { :root:not([data-theme="light"]) .mag-pill.unreviewed { color: #93c5fd; } }
.mag-toc-title { font-weight: 600; }
.mag-toc-by { color: var(--subtext); font-size: 13px; margin-left: 8px; }
.mag-toc-meta { display: flex; gap: 10px; align-items: center; color: var(--subtext); font-size: 13px; flex-wrap: wrap; }
diff --git a/tests/magazine.spec.js b/tests/magazine.spec.js
index e47ed18..0d464d1 100644
--- a/tests/magazine.spec.js
+++ b/tests/magazine.spec.js
@@ -238,7 +238,7 @@ test.describe('Magazine reader', () => {
// Non-contiguous pages (a jump-linked continuation) must not read as a range.
await expect(page.locator('.mag-toc-row')).toContainText('pp. 3, 8');
await expect(page.locator('.mag-toc-row')).toContainText('90%');
- await expect(page.locator('.mag-toc-row')).toContainText('needs review');
+ await expect(page.locator('.mag-toc-row')).toContainText('not reviewed');
});
test('review screen shows layout blocks pre-selected and approves', async ({ page }) => {
@@ -464,6 +464,34 @@ test.describe('Magazine pronunciation and spelling checks', () => {
});
});
+test.describe('Magazine: unreviewed articles', () => {
+ async function openContents(page, opts) {
+ await mockBackend(page, opts);
+ await page.goto('/', { waitUntil: 'domcontentloaded' });
+ await page.waitForSelector('#app-skeleton', { state: 'detached', timeout: 15_000 });
+ await navTo(page, 's-magazine');
+ await page.locator('#mag-library-list .mag-card').first().click();
+ await page.waitForSelector('.mag-toc-row');
+ }
+
+ test('an article nobody has approved is blue and says "not reviewed"', async ({ page }) => {
+ await openContents(page, { articleStatus: 'detected' });
+ const row = page.locator('.mag-toc-row');
+ await expect(row).toHaveClass(/is-unreviewed/);
+ await expect(row.locator('.mag-pill.unreviewed')).toHaveText('not reviewed');
+ const edge = await row.evaluate((el) => getComputedStyle(el).borderLeftColor);
+ expect(edge).toBe('rgb(37, 99, 235)'); // the blue edge
+ const bg = await row.evaluate((el) => getComputedStyle(el).backgroundColor);
+ expect(bg).not.toBe('rgba(0, 0, 0, 0)'); // and a tinted background, not transparent
+ });
+
+ test('an approved article is not blue', async ({ page }) => {
+ await openContents(page, { articleStatus: 'approved' });
+ await expect(page.locator('.mag-toc-row')).not.toHaveClass(/is-unreviewed/);
+ await expect(page.locator('.mag-toc-row')).toHaveClass(/is-approved/);
+ });
+});
+
test.describe('Magazine: what is wrong on this page', () => {
async function openReview(page) {
await page.goto('/', { waitUntil: 'domcontentloaded' });
diff --git a/tests/test_magazine.py b/tests/test_magazine.py
index f23397a..5e61a8e 100644
--- a/tests/test_magazine.py
+++ b/tests/test_magazine.py
@@ -3146,3 +3146,126 @@ class UncoveredPictureTests(unittest.TestCase):
layout = dict(self.layout, blocks=[{"id": "f", "page": 1, "type": "furniture", "text": "45", "bbox": [100, 500, 100, 10]},
{"id": "a", "page": 1, "type": "ad", "text": "Kaufen", "bbox": [100, 520, 100, 10]}])
self.assertEqual(audit_page_coverage(self.dir, layout, 1)["clipped"], [])
+
+
+class UncoveredNearGraphicsTests(unittest.TestCase):
+ def setUp(self):
+ from pathlib import Path
+ from PIL import Image, ImageDraw
+ self.dir = Path(tempfile.mkdtemp(prefix="ttvc-gfx-"))
+ (self.dir / "pages").mkdir()
+ im = Image.new("RGB", (600, 800), (248, 242, 244))
+ draw = ImageDraw.Draw(im)
+ for y in range(300, 360, 12): # text-like lines beside a chart
+ draw.rectangle([320, y, 460, y + 3], fill=(93, 91, 92))
+ for y in range(600, 660, 12): # the same lines, far from anything
+ draw.rectangle([100, y, 240, y + 3], fill=(93, 91, 92))
+ im.save(self.dir / "pages" / "0001.png")
+
+ def tearDown(self):
+ shutil.rmtree(self.dir, ignore_errors=True)
+
+ def audit(self, images=(), blocks=()):
+ from core.magazine import audit_page_coverage
+ layout = {"pages": [{"page": 1, "width": 600, "height": 800}], "images": list(images), "blocks": list(blocks)}
+ return audit_page_coverage(self.dir, layout, 1)["uncovered"]
+
+ def test_unboxed_ink_far_from_any_graphic_is_reported(self):
+ self.assertEqual(len(self.audit()), 2)
+
+ def test_ink_beside_a_picture_or_inside_an_advert_is_part_of_it_and_not_reported(self):
+ chart = {"id": "c", "page": 1, "bbox": [200, 280, 110, 100], "filename": "c.png", "reading_order": 0}
+ ad = {"id": "ad", "page": 1, "type": "ad", "text": "Kaufen", "bbox": [80, 580, 200, 100], "reading_order": 0}
+ found = self.audit(images=[chart], blocks=[ad])
+ self.assertEqual(found, [])
+
+
+class ResolveBoxOverlapTests(unittest.TestCase):
+ def blk(self, i, ty, bbox, **kw):
+ return {"id": i, "page": 1, "type": ty, "text": "t " + i, "bbox": bbox, "reading_order": 0, **kw}
+
+ def resolve(self, blocks):
+ from core.magazine import resolve_box_overlaps
+ out, trimmed = resolve_box_overlaps({"pages": [{"page": 1}], "images": [], "blocks": blocks})
+ return {b["id"]: b["bbox"] for b in out["blocks"]}, trimmed
+
+ def test_a_caption_running_over_a_headline_is_cut_back_below_it(self):
+ boxes, trimmed = self.resolve([self.blk("t", "title", [10, 10, 200, 40]), self.blk("c", "caption", [10, 30, 200, 120])])
+ self.assertEqual(trimmed, ["c"])
+ self.assertEqual(boxes["t"], [10, 10, 200, 40]) # the headline is untouched
+ self.assertGreaterEqual(boxes["c"][1], 50) # the caption now starts under it
+ self.assertLessEqual(boxes["c"][1] + boxes["c"][3], 150)
+
+ def test_the_lower_ranked_box_is_the_one_that_moves_whichever_is_listed_first(self):
+ boxes, _ = self.resolve([self.blk("c", "caption", [10, 30, 200, 120]), self.blk("t", "title", [10, 10, 200, 40])])
+ self.assertEqual(boxes["t"], [10, 10, 200, 40])
+
+ def test_equal_rank_hand_placed_and_barely_overlapping_boxes_are_left_alone(self):
+ a, t = self.resolve([self.blk("a", "body", [10, 10, 100, 50]), self.blk("b", "body", [10, 40, 100, 50])])
+ self.assertEqual(t, [])
+ _, t = self.resolve([self.blk("t", "title", [10, 10, 200, 40]), self.blk("c", "caption", [10, 30, 200, 120], box_manual=True)])
+ self.assertEqual(t, [])
+ _, t = self.resolve([self.blk("t", "title", [10, 10, 200, 40]), self.blk("c", "caption", [10, 48, 200, 120])])
+ self.assertEqual(t, []) # a 2 pt graze is not an overlap
+
+ def test_a_box_that_would_be_cut_to_almost_nothing_stays_for_a_human(self):
+ _, trimmed = self.resolve([self.blk("t", "title", [0, 0, 200, 100]), self.blk("c", "caption", [10, 10, 180, 60])])
+ self.assertEqual(trimmed, [])
+
+
+class ResolveOverlapDuplicatesAndHeadlineGrowthTests(unittest.TestCase):
+ def test_an_inset_pullquote_repeating_a_box_that_already_holds_that_text_becomes_a_duplicate(self):
+ from core.magazine import resolve_box_overlaps
+ text = "»Mitarbeiter, die ihre Aufgaben einfach an die KI durchreichen, ersetzen sich selbst.«"
+ layout = {"pages": [{"page": 1}], "images": [], "blocks": [
+ {"id": "b", "page": 1, "type": "body", "text": text, "bbox": [10, 10, 120, 50], "reading_order": 0},
+ {"id": "q", "page": 1, "type": "pullquote", "source": "inset_pullquote", "text": text, "bbox": [15, 20, 110, 35], "reading_order": 1}]}
+ out, fixed = resolve_box_overlaps(layout)
+ self.assertEqual(fixed, ["q"])
+ self.assertEqual(next(b for b in out["blocks"] if b["id"] == "q")["type"], "furniture")
+ self.assertEqual(next(b for b in out["blocks"] if b["id"] == "b")["type"], "body")
+
+ def test_a_headline_box_may_grow_further_sideways_than_a_body_box(self):
+ from pathlib import Path
+ from PIL import Image, ImageDraw
+ from core.magazine import snap_text_boxes
+ d = Path(tempfile.mkdtemp(prefix="ttvc-headgrow-"))
+ self.addCleanup(shutil.rmtree, d, True)
+ (d / "pages").mkdir()
+ im = Image.new("RGB", (600, 800), (248, 242, 244))
+ draw = ImageDraw.Draw(im)
+ draw.rectangle([100, 100, 300, 130], fill=(30, 30, 30)) # a headline 200 px wide, thick strokes
+ im.save(d / "pages" / "0001.png")
+ def grown(kind):
+ layout = {"pages": [{"page": 1, "width": 600, "height": 800}], "images": [], "blocks": [
+ {"id": "a", "page": 1, "type": kind, "text": "t", "bbox": [98, 98, 140, 36], "reading_order": 0}]} # stops 60 px short
+ out, _ = snap_text_boxes(d, layout)
+ x, y, w, h = out["blocks"][0]["bbox"]
+ return x + w
+ self.assertGreaterEqual(grown("title"), 296) # reaches the end of the headline
+ self.assertLess(grown("body"), 260) # a body box is capped at ~16 px
+
+
+class ClippedEdgeIgnoresSolidBackgroundsTests(unittest.TestCase):
+ def audit(self, fill_solid):
+ from pathlib import Path
+ from PIL import Image, ImageDraw
+ from core.magazine import audit_page_coverage
+ d = Path(tempfile.mkdtemp(prefix="ttvc-clip-"))
+ self.addCleanup(shutil.rmtree, d, True)
+ (d / "pages").mkdir()
+ im = Image.new("RGB", (600, 800), (248, 242, 244))
+ draw = ImageDraw.Draw(im)
+ if fill_solid:
+ draw.rectangle([250, 90, 330, 140], fill=(30, 40, 90)) # solid panel right of the box
+ else:
+ for y in range(100, 130, 8): # text lines running on right of the box
+ draw.rectangle([250, y, 330, y + 3], fill=(93, 91, 92))
+ im.save(d / "pages" / "0001.png")
+ layout = {"pages": [{"page": 1, "width": 600, "height": 800}], "images": [], "blocks": [
+ {"id": "t", "page": 1, "type": "title", "text": "Headline", "bbox": [100, 95, 150, 40], "reading_order": 0}]}
+ return audit_page_coverage(d, layout, 1)["clipped"]
+
+ def test_text_running_past_the_edge_is_clipping_but_a_solid_panel_is_not(self):
+ self.assertEqual([c["side"] for c in self.audit(False)], ["right"])
+ self.assertEqual(self.audit(True), [])