diff --git a/modules/basic-page-elements.xml b/modules/basic-page-elements.xml
index 1d237d1..ad571e4 100644
--- a/modules/basic-page-elements.xml
+++ b/modules/basic-page-elements.xml
@@ -32,32 +32,32 @@
 			<xsl:call-template name="newline-internal" />
 			<xsl:call-template name="newline-internal" />
 			<xsl:choose>
-				<xsl:when test="(@align = 'left') or (@align = 'right')">
+				<xsl:when test="@align = ('left', 'right')">
 					<xsl:text>\begin{flush</xsl:text>
 					<xsl:value-of select="@align" />
 					<xsl:text>}</xsl:text>
 				</xsl:when>
-				<xsl:when test="@align = 'center'">
+				<xsl:when test="@align = ('center', 'centre')">
 					<xsl:text>\begin{center}</xsl:text>
 				</xsl:when>
 			</xsl:choose>
-			<xsl:if test="@indent = 'no'">
+			<xsl:if test="@indent = ('no', 'n', 'false', 'f', '0')">
 				<xsl:text>\noindent </xsl:text>
 			</xsl:if>
-			<xsl:if test="@border = 'yes'">
+			<xsl:if test="@border = ('yes', 'y')">
 				<xsl:text>\fbox{\parbox[t]{\textwidth}{</xsl:text>
 			</xsl:if>
 			<xsl:apply-templates />
-			<xsl:if test="@border = 'yes'">
+			<xsl:if test="@border = ('yes', 'y')">
 				<xsl:text>}}</xsl:text>
 			</xsl:if>
 			<xsl:choose>
-				<xsl:when test="(@align = 'left') or (@align = 'right')">
+				<xsl:when test="@align = ('left', 'right')">
 					<xsl:text>\end{flush</xsl:text>
 					<xsl:value-of select="@align" />
 					<xsl:text>}</xsl:text>
 				</xsl:when>
-				<xsl:when test="@align = 'center'">
+				<xsl:when test="@align = ('center', 'centre')">
 					<xsl:text>\end{center}</xsl:text>
 				</xsl:when>
 			</xsl:choose>
@@ -73,7 +73,7 @@
 			-->
 			<xsl:param name="HTMLStyle" />
 			<p>
-				<xsl:if test="@border = 'yes'">
+                <xsl:if test="@border = ('yes', 'y')">
 					<xsl:attribute name="style">border: 1px solid black;</xsl:attribute>
 				</xsl:if>
 				<xsl:if test="$HTMLStyle">
@@ -149,11 +149,11 @@
 	<template name="page-break" match="page-break|new-page|newpage|pagebreak">
 		<common formats="/latex/xelatex/">
             <xsl:variable name="insert" select="
-                if ((name(..) = 'answer') and ($showanswers = 'no')) then false()
-                else if ((name(..) = 'question') and ($showanswers = 'yes')) then false()
+                if ((name(..) eq 'answer') and ($showanswers = ('no', 'n', 'false', 'f', '0'))) then false()
+                else if ((name(..) eq 'question') and ($showanswers = ('yes', 'y', 'true', 't', '1'))) then false()
                 else true()" />
             <xsl:if test="$insert">
-                <xsl:if test="@print-caption = 'yes'">
+                <xsl:if test="@print-caption = ('yes', 'y', 'true', 't', '1')">
                     <xsl:text>\begin{flushright}</xsl:text>
                     <xsl:call-template name="newline-internal" />
                     <xsl:text>\emph{</xsl:text>