Merge branch 'master' into 1576_remove_static_atlas

src/renderer/BaseRenderLayer.ts

@@ -288,7 +288,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
     this._currentGlyphIdentifier.code = cell.getCode() || WHITESPACE_CELL_CODE;
     this._currentGlyphIdentifier.bg = bg;
     this._currentGlyphIdentifier.fg = fg;
-    this._currentGlyphIdentifier.bold = cell.isBold() && terminal.options.enableBold;
+    this._currentGlyphIdentifier.bold = !!cell.isBold();
     this._currentGlyphIdentifier.dim = !!cell.isDim();
     this._currentGlyphIdentifier.italic = !!cell.isItalic();
     const atlasDidDraw = this._charAtlas && this._charAtlas.draw(
@@ -316,7 +316,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
    */
   private _drawUncachedChars(terminal: ITerminal, cell: ICellData, x: number, y: number): void {
     this._ctx.save();
-    this._ctx.font = this._getFont(terminal, cell.isBold() && terminal.options.enableBold, !!cell.isItalic());
+    this._ctx.font = this._getFont(terminal, !!cell.isBold(), !!cell.isItalic());
     this._ctx.textBaseline = 'middle';
 
     if (cell.isInverse()) {

src/renderer/dom/DomRendererRowFactory.test.ts

@@ -19,7 +19,6 @@ describe('DomRendererRowFactory', () => {
   beforeEach(() => {
     dom = new jsdom.JSDOM('');
 
-    options.enableBold = true;
     options.drawBoldTextInBrightColors = true;
 
     rowFactory = new DomRendererRowFactory(options, dom.window.document);

src/renderer/dom/DomRendererRowFactory.ts

@@ -77,7 +77,7 @@ export class DomRendererRowFactory {
         }
       }
 
-      if (this._workCell.isBold() && this._terminalOptions.enableBold) {
+      if (this._workCell.isBold()) {
         charElement.classList.add(BOLD_CLASS);
       }
 
@@ -104,8 +104,7 @@ export class DomRendererRowFactory {
         charElement.setAttribute('style', style);
       } else if (this._workCell.isFgPalette()) {
         let fg = this._workCell.getFgColor();
-        if (this._workCell.isBold() && fg < 8 && !swapColor &&
-            this._terminalOptions.enableBold && this._terminalOptions.drawBoldTextInBrightColors) {
+        if (this._workCell.isBold() && fg < 8 && !swapColor && this._terminalOptions.drawBoldTextInBrightColors) {
           fg += 8;
         }
         charElement.classList.add(`xterm-${swapColor ? 'b' : 'f'}g-${fg}`);