diff --git a/alternative_wmiircs/python/wmiirc.py b/alternative_wmiircs/python/wmiirc.py index fb677022..a33ff015 100644 --- a/alternative_wmiircs/python/wmiirc.py +++ b/alternative_wmiircs/python/wmiirc.py @@ -45,7 +45,7 @@ wmii['grabmod'] = keys.defs['mod'] wmii['border'] = 2 def setbackground(color): - call('xsetroot', '-solid', color) + call('xsetroot', '-solid', color, background=True) setbackground(background) terminal = 'wmiir', 'setsid', '@TERMINAL@' diff --git a/doc/mkfile b/doc/mkfile new file mode 100644 index 00000000..fffbd5ab --- /dev/null +++ b/doc/mkfile @@ -0,0 +1,33 @@ +MKSHELL=rc + +TARG = wmii.pdf +SRC = ${TARG:%.pdf=%.tex} +TEX = xelatex + +default:V: all +all:V: $TARG + +# mk doesn't recognize nested `{} +deps = `{ ash -c 'dep() { echo $1; for f in $(9 sed -n "s/.*\\include{([^}]+)}.*/\1.tex/p; s/.*\\input (.*)/\1.tex/p" $1); do dep $f; done; }; dep $SRC' } +# ` +$TARG: $deps + +junk = aux idx ilg ind log toc out +CLEAN = ${TARG:%.pdf=%} +CLEAN = ${junk:%=$CLEAN.%} ${deps:%.tex=%.aux} +clean:V: + rm -f $CLEAN + +%.pdf: %.tex mkfile + flag x + + if (~ $MAINFONT '') + fn tex { builtin $TEX $stem.tex } + if not + fn tex { builtin $TEX '\def\mainfont{'$"MAINFONT'}\input{'$stem.tex'}' } + + tex + makeindex $stem + tex + rm -f $stem.out 2>/dev/null + +# vim:se ft=make: diff --git a/doc/wmii.tex b/doc/wmii.tex index 64edf358..dd594301 100644 --- a/doc/wmii.tex +++ b/doc/wmii.tex @@ -22,7 +22,11 @@ \makeindex \let\primary=\textbf -\setmainfont[Mapping=tex-text, Numbers=OldStyle]{Palatino LT Std} +\ifx\mainfont\undefined + \def\mainfont{Palatino LT Std} +\fi + +\setmainfont[Mapping=tex-text, Numbers=OldStyle]\mainfont \def\lining{\addfontfeature{Numbers=Lining}} \let\primary=\textbf