X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdiacrit.c;h=f3b6c1dde2ec1cbcb2d068a5956059d4eb049fec;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=598043acf4e3a9bdd18ffada5f58c17a964ec3c6;hpb=293e41a23524c983790c776a6c4c7329954960fa;p=gnulib.git

diff --git a/lib/diacrit.c b/lib/diacrit.c
index 598043acf..f3b6c1dde 100644
--- a/lib/diacrit.c
+++ b/lib/diacrit.c
@@ -1,13 +1,26 @@
 /* Diacritics processing for a few character codes.
-   Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-   François Pinard <pinard@iro.umontreal.ca>, 1988.
+
+   Copyright (C) 1990-1993, 2000, 2006, 2009-2014 Free Software Foundation,
+   Inc.
+
+   François Pinard <pinard@iro.umontreal.ca>, 1988.
 
    All this file is a temporary hack, waiting for locales in GNU.
-*/
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
 
 #include "diacrit.h"
 
@@ -16,7 +29,7 @@
 
 /*--------------------------------------------------------------------.
 | For each alphabetic character, returns what it would be without its |
-| possible diacritic symbol.					      |
+| possible diacritic symbol.                                          |
 `--------------------------------------------------------------------*/
 
 const char diacrit_base[256] =
@@ -38,7 +51,7 @@ const char diacrit_base[256] =
   'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
   'x',    'y',    'z',    0,      0,      0,      0,      0,
 
-#ifdef MSDOS
+#ifdef __MSDOS__
 
   'C',    'u',    'e',    'a',    'a',    'a',    'a',    'c',
   'e',    'e',    'e',    'i',    'i',    'i',    'A',    'A',
@@ -57,7 +70,7 @@ const char diacrit_base[256] =
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
 
-#else /* not MSDOS */
+#else
 
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
@@ -76,15 +89,15 @@ const char diacrit_base[256] =
   0,      'n',    'o',    'o',    'o',    'o',    'o',    0,
   'o',    'u',    'u',    'u',    'u',    'y',    0,      'y',
 
-#endif /* not MSDOS */
+#endif
 };
 
 /*------------------------------------------------------------------------.
 | For each alphabetic character, returns a code of what its diacritic is, |
-| according to the following codes: 1 (eE) over aA for latin diphtongs; 2 |
-| (') acute accent; 3 (`) grave accent; 4 (^) circumflex accent; 5 (")	  |
-| umlaut or diaraesis; 6 (~) tilda; 7 (,) cedilla; 8 (o) covering degree  |
-| symbol; 9 (|) slashed character.					  |
+| according to the following codes: 1 (eE) over aA for latin diphthongs;  |
+| 2 (') acute accent; 3 (`) grave accent; 4 (^) circumflex accent; 5 (")  |
+| umlaut or diaeresis; 6 (~) tilda; 7 (,) cedilla; 8 (o) covering degree  |
+| symbol; 9 (|) slashed character.                                        |
 `------------------------------------------------------------------------*/
 
 const char diacrit_diac[256] =
@@ -106,7 +119,7 @@ const char diacrit_diac[256] =
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      6,      0,
 
-#ifdef MSDOS
+#ifdef __MSDOS__
 
   7,      5,      2,      4,      5,      3,      8,      7,
   4,      5,      3,      5,      4,      3,      5,      8,
@@ -125,7 +138,7 @@ const char diacrit_diac[256] =
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
 
-#else /* not MSDOS */
+#else
 
   0,      0,      0,      0,      0,      0,      0,      0,
   0,      0,      0,      0,      0,      0,      0,      0,
@@ -144,5 +157,5 @@ const char diacrit_diac[256] =
   0,      6,      3,      2,      4,      6,      5,      0,
   9,      3,      2,      4,      5,      2,      0,      0,
 
-#endif /* not MSDOS */
+#endif
 };