From e055fc96eeb3653e1ce2ee1d382976734a26fd3d Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Mon, 19 Jan 2026 23:14:58 +0100 Subject: [PATCH 1/9] starting layout-2 --- css/modules/_footnotes.scss | 7 ++- css/modules/_layout.scss | 33 +++++----- css/modules/_text.scss | 23 +++---- css/modules/_titles.scss | 83 ++++++++++++------------ css/modules/_var.scss | 7 ++- css/style.css | 122 +++++++++++++++++------------------- css/style.css.map | 2 +- csspageweaver/manifest.json | 2 +- index.html | 2 + 9 files changed, 142 insertions(+), 139 deletions(-) diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss index 8284658..e658dee 100644 --- a/css/modules/_footnotes.scss +++ b/css/modules/_footnotes.scss @@ -1,7 +1,7 @@ @page { @footnote { float: bottom; - + footnote-policy: auto; } } @@ -11,11 +11,12 @@ .inline-note { float: footnote; + footnote-policy: auto; font-size: 9px; - line-height: calc(var(--baseline)*0.9); + line-height: calc(var(--baseline)*0.8); padding-left: var(--indent); position: relative; - font-weight: 100; + // font-weight: 100; &::marker{ display: none; diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 278356f..edef233 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -2,18 +2,20 @@ @page { size: 134mm 205mm; // size: 150mm 220mm; - margin-top: 67px; - margin-bottom: 10mm; - margin-left: 10mm; - margin-right: 10mm; - bleed: 6mm; - marks: crop; + margin-top: 36px; + margin-bottom: 20mm; + + // bleed: 6mm; + // marks: crop; } @page:left { - margin-left: 12mm; - margin-right: 32mm; - @top-left { + margin-left: 22mm; + margin-right: 22mm; + @bottom-left { content: counter(page); + font-family: var(--font-title); + font-weight: 500; + font-size: var(--fs-num); } // @top-right { // content: "Höchstpersönlichkeit"; @@ -23,14 +25,17 @@ } @page:right { margin-left: 32mm; - margin-right: 12mm; - @top-right { + margin-right: 22mm; + @bottom-right { content: counter(page); + font-family: var(--font-title); + font-weight: 500; + font-size: var(--fs-num); } - @top-left { + @bottom-left { content: "Höchstpersönlichkeit"; - font-variant-caps: small-caps; - letter-spacing: 0.05em; + font-family: var(--font-title); + font-weight: normal; } } diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 0fd8176..1dea3e6 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -69,22 +69,23 @@ ol[type="1"] + p{ blockquote{ - padding-left: var(--indent); - margin-top: calc(var(--baseline)*1); - margin-bottom: calc(var(--baseline)*1); + padding-left: calc(var(--indent)*2); + // color: red; + // margin-top: calc(var(--baseline)*1); + // margin-bottom: calc(var(--baseline)*1); p{ - font-style: italic; - em{ - font-style: normal; - } + // font-family: "Edgar"; + // em{ + // font-style: normal; + // } } - u{ - font-variant: small-caps; - text-decoration: none; - } + // u{ + // font-variant: small-caps; + // text-decoration: none; + // } } diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index b26db1e..6b88118 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -28,19 +28,19 @@ h1{ font-family: var(--font-title); - font-weight: normal; - font-size: 1.5rem; + font-size: 1.6rem; + font-weight: 500; + text-transform: uppercase; line-height: calc(var(--baseline)*1.4); text-align: center; position: relative; - margin-top: calc(var(--baseline)*3 - 3px); + margin-top: calc(var(--baseline)*2 - 3px); padding-bottom: calc(var(--baseline)*1); padding-left: 1ch; padding-right: 1ch; &::before{ display: block; - font-size: 1rem; - + font-size: var(--fs-num); } } @@ -53,68 +53,67 @@ h2{ font-family: var(--font-title); - font-weight: normal; - font-size: 1.3rem; + font-size: 1.1rem; + font-weight: 500; + text-transform: uppercase; line-height: calc(var(--baseline)*1.2); - - text-align: right; - padding-left: 3ch; + text-align: center; position: relative; - margin-top: calc(var(--baseline)*1 + 9px); + margin-top: calc(var(--baseline)*1 + 6px); padding-bottom: calc(var(--baseline)*1); + padding-left: 2ch; + padding-right: 2ch; &::before{ - position: absolute; - left: 0; + display: block; + font-size: var(--fs-num); } } + + h3{ - font-family: var(--font-sans); - font-weight: normal; + font-family: var(--font-title); + font-weight: 500; font-size: 1rem; line-height: calc(var(--baseline)*1); - text-align: right; - padding-left: 3ch; + padding-left: var(--indent); + padding-right: calc(var(--indent)*2); position: relative; - margin-top: calc(var(--baseline)*1 + 9px); - padding-bottom: calc(var(--baseline)*1); + margin-top: calc(var(--baseline)*1 + 4px); + padding-bottom: calc(var(--baseline)*0.75); &::before{ - // font-family: 'Helixotrope 4'; - // font-size: var(--font-size); - // font-weight: bold; position: absolute; left: 0; } } h4{ - font-family: var(--font-sans); - font-weight: normal; + font-family: var(--font-title); + font-weight: 500; + font-size: 0.9rem; + line-height: calc(var(--baseline)*1); + padding-left: calc(var(--indent)*1); + padding-right: calc(var(--indent)*2); + position: relative; + margin-top: calc(var(--baseline)*1 + 4px); + padding-bottom: calc(var(--baseline)*0.75); + } + + + h5{ + font-family: var(--font-title); + font-weight: 500; font-size: 0.8rem; line-height: calc(var(--baseline)*1); - - text-align: right; - padding-left: 3ch; + padding-left: calc(var(--indent)*1); + // padding-right: calc(var(--indent)*2); position: relative; - margin-top: calc(var(--baseline)*0.5); - margin-bottom: calc(var(--baseline)*0.5); - font-weight: 500; - + margin-top: calc(var(--baseline)*1 + 4px); + padding-bottom: calc(var(--baseline)*0.25); } - h5{ - font-family: var(--font-sans); - font-weight: normal; - font-size: 0.7rem; - line-height: calc(var(--baseline)*1); - position: relative; - margin-top: calc(var(--baseline)*0.75); - margin-bottom: calc(var(--baseline)*0.25); - - } - } diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 3b7e71a..6ec784f 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -1,8 +1,9 @@ :root{ --font: 'Edgar', sans-serif; - --font-title: "Heliotrope 3 Caps", sans-serif; - --font-sans: "Heliotrope 4", sans-serif; - --font-size: 12px; + --font-title: 'Allium Rounded', sans-serif; + --font-sans: 'Allium Rounded', sans-serif; + --font-size: 11px; + --fs-num: 14px; --baseline: 16px; --indent: 26px; diff --git a/css/style.css b/css/style.css index f500709..162807a 100644 --- a/css/style.css +++ b/css/style.css @@ -1,9 +1,10 @@ @charset "UTF-8"; :root { --font: "Edgar", sans-serif; - --font-title: "Heliotrope 3 Caps", sans-serif; - --font-sans: "Heliotrope 4", sans-serif; - --font-size: 12px; + --font-title: "Allium Rounded", sans-serif; + --font-sans: "Allium Rounded", sans-serif; + --font-size: 11px; + --fs-num: 14px; --baseline: 16px; --indent: 26px; } @@ -31,30 +32,32 @@ body { @media print { @page { size: 134mm 205mm; - margin-top: 67px; - margin-bottom: 10mm; - margin-left: 10mm; - margin-right: 10mm; - bleed: 6mm; - marks: crop; + margin-top: 36px; + margin-bottom: 20mm; } @page :left { - margin-left: 12mm; - margin-right: 32mm; - @top-left { + margin-left: 22mm; + margin-right: 22mm; + @bottom-left { content: counter(page); + font-family: var(--font-title); + font-weight: 500; + font-size: var(--fs-num); } } @page :right { margin-left: 32mm; - margin-right: 12mm; - @top-right { + margin-right: 22mm; + @bottom-right { content: counter(page); + font-family: var(--font-title); + font-weight: 500; + font-size: var(--fs-num); } - @top-left { + @bottom-left { content: "Höchstpersönlichkeit"; - font-variant-caps: small-caps; - letter-spacing: 0.05em; + font-family: var(--font-title); + font-weight: normal; } } @page :first { @@ -224,21 +227,8 @@ ol[type="1"] + p { } blockquote { - padding-left: var(--indent); - margin-top: calc(var(--baseline) * 1); - margin-bottom: calc(var(--baseline) * 1); + padding-left: calc(var(--indent) * 2); } -blockquote p { - font-style: italic; -} -blockquote p em { - font-style: normal; -} -blockquote u { - font-variant: small-caps; - text-decoration: none; -} - blockquote + ol + p { text-indent: 0px; } @@ -316,73 +306,76 @@ blockquote + ol + p { } #section__content h1 { font-family: var(--font-title); - font-weight: normal; - font-size: 1.5rem; + font-size: 1.6rem; + font-weight: 500; + text-transform: uppercase; line-height: calc(var(--baseline) * 1.4); text-align: center; position: relative; - margin-top: calc(var(--baseline) * 3 - 3px); + margin-top: calc(var(--baseline) * 2 - 3px); padding-bottom: calc(var(--baseline) * 1); padding-left: 1ch; padding-right: 1ch; } #section__content h1::before { display: block; - font-size: 1rem; + font-size: var(--fs-num); } #section__content h1:first-of-type { margin-top: 3px !important; } #section__content h2 { font-family: var(--font-title); - font-weight: normal; - font-size: 1.3rem; + font-size: 1.1rem; + font-weight: 500; + text-transform: uppercase; line-height: calc(var(--baseline) * 1.2); - text-align: right; - padding-left: 3ch; + text-align: center; position: relative; - margin-top: calc(var(--baseline) * 1 + 9px); + margin-top: calc(var(--baseline) * 1 + 6px); padding-bottom: calc(var(--baseline) * 1); + padding-left: 2ch; + padding-right: 2ch; } #section__content h2::before { - position: absolute; - left: 0; + display: block; + font-size: var(--fs-num); } #section__content h3 { - font-family: var(--font-sans); - font-weight: normal; + font-family: var(--font-title); + font-weight: 500; font-size: 1rem; line-height: calc(var(--baseline) * 1); - text-align: right; - padding-left: 3ch; + padding-left: var(--indent); + padding-right: calc(var(--indent) * 2); position: relative; - margin-top: calc(var(--baseline) * 1 + 9px); - padding-bottom: calc(var(--baseline) * 1); + margin-top: calc(var(--baseline) * 1 + 4px); + padding-bottom: calc(var(--baseline) * 0.75); } #section__content h3::before { position: absolute; left: 0; } #section__content h4 { - font-family: var(--font-sans); - font-weight: normal; - font-size: 0.8rem; - line-height: calc(var(--baseline) * 1); - text-align: right; - padding-left: 3ch; - position: relative; - margin-top: calc(var(--baseline) * 0.5); - margin-bottom: calc(var(--baseline) * 0.5); + font-family: var(--font-title); font-weight: 500; + font-size: 0.9rem; + line-height: calc(var(--baseline) * 1); + padding-left: calc(var(--indent) * 1); + padding-right: calc(var(--indent) * 2); + position: relative; + margin-top: calc(var(--baseline) * 1 + 4px); + padding-bottom: calc(var(--baseline) * 0.75); } #section__content h5 { - font-family: var(--font-sans); - font-weight: normal; - font-size: 0.7rem; + font-family: var(--font-title); + font-weight: 500; + font-size: 0.8rem; line-height: calc(var(--baseline) * 1); + padding-left: calc(var(--indent) * 1); position: relative; - margin-top: calc(var(--baseline) * 0.75); - margin-bottom: calc(var(--baseline) * 0.25); + margin-top: calc(var(--baseline) * 1 + 4px); + padding-bottom: calc(var(--baseline) * 0.25); } [data-id=section__content][data-split-from] > :first-child { @@ -392,6 +385,7 @@ blockquote + ol + p { @page { @footnote { float: bottom; + footnote-policy: auto; } } .pagedjs_footnote_content { @@ -400,11 +394,11 @@ blockquote + ol + p { .inline-note { float: footnote; + footnote-policy: auto; font-size: 9px; - line-height: calc(var(--baseline) * 0.9); + line-height: calc(var(--baseline) * 0.8); padding-left: var(--indent); position: relative; - font-weight: 100; } .inline-note::marker { display: none; diff --git a/css/style.css.map b/css/style.css.map index fc0a9af..8457b4a 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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 7aa95e6..ffd0e07 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -1,5 +1,5 @@ { - "plugins": ["baseline","grid","marginBox","imposition","spread","previewPage","reloadInPlace","fullPage","inlineNotes"], + "plugins": ["baseline","grid","marginBox","imposition","spread","previewPage","reloadInPlace","fullPage"], "pluginsParameters":{}, "css": [ "css/style.css" diff --git a/index.html b/index.html index fafa53c..27cb73a 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,8 @@ + + From 8161aae996206099784dfb14fb592deea032c982 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Mon, 19 Jan 2026 23:37:32 +0100 Subject: [PATCH 2/9] gradation --- css/modules/_text.scss | 93 ++++++++++++++++++++++++---------------- css/modules/_titles.scss | 20 +++++---- css/style.css | 77 +++++++++++++++++++-------------- css/style.css.map | 2 +- 4 files changed, 113 insertions(+), 79 deletions(-) diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 1dea3e6..23a2628 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -26,40 +26,8 @@ p, li{ word-spacing: -0.004em; } - + -ol[type="1"]{ - list-style-type: none; - position: relative; - break-after: avoid; - - position: absolute; - left: calc(var(--indent)*-3); - &::before{ - content: attr(start); - font-family: var(--font-sans); - // font-weight: 200; - font-size: 0.6rem; - color: #999; - display: block; - padding: 0px 2px; - border: 1px solid #efefef; - - min-width: 1.5ch; - display: flex; - justify-content: center; - } - - - -} - -.pagedjs_left_page{ - ol[type="1"] { - left: inherit; - right: calc(var(--indent)*-3); - } -} p + p, ol[type="1"] + p{ @@ -69,10 +37,12 @@ ol[type="1"] + p{ blockquote{ - padding-left: calc(var(--indent)*2); - // color: red; - // margin-top: calc(var(--baseline)*1); - // margin-bottom: calc(var(--baseline)*1); + + padding-left: calc(var(--indent)*1); + font-size: 9px; + line-height: calc(var(--baseline)*0.75); + margin-top: calc(var(--baseline)*0.5); + margin-bottom: calc(var(--baseline)*0.5); p{ // font-family: "Edgar"; @@ -106,4 +76,53 @@ blockquote + ol + p{ text-indent: 0px; } justify-content: center; } +} + + + + +ol[type="1"]{ + list-style-type: none; + position: relative; + break-after: avoid; + + position: absolute; + left: calc(var(--indent)*-1.5 - 0.5ch); + &::before{ + content: attr(start); + font-family: var(--font-title); + font-weight: 500; + font-size: 0.6rem; + color: #999; + display: block; + + padding: 0px 2px; + // border: 1px solid #efefef; + min-width: 20px; + justify-content: center; + } + + + +} +.pagedjs_page_content::before{ + --color: #efefef; + --size: 20px; + content: ""; + display: block; + height: 100%; + width: var(--size); + // border: 1px solid var(--color); + // border-right: 1px solid var(--color); + position: absolute; + left: calc(var(--indent)*-1 - var(--size)); + + + + background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; + background-size: 100% var(--baseline); + background-repeat: repeat-y; + + + } \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 6b88118..ac14645 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -28,7 +28,7 @@ h1{ font-family: var(--font-title); - font-size: 1.6rem; + font-size: 1.4rem; font-weight: 500; text-transform: uppercase; line-height: calc(var(--baseline)*1.4); @@ -57,15 +57,16 @@ font-weight: 500; text-transform: uppercase; line-height: calc(var(--baseline)*1.2); - text-align: center; + // text-align: center; position: relative; margin-top: calc(var(--baseline)*1 + 6px); padding-bottom: calc(var(--baseline)*1); - padding-left: 2ch; + // padding-left: 2ch; padding-right: 2ch; &::before{ - display: block; - font-size: var(--fs-num); + display: block; + font-size: var(--fs-num); + padding-left: var(--indent); } } @@ -77,14 +78,17 @@ font-size: 1rem; line-height: calc(var(--baseline)*1); - padding-left: var(--indent); + // padding-left: var(--indent); padding-right: calc(var(--indent)*2); position: relative; margin-top: calc(var(--baseline)*1 + 4px); padding-bottom: calc(var(--baseline)*0.75); &::before{ - position: absolute; - left: 0; + display: block; + font-size: var(--fs-num); + padding-left: var(--indent); + // position: absolute; + // left: 0; } } diff --git a/css/style.css b/css/style.css index 162807a..551bab7 100644 --- a/css/style.css +++ b/css/style.css @@ -195,39 +195,17 @@ p, li { word-spacing: -0.004em; } -ol[type="1"] { - list-style-type: none; - position: relative; - -moz-column-break-after: avoid; - break-after: avoid; - position: absolute; - left: calc(var(--indent) * -3); -} -ol[type="1"]::before { - content: attr(start); - font-family: var(--font-sans); - font-size: 0.6rem; - color: #999; - display: block; - padding: 0px 2px; - border: 1px solid #efefef; - min-width: 1.5ch; - display: flex; - justify-content: center; -} - -.pagedjs_left_page ol[type="1"] { - left: inherit; - right: calc(var(--indent) * -3); -} - p + p, ol[type="1"] + p { text-indent: calc(var(--indent) * 0.5); } blockquote { - padding-left: calc(var(--indent) * 2); + padding-left: calc(var(--indent) * 1); + font-size: 9px; + line-height: calc(var(--baseline) * 0.75); + margin-top: calc(var(--baseline) * 0.5); + margin-bottom: calc(var(--baseline) * 0.5); } blockquote + ol + p { text-indent: 0px; @@ -244,6 +222,40 @@ blockquote + ol + p { justify-content: center; } +ol[type="1"] { + list-style-type: none; + position: relative; + -moz-column-break-after: avoid; + break-after: avoid; + position: absolute; + left: calc(var(--indent) * -1.5 - 0.5ch); +} +ol[type="1"]::before { + content: attr(start); + font-family: var(--font-title); + font-weight: 500; + font-size: 0.6rem; + color: #999; + display: block; + padding: 0px 2px; + min-width: 20px; + justify-content: center; +} + +.pagedjs_page_content::before { + --color: #efefef; + --size: 20px; + content: ""; + display: block; + height: 100%; + width: var(--size); + position: absolute; + left: calc(var(--indent) * -1 - var(--size)); + background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; + background-size: 100% var(--baseline); + background-repeat: repeat-y; +} + #section__content { counter-reset: h1; } @@ -306,7 +318,7 @@ blockquote + ol + p { } #section__content h1 { font-family: var(--font-title); - font-size: 1.6rem; + font-size: 1.4rem; font-weight: 500; text-transform: uppercase; line-height: calc(var(--baseline) * 1.4); @@ -330,31 +342,30 @@ blockquote + ol + p { font-weight: 500; text-transform: uppercase; line-height: calc(var(--baseline) * 1.2); - text-align: center; position: relative; margin-top: calc(var(--baseline) * 1 + 6px); padding-bottom: calc(var(--baseline) * 1); - padding-left: 2ch; padding-right: 2ch; } #section__content h2::before { display: block; font-size: var(--fs-num); + padding-left: var(--indent); } #section__content 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); position: relative; margin-top: calc(var(--baseline) * 1 + 4px); padding-bottom: calc(var(--baseline) * 0.75); } #section__content h3::before { - position: absolute; - left: 0; + display: block; + font-size: var(--fs-num); + padding-left: var(--indent); } #section__content h4 { font-family: var(--font-title); diff --git a/css/style.css.map b/css/style.css.map index 8457b4a..d6660c9 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file From 7239fa838b58aafc86e8b2654c5c61638ea13b30 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 13:32:39 +0100 Subject: [PATCH 3/9] layout 2 --- css/modules/_footnotes.scss | 8 +++++ css/modules/_text.scss | 55 ++++++++++++++++++------------ css/style.css | 67 +++++++++++++++++++++++++++---------- css/style.css.map | 2 +- 4 files changed, 93 insertions(+), 39 deletions(-) diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss index e658dee..84e1e3d 100644 --- a/css/modules/_footnotes.scss +++ b/css/modules/_footnotes.scss @@ -38,3 +38,11 @@ [data-footnote-call]{ font-size: 9px; } + + +.footnote-ref{ + font-family: var(--font-title); + line-height: 0; + font-size: 9px; + font-weight: 500; +} \ No newline at end of file diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 23a2628..9cbe4e5 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -44,18 +44,6 @@ blockquote{ margin-top: calc(var(--baseline)*0.5); margin-bottom: calc(var(--baseline)*0.5); - p{ - // font-family: "Edgar"; - // em{ - // font-style: normal; - // } - } - - - // u{ - // font-variant: small-caps; - // text-decoration: none; - // } } @@ -79,8 +67,38 @@ blockquote + ol + p{ text-indent: 0px; } } - +ol[type="1"]{ + list-style-type: none; + position: relative; + break-after: avoid; + position: absolute; + left: calc(var(--indent)*-1.5 - 0.5ch); + + &::before{ + content: attr(start); + // font-family: var(--font-title); + // font-weight: 500; + font-size: 0.6rem; + color: #999; + + display: block; + height: var(--baseline); + + padding-right: 1ch; + border-right: 1px solid #efefef; + } + + + +} + + + +// GRADATIONS + + +/* ol[type="1"]{ list-style-type: none; position: relative; @@ -112,17 +130,12 @@ ol[type="1"]{ display: block; height: 100%; width: var(--size); - // border: 1px solid var(--color); - // border-right: 1px solid var(--color); position: absolute; - left: calc(var(--indent)*-1 - var(--size)); - - - + left: calc(var(--indent)*-1 - var(--size)); background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; background-size: 100% var(--baseline); background-repeat: repeat-y; - +} -} \ No newline at end of file +*/ \ No newline at end of file diff --git a/css/style.css b/css/style.css index 551bab7..37e7fd0 100644 --- a/css/style.css +++ b/css/style.css @@ -207,6 +207,7 @@ blockquote { margin-top: calc(var(--baseline) * 0.5); margin-bottom: calc(var(--baseline) * 0.5); } + blockquote + ol + p { text-indent: 0px; } @@ -232,30 +233,55 @@ ol[type="1"] { } ol[type="1"]::before { content: attr(start); - font-family: var(--font-title); - font-weight: 500; font-size: 0.6rem; color: #999; display: block; - padding: 0px 2px; - min-width: 20px; - justify-content: center; + height: var(--baseline); + padding-right: 1ch; + border-right: 1px solid #efefef; } -.pagedjs_page_content::before { - --color: #efefef; - --size: 20px; - content: ""; - display: block; - height: 100%; - width: var(--size); - position: absolute; - left: calc(var(--indent) * -1 - var(--size)); - background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; - background-size: 100% var(--baseline); - background-repeat: repeat-y; +/* +ol[type="1"]{ + list-style-type: none; + position: relative; + break-after: avoid; + + position: absolute; + left: calc(var(--indent)*-1.5 - 0.5ch); + &::before{ + content: attr(start); + font-family: var(--font-title); + font-weight: 500; + font-size: 0.6rem; + color: #999; + display: block; + + padding: 0px 2px; + // border: 1px solid #efefef; + min-width: 20px; + justify-content: center; + } + + + +} +.pagedjs_page_content::before{ + --color: #efefef; + --size: 20px; + content: ""; + display: block; + height: 100%; + width: var(--size); + position: absolute; + left: calc(var(--indent)*-1 - var(--size)); + background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; + background-size: 100% var(--baseline); + background-repeat: repeat-y; + } +*/ #section__content { counter-reset: h1; } @@ -426,6 +452,13 @@ ol[type="1"]::before { font-size: 9px; } +.footnote-ref { + font-family: var(--font-title); + line-height: 0; + font-size: 9px; + font-weight: 500; +} + #section__list-of-abbr { display: none; color: red; diff --git a/css/style.css.map b/css/style.css.map index d6660c9..0eddfb0 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file From fb365c2f05261db56ebe2f1fb9432bef827f0a76 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 19:05:58 +0100 Subject: [PATCH 4/9] add these style --- css/modules/_layout.scss | 18 +++++++--- css/modules/_text.scss | 21 +++++------ css/modules/_titles-counters.scss | 8 +++++ css/modules/_titles.scss | 26 +++++++++++++- css/style.css | 60 ++++++++++++++++++++++++------- css/style.css.map | 2 +- index.html | 8 +++++ 7 files changed, 113 insertions(+), 30 deletions(-) diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index edef233..238d1af 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -5,8 +5,8 @@ margin-top: 36px; margin-bottom: 20mm; - // bleed: 6mm; - // marks: crop; + bleed: 6mm; + marks: crop; } @page:left { margin-left: 22mm; @@ -32,10 +32,20 @@ font-weight: 500; font-size: var(--fs-num); } - @bottom-left { + @right-top { content: "Höchstpersönlichkeit"; - font-family: var(--font-title); + 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: 18mm; + padding-left: 5px; } } diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 9cbe4e5..f5a22df 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -47,22 +47,19 @@ blockquote{ } -blockquote + ol + p{ text-indent: 0px; } +.these + ol + p, +blockquote + ol + p{ + text-indent: 0px; +} .these{ - &::before{ - content: "---" - } - &::after{ - content: "---"; - } - &::before, &::after{ - display: flex; - // width: 3ch; - justify-content: center; - } + + font-family: var(--font-title); + // color: red; + + margin-bottom: calc(var(--baseline)*1); } diff --git a/css/modules/_titles-counters.scss b/css/modules/_titles-counters.scss index efd6adc..023324b 100644 --- a/css/modules/_titles-counters.scss +++ b/css/modules/_titles-counters.scss @@ -47,4 +47,12 @@ h5::before{ content: counter(h5, lower-alpha) counter(h5, lower-alpha) ". "; } + + h6{ + counter-increment: h6 1; + } + + h6::before{ + content: "(" counter(h6) "). "; + } } \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index ac14645..430080f 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -2,7 +2,7 @@ #section__content{ - h1, h2, h3 { + h1, h2, h3 , h4{ break-inside: avoid; break-after: avoid; @@ -12,6 +12,19 @@ content: ''; display: block; height: calc(var(--baseline)*3); + } + } + + h5, h6 { + break-inside: avoid; + break-after: avoid; + + /* hack for avoiding break-after */ + margin-bottom: calc(var(--baseline)*-2); + &::after{ + content: ''; + display: block; + height: calc(var(--baseline)*2); // background-color: rgba(255, 255, 0, 0.595); } } @@ -102,6 +115,8 @@ 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; } @@ -117,6 +132,15 @@ padding-bottom: calc(var(--baseline)*0.25); } + 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; + } + diff --git a/css/style.css b/css/style.css index 37e7fd0..751cc48 100644 --- a/css/style.css +++ b/css/style.css @@ -34,6 +34,8 @@ body { size: 134mm 205mm; margin-top: 36px; margin-bottom: 20mm; + bleed: 6mm; + marks: crop; } @page :left { margin-left: 22mm; @@ -54,10 +56,19 @@ body { font-weight: 500; font-size: var(--fs-num); } - @bottom-left { + @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); + text-align: left; + position: relative; + left: 18mm; + padding-left: 5px; } } @page :first { @@ -208,19 +219,14 @@ blockquote { margin-bottom: calc(var(--baseline) * 0.5); } +.these + ol + p, blockquote + ol + p { text-indent: 0px; } -.these::before { - content: "---"; -} -.these::after { - content: "---"; -} -.these::before, .these::after { - display: flex; - justify-content: center; +.these { + font-family: var(--font-title); + margin-bottom: calc(var(--baseline) * 1); } ol[type="1"] { @@ -320,8 +326,14 @@ ol[type="1"]{ #section__content h5::before { content: counter(h5, lower-alpha) counter(h5, lower-alpha) ". "; } +#section__content h6 { + counter-increment: h6 1; +} +#section__content h6::before { + content: "(" counter(h6) "). "; +} -#section__content h1, #section__content h2, #section__content h3 { +#section__content h1, #section__content h2, #section__content h3, #section__content h4 { -moz-column-break-inside: avoid; break-inside: avoid; -moz-column-break-after: avoid; @@ -329,11 +341,24 @@ ol[type="1"]{ /* 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 h1::after, #section__content h2::after, #section__content h3::after, #section__content h4::after { content: ""; display: block; height: calc(var(--baseline) * 3); } +#section__content h5, #section__content h6 { + -moz-column-break-inside: avoid; + break-inside: avoid; + -moz-column-break-after: avoid; + break-after: avoid; + /* hack for avoiding break-after */ + margin-bottom: calc(var(--baseline) * -2); +} +#section__content h5::after, #section__content h6::after { + content: ""; + display: block; + height: calc(var(--baseline) * 2); +} #section__content h1 + ol + p, #section__content h2 + ol + p, #section__content h3 + ol + p, @@ -403,6 +428,9 @@ ol[type="1"]{ 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; } #section__content h5 { font-family: var(--font-title); @@ -414,6 +442,14 @@ ol[type="1"]{ 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; +} [data-id=section__content][data-split-from] > :first-child { margin-top: 0; diff --git a/css/style.css.map b/css/style.css.map index 0eddfb0..c04a8f2 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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 27cb73a..7812dfb 100644 --- a/index.html +++ b/index.html @@ -3598,6 +3598,7 @@ Bürgerlichen Gesetzbuch
+

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

+
@@ -7974,6 +7976,7 @@ Geschichte.

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

+
@@ -11357,6 +11361,7 @@ schweizerische Weg und deutsche Rechtsimplantate
+

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

+
@@ -13174,6 +13180,7 @@ role="doc-noteref">1552

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

Zusammenfassung in Thesen

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

+

Quellen- und Literaturverzeichnis

Adomeit, Klaus, Heteronome From 35c6271137b5165cebd378e33ca1d95760b9f56a Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 21:12:05 +0100 Subject: [PATCH 5/9] sectionedFootnotes --- css/modules/_footnotes.scss | 108 +++++++++++++++++++--------- css/modules/_layout.scss | 10 +-- css/modules/_text.scss | 10 +-- css/modules/_titles.scss | 4 +- css/modules/_var.scss | 1 + css/style.css | 81 +++++++++++---------- css/style.css.map | 2 +- csspageweaver/manifest.json | 3 +- js/custom-handler-example-1.js | 21 ------ js/custom-handler-example-2.js | 16 ----- js/sectionedFootnotes.js | 124 +++++++++++++++++++++++++++++++++ lua/add-style-as-class.lua | 11 --- lua/blockquote.lua | 6 -- 13 files changed, 251 insertions(+), 146 deletions(-) delete mode 100644 js/custom-handler-example-1.js delete mode 100644 js/custom-handler-example-2.js create mode 100644 js/sectionedFootnotes.js delete mode 100644 lua/add-style-as-class.lua delete mode 100644 lua/blockquote.lua diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss index 84e1e3d..964aaf5 100644 --- a/css/modules/_footnotes.scss +++ b/css/modules/_footnotes.scss @@ -1,48 +1,88 @@ -@page { - @footnote { - float: bottom; - footnote-policy: auto; - } - } +// @page { +// @footnote { +// float: bottom; +// footnote-policy: auto; +// } +// } - .pagedjs_footnote_content{ - padding-top: calc(var(--baseline)*1); - } +// .pagedjs_footnote_content{ +// padding-top: calc(var(--baseline)*1); +// } -.inline-note { - float: footnote; - footnote-policy: auto; - font-size: 9px; - line-height: calc(var(--baseline)*0.8); - padding-left: var(--indent); - position: relative; - // font-weight: 100; +// .inline-note { +// float: footnote; +// footnote-policy: auto; +// font-size: 9px; +// line-height: calc(var(--baseline)*0.8); +// padding-left: var(--indent); +// position: relative; +// // font-weight: 100; - &::marker{ - display: none; - content: ""; - } +// &::marker{ +// display: none; +// content: ""; +// } -} +// } -[data-counter-note]{ -&::before{ - content: attr(data-counter-note) "."; - position: absolute; - // left: calc(var(--indent)*-1); - left: 0px; - } -} +// [data-counter-note]{ +// &::before{ +// content: attr(data-counter-note) "."; +// position: absolute; +// left: 0px; +// } +// } -[data-footnote-call]{ - font-size: 9px; -} +// [data-footnote-call]{ +// font-size: 9px; +// } .footnote-ref{ font-family: var(--font-title); line-height: 0; - font-size: 9px; + font-size: var(--fs-small); font-weight: 500; +} + + +#footnotes{ + break-before: right; + + .title-part{ + font-family: var(--font-title); + font-size: 1.1rem; + font-weight: 500; + line-height: calc(var(--baseline)*1.2); + margin-top: calc(var(--baseline)*2); + padding-bottom: calc(var(--baseline)*1); + padding-right: 2ch; + padding-left: 2ch; + text-align: center; + text-wrap: balance; + &::before{ + content: attr(data-part-number) ". " + } + } + + li{ + font-size: var(--fs-small); + + // &::marker{ + // font-family: var(--font-title); + // font-weight: 500; + // } + } + + .footnote-back{ + display: none; + } + + + +} + +[data-id="footnotes"][data-split-from] > :first-child { + margin-top: 0; } \ No newline at end of file diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 238d1af..ac01000 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -9,8 +9,8 @@ marks: crop; } @page:left { - margin-left: 22mm; - margin-right: 22mm; + margin-left: 18mm; + margin-right: 26mm; @bottom-left { content: counter(page); font-family: var(--font-title); @@ -24,8 +24,8 @@ // } } @page:right { - margin-left: 32mm; - margin-right: 22mm; + margin-left: 26mm; + margin-right: 18mm; @bottom-right { content: counter(page); font-family: var(--font-title); @@ -44,7 +44,7 @@ transform: rotate(90deg); text-align: left; position: relative; - left: 18mm; + left: 14mm; padding-left: 5px; } diff --git a/css/modules/_text.scss b/css/modules/_text.scss index f5a22df..3650501 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -39,8 +39,8 @@ ol[type="1"] + p{ blockquote{ padding-left: calc(var(--indent)*1); - font-size: 9px; - line-height: calc(var(--baseline)*0.75); + font-size: var(--fs-small); + // line-height: calc(var(--baseline)*0.75); margin-top: calc(var(--baseline)*0.5); margin-bottom: calc(var(--baseline)*0.5); @@ -55,12 +55,8 @@ blockquote + ol + p{ .these{ - - font-family: var(--font-title); - // color: red; - + font-family: var(--font-title); margin-bottom: calc(var(--baseline)*1); - } diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 430080f..82d3228 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -5,6 +5,7 @@ h1, h2, h3 , h4{ break-inside: avoid; break-after: avoid; + text-wrap: balance; /* hack for avoiding break-after */ margin-bottom: calc(var(--baseline)*-3); @@ -18,6 +19,7 @@ h5, h6 { break-inside: avoid; break-after: avoid; + text-wrap: balance; /* hack for avoiding break-after */ margin-bottom: calc(var(--baseline)*-2); @@ -70,11 +72,9 @@ font-weight: 500; text-transform: uppercase; line-height: calc(var(--baseline)*1.2); - // text-align: center; position: relative; margin-top: calc(var(--baseline)*1 + 6px); padding-bottom: calc(var(--baseline)*1); - // padding-left: 2ch; padding-right: 2ch; &::before{ display: block; diff --git a/css/modules/_var.scss b/css/modules/_var.scss index 6ec784f..bd1e219 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -3,6 +3,7 @@ --font-title: 'Allium Rounded', sans-serif; --font-sans: 'Allium Rounded', sans-serif; --font-size: 11px; + --fs-small: 9.5px; --fs-num: 14px; --baseline: 16px; diff --git a/css/style.css b/css/style.css index 751cc48..f1129a9 100644 --- a/css/style.css +++ b/css/style.css @@ -4,6 +4,7 @@ --font-title: "Allium Rounded", sans-serif; --font-sans: "Allium Rounded", sans-serif; --font-size: 11px; + --fs-small: 9.5px; --fs-num: 14px; --baseline: 16px; --indent: 26px; @@ -38,8 +39,8 @@ body { marks: crop; } @page :left { - margin-left: 22mm; - margin-right: 22mm; + margin-left: 18mm; + margin-right: 26mm; @bottom-left { content: counter(page); font-family: var(--font-title); @@ -48,8 +49,8 @@ body { } } @page :right { - margin-left: 32mm; - margin-right: 22mm; + margin-left: 26mm; + margin-right: 18mm; @bottom-right { content: counter(page); font-family: var(--font-title); @@ -67,7 +68,7 @@ body { transform: rotate(90deg); text-align: left; position: relative; - left: 18mm; + left: 14mm; padding-left: 5px; } } @@ -213,8 +214,7 @@ ol[type="1"] + p { blockquote { padding-left: calc(var(--indent) * 1); - font-size: 9px; - line-height: calc(var(--baseline) * 0.75); + font-size: var(--fs-small); margin-top: calc(var(--baseline) * 0.5); margin-bottom: calc(var(--baseline) * 0.5); } @@ -338,6 +338,7 @@ ol[type="1"]{ break-inside: avoid; -moz-column-break-after: avoid; break-after: avoid; + text-wrap: balance; /* hack for avoiding break-after */ margin-bottom: calc(var(--baseline) * -3); } @@ -351,6 +352,7 @@ ol[type="1"]{ break-inside: avoid; -moz-column-break-after: avoid; break-after: avoid; + text-wrap: balance; /* hack for avoiding break-after */ margin-bottom: calc(var(--baseline) * -2); } @@ -455,46 +457,43 @@ ol[type="1"]{ margin-top: 0; } -@page { - @footnote { - float: bottom; - footnote-policy: auto; - } -} -.pagedjs_footnote_content { - padding-top: calc(var(--baseline) * 1); -} - -.inline-note { - float: footnote; - footnote-policy: auto; - font-size: 9px; - line-height: calc(var(--baseline) * 0.8); - padding-left: var(--indent); - position: relative; -} -.inline-note::marker { - display: none; - content: ""; -} - -[data-counter-note]::before { - content: attr(data-counter-note) "."; - position: absolute; - left: 0px; -} - -[data-footnote-call] { - font-size: 9px; -} - .footnote-ref { font-family: var(--font-title); line-height: 0; - font-size: 9px; + font-size: var(--fs-small); font-weight: 500; } +#footnotes { + -moz-column-break-before: right; + break-before: right; +} +#footnotes .title-part { + font-family: var(--font-title); + font-size: 1.1rem; + font-weight: 500; + line-height: calc(var(--baseline) * 1.2); + margin-top: calc(var(--baseline) * 2); + padding-bottom: calc(var(--baseline) * 1); + padding-right: 2ch; + padding-left: 2ch; + text-align: center; + text-wrap: balance; +} +#footnotes .title-part::before { + content: attr(data-part-number) ". "; +} +#footnotes li { + font-size: var(--fs-small); +} +#footnotes .footnote-back { + display: none; +} + +[data-id=footnotes][data-split-from] > :first-child { + margin-top: 0; +} + #section__list-of-abbr { display: none; color: red; diff --git a/css/style.css.map b/css/style.css.map index c04a8f2..9626662 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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 ffd0e07..e5a0aed 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -11,8 +11,7 @@ } }, "hook": [ - "/js/custom-handler-example-1.js", - "/js/custom-handler-example-2.js" + "/js/sectionedFootnotes.js" ] } diff --git a/js/custom-handler-example-1.js b/js/custom-handler-example-1.js deleted file mode 100644 index 2b01603..0000000 --- a/js/custom-handler-example-1.js +++ /dev/null @@ -1,21 +0,0 @@ -import { Handler } from '/csspageweaver/lib/paged.esm.js'; - -export default class myCustomHandler1 extends Handler { - constructor(chunker, polisher, caller) { - super(chunker, polisher, caller); - } - - beforeParsed(content){ - // let h2 = content.querySelectorAll('h2'); - // h2.forEach( h2 => { - // h2.insertAdjacentHTML("afterbegin", '🍄'); - // }); - } - - afterParsed(parsed) { - console.info("%c [CSS Page Weaver] Example custom handler 1 with afterParsed hook (see js/custom-handler-example-1.js", 'color: green;'); - } - -} - - diff --git a/js/custom-handler-example-2.js b/js/custom-handler-example-2.js deleted file mode 100644 index 5111051..0000000 --- a/js/custom-handler-example-2.js +++ /dev/null @@ -1,16 +0,0 @@ -import { Handler } from '/csspageweaver/lib/paged.esm.js'; - - -export default class myCustomHandler2 extends Handler { - constructor(chunker, polisher, caller) { - super(chunker, polisher, caller); - } - - - afterPageLayout(pageElement, page, breakToken) { - if(pageElement.id == "page-1"){ - console.info("%c [CSS Page Weaver] Example custom handler 2 with afterPageLayout hook (see js/custom-handler-example-2.js", 'color: green;') - } - } -} - diff --git a/js/sectionedFootnotes.js b/js/sectionedFootnotes.js new file mode 100644 index 0000000..53faae0 --- /dev/null +++ b/js/sectionedFootnotes.js @@ -0,0 +1,124 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class SectionedFootnotes extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + beforeParsed(content){ + + const sectionContent = content.querySelector('#section__content'); + const footnotesSection = content.querySelector('#footnotes'); + + if (!sectionContent || !footnotesSection) { + console.warn("Section content ou footnotes non trouvé"); + return; + } + + const originalOl = footnotesSection.querySelector('ol'); + if (!originalOl) { + console.warn("Liste de footnotes non trouvée"); + return; + } + + const allH1s = sectionContent.querySelectorAll('h1'); + + const noteToPartMap = new Map(); + + allH1s.forEach((h1, partIndex) => { + // Trouver le prochain h1 ou la fin de la section + const nextH1 = allH1s[partIndex + 1]; + + // Récupérer tous les éléments entre ce h1 et le suivant + let current = h1.nextElementSibling; + while (current && current !== nextH1) { + // Chercher les footnote-ref dans cet élément + const refs = current.querySelectorAll('.footnote-ref'); + refs.forEach(ref => { + const href = ref.getAttribute('href'); + if (href && href.startsWith('#fn')) { + const noteNum = href.replace('#fn', ''); + noteToPartMap.set(noteNum, partIndex); + } + }); + if (current.classList && current.classList.contains('footnote-ref')) { + const href = current.getAttribute('href'); + if (href && href.startsWith('#fn')) { + const noteNum = href.replace('#fn', ''); + noteToPartMap.set(noteNum, partIndex); + } + } + current = current.nextElementSibling; + } + }); + + const notesByPart = new Map(); + const allNotes = originalOl.querySelectorAll('li[id^="fn"]'); + + allNotes.forEach(note => { + const noteId = note.getAttribute('id'); + const noteNum = noteId.replace('fn', ''); + const partIndex = noteToPartMap.get(noteNum); + + if (partIndex !== undefined) { + if (!notesByPart.has(partIndex)) { + notesByPart.set(partIndex, []); + } + notesByPart.get(partIndex).push({ + num: parseInt(noteNum), + element: note + }); + } + }); + + const sortedParts = Array.from(notesByPart.keys()).sort((a, b) => a - b); + + // Vider la section footnotes (garder le hr s'il existe) + const hr = footnotesSection.querySelector('hr'); + footnotesSection.innerHTML = ''; + if (hr) { + footnotesSection.appendChild(hr); + } + + // Add title section + const mainTitle = document.createElement('h1'); + mainTitle.textContent = 'Notizen'; + footnotesSection.appendChild(mainTitle); + + sortedParts.forEach(partIndex => { + const h1 = allH1s[partIndex]; + const notes = notesByPart.get(partIndex); + + notes.sort((a, b) => a.num - b.num); + + if (notes.length > 0) { + // Upper-alpha counter + const titlePart = document.createElement('h2'); + titlePart.className = 'title-part'; + const letter = String.fromCharCode(65 + partIndex); // 65 = 'A' + titlePart.setAttribute('data-part-number', letter); + titlePart.textContent = h1.textContent.trim(); + footnotesSection.appendChild(titlePart); + + // New ol with new start + const newOl = document.createElement('ol'); + const firstNoteNum = notes[0].num; + newOl.setAttribute('start', firstNoteNum); + + notes.forEach(noteData => { + newOl.appendChild(noteData.element.cloneNode(true)); + }); + + footnotesSection.appendChild(newOl); + } + }); + + sectionContent.parentNode.insertBefore(footnotesSection, sectionContent.nextSibling); + + } + + + +} + + diff --git a/lua/add-style-as-class.lua b/lua/add-style-as-class.lua deleted file mode 100644 index c277278..0000000 --- a/lua/add-style-as-class.lua +++ /dev/null @@ -1,11 +0,0 @@ -function Span(el) - local cs = el.attributes['custom-style'] - if cs then - local class = cs - :lower() - :gsub("%s+", "-") - :gsub("[^a-z0-9%-]", "") - el.classes:insert("style-" .. class) - end - return el -end diff --git a/lua/blockquote.lua b/lua/blockquote.lua deleted file mode 100644 index ce8c43a..0000000 --- a/lua/blockquote.lua +++ /dev/null @@ -1,6 +0,0 @@ -function Para(el) - if el.style then - io.stderr:write("STYLE: " .. el.style .. "\n") - end - return el -end \ No newline at end of file From 5b80e66e60148c1c9ce6f7359abe7fcf12003b95 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 21:14:47 +0100 Subject: [PATCH 6/9] titles section --- css/modules/_titles.scss | 45 +++++++++++++++++++++------------------- css/style.css | 42 +++++++++++++++++++------------------ css/style.css.map | 2 +- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 82d3228..8a6d6da 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -41,27 +41,8 @@ text-indent: 0; } - h1{ - font-family: var(--font-title); - font-size: 1.4rem; - font-weight: 500; - text-transform: uppercase; - line-height: calc(var(--baseline)*1.4); - text-align: center; - position: relative; - margin-top: calc(var(--baseline)*2 - 3px); - padding-bottom: calc(var(--baseline)*1); - padding-left: 1ch; - padding-right: 1ch; - &::before{ - display: block; - font-size: var(--fs-num); - } - } + - h1:first-of-type{ - margin-top: 3px!important; - } @@ -148,4 +129,26 @@ [data-id="section__content"][data-split-from] > :first-child { margin-top: 0; -} \ No newline at end of file +} + + h1{ + font-family: var(--font-title); + font-size: 1.4rem; + font-weight: 500; + text-transform: uppercase; + line-height: calc(var(--baseline)*1.4); + text-align: center; + position: relative; + margin-top: calc(var(--baseline)*2 - 3px); + padding-bottom: calc(var(--baseline)*1); + padding-left: 1ch; + padding-right: 1ch; + &::before{ + display: block; + font-size: var(--fs-num); + } + } + + section h1:first-of-type{ + margin-top: 3px!important; + } \ No newline at end of file diff --git a/css/style.css b/css/style.css index f1129a9..a3f480c 100644 --- a/css/style.css +++ b/css/style.css @@ -369,26 +369,6 @@ ol[type="1"]{ #section__content h6 + ol + p { text-indent: 0; } -#section__content h1 { - font-family: var(--font-title); - font-size: 1.4rem; - font-weight: 500; - text-transform: uppercase; - line-height: calc(var(--baseline) * 1.4); - text-align: center; - position: relative; - margin-top: calc(var(--baseline) * 2 - 3px); - padding-bottom: calc(var(--baseline) * 1); - padding-left: 1ch; - padding-right: 1ch; -} -#section__content h1::before { - display: block; - font-size: var(--fs-num); -} -#section__content h1:first-of-type { - margin-top: 3px !important; -} #section__content h2 { font-family: var(--font-title); font-size: 1.1rem; @@ -457,6 +437,28 @@ ol[type="1"]{ margin-top: 0; } +h1 { + font-family: var(--font-title); + font-size: 1.4rem; + font-weight: 500; + text-transform: uppercase; + line-height: calc(var(--baseline) * 1.4); + text-align: center; + position: relative; + margin-top: calc(var(--baseline) * 2 - 3px); + padding-bottom: calc(var(--baseline) * 1); + padding-left: 1ch; + padding-right: 1ch; +} +h1::before { + display: block; + font-size: var(--fs-num); +} + +section h1:first-of-type { + margin-top: 3px !important; +} + .footnote-ref { font-family: var(--font-title); line-height: 0; diff --git a/css/style.css.map b/css/style.css.map index 9626662..30ecfe9 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,2BAAA;EACA,0CAAA;EACA,yCAAA;EACA,iBAAA;EACA,iBAAA;EACA,cAAA;EACA,gBAAA;EAEA,cAAA;ADCJ;;AEVA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFaJ;;AEXA;EACI,mBAAA;AFcJ;;AEXA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFYJ;;AG9BA;EACI;IACI,iBAAA;IAEA,gBAAA;IACA,mBAAA;IAEA,UAAA;IACA,WAAA;EH+BN;EG7BE;IACI,iBAAA;IACA,kBAAA;IACA;MACI,sBAAA;MACA,8BAAA;MACA,gBAAA;MACA,wBAAA;IH+BR;EACF;EGxBE;IACI,iBAAA;IACA,kBAAA;IACA;MACI,sBAAA;MACA,8BAAA;MACA,gBAAA;MACC,wBAAA;IH0BT;IGxBI;MACI,+BAAA;MACA,8BAAA;MACA,mBAAA;MAEA,0BAAA;MACA,iCAAA;MACA,oBAAA;MACA,WAAA;MACA,wBAAA;MACA,gBAAA;MACA,kBAAA;MACA,UAAA;MACA,iBAAA;IHyBR;EACF;EGtBE;IACI;MAAmB,aAAA;IHyBvB;IGxBI;MAAY,aAAA;IH2BhB;IG1BI;MAAc,aAAA;IH6BlB;IG5BI;MAAa,aAAA;IH+BjB;IG9BI;MAAoB,aAAA;IHiCxB;IGhCI;MAAY,aAAA;IHmChB;IGlCI;MAAe,aAAA;IHqCnB;IGpCI;MAAe,aAAA;IHuCnB;IGtCI;MAAa,aAAA;IHyCjB;IGxCI;MAAgB,aAAA;IH2CpB;IG1CI;MAAgB,aAAA;IH6CpB;IG5CI;MAAsB,aAAA;IH+C1B;IG9CI;MAAe,aAAA;IHiDnB;IGhDI;MAAiB,aAAA;IHmDrB;IGlDI;MAAgB,aAAA;IHqDpB;IGpDI;MAAuB,aAAA;IHuD3B;EACF;EGtDE;IACI;MAAmB,aAAA;IHyDvB;IGxDI;MAAY,aAAA;IH2DhB;IG1DI;MAAc,aAAA;IH6DlB;IG5DI;MAAa,aAAA;IH+DjB;IG9DI;MAAoB,aAAA;IHiExB;IGhEI;MAAY,aAAA;IHmEhB;IGlEI;MAAe,aAAA;IHqEnB;IGpEI;MAAe,aAAA;IHuEnB;IGtEI;MAAa,aAAA;IHyEjB;IGxEI;MAAgB,aAAA;IH2EpB;IG1EI;MAAgB,aAAA;IH6EpB;IG5EI;MAAsB,aAAA;IH+E1B;IG9EI;MAAe,aAAA;IHiFnB;IGhFI;MAAiB,aAAA;IHmFrB;IGlFI;MAAgB,aAAA;IHqFpB;IGpFI;MAAuB,aAAA;IHuF3B;EACF;AACF;AGpFA;EACI,+BAAA;OAAA,mBAAA;AHsFJ;;AIjLA;EACI,cAAA;AJoLJ;;AIjLA;EACI,YAAA;EACA,uBAAA;AJoLJ;;AIjLA;EACI,mBAAA;EACA,qBAAA;AJoLJ;;AIjLA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;AJoLJ;;AIjLA;EACI,qBAAA;UAAA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;AJoLJ;;AI9KA;;EAEI,sCAAA;AJiLJ;;AI5KA;EAEI,qCAAA;EACA,0BAAA;EAEA,uCAAA;EACA,0CAAA;AJ6KJ;;AIxKA;;EAEI,gBAAA;AJ2KJ;;AItKA;EACI,8BAAA;EACA,wCAAA;AJyKJ;;AIrKA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;EAEA,kBAAA;EACA,wCAAA;AJuKJ;AIrKI;EACI,oBAAA;EAGA,iBAAA;EACA,WAAA;EAEA,cAAA;EACE,uBAAA;EAEF,kBAAA;EACA,+BAAA;AJmKR;;AIvJA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAA;AC7FA;EAEI,iBAAA;AL+RJ;AK7RI;EACI,uBAAA;EACA,iBAAA;AL+RR;AK5RI;EACI,iCAAA;AL8RR;AK1RI;EACI,uBAAA;EACA,iBAAA;AL4RR;AKzRI;EACI,iCAAA;AL2RR;AKxRK;EACG,uBAAA;EACA,iBAAA;AL0RR;AKvRI;EACI,oBAAA;ALyRR;AKtRI;EACI,uBAAA;EACA,iBAAA;ALwRR;AKrRI;EACI,sCAAA;ALuRR;AKpRI;EACI,uBAAA;EACA,iBAAA;ALsRR;AKnRI;EACI,+DAAA;ALqRR;AKlRI;EACI,uBAAA;ALoRR;AKjRI;EACI,8BAAA;ALmRR;;AMtUI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANwUR;AMvUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANyUZ;AMrUK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANsUR;AMrUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANuUZ;AMjUI;;;;;;EAMI,cAAA;ANmUR;AMhUI;EACI,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,wCAAA;EACA,kBAAA;EACA,kBAAA;EACA,2CAAA;EACA,yCAAA;EACA,iBAAA;EACA,kBAAA;ANkUR;AMjUQ;EACI,cAAA;EACC,wBAAA;ANmUb;AM/TI;EACI,0BAAA;ANiUR;AM3TI;EACI,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,wCAAA;EACA,kBAAA;EACA,2CAAA;EACA,yCAAA;EACA,kBAAA;AN6TR;AM5TQ;EACG,cAAA;EACC,wBAAA;EACA,2BAAA;AN8TZ;AMxTI;EACI,8BAAA;EACA,gBAAA;EACA,eAAA;EACA,sCAAA;EAGA,sCAAA;EACA,kBAAA;EACA,2CAAA;EACA,4CAAA;ANwTR;AMvTQ;EACI,cAAA;EACA,wBAAA;EACA,2BAAA;ANyTZ;AMnTI;EACI,8BAAA;EACA,gBAAA;EACA,iBAAA;EACA,sCAAA;EACA,qCAAA;EACA,sCAAA;EACA,kBAAA;EACA,2CAAA;EACA,4CAAA;EACA,8CAAA;UAAA,sCAAA;EACA,0BAAA;ANqTR;AMjTK;EACG,8BAAA;EACA,gBAAA;EACA,iBAAA;EACA,sCAAA;EACA,qCAAA;EAEA,kBAAA;EACA,2CAAA;EACA,4CAAA;ANkTR;AM/SI;EACO,8BAAA;EACH,gBAAA;EACK,iBAAA;EACJ,uCAAA;EACA,4CAAA;EACA,WAAA;ANiTT;;AMzSA;EACQ,aAAA;AN4SR;;AOxZA;EACE,8BAAA;EACA,cAAA;EACA,0BAAA;EACA,gBAAA;AP2ZF;;AOvZA;EACE,+BAAA;OAAA,mBAAA;AP0ZF;AOxZG;EACK,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,wCAAA;EACA,qCAAA;EACA,yCAAA;EACA,kBAAA;EACA,iBAAA;EACA,kBAAA;EACA,kBAAA;AP0ZR;AOzZQ;EACG,oCAAA;AP2ZX;AOvZI;EACE,0BAAA;APyZN;AOjZI;EACE,aAAA;APmZN;;AO5YA;EACE,aAAA;AP+YF;;AQreA;EACI,aAAA;EACA,UAAA;ARweJ","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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;EACI,2BAAA;EACA,0CAAA;EACA,yCAAA;EACA,iBAAA;EACA,iBAAA;EACA,cAAA;EACA,gBAAA;EAEA,cAAA;ADCJ;;AEVA;EACI,SAAA;EACA,UAAA;EACA,sBAAA;AFaJ;;AEXA;EACI,mBAAA;AFcJ;;AEXA;EACI,mCAAA,EAAA,wBAAA;EACA,kCAAA,EAAA,kBAAA;EAEA,kCAAA,EAAA,6CAAA;EACA,+BAAA,EAAA,mDAAA;EAEA,wBAAA;EACA,2BAAA;EACA,4BAAA;AFYJ;;AG9BA;EACI;IACI,iBAAA;IAEA,gBAAA;IACA,mBAAA;IAEA,UAAA;IACA,WAAA;EH+BN;EG7BE;IACI,iBAAA;IACA,kBAAA;IACA;MACI,sBAAA;MACA,8BAAA;MACA,gBAAA;MACA,wBAAA;IH+BR;EACF;EGxBE;IACI,iBAAA;IACA,kBAAA;IACA;MACI,sBAAA;MACA,8BAAA;MACA,gBAAA;MACC,wBAAA;IH0BT;IGxBI;MACI,+BAAA;MACA,8BAAA;MACA,mBAAA;MAEA,0BAAA;MACA,iCAAA;MACA,oBAAA;MACA,WAAA;MACA,wBAAA;MACA,gBAAA;MACA,kBAAA;MACA,UAAA;MACA,iBAAA;IHyBR;EACF;EGtBE;IACI;MAAmB,aAAA;IHyBvB;IGxBI;MAAY,aAAA;IH2BhB;IG1BI;MAAc,aAAA;IH6BlB;IG5BI;MAAa,aAAA;IH+BjB;IG9BI;MAAoB,aAAA;IHiCxB;IGhCI;MAAY,aAAA;IHmChB;IGlCI;MAAe,aAAA;IHqCnB;IGpCI;MAAe,aAAA;IHuCnB;IGtCI;MAAa,aAAA;IHyCjB;IGxCI;MAAgB,aAAA;IH2CpB;IG1CI;MAAgB,aAAA;IH6CpB;IG5CI;MAAsB,aAAA;IH+C1B;IG9CI;MAAe,aAAA;IHiDnB;IGhDI;MAAiB,aAAA;IHmDrB;IGlDI;MAAgB,aAAA;IHqDpB;IGpDI;MAAuB,aAAA;IHuD3B;EACF;EGtDE;IACI;MAAmB,aAAA;IHyDvB;IGxDI;MAAY,aAAA;IH2DhB;IG1DI;MAAc,aAAA;IH6DlB;IG5DI;MAAa,aAAA;IH+DjB;IG9DI;MAAoB,aAAA;IHiExB;IGhEI;MAAY,aAAA;IHmEhB;IGlEI;MAAe,aAAA;IHqEnB;IGpEI;MAAe,aAAA;IHuEnB;IGtEI;MAAa,aAAA;IHyEjB;IGxEI;MAAgB,aAAA;IH2EpB;IG1EI;MAAgB,aAAA;IH6EpB;IG5EI;MAAsB,aAAA;IH+E1B;IG9EI;MAAe,aAAA;IHiFnB;IGhFI;MAAiB,aAAA;IHmFrB;IGlFI;MAAgB,aAAA;IHqFpB;IGpFI;MAAuB,aAAA;IHuF3B;EACF;AACF;AGpFA;EACI,+BAAA;OAAA,mBAAA;AHsFJ;;AIjLA;EACI,cAAA;AJoLJ;;AIjLA;EACI,YAAA;EACA,uBAAA;AJoLJ;;AIjLA;EACI,mBAAA;EACA,qBAAA;AJoLJ;;AIjLA;EACI,mBAAA;EACA,UAAA;EACA,SAAA;AJoLJ;;AIjLA;EACI,qBAAA;UAAA,aAAA;EACA,4BAAA;EACA,wBAAA;EACA,wBAAA;EACA,sBAAA;AJoLJ;;AI9KA;;EAEI,sCAAA;AJiLJ;;AI5KA;EAEI,qCAAA;EACA,0BAAA;EAEA,uCAAA;EACA,0CAAA;AJ6KJ;;AIxKA;;EAEI,gBAAA;AJ2KJ;;AItKA;EACI,8BAAA;EACA,wCAAA;AJyKJ;;AIrKA;EACI,qBAAA;EACA,kBAAA;EACA,8BAAA;OAAA,kBAAA;EAEA,kBAAA;EACA,wCAAA;AJuKJ;AIrKI;EACI,oBAAA;EAGA,iBAAA;EACA,WAAA;EAEA,cAAA;EACE,uBAAA;EAEF,kBAAA;EACA,+BAAA;AJmKR;;AIvJA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAA;AC7FA;EAEI,iBAAA;AL+RJ;AK7RI;EACI,uBAAA;EACA,iBAAA;AL+RR;AK5RI;EACI,iCAAA;AL8RR;AK1RI;EACI,uBAAA;EACA,iBAAA;AL4RR;AKzRI;EACI,iCAAA;AL2RR;AKxRK;EACG,uBAAA;EACA,iBAAA;AL0RR;AKvRI;EACI,oBAAA;ALyRR;AKtRI;EACI,uBAAA;EACA,iBAAA;ALwRR;AKrRI;EACI,sCAAA;ALuRR;AKpRI;EACI,uBAAA;EACA,iBAAA;ALsRR;AKnRI;EACI,+DAAA;ALqRR;AKlRI;EACI,uBAAA;ALoRR;AKjRI;EACI,8BAAA;ALmRR;;AMtUI;EACI,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANwUR;AMvUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANyUZ;AMrUK;EACG,+BAAA;OAAA,mBAAA;EACA,8BAAA;OAAA,kBAAA;EACA,kBAAA;EAEA,kCAAA;EACA,yCAAA;ANsUR;AMrUQ;EACI,WAAA;EACA,cAAA;EACA,iCAAA;ANuUZ;AMjUI;;;;;;EAMI,cAAA;ANmUR;AM1TI;EACI,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,wCAAA;EACA,kBAAA;EACA,2CAAA;EACA,yCAAA;EACA,kBAAA;AN4TR;AM3TQ;EACG,cAAA;EACC,wBAAA;EACA,2BAAA;AN6TZ;AMvTI;EACI,8BAAA;EACA,gBAAA;EACA,eAAA;EACA,sCAAA;EAGA,sCAAA;EACA,kBAAA;EACA,2CAAA;EACA,4CAAA;ANuTR;AMtTQ;EACI,cAAA;EACA,wBAAA;EACA,2BAAA;ANwTZ;AMlTI;EACI,8BAAA;EACA,gBAAA;EACA,iBAAA;EACA,sCAAA;EACA,qCAAA;EACA,sCAAA;EACA,kBAAA;EACA,2CAAA;EACA,4CAAA;EACA,8CAAA;UAAA,sCAAA;EACA,0BAAA;ANoTR;AMhTK;EACG,8BAAA;EACA,gBAAA;EACA,iBAAA;EACA,sCAAA;EACA,qCAAA;EAEA,kBAAA;EACA,2CAAA;EACA,4CAAA;ANiTR;AM9SI;EACO,8BAAA;EACH,gBAAA;EACK,iBAAA;EACJ,uCAAA;EACA,4CAAA;EACA,WAAA;ANgTT;;AMxSA;EACQ,aAAA;AN2SR;;AMxSG;EACK,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;EACA,wCAAA;EACA,kBAAA;EACA,kBAAA;EACA,2CAAA;EACA,yCAAA;EACA,iBAAA;EACA,kBAAA;AN2SR;AM1SQ;EACI,cAAA;EACC,wBAAA;AN4Sb;;AMxSI;EACI,0BAAA;AN2SR;;AO1ZA;EACE,8BAAA;EACA,cAAA;EACA,0BAAA;EACA,gBAAA;AP6ZF;;AOzZA;EACE,+BAAA;OAAA,mBAAA;AP4ZF;AO1ZG;EACK,8BAAA;EACA,iBAAA;EACA,gBAAA;EACA,wCAAA;EACA,qCAAA;EACA,yCAAA;EACA,kBAAA;EACA,iBAAA;EACA,kBAAA;EACA,kBAAA;AP4ZR;AO3ZQ;EACG,oCAAA;AP6ZX;AOzZI;EACE,0BAAA;AP2ZN;AOnZI;EACE,aAAA;APqZN;;AO9YA;EACE,aAAA;APiZF;;AQveA;EACI,aAAA;EACA,UAAA;AR0eJ","file":"style.css"} \ No newline at end of file From 4a955582378b3736b80d72bcb08e94eb62db40e6 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 21:30:25 +0100 Subject: [PATCH 7/9] counters js --- css/modules/_titles-counters.scss | 96 +++++++++++++++++-------------- css/style.css | 46 ++------------- css/style.css.map | 2 +- csspageweaver/manifest.json | 1 + js/counters.js | 94 ++++++++++++++++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 js/counters.js diff --git a/css/modules/_titles-counters.scss b/css/modules/_titles-counters.scss index 023324b..8442ccd 100644 --- a/css/modules/_titles-counters.scss +++ b/css/modules/_titles-counters.scss @@ -1,58 +1,70 @@ #section__content{ - counter-reset: h1; - - h1{ - counter-increment: h1 1; - counter-reset: h2; + h1, h2, h3 { + &::before{ + content: attr(data-counter); + } } - h1::before{ - content: counter(h1, upper-alpha); - + h4, h5, h6{ + &::before{ + content: attr(data-counter) ". "; + } } - h2{ - counter-increment: h2 1; - counter-reset: h3; - } + // counter-reset: h1; - h2::before{ - content: counter(h2, upper-roman); - } + // h1{ + // counter-increment: h1 1; + // counter-reset: h2; + // } - h3{ - counter-increment: h3 1; - counter-reset: h4; - } + // h1::before{ + // content: counter(h1, upper-alpha); - h3::before{ - content: counter(h3); - } + // } - h4{ - counter-increment: h4 1; - counter-reset: h5; - } + // h2{ + // counter-increment: h2 1; + // counter-reset: h3; + // } - h4::before{ - content: counter(h4, lower-alpha) ". "; - } + // h2::before{ + // content: counter(h2, upper-roman); + // } - h5{ - counter-increment: h5 1; - counter-reset: h6; - } + // h3{ + // counter-increment: h3 1; + // counter-reset: h4; + // } - h5::before{ - content: counter(h5, lower-alpha) counter(h5, lower-alpha) ". "; - } + // h3::before{ + // content: counter(h3); + // } - h6{ - counter-increment: h6 1; - } + // h4{ + // counter-increment: h4 1; + // counter-reset: h5; + // } - h6::before{ - content: "(" counter(h6) "). "; - } + // h4::before{ + // content: counter(h4, lower-alpha) ". "; + // } + + // h5{ + // counter-increment: h5 1; + // counter-reset: h6; + // } + + // h5::before{ + // content: counter(h5, lower-alpha) counter(h5, lower-alpha) ". "; + // } + + // h6{ + // counter-increment: h6 1; + // } + + // h6::before{ + // content: "(" counter(h6) "). "; + // } } \ No newline at end of file diff --git a/css/style.css b/css/style.css index a3f480c..983afd3 100644 --- a/css/style.css +++ b/css/style.css @@ -288,49 +288,11 @@ ol[type="1"]{ } */ -#section__content { - counter-reset: h1; +#section__content h1::before, #section__content h2::before, #section__content h3::before { + content: attr(data-counter); } -#section__content h1 { - counter-increment: h1 1; - counter-reset: h2; -} -#section__content h1::before { - content: counter(h1, upper-alpha); -} -#section__content h2 { - counter-increment: h2 1; - counter-reset: h3; -} -#section__content h2::before { - content: counter(h2, upper-roman); -} -#section__content h3 { - counter-increment: h3 1; - counter-reset: h4; -} -#section__content h3::before { - content: counter(h3); -} -#section__content h4 { - counter-increment: h4 1; - counter-reset: h5; -} -#section__content h4::before { - content: counter(h4, lower-alpha) ". "; -} -#section__content h5 { - counter-increment: h5 1; - counter-reset: h6; -} -#section__content h5::before { - content: counter(h5, lower-alpha) counter(h5, lower-alpha) ". "; -} -#section__content h6 { - counter-increment: h6 1; -} -#section__content h6::before { - content: "(" counter(h6) "). "; +#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 { diff --git a/css/style.css.map b/css/style.css.map index 30ecfe9..489dbe9 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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 e5a0aed..7f59ca6 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -11,6 +11,7 @@ } }, "hook": [ + "/js/counters.js", "/js/sectionedFootnotes.js" ] } diff --git a/js/counters.js b/js/counters.js new file mode 100644 index 0000000..967125e --- /dev/null +++ b/js/counters.js @@ -0,0 +1,94 @@ +import { Handler } from '/csspageweaver/lib/paged.esm.js'; + +export default class counters extends Handler { + constructor(chunker, polisher, caller) { + super(chunker, polisher, caller); + } + + // Convertir en upper-alpha (A, B, C...) + toUpperAlpha(num) { + return String.fromCharCode(64 + num); + } + + // Convertir en lower-alpha (a, b, c...) + toLowerAlpha(num) { + return String.fromCharCode(96 + num); + } + + // Convertir en upper-roman (I, II, III...) + toUpperRoman(num) { + const romanNumerals = [ + ['M', 1000], ['CM', 900], ['D', 500], ['CD', 400], + ['C', 100], ['XC', 90], ['L', 50], ['XL', 40], + ['X', 10], ['IX', 9], ['V', 5], ['IV', 4], ['I', 1] + ]; + let result = ''; + for (const [letter, value] of romanNumerals) { + while (num >= value) { + result += letter; + num -= value; + } + } + return result; + } + + beforeParsed(content) { + const sectionContent = content.querySelector('#section__content'); + if (!sectionContent) return; + + // Compteurs + let h1Count = 0; + let h2Count = 0; + let h3Count = 0; + let h4Count = 0; + let h5Count = 0; + let h6Count = 0; + + // Parcourir tous les éléments dans l'ordre du document + const allElements = sectionContent.querySelectorAll('h1, h2, h3, h4, h5, h6'); + + allElements.forEach(el => { + const tagName = el.tagName.toLowerCase(); + + switch (tagName) { + case 'h1': + h1Count++; + h2Count = 0; // reset h2 + el.setAttribute('data-counter', this.toUpperAlpha(h1Count)); + break; + + case 'h2': + h2Count++; + h3Count = 0; // reset h3 + el.setAttribute('data-counter', this.toUpperRoman(h2Count)); + break; + + case 'h3': + h3Count++; + h4Count = 0; // reset h4 + el.setAttribute('data-counter', h3Count.toString()); + break; + + case 'h4': + h4Count++; + h5Count = 0; // reset h5 + el.setAttribute('data-counter', this.toLowerAlpha(h4Count)); + break; + + case 'h5': + h5Count++; + h6Count = 0; // reset h6 + const letter = this.toLowerAlpha(h5Count); + el.setAttribute('data-counter', letter + letter); + break; + + case 'h6': + h6Count++; + el.setAttribute('data-counter', '(' + h6Count + ')'); + break; + } + }); + } +} + + From a4c3390b993713fcf403f7054f84dfadac800cba Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 21:31:42 +0100 Subject: [PATCH 8/9] delete CSS counters --- css/modules/_titles-counters.scss | 70 ------------------------------- css/modules/_titles.scss | 12 ++++++ css/style.css | 1 - css/style.css.map | 2 +- 4 files changed, 13 insertions(+), 72 deletions(-) delete mode 100644 css/modules/_titles-counters.scss diff --git a/css/modules/_titles-counters.scss b/css/modules/_titles-counters.scss deleted file mode 100644 index 8442ccd..0000000 --- a/css/modules/_titles-counters.scss +++ /dev/null @@ -1,70 +0,0 @@ -#section__content{ - - h1, h2, h3 { - &::before{ - content: attr(data-counter); - } - } - - h4, h5, h6{ - &::before{ - content: attr(data-counter) ". "; - } - } - - // counter-reset: h1; - - // h1{ - // counter-increment: h1 1; - // counter-reset: h2; - // } - - // h1::before{ - // content: counter(h1, upper-alpha); - - // } - - // h2{ - // counter-increment: h2 1; - // counter-reset: h3; - // } - - // h2::before{ - // content: counter(h2, upper-roman); - // } - - // h3{ - // counter-increment: h3 1; - // counter-reset: h4; - // } - - // h3::before{ - // content: counter(h3); - // } - - // h4{ - // counter-increment: h4 1; - // counter-reset: h5; - // } - - // h4::before{ - // content: counter(h4, lower-alpha) ". "; - // } - - // h5{ - // counter-increment: h5 1; - // counter-reset: h6; - // } - - // h5::before{ - // content: counter(h5, lower-alpha) counter(h5, lower-alpha) ". "; - // } - - // h6{ - // counter-increment: h6 1; - // } - - // h6::before{ - // content: "(" counter(h6) "). "; - // } - } \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index 8a6d6da..d86c5ca 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -1,6 +1,18 @@ #section__content{ + h1, h2, h3 { + &::before{ + content: attr(data-counter); + } + } + + h4, h5, h6{ + &::before{ + content: attr(data-counter) ". "; + } + } + h1, h2, h3 , h4{ break-inside: avoid; diff --git a/css/style.css b/css/style.css index 983afd3..b5ba306 100644 --- a/css/style.css +++ b/css/style.css @@ -294,7 +294,6 @@ ol[type="1"]{ #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 { -moz-column-break-inside: avoid; break-inside: avoid; diff --git a/css/style.css.map b/css/style.css.map index 489dbe9..e9d4344 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-counters.scss","modules/_titles.scss","modules/_footnotes.scss","modules/_list-of-abbr.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/_footnotes.scss","modules/_list-of-abbr.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file From 8255f08762514580ad9168f64e627b69dd6c419c Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 20 Jan 2026 22:37:15 +0100 Subject: [PATCH 9/9] layout-3 w/ Akkurat --- css/modules/_footnotes.scss | 123 +++++++++----------------- css/modules/_layout.scss | 2 +- css/modules/_text.scss | 84 ++++++------------ css/modules/_titles.scss | 58 +++++++++---- css/modules/_var.scss | 5 +- css/style.css | 168 ++++++++++++++++-------------------- css/style.css.map | 2 +- css/style.scss | 1 - csspageweaver/manifest.json | 5 +- index.html | 8 +- 10 files changed, 197 insertions(+), 259 deletions(-) diff --git a/css/modules/_footnotes.scss b/css/modules/_footnotes.scss index 964aaf5..2bd344b 100644 --- a/css/modules/_footnotes.scss +++ b/css/modules/_footnotes.scss @@ -1,88 +1,51 @@ -// @page { -// @footnote { -// float: bottom; -// footnote-policy: auto; -// } -// } +@page { + @footnote { + float: bottom; + footnote-policy: auto; + } + } -// .pagedjs_footnote_content{ -// padding-top: calc(var(--baseline)*1); -// } + .pagedjs_footnote_content{ + padding-top: calc(var(--baseline)*1); + } -// .inline-note { -// float: footnote; -// footnote-policy: auto; -// font-size: 9px; -// line-height: calc(var(--baseline)*0.8); -// padding-left: var(--indent); -// position: relative; -// // font-weight: 100; - -// &::marker{ -// display: none; -// content: ""; -// } - -// } - - -// [data-counter-note]{ -// &::before{ -// content: attr(data-counter-note) "."; -// position: absolute; -// left: 0px; -// } -// } - -// [data-footnote-call]{ -// font-size: 9px; -// } - - -.footnote-ref{ - font-family: var(--font-title); - line-height: 0; +.inline-note { + float: footnote; + footnote-policy: auto; font-size: var(--fs-small); - font-weight: 500; -} - - -#footnotes{ - break-before: right; - - .title-part{ - font-family: var(--font-title); - font-size: 1.1rem; - font-weight: 500; - line-height: calc(var(--baseline)*1.2); - margin-top: calc(var(--baseline)*2); - padding-bottom: calc(var(--baseline)*1); - padding-right: 2ch; - padding-left: 2ch; - text-align: center; - text-wrap: balance; - &::before{ - content: attr(data-part-number) ". " - } - } - - li{ - font-size: var(--fs-small); - - // &::marker{ - // font-family: var(--font-title); - // font-weight: 500; - // } - } - - .footnote-back{ - display: none; - } + line-height: calc(var(--baseline)*0.8); + padding-left: var(--indent); + position: relative; + font-weight: 600; + &::marker{ + display: none; + content: ""; + } +} + + +[data-counter-note]{ +&::before{ + content: attr(data-counter-note) "."; + position: absolute; + left: 0px; + } +} + +.inline-note::after{ + font-family: var(--font); + font-size: var(--fs-small); + line-height: 0; + position: relative; + top: -3px; + font-variant-position: normal!important; } -[data-id="footnotes"][data-split-from] > :first-child { - margin-top: 0; -} \ No newline at end of file +blockquote .inline-note{ + font-variant-position: normal!important; +} + + diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index ac01000..4304e1c 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -1,6 +1,6 @@ @media print { @page { - size: 134mm 205mm; + size: 176mm 240mm; // size: 150mm 220mm; margin-top: 36px; margin-bottom: 20mm; diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 3650501..0695543 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -37,12 +37,14 @@ ol[type="1"] + p{ blockquote{ - + font-family: var(--font-serif); padding-left: calc(var(--indent)*1); - font-size: var(--fs-small); - // line-height: calc(var(--baseline)*0.75); + 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; } @@ -55,8 +57,12 @@ blockquote + ol + p{ .these{ - font-family: var(--font-title); + // color: red; + // font-family: var(--font-title); margin-bottom: calc(var(--baseline)*1); + border-left: 4px solid #efefef; + box-decoration-break: clone; + padding-left: calc(var(--indent)*0.5); } @@ -66,20 +72,31 @@ ol[type="1"]{ break-after: avoid; position: absolute; - left: calc(var(--indent)*-1.5 - 0.5ch); + left: 0px; - &::before{ + display: flex; + gap: 0.25ch; + + &::after{ content: attr(start); // font-family: var(--font-title); // font-weight: 500; - font-size: 0.6rem; + font-size: var(--fs-small); color: #999; - display: block; - height: var(--baseline); + // display: block; + // height: var(--baseline); - padding-right: 1ch; - border-right: 1px solid #efefef; + // padding-right: 1ch; + // border-right: 1px solid #efefef; + } + + li::before{ + font-size: var(--fs-small); + content: "¶"; + color: #d7d7d7; + position: relative; + top: -1px; } @@ -87,48 +104,3 @@ ol[type="1"]{ } - -// GRADATIONS - - -/* -ol[type="1"]{ - list-style-type: none; - position: relative; - break-after: avoid; - - position: absolute; - left: calc(var(--indent)*-1.5 - 0.5ch); - &::before{ - content: attr(start); - font-family: var(--font-title); - font-weight: 500; - font-size: 0.6rem; - color: #999; - display: block; - - padding: 0px 2px; - // border: 1px solid #efefef; - min-width: 20px; - justify-content: center; - } - - - -} -.pagedjs_page_content::before{ - --color: #efefef; - --size: 20px; - content: ""; - display: block; - height: 100%; - width: var(--size); - position: absolute; - left: calc(var(--indent)*-1 - var(--size)); - background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; - background-size: 100% var(--baseline); - background-repeat: repeat-y; - -} - -*/ \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index d86c5ca..3d8fa16 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -1,13 +1,14 @@ #section__content{ + margin-left: 28mm; - h1, h2, h3 { + h1, h2, h3 { &::before{ content: attr(data-counter); } } - h4, h5, h6{ + h4, h5, h6{ &::before{ content: attr(data-counter) ". "; } @@ -69,10 +70,13 @@ margin-top: calc(var(--baseline)*1 + 6px); padding-bottom: calc(var(--baseline)*1); padding-right: 2ch; + padding-left: calc(var(--indent)*2); &::before{ - display: block; - font-size: var(--fs-num); - padding-left: var(--indent); + position: absolute; + left: 0; + // display: block; + // font-size: var(--fs-num); + // padding-left: var(--indent); } } @@ -89,12 +93,11 @@ position: relative; margin-top: calc(var(--baseline)*1 + 4px); padding-bottom: calc(var(--baseline)*0.75); + padding-left: calc(var(--indent)*2); &::before{ - display: block; - font-size: var(--fs-num); - padding-left: var(--indent); - // position: absolute; - // left: 0; + + position: absolute; + left: 0; } } @@ -103,13 +106,19 @@ font-weight: 500; font-size: 0.9rem; line-height: calc(var(--baseline)*1); - padding-left: calc(var(--indent)*1); padding-right: calc(var(--indent)*2); 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); + &::before{ + + // position: absolute; + // left: 0; + } } @@ -118,7 +127,7 @@ font-weight: 500; font-size: 0.8rem; line-height: calc(var(--baseline)*1); - padding-left: calc(var(--indent)*1); + padding-left: calc(var(--indent)*2); // padding-right: calc(var(--indent)*2); position: relative; margin-top: calc(var(--baseline)*1 + 4px); @@ -145,19 +154,32 @@ h1{ font-family: var(--font-title); - font-size: 1.4rem; + font-size: 1.6rem; font-weight: 500; text-transform: uppercase; - line-height: calc(var(--baseline)*1.4); - text-align: center; + 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: 1ch; + padding-left: calc(var(--indent)*2); padding-right: 1ch; + + &::before{ - display: block; - font-size: var(--fs-num); + // 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; } } diff --git a/css/modules/_var.scss b/css/modules/_var.scss index bd1e219..18aac84 100644 --- a/css/modules/_var.scss +++ b/css/modules/_var.scss @@ -1,9 +1,10 @@ :root{ - --font: 'Edgar', sans-serif; + --font: 'Akkurat Std', sans-serif; + --font-serif: 'Edgar', sans-serif; --font-title: 'Allium Rounded', sans-serif; --font-sans: 'Allium Rounded', sans-serif; --font-size: 11px; - --fs-small: 9.5px; + --fs-small: 8.5px; --fs-num: 14px; --baseline: 16px; diff --git a/css/style.css b/css/style.css index b5ba306..78bb725 100644 --- a/css/style.css +++ b/css/style.css @@ -1,10 +1,11 @@ @charset "UTF-8"; :root { - --font: "Edgar", sans-serif; + --font: "Akkurat Std", sans-serif; + --font-serif: "Edgar", sans-serif; --font-title: "Allium Rounded", sans-serif; --font-sans: "Allium Rounded", sans-serif; --font-size: 11px; - --fs-small: 9.5px; + --fs-small: 8.5px; --fs-num: 14px; --baseline: 16px; --indent: 26px; @@ -32,7 +33,7 @@ body { @media print { @page { - size: 134mm 205mm; + size: 176mm 240mm; margin-top: 36px; margin-bottom: 20mm; bleed: 6mm; @@ -213,10 +214,13 @@ ol[type="1"] + p { } blockquote { + font-family: var(--font-serif); padding-left: calc(var(--indent) * 1); - font-size: var(--fs-small); + 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; } .these + ol + p, @@ -225,8 +229,11 @@ blockquote + ol + p { } .these { - font-family: var(--font-title); 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"] { @@ -235,59 +242,26 @@ ol[type="1"] { -moz-column-break-after: avoid; break-after: avoid; position: absolute; - left: calc(var(--indent) * -1.5 - 0.5ch); + left: 0px; + display: flex; + gap: 0.25ch; } -ol[type="1"]::before { +ol[type="1"]::after { content: attr(start); - font-size: 0.6rem; + font-size: var(--fs-small); color: #999; - display: block; - height: var(--baseline); - padding-right: 1ch; - border-right: 1px solid #efefef; +} +ol[type="1"] li::before { + font-size: var(--fs-small); + content: "¶"; + color: #d7d7d7; + position: relative; + top: -1px; } -/* -ol[type="1"]{ - list-style-type: none; - position: relative; - break-after: avoid; - - position: absolute; - left: calc(var(--indent)*-1.5 - 0.5ch); - &::before{ - content: attr(start); - font-family: var(--font-title); - font-weight: 500; - font-size: 0.6rem; - color: #999; - display: block; - - padding: 0px 2px; - // border: 1px solid #efefef; - min-width: 20px; - justify-content: center; - } - - - +#section__content { + margin-left: 28mm; } -.pagedjs_page_content::before{ - --color: #efefef; - --size: 20px; - content: ""; - display: block; - height: 100%; - width: var(--size); - position: absolute; - left: calc(var(--indent)*-1 - var(--size)); - background: linear-gradient(transparent 0%, transparent calc(var(--baseline) - 1px), var(--color) calc(var(--baseline) - 1px), var(--color) var(--baseline)), transparent; - background-size: 100% var(--baseline); - background-repeat: repeat-y; - -} - -*/ #section__content h1::before, #section__content h2::before, #section__content h3::before { content: attr(data-counter); } @@ -340,11 +314,11 @@ ol[type="1"]{ margin-top: calc(var(--baseline) * 1 + 6px); padding-bottom: calc(var(--baseline) * 1); padding-right: 2ch; + padding-left: calc(var(--indent) * 2); } #section__content h2::before { - display: block; - font-size: var(--fs-num); - padding-left: var(--indent); + position: absolute; + left: 0; } #section__content h3 { font-family: var(--font-title); @@ -355,18 +329,17 @@ ol[type="1"]{ position: relative; margin-top: calc(var(--baseline) * 1 + 4px); padding-bottom: calc(var(--baseline) * 0.75); + padding-left: calc(var(--indent) * 2); } #section__content h3::before { - display: block; - font-size: var(--fs-num); - padding-left: var(--indent); + 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-left: calc(var(--indent) * 1); padding-right: calc(var(--indent) * 2); position: relative; margin-top: calc(var(--baseline) * 1 + 4px); @@ -374,13 +347,14 @@ ol[type="1"]{ -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) * 1); + padding-left: calc(var(--indent) * 2); position: relative; margin-top: calc(var(--baseline) * 1 + 4px); padding-bottom: calc(var(--baseline) * 0.25); @@ -400,61 +374,67 @@ ol[type="1"]{ h1 { font-family: var(--font-title); - font-size: 1.4rem; + font-size: 1.6rem; font-weight: 500; text-transform: uppercase; - line-height: calc(var(--baseline) * 1.4); - text-align: center; + line-height: calc(var(--baseline) * 1.6); position: relative; margin-top: calc(var(--baseline) * 2 - 3px); padding-bottom: calc(var(--baseline) * 1); - padding-left: 1ch; + padding-left: calc(var(--indent) * 2); padding-right: 1ch; } h1::before { - display: block; - font-size: var(--fs-num); + position: absolute; + left: 0; + width: calc(var(--indent) * 2 - 0.5ch); } section h1:first-of-type { margin-top: 3px !important; } -.footnote-ref { - font-family: var(--font-title); - line-height: 0; - font-size: var(--fs-small); - font-weight: 500; +@page { + @footnote { + float: bottom; + footnote-policy: auto; + } +} +.pagedjs_footnote_content { + padding-top: calc(var(--baseline) * 1); } -#footnotes { - -moz-column-break-before: right; - break-before: right; -} -#footnotes .title-part { - font-family: var(--font-title); - font-size: 1.1rem; - font-weight: 500; - line-height: calc(var(--baseline) * 1.2); - margin-top: calc(var(--baseline) * 2); - padding-bottom: calc(var(--baseline) * 1); - padding-right: 2ch; - padding-left: 2ch; - text-align: center; - text-wrap: balance; -} -#footnotes .title-part::before { - content: attr(data-part-number) ". "; -} -#footnotes li { +.inline-note { + float: footnote; + footnote-policy: auto; font-size: var(--fs-small); + line-height: calc(var(--baseline) * 0.8); + padding-left: var(--indent); + position: relative; + font-weight: 600; } -#footnotes .footnote-back { +.inline-note::marker { display: none; + content: ""; } -[data-id=footnotes][data-split-from] > :first-child { - margin-top: 0; +[data-counter-note]::before { + content: attr(data-counter-note) "."; + position: absolute; + left: 0px; +} + +.inline-note::after { + font-family: var(--font); + font-size: var(--fs-small); + line-height: 0; + position: relative; + top: -3px; + font-variant-position: normal !important; +} + +blockquote .inline-note { + font-variant-position: normal !important; } #section__list-of-abbr { diff --git a/css/style.css.map b/css/style.css.map index e9d4344..1cd0617 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/_footnotes.scss","modules/_list-of-abbr.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/_footnotes.scss","modules/_list-of-abbr.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 d81f558..59fbe83 100644 --- a/css/style.scss +++ b/css/style.scss @@ -3,7 +3,6 @@ @import 'modules/init'; @import 'modules/layout'; @import 'modules/text'; -@import 'modules/titles-counters'; @import 'modules/titles'; @import 'modules/footnotes'; @import 'modules/list-of-abbr'; \ No newline at end of file diff --git a/csspageweaver/manifest.json b/csspageweaver/manifest.json index 7f59ca6..5bd177d 100644 --- a/csspageweaver/manifest.json +++ b/csspageweaver/manifest.json @@ -1,5 +1,5 @@ { - "plugins": ["baseline","grid","marginBox","imposition","spread","previewPage","reloadInPlace","fullPage"], + "plugins": ["baseline","grid","marginBox","imposition","spread","previewPage","reloadInPlace","inlineNotes"], "pluginsParameters":{}, "css": [ "css/style.css" @@ -11,8 +11,7 @@ } }, "hook": [ - "/js/counters.js", - "/js/sectionedFootnotes.js" + "/js/counters.js" ] } diff --git a/index.html b/index.html index 7812dfb..888a588 100644 --- a/index.html +++ b/index.html @@ -9,9 +9,11 @@ - - - + + + + +