From 3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:16:38 +0100 Subject: dos -> unix --- libfontenc/src/Makefile.am | 64 ++++++++++++++++----------------- libfontenc/src/fontencI.h | 88 +++++++++++++++++++++++----------------------- 2 files changed, 76 insertions(+), 76 deletions(-) (limited to 'libfontenc/src') 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*); -- cgit v1.2.3