summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rwxr-xr-xMODULES.html.sh1
-rw-r--r--NEWS2
-rw-r--r--lib/diacrit.c161
-rw-r--r--lib/diacrit.h27
-rw-r--r--modules/diacrit29
6 files changed, 6 insertions, 218 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c4d4b5f2f..faf7927f33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2021-03-21 Paul Eggert <eggert@cs.ucla.edu>
+ diacrit: remove
+ * MODULES.html.sh (func_all_modules), NEWS: Remove diacrit.
+ * lib/diacrit.c, lib/diacrit.h, modules/diacrit: Remove.
+
tests: fix signed overflow issues
* tests/test-dynarray.c (value_at): Avoid undefined behavior
in signed integer multiplication.
diff --git a/MODULES.html.sh b/MODULES.html.sh
index 38fd8369b4..dad6c2a77e 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2013,7 +2013,6 @@ func_all_modules ()
func_module base64
func_module check-version
func_module crc
- func_module diacrit
func_module diffseq
func_module execinfo
func_module getline
diff --git a/NEWS b/NEWS
index ba8988198b..77cf565ec9 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,8 @@ User visible incompatible changes
Date Modules Changes
+2021-03-21 diacrit This deprecated module is removed.
+
2021-03-07 mbrtowc For single-locale optimizations, you now need to
mbrtoc32 define GNULIB_WCHAR_SINGLE_LOCALE instead of
wcwidth GNULIB_WCHAR_SINGLE.
diff --git a/lib/diacrit.c b/lib/diacrit.c
deleted file mode 100644
index 1920cc0e52..0000000000
--- a/lib/diacrit.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Diacritics processing for a few character codes. -*- coding: utf-8 -*-
-
- Copyright (C) 1990-1993, 2000, 2006, 2009-2021 Free Software Foundation,
- Inc.
-
- François Pinard <pinard@iro.umontreal.ca>, 1988.
-
- All this file is a temporary hack, waiting for locales in GNU.
-
- 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 <https://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "diacrit.h"
-
-/* ISO 8859-1 Latin-1 code is used as the underlying character set. If
- MSDOS is defined, IBM-PC's character set code is used instead. */
-
-/*--------------------------------------------------------------------.
-| For each alphabetic character, returns what it would be without its |
-| possible diacritic symbol. |
-`--------------------------------------------------------------------*/
-
-const char diacrit_base[256] =
-{
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 'A', 'B', 'C', 'D', 'E', 'F', 'G',
- 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
- 'X', 'Y', 'Z', 0, 0, 0, 0, 0,
- 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
- 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
- 'x', 'y', 'z', 0, 0, 0, 0, 0,
-
-#ifdef __MSDOS__
-
- 'C', 'u', 'e', 'a', 'a', 'a', 'a', 'c',
- 'e', 'e', 'e', 'i', 'i', 'i', 'A', 'A',
- 'E', 'e', 'E', 'o', 'o', 'o', 'u', 'u',
- 'y', 'O', 'U', 0, 0, 0, 0, 0,
- 'a', 'i', 'o', 'u', 'n', 'N', 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-
-#else
-
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'C',
- 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I',
- 0, 'N', 'O', 'O', 'O', 'O', 'O', 0,
- 'O', 'U', 'U', 'U', 'U', 'Y', 0, 0,
- 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c',
- 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
- 0, 'n', 'o', 'o', 'o', 'o', 'o', 0,
- 'o', 'u', 'u', 'u', 'u', 'y', 0, 'y',
-
-#endif
-};
-
-/*------------------------------------------------------------------------.
-| For each alphabetic character, returns a code of what its diacritic is, |
-| 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] =
-{
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 4, 0,
- 3, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 6, 0,
-
-#ifdef __MSDOS__
-
- 7, 5, 2, 4, 5, 3, 8, 7,
- 4, 5, 3, 5, 4, 3, 5, 8,
- 2, 1, 1, 4, 5, 3, 4, 3,
- 5, 5, 5, 0, 0, 0, 0, 0,
- 2, 2, 2, 2, 6, 6, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-
-#else
-
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 2, 4, 6, 5, 8, 1, 7,
- 3, 2, 4, 5, 3, 2, 4, 5,
- 0, 6, 3, 2, 4, 6, 5, 0,
- 9, 3, 2, 4, 5, 2, 0, 0,
- 3, 2, 4, 6, 5, 8, 1, 7,
- 3, 2, 4, 5, 3, 2, 4, 5,
- 0, 6, 3, 2, 4, 6, 5, 0,
- 9, 3, 2, 4, 5, 2, 0, 0,
-
-#endif
-};
diff --git a/lib/diacrit.h b/lib/diacrit.h
deleted file mode 100644
index b0c6c24aa1..0000000000
--- a/lib/diacrit.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Diacritics processing for a few character codes. -*- coding: utf-8 -*-
- Copyright (C) 1990-1993, 2009-2021 Free Software Foundation, Inc.
- François Pinard <pinard@iro.umontreal.ca>, 1988.
-
- All this file is a temporary hack, waiting for locales in GNU.
-
- 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 <https://www.gnu.org/licenses/>. */
-
-extern const char diacrit_base[]; /* characters without diacritics */
-extern const char diacrit_diac[]; /* diacritic code for each character */
-
-/* Returns CHAR without its diacritic. CHAR is known to be alphabetic. */
-#define tobase(Char) (diacrit_base[(unsigned char) (Char)])
-
-/* Returns a diacritic code for CHAR. CHAR is known to be alphabetic. */
-#define todiac(Char) (diacrit_diac[(unsigned char) (Char)])
diff --git a/modules/diacrit b/modules/diacrit
deleted file mode 100644
index bda96f5c9c..0000000000
--- a/modules/diacrit
+++ /dev/null
@@ -1,29 +0,0 @@
-Description:
-Decomposition of composed ISO-8859-1 characters.
-
-Status:
-deprecated
-
-Notice:
-This module is deprecated. Use the module 'uninorm/canonical-decomposition' instead.
-
-Files:
-lib/diacrit.h
-lib/diacrit.c
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-lib_SOURCES += diacrit.h diacrit.c
-
-Include:
-"diacrit.h"
-
-License:
-GPL
-
-Maintainer:
-Jim Meyering
-
View Lorry Controller Status