phonenumbers (12mar17)

git-svn-id: svn://tug.org/texlive/trunk@43482 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 25 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/phonenumbers/DE_Ortsnamen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex
index efaa76ab13a..efaa76ab13a 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/DE_Ortsnamen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Ortsnamen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/DE_Vorwahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex
index a40a5c361a0..a40a5c361a0 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/DE_Vorwahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-DE_Vorwahlen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/FR_Ortsnamen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-FR_Ortsnamen.tex
index a402c0a2a61..a402c0a2a61 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/FR_Ortsnamen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-FR_Ortsnamen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/FR_Vorwahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-FR_Vorwahlen.tex
index c9541379d9c..c9541379d9c 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/FR_Vorwahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-FR_Vorwahlen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/Landeskennzahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-Landeskennzahlen.tex
index f80710270ad..f80710270ad 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/Landeskennzahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-Landeskennzahlen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/US_Ortsnamen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex
index 58acd84125c..58acd84125c 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/US_Ortsnamen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Ortsnamen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/US_Vorwahlen.tex b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
index 7457f6aed9a..7457f6aed9a 100644
--- a/Master/texmf-dist/tex/latex/phonenumbers/US_Vorwahlen.tex
+++ b/Master/texmf-dist/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
diff --git a/Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty b/Master/texmf-dist/tex/latex/phonenumbers/phonenumbers.sty
index 1c1ca5ad2ae..9cb95388769 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: 1.2
-% Datum: 5. März 2017
+% Version: 1.2.1
+% Datum: 12. März 2017
 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
 
 
 \RequirePackage{expl3}
-\ProvidesExplPackage {phonenumbers} {2017/03/05} {1.2} {Telephone number package}
+\ProvidesExplPackage {phonenumbers} {2017/03/12} {1.2.1} {Telephone number package}
 
 \RequirePackage{xparse}
 \RequirePackage{l3keys2e}
@@ -150,7 +150,7 @@
             {US} {American}
          }
          {
-            not~supported
+            unsupported
          }
    }
 
@@ -361,7 +361,7 @@
                   \str_put_right:Nn \l_phone_bereinigte_nummer_str {##1}
                }
                {
-                  \bool_if:NTF \l_phone_erstes_zeichen_bool
+                  \bool_if:nTF {\l_phone_erstes_zeichen_bool && \str_if_eq_p:nn {##1} {+}}
                      {
                         \bool_set_true:N \l_phone_plusnummer_bool
                      }
@@ -608,7 +608,7 @@
       \group_end:
    }
 
-\file_input:n {Landeskennzahlen}
+\file_input:n {phn-Landeskennzahlen}
 
 \NewDocumentCommand \CountryCodes { }
    {
@@ -631,8 +631,8 @@
 
 %%%%%%%%%%%%%%%%%%%% DEUTSCHLAND %%%%%%%%%%%%%%%%%%%%
 
-\file_input:n {DE_Vorwahlen}
-\file_input:n {DE_Ortsnamen}
+\file_input:n {phn-DE_Vorwahlen}
+\file_input:n {phn-DE_Ortsnamen}
 
 \clist_new:N \c_phone_DE_vorwahlliste_clist
 \clist_concat:NNN \c_phone_DE_vorwahlliste_clist \c_phone_DE_ortsvorwahlliste_clist \c_phone_DE_sondervorwahlliste_clist
@@ -890,7 +890,7 @@
    }
 
 % #1: Vorwahl, #2: Teilnehmerrufnummer
-\cs_new:Npn \phone_DE_teilnehmerrufnummernlaenge_ueberpruefen:Nn #1#2
+\cs_new:Npn \phone_DE_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1#2
    {
       \int_set:Nn \l_tmpa_int {\str_count:N #1}
       \int_add:Nn \l_tmpa_int {\str_count:n {#2}}
@@ -909,12 +909,20 @@
                   \msg_warning:nnn {phonenumbers/DE} {subscriber~number~too~short} {3}
                }
                {
-                  \int_compare:nNnTF {\l_tmpa_int} > {8}
+                  % Warnung ausgeben, falls eine Nummer ohne Durchwahl mehr als 8 Stellen hat
+                  \bool_if:nTF {\str_if_empty_p:N \l_phone_bereinigte_durchwahl_str && \int_compare_p:nNn {\l_tmpa_int} > {8}}
                      {
                         \msg_warning:nnn {phonenumbers/DE} {subscriber~number~too~long} {8}
                      }
                      {
-                        \bool_set_true:N \l_phone_DE_teilnehmerrufnummer_gueltig_bool
+                        % Warnung ausgeben, falls eine Nummer mit Durchwahl mehr als 9 Stellen hat
+                        \int_compare:nNnTF {\l_tmpa_int} > {9}
+                           {
+                              \msg_warning:nnn {phonenumbers/DE} {subscriber~number~too~long} {9}
+                           }
+                           {
+                              \bool_set_true:N \l_phone_DE_teilnehmerrufnummer_gueltig_bool
+                           }
                      }
                }
          }
@@ -929,7 +937,7 @@
             % Festnetznummer ohne Vorwahl
             \bool_if:NF \l_phone_eingabe_leer_bool
                {
-                  \phone_DE_teilnehmerrufnummernlaenge_ueberpruefen:Nn #1 {#2}
+                  \phone_DE_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1 {#2}
                }
          }
          {
@@ -941,7 +949,7 @@
                         \msg_warning:nn {phonenumbers/DE} {illegal~start~of~subscriber~number}
                      }
                      {
-                        \phone_DE_teilnehmerrufnummernlaenge_ueberpruefen:Nn #1 {#2}
+                        \phone_DE_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1 {#2}
                      }
                }
                {
@@ -1072,8 +1080,8 @@
 
 %%%%%%%%%%%%%%%%%%%% FRANKREICH %%%%%%%%%%%%%%%%%%%%
 
-\file_input:n {FR_Vorwahlen}
-\file_input:n {FR_Ortsnamen}
+\file_input:n {phn-FR_Vorwahlen}
+\file_input:n {phn-FR_Ortsnamen}
 
 \clist_new:N \c_phone_FR_vorwahlliste_clist
 \clist_concat:NNN \c_phone_FR_vorwahlliste_clist \c_phone_FR_ortsvorwahlliste_clist \c_phone_FR_sondervorwahlliste_clist
@@ -1287,8 +1295,8 @@
 
 %%%%%%%%%%%%%%%%%%%% NORDAMERIKA %%%%%%%%%%%%%%%%%%%%
 
-\file_input:n {US_Vorwahlen}
-\file_input:n {US_Ortsnamen}
+\file_input:n {phn-US_Vorwahlen}
+\file_input:n {phn-US_Ortsnamen}
 
 \clist_new:N \c_phone_US_vorwahlliste_clist
 \clist_concat:NNN \c_phone_US_vorwahlliste_clist \c_phone_US_ortsvorwahlliste_clist \c_phone_US_sondervorwahlliste_clist