Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

8 files changed, 342 insertions, 342 deletions

diff --git a/libfontenc/.gitignore b/libfontenc/.gitignore
index f5a54a370..8fa75f179 100644
--- a/libfontenc/.gitignore
+++ b/libfontenc/.gitignore
@@ -1,78 +1,78 @@
-#

-#		X.Org module default exclusion patterns

-#		The next section if for module specific patterns

-#

-#	Do not edit the following section

-# 	GNU Build System (Autotools)

-aclocal.m4

-autom4te.cache/

-autoscan.log

-ChangeLog

-compile

-config.guess

-config.h

-config.h.in

-config.log

-config-ml.in

-config.py

-config.status

-config.status.lineno

-config.sub

-configure

-configure.scan

-depcomp

-.deps/

-INSTALL

-install-sh

-.libs/

-libtool

-libtool.m4

-ltmain.sh

-lt~obsolete.m4

-ltoptions.m4

-ltsugar.m4

-ltversion.m4

-Makefile

-Makefile.in

-mdate-sh

-missing

-mkinstalldirs

-*.pc

-py-compile

-stamp-h?

-symlink-tree

-texinfo.tex

-ylwrap

-

-#	Do not edit the following section

-# 	Edit Compile Debug Document Distribute

-*~

-*.[0-9]

-*.[0-9]x

-*.bak

-*.bin

-core

-*.dll

-*.exe

-*-ISO*.bdf

-*-JIS*.bdf

-*-KOI8*.bdf

-*.kld

-*.ko

-*.ko.cmd

-*.lai

-*.l[oa]

-*.[oa]

-*.obj

-*.patch

-*.so

-*.pcf.gz

-*.pdb

-*.tar.bz2

-*.tar.gz

-#

-#		Add & Override patterns for libfontenc 

-#

-#		Edit the following section as needed

-# For example, !report.pc overrides *.pc. See 'man gitignore'

-# 

+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
+aclocal.m4
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config-ml.in
+config.py
+config.status
+config.status.lineno
+config.sub
+configure
+configure.scan
+depcomp
+.deps/
+INSTALL
+install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
+missing
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for libfontenc 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
diff --git a/libfontenc/COPYING b/libfontenc/COPYING
index 047bead5a..51327effd 100644
--- a/libfontenc/COPYING
+++ b/libfontenc/COPYING
@@ -1,19 +1,19 @@
-Copyright (c) 1998-2001 by Juliusz Chroboczek

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-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

-AUTHORS OR COPYRIGHT HOLDERS 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.

+Copyright (c) 1998-2001 by Juliusz Chroboczek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
diff --git a/libfontenc/README b/libfontenc/README
index f4e90ac42..8a6658d49 100644
--- a/libfontenc/README
+++ b/libfontenc/README
@@ -1,25 +1,25 @@
-libfontenc - font encoding library

-

-All questions regarding this software should be directed at the

-Xorg mailing list:

-

-        http://lists.freedesktop.org/mailman/listinfo/xorg

-

-Please submit bug reports to the Xorg bugzilla:

-

-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg

-

-The master development code repository can be found at:

-

-        git://anongit.freedesktop.org/git/xorg/lib/libfontenc

-

-        http://cgit.freedesktop.org/xorg/lib/libfontenc

-

-For patch submission instructions, see:

-

-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches

-

-For more information on the git code manager, see:

-

-        http://wiki.x.org/wiki/GitPage

-

+libfontenc - font encoding library
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/lib/libfontenc
+
+        http://cgit.freedesktop.org/xorg/lib/libfontenc
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+
diff --git a/libfontenc/autogen.sh b/libfontenc/autogen.sh
index 6fcae015c..904cd6746 100644
--- a/libfontenc/autogen.sh
+++ b/libfontenc/autogen.sh
@@ -1,12 +1,12 @@
-#! /bin/sh

-

-srcdir=`dirname $0`

-test -z "$srcdir" && srcdir=.

-

-ORIGDIR=`pwd`

-cd $srcdir

-

-autoreconf -v --install || exit 1

-cd $ORIGDIR || exit $?

-

-$srcdir/configure --enable-maintainer-mode "$@"

+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/libfontenc/fontenc.pc.in b/libfontenc/fontenc.pc.in
index f28f2ce22..1be100f2d 100644
--- a/libfontenc/fontenc.pc.in
+++ b/libfontenc/fontenc.pc.in
@@ -1,10 +1,10 @@
-prefix=@prefix@

-exec_prefix=@exec_prefix@

-libdir=@libdir@

-includedir=@includedir@

-

-Name: fontenc

-Description: The fontenc Library

-Version: @PACKAGE_VERSION@

-Cflags: -I${includedir}

-Libs: -L${libdir} -lfontenc

+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: fontenc
+Description: The fontenc Library
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lfontenc
diff --git a/libfontenc/include/X11/fonts/fontenc.h b/libfontenc/include/X11/fonts/fontenc.h
index d33409a3d..656cfaae7 100644
--- a/libfontenc/include/X11/fonts/fontenc.h
+++ b/libfontenc/include/X11/fonts/fontenc.h
@@ -1,122 +1,122 @@
-/*

-Copyright (c) 1998-2001 by Juliusz Chroboczek

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-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

-AUTHORS OR COPYRIGHT HOLDERS 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.

-*/

-

-/* Header for backend-independent encoding code */

-

-/* An encoding is identified with a name.  An encoding contains some

-   global encoding data, such as its size, and a set of mappings.

-   Mappings are identified by their type and two integers, known as

-   pid and eid, the interpretation of which is type dependent. */

-

-#ifndef _FONTENC_H

-#define _FONTENC_H

-

-/* Encoding types.  For future extensions, clients should be prepared

-   to ignore unknown encoding types. */

-

-/* 0 is treated specially. */

-

-#define FONT_ENCODING_UNICODE 1

-#define FONT_ENCODING_TRUETYPE 2

-#define FONT_ENCODING_POSTSCRIPT 3

-

-/* This structure represents a mapping, either from numeric codes from

-   numeric codes, or from numeric codes to strings. */

-

-/* It is expected that only one of `recode' and `name' will actually

-   be present.  However, having both fields simplifies the interface

-   somewhat. */

-

-typedef struct _FontMap {

-    int type;                   /* the type of the mapping */

-    int pid, eid;               /* the identification of the mapping */

-    unsigned (*recode)(unsigned, void*); /* mapping function */

-    char *(*name)(unsigned, void*); /* function returning glyph names */

-    void *client_data;          /* second parameter of the two above */

-    struct _FontMap *next;      /* link to next element in list */

-    /* The following was added for version 0.3 of the font interface. */

-    /* It should be kept at the end to preserve binary compatibility. */

-    struct _FontEnc *encoding;

-} FontMapRec, *FontMapPtr;

-

-/* This is the structure that holds all the info for one encoding.  It

-   consists of a charset name, its size, and a linked list of mappings

-   like above. */

-

-typedef struct _FontEnc {

-    char *name;                 /* the name of the encoding */

-    char **aliases;             /* its aliases, null terminated */

-    int size;                   /* its size, either in bytes or rows */

-    int row_size;               /* the size of a row, or 0 if bytes */

-    FontMapPtr mappings;        /* linked list of mappings */

-    struct _FontEnc *next;      /* link to next element */

-    /* the following two were added in version 0.2 of the font interface */

-    /* they should be kept at the end to preserve binary compatibility */

-    int first;                  /* first byte or row */

-    int first_col;              /* first column in each row */

-} FontEncRec, *FontEncPtr;

-

-typedef struct _FontMapReverse {

-  unsigned int (*reverse)(unsigned, void*);

-  void *data;

-} FontMapReverseRec, *FontMapReversePtr;

-

-

-/* Function prototypes */

-

-/* extract an encoding name from an XLFD name.  Returns a pointer to a

-   *static* buffer, or NULL */

-char *FontEncFromXLFD(const char*, int);

-

-/* find the encoding data for a given encoding name; second parameter

-   is the filename of the font for which the encoding is needed.

-   Returns NULL on failure. */

-FontEncPtr FontEncFind(const char*, const char*);

-

-/* Find a given mapping for an encoding.  This is only a convenience

-   function, as clients are allowed to scavenge the data structures

-   themselves (as the TrueType backend does). */

-

-FontMapPtr FontMapFind(FontEncPtr, int, int, int);

-

-/* Do both in a single step */

-FontMapPtr FontEncMapFind(const char *, int, int, int, const char *);

-

-/* Recode a code.  Always succeeds. */

-unsigned FontEncRecode(unsigned, FontMapPtr);

-

-/* Return a name for a code.  Returns a string or NULL. */

-char *FontEncName(unsigned, FontMapPtr);

-

-/* Return a pointer to the name of the system encodings directory. */

-/* This string is static and should not be modified. */

-char* FontEncDirectory(void);

-

-/* Identify an encoding file.  If fileName doesn't exist, or is not an

-   encoding file, return NULL, otherwise returns a NULL-terminated

-   array of strings. */

-char **FontEncIdentify(const char *fileName);

-

-FontMapReversePtr FontMapReverse(FontMapPtr);

-

-void FontMapReverseFree(FontMapReversePtr);

-#endif

+/*
+Copyright (c) 1998-2001 by Juliusz Chroboczek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
+*/
+
+/* Header for backend-independent encoding code */
+
+/* An encoding is identified with a name.  An encoding contains some
+   global encoding data, such as its size, and a set of mappings.
+   Mappings are identified by their type and two integers, known as
+   pid and eid, the interpretation of which is type dependent. */
+
+#ifndef _FONTENC_H
+#define _FONTENC_H
+
+/* Encoding types.  For future extensions, clients should be prepared
+   to ignore unknown encoding types. */
+
+/* 0 is treated specially. */
+
+#define FONT_ENCODING_UNICODE 1
+#define FONT_ENCODING_TRUETYPE 2
+#define FONT_ENCODING_POSTSCRIPT 3
+
+/* This structure represents a mapping, either from numeric codes from
+   numeric codes, or from numeric codes to strings. */
+
+/* It is expected that only one of `recode' and `name' will actually
+   be present.  However, having both fields simplifies the interface
+   somewhat. */
+
+typedef struct _FontMap {
+    int type;                   /* the type of the mapping */
+    int pid, eid;               /* the identification of the mapping */
+    unsigned (*recode)(unsigned, void*); /* mapping function */
+    char *(*name)(unsigned, void*); /* function returning glyph names */
+    void *client_data;          /* second parameter of the two above */
+    struct _FontMap *next;      /* link to next element in list */
+    /* The following was added for version 0.3 of the font interface. */
+    /* It should be kept at the end to preserve binary compatibility. */
+    struct _FontEnc *encoding;
+} FontMapRec, *FontMapPtr;
+
+/* This is the structure that holds all the info for one encoding.  It
+   consists of a charset name, its size, and a linked list of mappings
+   like above. */
+
+typedef struct _FontEnc {
+    char *name;                 /* the name of the encoding */
+    char **aliases;             /* its aliases, null terminated */
+    int size;                   /* its size, either in bytes or rows */
+    int row_size;               /* the size of a row, or 0 if bytes */
+    FontMapPtr mappings;        /* linked list of mappings */
+    struct _FontEnc *next;      /* link to next element */
+    /* the following two were added in version 0.2 of the font interface */
+    /* they should be kept at the end to preserve binary compatibility */
+    int first;                  /* first byte or row */
+    int first_col;              /* first column in each row */
+} FontEncRec, *FontEncPtr;
+
+typedef struct _FontMapReverse {
+  unsigned int (*reverse)(unsigned, void*);
+  void *data;
+} FontMapReverseRec, *FontMapReversePtr;
+
+
+/* Function prototypes */
+
+/* extract an encoding name from an XLFD name.  Returns a pointer to a
+   *static* buffer, or NULL */
+char *FontEncFromXLFD(const char*, int);
+
+/* find the encoding data for a given encoding name; second parameter
+   is the filename of the font for which the encoding is needed.
+   Returns NULL on failure. */
+FontEncPtr FontEncFind(const char*, const char*);
+
+/* Find a given mapping for an encoding.  This is only a convenience
+   function, as clients are allowed to scavenge the data structures
+   themselves (as the TrueType backend does). */
+
+FontMapPtr FontMapFind(FontEncPtr, int, int, int);
+
+/* Do both in a single step */
+FontMapPtr FontEncMapFind(const char *, int, int, int, const char *);
+
+/* Recode a code.  Always succeeds. */
+unsigned FontEncRecode(unsigned, FontMapPtr);
+
+/* Return a name for a code.  Returns a string or NULL. */
+char *FontEncName(unsigned, FontMapPtr);
+
+/* Return a pointer to the name of the system encodings directory. */
+/* This string is static and should not be modified. */
+char* FontEncDirectory(void);
+
+/* Identify an encoding file.  If fileName doesn't exist, or is not an
+   encoding file, return NULL, otherwise returns a NULL-terminated
+   array of strings. */
+char **FontEncIdentify(const char *fileName);
+
+FontMapReversePtr FontMapReverse(FontMapPtr);
+
+void FontMapReverseFree(FontMapReversePtr);
+#endif
diff --git a/libfontenc/src/Makefile.am b/libfontenc/src/Makefile.am
index 54b735584..96d0a38be 100644
--- a/libfontenc/src/Makefile.am
+++ b/libfontenc/src/Makefile.am
@@ -1,32 +1,32 @@
-lib_LTLIBRARIES = libfontenc.la

-

-libfontenc_la_SOURCES = \

-         encparse.c \

-         fontenc.c \

-	 fontencI.h

-

-AM_CFLAGS = \

-	$(FONTENC_CFLAGS) \

-	$(CWARNFLAGS)

-

-FONTENCDIR=@ENCODINGSDIR@

-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"

-

-INCLUDES = -I$(top_srcdir)/include $(FONTENCDEFS)

-

-

-libfontenc_la_LIBADD = @FONTENC_LIBS@

-

-libfontenc_la_LDFLAGS = -version-number 1:0:0 -no-undefined

-

-libfontencincludedir = $(includedir)/X11/fonts

-libfontencinclude_HEADERS = \

-    $(top_srcdir)/include/X11/fonts/fontenc.h

-

-if LINT

-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-		$(AM_CPPFLAGS) $(CPPFLAGS)

-

-lint:

-	$(LINT) $(ALL_LINT_FLAGS) $(libfontenc_la_SOURCES) $(libfontenc_la_LIBADD) $(LIBS)

-endif LINT

+lib_LTLIBRARIES = libfontenc.la
+
+libfontenc_la_SOURCES = \
+         encparse.c \
+         fontenc.c \
+	 fontencI.h
+
+AM_CFLAGS = \
+	$(FONTENC_CFLAGS) \
+	$(CWARNFLAGS)
+
+FONTENCDIR=@ENCODINGSDIR@
+FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
+
+INCLUDES = -I$(top_srcdir)/include $(FONTENCDEFS)
+
+
+libfontenc_la_LIBADD = @FONTENC_LIBS@
+
+libfontenc_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
+libfontencincludedir = $(includedir)/X11/fonts
+libfontencinclude_HEADERS = \
+    $(top_srcdir)/include/X11/fonts/fontenc.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+	$(LINT) $(ALL_LINT_FLAGS) $(libfontenc_la_SOURCES) $(libfontenc_la_LIBADD) $(LIBS)
+endif LINT
diff --git a/libfontenc/src/fontencI.h b/libfontenc/src/fontencI.h
index 558607cb8..9bba85ee1 100644
--- a/libfontenc/src/fontencI.h
+++ b/libfontenc/src/fontencI.h
@@ -1,44 +1,44 @@
-/*

-Copyright (c) 1998-2001 by Juliusz Chroboczek

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-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

-AUTHORS OR COPYRIGHT HOLDERS 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.

-*/

-

-/* Private types and functions for the encoding code. */

-/* Used by the files `fontenc.h' and `encparse.h' */

-

-typedef struct _FontEncSimpleMap {

-    unsigned len;                 /* might be 0x10000 */

-    unsigned short row_size;

-    unsigned short first;

-    const unsigned short *map;

-} FontEncSimpleMapRec, *FontEncSimpleMapPtr;

-

-typedef struct _FontEncSimpleName {

-    unsigned len;

-    unsigned short first;

-    char **map;

-} FontEncSimpleNameRec, *FontEncSimpleNamePtr;

-

-unsigned FontEncSimpleRecode(unsigned, void*);

-unsigned FontEncUndefinedRecode(unsigned, void*);

-char *FontEncSimpleName(unsigned, void*);

-char *FontEncUndefinedName(unsigned, void*);

-

-FontEncPtr FontEncReallyLoad(const char*, const char*);

+/*
+Copyright (c) 1998-2001 by Juliusz Chroboczek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
+*/
+
+/* Private types and functions for the encoding code. */
+/* Used by the files `fontenc.h' and `encparse.h' */
+
+typedef struct _FontEncSimpleMap {
+    unsigned len;                 /* might be 0x10000 */
+    unsigned short row_size;
+    unsigned short first;
+    const unsigned short *map;
+} FontEncSimpleMapRec, *FontEncSimpleMapPtr;
+
+typedef struct _FontEncSimpleName {
+    unsigned len;
+    unsigned short first;
+    char **map;
+} FontEncSimpleNameRec, *FontEncSimpleNamePtr;
+
+unsigned FontEncSimpleRecode(unsigned, void*);
+unsigned FontEncUndefinedRecode(unsigned, void*);
+char *FontEncSimpleName(unsigned, void*);
+char *FontEncUndefinedName(unsigned, void*);
+
+FontEncPtr FontEncReallyLoad(const char*, const char*);