Skip to content

Commit d5b64e5

Browse files
Add new opt-in RescaleOverlappingGlyphs option
1 parent dccf370 commit d5b64e5

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,8 @@ Blazor WebAssembly `index.html`
9292
<script src="_framework/blazor.webassembly.js"></script>
9393
<script>navigator.serviceWorker.register('service-worker.js');</script>
9494

95+
<!-- Load the XtermBlazor library and register addons -->
9596
<script src="_content/XtermBlazor/XtermBlazor.min.js"></script>
96-
97-
<!-- Register addon to XtermBlazor -->
9897
<script>XtermBlazor.registerAddons({"addon-fit": new FitAddon.FitAddon()});</script>
9998
```
10099

@@ -104,9 +103,9 @@ Blazor Server `_Host.cshtml`
104103
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-fit@0.9.0/lib/addon-fit.min.js"></script>
105104

106105
<script src="_framework/blazor.server.js"></script>
107-
<script src="_content/XtermBlazor/XtermBlazor.min.js"></script>
108106

109-
<!-- Register addon to XtermBlazor -->
107+
<!-- Load the XtermBlazor library and register addons -->
108+
<script src="_content/XtermBlazor/XtermBlazor.min.js"></script>
110109
<script>XtermBlazor.registerAddons({"addon-fit": new FitAddon.FitAddon()});</script>
111110
```
112111

XtermBlazor.Demo.Server/Pages/_Host.cshtml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@
3333
<a class="dismiss">🗙</a>
3434
</div>
3535

36-
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-fit@0.9.0/lib/addon-fit.min.js"></script>
37-
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-search@0.14.0/lib/addon-search.min.js"></script>
38-
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-web-links@0.10.0/lib/addon-web-links.min.js"></script>
36+
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-fit@0.10.0/lib/addon-fit.min.js"></script>
37+
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-search@0.15.0/lib/addon-search.min.js"></script>
38+
<script src="https://cdn.jsdelivr.net/npm/@@xterm/addon-web-links@0.11.0/lib/addon-web-links.min.js"></script>
3939

4040
<script src="_framework/blazor.server.js"></script>
41+
4142
<script src="_content/XtermBlazor/XtermBlazor.min.js"></script>
4243
<script>
4344
XtermBlazor.registerAddons({

XtermBlazor.Demo.Wasm/wwwroot/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<a class="dismiss">🗙</a>
2525
</div>
2626

27-
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0.9.0/lib/addon-fit.min.js"></script>
28-
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-search@0.14.0/lib/addon-search.min.js"></script>
29-
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links@0.10.0/lib/addon-web-links.min.js"></script>
27+
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0.10.0/lib/addon-fit.min.js"></script>
28+
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-search@0.15.0/lib/addon-search.min.js"></script>
29+
<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links@0.11.0/lib/addon-web-links.min.js"></script>
3030

3131
<script src="_framework/blazor.webassembly.js"></script>
3232
<script>navigator.serviceWorker.register('service-worker.js');</script>

XtermBlazor/TerminalOptions.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,19 @@ public class TerminalOptions
248248
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
249249
public double? MinimumContrastRatio { get; set; }
250250

251+
/// <summary>
252+
/// Whether to rescale glyphs horizontally that are a single cell wide but
253+
/// have glyphs that would overlap following cell(s). This typically happens
254+
/// for ambiguous width characters (eg. the roman numeral characters U+2160+)
255+
/// which aren't featured in monospace fonts. Emoji glyphs are never
256+
/// rescaled. This is an important feature for achieving GB18030 compliance.
257+
/// <br /><br />
258+
/// Note that this doesn't work with the DOM renderer. The default is false.
259+
/// </summary>
260+
[JsonPropertyName("rescaleOverlappingGlyphs")]
261+
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
262+
public bool? RescaleOverlappingGlyphs { get; set; }
263+
251264
/// <summary>
252265
/// The type of renderer to use, this allows using the fallback DOM renderer
253266
/// when canvas is too slow for the environment. The following features do

XtermBlazor/XtermBlazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2020
<Description>Brings xterm.js to Blazor</Description>
2121
<PackageIcon>icon.png</PackageIcon>
22-
<Version>2.0.0</Version>
22+
<Version>2.1.0</Version>
2323
<PackageTags>xterm, xterm-js, blazor, blazor-server, blazor-webassembly, blazor-wasm,
2424
xtermblazor</PackageTags>
2525
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

0 commit comments

Comments
 (0)