From 5cb765701a2db5169dce79c624f4f302e47ed287 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 18:43:58 +0200 Subject: [PATCH 01/15] cleaning fonts --- css/modules/_var.scss | 8 ++++---- index.html | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 18aac84..8051f42 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -1,8 +1,8 @@ :root{ - --font: 'Akkurat Std', sans-serif; - --font-serif: 'Edgar', sans-serif; - --font-title: 'Allium Rounded', sans-serif; - --font-sans: 'Allium Rounded', sans-serif; + --font: 'Moulin', sans-serif; + --font-serif: 'Moulin', sans-serif; + --font-title: 'Louize', sans-serif; + --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 11px; --fs-small: 8.5px; --fs-num: 14px; diff --git a/index.html b/index.html index 1ab3c5e..ddfe0fd 100644 --- a/index.html +++ b/index.html @@ -7,12 +7,9 @@ CSS Page Weaver Example - - - - - - + + + From 9ed0fb0d1d3c8e8b209171ec3a07c057f213f478 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 19:37:52 +0200 Subject: [PATCH 02/15] title chapter --- .gitignore | 3 +- css/modules/_layout.scss | 126 +++++++++++++++++++-------- css/modules/_text.scss | 5 +- css/modules/_titles.scss | 97 ++++++++++++++------- css/modules/_var.scss | 5 +- css/style.css | 183 ++++++++++++++++++++++++++++----------- css/style.css.map | 2 +- index.html | 4 +- js/counters.js | 3 +- 9 files changed, 302 insertions(+), 126 deletions(-) diff --git a/.gitignore b/.gitignore index 587a7e2..3793dce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store .zip weaver_manager.sh -fonts/* \ No newline at end of file +fonts/* +images/* \ No newline at end of file diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 4304e1c..75589e9 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -1,52 +1,62 @@ +$width: 176mm; +$height: 240mm; +$top: 10mm; +$bottom: 12mm; +$inside: 20mm; +$outside: 14mm; +$content-h: calc($height - $top - $bottom - 1mm); + + @media print { @page { - size: 176mm 240mm; - // size: 150mm 220mm; - margin-top: 36px; - margin-bottom: 20mm; + size: $width $height; + margin-top: $top; + margin-bottom: $bottom; - bleed: 6mm; - marks: crop; + // bleed: 6mm; + // marks: crop; } @page:left { - margin-left: 18mm; - margin-right: 26mm; + margin-left: $outside; + margin-right: $inside; @bottom-left { content: counter(page); - font-family: var(--font-title); - font-weight: 500; + font-family: var(--font-sans); font-size: var(--fs-num); + text-align: left; } - // @top-right { - // content: "Höchstpersönlichkeit"; - // font-variant-caps: small-caps; - // letter-spacing: 0.01em; - // } + @bottom-center { + content: "Höchstpersönlichkeit"; + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: left; + } + } @page:right { - margin-left: 26mm; - margin-right: 18mm; + margin-left: $inside; + margin-right: $outside; @bottom-right { content: counter(page); - font-family: var(--font-title); - font-weight: 500; + font-family: var(--font-sans); font-size: var(--fs-num); + text-align: right; } - @right-top { - content: "Höchstpersönlichkeit"; - font-family: var(--font-title); - font-weight: normal; - // background-color: red; - transform-origin: top left; - height: calc(var(--baseline)*2); - word-spacing: nowrap; - width: 52ch; - transform: rotate(90deg); - text-align: left; - position: relative; - left: 14mm; - padding-left: 5px; + + @bottom-left { + content: string(chapterCount); + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: left; } + + @bottom-center { + content: string(chapter); + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: left; + } + } @page:first { @@ -85,10 +95,58 @@ @bottom-right { content: none; } @bottom-right-corner { content: none; } } + + @page chapter { + @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{ break-before: right; -} \ No newline at end of file +} + + +.page-break{ + break-before: page; +} + + +#section__content{ + columns: 2; + 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); +} + +#section__content h1 .h1-text{ + string-set: chapter content(text); +} + + diff --git a/css/modules/_text.scss b/css/modules/_text.scss index e1501ac..68c2877 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -1,3 +1,6 @@ + + + sup{ line-height: 0; } @@ -48,8 +51,6 @@ blockquote{ margin-bottom: calc(var(--baseline)*0.5); font-size: 12px; color: #343434; - - } .these + ol + p, diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 3d8fa16..817339e 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -1,8 +1,20 @@ #section__content{ - margin-left: 28mm; + // margin-left: 28mm; - h1, h2, h3 { + + + h1{ + + column-span: all; + height: $content-h; + } + + // h1 + ol{ + // break-before: page; + // } + + h2, h3 { &::before{ content: attr(data-counter); } @@ -15,7 +27,7 @@ } - h1, h2, h3 , h4{ + h2, h3 , h4{ break-inside: avoid; break-after: avoid; text-wrap: balance; @@ -57,6 +69,29 @@ + h1{ + + font-weight: 200; + font-size: 98px; + line-height: 1; + hyphens: auto; + + break-inside: avoid; + + + display: flex; + flex-direction: column; + justify-content: space-between; + text-align: center; + + + span{ + display: block; + } + + } + + @@ -152,36 +187,36 @@ margin-top: 0; } - h1{ - font-family: var(--font-title); - font-size: 1.6rem; - font-weight: 500; - text-transform: uppercase; - line-height: calc(var(--baseline)*1.6); - // text-align: center; - position: relative; - margin-top: calc(var(--baseline)*2 - 3px); - padding-bottom: calc(var(--baseline)*1); - padding-left: calc(var(--indent)*2); - padding-right: 1ch; +// h1{ +// font-family: var(--font-title); +// font-size: 1.6rem; +// font-weight: 500; +// text-transform: uppercase; +// line-height: calc(var(--baseline)*1.6); +// // text-align: center; +// position: relative; +// margin-top: calc(var(--baseline)*2 - 3px); +// padding-bottom: calc(var(--baseline)*1); +// padding-left: calc(var(--indent)*2); +// padding-right: 1ch; - &::before{ - // font-size: var(--fs-num); - // width: 2ch; - // height: 2ch; - // border: 1px solid currentColor; - // border-radius: 50%; - // display: flex; - // align-items: center; - // justify-content: center; - position: absolute; - left: 0; - width: calc(var(--indent)*2 - 0.5ch); - // border-bottom: 2px solid #cfcfcf; - // top: 3px; - } - } +// &::before{ +// // font-size: var(--fs-num); +// // width: 2ch; +// // height: 2ch; +// // border: 1px solid currentColor; +// // border-radius: 50%; +// // display: flex; +// // align-items: center; +// // justify-content: center; +// position: absolute; +// left: 0; +// width: calc(var(--indent)*2 - 0.5ch); +// // border-bottom: 2px solid #cfcfcf; +// // top: 3px; +// } +// } section h1:first-of-type{ margin-top: 3px!important; diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 8051f42..7f6bebe 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -5,10 +5,13 @@ --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 11px; --fs-small: 8.5px; - --fs-num: 14px; + --baseline: 16px; --indent: 26px; + + + --fs-num: 10px; } diff --git a/css/style.css b/css/style.css index fc814ae..881fbc1 100644 --- a/css/style.css +++ b/css/style.css @@ -1,14 +1,14 @@ @charset "UTF-8"; :root { - --font: 'Akkurat Std', sans-serif; - --font-serif: 'Edgar', sans-serif; - --font-title: 'Allium Rounded', sans-serif; - --font-sans: 'Allium Rounded', sans-serif; + --font: 'Moulin', sans-serif; + --font-serif: 'Moulin', sans-serif; + --font-title: 'Louize', sans-serif; + --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 11px; --fs-small: 8.5px; - --fs-num: 14px; --baseline: 16px; --indent: 26px; + --fs-num: 10px; } * { @@ -34,43 +34,45 @@ body { @media print { @page { size: 176mm 240mm; - margin-top: 36px; - margin-bottom: 20mm; - bleed: 6mm; - marks: crop; + margin-top: 10mm; + margin-bottom: 12mm; } @page :left { - margin-left: 18mm; - margin-right: 26mm; + margin-left: 14mm; + margin-right: 20mm; @bottom-left { content: counter(page); - font-family: var(--font-title); - font-weight: 500; + font-family: var(--font-sans); font-size: var(--fs-num); + text-align: left; + } + @bottom-center { + content: "Höchstpersönlichkeit"; + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: left; } } @page :right { - margin-left: 26mm; - margin-right: 18mm; + margin-left: 20mm; + margin-right: 14mm; @bottom-right { content: counter(page); - font-family: var(--font-title); - font-weight: 500; + font-family: var(--font-sans); font-size: var(--fs-num); + text-align: right; } - @right-top { - content: "Höchstpersönlichkeit"; - font-family: var(--font-title); - font-weight: normal; - transform-origin: top left; - height: calc(var(--baseline) * 2); - word-spacing: nowrap; - width: 52ch; - transform: rotate(90deg); + @bottom-left { + content: string(chapterCount); + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: left; + } + @bottom-center { + content: string(chapter); + font-family: var(--font-sans); + font-size: var(--fs-num); text-align: left; - position: relative; - left: 14mm; - padding-left: 5px; } } @page :first { @@ -173,12 +175,90 @@ body { content: none; } } + @page chapter { + @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 { -moz-column-break-before: right; break-before: right; } +.page-break { + -moz-column-break-before: page; + break-before: page; +} + +#section__content { + -moz-columns: 2; + columns: 2; + -moz-column-fill: auto; + column-fill: auto; +} + +#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); +} + +#section__content h1 .h1-text { + string-set: chapter content(text); +} + sup { line-height: 0; } @@ -262,16 +342,18 @@ ol[type="1"] li::before { top: -1px; } -#section__content { - margin-left: 28mm; +#section__content h1 { + -moz-column-span: all; + column-span: all; + height: 217mm; } -#section__content h1::before, #section__content h2::before, #section__content h3::before { +#section__content h2::before, #section__content h3::before { content: attr(data-counter); } #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter) ". "; } -#section__content h1, #section__content h2, #section__content h3, #section__content h4 { +#section__content h2, #section__content h3, #section__content h4 { -moz-column-break-inside: avoid; break-inside: avoid; -moz-column-break-after: avoid; @@ -280,7 +362,7 @@ ol[type="1"] li::before { /* hack for avoiding break-after */ margin-bottom: calc(var(--baseline) * -3); } -#section__content h1::after, #section__content h2::after, #section__content h3::after, #section__content h4::after { +#section__content h2::after, #section__content h3::after, #section__content h4::after { content: ""; display: block; height: calc(var(--baseline) * 3); @@ -307,6 +389,21 @@ ol[type="1"] li::before { #section__content h6 + ol + p { text-indent: 0; } +#section__content h1 { + font-weight: 200; + font-size: 98px; + line-height: 1; + 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; +} #section__content h2 { font-family: var(--font-title); font-size: 1.1rem; @@ -375,24 +472,6 @@ ol[type="1"] li::before { margin-top: 0; } -h1 { - font-family: var(--font-title); - font-size: 1.6rem; - font-weight: 500; - text-transform: uppercase; - line-height: calc(var(--baseline) * 1.6); - position: relative; - margin-top: calc(var(--baseline) * 2 - 3px); - padding-bottom: calc(var(--baseline) * 1); - padding-left: calc(var(--indent) * 2); - padding-right: 1ch; -} -h1::before { - position: absolute; - left: 0; - width: calc(var(--indent) * 2 - 0.5ch); -} - section h1:first-of-type { margin-top: 3px !important; } diff --git a/css/style.css.map b/css/style.css.map index cb36fc5..0e8410c 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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 ddfe0fd..d0d3975 100644 --- a/index.html +++ b/index.html @@ -1196,9 +1196,7 @@ Abteilung)
-

Titre niveau 1

-

Titre niveau 1

-

Titre niveau 1

+

Titre niveau 2

Titre niveau 2

Titre niveau 2

diff --git a/js/counters.js b/js/counters.js index 967125e..153e1e4 100644 --- a/js/counters.js +++ b/js/counters.js @@ -54,7 +54,8 @@ export default class counters extends Handler { case 'h1': h1Count++; h2Count = 0; // reset h2 - el.setAttribute('data-counter', this.toUpperAlpha(h1Count)); + const originalText = el.innerHTML; + el.innerHTML = `${this.toUpperAlpha(h1Count)}${originalText}`; break; case 'h2': From dcdd26de82bad8d671ce2a59f925ce0a810320d2 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 21:52:21 +0200 Subject: [PATCH 03/15] layout + font size --- css/modules/_followingNotes.scss | 25 ++-- css/modules/_footnotes.scss | 3 + css/modules/_layout.scss | 33 +++-- css/modules/_text.scss | 69 ++++------ css/modules/_titles.scss | 165 ++++++++++------------- css/modules/_var.scss | 10 +- css/style.css | 218 +++++++++++++++---------------- css/style.css.map | 2 +- csspageweaver/manifest.json | 3 +- index.html | 2 +- js/these.js | 16 +++ 11 files changed, 270 insertions(+), 276 deletions(-) create mode 100644 js/these.js diff --git a/css/modules/_followingNotes.scss b/css/modules/_followingNotes.scss index 6a130be..700d81c 100644 --- a/css/modules/_followingNotes.scss +++ b/css/modules/_followingNotes.scss @@ -1,24 +1,31 @@ .container-following-note{ + font-family: var(--font-sans); font-size: var(--fs-small); - line-height: calc(var(--baseline)*0.8); - // padding-left: var(--indent); + line-height: calc(var(--baseline)*0.75); position: relative; + 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; - // columns: 2; } .body_note{ - padding-left: calc(var(--indent)*1); - position: relative; + // padding-left: calc(var(--indent)*1); + // position: relative; } -.following-note_marker{ - position: absolute; - // left: calc(var(--indent)*2); - left: 0; +.following-note_marker::after{ + content: ". " } .following-note_call{ + font-family: var(--font-sans); font-size: var(--fs-small); line-height: 1; position: relative; diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss index 2bd344b..c11c056 100644 --- a/css/modules/_footnotes.scss +++ b/css/modules/_footnotes.scss @@ -1,3 +1,6 @@ +// INUTILE + + @page { @footnote { float: bottom; diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 75589e9..2f68243 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -1,10 +1,12 @@ $width: 176mm; $height: 240mm; -$top: 10mm; -$bottom: 12mm; -$inside: 20mm; -$outside: 14mm; +$top: 6mm; +$bottom: 18mm; +$inside: 12mm; +$outside: 6mm; $content-h: calc($height - $top - $bottom - 1mm); +$gap: 4mm; +$indent: 10mm; @media print { @@ -19,11 +21,17 @@ $content-h: calc($height - $top - $bottom - 1mm); @page:left { margin-left: $outside; margin-right: $inside; + + // background-image: url("/images/layout-2_3.png"); + // background-size: 100% 100%; + + @bottom-left { content: counter(page); font-family: var(--font-sans); font-size: var(--fs-num); text-align: left; + width: $indent; } @bottom-center { content: "Höchstpersönlichkeit"; @@ -36,18 +44,13 @@ $content-h: calc($height - $top - $bottom - 1mm); @page:right { margin-left: $inside; margin-right: $outside; - @bottom-right { - content: counter(page); - font-family: var(--font-sans); - font-size: var(--fs-num); - text-align: right; - } @bottom-left { content: string(chapterCount); font-family: var(--font-sans); font-size: var(--fs-num); text-align: left; + width: $indent; } @bottom-center { @@ -57,6 +60,13 @@ $content-h: calc($height - $top - $bottom - 1mm); text-align: left; } + @bottom-right { + content: counter(page); + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: right; + } + } @page:first { @@ -97,6 +107,8 @@ $content-h: calc($height - $top - $bottom - 1mm); } @page chapter { + margin-left: $outside; + margin-right: $outside; @top-left-corner { content: none; } @top-left { content: none; } @top-center { content: none; } @@ -130,6 +142,7 @@ $content-h: calc($height - $top - $bottom - 1mm); #section__content{ columns: 2; + column-gap: $gap; column-fill: auto; } diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 68c2877..a7e993e 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -22,6 +22,8 @@ p{ text-align: justify; orphans: 2; widows: 2; + margin-left: $indent*0.8; + padding-left: $indent*0.2; } p, li{ @@ -35,34 +37,36 @@ p, li{ -p + p, -ol[type="1"] + p{ - text-indent: calc(var(--indent)*0.5); -} +// p + p{ +// text-indent: calc(var(--indent)*0.5); +// } blockquote{ - font-family: var(--font-serif); - padding-left: calc(var(--indent)*1); - padding-right: calc(var(--indent)*1); - // font-size: var(--fs-small); - margin-top: calc(var(--baseline)*0.5); - margin-bottom: calc(var(--baseline)*0.5); - font-size: 12px; - color: #343434; + font-family: var(--font-quote); + + p{ + border-left: 1px solid #cfcfcf; + + } } -.these + ol + p, -blockquote + ol + p{ - text-indent: 0px; +blockquote u{ + text-decoration: none; + text-transform: uppercase; + font-size: var(--fs-small); } +// .these + ol + p, +// blockquote + ol + p{ +// text-indent: 0px; +// } + .these{ - // color: red; - // font-family: var(--font-title); + margin-bottom: calc(var(--baseline)*1); border-left: 4px solid #efefef; box-decoration-break: clone; @@ -75,32 +79,17 @@ ol[type="1"]{ position: relative; break-after: avoid; - position: absolute; - left: 0px; - display: flex; - gap: 0.25ch; - - &::after{ + &::after{ content: attr(start); - // font-family: var(--font-title); - // font-weight: 500; + display: block; + position: absolute; font-size: var(--fs-small); - color: #999; - - // display: block; - // height: var(--baseline); - - // padding-right: 1ch; - // border-right: 1px solid #efefef; - } - - li::before{ - font-size: var(--fs-small); - content: "¶"; - color: #d7d7d7; - position: relative; - top: -1px; + opacity: 0.5; + + // color: #d7d7 d7; + // position: relative; + // top: -1px; } diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 817339e..8da1770 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -10,22 +10,14 @@ height: $content-h; } - // h1 + ol{ - // break-before: page; - // } - h2, h3 { + + h2, h3, h4, h5, h6 { &::before{ content: attr(data-counter); } } - h4, h5, h6{ - &::before{ - content: attr(data-counter) ". "; - } - } - h2, h3 , h4{ break-inside: avoid; @@ -72,8 +64,8 @@ h1{ font-weight: 200; - font-size: 98px; - line-height: 1; + font-size: 115px; + line-height: 0.9; hyphens: auto; break-inside: avoid; @@ -83,6 +75,8 @@ flex-direction: column; justify-content: space-between; text-align: center; + + span{ @@ -96,86 +90,97 @@ h2{ - font-family: var(--font-title); - font-size: 1.1rem; - font-weight: 500; + font-size: 22px; + font-weight: 200; text-transform: uppercase; - line-height: calc(var(--baseline)*1.2); - position: relative; - margin-top: calc(var(--baseline)*1 + 6px); - padding-bottom: calc(var(--baseline)*1); - padding-right: 2ch; - padding-left: calc(var(--indent)*2); + text-align: center; + line-height: calc(var(--baseline)*1.4); + margin-top: 4mm; + padding-bottom: 4mm; + hyphens: auto; + + + &::before{ - position: absolute; - left: 0; - // display: block; - // font-size: var(--fs-num); - // padding-left: var(--indent); + display: block; + } + + // &::after{ + // content: ''; + // display: block; + // width: 100%; + // border-bottom: 1px solid currentColor; + // position: relative; + // top: calc(var(--baseline)*-2.5); + // opacity: 0.2; + // } } h3{ - font-family: var(--font-title); font-weight: 500; - font-size: 1rem; - line-height: calc(var(--baseline)*1); - - // padding-left: var(--indent); - padding-right: calc(var(--indent)*2); + font-size: 1em; + line-height: calc(var(--baseline)*0.75); position: relative; - margin-top: calc(var(--baseline)*1 + 4px); - padding-bottom: calc(var(--baseline)*0.75); - padding-left: calc(var(--indent)*2); + margin-top: 4mm; + padding-bottom: 4mm; + padding-left: $indent; + text-align: center; &::before{ - - position: absolute; - left: 0; + display: block; } } h4{ - font-family: var(--font-title); font-weight: 500; - font-size: 0.9rem; - line-height: calc(var(--baseline)*1); - padding-right: calc(var(--indent)*2); + font-size: 1em; + line-height: calc(var(--baseline)*0.75); position: relative; - margin-top: calc(var(--baseline)*1 + 4px); - padding-bottom: calc(var(--baseline)*0.75); - text-decoration: underline 1px #cfcfcf; - text-underline-offset: 3px; - - padding-left: calc(var(--indent)*2); + margin-top: calc(var(--baseline)*1); + padding-bottom: calc(var(--baseline)*0.5); + padding-left: $indent*2; &::before{ - - // position: absolute; - // left: 0; + display: block; + position: absolute; + left: $indent; } } h5{ - font-family: var(--font-title); - font-weight: 500; - font-size: 0.8rem; + font-weight: normal; + font-size: 1em; line-height: calc(var(--baseline)*1); - padding-left: calc(var(--indent)*2); - // padding-right: calc(var(--indent)*2); position: relative; - margin-top: calc(var(--baseline)*1 + 4px); + margin-top: calc(var(--baseline)*1); padding-bottom: calc(var(--baseline)*0.25); + padding-left: $indent; + + text-indent: $indent; + &::before{ + display: block; + position: absolute; + left: 0; + } } h6{ - font-family: var(--font-title); - font-weight: 500; - font-size: 0.8rem; - margin-top: calc(var(--baseline)*0.5); - padding-bottom: calc(var(--baseline)*0.25); - color: #666; + font-weight: normal; + font-size: 1em; + line-height: calc(var(--baseline)*1); + position: relative; + margin-top: calc(var(--baseline)*1); + padding-left: $indent; + + text-indent: $indent; + &::before{ + display: block; + position: absolute; + left: 0; + } + } @@ -187,37 +192,3 @@ margin-top: 0; } -// h1{ -// font-family: var(--font-title); -// font-size: 1.6rem; -// font-weight: 500; -// text-transform: uppercase; -// line-height: calc(var(--baseline)*1.6); -// // text-align: center; -// position: relative; -// margin-top: calc(var(--baseline)*2 - 3px); -// padding-bottom: calc(var(--baseline)*1); -// padding-left: calc(var(--indent)*2); -// padding-right: 1ch; - - -// &::before{ -// // font-size: var(--fs-num); -// // width: 2ch; -// // height: 2ch; -// // border: 1px solid currentColor; -// // border-radius: 50%; -// // display: flex; -// // align-items: center; -// // justify-content: center; -// position: absolute; -// left: 0; -// width: calc(var(--indent)*2 - 0.5ch); -// // border-bottom: 2px solid #cfcfcf; -// // top: 3px; -// } -// } - - section h1:first-of-type{ - margin-top: 3px!important; - } \ No newline at end of file diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 7f6bebe..a6dacfd 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -1,17 +1,17 @@ :root{ --font: 'Moulin', sans-serif; --font-serif: 'Moulin', sans-serif; - --font-title: 'Louize', sans-serif; + --font-quote: 'Louize', sans-serif; --font-sans: 'Basis Grotesque Pro', sans-serif; - --font-size: 11px; - --fs-small: 8.5px; + --font-size: 12px; + --fs-small: 9.8px; - --baseline: 16px; + --baseline: 18px; --indent: 26px; - --fs-num: 10px; + --fs-num: 12px; } diff --git a/css/style.css b/css/style.css index 881fbc1..6b4b02a 100644 --- a/css/style.css +++ b/css/style.css @@ -2,13 +2,13 @@ :root { --font: 'Moulin', sans-serif; --font-serif: 'Moulin', sans-serif; - --font-title: 'Louize', sans-serif; + --font-quote: 'Louize', sans-serif; --font-sans: 'Basis Grotesque Pro', sans-serif; - --font-size: 11px; - --fs-small: 8.5px; - --baseline: 16px; + --font-size: 12px; + --fs-small: 9.8px; + --baseline: 18px; --indent: 26px; - --fs-num: 10px; + --fs-num: 12px; } * { @@ -34,17 +34,18 @@ body { @media print { @page { size: 176mm 240mm; - margin-top: 10mm; - margin-bottom: 12mm; + margin-top: 6mm; + margin-bottom: 18mm; } @page :left { - margin-left: 14mm; - margin-right: 20mm; + margin-left: 6mm; + margin-right: 12mm; @bottom-left { content: counter(page); font-family: var(--font-sans); font-size: var(--fs-num); text-align: left; + width: 10mm; } @bottom-center { content: "Höchstpersönlichkeit"; @@ -54,19 +55,14 @@ body { } } @page :right { - margin-left: 20mm; - margin-right: 14mm; - @bottom-right { - content: counter(page); - font-family: var(--font-sans); - font-size: var(--fs-num); - text-align: right; - } + margin-left: 12mm; + margin-right: 6mm; @bottom-left { content: string(chapterCount); font-family: var(--font-sans); font-size: var(--fs-num); text-align: left; + width: 10mm; } @bottom-center { content: string(chapter); @@ -74,6 +70,12 @@ body { font-size: var(--fs-num); text-align: left; } + @bottom-right { + content: counter(page); + font-family: var(--font-sans); + font-size: var(--fs-num); + text-align: right; + } } @page :first { @top-left-corner { @@ -176,6 +178,8 @@ body { } } @page chapter { + margin-left: 6mm; + margin-right: 6mm; @top-left-corner { content: none; } @@ -239,6 +243,8 @@ body { #section__content { -moz-columns: 2; columns: 2; + -moz-column-gap: 4mm; + column-gap: 4mm; -moz-column-fill: auto; column-fill: auto; } @@ -281,6 +287,8 @@ p { text-align: justify; orphans: 2; widows: 2; + margin-left: 8mm; + padding-left: 2mm; } p, li { @@ -291,24 +299,17 @@ p, li { word-spacing: -0.004em; } -p + p, -ol[type="1"] + p { - text-indent: calc(var(--indent) * 0.5); -} - blockquote { - font-family: var(--font-serif); - padding-left: calc(var(--indent) * 1); - padding-right: calc(var(--indent) * 1); - margin-top: calc(var(--baseline) * 0.5); - margin-bottom: calc(var(--baseline) * 0.5); - font-size: 12px; - color: #343434; + font-family: var(--font-quote); +} +blockquote p { + border-left: 1px solid #cfcfcf; } -.these + ol + p, -blockquote + ol + p { - text-indent: 0px; +blockquote u { + text-decoration: none; + text-transform: uppercase; + font-size: var(--fs-small); } .these { @@ -324,35 +325,23 @@ ol[type="1"] { position: relative; -moz-column-break-after: avoid; break-after: avoid; - position: absolute; - left: 0px; - display: flex; - gap: 0.25ch; } ol[type="1"]::after { content: attr(start); + display: block; + position: absolute; font-size: var(--fs-small); - color: #999; -} -ol[type="1"] li::before { - font-size: var(--fs-small); - content: "¶"; - color: #d7d7d7; - position: relative; - top: -1px; + opacity: 0.5; } #section__content h1 { -moz-column-span: all; column-span: all; - height: 217mm; + height: 215mm; } -#section__content h2::before, #section__content h3::before { +#section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); } -#section__content h4::before, #section__content h5::before, #section__content h6::before { - content: attr(data-counter) ". "; -} #section__content h2, #section__content h3, #section__content h4 { -moz-column-break-inside: avoid; break-inside: avoid; @@ -391,8 +380,8 @@ ol[type="1"] li::before { } #section__content h1 { font-weight: 200; - font-size: 98px; - line-height: 1; + font-size: 115px; + line-height: 0.9; hyphens: auto; -moz-column-break-inside: avoid; break-inside: avoid; @@ -405,99 +394,104 @@ ol[type="1"] li::before { display: block; } #section__content h2 { - font-family: var(--font-title); - font-size: 1.1rem; - font-weight: 500; + font-size: 22px; + font-weight: 200; text-transform: uppercase; - line-height: calc(var(--baseline) * 1.2); - position: relative; - margin-top: calc(var(--baseline) * 1 + 6px); - padding-bottom: calc(var(--baseline) * 1); - padding-right: 2ch; - padding-left: calc(var(--indent) * 2); + text-align: center; + line-height: calc(var(--baseline) * 1.4); + margin-top: 4mm; + padding-bottom: 4mm; + hyphens: auto; } #section__content h2::before { - position: absolute; - left: 0; + display: block; } #section__content h3 { - font-family: var(--font-title); font-weight: 500; - font-size: 1rem; - line-height: calc(var(--baseline) * 1); - padding-right: calc(var(--indent) * 2); + font-size: 1em; + line-height: calc(var(--baseline) * 0.75); position: relative; - margin-top: calc(var(--baseline) * 1 + 4px); - padding-bottom: calc(var(--baseline) * 0.75); - padding-left: calc(var(--indent) * 2); + margin-top: 4mm; + padding-bottom: 4mm; + padding-left: 10mm; + text-align: center; } #section__content h3::before { + display: block; +} +#section__content h4 { + font-weight: 500; + font-size: 1em; + line-height: calc(var(--baseline) * 0.75); + position: relative; + margin-top: calc(var(--baseline) * 1); + padding-bottom: calc(var(--baseline) * 0.5); + padding-left: 20mm; +} +#section__content h4::before { + display: block; + position: absolute; + left: 10mm; +} +#section__content h5 { + font-weight: normal; + font-size: 1em; + line-height: calc(var(--baseline) * 1); + position: relative; + margin-top: calc(var(--baseline) * 1); + padding-bottom: calc(var(--baseline) * 0.25); + padding-left: 10mm; + text-indent: 10mm; +} +#section__content h5::before { + display: block; position: absolute; left: 0; } -#section__content h4 { - font-family: var(--font-title); - font-weight: 500; - font-size: 0.9rem; - line-height: calc(var(--baseline) * 1); - padding-right: calc(var(--indent) * 2); - position: relative; - margin-top: calc(var(--baseline) * 1 + 4px); - padding-bottom: calc(var(--baseline) * 0.75); - -webkit-text-decoration: underline 1px #cfcfcf; - text-decoration: underline 1px #cfcfcf; - text-underline-offset: 3px; - padding-left: calc(var(--indent) * 2); -} -#section__content h5 { - font-family: var(--font-title); - font-weight: 500; - font-size: 0.8rem; - line-height: calc(var(--baseline) * 1); - padding-left: calc(var(--indent) * 2); - position: relative; - margin-top: calc(var(--baseline) * 1 + 4px); - padding-bottom: calc(var(--baseline) * 0.25); -} #section__content h6 { - font-family: var(--font-title); - font-weight: 500; - font-size: 0.8rem; - margin-top: calc(var(--baseline) * 0.5); - padding-bottom: calc(var(--baseline) * 0.25); - color: #666; + font-weight: normal; + font-size: 1em; + line-height: calc(var(--baseline) * 1); + position: relative; + margin-top: calc(var(--baseline) * 1); + padding-left: 10mm; + text-indent: 10mm; +} +#section__content h6::before { + display: block; + position: absolute; + left: 0; } [data-id=section__content][data-split-from] > :first-child { margin-top: 0; } -section h1:first-of-type { - margin-top: 3px !important; -} - #section__list-of-abbr { display: none; color: red; } .container-following-note { + font-family: var(--font-sans); font-size: var(--fs-small); - line-height: calc(var(--baseline) * 0.8); + line-height: calc(var(--baseline) * 0.75); position: relative; + 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; } -.body_note { - padding-left: calc(var(--indent) * 1); - position: relative; -} - -.following-note_marker { - position: absolute; - left: 0; +.following-note_marker::after { + content: ". "; } .following-note_call { + font-family: var(--font-sans); font-size: var(--fs-small); line-height: 1; position: relative; diff --git a/css/style.css.map b/css/style.css.map index 0e8410c..29bea8c 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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 dd86589..20ffff8 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -23,7 +23,8 @@ } }, "hook": [ - "/js/counters.js" + "/js/counters.js", + "/js/these.js" ] } diff --git a/index.html b/index.html index d0d3975..9b0ddbd 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - CSS Page Weaver Example + Höchstpersönlichkeit diff --git a/js/these.js b/js/these.js new file mode 100644 index 0000000..bdd1b50 --- /dev/null +++ b/js/these.js @@ -0,0 +1,16 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class thesis extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + beforeParsed(content){ + console.log("Thesis ------- "); + } + + + +} + + From 5715733a40326d662147ba036edfeb5ef412d8b0 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 22:03:28 +0200 Subject: [PATCH 04/15] thesis script --- css/modules/_text.scss | 21 +++++++++++++-------- css/modules/_titles.scss | 8 +++----- css/style.css | 22 +++++++++++++++------- css/style.css.map | 2 +- js/these.js | 21 +++++++++++++++++++++ 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/css/modules/_text.scss b/css/modules/_text.scss index a7e993e..c3f0c8c 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -58,19 +58,24 @@ blockquote u{ font-size: var(--fs-small); } -// .these + ol + p, -// blockquote + ol + p{ -// text-indent: 0px; -// } -.these{ +.p-these{ + font-weight: 500; + 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); - border-left: 4px solid #efefef; - box-decoration-break: clone; - padding-left: calc(var(--indent)*0.5); } diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 8da1770..dadbf13 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -97,9 +97,7 @@ line-height: calc(var(--baseline)*1.4); margin-top: 4mm; padding-bottom: 4mm; - hyphens: auto; - - + hyphens: auto; &::before{ display: block; @@ -152,7 +150,7 @@ h5{ font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline)*1); + line-height: calc(var(--baseline)*0.75); position: relative; margin-top: calc(var(--baseline)*1); padding-bottom: calc(var(--baseline)*0.25); @@ -169,7 +167,7 @@ h6{ font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline)*1); + line-height: calc(var(--baseline)*0.75); position: relative; margin-top: calc(var(--baseline)*1); padding-left: $indent; diff --git a/css/style.css b/css/style.css index 6b4b02a..0be1e4d 100644 --- a/css/style.css +++ b/css/style.css @@ -312,12 +312,20 @@ blockquote u { font-size: var(--fs-small); } -.these { +.p-these { + font-weight: 500; +} +.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); - border-left: 4px solid #efefef; - -webkit-box-decoration-break: clone; - box-decoration-break: clone; - padding-left: calc(var(--indent) * 0.5); } ol[type="1"] { @@ -436,7 +444,7 @@ ol[type="1"]::after { #section__content h5 { font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline) * 1); + line-height: calc(var(--baseline) * 0.75); position: relative; margin-top: calc(var(--baseline) * 1); padding-bottom: calc(var(--baseline) * 0.25); @@ -451,7 +459,7 @@ ol[type="1"]::after { #section__content h6 { font-weight: normal; font-size: 1em; - line-height: calc(var(--baseline) * 1); + line-height: calc(var(--baseline) * 0.75); position: relative; margin-top: calc(var(--baseline) * 1); padding-left: 10mm; diff --git a/css/style.css.map b/css/style.css.map index 29bea8c..f31fd3a 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EAEA,gBAAA;EAEA,cAAA;EAGA,cAAA;ADFJ;;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;;AGpBA;EACI;IACI,iBAAA;IACA,eAZF;IAaE,mBAZC;EHmCP;EGlBE;IACI,gBAhBE;IAiBF,kBAlBC;IAwBD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACC,WAzBJ;IHwCL;IGbM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;IHeR;EACF;EGZE;IACI,iBAxCC;IAyCD,iBAxCE;IA0CF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;MACA,WA5CJ;IHyDL;IGVY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;IHYT;IGTO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACA,iBAAA;IHWT;EACF;EGPE;IACI;MAAmB,aAAA;IHUvB;IGTI;MAAY,aAAA;IHYhB;IGXI;MAAc,aAAA;IHclB;IGbI;MAAa,aAAA;IHgBjB;IGfI;MAAoB,aAAA;IHkBxB;IGjBI;MAAY,aAAA;IHoBhB;IGnBI;MAAe,aAAA;IHsBnB;IGrBI;MAAe,aAAA;IHwBnB;IGvBI;MAAa,aAAA;IH0BjB;IGzBI;MAAgB,aAAA;IH4BpB;IG3BI;MAAgB,aAAA;IH8BpB;IG7BI;MAAsB,aAAA;IHgC1B;IG/BI;MAAe,aAAA;IHkCnB;IGjCI;MAAiB,aAAA;IHoCrB;IGnCI;MAAgB,aAAA;IHsCpB;IGrCI;MAAuB,aAAA;IHwC3B;EACF;EGvCE;IACI;MAAmB,aAAA;IH0CvB;IGzCI;MAAY,aAAA;IH4ChB;IG3CI;MAAc,aAAA;IH8ClB;IG7CI;MAAa,aAAA;IHgDjB;IG/CI;MAAoB,aAAA;IHkDxB;IGjDI;MAAY,aAAA;IHoDhB;IGnDI;MAAe,aAAA;IHsDnB;IGrDI;MAAe,aAAA;IHwDnB;IGvDI;MAAa,aAAA;IH0DjB;IGzDI;MAAgB,aAAA;IH4DpB;IG3DI;MAAgB,aAAA;IH8DpB;IG7DI;MAAsB,aAAA;IHgE1B;IG/DI;MAAe,aAAA;IHkEnB;IGjEI;MAAiB,aAAA;IHoErB;IGnEI;MAAgB,aAAA;IHsEpB;IGrEI;MAAuB,aAAA;IHwE3B;EACF;EGtEG;IACI,gBAxGC;IAyGF,iBAzGE;IA0GF;MAAmB,aAAA;IHyEvB;IGxEI;MAAY,aAAA;IH2EhB;IG1EI;MAAc,aAAA;IH6ElB;IG5EI;MAAa,aAAA;IH+EjB;IG9EI;MAAoB,aAAA;IHiFxB;IGhFI;MAAY,aAAA;IHmFhB;IGlFI;MAAe,aAAA;IHqFnB;IGpFI;MAAe,aAAA;IHuFnB;IGtFI;MAAa,aAAA;IHyFjB;IGxFI;MAAgB,aAAA;IH2FpB;IG1FI;MAAgB,aAAA;IH6FpB;IG5FI;MAAsB,aAAA;IH+F1B;IG9FI;MAAe,aAAA;IHiGnB;IGhGI;MAAiB,aAAA;IHmGrB;IGlGI;MAAgB,aAAA;IHqGpB;IGpGI;MAAuB,aAAA;IHuG3B;EACF;AACF;AGpGA;EACI,+BAAA;OAAA,mBAAA;AHsGJ;;AGjGA;EACI,8BAAA;OAAA,kBAAA;AHoGJ;;AGhGA;EACI,eAAA;OAAA,UAAA;EACA,oBAzIE;OAyIF,eAzIE;EA0IF,sBAAA;OAAA,iBAAA;AHmGJ;;AG7FA;EACI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;EACA,aAAA;AHgGJ;;AG9FA;EACI,sCAAA;AHiGJ;;AG9FA;EACI,iCAAA;AHiGJ;;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,gBAAA;EACA,iBAAA;AJmQJ;;AIhQA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;AJmQJ;;AIvPA;EACI,8BAAA;AJ0PJ;AIxPI;EACI,8BAAA;AJ0PR;;AIrPA;EACI,qBAAA;EACA,yBAAA;EACA,0BAAA;AJwPJ;;AI9OA;EAEI,wCAAA;EACA,8BAAA;EACA,mCAAA;UAAA,2BAAA;EACA,uCAAA;AJgPJ;;AI5OA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;AJ+OJ;AI5OM;EACE,oBAAA;EACA,cAAA;EACA,kBAAA;EACA,0BAAA;EACA,YAAA;AJ8OR;;AK/TI;EAEI,qBAAA;OAAA,gBAAA;EACA,aFHI;AHoUZ;AK3TQ;EACI,2BAAA;AL6TZ;AKxTI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ALyTR;AKxTQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;AL0TZ;AKtTK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ALuTR;AKtTQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ALwTZ;AKlTI;;;;;;EAMI,cAAA;ALoTR;AK9SI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EAEA,+BAAA;OAAA,mBAAA;EAGA,aAAA;EACA,sBAAA;EACA,8BAAA;EACA,kBAAA;AL4SR;AKvSQ;EACI,cAAA;ALySZ;AKhSI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;ALkSR;AK9RQ;EACI,cAAA;ALgSZ;AK/QI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBFxHC;EEyHD,kBAAA;ALiRR;AKhRQ;EACI,cAAA;ALkRZ;AK9QI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,2CAAA;EACA,kBAAA;ALgRR;AK/QQ;EACI,cAAA;EACA,kBAAA;EACA,UF1IH;AH2ZT;AK5QK;EACE,mBAAA;EACC,cAAA;EACA,sCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBFtJC;EEwJD,iBFxJC;AHqaT;AK5QQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;AL8QZ;AK1QI;EACI,mBAAA;EACA,cAAA;EACA,sCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBFtKC;EEwKD,iBFxKC;AHmbT;AK1QQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;AL4QZ;;AKlQA;EACQ,aAAA;ALqQR;;AMpcA;EACI,aAAA;EACA,UAAA;ANucJ;;AOzcA;EACI,6BAAA;EACA,0BAAA;EACA,yCAAA;EACA,kBAAA;EACA,wCAAA;EAEA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;AP2cJ;;AOjcA;EACI,aAAA;APocJ;;AOjcA;EACI,6BAAA;EACA,0BAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;APocJ","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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EAEA,gBAAA;EAEA,cAAA;EAGA,cAAA;ADFJ;;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;;AGpBA;EACI;IACI,iBAAA;IACA,eAZF;IAaE,mBAZC;EHmCP;EGlBE;IACI,gBAhBE;IAiBF,kBAlBC;IAwBD;MACI,sBAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;MACC,WAzBJ;IHwCL;IGbM;MACE,+BAAA;MACA,6BAAA;MACA,wBAAA;MACA,gBAAA;IHeR;EACF;EGZE;IACI,iBAxCC;IAyCD,iBAxCE;IA0CF;MACI,6BAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;MACA,WA5CJ;IHyDL;IGVY;MACJ,wBAAA;MACE,6BAAA;MACD,wBAAA;MACA,gBAAA;IHYT;IGTO;MACC,sBAAA;MACA,6BAAA;MACC,wBAAA;MACA,iBAAA;IHWT;EACF;EGPE;IACI;MAAmB,aAAA;IHUvB;IGTI;MAAY,aAAA;IHYhB;IGXI;MAAc,aAAA;IHclB;IGbI;MAAa,aAAA;IHgBjB;IGfI;MAAoB,aAAA;IHkBxB;IGjBI;MAAY,aAAA;IHoBhB;IGnBI;MAAe,aAAA;IHsBnB;IGrBI;MAAe,aAAA;IHwBnB;IGvBI;MAAa,aAAA;IH0BjB;IGzBI;MAAgB,aAAA;IH4BpB;IG3BI;MAAgB,aAAA;IH8BpB;IG7BI;MAAsB,aAAA;IHgC1B;IG/BI;MAAe,aAAA;IHkCnB;IGjCI;MAAiB,aAAA;IHoCrB;IGnCI;MAAgB,aAAA;IHsCpB;IGrCI;MAAuB,aAAA;IHwC3B;EACF;EGvCE;IACI;MAAmB,aAAA;IH0CvB;IGzCI;MAAY,aAAA;IH4ChB;IG3CI;MAAc,aAAA;IH8ClB;IG7CI;MAAa,aAAA;IHgDjB;IG/CI;MAAoB,aAAA;IHkDxB;IGjDI;MAAY,aAAA;IHoDhB;IGnDI;MAAe,aAAA;IHsDnB;IGrDI;MAAe,aAAA;IHwDnB;IGvDI;MAAa,aAAA;IH0DjB;IGzDI;MAAgB,aAAA;IH4DpB;IG3DI;MAAgB,aAAA;IH8DpB;IG7DI;MAAsB,aAAA;IHgE1B;IG/DI;MAAe,aAAA;IHkEnB;IGjEI;MAAiB,aAAA;IHoErB;IGnEI;MAAgB,aAAA;IHsEpB;IGrEI;MAAuB,aAAA;IHwE3B;EACF;EGtEG;IACI,gBAxGC;IAyGF,iBAzGE;IA0GF;MAAmB,aAAA;IHyEvB;IGxEI;MAAY,aAAA;IH2EhB;IG1EI;MAAc,aAAA;IH6ElB;IG5EI;MAAa,aAAA;IH+EjB;IG9EI;MAAoB,aAAA;IHiFxB;IGhFI;MAAY,aAAA;IHmFhB;IGlFI;MAAe,aAAA;IHqFnB;IGpFI;MAAe,aAAA;IHuFnB;IGtFI;MAAa,aAAA;IHyFjB;IGxFI;MAAgB,aAAA;IH2FpB;IG1FI;MAAgB,aAAA;IH6FpB;IG5FI;MAAsB,aAAA;IH+F1B;IG9FI;MAAe,aAAA;IHiGnB;IGhGI;MAAiB,aAAA;IHmGrB;IGlGI;MAAgB,aAAA;IHqGpB;IGpGI;MAAuB,aAAA;IHuG3B;EACF;AACF;AGpGA;EACI,+BAAA;OAAA,mBAAA;AHsGJ;;AGjGA;EACI,8BAAA;OAAA,kBAAA;AHoGJ;;AGhGA;EACI,eAAA;OAAA,UAAA;EACA,oBAzIE;OAyIF,eAzIE;EA0IF,sBAAA;OAAA,iBAAA;AHmGJ;;AG7FA;EACI,8BAAA;OAAA,kBAAA;EACA,6BAAA;OAAA,iBAAA;EACA,aAAA;AHgGJ;;AG9FA;EACI,sCAAA;AHiGJ;;AG9FA;EACI,iCAAA;AHiGJ;;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,gBAAA;EACA,iBAAA;AJmQJ;;AIhQA;EACI,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;AJmQJ;;AIvPA;EACI,8BAAA;AJ0PJ;AIxPI;EACI,8BAAA;AJ0PR;;AIrPA;EACI,qBAAA;EACA,yBAAA;EACA,0BAAA;AJwPJ;;AIlPA;EACI,gBAAA;AJqPJ;AIpPI;EACI,yBAAA;EACA,qBAAA;EACA,eAAA;EACC,iBAAA;EACA,0BAAA;EACA,uBAAA;AJsPT;;AIjPA;EACI,wCAAA;AJoPJ;;AIhPA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;AJmPJ;AIhPM;EACE,oBAAA;EACA,cAAA;EACA,kBAAA;EACA,0BAAA;EACA,YAAA;AJkPR;;AKxUI;EAEI,qBAAA;OAAA,gBAAA;EACA,aFHI;AH6UZ;AKpUQ;EACI,2BAAA;ALsUZ;AKjUI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ALkUR;AKjUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ALmUZ;AK/TK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ALgUR;AK/TQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ALiUZ;AK3TI;;;;;;EAMI,cAAA;AL6TR;AKvTI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EAEA,+BAAA;OAAA,mBAAA;EAGA,aAAA;EACA,sBAAA;EACA,8BAAA;EACA,kBAAA;ALqTR;AKhTQ;EACI,cAAA;ALkTZ;AKzSI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;AL2SR;AKzSQ;EACI,cAAA;AL2SZ;AK1RI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBFtHC;EEuHD,kBAAA;AL4RR;AK3RQ;EACI,cAAA;AL6RZ;AKzRI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,2CAAA;EACA,kBAAA;AL2RR;AK1RQ;EACI,cAAA;EACA,kBAAA;EACA,UFxIH;AHoaT;AKvRK;EACE,mBAAA;EACC,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBFpJC;EEsJD,iBFtJC;AH8aT;AKvRQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ALyRZ;AKrRI;EACI,mBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBFpKC;EEsKD,iBFtKC;AH4bT;AKrRQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ALuRZ;;AK7QA;EACQ,aAAA;ALgRR;;AM7cA;EACI,aAAA;EACA,UAAA;ANgdJ;;AOldA;EACI,6BAAA;EACA,0BAAA;EACA,yCAAA;EACA,kBAAA;EACA,wCAAA;EAEA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;APodJ;;AO1cA;EACI,aAAA;AP6cJ;;AO1cA;EACI,6BAAA;EACA,0BAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;AP6cJ","file":"style.css"} \ No newline at end of file diff --git a/js/these.js b/js/these.js index bdd1b50..e3577b7 100644 --- a/js/these.js +++ b/js/these.js @@ -7,6 +7,27 @@ export default class thesis extends Handler { beforeParsed(content){ console.log("Thesis ------- "); + + 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 824317476cdf87340ed9ccc2b460ad0381ee68f0 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 22:10:24 +0200 Subject: [PATCH 05/15] thesis (p-thesis-last) --- css/modules/_text.scss | 19 ++++++++++++++----- css/style.css | 6 ++---- css/style.css.map | 2 +- js/these.js | 1 - 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/css/modules/_text.scss b/css/modules/_text.scss index c3f0c8c..108e47e 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -52,12 +52,21 @@ blockquote{ } } -blockquote u{ - text-decoration: none; - text-transform: uppercase; - font-size: var(--fs-small); -} +// blockquote u{ +// text-decoration: none; +// text-transform: uppercase; +// font-size: var(--fs-small); +// color: red; +// } +// u{ +// color: red; +// } + + +ul{ + color: red; +} diff --git a/css/style.css b/css/style.css index 0be1e4d..dae1a5a 100644 --- a/css/style.css +++ b/css/style.css @@ -306,10 +306,8 @@ blockquote p { border-left: 1px solid #cfcfcf; } -blockquote u { - text-decoration: none; - text-transform: uppercase; - font-size: var(--fs-small); +ul { + color: red; } .p-these { diff --git a/css/style.css.map b/css/style.css.map index f31fd3a..22011fe 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/these.js b/js/these.js index e3577b7..480dba1 100644 --- a/js/these.js +++ b/js/these.js @@ -6,7 +6,6 @@ export default class thesis extends Handler { } beforeParsed(content){ - console.log("Thesis ------- "); const strongs = content.querySelectorAll('strong'); strongs.forEach(strong => { From a8e3f5c31b9739b7520a85e798cc62a8baa677c4 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 22:15:00 +0200 Subject: [PATCH 06/15] change behaviour followingNotes (before next title or next ol) --- .../plugins/followingNotes/followingNotes.js | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/csspageweaver/plugins/followingNotes/followingNotes.js b/csspageweaver/plugins/followingNotes/followingNotes.js index 15b4c17..6dd0fc4 100644 --- a/csspageweaver/plugins/followingNotes/followingNotes.js +++ b/csspageweaver/plugins/followingNotes/followingNotes.js @@ -27,19 +27,38 @@ export default class followingNotes extends Handler { 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; - let container = paragraph.nextElementSibling; - if (!container || !container.classList.contains("container-following-note")) { - container = document.createElement("div"); - container.classList.add("container-following-note"); - paragraph.after(container); + // Find next boundary: heading or ol[type="1"] + let boundary = null; + let sibling = paragraph.nextElementSibling; + while (sibling) { + if (sibling.matches('h1, h2, h3, h4, h5, h6, ol[type="1"]')) { + boundary = sibling; + break; + } + sibling = sibling.nextElementSibling; } - container.appendChild(note); + const mapKey = boundary || paragraph.parentElement; + + if (!containerMap.has(mapKey)) { + let container = document.createElement("div"); + container.classList.add("container-following-note"); + if (boundary) { + boundary.before(container); + } else { + paragraph.parentElement.appendChild(container); + } + containerMap.set(mapKey, container); + } + + containerMap.get(mapKey).appendChild(note); }); From 84633a1d4a1e575a5d059da4d24fb4ab9ceb91b9 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 22:28:24 +0200 Subject: [PATCH 07/15] numParagraph.js --- css/modules/_text.scss | 7 +++++++ css/style.css | 6 ++++++ css/style.css.map | 2 +- csspageweaver/manifest.json | 3 ++- js/numParagraph.js | 27 +++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 js/numParagraph.js diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 108e47e..7facc28 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -92,6 +92,13 @@ ol[type="1"]{ list-style-type: none; position: relative; break-after: avoid; + width: $indent; + background-color: #efefef; + position: absolute; + + display: flex; + align-items: center; + justify-content: center; &::after{ diff --git a/css/style.css b/css/style.css index dae1a5a..e0fc07f 100644 --- a/css/style.css +++ b/css/style.css @@ -331,6 +331,12 @@ ol[type="1"] { position: relative; -moz-column-break-after: avoid; break-after: avoid; + width: 10mm; + background-color: #efefef; + position: absolute; + display: flex; + align-items: center; + justify-content: center; } ol[type="1"]::after { content: attr(start); diff --git a/css/style.css.map b/css/style.css.map index 22011fe..a005b91 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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 20ffff8..5044dd7 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -24,7 +24,8 @@ }, "hook": [ "/js/counters.js", - "/js/these.js" + "/js/these.js", + "/js/numParagraph.js" ] } diff --git a/js/numParagraph.js b/js/numParagraph.js new file mode 100644 index 0000000..69c8f19 --- /dev/null +++ b/js/numParagraph.js @@ -0,0 +1,27 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class thesis extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + afterPageLayout(pageElement, page, breakToken){ + let nums = pageElement.querySelectorAll('ol[type="1"]'); + nums.forEach(function (num) { + let totalHeight = 0; + let sibling = num.nextElementSibling; + while (sibling) { + if (sibling.matches('ol[type="1"], h1, h2, h3, h4, h5, h6, .container-following-note')) break; + totalHeight += sibling.offsetHeight; + sibling = sibling.nextElementSibling; + } + if (totalHeight > 0) { + num.style.height = totalHeight + 'px'; + } + }); + } + + +} + + From bdb35a7ea6f082acd25e902fe48dbbd47e66e3ae Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 9 Apr 2026 22:35:44 +0200 Subject: [PATCH 08/15] numParagraph.js break column --- css/modules/_text.scss | 2 ++ css/style.css | 2 ++ css/style.css.map | 2 +- js/numParagraph.js | 13 ++++++++++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 7facc28..d6c0c5b 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -72,6 +72,7 @@ ul{ .p-these{ font-weight: 500; + margin-bottom: calc(var(--baseline)*1); strong{ text-transform: uppercase; display: inline-block; @@ -99,6 +100,7 @@ ol[type="1"]{ display: flex; align-items: center; justify-content: center; + outline: 1px solid red; &::after{ diff --git a/css/style.css b/css/style.css index e0fc07f..eb8c2dd 100644 --- a/css/style.css +++ b/css/style.css @@ -312,6 +312,7 @@ ul { .p-these { font-weight: 500; + margin-bottom: calc(var(--baseline) * 1); } .p-these strong { text-transform: uppercase; @@ -337,6 +338,7 @@ ol[type="1"] { display: flex; align-items: center; justify-content: center; + outline: 1px solid red; } ol[type="1"]::after { content: attr(start); diff --git a/css/style.css.map b/css/style.css.map index a005b91..3bfd472 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/numParagraph.js b/js/numParagraph.js index 69c8f19..0f11b00 100644 --- a/js/numParagraph.js +++ b/js/numParagraph.js @@ -8,13 +8,24 @@ export default class thesis extends Handler { afterPageLayout(pageElement, page, breakToken){ let nums = pageElement.querySelectorAll('ol[type="1"]'); nums.forEach(function (num) { + const colContainer = num.closest('#section__content') || num.offsetParent; + const colHeight = colContainer.offsetHeight; + let totalHeight = 0; let sibling = num.nextElementSibling; while (sibling) { if (sibling.matches('ol[type="1"], h1, h2, h3, h4, h5, h6, .container-following-note')) break; - totalHeight += sibling.offsetHeight; + + // Le frère commence dans la colonne 2 → stop + if (sibling.offsetTop >= colHeight) break; + + // Le frère est coupé entre les deux colonnes → ne compter que la partie en colonne 1 + const partHeight = Math.min(sibling.offsetHeight, colHeight - sibling.offsetTop); + totalHeight += partHeight; + sibling = sibling.nextElementSibling; } + if (totalHeight > 0) { num.style.height = totalHeight + 'px'; } From 3b919834917516812051501f62f544dbb76f3694 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Fri, 10 Apr 2026 11:24:39 +0200 Subject: [PATCH 09/15] clone numParagraph (page + column) --- css/modules/_layout.scss | 1 + css/modules/_num-paragraph.scss | 41 ++++++++ css/modules/_text.scss | 43 +------- css/style.css | 19 ++-- css/style.css.map | 2 +- css/style.scss | 1 + .../plugins/followingNotes/followingNotes.js | 17 ++-- index.html | 12 --- js/numParagraph.js | 97 +++++++++++++++---- 9 files changed, 147 insertions(+), 86 deletions(-) create mode 100644 css/modules/_num-paragraph.scss diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 2f68243..6ef1b63 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -5,6 +5,7 @@ $bottom: 18mm; $inside: 12mm; $outside: 6mm; $content-h: calc($height - $top - $bottom - 1mm); +$content-w: calc($width - $inside - $outside); $gap: 4mm; $indent: 10mm; diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss new file mode 100644 index 0000000..f9eaf4a --- /dev/null +++ b/css/modules/_num-paragraph.scss @@ -0,0 +1,41 @@ +ol[type="1"]{ + list-style-type: none; + position: relative; + break-after: avoid; + width: $indent; + // background-color: #efefef; + position: absolute; + + display: flex; + align-items: center; + justify-content: center; + // outline: 1px solid red; + + + &::after{ + content: attr(start); + display: block; + position: absolute; + font-size: var(--fs-small); + opacity: 0.5; + } + + + +} + + + +ol[type="1"].ol-clone{ + break-before: column; + // outline: 1px solid green; + break-after: avoid; + top: 0; + left: calc($content-w/2 + $gap/2) +} + + +ol[type="1"].ol-clone-page{ + // outline: 1px solid yellow; +} + diff --git a/css/modules/_text.scss b/css/modules/_text.scss index d6c0c5b..a0d9e8a 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -22,8 +22,8 @@ p{ text-align: justify; orphans: 2; widows: 2; - margin-left: $indent*0.8; - padding-left: $indent*0.2; + margin-left: $indent; + // padding-left: $indent*0.2; } p, li{ @@ -45,11 +45,6 @@ p, li{ blockquote{ font-family: var(--font-quote); - - p{ - border-left: 1px solid #cfcfcf; - - } } // blockquote u{ @@ -72,7 +67,7 @@ ul{ .p-these{ font-weight: 500; - margin-bottom: calc(var(--baseline)*1); + margin-bottom: calc(var(--baseline)*0.5); strong{ text-transform: uppercase; display: inline-block; @@ -88,35 +83,3 @@ ul{ margin-bottom: calc(var(--baseline)*1); } - -ol[type="1"]{ - list-style-type: none; - position: relative; - break-after: avoid; - width: $indent; - background-color: #efefef; - position: absolute; - - display: flex; - align-items: center; - justify-content: center; - outline: 1px solid red; - - - &::after{ - content: attr(start); - display: block; - position: absolute; - font-size: var(--fs-small); - opacity: 0.5; - - // color: #d7d7 d7; - // position: relative; - // top: -1px; - } - - - -} - - diff --git a/css/style.css b/css/style.css index eb8c2dd..6b90697 100644 --- a/css/style.css +++ b/css/style.css @@ -287,8 +287,7 @@ p { text-align: justify; orphans: 2; widows: 2; - margin-left: 8mm; - padding-left: 2mm; + margin-left: 10mm; } p, li { @@ -302,9 +301,6 @@ p, li { blockquote { font-family: var(--font-quote); } -blockquote p { - border-left: 1px solid #cfcfcf; -} ul { color: red; @@ -312,7 +308,7 @@ ul { .p-these { font-weight: 500; - margin-bottom: calc(var(--baseline) * 1); + margin-bottom: calc(var(--baseline) * 0.5); } .p-these strong { text-transform: uppercase; @@ -333,12 +329,10 @@ ol[type="1"] { -moz-column-break-after: avoid; break-after: avoid; width: 10mm; - background-color: #efefef; position: absolute; display: flex; align-items: center; justify-content: center; - outline: 1px solid red; } ol[type="1"]::after { content: attr(start); @@ -348,6 +342,15 @@ 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: 81mm; +} + #section__content h1 { -moz-column-span: all; column-span: all; diff --git a/css/style.css.map b/css/style.css.map index 3bfd472..ac420d7 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/_titles.scss","modules/_list-of-abbr.scss","modules/_followingNotes.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"],"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 e90d3a3..0e45476 100644 --- a/css/style.scss +++ b/css/style.scss @@ -3,6 +3,7 @@ @import 'modules/init'; @import 'modules/layout'; @import 'modules/text'; +@import 'modules/num-paragraph'; @import 'modules/titles'; // @import 'modules/footnotes'; @import 'modules/list-of-abbr'; diff --git a/csspageweaver/plugins/followingNotes/followingNotes.js b/csspageweaver/plugins/followingNotes/followingNotes.js index 6dd0fc4..0a9f45b 100644 --- a/csspageweaver/plugins/followingNotes/followingNotes.js +++ b/csspageweaver/plugins/followingNotes/followingNotes.js @@ -20,8 +20,6 @@ export default class followingNotes extends Handler { beforeParsed(content) { - console.log("floatnotes"); - let newNotesClass = this.newNotesClass; resetCounter(content, this.reset, this.notesClass); createCallandMarker(content, this.notesClass, newNotesClass); @@ -34,9 +32,16 @@ export default class followingNotes extends Handler { let paragraph = note.closest("p"); if (!paragraph) return; - // Find next boundary: heading or ol[type="1"] + // 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 = paragraph.nextElementSibling; + let sibling = topLevel.nextElementSibling; while (sibling) { if (sibling.matches('h1, h2, h3, h4, h5, h6, ol[type="1"]')) { boundary = sibling; @@ -45,7 +50,7 @@ export default class followingNotes extends Handler { sibling = sibling.nextElementSibling; } - const mapKey = boundary || paragraph.parentElement; + const mapKey = boundary || sectionContent; if (!containerMap.has(mapKey)) { let container = document.createElement("div"); @@ -53,7 +58,7 @@ export default class followingNotes extends Handler { if (boundary) { boundary.before(container); } else { - paragraph.parentElement.appendChild(container); + sectionContent.appendChild(container); } containerMap.set(mapKey, container); } diff --git a/index.html b/index.html index 9b0ddbd..63881f9 100644 --- a/index.html +++ b/index.html @@ -1195,18 +1195,6 @@ Abteilung)
-
- -

Titre niveau 2

-

Titre niveau 2

-

Titre niveau 2

-

Titre niveau 3

-

Titre niveau 3

-

Titre niveau 3

-

Titre niveau 4

Titre niveau 4

Titre niveau 4

-
Titre niveau 5
Titre niveau 5
Titre niveau 5
-
Titre niveau 6
Titre niveau 6
Titre niveau 6
-

Vorrede

diff --git a/js/numParagraph.js b/js/numParagraph.js index 0f11b00..afbddd1 100644 --- a/js/numParagraph.js +++ b/js/numParagraph.js @@ -5,34 +5,93 @@ export default class thesis extends Handler { super(chunker, polisher, caller); } - afterPageLayout(pageElement, page, breakToken){ - let nums = pageElement.querySelectorAll('ol[type="1"]'); - nums.forEach(function (num) { - const colContainer = num.closest('#section__content') || num.offsetParent; - const colHeight = colContainer.offsetHeight; - let totalHeight = 0; + // 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; - - // Le frère commence dans la colonne 2 → stop - if (sibling.offsetTop >= colHeight) break; - - // Le frère est coupé entre les deux colonnes → ne compter que la partie en colonne 1 - const partHeight = Math.min(sibling.offsetHeight, colHeight - sibling.offsetTop); - totalHeight += partHeight; - + siblings.push(sibling); sibling = sibling.nextElementSibling; } - if (totalHeight > 0) { - num.style.height = totalHeight + 'px'; - } + // Insérer le wrapper à la place du ol + num.before(wrapper); + wrapper.appendChild(num); + siblings.forEach(s => wrapper.appendChild(s)); }); } + + + 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 299ffe6c4b468999afebf326669d2fb19555d447 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Fri, 10 Apr 2026 11:46:11 +0200 Subject: [PATCH 10/15] indent p + p --- css/modules/_text.scss | 12 ++++++++++-- css/style.css | 8 ++++++++ css/style.css.map | 2 +- csspageweaver/manifest.json | 1 + js/numParagraph.js | 13 +++++++++++++ js/snapToBaseline.js | 20 ++++++++++++++++++++ 6 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 js/snapToBaseline.js diff --git a/css/modules/_text.scss b/css/modules/_text.scss index a0d9e8a..c846769 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -35,10 +35,18 @@ p, li{ } +.wrapper-indent { + color: red; +} -// p + p{ -// text-indent: calc(var(--indent)*0.5); +.wrapper-indent > p:first-of-type { + text-indent: $indent*0.5; +} + +// p + ol + p{ +// color: red; +// text-indent: $indent*0.25; // } diff --git a/css/style.css b/css/style.css index 6b90697..7128def 100644 --- a/css/style.css +++ b/css/style.css @@ -298,6 +298,14 @@ p, li { word-spacing: -0.004em; } +.wrapper-indent { + color: red; +} + +.wrapper-indent > p:first-of-type { + text-indent: 5mm; +} + blockquote { font-family: var(--font-quote); } diff --git a/css/style.css.map b/css/style.css.map index ac420d7..c8625ca 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"],"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"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,4BAAA;EACA,kCAAA;EACA,kCAAA;EACA,8CAAA;EACA,iBAAA;EACA,iBAAA;EAEA,gBAAA;EAEA,cAAA;EAGA,cAAA;ADFJ;;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;AJkQJ;;AI9PA;EACI,UAAA;AJiQJ;;AI7PA;EACI,gBAAA;AJgQJ;;AItPA;EACI,8BAAA;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;;AKpUA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,WFKK;EEHL,kBAAA;EAEA,aAAA;EACA,mBAAA;EACA,uBAAA;ALqUJ;AKjUM;EACE,oBAAA;EACA,cAAA;EACA,kBAAA;EACA,0BAAA;EACA,YAAA;ALmUR;;AK1TA;EACI,gCAAA;OAAA,oBAAA;EAEC,8BAAA;OAAA,kBAAA;EACA,MAAA;EACA,UAAA;AL4TL;;AMvVI;EAEI,qBAAA;OAAA,gBAAA;EACA,aHHI;AH4VZ;AMnVQ;EACI,2BAAA;ANqVZ;AMhVI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANiVR;AMhVQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANkVZ;AM9UK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;AN+UR;AM9UQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANgVZ;AM1UI;;;;;;EAMI,cAAA;AN4UR;AMtUI;EAEI,gBAAA;EACA,gBAAA;EACA,gBAAA;EACA,aAAA;EAEA,+BAAA;OAAA,mBAAA;EAGA,aAAA;EACA,sBAAA;EACA,8BAAA;EACA,kBAAA;ANoUR;AM/TQ;EACI,cAAA;ANiUZ;AMxTI;EACI,eAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;EACA,mBAAA;EACA,aAAA;AN0TR;AMxTQ;EACI,cAAA;AN0TZ;AMzSI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;EACA,kBHrHC;EGsHD,kBAAA;AN2SR;AM1SQ;EACI,cAAA;AN4SZ;AMxSI;EACI,gBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,2CAAA;EACA,kBAAA;AN0SR;AMzSQ;EACI,cAAA;EACA,kBAAA;EACA,UHvIH;AHkbT;AMtSK;EACE,mBAAA;EACC,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,4CAAA;EACA,kBHnJC;EGqJD,iBHrJC;AH4bT;AMtSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANwSZ;AMpSI;EACI,mBAAA;EACA,cAAA;EACA,yCAAA;EACA,kBAAA;EACA,qCAAA;EACA,kBHnKC;EGqKD,iBHrKC;AH0cT;AMpSQ;EACI,cAAA;EACA,kBAAA;EACA,OAAA;ANsSZ;;AM5RA;EACQ,aAAA;AN+RR;;AO5dA;EACI,aAAA;EACA,UAAA;AP+dJ;;AQjeA;EACI,6BAAA;EACA,0BAAA;EACA,yCAAA;EACA,kBAAA;EACA,wCAAA;EAEA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;EACA,mBAAA;ARmeJ;;AQzdA;EACI,aAAA;AR4dJ;;AQzdA;EACI,6BAAA;EACA,0BAAA;EACA,cAAA;EACA,kBAAA;EACA,SAAA;AR4dJ","file":"style.css"} \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 5044dd7..a9e7a65 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -25,6 +25,7 @@ "hook": [ "/js/counters.js", "/js/these.js", + "js/snapToBaseline.js", "/js/numParagraph.js" ] } diff --git a/js/numParagraph.js b/js/numParagraph.js index afbddd1..80297b5 100644 --- a/js/numParagraph.js +++ b/js/numParagraph.js @@ -30,6 +30,19 @@ export default class thesis extends Handler { 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'); + } + } + }); } diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js new file mode 100644 index 0000000..fbcc922 --- /dev/null +++ b/js/snapToBaseline.js @@ -0,0 +1,20 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class snapToBaseline extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + renderNode(node, sourceNode){ + if (node.nodeName === 'P') { + return node; + } + } + + + + + +} + + From 831d276d41bc8024df966fbece918bde5d76ccac Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Fri, 10 Apr 2026 12:51:41 +0200 Subject: [PATCH 11/15] snapToBaseline --- css/modules/_followingNotes.scss | 3 ++- css/modules/_text.scss | 7 ------- css/style.css | 6 +----- css/style.css.map | 2 +- csspageweaver/manifest.json | 2 +- js/snapToBaseline.js | 19 +++++++++++++++++++ 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/css/modules/_followingNotes.scss b/css/modules/_followingNotes.scss index 700d81c..6ea7f26 100644 --- a/css/modules/_followingNotes.scss +++ b/css/modules/_followingNotes.scss @@ -3,7 +3,8 @@ font-size: var(--fs-small); line-height: calc(var(--baseline)*0.75); position: relative; - margin-top: calc(var(--baseline)*0.25); + margin-top: 2px; + // margin-top: calc(var(--baseline)*0.25); hyphens: auto; hyphenate-limit-chars: 7 3 4; diff --git a/css/modules/_text.scss b/css/modules/_text.scss index c846769..2e9b39c 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -35,19 +35,12 @@ p, li{ } -.wrapper-indent { - color: red; -} .wrapper-indent > p:first-of-type { text-indent: $indent*0.5; } -// p + ol + p{ -// color: red; -// text-indent: $indent*0.25; -// } diff --git a/css/style.css b/css/style.css index 7128def..f2b4610 100644 --- a/css/style.css +++ b/css/style.css @@ -298,10 +298,6 @@ p, li { word-spacing: -0.004em; } -.wrapper-indent { - color: red; -} - .wrapper-indent > p:first-of-type { text-indent: 5mm; } @@ -502,7 +498,7 @@ ol[type="1"].ol-clone { font-size: var(--fs-small); line-height: calc(var(--baseline) * 0.75); position: relative; - margin-top: calc(var(--baseline) * 0.25); + margin-top: 2px; hyphens: auto; hyphenate-limit-chars: 7 3 4; hyphenate-limit-lines: 2; diff --git a/css/style.css.map b/css/style.css.map index c8625ca..381a77f 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"],"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"],"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 a9e7a65..8a63ff6 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -25,7 +25,7 @@ "hook": [ "/js/counters.js", "/js/these.js", - "js/snapToBaseline.js", + "/js/snapToBaseline.js", "/js/numParagraph.js" ] } diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js index fbcc922..605e735 100644 --- a/js/snapToBaseline.js +++ b/js/snapToBaseline.js @@ -3,10 +3,29 @@ import { Handler } from '/csspageweaver/lib/paged.esm.js'; export default class snapToBaseline extends Handler { constructor(chunker, polisher, caller) { super(chunker, polisher, caller); + this.baseline; + } + + beforeParsed(content){ + this.baseline = parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--baseline').trim()); + // console.log("========================================"); + // console.log("baseline = " + this.baseline); } renderNode(node, sourceNode){ if (node.nodeName === 'P') { + this.baseline = parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--baseline').trim()); + const area = node.closest('.pagedjs_area'); + if (area) { + const areaRect = area.getBoundingClientRect(); + const nodeRect = node.getBoundingClientRect(); + const relativeTop = nodeRect.top - areaRect.top; + const modulo = relativeTop % this.baseline; + if (modulo !== 0) { + let newPadding = this.baseline - modulo; + node.style.paddingTop = newPadding + 'px'; + } + } return node; } } From 79b2753fdbf3da30da2b5d90d977a612e3334362 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 14 Apr 2026 18:18:10 +0200 Subject: [PATCH 12/15] baseline & toc --- .vscode/settings.json | 3 + css/modules/_layout.scss | 2 +- css/modules/_text.scss | 2 + css/modules/_toc.scss | 47 ++++++ css/modules/_var.scss | 4 - css/style.css | 40 ++++- css/style.css.map | 2 +- css/style.scss | 3 +- csspageweaver/manifest.json | 4 + .../plugins/tableOfContent/.gitignore | 1 + .../plugins/tableOfContent/README.md | 90 ++++++++++++ .../plugins/tableOfContent/config.json | 9 ++ .../plugins/tableOfContent/tableOfContent.css | 13 ++ .../plugins/tableOfContent/tableOfContent.js | 139 ++++++++++++++++++ index.html | 3 + js/snapToBaseline.js | 39 ++++- 16 files changed, 385 insertions(+), 16 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 css/modules/_toc.scss create mode 100644 csspageweaver/plugins/tableOfContent/.gitignore create mode 100755 csspageweaver/plugins/tableOfContent/README.md create mode 100644 csspageweaver/plugins/tableOfContent/config.json create mode 100644 csspageweaver/plugins/tableOfContent/tableOfContent.css create mode 100644 csspageweaver/plugins/tableOfContent/tableOfContent.js diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6f3a291 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 6ef1b63..6299012 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -1,7 +1,7 @@ $width: 176mm; $height: 240mm; $top: 6mm; -$bottom: 18mm; +$bottom: 20mm; $inside: 12mm; $outside: 6mm; $content-h: calc($height - $top - $bottom - 1mm); diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 2e9b39c..881e549 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -32,6 +32,8 @@ p, li{ hyphenate-limit-lines: 2; hyphenate-limit-zone: 8%; word-spacing: -0.004em; + widows: 2; + orphans: 2; } diff --git a/css/modules/_toc.scss b/css/modules/_toc.scss new file mode 100644 index 0000000..2bdaeb7 --- /dev/null +++ b/css/modules/_toc.scss @@ -0,0 +1,47 @@ +#toc_container{ + + break-before: page; + break-after: page; + // color: red; + + ul{ + list-style-type: none; + color: black; + } + + .toc-element-level-1{ + margin-top: calc(var(--baseline)*1); + margin-bottom: calc(var(--baseline)*0.5); + font-size: 1.2rem; + line-height: 1.2; + } + + .toc-element-level-2{ + font-weight: bold; + margin-top: calc(var(--baseline)*0.5); + margin-bottom: calc(var(--baseline)*0.5); + } + + .toc-element-level-3{ + text-indent: 5mm; + + } + + .toc-element-level-4{ + text-indent: 10mm; + + } + + .toc-element-level-5{ + text-indent: 15mm; + + } + + .toc-element-level-6{ + text-indent: 20mm; + + } + + + +} \ No newline at end of file diff --git a/css/modules/_var.scss b/css/modules/_var.scss index a6dacfd..0007669 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -5,12 +5,8 @@ --font-sans: 'Basis Grotesque Pro', sans-serif; --font-size: 12px; --fs-small: 9.8px; - --baseline: 18px; - --indent: 26px; - - --fs-num: 12px; } diff --git a/css/style.css b/css/style.css index f2b4610..c36e050 100644 --- a/css/style.css +++ b/css/style.css @@ -35,7 +35,7 @@ body { @page { size: 176mm 240mm; margin-top: 6mm; - margin-bottom: 18mm; + margin-bottom: 20mm; } @page :left { margin-left: 6mm; @@ -296,6 +296,8 @@ p, li { hyphenate-limit-lines: 2; hyphenate-limit-zone: 8%; word-spacing: -0.004em; + widows: 2; + orphans: 2; } .wrapper-indent > p:first-of-type { @@ -358,7 +360,7 @@ ol[type="1"].ol-clone { #section__content h1 { -moz-column-span: all; column-span: all; - height: 215mm; + 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); @@ -517,4 +519,38 @@ ol[type="1"].ol-clone { line-height: 1; position: relative; top: -4px; +} + +#toc_container { + -moz-column-break-before: page; + break-before: page; + -moz-column-break-after: page; + break-after: page; +} +#toc_container ul { + list-style-type: none; + color: black; +} +#toc_container .toc-element-level-1 { + margin-top: calc(var(--baseline) * 1); + margin-bottom: calc(var(--baseline) * 0.5); + font-size: 1.2rem; + line-height: 1.2; +} +#toc_container .toc-element-level-2 { + font-weight: bold; + margin-top: calc(var(--baseline) * 0.5); + margin-bottom: calc(var(--baseline) * 0.5); +} +#toc_container .toc-element-level-3 { + text-indent: 5mm; +} +#toc_container .toc-element-level-4 { + text-indent: 10mm; +} +#toc_container .toc-element-level-5 { + text-indent: 15mm; +} +#toc_container .toc-element-level-6 { + text-indent: 20mm; }/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/css/style.css.map b/css/style.css.map index 381a77f..5e0a6ac 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"],"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/css/style.scss b/css/style.scss index 0e45476..97acc4c 100644 --- a/css/style.scss +++ b/css/style.scss @@ -7,4 +7,5 @@ @import 'modules/titles'; // @import 'modules/footnotes'; @import 'modules/list-of-abbr'; -@import 'modules/followingNotes'; \ No newline at end of file +@import 'modules/followingNotes'; +// @import 'modules/toc'; \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 8a63ff6..91dec05 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -20,6 +20,10 @@ "followingNotes": { "selector": ".inline-note", "reset": ".chapter" + }, + "tableOfContent": { + "tocContainer": "#toc_container", + "tocTitles": ["#section__content h1", "#section__content h2", "h3", "h4", "h5", "h6"] } }, "hook": [ diff --git a/csspageweaver/plugins/tableOfContent/.gitignore b/csspageweaver/plugins/tableOfContent/.gitignore new file mode 100644 index 0000000..496ee2c --- /dev/null +++ b/csspageweaver/plugins/tableOfContent/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/csspageweaver/plugins/tableOfContent/README.md b/csspageweaver/plugins/tableOfContent/README.md new file mode 100755 index 0000000..66c4cb9 --- /dev/null +++ b/csspageweaver/plugins/tableOfContent/README.md @@ -0,0 +1,90 @@ +--- +name: tableOfContent +tags: recommended, stable +description: A script to generate a table of content. +--- + +# Table of content + +A script to generate a table of content. + +See pagedjs.org post: [Build a Table of Contents from your HTML](https://pagedjs.org/post/toc/) + +**tags**: recommended, stable + +## Parameters + +The plugin contain also a minimal stylesheet to add the corresponding page numbers with paged.js and add some style to the toc list. + +In `manifest.json`, you can modify/add some parameters: + +```json + "plugins":{ + "tableOfContent" + }, + "pluginsParameters":{ + "tableOfContent": { + "tocContainer": "#toc_container", + "tocTitles": ["h1", "h2"] + } + }, + ``` + +- `tocElement` → define the id element where the toc list will be create (by default: `#toc`) +- `titleElements` → array of the title element you want in the toc list. You can add as many as you want and the elements can be classes like `.title-1` or `.my-content h1:not(.unlisted)`. (by default: `["h1", "h2"]`) +- `beforePageNumber` (optional) → if you want to add some text before the page number ("page ", "p. ", ...) +- `position` → put the page number before or after the toc element, create `::before` or `::after` pseudo-element (by default: `after`) + + +## Stylesheet + +This plugin have a minimal stylesheet + +```CSS +#list-toc-generated{ + --before-page: ""; +} +``` + +`--before-page` refers to the text before the page number ("page ", "p. ", ...), you can change it directly here or in the config.json + + +If the page number is positionned after the toc element (`"position": "after"` in config.json), this style apply: + +```CSS +.toc-element a.toc-page-after::after{ + content: var(--before-page) target-counter(attr(href), page); /* This line create the page number */ + float: right; /* put number at the right of the page */ +} +``` + +If the page number is positionned before the toc element (`"position": "before"` in config.json), this style apply: + +```CSS +.toc-element a.toc-page-before::before{ + content: var(--before-page) target-counter(attr(href), page); + margin-right: 1ch; /* space after number */ +} + +``` + + + +## How to install + +### Download + +1. Download the ZIP archive via Code > Download ZIP. +2. Unzip the archive. +3. Rename the extracted folder by removing the branch name suffix: `tableOfContent-main` → `tableOfContent` +4. Move the folder into the `csspageweaver/plugins/` directory. +5. Add the required parameters to `manifest.json` (see above). + + +### Git clone + +1. Use git clone +2. Move the folder into the `csspageweaver/plugins/` directory. +3. Add the required parameters to `manifest.json` (see above). + + diff --git a/csspageweaver/plugins/tableOfContent/config.json b/csspageweaver/plugins/tableOfContent/config.json new file mode 100644 index 0000000..1da040a --- /dev/null +++ b/csspageweaver/plugins/tableOfContent/config.json @@ -0,0 +1,9 @@ +{ + "name": "Table of content", + "description": "A script to generate a table of content", + "author": ["Julie Blanc", "Julien Taquet"], + "licence": "MIT", + "version": "1.0", + "hook": "tableOfContent.js", + "stylesheet": "tableOfContent.css" +} \ No newline at end of file diff --git a/csspageweaver/plugins/tableOfContent/tableOfContent.css b/csspageweaver/plugins/tableOfContent/tableOfContent.css new file mode 100644 index 0000000..4ef2426 --- /dev/null +++ b/csspageweaver/plugins/tableOfContent/tableOfContent.css @@ -0,0 +1,13 @@ +#list-toc-generated{ + --before-page: ""; +} + +.toc-element a.toc-page-after::after{ + content: var(--before-page) target-counter(attr(href), page); + float: right; /* put number at the right of the page */ +} + +.toc-element a.toc-page-before::before{ + content: var(--before-page) target-counter(attr(href), page); + margin-right: 1ch; /* space after number */ +} \ No newline at end of file diff --git a/csspageweaver/plugins/tableOfContent/tableOfContent.js b/csspageweaver/plugins/tableOfContent/tableOfContent.js new file mode 100644 index 0000000..3eb2d85 --- /dev/null +++ b/csspageweaver/plugins/tableOfContent/tableOfContent.js @@ -0,0 +1,139 @@ +/** + * @name Table of content + * @author Julie Blanc + * @see { @link https://gitlab.com/csspageweaver/plugins/table_of_content/ } + */ + +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class tableOfContent extends Handler { + + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + this.tocContainer = cssPageWeaver.features.tableOfContent.parameters?.tocContainer || "#toc_container"; + this.tocTitles = cssPageWeaver.features.tableOfContent.parameters?.tocTitles || ["h1", "h2"]; + this.beforePageNumber = cssPageWeaver.features.tableOfContent.parameters?.beforePageNumber; + this.position = cssPageWeaver.features.tableOfContent.parameters?.position; + } + + beforeParsed(content) { + createToc({ + content: content, + container: this.tocContainer, + titleElements: this.tocTitles, + position: this.position + }); + + + + } + + afterParsed(parsed) { + const tocLinks = parsed.querySelectorAll('.toc-element a'); + tocLinks.forEach(link => { + const id = link.getAttribute('href')?.slice(1); + if (!id) return; + const heading = parsed.querySelector('#' + CSS.escape(id)); + if (!heading) return; + const counter = heading.getAttribute('data-counter'); + if (!counter) return; + const span = document.createElement('span'); + span.className = 'toc-counter'; + span.textContent = counter; + link.prepend(span); + }); + } +} + + + +function createToc(config) { + + const content = config.content; + const tocElement = config.container; + const titleElements = config.titleElements; + + let tocElementDiv = content.querySelector(tocElement) + if(!tocElementDiv) return console.warn('couldn’t start the toc') + tocElementDiv.innerHTML = '' + let tocUl = document.createElement('ul') + tocUl.id = 'list-toc-generated' + + + if(config.before){ + tocUl.style.setProperty('--before-page', '"' + config.before + '"'); + } + + + tocElementDiv.appendChild(tocUl) + + // add class to all title elements + let tocElementNbr = 0 + for (var i = 0; i < titleElements.length; i++) { + let titleHierarchy = i + 1 + let titleElement = content.querySelectorAll(titleElements[i]) + + titleElement.forEach(function (element) { + // check if shouldbe shown + if ( + !element.classList.contains('toc-ignore') || + !element.classList.contains('toc-ignore') + ) { + // add classes to the element + element.classList.add('title-element') + element.setAttribute('data-title-level', titleHierarchy) + + // add an id if doesn't exist + tocElementNbr++ + + if (element.id == '') { + element.id = 'title-element-' + tocElementNbr + } + let newIdElement = element.id + } + }) + } + + // create toc list + let tocElements = content.querySelectorAll('.title-element') + + for (var i = 0; i < tocElements.length; i++) { + let tocElement = tocElements[i] + + let tocNewLi = document.createElement('li') + + // Add class for the hierarcy of toc + tocNewLi.classList.add('toc-element') + tocNewLi.classList.add('toc-element-level-' + tocElement.dataset.titleLevel) + + let classes = [ + ...(tocElement.className ? tocElement.className.split(' ') : []), + ...(tocElement.closest('section')?.className ? tocElement.closest('section')?.className.split(' ') : []), + ]; + + classes.forEach((meta) => { + if (!meta || meta === 'title-element') return; + tocNewLi.classList.add(`toc-${meta}`); + }); + + //get the exisiting class + // Keep class of title elements + let classTocElement = tocElement.classList + for (var n = 0; n < classTocElement.length; n++) { + if (classTocElement[n] != 'title-element') { + tocNewLi.classList.add(classTocElement[n]) + } + } + + if(config.position && config.position === "before"){ + tocNewLi.innerHTML = + '' + tocElement.innerHTML + ''; + }else{ + tocNewLi.innerHTML = + '' + tocElement.innerHTML + ''; + } + + + tocUl.appendChild(tocNewLi) + } +} diff --git a/index.html b/index.html index 63881f9..f0dfb33 100644 --- a/index.html +++ b/index.html @@ -42,6 +42,9 @@
+
+
+ diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js index 605e735..c73b464 100644 --- a/js/snapToBaseline.js +++ b/js/snapToBaseline.js @@ -8,13 +8,19 @@ export default class snapToBaseline extends Handler { beforeParsed(content){ this.baseline = parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--baseline').trim()); - // console.log("========================================"); - // console.log("baseline = " + this.baseline); + + content.querySelectorAll('blockquote').forEach((bq) => { + const prev = bq.previousElementSibling; + if (!prev || prev.nodeName !== 'P') { + bq.style.color = 'red'; + } + }); } renderNode(node, sourceNode){ if (node.nodeName === 'P') { this.baseline = parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--baseline').trim()); + if (!shouldSnap(node)) return node; const area = node.closest('.pagedjs_area'); if (area) { const areaRect = area.getBoundingClientRect(); @@ -22,18 +28,37 @@ export default class snapToBaseline extends Handler { const relativeTop = nodeRect.top - areaRect.top; const modulo = relativeTop % this.baseline; if (modulo !== 0) { - let newPadding = this.baseline - modulo; - node.style.paddingTop = newPadding + 'px'; + node.style.paddingTop = (this.baseline - modulo) + 'px'; } } return node; } } - + afterPageLayout(pageElement, page, breakToken){ + const area = pageElement.querySelector('.pagedjs_area'); + if (!area) return; + + const areaRect = area.getBoundingClientRect(); + const paragraphs = pageElement.querySelectorAll('p'); + + paragraphs.forEach((node) => { + const nodeRect = node.getBoundingClientRect(); + if (nodeRect.bottom < areaRect.bottom - this.baseline) return; + if (!shouldSnap(node)) return; + + const relativeTop = nodeRect.top - areaRect.top; + const modulo = relativeTop % this.baseline; + if (modulo !== 0) { + node.style.paddingTop = (this.baseline - modulo) + 'px'; + } + }); + + } - - } +function shouldSnap(node) { + return !node.closest('blockquote'); +} From a51a86aa6fed5b6f2c532e43c076905f993392a4 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 15 Apr 2026 11:08:34 +0200 Subject: [PATCH 13/15] paragraphe 2 colonnes --- css/modules/_num-paragraph.scss | 16 ++++------------ css/style.css | 4 ++++ css/style.css.map | 2 +- css/style.scss | 3 +-- csspageweaver/manifest.json | 3 ++- js/snapToBaseline.js | 22 +++++++++++++++++----- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/css/modules/_num-paragraph.scss b/css/modules/_num-paragraph.scss index f9eaf4a..366a9ad 100644 --- a/css/modules/_num-paragraph.scss +++ b/css/modules/_num-paragraph.scss @@ -1,16 +1,16 @@ +[data-id="section__content"]{ + position: relative; +} + ol[type="1"]{ list-style-type: none; position: relative; break-after: avoid; width: $indent; - // background-color: #efefef; position: absolute; - display: flex; align-items: center; justify-content: center; - // outline: 1px solid red; - &::after{ content: attr(start); @@ -19,23 +19,15 @@ ol[type="1"]{ font-size: var(--fs-small); opacity: 0.5; } - - - } ol[type="1"].ol-clone{ break-before: column; - // outline: 1px solid green; break-after: avoid; top: 0; left: calc($content-w/2 + $gap/2) } -ol[type="1"].ol-clone-page{ - // outline: 1px solid yellow; -} - diff --git a/css/style.css b/css/style.css index c36e050..60c38b9 100644 --- a/css/style.css +++ b/css/style.css @@ -329,6 +329,10 @@ ul { margin-bottom: calc(var(--baseline) * 1); } +[data-id=section__content] { + position: relative; +} + ol[type="1"] { list-style-type: none; position: relative; diff --git a/css/style.css.map b/css/style.css.map index 5e0a6ac..58b7aa2 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/css/style.scss b/css/style.scss index 97acc4c..b58c8fc 100644 --- a/css/style.scss +++ b/css/style.scss @@ -5,7 +5,6 @@ @import 'modules/text'; @import 'modules/num-paragraph'; @import 'modules/titles'; -// @import 'modules/footnotes'; @import 'modules/list-of-abbr'; @import 'modules/followingNotes'; -// @import 'modules/toc'; \ No newline at end of file +@import 'modules/toc'; \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 91dec05..0a6d450 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -5,7 +5,8 @@ "marginBox", "imposition","spread","previewPage","reloadInPlace", "inlineNotes", - "followingNotes" + "followingNotes", + "tableOfContent" ], "pluginsParameters":{}, "css": [ diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js index c73b464..2544686 100644 --- a/js/snapToBaseline.js +++ b/js/snapToBaseline.js @@ -24,11 +24,17 @@ export default class snapToBaseline extends Handler { const area = node.closest('.pagedjs_area'); if (area) { const areaRect = area.getBoundingClientRect(); - const nodeRect = node.getBoundingClientRect(); - const relativeTop = nodeRect.top - areaRect.top; + // getClientRects()[0] = premier fragment (colonne 1 si le paragraphe + // s'étend sur 2 colonnes). getBoundingClientRect().top retournerait + // le minimum des deux tops, soit le haut de la colonne 2 — incorrect. + const firstRect = node.getClientRects()[0]; + if (!firstRect) return node; + const relativeTop = firstRect.top - areaRect.top; const modulo = relativeTop % this.baseline; + if (modulo !== 0) { node.style.paddingTop = (this.baseline - modulo) + 'px'; + node.style.color = "green"; } } return node; @@ -43,11 +49,17 @@ export default class snapToBaseline extends Handler { const paragraphs = pageElement.querySelectorAll('p'); paragraphs.forEach((node) => { - const nodeRect = node.getBoundingClientRect(); - if (nodeRect.bottom < areaRect.bottom - this.baseline) return; if (!shouldSnap(node)) return; - const relativeTop = nodeRect.top - areaRect.top; + const firstRect = node.getClientRects()[0]; + if (!firstRect) return; + + // firstRect.bottom = bas du premier fragment (colonne 1 pour un paragraphe + // qui s'étend sur 2 colonnes). Cela permet de cibler correctement les + // paragraphes dont la première partie touche le bas de la colonne. + if (firstRect.bottom < areaRect.bottom - this.baseline) return; + + const relativeTop = firstRect.top - areaRect.top; const modulo = relativeTop % this.baseline; if (modulo !== 0) { node.style.paddingTop = (this.baseline - modulo) + 'px'; From 030e27bfac2278934b528712d7fc6cc104cac189 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Wed, 15 Apr 2026 13:21:36 +0200 Subject: [PATCH 14/15] snap to baseline for columns --- js/snapToBaseline.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/js/snapToBaseline.js b/js/snapToBaseline.js index 2544686..2e70a1d 100644 --- a/js/snapToBaseline.js +++ b/js/snapToBaseline.js @@ -12,7 +12,7 @@ export default class snapToBaseline extends Handler { content.querySelectorAll('blockquote').forEach((bq) => { const prev = bq.previousElementSibling; if (!prev || prev.nodeName !== 'P') { - bq.style.color = 'red'; + // bq.style.color = 'red'; } }); } @@ -23,10 +23,7 @@ export default class snapToBaseline extends Handler { if (!shouldSnap(node)) return node; const area = node.closest('.pagedjs_area'); if (area) { - const areaRect = area.getBoundingClientRect(); - // getClientRects()[0] = premier fragment (colonne 1 si le paragraphe - // s'étend sur 2 colonnes). getBoundingClientRect().top retournerait - // le minimum des deux tops, soit le haut de la colonne 2 — incorrect. + const areaRect = area.getBoundingClientRect(); // cible les paragraphes sur 2 colonnes const firstRect = node.getClientRects()[0]; if (!firstRect) return node; const relativeTop = firstRect.top - areaRect.top; @@ -34,7 +31,6 @@ export default class snapToBaseline extends Handler { if (modulo !== 0) { node.style.paddingTop = (this.baseline - modulo) + 'px'; - node.style.color = "green"; } } return node; @@ -54,10 +50,8 @@ export default class snapToBaseline extends Handler { const firstRect = node.getClientRects()[0]; if (!firstRect) return; - // firstRect.bottom = bas du premier fragment (colonne 1 pour un paragraphe - // qui s'étend sur 2 colonnes). Cela permet de cibler correctement les - // paragraphes dont la première partie touche le bas de la colonne. - if (firstRect.bottom < areaRect.bottom - this.baseline) return; + + if (firstRect.bottom < areaRect.bottom - this.baseline) return; // cible les paragraphes qui sont sur 2 colonnes const relativeTop = firstRect.top - areaRect.top; const modulo = relativeTop % this.baseline; From 727f3839f36e6c01d20b7d5d6eb6a8f29d0412c4 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 14:48:49 +0200 Subject: [PATCH 15/15] 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