Changes templates from <% %> to <?lsmb ?>

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@141 4979c152-3d1c-0410-bac9-87ea11338e46

34 files changed, 1789 insertions, 1789 deletions

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 2ef55b7a..9e2eeb3a 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -560,31 +560,31 @@ sub parse_template {
 	}
 
 	# first we generate a tmpfile
-	# read file and replace <%variable%>
+	# read file and replace <?lsmb variable ?>
 	while ($_ = shift) {
 
 		$par = "";
 		$var = $_;
 
 		# detect pagebreak block and its parameters
-		if (/<%pagebreak ([0-9]+) ([0-9]+) ([0-9]+)%>/) {
+		if (/<\?lsmb pagebreak ([0-9]+) ([0-9]+) ([0-9]+) \?>/) {
 			$chars_per_line = $1;
 			$lines_on_first_page = $2;
 			$lines_on_second_page = $3;
 
 			while ($_ = shift) {
-				last if (/<%end pagebreak%>/);
+				last if (/<\?lsmb end pagebreak \?>/);
 				$pagebreak .= $_;
 			}
 		}
 
-		if (/<%foreach /) {
+		if (/<\?lsmb foreach /) {
 
 			# this one we need for the count
 			chomp $var;
-			$var =~ s/.*?<%foreach (.+?)%>/$1/;
+			$var =~ s/.*?<\?lsmb foreach (.+?) \?>/$1/;
 			while ($_ = shift) {
-				last if (/<%end $var%>/);
+				last if (/<\?lsmb end $var \?>/);
 
 				# store line in $par
 				$par .= $_;
@@ -598,7 +598,7 @@ sub parse_template {
 				}
 
 				# Try to detect whether a manual page break is necessary
-				# but only if there was a <%pagebreak ...%> block before
+				# but only if there was a <?lsmb pagebreak ... ?> block before
 
 				if ($var eq 'number' || $var eq 'part' || $var eq 'service') {
 
@@ -632,15 +632,15 @@ sub parse_template {
 						if (($current_line + $lines) > $lpp) {
 							my $pb = $pagebreak;
 
-							# replace the special variables <%sumcarriedforward%>
-							# and <%lastpage%>
+							# replace the special variables <?lsmb sumcarriedforward ?>
+							# and <?lsmb lastpage ?>
 							my $psum = $self->format_amount($myconfig, $sum, 2);
-							$pb =~ s/<%sumcarriedforward%>/$psum/g;
-							$pb =~ s/<%lastpage%>/$current_page/g;
+							$pb =~ s/<\?lsmb sumcarriedforward \?>/$psum/g;
+							$pb =~ s/<\?lsmb lastpage \?>/$current_page/g;
 
 							# only "normal" variables are supported here
-							# (no <%if, no <%foreach, no <%include)
-							$pb =~ s/<%(.+?)%>/$self->{$1}/g;
+							# (no <?lsmb if, no <?lsmb foreach, no <?lsmb include)
+							$pb =~ s/<\?lsmb (.+?) \?>/$self->{$1}/g;
 
 							# page break block is ready to rock
 							print(OUT $pb);
@@ -662,16 +662,16 @@ sub parse_template {
 		}
 
 		# if not comes before if!
-		if (/<%if not /) {
+		if (/<\?lsmb if not /) {
 
 			# check if it is not set and display
 			chop;
-			s/.*?<%if not (.+?)%>/$1/;
+			s/.*?<\?lsmb if not (.+?) \?>/$1/;
 
 			if (! $self->{$_}) {
 
 				while ($_ = shift) {
-					last if (/<%end /);
+					last if (/<\?lsmb end /);
 
 					# store line in $par
 					$par .= $_;
@@ -682,18 +682,18 @@ sub parse_template {
 			} else {
 
 				while ($_ = shift) {
-					last if (/<%end /);
+					last if (/<\?lsmb end /);
 				}
 
 				next;
 			}
 		}
 
-		if (/<%if /) {
+		if (/<\? lsmb if /) {
 
 			# check if it is set and display
 			chop;
-			s/.*?<%if (.+?)%>/$1/;
+			s/.*?<\?lsmb if (.+?) \?>/$1/;
 
 			if (/\s/) {
 				@a = split;
@@ -704,7 +704,7 @@ sub parse_template {
 
 			if ($ok) {
 				while ($_ = shift) {
-					last if (/<%end /);
+					last if (/<\?lsmb end /);
 					# store line in $par
 					$par .= $_;
 				}
@@ -714,19 +714,19 @@ sub parse_template {
 			} else {
 
 				while ($_ = shift) {
-					last if (/<%end /);
+					last if (/<\?lsmb end /);
 				}
 
 				next;
 			}
 		}
 
-		# check for <%include filename%>
-		if (/<%include /) {
+		# check for <?lsmb include filename ?>
+		if (/<\?lsmb include /) {
 
 			# get the filename
 			chomp $var;
-			$var =~ s/.*?<%include (.+?)%>/$1/;
+			$var =~ s/.*?<\?lsmb include (.+?) \?>/$1/;
 
 			# remove / .. for security reasons
 			$var =~ s/(\/|\.\.)//g;
@@ -936,7 +936,7 @@ sub format_line {
 	my $pad;
 	my $item;
 
-	while (/<%(.+?)%>/) {
+	while (/<\?lsmb (.+?) \?>/) {
 
 		%a = ();
 
@@ -961,10 +961,10 @@ sub format_line {
 			if ($str) {
 
 				$var =~ s/if\s+not\s+//;
-				s/<%if\s+not\s+$var%>.*?(<%end\s+$var%>|$)//s;
+				s/<\?lsmb if\s+not\s+$var \?>.*?(<\?lsmb end\s+$var \?>|$)//s;
 
 			} else {
-				s/<%$var%>//;
+				s/<\?lsmb $var \?>//;
 			}
 
 			next;
@@ -973,17 +973,17 @@ sub format_line {
 		if ($var =~ /^if\s+/) {
 
 			if ($str) {
-				s/<%$var%>//;
+				s/<\?lsmb $var \?>//;
 			} else {
 				$var =~ s/if\s+//;
-				s/<%if\s+$var%>.*?(<%end\s+$var%>|$)//s;
+				s/<\?lsmb if\s+$var \?>.*?(<\?lsmb end\s+$var \?>|$)//s;
 			}
 
 			next;
 		}
 
 		if ($var =~ /^end\s+/) {
-			s/<%$var%>//;
+			s/<\?lsmb $var \?>//;
 			next;
 		}
 
@@ -1043,7 +1043,7 @@ sub format_line {
 			}
 		}
 
-		s/<%(.+?)%>/$newstr/;
+		s/<\?lsmb (.+?) \?>/$newstr/;
 
 	}
 
@@ -2581,104 +2581,104 @@ sub update_defaults {
 	$_ = "0" unless $_;
 
 	# check for and replace
-	# <%DATE%>, <%YYMMDD%>, <%YEAR%>, <%MONTH%>, <%DAY%> or variations of
-	# <%NAME 1 1 3%>, <%BUSINESS%>, <%BUSINESS 10%>, <%CURR...%>
-	# <%DESCRIPTION 1 1 3%>, <%ITEM 1 1 3%>, <%PARTSGROUP 1 1 3%> only for parts
-	# <%PHONE%> for customer and vendors
-
-	my $num = $_;
-	$num =~ s/.*?<%.*?%>//g;
-	($num) = $num =~ /(\d+)/;
-
-	if (defined $num) {
-		my $incnum;
-		# if we have leading zeros check how long it is
-
-		if ($num =~ /^0/) {
-			my $l = length $num;
-			$incnum = $num + 1;
-			$l -= length $incnum;
-
-			# pad it out with zeros
-			my $padzero = "0" x $l;
-			$incnum = ("0" x $l) . $incnum;
-		} else {
-			$incnum = $num + 1;
-		}
-
-		s/$num/$incnum/;
-	}
-
-	my $dbvar = $_;
-	my $var = $_;
-	my $str;
-	my $param;
-
-	if (/<%/) {
-
-		while (/<%/) {
-
-			s/<%.*?%>//;
-			last unless $&;
-			$param = $&;
-			$str = "";
-
-			if ($param =~ /<%date%>/i) {
-				$str = ($self->split_date($myconfig->{dateformat}, $self->{transdate}))[0];
-				$var =~ s/$param/$str/;
-			}
-
-			if ($param =~ /<%(name|business|description|item|partsgroup|phone|custom)/i) {
-
-				my $fld = lc $&;
-				$fld =~ s/<%//;
-
-				if ($fld =~ /name/) {
-					if ($self->{type}) {
-						$fld = $self->{vc};
-					}
-				}
-
-				my $p = $param;
-				$p =~ s/(<|>|%)//g;
-				my @p = split / /, $p;
-				my @n = split / /, uc $self->{$fld};
-
-				if ($#p > 0) {
-
-					for (my $i = 1; $i <= $#p; $i++) {
-						$str .= substr($n[$i-1], 0, $p[$i]);
-					}
-
-				} else {
-					($str) = split /--/, $self->{$fld};
-				}
-
-				$var =~ s/$param/$str/;
-				$var =~ s/\W//g if $fld eq 'phone';
-			}
-
-			if ($param =~ /<%(yy|mm|dd)/i) {
-
-				my $p = $param;
-				$p =~ s/(<|>|%)//g;
-				my $spc = $p;
-				$spc =~ s/\w//g;
-				$spc = substr($spc, 0, 1);
-				my %d = ( yy => 1, mm => 2, dd => 3 );
-				my @p = ();
+	# <?lsmb DATE ?>, <?lsmb YYMMDD ?>, <?lsmb YEAR ?>, <?lsmb MONTH ?>, <?lsmb DAY ?> or variations of
+	# <?lsmb NAME 1 1 3 ?>, <?lsmb BUSINESS ?>, <?lsmb BUSINESS 10 ?>, <?lsmb CURR... ?>
+	# <?lsmb DESCRIPTION 1 1 3 ?>, <?lsmb ITEM 1 1 3 ?>, <?lsmb PARTSGROUP 1 1 3 ?> only for parts
+	# <?lsmb PHONE ?> for customer and vendors
+
+	#my $num = $_;
+#	$num =~ s/.*?<\?lsmb\s.*?\?>//g;
+#	($num) = $num =~ /(\d+)/;
+#
+#	if (defined $num) {
+#		my $incnum;
+#		# if we have leading zeros check how long it is
+#
+#		if ($num =~ /^0/) {
+#			my $l = length $num;
+#			$incnum = $num + 1;
+#			$l -= length $incnum;
+#
+#			# pad it out with zeros
+#			my $padzero = "0" x $l;
+#			$incnum = ("0" x $l) . $incnum;
+#		} else {
+#			$incnum = $num + 1;
+#		}
+#
+#		s/$num/$incnum/;
+#	}
+#
+#	my $dbvar = $_;
+#	my $var = $_;
+#	my $str;
+#	my $param;
+#
+#	if (/<\?lsmb /) {
+#
+#		while (/<\?lsmb /) {
+#
+#			s/<\?lsmb .*? ?>//;
+#			last unless $&;
+#			$param = $&;
+#			$str = "";
+#
+#			if ($param =~ /<\?lsmb date ?>/i) {
+#				$str = ($self->split_date($myconfig->{dateformat}, $self->{transdate}))[0];
+#				$var =~ s/$param/$str/;
+#			}
+#
+#			if ($param =~ /<\?lsmb (name|business|description|item|partsgroup|phone|custom)/i) {
 
-				my @a = $self->split_date($myconfig->{dateformat}, $self->{transdate});
-				for (sort keys %d) { push @p, $a[$d{$_}] if ($p =~ /$_/) }
-				$str = join $spc, @p;
-				$var =~ s/$param/$str/;
-			}
+#				my $fld = lc $&;
+#				$fld =~ s/<\?lsmb //;
 
-			if ($param =~ /<%curr/i) {
-				$var =~ s/$param/$self->{currency}/;
-			}
-		}
-	}
+#				if ($fld =~ /name/) {
+#					if ($self->{type}) {
+#						$fld = $self->{vc};
+#					}
+#				}
+#
+#				my $p = $param;
+#				$p =~ s/(<|>|%)//g;
+#				my @p = split / /, $p;
+#				my @n = split / /, uc $self->{$fld};
+#
+#				if ($#p > 0) {
+#
+#					for (my $i = 1; $i <= $#p; $i++) {
+#						$str .= substr($n[$i-1], 0, $p[$i]);
+#					}
+#
+#				} else {
+#					($str) = split /--/, $self->{$fld};
+#				}
+#
+#				$var =~ s/$param/$str/;
+#				$var =~ s/\W//g if $fld eq 'phone';
+#			}
+#
+#			if ($param =~ /<\?lsmb (yy|mm|dd)/i) {
+#
+#				my $p = $param;
+#				$p =~ s/(<|>|%)//g;
+#				my $spc = $p;
+#				$spc =~ s/\w//g;
+#				$spc = substr($spc, 0, 1);
+#				my %d = ( yy => 1, mm => 2, dd => 3 );
+#				my @p = ();
+#
+#				my @a = $self->split_date($myconfig->{dateformat}, $self->{transdate});
+#				for (sort keys %d) { push @p, $a[$d{$_}] if ($p =~ /$_/) }
+#				$str = join $spc, @p;
+#				$var =~ s/$param/$str/;
+#			}
+#
+#			if ($param =~ /<\?lsmb curr/i) {
+#				$var =~ s/$param/$self->{currency}/;
+#			}
+#		}
+#	}
 
 	$query = qq|UPDATE defaults
 				   SET $fld = '$dbvar'|;
diff --git a/templates/demo/ap_transaction.html b/templates/demo/ap_transaction.html
index 2ab4d5e5..364dcaea 100644
--- a/templates/demo/ap_transaction.html
+++ b/templates/demo/ap_transaction.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,72 +19,72 @@
     <td>
       <table width=100% callspacing=0 cellpadding=0>
         <tr valign=top>
-          <td><%name%>
-          <br><%address1%>
-	  <%if address2%>
-          <br><%address2%>
-	  <%end address2%>
-          <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+          <td><?lsmb name ?>
+          <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+          <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+          <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
 
-          <%if contact%>
-          <br><%contact%>
+          <?lsmb if contact ?>
+          <br><?lsmb contact ?>
           <br>
-          <%end contact%>
+          <?lsmb end contact ?>
 
-          <%if vendorphone%>
-          <br>Tel: <%vendorphone%>
-          <%end vendorphone%>
+          <?lsmb if vendorphone ?>
+          <br>Tel: <?lsmb vendorphone ?>
+          <?lsmb end vendorphone ?>
 
-          <%if vendorfax%>
-          <br>Fax: <%vendorfax%>
-          <%end vendorfax%>
+          <?lsmb if vendorfax ?>
+          <br>Fax: <?lsmb vendorfax ?>
+          <?lsmb end vendorfax ?>
 
-          <%if email%>
-          <br><%email%>
-          <%end email%>
+          <?lsmb if email ?>
+          <br><?lsmb email ?>
+          <?lsmb end email ?>
 
-          <%if vendortaxnumber%>
-          <p>Taxnumber: <%vendortaxnumber%>
-          <%end vendortaxnumber%>
+          <?lsmb if vendortaxnumber ?>
+          <p>Taxnumber: <?lsmb vendortaxnumber ?>
+          <?lsmb end vendortaxnumber ?>
           </td>
    
 	  <td align=right>
 	    <table>
 	      <tr>
 		<th align=left nowrap>Invoice #</th>
-		<td><%invnumber%></td>
+		<td><?lsmb invnumber ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>Date</th>
-		<td><%invdate%></td>
+		<td><?lsmb invdate ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>Due</th>
-		<td><%duedate%></td>
+		<td><?lsmb duedate ?></td>
 	      </tr>
-	      <%if ponumber%>
+	      <?lsmb if ponumber ?>
               <tr>
                 <th align=left>PO #</th>
-		<td><%ponumber%>&nbsp;</td>
+		<td><?lsmb ponumber ?>&nbsp;</td>
 	      </tr>
-	      <%end ponumber%>
-	      <%if ordnumber%>
+	      <?lsmb end ponumber ?>
+	      <?lsmb if ordnumber ?>
 	      <tr>
 		<th align=left>Order #</th>
-		<td><%ordnumber%>&nbsp;</td>
+		<td><?lsmb ordnumber ?>&nbsp;</td>
 	      </tr>
-	      <%end ordnumber%>
+	      <?lsmb end ordnumber ?>
 	      <tr>
 		<th align=left nowrap>Employee</th>
-		<td><%employee%>&nbsp;</td>
+		<td><?lsmb employee ?>&nbsp;</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -100,48 +100,48 @@
   
     <td>
       <table>
-	<%foreach account%>
+	<?lsmb foreach account ?>
 	<tr valign=top>
-	  <td><%accno%></td>
-	  <td><%account%></td>
+	  <td><?lsmb accno ?></td>
+	  <td><?lsmb account ?></td>
 	  <td width=10> </td>
-	  <td align=right><%amount%></td>
+	  <td align=right><?lsmb amount ?></td>
 	  <td width=10> </td>
-	  <td><%description%></td>
+	  <td><?lsmb description ?></td>
 	  <td width=10> </td>
-	  <td><%projectnumber%></td>
+	  <td><?lsmb projectnumber ?></td>
 	</tr>
-	<%end account%>
+	<?lsmb end account ?>
 
 	<tr>
-	  <%if taxincluded%>
+	  <?lsmb if taxincluded ?>
 	  <th colspan=2 align=right>Total</th>
 	  <td width=10> </td>
-	  <td align=right><%invtotal%></td>
-	  <%end taxincluded%>
+	  <td align=right><?lsmb invtotal ?></td>
+	  <?lsmb end taxincluded ?>
 
-	  <%if not taxincluded%>
+	  <?lsmb if not taxincluded ?>
 	  <th colspan=2 align=right>Subtotal</th>
 	  <td width=10> </td>
-	  <td align=right><%subtotal%></td>
-	  <%end taxincluded%>
+	  <td align=right><?lsmb subtotal ?></td>
+	  <?lsmb end taxincluded ?>
 	</tr>
 
-	<%foreach tax%>
+	<?lsmb foreach tax ?>
 	<tr>
-	  <th colspan=2 align=right><%taxdescription%> @ <%taxrate%> %</th>
+	  <th colspan=2 align=right><?lsmb taxdescription ?> @ <?lsmb taxrate ?> %</th>
 	  <td width=10> </td>
-	  <td align=right><%tax%></td>
+	  <td align=right><?lsmb tax ?></td>
 	</tr>
-	<%end tax%>
+	<?lsmb end tax ?>
 	
-	<%if not taxincluded%>
+	<?lsmb if not taxincluded ?>
 	<tr>
 	  <th colspan=2 align=right>Total</th>
 	  <td width=10> </td>
-	  <td align=right><%invtotal%></td>
+	  <td align=right><?lsmb invtotal ?></td>
 	</tr>
-	<%end taxincluded%>
+	<?lsmb end taxincluded ?>
       </table>
     </td>
   </tr>
@@ -150,7 +150,7 @@
     <td>&nbsp;</td>
     
     <td>
-      <%text_amount%> ***** <%decimal%>/100 <%currency%>
+      <?lsmb text_amount ?> ***** <?lsmb decimal ?>/100 <?lsmb currency ?>
     </td>
   </tr>
 
@@ -158,11 +158,11 @@
     <td>&nbsp;</td>
 
     <td>
-      <%notes%>
+      <?lsmb notes ?>
     </td>
   </tr>
 
-  <%if paid_1%>
+  <?lsmb if paid_1 ?>
   <tr>
     <td>&nbsp;</td>
 
@@ -188,30 +188,30 @@
 		<th>Memo</th>
 		<th>Amount</th>
 	      </tr>
-  <%end paid_1%>
+  <?lsmb end paid_1 ?>
 
-        <%foreach payment%>
+        <?lsmb foreach payment ?>
 	      <tr>
-		<td><%paymentdate%></td>
-		<td><%paymentaccount%></td>
-		<td><%paymentsource%></td>
-		<td><%paymentmemo%></td>
-		<td align=right><%payment%></td>
+		<td><?lsmb paymentdate ?></td>
+		<td><?lsmb paymentaccount ?></td>
+		<td><?lsmb paymentsource ?></td>
+		<td><?lsmb paymentmemo ?></td>
+		<td align=right><?lsmb payment ?></td>
 	      </tr>
-        <%end payment%>
+        <?lsmb end payment ?>
 
-  <%if paid_1%>
+  <?lsmb if paid_1 ?>
 	    </table>
 	  </td>
         </tr>
       </table>
     </td>
   </tr>
-  <%end paid_1%>
+  <?lsmb end paid_1 ?>
 
   <tr height=10></tr>
 
-  <%if taxincluded%>
+  <?lsmb if taxincluded ?>
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -219,7 +219,7 @@
   <tr>
     <th colspan=3 align=left><font size=-2>Taxes shown are included in price.</th>
   </tr>
-  <%end taxincluded%>
+  <?lsmb end taxincluded ?>
 
 </table>
 
diff --git a/templates/demo/ap_transaction.tex b/templates/demo/ap_transaction.tex
index 5cd134cc..31edf3ec 100644
--- a/templates/demo/ap_transaction.tex
+++ b/templates/demo/ap_transaction.tex
@@ -12,100 +12,100 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 \centerline{\textbf{A P} \hspace{0.3cm} \textbf{T R A N S A C T I O N}}
 
 \vspace*{0.5cm}
 
 \parbox[t]{.5\textwidth}{
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state>
-\hspace{-0.1cm}, <%state%>
-<%end state%> <%zipcode%>
+<?lsmb city ?>
+<?lsmb if state>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?> <?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
+<?lsmb if vendorphone ?>
+Tel: <?lsmb vendorphone ?>
+<?lsmb end vendorphone ?>
 
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
+<?lsmb if vendorfax ?>
+Fax: <?lsmb vendorfax ?>
+<?lsmb end vendorfax ?>
 
-<%email%>
+<?lsmb email ?>
 
-<%if vendortaxnumber%>
-Tax Number: <%vendortaxnumber%>
-<%end vendortaxnumber%>
+<?lsmb if vendortaxnumber ?>
+Tax Number: <?lsmb vendortaxnumber ?>
+<?lsmb end vendortaxnumber ?>
 }
 \hfill
 \begin{tabular}[t]{ll}
-  \textbf{Invoice \#} & <%invnumber%> \\
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Due} & <%duedate%> \\
-  <%if ponumber%>
-    \textbf{PO \#} & <%ponumber%> \\
-  <%end ponumber%>
-  <%if ordnumber%>
-    \textbf{Order \#} & <%ordnumber%> \\
-  <%end ordnumber%>
-  \textbf{Employee} & <%employee%> \\
+  \textbf{Invoice \#} & <?lsmb invnumber ?> \\
+  \textbf{Date} & <?lsmb invdate ?> \\
+  \textbf{Due} & <?lsmb duedate ?> \\
+  <?lsmb if ponumber ?>
+    \textbf{PO \#} & <?lsmb ponumber ?> \\
+  <?lsmb end ponumber ?>
+  <?lsmb if ordnumber ?>
+    \textbf{Order \#} & <?lsmb ordnumber ?> \\
+  <?lsmb end ordnumber ?>
+  \textbf{Employee} & <?lsmb employee ?> \\
 \end{tabular}
 
 \vspace{1cm}
 
 \begin{tabularx}{\textwidth}[t]{@{}llrX@{\hspace{1cm}}l@{}}
-<%foreach amount%>
-  <%accno%> & <%account%> & <%amount%> & <%description%> & <%projectnumber%> \\
-<%end amount%>
+<?lsmb foreach amount ?>
+  <?lsmb accno ?> & <?lsmb account ?> & <?lsmb amount ?> & <?lsmb description ?> & <?lsmb projectnumber ?> \\
+<?lsmb end amount ?>
 
-  \multicolumn{2}{r}{\textbf{Subtotal}} & <%subtotal%> & \\
-<%foreach tax%>
-  \multicolumn{2}{r}{\textbf{<%taxdescription%> @ <%taxrate%> \%}} & <%tax%> & \\
-<%end tax%>
+  \multicolumn{2}{r}{\textbf{Subtotal}} & <?lsmb subtotal ?> & \\
+<?lsmb foreach tax ?>
+  \multicolumn{2}{r}{\textbf{<?lsmb taxdescription ?> @ <?lsmb taxrate ?> \%}} & <?lsmb tax ?> & \\
+<?lsmb end tax ?>
 
-  \multicolumn{2}{r}{\textbf{Total}} & <%invtotal%> & \\
+  \multicolumn{2}{r}{\textbf{Total}} & <?lsmb invtotal ?> & \\
   
 \end{tabularx}
 
 \vspace{0.3cm}
 
-<%text_amount%> ***** <%decimal%>/100 <%currency%>
+<?lsmb text_amount ?> ***** <?lsmb decimal ?>/100 <?lsmb currency ?>
 
-<%if notes%>
+<?lsmb if notes ?>
 \vspace{0.3cm}
-<%notes%>
-<%end notes%>
+<?lsmb notes ?>
+<?lsmb end notes ?>
 
 \vspace{0.3cm}
 
-<%if paid_1%>
+<?lsmb if paid_1 ?>
 \begin{tabular}{@{}llllr@{}}
   \multicolumn{5}{c}{\textbf{Payments}} \\
   \hline
   \textbf{Date} & & \textbf{Source} & \textbf{Memo} & \textbf{Amount} \\
-<%end paid_1%>
-<%foreach payment%>
-  <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%paymentmemo%> & <%payment%> \\
-<%end payment%>
-<%if paid_1%>
+<?lsmb end paid_1 ?>
+<?lsmb foreach payment ?>
+  <?lsmb paymentdate ?> & <?lsmb paymentaccount ?> & <?lsmb paymentsource ?> & <?lsmb paymentmemo ?> & <?lsmb payment ?> \\
+<?lsmb end payment ?>
+<?lsmb if paid_1 ?>
 \end{tabular}
-<%end paid_1%>
+<?lsmb end paid_1 ?>
 
 \end{document}
 
diff --git a/templates/demo/ar_transaction.html b/templates/demo/ar_transaction.html
index f8b8e95e..8422609f 100644
--- a/templates/demo/ar_transaction.html
+++ b/templates/demo/ar_transaction.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
 
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,72 +19,72 @@
     <td>
       <table width=100% callspacing=0 cellpadding=0>
         <tr valign=top>
-          <td><%name%>
-          <br><%address1%>
-	  <%if address2%>
-          <br><%address2%>
-	  <%end address2%>
-          <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+          <td><?lsmb name ?>
+          <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+          <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+          <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
 
-          <%if contact%>
-          <br><%contact%>
+          <?lsmb if contact ?>
+          <br><?lsmb contact ?>
           <br>
-          <%end contact%>
+          <?lsmb end contact ?>
 
-          <%if customerphone%>
-          <br>Tel: <%customerphone%>
-          <%end customerphone%>
+          <?lsmb if customerphone ?>
+          <br>Tel: <?lsmb customerphone ?>
+          <?lsmb end customerphone ?>
 
-          <%if customerfax%>
-          <br>Fax: <%customerfax%>
-          <%end customerfax%>
+          <?lsmb if customerfax ?>
+          <br>Fax: <?lsmb customerfax ?>
+          <?lsmb end customerfax ?>
 
-          <%if email%>
-          <br><%email%>
-          <%end email%>
+          <?lsmb if email ?>
+          <br><?lsmb email ?>
+          <?lsmb end email ?>
 
-          <%if customertaxnumber%>
-          <br>Taxnumber: <%customertaxnumber%>
-          <%end customertaxnumber%>
+          <?lsmb if customertaxnumber ?>
+          <br>Taxnumber: <?lsmb customertaxnumber ?>
+          <?lsmb end customertaxnumber ?>
           </td>
    
 	  <td align=right>
 	    <table>
 	      <tr>
 		<th align=left nowrap>Invoice #</th>
-		<td><%invnumber%></td>
+		<td><?lsmb invnumber ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>Date</th>
-		<td><%invdate%></td>
+		<td><?lsmb invdate ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>Due</th>
-		<td><%duedate%></td>
+		<td><?lsmb duedate ?></td>
 	      </tr>
-	      <%if ponumber%>
+	      <?lsmb if ponumber ?>
               <tr>
                 <th align=left>PO #</th>
-		<td><%ponumber%>&nbsp;</td>
+		<td><?lsmb ponumber ?>&nbsp;</td>
 	      </tr>
-	      <%end ponumber%>
-	      <%if ordnumber%>
+	      <?lsmb end ponumber ?>
+	      <?lsmb if ordnumber ?>
 	      <tr>
 		<th align=left>Order #</th>
-		<td><%ordnumber%>&nbsp;</td>
+		<td><?lsmb ordnumber ?>&nbsp;</td>
 	      </tr>
-	      <%end ordnumber%>
+	      <?lsmb end ordnumber ?>
 	      <tr>
 		<th align=left nowrap>Salesperson</th>
-		<td><%employee%>&nbsp;</td>
+		<td><?lsmb employee ?>&nbsp;</td>
 	      </tr>
 	    </table>
 	  </td>
@@ -100,48 +100,48 @@
   
     <td>
       <table>
-	<%foreach account%>
+	<?lsmb foreach account ?>
 	<tr valign=top>
-	  <td><%accno%></td>
-	  <td><%account%></td>
+	  <td><?lsmb accno ?></td>
+	  <td><?lsmb account ?></td>
 	  <td width=10>&nbsp</td>
-	  <td align=right><%amount%></td>
+	  <td align=right><?lsmb amount ?></td>
 	  <td width=10>&nbsp</td>
-	  <td><%description%></td>
+	  <td><?lsmb description ?></td>
 	  <td width=10>&nbsp</td>
-	  <td><%projectnumber%></td>
+	  <td><?lsmb projectnumber ?></td>
 	</tr>
-	<%end account%>
+	<?lsmb end account ?>
 
 	<tr>
-	  <%if taxincluded%>
+	  <?lsmb if taxincluded ?>
 	  <th colspan=2 align=right>Total</th>
 	  <td width=10>&nbsp</td>
-	  <td align=right><%invtotal%></td>
-	  <%end taxincluded%>
+	  <td align=right><?lsmb invtotal ?></td>
+	  <?lsmb end taxincluded ?>
 
-	  <%if not taxincluded%>
+	  <?lsmb if not taxincluded ?>
 	  <th colspan=2 align=right>Subtotal</th>
 	  <td width=10>&nbsp</td>
-	  <td align=right><%subtotal%></td>
-	  <%end taxincluded%>
+	  <td align=right><?lsmb subtotal ?></td>
+	  <?lsmb end taxincluded ?>
 	</tr>
 
-	<%foreach tax%>
+	<?lsmb foreach tax ?>
 	<tr>
-	  <th colspan=2 align=right><%taxdescription%> @ <%taxrate%> %</th>
+	  <th colspan=2 align=right><?lsmb taxdescription ?> @ <?lsmb taxrate ?> %</th>
 	  <td width=10>&nbsp</td>
-	  <td align=right><%tax%></td>
+	  <td align=right><?lsmb tax ?></td>
 	</tr>
-	<%end tax%>
+	<?lsmb end tax ?>
 	
-	<%if not taxincluded%>
+	<?lsmb if not taxincluded ?>
 	<tr>
 	  <th colspan=2 align=right>Total</th>
 	  <td width=10>&nbsp</td>
-	  <td align=right><%invtotal%></td>
+	  <td align=right><?lsmb invtotal ?></td>
 	</tr>
-	<%end taxincluded%>
+	<?lsmb end taxincluded ?>
       </table>
     </td>
   </tr>
@@ -150,7 +150,7 @@
     <td>&nbsp;</td>
 
     <td>
-      <%text_amount%> ***** <%decimal%>/100 <%currency%>
+      <?lsmb text_amount ?> ***** <?lsmb decimal ?>/100 <?lsmb currency ?>
     </td>
   </tr>
 
@@ -158,11 +158,11 @@
     <td>&nbsp;</td>
 
     <td>
-      <%notes%>
+      <?lsmb notes ?>
     </td>
   </tr>
 
-  <%if paid_1%>
+  <?lsmb if paid_1 ?>
   <tr>
     <td>&nbsp;</td>
 
@@ -187,37 +187,37 @@
 		<th>Source</th>
 		<th>Amount</th>
 	      </tr>
-  <%end paid_1%>
+  <?lsmb end paid_1 ?>
 
-        <%foreach payment%>
+        <?lsmb foreach payment ?>
 	      <tr>
-		<td><%paymentdate%></td>
-		<td><%paymentaccount%></td>
-		<td><%paymentsource%></td>
-		<td align=right><%payment%></td>
+		<td><?lsmb paymentdate ?></td>
+		<td><?lsmb paymentaccount ?></td>
+		<td><?lsmb paymentsource ?></td>
+		<td align=right><?lsmb payment ?></td>
 	      </tr>
-        <%end payment%>
+        <?lsmb end payment ?>
 
-  <%if paid_1%>
+  <?lsmb if paid_1 ?>
 	    </table>
 	  </td>
         </tr>
       </table>
     </td>
   </tr>
-  <%end paid_1%>
+  <?lsmb end paid_1 ?>
 
   <tr height=10></tr>
 
-  <%foreach tax%>
+  <?lsmb foreach tax ?>
   <tr>
     <td>&nbsp;</td>
 
-    <th colspan=9 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
+    <th colspan=9 align=left><font size=-2><?lsmb taxdescription ?> Registration <?lsmb taxnumber ?></th>
   </tr>
-  <%end tax%>
+  <?lsmb end tax ?>
 
-  <%if taxincluded%>
+  <?lsmb if taxincluded ?>
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -225,7 +225,7 @@
   <tr>
     <th colspan=3 align=left><font size=-2>Taxes shown are included in price.</th>
   </tr>
-  <%end taxincluded%>
+  <?lsmb end taxincluded ?>
 
 </table>
 
diff --git a/templates/demo/ar_transaction.tex b/templates/demo/ar_transaction.tex
index 31e20fdb..ea55c19e 100644
--- a/templates/demo/ar_transaction.tex
+++ b/templates/demo/ar_transaction.tex
@@ -13,16 +13,16 @@
 
 \parbox{\textwidth}{%
   \parbox[b]{.42\textwidth}{%
-    <%company%>
+    <?lsmb company ?>
    
-    <%address%>
+    <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
     \includegraphics[scale=0.3]{ledger-smb}
   }\hfill
   \begin{tabular}[b]{rr@{}}
-  Tel: & <%tel%>\\
-  Fax: & <%fax%>
+  Tel: & <?lsmb tel ?>\\
+  Fax: & <?lsmb fax ?>
   \end{tabular}
 
   \rule[1.5em]{\textwidth}{0.5pt}
@@ -33,101 +33,101 @@
 \vspace*{0.5cm}
 
 \parbox[t]{.5\textwidth}{
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
-<%end contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
+<?lsmb end contact ?>
 
 \vspace{0.2cm}
 
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
+<?lsmb if customerphone ?>
+Tel: <?lsmb customerphone ?>
+<?lsmb end customerphone ?>
 
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
+<?lsmb if customerfax ?>
+Fax: <?lsmb customerfax ?>
+<?lsmb end customerfax ?>
 
-<%email%>
+<?lsmb email ?>
 
-<%if customertaxnumber%>
-Tax Number: <%customertaxnumber%>
-<%end customertaxnumber%>
+<?lsmb if customertaxnumber ?>
+Tax Number: <?lsmb customertaxnumber ?>
+<?lsmb end customertaxnumber ?>
 }
 \hfill
 \begin{tabular}[t]{ll}
-  \textbf{Invoice \#} & <%invnumber%> \\
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Due} & <%duedate%> \\
-  <%if ponumber%>
-    \textbf{PO \#} & <%ponumber%> \\
-  <%end ponumber%>
-  <%if ordnumber%>
-    \textbf{Order \#} & <%ordnumber%> \\
-  <%end ordnumber%>
-  \textbf{Employee} & <%employee%> \\
+  \textbf{Invoice \#} & <?lsmb invnumber ?> \\
+  \textbf{Date} & <?lsmb invdate ?> \\
+  \textbf{Due} & <?lsmb duedate ?> \\
+  <?lsmb if ponumber ?>
+    \textbf{PO \#} & <?lsmb ponumber ?> \\
+  <?lsmb end ponumber ?>
+  <?lsmb if ordnumber ?>
+    \textbf{Order \#} & <?lsmb ordnumber ?> \\
+  <?lsmb end ordnumber ?>
+  \textbf{Employee} & <?lsmb employee ?> \\
 \end{tabular}
 
 \vspace{1cm}
 
 \begin{tabularx}{\textwidth}[t]{@{}llrX@{\hspace{1cm}}l@{}}
-<%foreach amount%>
-  <%accno%> & <%account%> & <%amount%> & <%description%> & <%projectnumber%> \\
-<%end amount%>
+<?lsmb foreach amount ?>
+  <?lsmb accno ?> & <?lsmb account ?> & <?lsmb amount ?> & <?lsmb description ?> & <?lsmb projectnumber ?> \\
+<?lsmb end amount ?>
 
-  \multicolumn{2}{r}{\textbf{Subtotal}} & <%subtotal%> & \\
-<%foreach tax%>
-  \multicolumn{2}{r}{\textbf{<%taxdescription%> @ <%taxrate%> \%}} & <%tax%> & \\
-<%end tax%>
+  \multicolumn{2}{r}{\textbf{Subtotal}} & <?lsmb subtotal ?> & \\
+<?lsmb foreach tax ?>
+  \multicolumn{2}{r}{\textbf{<?lsmb taxdescription ?> @ <?lsmb taxrate ?> \%}} & <?lsmb tax ?> & \\
+<?lsmb end tax ?>
 
-  \multicolumn{2}{r}{\textbf{Total}} & <%invtotal%> & \\
+  \multicolumn{2}{r}{\textbf{Total}} & <?lsmb invtotal ?> & \\
   
 \end{tabularx}
 
 \vspace{0.3cm}
 
-<%text_amount%> ***** <%decimal%>/100 <%currency%>
+<?lsmb text_amount ?> ***** <?lsmb decimal ?>/100 <?lsmb currency ?>
 
-<%if notes%>
+<?lsmb if notes ?>
 \vspace{0.3cm}
-<%notes%>
-<%end notes%>
+<?lsmb notes ?>
+<?lsmb end notes ?>
 
 \vspace{0.3cm}
 
-<%if paid_1%>
+<?lsmb if paid_1 ?>
 \begin{tabular}{@{}lllr@{}}
   \multicolumn{5}{c}{\textbf{Payments}} \\
   \hline
   \textbf{Date} & & \textbf{Source} & \textbf{Amount} \\
-<%end paid_1%>
-<%foreach payment%>
-  <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%payment%> \\
-<%end payment%>
-<%if paid_1%>
+<?lsmb end paid_1 ?>
+<?lsmb foreach payment ?>
+  <?lsmb paymentdate ?> & <?lsmb paymentaccount ?> & <?lsmb paymentsource ?> & <?lsmb payment ?> \\
+<?lsmb end payment ?>
+<?lsmb if paid_1 ?>
 \end{tabular}
-<%end paid_1%>
+<?lsmb end paid_1 ?>
 
 \vspace{0.5cm}
 
-<%foreach tax%>
-\textbf{\scriptsize <%taxdescription%> Registration <%taxnumber%>} \\
-<%end tax%>
+<?lsmb foreach tax ?>
+\textbf{\scriptsize <?lsmb taxdescription ?> Registration <?lsmb taxnumber ?>} \\
+<?lsmb end tax ?>
   
 \end{document}
 
diff --git a/templates/demo/balance_sheet.html b/templates/demo/balance_sheet.html
index 6ede0b9c..2ce532f8 100644
--- a/templates/demo/balance_sheet.html
+++ b/templates/demo/balance_sheet.html
@@ -2,32 +2,32 @@
 <body>
 
 <h2 align=center>
-<%company%>
-<br><%address%>
+<?lsmb company ?>
+<br><?lsmb address ?>
 
 <p>BALANCE SHEET
-<br>as at <%this_period%>
+<br>as at <?lsmb this_period ?>
 </h2>
 
-<%if department%>
-<h4>Department: <%department%></h4>
-<%end department%>
+<?lsmb if department ?>
+<h4>Department: <?lsmb department ?></h4>
+<?lsmb end department ?>
 
 <table border=0>
 <tr>
   <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
+  <th><?lsmb this_period ?></th>
+  <th><?lsmb last_period ?></th>
 </tr>
 
-<%foreach asset_account%>
+<?lsmb foreach asset_account ?>
 <tr>
   <td> </td>
-  <td><%asset_account%></td>
-  <td align=right><%asset_this_period%></td>
-  <td align=right><%asset_last_period%></td>
+  <td><?lsmb asset_account ?></td>
+  <td align=right><?lsmb asset_this_period ?></td>
+  <td align=right><?lsmb asset_last_period ?></td>
 </tr>
-<%end asset_account%>
+<?lsmb end asset_account ?>
 
 <tr>
   <td colspan=2> </td>
@@ -37,22 +37,22 @@
 
 <tr valign=top>
   <th align=left colspan=2>TOTAL ASSETS</th>
-  <td align=right><%total_assets_this_period%><hr noshade size=2></td>
-  <td align=right><%total_assets_last_period%><hr noshade size=2></td>
+  <td align=right><?lsmb total_assets_this_period ?><hr noshade size=2></td>
+  <td align=right><?lsmb total_assets_last_period ?><hr noshade size=2></td>
 </tr>
 
 <tr>
   <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
 </tr>
 
-<%foreach liability_account%>
+<?lsmb foreach liability_account ?>
 <tr>
   <td></td>
-  <td><%liability_account%></td>
-  <td align=right><%liability_this_period%></td>
-  <td align=right><%liability_last_period%></td>
+  <td><?lsmb liability_account ?></td>
+  <td align=right><?lsmb liability_this_period ?></td>
+  <td align=right><?lsmb liability_last_period ?></td>
 </tr>
-<%end liability_account%>
+<?lsmb end liability_account ?>
 
 <tr>
   <td colspan=2> </td>
@@ -63,22 +63,22 @@
 <tr valign=top>
   <td></td>
   <th align=left>TOTAL LIABILITIES</th>
-  <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
+  <td align=right><?lsmb total_liabilities_this_period ?><br><hr noshade size=2</td>
+  <td align=right><?lsmb total_liabilities_last_period ?><br><hr noshade size=2</td>
 </tr>
 
 <tr>
   <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
 </tr>
 
-<%foreach equity_account%>
+<?lsmb foreach equity_account ?>
 <tr>
   <td></td>
-  <td><%equity_account%></td>
-  <td align=right><%equity_this_period%></td>
-  <td align=right><%equity_last_period%></td>
+  <td><?lsmb equity_account ?></td>
+  <td align=right><?lsmb equity_this_period ?></td>
+  <td align=right><?lsmb equity_last_period ?></td>
 </tr>
-<%end equity_account%>
+<?lsmb end equity_account ?>
 
 <tr>
   <td colspan=2> </td>
@@ -89,14 +89,14 @@
 <tr valign=top>
   <td></td>
   <th align=left>TOTAL EQUITY</th>
-  <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
+  <td align=right><?lsmb total_equity_this_period ?><br><hr noshade size=2</td>
+  <td align=right><?lsmb total_equity_last_period ?><br><hr noshade size=2</td>
 </tr>
 
 <tr valign=top>
   <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+  <td align=right><?lsmb total_this_period ?><br><hr noshade size=2></td>
+  <td align=right><?lsmb total_last_period ?><br><hr noshade size=2></td>
 </tr>
 </table>
 
diff --git a/templates/demo/bin_list.html b/templates/demo/bin_list.html
index 93abb57d..543dc8dd 100644
--- a/templates/demo/bin_list.html
+++ b/templates/demo/bin_list.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
 
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,70 +19,70 @@
     <td>
       <table width=100% cellspacing=0 cellpadding=0>
 	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>From</th>
-	  <th align=left width=50%><font color=ffffff>Ship To</th>
+	  <th align=left width=50 ?><font color=ffffff>From</th>
+	  <th align=left width=50 ?><font color=ffffff>Ship To</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-          <br><%address2%>
-          <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-          <%country%>
-          <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+          <br><?lsmb address2 ?>
+          <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+          <?lsmb country ?>
+          <?lsmb end country ?>
 	  <br>
 
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
+	  <?lsmb if contact ?>
+	  <br>Attn: <?lsmb contact ?>
+	  <?lsmb end contact ?>
 
-	  <%if vendorphone%>
-	  <br>Tel: <%vendorphone%>
-	  <%end vendorphone%>
+	  <?lsmb if vendorphone ?>
+	  <br>Tel: <?lsmb vendorphone ?>
+	  <?lsmb end vendorphone ?>
 
-	  <%if vendorfax%>
-	  <br>Fax: <%vendorfax%>
-	  <%end vendorfax%>
+	  <?lsmb if vendorfax ?>
+	  <br>Fax: <?lsmb vendorfax ?>
+	  <?lsmb end vendorfax ?>
 
-	  <%if email%>
-	  <br><%email%>
-	  <%end email%>
+	  <?lsmb if email ?>
+	  <br><?lsmb email ?>
+	  <?lsmb end email ?>
 	  
 	  </td>
 	  
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-          <br><%shiptoaddress2%>
-          <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-	  <%shiptozipcode%>
-	  <%if shiptocountry%>
-          <%shiptocountry%>
-          <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+          <br><?lsmb shiptoaddress2 ?>
+          <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+	  <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+          <?lsmb shiptocountry ?>
+          <?lsmb end shiptocountry ?>
 
 	  <br>
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
+	  <?lsmb if shiptocontact ?>
+	  <br>Attn: <?lsmb shiptocontact ?>
+	  <?lsmb end shiptocontact ?>
 	  
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
 
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
 	  </td>
 	</tr>
       </table>
@@ -100,32 +100,32 @@
 	  <th width=17% align=left nowrap>Order #</th>
 	  <th width=17% align=left nowrap>Date</th>
 	  <th width=17% align=left nowrap>Contact</th>
-	  <%if warehouse%>
+	  <?lsmb if warehouse ?>
 	  <th width=17% align=left nowrap>Warehouse</th>
-	  <%end warehouse%>
+	  <?lsmb end warehouse ?>
 	  <th width=17% align=left>Shipping Point</th>
 	  <th width=15% align=left>Ship via</th>
 	</tr>
 
 	<tr>
-	  <td><%ordnumber%>&nbsp;</td>
+	  <td><?lsmb ordnumber ?>&nbsp;</td>
 	  
-	  <%if shippingdate%>
-	  <td><%shippingdate%></td>
-	  <%end shippingdate%>
+	  <?lsmb if shippingdate ?>
+	  <td><?lsmb shippingdate ?></td>
+	  <?lsmb end shippingdate ?>
 	  
-	  <%if not shippingdate%>
-	  <td><%orddate%></td>
-	  <%end shippingdate%>
+	  <?lsmb if not shippingdate ?>
+	  <td><?lsmb orddate ?></td>
+	  <?lsmb end shippingdate ?>
 	  
-	  <td><%employee%>&nbsp;</td>
+	  <td><?lsmb employee ?>&nbsp;</td>
 
-	  <%if warehouse%>
-	  <td><%warehouse%></td>
-	  <%end warehouse%>
+	  <?lsmb if warehouse ?>
+	  <td><?lsmb warehouse ?></td>
+	  <?lsmb end warehouse ?>
   
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -135,7 +135,7 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=left><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -148,19 +148,19 @@
 	  <th><font color=ffffff>Bin</th>
 	</tr>
 
-	<%foreach number%>
+	<?lsmb foreach number ?>
 	<tr valign=top>
-	  <td><%runningnumber%></td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td><%serialnumber%></td>
-	  <td><%deliverydate%></td>
-	  <td align=right><%qty%></td>
-	  <td align=right><%ship%></td>
-	  <td><%unit%></td>
-	  <td><%bin%></td>
+	  <td><?lsmb runningnumber ?></td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td><?lsmb serialnumber ?></td>
+	  <td><?lsmb deliverydate ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td align=right><?lsmb ship ?></td>
+	  <td><?lsmb unit ?></td>
+	  <td><?lsmb bin ?></td>
 	</tr>
-	<%end number%>
+	<?lsmb end number ?>
 
       </table>
     </td>
diff --git a/templates/demo/bin_list.tex b/templates/demo/bin_list.tex
index 1bc85d66..0883d69f 100644
--- a/templates/demo/bin_list.tex
+++ b/templates/demo/bin_list.tex
@@ -11,19 +11,19 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
  
-<%pagebreak 65 27 37%>
+<?lsmb pagebreak 65 27 37 ?>
 \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
-<%end pagebreak%>
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -32,37 +32,37 @@
 \textbf{From}
 \vspace{0.3cm}
 
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 }
 \parbox[t]{.5\textwidth}{
 \textbf{Ship To}
 \vspace{0.3cm}
 
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 }
 \hfill
 
@@ -75,24 +75,24 @@
 
 \begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
-  <%if warehouse%>
+  <?lsmb if warehouse ?>
   & \textbf{Warehouse}
-  <%end warehouse%>
+  <?lsmb end warehouse ?>
   & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
   \hline
   
-  <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%orddate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb ordnumber ?>
+  <?lsmb if shippingdate ?>
+  & <?lsmb shippingdate ?>
+  <?lsmb end shippingdate ?>
+  <?lsmb if not shippingdate ?>
+  & <?lsmb orddate ?>
+  <?lsmb end shippingdate ?>
+  & <?lsmb employee ?>
+  <?lsmb if warehouse ?>
+  & <?lsmb warehouse ?>
+  <?lsmb end warehouse ?>
+  & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
   
@@ -101,10 +101,10 @@
 \begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
 
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
-  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb runningnumber ?> & <?lsmb number ?> & <?lsmb description ?> & <?lsmb serialnumber ?> &
+  <?lsmb deliverydate ?> & <?lsmb qty ?> & <?lsmb ship ?> & <?lsmb unit ?> & <?lsmb bin ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
diff --git a/templates/demo/check.tex b/templates/demo/check.tex
index 908f0e79..c6bef8b9 100644
--- a/templates/demo/check.tex
+++ b/templates/demo/check.tex
@@ -12,64 +12,64 @@
 \fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
 
 \parbox[t]{12cm}{
-  <%company%>
+  <?lsmb company ?>
 
-  <%address%>}
+  <?lsmb address ?>}
 \hfill
-\parbox[t]{6cm}{\hfill <%source%>}
+\parbox[t]{6cm}{\hfill <?lsmb source ?>}
 
 \vspace*{0.6cm}
 
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+<?lsmb text_amount ?> \dotfill <?lsmb decimal ?>/100 \makebox[0.5cm]{\hfill}
 
 \vspace{0.5cm}
 
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+\hfill <?lsmb datepaid ?> \makebox[2cm]{\hfill} <?lsmb amount ?>
 
 % different date format for datepaid
-% <%DD%><%MM%><%YYYY%>
+% <?lsmb DD ?><?lsmb MM ?><?lsmb YYYY ?>
 
 \vspace{0.5cm}
 
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{1.8cm}
 
-<%memo%>
+<?lsmb memo ?>
 
 \vspace{0.8cm}
 
-<%company%>
+<?lsmb company ?>
 
 \vspace{0.5cm}
 
-<%name%> \hfill <%datepaid%> \hfill <%source%>
+<?lsmb name ?> \hfill <?lsmb datepaid ?> \hfill <?lsmb source ?>
 
 \vspace{0.5cm}
 \begin{tabularx}{\textwidth}{lXrr@{}}
 \textbf{Invoice \#} & \textbf{Invoice Date}
   & \textbf{Amount Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
+<?lsmb foreach invnumber ?>
+<?lsmb invnumber ?> & <?lsmb invdate ?> \dotfill
+  & <?lsmb due ?> & <?lsmb paid ?> \\
+<?lsmb end invnumber ?>
 \end{tabularx}
 
 \vspace{1cm}
 
-<%memo%>
+<?lsmb memo ?>
 
 \vfill
 
diff --git a/templates/demo/income_statement.html b/templates/demo/income_statement.html
index d5221d63..14b01219 100644
--- a/templates/demo/income_statement.html
+++ b/templates/demo/income_statement.html
@@ -2,36 +2,36 @@
 <body>
 
 <h2 align=center>
-<%company%>
-<br><%address%>
+<?lsmb company ?>
+<br><?lsmb address ?>
 
 <p>INCOME STATEMENT
-<br><%period%>
+<br><?lsmb period ?>
 </h2>
 
-<%if department%>
-<h4>Department: <%department%></h4>
-<%end department%>
+<?lsmb if department ?>
+<h4>Department: <?lsmb department ?></h4>
+<?lsmb end department ?>
 
-<%if projectnumber%>
-<h4>Project Number: <%projectnumber%></h4>
-<%end projectnumber%>
+<?lsmb if projectnumber ?>
+<h4>Project Number: <?lsmb projectnumber ?></h4>
+<?lsmb end projectnumber ?>
 
 <table width=100% border=0>
 <tr>
   <th width=400 align=left colspan=2>INCOME<br><hr width=300 size=5 align=left noshade></th>
-  <th><%this_period%></th>
-  <th><%last_period%></th>
+  <th><?lsmb this_period ?></th>
+  <th><?lsmb last_period ?></th>
 </tr>
 
-<%foreach income_account%>
+<?lsmb foreach income_account ?>
 <tr>
   <td width=4> </td>
-  <td><%income_account%></td>
-  <td align=right><%income_this_period%></td>
-  <td align=right><%income_last_period%></td>
+  <td><?lsmb income_account ?></td>
+  <td align=right><?lsmb income_this_period ?></td>
+  <td align=right><?lsmb income_last_period ?></td>
 </tr>
-<%end income_account%>
+<?lsmb end income_account ?>
 
 <tr>
   <td colspan=2> </td>
@@ -42,22 +42,22 @@
 <tr valign=top>
   <td> </td>
   <th align=left>TOTAL INCOME</th>
-  <td align=right><%total_income_this_period%><hr noshade size=2></td>
-  <td align=right><%total_income_last_period%><hr noshade size=2></td>
+  <td align=right><?lsmb total_income_this_period ?><hr noshade size=2></td>
+  <td align=right><?lsmb total_income_last_period ?><hr noshade size=2></td>
 </tr>
 
 <tr>
   <th align=left colspan=2>EXPENSES<br><hr width=300 size=5 align=left noshade></th>
 </tr>
 
-<%foreach expense_account%>
+<?lsmb foreach expense_account ?>
 <tr>
   <td> </td>
-  <td><%expense_account%></td>
-  <td align=right><%expenses_this_period%></td>
-  <td align=right><%expenses_last_period%></td>
+  <td><?lsmb expense_account ?></td>
+  <td align=right><?lsmb expenses_this_period ?></td>
+  <td align=right><?lsmb expenses_last_period ?></td>
 </tr>
-<%end expense_account%>
+<?lsmb end expense_account ?>
 
 <tr>
   <td colspan=2> </td>
@@ -68,14 +68,14 @@
 <tr valign=top>
   <td> </td>
   <th align=left>TOTAL EXPENSES</th>
-  <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
-  <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
+  <td align=right><?lsmb total_expenses_this_period ?><br><hr noshade size=2</td>
+  <td align=right><?lsmb total_expenses_last_period ?><br><hr noshade size=2</td>
 </tr>
 
 <tr valign=top>
   <th align=left colspan=2>INCOME / (LOSS)</th>
-  <td align=right><%total_this_period%><br><hr noshade size=2></td>
-  <td align=right><%total_last_period%><br><hr noshade size=2></td>
+  <td align=right><?lsmb total_this_period ?><br><hr noshade size=2></td>
+  <td align=right><?lsmb total_last_period ?><br><hr noshade size=2></td>
 </tr>
 
 </table>
diff --git a/templates/demo/invoice.html b/templates/demo/invoice.html
index 3356aed6..3b15e0ee 100644
--- a/templates/demo/invoice.html
+++ b/templates/demo/invoice.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,75 +19,75 @@
     <td>
       <table width=100% callspacing=0 cellpadding=0>
         <tr bgcolor=000000>
-          <th align=left width=50%><font color=ffffff>To</th>
-          <th align=left width=50%><font color=ffffff>Ship To</th>
+          <th align=left width=50 ?><font color=ffffff>To</th>
+          <th align=left width=50 ?><font color=ffffff>Ship To</th>
         </tr>
 
         <tr valign=top>
-          <td><%name%>
-          <br><%address1%>
-	  <%if address2%>
-          <br><%address2%>
-	  <%end address2%>
-          <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+          <td><?lsmb name ?>
+          <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+          <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+          <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
 
-          <%if contact%>
-          <br><%contact%>
+          <?lsmb if contact ?>
+          <br><?lsmb contact ?>
           <br>
-          <%end contact%>
+          <?lsmb end contact ?>
 
-          <%if customerphone%>
-          <br>Tel: <%customerphone%>
-          <%end customerphone%>
+          <?lsmb if customerphone ?>
+          <br>Tel: <?lsmb customerphone ?>
+          <?lsmb end customerphone ?>
 
-          <%if customerfax%>
-          <br>Fax: <%customerfax%>
-          <%end customerfax%>
+          <?lsmb if customerfax ?>
+          <br>Fax: <?lsmb customerfax ?>
+          <?lsmb end customerfax ?>
 
-          <%if email%>
-          <br><%email%>
-          <%end email%>
+          <?lsmb if email ?>
+          <br><?lsmb email ?>
+          <?lsmb end email ?>
           </td>
 
-          <td><%shiptoname%>
-          <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-          <br><%shiptoaddress2%>
-	  <%end shiptoaddress2%>
-          <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-	  <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+          <td><?lsmb shiptoname ?>
+          <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+          <br><?lsmb shiptoaddress2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+          <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+	  <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
           <br>
 
-          <%if shiptocontact%>
-          <br><%shiptocontact%>
+          <?lsmb if shiptocontact ?>
+          <br><?lsmb shiptocontact ?>
           <br>
-          <%end shiptocontact%>
+          <?lsmb end shiptocontact ?>
 
-          <%if shiptophone%>
-          <br>Tel: <%shiptophone%>
-          <%end shiptophone%>
+          <?lsmb if shiptophone ?>
+          <br>Tel: <?lsmb shiptophone ?>
+          <?lsmb end shiptophone ?>
 
-          <%if shiptofax%>
-          <br>Fax: <%shiptofax%>
-          <%end shiptofax%>
+          <?lsmb if shiptofax ?>
+          <br>Fax: <?lsmb shiptofax ?>
+          <?lsmb end shiptofax ?>
 
-          <%if shiptoemail%>
-          <br><%shiptoemail%>
-          <%end shiptoemail%>
+          <?lsmb if shiptoemail ?>
+          <br><?lsmb shiptoemail ?>
+          <?lsmb end shiptoemail ?>
           </td>
         </tr>
       </table>
@@ -112,13 +112,13 @@
 	</tr>
 
 	<tr>
-	  <td><%invnumber%></td>
-	  <td><%invdate%></td>
-	  <td><%duedate%></td>
-	  <td><%ordnumber%>&nbsp;</td>
-	  <td><%employee%>&nbsp;</td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb invnumber ?></td>
+	  <td><?lsmb invdate ?></td>
+	  <td><?lsmb duedate ?></td>
+	  <td><?lsmb ordnumber ?>&nbsp;</td>
+	  <td><?lsmb employee ?>&nbsp;</td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -128,7 +128,7 @@
     <td>&nbsp;</td>
   
     <td>
-      <table width=100%>
+      <table width=100 ?>
         <tr bgcolor=000000>
           <th align=right><font color=ffffff>Item</th>
           <th align=left><font color=ffffff>Number</th>
@@ -141,62 +141,62 @@
           <th align=right><font color=ffffff>Extended</th>
         </tr>
 
-        <%foreach number%>
+        <?lsmb foreach number ?>
         <tr valign=top>
-          <td align=right><%runningnumber%>.</td>
-          <td><%number%></td>
-          <td><%description%></td>
-          <td><%deliverydate%></td>
-          <td align=right><%qty%></td>
-          <td><%unit%></td>
-          <td align=right><%sellprice%></td>
-          <td align=right><%discountrate%></td>
-          <td align=right><%linetotal%></td>
+          <td align=right><?lsmb runningnumber ?>.</td>
+          <td><?lsmb number ?></td>
+          <td><?lsmb description ?></td>
+          <td><?lsmb deliverydate ?></td>
+          <td align=right><?lsmb qty ?></td>
+          <td><?lsmb unit ?></td>
+          <td align=right><?lsmb sellprice ?></td>
+          <td align=right><?lsmb discountrate ?></td>
+          <td align=right><?lsmb linetotal ?></td>
         </tr>
-        <%end number%>
+        <?lsmb end number ?>
 
         <tr>
           <td colspan=9><hr noshade></td>
         </tr>
     
         <tr>
-          <%if taxincluded%>
+          <?lsmb if taxincluded ?>
           <th colspan=7 align=right>Total</th>
-          <td colspan=2 align=right><%invtotal%></td>
-          <%end taxincluded%>
+          <td colspan=2 align=right><?lsmb invtotal ?></td>
+          <?lsmb end taxincluded ?>
 
-          <%if not taxincluded%>
+          <?lsmb if not taxincluded ?>
           <th colspan=7 align=right>Subtotal</th>
-          <td colspan=2 align=right><%subtotal%></td>
-          <%end taxincluded%>
+          <td colspan=2 align=right><?lsmb subtotal ?></td>
+          <?lsmb end taxincluded ?>
         </tr>
 
-        <%foreach tax%>
+        <?lsmb foreach tax ?>
         <tr>
-          <th colspan=7 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-          <td colspan=2 align=right><%tax%></td>
+          <th colspan=7 align=right><?lsmb taxdescription ?> on <?lsmb taxbase ?> @ <?lsmb taxrate ?> %</th>
+          <td colspan=2 align=right><?lsmb tax ?></td>
         </tr>
-        <%end tax%>
+        <?lsmb end tax ?>
 
-        <%if paid%>
+        <?lsmb if paid ?>
         <tr>
           <th colspan=7 align=right>Paid</th>
-          <td colspan=2 align=right>- <%paid%></td>
+          <td colspan=2 align=right>- <?lsmb paid ?></td>
         </tr>
-        <%end paid%>
+        <?lsmb end paid ?>
 
         <tr>
           <td colspan=5>&nbsp;</td>
           <td colspan=4><hr noshade></td>
         </tr>
 
-        <%if total%>
+        <?lsmb if total ?>
         <tr>
           <td colspan=5>&nbsp;</td>
           <th colspan=2 align=right nowrap>Balance Due</th>
-          <th colspan=2 align=right><%total%></th>
+          <th colspan=2 align=right><?lsmb total ?></th>
         </tr>
-        <%end total%>
+        <?lsmb end total ?>
 
         <tr>
       </table>
@@ -207,28 +207,28 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
         <tr valign=top>
-          <%if notes%>
-          <td><%notes%></td>
-          <%end notes%>
+          <?lsmb if notes ?>
+          <td><?lsmb notes ?></td>
+          <?lsmb end notes ?>
 
-	  <td><%text_amount%> ***** <%decimal%>/100</td>
+	  <td><?lsmb text_amount ?> ***** <?lsmb decimal ?>/100</td>
 	  
           <td align=right nowrap>
-          All prices in <b><%currency%></b>
+          All prices in <b><?lsmb currency ?></b>
           </td>
         </tr>
       </table>
     </td>
   </tr>
 
-  <%if paid_1%>
+  <?lsmb if paid_1 ?>
   <tr>
     <td>&nbsp;</td>
 
     <td colspan=9>
-      <table width=60%>
+      <table width=60 ?>
 
         <tr>
           <th align=left>Payments</th>
@@ -246,22 +246,22 @@
           <th align=left>Source</th>
           <th align=left>Amount</th>
         </tr>
-  <%end paid_1%>
+  <?lsmb end paid_1 ?>
 
-        <%foreach payment%>
+        <?lsmb foreach payment ?>
         <tr>
-          <td><%paymentdate%></td>
-          <td><%paymentaccount%></td>
-          <td><%paymentsource%></td>
-          <td><%payment%></td>
+          <td><?lsmb paymentdate ?></td>
+          <td><?lsmb paymentaccount ?></td>
+          <td><?lsmb paymentsource ?></td>
+          <td><?lsmb payment ?></td>
         </tr>
-        <%end payment%>
+        <?lsmb end payment ?>
 
-  <%if paid_1%>
+  <?lsmb if paid_1 ?>
       </table>
     </td>
   </tr>
-  <%end paid_1%>
+  <?lsmb end paid_1 ?>
 
   <tr height=10></tr>
 
@@ -277,15 +277,15 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
         <tr valign=top>
-          <td width=60%><font size=-3>
-          Payment due by <%duedate%>.
-          Items returned are subject to a 10% restocking charge. A return authorization must be obtained from <%company%> before goods are returned. Returns must be shipped prepaid and properly insured. <%company%> will not be responsible for damages during transit.
+          <td width=60 ?><font size=-3>
+          Payment due by <?lsmb duedate ?>.
+          Items returned are subject to a 10% restocking charge. A return authorization must be obtained from <?lsmb company ?> before goods are returned. Returns must be shipped prepaid and properly insured. <?lsmb company ?> will not be responsible for damages during transit.
           </font>
           </td>
 
-          <td width=40%>
+          <td width=40 ?>
           X <hr noshade>
           </td>
         </tr>
@@ -293,15 +293,15 @@
     </td>
   </tr>
 
-  <%foreach tax%>
+  <?lsmb foreach tax ?>
   <tr>
     <td>&nbsp;</td>
 
-    <th colspan=9 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
+    <th colspan=9 align=left><font size=-2><?lsmb taxdescription ?> Registration <?lsmb taxnumber ?></th>
   </tr>
-  <%end tax%>
+  <?lsmb end tax ?>
 
-  <%if taxincluded%>
+  <?lsmb if taxincluded ?>
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -309,7 +309,7 @@
   <tr>
     <th colspan=8 align=left><font size=-2>Taxes shown are included in price.</th>
   </tr>
-  <%end taxincluded%>
+  <?lsmb end taxincluded ?>
 
 </table>
 
diff --git a/templates/demo/invoice.tex b/templates/demo/invoice.tex
index fa7145bf..e7f74697 100644
--- a/templates/demo/invoice.tex
+++ b/templates/demo/invoice.tex
@@ -16,15 +16,15 @@
   \parbox{\textwidth}{
   \tiny
   \rule[1.5em]{\textwidth}{0.5pt}
-Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will acrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge.
-A return authorization must be obtained from <%company%> before goods are returned. Returns must be shipped prepaid and properly insured.
-<%company%> will not be responsible for damages during transit.
+Payment due NET <?lsmb terms ?> Days from date of Invoice. Interest on overdue amounts will acrue at the rate of 12\% per annum starting from <?lsmb duedate ?> until paid in full. Items returned are subject to a 10\% restocking charge.
+A return authorization must be obtained from <?lsmb company ?> before goods are returned. Returns must be shipped prepaid and properly insured.
+<?lsmb company ?> will not be responsible for damages during transit.
   }
 }
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
-<%pagebreak 65 27 37%>
+<?lsmb pagebreak 65 27 37 ?>
 \end{tabularx}
 
   \rule{\textwidth}{2pt}
@@ -33,18 +33,18 @@ A return authorization must be obtained from <%company%> before goods are return
 
   \hfill
   \begin{tabularx}{\textwidth}{Xr@{\hspace{1cm}}r@{}}
-  & Subtotal & <%sumcarriedforward%> \\
+  & Subtotal & <?lsmb sumcarriedforward ?> \\
   \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%invnumber%>}{<%company%>\hfill <%invnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb invnumber ?>}{<?lsmb company ?>\hfill <?lsmb invnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}rlXlrlrrr@{}}
   \textbf{Pos} & \textbf{Number} & \textbf{Description} & & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\ [0.5em]
-  & carried forward from page <%lastpage%> & & & & & & & <%sumcarriedforward%> \\ [0.5em]
-<%end pagebreak%>
+  & carried forward from page <?lsmb lastpage ?> & & & & & & & <?lsmb sumcarriedforward ?> \\ [0.5em]
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -53,71 +53,71 @@ A return authorization must be obtained from <%company%> before goods are return
 \textbf{To}
 \vspace{0.3cm}
 
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
+<?lsmb if customerphone ?>
+Tel: <?lsmb customerphone ?>
+<?lsmb end customerphone ?>
 
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
+<?lsmb if customerfax ?>
+Fax: <?lsmb customerfax ?>
+<?lsmb end customerfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 \parbox[t]{.5\textwidth}{
 \textbf{Ship To}
 \vspace{0.3cm}
 
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 
 \vspace{0.3cm}
 
-<%if shiptocontact%>
-<%shiptocontact%>
+<?lsmb if shiptocontact ?>
+<?lsmb shiptocontact ?>
 \vspace{0.2cm}
-<%end shiptocontact%>
+<?lsmb end shiptocontact ?>
 
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
+<?lsmb if shiptophone ?>
+Tel: <?lsmb shiptophone ?>
+<?lsmb end shiptophone ?>
 
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
+<?lsmb if shiptofax ?>
+Fax: <?lsmb shiptofax ?>
+<?lsmb end shiptofax ?>
 
-<%shiptoemail%>
+<?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -132,8 +132,8 @@ Fax: <%shiptofax%>
   \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} & \textbf{Order \#}
   & \textbf{Salesperson} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
   \hline
-  <%invnumber%> & <%invdate%> & <%duedate%> & <%ordnumber%> & <%employee%>
-  & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb invnumber ?> & <?lsmb invdate ?> & <?lsmb duedate ?> & <?lsmb ordnumber ?> & <?lsmb employee ?>
+  & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
 
@@ -142,10 +142,10 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{@{}rlXlrlrrr@{}}
   \textbf{Pos} & \textbf{Number} & \textbf{Description} & & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\ [0.5em]
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%deliverydate%> &
-  <%qty%> & <%unit%> & <%sellprice%> & <%discountrate%> & <%linetotal%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb runningnumber ?> & <?lsmb number ?> & <?lsmb description ?> & <?lsmb deliverydate ?> &
+  <?lsmb qty ?> & <?lsmb unit ?> & <?lsmb sellprice ?> & <?lsmb discountrate ?> & <?lsmb linetotal ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -156,44 +156,44 @@ Fax: <%shiptofax%>
 
 \hfill
 \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & Subtotal & <%subtotal%> \\
-<%foreach tax%>
-  & <%taxdescription%> on <%taxbase%> & <%tax%> \\
-<%end tax%>
-<%if paid%>
-  & Paid & - <%paid%> \\
-<%end paid%>
+  & Subtotal & <?lsmb subtotal ?> \\
+<?lsmb foreach tax ?>
+  & <?lsmb taxdescription ?> on <?lsmb taxbase ?> & <?lsmb tax ?> \\
+<?lsmb end tax ?>
+<?lsmb if paid ?>
+  & Paid & - <?lsmb paid ?> \\
+<?lsmb end paid ?>
   \hline
-<%if total%>
-  & Balance Due & <%total%>
-<%end total%>
+<?lsmb if total ?>
+  & Balance Due & <?lsmb total ?>
+<?lsmb end total ?>
 \end{tabularx}
 
 \vspace{0.3cm}
 
-<%text_amount%> ***** <%decimal%>/100
+<?lsmb text_amount ?> ***** <?lsmb decimal ?>/100
 \hfill
-All prices in \textbf{<%currency%>}.
+All prices in \textbf{<?lsmb currency ?>}.
 
 \vspace{12pt}
 
-<%notes%>
+<?lsmb notes ?>
 }
 
 \vfill
 
-<%if paid_1%>
+<?lsmb if paid_1 ?>
 \begin{tabularx}{10cm}{@{}lXlr@{}}
   \textbf{Payments} & & & \\
   \hline
   \textbf{Date} & & \textbf{Source} & \textbf{Amount} \\
-<%end paid_1%>
-<%foreach payment%>
-  <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%payment%> \\
-<%end payment%>
-<%if paid_1%>
+<?lsmb end paid_1 ?>
+<?lsmb foreach payment ?>
+  <?lsmb paymentdate ?> & <?lsmb paymentaccount ?> & <?lsmb paymentsource ?> & <?lsmb payment ?> \\
+<?lsmb end payment ?>
+<?lsmb if paid_1 ?>
 \end{tabularx}
-<%end paid_1%>
+<?lsmb end paid_1 ?>
 
 \vspace{1cm}
 
diff --git a/templates/demo/letterhead.html b/templates/demo/letterhead.html
index ccac4c0f..1094bcf6 100644
--- a/templates/demo/letterhead.html
+++ b/templates/demo/letterhead.html
@@ -2,21 +2,21 @@
     <td width=10>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
         <tr>
           <td>
             <h4>
-            <%company%><br>
-            <%address%>
+            <?lsmb company ?><br>
+            <?lsmb address ?>
             </h4>
           </td>
 
-          <th><img src=<%templates%>/<%language_code%>/logo.png border=0 height=58></th>
+          <th><img src=<?lsmb templates ?>/<?lsmb language_code ?>/logo.png border=0 height=58></th>
 
           <td align=right>
             <h4>
-            Tel: <%tel%><br>
-            Fax: <%fax%>
+            Tel: <?lsmb tel ?><br>
+            Fax: <?lsmb fax ?>
             </h4>
           </td>
         </tr>
diff --git a/templates/demo/letterhead.tex b/templates/demo/letterhead.tex
index 16d1d16c..10ad0c44 100644
--- a/templates/demo/letterhead.tex
+++ b/templates/demo/letterhead.tex
@@ -1,15 +1,15 @@
 \parbox{\textwidth}{%
   \parbox[b]{.42\textwidth}{%
-    <%company%>
+    <?lsmb company ?>
    
-    <%address%>
+    <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<%templates%>/<%language_code%>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb templates ?>/<?lsmb language_code ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
-  Tel: & <%tel%>\\
-  Fax: & <%fax%>
+  Tel: & <?lsmb tel ?>\\
+  Fax: & <?lsmb fax ?>
   \end{tabular}
 
   \rule[1.5em]{\textwidth}{0.5pt}
diff --git a/templates/demo/packing_list.html b/templates/demo/packing_list.html
index 57286437..3a6683f8 100644
--- a/templates/demo/packing_list.html
+++ b/templates/demo/packing_list.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td> 
@@ -20,39 +20,39 @@
       <table width=100% cellspacing=0 cellpadding=0>
 	<tr bgcolor=000000>
 	  <th width=50% align=left><font color=ffffff>Ship To:</th>
-	  <th width=50%>&nbsp;</th>
+	  <th width=50 ?>&nbsp;</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-	  <br><%shiptoaddress2%>
-	  <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-	  <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+	  <br><?lsmb shiptoaddress2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+	  <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
 	  </td>
 	
 	  <td>
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
+	  <?lsmb if shiptocontact ?>
+	  <br>Attn: <?lsmb shiptocontact ?>
+	  <?lsmb end shiptocontact ?>
 	  
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
 	  
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
 
-	  <%shiptoemail%>
+	  <?lsmb shiptoemail ?>
 	  </td>
 	</tr>
       </table>
@@ -71,33 +71,33 @@
 	  <th width=17% align=left>Order #</th>
 	  <th width=17% align=left>Date</th>
 	  <th width=17% align=left nowrap>Contact</th>
-	  <%if warehouse%>
+	  <?lsmb if warehouse ?>
 	  <th width=17% align=left>Warehouse</th>
-	  <%end warehouse%>
+	  <?lsmb end warehouse ?>
 	  <th width=17% align=left>Shipping Point</th>
 	  <th width=15% align=left>Ship via</th>
 	</tr>
 
         <tr>
-	  <td><%invnumber%>&nbsp;</td>
-	  <td><%ordnumber%>&nbsp;</td>
+	  <td><?lsmb invnumber ?>&nbsp;</td>
+	  <td><?lsmb ordnumber ?>&nbsp;</td>
 	  
-	  <%if shippingdate%>
-	  <td><%shippingdate%></td>
-	  <%end shippingdate%>
+	  <?lsmb if shippingdate ?>
+	  <td><?lsmb shippingdate ?></td>
+	  <?lsmb end shippingdate ?>
 	  
-	  <%if not shippingdate%>
-	  <td><%transdate%></td>
-	  <%end shippingdate%>
+	  <?lsmb if not shippingdate ?>
+	  <td><?lsmb transdate ?></td>
+	  <?lsmb end shippingdate ?>
   
-          <td><%employee%>&nbsp;</td>
+          <td><?lsmb employee ?>&nbsp;</td>
 	  
-	  <%if warehouse%>
-	  <td><%warehouse%>&nbsp;</td>
-	  <%end warehouse%>
+	  <?lsmb if warehouse ?>
+	  <td><?lsmb warehouse ?>&nbsp;</td>
+	  <?lsmb end warehouse ?>
 
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -107,7 +107,7 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=left><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -119,18 +119,18 @@
 	  <th>&nbsp;</th>
 	</tr>
 
-	<%foreach number%>
+	<?lsmb foreach number ?>
 	<tr valign=top>
-	  <td><%runningnumber%></td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td><%serialnumber%></td>
-	  <td><%deliverydate%></td>
-	  <td align=right><%qty%></td>
-	  <td align=right><%ship%></td>
-	  <td><%unit%></td>
+	  <td><?lsmb runningnumber ?></td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td><?lsmb serialnumber ?></td>
+	  <td><?lsmb deliverydate ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td align=right><?lsmb ship ?></td>
+	  <td><?lsmb unit ?></td>
 	</tr>
-	<%end number%>
+	<?lsmb end number ?>
 
       </table>
     </td>
@@ -142,36 +142,36 @@
     <td><hr noshade></td>
   </tr>
 
-  <%if notes%>
+  <?lsmb if notes ?>
   <tr>
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
 	  <td>Notes</td>
-	  <td><%notes%></td>
+	  <td><?lsmb notes ?></td>
 	</tr>
       </table>
     </td>
   </tr>
-  <%end notes%>
+  <?lsmb end notes ?>
 
   <tr>
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-	  <td width=70%><font size=-3>
+	  <td width=70 ?><font size=-3>
 	  Items returned are subject to
 	  a 10% restocking charge. A return authorization must be obtained
-	  from <%company%> before goods are returned. Returns must be shipped
-	  prepaid and properly insured. <%company%> will not be responsible
+	  from <?lsmb company ?> before goods are returned. Returns must be shipped
+	  prepaid and properly insured. <?lsmb company ?> will not be responsible
 	  for damages during transit.
 	  </font>
 	  </td>
-	  <td width=30%>
+	  <td width=30 ?>
 	  X <hr noshade>
 	  </td>
 	</tr>
diff --git a/templates/demo/packing_list.tex b/templates/demo/packing_list.tex
index 2d3a1945..4798a92d 100644
--- a/templates/demo/packing_list.tex
+++ b/templates/demo/packing_list.tex
@@ -17,24 +17,24 @@
   \tiny
    \rule[1.5em]{\textwidth}{0.5pt}
 Items returned are subject to a 10\% restocking charge.
-A return authorization must be obtained from <%company%> before goods are
+A return authorization must be obtained from <?lsmb company ?> before goods are
 returned. Returns must be shipped prepaid and properly insured.
-<%company%> will not be responsible for damages during transit.
+<?lsmb company ?> will not be responsible for damages during transit.
   }
 }
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
-<%pagebreak 65 27 37%>
+<?lsmb pagebreak 65 27 37 ?>
 \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}rlXllrrl@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Ship} & \\
-<%end pagebreak%>
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -46,32 +46,32 @@ returned. Returns must be shipped prepaid and properly insured.
 
 \parbox[t]{.5\textwidth}{
   
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 }
 \parbox[t]{.5\textwidth}{
-  <%shiptocontact%>
+  <?lsmb shiptocontact ?>
   
-  <%if shiptophone%>
-  Tel: <%shiptophone%>
-  <%end shiptophone%>
+  <?lsmb if shiptophone ?>
+  Tel: <?lsmb shiptophone ?>
+  <?lsmb end shiptophone ?>
   
-  <%if shiptofax%>
-  Fax: <%shiptofax%>
-  <%end shiptofax%>
+  <?lsmb if shiptofax ?>
+  Fax: <?lsmb shiptofax ?>
+  <?lsmb end shiptofax ?>
   
-  <%shiptoemail%>
+  <?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -84,24 +84,24 @@ returned. Returns must be shipped prepaid and properly insured.
 
 \begin{tabularx}{\textwidth}{*{7}{|X}|} \hline
   \textbf{Invoice \#} & \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
-  <%if warehouse%>
+  <?lsmb if warehouse ?>
   & \textbf{Warehouse}
-  <%end warehouse%>
+  <?lsmb end warehouse ?>
   & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
   \hline
   
-  <%invnumber%> & <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%transdate%>
-  <%end shippingdate%>
-  & <%employee%>
-  <%if warehouse%>
-  & <%warehouse%>
-  <%end warehouse%>
-  & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb invnumber ?> & <?lsmb ordnumber ?>
+  <?lsmb if shippingdate ?>
+  & <?lsmb shippingdate ?>
+  <?lsmb end shippingdate ?>
+  <?lsmb if not shippingdate ?>
+  & <?lsmb transdate ?>
+  <?lsmb end shippingdate ?>
+  & <?lsmb employee ?>
+  <?lsmb if warehouse ?>
+  & <?lsmb warehouse ?>
+  <?lsmb end warehouse ?>
+  & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
   
@@ -110,10 +110,10 @@ returned. Returns must be shipped prepaid and properly insured.
 \begin{tabularx}{\textwidth}{@{}rlXllrrl@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Ship} & \\
 
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
-  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb runningnumber ?> & <?lsmb number ?> & <?lsmb description ?> & <?lsmb serialnumber ?> &
+  <?lsmb deliverydate ?> & <?lsmb qty ?> & <?lsmb ship ?> & <?lsmb unit ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -122,7 +122,7 @@ returned. Returns must be shipped prepaid and properly insured.
 
 \vspace{12pt}
 
-<%notes%>
+<?lsmb notes ?>
 
 }
 
diff --git a/templates/demo/pick_list.html b/templates/demo/pick_list.html
index c6055449..057c4944 100644
--- a/templates/demo/pick_list.html
+++ b/templates/demo/pick_list.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
 
   <tr>
     <td width=10>&nbsp;</td>
@@ -20,39 +20,39 @@
       <table width=100% callspacing=0 cellpadding=0>
         <tr bgcolor=000000>
 	  <th width=50% align=left><font color=ffffff>Ship To:</th>
-	  <th width=50%>&nbsp;</th>
+	  <th width=50 ?>&nbsp;</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-	  <br><%shiptoaddress2%>
-	  <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-	  <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+	  <br><?lsmb shiptoaddress2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+	  <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
 	  </td>
 
 	  <td>
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
+	  <?lsmb if shiptocontact ?>
+	  <br>Attn: <?lsmb shiptocontact ?>
+	  <?lsmb end shiptocontact ?>
 
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
 
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
 
-	  <%shiptoemail%>
+	  <?lsmb shiptoemail ?>
 	  </td>
 	</tr>
       </table>
@@ -77,20 +77,20 @@
 	</tr>
 
         <tr>
-	  <td><%invnumber%>&nbsp;</td>
-	  <td><%ordnumber%>&nbsp;</td>
-          <%if shippingdate%>
-	  <td><%shippingdate%></td>
-          <%end shippingdate%>
-
-	  <%if not shippingdate%>
-	  <td><%transdate%></td>
-	  <%end shippingdate%>
-
-	  <td><%employee%>&nbsp;</td>
-	  <td><%warehouse%>&nbsp;</td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb invnumber ?>&nbsp;</td>
+	  <td><?lsmb ordnumber ?>&nbsp;</td>
+          <?lsmb if shippingdate ?>
+	  <td><?lsmb shippingdate ?></td>
+          <?lsmb end shippingdate ?>
+
+	  <?lsmb if not shippingdate ?>
+	  <td><?lsmb transdate ?></td>
+	  <?lsmb end shippingdate ?>
+
+	  <td><?lsmb employee ?>&nbsp;</td>
+	  <td><?lsmb warehouse ?>&nbsp;</td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -100,7 +100,7 @@
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=left><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -111,17 +111,17 @@
 	  <th><font color=ffffff>Bin</th>
 	</tr>
 
-        <%foreach number%>
+        <?lsmb foreach number ?>
 	<tr valign=top>
-	  <td><%runningnumber%>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
+	  <td><?lsmb runningnumber ?>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td align=right><?lsmb qty ?></td>
 	  <td align=right>[&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]</td>
-	  <td><%unit%></td>
-	  <td align=right><%bin%></td>
+	  <td><?lsmb unit ?></td>
+	  <td align=right><?lsmb bin ?></td>
 	</tr>
-	<%end number%>
+	<?lsmb end number ?>
       </table>
     </td>
   </tr>
diff --git a/templates/demo/pick_list.tex b/templates/demo/pick_list.tex
index 2f82936a..cf8bb4fb 100644
--- a/templates/demo/pick_list.tex
+++ b/templates/demo/pick_list.tex
@@ -11,21 +11,21 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
  
-<%pagebreak 65 27 37%>
+<?lsmb pagebreak 65 27 37 ?>
 \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}rlXrcll@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} &
   \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
 
-<%end pagebreak%>
+<?lsmb end pagebreak ?>
 
 \vspace*{0.5cm}
 
@@ -37,32 +37,32 @@
 
 \parbox[t]{.5\textwidth}{
   
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 }
 \parbox[t]{.5\textwidth}{
-  <%shiptocontact%>
+  <?lsmb shiptocontact ?>
 
-  <%if shiptophone%>
-  Tel: <%shiptophone%>
-  <%end shiptophone%>
+  <?lsmb if shiptophone ?>
+  Tel: <?lsmb shiptophone ?>
+  <?lsmb end shiptophone ?>
 
-  <%if shiptofax%>
-  Fax: <%shiptofax%>
-  <%end shiptofax%>
+  <?lsmb if shiptofax ?>
+  Fax: <?lsmb shiptofax ?>
+  <?lsmb end shiptofax ?>
 
-  <%shiptoemail%>
+  <?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -77,14 +77,14 @@
   \textbf{Invoice \#} & \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
   & \textbf{Warehouse} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
   \hline
-  <%invnumber%> & <%ordnumber%>
-  <%if shippingdate%>
-  & <%shippingdate%>
-  <%end shippingdate%>
-  <%if not shippingdate%>
-  & <%transdate%>
-  <%end shippingdate%>
-  & <%employee%> & <%warehouse%> & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb invnumber ?> & <?lsmb ordnumber ?>
+  <?lsmb if shippingdate ?>
+  & <?lsmb shippingdate ?>
+  <?lsmb end shippingdate ?>
+  <?lsmb if not shippingdate ?>
+  & <?lsmb transdate ?>
+  <?lsmb end shippingdate ?>
+  & <?lsmb employee ?> & <?lsmb warehouse ?> & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
   
@@ -93,10 +93,10 @@
 \begin{tabularx}{\textwidth}{@{}rlXrcll@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} &
   \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> &
-  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb runningnumber ?> & <?lsmb number ?> & <?lsmb description ?> &
+  <?lsmb qty ?> & [\hspace{1cm}] & <?lsmb unit ?> & <?lsmb bin ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
diff --git a/templates/demo/pos_invoice.txt b/templates/demo/pos_invoice.txt
index cbc0055a..5cffdb3a 100644
--- a/templates/demo/pos_invoice.txt
+++ b/templates/demo/pos_invoice.txt
@@ -1,45 +1,45 @@
-<%company align=center width=40%>
-<%address align=center width=40%>
+<?lsmb company align=center width=40 ?>
+<?lsmb address align=center width=40 ?>
 
-Till: <%till align=left width=3%>         Phone#: <%tel%>
-Cashier: <%employee%>
-Inv #/Date: <%invnumber%> / <%invdate%>
-Printed: <%dateprinted%>
+Till: <?lsmb till align=left width=3 ?>         Phone#: <?lsmb tel ?>
+Cashier: <?lsmb employee ?>
+Inv #/Date: <?lsmb invnumber ?> / <?lsmb invdate ?>
+Printed: <?lsmb dateprinted ?>
 
   Qty Description                 Amount
-<%foreach number%>
-<%qty align=right width=5%> <%description align=left width=24 offset=6%> <%linetotal align=right width=9%>
-      <%number%> @ <%sellprice%>/<%unit%>
-<%end number%>
+<?lsmb foreach number ?>
+<?lsmb qty align=right width=5 ?> <?lsmb description align=left width=24 offset=6 ?> <?lsmb linetotal align=right width=9 ?>
+      <?lsmb number ?> @ <?lsmb sellprice ?>/<?lsmb unit ?>
+<?lsmb end number ?>
 
-Number of items: <%totalqty%>
-<%if taxincluded%>
+Number of items: <?lsmb totalqty ?>
+<?lsmb if taxincluded ?>
                          ---------------
-                        Total: <%invtotal align=right width=9%>
-<%end taxincluded%>
-<%if not taxincluded%>
+                        Total: <?lsmb invtotal align=right width=9 ?>
+<?lsmb end taxincluded ?>
+<?lsmb if not taxincluded ?>
                             ------------
-                     Subtotal: <%subtotal align=right width=9%>
-<%end taxincluded%>
-<%foreach tax%>
-<%taxdescription align=right width=23%> @ <%taxrate align=right width=2%>%: <%tax align=right width=9%>
-<%end tax%>
-<%foreach payment%>
-                         Paid: <%payment align=right width=9%> <%currency%>
-<%end payment%>
-<%if change%>
-                       Change: <%change align=right width=9%>
-<%end change%>
-<%if total%>
-                  Balance Due: <%total align=right width=9%>
-<%end total%>
-<%if discount%>
+                     Subtotal: <?lsmb subtotal align=right width=9 ?>
+<?lsmb end taxincluded ?>
+<?lsmb foreach tax ?>
+<?lsmb taxdescription align=right width=23 ?> @ <?lsmb taxrate align=right width=2 ?>%: <?lsmb tax align=right width=9 ?>
+<?lsmb end tax ?>
+<?lsmb foreach payment ?>
+                         Paid: <?lsmb payment align=right width=9 ?> <?lsmb currency ?>
+<?lsmb end payment ?>
+<?lsmb if change ?>
+                       Change: <?lsmb change align=right width=9 ?>
+<?lsmb end change ?>
+<?lsmb if total ?>
+                  Balance Due: <?lsmb total align=right width=9 ?>
+<?lsmb end total ?>
+<?lsmb if discount ?>
 
-<%discount%> % Discount applied
-<%end discount%>
+<?lsmb discount ?> % Discount applied
+<?lsmb end discount ?>
 
    Thank you for your valued business!
 
-<%if taxincluded%>
+<?lsmb if taxincluded ?>
 Taxes are included in price.
-<%end taxincluded%>
+<?lsmb end taxincluded ?>
diff --git a/templates/demo/purchase_order.html b/templates/demo/purchase_order.html
index ba4c1d43..656f4527 100644
--- a/templates/demo/purchase_order.html
+++ b/templates/demo/purchase_order.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,65 +19,65 @@
     <td>
       <table width=100% callspacing=0 cellpadding=0>
 	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>To:</th>
-	  <th align=left width=50%><font color=ffffff>Ship To:</th>
+	  <th align=left width=50 ?><font color=ffffff>To:</th>
+	  <th align=left width=50 ?><font color=ffffff>Ship To:</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-	  <br><%address2%>
-	  <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+	  <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
 
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
+	  <?lsmb if contact ?>
+	  <br>Attn: <?lsmb contact ?>
+	  <?lsmb end contact ?>
 	  
-	  <%if vendorphone%>
-	  <br>Tel: <%vendorphone%>
-	  <%end vendorphone%>
+	  <?lsmb if vendorphone ?>
+	  <br>Tel: <?lsmb vendorphone ?>
+	  <?lsmb end vendorphone ?>
 	  
-	  <%if vendorfax%>
-	  <br>Fax: <%vendorfax%>
-	  <%end vendorfax%>
+	  <?lsmb if vendorfax ?>
+	  <br>Fax: <?lsmb vendorfax ?>
+	  <?lsmb end vendorfax ?>
 	  </td>
 
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-	  <br><%shiptoaddress2%>
-	  <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-	  <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+	  <br><?lsmb shiptoaddress2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+	  <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
           <br>
 
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
+	  <?lsmb if shiptocontact ?>
+	  <br>Attn: <?lsmb shiptocontact ?>
+	  <?lsmb end shiptocontact ?>
 	  
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
 	  
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
 	  </td>
 	</tr>
       </table>
@@ -101,12 +101,12 @@
 	</tr>
 
 	<tr>
-	  <td><%ordnumber%></td>
-	  <td><%orddate%></td>
-	  <td><%reqdate%></td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb ordnumber ?></td>
+	  <td><?lsmb orddate ?></td>
+	  <td><?lsmb reqdate ?></td>
+	  <td><?lsmb employee ?></td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -114,7 +114,7 @@
 
   <tr>
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=right><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -126,107 +126,107 @@
 	  <th><font color=ffffff>Amount</th>
 	</tr>
 
-        <%foreach number%>
+        <?lsmb foreach number ?>
 	<tr valign=top>
-	  <td align=right><%runningnumber%>.</td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td><%unit%></td>
-	  <td align=right><%sellprice%></td>
-	  <td align=right><%discountrate%></th>
-	  <td align=right><%linetotal%></td>
+	  <td align=right><?lsmb runningnumber ?>.</td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td><?lsmb unit ?></td>
+	  <td align=right><?lsmb sellprice ?></td>
+	  <td align=right><?lsmb discountrate ?></th>
+	  <td align=right><?lsmb linetotal ?></td>
 	</tr>
-        <%end number%>
+        <?lsmb end number ?>
 
 	<tr>
 	  <td colspan=8><hr noshade></td>
 	</tr>
 	
 	<tr>
-          <%if taxincluded%>
+          <?lsmb if taxincluded ?>
 	  <th colspan=7 align=right>Total</th>
-	  <th colspan=1 align=right><%ordtotal%></th>
-          <%end taxincluded%>
+	  <th colspan=1 align=right><?lsmb ordtotal ?></th>
+          <?lsmb end taxincluded ?>
 	 
-          <%if not taxincluded%>
+          <?lsmb if not taxincluded ?>
 	  <th colspan=7 align=right>Subtotal</th>
-	  <td colspan=1 align=right><%subtotal%></td>
-          <%end taxincluded%>
+	  <td colspan=1 align=right><?lsmb subtotal ?></td>
+          <?lsmb end taxincluded ?>
 	</tr>
 
-        <%foreach tax%>
+        <?lsmb foreach tax ?>
 	<tr>
-	  <th colspan=7 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-	  <td colspan=1 align=right><%tax%></td>
+	  <th colspan=7 align=right><?lsmb taxdescription ?> on <?lsmb taxbase ?> @ <?lsmb taxrate ?> %</th>
+	  <td colspan=1 align=right><?lsmb tax ?></td>
 	</tr>
-        <%end tax%>
+        <?lsmb end tax ?>
 
 	<tr>
 	  <td colspan=4>&nbsp;</td>
 	  <td colspan=4><hr noshade></td>
 	</tr>
 	
-        <%if not taxincluded%>
+        <?lsmb if not taxincluded ?>
 	  <th colspan=7 align=right>Total</th>
-	  <td colspan=1 align=right><%ordtotal%></td>
-        <%end taxincluded%>
+	  <td colspan=1 align=right><?lsmb ordtotal ?></td>
+        <?lsmb end taxincluded ?>
 
-        <%if terms%>
+        <?lsmb if terms ?>
 	<tr>
-	  <td colspan=4>Terms Net <b><%terms%></b> days</td>
+	  <td colspan=4>Terms Net <b><?lsmb terms ?></b> days</td>
 	  <th colspan=3 align=right>Total</th>
-	  <th colspan=1 align=right><%ordtotal%></th>
+	  <th colspan=1 align=right><?lsmb ordtotal ?></th>
 	</tr>
-        <%end terms%>
+        <?lsmb end terms ?>
 
-        <%if taxincluded%>
+        <?lsmb if taxincluded ?>
 	<tr>
 	  <td colspan=2>Tax included</td>
 	</tr>
-        <%end taxincluded%>
+        <?lsmb end taxincluded ?>
 
 	<tr>
 	  <td>&nbsp;</td>
 	</tr>
 	
-        <%if ordtotal%>
+        <?lsmb if ordtotal ?>
 	<tr>
 	  <td colspan=8 align=right>
-	  All prices in <b><%currency%></b> Funds
+	  All prices in <b><?lsmb currency ?></b> Funds
 	  </td>
 	</tr>
-        <%end ordtotal%>
+        <?lsmb end ordtotal ?>
 
       </table>
     </td>
   </tr>
 
-  <%if notes%>
+  <?lsmb if notes ?>
   <tr>
     <td>&nbsp;</td>
     
     <td>
-    <table width=100%>
+    <table width=100 ?>
       <tr valign=top>
 	<td>Notes</td>
-	<td><%notes%></td>
+	<td><?lsmb notes ?></td>
       </tr>
 
     </table>
     </td>
   </tr>
-  <%end notes%>
+  <?lsmb end notes ?>
 
   <tr>
     <td>&nbsp;</td>
   
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-	  <td width=70%>&nbsp;</td>
+	  <td width=70 ?>&nbsp;</td>
 
-	  <td width=30%>
+	  <td width=30 ?>
 	  X <hr noshade>
 	  </td>
 	</tr>
diff --git a/templates/demo/purchase_order.tex b/templates/demo/purchase_order.tex
index fe1e6428..260bec99 100644
--- a/templates/demo/purchase_order.tex
+++ b/templates/demo/purchase_order.tex
@@ -12,28 +12,28 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 
-<%pagebreak 65 27 48%>
+<?lsmb pagebreak 65 27 48 ?>
 \end{tabularx}
 
   \rule{\textwidth}{2pt}
   
   \hfill
   \begin{tabularx}{7cm}{Xr@{\hspace{1cm}r@{}}
-  & Subtotal & <%sumcarriedforward%> \\
+  & Subtotal & <?lsmb sumcarriedforward ?> \\
   \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}lXrlrr@{}}
   \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
+  & carried forward from <?lsmb lastpage ?> & & & & <?lsmb sumcarriedforward ?> \\
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -42,71 +42,71 @@
 \textbf{To}
 \vspace{0.3cm}
   
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-Attn: <%contact%>
+<?lsmb if contact ?>
+Attn: <?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
+<?lsmb if vendorphone ?>
+Tel: <?lsmb vendorphone ?>
+<?lsmb end vendorphone ?>
 
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
+<?lsmb if vendorfax ?>
+Fax: <?lsmb vendorfax ?>
+<?lsmb end vendorfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 \parbox[t]{.5\textwidth}{
 \textbf{Ship To}
 \vspace{0.3cm}
 
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 
 \vspace{0.3cm}
 
-<%if shiptocontact%>
-Attn: <%shiptocontact%>
+<?lsmb if shiptocontact ?>
+Attn: <?lsmb shiptocontact ?>
 \vspace{0.2cm}
-<%end shiptocontact%>
+<?lsmb end shiptocontact ?>
 
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
+<?lsmb if shiptophone ?>
+Tel: <?lsmb shiptophone ?>
+<?lsmb end shiptophone ?>
 
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
+<?lsmb if shiptofax ?>
+Fax: <?lsmb shiptofax ?>
+<?lsmb end shiptofax ?>
 
-<%shiptoemail%>
+<?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -119,7 +119,7 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{Order \#} & \textbf{Date} & \textbf{Required by} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
   \hline
-  <%ordnumber%> & <%orddate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb ordnumber ?> & <?lsmb orddate ?> & <?lsmb reqdate ?> & <?lsmb employee ?> & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
 
@@ -128,10 +128,10 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{@{}lXrlrr@{}}
   \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb number ?> & <?lsmb description ?> & <?lsmb qty ?> &
+    <?lsmb unit ?> & <?lsmb sellprice ?> & <?lsmb linetotal ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -142,22 +142,22 @@ Fax: <%shiptofax%>
 
 \hfill
 \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & Subtotal & <%subtotal%> \\
-<%foreach tax%>
-  & <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
+  & Subtotal & <?lsmb subtotal ?> \\
+<?lsmb foreach tax ?>
+  & <?lsmb taxdescription ?> on <?lsmb taxbase ?> & <?lsmb tax ?>\\
+<?lsmb end tax ?>
   \hline
-  & Total & <%ordtotal%>\\
+  & Total & <?lsmb ordtotal ?>\\
 \end{tabularx}
 
 \vspace{0.3cm}
 
 \hfill
-  All prices in \textbf{<%currency%>}.
+  All prices in \textbf{<?lsmb currency ?>}.
 
 \vspace{12pt}
 
-<%notes%>
+<?lsmb notes ?>
 
 }
 
diff --git a/templates/demo/receipt.tex b/templates/demo/receipt.tex
index effc19b6..01e84022 100644
--- a/templates/demo/receipt.tex
+++ b/templates/demo/receipt.tex
@@ -12,64 +12,64 @@
 \fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
 
 \parbox[t]{12cm}{
-  <%company%>
+  <?lsmb company ?>
 
-  <%address%>}
+  <?lsmb address ?>}
 \hfill
-\parbox[t]{6cm}{\hfill <%source%>}
+\parbox[t]{6cm}{\hfill <?lsmb source ?>}
 
 \vspace*{0.6cm}
 
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
+<?lsmb text_amount ?> \dotfill <?lsmb decimal ?>/100 \makebox[0.5cm]{\hfill}
 
 \vspace{0.5cm}
 
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
+\hfill <?lsmb datepaid ?> \makebox[2cm]{\hfill} <?lsmb amount ?>
 
 % different date format for datepaid
-% <%DD%><%MM%><%YYYY%>
+% <?lsmb DD ?><?lsmb MM ?><?lsmb YYYY ?>
 
 \vspace{0.5cm}
 
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{1.8cm}
 
-<%memo%>
+<?lsmb memo ?>
 
 \vspace{0.8cm}
 
-<%company%>
+<?lsmb company ?>
 
 \vspace{0.5cm}
 
-<%name%> \hfill <%datepaid%> \hfill <%source%>
+<?lsmb name ?> \hfill <?lsmb datepaid ?> \hfill <?lsmb source ?>
 
 \vspace{0.5cm}
 \begin{tabularx}{\textwidth}{lXrr@{}}
 \textbf{Invoice No.} & \textbf{Invoice Date}
   & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
-  & <%due%> & <%paid%> \\
-<%end invnumber%>
+<?lsmb foreach invnumber ?>
+<?lsmb invnumber ?> & <?lsmb invdate ?> \dotfill
+  & <?lsmb due ?> & <?lsmb paid ?> \\
+<?lsmb end invnumber ?>
 \end{tabularx}
 
 \vspace{1cm}
 
-<%memo%>
+<?lsmb memo ?>
 
 \vfill
 
diff --git a/templates/demo/request_quotation.html b/templates/demo/request_quotation.html
index 433b8e80..ef3121a9 100644
--- a/templates/demo/request_quotation.html
+++ b/templates/demo/request_quotation.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -17,67 +17,67 @@
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>To:</th>
-	  <th align=left width=50%><font color=ffffff>Ship To:</th>
+	  <th align=left width=50 ?><font color=ffffff>To:</th>
+	  <th align=left width=50 ?><font color=ffffff>Ship To:</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-	  <br><%address2%>
-	  <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+	  <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
 	  
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
+	  <?lsmb if contact ?>
+	  <br>Attn: <?lsmb contact ?>
+	  <?lsmb end contact ?>
 	  
-	  <%if vendorphone%>
-	  <br>Tel: <%vendorphone%>
-	  <%end vendorphone%>
+	  <?lsmb if vendorphone ?>
+	  <br>Tel: <?lsmb vendorphone ?>
+	  <?lsmb end vendorphone ?>
 	  
-	  <%if vendorfax%>
-	  <br>Fax: <%vendorfax%>
-	  <%end vendorfax%>
+	  <?lsmb if vendorfax ?>
+	  <br>Fax: <?lsmb vendorfax ?>
+	  <?lsmb end vendorfax ?>
 	  </td>
 
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-	  <br><%shiptoaddr2%>
-	  <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-	  <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+	  <br><?lsmb shiptoaddr2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+	  <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
           <br>
 
-	  <%if shiptocontact%>
-	  <br>Attn: <%shiptocontact%>
-	  <%end shiptocontact%>
+	  <?lsmb if shiptocontact ?>
+	  <br>Attn: <?lsmb shiptocontact ?>
+	  <?lsmb end shiptocontact ?>
 	  
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
 	  
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
 	  </td>
 	</tr>
       </table>
@@ -101,12 +101,12 @@
 	</tr>
 
 	<tr>
-	  <td><%quonumber%></td>
-	  <td><%quodate%></td>
-	  <td><%reqdate%>&nbsp;</td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb quonumber ?></td>
+	  <td><?lsmb quodate ?></td>
+	  <td><?lsmb reqdate ?>&nbsp;</td>
+	  <td><?lsmb employee ?></td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -126,7 +126,7 @@
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr>
 	  <th align=right>Item</th>
 	  <th align=left>Number</th>
@@ -138,15 +138,15 @@
 	  <th>Extended</th>
 	</tr>
 
-        <%foreach number%>
+        <?lsmb foreach number ?>
         <tr valign=top>
-          <td align=right><%runningnumber%>.</td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td><%unit%></td>
+          <td align=right><?lsmb runningnumber ?>.</td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td><?lsmb unit ?></td>
 	</tr>
-	<%end number%>
+	<?lsmb end number ?>
 
 	<tr>
 	  <td colspan=8><hr noshade></td>
@@ -156,21 +156,21 @@
     </td>
   </tr>
 
-  <%if notes%>
+  <?lsmb if notes ?>
   <tr>
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
 	  <td>Notes</td>
-	  <td><%notes%></td>
+	  <td><?lsmb notes ?></td>
 	</tr>
 
       </table>
     </td>
   </tr>
-  <%end notes%>
+  <?lsmb end notes ?>
 
 </table>
 
diff --git a/templates/demo/request_quotation.tex b/templates/demo/request_quotation.tex
index cf95dd89..e620c517 100644
--- a/templates/demo/request_quotation.tex
+++ b/templates/demo/request_quotation.tex
@@ -11,28 +11,28 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 
-<%pagebreak 65 27 48%>
+<?lsmb pagebreak 65 27 48 ?>
 \end{tabularx}
 
   \rule{\textwidth}{2pt}
   
   \hfill
   \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  & \textbf{Subtotal} & \textbf{<?lsmb sumcarriedforward ?>} \\
   \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}lXrlrr@{}}
   \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Extended} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
+  & carried forward from <?lsmb lastpage ?> & & & & <?lsmb sumcarriedforward ?> \\
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -41,71 +41,71 @@
 \textbf{To}
 \vspace{0.3cm}
   
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
+<?lsmb if vendorphone ?>
+Tel: <?lsmb vendorphone ?>
+<?lsmb end vendorphone ?>
 
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
+<?lsmb if vendorfax ?>
+Fax: <?lsmb vendorfax ?>
+<?lsmb end vendorfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 \parbox[t]{.5\textwidth}{
 \textbf{Ship To}
 \vspace{0.3cm}
 
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 
 \vspace{0.3cm}
 
-<%if shiptocontact%>
-<%shiptocontact%>
+<?lsmb if shiptocontact ?>
+<?lsmb shiptocontact ?>
 \vspace{0.2cm}
-<%end shiptocontact%>
+<?lsmb end shiptocontact ?>
 
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
+<?lsmb if shiptophone ?>
+Tel: <?lsmb shiptophone ?>
+<?lsmb end shiptophone ?>
 
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
+<?lsmb if shiptofax ?>
+Fax: <?lsmb shiptofax ?>
+<?lsmb end shiptofax ?>
 
-<%shiptoemail%>
+<?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -119,7 +119,7 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{RFQ \#} & \textbf{Date} & \textbf{Required by} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
   \hline
-  <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb quonumber ?> & <?lsmb quodate ?> & <?lsmb reqdate ?> & <?lsmb employee ?> & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
 
@@ -132,9 +132,9 @@ Please provide price and delivery time for the following items:
 \begin{tabularx}{\textwidth}{@{}lXrllrr@{}}
   \textbf{Number} & \textbf{Description} & \textbf{Qt'y} & &
   \textbf{Delivery} & \textbf{Unit Price} & \textbf{Extended} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> & <%unit%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb number ?> & <?lsmb description ?> & <?lsmb qty ?> & <?lsmb unit ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -143,7 +143,7 @@ Please provide price and delivery time for the following items:
 
 \hfill
 
-<%notes%>
+<?lsmb notes ?>
 
 }
 
diff --git a/templates/demo/sales_order.html b/templates/demo/sales_order.html
index 14c17e1e..e3ff7e13 100644
--- a/templates/demo/sales_order.html
+++ b/templates/demo/sales_order.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,65 +19,65 @@
     <td>
       <table width=100% callspacing=0 cellpadding=0>
 	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>To</th>
-	  <th align=left width=50%><font color=ffffff>Ship To</th>
+	  <th align=left width=50 ?><font color=ffffff>To</th>
+	  <th align=left width=50 ?><font color=ffffff>Ship To</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-	  <br><%address2%>
-	  <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-          <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+	  <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+          <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
-	  <%if customerphone%>
-	  <br>Tel: <%customerphone%>
-	  <%end customerphone%>
-	  <%if customerfax%>
-	  <br>Fax: <%customerfax%>
-	  <%end customerfax%>
-	  <%if email%>
-	  <br><%email%>
-	  <%end email%>
+	  <?lsmb if contact ?>
+	  <br>Attn: <?lsmb contact ?>
+	  <?lsmb end contact ?>
+	  <?lsmb if customerphone ?>
+	  <br>Tel: <?lsmb customerphone ?>
+	  <?lsmb end customerphone ?>
+	  <?lsmb if customerfax ?>
+	  <br>Fax: <?lsmb customerfax ?>
+	  <?lsmb end customerfax ?>
+	  <?lsmb if email ?>
+	  <br><?lsmb email ?>
+	  <?lsmb end email ?>
 	  </td>
 
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-	  <br><%shiptoaddress2%>
-	  <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-          <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+	  <br><?lsmb shiptoaddress2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+          <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
 	  <br>
-          <%if shiptocontact%>
-          <br><%shiptocontact%>
-          <%end shiptocontact%>
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
-	  <%if shiptoemail%>
-	  <br><%shiptoemail%>
-	  <%end shiptoemail%>
+          <?lsmb if shiptocontact ?>
+          <br><?lsmb shiptocontact ?>
+          <?lsmb end shiptocontact ?>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
+	  <?lsmb if shiptoemail ?>
+	  <br><?lsmb shiptoemail ?>
+	  <?lsmb end shiptoemail ?>
 	  </td>
 	</tr>
       </table>
@@ -101,12 +101,12 @@
 	</tr>
 
 	<tr>
-	  <td><%ordnumber%></td>
-	  <td><%orddate%></td>
-	  <td><%reqdate%></td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb ordnumber ?></td>
+	  <td><?lsmb orddate ?></td>
+	  <td><?lsmb reqdate ?></td>
+	  <td><?lsmb employee ?></td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -116,7 +116,7 @@
     <td>&nbsp;</td>
  
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=right><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -128,41 +128,41 @@
 	  <th><font color=ffffff>Amount</th>
 	</tr>
 
-	<%foreach number%>
+	<?lsmb foreach number ?>
 	<tr valign=top>
-          <td align=right><%runningnumber%>.</td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td><%unit%></td>
-	  <td align=right><%sellprice%></td>
-	  <td align=right><%discountrate%></td>
-	  <td align=right><%linetotal%></td>
+          <td align=right><?lsmb runningnumber ?>.</td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td><?lsmb unit ?></td>
+	  <td align=right><?lsmb sellprice ?></td>
+	  <td align=right><?lsmb discountrate ?></td>
+	  <td align=right><?lsmb linetotal ?></td>
 	</tr>
-	<%end number%>
+	<?lsmb end number ?>
 
 	<tr>
 	  <td colspan=8><hr noshade></td>
 	</tr>
 	
 	<tr>
-	  <%if taxincluded%>
+	  <?lsmb if taxincluded ?>
 	  <th colspan=6 align=right>Total</th>
-	  <td colspan=2 align=right><%invtotal%></td>
-	  <%end taxincluded%>
+	  <td colspan=2 align=right><?lsmb invtotal ?></td>
+	  <?lsmb end taxincluded ?>
 
-	  <%if not taxincluded%>
+	  <?lsmb if not taxincluded ?>
 	  <th colspan=6 align=right>Subtotal</th>
-	  <td colspan=2 align=right><%subtotal%></td>
-	  <%end taxincluded%>
+	  <td colspan=2 align=right><?lsmb subtotal ?></td>
+	  <?lsmb end taxincluded ?>
 	</tr>
 
-	<%foreach tax%>
+	<?lsmb foreach tax ?>
 	<tr>
-	  <th colspan=6 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-	  <td colspan=2 align=right><%tax%></td>
+	  <th colspan=6 align=right><?lsmb taxdescription ?> on <?lsmb taxbase ?> @ <?lsmb taxrate ?> %</th>
+	  <td colspan=2 align=right><?lsmb tax ?></td>
 	</tr>
-	<%end tax%>
+	<?lsmb end tax ?>
 
 	<tr>
 	  <td colspan=4>&nbsp;</td>
@@ -171,13 +171,13 @@
 
 	<tr>
 	  <td colspan=4>
-          <%text_amount%> ***** <%decimal%>/100
-	  <%if terms%>
-	  <br>Terms Net <b><%terms%></b> days
-	  <%end terms%>
+          <?lsmb text_amount ?> ***** <?lsmb decimal ?>/100
+	  <?lsmb if terms ?>
+	  <br>Terms Net <b><?lsmb terms ?></b> days
+	  <?lsmb end terms ?>
 	  </td>
 	  <th colspan=2 align=right>Total</th>
-	  <th colspan=2 align=right><%ordtotal%></th>
+	  <th colspan=2 align=right><?lsmb ordtotal ?></th>
 	</tr>
 	
 	<tr>
@@ -192,14 +192,14 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-	  <%if notes%>
+	  <?lsmb if notes ?>
 	  <td>Notes</td>
-	  <td><%notes%></td>
-	  <%end notes%>
+	  <td><?lsmb notes ?></td>
+	  <?lsmb end notes ?>
 	  <td align=right nowrap>
-	  All prices in <%currency%> Funds</b>
+	  All prices in <?lsmb currency ?> Funds</b>
 	  </td>
 	</tr>
       </table>
@@ -210,13 +210,13 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-	  <td width=60%><font size=-3>
+	  <td width=60 ?><font size=-3>
 	  Special order items are subject to a 10% order cancellation fee.
 	  </font>
 	  </td>
-	  <td width=40%>
+	  <td width=40 ?>
 	  X <hr noshade>
 	  </td>
 	</tr>
diff --git a/templates/demo/sales_order.tex b/templates/demo/sales_order.tex
index 60f7bfeb..d3693af8 100644
--- a/templates/demo/sales_order.tex
+++ b/templates/demo/sales_order.tex
@@ -11,29 +11,29 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 
-<%pagebreak 65 27 48%>
+<?lsmb pagebreak 65 27 48 ?>
 \end{tabularx}
 
   \rule{\textwidth}{2pt}
   
   \hfill
   \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  & \textbf{Subtotal} & \textbf{<?lsmb sumcarriedforward ?>} \\
   \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 
 \begin{tabularx}{\textwidth}{@{}rlXrlrrr@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
   \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
+  & carried forward from <?lsmb lastpage ?> & & & & & <?lsmb sumcarriedforward ?> \\
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -42,71 +42,71 @@
 \textbf{To}
 \vspace{0.3cm}
   
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
+<?lsmb if customerphone ?>
+Tel: <?lsmb customerphone ?>
+<?lsmb end customerphone ?>
 
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
+<?lsmb if customerfax ?>
+Fax: <?lsmb customerfax ?>
+<?lsmb end customerfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 \parbox[t]{.5\textwidth}{
 \textbf{Ship To}
 \vspace{0.3cm}
 
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 
 \vspace{0.3cm}
 
-<%if shiptocontact%>
-<%shiptocontact%>
+<?lsmb if shiptocontact ?>
+<?lsmb shiptocontact ?>
 \vspace{0.2cm}
-<%end shiptocontact%>
+<?lsmb end shiptocontact ?>
 
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
+<?lsmb if shiptophone ?>
+Tel: <?lsmb shiptophone ?>
+<?lsmb end shiptophone ?>
 
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
+<?lsmb if shiptofax ?>
+Fax: <?lsmb shiptofax ?>
+<?lsmb end shiptofax ?>
 
-<%shiptoemail%>
+<?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -120,7 +120,7 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{Order \#} & \textbf{Order Date} & \textbf{Required by} & \textbf{Salesperson} & \textbf{Shipping Point} & \textbf{Ship Via} \\ [0.5em]
   \hline
-  <%ordnumber%> & <%orddate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb ordnumber ?> & <?lsmb orddate ?> & <?lsmb reqdate ?> & <?lsmb employee ?> & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
   
@@ -129,10 +129,10 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{@{}rlXrlrrr@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
   \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%qty%> &
-  <%unit%> & <%sellprice%> & <%discountrate%> & <%linetotal%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb runningnumber ?> & <?lsmb number ?> & <?lsmb description ?> & <?lsmb qty ?> &
+  <?lsmb unit ?> & <?lsmb sellprice ?> & <?lsmb discountrate ?> & <?lsmb linetotal ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -143,27 +143,27 @@ Fax: <%shiptofax%>
 
 \hfill
 \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & Subtotal & <%subtotal%> \\
-<%foreach tax%>
-  & <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
+  & Subtotal & <?lsmb subtotal ?> \\
+<?lsmb foreach tax ?>
+  & <?lsmb taxdescription ?> on <?lsmb taxbase ?> & <?lsmb tax ?>\\
+<?lsmb end tax ?>
   \hline
-  & Total & <%ordtotal%>\\
+  & Total & <?lsmb ordtotal ?>\\
 \end{tabularx}
 
 \vspace{0.3cm}
 
-<%text_amount%> ***** <%decimal%>/100
+<?lsmb text_amount ?> ***** <?lsmb decimal ?>/100
 \hfill
-All prices in \textbf{<%currency%>}.
+All prices in \textbf{<?lsmb currency ?>}.
 
-<%if terms%>
-Terms: <%terms%> days
-<%end terms%>
+<?lsmb if terms ?>
+Terms: <?lsmb terms ?> days
+<?lsmb end terms ?>
 
 \vspace{12pt}
 
-<%notes%>
+<?lsmb notes ?>
 
 }
 
diff --git a/templates/demo/sales_quotation.html b/templates/demo/sales_quotation.html
index 5d7f2699..b94f793d 100644
--- a/templates/demo/sales_quotation.html
+++ b/templates/demo/sales_quotation.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -17,39 +17,39 @@
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-	  <br><%address2%>
-	  <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+	  <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
 
 	  <br>
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
+	  <?lsmb if contact ?>
+	  <br>Attn: <?lsmb contact ?>
+	  <?lsmb end contact ?>
 
-	  <%if customerphone%>
-	  <br>Tel: <%customerphone%>
-	  <%end customerphone%>
+	  <?lsmb if customerphone ?>
+	  <br>Tel: <?lsmb customerphone ?>
+	  <?lsmb end customerphone ?>
 
-	  <%if customerfax%>
-	  <br>Fax: <%customerfax%>
-	  <%end customerfax%>
+	  <?lsmb if customerfax ?>
+	  <br>Fax: <?lsmb customerfax ?>
+	  <?lsmb end customerfax ?>
 
-	  <%if email%>
-	  <br><%email%>
-	  <%end email%>
+	  <?lsmb if email ?>
+	  <br><?lsmb email ?>
+	  <?lsmb end email ?>
 	  </td>
 
 	</tr>
@@ -72,12 +72,12 @@
 	</tr>
 
 	<tr>
-	  <td><%quonumber%></td>
-	  <td><%quodate%></td>
-	  <td><%reqdate%></td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb quonumber ?></td>
+	  <td><?lsmb quodate ?></td>
+	  <td><?lsmb reqdate ?></td>
+	  <td><?lsmb employee ?></td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -87,7 +87,7 @@
     <td>&nbsp;</td>
   
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=right><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -99,41 +99,41 @@
 	  <th><font color=ffffff>Amount</th>
 	</tr>
 
-        <%foreach number%>
+        <?lsmb foreach number ?>
 	<tr valign=top>
-	  <td align=right><%runningnumber%></td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td><%unit%></td>
-	  <td align=right><%sellprice%></td>
-	  <td align=right><%discountrate%></td>
-	  <td align=right><%linetotal%></td>
+	  <td align=right><?lsmb runningnumber ?></td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td><?lsmb unit ?></td>
+	  <td align=right><?lsmb sellprice ?></td>
+	  <td align=right><?lsmb discountrate ?></td>
+	  <td align=right><?lsmb linetotal ?></td>
 	</tr>
-        <%end number%>
+        <?lsmb end number ?>
 
 	<tr>
 	  <td colspan=8><hr noshade></td>
 	</tr>
 	
 	<tr>
-	  <%if taxincluded%>
+	  <?lsmb if taxincluded ?>
 	  <th colspan=6 align=right>Total</th>
-	  <td colspan=2 align=right><%invtotal%></td>
-	  <%end taxincluded%>
+	  <td colspan=2 align=right><?lsmb invtotal ?></td>
+	  <?lsmb end taxincluded ?>
 
-	  <%if not taxincluded%>
+	  <?lsmb if not taxincluded ?>
 	  <th colspan=6 align=right>Subtotal</th>
-	  <td colspan=2 align=right><%subtotal%></td>
-	  <%end taxincluded%>
+	  <td colspan=2 align=right><?lsmb subtotal ?></td>
+	  <?lsmb end taxincluded ?>
 	</tr>
 
-	<%foreach tax%>
+	<?lsmb foreach tax ?>
 	<tr>
-	  <th colspan=6 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
-	  <td colspan=2 align=right><%tax%></td>
+	  <th colspan=6 align=right><?lsmb taxdescription ?> on <?lsmb taxbase ?> @ <?lsmb taxrate ?> %</th>
+	  <td colspan=2 align=right><?lsmb tax ?></td>
 	</tr>
-	<%end tax%>
+	<?lsmb end tax ?>
 
 	<tr>
 	  <td colspan=4>&nbsp;</td>
@@ -142,12 +142,12 @@
 
 	<tr>
 	  <td colspan=4>&nbsp;
-	  <%if terms%>
-	  Terms Net <b><%terms%></b> days
-	  <%end terms%>
+	  <?lsmb if terms ?>
+	  Terms Net <b><?lsmb terms ?></b> days
+	  <?lsmb end terms ?>
 	  </td>
 	  <th colspan=2 align=right>Total</th>
-	  <th colspan=2 align=right><%quototal%></th>
+	  <th colspan=2 align=right><?lsmb quototal ?></th>
 	</tr>
 	
 	<tr>
@@ -162,14 +162,14 @@
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-          <%if notes%>
+          <?lsmb if notes ?>
 	  <td>Notes</td>
-	  <td><%notes%></td>
-          <%end notes%>
+	  <td><?lsmb notes ?></td>
+          <?lsmb end notes ?>
 	  <td align=right>
-	  All prices in <b><%currency%></b> Funds
+	  All prices in <b><?lsmb currency ?></b> Funds
 	  </td>
 	</tr>
       </table>
@@ -180,13 +180,13 @@
     <td>&nbsp;</td>
 
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-	  <td width=60%><font size=-3>
+	  <td width=60 ?><font size=-3>
 	  Special order items are subject to a 10% cancellation fee.
 	  </font>
 	  </td>
-	  <td width=40%>
+	  <td width=40 ?>
 	  X <hr noshade>
 	  </td>
 	</tr>
diff --git a/templates/demo/sales_quotation.tex b/templates/demo/sales_quotation.tex
index 771fe6a3..162ee009 100644
--- a/templates/demo/sales_quotation.tex
+++ b/templates/demo/sales_quotation.tex
@@ -20,64 +20,64 @@ Special order items are subject to a 10\% cancellation fee.
   }
 }
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 
-<%pagebreak 65 27 48%>
+<?lsmb pagebreak 65 27 48 ?>
 \end{tabularx}
 
   \rule{\textwidth}{2pt}
   
   \hfill
   \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
+  & \textbf{Subtotal} & \textbf{<?lsmb sumcarriedforward ?>} \\
   \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%quonumber%>}{<%company%>\hfill <%quonumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb quonumber ?>}{<?lsmb company ?>\hfill <?lsmb quonumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}lXrlrrr@{}}
   \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
+  & carried forward from <?lsmb lastpage ?> & & & & & <?lsmb sumcarriedforward ?> \\
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
 
 \parbox[t]{.5\textwidth}{
 
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
+<?lsmb if customerphone ?>
+Tel: <?lsmb customerphone ?>
+<?lsmb end customerphone ?>
 
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
+<?lsmb if customerfax ?>
+Fax: <?lsmb customerfax ?>
+<?lsmb end customerfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 
 \vspace{1cm}
@@ -90,7 +90,7 @@ Fax: <%customerfax%>
 \begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{Quotation \#} & \textbf{Date} & \textbf{Valid until} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
   \hline
-  <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb quonumber ?> & <?lsmb quodate ?> & <?lsmb reqdate ?> & <?lsmb employee ?> & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
   
@@ -99,10 +99,10 @@ Fax: <%customerfax%>
 \begin{tabularx}{\textwidth}{@{}lXrlrrr@{}}
   \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
     \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%sellprice%> & <%discountrate%> & <%linetotal%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb number ?> & <?lsmb description ?> & <?lsmb qty ?> &
+    <?lsmb unit ?> & <?lsmb sellprice ?> & <?lsmb discountrate ?> & <?lsmb linetotal ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -113,26 +113,26 @@ Fax: <%customerfax%>
 
 \hfill
 \begin{tabularx}{7cm}{Xr@{\hspace{1cm}}r@{}}
-  & Subtotal & <%subtotal%> \\
-<%foreach tax%>
-  & <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
+  & Subtotal & <?lsmb subtotal ?> \\
+<?lsmb foreach tax ?>
+  & <?lsmb taxdescription ?> on <?lsmb taxbase ?> & <?lsmb tax ?>\\
+<?lsmb end tax ?>
   \hline
-  & Total & <%quototal%>\\
+  & Total & <?lsmb quototal ?>\\
 \end{tabularx}
 
 \vspace{0.3cm}
 
 \hfill
-All prices in \textbf{<%currency%>}.
+All prices in \textbf{<?lsmb currency ?>}.
 
-<%if terms%>
-Terms: <%terms%> days
-<%end terms%>
+<?lsmb if terms ?>
+Terms: <?lsmb terms ?> days
+<?lsmb end terms ?>
 
 \vspace{12pt}
 
-<%notes%>
+<?lsmb notes ?>
 
 }
 
diff --git a/templates/demo/statement.html b/templates/demo/statement.html
index 9a951a98..d90afab4 100644
--- a/templates/demo/statement.html
+++ b/templates/demo/statement.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -15,38 +15,38 @@
   <tr>
     <td>&nbsp;</td>
     
-    <td colspan=3 align=right><%statementdate%></td>
+    <td colspan=3 align=right><?lsmb statementdate ?></td>
   </tr>
   
   <tr>
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-	  <br><%address2%>
-	  <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-	  <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+	  <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+	  <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
 	  <br>
-          <%if customerphone%>
-	  <br>Tel: <%customerphone%>
-          <%end customerphone%>
-          <%if customerfax%>
-	  <br>Fax: <%customerfax%>
-          <%end customerfax%>
-          <%if email%>
-	  <br><%email%>
-          <%end email%>
+          <?lsmb if customerphone ?>
+	  <br>Tel: <?lsmb customerphone ?>
+          <?lsmb end customerphone ?>
+          <?lsmb if customerfax ?>
+	  <br>Fax: <?lsmb customerfax ?>
+          <?lsmb end customerfax ?>
+          <?lsmb if email ?>
+	  <br><?lsmb email ?>
+          <?lsmb end email ?>
 	  </td>
 	</tr>
       </table>
@@ -59,30 +59,30 @@
     <td>&nbsp;</td>
     
     <td>
-      <table width=100%>
+      <table width=100 ?>
         <tr>
 	  <th align=left>Invoice #</th>
           <th align=left>Order#</th>
-	  <th width=10%>Date</th>
-	  <th width=10%>Due</th>
-	  <th width=10%>Current</th>
-	  <th width=10%>30</th>
-	  <th width=10%>60</th>
-	  <th width=10%>90</th>
+	  <th width=10 ?>Date</th>
+	  <th width=10 ?>Due</th>
+	  <th width=10 ?>Current</th>
+	  <th width=10 ?>30</th>
+	  <th width=10 ?>60</th>
+	  <th width=10 ?>90</th>
 	</tr>
         
-	<%foreach invnumber%>
+	<?lsmb foreach invnumber ?>
 	<tr>
-	  <td><%invnumber%></td>
-          <td><%ordnumber%></td>
-	  <td><%invdate%></td>
-	  <td><%duedate%></td>
-	  <td align=right><%c0%></td>
-	  <td align=right><%c30%></td>
-	  <td align=right><%c60%></td>
-	  <td align=right><%c90%></td>
+	  <td><?lsmb invnumber ?></td>
+          <td><?lsmb ordnumber ?></td>
+	  <td><?lsmb invdate ?></td>
+	  <td><?lsmb duedate ?></td>
+	  <td align=right><?lsmb c0 ?></td>
+	  <td align=right><?lsmb c30 ?></td>
+	  <td align=right><?lsmb c60 ?></td>
+	  <td align=right><?lsmb c90 ?></td>
 	</tr>
-        <%end invnumber%>
+        <?lsmb end invnumber ?>
 	
         <tr>
 	  <td colspan=8><hr size=1></td>
@@ -93,10 +93,10 @@
 	  <td>&nbsp;</td>
           <td>&nbsp;</td>
           <td>&nbsp;</td>
-	  <th align=right><%c0total%></td>
-	  <th align=right><%c30total%></td>
-	  <th align=right><%c60total%></td>
-	  <th align=right><%c90total%></td>
+	  <th align=right><?lsmb c0total ?></td>
+	  <th align=right><?lsmb c30total ?></td>
+	  <th align=right><?lsmb c60total ?></td>
+	  <th align=right><?lsmb c90total ?></td>
 	</tr>
       </table>
     </td>
@@ -108,10 +108,10 @@
     <td>&nbsp;</td>
     
     <td align=right>
-      <table width=50%>
+      <table width=50 ?>
         <tr>
 	  <th>Total Outstanding</th>
-          <th align=right><%total%></th>
+          <th align=right><?lsmb total ?></th>
 	</tr>
       </table>
     </td>
@@ -125,8 +125,8 @@
   
   <tr>
     <td>&nbsp;</td>
-    <td>All amounts in <b><%currency%></b> funds.
-    <br>Please make check payable to <b><%company%></b>.
+    <td>All amounts in <b><?lsmb currency ?></b> funds.
+    <br>Please make check payable to <b><?lsmb company ?></b>.
     </td>
   </tr>
 
diff --git a/templates/demo/statement.tex b/templates/demo/statement.tex
index 0beb6c64..f700a750 100644
--- a/templates/demo/statement.tex
+++ b/templates/demo/statement.tex
@@ -11,39 +11,39 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 \parbox[t]{.5\textwidth}{
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 }
 \parbox[t]{.5\textwidth}{
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
+<?lsmb if customerphone ?>
+Tel: <?lsmb customerphone ?>
+<?lsmb end customerphone ?>
 
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
+<?lsmb if customerfax ?>
+Fax: <?lsmb customerfax ?>
+<?lsmb end customerfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 \hfill
 
 \vspace{1cm}
 
-\textbf{S T A T E M E N T} \hfill \textbf{<%statementdate%>}
+\textbf{S T A T E M E N T} \hfill \textbf{<?lsmb statementdate ?>}
 
 \vspace{2cm}
 
@@ -52,13 +52,13 @@ Fax: <%customerfax%>
   \textbf{Invoice \#} & \textbf{Order \#} & \textbf{Date} & \textbf{Due} &
   \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90} \\
   \hline
-<%foreach invnumber%>
-  <%invnumber%> & <%ordnumber%> & <%invdate%> & <%duedate%> &
-  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
+<?lsmb foreach invnumber ?>
+  <?lsmb invnumber ?> & <?lsmb ordnumber ?> & <?lsmb invdate ?> & <?lsmb duedate ?> &
+  <?lsmb c0 ?> & <?lsmb c30 ?> & <?lsmb c60 ?> & <?lsmb c90 ?> \\
+<?lsmb end invnumber ?>
   \multicolumn{8}{|l|}{\mbox{}} \\
   \hline
-  \textbf{Subtotal} & & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%> \\
+  \textbf{Subtotal} & & & & <?lsmb c0total ?> & <?lsmb c30total ?> & <?lsmb c60total ?> & <?lsmb c90total ?> \\
   \hline
 \end{tabular*}
 
@@ -66,13 +66,13 @@ Fax: <%customerfax%>
 
 \hfill
 \begin{tabularx}{\textwidth}{Xr@{\hspace{1cm}}r@{}}
-  & \textbf{Total outstanding} & \textbf{<%total%>}
+  & \textbf{Total outstanding} & \textbf{<?lsmb total ?>}
 \end{tabularx}
 
 \vfill
-All amounts in \textbf{<%currency%>} funds.
+All amounts in \textbf{<?lsmb currency ?>} funds.
 
-Please make check payable to \textbf{<%company%>}
+Please make check payable to \textbf{<?lsmb company ?>}
 
 \end{document}
 
diff --git a/templates/demo/timecard.html b/templates/demo/timecard.html
index 73516e22..d9baa897 100644
--- a/templates/demo/timecard.html
+++ b/templates/demo/timecard.html
@@ -1,8 +1,8 @@
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -22,11 +22,11 @@
 	    <table>
 	      <tr>
 		<th align=left>Employee</th>
-		<td><%employee%></td>
+		<td><?lsmb employee ?></td>
 	      </tr>
 	      <tr>
 		<th align=left>ID</th>
-		<td><%employee_id%></td>
+		<td><?lsmb employee_id ?></td>
 	      </tr>
 	    </table>
 	  </td>
@@ -35,23 +35,23 @@
 	    <table>
 	      <tr>
 		<th align=left nowrap>Card ID</th>
-		<td><%id%></td>
+		<td><?lsmb id ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>Date</th>
-		<td><%transdate%></td>
+		<td><?lsmb transdate ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>In</th>
-		<td><%checkedin%></td>
+		<td><?lsmb checkedin ?></td>
 	      </tr>
               <tr>
                 <th align=left>Out</th>
-		<td><%checkedout%></td>
+		<td><?lsmb checkedout ?></td>
 	      </tr>
 	      <tr>
 		<th align=left nowrap>Hours</th>
-		<td><%qty%></td>
+		<td><?lsmb qty ?></td>
 	      </tr>
 	    </table>
 	  </td>
@@ -66,25 +66,25 @@
     <td>&nbsp;</td>
   
     <td>
-      <table width=100%>
+      <table width=100 ?>
         <tr valign=bottom>
 	  <td>
 	    <table>
 	      <tr valign=top>
 	        <th align=left>Job/Project #</th>
-		<td><%projectnumber%></td>
+		<td><?lsmb projectnumber ?></td>
 	      </tr>
 	      <tr>
 	        <th align=left>Description</th>
-		<td><%projectdescription%></td>
+		<td><?lsmb projectdescription ?></td>
 	      </tr>
 	      <tr valign=top>
 	        <th align=left>Labor/Service Code</th>
-		<td><%partnumber%></td>
+		<td><?lsmb partnumber ?></td>
 	      </tr>
 	      <tr>
 	        <th align=left>Description</th>
-		<td><%description%></td>
+		<td><?lsmb description ?></td>
 	      </tr>
 	    </table>
 	  </td>
@@ -92,11 +92,11 @@
 	    <table>
 	      <tr>
 	        <th align=right>Rate</th>
-		<td><%sellprice%></td>
+		<td><?lsmb sellprice ?></td>
 	      </tr>
 	      <tr>
 		<th align=right>Total</th>
-		<td><%total%></td>
+		<td><?lsmb total ?></td>
 	      </tr>
 	    </table>
 	  </td>
@@ -105,17 +105,17 @@
     </td>
   </tr>
 
-  <%if notes%>
+  <?lsmb if notes ?>
   <tr height=5></tr>
   
   <tr>
     <td>&nbsp;</td>
 
     <td>
-      <%notes%>
+      <?lsmb notes ?>
     </td>
   </tr>
-  <%end notes%>
+  <?lsmb end notes ?>
 
 </table>
 
diff --git a/templates/demo/timecard.tex b/templates/demo/timecard.tex
index b7630a00..ab849993 100644
--- a/templates/demo/timecard.tex
+++ b/templates/demo/timecard.tex
@@ -11,42 +11,42 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 \centerline{\textbf{T I M E}\hspace{0.5cm}\textbf{C A R D}}
 
 \vspace*{0.5cm}
 
 \begin{tabular}[t]{ll}
-  \textbf{Employee} & <%employee%> \\
-  \textbf{ID} & <%employee_id%> \\
+  \textbf{Employee} & <?lsmb employee ?> \\
+  \textbf{ID} & <?lsmb employee_id ?> \\
 \end{tabular}
 \hfill
 \begin{tabular}[t]{ll}
-  \textbf{Card ID} & <%id%> \\
-  \textbf{Date} & <%transdate%> \\
-  \textbf{In} & <%checkedin%> \\
-  \textbf{Out} & <%checkedout%> \\
-  \textbf{Hours} & <%qty%> \\
+  \textbf{Card ID} & <?lsmb id ?> \\
+  \textbf{Date} & <?lsmb transdate ?> \\
+  \textbf{In} & <?lsmb checkedin ?> \\
+  \textbf{Out} & <?lsmb checkedout ?> \\
+  \textbf{Hours} & <?lsmb qty ?> \\
 \end{tabular}
 
 \vspace{1cm}
 
 \begin{tabular}[b]{ll}
-  \textbf{Job/Project \#} & <%projectnumber%> \\
-  \textbf{Description} & <%projectdescription%> \\
-  \textbf{Labor/Service Code} & <%partnumber%> \\
-  \textbf{Description} & <%description%> \\
+  \textbf{Job/Project \#} & <?lsmb projectnumber ?> \\
+  \textbf{Description} & <?lsmb projectdescription ?> \\
+  \textbf{Labor/Service Code} & <?lsmb partnumber ?> \\
+  \textbf{Description} & <?lsmb description ?> \\
 \end{tabular}
 \hfill
 \begin{tabular}[b]{lr}
-  \textbf{Rate} & <%sellprice%> \\
-  \textbf{Total} & <%total%> \\
+  \textbf{Rate} & <?lsmb sellprice ?> \\
+  \textbf{Total} & <?lsmb total ?> \\
 \end{tabular}
   
 \vspace{0.3cm}
 
-<%notes%>
+<?lsmb notes ?>
  
 \end{document}
 
diff --git a/templates/demo/work_order.html b/templates/demo/work_order.html
index 38fadacf..b0c4ee49 100644
--- a/templates/demo/work_order.html
+++ b/templates/demo/work_order.html
@@ -1,9 +1,9 @@
 
 <body bgcolor=ffffff>
 
-<table width=100%>
+<table width=100 ?>
 
-  <%include letterhead.html%>
+  <?lsmb include letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -19,65 +19,65 @@
     <td>
       <table width=100% callspacing=0 cellpadding=0>
 	<tr bgcolor=000000>
-	  <th align=left width=50%><font color=ffffff>To</th>
-	  <th align=left width=50%><font color=ffffff>Ship To</th>
+	  <th align=left width=50 ?><font color=ffffff>To</th>
+	  <th align=left width=50 ?><font color=ffffff>Ship To</th>
 	</tr>
 
 	<tr valign=top>
-	  <td><%name%>
-	  <br><%address1%>
-	  <%if address2%>
-	  <br><%address2%>
-	  <%end address2%>
-	  <br><%city%>
-	  <%if state%>
-	  , <%state%>
-	  <%end state%>
-          <%zipcode%>
-	  <%if country%>
-	  <br><%country%>
-	  <%end country%>
+	  <td><?lsmb name ?>
+	  <br><?lsmb address1 ?>
+	  <?lsmb if address2 ?>
+	  <br><?lsmb address2 ?>
+	  <?lsmb end address2 ?>
+	  <br><?lsmb city ?>
+	  <?lsmb if state ?>
+	  , <?lsmb state ?>
+	  <?lsmb end state ?>
+          <?lsmb zipcode ?>
+	  <?lsmb if country ?>
+	  <br><?lsmb country ?>
+	  <?lsmb end country ?>
           <br>
-	  <%if contact%>
-	  <br>Attn: <%contact%>
-	  <%end contact%>
-	  <%if customerphone%>
-	  <br>Tel: <%customerphone%>
-	  <%end customerphone%>
-	  <%if customerfax%>
-	  <br>Fax: <%customerfax%>
-	  <%end customerfax%>
-	  <%if email%>
-	  <br><%email%>
-	  <%end email%>
+	  <?lsmb if contact ?>
+	  <br>Attn: <?lsmb contact ?>
+	  <?lsmb end contact ?>
+	  <?lsmb if customerphone ?>
+	  <br>Tel: <?lsmb customerphone ?>
+	  <?lsmb end customerphone ?>
+	  <?lsmb if customerfax ?>
+	  <br>Fax: <?lsmb customerfax ?>
+	  <?lsmb end customerfax ?>
+	  <?lsmb if email ?>
+	  <br><?lsmb email ?>
+	  <?lsmb end email ?>
 	  </td>
 
-	  <td><%shiptoname%>
-	  <br><%shiptoaddress1%>
-	  <%if shiptoaddress2%>
-	  <br><%shiptoaddress2%>
-	  <%end shiptoaddress2%>
-	  <br><%shiptocity%>
-	  <%if shiptostate%>
-	  , <%shiptostate%>
-	  <%end shiptostate%>
-          <%shiptozipcode%>
-	  <%if shiptocountry%>
-	  <br><%shiptocountry%>
-	  <%end shiptocountry%>
+	  <td><?lsmb shiptoname ?>
+	  <br><?lsmb shiptoaddress1 ?>
+	  <?lsmb if shiptoaddress2 ?>
+	  <br><?lsmb shiptoaddress2 ?>
+	  <?lsmb end shiptoaddress2 ?>
+	  <br><?lsmb shiptocity ?>
+	  <?lsmb if shiptostate ?>
+	  , <?lsmb shiptostate ?>
+	  <?lsmb end shiptostate ?>
+          <?lsmb shiptozipcode ?>
+	  <?lsmb if shiptocountry ?>
+	  <br><?lsmb shiptocountry ?>
+	  <?lsmb end shiptocountry ?>
 	  <br>
-          <%if shiptocontact%>
-          <br><%shiptocontact%>
-          <%end shiptocontact%>
-	  <%if shiptophone%>
-	  <br>Tel: <%shiptophone%>
-	  <%end shiptophone%>
-	  <%if shiptofax%>
-	  <br>Fax: <%shiptofax%>
-	  <%end shiptofax%>
-	  <%if shiptoemail%>
-	  <br><%shiptoemail%>
-	  <%end shiptoemail%>
+          <?lsmb if shiptocontact ?>
+          <br><?lsmb shiptocontact ?>
+          <?lsmb end shiptocontact ?>
+	  <?lsmb if shiptophone ?>
+	  <br>Tel: <?lsmb shiptophone ?>
+	  <?lsmb end shiptophone ?>
+	  <?lsmb if shiptofax ?>
+	  <br>Fax: <?lsmb shiptofax ?>
+	  <?lsmb end shiptofax ?>
+	  <?lsmb if shiptoemail ?>
+	  <br><?lsmb shiptoemail ?>
+	  <?lsmb end shiptoemail ?>
 	  </td>
 	</tr>
       </table>
@@ -101,12 +101,12 @@
 	</tr>
 
 	<tr>
-	  <td><%ordnumber%></td>
-	  <td><%orddate%></td>
-	  <td><%reqdate%></td>
-	  <td><%employee%></td>
-	  <td><%shippingpoint%>&nbsp;</td>
-	  <td><%shipvia%>&nbsp;</td>
+	  <td><?lsmb ordnumber ?></td>
+	  <td><?lsmb orddate ?></td>
+	  <td><?lsmb reqdate ?></td>
+	  <td><?lsmb employee ?></td>
+	  <td><?lsmb shippingpoint ?>&nbsp;</td>
+	  <td><?lsmb shipvia ?>&nbsp;</td>
 	</tr>
       </table>
     </td>
@@ -116,7 +116,7 @@
     <td>&nbsp;</td>
  
     <td>
-      <table width=100%>
+      <table width=100 ?>
 	<tr bgcolor=000000>
 	  <th align=right><font color=ffffff>Item</th>
 	  <th align=left><font color=ffffff>Number</th>
@@ -127,17 +127,17 @@
 	  <th><font color=ffffff>Serial #</th>
 	</tr>
 
-	<%foreach number%>
+	<?lsmb foreach number ?>
 	<tr valign=top>
-          <td align=right><%runningnumber%>.</td>
-	  <td><%number%></td>
-	  <td><%description%></td>
-	  <td align=right><%qty%></td>
-	  <td><%unit%></td>
-           <td><%bin%></td>
-	  <td><%serialnumber%></td>
+          <td align=right><?lsmb runningnumber ?>.</td>
+	  <td><?lsmb number ?></td>
+	  <td><?lsmb description ?></td>
+	  <td align=right><?lsmb qty ?></td>
+	  <td><?lsmb unit ?></td>
+           <td><?lsmb bin ?></td>
+	  <td><?lsmb serialnumber ?></td>
 	</tr>
-	<%end number%>
+	<?lsmb end number ?>
 
 	<tr>
 	  <td colspan=7><hr noshade></td>
@@ -150,9 +150,9 @@
   <tr>
     <td>&nbsp;</td>
 
-    <%if notes%>
-    <td><%notes%></td>
-    <%end notes%>
+    <?lsmb if notes ?>
+    <td><?lsmb notes ?></td>
+    <?lsmb end notes ?>
   </tr>
 </table>
 
diff --git a/templates/demo/work_order.tex b/templates/demo/work_order.tex
index c8d48172..266459f2 100644
--- a/templates/demo/work_order.tex
+++ b/templates/demo/work_order.tex
@@ -11,20 +11,20 @@
 
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
-<%include letterhead.tex%>
+<?lsmb include letterhead.tex ?>
 
 
-<%pagebreak 65 27 48%>
+<?lsmb pagebreak 65 27 48 ?>
 \end{tabularx}
 
 \newpage
 
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
 \begin{tabularx}{\textwidth}{@{}rlXrll@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
   & \textbf{Serial Number} \\
-<%end pagebreak%>
+<?lsmb end pagebreak ?>
 
 
 \vspace*{0.5cm}
@@ -33,71 +33,71 @@
 \textbf{To}
 \vspace{0.3cm}
   
-<%name%>
+<?lsmb name ?>
 
-<%address1%>
+<?lsmb address1 ?>
 
-<%address2%>
+<?lsmb address2 ?>
 
-<%city%>
-<%if state%>
-\hspace{-0.1cm}, <%state%>
-<%end state%>
-<%zipcode%>
+<?lsmb city ?>
+<?lsmb if state ?>
+\hspace{-0.1cm}, <?lsmb state ?>
+<?lsmb end state ?>
+<?lsmb zipcode ?>
 
-<%country%>
+<?lsmb country ?>
 
 \vspace{0.3cm}
 
-<%if contact%>
-<%contact%>
+<?lsmb if contact ?>
+<?lsmb contact ?>
 \vspace{0.2cm}
-<%end contact%>
+<?lsmb end contact ?>
 
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
+<?lsmb if customerphone ?>
+Tel: <?lsmb customerphone ?>
+<?lsmb end customerphone ?>
 
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
+<?lsmb if customerfax ?>
+Fax: <?lsmb customerfax ?>
+<?lsmb end customerfax ?>
 
-<%email%>
+<?lsmb email ?>
 }
 \parbox[t]{.5\textwidth}{
 \textbf{Ship To}
 \vspace{0.3cm}
 
-<%shiptoname%>
+<?lsmb shiptoname ?>
 
-<%shiptoaddress1%>
+<?lsmb shiptoaddress1 ?>
 
-<%shiptoaddress2%>
+<?lsmb shiptoaddress2 ?>
 
-<%shiptocity%>
-<%if shiptostate%>
-\hspace{-0.1cm}, <%shiptostate%>
-<%end shiptostate%>
-<%shiptozipcode%>
+<?lsmb shiptocity ?>
+<?lsmb if shiptostate ?>
+\hspace{-0.1cm}, <?lsmb shiptostate ?>
+<?lsmb end shiptostate ?>
+<?lsmb shiptozipcode ?>
 
-<%shiptocountry%>
+<?lsmb shiptocountry ?>
 
 \vspace{0.3cm}
 
-<%if shiptocontact%>
-<%shiptocontact%>
+<?lsmb if shiptocontact ?>
+<?lsmb shiptocontact ?>
 \vspace{0.2cm}
-<%end shiptocontact%>
+<?lsmb end shiptocontact ?>
 
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
+<?lsmb if shiptophone ?>
+Tel: <?lsmb shiptophone ?>
+<?lsmb end shiptophone ?>
 
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
+<?lsmb if shiptofax ?>
+Fax: <?lsmb shiptofax ?>
+<?lsmb end shiptofax ?>
 
-<%shiptoemail%>
+<?lsmb shiptoemail ?>
 }
 \hfill
 
@@ -111,7 +111,7 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
   \textbf{Order \#} & \textbf{Order Date} & \textbf{Required by} & \textbf{Salesperson} & \textbf{Shipping Point} & \textbf{Ship Via} \\ [0.5em]
   \hline
-  <%ordnumber%> & <%orddate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
+  <?lsmb ordnumber ?> & <?lsmb orddate ?> & <?lsmb reqdate ?> & <?lsmb employee ?> & <?lsmb shippingpoint ?> & <?lsmb shipvia ?> \\
   \hline
 \end{tabularx}
   
@@ -120,10 +120,10 @@ Fax: <%shiptofax%>
 \begin{tabularx}{\textwidth}{@{}rlXrll@{}}
   \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
   & \textbf{Serial Number} \\
-<%foreach number%>
-  <%runningnumber%> & <%number%> & <%description%> & <%qty%> &
-  <%unit%> & <%serialnumber%> \\
-<%end number%>
+<?lsmb foreach number ?>
+  <?lsmb runningnumber ?> & <?lsmb number ?> & <?lsmb description ?> & <?lsmb qty ?> &
+  <?lsmb unit ?> & <?lsmb serialnumber ?> \\
+<?lsmb end number ?>
 \end{tabularx}
 
 
@@ -132,7 +132,7 @@ Fax: <%shiptofax%>
 
 \vspace{12pt}
 
-<%notes%>
+<?lsmb notes ?>
 }
 
 \vfill