doc: Release udpate.

* HACKING: Update. * INSTALL: Update. * NEWS: Update. * README: Update. * doc/ANNOUNCE-0.12: New file. * throughout: (janneke) coming out.
2017-11-21 19:22:26 +01:00 · 2017-11-21 19:22:26 +01:00 · ad135d3752
parent e2c2c1f78f
commit ad135d3752
346 changed files with 502 additions and 409 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Jan Nieuwenhuizen <janneke@gnu.org>
+Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 Main author
 All files except the files listed below

--- a/74
+++ b/74
@ -41,14 +41,18 @@ Running ./make.scm produces a `script' file.

 * ROADMAP
 ** TODO 
-*** release 0.12
-  - mescc: compile a mes-tcc that can compile gcc-4.7.
 *** release 0.x, unsorted
+  - mes+mescc: compile a mes-tcc that can compile gcc-4.7.
+  - mes: prepare src/mes.c for M2-Planet transpiler.
+  - mes: use more efficient scheme continuation stack (wip-array?)
+  - mes: drop SCM stack in C / implement call/cc a la guile-1.8 setjmp?
  - mescc: refactor type(/ptr?) system; expr->type and ast-type->type.
  - mescc: refactor initializers.
-  - mescc: record and support function types, and thus foo ()->bar.
+  - mescc: record and support function types, and thus foo ()->bar, *foo ().
  - mescc: refactor switch statement to support unpatched tinycc.
-  - mes/mescc: bootstrap a minimal-Guile (libguile/eval.c,ice-9/eval.scm).
+  - mes/mescc: bootstrap a minimal-Guile
+    + libguile/{eval,init,list,strings,values,..}.c
+    + ice-9/eval.scm
  - mescc: have mes-tcc pass all scaffold/tests, scaffold/tinycc tests.
  - mescc: compile a mes-tcc that can compile gcc-4.7.
  - mescc: refactor switch; support heterogeneous switch case.
@ -62,23 +66,18 @@ Running ./make.scm produces a `script' file.
  - mescc: some success with 8cc,pcc,guile/libguile/eval.c.
  - build: guile/guix/make.scm: add file-types, intermediate, hash all dependencies
  - build: make.scm: imperative->declaritive
-  - hex2: produce ELF_sym and ELF_str tables from hex2; nicer for objdump -d, gdb (in mescc-tools?)
-  - compile src/mes.c with M2-Planet.
-  - rewrite src/mes.c in stage0's stage2 LISP.
-  - and/or: rewrite src/mes.c M1
-  - and/or: connect to GNU Epsilon's VM
-  - and/or: compile Scheme to C, rewrite Mes.c into Mes.scm.
-  - real module support, bonus for supporting Guile's define-module/define-public syntax.
+  - mes: real module support, bonus for supporting Guile's define-module/define-public syntax.
  - get full source syntax-case up (Andre van Tonder?) OR drop it.
+    https://srfi.schemers.org/srfi-72/srfi-72.html
    psyntax/syntax-case and rewrite Nyacc without syntax-case+R7RS Ellipsis.
-  - support regexp OR rewrite Nyacc without regexps.
-  - split-off MesCC as as standalone Guile C compiler project.
+  - mescc: split-off MesCC as as standalone Guile C compiler project.
 *** release 1.0
  - replace GuixSD's bootstrap binaries for x86.
  - add x86_64, replace GuixSD's bootstrap binaries for x86_64.
  - more architectures?
 ** DONE
-*** 0.11: MesCC now compiles a mes-tcc that passes 41/69 of mescc's C tests.
+*** 0.12: Mes+MesCC now compiles mes.c (~3000LOC) in ~4min.
+*** 0.11: MesCC now compiles a mes-tcc that passes 26/69 of mescc's C tests.
 *** 0.10: Mescc now compiles a mes-tcc that compiles a trivial C to a running a.out.
 *** 0.9: Mescc now writes M1 macro assembly files and compiles tcc.
 *** 0.8: Mescc now writes object files in stage0's labeled hex2 format.
@ -93,48 +92,13 @@ eenough to work on compiling tinycc's tcc.c albeit a somewhat modified version.
 *** 0.1: Mes eval/apply feature complete; support syntax-rules, compile main.c using LALR, dump ELF

 * Bugs
-** eval_apply/gc + Nyacc bug
-scripts/messc.mes intermittently exposes a bug in eval_apply/gc when
-Nyacc parses mes.c-sized source.  Running 
-
-    MES_MAX_ARENA=<another-size> scripts/mescc.mes
-
-may [un]cover the bug.  So there is probably some eval_apply-construct
-that Nyacc uses, possiblby indirectly via with-fluid, like (call/cc,
-call-with-current-continuation), that breaks when GC triggers at the
-wrong time.
-** mescc can only compile itself, it cannot full-functionally compile tcc, gcc or guile
+** mes: remove pmatch-car/pmatch-cdr hack.
+** mes+mescc: parse tcc.c->tcc.E works, compile tcc.E -> tcc.M1 segfaults.
+  time GUILE_LOAD_PATH=/home/janneke/src/nyacc/module:$GUILE_LOAD_PATH ../mes/scripts/mescc.mes -E -o tcc.E -I . -I ../mes/lib -I ../mes/include -D 'CONFIG_TCCDIR="usr/lib/tcc"' -D 'CONFIG_TCC_CRTPREFIX="usr/lib:{B}/lib:."' -D 'CONFIG_TCC_ELFINTERP="/gnu/store/70jxsnpffkl7fdb7qv398n8yi1a3w5nx-glibc-2.26.105-g0890d5379c/lib/ld-linux.so.2"' -D 'CONFIG_TCC_LIBPATHS="/home/janneke/src/tinycc/usr/lib:{B}/lib:."' -D 'CONFIG_TCC_SYSINCLUDEPATHS="../mes/include:usr/include:{B}/include"' -D CONFIG_USE_LIBGCC=1 -D 'TCC_LIBGCC="/home/janneke/src/tinycc/usr/lib/libc+tcc-gcc.mlibc-o"' -D CONFIG_TCC_STATIC=1 -D ONE_SOURCE=yes -D TCC_TARGET_I386=1 -D BOOTSTRAP=1 tcc.c
+  time GUILE_LOAD_PATH=/home/janneke/src/nyacc/module:$GUILE_LOAD_PATH MES_ARENA=200000000 ../mes/scripts/mescc.mes -c -o tcc.M1 tcc.E
+** mes: with-fluids: tests/fluids.test test 7 fails with Mes.
 ** mescc: 7n-struct-struct-array.c:  struct file f = {"first.h"};
-** mes.mes cannot read sexps, only --dump's, mes.mes cannot --dump
-** Bootstrap binary mes is too big and opaque to be considered source
-68kB ELF binary which can be disassembled (objdump -d mes.mes).
-** Psyntax is too big and opaque to be considered source
-And needs a patched Guile-1.8 to [re]generate.
 ** test/match.test ("nyacc-simple"): hygiene problem in match
-** Performance
-*** mes is slow
-*** The Scheme reader is very slow.
-*** mescc is slow
-**** compiling mes.c takes mescc.mes 2h30'
-mescc.scm which runs on Guile takes 30"
-** Fluids are a hack for Nyacc.
-*** Translate C-prototype mes.c into annotated hex?
-One idea is to use OriansJ's amazing self-hosting [[https://github.com/oriansj/stage0][stage0]] hex assembler
-and minimal bootstrap binaries and rewrite the mes.c core to directly
-bootstrap into Scheme.
-
-*** Rewrite mes.c in Schemy/Sexp-C and generate annotated hex?
-Another idea (thanks Rutger!) is to rewrite the mes.c core in a s-exp
-C/Assembly variant and thave mescc produce the simple, annotated
-bootstrap binary.
-
-*** Compile the [[https://en.wikipedia.org/wiki/Tiny_C_Compiler][Tiny C Compiler]]
-
-** Build tools do not run on mes
-*** configure needs Bash, Guile
-*** GNUmakefile needs Bash, Guile
-*** build-aux/mes-snarf.scm needs Guile
-*** build-aux/git-changelog needs Perl
 * OLD: Booting from LISP-1.5 into Mes

 Mes started out experimenting with booting from a hex-coded minimal
@ -164,7 +128,7 @@ while Guile is used for bootstrapping.
 info registers
 p/x $eax
 p/x $edx
-set disassemble-next-line
+set disassemble-next-line on
 gdb-display-disassembly-buffer
 b *0x804a79d
 ** Create memory dump with 32 bit Gcc compiled Mes
--- a/8
+++ b/8
@ -8,8 +8,8 @@ Building and Installing Mes
 * Prerequisites
 ** Bootstrapping
 For bootstrapping, the M1 macro assembler and hex2 linker and Nyacc
-*** [[https://github.com/oriansj/mescc-tools][mescc-tools]], 0.2 is known to work.
-*** [[https://savannah.gnu.org/projects/nyacc][Nyacc]], 0.82.4 is known to work.
+*** [[https://github.com/oriansj/mescc-tools][mescc-tools]], 0.4 is known to work.
+*** [[https://savannah.gnu.org/projects/nyacc][Nyacc]], [[https://gitlab.com/janneke/nyacc][patched Nyacc]] 0.80.42 is known to work.
 For development
 ** Development
 For development, there are some more dependencies.
@ -19,8 +19,8 @@ For development, there are some more dependencies.
    guix environment --system=i686-linux -l guix.scm #32 bit only

 *** Other GNU/Linux
-**** [[https://github.com/oriansj/mescc-tools][mescc-tools]], 0.2 is known to work.
-**** [[https://savannah.gnu.org/projects/nyacc][Nyacc]], 0.82.4 is known to work.
+**** [[https://github.com/oriansj/mescc-tools][mescc-tools]], 0.4 is known to work.
+**** [[https://savannah.gnu.org/projects/nyacc][Nyacc]], [[https://gitlab.com/janneke/nyacc][patched Nyacc]] 0.80.42 is known to work.
 **** GNU Gcc, 4.9.3 is known to work.
 The idea is to drop this requirement, of course.

--- a/35
+++ b/35
@ -2,7 +2,7 @@
 #+TITLE: Mes NEWS – history of user-visible changes
 #+STARTUP: content hidestars

-Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@ -10,9 +10,40 @@ Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>

 Please send Mes bug reports to janneke@gnu.org.

+* Changes in 0.12 since 0.11
+** Core
+*** Mes can now run Nyacc (0.80.42) to compile itself in ~4min (~3000 LOC).
+*** Mes now recursively expands global variables per top level statement.
+*** Mes now recursively expands macros per top level statement.
+*** Mes now boots from MES_BOOT (default: module/mes/boot-0.scm).
+*** Mes now has a full Scheme reader in C again.
+This gives a 10x-20x performance improvement and increases the
+bootstrap footprint by 160 LOC.
+*** Mes reader now supports older abbreviated character forms
+#\bel, #\bs, #\ht and #\vt.
+*** 3 new functions
+equal2?, memq, core:write.
+** Language
+*** Mes now has an incremental Scheme semantics test suite with 71 small tests.
+*** Variable names can now have ticks.
+*** Mes now evaluates expresions of COND only once.
+*** srfi-9 records have been reimplemented.
+*** #\page is now whitespace.
+*** #<eof> is no longer a character.
+*** 2 new macros
+define-macro*, with-fluids.
+*** 9 new functions
+dirname, last, reverse-list->string, setenv, string-drop-right,
+string-fold, string-fold-right, string-null?, write.
+** MesCC
+**** 9 new functions
+chmod, getopt_long, ferror, itoab, longjmp, qsort, setenv, setjmp, strtol.
+**** 2 new header files
+endian.h, sys/signal.h.
+
 * Changes in 0.11 since 0.10
 ** MesCC
-*** MesCC now compiles a mes-tcc that passes 41/69 of mescc's C tests.
+*** MesCC now compiles a mes-tcc that fails 41/69 of mescc's C tests.
 *** Messc's libc can now be compiled with tcc (syscall support: write).
 *** Messc now compiles a less-patched tcc: -214/+458 lines [WAS: -333/+747].
 *** MesCC now supports empty for.
--- a/7
+++ b/7
@ -6,8 +6,8 @@ Mes -- Maxwell Equations of Software

 It currently consists of a mutual self-hosting [close to Guile-]
 Scheme interpreter prototype in C and a Nyacc-based C compiler in
-[Guile] Scheme.  This C prototype will be rewritten in [[https://github.com/oriansj/stage0][stage0]] M1
-assembly (or possibly stage2 slow-LISP, or ...).
+[Guile] Scheme.  This C prototype will be simplified to be transpiled
+by [[https://github.com/oriansj/m2-planet][M2-Planet]].

 The Scheme interpreter prototype (mes.c) has a Garbage Collector, a
 library of loadable Scheme modules-- notably Dominique Boucher's [[https://github.com/schemeway/lalr-scm][LALR]],
@ -25,7 +25,7 @@ Jeremiah Orians's stage0 ~300 byte self-hosting hex assembler.
 [0] https://gitlab.com/janneke/mes
 [1] https://www.gnu.org/software/guix
 [2] http://bootstrappable.org
-[3] https://github.com/oriansj/stage0
+[3] https://github.com/oriansj/m2-planet
 [4] https://github.com/schemeway/lalr-scm
 [5] https://www.cs.indiana.edu/chezscheme/syntax-case/old-psyntax.html
 [6] https://www.nongnu.org/nyacc
@ -33,6 +33,7 @@ Jeremiah Orians's stage0 ~300 byte self-hosting hex assembler.
 [8] https://gitlab.com/janneke/tinycc
 [9] https://lists.gnu.org/archive/html/tinycc-devel/2017-05/msg00103.html
 [10] http://www.softwarepreservation.org/projects/LISP/book/LISP%25201.5%2520Programmers%2520Manual.pdf
+[11] https://github.com/oriansj/stage0

 Mes is free software, it is distributed under the terms of the GNU
 General Public Licence version 3 or later.  See the file COPYING.
--- a/build-aux/manifest.scm
+++ b/build-aux/manifest.scm
@ -1,5 +1,5 @@
 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

 ;;; This file is part of Mes.
 ;;;
--- a/build-aux/mes-snarf.scm
+++ b/build-aux/mes-snarf.scm
@ -4,7 +4,7 @@ exec ${GUILE-guile} --no-auto-compile -L $HOME/src/mes/build-aux -L build-aux -e
 !#

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; mes-snarf.scm: This file is part of Mes.
 ;;;
--- a/build.sh
+++ b/build.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # Mes --- Maxwell Equations of Software
-# Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of Mes.
 #
--- a/check-boot.sh
+++ b/check-boot.sh
@ -1,7 +1,7 @@
 #! /bin/bash

 # Mes --- Maxwell Equations of Software
-# Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of Mes.
 #
--- a/check-mescc.sh
+++ b/check-mescc.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # Mes --- Maxwell Equations of Software
-# Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of Mes.
 #
--- a/check.sh
+++ b/check.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # Mes --- Maxwell Equations of Software
-# Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of Mes.
 #
--- a/2
+++ b/2
@ -21,7 +21,7 @@ exec ${GUILE} --no-auto-compile -L $(pwd) -C $(pwd) -e 'main' -s "$0" ${1+"$@"}
 !#

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; configure: This file is part of Mes.
 ;;;
--- a/doc/ANNOUNCE-0.12
+++ b/doc/ANNOUNCE-0.12
@ -0,0 +1,97 @@
+Subject: Mes 0.12 released
+
+I am pleased to announce the release of Mes 0.12, representing 120
+commits over 20 weeks.  MesCC is prototyped running on Guile and can
+now run on Mes.  Performance of Mes running MesCC has been improved by
+a factor of 100; mes.c (~3000 LOC) now compiles in ~4min.  Many fixes
+and enhancements make that now also TinyCC parses (~1.5h) and compiles
+(~20min) with Mes+MesCC (Guile+MesCC takes ~2min).
+
+Special thanks go to Ricardo Wurmus for sharing the recursive macro
+expand perspective and starting work on that, to Han-Wen Nienhuys for
+his sharp `Ah, so you skipped SICP chapter 3' remark and to rain1 for
+their continuous help on #bootstrapping and their `let's only expand
+global variables' insight.
+
+* About
+
+    Mes[0] aims to create full source bootstrapping for GuixSD[1] as
+    part of the bootstrappable builds[2] project.
+
+    It currently consists of a mutual self-hosting [close to Guile-]
+    Scheme interpreter prototype in C and a Nyacc-based C compiler in
+    [Guile] Scheme.  This C prototype will be simplified to be
+    transpiled by M2-Planet[3].
+
+    The Scheme interpreter prototype (mes.c) has a Garbage Collector,
+    a library of loadable Scheme modules-- notably Dominique Boucher's
+    LALR[4], pre-R6RS portable syntax-case[5] with R7RS ellipsis, Matt
+    Wette's Nyacc[6], Guile's PEG[7] --and test suite just barely
+    enough to support a simple REPL (repl.mes) and simple C-compiler
+    MesCC (mescc.mes).
+
+    MesCC can compile a modified TinyCC[8] that is close to being
+    self-hosting.  A GNU Ccc-compiled tcc is known[9] to compile GCC.
+
+    Mes is inspired by The Maxwell Equations of Software: LISP-1.5[10]
+    -- John McCarthy page 13, GNU Guix's source/binary packaging
+    transparency and Jeremiah Orians's stage0[11] ~300 byte self-hosting
+    hex assembler.
+
+* Download
+
+    git clone https://gitlab.com/janneke/mes
+
+    wget https://gitlab.com/janneke/mes/repository/archive.tar.gz?ref=v0.12 -O mes-0.12.tar.gz
+
+Mes runs from the source tree and can also be built, packaged and
+installed in Guix[SD] by the usual
+
+    guix package -f guix.scm
+
+* Changes in 0.12 since 0.11
+ ** Core
+ *** Mes can now run Nyacc (0.80.42) to compile itself in ~4min (~3000 LOC).
+ *** Mes now recursively expands global variables per top level statement.
+ *** Mes now recursively expands macros per top level statement.
+ *** Mes now boots from MES_BOOT (default: module/mes/boot-0.scm).
+ *** Mes now has a full Scheme reader in C again.
+ This gives a 10x-20x performance improvement and increases the
+ bootstrap footprint by 160 LOC.
+ *** Mes reader now supports older abbreviated character forms
+ #\bel, #\bs, #\ht and #\vt.
+ *** 3 new functions
+ equal2?, memq, core:write.
+ ** Language
+ *** Mes now has an incremental Scheme semantics test suite with 71 small tests.
+ *** Variable names can now have ticks.
+ *** Mes now evaluates expresions of COND only once.
+ *** srfi-9 records have been reimplemented.
+ *** #\page is now whitespace.
+ *** #<eof> is no longer a character.
+ *** 2 new macros
+ define-macro*, with-fluids.
+ *** 9 new functions
+ dirname, last, reverse-list->string, setenv, string-drop-right,
+ string-fold, string-fold-right, string-null?, write.
+ ** MesCC
+ **** 9 new functions
+ chmod, getopt_long, ferror, itoab, longjmp, qsort, setenv, setjmp, strtol.
+ **** 2 new header files
+ endian.h, sys/signal.h.
+
+Greetings,
+janneke
+
+[0] https://gitlab.com/janneke/mes
+[1] https://www.gnu.org/software/guix
+[2] http://bootstrappable.org
+[3] https://github.com/oriansj/m2-planet
+[4] https://github.com/schemeway/lalr-scm
+[5] https://www.cs.indiana.edu/chezscheme/syntax-case/old-psyntax.html
+[6] https://www.nongnu.org/nyacc/
+[7] https://www.gnu.org/software/guile/docs/master/guile.html/PEG-Parsing.html
+[8] https://gitlab.com/janneke/tinycc
+[9] https://lists.gnu.org/archive/html/tinycc-devel/2017-05/msg00103.html
+[10] http://www.softwarepreservation.org/projects/LISP/book/LISP%25201.5%2520Programmers%2520Manual.pdf
+[11] https://github.com/oriansj/stage0
--- a/doc/fosdem/fosdem.org
+++ b/doc/fosdem/fosdem.org
@ -642,7 +642,7 @@ R5RS to x86 Assembly
 #  :COPYING: t
 #  :END:

-#   Copyright \copy 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+#   Copyright \copy 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

 # C-c C-e l b     (org-beamer-export-to-latex)
 # C-c C-e l P     (org-beamer-export-to-pdf)
--- a/guile/guix/make.scm
+++ b/guile/guix/make.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/guile/mes-0.scm
+++ b/guile/mes-0.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; mes-0.scm: This file is part of Mes.
 ;;;
--- a/guile/mes.mes
+++ b/guile/mes.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; mes.mes: This file is part of Mes.
 ;;;
--- a/guile/mes.scm
+++ b/guile/mes.scm
@ -4,7 +4,7 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@"
 !#

 ;;; Mes --- The Maxwell Equations of Software
-;;; Copyright © 2016,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
--- a/guile/mescc.scm
+++ b/guile/mescc.scm
@ -10,7 +10,7 @@ exec ${GUILE-guile} -L $GUILEDIR -e '(mescc)' -s "$0" "$@"
 !#

 ;;; Mes --- The Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
--- a/guile/reader.mes
+++ b/guile/reader.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/guix.scm
+++ b/guix.scm
@ -1,7 +1,7 @@
 ;;; guix.scm -- Guix package definition

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

 ;;; Also borrowing code from:
 ;;; guile-sdl2 --- FFI bindings for SDL2
--- a/include/00-test.i
+++ b/include/00-test.i
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/30-test.i
+++ b/include/30-test.i
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/alloca.h
+++ b/include/alloca.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/assert.h
+++ b/include/assert.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/ctype.h
+++ b/include/ctype.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/endian.h
+++ b/include/endian.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/errno.h
+++ b/include/errno.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/fcntl.h
+++ b/include/fcntl.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/features.h
+++ b/include/features.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/float.h
+++ b/include/float.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/getopt.h
+++ b/include/getopt.h
@ -1,7 +1,7 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
 * Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/inttypes.h
+++ b/include/inttypes.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/libgen.h
+++ b/include/libgen.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/limits.h
+++ b/include/limits.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/locale.h
+++ b/include/locale.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/math.h
+++ b/include/math.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/mlibc.h
+++ b/include/mlibc.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/setjmp.h
+++ b/include/setjmp.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/signal.h
+++ b/include/signal.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stdarg.h
+++ b/include/stdarg.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stdbool.h
+++ b/include/stdbool.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stddef.h
+++ b/include/stddef.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stdint.h
+++ b/include/stdint.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stdio.h
+++ b/include/stdio.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stdlib.h
+++ b/include/stdlib.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/stdnoreturn.h
+++ b/include/stdnoreturn.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/string.h
+++ b/include/string.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/strings.h
+++ b/include/strings.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/select.h
+++ b/include/sys/select.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/time.h
+++ b/include/sys/time.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/timeb.h
+++ b/include/sys/timeb.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/types.h
+++ b/include/sys/types.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/ucontext.h
+++ b/include/sys/ucontext.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/time.h
+++ b/include/time.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/include/unistd.h
+++ b/include/unistd.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/crt1.c
+++ b/lib/crt1.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/getopt.c
+++ b/lib/getopt.c
@ -1,6 +1,6 @@
 /* Getopt for GNU.
   Copyright (C) 1987, 88, 89, 90, 91, 1992 Free Software Foundation, Inc.
-   Copyright (C) 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+   Copyright (C) 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
--- a/lib/libc+tcc-gcc.c
+++ b/lib/libc+tcc-gcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/libc+tcc-mes.c
+++ b/lib/libc+tcc-mes.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/libc+tcc.c
+++ b/lib/libc+tcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/libc-gcc.c
+++ b/lib/libc-gcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/libc-mes.c
+++ b/lib/libc-mes.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/libc.c
+++ b/lib/libc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/linux+tcc-gcc.c
+++ b/lib/linux+tcc-gcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/linux+tcc-mes.c
+++ b/lib/linux+tcc-mes.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/linux-gcc.c
+++ b/lib/linux-gcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/linux-mes.c
+++ b/lib/linux-mes.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/mini-libc-gcc.c
+++ b/lib/mini-libc-gcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/mini-libc-mes.c
+++ b/lib/mini-libc-mes.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/mini-libc.c
+++ b/lib/mini-libc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/mini-linux-gcc.c
+++ b/lib/mini-linux-gcc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/lib/mini-linux-mes.c
+++ b/lib/mini-linux-mes.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of Mes.
 *
--- a/make.scm
+++ b/make.scm
@ -4,7 +4,7 @@ exec ${GUILE-guile} --no-auto-compile -L . -L guile -C . -C guile -s "$0" ${1+"$
 !#

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/language/c99/compiler.mes
+++ b/module/language/c99/compiler.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/language/c99/compiler.scm
+++ b/module/language/c99/compiler.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/language/c99/info.mes
+++ b/module/language/c99/info.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/language/c99/info.scm
+++ b/module/language/c99/info.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/language/paren.mes
+++ b/module/language/paren.mes
@ -2,7 +2,7 @@

 ;;; Mes --- Maxwell Equations of Software
 ;;; Copyright © 2008 Derek Peschel
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/M1.mes
+++ b/module/mes/M1.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/M1.scm
+++ b/module/mes/M1.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/as-i386.mes
+++ b/module/mes/as-i386.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/as-i386.scm
+++ b/module/mes/as-i386.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/as.mes
+++ b/module/mes/as.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/as.scm
+++ b/module/mes/as.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/base-0.mes
+++ b/module/mes/base-0.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/base.mes
+++ b/module/mes/base.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/boot-0.scm
+++ b/module/mes/boot-0.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/boot-00.scm
+++ b/module/mes/boot-00.scm
@ -1,5 +1,5 @@
 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/boot-01.scm
+++ b/module/mes/boot-01.scm
@ -1,5 +1,5 @@
 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/bytevectors.mes
+++ b/module/mes/bytevectors.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/bytevectors.scm
+++ b/module/mes/bytevectors.scm
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/catch.mes
+++ b/module/mes/catch.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/display.mes
+++ b/module/mes/display.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/module/mes/elf.mes
+++ b/module/mes/elf.mes
@ -1,7 +1,7 @@
 <;;; -*-scheme-*-

 ;;; Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of Mes.
 ;;;
--- a/Show more
+++ b/Show more