~acdw/bollux

56abf839f03baca1a791f13a0029109f1124be3a — Case Duckworth a month ago d3f0b7f + 5286e4f main
Merge branch 'main' of tildegit.org:acdw/bollux
4 files changed, 9 insertions(+), 6 deletions(-)

M README.md
M bollux
M bollux.1
M bollux.conf.5
M README.md => README.md +3 -0
@@ 56,6 56,9 @@ $ cd bollux
# make install
```

**NOTE** if you installed an older version, make sure to rm /usr/bin/bollux.  
The new install path is /usr/local/bin.

## Alternative

```

M bollux => bollux +4 -4
@@ 123,8 123,8 @@ bollux_config() {
	: "${BOLLUX_CONFIG:=${XDG_CONFIG_HOME:-$HOME/.config}/bollux/bollux.conf}"

	if [ -f "$BOLLUX_CONFIG" ]; then
		# shellcheck disable=1090
		log debug "Loading config file '$BOLLUX_CONFIG'"
		# shellcheck disable=1090
		. "$BOLLUX_CONFIG"
	else
		log debug "Can't load config file '$BOLLUX_CONFIG'."


@@ 146,7 146,7 @@ bollux_config() {
	## typesetting
	: "${T_MARGIN:=4}"                 # left and right margin
	: "${T_WIDTH:=0}"                  # width of the viewport -- 0 = get term width
	: "${T_PRE_DISPLAY:=pre,alt,both}" # how to view PRE blocks
	: "${T_PRE_DISPLAY:=both,pre,alt}" # how to view PRE blocks
	# colors -- these will be wrapped in \e[ __ m
	C_RESET='\e[0m'         # reset
	: "${C_SIGIL:=35}"      # sigil (=>, #, ##, ###, *, ```)


@@ 744,7 744,7 @@ mklesskey() { # mklesskey FILENAME
		] quit 3 # 51 forward
		r quit 4 # 52 re-request / download
		G quit 5 # 53 goto a url (pre-filled)
		` quit 6 # 54 cycle T_PRE_DISPLAY and refresh
		p quit 6 # 54 cycle T_PRE_DISPLAY and refresh
		# other keybinds
		\40 forw-screen-force
		h left-scroll


@@ 1041,7 1041,7 @@ extract_links() {
	local url alt
	local re="^=>[[:space:]]*([^[:space:]]+)([[:space:]]+(.*))?$"
	while read -r; do
		log d $re
		log d "$re"
		if [[ $REPLY =~ $re ]]; then
			url="${BASH_REMATCH[1]}"
			alt="${BASH_REMATCH[3]}"

M bollux.1 => bollux.1 +1 -1
@@ 56,7 56,7 @@ goto a new URL - with current URL pre-filled
.B r
refresh the current page
.TP
.B `
.B p
cycle preformatted text visibility and refresh the current page
.TP
.B [

M bollux.conf.5 => bollux.conf.5 +1 -1
@@ 94,7 94,7 @@ If set to 0, attempts to use the width of the terminal,
falling back to 80.
.TP
.BR T_PRE_DISPLAY
comma-separated list of items; default is pre,alt,both.
comma-separated list of items; default is both,pre,alt.
.br
How to display preformatted text blocks.
.I pre