5 files changed, 21 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/bytefield/README b/Master/texmf-dist/doc/latex/bytefield/README
index ea336b2d952..e1e0d208b9d 100644
--- a/Master/texmf-dist/doc/latex/bytefield/README
+++ b/Master/texmf-dist/doc/latex/bytefield/README
@@ -23,18 +23,17 @@ makeindex -s gglo.ist bytefield.glo -o bytefield.gls  <== Writes a change log
 latex bytefield.dtx     <== Incorporates the index and change log into
                             bytefield.dvi
 
-Note that bytefield comes with pre-built documentation (PDF format,
-U.S. letter-sized paper, 24 pages).  Also, there is an example.tex
-file that shows how one might include hyperlinks in a protocol
-diagram.  example.tex needs the hyperref package and should be run
-through pdfLaTeX, VTeX, dvipdfm, or any other backend that supports
-hyperref hyperlinks.
+Note that bytefield comes with pre-built documentation.  Also, there
+is an example.tex file that shows how one might include hyperlinks in
+a protocol diagram.  example.tex needs the hyperref package and should
+be run through pdfLaTeX, VTeX, dvipdfm, or any other backend that
+supports hyperref hyperlinks.
 
 
 Copyright and license
 ---------------------
 
-Copyright (C) 2015 Scott Pakin, scott+bf@pakin.org
+Copyright (C) 2017 Scott Pakin, scott+bf@pakin.org
 
 This package may be distributed and/or modified under the conditions
 of the LaTeX Project Public License, either version 1.3a of this
diff --git a/Master/texmf-dist/doc/latex/bytefield/bytefield.pdf b/Master/texmf-dist/doc/latex/bytefield/bytefield.pdf
index 13ca3942a9d..3436fa27faf 100644
--- a/Master/texmf-dist/doc/latex/bytefield/bytefield.pdf
+++ b/Master/texmf-dist/doc/latex/bytefield/bytefield.pdf
diff --git a/Master/texmf-dist/source/latex/bytefield/bytefield.dtx b/Master/texmf-dist/source/latex/bytefield/bytefield.dtx
index d5592242307..deb30c81bed 100644
--- a/Master/texmf-dist/source/latex/bytefield/bytefield.dtx
+++ b/Master/texmf-dist/source/latex/bytefield/bytefield.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2015 by Scott Pakin <scott+bf@pakin.org>
+% Copyright (C) 2017 by Scott Pakin <scott+bf@pakin.org>
 % ------------------------------------------------------
 %
 % This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{bytefield}
 %<*package>
-    [2015/10/28 v2.3 Network protocol diagrams]
+    [2017/09/15 v2.4 Network protocol diagrams]
 %</package>
 %
 %<*driver>
@@ -45,7 +45,7 @@
   pdfauthor={Scott Pakin},
   pdfsubject={Protocol diagrams for LaTeX},
   pdfkeywords={bits, bytes, bit fields, communication, network protocol diagrams, LaTeX2e, memory maps},
-  pdfcopyright={Copyright (C) 2015, Scott Pakin},
+  pdfcopyright={Copyright (C) 2017, Scott Pakin},
   pdflicenseurl={http://www.latex-project.org/lppl/},
   pdfcaptionwriter={Scott Pakin},
   pdfcontactemail={scott+bf@pakin.org},
@@ -67,7 +67,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1025}
+% \CheckSum{1028}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -2075,6 +2075,9 @@
 %
 % \begin{environment}{bytefield}
 % \usermacro
+% \changes{v2.4}{2017/09/15}{Make the code resilient to changes in
+%   \texttt{\string\string\string\baselinestretch}.  Thanks to
+%   Karst Koymans for the bug report}
 % \begin{macro}{\bits@wide}
 % \begin{macro}{\old@nl}
 % \begin{macro}{\amp}
@@ -2089,6 +2092,8 @@
 %    \begin{macrocode}
 \newenvironment{bytefield}[2][]{%
   \bf@bytefieldsetup{#1}%
+  \renewcommand{\baselinestretch}{}%
+  \selectfont
   \def\bits@wide{#2}%
   \let\old@nl=\\%
   \let\amp=&%
diff --git a/Master/texmf-dist/source/latex/bytefield/bytefield.ins b/Master/texmf-dist/source/latex/bytefield/bytefield.ins
index f85ddeb20a4..37197a9ab0c 100644
--- a/Master/texmf-dist/source/latex/bytefield/bytefield.ins
+++ b/Master/texmf-dist/source/latex/bytefield/bytefield.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2015 by Scott Pakin <scott+bf@pakin.org>
+%% Copyright (C) 2017 by Scott Pakin <scott+bf@pakin.org>
 %%
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3a of this license
@@ -21,7 +21,7 @@
 
 This is a generated file.
 
-Copyright (C) 2015 by Scott Pakin <scott+bf@pakin.org>
+Copyright (C) 2017 by Scott Pakin <scott+bf@pakin.org>
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3a of this license
diff --git a/Master/texmf-dist/tex/latex/bytefield/bytefield.sty b/Master/texmf-dist/tex/latex/bytefield/bytefield.sty
index 9086ac5f08e..79972b59f2e 100644
--- a/Master/texmf-dist/tex/latex/bytefield/bytefield.sty
+++ b/Master/texmf-dist/tex/latex/bytefield/bytefield.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2015 by Scott Pakin <scott+bf@pakin.org>
+%% Copyright (C) 2017 by Scott Pakin <scott+bf@pakin.org>
 %% 
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3a of this license
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{bytefield}
-    [2015/10/28 v2.3 Network protocol diagrams]
+    [2017/09/15 v2.4 Network protocol diagrams]
 \RequirePackage{calc}[1998/07/07]
 \RequirePackage{keyval}
 \def\bf@newdimen#1{\advance\count11 by 1
@@ -50,6 +50,8 @@
 \newsavebox{\entire@bytefield@picture}
 \newenvironment{bytefield}[2][]{%
   \bf@bytefieldsetup{#1}%
+  \renewcommand{\baselinestretch}{}%
+  \selectfont
   \def\bits@wide{#2}%
   \let\old@nl=\\%
   \let\amp=&%