From b3254ae8c0509ca29967c882a515bf3a5d757337 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Aug 2018 21:02:09 +0000 Subject: phonenumbers (5aug18) git-svn-id: svn://tug.org/texlive/trunk@48355 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/phonenumbers/Literatur.bib | 40 +++++------ Master/texmf-dist/doc/latex/phonenumbers/README | 6 +- .../doc/latex/phonenumbers/phonenumbers-de.pdf | Bin 1891105 -> 1891936 bytes .../doc/latex/phonenumbers/phonenumbers-de.tex | 20 ++++-- .../doc/latex/phonenumbers/phonenumbers-en.pdf | Bin 1890495 -> 1890496 bytes .../doc/latex/phonenumbers/phonenumbers-en.tex | 20 ++++-- .../tex/latex/phonenumbers/phn-DE_Ortsnamen.tex | 3 +- .../tex/latex/phonenumbers/phn-DE_Vorwahlen.tex | 3 +- .../tex/latex/phonenumbers/phn-UK_Ortsnamen.tex | 12 ++-- .../tex/latex/phonenumbers/phn-UK_Vorwahlen.tex | 14 ++-- .../tex/latex/phonenumbers/phn-US_Ortsnamen.tex | 7 +- .../tex/latex/phonenumbers/phn-US_Vorwahlen.tex | 29 +++++--- .../tex/latex/phonenumbers/phonenumbers.sty | 75 ++++++++++++++++----- 13 files changed, 156 insertions(+), 73 deletions(-) diff --git a/Master/texmf-dist/doc/latex/phonenumbers/Literatur.bib b/Master/texmf-dist/doc/latex/phonenumbers/Literatur.bib index 28ec1904b8d..512f9aeee00 100644 --- a/Master/texmf-dist/doc/latex/phonenumbers/Literatur.bib +++ b/Master/texmf-dist/doc/latex/phonenumbers/Literatur.bib @@ -1,5 +1,5 @@ % phonenumbers package: references -% Datum: 22. Oktober 2017 +% Datum: 5. August 2018 @book{duden, title = {Duden}, subtitle = {Die deutsche Rechtschreibung}, @@ -75,14 +75,14 @@ @online{BNA-mobil, author = {{Bundesnetzagentur}}, title = {Mobile Dienste, zugeteilte RNB}, - date = {2017-03-01}, + date = {2017-10-24}, url = {http://www.bundesnetzagentur.de/cln_1432/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/MobileDienste/zugeteilte%20RNB/MobileDiensteBelegteRNB_Basepage.html?nn=268384#download=1} } @online{BNA-Struktur, author = {{Bundesnetzagentur}}, title = {Struktur und Ausgestaltung des Nummernbereichs für Ortsnetzrufnummern}, - date = {2017-02-08}, + date = {2017-12-20}, url = {https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/ONRufnr/Vfg_25_2006_konsFassung.pdf?__blob=publicationFile&v=2} } @@ -96,7 +96,7 @@ @online{RTR-Verordnung, author = {{Rundfunk- und Telekom-Regulierungs-GmbH}}, title = {Aktuelle Fassung der Kommunikationsparameter-, Entgelt- und Mehrwertdiensteverordnung 2009}, - date = {2016-10-19}, + date = {2017-10-25}, url = {https://www.rtr.at/de/tk/KEMV2009kons} } @@ -104,7 +104,7 @@ title = {Telefonvorwahl (Österreich)}, booktitle = {Wikipedia}, booksubtitle = {Die freie Enzyklopädie}, - date = {2017-09-07}, + date = {2018-06-19}, url = {https://de.wikipedia.org/wiki/Telefonvorwahl_(%C3%96sterreich)} } @@ -118,7 +118,7 @@ @inreference{wikipedia-FR-fr, title = {Plan de numérotation en France}, booktitle = {Wikipédia en fran\c{c}ais}, - date = {2017-06-11}, + date = {2018-07-11}, url = {https://fr.wikipedia.org/wiki/Plan_de_num%C3%A9rotation_en_France}, } @@ -126,7 +126,7 @@ title = {Telefonvorwahl (Frankreich)}, booktitle = {Wikipedia}, booksubtitle = {Die freie Enzyklopädie}, - date = {2017-09-28}, + date = {2017-11-22}, url = {https://de.wikipedia.org/wiki/Telefonvorwahl_(Frankreich)} } @@ -134,7 +134,7 @@ title = {North American Numbering Plan}, booktitle = {Wikipedia}, booksubtitle = {The Free Encyclopedia}, - date = {2017-06-28}, + date = {2018-07-15}, url = {https://en.wikipedia.org/wiki/North_American_Numbering_Plan} } @@ -150,41 +150,41 @@ author = {{North American Numbering Plan Association}}, title = {Geographic NPAs in Service Sorted by Number}, url = {https://www.nationalnanpa.com/enas/geoAreaCodeNumberReport.do}, - urldate = {2017-07-04} + urldate = {2018-07-29} } @online{NANPA-non-geographic, author = {{North American Numbering Plan Association}}, title = {Non-Geographic NPAs in Service}, url = {https://www.nationalnanpa.com/enas/nonGeoNpaServiceReport.do}, - urldate = {2017-07-04} + urldate = {2018-07-29} } @online{NANPA-ten-years, author = {{North American Numbering Plan Association}}, title = {NPAs Introduced over the Last 10 Years}, url = {https://www.nationalnanpa.com/enas/npasOverLast10YearsReport.do}, - urldate = {2017-07-04} + urldate = {2018-07-29} } @online{NANPA-not-yet, author = {{North American Numbering Plan Association}}, title = {Planned NPAs Not Yet in Service}, url = {https://www.nationalnanpa.com/enas/plannedNpasNotInServiceReport.do}, - urldate = {2017-07-04} + urldate = {2018-07-29} } @online{NANPA-ten-digit, author = {{North American Numbering Plan Association}}, title = {Area Codes Requiring 10 Digit Dialing}, url = {https://www.nationalnanpa.com/enas/npasRequiring10DigitReport.do}, - urldate = {2017-07-04} + urldate = {2018-07-29} } @online{hyperref, author = {Sebastian Rahtz and Heiko Oberdiek}, title = {hyperref}, - version = {6.85}, + version = {6.86}, url = {http://ctan.org/pkg/hyperref} } @@ -206,7 +206,7 @@ title = {Telephone numbers in the United Kingdom}, booktitle = {Wikipedia}, booksubtitle = {The Free Encyclopedia}, - date = {2017-10-06}, + date = {2018-07-18}, url = {https://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom} } @@ -214,25 +214,25 @@ title = {Phone Number Formatting}, subtitle = {How to write UK telephone numbers}, url = {http://www.area-codes.org.uk/formatting.php}, - urldate = {2017-10-11} + urldate = {2018-07-30} } @online{UK-area-codes, title = {UK Area Codes and Phone Number Information}, url = {http://www.area-codes.org.uk/}, - urldate = {2017-04-01} + urldate = {2018-07-30} } @online{Ofcom-plan, author = {Ofcom}, title = {The National Telephone Numbering Plan}, - date = {2015-07-01}, - url = {https://www.ofcom.org.uk/__data/assets/pdf_file/0016/36070/numbering_plan_july2015.pdf} + date = {2018-04-26}, + url = {https://www.ofcom.org.uk/__data/assets/pdf_file/0013/102613/national-numbering-plan.pdf} } @online{Ofcom-numbering, author = {Ofcom}, title = {Ofcom Numbering Site}, url = {http://static.ofcom.org.uk/static/numbering/index.htm}, - urldate = {2017-09-30} + urldate = {2018-07-30} } diff --git a/Master/texmf-dist/doc/latex/phonenumbers/README b/Master/texmf-dist/doc/latex/phonenumbers/README index 9f35ac693e9..e640e7856ab 100644 --- a/Master/texmf-dist/doc/latex/phonenumbers/README +++ b/Master/texmf-dist/doc/latex/phonenumbers/README @@ -1,5 +1,5 @@ The phonenumbers package makes it possible to typeset telephone numbers -according to different national conventions. German, Austrian, French, British +according to different national conventions. German, Austrian, French, British, and North American phone numbers are supported. Phone numbers from other countries are supported rudimentarily. @@ -9,8 +9,8 @@ number is valid according to the national rules. It also allows to link phone numbers using the hyperref package. Package author: K. Wehr -Version: 2.0.2 -Date: 2nd January 2018 +Version: 2.1 +Date: 5th August 2018 The phonenumbers package is subject to the LaTeX Project Public License, version 1.3 or later. diff --git a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.pdf b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.pdf index 78fc9060480..633c5ad2720 100644 Binary files a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.pdf and b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.pdf differ diff --git a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.tex b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.tex index e453c9df515..34b00424fa4 100644 --- a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.tex +++ b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-de.tex @@ -1,6 +1,6 @@ % phonenumbers package: German manual -% Version 2.0.2 -% Datum: 2. Januar 2018 +% Version 2.1 +% Datum: 5. August 2018 \documentclass[numbers=noenddot]{scrreprt} \usepackage[french,ngerman]{babel} \usepackage{fontspec} @@ -523,14 +523,14 @@ Der zugehörige Tarif kann mit Hilfe der Option \begin{itemize} \item eine mit 0 beginnende Nummer keine gültige Vorwahl enthält, \item die eingegebene Nummer nur aus einer Vorwahl besteht, -\item eine Mobilfunk- oder Sondernummer eine Durchwahl enthält. +\item eine Mobilfunk- oder Sondernummer eine Durchwahl enthält (außer für MABEZ-Nummern). \end{itemize} Bei Festnetznummern wird eine Warnung ausgegeben, wenn \begin{itemize} \item die Teilnehmerrufnummer mit einer 0 beginnt \cite[6]{BNA-nummernplan}, \item die Teilnehmerrufnummer einschließlich Durchwahlnummer weniger als 3 Stellen hat \cite[6]{BNA-nummernplan}, -\item die Teilnehmerrufnummer einschließlich Durchwahlnummer mehr als 10 Stellen hat \cite[3]{BNA-Struktur}, -\item die Nummer einschließlich Vorwahl mehr als 13 Stellen hat \cite[3]{BNA-Struktur}. +\item die Teilnehmerrufnummer einschließlich Durchwahlnummer mehr als 10 Stellen hat \cite[2]{BNA-Struktur}, +\item die Nummer einschließlich Vorwahl mehr als 13 Stellen hat \cite[2]{BNA-Struktur}. \end{itemize} Bei Mobilfunknummern wird eine Warnung ausgegeben, wenn \begin{itemize} @@ -1168,7 +1168,15 @@ am Anfang \begin{itemize} \item Fehlerkorrektur im Paketcode \end{itemize} - +\item[2.1] \printdate{5.8.2018} +\begin{itemize} +\item Erlaubnis von Durchwahlen in deutschen MABEZ-Nummern (Vorwahl~01\,37\,X) +\item Ergänzung der neuen deutschen Mobilfunkvorwahl 01\,55\,66 +\item Ergänzung der neuen britischen Mobilfunkvorwahlen 07307, 07308, 07309, 07310, 07311 und 07312 +\item Entfernung der britischen Vorwahlen 07007, 07571, 07643 und 07662 +\item Ergänzung der neuen nordamerikanischen Vorwahlen 326, 521, 658 und 672 +\item Entfernung der nordamerikanischen Vorwahl 456 +\end{itemize} \end{description} \end{document} diff --git a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.pdf b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.pdf index af0f9b4a8d9..5c44cd3ad52 100644 Binary files a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.pdf and b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.pdf differ diff --git a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.tex b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.tex index 4d44f678ede..79f9d6752ab 100644 --- a/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.tex +++ b/Master/texmf-dist/doc/latex/phonenumbers/phonenumbers-en.tex @@ -1,6 +1,6 @@ % phonenumbers package: English manual -% Version 2.0.2 -% Datum: 2. Januar 2018 +% Version 2.1 +% Datum: 5. August 2018 \documentclass[numbers=noenddot]{scrreprt} \usepackage[french,UKenglish]{babel} \usepackage{fontspec} @@ -523,14 +523,14 @@ The relevant tariff can be output using the \begin{itemize} \item a number beginning with 0 does not contain a valid area code, \item the given number consists of an area code only, -\item a non-geographic number contains an extension. +\item a non-geographic number contains an extension (except for MABEZ numbers). \end{itemize} For landline numbers a warning will be issued if \begin{itemize} \item the subscriber number begins with a 0 \cite[6]{BNA-nummernplan}, \item the subscriber number including the extension has less than 3 digits \cite[6]{BNA-nummernplan}, -\item the subscriber number including the extension has more than 10 digits \cite[3]{BNA-Struktur}, -\item the number including the area code has more than 13 digits \cite[3]{BNA-Struktur}. +\item the subscriber number including the extension has more than 10 digits \cite[2]{BNA-Struktur}, +\item the number including the area code has more than 13 digits \cite[2]{BNA-Struktur}. \end{itemize} For mobile phone numbers a warning will be issued if \begin{itemize} @@ -1168,7 +1168,15 @@ option for the area code separator in numbers with country calling code \begin{itemize} \item Error correction in the package code \end{itemize} - +\item[2.1] \printdate{5.8.2018} +\begin{itemize} +\item Permission for extensions in German MABEZ numbers (area code~01\,37\,X) +\item Addition of the new German mobile phone area code 01\,55\,66 +\item Addition of the new British mobile phone area codes 07307, 07308, 07309, 07310, 07311, and 07312 +\item Removal of the British area codes 07007, 07571, 07643, and 07662 +\item Addition of the new North American area codes 326, 521, 658, and 672 +\item Removal of the North American area code 456 +\end{itemize} \end{description} \end{document} 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 -- cgit v1.2.3