Generalise date options (plk#863)

... at least the easy ones...
moewew · Feb 13, 2020 · 4788187 · 4788187
1 parent 4208f41
commit 4788187
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/doc/latex/biblatex/biblatex.tex b/doc/latex/biblatex/biblatex.tex
@@ -14044,8 +14044,8 @@ \section{Option Scope}
 \let\+\tickmarkyes
 \let\_\tickmarkno
 \begin{longtable}[l]{@{}%
-	V{0.3\textwidth}@{}%
-	C{0.1\textwidth}@{}%
+  V{0.3\textwidth}@{}%
+  C{0.1\textwidth}@{}%
   C{0.1\textwidth}@{}%
   C{0.1\textwidth}@{}%
   C{0.1\textwidth}@{}%
@@ -14058,11 +14058,11 @@ \section{Option Scope}
 \cmidrule{2-8}
 & \multicolumn{1}{@{}H}{Load-time} &
 \multicolumn{1}{@{}H}{Global} &
-\multicolumn{1}{@{}H}{Per-refcontext} &
-\multicolumn{1}{@{}H}{Per-type} &
-\multicolumn{1}{@{}H}{Per-entry} &
-\multicolumn{1}{@{}H}{Per-namelist} &
-\multicolumn{1}{@{}H}{Per-name} \\
+\multicolumn{1}{@{}H}{Refcontext} &
+\multicolumn{1}{@{}H}{Type} &
+\multicolumn{1}{@{}H}{Entry} &
+\multicolumn{1}{@{}H}{Namelist} &
+\multicolumn{1}{@{}H}{Name} \\
 \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule(r){4-4}\cmidrule(r){5-5}\cmidrule(r){6-6}\cmidrule(r){7-7}\cmidrule(r){8-8}
 \endhead
 \bottomrule
@@ -14094,22 +14094,22 @@ \section{Option Scope}
 labeldate                         &\+&\+&\_&\_&\_&\_&\_\\
 $<$datetype$>$date                &\+&\+&\_&\_&\_&\_&\_\\
 dateabbrev                        &\+&\+&\_&\+&\+&\_&\_\\
-datecirca                         &\+&\+&\_&\_&\_&\_&\_\\
-dateera                           &\+&\+&\_&\_&\_&\_&\_\\
-dateerauto                        &\+&\+&\_&\_&\_&\_&\_\\
-dateuncertain                     &\+&\+&\_&\_&\_&\_&\_\\
+datecirca                         &\+&\+&\_&\+&\+&\_&\_\\
+dateera                           &\+&\+&\_&\+&\+&\_&\_\\
+dateerauto                        &\+&\+&\_&\+&\+&\_&\_\\
+dateuncertain                     &\+&\+&\_&\+&\+&\_&\_\\
 datezeros                         &\+&\+&\_&\_&\_&\_&\_\\
 defernumbers                      &\+&\+&\_&\_&\_&\_&\_\\
 doi                               &\+&\+&\_&\+&\+&\_&\_\\ % style
 eprint                            &\+&\+&\_&\+&\+&\_&\_\\ % style
 $<$namepart$>$inits               &\+&\+&\_&\+&\+&\+&\+\\
-gregorianstart                    &\+&\+&\_&\_&\_&\_&\_\\
+gregorianstart                    &\+&\+&\_&\+&\+&\_&\_\\
 hyperref                          &\+&\+&\_&\_&\_&\_&\_\\
 ibidtracker                       &\+&\+&\_&\+&\+&\_&\_\\
 idemtracker                       &\+&\+&\_&\+&\+&\_&\_\\
 indexing                          &\+&\+&\_&\+&\+&\_&\_\\
 isbn                              &\+&\+&\_&\+&\+&\_&\_\\ % style
-julian                            &\+&\+&\_&\_&\_&\_&\_\\
+julian                            &\+&\+&\_&\+&\+&\_&\_\\
 labelalpha                        &\+&\+&\_&\+&\+&\_&\_\\
 labelalphanametemplatename        &\_&\_&\+&\_&\+&\+&\+\\
 labelnamefield                    &\_&\_&\_&\_&\+&\_&\_\\
@@ -14122,7 +14122,7 @@ \section{Option Scope}
 labeldateusetime                  &\+&\+&\_&\_&\_&\_&\_\\
 labelprefix                       &\_&\_&\+&\_&\_&\_&\_\\
 $<$datetype$>$time                &\+&\+&\_&\_&\_&\_&\_\\
-$<$datetype$>$dateusetime         &\+&\+&\_&\_&\_&\_&\_\\
+$<$datetype$>$dateusetime         &\+&\+&\_&\+&\+&\_&\_\\
 language                          &\+&\+&\_&\_&\_&\_&\_\\
 loadfiles                         &\+&\+&\_&\_&\_&\_&\_\\
 loccittracker                     &\+&\+&\_&\+&\+&\_&\_\\
@@ -14157,7 +14157,7 @@ \section{Option Scope}
 refsegment                        &\+&\+&\_&\_&\_&\_&\_\\
 related                           &\+&\+&\_&\+&\+&\_&\_\\ % style
 safeinputenc                      &\+&\+&\_&\_&\_&\_&\_\\
-seconds                           &\+&\+&\_&\_&\_&\_&\_\\
+seconds                           &\+&\+&\_&\+&\+&\_&\_\\
 singletitle                       &\+&\+&\_&\+&\+&\_&\_\\
 skipbib                           &\+&\+&\_&\+&\+&\_&\_\\
 skipbiblist                       &\+&\+&\_&\+&\+&\_&\_\\
@@ -14166,15 +14166,14 @@ \section{Option Scope}
 sortcites                         &\+&\+&\_&\_&\_&\_&\_\\
 sorting                           &\+&\+&\_&\_&\_&\_&\_\\
 sortingnamekeytemplatename        &\_&\_&\+&\_&\+&\+&\+\\
-
 sortlocale                        &\+&\+&\_&\_&\_&\_&\_\\
 sortlos                           &\+&\+&\_&\_&\_&\_&\_\\
 sortupper                         &\+&\+&\_&\_&\_&\_&\_\\
 style                             &\+&\_&\_&\_&\_&\_&\_\\
 terseinits                        &\+&\+&\_&\+&\+&\+&\+\\
 texencoding                       &\+&\+&\_&\_&\_&\_&\_\\
 timezeros                         &\+&\+&\_&\_&\_&\_&\_\\
-timezones                         &\+&\+&\_&\_&\_&\_&\_\\
+timezones                         &\+&\+&\_&\+&\+&\_&\_\\
 uniquelist                        &\+&\+&\_&\+&\+&\+&\_\\
 uniquename                        &\+&\+&\_&\+&\+&\+&\+\\
 uniquenametemplatename            &\_&\_&\+&\_&\+&\+&\+\\

diff --git a/tex/latex/biblatex/biblatex.sty b/tex/latex/biblatex/biblatex.sty
@@ -14733,7 +14733,7 @@
     {\setcounter{maxparens}{#1}}}
 
 \newtoggle{blx@labeldateusetime}
-\DeclareBibliographyOption[boolean]{labeldateusetime}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{labeldateusetime}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@labeldateusetime}}
     {\togglefalse{blx@labeldateusetime}}}
@@ -14786,7 +14786,7 @@
     {\blx@err@invopt{labeltime=#1}{}}}
 
 % Date meta-information
-\DeclareBibliographyOption[string]{dateera}{%
+\DeclareBiblatexOption{global,type,entry}[string]{dateera}{%
   \ifboolexpr{%
               test {\ifstrequal{#1}{astronomical}}
               or
@@ -14807,11 +14807,11 @@
 % Effectively turns off dateeraauto since it's only used on ce dates which
 % are never less than zero (as that would be a bce date)
 \numdef\blx@dateeraauto{0}
-\DeclareBibliographyOption[integer]{dateeraauto}{%
+\DeclareBiblatexOption{global,type,entry}[integer]{dateeraauto}{%
   \numdef\blx@dateeraauto{#1}}
 
 \newtoggle{blx@datecirca}
-\DeclareBibliographyOption[boolean]{datecirca}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{datecirca}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@datecirca}%
      \protected\def\datecircaprint{%
@@ -14835,7 +14835,7 @@
     {\togglefalse{blx@datecirca}}}
 
 \newtoggle{blx@dateuncertain}
-\DeclareBibliographyOption[boolean]{dateuncertain}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{dateuncertain}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@dateuncertain}%
      \protected\def\dateuncertainprint{%
@@ -14887,7 +14887,7 @@
     \setkeys{blx@opt@pre}{#1time=24h}%
     % Boolean to determine if times are printed with dates
     \newtoggle{blx@#1dateusetime}%
-    \DeclareBibliographyOption[boolean]{#1dateusetime}{%
+    \DeclareBiblatexOption{global,type,entry}[boolean]{#1dateusetime}[true]{%
       \ifstrequal{##1}{true}
         {\toggletrue{blx@#1dateusetime}}
         {\togglefalse{blx@#1dateusetime}}}}
@@ -14911,12 +14911,12 @@
 
 \newtoggle{blx@julian}
 \def\blx@gregorianstart{1582-10-15}
-\DeclareBibliographyOption[boolean]{julian}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{julian}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@julian}}
     {\togglefalse{blx@julian}}}
 
-\DeclareBibliographyOption[string]{gregorianstart}{%
+\DeclareBiblatexOption{global,type,entry}[string]{gregorianstart}{%
   \def\blx@gregorianstart{#1}}
 
 \newtoggle{blx@datezeros}\toggletrue{blx@datezeros}
@@ -14940,13 +14940,13 @@
      \let\blx@imc@mktimezeros\blx@imc@stripzeros}}
 
 \newtoggle{blx@timezones}
-\DeclareBibliographyOption[boolean]{timezones}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{timezones}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@timezones}}
     {\togglefalse{blx@timezones}}}
 
 \newtoggle{blx@seconds}
-\DeclareBibliographyOption[boolean]{seconds}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{seconds}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@seconds}}
     {\togglefalse{blx@seconds}}}