Changeset 3013

Timestamp:

2003年02月22日 10時52分24秒 (6 years ago)

Author:

miyoshi

Message:

* mw32font.c (Qcentering): New variable.
(mw32_set_windows_logical_font): Invalidate vertical centering.
(mw32_set_bdf_font): Ditto.
(set_font_info): Validate vertical centering if the centering flag
of the font is true or the font request matches
vertical-centering-font-regexp.
(mw32_default_hash_function): Take account of `centering'.
(mw32_lf_equal): Ditto.
(mw32_set_option_alist_to_logical_font): Ditto.
(mw32_check_font_request_alist): Ditto.
(syms_of_mw32font): Initialize `Qcentering'.

* mw32font.h (struct MW32LogicalFont): New member variable
`centering'.

Files:

• work/cvs2svn/src/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/src/mw32font.c (modified) (11 diffs)
• work/cvs2svn/src/mw32font.h (modified) (1 diff)

work/cvs2svn/src/ChangeLog.Meadow

@@ +1 @@
+2003-02-22  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * mw32font.c (Qcentering): New variable.
+        (mw32_set_windows_logical_font): Invalidate vertical centering.
+        (mw32_set_bdf_font): Ditto.
+        (set_font_info): Validate vertical centering if the centering flag
+        of the font is true or the font request matches
+        vertical-centering-font-regexp.
+        (mw32_default_hash_function): Take account of `centering'.
+        (mw32_lf_equal): Ditto.
+        (mw32_set_option_alist_to_logical_font): Ditto.
+        (mw32_check_font_request_alist): Ditto.
+        (syms_of_mw32font): Initialize `Qcentering'.
+
+        * mw32font.h (struct MW32LogicalFont): New member variable
+        `centering'.
+
-2003-02-20  MIYASHITA Hisashi  <himi@meadowy.org>
-

work/cvs2svn/src/mw32font.c

@@ -45 +45 @@
-Lisp_Object Qoverhang, Qrelative_compose, Qdefault_ascent;
-Lisp_Object Qencoding_type, Qencoder;
-
+, Qcentering
-
-Lisp_Object Qbase, Qweight, Qfixed, Qitalic;
@@ -448 +448 @@
-      plf->default_ascent = 0;
-      plf->character_spacing = 0;
+      plf->centering = 0;
-
-      pwf->ttfp = (tm.tmPitchAndFamily & TMPF_TRUETYPE);
@@ -578 +579 @@
-      plf->dim = 1;
-      plf->encoding_type = 0;
+      plf->centering = 0;
-      INITIALIZE_CCL_ID(plf->ccl_method);
-    }
@@ -720 +722 @@
-      fontp->encoding[1] = plf->encoding_type;
-    }
-
-
-
-
+
+
+
+
+
-}
-
@@ -1317 +1320 @@
-  hashval = (hashval << 1) ^ plf->fixed_pitch;
-  hashval = (hashval << 1) ^ plf->dim;
+  hashval = (hashval << 1) ^ plf->centering;
-  if (hashval > HASHMAXVAL) hashval %= HASHMAXVAL;
-  hashval = hashval ^ mw32_hash_ccl_method(plf->ccl_method);
@@ -1352 +1356 @@
-          && LF_EQUAL_ELEM (fixed_pitch)
-          && LF_EQUAL_ELEM (dim)
+          && LF_EQUAL_ELEM (centering)
-          && LF_EQUAL_ELEM (hash)
-          && LF_EQUAL_ELEM (textout)
@@ -1629 +1634 @@
-
-  val = mw32_get_font_request_parameter (Qencoding_type, option);
-(val)) plf->encoding_type = XINT
+ (val)) plf->encoding_type = XINT 
-  val = mw32_get_font_request_parameter (Qencoder, option);
-(val)) plf->ccl_method = mw32_get_ccl_id
+ (val)) plf->ccl_method = mw32_get_ccl_id 
-  val = mw32_get_font_request_parameter (Qrelative_compose, option);
-(val)) plf->relative_compose = XINT
+ (val)) plf->relative_compose = XINT 
-  val = mw32_get_font_request_parameter (Qdefault_ascent, option);
-(val)) plf->default_ascent = XINT
+ (val)) plf->default_ascent = XINT 
-  val = mw32_get_font_request_parameter (Qspacing, option);
-(val)) plf->character_spacing = XINT
+ (val)) plf->character_spacing = XINT 
-  val = mw32_get_font_request_parameter (Qdim, option);
-
+
+
+
-}
-
@@ -2172 +2179 @@
-  Lisp_Object width, height, base, overhang, encoding_type;
-  Lisp_Object relative_compose, default_ascent, encoder;
-
+, centering
-
-  width = mw32_get_font_request_parameter(Qwidth, alist);
@@ -2184 +2191 @@
-  spacing = mw32_get_font_request_parameter(Qspacing, alist);
-  dim = mw32_get_font_request_parameter(Qdim, alist);
+  centering = mw32_get_font_request_parameter(Qcentering, alist);
-
-  if (!NILP(width)) CHECK_NUMBER(width, 2);
@@ -2197 +2205 @@
-  if (!NILP(spacing)) CHECK_NUMBER(spacing, 9);
-  if (!NILP(dim)) CHECK_NUMBER(dim, 10);
+  if (!NILP(centering))CHECK_SYMBOL(dim, 11);
-}
-
@@ -2680 +2689 @@
-  Qdim = intern ("dim");
-  staticpro (&Qdim);
+  Qcentering = intern ("centering");
+  staticpro (&Qcentering);
-
-  DEFVAR_LISP ("w32-system-coding-system",

work/cvs2svn/src/mw32font.h

@@ -107 +107 @@
-  int dim;
-  int character_spacing;
+  int centering;
-  struct ccl_id_type ccl_method;
-  struct font_info *fontip;