Commit e12a471f6af23257f4c406feb8745eb12915fa7d

Werner Lemberg 2006-05-12T14:20:43

* src/tools/docmaker/tohtml.py (html_header_1): Use `utf-8' charset. Convert some files to UTF-8.

diff --git a/ChangeLog b/ChangeLog
index 0b9e93f..3838384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	boundary markers.
 	* src/tools/docmaker/content.py (re_field): Allow `.' in field names
 	(but not at the beginning or end).
+	* src/tools/docmaker/tohtml.py (html_header_1): Use `utf-8' charset.
 
 	* include/freetype/*: Many minor documentation improvements (adding
 	links, spelling errors, etc.).
diff --git a/ChangeLog.20 b/ChangeLog.20
index cf51c54..fc6346f 100644
--- a/ChangeLog.20
+++ b/ChangeLog.20
@@ -1638,7 +1638,7 @@
 	is now slower, but proves a point :-)
 
 	* src/raster/ftraster.c, src/smooth/ftgrays.c, src/base/ftbbox.c:
-	Fixed the bezier stack depths.
+	Fixed the Bézier stack depths.
 
 	* src/base/ftcalc.c (FT_MulFix): Minor rounding fix.
 
diff --git a/ChangeLog.21 b/ChangeLog.21
index 3cebdc0..0801172 100644
--- a/ChangeLog.21
+++ b/ChangeLog.21
@@ -6503,7 +6503,7 @@
 	well as providing an autoconf fragment provided by Lars Clausen.
 
 	* src/smooth/ftgrays.c (gray_render_conic): Fixed small bug that
-	prevented bezier arcs with negative vertical coordinates to be
+	prevented Bézier arcs with negative vertical coordinates to be
 	rendered appropriately.
 
 2002-12-02  Antoine Leca  <Antoine-Freetype@Leca-Marti.org>
diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h
index f98c89e..d7077e1 100644
--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@@ -61,7 +61,7 @@ FT_BEGIN_HEADER
   /*    Computes the exact bounding box of an outline.  This is slower     */
   /*    than computing the control box.  However, it uses an advanced      */
   /*    algorithm which returns _very_ quickly when the two boxes          */
-  /*    coincide.  Otherwise, the outline Bezier arcs are walked over to   */
+  /*    coincide.  Otherwise, the outline Bézier arcs are walked over to   */
   /*    extract their extrema.                                             */
   /*                                                                       */
   /* <Input>                                                               */
@@ -87,3 +87,9 @@ FT_END_HEADER
 
 
 /* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */
+ 
\ No newline at end of file
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 80ff9cb..08058da 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -354,10 +354,10 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Return a glyph's `control box'.  The control box encloses all the  */
-  /*    outline's points, including Bezier control points.  Though it      */
+  /*    outline's points, including Bézier control points.  Though it      */
   /*    coincides with the exact bounding box for most glyphs, it can be   */
   /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains Bezier outside arcs).                               */
+  /*    which contains Bézier outside arcs).                               */
   /*                                                                       */
   /*    Computing the control box is very fast, while getting the bounding */
   /*    box can take much more time as it needs to walk over all segments  */
@@ -568,3 +568,8 @@ FT_END_HEADER
 
 
 /* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 84e6468..68629c9 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -318,11 +318,11 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    tags       :: A pointer to an array of `n_points' chars, giving    */
   /*                  each outline point's type.  If bit 0 is unset, the   */
-  /*                  point is `off' the curve, i.e., a Bezier control     */
+  /*                  point is `off' the curve, i.e., a Bézier control     */
   /*                  point, while it is `on' when set.                    */
   /*                                                                       */
   /*                  Bit 1 is meaningful for `off' points only.  If set,  */
-  /*                  it indicates a third-order Bezier arc control point; */
+  /*                  it indicates a third-order Bézier arc control point; */
   /*                  and a second-order control point if unset.           */
   /*                                                                       */
   /*    contours   :: An array of `n_contours' shorts, giving the end      */
@@ -526,7 +526,7 @@ FT_BEGIN_HEADER
   /*    A function pointer type use to describe the signature of a `conic  */
   /*    to' function during outline walking/decomposition.                 */
   /*                                                                       */
-  /*    A `conic to' is emitted to indicate a second-order Bezier arc in   */
+  /*    A `conic to' is emitted to indicate a second-order Bézier arc in   */
   /*    the outline.                                                       */
   /*                                                                       */
   /* <Input>                                                               */
@@ -557,12 +557,12 @@ FT_BEGIN_HEADER
   /*    A function pointer type used to describe the signature of a `cubic */
   /*    to' function during outline walking/decomposition.                 */
   /*                                                                       */
-  /*    A `cubic to' is emitted to indicate a third-order Bezier arc.      */
+  /*    A `cubic to' is emitted to indicate a third-order Bézier arc.      */
   /*                                                                       */
   /* <Input>                                                               */
-  /*    control1 :: A pointer to the first Bezier control point.           */
+  /*    control1 :: A pointer to the first Bézier control point.           */
   /*                                                                       */
-  /*    control2 :: A pointer to the second Bezier control point.          */
+  /*    control2 :: A pointer to the second Bézier control point.          */
   /*                                                                       */
   /*    to       :: A pointer to the target end point.                     */
   /*                                                                       */
@@ -588,7 +588,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    A structure to hold various function pointers used during outline  */
-  /*    decomposition in order to emit segments, conic, and cubic Beziers, */
+  /*    decomposition in order to emit segments, conic, and cubic Béziers, */
   /*    as well as `move to' and `close to' operations.                    */
   /*                                                                       */
   /* <Fields>                                                              */
@@ -596,9 +596,9 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    line_to  :: The segment emitter.                                   */
   /*                                                                       */
-  /*    conic_to :: The second-order Bezier arc emitter.                   */
+  /*    conic_to :: The second-order Bézier arc emitter.                   */
   /*                                                                       */
-  /*    cubic_to :: The third-order Bezier arc emitter.                    */
+  /*    cubic_to :: The third-order Bézier arc emitter.                    */
   /*                                                                       */
   /*    shift    :: The shift that is applied to coordinates before they   */
   /*                are sent to the emitter.                               */
@@ -695,7 +695,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*    FT_GLYPH_FORMAT_OUTLINE ::                                         */
   /*      The glyph image is a vectorial outline made of line segments     */
-  /*      and Bezier arcs; it can be described as an @FT_Outline; you      */
+  /*      and Bézier arcs; it can be described as an @FT_Outline; you      */
   /*      generally want to access the `outline' field of the              */
   /*      @FT_GlyphSlotRec structure to read it.                           */
   /*                                                                       */
@@ -1231,3 +1231,8 @@ FT_END_HEADER
 
 
 /* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 5ebd98f..aa1085a 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -85,7 +85,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Walks over an outline's structure to decompose it into individual  */
-  /*    segments and Bezier arcs.  This function is also able to emit      */
+  /*    segments and Bézier arcs.  This function is also able to emit      */
   /*    `move to' and `close to' operations to indicate the start and end  */
   /*    of new contours in the outline.                                    */
   /*                                                                       */
@@ -213,10 +213,10 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*    Returns an outline's `control box'.  The control box encloses all  */
-  /*    the outline's points, including Bezier control points.  Though it  */
+  /*    the outline's points, including Bézier control points.  Though it  */
   /*    coincides with the exact bounding box for most glyphs, it can be   */
   /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains Bezier outside arcs).                               */
+  /*    which contains Bézier outside arcs).                               */
   /*                                                                       */
   /*    Computing the control box is very fast, while getting the bounding */
   /*    box can take much more time as it needs to walk over all segments  */
@@ -519,3 +519,8 @@ FT_END_HEADER
 
 
 /* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */
diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h
index 4d13d0c..6e75921 100644
--- a/include/freetype/ftstroke.h
+++ b/include/freetype/ftstroke.h
@@ -407,7 +407,7 @@ FT_BEGIN_HEADER
    *   FT_Stroker_ConicTo
    *
    * @description:
-   *   `Draw' a single quadratic bezier in the stroker's current sub-path,
+   *   `Draw' a single quadratic Bézier in the stroker's current sub-path,
    *   from the last position.
    *
    * @input:
@@ -415,7 +415,7 @@ FT_BEGIN_HEADER
    *     The target stroker handle.
    *
    *   control ::
-   *     A pointer to a Bezier control point.
+   *     A pointer to a Bézier control point.
    *
    *   to ::
    *     A pointer to the destination point.
@@ -439,7 +439,7 @@ FT_BEGIN_HEADER
    *   FT_Stroker_CubicTo
    *
    * @description:
-   *   `Draw' a single cubic Bezier in the stroker's current sub-path,
+   *   `Draw' a single cubic Bézier in the stroker's current sub-path,
    *   from the last position.
    *
    * @input:
@@ -447,10 +447,10 @@ FT_BEGIN_HEADER
    *     The target stroker handle.
    *
    *   control1 ::
-   *     A pointer to the first Bezier control point.
+   *     A pointer to the first Bézier control point.
    *
    *   control2 ::
-   *     A pointer to second Bezier control point.
+   *     A pointer to second Bézier control point.
    *
    *   to ::
    *     A pointer to the destination point.
@@ -709,3 +709,8 @@ FT_END_HEADER
 
 
 /* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */
diff --git a/include/freetype/ftwinfnt.h b/include/freetype/ftwinfnt.h
index 355b7e9..5849b00 100644
--- a/include/freetype/ftwinfnt.h
+++ b/include/freetype/ftwinfnt.h
@@ -77,7 +77,8 @@ FT_BEGIN_HEADER
    *     Mac Roman encoding.
    *
    *   FT_WinFNT_ID_OEM ::
-   *     From Michael Pöttgen <michael@poettgen.de>:
+   *     From Michael Pöttgen <michael@poettgen.de>:
+   *
    *       The `Windows Font Mapping' article says that FT_WinFNT_ID_OEM
    *       is used for the charset of vector fonts, like `modern.fon',
    *       `roman.fon', and `script.fon' on Windows.
@@ -255,3 +256,8 @@ FT_END_HEADER
 
 
 /* END */
+
+
+/* Local Variables: */
+/* coding: utf-8    */
+/* End:             */
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 338dd25..f011aaf 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -11,7 +11,7 @@ html_header_1 = """\
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>"""
 
 html_header_2= """ API Reference</title>