Handle Linux extra locale categories

Linux has six locale categories that aren't in the POSIX standard.  This
commit enables their use.  For example there is meta data about a
locale, and information about how telephone numbers are formatted for
it.

On non-Linux boxes, you can now request them as well, but you will get
stub values, as if the locale were C.

Author: khwilliamson

ext/I18N-Langinfo/Langinfo.pm

@@ -68,6 +68,46 @@ our @EXPORT_OK = qw(
                     T_FMT_AMPM
                     YESEXPR
                     YESSTR
+                    _NL_ADDRESS_POSTAL_FMT
+                    _NL_ADDRESS_COUNTRY_NAME
+                    _NL_ADDRESS_COUNTRY_POST
+                    _NL_ADDRESS_COUNTRY_AB2
+                    _NL_ADDRESS_COUNTRY_AB3
+                    _NL_ADDRESS_COUNTRY_CAR
+                    _NL_ADDRESS_COUNTRY_NUM
+                    _NL_ADDRESS_COUNTRY_ISBN
+                    _NL_ADDRESS_LANG_NAME
+                    _NL_ADDRESS_LANG_AB
+                    _NL_ADDRESS_LANG_TERM
+                    _NL_ADDRESS_LANG_LIB
+                    _NL_IDENTIFICATION_TITLE
+                    _NL_IDENTIFICATION_SOURCE
+                    _NL_IDENTIFICATION_ADDRESS
+                    _NL_IDENTIFICATION_CONTACT
+                    _NL_IDENTIFICATION_EMAIL
+                    _NL_IDENTIFICATION_TEL
+                    _NL_IDENTIFICATION_FAX
+                    _NL_IDENTIFICATION_LANGUAGE
+                    _NL_IDENTIFICATION_TERRITORY
+                    _NL_IDENTIFICATION_AUDIENCE
+                    _NL_IDENTIFICATION_APPLICATION
+                    _NL_IDENTIFICATION_ABBREVIATION
+                    _NL_IDENTIFICATION_REVISION
+                    _NL_IDENTIFICATION_DATE
+                    _NL_IDENTIFICATION_CATEGORY
+                    _NL_MEASUREMENT_MEASUREMENT
+                    _NL_NAME_NAME_FMT
+                    _NL_NAME_NAME_GEN
+                    _NL_NAME_NAME_MR
+                    _NL_NAME_NAME_MRS
+                    _NL_NAME_NAME_MISS
+                    _NL_NAME_NAME_MS
+                    _NL_PAPER_HEIGHT
+                    _NL_PAPER_WIDTH
+                    _NL_TELEPHONE_TEL_INT_FMT
+                    _NL_TELEPHONE_TEL_DOM_FMT
+                    _NL_TELEPHONE_INT_SELECT
+                    _NL_TELEPHONE_INT_PREFIX
                    );
 
 our $VERSION = '0.23';
@@ -209,6 +249,114 @@ For the eras based on typically some ruler, such as the Japanese Emperor
 
 =back
 
+In addition, Linux boxes have extra items, as follows.  (When called from
+other platform types, these return a stub value, of not much use.)
+
+=over
+
+=item C<_NL_ADDRESS_POSTAL_FMT>
+
+=item C<_NL_ADDRESS_COUNTRY_NAME>
+
+=item C<_NL_ADDRESS_COUNTRY_POST>
+
+=item C<_NL_ADDRESS_COUNTRY_AB2>
+
+=item C<_NL_ADDRESS_COUNTRY_AB3>
+
+=item C<_NL_ADDRESS_COUNTRY_CAR>
+
+=item C<_NL_ADDRESS_COUNTRY_NUM>
+
+=item C<_NL_ADDRESS_COUNTRY_ISBN>
+
+=item C<_NL_ADDRESS_LANG_NAME>
+
+=item C<_NL_ADDRESS_LANG_AB>
+
+=item C<_NL_ADDRESS_LANG_TERM>
+
+=item C<_NL_ADDRESS_LANG_LIB>
+
+On Linux boxes, these return information about the country for the current
+locale.  Further information is found in F<langinfo.h>
+
+=item C<_NL_IDENTIFICATION_TITLE>
+
+=item C<_NL_IDENTIFICATION_SOURCE>
+
+=item C<_NL_IDENTIFICATION_ADDRESS>
+
+=item C<_NL_IDENTIFICATION_CONTACT>
+
+=item C<_NL_IDENTIFICATION_EMAIL>
+
+=item C<_NL_IDENTIFICATION_TEL>
+
+=item C<_NL_IDENTIFICATION_FAX>
+
+=item C<_NL_IDENTIFICATION_LANGUAGE>
+
+=item C<_NL_IDENTIFICATION_TERRITORY>
+
+=item C<_NL_IDENTIFICATION_AUDIENCE>
+
+=item C<_NL_IDENTIFICATION_APPLICATION>
+
+=item C<_NL_IDENTIFICATION_ABBREVIATION>
+
+=item C<_NL_IDENTIFICATION_REVISION>
+
+=item C<_NL_IDENTIFICATION_DATE>
+
+=item C<_NL_IDENTIFICATION_CATEGORY>
+
+On Linux boxes, these return meta information about the current locale,
+such as how to get in touch with its maintainers.
+Further information is found in F<langinfo.h>
+
+=item C<_NL_MEASUREMENT_MEASUREMENT>
+
+On Linux boxes, it returns 1 if the metric system of measurement prevails in
+the locale; or 2 if US customary units prevail.
+
+=item C<_NL_NAME_NAME_FMT>
+
+=item C<_NL_NAME_NAME_GEN>
+
+=item C<_NL_NAME_NAME_MR>
+
+=item C<_NL_NAME_NAME_MRS>
+
+=item C<_NL_NAME_NAME_MISS>
+
+=item C<_NL_NAME_NAME_MS>
+
+On Linux boxes, these return information about how names are formatted and
+the personal salutations used in the current locale.  Further information
+is found in L<locale(7)> and F<langinfo.h>
+
+=item C<_NL_PAPER_HEIGHT>
+
+=item C<_NL_PAPER_WIDTH>
+
+On Linux boxes, these return the standard size of sheets of paper (in
+millimeters) in the current locale.
+
+=item C<_NL_TELEPHONE_TEL_INT_FMT>
+
+=item C<_NL_TELEPHONE_TEL_DOM_FMT>
+
+=item C<_NL_TELEPHONE_INT_SELECT>
+
+=item C<_NL_TELEPHONE_INT_PREFIX>
+
+On Linux boxes, these return information about how telephone numbers are
+formatted (both domestically and international calling) in the current locale.
+Further information is found in F<langinfo.h>
+
+=back
+
 =head2 For systems without C<nl_langinfo>
 
 This module originally was just a wrapper for the libc C<nl_langinfo>
@@ -275,6 +423,11 @@ L<https://github.com/Perl/perl5/issues>.
 These are derived by using C<strftime()>, and not all versions of that function
 know about them.  C<""> is returned for these on such systems.
 
+=item All C<_NL_I<foo>> items
+
+These return the same values as they do on boxes that don't have the
+appropriate underlying locale categories.
+
 =back
 
 See your L<nl_langinfo(3)> for more information about the available

ext/I18N-Langinfo/Langinfo.xs

@@ -26,15 +26,7 @@ langinfo(code)
 	int	code
   PROTOTYPE: _
   CODE:
-#ifdef HAS_NL_LANGINFO
-	if (code < 0) {
-	    SETERRNO(EINVAL, LIB_INVARG);
-	    RETVAL = &PL_sv_undef;
-	} else
-#endif
-        {
-            RETVAL = sv_langinfo(code);
-        }
+        RETVAL = sv_langinfo(code);
 
   OUTPUT:
         RETVAL

ext/I18N-Langinfo/Makefile.PL

@@ -14,15 +14,56 @@ WriteMakefile(
 my @names = 'CODESET'; # CODESET isn't an enum in old glibc's langinfo.h
 push @names,           # This lot are always enums in old langinfo.h:
     {name=>$_, type=>"IV",
-     macro=>["#if defined($_) || (defined(__GNU_LIBRARY__) && defined(_NL_ITEM))\n",
+     macro=>["#if defined($_) || (defined(_NL_ITEM))\n",
              "#endif\n"]}
       foreach qw (ABDAY_1 ABDAY_2 ABDAY_3 ABDAY_4 ABDAY_5 ABDAY_6 ABDAY_7
                   ABMON_1 ABMON_10 ABMON_11 ABMON_12 ABMON_2 ABMON_3 ABMON_4
                   ABMON_5 ABMON_6 ABMON_7 ABMON_8 ABMON_9 ALT_DIGITS AM_STR
                   DAY_1 DAY_2 DAY_3 DAY_4 DAY_5 DAY_6 DAY_7 D_FMT D_T_FMT ERA
                   ERA_D_FMT ERA_D_T_FMT ERA_T_FMT MON_1 MON_10 MON_11 MON_12
                   MON_2 MON_3 MON_4 MON_5 MON_6 MON_7 MON_8 MON_9 NOEXPR NOSTR
-                  PM_STR T_FMT T_FMT_AMPM YESEXPR YESSTR);
+                  PM_STR T_FMT T_FMT_AMPM YESEXPR YESSTR
+                  _NL_ADDRESS_POSTAL_FMT
+                  _NL_ADDRESS_COUNTRY_NAME
+                  _NL_ADDRESS_COUNTRY_POST
+                  _NL_ADDRESS_COUNTRY_AB2
+                  _NL_ADDRESS_COUNTRY_AB3
+                  _NL_ADDRESS_COUNTRY_CAR
+                  _NL_ADDRESS_COUNTRY_NUM
+                  _NL_ADDRESS_COUNTRY_ISBN
+                  _NL_ADDRESS_LANG_NAME
+                  _NL_ADDRESS_LANG_AB
+                  _NL_ADDRESS_LANG_TERM
+                  _NL_ADDRESS_LANG_LIB
+                  _NL_IDENTIFICATION_TITLE
+                  _NL_IDENTIFICATION_SOURCE
+                  _NL_IDENTIFICATION_ADDRESS
+                  _NL_IDENTIFICATION_CONTACT
+                  _NL_IDENTIFICATION_EMAIL
+                  _NL_IDENTIFICATION_TEL
+                  _NL_IDENTIFICATION_FAX
+                  _NL_IDENTIFICATION_LANGUAGE
+                  _NL_IDENTIFICATION_TERRITORY
+                  _NL_IDENTIFICATION_AUDIENCE
+                  _NL_IDENTIFICATION_APPLICATION
+                  _NL_IDENTIFICATION_ABBREVIATION
+                  _NL_IDENTIFICATION_REVISION
+                  _NL_IDENTIFICATION_DATE
+                  _NL_IDENTIFICATION_CATEGORY
+                  _NL_MEASUREMENT_MEASUREMENT
+                  _NL_NAME_NAME_FMT
+                  _NL_NAME_NAME_GEN
+                  _NL_NAME_NAME_MR
+                  _NL_NAME_NAME_MRS
+                  _NL_NAME_NAME_MISS
+                  _NL_NAME_NAME_MS
+                  _NL_PAPER_HEIGHT
+                  _NL_PAPER_WIDTH
+                  _NL_TELEPHONE_TEL_INT_FMT
+                  _NL_TELEPHONE_TEL_DOM_FMT
+                  _NL_TELEPHONE_INT_SELECT
+                  _NL_TELEPHONE_INT_PREFIX
+                 );
 push @names,           # This lot are only enums for __SVR4_I386_ABI_L1__:
     {name=>$_, type=>"IV",
      macro=>["#if defined($_) || (defined(__GNU_LIBRARY__) && defined(_NL_ITEM) && defined(__SVR4_I386_ABI_L1__))\n",

ext/I18N-Langinfo/t/Langinfo.t

@@ -22,6 +22,13 @@ my %want = (    RADIXCHAR => qr/ ^ \. $ /x,
                 # these.  In the C locale, there is nothing after the first
                 # character.
                 CRNCYSTR  => qr/ ^ [+-.]? $ /x,
+
+                _NL_ADDRESS_COUNTRY_NUM => qr/^ 0 $/x,
+                _NL_IDENTIFICATION_TERRITORY => qr/ ^ ISO $/x,
+                _NL_MEASUREMENT_MEASUREMENT => qr/ ^ [01] $/x,
+                _NL_PAPER_HEIGHT => qr/^ \d+ $/x,
+                _NL_NAME_NAME_GEN => qr/ .* /x,
+                _NL_TELEPHONE_INT_SELECT => qr/ .* /x,
            );
 
 # Abbreviated and full are swapped in many locales in early netbsd.  Skip
@@ -145,7 +152,51 @@ sub check_utf8_validity($$$) {
 my @want = sort keys %want;
 my @illegal_utf8;
 
-use_ok('I18N::Langinfo', 'langinfo', @constants, 'CRNCYSTR');
+my %extra_items = (
+                    _NL_ADDRESS_POSTAL_FMT => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_NAME => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_POST => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_AB2 => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_AB3 => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_CAR => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_NUM => 'LC_ADDRESS',
+                    _NL_ADDRESS_COUNTRY_ISBN => 'LC_ADDRESS',
+                    _NL_ADDRESS_LANG_NAME => 'LC_ADDRESS',
+                    _NL_ADDRESS_LANG_AB => 'LC_ADDRESS',
+                    _NL_ADDRESS_LANG_TERM => 'LC_ADDRESS',
+                    _NL_ADDRESS_LANG_LIB => 'LC_ADDRESS',
+                    _NL_IDENTIFICATION_TITLE => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_SOURCE => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_ADDRESS => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_CONTACT => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_EMAIL => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_TEL => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_FAX => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_LANGUAGE => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_TERRITORY => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_AUDIENCE => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_APPLICATION => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_ABBREVIATION => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_REVISION => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_DATE => 'LC_IDENTIFICATION',
+                    _NL_IDENTIFICATION_CATEGORY => 'LC_IDENTIFICATION',
+                    _NL_MEASUREMENT_MEASUREMENT => 'LC_MEASUREMENT',
+                    _NL_NAME_NAME_FMT => 'LC_NAME',
+                    _NL_NAME_NAME_GEN => 'LC_NAME',
+                    _NL_NAME_NAME_MR => 'LC_NAME',
+                    _NL_NAME_NAME_MRS => 'LC_NAME',
+                    _NL_NAME_NAME_MISS => 'LC_NAME',
+                    _NL_NAME_NAME_MS => 'LC_NAME',
+                    _NL_PAPER_HEIGHT => 'LC_PAPER',
+                    _NL_PAPER_WIDTH => 'LC_PAPER',
+                    _NL_TELEPHONE_TEL_INT_FMT => 'LC_TELEPHONE',
+                    _NL_TELEPHONE_TEL_DOM_FMT => 'LC_TELEPHONE',
+                    _NL_TELEPHONE_INT_SELECT => 'LC_TELEPHONE',
+                    _NL_TELEPHONE_INT_PREFIX => 'LC_TELEPHONE',
+                );
+
+use_ok('I18N::Langinfo', 'langinfo', @constants, 'CRNCYSTR',
+                          keys %extra_items);
 
 use POSIX;
 

ext/XS-APItest/t/locale.t

@@ -151,6 +151,46 @@ my %correct_C_responses = (
                             T_FMT_AMPM => undef,
                             YESEXPR => undef,
                             YESSTR => undef,
+                            _NL_ADDRESS_POSTAL_FMT => undef,
+                            _NL_ADDRESS_COUNTRY_NAME => undef,
+                            _NL_ADDRESS_COUNTRY_POST => undef,
+                            _NL_ADDRESS_COUNTRY_AB2 => undef,
+                            _NL_ADDRESS_COUNTRY_AB3 => undef,
+                            _NL_ADDRESS_COUNTRY_CAR => undef,
+                            _NL_ADDRESS_COUNTRY_NUM => 0,
+                            _NL_ADDRESS_COUNTRY_ISBN => undef,
+                            _NL_ADDRESS_LANG_NAME => undef,
+                            _NL_ADDRESS_LANG_AB => undef,
+                            _NL_ADDRESS_LANG_TERM => undef,
+                            _NL_ADDRESS_LANG_LIB => undef,
+                            _NL_IDENTIFICATION_TITLE => undef,
+                            _NL_IDENTIFICATION_SOURCE => undef,
+                            _NL_IDENTIFICATION_ADDRESS => undef,
+                            _NL_IDENTIFICATION_CONTACT => undef,
+                            _NL_IDENTIFICATION_EMAIL => undef,
+                            _NL_IDENTIFICATION_TEL => undef,
+                            _NL_IDENTIFICATION_FAX => undef,
+                            _NL_IDENTIFICATION_LANGUAGE => undef,
+                            _NL_IDENTIFICATION_TERRITORY => "ISO",
+                            _NL_IDENTIFICATION_AUDIENCE => undef,
+                            _NL_IDENTIFICATION_APPLICATION => undef,
+                            _NL_IDENTIFICATION_ABBREVIATION => undef,
+                            _NL_IDENTIFICATION_REVISION => undef,
+                            _NL_IDENTIFICATION_DATE => undef,
+                            _NL_IDENTIFICATION_CATEGORY => undef,
+                            _NL_MEASUREMENT_MEASUREMENT => undef,
+                            _NL_NAME_NAME_FMT => undef,
+                            _NL_NAME_NAME_GEN => undef,
+                            _NL_NAME_NAME_MR => undef,
+                            _NL_NAME_NAME_MRS => undef,
+                            _NL_NAME_NAME_MISS => undef,
+                            _NL_NAME_NAME_MS => undef,
+                            _NL_PAPER_HEIGHT => undef,
+                            _NL_PAPER_WIDTH => undef,
+                            _NL_TELEPHONE_TEL_INT_FMT => undef,
+                            _NL_TELEPHONE_TEL_DOM_FMT => undef,
+                            _NL_TELEPHONE_INT_SELECT => undef,
+                            _NL_TELEPHONE_INT_PREFIX => undef,
                         );
 
 my $hdr = "../../perl_langinfo.h";