summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorluz.paz <luzpaz@users.noreply.github.com>2018-09-30 18:39:25 +0000
committerluz paz <luzpaz@users.noreply.github.com>2018-10-06 02:05:25 +0000
commit33780c0f28bcda586b1e14de93525a6ab426e4df (patch)
tree341c90061fed79841ea4161b2088d5baa40fe1fa /src/libnrtype
parentAdd new style register style property for stop color and opacity (diff)
downloadinkscape-33780c0f28bcda586b1e14de93525a6ab426e4df.tar.gz
inkscape-33780c0f28bcda586b1e14de93525a6ab426e4df.zip
Misc. typos
Found via `codespell`
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontFactory.h2
-rw-r--r--src/libnrtype/FontInstance.cpp2
-rw-r--r--src/libnrtype/Layout-TNG-Output.cpp4
-rw-r--r--src/libnrtype/Layout-TNG-Scanline-Makers.cpp2
-rw-r--r--src/libnrtype/Layout-TNG.h2
-rw-r--r--src/libnrtype/font-instance.h4
6 files changed, 8 insertions, 8 deletions
diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h
index 82476fbae..085410169 100644
--- a/src/libnrtype/FontFactory.h
+++ b/src/libnrtype/FontFactory.h
@@ -130,7 +130,7 @@ public:
int weight=PANGO_WEIGHT_NORMAL, int stretch=PANGO_STRETCH_NORMAL,
int size=10, int spacing=0);
- /// Semi-private: tells the font_factory taht the font_instance 'who' has died and should be removed from loadedFaces
+ /// Semi-private: tells the font_factory that the font_instance 'who' has died and should be removed from loadedFaces
void UnrefFace(font_instance* who);
// internal
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index 235840bb0..88339a60e 100644
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -700,7 +700,7 @@ void font_instance::FindFontMetrics() {
// On Windows, the typographic ascender and descender are taken from the otmMacAscent and
// otmMacDescent values:
// http://microsoft.public.win32.programmer.gdi.narkive.com/LV6k4BDh/msdn-documentation-outlinetextmetrics-clarification
- // The otmAscent and otmDescent values are the maxiumum ascent and maxiumum descent of all the
+ // The otmAscent and otmDescent values are the maximum ascent and maximum descent of all the
// glyphs in a font.
if ( theFace ) {
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index c9f140872..81710b471 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -206,7 +206,7 @@ void Layout::show(DrawingGroup *in_arena, Geom::OptRect const &paintbox) const
}
// Save the starting coordinates for the line - these are needed for figuring out
// dot/dash/wave phase.
- // Use maximum ascent and descent to ensure glpyhs that extend outside the embox
+ // Use maximum ascent and descent to ensure glyphs that extend outside the embox
// are fully drawn.
(void) nr_text->addComponent(_spans[span_index].font, _glyphs[glyph_index].glyph, glyph_matrix,
_glyphs[glyph_index].width,
@@ -373,7 +373,7 @@ std:: cout << "DEBUG Layout::print in while "
++text_iter;
if(doUTN)newtarget=SingleUnicodeToNon(*text_iter); // this should only ever be with a 1:1 glyph:character situation
if(newtarget != oldtarget)break; // change in unicode to nonunicode translation status
- // MUST exit on any major span change, but not on some little events, like a font substitution event irrelvant for the file save
+ // MUST exit on any major span change, but not on some little events, like a font substitution event irrelevant for the file save
unsigned next_span_index = _characters[lc_index].in_span;
if(span_index != next_span_index){
/* on major changes break out of loop.
diff --git a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
index f95846279..78b805003 100644
--- a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
+++ b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
@@ -130,7 +130,7 @@ std::vector<Layout::ScanlineMaker::ScanRun> Layout::ShapeScanlineMaker::makeScan
// I think what's going on here is that we're moving the top of the scanline to the given position...
_rotated_shape->Scan(_rasterizer_y, _current_rasterization_point, _y, line_text_height);
- // ...then actually retreiving the scanline (which alters the first two parameters)
+ // ...then actually retrieving the scanline (which alters the first two parameters)
_rotated_shape->Scan(_rasterizer_y, _current_rasterization_point, _y + line_text_height , &line_rasterization, true, line_text_height);
// sanitise the raw rasterisation, which could have weird overlaps
line_rasterization.Flatten();
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index 879bef24b..6c68ae913 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -972,7 +972,7 @@ public:
/* mustn't compare _glyph_index in these operators because for characters
that don't have glyphs (line breaks, elided soft hyphens, etc), the glyph
- index is -1 which makes them not well-ordered. To be honest, interating by
+ index is -1 which makes them not well-ordered. To be honest, iterating by
glyphs is not very useful and should be avoided. */
bool operator< (iterator const &other) const
{return _char_index < other._char_index;}
diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index 725d5d2d2..0834ace04 100644
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -105,8 +105,8 @@ private:
double _ascent; // Typographic ascent.
double _descent; // Typographic descent.
double _xheight; // x-height of font.
- double _ascent_max; // Maxiumum ascent of all glyphs in font.
- double _descent_max; // Maxiumum descent of all glyphs in font.
+ double _ascent_max; // Maximum ascent of all glyphs in font.
+ double _descent_max; // Maximum descent of all glyphs in font.
// Baselines
double _baselines[SP_CSS_BASELINE_SIZE];