summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNathan Lee <2431820-nathanal@users.noreply.gitlab.com>2019-05-23 13:06:44 +0000
committerThomas Holder <thomas@thomas-holder.de>2019-06-18 07:32:29 +0000
commit99ac6c9a52cb59ae037e7085633cfc5d0eb83837 (patch)
treef5b81581074b5f61e0ba3d9d6d3b31cc29693697 /src
parentFix a icon bug (diff)
downloadinkscape-99ac6c9a52cb59ae037e7085633cfc5d0eb83837.tar.gz
inkscape-99ac6c9a52cb59ae037e7085633cfc5d0eb83837.zip
Better check for CONTROL_CODE
Amend my previous commit 795066a6e73505 Based off extra case in _buildSpansForPara
Diffstat (limited to 'src')
-rw-r--r--src/libnrtype/Layout-TNG-Compute.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp
index e3f53f820..ce1b81676 100644
--- a/src/libnrtype/Layout-TNG-Compute.cpp
+++ b/src/libnrtype/Layout-TNG-Compute.cpp
@@ -711,7 +711,7 @@ void Layout::Calculator::_outputLine(ParagraphInfo const &para,
counter_directional_width_remaining = 0.0;
std::vector<BrokenSpan>::const_iterator it_following_span;
for (it_following_span = it_span ; it_following_span != it_chunk->broken_spans.end() ; it_following_span++) {
- if (_flow._input_stream[it_following_span->start.iter_span->input_index]->Type() == CONTROL_CODE) break;
+ if (it_following_span->start.iter_span->pango_item_index == -1) break;
Layout::Direction following_span_progression = static_cast<InputStreamTextSource const *>(_flow._input_stream[it_following_span->start.iter_span->input_index])->styleGetBlockProgression();
if (!Layout::_directions_are_orthogonal(following_span_progression, _block_progression)) {
if (new_span.direction != (para.pango_items[it_following_span->start.iter_span->pango_item_index].item->analysis.level & 1 ? RIGHT_TO_LEFT : LEFT_TO_RIGHT)) break;