Imported Upstream version 0.5.1

1 files changed, 40 insertions, 60 deletions

diff --git a/doc/public/xml/cairo-win32.xml b/doc/public/xml/cairo-win32.xml
index 4c31db5..222afd9 100644
--- a/doc/public/xml/cairo-win32.xml
+++ b/doc/public/xml/cairo-win32.xml
@@ -18,17 +18,16 @@
 
 
 
-<link linkend="void">void</link>        <link linkend="cairo-set-target-win32">cairo_set_target_win32</link>          (<link linkend="cairo-t">cairo_t</link> *cr,
-                                             <link linkend="HDC:CAPS">HDC</link> hdc);
 <link linkend="cairo-surface-t">cairo_surface_t</link>* <link linkend="cairo-win32-surface-create">cairo_win32_surface_create</link> (<link linkend="HDC:CAPS">HDC</link> hdc);
-<link linkend="cairo-font-t">cairo_font_t</link>* <link linkend="cairo-win32-font-create-for-logfontw">cairo_win32_font_create_for_logfontw</link>
-                                            (<link linkend="LOGFONTW:CAPS">LOGFONTW</link> *logfont,
-                                             <link linkend="cairo-matrix-t">cairo_matrix_t</link> *scale);
-<link linkend="cairo-status-t">cairo_status_t</link> <link linkend="cairo-win32-font-select-font">cairo_win32_font_select_font</link> (<link linkend="cairo-font-t">cairo_font_t</link> *font,
+<link linkend="cairo-font-face-t">cairo_font_face_t</link>* <link linkend="cairo-win32-font-face-create-for-logfontw">cairo_win32_font_face_create_for_logfontw</link>
+                                            (<link linkend="LOGFONTW:CAPS">LOGFONTW</link> *logfont);
+<link linkend="cairo-status-t">cairo_status_t</link> <link linkend="cairo-win32-scaled-font-select-font">cairo_win32_scaled_font_select_font</link>
+                                            (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font,
                                              <link linkend="HDC:CAPS">HDC</link> hdc);
-<link linkend="void">void</link>        <link linkend="cairo-win32-font-done-font">cairo_win32_font_done_font</link>      (<link linkend="cairo-font-t">cairo_font_t</link> *font);
-<link linkend="double">double</link>      <link linkend="cairo-win32-font-get-scale-factor">cairo_win32_font_get_scale_factor</link>
-                                            (<link linkend="cairo-font-t">cairo_font_t</link> *font);
+<link linkend="void">void</link>        <link linkend="cairo-win32-scaled-font-done-font">cairo_win32_scaled_font_done_font</link>
+                                            (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font);
+<link linkend="double">double</link>      <link linkend="cairo-win32-scaled-font-get-metrics-factor">cairo_win32_scaled_font_get_metrics_factor</link>
+                                            (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font);
 </synopsis>
 </refsynopsisdiv>
 
@@ -50,22 +49,6 @@
 <refsect1>
 <title>Details</title>
 <refsect2>
-<title><anchor id="cairo-set-target-win32"/>cairo_set_target_win32 ()</title>
-<indexterm><primary>cairo_set_target_win32</primary></indexterm><programlisting><link linkend="void">void</link>        cairo_set_target_win32          (<link linkend="cairo-t">cairo_t</link> *cr,
-                                             <link linkend="HDC:CAPS">HDC</link> hdc);</programlisting>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>cr</parameter>&nbsp;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hdc</parameter>&nbsp;:</term>
-<listitem><simpara>
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
 <title><anchor id="cairo-win32-surface-create"/>cairo_win32_surface_create ()</title>
 <indexterm><primary>cairo_win32_surface_create</primary></indexterm><programlisting><link linkend="cairo-surface-t">cairo_surface_t</link>* cairo_win32_surface_create (<link linkend="HDC:CAPS">HDC</link> hdc);</programlisting>
 <para>
@@ -80,49 +63,43 @@
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="cairo-win32-font-create-for-logfontw"/>cairo_win32_font_create_for_logfontw ()</title>
-<indexterm><primary>cairo_win32_font_create_for_logfontw</primary></indexterm><programlisting><link linkend="cairo-font-t">cairo_font_t</link>* cairo_win32_font_create_for_logfontw
-                                            (<link linkend="LOGFONTW:CAPS">LOGFONTW</link> *logfont,
-                                             <link linkend="cairo-matrix-t">cairo_matrix_t</link> *scale);</programlisting>
+<title><anchor id="cairo-win32-font-face-create-for-logfontw"/>cairo_win32_font_face_create_for_logfontw ()</title>
+<indexterm><primary>cairo_win32_font_face_create_for_logfontw</primary></indexterm><programlisting><link linkend="cairo-font-face-t">cairo_font_face_t</link>* cairo_win32_font_face_create_for_logfontw
+                                            (<link linkend="LOGFONTW:CAPS">LOGFONTW</link> *logfont);</programlisting>
 <para>
 Creates a new font for the Win32 font backend based on a
 <link linkend="LOGFONT:CAPS"><type>LOGFONT</type></link>. This font can then be used with
-<link linkend="cairo-set-font"><function>cairo_set_font()</function></link>, <link linkend="cairo-font-glyph-extents"><function>cairo_font_glyph_extents()</function></link>, or FreeType backend
-specific functions like <link linkend="cairo-win32-font-select-font"><function>cairo_win32_font_select_font()</function></link>.</para>
+<link linkend="cairo-set-font-face"><function>cairo_set_font_face()</function></link> or <link linkend="cairo-font-create"><function>cairo_font_create()</function></link>. The <link linkend="cairo-scaled-font-t"><type>cairo_scaled_font_t</type></link>
+returned from <link linkend="cairo-font-create"><function>cairo_font_create()</function></link> is also for the Win32 backend
+and can be used with functions such as <link linkend="cairo-win32-scaled-font-select-font"><function>cairo_win32_scaled_font_select_font()</function></link>.</para>
 <para>
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>logfont</parameter>&nbsp;:</term>
 <listitem><simpara> A <link linkend="LOGFONTW:CAPS"><type>LOGFONTW</type></link> structure specifying the font to use.
   The lfHeight, lfWidth, lfOrientation and lfEscapement
-  fields of this structure are ignored; information from
-  <parameter>scale</parameter> will be used instead.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>scale</parameter>&nbsp;:</term>
-<listitem><simpara> The scale at which this font will be used. The
-  scale is given by multiplying the font matrix (see
-  <link linkend="cairo-transform-font"><function>cairo_transform_font()</function></link>) by the current transformation matrix.
-  The translation elements of the resulting matrix are ignored.
+  fields of this structure are ignored.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a newly created <link linkend="cairo-font-t"><type>cairo_font_t</type></link>. Free with
- <link linkend="cairo-font-destroy"><function>cairo_font_destroy()</function></link> when you are done using it.
+<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a newly created <link linkend="cairo-font-face-t"><type>cairo_font_face_t</type></link>. Free with
+ <link linkend="cairo-font-face-destroy"><function>cairo_font_face_destroy()</function></link> when you are done using it.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="cairo-win32-font-select-font"/>cairo_win32_font_select_font ()</title>
-<indexterm><primary>cairo_win32_font_select_font</primary></indexterm><programlisting><link linkend="cairo-status-t">cairo_status_t</link> cairo_win32_font_select_font (<link linkend="cairo-font-t">cairo_font_t</link> *font,
+<title><anchor id="cairo-win32-scaled-font-select-font"/>cairo_win32_scaled_font_select_font ()</title>
+<indexterm><primary>cairo_win32_scaled_font_select_font</primary></indexterm><programlisting><link linkend="cairo-status-t">cairo_status_t</link> cairo_win32_scaled_font_select_font
+                                            (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font,
                                              <link linkend="HDC:CAPS">HDC</link> hdc);</programlisting>
 <para>
 Selects the font into the given device context and changes the
 map mode and world transformation of the device context to match
 that of the font. This function is intended for use when using
 layout APIs such as Uniscribe to do text layout with the
-Cairo font. After finishing using the device context, you must call
-<link linkend="cairo-win32-font-done-font"><function>cairo_win32_font_done_font()</function></link> to release any resources allocated
+cairo font. After finishing using the device context, you must call
+<link linkend="cairo-win32-scaled-font-done-font"><function>cairo_win32_scaled_font_done_font()</function></link> to release any resources allocated
 by this function.
 </para>
 <para>
-See <link linkend="cairo-win32-font-get-scale-factor"><function>cairo_win32_font_get_scale_factor()</function></link> for converting logical
+See <link linkend="cairo-win32-scaled-font-get-metrics-factor"><function>cairo_win32_scaled_font_get_metrics_factor()</function></link> for converting logical
 coordinates from the device context to font space.
 </para>
 <para>
@@ -131,9 +108,9 @@ the use of this function to preserve the original graphics state.</para>
 <para>
 
 </para><variablelist role="params">
-<varlistentry><term><parameter>font</parameter>&nbsp;:</term>
-<listitem><simpara> A <link linkend="cairo-font-t"><type>cairo_font_t</type></link> from the Win32 font backend. Such an
-  object can be created with <link linkend="cairo-win32-font-create-for-logfontw"><function>cairo_win32_font_create_for_logfontw()</function></link>.
+<varlistentry><term><parameter>scaled_font</parameter>&nbsp;:</term>
+<listitem><simpara> A <link linkend="cairo-scaled-font-t"><type>cairo_scaled_font_t</type></link> from the Win32 font backend. Such an
+  object can be created with <link linkend="cairo-win32-scaled-font-create-for-logfontw"><function>cairo_win32_scaled_font_create_for_logfontw()</function></link>.
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>hdc</parameter>&nbsp;:</term>
 <listitem><simpara> a device context
@@ -144,29 +121,32 @@ the use of this function to preserve the original graphics state.</para>
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="cairo-win32-font-done-font"/>cairo_win32_font_done_font ()</title>
-<indexterm><primary>cairo_win32_font_done_font</primary></indexterm><programlisting><link linkend="void">void</link>        cairo_win32_font_done_font      (<link linkend="cairo-font-t">cairo_font_t</link> *font);</programlisting>
+<title><anchor id="cairo-win32-scaled-font-done-font"/>cairo_win32_scaled_font_done_font ()</title>
+<indexterm><primary>cairo_win32_scaled_font_done_font</primary></indexterm><programlisting><link linkend="void">void</link>        cairo_win32_scaled_font_done_font
+                                            (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font);</programlisting>
 <para>
-Releases any resources allocated by <link linkend="cairo-win32-font-select-font"><function>cairo_win32_font_select_font()</function></link></para>
+Releases any resources allocated by <link linkend="cairo-win32-scaled-font-select-font"><function>cairo_win32_scaled_font_select_font()</function></link></para>
 <para>
 
 </para><variablelist role="params">
-<varlistentry><term><parameter>font</parameter>&nbsp;:</term>
-<listitem><simpara> A <link linkend="cairo-font-t"><type>cairo_font_t</type></link> from the Win32 font backend.
+<varlistentry><term><parameter>scaled_font</parameter>&nbsp;:</term>
+<listitem><simpara> A <link linkend="cairo-scaled-font-t"><type>cairo_scaled_font_t</type></link> from the Win32 font backend.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2>
-<title><anchor id="cairo-win32-font-get-scale-factor"/>cairo_win32_font_get_scale_factor ()</title>
-<indexterm><primary>cairo_win32_font_get_scale_factor</primary></indexterm><programlisting><link linkend="double">double</link>      cairo_win32_font_get_scale_factor
-                                            (<link linkend="cairo-font-t">cairo_font_t</link> *font);</programlisting>
+<title><anchor id="cairo-win32-scaled-font-get-metrics-factor"/>cairo_win32_scaled_font_get_metrics_factor ()</title>
+<indexterm><primary>cairo_win32_scaled_font_get_metrics_factor</primary></indexterm><programlisting><link linkend="double">double</link>      cairo_win32_scaled_font_get_metrics_factor
+                                            (<link linkend="cairo-scaled-font-t">cairo_scaled_font_t</link> *scaled_font);</programlisting>
 <para>
 Gets a scale factor between logical coordinates in the coordinate
-space used by <link linkend="cairo-win32-font-select-font"><function>cairo_win32_font_select_font()</function></link> and font space coordinates.</para>
+space used by <link linkend="cairo-win32-scaled-font-select-font"><function>cairo_win32_scaled_font_select_font()</function></link> (that is, the
+coordinate system used by the Windows functions to return metrics) and
+font space coordinates.</para>
 <para>
 
 </para><variablelist role="params">
-<varlistentry><term><parameter>font</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="cairo-font-t"><type>cairo_font_t</type></link> from the Win32 font backend
+<varlistentry><term><parameter>scaled_font</parameter>&nbsp;:</term>
+<listitem><simpara> a <link linkend="cairo-scaled-font-t"><type>cairo_scaled_font_t</type></link> from the Win32 font backend
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> factor to multiply logical units by to get font space
               coordinates.