move pango_shape and pango_reorder_items in here.

2000-12-15  Havoc Pennington  <hp@pobox.com>

* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
here.

* pango/pango-break.h: move most of pango.h in here, so that
pango.h can be the only file that includes pango-enum-types.h, so
that changing any header doesn't end up rebuilding all of pango
due to a rebuild of pango-enum-types.h.

* pango/makeenums.pl: script to generate pango-enum-types.[hc]

* pango/Makefile.am (pango_headers): built pango-enum-types.h,
pango-enum-types.c that do enum type registration; add
pango-break.h; do some assorted rearranging to handle the
built headers

* pango/pango.h: moved most of it to pango-break.h

* pango/break.c: include individual headers, not pango.h

* pango/shape.c: ditto

* pango/reorder-items.c: ditto

* pango/querymodules.c: ditto

* pango/pango-layout.c: ditto

* pango/pango-indic.c: ditto

* pango/mapping.c: ditto

* pango/itemize.c: ditto

* pango/fonts.c: ditto

1 files changed, 2 insertions, 76 deletions

diff --git a/pango/pango.h b/pango/pango.h
index 3cbc0f59..b5691901 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -22,16 +22,16 @@
 #ifndef __PANGO_H__
 #define __PANGO_H__
 
-#include <glib.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 #include <pango/pango-attributes.h>
+#include <pango/pango-break.h>
 #include <pango/pango-context.h>
 #include <pango/pango-coverage.h>
 #include <pango/pango-engine.h>
+#include <pango/pango-enum-types.h>
 #include <pango/pango-font.h>
 #include <pango/pango-fontmap.h>
 #include <pango/pango-glyph.h>
@@ -39,80 +39,6 @@ extern "C" {
 #include <pango/pango-layout.h>
 #include <pango/pango-types.h>
 
-/* Logical attributes of a character.
- */
-struct _PangoLogAttr
-{
-  guint is_break : 1;           /* Can break line in front of character */
-
-  guint is_mandatory_break : 1; /* Must break line in front of character */
-  
-  guint is_white : 1;           /* Whitespace character */
-
-  /* cursor can appear in front of character (i.e. this is a grapheme
-   * boundary, or the first character in the text)
-   */
-  guint is_cursor_position : 1;
-  
-  /* Note that in degenerate cases, you could have both start/end set on
-   * some text, most likely for sentences (e.g. no space after a period, so
-   * the next sentence starts right away)
-   */
-  
-  guint is_word_start : 1;      /* first character in a word */
-  guint is_word_end   : 1;      /* is first non-word char after a word */
-
-  /* There are two ways to divide sentences. The first assigns all
-   * intersentence whitespace/control/format chars to some sentence,
-   * so all chars are in some sentence; is_sentence_boundary denotes
-   * the boundaries there. The second way doesn't assign
-   * between-sentence spaces, etc. to any sentence, so
-   * is_sentence_start/is_sentence_end mark the boundaries of those
-   * sentences.
-   */
-  guint is_sentence_boundary : 1;
-  guint is_sentence_start : 1;  /* first character in a sentence */
-  guint is_sentence_end : 1;    /* first non-sentence char after a sentence */
-};
-
-/* Determine information about cluster/word/line breaks in a string
- * of Unicode text.
- */
-void pango_break (const gchar   *text, 
-		  gint           length, 
-		  PangoAnalysis *analysis, 
-		  PangoLogAttr  *attrs);
-
-void pango_find_paragraph_boundary (const gchar *text,
-                                    gint         length,
-                                    gint        *paragraph_delimiter_index,
-                                    gint        *next_paragraph_start);
-
-void pango_get_log_attrs (const char    *text,
-                          int            length,
-                          int            level,
-                          const char    *language,
-                          PangoLogAttr  *log_attrs);
-
-/* Turn a string of characters into a string of glyphs
- */
-void pango_shape (const gchar      *text,
-		  gint              length,
-		  PangoAnalysis    *analysis,
-		  PangoGlyphString *glyphs);
-
-GList *pango_reorder_items (GList *logical_items);
-
-/* This is the default break algorithm, used if no language
- * engine overrides it. Normally you should use pango_break()
- * instead; this function is mostly useful for chaining up
- * from a language engine override.
- */
-void pango_default_break (const gchar   *text,
-                          gint           length,
-                          PangoAnalysis *analysis,
-                          PangoLogAttr  *attrs);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */