From fa738ed6057cc24085ac4e51e9247fd52804670a Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 09:42:55 +0200 Subject: [PATCH 01/21] grid column --- css/modules/_layout.scss | 31 ++- css/modules/_num-paragraph.scss | 8 +- css/modules/_text.scss | 7 +- css/style.css | 72 ++---- css/style.css.map | 2 +- css/style.scss | 2 +- csspageweaver/manifest.json | 14 +- .../plugins/followingNotes/config.json | 8 - .../plugins/followingNotes/followingNotes.js | 244 ------------------ csspageweaver/plugins/grid/.gitignore | 1 - csspageweaver/plugins/grid/config.json | 14 - csspageweaver/plugins/grid/grid-hook.js | 17 -- csspageweaver/plugins/grid/grid-ui.js | 115 --------- csspageweaver/plugins/grid/grid.css | 124 --------- csspageweaver/plugins/grid/template.html | 16 -- .../{followingNotes => gridColumn}/.gitignore | 0 .../plugins/{grid => gridColumn}/README.md | 0 csspageweaver/plugins/gridColumn/config.json | 13 + csspageweaver/plugins/gridColumn/grid-ui.js | 73 ++++++ csspageweaver/plugins/gridColumn/grid.css | 36 +++ .../plugins/gridColumn/template.html | 4 + js/snapToBaseline.js | 12 +- 22 files changed, 183 insertions(+), 630 deletions(-) delete mode 100644 csspageweaver/plugins/followingNotes/config.json delete mode 100644 csspageweaver/plugins/followingNotes/followingNotes.js delete mode 100644 csspageweaver/plugins/grid/.gitignore delete mode 100644 csspageweaver/plugins/grid/config.json delete mode 100644 csspageweaver/plugins/grid/grid-hook.js delete mode 100644 csspageweaver/plugins/grid/grid-ui.js delete mode 100644 csspageweaver/plugins/grid/grid.css delete mode 100644 csspageweaver/plugins/grid/template.html rename csspageweaver/plugins/{followingNotes => gridColumn}/.gitignore (100%) rename csspageweaver/plugins/{grid => gridColumn}/README.md (100%) create mode 100644 csspageweaver/plugins/gridColumn/config.json create mode 100644 csspageweaver/plugins/gridColumn/grid-ui.js create mode 100644 csspageweaver/plugins/gridColumn/grid.css create mode 100644 csspageweaver/plugins/gridColumn/template.html diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 6299012..697ac17 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -1,13 +1,18 @@ $width: 176mm; $height: 240mm; -$top: 6mm; -$bottom: 20mm; -$inside: 12mm; -$outside: 6mm; +$top: 10mm; +$bottom: 14mm; +$inside: 20mm; +$outside: 14mm; $content-h: calc($height - $top - $bottom - 1mm); $content-w: calc($width - $inside - $outside); $gap: 4mm; $indent: 10mm; +$unit: calc($content-w/7); + +:root{ + --unit: #{$unit}; +} @media print { @@ -23,9 +28,7 @@ $indent: 10mm; margin-left: $outside; margin-right: $inside; - // background-image: url("/images/layout-2_3.png"); - // background-size: 100% 100%; - + @bottom-left { content: counter(page); @@ -46,6 +49,10 @@ $indent: 10mm; margin-left: $inside; margin-right: $outside; + background-image: url("/images/layout-1_20.png"); + background-size: 100% 100%; + + @bottom-left { content: string(chapterCount); font-family: var(--font-sans); @@ -141,11 +148,11 @@ $indent: 10mm; } -#section__content{ - columns: 2; - column-gap: $gap; - column-fill: auto; -} +// #section__content{ +// columns: 2; +// column-gap: $gap; +// column-fill: auto; +// } // Title chapter diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss index 366a9ad..9ddcafb 100644 --- a/css/modules/_num-paragraph.scss +++ b/css/modules/_num-paragraph.scss @@ -4,18 +4,12 @@ ol[type="1"]{ list-style-type: none; - position: relative; break-after: avoid; - width: $indent; position: absolute; - display: flex; - align-items: center; - justify-content: center; - + left: calc(var(--unit)*2); &::after{ content: attr(start); display: block; - position: absolute; font-size: var(--fs-small); opacity: 0.5; } diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 881e549..9ccb138 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -22,8 +22,13 @@ p{ text-align: justify; orphans: 2; widows: 2; - margin-left: $indent; + + position: relative; + top: -2px; + // margin-left: $indent; // padding-left: $indent*0.2; + + padding-left: calc(var(--unit)*3); } p, li{ diff --git a/css/style.css b/css/style.css index 60c38b9..17782ee 100644 --- a/css/style.css +++ b/css/style.css @@ -31,15 +31,19 @@ body { line-height: var(--baseline); } +:root { + --unit: 20.2857142857mm; +} + @media print { @page { size: 176mm 240mm; - margin-top: 6mm; - margin-bottom: 20mm; + margin-top: 10mm; + margin-bottom: 14mm; } @page :left { - margin-left: 6mm; - margin-right: 12mm; + margin-left: 14mm; + margin-right: 20mm; @bottom-left { content: counter(page); font-family: var(--font-sans); @@ -55,8 +59,10 @@ body { } } @page :right { - margin-left: 12mm; - margin-right: 6mm; + margin-left: 20mm; + margin-right: 14mm; + background-image: url("/images/layout-1_20.png"); + background-size: 100% 100%; @bottom-left { content: string(chapterCount); font-family: var(--font-sans); @@ -178,8 +184,8 @@ body { } } @page chapter { - margin-left: 6mm; - margin-right: 6mm; + margin-left: 14mm; + margin-right: 14mm; @top-left-corner { content: none; } @@ -240,15 +246,6 @@ body { break-before: page; } -#section__content { - -moz-columns: 2; - columns: 2; - -moz-column-gap: 4mm; - column-gap: 4mm; - -moz-column-fill: auto; - column-fill: auto; -} - #section__content h1 { -moz-column-break-before: left; break-before: left; @@ -287,7 +284,9 @@ p { text-align: justify; orphans: 2; widows: 2; - margin-left: 10mm; + position: relative; + top: -2px; + padding-left: calc(var(--unit) * 3); } p, li { @@ -335,19 +334,14 @@ ul { ol[type="1"] { list-style-type: none; - position: relative; -moz-column-break-after: avoid; break-after: avoid; - width: 10mm; position: absolute; - display: flex; - align-items: center; - justify-content: center; + left: calc(var(--unit) * 2); } ol[type="1"]::after { content: attr(start); display: block; - position: absolute; font-size: var(--fs-small); opacity: 0.5; } @@ -358,13 +352,13 @@ ol[type="1"].ol-clone { -moz-column-break-after: avoid; break-after: avoid; top: 0; - left: 81mm; + left: 73mm; } #section__content h1 { -moz-column-span: all; column-span: all; - height: 213mm; + height: 215mm; } #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); @@ -499,32 +493,6 @@ ol[type="1"].ol-clone { color: red; } -.container-following-note { - font-family: var(--font-sans); - font-size: var(--fs-small); - line-height: calc(var(--baseline) * 0.75); - position: relative; - margin-top: 2px; - hyphens: auto; - hyphenate-limit-chars: 7 3 4; - hyphenate-limit-lines: 2; - hyphenate-limit-zone: 8%; - word-spacing: -0.004em; - text-align: justify; -} - -.following-note_marker::after { - content: ". "; -} - -.following-note_call { - font-family: var(--font-sans); - font-size: var(--fs-small); - line-height: 1; - position: relative; - top: -4px; -} - #toc_container { -moz-column-break-before: page; break-before: page; diff --git a/css/style.css.map b/css/style.css.map index 58b7aa2..67820a2 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index b58c8fc..f9799c0 100644 --- a/css/style.scss +++ b/css/style.scss @@ -6,5 +6,5 @@ @import 'modules/num-paragraph'; @import 'modules/titles'; @import 'modules/list-of-abbr'; -@import 'modules/followingNotes'; +// @import 'modules/followingNotes'; @import 'modules/toc'; \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 0a6d450..63be0f6 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -1,12 +1,10 @@ { "plugins": [ "baseline", - "grid", + "gridColumn", "marginBox", "imposition","spread","previewPage","reloadInPlace", - "inlineNotes", - "followingNotes", - "tableOfContent" + "inlineNotes" ], "pluginsParameters":{}, "css": [ @@ -18,10 +16,6 @@ "containerNotes": "#footnotes", "newClass": "inline-note" }, - "followingNotes": { - "selector": ".inline-note", - "reset": ".chapter" - }, "tableOfContent": { "tocContainer": "#toc_container", "tocTitles": ["#section__content h1", "#section__content h2", "h3", "h4", "h5", "h6"] @@ -29,9 +23,7 @@ }, "hook": [ "/js/counters.js", - "/js/these.js", - "/js/snapToBaseline.js", - "/js/numParagraph.js" + "/js/these.js" ] } diff --git a/csspageweaver/plugins/followingNotes/config.json b/csspageweaver/plugins/followingNotes/config.json deleted file mode 100644 index bc66d35..0000000 --- a/csspageweaver/plugins/followingNotes/config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "FollowingNotes", - "description": "Create followingNotes with call & markers", - "author": ["Julie Blanc"], - "licence": "MIT", - "version": "1.0", - "hook": "followingNotes.js" -} diff --git a/csspageweaver/plugins/followingNotes/followingNotes.js b/csspageweaver/plugins/followingNotes/followingNotes.js deleted file mode 100644 index 0a9f45b..0000000 --- a/csspageweaver/plugins/followingNotes/followingNotes.js +++ /dev/null @@ -1,244 +0,0 @@ -/** - * @name FollowingNotes - * @author Julie Blanc - * @see { @link https://gitlab.com/csspageweaver/plugins/followingNotes/ } - */ - -import { Handler } from '/csspageweaver/lib/paged.esm.js'; - -export default class followingNotes extends Handler { - - constructor(chunker, polisher, caller) { - super(chunker, polisher, caller); - this.parameters = cssPageWeaver.features.followingNotes.parameters; - this.notesClass = this.parameters?.selector || ".inline-note"; - this.newNotesClass = this.parameters?.newNotesClass || "following-note"; - this.reset = this.parameters?.reset; - this.align = this.parameters?.align; - this.followingNoteOverflow = new Set(); - } - - beforeParsed(content) { - - let newNotesClass = this.newNotesClass; - resetCounter(content, this.reset, this.notesClass); - createCallandMarker(content, this.notesClass, newNotesClass); - - - const containerMap = new Map(); - - let notes = content.querySelectorAll(this.notesClass); - notes.forEach(function (note) { - let paragraph = note.closest("p"); - if (!paragraph) return; - - // Remonter au niveau direct de #section__content (ignorer blockquote et autres conteneurs) - const sectionContent = note.closest('#section__content') || content; - let topLevel = paragraph; - while (topLevel.parentElement && topLevel.parentElement !== sectionContent) { - topLevel = topLevel.parentElement; - } - - // Find next boundary: heading or ol[type="1"], au niveau de #section__content - let boundary = null; - let sibling = topLevel.nextElementSibling; - while (sibling) { - if (sibling.matches('h1, h2, h3, h4, h5, h6, ol[type="1"]')) { - boundary = sibling; - break; - } - sibling = sibling.nextElementSibling; - } - - const mapKey = boundary || sectionContent; - - if (!containerMap.has(mapKey)) { - let container = document.createElement("div"); - container.classList.add("container-following-note"); - if (boundary) { - boundary.before(container); - } else { - sectionContent.appendChild(container); - } - containerMap.set(mapKey, container); - } - - containerMap.get(mapKey).appendChild(note); - }); - - - } - - - -} - - - - -/// FUNCTIONS ----------------------------------------------------- - - -// RESET COUNTER - -function resetCounter(content, reset, notesClass){ - - if(reset && reset != ""){ - const elements = content.querySelectorAll(reset + ", " + notesClass); - let resetEligible = false; - elements.forEach(element => { - if (element.matches(reset)) { - resetEligible = true; - } else if (resetEligible && element.matches(notesClass)) { - element.dataset.resetCounterFollowingNote = true; - resetEligible = false; - } - }); - } - -} - - -// CALL & MARKER -function createCallandMarker(content, notesClass, newNotesClass){ - - let notes = content.querySelectorAll(notesClass); - let resetNum = 0; - - notes.forEach(function (note, index) { - - if (note.dataset.resetCounterFollowingNote === "true") { - resetNum = index; - } - let num = index + 1 - resetNum; - - note.classList.add(newNotesClass); - note.dataset.counterNote = num; - - // call - let ref_note = document.createElement('span'); - ref_note.className = newNotesClass + "_call"; - ref_note.dataset.counterNote = num; - ref_note.innerHTML = num; - - // wrap preceding word + call in .wrapper__note-call - let wrapper = document.createElement('span'); - wrapper.className = 'wrapper__note-call'; - - let prevSibling = note.previousSibling; - if (prevSibling && prevSibling.nodeType === Node.TEXT_NODE) { - let text = prevSibling.textContent; - let m = text.match(/^([\s\S]*\s)(\S+\s*)$/); - if (m) { - let before = m[1]; - let extracted = m[2]; - - // Si le dernier mot extrait est uniquement », prendre aussi le mot d'avant - if (/^»\s*$/.test(extracted)) { - let m2 = before.trimEnd().match(/^([\s\S]*\s|)(\S+)$/); - if (m2) { - let spaceBetween = before.slice(m2[1].length + m2[2].length); - before = m2[1]; - extracted = m2[2] + spaceBetween + extracted; - } - } - - prevSibling.textContent = before; - wrapper.appendChild(document.createTextNode(extracted)); - } else { - prevSibling.textContent = ''; - wrapper.appendChild(document.createTextNode(text)); - } - } - - wrapper.appendChild(ref_note); - note.after(wrapper); - - // marker + content note wrapped in body_note - let marker_note = document.createElement('span'); - marker_note.className = newNotesClass + "_marker"; - //marker_note.innerHTML = num + ". "; - marker_note.innerHTML = num; - - let body_note = document.createElement('div'); - body_note.className = 'body_note'; - while (note.firstChild) { - body_note.appendChild(note.firstChild); - } - body_note.prepend(marker_note); - note.appendChild(body_note); - - }); - - } - - - - -// MARGINS - -function marginNoteTop(elem) { - let marginTop = parseInt(window.getComputedStyle(elem).marginTop, 10) - return marginTop; -} - -function marginNoteBottom(elem) { - let marginBottom = parseInt(window.getComputedStyle(elem).marginBottom, 10) - return marginBottom; -} - -function biggestMargin(a, b) { - let margin; - let marginBottom = marginNoteBottom(a); - let marginTop = marginNoteTop(b); - if (marginBottom > marginTop) { - margin = marginBottom; - } else { - margin = marginTop; - } - return margin; -} - - - -function checkOverflownote(notesClass, pageElement, maxHeight, arrayOverflow, container) { - let notes = pageElement.querySelectorAll(notesClass); - - let notesHeightAll = []; - - for (let n = 0; n < notes.length; ++n) { - - // Add height of the notes to array notesHeightAll - let noteHeight = notes[n].offsetHeight; - notesHeightAll.push(noteHeight); - // Add margins of the notes to array notesHeightAll - if (n >= 1) { - let margins = biggestMargin(notes[n - 1], notes[n]); - notesHeightAll.push(margins); - } - } - - // If notes on page - if (notesHeightAll.length > 0) { - - // Calculate if all notes fit on the page; - let reducer = (accumulator, currentValue) => accumulator + currentValue; - let allHeight = notesHeightAll.reduce(reducer); - let paddingTop = getComputedStyle(container).paddingTop; - let paddingContainer = parseInt(paddingTop); - - let totalHeight = allHeight + paddingContainer; - - if (totalHeight > maxHeight) { - - let lastNote = notes[notes.length - 1]; - arrayOverflow.add(lastNote); - lastNote.remove(); - - checkOverflownote(notesClass, pageElement, maxHeight, arrayOverflow, container); - - } - - - } -} diff --git a/csspageweaver/plugins/grid/.gitignore b/csspageweaver/plugins/grid/.gitignore deleted file mode 100644 index 496ee2c..0000000 --- a/csspageweaver/plugins/grid/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store \ No newline at end of file diff --git a/csspageweaver/plugins/grid/config.json b/csspageweaver/plugins/grid/config.json deleted file mode 100644 index 07871e3..0000000 --- a/csspageweaver/plugins/grid/config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Grid", - "description": "", - "version": "1.0", - "ui": { - "title": "Squared grid", - "description": "This Toogle a squared grid", - "template": "template.html", - "toggle": true - }, - "stylesheet": "grid.css", - "script": "grid-ui.js", - "hook": "grid-hook.js" -} \ No newline at end of file diff --git a/csspageweaver/plugins/grid/grid-hook.js b/csspageweaver/plugins/grid/grid-hook.js deleted file mode 100644 index 5618bd5..0000000 --- a/csspageweaver/plugins/grid/grid-hook.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @name Grid - * @author Julie Blanc - * @see { @link https://gitlab.com/csspageweaver/plugins/grid/ } - */ - -import { Handler } from '/csspageweaver/lib/paged.esm.js'; - -export default class GridPage extends Handler { - constructor(chunker, polisher, caller) { - super(chunker, polisher, caller); - } - - - - -} diff --git a/csspageweaver/plugins/grid/grid-ui.js b/csspageweaver/plugins/grid/grid-ui.js deleted file mode 100644 index a9687ed..0000000 --- a/csspageweaver/plugins/grid/grid-ui.js +++ /dev/null @@ -1,115 +0,0 @@ -/** - * @name Grid - * @author Julie Blanc - * @see { @link https://gitlab.com/csspageweaver/plugins/grid/ } - */ - - -export default function gridEvents(){ - let body = cssPageWeaver.ui.body; - let fileTitle = cssPageWeaver.docTitle; - let parameters = cssPageWeaver.features.grid.parameters || {}; - let isParametersSet = Object.keys(parameters).length > 0; - - let grid = {}; - - // valeur par défaut - grid.default = { - toggle: 'no-grid', - spacing: 56, - steps: 5, - positionX: 28, - positionY: 0 - }; - - grid.toggle = {}; - grid.toggle.input = cssPageWeaver.ui.grid.toggleInput; - grid.toggle.label = cssPageWeaver.ui.grid.toggleLabel; - - grid.spacing = {}; - grid.spacing.value = parameters.spacing || grid.default.spacing; - grid.spacing.input = document.querySelector('#spacing-grid'); - - grid.steps = {}; - grid.steps.value = parameters.steps || grid.default.steps; - grid.steps.input = document.querySelector('#steps-grid'); - - grid.positionX = {}; - grid.positionX.value = parameters.positionX || grid.default.positionX; - grid.positionX.input = document.querySelector('#position-x-grid'); - - grid.positionY = {}; - grid.positionY.value = parameters.positionY || grid.default.positionY; - grid.positionY.input = document.querySelector('#position-y-grid'); - - /* Récupération de la session précédente */ - grid.toggle.value = localStorage.getItem('gridToggle_' + fileTitle) || grid.default.toggle; - grid.spacing.value = localStorage.getItem('gridSpacing_' + fileTitle) || grid.spacing.value; - grid.steps.value = localStorage.getItem('gridSteps_' + fileTitle) || grid.steps.value; - grid.positionX.value = localStorage.getItem('gridPositionX_' + fileTitle) || grid.positionX.value; - grid.positionY.value = localStorage.getItem('gridPositionY_' + fileTitle) || grid.positionY.value; - - /* DOM edit */ - if(grid.toggle.value === "grid"){ - body.classList.add('grid'); // on indique qu'il y a la grille - grid.toggle.input.checked = true; - } else { - body.classList.remove('grid'); // grille désactivée - grid.toggle.input.checked = false; - } - - /* Set grid values on load */ - grid.spacing.input.value = grid.spacing.value; - document.documentElement.style.setProperty('--grid-spacing', grid.spacing.value + 'px'); - - grid.steps.input.value = grid.steps.value; - document.documentElement.style.setProperty('--steps', grid.steps.value); - - grid.positionX.input.value = grid.positionX.value; - document.documentElement.style.setProperty('--grid-position-x', grid.positionX.value + 'px'); - - grid.positionY.input.value = grid.positionY.value; - document.documentElement.style.setProperty('--grid-position-y', grid.positionY.value + 'px'); - - /* Event listeners */ - - /* Toggle event */ - grid.toggle.input.addEventListener("input", (e) => { - if(e.target.checked){ - body.classList.add('grid'); // grille activée - localStorage.setItem('gridToggle_' + fileTitle, 'grid'); - } else { - body.classList.remove('grid'); // grille désactivée - localStorage.setItem('gridToggle_' + fileTitle, 'no-grid'); - } - }); - - /* Change grid spacing on input */ - document.querySelector("#spacing-grid").addEventListener("input", (e) => { - grid.spacing.value = e.target.value; - document.documentElement.style.setProperty('--grid-spacing', grid.spacing.value + 'px'); - localStorage.setItem('gridSpacing_' + fileTitle, grid.spacing.value); - }); - - /* Change grid steps on input */ - document.querySelector("#steps-grid").addEventListener("input", (e) => { - grid.steps.value = e.target.value; - document.documentElement.style.setProperty('--steps', grid.steps.value); - localStorage.setItem('gridSteps_' + fileTitle, grid.steps.value); - }); - - /* Change grid position X on input */ - document.querySelector("#position-x-grid").addEventListener("input", (e) => { - grid.positionX.value = e.target.value; - document.documentElement.style.setProperty('--grid-position-x', grid.positionX.value + 'px'); - localStorage.setItem('gridPositionX_' + fileTitle, grid.positionX.value); - }); - - /* Change grid position Y on input */ - document.querySelector("#position-y-grid").addEventListener("input", (e) => { - grid.positionY.value = e.target.value; - document.documentElement.style.setProperty('--grid-position-y', grid.positionY.value + 'px'); - localStorage.setItem('gridPositionY_' + fileTitle, grid.positionY.value); - }); -} - diff --git a/csspageweaver/plugins/grid/grid.css b/csspageweaver/plugins/grid/grid.css deleted file mode 100644 index 8cd4dee..0000000 --- a/csspageweaver/plugins/grid/grid.css +++ /dev/null @@ -1,124 +0,0 @@ -:root { - --grid-bold: #bfbfbf; - --grid-light: #efefef; - - --grid-spacing: 56px; - --steps: 5; - --grid-position-x: 28px; - --grid-position-y: 0px; - - --grid-subdivisions: calc(var(--grid-spacing)/var(--steps)); - -} - - -@media screen{ - - - - body.grid .pagedjs_sheet { - - - - z-index: -1; - - - background-image: - /* Traits bold */ - repeating-linear-gradient( - 90deg, - var(--grid-bold) 0 1px, - transparent 1px var(--grid-spacing) - ), - repeating-linear-gradient( - 0deg, - var(--grid-bold) 0 1px, - transparent 1px var(--grid-spacing) - ), - - /* Traits fins (3 traits → 4 carrés) */ - repeating-linear-gradient( - 90deg, - var(--grid-light) 0 1px, - transparent 1px var(--grid-subdivisions) - ), - repeating-linear-gradient( - 0deg, - var(--grid-light) 0 1px, - transparent 1px var(--grid-subdivisions) - ); - - background-position: - var(--grid-position-x) var(--grid-position-y), - var(--grid-position-x) var(--grid-position-y), - var(--grid-position-x) var(--grid-position-y), - var(--grid-position-x) var(--grid-position-y); - } - - - - - - - - .grid-page{ - --nbr-columns: 8; - width: var(--pagedjs-pagebox-width); - height: var(--pagedjs-pagebox-height); - position: absolute; - top: 0; - left: 0; - display: grid; - grid-template-columns: repeat(var(--nbr-columns), calc(100%/var(--nbr-columns))); - - box-shadow: 1px 0px 0px 0px var(--grid-color); - - --grid-color: magenta; - z-index: -1; - } - - .pagedjs_right_page .grid-page{ - padding-left: var(--pagedjs-margin-left); - padding-right: var(--pagedjs-margin-right); - } - - .pagedjs_left_page .grid-page{ - padding-left: var(--pagedjs-margin-left); - padding-right: var(--pagedjs-margin-right); - } - - - .grid-page .grid-column{ - box-shadow: 1px 0px 0px 0px var(--grid-color); - grid-row: 1/end; - width: 100%; - justify-self: right; - - - } - - .grid-column-0{ - grid-column: 1; - box-shadow: -1px 0px 0px 0px var(--grid-color)!important; - justify-self: left; - } - - .grid-column-1{ grid-column: 1; } - .grid-column-2{ grid-column: 2; } - .grid-column-3{ grid-column: 3; } - .grid-column-4{ grid-column: 4; } - .grid-column-5{ grid-column: 5; } - .grid-column-6{ grid-column: 6; } - .grid-column-7{ grid-column: 7; } - .grid-column-8{ grid-column: 8; } - .grid-column-9{ grid-column: 9; } - .grid-column-10{ grid-column: 10; } - .grid-column-11{ grid-column: 11; } - .grid-column-12{ grid-column: 12; } -} - -.no-grid .grid-page{ - display: none; -} - - diff --git a/csspageweaver/plugins/grid/template.html b/csspageweaver/plugins/grid/template.html deleted file mode 100644 index 8b7adcc..0000000 --- a/csspageweaver/plugins/grid/template.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - -
-
- - -
-
- - -
-
- - -
\ No newline at end of file diff --git a/csspageweaver/plugins/followingNotes/.gitignore b/csspageweaver/plugins/gridColumn/.gitignore similarity index 100% rename from csspageweaver/plugins/followingNotes/.gitignore rename to csspageweaver/plugins/gridColumn/.gitignore diff --git a/csspageweaver/plugins/grid/README.md b/csspageweaver/plugins/gridColumn/README.md similarity index 100% rename from csspageweaver/plugins/grid/README.md rename to csspageweaver/plugins/gridColumn/README.md diff --git a/csspageweaver/plugins/gridColumn/config.json b/csspageweaver/plugins/gridColumn/config.json new file mode 100644 index 0000000..e67b7b0 --- /dev/null +++ b/csspageweaver/plugins/gridColumn/config.json @@ -0,0 +1,13 @@ +{ + "name": "Column grid", + "description": "", + "version": "1.0", + "ui": { + "title": "Column grid", + "description": "This Toogle a column grid", + "template": "template.html", + "toggle": true + }, + "stylesheet": "grid.css", + "script": "grid-ui.js" +} \ No newline at end of file diff --git a/csspageweaver/plugins/gridColumn/grid-ui.js b/csspageweaver/plugins/gridColumn/grid-ui.js new file mode 100644 index 0000000..df9983e --- /dev/null +++ b/csspageweaver/plugins/gridColumn/grid-ui.js @@ -0,0 +1,73 @@ +/** + * @name Grid + * @author Julie Blanc + * @see { @link https://gitlab.com/csspageweaver/plugins/grid/ } + */ + + +export default function gridEvents(id){ + let body = cssPageWeaver.ui.body; + let fileTitle = cssPageWeaver.docTitle; + let parameters = cssPageWeaver.features[id].parameters || {}; + let isParametersSet = Object.keys(parameters).length > 0; + + let grid = {}; + + // valeur par défaut + grid.default = { + steps: 7, + }; + + grid.toggle = {}; + grid.toggle.value = localStorage.getItem('gridColToggle_' + fileTitle) || 'no-grid-col'; + grid.toggle.input = document.querySelector(`#${id}-toggle`); + + grid.steps = {}; + grid.steps.value = parameters.steps || grid.default.steps; + grid.steps.input = document.querySelector('#steps-grid-col'); + + + /* Récupération de la session précédente si elle existe */ + + grid.steps.value = localStorage.getItem('gridColSteps_' + fileTitle) || grid.steps.value; + + grid.steps.input.value = grid.steps.value; + + + document.documentElement.style.setProperty('--grid-col-steps', grid.steps.value); + + + /* DOM edit */ + if(grid.toggle.value === "grid-col"){ + body.classList.add('grid-col'); // on indique qu'il y a la grille + grid.toggle.input.checked = true; + } else { + body.classList.remove('grid-col'); // grille désactivée + grid.toggle.input.checked = false; + } + + + + + /* Toggle event */ + grid.toggle.input.addEventListener("input", (e) => { + if(e.target.checked){ + body.classList.add('grid-col'); // grille activée + localStorage.setItem('gridColToggle_' + fileTitle, 'grid-col'); + } else { + body.classList.remove('grid-col'); // grille désactivée + localStorage.setItem('gridColToggle_' + fileTitle, 'no-grid-col'); + } + }); + + + /* Change grid steps on input */ + document.querySelector("#steps-grid-col").addEventListener("input", (e) => { + grid.steps.value = e.target.value; + document.documentElement.style.setProperty('--grid-col-steps', grid.steps.value); + localStorage.setItem('gridColSteps_' + fileTitle, grid.steps.value); + }); + + +} + diff --git a/csspageweaver/plugins/gridColumn/grid.css b/csspageweaver/plugins/gridColumn/grid.css new file mode 100644 index 0000000..bcaf92d --- /dev/null +++ b/csspageweaver/plugins/gridColumn/grid.css @@ -0,0 +1,36 @@ +:root { + --grid-col-color: #ee33d2; + --grid-light: #efefef; + + --grid-spacing: 56px; + --steps: 5; + --grid-position-x: 28px; + --grid-position-y: 0px; + + --grid-subdivisions: calc(var(--grid-spacing)/var(--steps)); + +} + + +@media screen{ + + + + body.grid-col .pagedjs_area { + + + + z-index: -1; + + box-shadow: 0px 0px 1px 0px var(--grid-col-color); + + background-image: repeating-linear-gradient(to right, var(--grid-col-color), var(--grid-col-color) 0.5px, transparent 0.5px, transparent); + background-size: calc(100%/var(--grid-col-steps)); + + } + + + +} + + diff --git a/csspageweaver/plugins/gridColumn/template.html b/csspageweaver/plugins/gridColumn/template.html new file mode 100644 index 0000000..a19bd76 --- /dev/null +++ b/csspageweaver/plugins/gridColumn/template.html @@ -0,0 +1,4 @@ +
+ + +
diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js index 2e70a1d..9ae7ad9 100644 --- a/js/snapToBaseline.js +++ b/js/snapToBaseline.js @@ -9,12 +9,12 @@ export default class snapToBaseline extends Handler { beforeParsed(content){ this.baseline = parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--baseline').trim()); - content.querySelectorAll('blockquote').forEach((bq) => { - const prev = bq.previousElementSibling; - if (!prev || prev.nodeName !== 'P') { - // bq.style.color = 'red'; - } - }); + // content.querySelectorAll('blockquote').forEach((bq) => { + // const prev = bq.previousElementSibling; + // if (!prev || prev.nodeName !== 'P') { + // // bq.style.color = 'red'; + // } + // }); } renderNode(node, sourceNode){ From d57050caeb8cbf189b7e80ea4174a157a0c92c4f Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 10:35:30 +0200 Subject: [PATCH 02/21] add blank page --- css/modules/_layout.scss | 4 ++-- css/modules/_text.scss | 3 +-- css/style.css | 2 -- css/style.css.map | 2 +- csspageweaver/manifest.json | 3 ++- js/addPagesNotes.js | 14 ++++++++++++++ 6 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 js/addPagesNotes.js diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 697ac17..10c37d5 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -49,8 +49,8 @@ $unit: calc($content-w/7); margin-left: $inside; margin-right: $outside; - background-image: url("/images/layout-1_20.png"); - background-size: 100% 100%; + // background-image: url("/images/layout-1_20.png"); + // background-size: 100% 100%; @bottom-left { diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 9ccb138..3609908 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -25,8 +25,7 @@ p{ position: relative; top: -2px; - // margin-left: $indent; - // padding-left: $indent*0.2; + padding-left: calc(var(--unit)*3); } diff --git a/css/style.css b/css/style.css index 17782ee..7e187f3 100644 --- a/css/style.css +++ b/css/style.css @@ -61,8 +61,6 @@ body { @page :right { margin-left: 20mm; margin-right: 14mm; - background-image: url("/images/layout-1_20.png"); - background-size: 100% 100%; @bottom-left { content: string(chapterCount); font-family: var(--font-sans); diff --git a/css/style.css.map b/css/style.css.map index 67820a2..91871ab 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 63be0f6..3f6aea9 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -23,7 +23,8 @@ }, "hook": [ "/js/counters.js", - "/js/these.js" + "/js/these.js", + "/js/addPagesNotes.js" ] } diff --git a/js/addPagesNotes.js b/js/addPagesNotes.js new file mode 100644 index 0000000..a70484e --- /dev/null +++ b/js/addPagesNotes.js @@ -0,0 +1,14 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class addPagesNotes extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + afterPageLayout(pageElement, page, breakToken, chunker) { + if (page.element.classList.contains('pagedjs_left_page')) { + let blankPage = chunker.addPage(); + blankPage.element.classList.add('blank-page'); + } + } +} From 727f3839f36e6c01d20b7d5d6eb6a8f29d0412c4 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 14:48:49 +0200 Subject: [PATCH 03/21] titles h1 --- css/modules/_titles.scss | 5 ++++- css/style.css | 4 +++- css/style.css.map | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index dadbf13..2f0e312 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -64,9 +64,10 @@ h1{ font-weight: 200; - font-size: 115px; + font-size: 105px; line-height: 0.9; hyphens: auto; + hyphenate-limit-chars: 8 4 3; break-inside: avoid; @@ -76,6 +77,8 @@ justify-content: space-between; text-align: center; + text-wrap: balance; + diff --git a/css/style.css b/css/style.css index 60c38b9..f91719c 100644 --- a/css/style.css +++ b/css/style.css @@ -407,15 +407,17 @@ ol[type="1"].ol-clone { } #section__content h1 { font-weight: 200; - font-size: 115px; + font-size: 105px; line-height: 0.9; hyphens: auto; + hyphenate-limit-chars: 8 4 3; -moz-column-break-inside: avoid; break-inside: avoid; display: flex; flex-direction: column; justify-content: space-between; text-align: center; + text-wrap: balance; } #section__content h1 span { display: block; diff --git a/css/style.css.map b/css/style.css.map index 58b7aa2..8f512bd 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file From 1d747cc77b257cb4bc43c4dabcdd50aa6c446f19 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 16:00:53 +0200 Subject: [PATCH 04/21] move note to prev page --- css/modules/_layout.scss | 21 ++++-- css/modules/_notes.scss | 4 ++ css/modules/_titles.scss | 20 +++--- css/style.css | 34 ++++----- css/style.css.map | 2 +- css/style.scss | 2 + .../plugins/inlineNotes/inlineNotes.js | 1 - js/addPagesNotes.js | 70 ++++++++++++++++++- 8 files changed, 114 insertions(+), 40 deletions(-) create mode 100644 css/modules/_notes.scss diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 10c37d5..c9033bd 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -139,7 +139,7 @@ $unit: calc($content-w/7); #section__content{ break-before: right; - + } @@ -157,11 +157,11 @@ $unit: calc($content-w/7); // Title chapter -#section__content h1{ - break-before: left; - break-after: page; - page: chapter; -} +// #section__content h1{ +// break-before: left; +// break-after: page; +// page: chapter; +// } #section__content h1 .h1-count{ string-set: chapterCount content(text); } @@ -171,3 +171,12 @@ $unit: calc($content-w/7); } +#section__content{ + break-before: left; +} + + +#section__content h1:first-of-type{ + break-before: right; + // background-color: red; +} \ No newline at end of file diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss new file mode 100644 index 0000000..8478b98 --- /dev/null +++ b/css/modules/_notes.scss @@ -0,0 +1,4 @@ +.body-note{ + display: block; + color: red; +} \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index dadbf13..6434b44 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -1,13 +1,13 @@ #section__content{ - // margin-left: 28mm; + + - h1{ - - column-span: all; - height: $content-h; + h1:first-of-type{ + // column-span: all; + // height: $content-h; } @@ -68,13 +68,13 @@ line-height: 0.9; hyphens: auto; - break-inside: avoid; + // break-inside: avoid; - display: flex; - flex-direction: column; - justify-content: space-between; - text-align: center; + // display: flex; + // flex-direction: column; + // justify-content: space-between; + // text-align: center; diff --git a/css/style.css b/css/style.css index 7e187f3..9c1645c 100644 --- a/css/style.css +++ b/css/style.css @@ -244,14 +244,6 @@ body { break-before: page; } -#section__content h1 { - -moz-column-break-before: left; - break-before: left; - -moz-column-break-after: page; - break-after: page; - page: chapter; -} - #section__content h1 .h1-count { string-set: chapterCount content(text); } @@ -260,6 +252,16 @@ body { string-set: chapter content(text); } +#section__content { + -moz-column-break-before: left; + break-before: left; +} + +#section__content h1:first-of-type { + -moz-column-break-before: right; + break-before: right; +} + sup { line-height: 0; } @@ -353,11 +355,6 @@ ol[type="1"].ol-clone { left: 73mm; } -#section__content h1 { - -moz-column-span: all; - column-span: all; - height: 215mm; -} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); } @@ -402,12 +399,6 @@ ol[type="1"].ol-clone { font-size: 115px; line-height: 0.9; hyphens: auto; - -moz-column-break-inside: avoid; - break-inside: avoid; - display: flex; - flex-direction: column; - justify-content: space-between; - text-align: center; } #section__content h1 span { display: block; @@ -491,6 +482,11 @@ ol[type="1"].ol-clone { color: red; } +.body-note { + display: block; + color: red; +} + #toc_container { -moz-column-break-before: page; break-before: page; diff --git a/css/style.css.map b/css/style.css.map index 91871ab..8e64015 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index f9799c0..43dd27e 100644 --- a/css/style.scss +++ b/css/style.scss @@ -6,5 +6,7 @@ @import 'modules/num-paragraph'; @import 'modules/titles'; @import 'modules/list-of-abbr'; +@import 'modules/notes'; + // @import 'modules/followingNotes'; @import 'modules/toc'; \ No newline at end of file diff --git a/csspageweaver/plugins/inlineNotes/inlineNotes.js b/csspageweaver/plugins/inlineNotes/inlineNotes.js index a68bbe0..6b1e72c 100644 --- a/csspageweaver/plugins/inlineNotes/inlineNotes.js +++ b/csspageweaver/plugins/inlineNotes/inlineNotes.js @@ -91,7 +91,6 @@ function createNotes(content, input, type){ inline_note.innerHTML = unwrapBlockChildren(note).innerHTML; call.after(inline_note); - call.parentElement.removeChild(call); }) diff --git a/js/addPagesNotes.js b/js/addPagesNotes.js index a70484e..863b2e3 100644 --- a/js/addPagesNotes.js +++ b/js/addPagesNotes.js @@ -5,10 +5,74 @@ export default class addPagesNotes extends Handler { super(chunker, polisher, caller); } + + afterParsed(parsed){ + let notes = parsed.querySelectorAll(".inline-note"); + notes.forEach(function (note, index) { + console.log(note); + note.style.position = "absolute"; + note.style.top = "0px"; + note.style.left = "0px"; + note.style.height = "0px"; + + let counter = note.getAttribute('data-counter-note'); + + let call = document.createElement('span'); + call.classList.add('note_call'); + call.textContent = counter; + note.insertAdjacentElement('beforebegin', call); + + note.classList.replace('inline-note', 'body-note'); + let marker = document.createElement('span'); + marker.classList.add('note_marker'); + marker.textContent = counter + ". "; + note.prepend(marker); + }); + + } + afterPageLayout(pageElement, page, breakToken, chunker) { - if (page.element.classList.contains('pagedjs_left_page')) { - let blankPage = chunker.addPage(); - blankPage.element.classList.add('blank-page'); + + + // move notes into previous page + let notes = pageElement.querySelectorAll(".body-note"); + if(notes){ + let container = document.createElement('div'); + container.classList.add('container-note'); + notes.forEach(function (note, index) { + container.appendChild(note); + note.style.position = "relative"; + note.style.height = "auto"; + }); + + let pageNum = parseInt(pageElement.getAttribute('data-page-number')); + let prevPage = document.querySelector('[data-page-number="' + (pageNum - 1) + '"]'); + if (prevPage) { + let content = prevPage.querySelector("#section_content"); + if(content){ + content.appendChild(container); + }else{ + prevPage.querySelector('.pagedjs_page_content').appendChild(container); + } + + } + + } + + + + // create blank left page + if ( + page.element.classList.contains('pagedjs_right_page') && + page.element.querySelector('[data-id="section__content"]') + ) { + + let notesPage = chunker.addPage(); + notesPage.element.classList.add('page-notes'); + + // Make margin boxes visible (hasContent is set during polishing, which skips added pages) + notesPage.element.querySelector('.pagedjs_margin-bottom-left')?.classList.add('hasContent'); + notesPage.element.querySelector('.pagedjs_margin-bottom-center')?.classList.add('hasContent'); } } } From bc2c5ffccb8e1ce64c2739c0163aef184d80a606 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 17:42:46 +0200 Subject: [PATCH 05/21] style notes --- css/modules/_layout.scss | 2 ++ css/modules/_notes.scss | 34 +++++++++++++++++++++++++++++++++- css/modules/_titles.scss | 3 +++ css/style.css | 32 +++++++++++++++++++++++++++++++- css/style.css.map | 2 +- js/addPagesNotes.js | 5 ++++- 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index c9033bd..b856165 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -28,6 +28,8 @@ $unit: calc($content-w/7); margin-left: $outside; margin-right: $inside; + // background-image: url("/images/layout-1_3.png"); + // background-size: 100% 100%; @bottom-left { diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss index 8478b98..925400f 100644 --- a/css/modules/_notes.scss +++ b/css/modules/_notes.scss @@ -1,4 +1,36 @@ +.pagedjs_page_content{ + position: relative; +} + + +.container-note{ + padding-left: calc(var(--unit)*2); +} +.container-note-first{ + position: absolute; + top: 0; + left: 0; + // color: red; +} + .body-note{ display: block; - color: red; + + font-family: var(--font-sans); + font-size: var(--fs-small); + line-height: calc(var(--baseline)*0.75); + + // margin-top: calc(var(--baseline)*0.25); + + hyphens: auto; + hyphenate-limit-chars: 7 3 4; + hyphenate-limit-lines: 2; + hyphenate-limit-zone: 8%; + word-spacing: -0.004em; + text-align: justify; + +} + +.note_marker{ + font-weight: bold; } \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 6434b44..81e9e00 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -10,6 +10,9 @@ // height: $content-h; } + h1{ + break-before: page; + } h2, h3, h4, h5, h6 { diff --git a/css/style.css b/css/style.css index 9c1645c..7b920f1 100644 --- a/css/style.css +++ b/css/style.css @@ -355,6 +355,10 @@ ol[type="1"].ol-clone { left: 73mm; } +#section__content h1 { + -moz-column-break-before: page; + break-before: page; +} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); } @@ -482,9 +486,35 @@ ol[type="1"].ol-clone { color: red; } +.pagedjs_page_content { + position: relative; +} + +.container-note { + padding-left: calc(var(--unit) * 2); +} + +.container-note-first { + position: absolute; + top: 0; + left: 0; +} + .body-note { display: block; - color: red; + font-family: var(--font-sans); + font-size: var(--fs-small); + line-height: calc(var(--baseline) * 0.75); + hyphens: auto; + hyphenate-limit-chars: 7 3 4; + hyphenate-limit-lines: 2; + hyphenate-limit-zone: 8%; + word-spacing: -0.004em; + text-align: justify; +} + +.note_marker { + font-weight: bold; } #toc_container { diff --git a/css/style.css.map b/css/style.css.map index 8e64015..a4a2c87 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/addPagesNotes.js b/js/addPagesNotes.js index 863b2e3..b896b8d 100644 --- a/js/addPagesNotes.js +++ b/js/addPagesNotes.js @@ -40,9 +40,12 @@ export default class addPagesNotes extends Handler { let container = document.createElement('div'); container.classList.add('container-note'); notes.forEach(function (note, index) { - container.appendChild(note); + container.appendChild(note); note.style.position = "relative"; note.style.height = "auto"; + if (note.getAttribute('data-counter-note') === '1') { + container.classList.add('container-note-first'); + } }); let pageNum = parseInt(pageElement.getAttribute('data-page-number')); From 656e58b0f4dd4f08c27e648e90e9d111071423fa Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 17:44:10 +0200 Subject: [PATCH 06/21] style-note --- css/modules/_titles.scss | 13 ++----------- css/style.css | 3 ++- css/style.css.map | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 81e9e00..1011904 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -67,19 +67,10 @@ h1{ font-weight: 200; - font-size: 115px; + font-size: 105px; line-height: 0.9; hyphens: auto; - - // break-inside: avoid; - - - // display: flex; - // flex-direction: column; - // justify-content: space-between; - // text-align: center; - - + hyphenate-limit-chars: 8 4 3; span{ diff --git a/css/style.css b/css/style.css index 7b920f1..360bda7 100644 --- a/css/style.css +++ b/css/style.css @@ -400,9 +400,10 @@ ol[type="1"].ol-clone { } #section__content h1 { font-weight: 200; - font-size: 115px; + font-size: 105px; line-height: 0.9; hyphens: auto; + hyphenate-limit-chars: 8 4 3; } #section__content h1 span { display: block; diff --git a/css/style.css.map b/css/style.css.map index a4a2c87..dd49f2f 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file From 5b1113c98842d92652936fb4cebfcd83752e8386 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 18:15:07 +0200 Subject: [PATCH 07/21] title same page notes --- css/modules/_notes.scss | 6 +++++- css/modules/_titles.scss | 15 +++++++++++++++ css/style.css | 10 ++++++++++ css/style.css.map | 2 +- csspageweaver/manifest.json | 1 + js/addPagesNotes.js | 14 +++++++++++--- js/beforeAll.js | 21 +++++++++++++++++++++ 7 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 js/beforeAll.js diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss index 925400f..80bdf01 100644 --- a/css/modules/_notes.scss +++ b/css/modules/_notes.scss @@ -6,6 +6,8 @@ .container-note{ padding-left: calc(var(--unit)*2); } + +.page-with-h1 .before-h1, .container-note-first{ position: absolute; top: 0; @@ -33,4 +35,6 @@ .note_marker{ font-weight: bold; -} \ No newline at end of file +} + + diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 1011904..697c120 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -10,8 +10,23 @@ // height: $content-h; } + // .before-h1{ + // break-after: page; + // } + h1{ break-before: page; + break-after: page; + + position: absolute; + left: 0; + top: 0; + + height: $content-h; + // background-color: red; + display: flex; + flex-direction: column; + justify-content: space-between; } diff --git a/css/style.css b/css/style.css index 360bda7..7d53b38 100644 --- a/css/style.css +++ b/css/style.css @@ -358,6 +358,15 @@ ol[type="1"].ol-clone { #section__content h1 { -moz-column-break-before: page; break-before: page; + -moz-column-break-after: page; + break-after: page; + position: absolute; + left: 0; + top: 0; + height: 215mm; + display: flex; + flex-direction: column; + justify-content: space-between; } #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); @@ -495,6 +504,7 @@ ol[type="1"].ol-clone { padding-left: calc(var(--unit) * 2); } +.page-with-h1 .before-h1, .container-note-first { position: absolute; top: 0; diff --git a/css/style.css.map b/css/style.css.map index dd49f2f..5854c94 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 3f6aea9..e24d079 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -22,6 +22,7 @@ } }, "hook": [ + "/js/beforeAll.js", "/js/counters.js", "/js/these.js", "/js/addPagesNotes.js" diff --git a/js/addPagesNotes.js b/js/addPagesNotes.js index b896b8d..3a4763f 100644 --- a/js/addPagesNotes.js +++ b/js/addPagesNotes.js @@ -9,7 +9,7 @@ export default class addPagesNotes extends Handler { afterParsed(parsed){ let notes = parsed.querySelectorAll(".inline-note"); notes.forEach(function (note, index) { - console.log(note); + // console.log(note); note.style.position = "absolute"; note.style.top = "0px"; note.style.left = "0px"; @@ -33,6 +33,10 @@ export default class addPagesNotes extends Handler { afterPageLayout(pageElement, page, breakToken, chunker) { + // add class if page contains h1 + if (pageElement.querySelector('h1')) { + pageElement.classList.add('page-with-h1'); + } // move notes into previous page let notes = pageElement.querySelectorAll(".body-note"); @@ -51,9 +55,12 @@ export default class addPagesNotes extends Handler { let pageNum = parseInt(pageElement.getAttribute('data-page-number')); let prevPage = document.querySelector('[data-page-number="' + (pageNum - 1) + '"]'); if (prevPage) { - let content = prevPage.querySelector("#section_content"); + let content = prevPage.querySelector('[data-id="section__content"]'); + let contentId = prevPage.querySelector('#section__content'); if(content){ content.appendChild(container); + }else if(contentId){ + contentId.appendChild(container); }else{ prevPage.querySelector('.pagedjs_page_content').appendChild(container); } @@ -67,7 +74,8 @@ export default class addPagesNotes extends Handler { // create blank left page if ( page.element.classList.contains('pagedjs_right_page') && - page.element.querySelector('[data-id="section__content"]') + page.element.querySelector('[data-id="section__content"]') && + !pageElement.querySelector('.before-h1') ) { let notesPage = chunker.addPage(); diff --git a/js/beforeAll.js b/js/beforeAll.js new file mode 100644 index 0000000..da463be --- /dev/null +++ b/js/beforeAll.js @@ -0,0 +1,21 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class beforeAll extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + beforeParsed(content){ + let headings = content.querySelectorAll('#section__content h1'); + headings.forEach(function (h1) { + let div = document.createElement('div'); + div.classList.add('before-h1'); + h1.insertAdjacentElement('beforebegin', div); + }); + } + + + +} + + From 92b92a114649c5aee8d44ce87ac51daa184f4126 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Fri, 17 Apr 2026 18:06:54 +0200 Subject: [PATCH 08/21] titles --- css/modules/_notes.scss | 10 +++++ css/modules/_num-paragraph.scss | 4 +- css/modules/_text.scss | 11 +++++- css/modules/_titles.scss | 53 ++++++++++++++------------ css/modules/_var.scss | 1 + css/style.css | 66 +++++++++++++++++++++++---------- css/style.css.map | 2 +- csspageweaver/manifest.json | 3 +- 8 files changed, 101 insertions(+), 49 deletions(-) diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss index 80bdf01..a6e537e 100644 --- a/css/modules/_notes.scss +++ b/css/modules/_notes.scss @@ -38,3 +38,13 @@ } + +.note_call{ + + font-family: var(--font-sans); + font-size: var(--fs-small); + font-weight: bold; + line-height: 1; + position: relative; + top: -4px; +} diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss index 9ddcafb..7c696a8 100644 --- a/css/modules/_num-paragraph.scss +++ b/css/modules/_num-paragraph.scss @@ -6,9 +6,9 @@ ol[type="1"]{ list-style-type: none; break-after: avoid; position: absolute; - left: calc(var(--unit)*2); + left: calc(var(--unit)*1); &::after{ - content: attr(start); + content: attr(start)!important; display: block; font-size: var(--fs-small); opacity: 0.5; diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 3609908..5716bc4 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -27,7 +27,7 @@ p{ top: -2px; - padding-left: calc(var(--unit)*3); + padding-left: calc(var(--unit)*2); } p, li{ @@ -51,7 +51,14 @@ p, li{ blockquote{ - font-family: var(--font-quote); + // font-family: var(--font-quote); + border-left: 0.5px solid black; + margin-left: calc(var(--unit)*1.5); + +} + +blockquote p{ + padding-left: 2mm; } // blockquote u{ diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 697c120..6ebd364 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -102,56 +102,61 @@ font-size: 22px; font-weight: 200; text-transform: uppercase; - text-align: center; + text-align: left; line-height: calc(var(--baseline)*1.4); - margin-top: 4mm; - padding-bottom: 4mm; + margin-top: 6mm; + padding-bottom: 6mm; hyphens: auto; + padding-left: calc(var(--unit)*1); + position: relative; + max-width: calc(var(--unit)*5); + text-wrap: balance; &::before{ display: block; + position: absolute; + left: 0; } - // &::after{ - // content: ''; - // display: block; - // width: 100%; - // border-bottom: 1px solid currentColor; - // position: relative; - // top: calc(var(--baseline)*-2.5); - // opacity: 0.2; - // } } h3{ font-weight: 500; - font-size: 1em; - line-height: calc(var(--baseline)*0.75); + font-size: var(--fs-medium); + line-height: 1.1; + padding-left: calc(var(--unit)*1); + position: relative; - margin-top: 4mm; - padding-bottom: 4mm; - padding-left: $indent; - text-align: center; + margin-top: 6mm; + padding-bottom: 6mm; + margin-right: 8mm; &::before{ display: block; + position: absolute; + left: 0; } } h4{ - font-weight: 500; + font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline)*0.75); + line-height: var(--baseline); position: relative; - margin-top: calc(var(--baseline)*1); - padding-bottom: calc(var(--baseline)*0.5); - padding-left: $indent*2; + margin-top: 6mm; + padding-bottom: 6mm; + margin-right: 20mm; + padding-left: calc(var(--unit)*2); + text-decoration: 0.5px underline; + text-underline-offset: 3px; + &::before{ display: block; position: absolute; - left: $indent; + left: calc(var(--unit)*1); + text-decoration: none; } } diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 0007669..b602cc3 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -4,6 +4,7 @@ --font-quote: 'Louize', sans-serif; --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 12px; + --fs-medium: 15px; --fs-small: 9.8px; --baseline: 18px; --indent: 26px; diff --git a/css/style.css b/css/style.css index 7d53b38..c954596 100644 --- a/css/style.css +++ b/css/style.css @@ -5,6 +5,7 @@ --font-quote: 'Louize', sans-serif; --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 12px; + --fs-medium: 15px; --fs-small: 9.8px; --baseline: 18px; --indent: 26px; @@ -286,7 +287,7 @@ p { widows: 2; position: relative; top: -2px; - padding-left: calc(var(--unit) * 3); + padding-left: calc(var(--unit) * 2); } p, li { @@ -304,7 +305,12 @@ p, li { } blockquote { - font-family: var(--font-quote); + border-left: 0.5px solid black; + margin-left: calc(var(--unit) * 1.5); +} + +blockquote p { + padding-left: 2mm; } ul { @@ -337,10 +343,10 @@ ol[type="1"] { -moz-column-break-after: avoid; break-after: avoid; position: absolute; - left: calc(var(--unit) * 2); + left: calc(var(--unit) * 1); } ol[type="1"]::after { - content: attr(start); + content: attr(start) !important; display: block; font-size: var(--fs-small); opacity: 0.5; @@ -421,41 +427,54 @@ ol[type="1"].ol-clone { font-size: 22px; font-weight: 200; text-transform: uppercase; - text-align: center; + text-align: left; line-height: calc(var(--baseline) * 1.4); - margin-top: 4mm; - padding-bottom: 4mm; + margin-top: 6mm; + padding-bottom: 6mm; hyphens: auto; + padding-left: calc(var(--unit) * 1); + position: relative; + max-width: calc(var(--unit) * 5); + text-wrap: balance; } #section__content h2::before { display: block; + position: absolute; + left: 0; } #section__content h3 { font-weight: 500; - font-size: 1em; - line-height: calc(var(--baseline) * 0.75); + font-size: var(--fs-medium); + line-height: 1.1; + padding-left: calc(var(--unit) * 1); position: relative; - margin-top: 4mm; - padding-bottom: 4mm; - padding-left: 10mm; - text-align: center; + margin-top: 6mm; + padding-bottom: 6mm; + margin-right: 8mm; } #section__content h3::before { display: block; + position: absolute; + left: 0; } #section__content h4 { - font-weight: 500; + font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline) * 0.75); + line-height: var(--baseline); position: relative; - margin-top: calc(var(--baseline) * 1); - padding-bottom: calc(var(--baseline) * 0.5); - padding-left: 20mm; + margin-top: 6mm; + padding-bottom: 6mm; + margin-right: 20mm; + padding-left: calc(var(--unit) * 2); + -webkit-text-decoration: 0.5px underline; + text-decoration: 0.5px underline; + text-underline-offset: 3px; } #section__content h4::before { display: block; position: absolute; - left: 10mm; + left: calc(var(--unit) * 1); + text-decoration: none; } #section__content h5 { font-weight: normal; @@ -528,6 +547,15 @@ ol[type="1"].ol-clone { font-weight: bold; } +.note_call { + font-family: var(--font-sans); + font-size: var(--fs-small); + font-weight: bold; + line-height: 1; + position: relative; + top: -4px; +} + #toc_container { -moz-column-break-before: page; break-before: page; diff --git a/css/style.css.map b/css/style.css.map index 5854c94..b6a61bc 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index e24d079..0a02b13 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -4,7 +4,8 @@ "gridColumn", "marginBox", "imposition","spread","previewPage","reloadInPlace", - "inlineNotes" + "inlineNotes", + "tableOfContent" ], "pluginsParameters":{}, "css": [ From 07047d97eaab110fd5f07f41a240b4ee3420ea8c Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 13:52:57 +0200 Subject: [PATCH 09/21] add intro and chapter wrapper --- css/modules/_layout.scss | 33 ++++------- css/modules/_titles.scss | 3 +- css/style.css | 9 +-- css/style.css.map | 2 +- csspageweaver/manifest.json | 1 - index.html | 1 + js/beforeAll.js | 115 ++++++++++++++++++++++++++++++++++-- js/these.js | 21 +------ 8 files changed, 130 insertions(+), 55 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index b856165..dc39435 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -150,20 +150,6 @@ $unit: calc($content-w/7); } -// #section__content{ -// columns: 2; -// column-gap: $gap; -// column-fill: auto; -// } - - -// Title chapter - -// #section__content h1{ -// break-before: left; -// break-after: page; -// page: chapter; -// } #section__content h1 .h1-count{ string-set: chapterCount content(text); } @@ -172,13 +158,20 @@ $unit: calc($content-w/7); string-set: chapter content(text); } - -#section__content{ +.chapter{ break-before: left; } +.intro{ + color: red; +} -#section__content h1:first-of-type{ - break-before: right; - // background-color: red; -} \ No newline at end of file + +// #section__content{ +// break-before: left; +// } + + +// #section__content h1:first-of-type{ +// break-before: right; +// } \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 6ebd364..bc3d819 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -2,6 +2,7 @@ #section__content{ + @@ -15,7 +16,7 @@ // } h1{ - break-before: page; + // break-before: page; break-after: page; position: absolute; diff --git a/css/style.css b/css/style.css index c954596..0ac9e72 100644 --- a/css/style.css +++ b/css/style.css @@ -253,14 +253,13 @@ body { string-set: chapter content(text); } -#section__content { +.chapter { -moz-column-break-before: left; break-before: left; } -#section__content h1:first-of-type { - -moz-column-break-before: right; - break-before: right; +.intro { + color: red; } sup { @@ -362,8 +361,6 @@ ol[type="1"].ol-clone { } #section__content h1 { - -moz-column-break-before: page; - break-before: page; -moz-column-break-after: page; break-after: page; position: absolute; diff --git a/css/style.css.map b/css/style.css.map index b6a61bc..881eab3 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 0a02b13..5fb973f 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -25,7 +25,6 @@ "hook": [ "/js/beforeAll.js", "/js/counters.js", - "/js/these.js", "/js/addPagesNotes.js" ] } diff --git a/index.html b/index.html index f0dfb33..f445339 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ Höchstpersönlichkeit + diff --git a/js/beforeAll.js b/js/beforeAll.js index da463be..2644d2f 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -6,12 +6,85 @@ export default class beforeAll extends Handler { } beforeParsed(content){ - let headings = content.querySelectorAll('#section__content h1'); - headings.forEach(function (h1) { - let div = document.createElement('div'); - div.classList.add('before-h1'); - h1.insertAdjacentElement('beforebegin', div); - }); + + + thesis(content); + + + // for break + // let headings = content.querySelectorAll('#section__content h1'); + // headings.forEach(function (h1) { + // let div = document.createElement('div'); + // div.classList.add('before-h1'); + // h1.insertAdjacentElement('beforebegin', div); + // }); + + // Wrap h1 and following content in .chapter sections + const sectionContent = content.querySelector('#section__content'); + if (sectionContent) { + const h1s = sectionContent.querySelectorAll(':scope > h1'); + h1s.forEach(h1 => { + // Create chapter section + const chapter = document.createElement('section'); + chapter.classList.add('chapter'); + + // Insert chapter before h1 + h1.parentNode.insertBefore(chapter, h1); + + // Move h1 into chapter + chapter.appendChild(h1); + + // Move following siblings until next h1 or end + let nextElement = chapter.nextElementSibling; + while (nextElement && nextElement.tagName.toLowerCase() !== 'h1') { + const current = nextElement; + nextElement = nextElement.nextElementSibling; + chapter.appendChild(current); + } + }); + + // Wrap content between h1 and h2 in .intro if chapter doesn't contain .p-these + const chapters = sectionContent.querySelectorAll('.chapter'); + chapters.forEach(chapter => { + if (chapter.querySelector('.p-these')) { + // Case 1: Chapter has thesis + chapter.classList.add('has-thesis'); + } else { + const h1 = chapter.querySelector('h1'); + const nextHeading = chapter.querySelector('h2, h3, h4, h5, h6'); + + if (h1) { + const intro = document.createElement('div'); + intro.classList.add('intro'); + + if (nextHeading) { + // Case 2: Has heading, wrap all content between h1 and that heading + h1.parentNode.insertBefore(intro, h1.nextSibling); + + let current = intro.nextSibling; + while (current && current !== nextHeading) { + const next = current.nextSibling; + intro.appendChild(current); + current = next; + } + chapter.classList.add('has-intro'); + } else { + // Case 3: No heading, wrap only the first paragraph after h1 + let current = h1.nextSibling; + while (current && current.tagName.toLowerCase() !== 'p') { + current = current.nextSibling; + } + + if (current) { + current.parentNode.insertBefore(intro, current); + intro.appendChild(current); + chapter.classList.add('has-intro-1-paragraph'); + } + } + } + } + }); + } } @@ -19,3 +92,33 @@ export default class beforeAll extends Handler { } +function thesis(content){ + const strongs = content.querySelectorAll('strong'); + strongs.forEach(strong => { + if (/^these\s+\d+/i.test(strong.textContent.trim())) { + const parent = strong.closest('p'); + if (parent) { + const thesisDiv = document.createElement('div'); + thesisDiv.classList.add('thesis-title'); + const thesisP = document.createElement('p'); + thesisP.textContent = strong.textContent; + thesisDiv.appendChild(thesisP); + parent.parentNode.insertBefore(thesisDiv, parent); + strong.remove(); + + parent.classList.add('p-these'); + } + } + }); + + const theseParas = content.querySelectorAll('.p-these'); + theseParas.forEach(p => { + let next = p.nextElementSibling; + while (next && next.tagName.toLowerCase() === 'ol') { + next = next.nextElementSibling; + } + if (!next || !next.classList.contains('p-these')) { + p.classList.add('p-these-last'); + } + }); +} \ No newline at end of file diff --git a/js/these.js b/js/these.js index 480dba1..8c6321c 100644 --- a/js/these.js +++ b/js/these.js @@ -7,26 +7,7 @@ export default class thesis extends Handler { beforeParsed(content){ - const strongs = content.querySelectorAll('strong'); - strongs.forEach(strong => { - if (/^these\s+\d+/i.test(strong.textContent.trim())) { - const parent = strong.closest('p'); - if (parent) { - parent.classList.add('p-these'); - } - } - }); - - const theseParas = content.querySelectorAll('.p-these'); - theseParas.forEach(p => { - let next = p.nextElementSibling; - while (next && next.tagName.toLowerCase() === 'ol') { - next = next.nextElementSibling; - } - if (!next || !next.classList.contains('p-these')) { - p.classList.add('p-these-last'); - } - }); + } From 0d56ca3d0d69736bbb5b1d73684dc44c08c6a4bc Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 15:40:30 +0200 Subject: [PATCH 10/21] wrap intro + add chapterEnd --- css/modules/_layout.scss | 28 +---- css/modules/_notes.scss | 1 + css/modules/_num-paragraph.scss | 7 +- css/modules/_text.scss | 39 +++++-- css/modules/_titles.scss | 13 ++- css/modules/_var.scss | 3 +- css/style.css | 58 ++++----- css/style.css.map | 2 +- js/addPagesNotes.js | 23 ++-- js/beforeAll.js | 201 ++++++++++++++++++++------------ 10 files changed, 217 insertions(+), 158 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index dc39435..31a4cf1 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -11,7 +11,9 @@ $indent: 10mm; $unit: calc($content-w/7); :root{ - --unit: #{$unit}; + // --content-w: #{$content-w}; + // --unit: calc(var(--content-w)/7); + --unit: 80px; } @@ -139,15 +141,6 @@ $unit: calc($content-w/7); } -#section__content{ - break-before: right; - -} - - -.page-break{ - break-before: page; -} #section__content h1 .h1-count{ @@ -159,19 +152,8 @@ $unit: calc($content-w/7); } .chapter{ - break-before: left; -} - -.intro{ - color: red; + page: chapter; + break-before: page; } -// #section__content{ -// break-before: left; -// } - - -// #section__content h1:first-of-type{ -// break-before: right; -// } \ No newline at end of file diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss index a6e537e..be8a713 100644 --- a/css/modules/_notes.scss +++ b/css/modules/_notes.scss @@ -12,6 +12,7 @@ position: absolute; top: 0; left: 0; + color: blue; // color: red; } diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss index 7c696a8..9e5a78e 100644 --- a/css/modules/_num-paragraph.scss +++ b/css/modules/_num-paragraph.scss @@ -17,11 +17,8 @@ ol[type="1"]{ -ol[type="1"].ol-clone{ - break-before: column; - break-after: avoid; - top: 0; - left: calc($content-w/2 + $gap/2) +.intro ol[type="1"]{ + left: 0px; } diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 5716bc4..8f918a6 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -61,16 +61,6 @@ blockquote p{ padding-left: 2mm; } -// blockquote u{ -// text-decoration: none; -// text-transform: uppercase; -// font-size: var(--fs-small); -// color: red; -// } - -// u{ -// color: red; -// } ul{ @@ -79,6 +69,9 @@ ul{ + +// THESE -------------------------------------------------- + .p-these{ font-weight: 500; margin-bottom: calc(var(--baseline)*0.5); @@ -97,3 +90,29 @@ ul{ margin-bottom: calc(var(--baseline)*1); } + + +// INTRO -------------------------------------------------- + + + + +.has-intro-1-paragraph .intro, +.has-intro .intro{ + break-after: right; +} +.intro{ + color: red; + p{ + font-size: var(--fs-intro); + padding-left: calc(var(--unit)*1); + line-height: 1.4; + } +} + + +.chapter-end{ + width: 20px; + height: 20px; + background-color: green; +} \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index bc3d819..b3b7dde 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -16,18 +16,21 @@ // } h1{ - // break-before: page; - break-after: page; - position: absolute; - left: 0; - top: 0; + + // break-before: page; + // break-after: page; + + // position: absolute; + // left: 0; + // top: 0; height: $content-h; // background-color: red; display: flex; flex-direction: column; justify-content: space-between; + // display: none; } diff --git a/css/modules/_var.scss b/css/modules/_var.scss index b602cc3..3035a68 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -4,8 +4,9 @@ --font-quote: 'Louize', sans-serif; --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 12px; - --fs-medium: 15px; + --fs-medium: 15px; --fs-small: 9.8px; + --fs-intro: 16.5px; --baseline: 18px; --indent: 26px; --fs-num: 12px; diff --git a/css/style.css b/css/style.css index 0ac9e72..4078dbc 100644 --- a/css/style.css +++ b/css/style.css @@ -7,6 +7,7 @@ --font-size: 12px; --fs-medium: 15px; --fs-small: 9.8px; + --fs-intro: 16.5px; --baseline: 18px; --indent: 26px; --fs-num: 12px; @@ -33,7 +34,7 @@ body { } :root { - --unit: 20.2857142857mm; + --unit: 80px; } @media print { @@ -235,16 +236,6 @@ body { } } } -#section__content { - -moz-column-break-before: right; - break-before: right; -} - -.page-break { - -moz-column-break-before: page; - break-before: page; -} - #section__content h1 .h1-count { string-set: chapterCount content(text); } @@ -254,12 +245,9 @@ body { } .chapter { - -moz-column-break-before: left; - break-before: left; -} - -.intro { - color: red; + page: chapter; + -moz-column-break-before: page; + break-before: page; } sup { @@ -333,6 +321,27 @@ ul { margin-bottom: calc(var(--baseline) * 1); } +.has-intro-1-paragraph .intro, +.has-intro .intro { + -moz-column-break-after: right; + break-after: right; +} + +.intro { + color: red; +} +.intro p { + font-size: var(--fs-intro); + padding-left: calc(var(--unit) * 1); + line-height: 1.4; +} + +.chapter-end { + width: 20px; + height: 20px; + background-color: green; +} + [data-id=section__content] { position: relative; } @@ -351,21 +360,11 @@ ol[type="1"]::after { opacity: 0.5; } -ol[type="1"].ol-clone { - -moz-column-break-before: column; - break-before: column; - -moz-column-break-after: avoid; - break-after: avoid; - top: 0; - left: 73mm; +.intro ol[type="1"] { + left: 0px; } #section__content h1 { - -moz-column-break-after: page; - break-after: page; - position: absolute; - left: 0; - top: 0; height: 215mm; display: flex; flex-direction: column; @@ -525,6 +524,7 @@ ol[type="1"].ol-clone { position: absolute; top: 0; left: 0; + color: blue; } .body-note { diff --git a/css/style.css.map b/css/style.css.map index 881eab3..345b482 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACC,iBAAA;EACD,iBAAA;EACA,gBAAA;EACA,cAAA;EACA,cAAA;ADEJ;;AEZA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFeJ;;AEbA;EACI,mBAAA;AFgBJ;;AEbA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFcJ;;AGpBA;EACI,uBAAA;AHuBJ;;AGnBA;EACI;IACI,iBAAA;IACA,gBAlBF;IAmBE,mBAlBC;EHwCP;EGjBE;IACI,iBAtBE;IAuBF,kBAxBC;IA8BD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACC,WA9BJ;IH4CL;IGZM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;IHcR;EACF;EGXE;IACI,iBA9CC;IA+CD,kBA9CE;IAoDF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;MACA,WArDJ;IH6DL;IGLY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;IHOT;IGJO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACA,iBAAA;IHMT;EACF;EGFE;IACI;MAAmB,aAAA;IHKvB;IGJI;MAAY,aAAA;IHOhB;IGNI;MAAc,aAAA;IHSlB;IGRI;MAAa,aAAA;IHWjB;IGVI;MAAoB,aAAA;IHaxB;IGZI;MAAY,aAAA;IHehB;IGdI;MAAe,aAAA;IHiBnB;IGhBI;MAAe,aAAA;IHmBnB;IGlBI;MAAa,aAAA;IHqBjB;IGpBI;MAAgB,aAAA;IHuBpB;IGtBI;MAAgB,aAAA;IHyBpB;IGxBI;MAAsB,aAAA;IH2B1B;IG1BI;MAAe,aAAA;IH6BnB;IG5BI;MAAiB,aAAA;IH+BrB;IG9BI;MAAgB,aAAA;IHiCpB;IGhCI;MAAuB,aAAA;IHmC3B;EACF;EGlCE;IACI;MAAmB,aAAA;IHqCvB;IGpCI;MAAY,aAAA;IHuChB;IGtCI;MAAc,aAAA;IHyClB;IGxCI;MAAa,aAAA;IH2CjB;IG1CI;MAAoB,aAAA;IH6CxB;IG5CI;MAAY,aAAA;IH+ChB;IG9CI;MAAe,aAAA;IHiDnB;IGhDI;MAAe,aAAA;IHmDnB;IGlDI;MAAa,aAAA;IHqDjB;IGpDI;MAAgB,aAAA;IHuDpB;IGtDI;MAAgB,aAAA;IHyDpB;IGxDI;MAAsB,aAAA;IH2D1B;IG1DI;MAAe,aAAA;IH6DnB;IG5DI;MAAiB,aAAA;IH+DrB;IG9DI;MAAgB,aAAA;IHiEpB;IGhEI;MAAuB,aAAA;IHmE3B;EACF;EGjEG;IACI,iBAlHC;IAmHF,kBAnHE;IAoHF;MAAmB,aAAA;IHoEvB;IGnEI;MAAY,aAAA;IHsEhB;IGrEI;MAAc,aAAA;IHwElB;IGvEI;MAAa,aAAA;IH0EjB;IGzEI;MAAoB,aAAA;IH4ExB;IG3EI;MAAY,aAAA;IH8EhB;IG7EI;MAAe,aAAA;IHgFnB;IG/EI;MAAe,aAAA;IHkFnB;IGjFI;MAAa,aAAA;IHoFjB;IGnFI;MAAgB,aAAA;IHsFpB;IGrFI;MAAgB,aAAA;IHwFpB;IGvFI;MAAsB,aAAA;IH0F1B;IGzFI;MAAe,aAAA;IH4FnB;IG3FI;MAAiB,aAAA;IH8FrB;IG7FI;MAAgB,aAAA;IHgGpB;IG/FI;MAAuB,aAAA;IHkG3B;EACF;AACF;AG/FA;EACI,+BAAA;OAAA,mBAAA;AHiGJ;;AG5FA;EACI,8BAAA;OAAA,kBAAA;AH+FJ;;AG3FA;EACI,sCAAA;AH8FJ;;AG3FA;EACI,iCAAA;AH8FJ;;AG3FA;EACI,8BAAA;OAAA,kBAAA;AH8FJ;;AG3FA;EACI,UAAA;AH8FJ;;AIhQA;EACI,cAAA;AJmQJ;;AIhQA;EACI,wBAAA;AJmQJ;;AIjQA;EACI,YAAA;EACA,uBAAA;AJoQJ;;AIjQA;EACI,mBAAA;EACA,qBAAA;AJoQJ;;AIjQA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;EAEA,kBAAA;EACA,SAAA;EAGA,mCAAA;AJiQJ;;AI9PA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,SAAA;EACA,UAAA;AJiQJ;;AI3PA;EACI,gBAAA;AJ8PJ;;AIxPA;EAEI,8BAAA;EACA,oCAAA;AJ0PJ;;AItPA;EACI,iBAAA;AJyPJ;;AI1OA;EACI,UAAA;AJ6OJ;;AIxOA;EACI,gBAAA;EACA,0CAAA;AJ2OJ;AI1OI;EACI,yBAAA;EACA,qBAAA;EACA,eAAA;EACC,iBAAA;EACA,0BAAA;EACA,uBAAA;AJ4OT;;AIvOA;EACI,wCAAA;AJ0OJ;;AK1UA;EACI,kBAAA;AL6UJ;;AK1UA;EACI,qBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EACA,2BAAA;AL6UJ;AK5UM;EACE,+BAAA;EACA,cAAA;EACA,0BAAA;EACA,YAAA;AL8UR;;AKxUA;EACI,gCAAA;OAAA,oBAAA;EACC,8BAAA;OAAA,kBAAA;EACA,MAAA;EACA,UAAA;AL2UL;;AMjVI;EAEI,6BAAA;OAAA,iBAAA;EAEA,kBAAA;EACA,OAAA;EACA,MAAA;EAEA,aHnBI;EGqBJ,aAAA;EACA,sBAAA;EACA,8BAAA;ANgVR;AM3UQ;EACI,2BAAA;AN6UZ;AMxUI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANyUR;AMxUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;AN0UZ;AMtUK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANuUR;AMtUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANwUZ;AMlUI;;;;;;EAMI,cAAA;ANoUR;AM9TI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EACA,4BAAA;AN+TR;AM5TQ;EACI,cAAA;AN8TZ;AMrTI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,gBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;EACA,mCAAA;EACA,kBAAA;EACA,gCAAA;EACA,kBAAA;ANuTR;AMrTQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANuTZ;AM/SI;EACI,gBAAA;EACA,2BAAA;EACA,gBAAA;EACA,mCAAA;EAEA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,iBAAA;ANgTR;AM/SQ;EACI,cAAA;EACC,kBAAA;EACD,OAAA;ANiTZ;AM7SI;EACI,mBAAA;EACA,cAAA;EACA,4BAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBAAA;EACA,mCAAA;EACA,wCAAA;UAAA,gCAAA;EACA,0BAAA;AN+SR;AM7SQ;EACI,cAAA;EACA,kBAAA;EACA,2BAAA;EACA,qBAAA;AN+SZ;AM1SK;EACE,mBAAA;EACC,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBHlKC;EGoKD,iBHpKC;AH+cT;AM1SQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;AN4SZ;AMxSI;EACI,mBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBHlLC;EGoLD,iBHpLC;AH6dT;AMxSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;AN0SZ;;AMhSA;EACQ,aAAA;ANmSR;;AO/eA;EACI,aAAA;EACA,UAAA;APkfJ;;AQpfA;EACI,kBAAA;ARufJ;;AQnfA;EACI,mCAAA;ARsfJ;;AQnfA;;EAEI,kBAAA;EACA,MAAA;EACA,OAAA;ARsfJ;;AQlfA;EACI,cAAA;EAEG,6BAAA;EACH,0BAAA;EACA,yCAAA;EAIA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;ARifJ;;AQ7eA;EACI,iBAAA;ARgfJ;;AQ3eA;EAEC,6BAAA;EACG,0BAAA;EACA,iBAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;AR6eJ;;AS7hBA;EAEI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;AT+hBJ;AS5hBI;EACI,qBAAA;EACA,YAAA;AT8hBR;AS3hBI;EACO,qCAAA;EACH,0CAAA;EACA,iBAAA;EACA,gBAAA;AT6hBR;AS1hBI;EACI,iBAAA;EACQ,uCAAA;EACR,0CAAA;AT4hBR;ASzhBI;EACI,gBAAA;AT2hBR;ASvhBK;EACG,iBAAA;ATyhBR;ASrhBM;EACE,iBAAA;ATuhBR;ASnhBM;EACE,iBAAA;ATqhBR","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/addPagesNotes.js b/js/addPagesNotes.js index 3a4763f..5ee976c 100644 --- a/js/addPagesNotes.js +++ b/js/addPagesNotes.js @@ -57,6 +57,10 @@ export default class addPagesNotes extends Handler { if (prevPage) { let content = prevPage.querySelector('[data-id="section__content"]'); let contentId = prevPage.querySelector('#section__content'); + let titleH1 = prevPage.querySelector('h1'); + if(titleH1){ + container.classList.add('container-note-first'); + } if(content){ content.appendChild(container); }else if(contentId){ @@ -71,19 +75,22 @@ export default class addPagesNotes extends Handler { - // create blank left page + // create blank left page if ( page.element.classList.contains('pagedjs_right_page') && - page.element.querySelector('[data-id="section__content"]') && - !pageElement.querySelector('.before-h1') + page.element.classList.contains('pagedjs_chapter_page') ) { + // Check if previous page is not end chapter + let pageEnd = pageElement.querySelector(".chapter-end"); - let notesPage = chunker.addPage(); - notesPage.element.classList.add('page-notes'); + if (!pageEnd) { + let notesPage = chunker.addPage(); + notesPage.element.classList.add('page-notes'); - // Make margin boxes visible (hasContent is set during polishing, which skips added pages) - notesPage.element.querySelector('.pagedjs_margin-bottom-left')?.classList.add('hasContent'); - notesPage.element.querySelector('.pagedjs_margin-bottom-center')?.classList.add('hasContent'); + // Make margin boxes visible (hasContent is set during polishing, which skips added pages) + notesPage.element.querySelector('.pagedjs_margin-bottom-left')?.classList.add('hasContent'); + notesPage.element.querySelector('.pagedjs_margin-bottom-center')?.classList.add('hasContent'); + } } } } diff --git a/js/beforeAll.js b/js/beforeAll.js index 2644d2f..83a2a79 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -9,82 +9,8 @@ export default class beforeAll extends Handler { thesis(content); - - - // for break - // let headings = content.querySelectorAll('#section__content h1'); - // headings.forEach(function (h1) { - // let div = document.createElement('div'); - // div.classList.add('before-h1'); - // h1.insertAdjacentElement('beforebegin', div); - // }); - - // Wrap h1 and following content in .chapter sections - const sectionContent = content.querySelector('#section__content'); - if (sectionContent) { - const h1s = sectionContent.querySelectorAll(':scope > h1'); - h1s.forEach(h1 => { - // Create chapter section - const chapter = document.createElement('section'); - chapter.classList.add('chapter'); - - // Insert chapter before h1 - h1.parentNode.insertBefore(chapter, h1); - - // Move h1 into chapter - chapter.appendChild(h1); - - // Move following siblings until next h1 or end - let nextElement = chapter.nextElementSibling; - while (nextElement && nextElement.tagName.toLowerCase() !== 'h1') { - const current = nextElement; - nextElement = nextElement.nextElementSibling; - chapter.appendChild(current); - } - }); - - // Wrap content between h1 and h2 in .intro if chapter doesn't contain .p-these - const chapters = sectionContent.querySelectorAll('.chapter'); - chapters.forEach(chapter => { - if (chapter.querySelector('.p-these')) { - // Case 1: Chapter has thesis - chapter.classList.add('has-thesis'); - } else { - const h1 = chapter.querySelector('h1'); - const nextHeading = chapter.querySelector('h2, h3, h4, h5, h6'); - - if (h1) { - const intro = document.createElement('div'); - intro.classList.add('intro'); - - if (nextHeading) { - // Case 2: Has heading, wrap all content between h1 and that heading - h1.parentNode.insertBefore(intro, h1.nextSibling); - - let current = intro.nextSibling; - while (current && current !== nextHeading) { - const next = current.nextSibling; - intro.appendChild(current); - current = next; - } - chapter.classList.add('has-intro'); - } else { - // Case 3: No heading, wrap only the first paragraph after h1 - let current = h1.nextSibling; - while (current && current.tagName.toLowerCase() !== 'p') { - current = current.nextSibling; - } - - if (current) { - current.parentNode.insertBefore(intro, current); - intro.appendChild(current); - chapter.classList.add('has-intro-1-paragraph'); - } - } - } - } - }); - } + wrapChapterAndIntro(content); + } @@ -92,6 +18,129 @@ export default class beforeAll extends Handler { } + +function wrapChapterAndIntro(content){ + // Wrap h1 and following content in .chapter sections + const sectionContent = content.querySelector('#section__content'); + if (sectionContent) { + const h1s = sectionContent.querySelectorAll(':scope > h1'); + h1s.forEach(h1 => { + // Create chapter section + const chapter = document.createElement('section'); + chapter.classList.add('chapter'); + + // Insert chapter before h1 + h1.parentNode.insertBefore(chapter, h1); + + // Move h1 into chapter + chapter.appendChild(h1); + + // Move following siblings until next h1 or end + let nextElement = chapter.nextElementSibling; + while (nextElement && nextElement.tagName.toLowerCase() !== 'h1') { + const current = nextElement; + nextElement = nextElement.nextElementSibling; + chapter.appendChild(current); + } + + let divEnd = document.createElement('div'); + divEnd.classList.add("chapter-end"); // need to avoid to add new page + chapter.appendChild(divEnd); + + }); + + + + // Wrap content between h1 and h2 in .intro if chapter doesn't contain .p-these + const chapters = sectionContent.querySelectorAll('.chapter'); + chapters.forEach(chapter => { + if (chapter.querySelector('.p-these')) { + // Case 1: Chapter has thesis + chapter.classList.add('has-thesis'); + } else { + const h1 = chapter.querySelector('h1'); + + if (h1) { + // Calculate chapter content length excluding notes + const chapterClone = chapter.cloneNode(true); + // Remove notes (common note selectors) + chapterClone.querySelectorAll('.note, .footnote, .sidenote, aside, [role="note"]').forEach(note => note.remove()); + const contentLength = chapterClone.textContent.trim().length; + + const intro = document.createElement('div'); + intro.classList.add('intro'); + + if (contentLength < 5000) { + // Case 2: Short chapter, wrap all content after h1 + h1.parentNode.insertBefore(intro, h1.nextSibling); + + let current = intro.nextSibling; + while (current) { + const next = current.nextSibling; + intro.appendChild(current); + current = next; + } + chapter.classList.add('has-only-intro'); + } else { + const nextHeading = chapter.querySelector('h2, h3, h4, h5, h6'); + + if (nextHeading) { + // Case 3: Has heading, wrap all content between h1 and that heading + h1.parentNode.insertBefore(intro, h1.nextSibling); + + let current = intro.nextSibling; + while (current && current !== nextHeading) { + const next = current.nextSibling; + intro.appendChild(current); + current = next; + } + chapter.classList.add('has-intro'); + } else { + // Case 4: No heading, wrap first ol[type="1"] and first p after h1 + h1.parentNode.insertBefore(intro, h1.nextSibling); + + let foundOl = false; + let foundP = false; + let current = intro.nextSibling; + + while (current && (!foundOl || !foundP)) { + const next = current.nextSibling; + + // Skip text nodes (whitespace) + if (current.nodeType !== 1) { + current = next; + continue; + } + + const isOlType1 = current.tagName.toLowerCase() === 'ol' && current.getAttribute('type') === '1'; + const isP = current.tagName.toLowerCase() === 'p'; + + if (isOlType1 && !foundOl) { + intro.appendChild(current); + foundOl = true; + current = next; + } else if (isP && !foundP) { + intro.appendChild(current); + foundP = true; + current = next; + } else if (!isOlType1 && !isP) { + break; + } else { + current = next; + } + } + + if (intro.children.length > 0) { + chapter.classList.add('has-intro-1-paragraph'); + } + } + } + } + } + }); + } +} + function thesis(content){ const strongs = content.querySelectorAll('strong'); strongs.forEach(strong => { From 626ba00ba87f5e7b1b56fdbd690b2a60b7a163ed Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 16:18:44 +0200 Subject: [PATCH 11/21] ol satrt in html --- css/modules/_num-paragraph.scss | 15 +++-- css/style.css | 3 - css/style.css.map | 2 +- js/beforeAll.js | 11 +++- js/numParagraph.js | 110 -------------------------------- 5 files changed, 19 insertions(+), 122 deletions(-) delete mode 100644 js/numParagraph.js diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss index 9e5a78e..532f0f3 100644 --- a/css/modules/_num-paragraph.scss +++ b/css/modules/_num-paragraph.scss @@ -7,12 +7,15 @@ ol[type="1"]{ break-after: avoid; position: absolute; left: calc(var(--unit)*1); - &::after{ - content: attr(start)!important; - display: block; - font-size: var(--fs-small); - opacity: 0.5; - } + display: block; + font-size: var(--fs-small); + opacity: 0.5; + // &::after{ + // content: attr(start)!important; + // display: block; + // font-size: var(--fs-small); + // opacity: 0.5; + // } } diff --git a/css/style.css b/css/style.css index 4078dbc..069a1a7 100644 --- a/css/style.css +++ b/css/style.css @@ -352,9 +352,6 @@ ol[type="1"] { break-after: avoid; position: absolute; left: calc(var(--unit) * 1); -} -ol[type="1"]::after { - content: attr(start) !important; display: block; font-size: var(--fs-small); opacity: 0.5; diff --git a/css/style.css.map b/css/style.css.map index 345b482..05d0596 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/beforeAll.js b/js/beforeAll.js index 83a2a79..62fc2ca 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -7,10 +7,9 @@ export default class beforeAll extends Handler { beforeParsed(content){ - + numParagraph(content); thesis(content); wrapChapterAndIntro(content); - } @@ -18,6 +17,14 @@ export default class beforeAll extends Handler { } +function numParagraph(content){ + let numParagraphs = content.querySelectorAll('ol[type="1"]'); + numParagraphs.forEach(function (num, index) { + let start = num.getAttribute('start'); + num.querySelector('li').innerHTML = start; + }); +} + function wrapChapterAndIntro(content){ // Wrap h1 and following content in .chapter sections diff --git a/js/numParagraph.js b/js/numParagraph.js deleted file mode 100644 index 80297b5..0000000 --- a/js/numParagraph.js +++ /dev/null @@ -1,110 +0,0 @@ -import { Handler } from '/csspageweaver/lib/paged.esm.js'; - -export default class thesis extends Handler { - constructor(chunker, polisher, caller) { - super(chunker, polisher, caller); - } - - - // Créer un wrapper pour récupérer tous les éléments qui suivent le ol (hors titres et .container-following-note) - // -------------------------------------------------------------------------------------------------------------- - beforeParsed(content){ - const nums = content.querySelectorAll('ol[type="1"]'); - - nums.forEach((num) => { - const wrapper = document.createElement('div'); - wrapper.classList.add('wrapper-ol'); - wrapper.id = 'wrapper-' + (num.getAttribute('start') || '1'); - - // Collecter les frères/sœurs suivants jusqu'à la prochaine limite - const siblings = []; - let sibling = num.nextElementSibling; - while (sibling) { - if (sibling.matches('ol[type="1"], h1, h2, h3, h4, h5, h6, .container-following-note')) break; - siblings.push(sibling); - sibling = sibling.nextElementSibling; - } - - // Insérer le wrapper à la place du ol - num.before(wrapper); - wrapper.appendChild(num); - siblings.forEach(s => wrapper.appendChild(s)); - }); - - // Si le dernier enfant d'un wrapper est un p et que le suivant est aussi un wrapper → .wrapper-indent - const wrappers = content.querySelectorAll('.wrapper-ol'); - wrappers.forEach((wrapper) => { - const last = wrapper.lastElementChild; - const next = wrapper.nextElementSibling; - if (last && last.nodeName === 'P' && next && next.classList.contains('wrapper-ol')) { - const firstP = next.querySelector('p'); - if (!firstP || !firstP.classList.contains('p-these')) { - next.classList.add('wrapper-indent'); - } - } - }); - } - - - - - afterPageLayout(pageElement, page, breakToken){ - - const wrappers = pageElement.querySelectorAll('.wrapper-ol'); - const minSize = 37; // taille minimal du wrapper pour qu’il y ait clone (2 lignes) - - // Fais un clone du ol pour de la page précédente - // ----------------------------------------------- - - if (wrappers.length > 0) { - const first = wrappers[0]; - if (first.hasAttribute('data-split-from')) { - let idWrapper = first.getAttribute('data-id'); - let numPage = pageElement.getAttribute('data-page-number'); - let numPrev = parseInt(numPage) - 1; - let prevPage = document.querySelector('#page-' + numPrev); - let olPara = prevPage.querySelector('#' + idWrapper + ' ol[type="1"]'); - - if (olPara && first.offsetHeight >= minSize) { - const start = olPara.getAttribute('start') || '1'; - const olClonePage = document.createElement('ol'); - olClonePage.setAttribute('start', start); - olClonePage.setAttribute('type', '1'); - olClonePage.classList.add('ol-clone-page'); - olClonePage.style.height = first.offsetHeight + 'px'; - const li = document.createElement('li'); - li.setAttribute('data-item-num', start); - olClonePage.appendChild(li); - first.prepend(olClonePage); - } - } - } - - - // Fais un clone du ol pour la colonne suivante (dans la même page) - // ---------------------------------------------------------------- - wrappers.forEach((wrapper) => { - const ol = wrapper.querySelector('ol[type="1"]'); - if (!ol) return; - - const rects = wrapper.getClientRects(); - if (rects.length === 1) { - ol.style.height = rects[0].height + 'px'; - } else if (rects.length === 2) { - ol.style.height = rects[0].height + 'px'; - if (rects[1].height >= minSize) { - const olClone = ol.cloneNode(true); - olClone.classList.add('ol-clone'); - olClone.style.height = rects[1].height + 'px'; - olClone.removeAttribute('id'); - ol.after(olClone); - } - } - }); - - - - - } - -} From 9ef96b6897f1aa1fab631573652c87e05608b5de Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 16:37:59 +0200 Subject: [PATCH 12/21] wrap thesis --- css/modules/_text.scss | 51 +++++++++++++++-------------- css/modules/_titles.scss | 35 ++++++++------------ css/style.css | 39 ++++++++-------------- css/style.css.map | 2 +- js/beforeAll.js | 71 ++++++++++++++++++++++++++-------------- 5 files changed, 101 insertions(+), 97 deletions(-) diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 8f918a6..1d92b22 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -70,49 +70,52 @@ ul{ + +// ol, p, h4, h5, h6{ +// display: none; +// } + + // THESE -------------------------------------------------- -.p-these{ - font-weight: 500; - margin-bottom: calc(var(--baseline)*0.5); - strong{ - text-transform: uppercase; - display: inline-block; - min-width: $indent*2; - font-weight: bold; - font-size: var(--fs-small); - letter-spacing: 0.05rem; - } +.thesis p{ + display: block; } +// .p-these{ +// font-weight: 500; +// margin-bottom: calc(var(--baseline)*0.5); +// display: block; +// strong{ +// text-transform: uppercase; +// display: inline-block; +// min-width: $indent*2; +// font-weight: bold; +// font-size: var(--fs-small); +// letter-spacing: 0.05rem; +// } -.p-these-last{ - margin-bottom: calc(var(--baseline)*1); -} + +// } + +// .p-these-last{ +// margin-bottom: calc(var(--baseline)*1); +// } // INTRO -------------------------------------------------- - - .has-intro-1-paragraph .intro, .has-intro .intro{ break-after: right; } .intro{ - color: red; p{ font-size: var(--fs-intro); padding-left: calc(var(--unit)*1); line-height: 1.4; + display: block; } } - - -.chapter-end{ - width: 20px; - height: 20px; - background-color: green; -} \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index b3b7dde..6583d95 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -2,35 +2,26 @@ #section__content{ - - - - - h1:first-of-type{ - // column-span: all; - // height: $content-h; - } - - // .before-h1{ - // break-after: page; - // } + h1{ + .h1-count::after{ + content: "." + } + .h1-count{ + margin-bottom: 1em; + } - // break-before: page; - // break-after: page; - - // position: absolute; - // left: 0; - // top: 0; - - height: $content-h; - // background-color: red; + min-height: $content-h; display: flex; flex-direction: column; justify-content: space-between; - // display: none; + + &[data-split-from]{ + color: red; + position: absolute; + } } diff --git a/css/style.css b/css/style.css index 069a1a7..5a2d879 100644 --- a/css/style.css +++ b/css/style.css @@ -304,21 +304,8 @@ ul { color: red; } -.p-these { - font-weight: 500; - margin-bottom: calc(var(--baseline) * 0.5); -} -.p-these strong { - text-transform: uppercase; - display: inline-block; - min-width: 20mm; - font-weight: bold; - font-size: var(--fs-small); - letter-spacing: 0.05rem; -} - -.p-these-last { - margin-bottom: calc(var(--baseline) * 1); +.thesis p { + display: block; } .has-intro-1-paragraph .intro, @@ -327,19 +314,11 @@ ul { break-after: right; } -.intro { - color: red; -} .intro p { font-size: var(--fs-intro); padding-left: calc(var(--unit) * 1); line-height: 1.4; -} - -.chapter-end { - width: 20px; - height: 20px; - background-color: green; + display: block; } [data-id=section__content] { @@ -361,12 +340,22 @@ ol[type="1"] { left: 0px; } +#section__content h1 .h1-count::after { + content: "."; +} +#section__content h1 .h1-count { + margin-bottom: 1em; +} #section__content h1 { - height: 215mm; + min-height: 215mm; display: flex; flex-direction: column; justify-content: space-between; } +#section__content h1[data-split-from] { + color: red; + position: absolute; +} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); } diff --git a/css/style.css.map b/css/style.css.map index 05d0596..5994bf6 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/beforeAll.js b/js/beforeAll.js index 62fc2ca..bc17ec5 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -58,10 +58,10 @@ function wrapChapterAndIntro(content){ - // Wrap content between h1 and h2 in .intro if chapter doesn't contain .p-these + // Wrap content between h1 and h2 in .intro if chapter doesn't contain .thesis const chapters = sectionContent.querySelectorAll('.chapter'); chapters.forEach(chapter => { - if (chapter.querySelector('.p-these')) { + if (chapter.querySelector('.thesis')) { // Case 1: Chapter has thesis chapter.classList.add('has-thesis'); } else { @@ -150,31 +150,52 @@ function wrapChapterAndIntro(content){ function thesis(content){ const strongs = content.querySelectorAll('strong'); - strongs.forEach(strong => { - if (/^these\s+\d+/i.test(strong.textContent.trim())) { - const parent = strong.closest('p'); - if (parent) { - const thesisDiv = document.createElement('div'); - thesisDiv.classList.add('thesis-title'); - const thesisP = document.createElement('p'); - thesisP.textContent = strong.textContent; - thesisDiv.appendChild(thesisP); - parent.parentNode.insertBefore(thesisDiv, parent); - strong.remove(); + const thesisElements = []; - parent.classList.add('p-these'); + strongs.forEach(strong => { + if (/^these\s+\d+/i.test(strong.textContent.trim())) { + const parent = strong.closest('p'); + if (parent) { + // Create thesis wrapper + const thesisWrapper = document.createElement('div'); + thesisWrapper.classList.add('thesis'); + + // Find preceding ol if it exists + let prev = parent.previousElementSibling; + let olElement = null; + if (prev && prev.tagName.toLowerCase() === 'ol') { + olElement = prev; } - } - }); - const theseParas = content.querySelectorAll('.p-these'); - theseParas.forEach(p => { - let next = p.nextElementSibling; - while (next && next.tagName.toLowerCase() === 'ol') { - next = next.nextElementSibling; + // Insert thesis wrapper before ol or before p + if (olElement) { + olElement.parentNode.insertBefore(thesisWrapper, olElement); + thesisWrapper.appendChild(olElement); + } else { + parent.parentNode.insertBefore(thesisWrapper, parent); + } + + // Create thesis-title + const thesisTitleDiv = document.createElement('div'); + thesisTitleDiv.classList.add('thesis-title'); + const thesisP = document.createElement('p'); + thesisP.textContent = strong.textContent; + thesisTitleDiv.appendChild(thesisP); + thesisWrapper.appendChild(thesisTitleDiv); + + // Transform parent p into thesis-content + strong.remove(); + parent.classList.add('thesis-content'); + thesisWrapper.appendChild(parent); + + thesisElements.push(thesisWrapper); } - if (!next || !next.classList.contains('p-these')) { - p.classList.add('p-these-last'); - } - }); + } + }); + + // Mark first and last thesis + if (thesisElements.length > 0) { + thesisElements[0].classList.add('thesis-first'); + thesisElements[thesisElements.length - 1].classList.add('thesis-last'); + } } \ No newline at end of file From 725306418d19f29b76015a8c981a2488730a131a Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 23:05:59 +0200 Subject: [PATCH 13/21] intro bottom --- css/modules/_layout.scss | 67 ++++++++++++------------ css/modules/_notes.scss | 3 +- css/modules/_text.scss | 18 ++++++- css/modules/_titles.scss | 6 ++- css/modules/_var.scss | 2 +- css/style.css | 107 ++++++++++++++++----------------------- css/style.css.map | 2 +- js/beforeAll.js | 14 +++++ 8 files changed, 116 insertions(+), 103 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 31a4cf1..25c8279 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -1,7 +1,7 @@ $width: 176mm; $height: 240mm; $top: 10mm; -$bottom: 14mm; +$bottom: 19mm; $inside: 20mm; $outside: 14mm; $content-h: calc($height - $top - $bottom - 1mm); @@ -12,40 +12,44 @@ $unit: calc($content-w/7); :root{ // --content-w: #{$content-w}; - // --unit: calc(var(--content-w)/7); - --unit: 80px; + --unit: calc(#{$content-w}/7); + // --unit: 80px; + --margin-box: -13px; } + + @media print { @page { size: $width $height; margin-top: $top; margin-bottom: $bottom; - - // bleed: 6mm; - // marks: crop; + bleed: 6mm; + marks: crop; } @page:left { margin-left: $outside; margin-right: $inside; - // background-image: url("/images/layout-1_3.png"); - // background-size: 100% 100%; - - @bottom-left { content: counter(page); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; width: $indent; + position: relative; + top: var(--margin-box); } @bottom-center { content: "Höchstpersönlichkeit"; font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; + position: relative; + top: var(--margin-box); } } @@ -53,35 +57,48 @@ $unit: calc($content-w/7); margin-left: $inside; margin-right: $outside; - // background-image: url("/images/layout-1_20.png"); + // background-image: url('/images/layout-1_2.png'); // background-size: 100% 100%; - @bottom-left { content: string(chapterCount); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; - width: $indent; + width: calc(var(--unit)*3); + padding-left: calc(var(--unit)*2); + position: relative; + top: var(--margin-box); } @bottom-center { content: string(chapter); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; + position: relative; + top: var(--margin-box); + width: calc(var(--unit)*3.5); } @bottom-right { content: counter(page); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: right; + position: relative; + top: var(--margin-box); } } - @page:first { + + + + @page chapter:first { @top-left-corner { content: none; } @top-left { content: none; } @top-center { content: none; } @@ -118,26 +135,7 @@ $unit: calc($content-w/7); @bottom-right-corner { content: none; } } - @page chapter { - margin-left: $outside; - margin-right: $outside; - @top-left-corner { content: none; } - @top-left { content: none; } - @top-center { content: none; } - @top-right { content: none; } - @top-right-corner { content: none; } - @left-top { content: none; } - @left-middle { content: none; } - @left-bottom { content: none; } - @right-top { content: none; } - @right-middle { content: none; } - @right-bottom { content: none; } - @bottom-left-corner { content: none; } - @bottom-left { content: none; } - @bottom-center { content: none; } - @bottom-right { content: none; } - @bottom-right-corner { content: none; } - } + } @@ -151,6 +149,7 @@ $unit: calc($content-w/7); string-set: chapter content(text); } + .chapter{ page: chapter; break-before: page; diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss index be8a713..1d1700f 100644 --- a/css/modules/_notes.scss +++ b/css/modules/_notes.scss @@ -12,8 +12,7 @@ position: absolute; top: 0; left: 0; - color: blue; - // color: red; + } .body-note{ diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 1d92b22..61cf9e6 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -79,6 +79,21 @@ ul{ // THESE -------------------------------------------------- + +.thesis-title{ + width: 100%; + display: flex; + +} + +.thesis-title p::after{ + content: ''; + display: block; + width: 100%; + height: 10px; + background-color: black; + flex-grow: 1; +} .thesis p{ display: block; } @@ -112,10 +127,11 @@ ul{ break-after: right; } .intro{ + p{ font-size: var(--fs-intro); padding-left: calc(var(--unit)*1); - line-height: 1.4; + line-height: 23px; display: block; } } diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 6583d95..6a41185 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -80,7 +80,7 @@ font-size: 105px; line-height: 0.9; hyphens: auto; - hyphenate-limit-chars: 8 4 3; + hyphenate-limit-chars: 12 4 3; span{ @@ -195,7 +195,9 @@ } -[data-id="section__content"][data-split-from] > :first-child { +[data-id="section__content"] > .chapter h2:first-child, +[data-id="section__content"] > .chapter h3:first-child, +[data-id="section__content"] > .chapter h4:first-child { margin-top: 0; } diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 3035a68..68a281f 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -9,7 +9,7 @@ --fs-intro: 16.5px; --baseline: 18px; --indent: 26px; - --fs-num: 12px; + --fs-num: 11px; } diff --git a/css/style.css b/css/style.css index 5a2d879..997bd7f 100644 --- a/css/style.css +++ b/css/style.css @@ -10,7 +10,7 @@ --fs-intro: 16.5px; --baseline: 18px; --indent: 26px; - --fs-num: 12px; + --fs-num: 11px; } * { @@ -34,14 +34,17 @@ body { } :root { - --unit: 80px; + --unit: calc(142mm/7); + --margin-box: -13px; } @media print { @page { size: 176mm 240mm; margin-top: 10mm; - margin-bottom: 14mm; + margin-bottom: 19mm; + bleed: 6mm; + marks: crop; } @page :left { margin-left: 14mm; @@ -50,14 +53,20 @@ body { content: counter(page); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; width: 10mm; + position: relative; + top: var(--margin-box); } @bottom-center { content: "Höchstpersönlichkeit"; font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; + position: relative; + top: var(--margin-box); } } @page :right { @@ -67,23 +76,34 @@ body { content: string(chapterCount); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; - width: 10mm; + width: calc(var(--unit) * 3); + padding-left: calc(var(--unit) * 2); + position: relative; + top: var(--margin-box); } @bottom-center { content: string(chapter); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: left; + position: relative; + top: var(--margin-box); + width: calc(var(--unit) * 3.5); } @bottom-right { content: counter(page); font-family: var(--font-sans); font-size: var(--fs-num); + font-weight: 500; text-align: right; + position: relative; + top: var(--margin-box); } } - @page :first { + @page chapter:first { @top-left-corner { content: none; } @@ -183,58 +203,6 @@ body { content: none; } } - @page chapter { - margin-left: 14mm; - margin-right: 14mm; - @top-left-corner { - content: none; - } - @top-left { - content: none; - } - @top-center { - content: none; - } - @top-right { - content: none; - } - @top-right-corner { - content: none; - } - @left-top { - content: none; - } - @left-middle { - content: none; - } - @left-bottom { - content: none; - } - @right-top { - content: none; - } - @right-middle { - content: none; - } - @right-bottom { - content: none; - } - @bottom-left-corner { - content: none; - } - @bottom-left { - content: none; - } - @bottom-center { - content: none; - } - @bottom-right { - content: none; - } - @bottom-right-corner { - content: none; - } - } } #section__content h1 .h1-count { string-set: chapterCount content(text); @@ -304,6 +272,20 @@ ul { color: red; } +.thesis-title { + width: 100%; + display: flex; +} + +.thesis-title p::after { + content: ""; + display: block; + width: 100%; + height: 10px; + background-color: black; + flex-grow: 1; +} + .thesis p { display: block; } @@ -317,7 +299,7 @@ ul { .intro p { font-size: var(--fs-intro); padding-left: calc(var(--unit) * 1); - line-height: 1.4; + line-height: 23px; display: block; } @@ -347,7 +329,7 @@ ol[type="1"] { margin-bottom: 1em; } #section__content h1 { - min-height: 215mm; + min-height: 210mm; display: flex; flex-direction: column; justify-content: space-between; @@ -400,7 +382,7 @@ ol[type="1"] { font-size: 105px; line-height: 0.9; hyphens: auto; - hyphenate-limit-chars: 8 4 3; + hyphenate-limit-chars: 12 4 3; } #section__content h1 span { display: block; @@ -488,7 +470,9 @@ ol[type="1"] { left: 0; } -[data-id=section__content][data-split-from] > :first-child { +[data-id=section__content] > .chapter h2:first-child, +[data-id=section__content] > .chapter h3:first-child, +[data-id=section__content] > .chapter h4:first-child { margin-top: 0; } @@ -510,7 +494,6 @@ ol[type="1"] { position: absolute; top: 0; left: 0; - color: blue; } .body-note { diff --git a/css/style.css.map b/css/style.css.map index 5994bf6..97dd86b 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EACA,iBAAA;EACA,kBAAA;EACA,gBAAA;EACA,cAAA;EACA,cAAA;ADEJ;;AEbA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFgBJ;;AEdA;EACI,mBAAA;AFiBJ;;AEdA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFeJ;;AGrBA;EAEI,qBAAA;EAEA,mBAAA;AHsBJ;;AGhBA;EACI;IACI,iBAAA;IACA,gBAvBF;IAwBE,mBAvBC;IAwBD,UAAA;IACA,WAAA;EHmBN;EGjBE;IACI,iBA1BE;IA2BF,kBA5BC;IA8BD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACA,gBAAA;MACC,WA/BJ;MAgCK,kBAAA;MACD,sBAAA;IHkBT;IGhBM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACC,gBAAA;MACD,gBAAA;MACC,kBAAA;MACA,sBAAA;IHkBT;EACF;EGfE;IACI,iBApDC;IAqDD,kBApDE;IAyDF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACC,gBAAA;MACD,gBAAA;MACA,4BAAA;MACA,mCAAA;MACC,kBAAA;MACD,sBAAA;IHaT;IGVY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACC,gBAAA;MACD,gBAAA;MACC,kBAAA;MACD,sBAAA;MACA,8BAAA;IHYT;IGTO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACC,gBAAA;MACD,iBAAA;MACC,kBAAA;MACD,sBAAA;IHWT;EACF;EGJE;IACI;MAAmB,aAAA;IHOvB;IGNI;MAAY,aAAA;IHShB;IGRI;MAAc,aAAA;IHWlB;IGVI;MAAa,aAAA;IHajB;IGZI;MAAoB,aAAA;IHexB;IGdI;MAAY,aAAA;IHiBhB;IGhBI;MAAe,aAAA;IHmBnB;IGlBI;MAAe,aAAA;IHqBnB;IGpBI;MAAa,aAAA;IHuBjB;IGtBI;MAAgB,aAAA;IHyBpB;IGxBI;MAAgB,aAAA;IH2BpB;IG1BI;MAAsB,aAAA;IH6B1B;IG5BI;MAAe,aAAA;IH+BnB;IG9BI;MAAiB,aAAA;IHiCrB;IGhCI;MAAgB,aAAA;IHmCpB;IGlCI;MAAuB,aAAA;IHqC3B;EACF;EGpCE;IACI;MAAmB,aAAA;IHuCvB;IGtCI;MAAY,aAAA;IHyChB;IGxCI;MAAc,aAAA;IH2ClB;IG1CI;MAAa,aAAA;IH6CjB;IG5CI;MAAoB,aAAA;IH+CxB;IG9CI;MAAY,aAAA;IHiDhB;IGhDI;MAAe,aAAA;IHmDnB;IGlDI;MAAe,aAAA;IHqDnB;IGpDI;MAAa,aAAA;IHuDjB;IGtDI;MAAgB,aAAA;IHyDpB;IGxDI;MAAgB,aAAA;IH2DpB;IG1DI;MAAsB,aAAA;IH6D1B;IG5DI;MAAe,aAAA;IH+DnB;IG9DI;MAAiB,aAAA;IHiErB;IGhEI;MAAgB,aAAA;IHmEpB;IGlEI;MAAuB,aAAA;IHqE3B;EACF;AACF;AG9DA;EACI,sCAAA;AHgEJ;;AG7DA;EACI,iCAAA;AHgEJ;;AG5DA;EACI,aAAA;EACA,8BAAA;OAAA,kBAAA;AH+DJ;;AItNA;EACI,cAAA;AJyNJ;;AItNA;EACI,wBAAA;AJyNJ;;AIvNA;EACI,YAAA;EACA,uBAAA;AJ0NJ;;AIvNA;EACI,mBAAA;EACA,qBAAA;AJ0NJ;;AIvNA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;EAEA,kBAAA;EACA,SAAA;EAGA,mCAAA;AJuNJ;;AIpNA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,SAAA;EACA,UAAA;AJuNJ;;AIjNA;EACI,gBAAA;AJoNJ;;AI9MA;EAEI,8BAAA;EACA,oCAAA;AJgNJ;;AI5MA;EACI,iBAAA;AJ+MJ;;AI1MA;EACI,UAAA;AJ6MJ;;AI7LA;EACI,WAAA;EACA,aAAA;AJgMJ;;AI5LA;EACI,WAAA;EACA,cAAA;EACA,WAAA;EACA,YAAA;EACA,uBAAA;EACA,YAAA;AJ+LJ;;AI7LA;EACI,cAAA;AJgMJ;;AIrKA;;EAEI,8BAAA;OAAA,kBAAA;AJwKJ;;AIpKI;EACI,0BAAA;EACA,mCAAA;EACA,iBAAA;EACA,cAAA;AJuKR;;AK7SA;EACI,kBAAA;ALgTJ;;AK7SA;EACI,qBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EACA,2BAAA;EACA,cAAA;EACA,0BAAA;EACA,YAAA;ALgTJ;;AKrSA;EACI,SAAA;ALwSJ;;AMxTQ;EACI,YAAA;AN2TZ;AMxTQ;EACI,kBAAA;AN0TZ;AMhUI;EASI,iBHTI;EGUJ,aAAA;EACA,sBAAA;EACA,8BAAA;AN0TR;AMxTQ;EACI,UAAA;EACA,kBAAA;AN0TZ;AMpTQ;EACI,2BAAA;ANsTZ;AMjTI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANkTR;AMjTQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANmTZ;AM/SK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANgTR;AM/SQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANiTZ;AM3SI;;;;;;EAMI,cAAA;AN6SR;AMvSI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EACA,6BAAA;ANwSR;AMrSQ;EACI,cAAA;ANuSZ;AM9RI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,gBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;EACA,mCAAA;EACA,kBAAA;EACA,gCAAA;EACA,kBAAA;ANgSR;AM9RQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANgSZ;AMxRI;EACI,gBAAA;EACA,2BAAA;EACA,gBAAA;EACA,mCAAA;EAEA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,iBAAA;ANyRR;AMxRQ;EACI,cAAA;EACC,kBAAA;EACD,OAAA;AN0RZ;AMtRI;EACI,mBAAA;EACA,cAAA;EACA,4BAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBAAA;EACA,mCAAA;EACA,wCAAA;UAAA,gCAAA;EACA,0BAAA;ANwRR;AMtRQ;EACI,cAAA;EACA,kBAAA;EACA,2BAAA;EACA,qBAAA;ANwRZ;AMnRK;EACE,mBAAA;EACC,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBH5JC;EG8JD,iBH9JC;AHkbT;AMnRQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANqRZ;AMjRI;EACI,mBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBH5KC;EG8KD,iBH9KC;AHgcT;AMjRQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANmRZ;;AMzQA;;;EAGQ,aAAA;AN4QR;;AOpdA;EACI,aAAA;EACA,UAAA;APudJ;;AQzdA;EACI,kBAAA;AR4dJ;;AQxdA;EACI,mCAAA;AR2dJ;;AQxdA;;EAEI,kBAAA;EACA,MAAA;EACA,OAAA;AR2dJ;;AQvdA;EACI,cAAA;EAEG,6BAAA;EACH,0BAAA;EACA,yCAAA;EAIA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;ARsdJ;;AQldA;EACI,iBAAA;ARqdJ;;AQhdA;EAEC,6BAAA;EACG,0BAAA;EACA,iBAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;ARkdJ;;ASlgBA;EAEI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;ATogBJ;ASjgBI;EACI,qBAAA;EACA,YAAA;ATmgBR;AShgBI;EACO,qCAAA;EACH,0CAAA;EACA,iBAAA;EACA,gBAAA;ATkgBR;AS/fI;EACI,iBAAA;EACQ,uCAAA;EACR,0CAAA;ATigBR;AS9fI;EACI,gBAAA;ATggBR;AS5fK;EACG,iBAAA;AT8fR;AS1fM;EACE,iBAAA;AT4fR;ASxfM;EACE,iBAAA;AT0fR","file":"style.css"} \ No newline at end of file diff --git a/js/beforeAll.js b/js/beforeAll.js index bc17ec5..ff596e7 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -12,6 +12,20 @@ export default class beforeAll extends Handler { wrapChapterAndIntro(content); } + afterPageLayout(pageElement, page, breakToken){ + let intro = pageElement.querySelector('.intro'); + let pageContent = pageElement.querySelector('.pagedjs_page_content'); + + if(intro && pageContent){ + let introBottom = intro.getBoundingClientRect().bottom; + let pageContentBottom = pageContent.getBoundingClientRect().bottom; + let gap = pageContentBottom - introBottom; + gap = gap - 4; // snap on baseline + intro.style.paddingTop = gap + "px"; + } + + } + } From ed5d47184dbcb0c8e79129820350f6d49f0f3351 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 23:28:03 +0200 Subject: [PATCH 14/21] thesis align bottom --- css/modules/_layout.scss | 4 ++-- css/modules/_notes.scss | 2 +- css/modules/_text.scss | 44 ++++++++++++++++++---------------------- css/style.css | 31 ++++++++++++++++++++-------- css/style.css.map | 2 +- js/beforeAll.js | 15 ++++++++++++++ 6 files changed, 62 insertions(+), 36 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 25c8279..e035fdc 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -25,8 +25,8 @@ $unit: calc($content-w/7); size: $width $height; margin-top: $top; margin-bottom: $bottom; - bleed: 6mm; - marks: crop; + // bleed: 6mm; + // marks: crop; } @page:left { margin-left: $outside; diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss index 1d1700f..49ac2e9 100644 --- a/css/modules/_notes.scss +++ b/css/modules/_notes.scss @@ -43,7 +43,7 @@ font-family: var(--font-sans); font-size: var(--fs-small); - font-weight: bold; + font-weight: normal; line-height: 1; position: relative; top: -4px; diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 61cf9e6..835976d 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -79,44 +79,40 @@ ul{ // THESE -------------------------------------------------- - +.thesis{ + break-inside: avoid; +} .thesis-title{ width: 100%; display: flex; + gap: 1ch; + } -.thesis-title p::after{ - content: ''; - display: block; + +.thesis-line{ width: 100%; - height: 10px; + height: 8px; background-color: black; - flex-grow: 1; + position: relative; + top: 3px; +} +.thesis-title p{ + flex-shrink: 0; + text-transform: uppercase; + font-weight: 500; + font-size: 0.9em; + letter-spacing: 0.01rem; } .thesis p{ display: block; } -// .p-these{ -// font-weight: 500; -// margin-bottom: calc(var(--baseline)*0.5); -// display: block; -// strong{ -// text-transform: uppercase; -// display: inline-block; -// min-width: $indent*2; -// font-weight: bold; -// font-size: var(--fs-small); -// letter-spacing: 0.05rem; -// } -// } - -// .p-these-last{ -// margin-bottom: calc(var(--baseline)*1); -// } - +.thesis + .thesis{ + margin-top: calc(var(--baseline)*1); +} // INTRO -------------------------------------------------- diff --git a/css/style.css b/css/style.css index 997bd7f..9bef135 100644 --- a/css/style.css +++ b/css/style.css @@ -43,8 +43,6 @@ body { size: 176mm 240mm; margin-top: 10mm; margin-bottom: 19mm; - bleed: 6mm; - marks: crop; } @page :left { margin-left: 14mm; @@ -272,24 +270,41 @@ ul { color: red; } +.thesis { + -moz-column-break-inside: avoid; + break-inside: avoid; +} + .thesis-title { width: 100%; display: flex; + gap: 1ch; } -.thesis-title p::after { - content: ""; - display: block; +.thesis-line { width: 100%; - height: 10px; + height: 8px; background-color: black; - flex-grow: 1; + position: relative; + top: 3px; +} + +.thesis-title p { + flex-shrink: 0; + text-transform: uppercase; + font-weight: 500; + font-size: 0.9em; + letter-spacing: 0.01rem; } .thesis p { display: block; } +.thesis + .thesis { + margin-top: calc(var(--baseline) * 1); +} + .has-intro-1-paragraph .intro, .has-intro .intro { -moz-column-break-after: right; @@ -516,7 +531,7 @@ ol[type="1"] { .note_call { font-family: var(--font-sans); font-size: var(--fs-small); - font-weight: bold; + font-weight: normal; line-height: 1; position: relative; top: -4px; diff --git a/css/style.css.map b/css/style.css.map index 97dd86b..681f912 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/beforeAll.js b/js/beforeAll.js index ff596e7..76de545 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -24,6 +24,17 @@ export default class beforeAll extends Handler { intro.style.paddingTop = gap + "px"; } + let thesisList = pageElement.querySelectorAll('.thesis'); + if(thesisList.length > 0 && pageContent){ + let lastThesis = thesisList[thesisList.length - 1]; + let firstThesis = thesisList[0]; + let lastThesisBottom = lastThesis.getBoundingClientRect().bottom; + let pageContentBottom = pageContent.getBoundingClientRect().bottom; + let gap = pageContentBottom - lastThesisBottom; + gap = gap - 4; // snap on baseline + firstThesis.style.marginTop = gap + "px"; + } + } @@ -194,7 +205,11 @@ function thesis(content){ thesisTitleDiv.classList.add('thesis-title'); const thesisP = document.createElement('p'); thesisP.textContent = strong.textContent; + var line = document.createElement('div'); + line.classList.add('thesis-line'); + thesisTitleDiv.appendChild(thesisP); + thesisTitleDiv.appendChild(line) thesisWrapper.appendChild(thesisTitleDiv); // Transform parent p into thesis-content From 5cd734966e0c01518361a4a622b644cf9474b2e3 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 10:43:53 +0200 Subject: [PATCH 15/21] move list of abrr --- index.html | 51 +++++++++++++++---------------------------------- js/beforeAll.js | 33 ++++++++++++++++++++++++++++++++ src/output.html | 3 +-- 3 files changed, 49 insertions(+), 38 deletions(-) diff --git a/index.html b/index.html index f445339..4d03903 100644 --- a/index.html +++ b/index.html @@ -47,9 +47,21 @@ - +
-
+

«Der Gedanke … des … [W]illens hat sich nicht bewährt, der Glaube der +modernen Jurisprudenz, in dem animus … den Schlüssel entdeckt +zu haben, der ihr das Verständniß der ganzen … [L]ehre erschlüsse, hat +sich als ein trügerischer erwiesen, all’ die unsägliche Mühe, die sie +aufgeboten, alle die verzweifelten und gewaltsamen Anstrengungen, denen +sie sich unterzogen hat, sind nutzlos aufgewandt worden, sie haben, wie +es stets der Fall ist, wenn man mit einem falschen Schlüssel gewaltsam +ein Schloß zu öffnen sucht, das Schloß nicht geöffnet, sondern +verdreht.»

+
+

Jhering, Besitzwille, 1889, S. 364, +dort in Bezug auf die römische «Besitzeslehre».

+

Abkürzungsverzeichnis

@@ -1193,15 +1205,7 @@ Abteilung)
- -
- -
- - - - -

Vorrede

+

Vorrede

@@ -1324,8 +1328,6 @@ class="smallcaps">Hubers, dem Redaktor des Schweizerischen Zivilgesetzbuchs.13 Die Gutachtenanfrage hatte folgenden Wortlaut:

- -

„Sehr geehrter Herr Professor!

Darf ich mir gestatten Sie um Ihre Ansicht zu bitten über den Artikel ‘Kann der Erblasser die Bestimmung der Person, die eine letztwillige @@ -1380,13 +1382,11 @@ aufgestellten Testamentsbestimmungen anfechtbar.

dem hochverehrten Schöpfer unseres Civilgesetzbuches, zu vernehmen, welches Ihre Meinung ist.“14

-

Eugen Huber antwortete bereits wenige Tage später wie folgt:

-

„Sehr geehrter Herr Doktor!

Auf Ihre Anfrage v. 12. ds. teile ich Ihnen ergebenst mit, dass Folgendes in der Frage meine Auffassung ist:

@@ -1439,7 +1439,6 @@ Inhalt oder in der Willensvollstreckung gegeben ist.

diesen Zeilen mit genügender Bestimmtheit entnehmen können.“15

-

Höchstpersönlichkeit im Erbrecht heute

    @@ -1498,7 +1497,6 @@ role="doc-noteref">24

    -

    So findet man auf der einen Seite als Grundsatz materieller Höchstpersönlichkeit heute formuliert, «dass der Erblasser den Inhalt seiner Verfügung von Todes wegen selbst festzusetzen @@ -1545,7 +1543,6 @@ Delegation ist einzig dort zu verneinen, wo der Erblasser sich bequemlichkeitshalber um den ihm möglichen Entscheid gedrückt hat».29

    -
    @@ -1586,7 +1583,6 @@ der Höchstpersönlichkeit

Wie es aber zu solchem, besonderen Grundsatz der Höchstpersönlichkeit im Erbrecht überhaupt kommen konnte,

-

«Die Testfreiheit ist doch als erbrechtliche Ausprägung der Privatautonomie zu begreifen: die Verfügung über sein Vermögen wird dem Ermessen des Eigentümers überlassen. Dabei ist es im Rechtsverkehr unter @@ -1596,7 +1592,6 @@ Gegenstand zu übertragen ist) in das Ermessen eines Dritten stellt. Warum soll dies im Falle einer Verfügung von Todes wegen anders sein?»,36

-

scheint schnell erzählt. Aus schweizerischer Perspektive steht dabei heute die folgende Rechtsgeschichte im Vordergrund.einen Vermögensvorteil als Vermächtnis zuwenden» kann.72

-

«Das ZGB. bestimmt in den Art. 481 bis 497 erschöpfend, welche Verfügungsarten inhaltlich zugelassen sein sollen. Es verlangt, dass mit dem Tode des Erblassers ein gesetzlicher oder eingesetzter Erbe @@ -1849,7 +1843,6 @@ Erblasser verfügen würde, ein Dritter habe nach dem Tode des Erblassers zu bestimmen, wer Erbe oder Vermächtnisnehmer sein soll».73

-

Möglich war «also nicht Überlassung der Bezeichnung durch Direktion … Anders BGb. 2064 u. 2151 u. Gemein R.»86

Hintergrund neu zu begründen. Anstelle der subjektiven Verantwortung gegen sich selbst hatte man mit der Verantwortung gegenüber den gesetzlichen Erben nun ihr objektives Mass gefunden:

-

«Entscheidend ist, ob sachliche Gründe (z.B. fehlendes Wissen über konkrete Zwecke wohltätiger Institutionen oder Möglichkeit der Förderung bestimmter technischer Innovationen; noch nicht absehbare @@ -2006,7 +1998,6 @@ Dritten im Zeitpunkt der Umsetzung des Testaments nach objektiven, sachlichen Kriterien einen Entscheid treffen zu lassen».87

-

Ein Kurzschluss gleich zu Anfang

    @@ -2234,8 +2225,6 @@ des römischen Rechts
    - -

    These 1. Im Zentrum unseres heutigen Rechtsdenken und auch unserer Sprache der Rechte steht die Privatautonomie bzw. die Freiheit des Willens. Im Zentrum des römischen Rechts und seiner Sprache @@ -2266,7 +2255,6 @@ allgemein vertretene abweichende Auffassung, dass das römische Erbrecht noch über die Stellvertretung hinaus besondere Anforderungen an die Selbstständigkeit und Bestimmtheit des Willens des Erblassers gestellt hat, beruht auf einem Missverständnis der römischen Quellen.

    -
    @@ -3608,7 +3596,6 @@ Bürgerlichen Gesetzbuch
    -

    These 4. Das 19. Jahrhundert wurde zur Wiege der noch heute geltenden Voraussetzung einer Höchstpersönlichkeit der Verfügung von Todes wegen, zunächst vermittelt über das gemeine Recht, @@ -3675,7 +3662,6 @@ Auflage beschlossen hatte, bestimmte er mit § 2151 BGB und damit in gewisser Spannung zum Prinzip des Vonselbsterwerbs eine Ausnahme von der Selbständigkeit und Bestimmtheit der Verfügung auch für das Vermächtnis.

    -
    @@ -7986,7 +7972,6 @@ Geschichte.

    id="vom-umlesen-der-höchstpersönlichkeit-im-deutschen-bürgerlichen-gesetzbuch"> Vom Umlesen der Höchstpersönlichkeit im deutschen Bürgerlichen Gesetzbuch -
    @@ -8049,7 +8034,6 @@ auseinanderzulegen und neu zu begründen. Je nach gefundener Begründung gelangte man so zu dessen Begründet‑ oder teilweisen Unbegründetheit. Am Ausschluss einer gewillkürten Stellvertretung wollte man jedoch nach allen Ansichten festhalten.

    -
    @@ -11371,7 +11355,6 @@ schweizerische Weg und deutsche Rechtsimplantate
    -

    These 16. Der Schweizer Gesetzgeber schloss sich nicht der gesetzgeberischen Konzeption des deutschen Bürgerlichen Gesetzbuchs an. Anders als der deutsche Gesetzgeber, bestimmte der @@ -11449,7 +11432,6 @@ eingefügten Rechtsimplantate abzustossen. Versucht wird dies mit wiederum neuen Rechtsimplantaten, aus dem deutschen Recht. Die gesetzgeberische Konzeption hat man damit weit hinter sich gelassen. Für die Praxis bedeutet dies eine erhebliche Rechtsunsicherheit.

    -
    @@ -13190,7 +13172,6 @@ role="doc-noteref">1552

    überweisen. Mit der vorliegenden Rechtsgeschichte ist ihr hoffentlich der Grund bereitet.

    Zusammenfassung in Thesen

    -
    @@ -13435,7 +13416,6 @@ eingefügten Rechtsimplantate abzustossen. Versucht wird dies mit wiederum neuen Rechtsimplantaten, aus dem deutschen Recht. Die gesetzgeberische Konzeption hat man damit weit hinter sich gelassen. Für die Praxis bedeutet dies eine erhebliche Rechtsunsicherheit.

    -

    Quellen- und Literaturverzeichnis

    Adomeit, Klaus, Heteronome @@ -28774,7 +28754,6 @@ class="footnote-back" role="doc-backlink">↩︎

-
diff --git a/js/beforeAll.js b/js/beforeAll.js index 76de545..5a823d3 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -7,6 +7,7 @@ export default class beforeAll extends Handler { beforeParsed(content){ + listAbbr(content); numParagraph(content); thesis(content); wrapChapterAndIntro(content); @@ -42,6 +43,38 @@ export default class beforeAll extends Handler { } +function listAbbr(content){ + const h1s = content.querySelectorAll('h1'); + let abbrH1 = null; + + h1s.forEach(h1 => { + if (h1.textContent.trim().includes('Abkürzungsverzeichnis')) { + abbrH1 = h1; + } + }); + + if (!abbrH1) return; + + const sectionContent = content.querySelector('#section__content'); + if (!sectionContent || !sectionContent.contains(abbrH1)) return; + + // Collect h1 and all following siblings until next h1 + const elements = [abbrH1]; + let next = abbrH1.nextElementSibling; + while (next && next.tagName.toLowerCase() !== 'h1') { + elements.push(next); + next = next.nextElementSibling; + } + + // Create section and move elements into it + const section = document.createElement('section'); + section.id = 'list-of-abbr'; + elements.forEach(el => section.appendChild(el)); + + // content is the DocumentFragment; insert #list-of-abbr before #section__content + content.insertBefore(section, sectionContent); +} + function numParagraph(content){ let numParagraphs = content.querySelectorAll('ol[type="1"]'); numParagraphs.forEach(function (num, index) { diff --git a/src/output.html b/src/output.html index c90ec47..eed0aea 100644 --- a/src/output.html +++ b/src/output.html @@ -1,5 +1,4 @@ -

Höchstpersönlichkeit

-

Eine Erbrechtsgeschichte von Missverständnissen

+

«Der Gedanke … des … [W]illens hat sich nicht bewährt, der Glaube der modernen Jurisprudenz, in dem animus … den Schlüssel entdeckt zu haben, der ihr das Verständniß der ganzen … [L]ehre erschlüsse, hat From cd2a9e554d34b214863ce97f62119eed40236094 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 10:47:47 +0200 Subject: [PATCH 16/21] add counters to toc level-1 --- js/counters.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/counters.js b/js/counters.js index 153e1e4..77749c2 100644 --- a/js/counters.js +++ b/js/counters.js @@ -56,6 +56,7 @@ export default class counters extends Handler { h2Count = 0; // reset h2 const originalText = el.innerHTML; el.innerHTML = `${this.toUpperAlpha(h1Count)}${originalText}`; + el.setAttribute('data-counter', this.toUpperAlpha(h1Count)); break; case 'h2': From fbeefd2f31f3199ead2a1f812ff45b6534c8c3a7 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 16:54:26 +0200 Subject: [PATCH 17/21] num paragraph to top --- css/modules/_num-paragraph.scss | 8 ++++---- css/style.css | 4 ---- css/style.css.map | 2 +- js/snapToBaseline.js | 14 ++++++++++++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss index 366a9ad..ced281e 100644 --- a/css/modules/_num-paragraph.scss +++ b/css/modules/_num-paragraph.scss @@ -8,14 +8,14 @@ ol[type="1"]{ break-after: avoid; width: $indent; position: absolute; - display: flex; - align-items: center; - justify-content: center; + // display: flex; + // align-items: center; + // justify-content: center; &::after{ content: attr(start); display: block; - position: absolute; + // position: absolute; font-size: var(--fs-small); opacity: 0.5; } diff --git a/css/style.css b/css/style.css index f91719c..09f01a3 100644 --- a/css/style.css +++ b/css/style.css @@ -340,14 +340,10 @@ ol[type="1"] { break-after: avoid; width: 10mm; position: absolute; - display: flex; - align-items: center; - justify-content: center; } ol[type="1"]::after { content: attr(start); display: block; - position: absolute; font-size: var(--fs-small); opacity: 0.5; } diff --git a/css/style.css.map b/css/style.css.map index 8f512bd..2548acd 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js index 2e70a1d..ed583e3 100644 --- a/js/snapToBaseline.js +++ b/js/snapToBaseline.js @@ -30,7 +30,12 @@ export default class snapToBaseline extends Handler { const modulo = relativeTop % this.baseline; if (modulo !== 0) { - node.style.paddingTop = (this.baseline - modulo) + 'px'; + const pt = (this.baseline - modulo) + 'px'; + node.style.paddingTop = pt; + const prev = node.previousElementSibling; + if (prev && prev.matches('ol[type="1"]')) { + prev.style.paddingTop = pt; + } } } return node; @@ -56,7 +61,12 @@ export default class snapToBaseline extends Handler { const relativeTop = firstRect.top - areaRect.top; const modulo = relativeTop % this.baseline; if (modulo !== 0) { - node.style.paddingTop = (this.baseline - modulo) + 'px'; + const pt = (this.baseline - modulo) + 'px'; + node.style.paddingTop = pt; + const prev = node.previousElementSibling; + if (prev && prev.matches('ol[type="1"]')) { + prev.style.paddingTop = pt; + } } }); From acb97e1a8e7743eea43b65c2072ee6d5c0b7af42 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 17:01:29 +0200 Subject: [PATCH 18/21] =?UTF-8?q?titles=20w/=20point=20+=E2=80=AFcorrectio?= =?UTF-8?q?ns=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/modules/_titles.scss | 24 ++++++++++++++---------- css/style.css | 20 +++++++++++--------- css/style.css.map | 2 +- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 2f0e312..a6ee217 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -14,7 +14,7 @@ h2, h3, h4, h5, h6 { &::before{ - content: attr(data-counter); + content: attr(data-counter) ". "; } } @@ -99,9 +99,11 @@ text-align: center; line-height: calc(var(--baseline)*1.4); margin-top: 4mm; - padding-bottom: 4mm; + padding-bottom: calc(var(--baseline)*0.5); hyphens: auto; + // color: red; + &::before{ display: block; @@ -121,16 +123,18 @@ h3{ - font-weight: 500; - font-size: 1em; - line-height: calc(var(--baseline)*0.75); + font-weight: normal; + font-size: 16px; + line-height: calc(var(--baseline)*1); position: relative; margin-top: 4mm; - padding-bottom: 4mm; - padding-left: $indent; - text-align: center; + padding-bottom: 2mm; + padding-left: $indent*1.5; + text-align: left; &::before{ - display: block; + display: block; + position: absolute; + left: $indent; } } @@ -141,7 +145,7 @@ position: relative; margin-top: calc(var(--baseline)*1); padding-bottom: calc(var(--baseline)*0.5); - padding-left: $indent*2; + padding-left: $indent*1.5; &::before{ display: block; position: absolute; diff --git a/css/style.css b/css/style.css index 09f01a3..3627f5f 100644 --- a/css/style.css +++ b/css/style.css @@ -363,7 +363,7 @@ ol[type="1"].ol-clone { height: 213mm; } #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { - content: attr(data-counter); + content: attr(data-counter) ". "; } #section__content h2, #section__content h3, #section__content h4 { -moz-column-break-inside: avoid; @@ -425,24 +425,26 @@ ol[type="1"].ol-clone { text-align: center; line-height: calc(var(--baseline) * 1.4); margin-top: 4mm; - padding-bottom: 4mm; + padding-bottom: calc(var(--baseline) * 0.5); hyphens: auto; } #section__content h2::before { display: block; } #section__content h3 { - font-weight: 500; - font-size: 1em; - line-height: calc(var(--baseline) * 0.75); + font-weight: normal; + font-size: 16px; + line-height: calc(var(--baseline) * 1); position: relative; margin-top: 4mm; - padding-bottom: 4mm; - padding-left: 10mm; - text-align: center; + padding-bottom: 2mm; + padding-left: 15mm; + text-align: left; } #section__content h3::before { display: block; + position: absolute; + left: 10mm; } #section__content h4 { font-weight: 500; @@ -451,7 +453,7 @@ ol[type="1"].ol-clone { position: relative; margin-top: calc(var(--baseline) * 1); padding-bottom: calc(var(--baseline) * 0.5); - padding-left: 20mm; + padding-left: 15mm; } #section__content h4::before { display: block; diff --git a/css/style.css.map b/css/style.css.map index 2548acd..5f685c9 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EACA,gBAAA;EACA,cAAA;EACA,cAAA;ADEJ;;AEXA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFcJ;;AEZA;EACI,mBAAA;AFeJ;;AEZA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFaJ;;AGnBA;EACI;IACI,iBAAA;IACA,eAbF;IAcE,mBAbC;EHmCP;EGjBE;IACI,gBAjBE;IAkBF,kBAnBC;IAyBD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACC,WAzBJ;IHuCL;IGZM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;IHcR;EACF;EGXE;IACI,iBAzCC;IA0CD,iBAzCE;IA2CF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;MACA,WA5CJ;IHwDL;IGTY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;IHWT;IGRO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACA,iBAAA;IHUT;EACF;EGNE;IACI;MAAmB,aAAA;IHSvB;IGRI;MAAY,aAAA;IHWhB;IGVI;MAAc,aAAA;IHalB;IGZI;MAAa,aAAA;IHejB;IGdI;MAAoB,aAAA;IHiBxB;IGhBI;MAAY,aAAA;IHmBhB;IGlBI;MAAe,aAAA;IHqBnB;IGpBI;MAAe,aAAA;IHuBnB;IGtBI;MAAa,aAAA;IHyBjB;IGxBI;MAAgB,aAAA;IH2BpB;IG1BI;MAAgB,aAAA;IH6BpB;IG5BI;MAAsB,aAAA;IH+B1B;IG9BI;MAAe,aAAA;IHiCnB;IGhCI;MAAiB,aAAA;IHmCrB;IGlCI;MAAgB,aAAA;IHqCpB;IGpCI;MAAuB,aAAA;IHuC3B;EACF;EGtCE;IACI;MAAmB,aAAA;IHyCvB;IGxCI;MAAY,aAAA;IH2ChB;IG1CI;MAAc,aAAA;IH6ClB;IG5CI;MAAa,aAAA;IH+CjB;IG9CI;MAAoB,aAAA;IHiDxB;IGhDI;MAAY,aAAA;IHmDhB;IGlDI;MAAe,aAAA;IHqDnB;IGpDI;MAAe,aAAA;IHuDnB;IGtDI;MAAa,aAAA;IHyDjB;IGxDI;MAAgB,aAAA;IH2DpB;IG1DI;MAAgB,aAAA;IH6DpB;IG5DI;MAAsB,aAAA;IH+D1B;IG9DI;MAAe,aAAA;IHiEnB;IGhEI;MAAiB,aAAA;IHmErB;IGlEI;MAAgB,aAAA;IHqEpB;IGpEI;MAAuB,aAAA;IHuE3B;EACF;EGrEG;IACI,gBAzGC;IA0GF,iBA1GE;IA2GF;MAAmB,aAAA;IHwEvB;IGvEI;MAAY,aAAA;IH0EhB;IGzEI;MAAc,aAAA;IH4ElB;IG3EI;MAAa,aAAA;IH8EjB;IG7EI;MAAoB,aAAA;IHgFxB;IG/EI;MAAY,aAAA;IHkFhB;IGjFI;MAAe,aAAA;IHoFnB;IGnFI;MAAe,aAAA;IHsFnB;IGrFI;MAAa,aAAA;IHwFjB;IGvFI;MAAgB,aAAA;IH0FpB;IGzFI;MAAgB,aAAA;IH4FpB;IG3FI;MAAsB,aAAA;IH8F1B;IG7FI;MAAe,aAAA;IHgGnB;IG/FI;MAAiB,aAAA;IHkGrB;IGjGI;MAAgB,aAAA;IHoGpB;IGnGI;MAAuB,aAAA;IHsG3B;EACF;AACF;AGnGA;EACI,+BAAA;OAAA,mBAAA;AHqGJ;;AGhGA;EACI,8BAAA;OAAA,kBAAA;AHmGJ;;AG/FA;EACI,eAAA;OAAA,UAAA;EACA,oBAzIE;OAyIF,eAzIE;EA0IF,sBAAA;OAAA,iBAAA;AHkGJ;;AG5FA;EACI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;EACA,aAAA;AH+FJ;;AG7FA;EACI,sCAAA;AHgGJ;;AG7FA;EACI,iCAAA;AHgGJ;;AI/PA;EACI,cAAA;AJkQJ;;AI/PA;EACI,wBAAA;AJkQJ;;AIhQA;EACI,YAAA;EACA,uBAAA;AJmQJ;;AIhQA;EACI,mBAAA;EACA,qBAAA;AJmQJ;;AIhQA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;EACA,iBDfK;AHkRT;;AI/PA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,SAAA;EACA,UAAA;AJkQJ;;AI5PA;EACI,gBAAA;AJ+PJ;;AIzPA;EACI,8BAAA;AJ4PJ;;AI7OA;EACI,UAAA;AJgPJ;;AI3OA;EACI,gBAAA;EACA,0CAAA;AJ8OJ;AI7OI;EACI,yBAAA;EACA,qBAAA;EACA,eAAA;EACC,iBAAA;EACA,0BAAA;EACA,uBAAA;AJ+OT;;AI1OA;EACI,wCAAA;AJ6OJ;;AKlUA;EACI,kBAAA;ALqUJ;;AKlUA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,WFCK;EEAL,kBAAA;ALqUJ;AKhUM;EACE,oBAAA;EACA,cAAA;EAEA,0BAAA;EACA,YAAA;ALiUR;;AK3TA;EACI,gCAAA;OAAA,oBAAA;EACC,8BAAA;OAAA,kBAAA;EACA,MAAA;EACA,UAAA;AL8TL;;AMrVI;EAEI,qBAAA;OAAA,gBAAA;EACA,aHHI;AH0VZ;AMjVQ;EACI,2BAAA;ANmVZ;AM9UI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;AN+UR;AM9UQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANgVZ;AM5UK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;AN6UR;AM5UQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;AN8UZ;AMxUI;;;;;;EAMI,cAAA;AN0UR;AMpUI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EACC,4BAAA;EAED,+BAAA;OAAA,mBAAA;EAGA,aAAA;EACA,sBAAA;EACA,8BAAA;EACA,kBAAA;EAEA,kBAAA;ANiUR;AM5TQ;EACI,cAAA;AN8TZ;AMrTI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;ANuTR;AMrTQ;EACI,cAAA;ANuTZ;AMtSI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBHxHC;EGyHD,kBAAA;ANwSR;AMvSQ;EACI,cAAA;ANySZ;AMrSI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,2CAAA;EACA,kBAAA;ANuSR;AMtSQ;EACI,cAAA;EACA,kBAAA;EACA,UH1IH;AHkbT;AMnSK;EACE,mBAAA;EACC,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBHtJC;EGwJD,iBHxJC;AH4bT;AMnSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANqSZ;AMjSI;EACI,mBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBHtKC;EGwKD,iBHxKC;AH0cT;AMjSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANmSZ;;AMzRA;EACQ,aAAA;AN4RR;;AO5dA;EACI,aAAA;EACA,UAAA;AP+dJ;;AQjeA;EACI,6BAAA;EACA,0BAAA;EACA,yCAAA;EACA,kBAAA;EACA,eAAA;EAGA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;ARkeJ;;AQxdA;EACI,aAAA;AR2dJ;;AQxdA;EACI,6BAAA;EACA,0BAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;AR2dJ;;AS3fA;EAEI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;AT6fJ;AS1fI;EACI,qBAAA;EACA,YAAA;AT4fR;ASzfI;EACO,qCAAA;EACH,0CAAA;EACA,iBAAA;EACA,gBAAA;AT2fR;ASxfI;EACI,iBAAA;EACQ,uCAAA;EACR,0CAAA;AT0fR;ASvfI;EACI,gBAAA;ATyfR;ASrfK;EACG,iBAAA;ATufR;ASnfM;EACE,iBAAA;ATqfR;ASjfM;EACE,iBAAA;ATmfR","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss","modules/_toc.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EACA,gBAAA;EACA,cAAA;EACA,cAAA;ADEJ;;AEXA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFcJ;;AEZA;EACI,mBAAA;AFeJ;;AEZA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFaJ;;AGnBA;EACI;IACI,iBAAA;IACA,eAbF;IAcE,mBAbC;EHmCP;EGjBE;IACI,gBAjBE;IAkBF,kBAnBC;IAyBD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACC,WAzBJ;IHuCL;IGZM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;IHcR;EACF;EGXE;IACI,iBAzCC;IA0CD,iBAzCE;IA2CF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;MACA,WA5CJ;IHwDL;IGTY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;IHWT;IGRO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACA,iBAAA;IHUT;EACF;EGNE;IACI;MAAmB,aAAA;IHSvB;IGRI;MAAY,aAAA;IHWhB;IGVI;MAAc,aAAA;IHalB;IGZI;MAAa,aAAA;IHejB;IGdI;MAAoB,aAAA;IHiBxB;IGhBI;MAAY,aAAA;IHmBhB;IGlBI;MAAe,aAAA;IHqBnB;IGpBI;MAAe,aAAA;IHuBnB;IGtBI;MAAa,aAAA;IHyBjB;IGxBI;MAAgB,aAAA;IH2BpB;IG1BI;MAAgB,aAAA;IH6BpB;IG5BI;MAAsB,aAAA;IH+B1B;IG9BI;MAAe,aAAA;IHiCnB;IGhCI;MAAiB,aAAA;IHmCrB;IGlCI;MAAgB,aAAA;IHqCpB;IGpCI;MAAuB,aAAA;IHuC3B;EACF;EGtCE;IACI;MAAmB,aAAA;IHyCvB;IGxCI;MAAY,aAAA;IH2ChB;IG1CI;MAAc,aAAA;IH6ClB;IG5CI;MAAa,aAAA;IH+CjB;IG9CI;MAAoB,aAAA;IHiDxB;IGhDI;MAAY,aAAA;IHmDhB;IGlDI;MAAe,aAAA;IHqDnB;IGpDI;MAAe,aAAA;IHuDnB;IGtDI;MAAa,aAAA;IHyDjB;IGxDI;MAAgB,aAAA;IH2DpB;IG1DI;MAAgB,aAAA;IH6DpB;IG5DI;MAAsB,aAAA;IH+D1B;IG9DI;MAAe,aAAA;IHiEnB;IGhEI;MAAiB,aAAA;IHmErB;IGlEI;MAAgB,aAAA;IHqEpB;IGpEI;MAAuB,aAAA;IHuE3B;EACF;EGrEG;IACI,gBAzGC;IA0GF,iBA1GE;IA2GF;MAAmB,aAAA;IHwEvB;IGvEI;MAAY,aAAA;IH0EhB;IGzEI;MAAc,aAAA;IH4ElB;IG3EI;MAAa,aAAA;IH8EjB;IG7EI;MAAoB,aAAA;IHgFxB;IG/EI;MAAY,aAAA;IHkFhB;IGjFI;MAAe,aAAA;IHoFnB;IGnFI;MAAe,aAAA;IHsFnB;IGrFI;MAAa,aAAA;IHwFjB;IGvFI;MAAgB,aAAA;IH0FpB;IGzFI;MAAgB,aAAA;IH4FpB;IG3FI;MAAsB,aAAA;IH8F1B;IG7FI;MAAe,aAAA;IHgGnB;IG/FI;MAAiB,aAAA;IHkGrB;IGjGI;MAAgB,aAAA;IHoGpB;IGnGI;MAAuB,aAAA;IHsG3B;EACF;AACF;AGnGA;EACI,+BAAA;OAAA,mBAAA;AHqGJ;;AGhGA;EACI,8BAAA;OAAA,kBAAA;AHmGJ;;AG/FA;EACI,eAAA;OAAA,UAAA;EACA,oBAzIE;OAyIF,eAzIE;EA0IF,sBAAA;OAAA,iBAAA;AHkGJ;;AG5FA;EACI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;EACA,aAAA;AH+FJ;;AG7FA;EACI,sCAAA;AHgGJ;;AG7FA;EACI,iCAAA;AHgGJ;;AI/PA;EACI,cAAA;AJkQJ;;AI/PA;EACI,wBAAA;AJkQJ;;AIhQA;EACI,YAAA;EACA,uBAAA;AJmQJ;;AIhQA;EACI,mBAAA;EACA,qBAAA;AJmQJ;;AIhQA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;EACA,iBDfK;AHkRT;;AI/PA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,SAAA;EACA,UAAA;AJkQJ;;AI5PA;EACI,gBAAA;AJ+PJ;;AIzPA;EACI,8BAAA;AJ4PJ;;AI7OA;EACI,UAAA;AJgPJ;;AI3OA;EACI,gBAAA;EACA,0CAAA;AJ8OJ;AI7OI;EACI,yBAAA;EACA,qBAAA;EACA,eAAA;EACC,iBAAA;EACA,0BAAA;EACA,uBAAA;AJ+OT;;AI1OA;EACI,wCAAA;AJ6OJ;;AKlUA;EACI,kBAAA;ALqUJ;;AKlUA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,WFCK;EEAL,kBAAA;ALqUJ;AKhUM;EACE,oBAAA;EACA,cAAA;EAEA,0BAAA;EACA,YAAA;ALiUR;;AK3TA;EACI,gCAAA;OAAA,oBAAA;EACC,8BAAA;OAAA,kBAAA;EACA,MAAA;EACA,UAAA;AL8TL;;AMrVI;EAEI,qBAAA;OAAA,gBAAA;EACA,aHHI;AH0VZ;AMjVQ;EACI,gCAAA;ANmVZ;AM9UI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;AN+UR;AM9UQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANgVZ;AM5UK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;AN6UR;AM5UQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;AN8UZ;AMxUI;;;;;;EAMI,cAAA;AN0UR;AMpUI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EACC,4BAAA;EAED,+BAAA;OAAA,mBAAA;EAGA,aAAA;EACA,sBAAA;EACA,8BAAA;EACA,kBAAA;EAEA,kBAAA;ANiUR;AM5TQ;EACI,cAAA;AN8TZ;AMrTI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;EACA,2CAAA;EACA,aAAA;ANuTR;AMnTQ;EACI,cAAA;ANqTZ;AMpSI;EACI,mBAAA;EACA,eAAA;EACA,sCAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACC,kBAAA;EACD,gBAAA;ANsSR;AMrSQ;EACO,cAAA;EACH,kBAAA;EACA,UH/HH;AHsaT;AMnSI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,2CAAA;EACA,kBAAA;ANqSR;AMpSQ;EACI,cAAA;EACA,kBAAA;EACA,UH9IH;AHobT;AMjSK;EACE,mBAAA;EACC,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBH1JC;EG4JD,iBH5JC;AH8bT;AMjSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANmSZ;AM/RI;EACI,mBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBH1KC;EG4KD,iBH5KC;AH4cT;AM/RQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANiSZ;;AMvRA;EACQ,aAAA;AN0RR;;AO9dA;EACI,aAAA;EACA,UAAA;APieJ;;AQneA;EACI,6BAAA;EACA,0BAAA;EACA,yCAAA;EACA,kBAAA;EACA,eAAA;EAGA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;ARoeJ;;AQ1dA;EACI,aAAA;AR6dJ;;AQ1dA;EACI,6BAAA;EACA,0BAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;AR6dJ;;AS7fA;EAEI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;AT+fJ;AS5fI;EACI,qBAAA;EACA,YAAA;AT8fR;AS3fI;EACO,qCAAA;EACH,0CAAA;EACA,iBAAA;EACA,gBAAA;AT6fR;AS1fI;EACI,iBAAA;EACQ,uCAAA;EACR,0CAAA;AT4fR;ASzfI;EACI,gBAAA;AT2fR;ASvfK;EACG,iBAAA;ATyfR;ASrfM;EACE,iBAAA;ATufR;ASnfM;EACE,iBAAA;ATqfR","file":"style.css"} \ No newline at end of file From 20e5b00d641223317a1e548b42de69b392de389d Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 17:25:34 +0200 Subject: [PATCH 19/21] title level 1, add point --- js/counters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/counters.js b/js/counters.js index 153e1e4..8e393eb 100644 --- a/js/counters.js +++ b/js/counters.js @@ -55,7 +55,7 @@ export default class counters extends Handler { h1Count++; h2Count = 0; // reset h2 const originalText = el.innerHTML; - el.innerHTML = `${this.toUpperAlpha(h1Count)}${originalText}`; + el.innerHTML = `${this.toUpperAlpha(h1Count)}.${originalText}`; break; case 'h2': From c801320c31ff62bbb064d02a4073af5325b0fe0b Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 17:43:29 +0200 Subject: [PATCH 20/21] styles paragraphes --- css/modules/_followingNotes.scss | 35 - css/modules/_footnotes.scss | 54 -- css/modules/_text.scss | 2 +- css/modules/_titles.scss | 43 +- css/style.css | 39 +- css/style.css.map | 2 +- index.html | 1188 +----------------------------- 7 files changed, 79 insertions(+), 1284 deletions(-) delete mode 100644 css/modules/_followingNotes.scss delete mode 100644 css/modules/_footnotes.scss diff --git a/css/modules/_followingNotes.scss b/css/modules/_followingNotes.scss deleted file mode 100644 index 6ea7f26..0000000 --- a/css/modules/_followingNotes.scss +++ /dev/null @@ -1,35 +0,0 @@ -.container-following-note{ - font-family: var(--font-sans); - font-size: var(--fs-small); - line-height: calc(var(--baseline)*0.75); - position: relative; - margin-top: 2px; - // margin-top: calc(var(--baseline)*0.25); - - hyphens: auto; - hyphenate-limit-chars: 7 3 4; - hyphenate-limit-lines: 2; - hyphenate-limit-zone: 8%; - word-spacing: -0.004em; - text-align: justify; - // color: #999; - -} - -.body_note{ - // padding-left: calc(var(--indent)*1); - // position: relative; -} - -.following-note_marker::after{ - content: ". " -} - -.following-note_call{ - font-family: var(--font-sans); - font-size: var(--fs-small); - line-height: 1; - position: relative; - top: -4px; -} - diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss deleted file mode 100644 index c11c056..0000000 --- a/css/modules/_footnotes.scss +++ /dev/null @@ -1,54 +0,0 @@ -// INUTILE - - -@page { - @footnote { - float: bottom; - footnote-policy: auto; - } - } - - .pagedjs_footnote_content{ - padding-top: calc(var(--baseline)*1); - } - -.inline-note { - float: footnote; - footnote-policy: auto; - font-size: var(--fs-small); - line-height: calc(var(--baseline)*0.8); - padding-left: var(--indent); - position: relative; - font-weight: 600; - - &::marker{ - display: none; - content: ""; - } - -} - - -[data-counter-note]{ -&::before{ - content: attr(data-counter-note) "."; - position: absolute; - left: 0px; - } -} - -.inline-note::after{ - font-family: var(--font); - font-size: var(--fs-small); - line-height: 0; - position: relative; - top: -3px; - font-variant-position: normal!important; - -} - -blockquote .inline-note{ - font-variant-position: normal!important; -} - - diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 835976d..aef723d 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -53,7 +53,7 @@ p, li{ blockquote{ // font-family: var(--font-quote); border-left: 0.5px solid black; - margin-left: calc(var(--unit)*1.5); + margin-left: calc(var(--unit)*2); } diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 6a41185..6442bb6 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -26,8 +26,9 @@ h2, h3, h4, h5, h6 { + color: red; &::before{ - content: attr(data-counter); + content: attr(data-counter) ". "; } } @@ -102,10 +103,12 @@ margin-top: 6mm; padding-bottom: 6mm; hyphens: auto; - padding-left: calc(var(--unit)*1); + margin-left: calc(var(--unit)*1); + padding-left: calc(var(--unit)*0.5); position: relative; max-width: calc(var(--unit)*5); text-wrap: balance; + // background-color: red; &::before{ display: block; @@ -123,7 +126,8 @@ font-size: var(--fs-medium); line-height: 1.1; padding-left: calc(var(--unit)*1); - + margin-left: calc(var(--unit)*2); + padding-left: calc(var(--unit)*0.5); position: relative; margin-top: 6mm; padding-bottom: 6mm; @@ -143,14 +147,17 @@ margin-top: 6mm; padding-bottom: 6mm; margin-right: 20mm; - padding-left: calc(var(--unit)*2); text-decoration: 0.5px underline; text-underline-offset: 3px; + margin-left: calc(var(--unit)*2); + padding-left: calc(var(--unit)*0.5); + &::before{ display: block; position: absolute; - left: calc(var(--unit)*1); + left: 0; + // left: calc(var(--unit)*1); text-decoration: none; } } @@ -159,13 +166,14 @@ h5{ font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline)*0.75); + line-height: calc(var(--baseline)*1); position: relative; + top: -2px; margin-top: calc(var(--baseline)*1); - padding-bottom: calc(var(--baseline)*0.25); - padding-left: $indent; + margin-left: calc(var(--unit)*3); + padding-left: calc(var(--unit)*0.5); + - text-indent: $indent; &::before{ display: block; position: absolute; @@ -176,16 +184,17 @@ h6{ font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline)*0.75); - position: relative; + line-height: calc(var(--baseline)*1); margin-top: calc(var(--baseline)*1); - padding-left: $indent; - - text-indent: $indent; + margin-left: calc(var(--unit)*2); + // padding-left: calc(var(--unit)*0.5); + // color: red; + position: relative; + top: -2px; &::before{ - display: block; - position: absolute; - left: 0; + // display: block; + // position: absolute; + // left: 0; } } diff --git a/css/style.css b/css/style.css index 9bef135..ca42010 100644 --- a/css/style.css +++ b/css/style.css @@ -259,7 +259,7 @@ p, li { blockquote { border-left: 0.5px solid black; - margin-left: calc(var(--unit) * 1.5); + margin-left: calc(var(--unit) * 2); } blockquote p { @@ -353,8 +353,11 @@ ol[type="1"] { color: red; position: absolute; } +#section__content h2, #section__content h3, #section__content h4, #section__content h5, #section__content h6 { + color: red; +} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { - content: attr(data-counter); + content: attr(data-counter) ". "; } #section__content h2, #section__content h3, #section__content h4 { -moz-column-break-inside: avoid; @@ -411,7 +414,8 @@ ol[type="1"] { margin-top: 6mm; padding-bottom: 6mm; hyphens: auto; - padding-left: calc(var(--unit) * 1); + margin-left: calc(var(--unit) * 1); + padding-left: calc(var(--unit) * 0.5); position: relative; max-width: calc(var(--unit) * 5); text-wrap: balance; @@ -426,6 +430,8 @@ ol[type="1"] { font-size: var(--fs-medium); line-height: 1.1; padding-left: calc(var(--unit) * 1); + margin-left: calc(var(--unit) * 2); + padding-left: calc(var(--unit) * 0.5); position: relative; margin-top: 6mm; padding-bottom: 6mm; @@ -444,26 +450,27 @@ ol[type="1"] { margin-top: 6mm; padding-bottom: 6mm; margin-right: 20mm; - padding-left: calc(var(--unit) * 2); -webkit-text-decoration: 0.5px underline; text-decoration: 0.5px underline; text-underline-offset: 3px; + margin-left: calc(var(--unit) * 2); + padding-left: calc(var(--unit) * 0.5); } #section__content h4::before { display: block; position: absolute; - left: calc(var(--unit) * 1); + left: 0; text-decoration: none; } #section__content h5 { font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline) * 0.75); + line-height: calc(var(--baseline) * 1); position: relative; + top: -2px; margin-top: calc(var(--baseline) * 1); - padding-bottom: calc(var(--baseline) * 0.25); - padding-left: 10mm; - text-indent: 10mm; + margin-left: calc(var(--unit) * 3); + padding-left: calc(var(--unit) * 0.5); } #section__content h5::before { display: block; @@ -473,18 +480,12 @@ ol[type="1"] { #section__content h6 { font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline) * 0.75); - position: relative; + line-height: calc(var(--baseline) * 1); margin-top: calc(var(--baseline) * 1); - padding-left: 10mm; - text-indent: 10mm; + margin-left: calc(var(--unit) * 2); + position: relative; + top: -2px; } -#section__content h6::before { - display: block; - position: absolute; - left: 0; -} - [data-id=section__content] > .chapter h2:first-child, [data-id=section__content] > .chapter h3:first-child, [data-id=section__content] > .chapter h4:first-child { diff --git a/css/style.css.map b/css/style.css.map index 681f912..d932843 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/index.html b/index.html index 4d03903..d0912c4 100644 --- a/index.html +++ b/index.html @@ -47,1165 +47,13 @@ +

-

«Der Gedanke … des … [W]illens hat sich nicht bewährt, der Glaube der -modernen Jurisprudenz, in dem animus … den Schlüssel entdeckt -zu haben, der ihr das Verständniß der ganzen … [L]ehre erschlüsse, hat -sich als ein trügerischer erwiesen, all’ die unsägliche Mühe, die sie -aufgeboten, alle die verzweifelten und gewaltsamen Anstrengungen, denen -sie sich unterzogen hat, sind nutzlos aufgewandt worden, sie haben, wie -es stets der Fall ist, wenn man mit einem falschen Schlüssel gewaltsam -ein Schloß zu öffnen sucht, das Schloß nicht geöffnet, sondern -verdreht.»

-
-

Jhering, Besitzwille, 1889, S. 364, -dort in Bezug auf die römische «Besitzeslehre».

-
-

Abkürzungsverzeichnis

- ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
A(.)L(.)R.Allgemeine(n/s) Landrecht
a. BGB.Allgemeines bürgerliches Gesetzbuch
a.A.anderer Ansicht
a.a.O.am angeführten Ort
a.E.am Ende
abl.ablehnend
Abs.Absatz
AcPArchiv für die civilistische Praxis
add.ad diem
AGGAllgemeines Gleichbehandlungsgesetz
AJPAktuelle Juristische Praxis
Aktiengesellsch.Aktiengesellschaft
allg.allgemeinen/Allgemeinen
Allg. Th.Allgemeine(r) Theil
AllgTAllgemeiner Teil
Anm.Anmerkung(en)
apr.april
apvactio praescriptis verbis
arg e contr.argumentum e contrario
ARSPArchiv für Rechts- und Sozialphilosophie
Art.Artikel(n)
art.article/articolo/artigo/artículo
ATAllgemeiner Teil
Aufl.Auflage
B(.)G(.)B(.)/BGb.Bürgerliche(s) Gesetzbuch
b(e)z(w).beziehungsweise
bayer. NotarGBayerisches Notariatsgesetz
Bd.Band
BeckOGKBeck Online Großkommentar
BeckOKBeck’sche Online-Kommentare
benef.beneficiis
besbesonders
Beschl.Beschluss
BeurkGBeurkundungsgesetz
BGBBBundesgesetz über das bäuerliche Bodenrecht vom 4. Oktober 1991 (SR -211.412)
BGEEntscheidungen des Schweizerischen Bundesgerichts
BGerBundesgericht
BGHBundesgerichtshof
BGHZAmtliche Sammlung der Entscheidungen des BGH in Zivilsachen
BKBerner Kommentar
BlZür.Blätter für Zürcherische Rechtsprechung
BSKBasler Kommentar
bspw.beispielsweise
BVBundesverfassung der Schweizerischen Eidgenossenschaft vom 18. April -1999 (SR 101)
BWNotZZeitschrift für das Notariat in Baden-Württemberg
bzgl.bezüglich
C. c.Code Civil
C. P. O.Civilprozeßordnung
cap.capitulum
CCCode civil suisse du 10 décembre 1907 (SR 210)
cf.confer
CHKHandkommentar zum Schweizer Privatrecht
cit.citatum
Cod.Codex Iustinianus
code civ.Code Civil
cond(it).condicionibus/conditionibus
contr.contrahenda
CRCommentaire Romand
CSCommentaire Stämpfli
d.der/des
D.Digesta Iustiniani
d.h.das heisst
d.i.das ist
dems.demselben
dens.denselben
ders.derselbe
dess.desselben
dies.dieselbe(n)
DRDeutsches Recht (vereinigt mit Juristische Wochenschrift), -Zentralorgan des National-Sozialistischen Rechtswahrerbundes
Dr.Doktor
ds.desselben
DVODurchführungsverordnung
E(.)Entwurf
E.Erwägung
Ed.Edition
EGBGBEinführungsgesetz zum Bürgerlichen Gesetzbuche
EheGEhegesetz
eingesetzt.eingesetzten
Einl.Einleitung
emt.emptione
Entw.Entwurf(s)
eod.eodem
ErbbauRGErbbaurechtsgesetz
ErblErblasser
ErbRZeitschrift für die gesamte erbrechtliche Praxis/Erbrecht
Erbr. E.Erbrechtsentwurf
ErbregelungsVOErbregelungsverordnung
Erl.Erläuterung(en)
et al.et alii
etc.et cetera
evtl.eventuell
F. R. Entw.Familienrechtsentwurf
f./ff(.)(und) folgende(r)
FamRZZeitschrift für das gesamte Familienrecht
Febr.Februar
FGFestgabe
fideic.fideicommissariis
flg.folgend
Fn.Fussnote(n)
fr(an)z.französische(n/s)
Fr.Franken
FSFestschrift
Gai.Gaius
Gemein R.Gemeines Recht
gesetzl.gesetzliche(n)
GGGrundgesetz
GG.Gütergemeinschaft
ggübergegenüber
GSGedenkschrift
Gsb.Gesetzbuch/Gesetzbücher
h.L.herrschende Lehre
h.t.hoc titulo
her(ed).heredibus
Hess./hess. Entw.Entwurf eines bürgerlichen Gesetzbuchs für das Großherzogtum -Hessen
HKKHistorisch-kritischer Kommentar zum BGB
HöfeOHöfeordnung
Hr.Herr(n)
HRPHandbuch des Römischen Privatrechts
Hrsg.Herausgeber(in)
HTÜHaager Trustübereinkommen
i.in
i.E.im Ergebnis
i.f.in fine
i.S.im Sinne
i.V.m.in Verbindung mit
insb(es).insbesondere
Inst.Institutiones Iustiniani
inst.instituendis
ital. GB.Italienischen Zivilgesetzbuch
JhJahrhundert
JherJbJherings Jahrbücher für die Dogmatik des bürgerlichen Rechts
jun.junior
Jurist.Juristische
JuSJuristische Schulung
JWJuristische Wochenschrift
JZJuristenzeitung
K. E.Kommissionsentwurf
Kant.kantonalen
Kap.Kapitel
KGerKantonsgericht
KJKritische Justiz
Kom.Kommission
Komm.Kommentar
krit.kritisch(en)
KritUebKritische Ueberschau der deutschen Gesetzgebung und -Rechtswissenschaft
KUKOKurzkommentar
l. V.(en)letztwillige(n/r) Verfügung(en)
L./l.Liber
l.c.loco citato
leg.legatis
Lehrb.Lehrbuch
lib.libertorum/libertatibus
LPartGLebenspartnerschaftsgesetz
LUKanton Luzern
lüb. G.Lübisches Gesetzbuch
M.Mark/Motive
m.a.W.mit anderen Worten
m.E.meines Erachtens
m.H.mit Hinweisen
m.N.mit Nachweisen
m.w.N.mit weiteren Nachweisen
manum.manumissis
Mot.Motive(n)
MünchKommMünchener Kommentar
N.Note(n), Nummer(n), Randnote(n)
nähnäher
NJWNeue Juristische Wochenschrift
No.Numero
not@lexRevue de droit privé et fiscal du patrimoine
Nr./nr.Nummer(n)/Randnummer(n)
NSNationalsozialismus
O.R./ORBundesgesetz betreffend die Ergänzung des Schweizerischen -Zivilgesetzbuches (Fünfter Teil: Obligationenrecht) vom 30. März 1911 -(SR 220)
obl.obligationibus
Oestr./österr(eich). Gsb.Österreichische(s/n) Gesetzbuch
OFKOrell Füssli Kommentar
op.operis
OrdngOrdnung
österreich.österreichische
p(ag).pagina(e)/page(s)
P.Protokolle
p. Chr. n.post Christum natum
PDPrivatdozent
pr.principium
Pr. A. L. R.Allgemeines Landrecht für die Preußischen Staaten
PraDie Praxis
PraxKommPraxiskommentar
preuß.preußische(m/n/s)
Preuß. Ldr.Allgemeines Landrecht für die Preußischen Staaten
ProdHaftGProdukthaftungsgesetz
Prof.Professor
Prot.Protokoll
RRecht
RRecht
R.R.Römischen Rechts
RabelsZRabels Zeitschrift für ausländisches und internationales -Privatrecht
RdNr.Randnummer
rechtZeitschrift für juristische Weiterbildung und Praxis
RedKom.Redaktionskommission
resp.respektive
RG(.)Reichsgericht(s)
RGBl.Reichsgesetzblatt
RGRKReichsgerichtsrätekommentar
RGZEntscheidungen des Reichsgerichts in Zivilsachen
RJRechtshistorisches Journal
Röm./röm.römische(m/n/r)
Rsp(r.)Rechtsprechung
S.Seite(n)/Satz
s.siehe
s.g.sogenannten
sächs.sächsische(n/s)
Sächs./sächs. Gsb./G(.)B.Sächsische(s/n) Gesetzbuch
SAGSchweizerische Aktiengesellschaft
Sammlg.Sammlung
sc(il).scilicet
schw(eiz)./Schweiz.schweizerische(s)
Sept.Septembre
Seuff. A.J.A. Seuffert’s Archiv für Entscheidungen der obersten Gerichte in -den deutschen Staaten
SJZSchweizerische Juristen-Zeitung
sog.sogenannte(n)
Sp.Spalte(n)
SPRSchweizerisches Privatrecht
SRSystematische Sammlung des Bundesrechts
SRZSaarbrücker Rechtszeitschrift
St.Sankt
successioZeitschrift für Erbrecht
TDPSTraité de Droit Privé Suisse
TETeilentwurf
TE-ErbrechtTeilentwurf Erbrecht
test.Testamentis/testamento
testam.testamentarische
TestGGesetz über die Errichtung von Testamenten und Erbverträgen
Thür.Thüringen
Tit.Titulus, Titel
TwegTodeswegen
u(.)und
u(.)A.und andere(s)
u(.)s(.)w.und so weiter
U.Urteil
u.a.unter anderem
u.Ä.und Ähnliches
u.dgl.und dergleichen
u.E.unseres Erachtens
u.s.f.und so fort
übrübrigen
UEUlpiani epitome (tituli ex corpore Ulpiani)
Ulp.Domitius Ulpianus
vvon
v(er)gl.vergleiche
v.vom/von/vor
verb.verborum
Verf.Verfasser(s)
VerfgVerfügung
verpflverpflichtet
VersAusglGVersorgungsausgleichsgesetz
VOVerordnung
Vorbem.Vorbemerkungen
vorl.vorliegende(n)
vs.versus
W. E.Willenserklärung
w.N.weitere(n) Nachweise(n)
WeimRVWeimarer Reichsverfassung
wirtschaftlwirtschaftlichen
WRVWeimarer Reichsverfassung
württ(emb).württembergische(n/s)
z(.)B(.)zum Beispiel
ZA(k)fDRZeitschrift der Akademie für Deutsches Recht
ZBJVZeitschrift des Bernischen Juristenvereins
ZEuPZeitschrift für Europäisches Privatrecht
ZEVZeitschrift für Erbrecht und Vermögensnachfolge
ZfPWZeitschrift für die gesamte Privatrechtswissenschaft
ZGB(.)/ZGb.Schweizerisches Zivilgesetzbuch vom 10. Dezember 1907 (SR 210)
ZHRZeitschrift für das gesamte Handels- und Wirtschaftsrecht
Ziff.Ziffer
ZivSen.Zivilsenat
ZKZürcher Kommentar
ZNRZeitschrift für Neuere Rechtsgeschichte
ZPOZivilprozessordnung
ZRG GAZeitschrift der Savigny-Stiftung für Rechtsgeschichte -(Germanistische Abteilung)
ZRG RAZeitschrift der Savigny-Stiftung für Rechtsgeschichte (Romanistische -Abteilung)
ZSRZeitschrift für Schweizerisches Recht
-

Vorrede

+ + + +

Vorrede

@@ -1328,6 +176,8 @@ class="smallcaps">Hubers, dem Redaktor des Schweizerischen Zivilgesetzbuchs.13 Die Gutachtenanfrage hatte folgenden Wortlaut:

+ +

„Sehr geehrter Herr Professor!

Darf ich mir gestatten Sie um Ihre Ansicht zu bitten über den Artikel ‘Kann der Erblasser die Bestimmung der Person, die eine letztwillige @@ -1382,11 +232,13 @@ aufgestellten Testamentsbestimmungen anfechtbar.

dem hochverehrten Schöpfer unseres Civilgesetzbuches, zu vernehmen, welches Ihre Meinung ist.“14

+

Eugen Huber antwortete bereits wenige Tage später wie folgt:

+

„Sehr geehrter Herr Doktor!

Auf Ihre Anfrage v. 12. ds. teile ich Ihnen ergebenst mit, dass Folgendes in der Frage meine Auffassung ist:

@@ -1439,6 +291,7 @@ Inhalt oder in der Willensvollstreckung gegeben ist.

diesen Zeilen mit genügender Bestimmtheit entnehmen können.“15

+

Höchstpersönlichkeit im Erbrecht heute

    @@ -1497,6 +350,7 @@ role="doc-noteref">24

    +

    So findet man auf der einen Seite als Grundsatz materieller Höchstpersönlichkeit heute formuliert, «dass der Erblasser den Inhalt seiner Verfügung von Todes wegen selbst festzusetzen @@ -1543,6 +397,7 @@ Delegation ist einzig dort zu verneinen, wo der Erblasser sich bequemlichkeitshalber um den ihm möglichen Entscheid gedrückt hat».29

    +
    @@ -1583,6 +438,7 @@ der Höchstpersönlichkeit

Wie es aber zu solchem, besonderen Grundsatz der Höchstpersönlichkeit im Erbrecht überhaupt kommen konnte,

+

«Die Testfreiheit ist doch als erbrechtliche Ausprägung der Privatautonomie zu begreifen: die Verfügung über sein Vermögen wird dem Ermessen des Eigentümers überlassen. Dabei ist es im Rechtsverkehr unter @@ -1592,6 +448,7 @@ Gegenstand zu übertragen ist) in das Ermessen eines Dritten stellt. Warum soll dies im Falle einer Verfügung von Todes wegen anders sein?»,36

+

scheint schnell erzählt. Aus schweizerischer Perspektive steht dabei heute die folgende Rechtsgeschichte im Vordergrund.einen Vermögensvorteil als Vermächtnis zuwenden» kann.72

+

«Das ZGB. bestimmt in den Art. 481 bis 497 erschöpfend, welche Verfügungsarten inhaltlich zugelassen sein sollen. Es verlangt, dass mit dem Tode des Erblassers ein gesetzlicher oder eingesetzter Erbe @@ -1843,6 +701,7 @@ Erblasser verfügen würde, ein Dritter habe nach dem Tode des Erblassers zu bestimmen, wer Erbe oder Vermächtnisnehmer sein soll».73

+

Möglich war «also nicht Überlassung der Bezeichnung durch Direktion … Anders BGb. 2064 u. 2151 u. Gemein R.»86

Hintergrund neu zu begründen. Anstelle der subjektiven Verantwortung gegen sich selbst hatte man mit der Verantwortung gegenüber den gesetzlichen Erben nun ihr objektives Mass gefunden:

+

«Entscheidend ist, ob sachliche Gründe (z.B. fehlendes Wissen über konkrete Zwecke wohltätiger Institutionen oder Möglichkeit der Förderung bestimmter technischer Innovationen; noch nicht absehbare @@ -1998,6 +858,7 @@ Dritten im Zeitpunkt der Umsetzung des Testaments nach objektiven, sachlichen Kriterien einen Entscheid treffen zu lassen».87

+

Ein Kurzschluss gleich zu Anfang

    @@ -2225,6 +1086,8 @@ des römischen Rechts
    + +

    These 1. Im Zentrum unseres heutigen Rechtsdenken und auch unserer Sprache der Rechte steht die Privatautonomie bzw. die Freiheit des Willens. Im Zentrum des römischen Rechts und seiner Sprache @@ -2255,6 +1118,7 @@ allgemein vertretene abweichende Auffassung, dass das römische Erbrecht noch über die Stellvertretung hinaus besondere Anforderungen an die Selbstständigkeit und Bestimmtheit des Willens des Erblassers gestellt hat, beruht auf einem Missverständnis der römischen Quellen.

    +
    @@ -3596,6 +2460,7 @@ Bürgerlichen Gesetzbuch
    +

    These 4. Das 19. Jahrhundert wurde zur Wiege der noch heute geltenden Voraussetzung einer Höchstpersönlichkeit der Verfügung von Todes wegen, zunächst vermittelt über das gemeine Recht, @@ -3662,6 +2527,7 @@ Auflage beschlossen hatte, bestimmte er mit § 2151 BGB und damit in gewisser Spannung zum Prinzip des Vonselbsterwerbs eine Ausnahme von der Selbständigkeit und Bestimmtheit der Verfügung auch für das Vermächtnis.

    +
    @@ -7972,6 +6838,7 @@ Geschichte.

    id="vom-umlesen-der-höchstpersönlichkeit-im-deutschen-bürgerlichen-gesetzbuch"> Vom Umlesen der Höchstpersönlichkeit im deutschen Bürgerlichen Gesetzbuch +
    @@ -8034,6 +6901,7 @@ auseinanderzulegen und neu zu begründen. Je nach gefundener Begründung gelangte man so zu dessen Begründet‑ oder teilweisen Unbegründetheit. Am Ausschluss einer gewillkürten Stellvertretung wollte man jedoch nach allen Ansichten festhalten.

    +
    @@ -11355,6 +10223,7 @@ schweizerische Weg und deutsche Rechtsimplantate
    +

    These 16. Der Schweizer Gesetzgeber schloss sich nicht der gesetzgeberischen Konzeption des deutschen Bürgerlichen Gesetzbuchs an. Anders als der deutsche Gesetzgeber, bestimmte der @@ -11432,6 +10301,7 @@ eingefügten Rechtsimplantate abzustossen. Versucht wird dies mit wiederum neuen Rechtsimplantaten, aus dem deutschen Recht. Die gesetzgeberische Konzeption hat man damit weit hinter sich gelassen. Für die Praxis bedeutet dies eine erhebliche Rechtsunsicherheit.

    +
    @@ -13172,6 +12042,7 @@ role="doc-noteref">1552

    überweisen. Mit der vorliegenden Rechtsgeschichte ist ihr hoffentlich der Grund bereitet.

    Zusammenfassung in Thesen

    +
    @@ -13416,6 +12287,7 @@ eingefügten Rechtsimplantate abzustossen. Versucht wird dies mit wiederum neuen Rechtsimplantaten, aus dem deutschen Recht. Die gesetzgeberische Konzeption hat man damit weit hinter sich gelassen. Für die Praxis bedeutet dies eine erhebliche Rechtsunsicherheit.

    +

    Quellen- und Literaturverzeichnis

    Adomeit, Klaus, Heteronome @@ -28754,10 +27626,12 @@ class="footnote-back" role="doc-backlink">↩︎

+ + From c7058237848fadafac84843d9dde1973808e4cf9 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 22 Apr 2026 17:50:32 +0200 Subject: [PATCH 21/21] bleed mark --- css/modules/_layout.scss | 4 ++-- css/modules/_titles.scss | 1 - css/style.css | 5 ++--- css/style.css.map | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index e035fdc..25c8279 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -25,8 +25,8 @@ $unit: calc($content-w/7); size: $width $height; margin-top: $top; margin-bottom: $bottom; - // bleed: 6mm; - // marks: crop; + bleed: 6mm; + marks: crop; } @page:left { margin-left: $outside; diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 6442bb6..c693bcd 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -26,7 +26,6 @@ h2, h3, h4, h5, h6 { - color: red; &::before{ content: attr(data-counter) ". "; } diff --git a/css/style.css b/css/style.css index ca42010..70b2136 100644 --- a/css/style.css +++ b/css/style.css @@ -43,6 +43,8 @@ body { size: 176mm 240mm; margin-top: 10mm; margin-bottom: 19mm; + bleed: 6mm; + marks: crop; } @page :left { margin-left: 14mm; @@ -353,9 +355,6 @@ ol[type="1"] { color: red; position: absolute; } -#section__content h2, #section__content h3, #section__content h4, #section__content h5, #section__content h6 { - color: red; -} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter) ". "; } diff --git a/css/style.css.map b/css/style.css.map index d932843..3a733d2 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EACA,iBAAA;EACA,kBAAA;EACA,gBAAA;EACA,cAAA;EACA,cAAA;ADEJ;;AEbA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFgBJ;;AEdA;EACI,mBAAA;AFiBJ;;AEdA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFeJ;;AGrBA;EAEI,qBAAA;EAEA,mBAAA;AHsBJ;;AGhBA;EACI;IACI,iBAAA;IACA,gBAvBF;IAwBE,mBAvBC;EH0CP;EGfE;IACI,iBA1BE;IA2BF,kBA5BC;IA8BD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACA,gBAAA;MACC,WA/BJ;MAgCK,kBAAA;MACD,sBAAA;IHgBT;IGdM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACC,gBAAA;MACD,gBAAA;MACC,kBAAA;MACA,sBAAA;IHgBT;EACF;EGbE;IACI,iBApDC;IAqDD,kBApDE;IAyDF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACC,gBAAA;MACD,gBAAA;MACA,4BAAA;MACA,mCAAA;MACC,kBAAA;MACD,sBAAA;IHWT;IGRY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACC,gBAAA;MACD,gBAAA;MACC,kBAAA;MACD,sBAAA;MACA,8BAAA;IHUT;IGPO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACC,gBAAA;MACD,iBAAA;MACC,kBAAA;MACD,sBAAA;IHST;EACF;EGFE;IACI;MAAmB,aAAA;IHKvB;IGJI;MAAY,aAAA;IHOhB;IGNI;MAAc,aAAA;IHSlB;IGRI;MAAa,aAAA;IHWjB;IGVI;MAAoB,aAAA;IHaxB;IGZI;MAAY,aAAA;IHehB;IGdI;MAAe,aAAA;IHiBnB;IGhBI;MAAe,aAAA;IHmBnB;IGlBI;MAAa,aAAA;IHqBjB;IGpBI;MAAgB,aAAA;IHuBpB;IGtBI;MAAgB,aAAA;IHyBpB;IGxBI;MAAsB,aAAA;IH2B1B;IG1BI;MAAe,aAAA;IH6BnB;IG5BI;MAAiB,aAAA;IH+BrB;IG9BI;MAAgB,aAAA;IHiCpB;IGhCI;MAAuB,aAAA;IHmC3B;EACF;EGlCE;IACI;MAAmB,aAAA;IHqCvB;IGpCI;MAAY,aAAA;IHuChB;IGtCI;MAAc,aAAA;IHyClB;IGxCI;MAAa,aAAA;IH2CjB;IG1CI;MAAoB,aAAA;IH6CxB;IG5CI;MAAY,aAAA;IH+ChB;IG9CI;MAAe,aAAA;IHiDnB;IGhDI;MAAe,aAAA;IHmDnB;IGlDI;MAAa,aAAA;IHqDjB;IGpDI;MAAgB,aAAA;IHuDpB;IGtDI;MAAgB,aAAA;IHyDpB;IGxDI;MAAsB,aAAA;IH2D1B;IG1DI;MAAe,aAAA;IH6DnB;IG5DI;MAAiB,aAAA;IH+DrB;IG9DI;MAAgB,aAAA;IHiEpB;IGhEI;MAAuB,aAAA;IHmE3B;EACF;AACF;AG5DA;EACI,sCAAA;AH8DJ;;AG3DA;EACI,iCAAA;AH8DJ;;AG1DA;EACI,aAAA;EACA,8BAAA;OAAA,kBAAA;AH6DJ;;AIpNA;EACI,cAAA;AJuNJ;;AIpNA;EACI,wBAAA;AJuNJ;;AIrNA;EACI,YAAA;EACA,uBAAA;AJwNJ;;AIrNA;EACI,mBAAA;EACA,qBAAA;AJwNJ;;AIrNA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;EAEA,kBAAA;EACA,SAAA;EAGA,mCAAA;AJqNJ;;AIlNA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,SAAA;EACA,UAAA;AJqNJ;;AI/MA;EACI,gBAAA;AJkNJ;;AI5MA;EAEI,8BAAA;EACA,kCAAA;AJ8MJ;;AI1MA;EACI,iBAAA;AJ6MJ;;AIxMA;EACI,UAAA;AJ2MJ;;AI5LA;EACI,+BAAA;OAAA,mBAAA;AJ+LJ;;AI7LA;EACI,WAAA;EACA,aAAA;EACA,QAAA;AJgMJ;;AI1LA;EACI,WAAA;EACA,WAAA;EACA,uBAAA;EACA,kBAAA;EACA,QAAA;AJ6LJ;;AI3LA;EACI,cAAA;EACA,yBAAA;EACA,gBAAA;EACA,gBAAA;EACA,uBAAA;AJ8LJ;;AI5LA;EACI,cAAA;AJ+LJ;;AI3LA;EACI,qCAAA;AJ8LJ;;AIvLA;;EAEI,8BAAA;OAAA,kBAAA;AJ0LJ;;AItLI;EACI,0BAAA;EACA,mCAAA;EACA,iBAAA;EACA,cAAA;AJyLR;;AK3TA;EACI,kBAAA;AL8TJ;;AK3TA;EACI,qBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EACA,2BAAA;EACA,cAAA;EACA,0BAAA;EACA,YAAA;AL8TJ;;AKnTA;EACI,SAAA;ALsTJ;;AMtUQ;EACI,YAAA;ANyUZ;AMtUQ;EACI,kBAAA;ANwUZ;AM9UI;EASI,iBHTI;EGUJ,aAAA;EACA,sBAAA;EACA,8BAAA;ANwUR;AMtUQ;EACI,UAAA;EACA,kBAAA;ANwUZ;AMnUM;EACE,UAAA;ANqUR;AMpUQ;EACI,gCAAA;ANsUZ;AMjUI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANkUR;AMjUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANmUZ;AM/TK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANgUR;AM/TQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANiUZ;AM3TI;;;;;;EAMI,cAAA;AN6TR;AMvTI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EACA,6BAAA;ANwTR;AMrTQ;EACI,cAAA;ANuTZ;AM9SI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,gBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;EACA,kCAAA;EACA,qCAAA;EACA,kBAAA;EACA,gCAAA;EACA,kBAAA;ANgTR;AM7SQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;AN+SZ;AMvSI;EACI,gBAAA;EACA,2BAAA;EACA,gBAAA;EACA,mCAAA;EACA,kCAAA;EACC,qCAAA;EACD,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,iBAAA;ANySR;AMxSQ;EACI,cAAA;EACC,kBAAA;EACD,OAAA;AN0SZ;AMtSI;EACI,mBAAA;EACA,cAAA;EACA,4BAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBAAA;EACA,wCAAA;UAAA,gCAAA;EACA,0BAAA;EACC,kCAAA;EACA,qCAAA;ANwST;AMrSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;EAEA,qBAAA;ANsSZ;AMjSK;EACE,mBAAA;EACC,cAAA;EACA,sCAAA;EACA,kBAAA;EACA,SAAA;EACA,qCAAA;EACA,kCAAA;EACA,qCAAA;ANmSR;AMhSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANkSZ;AM9RI;EACI,mBAAA;EACA,cAAA;EACA,sCAAA;EACA,qCAAA;EACJ,kCAAA;EAGK,kBAAA;EACA,SAAA;AN8RT;AMhRA;;;EAGQ,aAAA;ANkRR;;AOneA;EACI,aAAA;EACA,UAAA;APseJ;;AQxeA;EACI,kBAAA;AR2eJ;;AQveA;EACI,mCAAA;AR0eJ;;AQveA;;EAEI,kBAAA;EACA,MAAA;EACA,OAAA;AR0eJ;;AQteA;EACI,cAAA;EAEG,6BAAA;EACH,0BAAA;EACA,yCAAA;EAIA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;ARqeJ;;AQjeA;EACI,iBAAA;ARoeJ;;AQ/dA;EAEC,6BAAA;EACG,0BAAA;EACA,mBAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;ARieJ;;ASjhBA;EAEI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;ATmhBJ;AShhBI;EACI,qBAAA;EACA,YAAA;ATkhBR;AS/gBI;EACO,qCAAA;EACH,0CAAA;EACA,iBAAA;EACA,gBAAA;ATihBR;AS9gBI;EACI,iBAAA;EACQ,uCAAA;EACR,0CAAA;ATghBR;AS7gBI;EACI,gBAAA;AT+gBR;AS3gBK;EACG,iBAAA;AT6gBR;ASzgBM;EACE,iBAAA;AT2gBR;ASvgBM;EACE,iBAAA;ATygBR","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file