From 4c5629df62c0a694b6ef3aada2ec86890bfeceaa Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 12 Sep 2026 14:11:59 +0300 Subject: feat!: Rework website generation - Move src.du into src/INIT.du - Replace generate.sh with make.sh, which uses multiple stages for execution and allows customising them. - Added a stage for sitemap generation in make.sh --- src/INIT.du | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 415 insertions(+) create mode 100644 src/INIT.du (limited to 'src/INIT.du') diff --git a/src/INIT.du b/src/INIT.du new file mode 100644 index 0000000..717f259 --- /dev/null +++ b/src/INIT.du @@ -0,0 +1,415 @@ +'hide Necessary definitions for all pages under src + +'if {eq {ifn {OUTPUT_FORMAT};{env OUTPUT_FORMAT}};HTML} + +# FILENAME + +'def FILENAME {trimEnd {1};du}html + +# HEADER + +Expected substitutions: +title - Page title +desc - Page description + +'def HEADER \ +\ +\ +\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + {title} — Syndamia\ +\ +\ + Jump to content

\ +\ + \ +\ +
\ + \ + \ +
{def href_section;0}{def href_url;0}{def slide;0}{def URL;{trimStart {query inputFile};./website/}} + +# FOOTER + +'def FOOTER
\ + \ +
\ +
\ +\ +
︽
\ +\ +\ +\ +\ +\ +\ +\ + + +# Blocks + +'if {env HIGHLIGHT} +'cmdprocess code highlight -O html -f -S {default {normalise {LANG}};text} +'endif + +## Attention + +'let start question
question +'let end question
+ +'let start warn
warn +'let end warn
+ +'let start important
important +'let end important
+ +'let start note
+'let end note
+ +## Headers + +For each header (except H1) we'll add a "gap" element and an anchor link to the end. +The gap is only for visual purposes. + +href function +'def fhref {default {normalise {1}};section-{inc {2}}} +auto href +'def ahref {def href;{fhref {query line};href_section}}{href} +url href +'def uhref {url {1};#{fhref {1};href_url}} + +'let start header2

+'let end header2

+'let start header3

+'let end header3

+'let start header4

+'let end header4

+'let start header5
+'let end header5
+'let start header6
+'let end header6
+ +## Teaching + +'let start solution-link
< +'let end solution-link >
+ +## Contents + +'let start contents

Contents

+'let end contents
+ +## Presentations + +'let start font18
+'let end font18
+'let start centered18
+'let end centered18
+'let start slide18
+'let end slide18
+'let start middle_slide18
+'let end middle_slide18
+'let start title_slide18
+'let end title_slide18
+ +'let start font20
+'let end font20
+'let start centered20
+'let end centered20
+'let start slide20
+'let end slide20
+'let start middle_slide20
+'let end middle_slide20
+'let start title_slide20
+'let end title_slide20
+ +'let start font22
+'let end font22
+'let start centered22
+'let end centered22
+'let start slide22
+'let end slide22
+'let start middle_slide22
+'let end middle_slide22
+'let start title_slide22
+'let end title_slide22
+ +'let start font25
+'let end font25
+'let start centered25
+'let end centered25
+'let start slide25
+'let end slide25
+'let start middle_slide25
+'let end middle_slide25
+'let start title_slide25
+'let end title_slide25
+ +'let start font27
+'let end font27
+'let start centered27
+'let end centered27
+'let start slide27
+'let end slide27
+'let start middle_slide27
+'let end middle_slide27
+'let start title_slide27
+'let end title_slide27
+ +'let start font35
+'let end font35
+'let start centered35
+'let end centered35
+'let start slide35
+'let end slide35
+'let start middle_slide35
+'let end middle_slide35
+'let start title_slide35
+'let end title_slide35
+ +'let start font
+'let end font
+'let start centered
+'let end centered
+'let start slide
+'let end slide
+'let start middle_slide
+'let end middle_slide
+'let start title_slide
+'let end title_slide
+ +'let start row
+'let end row
+'let start sqrow
+'let end sqrow
+ +'let start width5%
+'let end width5%
+'let start width10%
+'let end width10%
+'let start width15%
+'let end width15%
+'let start width20%
+'let end width20%
+'let start width25%
+'let end width25%
+'let start width30%
+'let end width30%
+'let start width35%
+'let end width35%
+'let start width40%
+'let end width40%
+'let start width45%
+'let end width45%
+'let start width50%
+'let end width50%
+'let start width55%
+'let end width55%
+'let start width60%
+'let end width60%
+'let start width65%
+'let end width65%
+'let start width70%
+'let end width70%
+'let start width75%
+'let end width75%
+'let start width80%
+'let end width80%
+'let start width85%
+'let end width85%
+'let start width90%
+'let end width90%
+'let start width95%
+'let end width95%
+ +'let start fright
+'let end fright
+'let start column
+'let end column
+ +# Substitutions + +'def due_for_rework {url {b {i Due for rework}};/rework.html} +'def nohtml {greplace {1};<;<\;} + +## Country flags + +'def gb ENG +'def bg BGN + +## File types + +'def ft-photo +'def ft-text +'def ft-zip +'def ft-movie +'def ft-markdown +'def ft-browser + +## Pagenav + +Expects substitutions: +reading +created +edited + +'def breadcrumb » {def x/...;{>= {count {1};/};1}}{if {x/...};{url {substrBefore {1};/};{default {2};./}};{italic {substrAfter {1};/}}} {{if {x/...};breadcrumb;none} {substrAfter {1};/};{substrAfter {2};../}} + +'def pagenav + +## Presentations + +'def line
+ +'def presentation-controller

\ + + +'def newrow
+ +'def br1
+'def br2
+'def br3
+'def br4
+'def br5
+'def br6
+'def br7
+'def br8
+'def br9
+ +## Pagination + + 1 2 3 4 5 +{pagination START_URL;PREV_TITLE;PREV_URL;NEXT;NEXT_URL} + +'def pagination {if {1};{code {url {nohtml <<};{1}}} || }{if {2};{code {url {nohtml <} {2};{3}}}}{if {2}{4}; || }{if {4};{code {url {4} {nohtml >};{5}}}} + +'else +'exit 1 +'endif -- cgit v1.3.1-26-gb76a From fd1cbd9d3453bfc41893afc3f88308188ad07cfe Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 12 Sep 2026 15:41:07 +0300 Subject: chore: Update dunbar --- dunbar | 2 +- make.sh | 4 ++-- src/INIT.du | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/INIT.du') diff --git a/dunbar b/dunbar index c8d67ca..eaa4cb0 160000 --- a/dunbar +++ b/dunbar @@ -1 +1 @@ -Subproject commit c8d67cab27f8ab93289fa69e3291367fb083ed73 +Subproject commit eaa4cb0123bcf01056d4dc400f2c3e513f41e967 diff --git a/make.sh b/make.sh index 2437873..c18af74 100755 --- a/make.sh +++ b/make.sh @@ -47,9 +47,9 @@ prepare() { } build() { - OUTPUT_FORMAT=HTML "$AWK" \ + "$AWK" \ -f ./dunbar/dunbar_awk/dunbar.awk \ - ./dunbar/stdenv/sgml.du \ + ./dunbar/stdenv/lang/html.du ./dunbar/stdenv/code.du \ -c "$SRC/INIT.du" \ $(find "$DST" -type f -name '*.du') diff --git a/src/INIT.du b/src/INIT.du index 717f259..e11e835 100644 --- a/src/INIT.du +++ b/src/INIT.du @@ -1,6 +1,6 @@ 'hide Necessary definitions for all pages under src -'if {eq {ifn {OUTPUT_FORMAT};{env OUTPUT_FORMAT}};HTML} +'if {or {empty {env OUTPUT_FORMAT}};{eq HTML;{env OUTPUT_FORMAT}}} # FILENAME -- cgit v1.3.1-26-gb76a From 51af35b9e6993e62000ef9be7a3a644a629a6c78 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 12 Sep 2026 18:39:34 +0300 Subject: fix(INIT.du): Do not pass code without language to highlight Because highlight will escape all HTML entities, so for example bold text inside code will be escaped --- src/INIT.du | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/INIT.du') diff --git a/src/INIT.du b/src/INIT.du index e11e835..d03720a 100644 --- a/src/INIT.du +++ b/src/INIT.du @@ -159,7 +159,7 @@ desc - Page description # Blocks 'if {env HIGHLIGHT} -'cmdprocess code highlight -O html -f -S {default {normalise {LANG}};text} +'cmdprocess code {if {LANG};highlight -O html -f -S {default {normalise {LANG}};text};cat} 'endif ## Attention -- cgit v1.3.1-26-gb76a From 3bf2c2004c1c3ea1748983247e1fcf12913d587f Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 14 Sep 2026 11:39:40 +0300 Subject: feat(src): Final markup fixes and dunbar update --- dunbar | 2 +- src/INIT.du | 17 +++++- src/blog/bash-is-weird/index.du | 5 -- src/blog/connect-to-mysql-in-dotnet-ef/index.du | 4 +- src/blog/fix-no-frame-buffer-plan9/index.du | 1 - src/blog/fix-qc-timeout/index.du | 4 -- .../index.du | 2 - .../index.du | 25 +++----- src/blog/how-to-encrypt-email/index.du | 6 +- .../index.du | 5 +- .../install-drivers-for-epson-scanners/index.du | 4 +- .../managing-apps-with-adb-without-root/index.du | 8 +-- .../mundus-first-shot-at-gamedev/basic-concepts.du | 4 +- src/blog/mundus-first-shot-at-gamedev/timeline.du | 6 +- .../mundus-first-shot-at-gamedev/user-interface.du | 2 +- src/blog/plan9-in-linux-mouse-menus/index.du | 8 +-- .../sane-explanation-of-compilers/part-1/index.du | 71 +++++++++++----------- src/blog/taming-the-fun-too/index.du | 10 +-- .../index.du | 32 ++++------ src/blog/turn-off-notifications-windows/index.du | 2 - src/blog/virt-manager-freeze-on-browse/index.du | 6 +- src/blog/windows-run-dialog/index.du | 4 +- src/teaching/oop-2023/week1/good-software.du | 2 + src/teaching/upp-2023/week12/index.du | 8 ++- src/teaching/upp-2025/week13/index.du | 2 +- 25 files changed, 116 insertions(+), 124 deletions(-) (limited to 'src/INIT.du') diff --git a/dunbar b/dunbar index eaa4cb0..efb7d51 160000 --- a/dunbar +++ b/dunbar @@ -1 +1 @@ -Subproject commit eaa4cb0123bcf01056d4dc400f2c3e513f41e967 +Subproject commit efb7d51a645b0038e22eabbe494ddc0598962458 diff --git a/src/INIT.du b/src/INIT.du index d03720a..02e6eff 100644 --- a/src/INIT.du +++ b/src/INIT.du @@ -162,19 +162,32 @@ desc - Page description 'cmdprocess code {if {LANG};highlight -O html -f -S {default {normalise {LANG}};text};cat} 'endif +'let start {unordered}default

+'let end {unordered}default

+'let start {ordered}default

+'let end {ordered}default

+ ## Attention 'let start question
question 'let end question
+'let start {question}default

+'let end {question}default

'let start warn
warn 'let end warn
+'let start {warn}default

+'let end {warn}default

'let start important
important 'let end important
+'let start {important}default

+'let end {important}default

'let start note
'let end note
+'let start {note}default

+'let end {note}default

## Headers @@ -339,6 +352,8 @@ url href # Substitutions +'def fn_ref {sup {1}} + 'def due_for_rework {url {b {i Due for rework}};/rework.html} 'def nohtml {greplace {1};<;<\;} @@ -363,7 +378,7 @@ reading created edited -'def breadcrumb » {def x/...;{>= {count {1};/};1}}{if {x/...};{url {substrBefore {1};/};{default {2};./}};{italic {substrAfter {1};/}}} {{if {x/...};breadcrumb;none} {substrAfter {1};/};{substrAfter {2};../}} +'def breadcrumb » {def x/...;{>= {count {1};/};1}}{if {x/...};{url {substrBefore {1};/};{default {2};./}};{italic {1}}} {{if {x/...};breadcrumb;none} {substrAfter {1};/};{substrAfter {2};../}} 'def pagenav