Commit correct docs for wxwxScopedPtr

[wxWidgets.git] / docs / latex / wx / tfontenc.tex

diff --git a/docs/latex/wx/tfontenc.tex b/docs/latex/wx/tfontenc.tex
index d35e87cc0ab16b5eef5ee4beef53050cadf52407..1c5ad6f7fad4fbff71fb7d8a3e2ce104d3118734 100644 (file)
--- a/docs/latex/wx/tfontenc.tex
+++ b/docs/latex/wx/tfontenc.tex
@@ -11,7 +11,7 @@
 
 \section{Font encoding overview}\label{wxfontencodingoverview}
 
 
 \section{Font encoding overview}\label{wxfontencodingoverview}
 

-wxWindows has support for multiple font encodings starting from release 2.2.
+wxWidgets has support for multiple font encodings.

 By encoding we mean here the mapping between the character codes and the
 letters. Probably the most well-known encoding is (7 bit) ASCII one which is
 used almost universally now to represent the letters of the English alphabet
 By encoding we mean here the mapping between the character codes and the
 letters. Probably the most well-known encoding is (7 bit) ASCII one which is
 used almost universally now to represent the letters of the English alphabet


@@ -20,7 +20,7 @@ letters of foreign alphabets and here other encodings come into play. Please
 note that we will only discuss 8-bit fonts here and not 
 \helpref{Unicode}{unicode}.
 
 note that we will only discuss 8-bit fonts here and not 
 \helpref{Unicode}{unicode}.
 

-Font encoding support is assured by several classes: 
+Font encoding support is ensured by several classes: 

 \helpref{wxFont}{wxfont} itself, but also 
 \helpref{wxFontEnumerator}{wxfontenumerator} and 
 \helpref{wxFontMapper}{wxfontmapper}. wxFont encoding support is reflected by
 \helpref{wxFont}{wxfont} itself, but also 
 \helpref{wxFontEnumerator}{wxfontenumerator} and 
 \helpref{wxFontMapper}{wxfontmapper}. wxFont encoding support is reflected by


@@ -55,20 +55,19 @@ The situation is particularly complicated with Cyrillic encodings for which
 used on the Internet), ISO8859-5 (ISO standard for Cyrillic) and CP1251
 (WinCyrillic).
 
 used on the Internet), ISO8859-5 (ISO standard for Cyrillic) and CP1251
 (WinCyrillic).
 

-This abundance of (incompatible) encoding:w
-s should make it clear that using
+This abundance of (incompatible) encodings should make it clear that using

 encodings is less easy than it might seem. The problems arise both from the
 fact that the standard encodings for the given language (say Russian, which is
 written in Cyrillic) are different on different platforms and because the
 fonts in the given encoding might just not be installed (this is especially a
 problem with Unix, or, in general, non-Win32 systems).
 
 encodings is less easy than it might seem. The problems arise both from the
 fact that the standard encodings for the given language (say Russian, which is
 written in Cyrillic) are different on different platforms and because the
 fonts in the given encoding might just not be installed (this is especially a
 problem with Unix, or, in general, non-Win32 systems).
 

-To allow to see clearer in this, \helpref{wxFontEnumerator}{wxfontenumerator} 
+To clarify, the \helpref{wxFontEnumerator}{wxfontenumerator} 

 class may be used to enumerate both all available encodings and to find the
 facename(s) in which the given encoding exists. If you can find the font in
 the correct encoding with wxFontEnumerator then your troubles are over, but,
 unfortunately, sometimes this is not enough. For example, there is no standard
 class may be used to enumerate both all available encodings and to find the
 facename(s) in which the given encoding exists. If you can find the font in
 the correct encoding with wxFontEnumerator then your troubles are over, but,
 unfortunately, sometimes this is not enough. For example, there is no standard

-way (I know of, please tell me if you do!) to find a font on a Windows system
+way (that I know of, please tell me if you do!) to find a font on a Windows system

 for KOI8 encoding (only for WinCyrillic one which is quite different), so 
 \helpref{wxFontEnumerator}{wxfontenumerator} will never return one, even if
 the user has installed a KOI8 font on his system.
 for KOI8 encoding (only for WinCyrillic one which is quite different), so 
 \helpref{wxFontEnumerator}{wxfontenumerator} will never return one, even if
 the user has installed a KOI8 font on his system.


@@ -77,10 +76,10 @@ To solve this problem, a \helpref{wxFontMapper}{wxfontmapper} class is provided.
 This class stores the mapping between the encodings and the font face
 names which support them in \helpref{wxConfig}{wxconfigoverview} object. Of
 course, it would be fairly useless if it tried to determine these mappings by
 This class stores the mapping between the encodings and the font face
 names which support them in \helpref{wxConfig}{wxconfigoverview} object. Of
 course, it would be fairly useless if it tried to determine these mappings by

-itself, so, instead, it (optionally) ask the user and remember his answers
+itself, so, instead, it (optionally) asks the user and remembers his answers

 so that the next time the program will automatically choose the correct font.
 
 so that the next time the program will automatically choose the correct font.
 

-All these topics are illustrated by the \helpref{font sample}{samplefont},
+All these topics are illustrated by the \helpref{font sample}{samplefont};

 please refer to it and the documentation of the classes mentioned here for
 further explanations.
 
 please refer to it and the documentation of the classes mentioned here for
 further explanations.