diff --git a/.editorconfig b/.editorconfig index 0d40c64..6cbcd47 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ insert_final_newline=true [{Makefile,*.s[ac]ss}] indent_style=tab indent_size=1 -[{ignore.txt,*.csv}] +[{ignore.txt,*.csv,m4/*}] insert_final_newline=false [*.rb] indent_style=space diff --git a/get_sd.awk b/get_sd.awk index 42457b8..fc4b20e 100644 --- a/get_sd.awk +++ b/get_sd.awk @@ -1,4 +1,7 @@ #!/usr/bin/awk BEGIN{FS="/";x=2} +function none() {print "main";exit} +NF==1{none()} /\.\//{x++} -{gsub($0,"./","");print $x;exit} +$x~/\.(txti|html|org|md)/{none()} +{if($x=="dnd")none();print $x;exit} diff --git a/m4/lib.m4 b/m4/lib.m4 index cfd8fb6..46841d6 100644 --- a/m4/lib.m4 +++ b/m4/lib.m4 @@ -1,5 +1,6 @@ divert(-1) # extra macros for site structure -define(`ytv',`') -define(`wrap',<$1>$2$1>) -divert +define(`_ytv',`') +define(`_wrap',<$1>$2$1>) +define(`_empty',`') +divert dnl diff --git a/m4/main.html.m4 b/m4/main.html.m4 index f03a317..775bc88 100644 --- a/m4/main.html.m4 +++ b/m4/main.html.m4 @@ -1,14 +1,12 @@ -dnl template.m4.html v1.3-p1 +dnl template.m4.html v1.4-p1 dnl Part of the tape-and-string suite used to construct the website +ifdef(`DEBUG',`traceon')dnl include(`m4/lib.m4')dnl -ifdef(`CSS_INC',`', define(`CSS_INC', `main'))dnl -ifelse(CSS_INC,`dnd',define(`CSS_INC',`main'))dnl -define(`_CSS',`/css/CSS_INC.css')dnl