improve spcurve::second_point and document its behavior

[inkscape.git] / src / libnrtype / Layout-TNG-OutIter.cpp

diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 3dd043a..41fd48c
--- a/src/libnrtype/Layout-TNG-OutIter.cpp
+++ b/src/libnrtype/Layout-TNG-OutIter.cpp
@@ -201,7 +201,7 @@ Layout::iterator Layout::sourceToIterator(void *source_cookie) const
     return sourceToIterator(source_cookie, Glib::ustring::const_iterator(std::string::const_iterator(NULL)));
 }
 
-NR::Rect Layout::glyphBoundingBox(iterator const &it, double *rotation) const
+NR::Maybe<NR::Rect> Layout::glyphBoundingBox(iterator const &it, double *rotation) const
 {
    if (rotation) *rotation = _glyphs[it._glyph_index].rotation;
    return _glyphs[it._glyph_index].span(this).font->BBox(_glyphs[it._glyph_index].glyph);
@@ -264,14 +264,15 @@ NR::Rect Layout::characterBoundingBox(iterator const &it, double *rotation) cons
             NR::Point midpoint;
             NR::Point tangent;
             Span const &span = _characters[char_index].span(this);
-            double top = span.baseline_shift - span.line_height.ascent;
-            double bottom = span.baseline_shift + span.line_height.descent;
 
             const_cast<Path*>(_path_fitted)->PointAndTangentAt(midpoint_otp[0].piece, midpoint_otp[0].t, midpoint, tangent);
             top_left[NR::X] = midpoint[NR::X] - cluster_half_width;
-            top_left[NR::Y] = midpoint[NR::Y] + top;
+            top_left[NR::Y] = midpoint[NR::Y] - span.line_height.ascent;
             bottom_right[NR::X] = midpoint[NR::X] + cluster_half_width;
-            bottom_right[NR::Y] = midpoint[NR::Y] + bottom;
+            bottom_right[NR::Y] = midpoint[NR::Y] + span.line_height.descent;
+            NR::Point normal = tangent.cw();
+            top_left += span.baseline_shift * normal;
+            bottom_right += span.baseline_shift * normal;
             if (rotation)
                 *rotation = atan2(tangent[1], tangent[0]);
         }
@@ -753,7 +754,7 @@ bool Layout::iterator::prevLineCursor()
         for ( ; ; ) {                                                                            \
             if (_char_index == 0) {                                                              \
                 _glyph_index = 0;                                                                \
-                return true;                                                                     \
+                return false;                                                                    \
             }                                                                                    \
             _char_index--;                                                                       \
             if (_parent_layout->_characters[_char_index].char_attributes.attr) break;            \