diff --git a/format-master.xml b/format-master.xml
index ee708f5..67d1c90 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -236,22 +236,40 @@
 	<template name="code-block" match="code-block">
 		<latex>
 			<xsl:call-template name="newline-internal"/>
+			<!-- If the code-block specifies "allow-breaks='no'", wrap the verbatim inside a minipage to avoid page breaks within the code. -->
+			<!-- <xsl:apply-templates select="@allow-breaks"/> -->
+			<xsl:if test="@allow-breaks = 'no'">
+				<xsl:text>\begin{minipage}{\textwidth}</xsl:text>
+				<!-- not sure if this is strictly necessary now... -->
+				<!--
+				<xsl:call-template name="newline-internal"/>
+				<xsl:text>\setlength{\parskip}{0pt}</xsl:text>
+				-->
+				<xsl:call-template name="newline-internal"/>
+			</xsl:if>
 			<xsl:text>\begin{verbatim}</xsl:text>
-				<xsl:apply-templates/>
-				<xsl:text>\end{verbatim}</xsl:text>
+			<xsl:apply-templates/>
+			<xsl:text>\end{verbatim}</xsl:text>
 			<xsl:call-template name="newline-internal"/>
+			<xsl:if test="@allow-breaks = 'no'">
+				<xsl:text>\end{minipage}</xsl:text>
+				<xsl:call-template name="newline-internal"/>
+			</xsl:if>
 		</latex>
 		<html>
 			<PRE CLASS="code"><xsl:apply-templates/></PRE>
 		</html>
 	</template>
 
-	<!-- This is for stuff that should unequivocally be treated verbatim (e.g. problem code). -->
+	<!--
+		This is for stuff that should unequivocally be treated verbatim (e.g. problem code).
+		I'm pretty sure that previously this was distinguished from "code-block" because it (code-block) used to use listings instead of verbatim.  Now that they're both using verbatim there is probably no need for them both (but we might switch back to using listings for code-block).
+	-->
 	<template name="verbatim" match="verbatim">
 		<latex>
 			<xsl:call-template name="newline-internal"/>
 			<xsl:text>\begin{verbatim}</xsl:text>
-				<xsl:apply-templates/>
+			<xsl:apply-templates/>
 			<xsl:text>\end{verbatim}</xsl:text>
 			<xsl:call-template name="newline-internal"/>
 		</latex>
