Synchronised line endinge with release branch

1 files changed, 165 insertions, 165 deletions

diff --git a/libXmu/include/X11/Xmu/Xct.h b/libXmu/include/X11/Xmu/Xct.h
index 337b70bc8..514ad7fea 100644
--- a/libXmu/include/X11/Xmu/Xct.h
+++ b/libXmu/include/X11/Xmu/Xct.h
@@ -1,165 +1,165 @@
-/*

-

-Copyright 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifndef _Xct_h

-#define _Xct_h

-

-#include <X11/Xfuncproto.h>

-

-#define XctVersion 1

-

-typedef unsigned char *XctString;

-

-typedef enum {

-    XctUnspecified,

-    XctLeftToRight,

-    XctRightToLeft

-} XctHDirection;

-

-typedef unsigned long XctFlags;

-

-/* These are bits in XctFlags. */

-

-#define XctSingleSetSegments	0x0001

-   /* This means that returned segments should contain characters from only

-    * one set (C0, C1, GL, GR).  When this is requested, XctSegment is never

-    * returned, instead XctC0Segment, XctC1Segment, XctGlSegment, and

-    * XctGRSegment are returned.  C0 and C1 segments are always returned as

-    * singleton characters.

-    */

-

-#define XctProvideExtensions	0x0002

-   /* This means that if the Compound Text string is from a higher version

-    * than this code is implemented to, then syntactically correct but unknown

-    * control sequences should be returned as XctExtension items.  If this

-    * flag is not set, and the Compound Text string version indicates that

-    * extensions cannot be ignored, then each unknown control sequence will be

-    * reported as an XctError.

-    */

-

-#define XctAcceptC0Extensions	0x0004

-   /* This means that if the Compound Text string is from a higher version

-    * than this code is implemented to, then unknown C0 characters should be

-    * treated as if they were legal, and returned as C0 characters (regardless

-    * of how XctProvideExtensions is set).  If this flag is not set, then all

-    * unknown C0 characters are treated according to XctProvideExtensions.

-    */

-

-#define XctAcceptC1Extensions	0x0008

-   /* This means that if the Compound Text string is from a higher version

-    * than this code is implemented to, then unknown C0 characters should be

-    * treated as if they were legal, and returned as C0 characters (regardless

-    * of how XctProvideExtensions is set).  If this flag is not set, then all

-    * unknown C0 characters are treated according to XctProvideExtensions.

-    */

-

-#define XctHideDirection	0x0010

-   /* This means that horizontal direction changes should be reported as

-    * XctHorizontal items.  If this flag is not set, then direction changes are

-    * not returned as items, but the current direction is still maintained and

-    * reported for other items.

-    */

-

-#define XctFreeString		0x0020

-   /* This means that XctFree should free the Compound Text string (that was

-    * passed to XctCreate.  If this flag is not set, the string is not freed.

-    */

-

-#define XctShiftMultiGRToGL	0x0040

-   /* Translate GR segments on-the-fly into GL segments for the GR sets:

-    * GB2312.1980-1, JISX0208.1983-1, and KSC5601.1987-1.

-    */

-

-/* This is the return type for XctNextItem. */

-typedef enum {

-    XctSegment,		/* used when XctSingleSetSegments is not requested */

-    XctC0Segment,	/* used when XctSingleSetSegments is requested */

-    XctGLSegment,	/* used when XctSingleSetSegments is requested */

-    XctC1Segment,	/* used when XctSingleSetSegments is requested */

-    XctGRSegment,	/* used when XctSingleSetSegments is requested */

-    XctExtendedSegment,	/* an extended segment */

-    XctExtension,	/* used when XctProvideExtensions is requested */

-    XctHorizontal,	/* horizontal direction or depth change */

-    XctEndOfText,	/* end of text string */

-    XctError		/* syntactic or semantic error */

-} XctResult;

-

-typedef struct _XctRec {

-    XctString		total_string;	/* as given to XctCreate */

-    int			total_length;	/* as given to XctCreate */

-    XctFlags		flags;		/* as given to XctCreate */

-    int			version;	/* indicates the version of the CT spec

-					 * the string was produced from */

-    int			can_ignore_exts;/* non-zero if ignoring extensions is

-					 * acceptable, else zero */

-    XctString		item;		/* item returned from XctNextItem */

-    unsigned		item_length;	/* length of item in bytes */

-    int			char_size;	/* number of bytes per character in

-					 * item, with zero meaning variable */

-    char		*encoding;	/* Encoding name for item */

-    XctHDirection	horizontal;	/* direction of item */

-    unsigned		horz_depth;	/* current direction nesting depth */

-    char		*GL;		/* "{I} F" string for current GL */

-    char		*GL_encoding;	/* Encoding name for current GL */

-    int			GL_set_size;	/* 94 or 96 */

-    int			GL_char_size;	/* number of bytes per GL character */

-    char		*GR;		/* "{I} F" string for current GR */

-    char		*GR_encoding;	/* Encoding name for current GR */

-    int			GR_set_size;	/* 94 or 96 */

-    int			GR_char_size;	/* number of bytes per GR character */

-    char		*GLGR_encoding;	/* Encoding name for current GL+GR,

-					 * if known */

-    struct _XctPriv	*priv;		/* private to parser, don't peek */

-} *XctData;

-

-/* these are the external routines */

-_XFUNCPROTOBEGIN

-

-XctData XctCreate

-(

- _Xconst unsigned char	*string,

- int			length,

- XctFlags		flags

-);

-

-XctResult XctNextItem

-(

- XctData		data

-);

-

-void XctFree

-(

- XctData		data

- );

-

-void XctReset

-(

- XctData		data

- );

-

-_XFUNCPROTOEND

-

-#endif /* _Xct_h */

+/*
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifndef _Xct_h
+#define _Xct_h
+
+#include <X11/Xfuncproto.h>
+
+#define XctVersion 1
+
+typedef unsigned char *XctString;
+
+typedef enum {
+    XctUnspecified,
+    XctLeftToRight,
+    XctRightToLeft
+} XctHDirection;
+
+typedef unsigned long XctFlags;
+
+/* These are bits in XctFlags. */
+
+#define XctSingleSetSegments	0x0001
+   /* This means that returned segments should contain characters from only
+    * one set (C0, C1, GL, GR).  When this is requested, XctSegment is never
+    * returned, instead XctC0Segment, XctC1Segment, XctGlSegment, and
+    * XctGRSegment are returned.  C0 and C1 segments are always returned as
+    * singleton characters.
+    */
+
+#define XctProvideExtensions	0x0002
+   /* This means that if the Compound Text string is from a higher version
+    * than this code is implemented to, then syntactically correct but unknown
+    * control sequences should be returned as XctExtension items.  If this
+    * flag is not set, and the Compound Text string version indicates that
+    * extensions cannot be ignored, then each unknown control sequence will be
+    * reported as an XctError.
+    */
+
+#define XctAcceptC0Extensions	0x0004
+   /* This means that if the Compound Text string is from a higher version
+    * than this code is implemented to, then unknown C0 characters should be
+    * treated as if they were legal, and returned as C0 characters (regardless
+    * of how XctProvideExtensions is set).  If this flag is not set, then all
+    * unknown C0 characters are treated according to XctProvideExtensions.
+    */
+
+#define XctAcceptC1Extensions	0x0008
+   /* This means that if the Compound Text string is from a higher version
+    * than this code is implemented to, then unknown C0 characters should be
+    * treated as if they were legal, and returned as C0 characters (regardless
+    * of how XctProvideExtensions is set).  If this flag is not set, then all
+    * unknown C0 characters are treated according to XctProvideExtensions.
+    */
+
+#define XctHideDirection	0x0010
+   /* This means that horizontal direction changes should be reported as
+    * XctHorizontal items.  If this flag is not set, then direction changes are
+    * not returned as items, but the current direction is still maintained and
+    * reported for other items.
+    */
+
+#define XctFreeString		0x0020
+   /* This means that XctFree should free the Compound Text string (that was
+    * passed to XctCreate.  If this flag is not set, the string is not freed.
+    */
+
+#define XctShiftMultiGRToGL	0x0040
+   /* Translate GR segments on-the-fly into GL segments for the GR sets:
+    * GB2312.1980-1, JISX0208.1983-1, and KSC5601.1987-1.
+    */
+
+/* This is the return type for XctNextItem. */
+typedef enum {
+    XctSegment,		/* used when XctSingleSetSegments is not requested */
+    XctC0Segment,	/* used when XctSingleSetSegments is requested */
+    XctGLSegment,	/* used when XctSingleSetSegments is requested */
+    XctC1Segment,	/* used when XctSingleSetSegments is requested */
+    XctGRSegment,	/* used when XctSingleSetSegments is requested */
+    XctExtendedSegment,	/* an extended segment */
+    XctExtension,	/* used when XctProvideExtensions is requested */
+    XctHorizontal,	/* horizontal direction or depth change */
+    XctEndOfText,	/* end of text string */
+    XctError		/* syntactic or semantic error */
+} XctResult;
+
+typedef struct _XctRec {
+    XctString		total_string;	/* as given to XctCreate */
+    int			total_length;	/* as given to XctCreate */
+    XctFlags		flags;		/* as given to XctCreate */
+    int			version;	/* indicates the version of the CT spec
+					 * the string was produced from */
+    int			can_ignore_exts;/* non-zero if ignoring extensions is
+					 * acceptable, else zero */
+    XctString		item;		/* item returned from XctNextItem */
+    unsigned		item_length;	/* length of item in bytes */
+    int			char_size;	/* number of bytes per character in
+					 * item, with zero meaning variable */
+    char		*encoding;	/* Encoding name for item */
+    XctHDirection	horizontal;	/* direction of item */
+    unsigned		horz_depth;	/* current direction nesting depth */
+    char		*GL;		/* "{I} F" string for current GL */
+    char		*GL_encoding;	/* Encoding name for current GL */
+    int			GL_set_size;	/* 94 or 96 */
+    int			GL_char_size;	/* number of bytes per GL character */
+    char		*GR;		/* "{I} F" string for current GR */
+    char		*GR_encoding;	/* Encoding name for current GR */
+    int			GR_set_size;	/* 94 or 96 */
+    int			GR_char_size;	/* number of bytes per GR character */
+    char		*GLGR_encoding;	/* Encoding name for current GL+GR,
+					 * if known */
+    struct _XctPriv	*priv;		/* private to parser, don't peek */
+} *XctData;
+
+/* these are the external routines */
+_XFUNCPROTOBEGIN
+
+XctData XctCreate
+(
+ _Xconst unsigned char	*string,
+ int			length,
+ XctFlags		flags
+);
+
+XctResult XctNextItem
+(
+ XctData		data
+);
+
+void XctFree
+(
+ XctData		data
+ );
+
+void XctReset
+(
+ XctData		data
+ );
+
+_XFUNCPROTOEND
+
+#endif /* _Xct_h */