Fix position of text when 'direction' is 'rtl' (right-to-left).

(bzr r14405)

2 files changed, 25 insertions, 9 deletions

diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp
index d81e1b6b4..c4b0a5bee 100644
--- a/src/libnrtype/Layout-TNG-Compute.cpp
+++ b/src/libnrtype/Layout-TNG-Compute.cpp
@@ -24,15 +24,31 @@ namespace Text {
 #define TRACE(_args) IFTRACE(g_print _args)
 
 // ******* enum conversion tables
+
+// These enums are probably from the SVG 1.0 era where one could interpret 'writing-mode' as setting direction.
+// SVG 1.1 makes it clear that 'direction' should be used. 'direction' has only two values 'ltr' and 'rtl'.
+// The first two values for the 'writing-mode' enum just happen to match the first two value of 'direction' so the
+// existing code worked when 'writing-mode' was changed to 'direction'.
+// static Layout::EnumConversionItem const enum_convert_spstyle_direction_to_pango_direction[] = {
+//     {SP_CSS_WRITING_MODE_LR_TB, PANGO_DIRECTION_LTR},
+//     {SP_CSS_WRITING_MODE_RL_TB, PANGO_DIRECTION_RTL},
+//     {SP_CSS_WRITING_MODE_TB_LR, PANGO_DIRECTION_LTR}};   // this is correct
+
+// static Layout::EnumConversionItem const enum_convert_spstyle_direction_to_my_direction[] = {
+//     {SP_CSS_WRITING_MODE_LR_TB, Layout::LEFT_TO_RIGHT},
+//     {SP_CSS_WRITING_MODE_RL_TB, Layout::RIGHT_TO_LEFT},
+//     {SP_CSS_WRITING_MODE_TB_LR, Layout::LEFT_TO_RIGHT}};   // this is correct
+
+// Proper 'direction' enums
 static Layout::EnumConversionItem const enum_convert_spstyle_direction_to_pango_direction[] = {
-    {SP_CSS_WRITING_MODE_LR_TB, PANGO_DIRECTION_LTR},
-    {SP_CSS_WRITING_MODE_RL_TB, PANGO_DIRECTION_RTL},
-    {SP_CSS_WRITING_MODE_TB_LR, PANGO_DIRECTION_LTR}};   // this is correct
+    {SP_CSS_DIRECTION_LTR, PANGO_DIRECTION_LTR},
+    {SP_CSS_DIRECTION_RTL, PANGO_DIRECTION_RTL}};
 
 static Layout::EnumConversionItem const enum_convert_spstyle_direction_to_my_direction[] = {
-    {SP_CSS_WRITING_MODE_LR_TB, Layout::LEFT_TO_RIGHT},
-    {SP_CSS_WRITING_MODE_RL_TB, Layout::RIGHT_TO_LEFT},
-    {SP_CSS_WRITING_MODE_TB_LR, Layout::LEFT_TO_RIGHT}};   // this is correct
+    {SP_CSS_DIRECTION_LTR, Layout::LEFT_TO_RIGHT},
+    {SP_CSS_DIRECTION_RTL, Layout::RIGHT_TO_LEFT}};
+
+
 
 /** \brief private to Layout. Does the real work of text flowing.
 
diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index 84f3f260e..c9cfe81cc 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -202,13 +202,13 @@ Layout::Direction Layout::InputStreamTextSource::styleGetBlockProgression() cons
 
 }
 
-static Layout::Alignment text_anchor_to_alignment(unsigned anchor, Layout::Direction /*para_direction*/)
+static Layout::Alignment text_anchor_to_alignment(unsigned anchor, Layout::Direction para_direction)
 {
     switch (anchor) {
         default:
-        case SP_CSS_TEXT_ANCHOR_START:  return Layout::LEFT;
+        case SP_CSS_TEXT_ANCHOR_START:  return para_direction == Layout::LEFT_TO_RIGHT ? Layout::LEFT : Layout::RIGHT;
         case SP_CSS_TEXT_ANCHOR_MIDDLE: return Layout::CENTER;
-        case SP_CSS_TEXT_ANCHOR_END:    return Layout::RIGHT;
+        case SP_CSS_TEXT_ANCHOR_END:    return para_direction == Layout::LEFT_TO_RIGHT ? Layout::RIGHT : Layout::LEFT;
     }
 }