summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-08-07 14:42:45 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-08-20 09:59:23 -0400
commitd8df0da73752284dff28952224258b1884ed200c (patch)
treed85a79aaf139cef2400949790a247d88746e6b44
parentdf6d8df3242d3e139df99dcccecf7ca9bbeed95d (diff)
downloadpango-d8df0da73752284dff28952224258b1884ed200c.tar.gz
Cosmetics: Split off pango-markup.h
-rw-r--r--pango/meson.build1
-rw-r--r--pango/pango-attributes.h19
-rw-r--r--pango/pango-markup.c2
-rw-r--r--pango/pango-markup.h52
-rw-r--r--pango/pango.h1
5 files changed, 56 insertions, 19 deletions
diff --git a/pango/meson.build b/pango/meson.build
index e5121bd8..04d19b2b 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -48,6 +48,7 @@ pango_headers = [
'pango-language.h',
'pango-layout.h',
'pango-matrix.h',
+ 'pango-markup.h',
'pango-modules.h',
'pango-renderer.h',
'pango-script.h',
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 35615bf3..9cdacf7f 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -689,25 +689,6 @@ void pango_attr_iterator_get_font (PangoAttrIterator *iterator
PANGO_AVAILABLE_IN_1_2
GSList * pango_attr_iterator_get_attrs (PangoAttrIterator *iterator);
-
-PANGO_AVAILABLE_IN_ALL
-gboolean pango_parse_markup (const char *markup_text,
- int length,
- gunichar accel_marker,
- PangoAttrList **attr_list,
- char **text,
- gunichar *accel_char,
- GError **error);
-
-PANGO_AVAILABLE_IN_1_32
-GMarkupParseContext * pango_markup_parser_new (gunichar accel_marker);
-PANGO_AVAILABLE_IN_1_32
-gboolean pango_markup_parser_finish (GMarkupParseContext *context,
- PangoAttrList **attr_list,
- char **text,
- gunichar *accel_char,
- GError **error);
-
PANGO_AVAILABLE_IN_1_50
PangoAttrString *pango_attribute_as_string (PangoAttribute *attr);
PANGO_AVAILABLE_IN_1_50
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index d4421711..a897a52d 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -24,6 +24,8 @@
#include <stdlib.h>
#include <errno.h>
+#include "pango-markup.h"
+
#include "pango-attributes.h"
#include "pango-font.h"
#include "pango-enum-types.h"
diff --git a/pango/pango-markup.h b/pango/pango-markup.h
new file mode 100644
index 00000000..92ac509d
--- /dev/null
+++ b/pango/pango-markup.h
@@ -0,0 +1,52 @@
+/* Pango
+ * pango-markup.h: Parser for attributed text
+ *
+ * Copyright (C) 2000 Red Hat Software
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PANGO_MARKUP_H__
+#define __PANGO_MARKUP_H__
+
+#include <pango-attributes.h>
+
+G_BEGIN_DECLS
+
+
+PANGO_AVAILABLE_IN_1_32
+GMarkupParseContext * pango_markup_parser_new (gunichar accel_marker);
+
+PANGO_AVAILABLE_IN_1_32
+gboolean pango_markup_parser_finish (GMarkupParseContext *context,
+ PangoAttrList **attr_list,
+ char **text,
+ gunichar *accel_char,
+ GError **error);
+
+PANGO_AVAILABLE_IN_ALL
+gboolean pango_parse_markup (const char *markup_text,
+ int length,
+ gunichar accel_marker,
+ PangoAttrList **attr_list,
+ char **text,
+ gunichar *accel_char,
+ GError **error);
+
+
+G_END_DECLS
+
+#endif /* __PANGO_MARKUP_H__ */
diff --git a/pango/pango.h b/pango/pango.h
index 7a00f925..16c7443a 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -40,6 +40,7 @@
#include <pango/pango-item.h>
#include <pango/pango-layout.h>
#include <pango/pango-matrix.h>
+#include <pango/pango-markup.h>
#include <pango/pango-renderer.h>
#include <pango/pango-script.h>
#include <pango/pango-tabs.h>