Only print non-ascii font if switch "use different font" is active

This commit is contained in:
Dominik Ritter 2017-03-02 02:17:36 +01:00
parent e2d1cb27a5
commit 3cf7c5ffa2
1 changed files with 8 additions and 9 deletions

View File

@ -1659,15 +1659,14 @@ get_term_font() {
# "Normal Font"
term_font=$(/usr/libexec/PlistBuddy -c "Print :New\ Bookmarks:${idx}:Normal\ Font:" ~/Library/Preferences/com.googlecode.iterm2.plist)
# Font for non-ascii characters
# This font setting may differ from normal font, but this might be a false
# positive, as there is a setting to use a different font for non-ascii
# characters and this setting does not get updated when flipping the switch.
# So it might be that the user checked the mark to use a different font,
# selected one, but then decided to uncheck the "use different font" mark
# again.
local nonAsciiFont=$(/usr/libexec/PlistBuddy -c "Print :New\ Bookmarks:${idx}:Non\ Ascii\ Font:" ~/Library/Preferences/com.googlecode.iterm2.plist)
if [[ "$term_font" != "$nonAsciiFont" ]]; then
term_font="$term_font (normal) / $nonAsciiFont (non-ascii)"
# Only check for a different non-ascii font, if the user checked
# the "use a different font for non-ascii text" switch.
local useDifferentFont=$(/usr/libexec/PlistBuddy -c "Print :New\ Bookmarks:${idx}:Use\ Non-ASCII\ Font:" ~/Library/Preferences/com.googlecode.iterm2.plist)
if [[ "$useDifferentFont" == "true" ]]; then
local nonAsciiFont=$(/usr/libexec/PlistBuddy -c "Print :New\ Bookmarks:${idx}:Non\ Ascii\ Font:" ~/Library/Preferences/com.googlecode.iterm2.plist)
if [[ "$term_font" != "$nonAsciiFont" ]]; then
term_font="$term_font (normal) / $nonAsciiFont (non-ascii)"
fi
fi
fi
done