Merge pull request #8785 from Rob--W/svg-ignore-missing-glyph
SVG: Don't render missing glyphs
This commit is contained in:
		
						commit
						50e10fdafc
					
				@ -742,15 +742,23 @@ SVGGraphics = (function SVGGraphicsClosure() {
 | 
				
			|||||||
          x += -glyph * fontSize * 0.001;
 | 
					          x += -glyph * fontSize * 0.001;
 | 
				
			||||||
          continue;
 | 
					          continue;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        current.xcoords.push(current.x + x * textHScale);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        var width = glyph.width;
 | 
					        var width = glyph.width;
 | 
				
			||||||
        var character = glyph.fontChar;
 | 
					        var character = glyph.fontChar;
 | 
				
			||||||
        var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
 | 
					        var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
 | 
				
			||||||
        var charWidth = width * widthAdvanceScale + spacing * fontDirection;
 | 
					        var charWidth = width * widthAdvanceScale + spacing * fontDirection;
 | 
				
			||||||
        x += charWidth;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!glyph.isInFont && !font.missingFile) {
 | 
				
			||||||
 | 
					          x += charWidth;
 | 
				
			||||||
 | 
					          // TODO: To assist with text selection, we should replace the missing
 | 
				
			||||||
 | 
					          // character with a space character if charWidth is not zero.
 | 
				
			||||||
 | 
					          // But we cannot just do "character = ' '", because the ' ' character
 | 
				
			||||||
 | 
					          // might actually map to a different glyph.
 | 
				
			||||||
 | 
					          continue;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        current.xcoords.push(current.x + x * textHScale);
 | 
				
			||||||
        current.tspan.textContent += character;
 | 
					        current.tspan.textContent += character;
 | 
				
			||||||
 | 
					        x += charWidth;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
      if (vertical) {
 | 
					      if (vertical) {
 | 
				
			||||||
        current.y -= x * textHScale;
 | 
					        current.y -= x * textHScale;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user