diff options
author | marha <marha@users.sourceforge.net> | 2015-02-22 21:39:56 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-02-22 21:39:56 +0100 |
commit | 462f18c7b25fe3e467f837647d07ab0a78aa8d2b (patch) | |
tree | fc8013c0a1bac05a1945846c1697e973f4c35013 /fontconfig/doc | |
parent | 36f711ee12b6dd5184198abed3aa551efb585587 (diff) | |
download | vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.gz vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.bz2 vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.zip |
Merged origin/release (checked in because wanted to merge new stuff)
Diffstat (limited to 'fontconfig/doc')
-rw-r--r-- | fontconfig/doc/fcconfig.fncs | 10 | ||||
-rw-r--r-- | fontconfig/doc/fcrange.fncs | 1 | ||||
-rw-r--r-- | fontconfig/doc/fontconfig-devel.sgml | 13 | ||||
-rw-r--r-- | fontconfig/doc/fontconfig-user.sgml | 9 |
4 files changed, 28 insertions, 5 deletions
diff --git a/fontconfig/doc/fcconfig.fncs b/fontconfig/doc/fcconfig.fncs index 10f5afc7f..af328fc70 100644 --- a/fontconfig/doc/fcconfig.fncs +++ b/fontconfig/doc/fcconfig.fncs @@ -219,8 +219,9 @@ If <parameter>config</parameter> is NULL, the current configuration is used. @PURPOSE@ Add font file to font database @DESC@ Adds an application-specific font to the configuration. Returns FcFalse -if the fonts cannot be added (due to allocation failure). Otherwise returns FcTrue. -If <parameter>config</parameter> is NULL, the current configuration is used. +if the fonts cannot be added (due to allocation failure or no fonts found). +Otherwise returns FcTrue. If <parameter>config</parameter> is NULL, +the current configuration is used. @@ @RET@ FcBool @@ -231,8 +232,9 @@ If <parameter>config</parameter> is NULL, the current configuration is used. @DESC@ Scans the specified directory for fonts, adding each one found to the application-specific set of fonts. Returns FcFalse -if the fonts cannot be added (due to allocation failure). Otherwise returns FcTrue. -If <parameter>config</parameter> is NULL, the current configuration is used. +if the fonts cannot be added (due to allocation failure or no fonts found). +Otherwise returns FcTrue. If <parameter>config</parameter> is NULL, +the current configuration is used. @@ @RET@ void diff --git a/fontconfig/doc/fcrange.fncs b/fontconfig/doc/fcrange.fncs index 4181b8093..ba76f65b2 100644 --- a/fontconfig/doc/fcrange.fncs +++ b/fontconfig/doc/fcrange.fncs @@ -72,3 +72,4 @@ all memory associated with it. @DESC@ Returns in <parameter>begin</parameter> and <parameter>end</parameter> as the range. @SINCE@ 2.11.91 +@@ diff --git a/fontconfig/doc/fontconfig-devel.sgml b/fontconfig/doc/fontconfig-devel.sgml index 2b1122f18..0fa4605b5 100644 --- a/fontconfig/doc/fontconfig-devel.sgml +++ b/fontconfig/doc/fontconfig-devel.sgml @@ -20,6 +20,7 @@ <!ENTITY fcstring SYSTEM "fcstring.sgml"> <!ENTITY fcstrset SYSTEM "fcstrset.sgml"> <!ENTITY fcvalue SYSTEM "fcvalue.sgml"> +<!ENTITY fcweight SYSTEM "fcweight.sgml"> <!ENTITY version SYSTEM "version.sgml"> ]> <!-- @@ -176,6 +177,7 @@ convenience for the application's rendering mechanism. scalable FC_SCALABLE Bool Whether glyphs can be scaled scale FC_SCALE Double Scale factor for point->pixel conversions + color FC_COLOR Bool Whether any glyphs have color dpi FC_DPI Double Target dots per inch rgba FC_RGBA Int unknown, rgb, bgr, vrgb, vbgr, none - subpixel geometry @@ -189,8 +191,13 @@ convenience for the application's rendering mechanism. fontversion FC_FONTVERSION Int Version number of the font capability FC_CAPABILITY String List of layout capabilities in the font + fontformat FC_FONTFORMAT String String name of the font format embolden FC_EMBOLDEN Bool Rasterizer should synthetically embolden the font + embeddedbitmap FC_EMBEDDED_BITMAP Bool Use the embedded bitmap instead + of the outline + decorative FC_DECORATIVE Bool Whether the style is a decorative + variant fontfeatures FC_FONT_FEATURES String List of extra feature tags in OpenType to be enabled namelang FC_NAMELANG String Language name to be used for the @@ -536,6 +543,12 @@ Provides for application-specified symbolic constants for font names. </para> &fcconstant; </sect2> + <sect2><title>FcWeight</title> + <para> +Maps weights to and from OpenType weights. + </para> + &fcweight; + </sect2> <sect2><title>FcBlanks</title> <para> An FcBlanks object holds a list of Unicode chars which are expected to diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml index 482b45331..ac9d8079e 100644 --- a/fontconfig/doc/fontconfig-user.sgml +++ b/fontconfig/doc/fontconfig-user.sgml @@ -119,6 +119,7 @@ convenience for the applications' rendering mechanism. rasterizer String Which rasterizer is in use (deprecated) outline Bool Whether the glyphs are outlines scalable Bool Whether glyphs can be scaled + color Bool Whether any glyphs have color scale Double Scale factor for point->pixel conversions dpi Double Target dots per inch rgba Int unknown, rgb, bgr, vrgb, vbgr, @@ -130,9 +131,15 @@ convenience for the applications' rendering mechanism. font supports fontversion Int Version number of the font capability String List of layout capabilities in the font + fontformat String String name of the font format embolden Bool Rasterizer should synthetically embolden the font + embeddedbitmap Bool Use the embedded bitmap instead of the outline + decorative Bool Whether the style is a decorative variant fontfeatures String List of the feature tags in OpenType to be enabled + namelang String Language name to be used for the default value of + familylang, stylelang, and fullnamelang prgname String String Name of the running program + postscriptname String Font family name in PostScript </programlisting> </refsect2> <refsect2> @@ -314,7 +321,7 @@ the configuration file, the directory that can be accessed first in the list will be used to store the cache files. If it starts with '~', it refers to a directory in the users home directory. If 'prefix' is set to "xdg", the value in the XDG_CACHE_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details. The default directory is ``$XDG_CACHE_HOME/fontconfig'' and it contains the cache files -named ``<literal><hash value></literal>-<literal><architecture></literal>.cache-<literal><version</literal>'', +named ``<literal><hash value></literal>-<literal><architecture></literal>.cache-<literal><version></literal>'', where <literal><version></literal> is the font configureation file version number (currently 3). </para></refsect2> |