diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/doi/README.md (renamed from Master/texmf-dist/doc/latex/doi/README) | 24 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/doi/doi.sty | 31 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/eplain.tlpsrc | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/jadetex.tlpsrc | 5 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/latex-bin.tlpsrc | 4 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/mltex.tlpsrc | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/pdftex.tlpsrc | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/xmltex.tlpsrc | 2 |
8 files changed, 46 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/doi/README b/Master/texmf-dist/doc/latex/doi/README.md index 00cf31c5919..907d4802523 100644 --- a/Master/texmf-dist/doc/latex/doi/README +++ b/Master/texmf-dist/doc/latex/doi/README.md @@ -1,22 +1,26 @@ -You can hyperlink DOI numbers to dx.doi.org. Some publishers have elected to -use some nasty characters in their doi numbering scheme (<, >, ; have all -been spotted). This will either upset (La)TeX, or your pdf reader. This style -file contains a user-level command \doi{}, which takes a doi number, -and creates a hyperlink from it. The format of the doi can be controlled by +You can hyperlink DOI numbers to dx.doi.org. Some publishers have elected to +use some nasty characters in their doi numbering scheme (<, >, ; have all +been spotted). This will either upset (La)TeX, or your pdf reader. This style +file contains a user-level command \doi{}, which takes a doi number, +and creates a hyperlink from it. The format of the doi can be controlled by redefining the \doitext command, which does not take an argument (unlike the -command with the same name in the doipubmed package). +command with the same name in the doipubmed package). Note: the \doi{} command connot be used within other macros. -This style file is based original code written by Heiko Oberdiek -and published on comp.text.tex. It was packaged with permission -as a style file by Maarten Sneep, with some minor changes suggested +This style file is based original code written by Heiko Oberdiek +and published on comp.text.tex. It was packaged with permission +as a style file by Maarten Sneep, with some minor changes suggested by Bruno Voisin to accomodate the Apple pdf framework -Michael Orlov noticed that underscores were not handled appropriately +Michael Orlov noticed that underscores were not handled appropriately and sends in a patch. +Now supported by the "Oberdiek Package Support Group" at GitHub. This code is placed under the LPPL. Original discussion on Google under: http://groups.google.com/group/comp.text.tex/msg/922919daa207d613 +Comments and bug reports to +https://github.com/ho-tex/doi/issues + diff --git a/Master/texmf-dist/tex/latex/doi/doi.sty b/Master/texmf-dist/tex/latex/doi/doi.sty index 5d8e5dbcfce..0c3c152b910 100644 --- a/Master/texmf-dist/tex/latex/doi/doi.sty +++ b/Master/texmf-dist/tex/latex/doi/doi.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{doi}[2007/07/24 handle doi numbers] +\ProvidesPackage{doi}[2018/09/09 handle doi numbers] %% This style file is based original code written by Heiko Oberdiek %% and published on comp.text.tex. It was packaged with permission @@ -11,6 +11,9 @@ %% Original discussion on Google under: %% http://groups.google.com/group/comp.text.tex/msg/922919daa207d613 %% +%% Comments and bug reports may be submitted via +%% https://github.com/ho-tex/doi/issues +%% %% You can hyperlink DOI numbers to dx.doi.org. Some publishers have elected to %% use some nasty characters in their doi numbering scheme (<, >, ; have all %% been spotted). This will either upset (La)TeX, or your pdf reader. This style @@ -30,17 +33,29 @@ %% A \doitext command is added, following the example from doipubmed. %% Some comments are added to make the code a little more readable. %% July 2007: Michael Orlov sends in a patch to correctly handle underscores. +%% September 2018: David Carlisle for "Oberdiek Package Support Group" +%% Move to github https://github.com/ho-tex/doi/issues +%% Add macro defaulting to new +%% https://doi.org/ URL but may be set to old http://dx.doi.org/ +%% + %% We need hyperref, but you probably want to load hyperref %% beforehand, or set some options later on. \RequirePackage{hyperref} -%% to change the default prefix, redefine this command within your own code. +%% To change the default prefix, redefine this command within your own code. %% It takes no argument, which is different from the doipubmed package. \newcommand{\doitext}{doi:} -%% the meat of the code -%% the first command opens a group, and changes a few catcodes. +%% To change the default DOI URL resoloution URL, redefine this command +%% within your own code. +%% Previous versions of this package always used http://dx.doi.org/ but +%% The preferred address is now as given here, https://doi.org/ +\newcommand{\doiurl}{https://doi.org/} + +%% The meat of the code. +%% The first command opens a group, and changes a few catcodes. \newcommand*{\doi}{% \begingroup \lccode`\~=`\#\relax @@ -59,7 +74,7 @@ \@doi } -%% this is the actual command which processes the argument, with the catcodes +%% This is the actual command which processes the argument, with the catcodes %% set in the previous command %% it closes the group, and spits out the url. \def\@doi#1{% @@ -73,11 +88,11 @@ \edef\_{_}% \edef\textless{\@percentchar3C}% instead of {\string<} for Apple \edef\textgreater{\@percentchar3E}% instead of {\sting>} for Apple - \edef\x{\toks1={\noexpand\href{http://dx.doi.org/#1}}}% + \edef\x{\toks2={\noexpand\href{\doiurl#1}}}% \x - \edef\x{\endgroup\doitext\the\toks1 \the\toks0}% + \edef\x{\endgroup\doitext\the\toks2 \the\toks0}% \x } -%% that's all folks. +%% That's all folks. \endinput diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc index 69c280c8bfe..105499c2940 100644 --- a/Master/tlpkg/tlpsrc/eplain.tlpsrc +++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc @@ -1,7 +1,7 @@ depend pdftex execute AddFormat name=eplain engine=pdftex patterns=language.dat \ options="-translate-file=cp227.tcx *eplain.ini" \ - fmttriggers=babel,cm,hyphen-base,knuth-lib,latex-fonts,plain + fmttriggers=babel,cm,dehyph,hyphen-base,knuth-lib,latex-fonts,plain docpattern +f texmf-dist/doc/info/eplain.info docpattern +f texmf-dist/doc/man/man1/eplain.* binpattern f bin/${ARCH}/eplain diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc index f5b72c62962..bbd803e5b15 100644 --- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc +++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc @@ -3,8 +3,9 @@ depend passivetex depend pdftex depend tex -tlpsetvar fmtcomm amsfonts,babel,cm,colortbl,cyrillic,ec,fancyhdr,graphics,\ -graphics-cfg,graphics-def,hyperref,hyphen-base,ifxetex,latex,\ +tlpsetvar fmtcomm amsfonts,babel,cm,colortbl,cyrillic,dehyph,\ +ec,fancyhdr,graphics,graphics-cfg,graphics-def,hyperref,\ +hyphen-base,ifxetex,latex,\ latex-fonts,latexconfig,marvosym,oberdiek,passivetex,psnfss,stmaryrd,\ symbol,tex-ini-files,tipa,tools,ulem,url,wasysym,zapfding # diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc index 93e8e472c80..959fbab7e02 100644 --- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc @@ -11,13 +11,13 @@ binpattern f bin/${ARCH}/latex execute AddFormat name=latex engine=pdftex \ patterns=language.dat \ options="-translate-file=cp227.tcx *latex.ini" \ - fmttriggers=${fmtcomm},latexconfig + fmttriggers=${fmtcomm},dehyph,latexconfig # binpattern f bin/${ARCH}/pdflatex execute AddFormat name=pdflatex engine=pdftex \ patterns=language.dat \ options="-translate-file=cp227.tcx *pdflatex.ini" \ - fmttriggers=${fmtcomm},latexconfig + fmttriggers=${fmtcomm},dehyph,latexconfig # binpattern f bin/${ARCH}/dvilualatex execute AddFormat name=dvilualatex engine=luatex \ diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc index 32fdedcbd12..64f058b3d12 100644 --- a/Master/tlpkg/tlpsrc/mltex.tlpsrc +++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc @@ -4,7 +4,7 @@ tlpsetvar fmtdeps cm,hyphen-base # execute AddFormat name=mllatex engine=pdftex patterns=language.dat \ options="-translate-file=cp227.tcx -mltex *mllatex.ini" \ - fmttriggers=${fmtdeps},babel,latex,latexconfig,latex-fonts + fmttriggers=${fmtdeps},babel,dehyph,latex,latexconfig,latex-fonts # execute AddFormat name=mltex engine=pdftex \ options="-translate-file=cp227.tcx -mltex mltex.ini" \ diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc index e949efe2d4a..3600d597525 100644 --- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc +++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc @@ -1,7 +1,7 @@ category TLCore depend kpathsea -tlpsetvar fmtcomm cm,etex,hyphen-base,knuth-lib,plain +tlpsetvar fmtcomm cm,dehyph,etex,hyphen-base,knuth-lib,plain # execute AddFormat name=pdftex engine=pdftex patterns=language.def \ options="-translate-file=cp227.tcx *pdfetex.ini" \ diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc index 034960b4dd5..564685d480c 100644 --- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc +++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc @@ -3,7 +3,7 @@ depend pdftex depend tex depend xmltexconfig -tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,latexconfig,\ +tlpsetvar fmtcomm babel,cm,dehyph,hyphen-base,latex,latex-fonts,latexconfig,\ tex-ini-files,xmltexconfig # execute AddFormat name=xmltex engine=pdftex patterns=language.dat \ |