diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2015-11-10 12:57:55 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2015-11-10 12:57:55 +0000 |
| commit | 322711ea12ec4ec3b129e3415fa1a1bd8bc7060f (patch) | |
| tree | 7a334a10afb8839dc9853e6bc9dabd6c5dc17ebd /src | |
| parent | Rearrange code to make handling of baseline clearer. (diff) | |
| download | inkscape-322711ea12ec4ec3b129e3415fa1a1bd8bc7060f.tar.gz inkscape-322711ea12ec4ec3b129e3415fa1a1bd8bc7060f.zip | |
'direction' is an inherited property, remove 'set' requirement.
(bzr r14430.1.4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnrtype/Layout-TNG-Compute.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp index 7cae1eb8a..8f7f6bca0 100644 --- a/src/libnrtype/Layout-TNG-Compute.cpp +++ b/src/libnrtype/Layout-TNG-Compute.cpp @@ -1072,11 +1072,10 @@ void Layout::Calculator::_buildPangoItemizationForPara(ParagraphInfo *para) con para->direction = LEFT_TO_RIGHT; // CSS default if (_flow._input_stream[para->first_input_index]->Type() == TEXT_SOURCE) { Layout::InputStreamTextSource const *text_source = static_cast<Layout::InputStreamTextSource *>(_flow._input_stream[para->first_input_index]); - if (text_source->style->direction.set) { - para->direction = (text_source->style->direction.computed == SP_CSS_DIRECTION_LTR) ? LEFT_TO_RIGHT : RIGHT_TO_LEFT; - PangoDirection pango_direction = (text_source->style->direction.computed == SP_CSS_DIRECTION_LTR) ? PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL; - pango_items_glist = pango_itemize_with_base_dir(_pango_context, pango_direction, para_text.data(), 0, para_text.bytes(), attributes_list, NULL); - } + + para->direction = (text_source->style->direction.computed == SP_CSS_DIRECTION_LTR) ? LEFT_TO_RIGHT : RIGHT_TO_LEFT; + PangoDirection pango_direction = (text_source->style->direction.computed == SP_CSS_DIRECTION_LTR) ? PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL; + pango_items_glist = pango_itemize_with_base_dir(_pango_context, pango_direction, para_text.data(), 0, para_text.bytes(), attributes_list, NULL); } if( pango_items_glist == NULL ) { |