From 7abf6c5a40bd14e2719d0423426fa905076ec97e Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Fri, 23 Feb 2024 15:22:05 +0100 Subject: Use doubled curly-quotes for m4 --- m4/__base.m4 | 6 +++--- m4/article.m4 | 10 +++++----- m4/fmt-code.m4 | 4 ++-- m4/foot.m4 | 10 +++++----- m4/head.m4 | 2 +- m4/include.m4 | 3 --- m4/newtab.m4 | 2 +- 7 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 m4/include.m4 (limited to 'm4') diff --git a/m4/__base.m4 b/m4/__base.m4 index 611a256..a990e89 100644 --- a/m4/__base.m4 +++ b/m4/__base.m4 @@ -1,6 +1,6 @@ -m4_dnl To avoid annoying conflicts with quote characters, use -m4_dnl U+2068 FIRST STRONG ISOLATE and U+2069 POP DIRECTIONAL ISOLATE -m4_changequote(⁨,⁩) +m4_dnl To avoid annoying conflicts with quote characters, use doubled curly +m4_dnl quotes. +m4_changequote(‘‘,’’) m4_dnl We also need to avoid the comment character ever doing absolutely m4_dnl anything, so set it to U+FFFD REPLACEMENT CHARACTER diff --git a/m4/article.m4 b/m4/article.m4 index 9572ff8..9d7958e 100644 --- a/m4/article.m4 +++ b/m4/article.m4 @@ -1,9 +1,9 @@ -m4_define(ARTICLE, ⁨li .article { +m4_define(ARTICLE, ‘‘li .article { a href="$1" $2 __FILE_CREATE_DATA($1) -}⁩) +}’’) -m4_define(__FILE_CREATE_DATA, ⁨ - m4_define(⁨__DT⁩, m4_esyscmd( +m4_define(__FILE_CREATE_DATA, ‘‘ + m4_define(‘‘__DT’’, m4_esyscmd( git log --follow --pretty='format:%cI' $(dirname m4___file__)/$1/index.gsp \ | tail --lines=1 )) @@ -14,4 +14,4 @@ m4_define(__FILE_CREATE_DATA, ⁨ | ordinal --positions=1) } ) -⁩) +’’) diff --git a/m4/fmt-code.m4 b/m4/fmt-code.m4 index f1af3e1..9b2c593 100644 --- a/m4/fmt-code.m4 +++ b/m4/fmt-code.m4 @@ -1,4 +1,4 @@ -m4_define(FMT_CODE, ⁨pre .code-sample {= +m4_define(FMT_CODE, ‘‘pre .code-sample {= m4_esyscmd(sed ' s/[@\\}]/\\&/g m4_regexp($1, .*\.diff$, @@ -7,4 +7,4 @@ m4_define(FMT_CODE, ⁨pre .code-sample {= ) s/.*/@code{-&}/ ' $(dirname 'm4___file__')/$1) -}⁩) +}’’) diff --git a/m4/foot.m4 b/m4/foot.m4 index 243a84b..c980b9a 100644 --- a/m4/foot.m4 +++ b/m4/foot.m4 @@ -1,11 +1,11 @@ -m4_define(FOOT, ⁨ - m4_define(⁨__HASH⁩, m4_esyscmd( - git rev-list --max-count=1 ⁨HEAD⁩ m4___file__ +m4_define(FOOT, ‘‘ + m4_define(‘‘__HASH’’, m4_esyscmd( + git rev-list --max-count=1 ‘‘HEAD’’ m4___file__ )) - m4_define(⁨__DATE⁩, m4_esyscmd( + m4_define(‘‘__DATE’’, m4_esyscmd( git log --max-count=1 --pretty='format:%cI' m4___file__ \ | xargs --no-run-if-empty -- date '+%-d %B %Y (%A) — %T %Z' --date \ | ifne -n echo 'No commit yet…' )) m4_include(foot.gsp) -⁩) +’’) diff --git a/m4/head.m4 b/m4/head.m4 index 9161929..b69ad80 100644 --- a/m4/head.m4 +++ b/m4/head.m4 @@ -1 +1 @@ -m4_define(HEAD, ⁨m4_include(head.gsp)⁩) +m4_define(HEAD, ‘‘m4_include(head.gsp)’’) diff --git a/m4/include.m4 b/m4/include.m4 deleted file mode 100644 index ef22bf1..0000000 --- a/m4/include.m4 +++ /dev/null @@ -1,3 +0,0 @@ -m4_dnl Exactly the same as m4_include, but following the same naming conventions -m4_dnl as the other macros I create. -m4_define(INCLUDE, ⁨m4_include($1)⁩) diff --git a/m4/newtab.m4 b/m4/newtab.m4 index 7aa8ba2..d202b22 100644 --- a/m4/newtab.m4 +++ b/m4/newtab.m4 @@ -1 +1 @@ -m4_define(NEWTAB, ⁨a target="_blank"⁩) +m4_define(NEWTAB, ‘‘a target="_blank"’’) -- cgit v1.2.3