aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/cgi_spine_search.org2
-rw-r--r--org/config_d_cfte.org2
-rw-r--r--org/config_dub.org2
-rw-r--r--org/config_make.org359
-rw-r--r--org/config_meson.org2
-rw-r--r--org/config_nix.org2
6 files changed, 8 insertions, 361 deletions
diff --git a/org/cgi_spine_search.org b/org/cgi_spine_search.org
index 13aea47..d71445c 100644
--- a/org/cgi_spine_search.org
+++ b/org/cgi_spine_search.org
@@ -41,7 +41,7 @@ struct Version {
#+NAME: spine_version_set
#+BEGIN_SRC d
-enum _ver = Version(0, 11, 3);
+enum _ver = Version(0, 12, 0);
#+END_SRC
** compilation restrictions (supported compilers)
diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org
index dbbf6d8..bb8695c 100644
--- a/org/config_d_cfte.org
+++ b/org/config_d_cfte.org
@@ -27,7 +27,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC d
-0, 11, 3
+0, 12, 0
#+END_SRC
*** set program version tangle :version:
diff --git a/org/config_dub.org b/org/config_dub.org
index d5994c0..839adf9 100644
--- a/org/config_dub.org
+++ b/org/config_dub.org
@@ -21,7 +21,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
** dub
diff --git a/org/config_make.org b/org/config_make.org
index 9f4b00b..8214e4e 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -22,7 +22,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
*** build tools if specified
@@ -611,8 +611,8 @@ markup-file-samples:
#+NAME: make_cmd_dev_misc
#+BEGIN_SRC makefile
# version_tag:
-# echo "DRV=0.11.3; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
-# echo "git tag -f doc-reform_v0.11.3 -m\"doc-reform spine-0.11.3\" HEAD"
+# echo "DRV=0.12.0; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
+# echo "git tag -f doc-reform_v0.12.0 -m\"doc-reform spine-0.12.0\" HEAD"
# archive spine output (www)
spineWWWarchive:
@@ -1842,359 +1842,6 @@ export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
- /srv/www/spine/latex
-** make
-
-#+HEADER: :tangle /srv/www/spine/latex/makefile
-#+BEGIN_SRC makefile
-# nix build
-#build:
-# nix-build
-
-# clean, deletes latex processing workfiles
-clean:
- for ext in "aux" "log" "toc"; do \
- rm *.$ext; \
- done;
-
-# rm *.aux;
-# rm *.log;
-# rm *.toc;
-
-# clean, deletes latex processing workfiles for landscape documents
-clean-landscape:
- for ext in "aux" "log" "toc"; do \
- rm *.landscape.$ext; \
- done;
-
-# clean, deletes latex processing workfiles for portrait documents
-clean-portrait:
- for ext in "aux" "log" "toc"; do \
- rm *.portrait.$ext; \
- done;
-
-# clean, deletes latex processing workfiles for a4 documents
-clean-size papersize:
- for ext in "aux" "log" "toc"; do \
- rm *.{{papersize}}.portrait.$ext; \
- done; \
- echo "removed latex {{papersize}} workfiles";
-
-# wipe clean, deletes latex processing workfiles & pdfs
-wipe: clean
- rm *.pdf;
-
-# wipe clean, deletes latex processing workfiles & pdfs for landscape documents
-wipe-landscape: clean-landscape
- rm *.landscape.pdf;
-
-# wipe clean, deletes latex processing workfiles & pdfs for portrait documents
-wipe-portrait: clean-portrait
- rm *.portrait.pdf;
-
-# wipe clean, deletes latex processing workfiles & pdfs for a4 documents
-wipe-size papersize: (clean-size papersize)
- rm *.{{papersize}}.*.pdf; \
- echo "removed {{papersize}} pdfs";
-
-# xelatex pdf output
-latex: wipe portrait landscape
-
-# xelatex pdf portrait output
-portrait:
- for file in `ls *.portrait.tex`; do \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "portrait pdfs complete";
-
-# xelatex pdf landscape output
-landscape:
- for file in `ls *.landscape.tex`; do \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "landscape pdfs complete";
-
-# xelatex pdf output
-pdf: wipe
- for file in `ls *.tex`; do \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "pdfs complete";
-
-# xelatex pdf a4 output of papersize given, provide papersize
-pdf-size papersize: (pdf-portrait papersize) (pdf-landscape papersize)
- echo "{{papersize}} pdfs complete";
-
-# xelatex pdf portrait output of papersize given, provide papersize
-pdf-portrait papersize:
- echo "{{papersize}} portrait ->"; \
- for file in `ls *.{{papersize}}.portrait.tex`; do \
- echo $file; \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "{{papersize}} portrait pdfs complete";
-
-# xelatex pdf landscape output of papersize given, provide papersize
-pdf-landscape papersize:
- echo "{{papersize}}landscape ->"; \
- for file in `ls *.{{papersize}}.landscape.tex`; do \
- echo $file; \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "{{papersize}} landscape pdfs complete";
-#+END_SRC
-
-** README
-
-#+HEADER: :tangle /srv/www/spine/latex/README
-#+BEGIN_SRC sh
--*- mode: org -*-
-things nix to be placed in $SpineOUT/latex
-
-cp -vi nix.org $SpineOUT/latex/.
-
-$SpineBIN/spine --verbose --latex --output="$SpineOUT" $SpinePOD/*
-$SpineBIN/spine --verbose --latex --set-papersize="a4,letter.portrait,b4.portrait" --output="$SpineOUT" $SpinePOD/*
-#+END_SRC
-
-** shell.nix
-*** shell hook
-**** shell hook
-
-#+NAME: shell_hook_
-#+HEADER: :noweb yes
-#+BEGIN_SRC sh
-if [[ -e ".envrc" ]]; then
- source .envrc
-fi
-eval "$(starship init bash)"
-for texfile in <<tex_files>>; do
- for run in {1..<<repeat_run>>}; do
- xelatex -interaction=nonstopmode $texfile
- done
-done
-rm *.{aux,log,out,toc}
-ls *.tex; ls *.pdf;
-#+END_SRC
-
-#+NAME: shell_hook
-#+BEGIN_SRC sh
-if [[ -e ".envrc" ]]; then
- source .envrc
-fi
-eval "$(starship init bash)"
-for size in <<paper_sizes>>; do
- for orient in <<paper_orientations>>; do
- for texfile in *.$size.$orient.tex; do
- for run in {1..<<repeat_run>>}; do
- xelatex -interaction=nonstopmode $texfile
- done
- done
- done
-done
-rm *.{aux,log,out,toc}
-ls *.tex; ls *.pdf;
-#+END_SRC
-
-**** shell hook variables
-***** tex files
-
-#+NAME: tex_files
-#+BEGIN_SRC sh
-{sisu_markup,the_wealth_of_networks.yochai_benkler,two_bits.christopher_kelty,viral_spiral.david_bollier}.en.*.tex
-#+END_SRC
-
-***** paper sizes
-
-#+NAME: paper_sizes
-#+BEGIN_SRC sh
-"a4" "b4" "letter"
-#+END_SRC
-
-***** paper orientations
-
-#+NAME: paper_orientations
-#+BEGIN_SRC sh
-"portrait"
-#+END_SRC
-
-***** repeat xeletex run
-
-#+NAME: repeat_run
-#+BEGIN_SRC sh
-3
-#+END_SRC
-
-***** env paths init
-
-#+NAME: spine_proj
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform
-#+END_SRC
-
-#+NAME: spine_src
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform/src
-#+END_SRC
-
-#+NAME: spine_bin
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform/result/bin
-#+END_SRC
-
-#+NAME: spine_doc
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
-#+END_SRC
-
-#+NAME: spine_pod
-#+BEGIN_SRC sh
-$SpineDOC/markup/pod
-#+END_SRC
-
-#+NAME: spine_out
-#+BEGIN_SRC sh
-/srv/www/spine
-#+END_SRC
-
-*** shell.nix
-
-#+HEADER: :tangle /srv/www/spine/latex/shell.nix
-#+HEADER: :noweb yes
-#+BEGIN_SRC nix
-#!/usr/bin/env -S nix-shell --pure
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs;
-mkShell {
- buildInputs = [
- <<package_list_latex>>
- ];
- shellHook = ''
- # <<shell_hook>>
- '';
-}
-#+END_SRC
-
-*** packages.nix
-
-#+NAME: package_list_latex
-#+BEGIN_SRC nix
-### nix_related
-nixFlakes
-nix-prefetch-git
-validatePkgConfig
-jq
-git
-### d_build_related
-## package manager
-dub
-## compiler
-ldc
-rund
-# ### pdf_latex_related
-source-sans-pro
-source-serif-pro
-source-code-pro
-texlive.combined.scheme-full
-# texlive.combined.scheme-tetex
-evince
-zathura
-apvlv
-### candy
-starship
-#+END_SRC
-
-*** packages.nix
-
-#+NAME: package_list_inherit_latex
-#+BEGIN_SRC nix
-(import ./packages.nix { inherit pkgs; })
-#+END_SRC
-
-#+HEADER: :tangle /srv/www/spine/latex/packages.nix
-#+HEADER: :noweb yes
-#+BEGIN_SRC nix
-### nix_related
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
- <<package_list_latex>>
-]
-#+END_SRC
-
-** env
-*** .envrc
-
-#+HEADER: :tangle /srv/www/spine/latex/.envrc
-#+BEGIN_SRC sh
-NIX_ENFORCE_PURITY=0
-if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
-# https://github.com/nix-community/nix-direnv
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
-fi
-if [ -e .env/local ]; then
- source_env_if_exists .env/local || source .env/local
-fi
-#+END_SRC
-
-*** .env/local
-
-#+HEADER: :tangle /srv/www/spine/latex/.env/local
-#+HEADER: :noweb yes
-#+BEGIN_SRC sh
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
-#export NIX_PATH=/nixpkgs-ra/nixpkgs
-# reload when these files change
-# watch_file flake.nix
-# watch_file flake.lock
-## load the flake devShell
-# eval "$(nix print-dev-env)"
-# echo $NIX_BUILD_TOP
-export PROJ="~/grotto/repo/git.repo/projects/project-spine"
-export SpinePROJ=<<spine_proj>>
-export SpineSRC=<<spine_src>>
-export SpineBIN=<<spine_bin>>
-export SpineDOC=<<spine_doc>>
-export SpinePOD=<<spine_pod>>
-export SpineOUT=<<spine_out>>
-#use nix
-if [ -e .env/echo-nixNote ]; then
- source .env/echo-nixNote
-fi
-#+END_SRC
-
-** git
-*** .gitignore
-
-#+HEADER: :tangle /srv/www/spine/latex/.gitignore
-#+BEGIN_SRC sh
-# git ls-files --others --exclude-from=.git/info/exclude
-,*
-!README
-!nix.org
-!shell.nix
-!packages.nix
-!.gitignore
-!.envrc
-!.env/
-!.env/local
-!sty/
-!sty/*.sty
-!sisu_markup.en.*.tex
-!two_bits.christopher_kelty.en.*.tex
-!the_wealth_of_networks.yochai_benkler.en.*.tex
-!viral_spiral.david_bollier.en.*.tex
-#+END_SRC
-
** notes
- vim {the_wealth_of_networks.yochai_benkler,two_bits.christopher_kelty,viral_spiral.david_bollier}.en.a4.portrait.tex
diff --git a/org/config_meson.org b/org/config_meson.org
index b09d945..373f22a 100644
--- a/org/config_meson.org
+++ b/org/config_meson.org
@@ -23,7 +23,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
*** subprojects
diff --git a/org/config_nix.org b/org/config_nix.org
index a62990f..8286b05 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1611,7 +1611,7 @@ mkDubDerivation rec {
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
*** set names SET