pango r2636 - in trunk: . pango

[tml svn gnome org]

Author: tml
Date: Mon May 26 16:26:59 2008
New Revision: 2636
URL: http://svn.gnome.org/viewvc/pango?rev=2636&view=rev

Log:
2008-05-26  Tor Lillqvist  <tml novell com>

	* pango/pangowin32.c
	* pango/pangowin32-fontmap.c: Some whitespace cleanup. 



Modified:
   trunk/ChangeLog
   trunk/pango/pangowin32-fontmap.c
   trunk/pango/pangowin32.c

Modified: trunk/pango/pangowin32-fontmap.c
==============================================================================
--- trunk/pango/pangowin32-fontmap.c	(original)
+++ trunk/pango/pangowin32-fontmap.c	Mon May 26 16:26:59 2008
@@ -190,7 +190,7 @@
 {
   LOGFONTW lf;
 
-  PING(("%S: %lu %lx", lfp->lfFaceName, fontType, metrics->ntmFlags));
+  PING (("%S: %lu %lx", lfp->lfFaceName, fontType, metrics->ntmFlags));
 
   if (fontType == TRUETYPE_FONTTYPE ||
       (_pango_win32_os_version_info.dwMajorVersion >= 5 &&
@@ -378,6 +378,7 @@
 pango_win32_family_get_name (PangoFontFamily  *family)
 {
   PangoWin32Family *win32family = PANGO_WIN32_FAMILY (family);
+
   return win32family->family_name;
 }
 
@@ -498,7 +499,7 @@
 
   g_return_val_if_fail (description != NULL, NULL);
 
-  PING(("name=%s", pango_font_description_get_family (description)));
+  PING (("name=%s", pango_font_description_get_family (description)));
 
   win32family = g_hash_table_lookup (win32fontmap->families,
 				     pango_font_description_get_family (description));
@@ -526,7 +527,7 @@
 									   description);
 	/* TODO: Handle the case that result == NULL. */
       else
-	PING(("no best match!"));
+	PING (("no best match!"));
     }
 
   return result;
@@ -567,7 +568,7 @@
   if (pango_font_description_get_size_is_absolute (description))
     size = (int) 0.5 + (size * win32fontmap->resolution) / PANGO_SCALE;
 
-  PING(("got best match:%S size=%d",face->logfontw.lfFaceName,size));
+  PING (("got best match:%S size=%d",face->logfontw.lfFaceName,size));
 
   while (tmp_list)
     {
@@ -648,8 +649,8 @@
       if ((record.name_id != 1 && record.name_id != 16) || record.string_length <= 0)
 	continue;
 
-      PING(("platform:%d encoding:%d language:%04x name_id:%d",
-	    record.platform_id, record.encoding_id, record.language_id, record.name_id));
+      PING (("platform:%d encoding:%d language:%04x name_id:%d",
+	     record.platform_id, record.encoding_id, record.language_id, record.name_id));
 
       if (record.platform_id == APPLE_UNICODE_PLATFORM_ID ||
 	  record.platform_id == ISO_PLATFORM_ID)
@@ -704,7 +705,7 @@
     goto fail2;
   g_free (string);
 
-  PING(("%s", name));
+  PING (("%s", name));
 
   SelectObject (_pango_win32_hdc, oldhfont);
   DeleteObject (hfont);
@@ -844,8 +845,8 @@
       if ((record.name_id != 1 && record.name_id != 16) || record.string_length <= 0)
 	continue;
 
-      PING(("platform:%d encoding:%d language:%04x name_id:%d",
-	    record.platform_id, record.encoding_id, record.language_id, record.name_id));
+      PING (("platform:%d encoding:%d language:%04x name_id:%d",
+	     record.platform_id, record.encoding_id, record.language_id, record.name_id));
 
       if (record.platform_id == APPLE_UNICODE_PLATFORM_ID ||
 	  record.platform_id == ISO_PLATFORM_ID)
@@ -900,7 +901,7 @@
     goto fail2;
   g_free (string);
 
-  PING(("%s", name));
+  PING (("%s", name));
 
   SelectObject (_pango_win32_hdc, oldhfont);
   DeleteObject (hfont);
@@ -1090,7 +1091,7 @@
     pango_win32_get_font_family (win32fontmap,
 				 pango_font_description_get_family (win32face->description));
   font_family->font_entries = g_slist_append (font_family->font_entries, win32face);
-  PING(("g_slist_length(font_family->font_entries)=%d", g_slist_length(font_family->font_entries)));
+  PING (("g_slist_length(font_family->font_entries)=%d", g_slist_length(font_family->font_entries)));
 
   win32fontmap->n_fonts++;
 
@@ -1106,20 +1107,20 @@
   switch (lfp->lfPitchAndFamily & 0xF0)
     {
     case FF_MODERN : /* monospace */
-      PING(("monospace"));
+      PING (("monospace"));
       font_family->is_monospace = TRUE; /* modify before reuse */
       font_family = pango_win32_get_font_family (win32fontmap, "monospace");
       font_family->font_entries = g_slist_append (font_family->font_entries, win32face);
       win32fontmap->n_fonts++;
       break;
     case FF_ROMAN : /* serif */
-      PING(("serif"));
+      PING (("serif"));
       font_family = pango_win32_get_font_family (win32fontmap, "serif");
       font_family->font_entries = g_slist_append (font_family->font_entries, win32face);
       win32fontmap->n_fonts++;
       break;
     case  FF_SWISS  : /* sans */
-      PING(("sans"));
+      PING (("sans"));
       font_family = pango_win32_get_font_family (win32fontmap, "sans");
       font_family->font_entries = g_slist_append (font_family->font_entries, win32face);
       win32fontmap->n_fonts++;
@@ -1152,7 +1153,8 @@
   PangoWin32FontMap *win32fontmap;
   LOGFONTW *match;
 
-  PING(("lfp.face=%S,wt=%ld,ht=%ld,size:%d",lfp->lfFaceName,lfp->lfWeight,lfp->lfHeight,size));
+  PING (("lfp.face=%S,wt=%ld,ht=%ld,size:%d",
+	 lfp->lfFaceName, lfp->lfWeight, lfp->lfHeight, size));
   win32fontmap = PANGO_WIN32_FONT_MAP (fontmap);
 
   match = g_hash_table_lookup (win32fontmap->fonts, lfp);

Modified: trunk/pango/pangowin32.c
==============================================================================
--- trunk/pango/pangowin32.c	(original)
+++ trunk/pango/pangowin32.c	Mon May 26 16:26:59 2008
@@ -1631,8 +1631,8 @@
       if ((record.name_id != 1 && record.name_id != 16) || record.string_length <= 0)
 	continue;
 
-      PING(("platform:%d encoding:%d language:%04x name_id:%d",
-	    record.platform_id, record.encoding_id, record.language_id, record.name_id));
+      PING (("platform:%d encoding:%d language:%04x name_id:%d",
+	     record.platform_id, record.encoding_id, record.language_id, record.name_id));
 
       if (record.platform_id == MICROSOFT_PLATFORM_ID)
 	if ((cjkv == PANGO_WIN32_COVERAGE_ZH_TW &&
@@ -1714,8 +1714,8 @@
 
   desc = pango_font_describe (font);
   name = pango_font_description_to_string (desc);
-  PING(("font:%s lang:%s", name,
-	pango_language_to_string (lang)));
+  PING (("font:%s lang:%s", name,
+	 pango_language_to_string (lang)));
   g_free (name);
   pango_font_description_free (desc);
 
@@ -1737,7 +1737,7 @@
 
   if (cjkv != PANGO_WIN32_COVERAGE_UNSPEC && !font_has_name_in (font, cjkv))
     {
-      PING(("hiding UniHan chars"));
+      PING (("hiding UniHan chars"));
       hide_unihan = TRUE;
     }