Remove duplicate include of basic-common.h (#97667, Tony Graham)

Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/basic/basic-ft2.c: Remove duplicate
        include of basic-common.h (#97667, Tony Graham)

7 files changed, 96 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d3e8e766..5e3a5fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-ft2.c: Remove duplicate
+	include of basic-common.h (#97667, Tony Graham)
+
 Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use some shell magic rather than 
@@ -7,6 +12,17 @@ Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 	Check for 0.10, since we need that for 
 	--output-format=xml.
 
+Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (imposed_shape): Fix bytes/chars
+	problem for glyph->log_clusters.
+
+	* pango/pango-layout.c (cluster_end_index)
+	* pango/pango-layout.c (pango_layout_iter_next_cluster): Fix 
+	confusion between global indices and run-relative indices.
+
+	* docs/tmpl/glyphs.sgml: Improve docs for log_clusters.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d3e8e766..5e3a5fe8 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-ft2.c: Remove duplicate
+	include of basic-common.h (#97667, Tony Graham)
+
 Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use some shell magic rather than 
@@ -7,6 +12,17 @@ Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 	Check for 0.10, since we need that for 
 	--output-format=xml.
 
+Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (imposed_shape): Fix bytes/chars
+	problem for glyph->log_clusters.
+
+	* pango/pango-layout.c (cluster_end_index)
+	* pango/pango-layout.c (pango_layout_iter_next_cluster): Fix 
+	confusion between global indices and run-relative indices.
+
+	* docs/tmpl/glyphs.sgml: Improve docs for log_clusters.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index d3e8e766..5e3a5fe8 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-ft2.c: Remove duplicate
+	include of basic-common.h (#97667, Tony Graham)
+
 Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use some shell magic rather than 
@@ -7,6 +12,17 @@ Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 	Check for 0.10, since we need that for 
 	--output-format=xml.
 
+Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (imposed_shape): Fix bytes/chars
+	problem for glyph->log_clusters.
+
+	* pango/pango-layout.c (cluster_end_index)
+	* pango/pango-layout.c (pango_layout_iter_next_cluster): Fix 
+	confusion between global indices and run-relative indices.
+
+	* docs/tmpl/glyphs.sgml: Improve docs for log_clusters.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index d3e8e766..5e3a5fe8 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-ft2.c: Remove duplicate
+	include of basic-common.h (#97667, Tony Graham)
+
 Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use some shell magic rather than 
@@ -7,6 +12,17 @@ Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 	Check for 0.10, since we need that for 
 	--output-format=xml.
 
+Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (imposed_shape): Fix bytes/chars
+	problem for glyph->log_clusters.
+
+	* pango/pango-layout.c (cluster_end_index)
+	* pango/pango-layout.c (pango_layout_iter_next_cluster): Fix 
+	confusion between global indices and run-relative indices.
+
+	* docs/tmpl/glyphs.sgml: Improve docs for log_clusters.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index d3e8e766..5e3a5fe8 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-ft2.c: Remove duplicate
+	include of basic-common.h (#97667, Tony Graham)
+
 Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use some shell magic rather than 
@@ -7,6 +12,17 @@ Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 	Check for 0.10, since we need that for 
 	--output-format=xml.
 
+Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (imposed_shape): Fix bytes/chars
+	problem for glyph->log_clusters.
+
+	* pango/pango-layout.c (cluster_end_index)
+	* pango/pango-layout.c (pango_layout_iter_next_cluster): Fix 
+	confusion between global indices and run-relative indices.
+
+	* docs/tmpl/glyphs.sgml: Improve docs for log_clusters.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index d3e8e766..5e3a5fe8 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Thu Nov 21 17:35:08 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/basic/basic-ft2.c: Remove duplicate
+	include of basic-common.h (#97667, Tony Graham)
+
 Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use some shell magic rather than 
@@ -7,6 +12,17 @@ Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
 	Check for 0.10, since we need that for 
 	--output-format=xml.
 
+Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (imposed_shape): Fix bytes/chars
+	problem for glyph->log_clusters.
+
+	* pango/pango-layout.c (cluster_end_index)
+	* pango/pango-layout.c (pango_layout_iter_next_cluster): Fix 
+	confusion between global indices and run-relative indices.
+
+	* docs/tmpl/glyphs.sgml: Improve docs for log_clusters.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index 63d596ad..e1f65a42 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -31,8 +31,6 @@
 
 #define SCRIPT_ENGINE_NAME "BasicScriptEngineFT2"
 
-#include "basic-common.h"
-
 
 static PangoEngineRange basic_ranges[] = {
   /* Basic Latin, Latin-1 Supplement, Latin Extended-A, Latin Extended-B,