Skip to content

Commit 418bd0b

Browse files
author
jan.nijtmans
committed
Indenting
2 parents d7ad817 + e8ecdd6 commit 418bd0b

4 files changed

Lines changed: 162 additions & 162 deletions

File tree

‎macosx/tkMacOSXAccessibility.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void PostAccessibilityAnnouncement(NSString *message)
362362
return value;
363363
}
364364

365-
/* Return label for buttons. */
365+
/* Return label for buttons. */
366366
if (role && CFStringCompare(role, kAXButtonRole, 0) == kCFCompareEqualTo) {
367367
NSString *value = self.accessibilityLabel;
368368
return value;

‎unix/configure‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8523,83 +8523,83 @@ printf '%s\n' "$as_me: Bidi enabled: forcing Xft on as well" >&6;}
85238523
fi
85248524

85258525
BIDI_CFLAGS="-I${TK_SRC_DIR}/unix/bidi/Headers \
8526-
-I${TK_SRC_DIR}/unix/bidi/Source \
8527-
-I${TK_SRC_DIR}/unix/bidi \
8528-
-DSB_CONFIG_UNITY -DSB_CONFIG_EXPERIMENTAL_TEXT_API -w"
8526+
-I${TK_SRC_DIR}/unix/bidi/Source \
8527+
-I${TK_SRC_DIR}/unix/bidi \
8528+
-DSB_CONFIG_UNITY -DSB_CONFIG_EXPERIMENTAL_TEXT_API -w"
85298529

85308530
printf '%s\n' "#define HAVE_BIDI 1" >>confdefs.h
85318531

85328532
UNIX_FONT_OBJS="tkUnixBidiFont.o SheenBidi.o"
85338533

8534-
#--------------------------------------------------------------------
8535-
# HarfBuzz - version check (minimum 2.8.2)
8536-
#--------------------------------------------------------------------
8537-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for HarfBuzz (required for --enable-bidi)" >&5
8534+
#--------------------------------------------------------------------
8535+
# HarfBuzz - version check (minimum 2.8.2)
8536+
#--------------------------------------------------------------------
8537+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for HarfBuzz (required for --enable-bidi)" >&5
85388538
printf %s "checking for HarfBuzz (required for --enable-bidi)... " >&6; }
8539-
if pkg-config --exists harfbuzz; then
8540-
HB_VERSION=`pkg-config --modversion harfbuzz 2>/dev/null || echo "0.0.0"`
8541-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: found version $HB_VERSION" >&5
8539+
if pkg-config --exists harfbuzz; then
8540+
HB_VERSION=`pkg-config --modversion harfbuzz 2>/dev/null || echo "0.0.0"`
8541+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: found version $HB_VERSION" >&5
85428542
printf '%s\n' "found version $HB_VERSION" >&6; }
85438543

8544-
# Pure shell version comparison: is HB_VERSION < 2.8.2 ?
8545-
if test -n "$HB_VERSION"; then
8546-
# Normalize version strings (handle cases like 2.8.2, 3.0.0, etc.)
8547-
HB_MAJOR=`echo $HB_VERSION | cut -d. -f1`
8548-
HB_MINOR=`echo $HB_VERSION | cut -d. -f2`
8549-
HB_PATCH=`echo $HB_VERSION | cut -d. -f3 | cut -d- -f1`
8550-
8551-
REQ_MAJOR=2
8552-
REQ_MINOR=8
8553-
REQ_PATCH=2
8554-
8555-
too_old=no
8556-
if test $HB_MAJOR -lt $REQ_MAJOR; then
8557-
too_old=yes
8558-
elif test $HB_MAJOR -eq $REQ_MAJOR; then
8559-
if test $HB_MINOR -lt $REQ_MINOR; then
8560-
too_old=yes
8561-
elif test $HB_MINOR -eq $REQ_MINOR; then
8562-
if test -n "$HB_PATCH" && test $HB_PATCH -lt $REQ_PATCH; then
8563-
too_old=yes
8564-
fi
8565-
fi
8566-
fi
8567-
8568-
if test "$too_old" = "yes"; then
8569-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: HarfBuzz version $HB_VERSION is too old (need >= 2.8.2)." >&5
8544+
# Pure shell version comparison: is HB_VERSION < 2.8.2 ?
8545+
if test -n "$HB_VERSION"; then
8546+
# Normalize version strings (handle cases like 2.8.2, 3.0.0, etc.)
8547+
HB_MAJOR=`echo $HB_VERSION | cut -d. -f1`
8548+
HB_MINOR=`echo $HB_VERSION | cut -d. -f2`
8549+
HB_PATCH=`echo $HB_VERSION | cut -d. -f3 | cut -d- -f1`
8550+
8551+
REQ_MAJOR=2
8552+
REQ_MINOR=8
8553+
REQ_PATCH=2
8554+
8555+
too_old=no
8556+
if test $HB_MAJOR -lt $REQ_MAJOR; then
8557+
too_old=yes
8558+
elif test $HB_MAJOR -eq $REQ_MAJOR; then
8559+
if test $HB_MINOR -lt $REQ_MINOR; then
8560+
too_old=yes
8561+
elif test $HB_MINOR -eq $REQ_MINOR; then
8562+
if test -n "$HB_PATCH" && test $HB_PATCH -lt $REQ_PATCH; then
8563+
too_old=yes
8564+
fi
8565+
fi
8566+
fi
8567+
8568+
if test "$too_old" = "yes"; then
8569+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: HarfBuzz version $HB_VERSION is too old (need >= 2.8.2)." >&5
85708570
printf '%s\n' "$as_me: WARNING: HarfBuzz version $HB_VERSION is too old (need >= 2.8.2)." >&2;}
8571-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Disabling bidirectional text support (--disable-bidi)." >&5
8571+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: WARNING: Disabling bidirectional text support (--disable-bidi)." >&5
85728572
printf '%s\n' "$as_me: WARNING: Disabling bidirectional text support (--disable-bidi)." >&2;}
8573-
enable_bidi=no
8574-
else
8575-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: HarfBuzz version $HB_VERSION is sufficient (>= 2.8.2)." >&5
8573+
enable_bidi=no
8574+
else
8575+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: HarfBuzz version $HB_VERSION is sufficient (>= 2.8.2)." >&5
85768576
printf '%s\n' "HarfBuzz version $HB_VERSION is sufficient (>= 2.8.2)." >&6; }
8577-
fi
8578-
fi
8577+
fi
8578+
fi
85798579

8580-
if test "$enable_bidi" = "yes"; then
8581-
HB_CFLAGS=`pkg-config --cflags harfbuzz`
8582-
HB_LIBS=`pkg-config --libs harfbuzz`
8580+
if test "$enable_bidi" = "yes"; then
8581+
HB_CFLAGS=`pkg-config --cflags harfbuzz`
8582+
HB_LIBS=`pkg-config --libs harfbuzz`
85838583

8584-
tk_oldCFlags=$CFLAGS
8585-
tk_oldLibs=$LIBS
8586-
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS $HB_CFLAGS"
8587-
LIBS="$tk_oldLibs $XFT_LIBS $HB_LIBS $XLIBSW"
8584+
tk_oldCFlags=$CFLAGS
8585+
tk_oldLibs=$LIBS
8586+
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS $HB_CFLAGS"
8587+
LIBS="$tk_oldLibs $XFT_LIBS $HB_LIBS $XLIBSW"
85888588

8589-
ac_fn_c_check_header_compile "$LINENO" "harfbuzz/hb.h" "ac_cv_header_harfbuzz_hb_h" "#include <X11/Xlib.h>
8589+
ac_fn_c_check_header_compile "$LINENO" "harfbuzz/hb.h" "ac_cv_header_harfbuzz_hb_h" "#include <X11/Xlib.h>
85908590
"
85918591
if test "x$ac_cv_header_harfbuzz_hb_h" = xyes
85928592
then :
85938593

85948594
else case e in #(
85958595
e)
8596-
as_fn_error $? "HarfBuzz header <harfbuzz/hb.h> not found" "$LINENO" 5
8597-
;;
8596+
as_fn_error $? "HarfBuzz header <harfbuzz/hb.h> not found" "$LINENO" 5
8597+
;;
85988598
esac
85998599
fi
86008600

86018601

8602-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for hb_buffer_create in -lharfbuzz" >&5
8602+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for hb_buffer_create in -lharfbuzz" >&5
86038603
printf %s "checking for hb_buffer_create in -lharfbuzz... " >&6; }
86048604
if test ${ac_cv_lib_harfbuzz_hb_buffer_create+y}
86058605
then :
@@ -8650,29 +8650,29 @@ then :
86508650

86518651
else case e in #(
86528652
e)
8653-
as_fn_error $? "HarfBuzz library (libharfbuzz) not found or unusable" "$LINENO" 5
8654-
;;
8653+
as_fn_error $? "HarfBuzz library (libharfbuzz) not found or unusable" "$LINENO" 5
8654+
;;
86558655
esac
86568656
fi
86578657

86588658

8659-
CFLAGS=$tk_oldCFlags
8660-
LIBS=$tk_oldLibs
8659+
CFLAGS=$tk_oldCFlags
8660+
LIBS=$tk_oldLibs
86618661

8662-
BIDI_CFLAGS="$BIDI_CFLAGS $HB_CFLAGS"
8662+
BIDI_CFLAGS="$BIDI_CFLAGS $HB_CFLAGS"
86638663

86648664

8665-
fi
8666-
else
8667-
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
8665+
fi
8666+
else
8667+
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: no" >&5
86688668
printf '%s\n' "no" >&6; }
8669-
as_fn_error $? "--enable-bidi requires HarfBuzz development files.
8669+
as_fn_error $? "--enable-bidi requires HarfBuzz development files.
86708670
Please install the HarfBuzz development package:
86718671
- Debian/Ubuntu: sudo apt install libharfbuzz-dev
86728672
- Fedora/RHEL: sudo dnf install harfbuzz-devel
86738673
- Arch: sudo pacman -S harfbuzz
86748674
- macOS (Homebrew): brew install harfbuzz" "$LINENO" 5
8675-
fi
8675+
fi
86768676
fi
86778677

86788678
if test "$enable_bidi" = "no"; then
@@ -8681,12 +8681,12 @@ Please install the HarfBuzz development package:
86818681
HB_CFLAGS=""
86828682
HB_LIBS=""
86838683
if test "$enable_xft" = "yes" ; then
8684-
UNIX_FONT_OBJS="tkUnixRFont.o"
8684+
UNIX_FONT_OBJS="tkUnixRFont.o"
86858685

86868686
printf '%s\n' "#define HAVE_XFT 1" >>confdefs.h
86878687

86888688
else
8689-
UNIX_FONT_OBJS="tkUnixFont.o"
8689+
UNIX_FONT_OBJS="tkUnixFont.o"
86908690
fi
86918691
fi
86928692

‎unix/configure.ac‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -374,86 +374,86 @@ if test $tk_aqua = no; then
374374
fi
375375

376376
BIDI_CFLAGS="-I${TK_SRC_DIR}/unix/bidi/Headers \
377-
-I${TK_SRC_DIR}/unix/bidi/Source \
378-
-I${TK_SRC_DIR}/unix/bidi \
379-
-DSB_CONFIG_UNITY -DSB_CONFIG_EXPERIMENTAL_TEXT_API -w"
377+
-I${TK_SRC_DIR}/unix/bidi/Source \
378+
-I${TK_SRC_DIR}/unix/bidi \
379+
-DSB_CONFIG_UNITY -DSB_CONFIG_EXPERIMENTAL_TEXT_API -w"
380380
AC_DEFINE(HAVE_BIDI, 1, [Define to 1 if bidirectional text support is enabled])
381381
UNIX_FONT_OBJS="tkUnixBidiFont.o SheenBidi.o"
382382

383-
#--------------------------------------------------------------------
384-
# HarfBuzz - version check (minimum 2.8.2)
385-
#--------------------------------------------------------------------
386-
AC_MSG_CHECKING([for HarfBuzz (required for --enable-bidi)])
387-
if pkg-config --exists harfbuzz; then
388-
HB_VERSION=`pkg-config --modversion harfbuzz 2>/dev/null || echo "0.0.0"`
389-
AC_MSG_RESULT([found version $HB_VERSION])
390-
391-
# Pure shell version comparison: is HB_VERSION < 2.8.2 ?
392-
if test -n "$HB_VERSION"; then
393-
# Normalize version strings (handle cases like 2.8.2, 3.0.0, etc.)
394-
HB_MAJOR=`echo $HB_VERSION | cut -d. -f1`
395-
HB_MINOR=`echo $HB_VERSION | cut -d. -f2`
396-
HB_PATCH=`echo $HB_VERSION | cut -d. -f3 | cut -d- -f1`
397-
398-
REQ_MAJOR=2
399-
REQ_MINOR=8
400-
REQ_PATCH=2
401-
402-
too_old=no
403-
if test $HB_MAJOR -lt $REQ_MAJOR; then
404-
too_old=yes
405-
elif test $HB_MAJOR -eq $REQ_MAJOR; then
406-
if test $HB_MINOR -lt $REQ_MINOR; then
407-
too_old=yes
408-
elif test $HB_MINOR -eq $REQ_MINOR; then
409-
if test -n "$HB_PATCH" && test $HB_PATCH -lt $REQ_PATCH; then
410-
too_old=yes
411-
fi
412-
fi
413-
fi
414-
415-
if test "$too_old" = "yes"; then
416-
AC_MSG_WARN([HarfBuzz version $HB_VERSION is too old (need >= 2.8.2).])
417-
AC_MSG_WARN([Disabling bidirectional text support (--disable-bidi).])
418-
enable_bidi=no
419-
else
420-
AC_MSG_RESULT([HarfBuzz version $HB_VERSION is sufficient (>= 2.8.2).])
421-
fi
422-
fi
423-
424-
if test "$enable_bidi" = "yes"; then
425-
HB_CFLAGS=`pkg-config --cflags harfbuzz`
426-
HB_LIBS=`pkg-config --libs harfbuzz`
427-
428-
tk_oldCFlags=$CFLAGS
429-
tk_oldLibs=$LIBS
430-
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS $HB_CFLAGS"
431-
LIBS="$tk_oldLibs $XFT_LIBS $HB_LIBS $XLIBSW"
432-
433-
AC_CHECK_HEADER(harfbuzz/hb.h, [], [
434-
AC_MSG_ERROR([HarfBuzz header <harfbuzz/hb.h> not found])
435-
], [#include <X11/Xlib.h>])
436-
437-
AC_CHECK_LIB(harfbuzz, hb_buffer_create, [], [
438-
AC_MSG_ERROR([HarfBuzz library (libharfbuzz) not found or unusable])
439-
])
440-
441-
CFLAGS=$tk_oldCFlags
442-
LIBS=$tk_oldLibs
443-
444-
BIDI_CFLAGS="$BIDI_CFLAGS $HB_CFLAGS"
445-
AC_SUBST(HB_CFLAGS)
446-
AC_SUBST(HB_LIBS)
447-
fi
448-
else
449-
AC_MSG_RESULT([no])
450-
AC_MSG_ERROR([--enable-bidi requires HarfBuzz development files.
383+
#--------------------------------------------------------------------
384+
# HarfBuzz - version check (minimum 2.8.2)
385+
#--------------------------------------------------------------------
386+
AC_MSG_CHECKING([for HarfBuzz (required for --enable-bidi)])
387+
if pkg-config --exists harfbuzz; then
388+
HB_VERSION=`pkg-config --modversion harfbuzz 2>/dev/null || echo "0.0.0"`
389+
AC_MSG_RESULT([found version $HB_VERSION])
390+
391+
# Pure shell version comparison: is HB_VERSION < 2.8.2 ?
392+
if test -n "$HB_VERSION"; then
393+
# Normalize version strings (handle cases like 2.8.2, 3.0.0, etc.)
394+
HB_MAJOR=`echo $HB_VERSION | cut -d. -f1`
395+
HB_MINOR=`echo $HB_VERSION | cut -d. -f2`
396+
HB_PATCH=`echo $HB_VERSION | cut -d. -f3 | cut -d- -f1`
397+
398+
REQ_MAJOR=2
399+
REQ_MINOR=8
400+
REQ_PATCH=2
401+
402+
too_old=no
403+
if test $HB_MAJOR -lt $REQ_MAJOR; then
404+
too_old=yes
405+
elif test $HB_MAJOR -eq $REQ_MAJOR; then
406+
if test $HB_MINOR -lt $REQ_MINOR; then
407+
too_old=yes
408+
elif test $HB_MINOR -eq $REQ_MINOR; then
409+
if test -n "$HB_PATCH" && test $HB_PATCH -lt $REQ_PATCH; then
410+
too_old=yes
411+
fi
412+
fi
413+
fi
414+
415+
if test "$too_old" = "yes"; then
416+
AC_MSG_WARN([HarfBuzz version $HB_VERSION is too old (need >= 2.8.2).])
417+
AC_MSG_WARN([Disabling bidirectional text support (--disable-bidi).])
418+
enable_bidi=no
419+
else
420+
AC_MSG_RESULT([HarfBuzz version $HB_VERSION is sufficient (>= 2.8.2).])
421+
fi
422+
fi
423+
424+
if test "$enable_bidi" = "yes"; then
425+
HB_CFLAGS=`pkg-config --cflags harfbuzz`
426+
HB_LIBS=`pkg-config --libs harfbuzz`
427+
428+
tk_oldCFlags=$CFLAGS
429+
tk_oldLibs=$LIBS
430+
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS $HB_CFLAGS"
431+
LIBS="$tk_oldLibs $XFT_LIBS $HB_LIBS $XLIBSW"
432+
433+
AC_CHECK_HEADER(harfbuzz/hb.h, [], [
434+
AC_MSG_ERROR([HarfBuzz header <harfbuzz/hb.h> not found])
435+
], [#include <X11/Xlib.h>])
436+
437+
AC_CHECK_LIB(harfbuzz, hb_buffer_create, [], [
438+
AC_MSG_ERROR([HarfBuzz library (libharfbuzz) not found or unusable])
439+
])
440+
441+
CFLAGS=$tk_oldCFlags
442+
LIBS=$tk_oldLibs
443+
444+
BIDI_CFLAGS="$BIDI_CFLAGS $HB_CFLAGS"
445+
AC_SUBST(HB_CFLAGS)
446+
AC_SUBST(HB_LIBS)
447+
fi
448+
else
449+
AC_MSG_RESULT([no])
450+
AC_MSG_ERROR([--enable-bidi requires HarfBuzz development files.
451451
Please install the HarfBuzz development package:
452452
- Debian/Ubuntu: sudo apt install libharfbuzz-dev
453453
- Fedora/RHEL: sudo dnf install harfbuzz-devel
454454
- Arch: sudo pacman -S harfbuzz
455455
- macOS (Homebrew): brew install harfbuzz])
456-
fi
456+
fi
457457
fi
458458

459459
if test "$enable_bidi" = "no"; then
@@ -462,10 +462,10 @@ Please install the HarfBuzz development package:
462462
HB_CFLAGS=""
463463
HB_LIBS=""
464464
if test "$enable_xft" = "yes" ; then
465-
UNIX_FONT_OBJS="tkUnixRFont.o"
466-
AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?])
465+
UNIX_FONT_OBJS="tkUnixRFont.o"
466+
AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?])
467467
else
468-
UNIX_FONT_OBJS="tkUnixFont.o"
468+
UNIX_FONT_OBJS="tkUnixFont.o"
469469
fi
470470
fi
471471

0 commit comments

Comments
 (0)