From 1d747cc77b257cb4bc43c4dabcdd50aa6c446f19 Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Thu, 16 Apr 2026 16:00:53 +0200 Subject: [PATCH] move note to prev page --- css/modules/_layout.scss | 21 ++++-- css/modules/_notes.scss | 4 ++ css/modules/_titles.scss | 20 +++--- css/style.css | 34 ++++----- css/style.css.map | 2 +- css/style.scss | 2 + .../plugins/inlineNotes/inlineNotes.js | 1 - js/addPagesNotes.js | 70 ++++++++++++++++++- 8 files changed, 114 insertions(+), 40 deletions(-) create mode 100644 css/modules/_notes.scss diff --git a/css/modules/_layout.scss b/css/modules/_layout.scss index 10c37d5..c9033bd 100644 --- a/css/modules/_layout.scss +++ b/css/modules/_layout.scss @@ -139,7 +139,7 @@ $unit: calc($content-w/7); #section__content{ break-before: right; - + } @@ -157,11 +157,11 @@ $unit: calc($content-w/7); // Title chapter -#section__content h1{ - break-before: left; - break-after: page; - page: chapter; -} +// #section__content h1{ +// break-before: left; +// break-after: page; +// page: chapter; +// } #section__content h1 .h1-count{ string-set: chapterCount content(text); } @@ -171,3 +171,12 @@ $unit: calc($content-w/7); } +#section__content{ + break-before: left; +} + + +#section__content h1:first-of-type{ + break-before: right; + // background-color: red; +} \ No newline at end of file diff --git a/css/modules/_notes.scss b/css/modules/_notes.scss new file mode 100644 index 0000000..8478b98 --- /dev/null +++ b/css/modules/_notes.scss @@ -0,0 +1,4 @@ +.body-note{ + display: block; + color: red; +} \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index dadbf13..6434b44 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -1,13 +1,13 @@ #section__content{ - // margin-left: 28mm; + + - h1{ - - column-span: all; - height: $content-h; + h1:first-of-type{ + // column-span: all; + // height: $content-h; } @@ -68,13 +68,13 @@ line-height: 0.9; hyphens: auto; - break-inside: avoid; + // break-inside: avoid; - display: flex; - flex-direction: column; - justify-content: space-between; - text-align: center; + // display: flex; + // flex-direction: column; + // justify-content: space-between; + // text-align: center; diff --git a/css/style.css b/css/style.css index 7e187f3..9c1645c 100644 --- a/css/style.css +++ b/css/style.css @@ -244,14 +244,6 @@ body { break-before: page; } -#section__content h1 { - -moz-column-break-before: left; - break-before: left; - -moz-column-break-after: page; - break-after: page; - page: chapter; -} - #section__content h1 .h1-count { string-set: chapterCount content(text); } @@ -260,6 +252,16 @@ body { string-set: chapter content(text); } +#section__content { + -moz-column-break-before: left; + break-before: left; +} + +#section__content h1:first-of-type { + -moz-column-break-before: right; + break-before: right; +} + sup { line-height: 0; } @@ -353,11 +355,6 @@ ol[type="1"].ol-clone { left: 73mm; } -#section__content h1 { - -moz-column-span: all; - column-span: all; - height: 215mm; -} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); } @@ -402,12 +399,6 @@ ol[type="1"].ol-clone { font-size: 115px; line-height: 0.9; hyphens: auto; - -moz-column-break-inside: avoid; - break-inside: avoid; - display: flex; - flex-direction: column; - justify-content: space-between; - text-align: center; } #section__content h1 span { display: block; @@ -491,6 +482,11 @@ ol[type="1"].ol-clone { color: red; } +.body-note { + display: block; + color: red; +} + #toc_container { -moz-column-break-before: page; break-before: page; diff --git a/css/style.css.map b/css/style.css.map index 91871ab..8e64015 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index f9799c0..43dd27e 100644 --- a/css/style.scss +++ b/css/style.scss @@ -6,5 +6,7 @@ @import 'modules/num-paragraph'; @import 'modules/titles'; @import 'modules/list-of-abbr'; +@import 'modules/notes'; + // @import 'modules/followingNotes'; @import 'modules/toc'; \ No newline at end of file diff --git a/csspageweaver/plugins/inlineNotes/inlineNotes.js b/csspageweaver/plugins/inlineNotes/inlineNotes.js index a68bbe0..6b1e72c 100644 --- a/csspageweaver/plugins/inlineNotes/inlineNotes.js +++ b/csspageweaver/plugins/inlineNotes/inlineNotes.js @@ -91,7 +91,6 @@ function createNotes(content, input, type){ inline_note.innerHTML = unwrapBlockChildren(note).innerHTML; call.after(inline_note); - call.parentElement.removeChild(call); }) diff --git a/js/addPagesNotes.js b/js/addPagesNotes.js index a70484e..863b2e3 100644 --- a/js/addPagesNotes.js +++ b/js/addPagesNotes.js @@ -5,10 +5,74 @@ export default class addPagesNotes extends Handler { super(chunker, polisher, caller); } + + afterParsed(parsed){ + let notes = parsed.querySelectorAll(".inline-note"); + notes.forEach(function (note, index) { + console.log(note); + note.style.position = "absolute"; + note.style.top = "0px"; + note.style.left = "0px"; + note.style.height = "0px"; + + let counter = note.getAttribute('data-counter-note'); + + let call = document.createElement('span'); + call.classList.add('note_call'); + call.textContent = counter; + note.insertAdjacentElement('beforebegin', call); + + note.classList.replace('inline-note', 'body-note'); + let marker = document.createElement('span'); + marker.classList.add('note_marker'); + marker.textContent = counter + ". "; + note.prepend(marker); + }); + + } + afterPageLayout(pageElement, page, breakToken, chunker) { - if (page.element.classList.contains('pagedjs_left_page')) { - let blankPage = chunker.addPage(); - blankPage.element.classList.add('blank-page'); + + + // move notes into previous page + let notes = pageElement.querySelectorAll(".body-note"); + if(notes){ + let container = document.createElement('div'); + container.classList.add('container-note'); + notes.forEach(function (note, index) { + container.appendChild(note); + note.style.position = "relative"; + note.style.height = "auto"; + }); + + let pageNum = parseInt(pageElement.getAttribute('data-page-number')); + let prevPage = document.querySelector('[data-page-number="' + (pageNum - 1) + '"]'); + if (prevPage) { + let content = prevPage.querySelector("#section_content"); + if(content){ + content.appendChild(container); + }else{ + prevPage.querySelector('.pagedjs_page_content').appendChild(container); + } + + } + + } + + + + // create blank left page + if ( + page.element.classList.contains('pagedjs_right_page') && + page.element.querySelector('[data-id="section__content"]') + ) { + + let notesPage = chunker.addPage(); + notesPage.element.classList.add('page-notes'); + + // Make margin boxes visible (hasContent is set during polishing, which skips added pages) + notesPage.element.querySelector('.pagedjs_margin-bottom-left')?.classList.add('hasContent'); + notesPage.element.querySelector('.pagedjs_margin-bottom-center')?.classList.add('hasContent'); } } }