diff --git a/t/digestion/dollar.pdf b/t/digestion/dollar.pdf
index ea164f842..21a9d1eec 100644
Binary files a/t/digestion/dollar.pdf and b/t/digestion/dollar.pdf differ
diff --git a/t/digestion/dollar.tex b/t/digestion/dollar.tex
index 36a39cc15..fbb05a6f9 100644
--- a/t/digestion/dollar.tex
+++ b/t/digestion/dollar.tex
@@ -8,6 +8,18 @@
 Footnote\footnote{text $math$ text}
 Another\footnote{text $$displayedmath$$ text}
 
+\begin{minipage}{3in}
+text $$displaymath$$ text
+\end{minipage}
+
+\hbox{\begin{minipage}{3in}
+text $$displaymath$$ text
+\end{minipage}}
+
+\parbox{3in}{text $$displaymath$$ text}
+
+\hbox{\parbox{3in}{text $$displaymath$$ text}}
+
 Note that dollar inside equation, etc.~fails.
 % \[ math {\rm $text$ } math \]
 
diff --git a/t/digestion/dollar.xml b/t/digestion/dollar.xml
index 90677f8d4..0a53fcc25 100644
--- a/t/digestion/dollar.xml
+++ b/t/digestion/dollar.xml
@@ -63,11 +63,115 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
           </Math>
         </equation> text</note></p>
   </para>
-  <para xml:id="p4">
-    <p>Note that dollar inside equation, etc. fails.</p>
+  <para class="ltx_minipage" vattach="middle" width="216.8pt" xml:id="p4">
+    <p>text</p>
+    <equation xml:id="S0.Ex2">
+      <Math mode="display" tex="displaymath" text="d * i * s * p * l * a * y * m * a * t * h" xml:id="S0.Ex2.m1">
+        <XMath>
+          <XMApp>
+            <XMTok meaning="times" role="MULOP">⁢</XMTok>
+            <XMTok font="italic" role="UNKNOWN">d</XMTok>
+            <XMTok font="italic" role="UNKNOWN">i</XMTok>
+            <XMTok font="italic" role="UNKNOWN">s</XMTok>
+            <XMTok font="italic" role="UNKNOWN">p</XMTok>
+            <XMTok font="italic" role="UNKNOWN">l</XMTok>
+            <XMTok font="italic" role="UNKNOWN">a</XMTok>
+            <XMTok font="italic" role="UNKNOWN">y</XMTok>
+            <XMTok font="italic" role="UNKNOWN">m</XMTok>
+            <XMTok font="italic" role="UNKNOWN">a</XMTok>
+            <XMTok font="italic" role="UNKNOWN">t</XMTok>
+            <XMTok font="italic" role="UNKNOWN">h</XMTok>
+          </XMApp>
+        </XMath>
+      </Math>
+    </equation>
+    <p>text</p>
   </para>
   <para xml:id="p5">
-    <p>text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="p5.m1">
+    <p><inline-para class="ltx_minipage" vattach="middle" width="216.8pt">
+        <para xml:id="p5.p1">
+          <p>text</p>
+          <equation xml:id="S0.Ex3">
+            <Math mode="display" tex="displaymath" text="d * i * s * p * l * a * y * m * a * t * h" xml:id="S0.Ex3.m1">
+              <XMath>
+                <XMApp>
+                  <XMTok meaning="times" role="MULOP">⁢</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">d</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">i</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">s</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">p</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">l</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">a</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">y</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">m</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">a</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">t</XMTok>
+                  <XMTok font="italic" role="UNKNOWN">h</XMTok>
+                </XMApp>
+              </XMath>
+            </Math>
+          </equation>
+          <p>text</p>
+        </para>
+      </inline-para></p>
+  </para>
+  <para xml:id="p6">
+    <inline-block class="ltx_parbox" vattach="middle" width="216.8pt">
+      <p>text</p>
+      <equation xml:id="S0.Ex4">
+        <Math mode="display" tex="displaymath" text="d * i * s * p * l * a * y * m * a * t * h" xml:id="S0.Ex4.m1">
+          <XMath>
+            <XMApp>
+              <XMTok meaning="times" role="MULOP">⁢</XMTok>
+              <XMTok font="italic" role="UNKNOWN">d</XMTok>
+              <XMTok font="italic" role="UNKNOWN">i</XMTok>
+              <XMTok font="italic" role="UNKNOWN">s</XMTok>
+              <XMTok font="italic" role="UNKNOWN">p</XMTok>
+              <XMTok font="italic" role="UNKNOWN">l</XMTok>
+              <XMTok font="italic" role="UNKNOWN">a</XMTok>
+              <XMTok font="italic" role="UNKNOWN">y</XMTok>
+              <XMTok font="italic" role="UNKNOWN">m</XMTok>
+              <XMTok font="italic" role="UNKNOWN">a</XMTok>
+              <XMTok font="italic" role="UNKNOWN">t</XMTok>
+              <XMTok font="italic" role="UNKNOWN">h</XMTok>
+            </XMApp>
+          </XMath>
+        </Math>
+      </equation>
+      <p>text</p>
+    </inline-block>
+  </para>
+  <para xml:id="p7">
+    <p><inline-block class="ltx_parbox" vattach="middle" width="216.8pt">
+        <p>text</p>
+        <equation xml:id="S0.Ex5">
+          <Math mode="display" tex="displaymath" text="d * i * s * p * l * a * y * m * a * t * h" xml:id="S0.Ex5.m1">
+            <XMath>
+              <XMApp>
+                <XMTok meaning="times" role="MULOP">⁢</XMTok>
+                <XMTok font="italic" role="UNKNOWN">d</XMTok>
+                <XMTok font="italic" role="UNKNOWN">i</XMTok>
+                <XMTok font="italic" role="UNKNOWN">s</XMTok>
+                <XMTok font="italic" role="UNKNOWN">p</XMTok>
+                <XMTok font="italic" role="UNKNOWN">l</XMTok>
+                <XMTok font="italic" role="UNKNOWN">a</XMTok>
+                <XMTok font="italic" role="UNKNOWN">y</XMTok>
+                <XMTok font="italic" role="UNKNOWN">m</XMTok>
+                <XMTok font="italic" role="UNKNOWN">a</XMTok>
+                <XMTok font="italic" role="UNKNOWN">t</XMTok>
+                <XMTok font="italic" role="UNKNOWN">h</XMTok>
+              </XMApp>
+            </XMath>
+          </Math>
+        </equation>
+        <p>text</p>
+      </inline-block></p>
+  </para>
+  <para xml:id="p8">
+    <p>Note that dollar inside equation, etc. fails.</p>
+  </para>
+  <para xml:id="p9">
+    <p>text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="p9.m1">
         <XMath>
           <XMApp>
             <XMTok meaning="times" role="MULOP">⁢</XMTok>
@@ -79,17 +183,17 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
         </XMath>
       </Math> text</p>
   </para>
-  <para xml:id="p6">
+  <para xml:id="p10">
     <p>text alsotext text</p>
   </para>
-  <para xml:id="p7">
-    <equation xml:id="S0.Ex2">
-      <Math mode="display" tex="a+\mbox{text $math$ text}+c" text="a + [text ⁢math text] + c" xml:id="S0.Ex2.m1">
+  <para xml:id="p11">
+    <equation xml:id="S0.Ex6">
+      <Math mode="display" tex="a+\mbox{text $math$ text}+c" text="a + [text ⁢math text] + c" xml:id="S0.Ex6.m1">
         <XMath>
           <XMApp>
             <XMTok meaning="plus" role="ADDOP">+</XMTok>
             <XMTok font="italic" role="UNKNOWN">a</XMTok>
-            <XMText>text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="S0.Ex2.m1.m1">
+            <XMText>text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="S0.Ex6.m1.m1">
                 <XMath>
                   <XMApp>
                     <XMTok meaning="times" role="MULOP">⁢</XMTok>
@@ -106,9 +210,9 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
       </Math>
     </equation>
   </para>
-  <para xml:id="p8">
-    <equation xml:id="S0.Ex3">
-      <Math mode="display" tex="a+\mbox{text $$alsotext$$ text}+c" text="a + [text alsotext text] + c" xml:id="S0.Ex3.m1">
+  <para xml:id="p12">
+    <equation xml:id="S0.Ex7">
+      <Math mode="display" tex="a+\mbox{text $$alsotext$$ text}+c" text="a + [text alsotext text] + c" xml:id="S0.Ex7.m1">
         <XMath>
           <XMApp>
             <XMTok meaning="plus" role="ADDOP">+</XMTok>
@@ -120,14 +224,14 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
       </Math>
     </equation>
   </para>
-  <para xml:id="p9">
-    <equation xml:id="S0.Ex4">
-      <Math mode="display" tex="a+\makebox{text $math$ text}+c" text="a + [text ⁢math text] + c" xml:id="S0.Ex4.m1">
+  <para xml:id="p13">
+    <equation xml:id="S0.Ex8">
+      <Math mode="display" tex="a+\makebox{text $math$ text}+c" text="a + [text ⁢math text] + c" xml:id="S0.Ex8.m1">
         <XMath>
           <XMApp>
             <XMTok meaning="plus" role="ADDOP">+</XMTok>
             <XMTok font="italic" role="UNKNOWN">a</XMTok>
-            <XMText>text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="S0.Ex4.m1.m1">
+            <XMText>text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="S0.Ex8.m1.m1">
                 <XMath>
                   <XMApp>
                     <XMTok meaning="times" role="MULOP">⁢</XMTok>
@@ -144,9 +248,9 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
       </Math>
     </equation>
   </para>
-  <para xml:id="p10">
-    <equation xml:id="S0.Ex5">
-      <Math mode="display" tex="a+\makebox{text $$alsotext$$ text}+c" text="a + [text alsotext text] + c" xml:id="S0.Ex5.m1">
+  <para xml:id="p14">
+    <equation xml:id="S0.Ex9">
+      <Math mode="display" tex="a+\makebox{text $$alsotext$$ text}+c" text="a + [text alsotext text] + c" xml:id="S0.Ex9.m1">
         <XMath>
           <XMApp>
             <XMTok meaning="plus" role="ADDOP">+</XMTok>
@@ -158,8 +262,8 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
       </Math>
     </equation>
   </para>
-  <para xml:id="p11">
-    <p>Base<text yoffset="10.0pt">text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="p11.m1">
+  <para xml:id="p15">
+    <p>Base<text yoffset="10.0pt">text <Math mode="inline" tex="math" text="m * a * t * h" xml:id="p15.m1">
           <XMath>
             <XMApp>
               <XMTok meaning="times" role="MULOP">⁢</XMTok>
@@ -171,13 +275,13 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
           </XMath>
         </Math> text</text></p>
   </para>
-  <para xml:id="p12">
+  <para xml:id="p16">
     <p>Base<text yoffset="10.0pt">text alsotext text</text></p>
   </para>
-  <para xml:id="p13">
+  <para xml:id="p17">
     <p>Base<inline-block>
         <p>text</p>
-        <p><Math mode="inline" tex="math" text="m * a * t * h" xml:id="p13.m1">
+        <p><Math mode="inline" tex="math" text="m * a * t * h" xml:id="p17.m1">
             <XMath>
               <XMApp>
                 <XMTok meaning="times" role="MULOP">⁢</XMTok>
@@ -191,7 +295,7 @@ Another<note mark="2" role="footnote" xml:id="footnote2"><tags>
         <p>text</p>
       </inline-block></p>
   </para>
-  <para xml:id="p14">
+  <para xml:id="p18">
     <p>Base<inline-block>
         <p>text</p>
         <p>alsotext</p>