Bug 436988 – Adding PangoScript to PangoAnalysis

2007-05-08  Behdad Esfahbod  <behdad@gnome.org>

        Bug 436988 – Adding PangoScript to PangoAnalysis

        * pango/pango-item.h:
        * pango/pango-context.c (itemize_state_add_character):
        Add a 'script' member to PangoAnalysis.  It's added as a guint8
        in the padding available in that struct, though it's value is a
        PangoScript.

        * pango/pangox.c (itemize_string_foreach):
        Update.


svn path=/trunk/; revision=2267

4 files changed, 17 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 148839a1..9f5d7c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2007-05-08  Behdad Esfahbod  <behdad@gnome.org>
 
+	Bug 436988 – Adding PangoScript to PangoAnalysis
+
+	* pango/pango-item.h:
+	* pango/pango-context.c (itemize_state_add_character):
+	Add a 'script' member to PangoAnalysis.  It's added as a guint8
+	in the padding available in that struct, though it's value is a
+	PangoScript.
+
+	* pango/pangox.c (itemize_string_foreach):
+	Update.
+
+2007-05-08  Behdad Esfahbod  <behdad@gnome.org>
+
 	Bug 416515 – Time is not aligned with date on vertical panel
 
 	* pango/pango-context.c (itemize_state_init),
diff --git a/pango/pango-context.c b/pango/pango-context.c
index a40c8edc..ff667b14 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -1013,6 +1013,7 @@ itemize_state_add_character (ItemizeState     *state,
 
   state->item->analysis.flags = state->centered_baseline ? PANGO_ANALYSIS_FLAG_CENTERED_BASELINE : 0;
 
+  state->item->analysis.script = state->script;
   state->item->analysis.language = state->derived_lang;
 
   if (state->copy_extra_attrs)
diff --git a/pango/pango-item.h b/pango/pango-item.h
index c07dc670..0775003c 100644
--- a/pango/pango-item.h
+++ b/pango/pango-item.h
@@ -42,7 +42,9 @@ struct _PangoAnalysis
   guint8 gravity; /* PangoGravity */
   guint8 flags;
 
+  guint8 script; /* PangoScript */
   PangoLanguage *language;
+
   GSList *extra_attrs;
 };
 
diff --git a/pango/pangox.c b/pango/pangox.c
index 8f58c861..59c0649e 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -754,15 +754,13 @@ itemize_string_foreach (PangoFont     *font,
 	  (finished ||
 	   (shaper != last_shaper || last_level != embedding_levels[i])))
 	{
-	  PangoAnalysis analysis;
+	  PangoAnalysis analysis = {0};
 	  int j;
 
 	  analysis.shape_engine = last_shaper;
-	  analysis.lang_engine = NULL;
 	  analysis.font = font;
 	  analysis.language = language;
 	  analysis.level = last_level;
-	  analysis.extra_attrs = NULL;
 
 	  pango_shape (start, p - start, &analysis, glyph_str);