diff --git a/.gitignore b/.gitignore index 474022f..ef22b71 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ css/code.css pgvv/ all_chars.txt **/fonts/**/*-Subset.* -woff2/ -**/serve_* diff --git a/acl.cool/site/assets/EasySalsa.pdf.draft b/acl.cool/site/assets/EasySalsa.pdf.draft deleted file mode 100644 index 060b56d..0000000 Binary files a/acl.cool/site/assets/EasySalsa.pdf.draft and /dev/null differ diff --git a/acl.cool/site/draft/nomad.dj b/acl.cool/site/draft/nomad.dj index fe24358..d83273e 100644 --- a/acl.cool/site/draft/nomad.dj +++ b/acl.cool/site/draft/nomad.dj @@ -78,7 +78,7 @@ let various_floats = [1.0; 4.0; 9.0] let together : float ListMonad.t = ListMonad.bind sqrt various_floats ``` -Here's an example of the monad in action. `together` is `[1.0; -1.0] @ [2.0; -2.0] @ [3.0; -3.0]`, which of course is `[1.0; -1.0; 2.0; -2.0; 3.0; -3.0]`. In this case, we used the taking-all-branches nature of the list monad to compute all the square roots of the numbers in the provided list. If taking the square-root is considered to be an ambiguous operation[^i-know], then *yada yada*. This monad is often used to run operations that have some ambiguous result, to capture the idea that multiple possible return values are valid, e.g. "the square root of four" can be considered ambiguous, since both 2^2^ and (-2)^2^ are 4. Another example of this can be found in parsing with ambiguous grammars. Parser combinator libraries often make it easy to define ambiguous-on-the-face parsers and resolve the ambiguity through some convention, but perhaps +Here's an example of the monad in action. `together` is `[1.0; -1.0] @ [2.0; -2.0] @ [3.0; -3.0]`, which of course is `[1.0; -1.0; 2.0' -2.0; 3.0; -3.0]`. In this case, we used the taking-all-branches nature of the list monad to compute all the square roots of the numbers in the provided list. If taking the square-root is considered to be an ambiguous operation[^i-know], then *yada yada*. This monad is often used to run operations that have some ambiguous result, to capture the idea that multiple possible return values are valid, e.g. "the square root of four" can be considered ambiguous, since both 2^2^ and (-2)^2^ are 4. Another example of this can be found in parsing with ambiguous grammars. Parser combinator libraries often make it easy to define ambiguous-on-the-face parsers and resolve the ambiguity through some convention, but perhaps looks like multiple return with only one in the chain, but the sequencing is what gives us nondeterminism; multiple return doesn't chain the same. To do this without a monad we'd need to do diff --git a/acl.cool/site/writings/culture-order.dj b/acl.cool/site/writings/culture-order.dj index 67e826b..35fd2be 100644 --- a/acl.cool/site/writings/culture-order.dj +++ b/acl.cool/site/writings/culture-order.dj @@ -1,6 +1,6 @@ # Reading Order of The Culture -I've generated a reading order dependency graph for books in Iain M. Banks' unsurpassable Sci-Fi classic, the _Culture_ series. The idea is that if there's an arrow from book A to book B, then to get the most possible enjoyment from either A or B, A should be read before B. +I've generated a reading order dependency graph for books in Iain M. Banks' monumental _Culture_ series. The idea is that if there's an arrow from book A to book B, then to get the most possible enjoyment from either A or B, A should be read before B. ![A dependency graph diagram of what Culture books must eb read before what others.](/culture.dot.png) Above is the graph, and [right here](/culture.dot.txt) is the vizgraph description file that lists my rationale for each dependency. diff --git a/build.sh b/build.sh index b637f49..d787f6b 100755 --- a/build.sh +++ b/build.sh @@ -1,77 +1,48 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash --pure -#! nix-shell -p bash harfbuzz soupault woff2 jotdown python3 --pure +#!/bin/bash -if ! [[ -d pgvv/ ]]; then - python3 -m venv pgvv - source ./pgvv/bin/activate - python3 -m pip install --upgrade pip - pip install --upgrade pygments - deactivate -fi +./deps.sh + +find acl.cool/serve/ ytheleus.org/serve/ -type f -mmin +11 -delete function soup_config { rm soupault.toml cp ../soupault.toml soupault.toml - cat soupault.toml.frag* >>soupault.toml + cat soupault.toml.frag* >> soupault.toml } source ./pgvv/bin/activate -find acl.cool/site/ ytheleus.org/site/ -type f \( -name '*.dj' -o -name '*.html' \) -exec cat {} + >all_chars.txt -cat common_chars.txt >>all_chars.txt +find acl.cool/site/ ytheleus.org/site/ -type f \( -name '*.dj' -o -name '*.html' \) -exec cat {} + > all_chars.txt +cat common_chars.txt >> all_chars.txt for font in fonts/JuliaMono/*{-Light,-Regular,-SemiBold}{,Italic}.woff2; do - woff2_decompress "$font" - ttf_font="${font%.woff2}.ttf" - - subset_ttf="${ttf_font%.ttf}-Subset.ttf" - hb-subset "$ttf_font" \ - --output-file="$subset_ttf" \ - --text-file=all_chars.txt \ - --layout-features='*' \ - --passthrough-tables - - woff2_compress "$subset_ttf" - - rm "$subset_ttf" "$ttf_font" + echo "Subsetting $font" + pyftsubset "$font" --flavor=woff2 --text-file=all_chars.txt --layout-features='*' \ + --output-file="$(awk -F '.woff2' '{print $1}' <<< "$font")-Subset.woff2" done -for font in \ - fonts/Alegreya/static/Alegreya-{Regular,Italic,Bold,BoldItalic}.ttf \ - fonts/Alegreya_Sans/AlegreyaSans-{Regular,Italic,Bold,BoldItalic}.ttf; do - subset_ttf="${font%.ttf}-Subset.ttf" - hb-subset "$font" \ - --output-file="$subset_ttf" \ - --text-file=all_chars.txt \ - --layout-features='*' \ - --passthrough-tables - - woff2_compress "$subset_ttf" - - rm "$subset_ttf" -done +#for font in fonts/Alegreya/static/Alegreya-{Regular,Italic,Bold,BoldItalic}.ttf; do +# echo "Subsetting $font" +# pyftsubset "$font" --text-file=all_chars.txt --layout-features='*' \ +# --output-file="$(awk -F '.ttf' '{print $1}' <<< "$font")-Subset.ttf" +#done +# +#for font in fonts/Alegreya_Sans/AlegreyaSans-{Regular,Italic,Bold,BoldItalic}.ttf; do +# echo "Subsetting $font" +# pyftsubset "$font" --text-file=all_chars.txt --layout-features='*' \ +# --output-file="$(awk -F '.ttf' '{print $1}' <<< "$font")-Subset.ttf" +#done rm css/code.css -pygmentize -f html -S algol_nu | grep -v 'line-height' >css/code.css +pygmentize -f html -S algol_nu | grep -v 'line-height' > css/code.css builtin pushd acl.cool soup_config soupault - -NEXT_DIR="serve_$(date +%s)" -cp -a serve "$NEXT_DIR" -ln -sfn "$NEXT_DIR" serve_ - popd builtin pushd ytheleus.org soup_config soupault - -NEXT_DIR="serve_$(date +%s)" -cp -a serve "$NEXT_DIR" -ln -sfn "$NEXT_DIR" serve_ - popd deactivate diff --git a/css/fonts.css b/css/fonts.css index c5e45e0..b2e464a 100644 --- a/css/fonts.css +++ b/css/fonts.css @@ -56,56 +56,56 @@ @font-face { font-family: 'BodySerif'; - src: url('../assets/fonts/Alegreya/static/Alegreya-Regular-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya/static/Alegreya-Regular.ttf') format('truetype'); font-weight: normal; font-style: normal; } @font-face { font-family: 'BodySerif'; - src: url('../assets/fonts/Alegreya/static/Alegreya-Italic-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya/static/Alegreya-Italic.ttf') format('truetype'); font-weight: normal; font-style: italic; } @font-face { font-family: 'BodySerif'; - src: url('../assets/fonts/Alegreya/static/Alegreya-Bold-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya/static/Alegreya-Bold.ttf') format('truetype'); font-weight: bold; font-style: normal; } @font-face { font-family: 'BodySerif'; - src: url('../assets/fonts/Alegreya/static/Alegreya-BoldItalic-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya/static/Alegreya-BoldItalic.ttf') format('truetype'); font-weight: bold; font-style: italic; } @font-face { font-family: 'BodySans'; - src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-Regular-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-Regular.ttf') format('truetype'); font-weight: normal; font-style: normal; } @font-face { font-family: 'BodySans'; - src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-Italic-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-Italic.ttf') format('truetype'); font-weight: normal; font-style: italic; } @font-face { font-family: 'BodySans'; - src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-Bold-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-Bold.ttf') format('truetype'); font-weight: bold; font-style: normal; } @font-face { font-family: 'BodySans'; - src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-BoldItalic-Subset.woff2') format('woff2'); + src: url('../assets/fonts/Alegreya_Sans/AlegreyaSans-BoldItalic.ttf') format('truetype'); font-weight: bold; font-style: italic; } diff --git a/css/index.css b/css/index.css new file mode 100644 index 0000000..753f81a --- /dev/null +++ b/css/index.css @@ -0,0 +1,7 @@ +@import url(fonts.css); + +@import url(looks.css); + +@import url(layout.css); + +@import url(code.css); \ No newline at end of file diff --git a/deps.sh b/deps.sh new file mode 100755 index 0000000..7834f41 --- /dev/null +++ b/deps.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +if ! [[ -d pgvv/ ]]; then + python3 -m venv pgvv + source ./pgvv/bin/activate + python3 -m pip install --upgrade pip + pip install --upgrade pygments + pip install --upgrade fonttools + pip install --upgrade brotli + deactivate +fi + +which opam 2> /dev/null +if [[ $? == 0 ]]; then + opam install -y soupault +else + echo 'failed to install soupault with opam' >&2 + exit 2 +fi + +which cargo 2> /dev/null +if [[ $? == 0 ]]; then + cargo install jotdown +else + echo 'failed to install jotdown with cargo' + exit 3 +fi diff --git a/shared_templates/main.html b/shared_templates/main.html index 8303b84..ac13523 100644 --- a/shared_templates/main.html +++ b/shared_templates/main.html @@ -4,10 +4,7 @@ <!-- set automatically, see soupault.conf --> - - - - +