From 85d357155a82789ab969802555b269e925dfa615 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 26 Jul 2002 22:09:12 +0000 Subject: Replace uses of grep \(A\|B\) ... with egrep (A|B). (#84872, Arnaud Fri Jul 26 17:59:06 2002 Owen Taylor * configure.in: Replace uses of grep \(A\|B\) ... with egrep (A|B). (#84872, Arnaud Charlet) --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-1-10 | 13 +++++++++++++ ChangeLog.pre-1-2 | 13 +++++++++++++ ChangeLog.pre-1-4 | 13 +++++++++++++ ChangeLog.pre-1-6 | 13 +++++++++++++ ChangeLog.pre-1-8 | 13 +++++++++++++ configure.in | 56 +++++++++++++++++++++++++++--------------------------- 7 files changed, 106 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index ace27550..5ce261d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + +Thu Jul 25 11:42:17 2002 Owen Taylor + + * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) + * pango/pangowin32-fontmap.c (pango_win32_shutdown_display): + Handle checking for fontmap == NULL and setting + it to NULL after unrefing properly. (#87915, + Sven Neumann) + Wed Jul 24 23:07:43 2002 Owen Taylor * pango/pango-layout.c: Fix wrong assertion that was diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ace27550..5ce261d5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,16 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + +Thu Jul 25 11:42:17 2002 Owen Taylor + + * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) + * pango/pangowin32-fontmap.c (pango_win32_shutdown_display): + Handle checking for fontmap == NULL and setting + it to NULL after unrefing properly. (#87915, + Sven Neumann) + Wed Jul 24 23:07:43 2002 Owen Taylor * pango/pango-layout.c: Fix wrong assertion that was diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index ace27550..5ce261d5 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,16 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + +Thu Jul 25 11:42:17 2002 Owen Taylor + + * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) + * pango/pangowin32-fontmap.c (pango_win32_shutdown_display): + Handle checking for fontmap == NULL and setting + it to NULL after unrefing properly. (#87915, + Sven Neumann) + Wed Jul 24 23:07:43 2002 Owen Taylor * pango/pango-layout.c: Fix wrong assertion that was diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ace27550..5ce261d5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,16 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + +Thu Jul 25 11:42:17 2002 Owen Taylor + + * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) + * pango/pangowin32-fontmap.c (pango_win32_shutdown_display): + Handle checking for fontmap == NULL and setting + it to NULL after unrefing properly. (#87915, + Sven Neumann) + Wed Jul 24 23:07:43 2002 Owen Taylor * pango/pango-layout.c: Fix wrong assertion that was diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ace27550..5ce261d5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,16 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + +Thu Jul 25 11:42:17 2002 Owen Taylor + + * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) + * pango/pangowin32-fontmap.c (pango_win32_shutdown_display): + Handle checking for fontmap == NULL and setting + it to NULL after unrefing properly. (#87915, + Sven Neumann) + Wed Jul 24 23:07:43 2002 Owen Taylor * pango/pango-layout.c: Fix wrong assertion that was diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ace27550..5ce261d5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,16 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + +Thu Jul 25 11:42:17 2002 Owen Taylor + + * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) + * pango/pangowin32-fontmap.c (pango_win32_shutdown_display): + Handle checking for fontmap == NULL and setting + it to NULL after unrefing properly. (#87915, + Sven Neumann) + Wed Jul 24 23:07:43 2002 Owen Taylor * pango/pango-layout.c: Fix wrong assertion that was diff --git a/configure.in b/configure.in index b7ef7519..55a9744c 100644 --- a/configure.in +++ b/configure.in @@ -360,19 +360,19 @@ INCLUDED_FT2_MODULES= INCLUDED_WIN32_MODULES= IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $indic_modules | grep "\(^\| \)$module\(\$\| \)" > /dev/null; then + if echo $indic_modules | egrep "(^| )$module(\$| )" > /dev/null; then dir=indic else dir=`echo $module | sed "s/-.*//"` fi - if echo $module | grep -- "-xft\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-xft($|,)" > /dev/null; then INCLUDED_XFT_MODULES="$INCLUDED_XFT_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" - elif echo $module | grep -- "-ft2\($\|,\)" > /dev/null; then + elif echo $module | egrep -- "-ft2($|,)" > /dev/null; then INCLUDED_FT2_MODULES="$INCLUDED_FT2_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" - elif echo $module | grep -- "-x\($\|,\)" > /dev/null; then + elif echo $module | egrep -- "-x($|,)" > /dev/null; then INCLUDED_X_MODULES="$INCLUDED_X_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" - elif echo $module | grep -- "-win32\($\|,\)" > /dev/null; then + elif echo $module | egrep -- "-win32($|,)" > /dev/null; then INCLUDED_WIN32_MODULES="$INCLUDED_WIN32_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" else AC_MSG_ERROR([the specified module $module does not exist]) @@ -385,32 +385,32 @@ AC_SUBST(INCLUDED_XFT_MODULES) AC_SUBST(INCLUDED_FT2_MODULES) AC_SUBST(INCLUDED_WIN32_MODULES) -AM_CONDITIONAL(INCLUDE_ARABIC_FT2,echo $included_modules | grep '\(^\|,\)arabic-ft2\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_ARABIC_X,echo $included_modules | grep '\(^\|,\)arabic-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_ARABIC_XFT,echo $included_modules | grep '\(^\|,\)arabic-xft\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_ARABIC_FT2,echo $included_modules | egrep '(^|,)arabic-ft2($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_ARABIC_X,echo $included_modules | egrep '(^|,)arabic-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_ARABIC_XFT,echo $included_modules | egrep '(^|,)arabic-xft($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_FT2,echo $included_modules | grep '\(^\|,\)basic-ft2\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_WIN32,echo $included_modules | grep '\(^\|,\)basic-win32\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_XFT,echo $included_modules | grep '\(^\|,\)basic-xft\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_X,echo $included_modules | grep '\(^\|,\)basic-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_FT2,echo $included_modules | egrep '(^|,)basic-ft2($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_WIN32,echo $included_modules | egrep '(^|,)basic-win32($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_XFT,echo $included_modules | egrep '(^|,)basic-xft($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_X,echo $included_modules | egrep '(^|,)basic-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HANGUL_X,echo $included_modules | grep '\(^\|,\)hangul-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HANGUL_X,echo $included_modules | egrep '(^|,)hangul-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HEBREW_FT2,echo $included_modules | grep '\(^\|,\)hebrew-ft2\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HEBREW_X,echo $included_modules | grep '\(^\|,\)hebrew-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HEBREW_XFT,echo $included_modules | grep '\(^\|,\)hebrew-xft\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HEBREW_FT2,echo $included_modules | egrep '(^|,)hebrew-ft2($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HEBREW_X,echo $included_modules | egrep '(^|,)hebrew-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HEBREW_XFT,echo $included_modules | egrep '(^|,)hebrew-xft($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BENGALI_X,echo $included_modules | grep '\(^\|,\)bengali-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_DEVANAGARI_X,echo $included_modules | grep '\(^\|,\)devanagari-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_GUJARATI_X,echo $included_modules | grep '\(^\|,\)gujarati-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | grep '\(^\|,\)gurmukhi-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | grep '\(^\|,\)myanmar-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BENGALI_X,echo $included_modules | egrep '(^|,)bengali-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_DEVANAGARI_X,echo $included_modules | egrep '(^|,)devanagari-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_GUJARATI_X,echo $included_modules | egrep '(^|,)gujarati-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | egrep '(^|,)gurmukhi-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | egrep '(^|,)myanmar-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | grep '\(^\|,\)tamil-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | egrep '(^|,)tamil-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | grep '\(^\|,\)thai-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | egrep '(^|,)thai-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_INDIC_XFT,echo $included_modules | grep '\(^\|,\)indic-xft\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_INDIC_XFT,echo $included_modules | egrep '(^|,)indic-xft($|,)' > /dev/null) # # We use flockfile to implement pango_getline() - should be moved to GLib @@ -625,7 +625,7 @@ EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $module | grep -- "-x\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-x($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-x.c < /dev/null; then + if echo $module | egrep -- "-xft($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-xft.c < /dev/null; then + if echo $module | egrep -- "-ft2($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-ft2.c < /dev/null; then + if echo $module | egrep -- "-win32($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-win32.c <