[Emacs-diffs] emacs/src font.h

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/02/18 02:44:28

Modified files:
        src            : font.h 

Log message:
        *** empty log message ***

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.h?cvsroot=emacs&r1=1.26&r2=1.27

Patches:
Index: font.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- font.h      27 Jan 2009 05:08:00 -0000      1.26
+++ font.h      18 Feb 2009 02:44:27 -0000      1.27
@@ -508,15 +508,35 @@
   Lisp_Object (*get_cache) P_ ((FRAME_PTR F));
 
   /* List fonts exactly matching with FONT_SPEC on FRAME.  The value
-     is a list of font-entities.  It is assured that the properties
-     WEIGHT to AVGWIDTH are all nil (i.e. not specified) in FONT_SPEC.
+     is a list of font-entities.  The font properties to be considered
+     are: :foundly, :family, :adstyle, :registry, :script, :lang, and
+     :otf.  See the function `font-spec' for their meanings.  Note
+     that the last three properties are stored in FONT_EXTRA_INDEX
+     slot of FONT_SPEC.
+
+     The returned value is a list of font-entities.  Each font-entity
+     has :type property whose value is the same as the above `type'.
+     It also has these properties if they are available from the
+     corresponding font; :foundry, :family, :adstyle, :registry,
+     :weight, :slant, :width, :size, :dpi, :spacing, :avgwidth.  If
+     the font is scalable, :size and :avgwidth must be 0.
+
+     The `open' method of the same font-backend is called with one of
+     the returned font-entities.  If the backend needs additional
+     information to be used in `open' method, this method can add any
+     Lispy value by the property :font-entity to the entities.
+
      This and the following `match' are the only APIs that allocate
      font-entities.  */
   Lisp_Object (*list) P_ ((Lisp_Object frame, Lisp_Object font_spec));
 
-  /* Return a font entity most closely maching with FONT_SPEC on
-     FRAME.  The closeness is detemined by the font backend, thus
-     `face-font-selection-order' is ignored here.  */
+  /* Return a font-entity most closely maching with FONT_SPEC on
+     FRAME.  Which font property to consider, and how to calculate the
+     closeness is detemined by the font backend, thus
+     `face-font-selection-order' is ignored here.
+
+     The properties that the font-entity has is the same as `list'
+     method.  */
   Lisp_Object (*match) P_ ((Lisp_Object frame, Lisp_Object font_spec));
 
   /* Optional.