summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/phonenumbers
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-08-05 21:02:09 +0000
committerKarl Berry <karl@freefriends.org>2018-08-05 21:02:09 +0000
commitb3254ae8c0509ca29967c882a515bf3a5d757337 (patch)
treef726caa99e5f198833f021f448a5146b6197c2e4 /Master/texmf-dist/tex/latex/phonenumbers
parent97e209dcd0fde3344f46c73684ab43a68e9c0387 (diff)
phonenumbers (5aug18)
git-svn-id: svn://tug.org/texlive/trunk@48355 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/phonenumbers')
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex3
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex3
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Ortsnamen.tex12
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Vorwahlen.tex14
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex7
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex29
-rw-r--r--Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty75
7 files changed, 105 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex
index 52bae52b25e..370693cf8e3 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: German place names
-% Datum: 5. März 2017
+% Datum: 5. August 2018
\tl_const:cn {c_phone_DE_ortsname_0201_tl} {Essen}
\tl_const:cn {c_phone_DE_ortsname_0202_tl} {Wuppertal}
\tl_const:cn {c_phone_DE_ortsname_0203_tl} {Duisburg}
@@ -5226,6 +5226,7 @@
\tl_const:cn {c_phone_DE_ortsname_01526_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01529_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015555_tl} {Mobilfunk}
+\tl_const:cn {c_phone_DE_ortsname_015566_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015630_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_015678_tl} {Mobilfunk}
\tl_const:cn {c_phone_DE_ortsname_01570_tl} {Mobilfunk}
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex
index a898f264399..aba6b8b89a9 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: German area codes
-% Datum: 22. August 2016
+% Datum: 5. August 2018
\clist_const:Nn \c_phone_DE_ortsvorwahlen_clist {0201,
0202,
0203,
@@ -5226,6 +5226,7 @@
01526,
01529,
015555,
+015566,
015630,
015678,
01570,
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Ortsnamen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Ortsnamen.tex
index bf14c30e919..ac203278d86 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Ortsnamen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: British place names
-% Datum: 22. Oktober 2017
+% Datum: 5. August 2018
\tl_const:cn {c_phone_UK_ortsname_0113_tl} {Leeds}
\tl_const:cn {c_phone_UK_ortsname_0114_tl} {Sheffield}
\tl_const:cn {c_phone_UK_ortsname_0115_tl} {Nottingham}
@@ -637,7 +637,6 @@
\tl_const:cn {c_phone_UK_ortsname_07004_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07005_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07006_tl} {Personal~number}
-\tl_const:cn {c_phone_UK_ortsname_07007_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07008_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07009_tl} {Personal~number}
\tl_const:cn {c_phone_UK_ortsname_07010_tl} {Personal~number}
@@ -734,6 +733,12 @@
\tl_const:cn {c_phone_UK_ortsname_07304_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07305_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07306_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07307_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07308_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07309_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07310_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07311_tl} {Mobile~phone}
+\tl_const:cn {c_phone_UK_ortsname_07312_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07340_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07341_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07342_tl} {Mobile~phone}
@@ -937,7 +942,6 @@
\tl_const:cn {c_phone_UK_ortsname_07568_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07569_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07570_tl} {Mobile~phone}
-\tl_const:cn {c_phone_UK_ortsname_07571_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07572_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07573_tl} {Mobile~phone}
\tl_const:cn {c_phone_UK_ortsname_07574_tl} {Mobile~phone}
@@ -974,13 +978,11 @@
\tl_const:cn {c_phone_UK_ortsname_07626_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07640_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07641_tl} {Radiopaging}
-\tl_const:cn {c_phone_UK_ortsname_07643_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07644_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07654_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07659_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07660_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07661_tl} {Radiopaging}
-\tl_const:cn {c_phone_UK_ortsname_07662_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07663_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07666_tl} {Radiopaging}
\tl_const:cn {c_phone_UK_ortsname_07669_tl} {Radiopaging}
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Vorwahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Vorwahlen.tex
index ad57eda20fa..b471389c15a 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Vorwahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-UK_Vorwahlen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: British area codes
-% Datum: 22. Oktober 2017
+% Datum: 5. August 2018
\clist_const:Nn \c_phone_UK_ortsvorwahlen_clist {0113,
0114,
0115,
@@ -643,7 +643,6 @@
07004,
07005,
07006,
-07007,
07008,
07009,
07010,
@@ -740,6 +739,12 @@
07304,
07305,
07306,
+07307,
+07308,
+07309,
+07310,
+07311,
+07312,
07340,
07341,
07342,
@@ -812,7 +817,7 @@
07436,
07437,
07438,
-07439,
+07439, % nicht mehr in Gebrauch
07440,
07441,
07442,
@@ -943,7 +948,6 @@
07568,
07569,
07570,
-07571,
07572,
07573,
07574,
@@ -980,13 +984,11 @@
07626,
07640,
07641,
-07643,
07644,
07654,
07659,
07660,
07661,
-07662,
07663,
07666,
07669,
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex
index 5b22d75055f..11c6978dac8 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: place names of the North American Numbering Plan
-% Datum: 22. Oktober 2017
+% Datum: 5. August 2018
\tl_const:cn {c_phone_US_ortsname_201_tl} {New~Jersey}
\tl_const:cn {c_phone_US_ortsname_202_tl} {Washington,~D.\,C.}
\tl_const:cn {c_phone_US_ortsname_203_tl} {Connecticut}
@@ -75,6 +75,7 @@
\tl_const:cn {c_phone_US_ortsname_321_tl} {Florida}
\tl_const:cn {c_phone_US_ortsname_323_tl} {California}
\tl_const:cn {c_phone_US_ortsname_325_tl} {Texas}
+\tl_const:cn {c_phone_US_ortsname_326_tl} {Ohio}
\tl_const:cn {c_phone_US_ortsname_330_tl} {Ohio}
\tl_const:cn {c_phone_US_ortsname_331_tl} {Illinois}
\tl_const:cn {c_phone_US_ortsname_332_tl} {New~York}
@@ -220,6 +221,7 @@
\tl_const:cn {c_phone_US_ortsname_650_tl} {California}
\tl_const:cn {c_phone_US_ortsname_651_tl} {Minnesota}
\tl_const:cn {c_phone_US_ortsname_657_tl} {California}
+\tl_const:cn {c_phone_US_ortsname_658_tl} {Jamaica}
\tl_const:cn {c_phone_US_ortsname_660_tl} {Missouri}
\tl_const:cn {c_phone_US_ortsname_661_tl} {California}
\tl_const:cn {c_phone_US_ortsname_662_tl} {Mississippi}
@@ -228,6 +230,7 @@
\tl_const:cn {c_phone_US_ortsname_669_tl} {California}
\tl_const:cn {c_phone_US_ortsname_670_tl} {Northern~Mariana~Islands}
\tl_const:cn {c_phone_US_ortsname_671_tl} {Guam}
+\tl_const:cn {c_phone_US_ortsname_672_tl} {British~Columbia}
\tl_const:cn {c_phone_US_ortsname_678_tl} {Georgia}
\tl_const:cn {c_phone_US_ortsname_680_tl} {New~York}
\tl_const:cn {c_phone_US_ortsname_681_tl} {West~Virginia}
@@ -386,8 +389,8 @@
\tl_const:cn {c_phone_US_ortsname_985_tl} {Louisiana}
\tl_const:cn {c_phone_US_ortsname_986_tl} {Idaho}
\tl_const:cn {c_phone_US_ortsname_989_tl} {Michigan}
-\tl_const:cn {c_phone_US_ortsname_456_tl} {Inbound~International}
\tl_const:cn {c_phone_US_ortsname_500_tl} {Non-Geographic~Service}
+\tl_const:cn {c_phone_US_ortsname_521_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_522_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_533_tl} {Non-Geographic~Service}
\tl_const:cn {c_phone_US_ortsname_544_tl} {Non-Geographic~Service}
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
index 321cb3f691a..b8989839b56 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
@@ -1,5 +1,5 @@
% phonenumbers package: area codes of the North American Numbering Plan
-% Datum: 22. Oktober 2017
+% Datum: 5. August 2018
\clist_const:Nn \c_phone_US_ortsvorwahlen_clist {201,
202,
203,
@@ -75,6 +75,7 @@
321,
323,
325,
+326,
330,
331,
332,
@@ -220,6 +221,7 @@
650,
651,
657,
+658,
660,
661,
662,
@@ -228,6 +230,7 @@
669,
670,
671,
+672,
678,
680,
681,
@@ -336,7 +339,7 @@
873,
876,
878,
-879,
+879, % Freischaltungsdatum noch unklar
901,
902,
903,
@@ -389,9 +392,11 @@
\clist_const:Nn \c_phone_US_obligatorische_ortsvorwahlen_clist {201,
203,
204,
+206,
208,
210,
212,
+213,
214,
215,
220,
@@ -404,6 +409,7 @@
248,
249,
250,
+253,
256,
267,
270,
@@ -419,6 +425,8 @@
312,
315,
317,
+323,
+326,
330,
331,
332,
@@ -446,6 +454,7 @@
418,
419,
424,
+425,
430,
431,
437,
@@ -481,12 +490,13 @@
587,
601,
604,
-% 609, Bisher 7D, 10D ab 17. September 2018 (Einführung von 640 in New Jersey)
+609,
610,
613,
614,
615,
617,
+619,
628,
629,
630,
@@ -496,8 +506,10 @@
646,
647,
657,
+658,
667,
669,
+672,
678,
680,
681,
@@ -506,7 +518,7 @@
703,
704,
706,
-% 709, Bisher 7D, 10D ab 24. November 2018 (Einführung von 879 in Neufundland)
+% 709, Bisher 7D, demnächst 10D (Einführung von 879 in Neufundland)
713,
714,
715,
@@ -536,7 +548,7 @@
786,
787,
801,
-% 805, Bisher 7D, 10D ab 20. Juni 2018 (Einführung von 820 in Kalifornien)
+805,
809,
812,
815,
@@ -554,6 +566,7 @@
849,
854,
857,
+858,
860,
862,
872,
@@ -563,7 +576,7 @@
902,
903,
905,
-% 916, Bisher 7D, 10D ab 10. März 2018 (Einführung von 279 in Kalifornien)
+916,
917,
918,
919,
@@ -582,8 +595,8 @@
980,
984,
986}
-\clist_const:Nn \c_phone_US_sondervorwahlen_clist {456,
-500,
+\clist_const:Nn \c_phone_US_sondervorwahlen_clist {500,
+521,
522,
533,
544,
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty b/Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty
index b3b1d38cfb0..f421831bb7e 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty
@@ -2,8 +2,8 @@
% LaTeX-Paket zur Formatierung von Telefonnummern
% LaTeX package for formatting telephone numbers
% Autor: K. Wehr
-% Version: 2.0.2
-% Datum: 2. Januar 2018
+% Version: 2.1
+% Datum: 5. August 2018
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,10 +14,9 @@
% version 2005/12/01 or later.
-\RequirePackage{expl3}
-\ProvidesExplPackage {phonenumbers} {2018/01/02} {2.0.2} {Telephone number package}
-
\RequirePackage{xparse}
+\ProvidesExplPackage {phonenumbers} {2018/08/05} {2.1} {Telephone number package}
+
\RequirePackage{l3keys2e}
\RequirePackage{ltxcmds}
@@ -84,22 +83,37 @@
\msg_new:nnn {phonenumbers} {illegal~extension}
{
- extension~(Durchwahl)~of~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~ignored~\msg_line_context:
+ extension~(Durchwahl)~of~
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ phone~number~ignored~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {odd~extension}
{
- \phone_landesadjektiv:V \l_phone_land_str\ non-geographic~number~should~not~contain~an~extension~(Durchwahl)~\msg_line_context:
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ non-geographic~number~should~not~contain~an~extension~(Durchwahl)~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {subscriber~number~too~short}
{
- subscriber~number~(Teilnehmerrufnummer)~has~less~than~#1~digits~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
+ subscriber~number~(Teilnehmerrufnummer)~has~less~than~#1~digits~in~
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ phone~number~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {subscriber~number~too~long}
{
- subscriber~number~(Teilnehmerrufnummer)~has~more~than~#1~digits~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
+ subscriber~number~(Teilnehmerrufnummer)~has~more~than~#1~digits~in~
+ \phone_landesadjektiv:V \l_phone_land_str
+ \c_space_tl
+ phone~number~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {illegal~start~of~subscriber~number}
@@ -149,7 +163,11 @@
\msg_new:nnn {phonenumbers} {invalid~home~area~code}
{
- #1~unknown~as~\phone_landesadjektiv:V \l_phone_heimatland_str\ ~geographic~area~code~(Ortsvorwahl)~\msg_line_context:
+ #1~unknown~as~
+ \phone_landesadjektiv:V \l_phone_heimatland_str
+ \c_space_tl
+ geographic~area~code~(Ortsvorwahl)~
+ \msg_line_context:
}
\msg_new:nnn {phonenumbers} {invalid~country~code}
@@ -170,7 +188,7 @@
{AT} {Austrian}
{FR} {French}
{UK} {British}
- {US} {American}
+ {US} {North~American}
}
{
unsupported
@@ -1151,6 +1169,29 @@
}
}
+% #1: Nummer
+\cs_new:Npn \phone_DE_MABEZnummernlaenge_ueberpruefen:N #1
+ {
+ \int_set:Nn \l_tmpa_int {\str_count:N #1}
+ \int_add:Nn \l_tmpa_int {\str_count:N \l_phone_bereinigte_durchwahl_str}
+
+ \int_compare:nNnTF {\l_tmpa_int} > {11}
+ {
+ % Gesamtnummer hat mehr als 11 Stellen
+ \msg_warning:nnnn {phonenumbers} {number~too~long} {0137~(MABEZ)} {11}
+ }
+ {
+ \int_compare:nNnTF {\l_tmpa_int} < {11}
+ {
+ % Gesamtnummer hat weniger als 11 Stellen
+ \msg_warning:nnnn {phonenumbers} {number~too~short} {0137~(MABEZ)} {11}
+ }
+ {
+ \bool_set_true:N \l_phone_teilnehmerrufnummer_gueltig_bool
+ }
+ }
+ }
+
% #1: Vorwahl, #2: Teilnehmerrufnummer
\cs_new:Npn \phone_DE_teilnehmerrufnummer_schreiben:Nn #1 #2
{
@@ -1187,7 +1228,7 @@
{
\str_case:xnF {\str_range:Nnn #1 {1} {4}}
{
- {0137} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {11} {0137}}
+ {0137} {\phone_DE_MABEZnummernlaenge_ueberpruefen:N \l_tmpa_str}
{0160} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
{0162} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
{0163} {\phone_nummernlaenge_ueberpruefen:Vnnn \l_tmpa_str {11} {12} {mobile~phone}}
@@ -1217,7 +1258,11 @@
\str_if_empty:NF \l_phone_bereinigte_durchwahl_str
{
- \msg_warning:nn {phonenumbers} {odd~extension}
+ % Mobilfunk- und Sondernummern dürfen keine Durchwahl enthalten (ausgenommen MABEZ-Nummern)
+ \str_if_eq:xnF {\str_range:Nnn #1 {1} {4}} {0137}
+ {
+ \msg_warning:nn {phonenumbers} {odd~extension}
+ }
}
}
@@ -1949,12 +1994,12 @@
\msg_new:nnn {phonenumbers} {US/invalid~area~code}
{
- unknown~area~code~#1~in~American~phone~number~\msg_line_context:
+ unknown~area~code~#1~in~North~American~phone~number~\msg_line_context:
}
\msg_new:nnn {phonenumbers} {US/invalid~central~office~code}
{
- invalid~central~office~code~#1~in~American~phone~number~\msg_line_context:
+ invalid~central~office~code~#1~in~North~American~phone~number~\msg_line_context:
}
\bool_new:N \l_phone_US_ferngespraechspraefix_bool