diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | docs/pango-docs.sgml | 3 | ||||
| -rw-r--r-- | pango/fonts.c | 2 | ||||
| -rw-r--r-- | pango/pango-color.c | 4 |
9 files changed, 57 insertions, 6 deletions
@@ -1,3 +1,12 @@ +2002-06-03 Matthias Clasen <maclas@gmx.de> + + * pango/fonts.c (pango_font_description_better_match): Typo fix. + + * pango/pango-color.c (pango_color_parse): + * docs/pango-docs.sgml: Replace homegrown "nbsp", "hash" + and "mdash" entities by standard ISO entities "nbsp", "num" and + "mdash". + 2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d876e343..726d047e 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +2002-06-03 Matthias Clasen <maclas@gmx.de> + + * pango/fonts.c (pango_font_description_better_match): Typo fix. + + * pango/pango-color.c (pango_color_parse): + * docs/pango-docs.sgml: Replace homegrown "nbsp", "hash" + and "mdash" entities by standard ISO entities "nbsp", "num" and + "mdash". + 2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index d876e343..726d047e 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +2002-06-03 Matthias Clasen <maclas@gmx.de> + + * pango/fonts.c (pango_font_description_better_match): Typo fix. + + * pango/pango-color.c (pango_color_parse): + * docs/pango-docs.sgml: Replace homegrown "nbsp", "hash" + and "mdash" entities by standard ISO entities "nbsp", "num" and + "mdash". + 2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d876e343..726d047e 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +2002-06-03 Matthias Clasen <maclas@gmx.de> + + * pango/fonts.c (pango_font_description_better_match): Typo fix. + + * pango/pango-color.c (pango_color_parse): + * docs/pango-docs.sgml: Replace homegrown "nbsp", "hash" + and "mdash" entities by standard ISO entities "nbsp", "num" and + "mdash". + 2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d876e343..726d047e 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +2002-06-03 Matthias Clasen <maclas@gmx.de> + + * pango/fonts.c (pango_font_description_better_match): Typo fix. + + * pango/pango-color.c (pango_color_parse): + * docs/pango-docs.sgml: Replace homegrown "nbsp", "hash" + and "mdash" entities by standard ISO entities "nbsp", "num" and + "mdash". + 2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d876e343..726d047e 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +2002-06-03 Matthias Clasen <maclas@gmx.de> + + * pango/fonts.c (pango_font_description_better_match): Typo fix. + + * pango/pango-color.c (pango_color_parse): + * docs/pango-docs.sgml: Replace homegrown "nbsp", "hash" + and "mdash" entities by standard ISO entities "nbsp", "num" and + "mdash". + 2002-06-03 Sven Neumann <sven@gimp.org> * pango/pangoft2-fontmap.c (pango_ft2_font_map_list_families): set diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml index 4e08ce45..e116b8d9 100644 --- a/docs/pango-docs.sgml +++ b/docs/pango-docs.sgml @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY hash "#"> -<!ENTITY nbsp " "> -<!ENTITY mdash "—"> <!ENTITY pango-Text-Processing SYSTEM "xml/main.xml"> <!ENTITY pango-Glyph-Storage SYSTEM "xml/glyphs.xml"> <!ENTITY pango-Coverage-Maps SYSTEM "xml/coverage-maps.xml"> diff --git a/pango/fonts.c b/pango/fonts.c index 5742e072..a75ff116 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -510,7 +510,7 @@ compute_distance (const PangoFontDescription *a, /** * pango_font_description_better_match: - * @desc: a #PangoFontDecription + * @desc: a #PangoFontDescription * @old_match: a #PangoFontDescription, or %NULL * @new_match: a #PangoFontDescription * diff --git a/pango/pango-color.c b/pango/pango-color.c index bd25cea9..b9d8b357 100644 --- a/pango/pango-color.c +++ b/pango/pango-color.c @@ -922,10 +922,10 @@ find_color(const char *name, * Fill in the fields of a color from a string specification. The * string can either one of a large set of standard names. (Taken * from the X11 <filename>rgb.txt</filename> file), or it can be a hex value in the - * form '&hash;rgb' '&hash;rrggbb' '&hash;rrrgggbbb' or '&hash;rrrrggggbbbb' where + * form '#rgb' '#rrggbb' '#rrrgggbbb' or '#rrrrggggbbbb' where * 'r', 'g' and 'b' are hex digits of the red, green, and blue * components of the color, respectively. (White in the four - * forms is '&hash;fff' '&hash;ffffff' '&hash;fffffffff' and '&hash;ffffffffffff') + * forms is '#fff' '#ffffff' '#fffffffff' and '#ffffffffffff') * * Return value: %TRUE if parsing of the specifier succeeded, * otherwise false. |