diff --git a/CHANGELOG.md b/CHANGELOG.md index 23ad7ae07b..d51da1de92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ - Fixed non-printable characters display for redirected output, see #1061 (@gsomix) ## Other +- Switched to "·" (U+00B7) Middle Dot from "•" (U+2022) Bullet for non-printing spaces, see #1056 and #1100 (@LordFlashmeow) + ## Syntaxes - Update AsciiDoc syntax, see #1034 (@rxt1077) diff --git a/assets/syntaxes.bin b/assets/syntaxes.bin index 2b12fad90a..adebfe9722 100644 Binary files a/assets/syntaxes.bin and b/assets/syntaxes.bin differ diff --git a/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax b/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax index 179d88b6a1..0d09ef237d 100644 --- a/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax +++ b/assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax @@ -7,7 +7,7 @@ file_extensions: scope: whitespace contexts: main: - - match: "•" + - match: "·" scope: support.function.show-nonprintable.space - match: "├─*┤" scope: constant.character.escape.show-nonprintable.tab diff --git a/src/preprocessor.rs b/src/preprocessor.rs index f6c3d3f3a0..eb87889027 100644 --- a/src/preprocessor.rs +++ b/src/preprocessor.rs @@ -60,7 +60,7 @@ pub fn replace_nonprintable(input: &[u8], tab_width: usize) -> String { match chr { // space - ' ' => output.push('•'), + ' ' => output.push('·'), // tab '\t' => { if tab_width == 1 { diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index 730974c95f..a1f3538c72 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -746,6 +746,6 @@ fn show_all_mode() { .arg("--show-all") .arg("nonprintable.txt") .assert() - .stdout("hello•world␊\n├──┤␍␀␇␈␛") + .stdout("hello·world␊\n├──┤␍␀␇␈␛") .stderr(""); }