Remove tag compaction "optimizations"
The intention was to remove tags that won't have an effect and join together consecutive tags. However the patterns used can just as well appear in regular text, so this can replace characters inside user defined text and not just formatting tags. Fixes #2331
This commit is contained in:
parent
64649a1e47
commit
e30d2c4c1f
@ -10,10 +10,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
### Fixed
|
||||||
|
- Wrong text displayed if module text ends with `}` ([`#2331`](https://github.com/polybar/polybar/issues/2331))
|
||||||
|
|
||||||
## [3.5.3] - 2020-12-23
|
## [3.5.3] - 2020-12-23
|
||||||
### Build
|
### Build
|
||||||
- Don't use `git` when building documentation ([`#2311`](https://github.com/polybar/polybar/issues/2309))
|
- Don't use `git` when building documentation ([`#2309`](https://github.com/polybar/polybar/issues/2309))
|
||||||
### Fixed
|
### Fixed
|
||||||
- Empty color values are no longer treated as invalid and no longer produce an error.
|
- Empty color values are no longer treated as invalid and no longer produce an error.
|
||||||
|
|
||||||
|
@ -646,16 +646,7 @@ bool controller::process_update(bool force) {
|
|||||||
block_contents += padding_right;
|
block_contents += padding_right;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Strip unnecessary reset tags
|
contents += block_contents;
|
||||||
block_contents = string_util::replace_all(block_contents, "T-}%{T", "T");
|
|
||||||
block_contents = string_util::replace_all(block_contents, "B-}%{B#", "B#");
|
|
||||||
block_contents = string_util::replace_all(block_contents, "F-}%{F#", "F#");
|
|
||||||
block_contents = string_util::replace_all(block_contents, "U-}%{U#", "U#");
|
|
||||||
block_contents = string_util::replace_all(block_contents, "u-}%{u#", "u#");
|
|
||||||
block_contents = string_util::replace_all(block_contents, "o-}%{o#", "o#");
|
|
||||||
|
|
||||||
// Join consecutive tags
|
|
||||||
contents += string_util::replace_all(block_contents, "}%{", " ");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
Loading…
Reference in New Issue
Block a user