Index: mpi-sys-macs.tex
===================================================================
--- mpi-sys-macs.tex	(revision 834)
+++ mpi-sys-macs.tex	(working copy)
@@ -25,7 +25,14 @@
 % For publisher's additions in the printed book
 \newif\ifbookprinting
 \bookprintingfalse
+% Provide a way to indicate whether the text is within a float (such as a
+% table); this is necessary to avoid problems with lost floats.  Use this
+% for macros that use the \ticket command (such as the MPIupdate, MPIreplace,
+% or MPIdelete macros) within table for figure environments.
+\newif\ifinfloat
+\infloatfalse
 
+
 %
 % There are a number of features that are controlled by LaTeX if commands.
 % This step allows you to control these through a configuration file
@@ -158,7 +165,7 @@
 \def\ticket#1{\relax}
 \else
 \ifshowtickets
-\def\ticket#1{\ifinner[ticket#1.]\else\protect\marginpar[\mbox{\hbox to \marginparwidth{\hss ticket#1.\hspace{30pt}}}]{\hbox to \marginparwidth{\hspace{30pt}ticket#1.\hss}}\fi}
+\def\ticket#1{\ifinfloat[ticket#1.]\else\ifinner[ticket#1.]\else\protect\marginpar[\mbox{\hbox to \marginparwidth{\hss ticket#1.\hspace{30pt}}}]{\hbox to \marginparwidth{\hspace{30pt}ticket#1.\hss}}\fi\fi}
 \else
 \def\ticket#1{\relax}
 \fi % showtickets
Index: chap-datatypes/datatypes.tex
===================================================================
--- chap-datatypes/datatypes.tex	(revision 834)
+++ chap-datatypes/datatypes.tex	(working copy)
@@ -2236,6 +2236,7 @@
 right.
 
 \begin{table}[ht]
+\infloattrue
 \begin{center} 
 \begin{constlist}
 \constitem{MPI\_COMBINER\_NAMED}{a named predefined datatype}
@@ -2283,6 +2284,7 @@
 \mpiarg{combiner} values returned from \mpiskipfunc{MPI\_TYPE\_GET\_ENVELOPE}
 } 
 \label{table:ei:combiner}
+\infloatfalse
 \end{table} 
 
 If \mpiarg{combiner} is \const{MPI\_COMBINER\_NAMED} then \mpiarg{datatype} is a