Don't rely on bold being rendered brighter

FossilOrigin-Name: 9e5ca0405a613eeabf356760f370bf50eb1f4763a7de54ea62014c7c06286123
This commit is contained in:
Jonathan Schleifer 2025-01-08 14:12:57 +00:00
parent ff8e1fdf94
commit d73d05e23c
2 changed files with 52 additions and 22 deletions

View file

@ -100,6 +100,16 @@ AC_DEFUN([BUILDSYS_INIT], [
"$($TPUT setaf 4 2>/dev/null)") "$($TPUT setaf 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6, AC_SUBST(TERM_SETAF6,
"$($TPUT setaf 6 2>/dev/null)") "$($TPUT setaf 6 2>/dev/null)")
AC_SUBST(TERM_SETAF9,
"$($TPUT setaf 9 2>/dev/null)")
AC_SUBST(TERM_SETAF10,
"$($TPUT setaf 10 2>/dev/null)")
AC_SUBST(TERM_SETAF11,
"$($TPUT setaf 11 2>/dev/null)")
AC_SUBST(TERM_SETAF12,
"$($TPUT setaf 12 2>/dev/null)")
AC_SUBST(TERM_SETAF14,
"$($TPUT setaf 14 2>/dev/null)")
dnl OpenBSD seems to want 3 parameters for terminals dnl OpenBSD seems to want 3 parameters for terminals
dnl ending in -256color, but the additional two dnl ending in -256color, but the additional two
dnl parameters don't seem to do anything, so we set dnl parameters don't seem to do anything, so we set
@ -114,6 +124,16 @@ AC_DEFUN([BUILDSYS_INIT], [
"$($TPUT setaf 4 0 0 2>/dev/null)") "$($TPUT setaf 4 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF6, AC_SUBST(TERM_SETAF6,
"$($TPUT setaf 6 0 0 2>/dev/null)") "$($TPUT setaf 6 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF9,
"$($TPUT setaf 9 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF10,
"$($TPUT setaf 10 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF11,
"$($TPUT setaf 11 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF12,
"$($TPUT setaf 12 0 0 2>/dev/null)")
AC_SUBST(TERM_SETAF14,
"$($TPUT setaf 14 0 0 2>/dev/null)")
else else
AC_SUBST(TERM_SETAF1, AC_SUBST(TERM_SETAF1,
"$($TPUT AF 1 2>/dev/null)") "$($TPUT AF 1 2>/dev/null)")
@ -125,6 +145,16 @@ AC_DEFUN([BUILDSYS_INIT], [
"$($TPUT AF 4 2>/dev/null)") "$($TPUT AF 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6, AC_SUBST(TERM_SETAF6,
"$($TPUT AF 6 2>/dev/null)") "$($TPUT AF 6 2>/dev/null)")
AC_SUBST(TERM_SETAF9,
"$($TPUT AF 9 2>/dev/null)")
AC_SUBST(TERM_SETAF10,
"$($TPUT AF 10 2>/dev/null)")
AC_SUBST(TERM_SETAF11,
"$($TPUT AF 11 2>/dev/null)")
AC_SUBST(TERM_SETAF12,
"$($TPUT AF 12 2>/dev/null)")
AC_SUBST(TERM_SETAF14,
"$($TPUT AF 14 2>/dev/null)")
fi fi
]) ])

View file

@ -1099,28 +1099,28 @@ print-hierarchy:
print-var: print-var:
printf '%s\n' '${${VAR}}' printf '%s\n' '${${VAR}}'
DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$? DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_SETAF14@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$? DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_SETAF14@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<" COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<"
COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<" COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<"
COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<" COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<" COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
COMPILE_AMIGA_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (Amiga lib)...@TERM_SGR0@\r" "$<" COMPILE_AMIGA_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (Amiga lib)...@TERM_SGR0@\r" "$<"
COMPILE_AMIGA_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (Amiga lib).@TERM_SGR0@\n" "$<" COMPILE_AMIGA_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (Amiga lib).@TERM_SGR0@\n" "$<"
COMPILE_AMIGA_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (Amiga lib)!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_AMIGA_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (Amiga lib)!@TERM_SGR0@\n" "$<"; exit $$err
COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<" COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<" COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_SETAF11@@TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_SETAF10@@TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_SETAF9@@TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i" INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_SETAF11@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i"
INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i" INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_SETAF10@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i"
INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i" DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_SETAF12@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i"
DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_SETAF9@@TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
.CURDIR ?= . .CURDIR ?= .
-include ${.CURDIR}/.deps -include ${.CURDIR}/.deps