From b80f68e9585593a78bad9ae34385cbebe780299a Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 15 Oct 2015 13:52:47 +0200
Subject: Add new 'writing-mode' values, remove 'block-progression', fix a few
 typos.

(bzr r14416)
---
 src/libnrtype/Layout-TNG-Input.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index c9cfe81cc..9c2fc5c11 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -172,11 +172,6 @@ float Layout::InputStreamTextSource::styleComputeFontSize() const
     return medium_font_size * inherit_multiplier;
 }
 
-static const Layout::EnumConversionItem enum_convert_spstyle_block_progression_to_direction[] = {
-    {SP_CSS_BLOCK_PROGRESSION_TB, Layout::TOP_TO_BOTTOM},
-    {SP_CSS_BLOCK_PROGRESSION_LR, Layout::LEFT_TO_RIGHT},
-    {SP_CSS_BLOCK_PROGRESSION_RL, Layout::RIGHT_TO_LEFT}};
-
 static const Layout::EnumConversionItem enum_convert_spstyle_writing_mode_to_direction[] = {
     {SP_CSS_WRITING_MODE_LR_TB, Layout::TOP_TO_BOTTOM},
     {SP_CSS_WRITING_MODE_RL_TB, Layout::TOP_TO_BOTTOM},
@@ -190,8 +185,6 @@ Layout::Direction Layout::InputStreamTextSource::styleGetBlockProgression() cons
     SPStyle const *this_style = style;
 
     for ( ; ; ) {
-        if (this_style->block_progression.set)
-            return (Layout::Direction)_enum_converter(this_style->block_progression.computed, enum_convert_spstyle_block_progression_to_direction, sizeof(enum_convert_spstyle_block_progression_to_direction)/sizeof(enum_convert_spstyle_block_progression_to_direction[0]));
         if (this_style->writing_mode.set)
             return (Layout::Direction)_enum_converter(this_style->writing_mode.computed, enum_convert_spstyle_writing_mode_to_direction, sizeof(enum_convert_spstyle_writing_mode_to_direction)/sizeof(enum_convert_spstyle_writing_mode_to_direction[0]));
         if (this_style->object == NULL || this_style->object->parent == NULL) break;
-- 
cgit v1.2.3


From d929999b79640a8b1425a999483d782883035d3b Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 15 Oct 2015 14:14:01 +0200
Subject: Simplify code after removal of 'block-progression'.

(bzr r14417)
---
 src/libnrtype/Layout-TNG-Input.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index 9c2fc5c11..77480cebe 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -172,27 +172,24 @@ float Layout::InputStreamTextSource::styleComputeFontSize() const
     return medium_font_size * inherit_multiplier;
 }
 
-static const Layout::EnumConversionItem enum_convert_spstyle_writing_mode_to_direction[] = {
-    {SP_CSS_WRITING_MODE_LR_TB, Layout::TOP_TO_BOTTOM},
-    {SP_CSS_WRITING_MODE_RL_TB, Layout::TOP_TO_BOTTOM},
-    {SP_CSS_WRITING_MODE_TB_RL, Layout::RIGHT_TO_LEFT},
-    {SP_CSS_WRITING_MODE_TB_LR, Layout::LEFT_TO_RIGHT}};
-
 Layout::Direction Layout::InputStreamTextSource::styleGetBlockProgression() const
 {
-    // this function shouldn't be necessary, but since style.cpp doesn't support
-    // shorthand properties yet, it is.
-    SPStyle const *this_style = style;
+  switch( style->writing_mode.computed ) {
 
-    for ( ; ; ) {
-        if (this_style->writing_mode.set)
-            return (Layout::Direction)_enum_converter(this_style->writing_mode.computed, enum_convert_spstyle_writing_mode_to_direction, sizeof(enum_convert_spstyle_writing_mode_to_direction)/sizeof(enum_convert_spstyle_writing_mode_to_direction[0]));
-        if (this_style->object == NULL || this_style->object->parent == NULL) break;
-        this_style = this_style->object->parent->style;
-        if (this_style == NULL) break;
-    }
+  case SP_CSS_WRITING_MODE_LR_TB:
+  case SP_CSS_WRITING_MODE_RL_TB:
     return TOP_TO_BOTTOM;
+      
+  case SP_CSS_WRITING_MODE_TB_RL:
+    return RIGHT_TO_LEFT;
+
+  case SP_CSS_WRITING_MODE_TB_LR:
+    return LEFT_TO_RIGHT;
 
+  default:
+    std::cerr << "Layout::InputTextStream::styleGetBlockProgression: invalid writing mode." << std::endl;
+  }
+  return TOP_TO_BOTTOM;
 }
 
 static Layout::Alignment text_anchor_to_alignment(unsigned anchor, Layout::Direction para_direction)
-- 
cgit v1.2.3