parse tt tags as code, resolves #10

Author: nickmonad

.github/workflows/update.yml

@@ -1,9 +1,12 @@
 name: update-and-publish
 
 on:
+  push:
+    branches:
+      - master
+
   schedule:
-  # run every 12 hours
-  - cron: '0 */12 * * *'
+    - cron: '0 */12 * * *' # every 12 hours
 
 env:
   CARGO_TERM_COLOR: always
@@ -15,33 +18,38 @@ jobs:
     - name: checkout
       uses: actions/checkout@v4
 
-    - name: generate
+    - name: install just
+      uses: extractions/setup-just@f8a3cce218d9f83db3a2ecd90e41ac3de6cdfd9b
+
+    - name: install dependencies
+      run: |
+        just install
+
+    - name: generate markdown
       run: |
         git config --global --add safe.directory '*'
-        ./scripts/install-tailwind.sh
-        ./scripts/install-pagefind.sh
-        ./scripts/bips.sh
-        ./scripts/tailwind.sh
-        ./scripts/static.sh
-        ./scripts/generate.sh
-
-    - name: zola
+        just bips
+        just tailwind
+        just static
+        just generate
+
+    - name: build site
       run: |
-        wget -q https://github.com/getzola/zola/releases/download/v0.18.0/zola-v0.18.0-x86_64-unknown-linux-gnu.tar.gz
+        wget -q https://github.com/getzola/zola/releases/download/v0.21.0/zola-v0.21.0-x86_64-unknown-linux-gnu.tar.gz
         tar xzf zola*.tar.gz
         cd web
         ../zola build
         cd ..
         rm -rf zola*
 
-    - name: pagefind
+    - name: run pagefind
       run: |
-        pagefind --site web/public
+        just pagefind
 
     - name: commit and push
       uses: EndBug/add-and-commit@v7.2.0
       with:
         default_author: github_actions
         branch: master
-        message: 'cron: update bips submodule and build'
+        message: 'update bips submodule and build'
         push: true

Justfile

@@ -0,0 +1,37 @@
+default: install build
+
+nix:
+    nix-shell --run fish
+
+install-tailwind:
+    curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.1/tailwindcss-linux-x64
+    chmod +x tailwindcss*
+    mkdir -p bin
+    mv tailwindcss* bin/tailwindcss
+
+install-pagefind:
+    cargo install pagefind
+
+install: install-tailwind install-pagefind
+
+bips:
+    git submodule init && git submodule update --recursive --remote
+
+tailwind:
+    ./bin/tailwindcss -c web/tailwind.config.js -i web/static/style.tailwind.css -o web/static/style.css --minify
+
+pagefind:
+    pagefind --site web/public
+
+static:
+    ./scripts/static.sh
+
+generate:
+    find bips -maxdepth 1 -type f -name 'bip-*' \
+        | cargo run -- generate
+
+[working-directory: 'web']
+zola:
+    zola build
+
+build: bips tailwind static generate zola pagefind

scripts/bips.sh

@@ -0,0 +1,11 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    cargo
+    clippy
+    rustc
+    rustfmt
+    zola
+  ];
+}

scripts/generate.sh

@@ -451,6 +451,7 @@ fn render_line(line: &str, refs: &mut Vec<String>) -> Result<String, Infallible>
         .and_then(replace_bold)
         .and_then(replace_italic)
         .and_then(replace_code_tag)
+        .and_then(replace_tt_tag)
 }
 
 fn replace_nop(line: String) -> Result<String, Infallible> {
@@ -461,6 +462,10 @@ fn replace_code_tag(line: String) -> Result<String, Infallible> {
     Ok(line.replace("<code>", "`").replace("</code>", "`"))
 }
 
+fn replace_tt_tag(line: String) -> Result<String, Infallible> {
+    Ok(line.replace("<tt>", "`").replace("</tt>", "`"))
+}
+
 fn replace_bold(line: String) -> Result<String, Infallible> {
     let mut buffer = String::new();
     let bold: Vec<(usize, &str)> = line.match_indices("'''").collect();
@@ -948,6 +953,32 @@ mod test {
         )
     }
 
+    // tags
+
+    #[test]
+    fn tag_code() {
+        assert_eq!(
+            render_line(
+                "this is some <code>print()</code> text",
+                &mut Vec::default()
+            )
+            .unwrap(),
+            "this is some `print()` text".to_string(),
+        )
+    }
+
+    #[test]
+    fn tag_tt() {
+        assert_eq!(
+            render_line(
+                "this is some <tt>xprv(somestuff*)</tt> text",
+                &mut Vec::default()
+            )
+            .unwrap(),
+            "this is some `xprv(somestuff*)` text".to_string(),
+        )
+    }
+
     // references
 
     #[test]