diff options
| author | jfbu <jfbu@free.fr> | 2017-05-05 19:20:01 +0300 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2017-05-05 19:20:01 +0300 |
| commit | 3b69c51897fcaea5db573e7c25ce56c03ebac5a7 (patch) | |
| tree | d3ce99de54fa4db7165708ac6e81ccfdc8f22eb4 /sphinx | |
| parent | 79412051d206563030d44a728836ed286cc383a4 (diff) | |
| parent | 698d8d440eebdbea04f769e625dcecf834778ab2 (diff) | |
Merge branch 'stable' into 1.6-release
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/texinputs/sphinx.sty | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 7a1417388..3b05015e5 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -16,15 +16,16 @@ %% for deprecation warnings \newcommand\sphinxdeprecationwarning[4]{% #1 the deprecated macro or name, -% #2 = version when deprecated, #3 = version when removed, #4 = message +% #2 = when deprecated, #3 = when removed, #4 = additional info \edef\spx@tempa{\detokenize{#1}}% \ltx@ifundefined{sphinx_depr_\spx@tempa}{% \global\expandafter\let\csname sphinx_depr_\spx@tempa\endcsname\spx@tempa \expandafter\AtEndDocument\expandafter{\expandafter\let\expandafter \sphinxdeprecatedmacro\csname sphinx_depr_\spx@tempa\endcsname \PackageWarningNoLine{sphinx}{^^J**** SPHINX DEPRECATION WARNING:^^J - \sphinxdeprecatedmacro\space will be (or has been) - deprecated at Sphinx #2^^J and will be removed at Sphinx #3.^^J + \sphinxdeprecatedmacro^^J + \@spaces- is deprecated at Sphinx #2^^J + \@spaces- and removed at Sphinx #3.^^J #4^^J****}}% }{% warning already emitted (at end of latex log), don't repeat }} @@ -1383,8 +1384,10 @@ Anyhow, Sphinx mark-up uses only \string\sphinx\@tempa.}% % and also at end of log for better visibility \expandafter\sphinxdeprecationwarning\expandafter{\csname\@tempa\endcsname}{1.6}{1.7} - {\sphinxdeprecatedmacro\space already existed at Sphinx loading time! Not redefined!^^J - Sphinx mark-up uses only \string\sphinx\expandafter\@gobble\sphinxdeprecatedmacro.}% + {\sphinxdeprecatedmacro already existed at Sphinx loading time! Not redefined!^^J + Sphinx mark-up uses only \string\sphinx\expandafter\@gobble\sphinxdeprecatedmacro.^^J + Note: if this warning is about macro \string\strong, it presumably results^^J + from fontspec 2.6 having defined it prior to Sphinx. No need for alarm!}% }% \fi \sphinxdeprecationwarning{latex_keep_old_macro_names=True}{1.6}{1.7}{}% |