diff --git a/docs/aztec.png b/docs/aztec.png
new file mode 100644
index 00000000..cd0b5822
Binary files /dev/null and b/docs/aztec.png differ
diff --git a/docs/backend.html b/docs/backend.html
index 21aa31ed..b68701b5 100644
--- a/docs/backend.html
+++ b/docs/backend.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Using the API</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
-	<META NAME="CHANGED" CONTENT="20080309;20075400">
+	<META NAME="CHANGED" CONTENT="20080828;8103400">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -1180,6 +1180,17 @@ following table. For example</P>
 					<P ALIGN=CENTER>Extended Code 39 + mod 43</P>
 				</TD>
 			</TR>
+			<TR VALIGN=TOP>
+				<TD WIDTH=150>
+					<P ALIGN=CENTER>107</P>
+				</TD>
+				<TD WIDTH=382>
+					<P ALIGN=CENTER><FONT FACE="Courier">BARCODE_AZTEC</FONT></P>
+				</TD>
+				<TD WIDTH=366>
+					<P ALIGN=CENTER>Aztec Code</P>
+				</TD>
+			</TR>
 			<TR VALIGN=TOP>
 				<TD WIDTH=150>
 					<P ALIGN=CENTER>110</P>
@@ -1296,6 +1307,28 @@ following table. For example</P>
 					Stacked component</P>
 				</TD>
 			</TR>
+			<TR VALIGN=TOP>
+				<TD WIDTH=150>
+					<P ALIGN=CENTER>120</P>
+				</TD>
+				<TD WIDTH=382>
+					<P ALIGN=CENTER><FONT FACE="Courier">BARCODE_KIX</FONT></P>
+				</TD>
+				<TD WIDTH=366>
+					<P ALIGN=CENTER>Dutch Post KIX Code</P>
+				</TD>
+			</TR>
+			<TR VALIGN=TOP>
+				<TD WIDTH=150>
+					<P ALIGN=CENTER>121</P>
+				</TD>
+				<TD WIDTH=382>
+					<P ALIGN=CENTER><FONT FACE="Courier">BARCODE_CODE32</FONT></P>
+				</TD>
+				<TD WIDTH=366>
+					<P ALIGN=CENTER>Code 32</P>
+				</TD>
+			</TR>
 		</TBODY>
 	</TABLE>
 </CENTER>
@@ -1352,6 +1385,16 @@ variable from the following table [2].</P>
 </CENTER>
 <P><BR><BR>
 </P>
+<P><A NAME="ROTATE"></A><FONT SIZE=5><B>4.7 Rotating the Symbol</B></FONT></P>
+<P>Rotating the output is done using the
+<FONT FACE="Courier, monospace">ZBarcode_Encode_and_Print_Rotated()</FONT>
+and <FONT FACE="Courier, monospace">ZBarcode_Print_Rotated()</FONT>
+functions. These take an extra integer argument giving the angle of
+rotation. Valid values are 0, 90, 180 and 270 degrees measured
+clockwise. For example the following code generates a symbol rotated
+by 90 degrees. Only PNG output can be rotated in this way.</P>
+<P>&nbsp;&nbsp;&nbsp;&nbsp;<FONT FACE="Courier, monospace"><FONT SIZE=2>error
+= ZBarcode_Encode_and_Print_Rotated(my_symbol, argv[1], 90);</FONT></FONT></P>
 <P><BR><BR>
 </P>
 <P>[1] This value is ignored for Australia Post 4-State Barcodes,
diff --git a/docs/bar38l.png b/docs/bar38l.png
new file mode 100644
index 00000000..ce3538f5
Binary files /dev/null and b/docs/bar38l.png differ
diff --git a/docs/bar38n.png b/docs/bar38n.png
new file mode 100644
index 00000000..38a23dbd
Binary files /dev/null and b/docs/bar38n.png differ
diff --git a/docs/bar38r.png b/docs/bar38r.png
new file mode 100644
index 00000000..8a4073af
Binary files /dev/null and b/docs/bar38r.png differ
diff --git a/docs/bar38u.png b/docs/bar38u.png
new file mode 100644
index 00000000..95b01bc7
Binary files /dev/null and b/docs/bar38u.png differ
diff --git a/docs/barext.png b/docs/barext.png
new file mode 100644
index 00000000..8cba1578
Binary files /dev/null and b/docs/barext.png differ
diff --git a/docs/border.png b/docs/border.png
index a186b431..1825c51b 100644
Binary files a/docs/border.png and b/docs/border.png differ
diff --git a/docs/box.png b/docs/box.png
index 0f848061..cad2528e 100644
Binary files a/docs/box.png and b/docs/box.png differ
diff --git a/docs/cca.png b/docs/cca.png
index c7743236..7c9459d4 100644
Binary files a/docs/cca.png and b/docs/cca.png differ
diff --git a/docs/ccb.png b/docs/ccb.png
index a554e4e8..a2e61311 100644
Binary files a/docs/ccb.png and b/docs/ccb.png differ
diff --git a/docs/ccc.png b/docs/ccc.png
index 0701ab17..a70fd649 100644
Binary files a/docs/ccc.png and b/docs/ccc.png differ
diff --git a/docs/codabar.png b/docs/codabar.png
index 5e05ebfa..d3c64ff4 100644
Binary files a/docs/codabar.png and b/docs/codabar.png differ
diff --git a/docs/code11.png b/docs/code11.png
index be419623..752b875b 100644
Binary files a/docs/code11.png and b/docs/code11.png differ
diff --git a/docs/code128.png b/docs/code128.png
index cfb244e2..92d03e8b 100644
Binary files a/docs/code128.png and b/docs/code128.png differ
diff --git a/docs/code39.png b/docs/code39.png
index c38180db..4df52554 100644
Binary files a/docs/code39.png and b/docs/code39.png differ
diff --git a/docs/composite.html b/docs/composite.html
index bec7c083..b5f4d40e 100644
--- a/docs/composite.html
+++ b/docs/composite.html
@@ -3,7 +3,7 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Composite Symbols</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="0;0">
 	<META NAME="CHANGED" CONTENT="20080316;12521000">
 	<META NAME="ProgId" CONTENT="FrontPage.Editor.Document">
@@ -222,7 +222,7 @@ the amount of error correction is determined by the amount of data to
 be encoded and the type of linear component which is being used. CC-A
 can encode up to 56 numeric digits or an alphanumeric string of
 shorter length. To select CC-A use <FONT FACE="Courier">--mode=1</FONT>.</P>
-<P ALIGN=LEFT><IMG SRC="cca.png" NAME="graphics1" ALIGN=LEFT WIDTH=223 HEIGHT=204 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=LEFT><IMG SRC="cca.png" NAME="graphics1" ALIGN=LEFT WIDTH=238 HEIGHT=218 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P ALIGN=LEFT><A NAME="CCB"></A><FONT SIZE=5><B>5.3.2 CC-B</B></FONT></P>
 <P ALIGN=LEFT>This system uses MicroPDF417 to encode the 2D
@@ -231,14 +231,14 @@ correction is determined by the amount of data to be encoded and the
 type of linear component which is being used. CC-B can encode up to
 338 numeric digits or an alphanumeric string of shorter length. To
 select CC-B use <FONT FACE="Courier">--mode=2</FONT>.</P>
-<P ALIGN=LEFT><IMG SRC="ccb.png" NAME="graphics2" ALIGN=LEFT WIDTH=218 HEIGHT=200 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=LEFT><IMG SRC="ccb.png" NAME="graphics2" ALIGN=LEFT WIDTH=166 HEIGHT=218 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P ALIGN=LEFT><A NAME="CCC"></A><FONT SIZE=5><B>5.3.3 CC-C</B></FONT></P>
 <P ALIGN=LEFT>This system uses PDF417 and can only be used in
 conjunction with a GS1-128 linear component. CC-C can encode up to
 2361 numeric digits or an alphanumeric string of shorter length. To
 select CC-C use <FONT FACE="Courier">--mode=3</FONT>.</P>
-<P ALIGN=LEFT><IMG SRC="ccc.png" NAME="graphics3" ALIGN=LEFT WIDTH=322 HEIGHT=202 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=LEFT><IMG SRC="ccc.png" NAME="graphics3" ALIGN=LEFT WIDTH=348 HEIGHT=218 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <HR>
 <TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0>
diff --git a/docs/databar.png b/docs/databar.png
index 218cff47..2c0ba267 100644
Binary files a/docs/databar.png and b/docs/databar.png differ
diff --git a/docs/ean13.png b/docs/ean13.png
index 064b8729..a522b900 100644
Binary files a/docs/ean13.png and b/docs/ean13.png differ
diff --git a/docs/fourstate.html b/docs/fourstate.html
index 6f4455fe..efd177a0 100644
--- a/docs/fourstate.html
+++ b/docs/fourstate.html
@@ -3,7 +3,7 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>4-State Codes</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
 	<META NAME="CHANGED" CONTENT="20080316;13072500">
 	<STYLE TYPE="text/css">
@@ -176,7 +176,14 @@ which requires an 8-digit DPID input.</P>
 92) which requires an 8-digit DPID input.</P>
 <P ALIGN=CENTER><IMG SRC="auspost.png" NAME="graphics1" ALIGN=LEFT WIDTH=266 HEIGHT=20 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
-<P><A NAME="RM4SCC"></A><FONT SIZE=5><B>5.5.2 Royal Mail 4-State
+<P><A NAME="KIX"></A><FONT SIZE=5><B>5.5.2 Dutch Post KIX Code</B></FONT></P>
+<P>This Symbology is used by Royal Dutch TPG Post (Netherlands) for
+Postal code and automatic mail sorting. Data input can consist of
+numbers 0-9 and letters A-Z and needs to be 11 characters in length.
+No check digit is included.</P>
+<P><IMG SRC="kix.png" NAME="graphics4" ALIGN=LEFT WIDTH=174 HEIGHT=20 BORDER=0><BR><BR>
+</P>
+<P><A NAME="RM4SCC"></A><FONT SIZE=5><B>5.5.3 Royal Mail 4-State
 Country Code (RM4SCC)</B></FONT></P>
 <P>The RM4SCC standard is used by the Royal Mail in the UK to encode
 postcode and customer data on mail items. Data input can consist of
@@ -185,7 +192,7 @@ followed by house number. For example &quot;W1J0TR01&quot; for 1
 Picadilly Circus in London. Check digit data is generated by Zint.</P>
 <P ALIGN=CENTER><IMG SRC="rm4scc.png" NAME="graphics2" ALIGN=LEFT WIDTH=166 HEIGHT=20 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
-<P><A NAME="ONECODE"></A><FONT SIZE=5><B>5.5.3 USPS OneCode</B></FONT></P>
+<P><A NAME="ONECODE"></A><FONT SIZE=5><B>5.5.4 USPS OneCode</B></FONT></P>
 <P>Also known as the Intelligent Mail Barcode and used in the US by
 the United States Postal Service (USPS), the OneCode system is due to
 replace the PostNet and PLANET symbologies by 2009. OneCode is a
diff --git a/docs/frontend.html b/docs/frontend.html
index ac60b9e3..858ca9b2 100644
--- a/docs/frontend.html
+++ b/docs/frontend.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Using the Front End</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
-	<META NAME="CHANGED" CONTENT="20080309;20090400">
+	<META NAME="CHANGED" CONTENT="20080828;8094200">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -553,6 +553,14 @@ appropriate integer value in the following table.</P>
 					<P ALIGN=CENTER>Extended Code 39 + mod 43</P>
 				</TD>
 			</TR>
+			<TR VALIGN=TOP>
+				<TD WIDTH=139>
+					<P ALIGN=CENTER>107</P>
+				</TD>
+				<TD WIDTH=643>
+					<P ALIGN=CENTER>Aztec Code</P>
+				</TD>
+			</TR>
 			<TR VALIGN=TOP>
 				<TD WIDTH=139>
 					<P ALIGN=CENTER>110</P>
@@ -639,6 +647,22 @@ appropriate integer value in the following table.</P>
 					Stacked component</P>
 				</TD>
 			</TR>
+			<TR VALIGN=TOP>
+				<TD WIDTH=139>
+					<P ALIGN=CENTER>120</P>
+				</TD>
+				<TD WIDTH=643>
+					<P ALIGN=CENTER>Dutch Post KIX Code</P>
+				</TD>
+			</TR>
+			<TR VALIGN=TOP>
+				<TD WIDTH=139>
+					<P ALIGN=CENTER>121</P>
+				</TD>
+				<TD WIDTH=643>
+					<P ALIGN=CENTER>Code 32</P>
+				</TD>
+			</TR>
 		</TBODY>
 	</TABLE>
 </CENTER>
@@ -683,10 +707,10 @@ specified using the --border switch. For example:</P>
 	<COL WIDTH=128*>
 	<TR VALIGN=TOP>
 		<TD WIDTH=50%>
-			<P ALIGN=CENTER><IMG SRC="border.png" NAME="graphics2" ALT="bound symbol" ALIGN=MIDDLE WIDTH=238 HEIGHT=120 BORDER=0></P>
+			<P ALIGN=CENTER><IMG SRC="border.png" NAME="graphics2" ALT="bound symbol" ALIGN=MIDDLE WIDTH=238 HEIGHT=138 BORDER=0></P>
 		</TD>
 		<TD WIDTH=50%>
-			<P ALIGN=CENTER><IMG SRC="box.png" NAME="graphics1" ALT="boxed symbol" ALIGN=MIDDLE WIDTH=238 HEIGHT=120 BORDER=0></P>
+			<P ALIGN=CENTER><IMG SRC="box.png" NAME="graphics1" ALT="boxed symbol" ALIGN=MIDDLE WIDTH=238 HEIGHT=138 BORDER=0></P>
 		</TD>
 	</TR>
 </TABLE>
@@ -702,11 +726,12 @@ white symbol is shown on a black background. For example the command</P>
 -r -d 'This'</FONT></FONT></P>
 <P STYLE="font-style: normal">gives an inverted Code 128 symbol. This
 is not practical for most symbologies but white-on-black is allowed
-by the Data Matrix symbology specification.</P>
+by the Data Matrix and Aztec Code symbology specifications.</P>
 <P STYLE="font-style: normal">For more specific needs the foreground
-and background colours can be specified using the --fg= and --bg=
-options followed by a number in RGB hexadecimal notation (the same
-system used in HTML). For example the command 
+and background colours can be specified using the <FONT FACE="Courier, monospace">--fg=</FONT>
+and <FONT FACE="Courier, monospace">--bg=</FONT> options followed by
+a number in RGB hexadecimal notation (the same system used in HTML).
+For example the command 
 </P>
 <P STYLE="font-style: normal"><FONT FACE="Courier, monospace"><FONT SIZE=2>zint
 --fg=004700 -d 'This'</FONT></FONT></P>
@@ -717,16 +742,62 @@ shown below.</P>
 	<COL WIDTH=128*>
 	<TR VALIGN=TOP>
 		<TD WIDTH=50%>
-			<P ALIGN=CENTER><IMG SRC="green.png" NAME="graphics3" ALT="symbol with green ink" ALIGN=BOTTOM WIDTH=238 HEIGHT=120 BORDER=0></P>
+			<P ALIGN=CENTER><IMG SRC="green.png" NAME="graphics3" ALT="symbol with green ink" ALIGN=BOTTOM WIDTH=238 HEIGHT=138 BORDER=0></P>
 		</TD>
 		<TD WIDTH=50%>
-			<P ALIGN=CENTER><IMG SRC="pink.png" NAME="graphics4" ALT="symbol with pink paper" ALIGN=BOTTOM WIDTH=238 HEIGHT=120 BORDER=0></P>
+			<P ALIGN=CENTER><IMG SRC="pink.png" NAME="graphics4" ALT="symbol with pink paper" ALIGN=BOTTOM WIDTH=238 HEIGHT=138 BORDER=0></P>
 		</TD>
 	</TR>
 </TABLE>
 <P><BR><BR>
 </P>
-<P STYLE="font-style: normal"><A NAME="OTHER"></A><FONT SIZE=5><B>3.8
+<P STYLE="font-style: normal"><A NAME="ROTATE"></A><FONT SIZE=5><B>3.8
+Rotating the Symbol</B></FONT></P>
+<P STYLE="font-style: normal; font-weight: medium"><FONT SIZE=3>The
+symbol can be rotated through four orientations using the <FONT FACE="Courier, monospace">--rotate=</FONT>
+option followed by the angle of rotation as shown below. This option
+is only available with PNG output.</FONT></P>
+<DL>
+	<DL>
+		<DL>
+			<DD>
+			<TABLE WIDTH=1008 BORDER=1 CELLPADDING=4 CELLSPACING=3>
+				<COL WIDTH=501>
+				<COL WIDTH=480>
+				<TR VALIGN=TOP>
+					<TD WIDTH=501>
+						<P ALIGN=CENTER><IMG SRC="bar38n.png" NAME="graphics5" ALIGN=BOTTOM WIDTH=200 HEIGHT=118 BORDER=0><BR><BR><BR>
+						</P>
+						<P ALIGN=CENTER><FONT SIZE=3><FONT FACE="Courier, monospace">--rotate=0</FONT>
+						(default)</FONT></P>
+					</TD>
+					<TD WIDTH=480>
+						<P ALIGN=CENTER><IMG SRC="bar38u.png" NAME="graphics6" ALIGN=BOTTOM WIDTH=200 HEIGHT=118 BORDER=0><BR><BR><BR>
+						</P>
+						<P ALIGN=CENTER><FONT FACE="Courier, monospace"><FONT SIZE=3>--rotate=180</FONT></FONT></P>
+					</TD>
+				</TR>
+				<TR VALIGN=TOP>
+					<TD WIDTH=501>
+						<P ALIGN=CENTER><IMG SRC="bar38l.png" NAME="graphics7" ALIGN=BOTTOM WIDTH=118 HEIGHT=200 BORDER=0><BR><BR><BR>
+						</P>
+						<P ALIGN=CENTER><FONT FACE="Courier, monospace"><FONT SIZE=3>--rotate=270</FONT></FONT></P>
+					</TD>
+					<TD WIDTH=480>
+						<P ALIGN=CENTER><IMG SRC="bar38r.png" NAME="graphics8" ALIGN=BOTTOM WIDTH=118 HEIGHT=200 BORDER=0><BR><BR><BR>
+						</P>
+						<P ALIGN=CENTER><FONT FACE="Courier, monospace"><FONT SIZE=3>--rotate=90</FONT></FONT></P>
+					</TD>
+				</TR>
+			</TABLE>
+		</DL>
+	</DL>
+</DL>
+<P><BR><BR>
+</P>
+<P><BR><BR>
+</P>
+<P STYLE="font-style: normal"><A NAME="OTHER"></A><FONT SIZE=5><B>3.9
 Other options</B></FONT></P>
 <P STYLE="font-style: normal">Additional options are available which
 are specific to certain symbologies. These may, for example, control
diff --git a/docs/green.png b/docs/green.png
index 410d215a..149ddb8e 100644
Binary files a/docs/green.png and b/docs/green.png differ
diff --git a/docs/index.html b/docs/index.html
index 1cfdabee..2e684683 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Zint Barcode Generator</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070802;10154800">
-	<META NAME="CHANGED" CONTENT="20080422;8300800">
+	<META NAME="CHANGED" CONTENT="20080708;13393200">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -13,7 +13,6 @@
 		H1 { color: #000000 }
 		P { color: #000000 }
 		DT { color: #000000 }
-		DD { color: #000000 }
 		A:link { color: #0000ff }
 		A:visited { color: #840084 }
 	-->
@@ -22,7 +21,7 @@
 <BODY LANG="en-GB" TEXT="#000000" LINK="#0000ff" VLINK="#840084" BGCOLOR="#ffffff" DIR="LTR">
 <H1>Zint Barcode Generator</H1>
 <H3>by Robin Stuart</H3>
-<P>version 1.6, 22nd April 2008</P>
+<P>Version 1.6.3, 27th August 2008</P>
 <P>This document is a guide to Zint, the <I>libzint</I> library and
 the barcode symbologies supported by them.</P>
 <HR>
@@ -58,7 +57,9 @@ the barcode symbologies supported by them.</P>
 				</DT><DT>
 		3.7 <A HREF="frontend.html#COLOUR">Using Colour</A> 
 		</DT><DT>
-		3.8 <A HREF="frontend.html#OTHER">Other Options</A> 
+		3.8 <A HREF="frontend.html#ROTATE">Rotating the Symbol</A> 
+		</DT><DT>
+		3.9 <A HREF="frontend.html#OTHER">Other Options</A> 
 		</DT></DL>
 	<DT>
 	4. <A HREF="backend.html">Using the API</A> 
@@ -75,7 +76,9 @@ the barcode symbologies supported by them.</P>
 		4.5 <A HREF="backend.html#SYMBOL">Specifying a Symbology</A> 
 		</DT><DT>
 		4.6 <A HREF="backend.html#BOXES">Adding Boxes and Boundary Bars</A>
-				</DT></DL>
+				</DT><DT>
+		4.7 <A HREF="backend.html#ROTATE">Rotating the Symbol</A> 
+		</DT></DL>
 	<DT>
 	5. <A HREF="symbologies.html">Types of Symbol</A> 
 	</DT><DL>
@@ -100,9 +103,9 @@ the barcode symbologies supported by them.</P>
 				</DT><DT>
 				5.1.2.6 <A HREF="onedim.html#ITF14">ITF-14</A> 
 				</DT><DT>
-				5.1.2.7 <A HREF="onedim.html#DPLEIT">Deutche Post Leitcode</A> 
+				5.1.2.7 <A HREF="onedim.html#DPLEIT">Deutsche Post Leitcode</A> 
 				</DT><DT>
-				5.1.2.8 <A HREF="onedim.html#DPIDENT">Deutche Post Identcode</A> 
+				5.1.2.8 <A HREF="onedim.html#DPIDENT">Deutsche Post Identcode</A> 
 				</DT></DL>
 			<DT>
 			5.1.3 <A HREF="onedim.html#UPC">Universal Product Code (EN 797)</A>
@@ -146,6 +149,8 @@ the barcode symbologies supported by them.</P>
 				5.1.8.4 <A HREF="onedim.html#PZN">PZN</A> 
 				</DT><DT>
 				5.1.8.5 <A HREF="onedim.html#LOGMARS">LOGMARS</A> 
+				</DT></DT>
+				5.1.8.6 <A HREF="onedim.html#CODE32">Code 32</A>
 				</DT></DL>
 			<DT>
 			5.1.9 <A HREF="onedim.html#CODABAR">Codabar (EN 798)</A> 
@@ -244,16 +249,18 @@ the barcode symbologies supported by them.</P>
 			</DT><DT>
 			5.6.2 <A HREF="twodims.html#QRCODE">QR Code (ISO 18004)</A> 
 			</DT><DT>
-			5.6.3 <A HREF="twodims.html#MAXI">Maxicode (ISO 16023)</A></DT></DL>
+			5.6.3 <A HREF="twodims.html#MAXI">Maxicode (ISO 16023)</A> 
+			</DT><DT>
+			5.6.4 <A HREF="twodims.html#AZTEC">Aztec Code (ISO 24778)</A> 
+			</DT></DL>
 		<DT>
-		5.7 <A HREF="markings.html">Other Barcode-Like Markings</A> 
-		</DT><DL>
+		5.7 <A HREF="markings.html">Other Barcode-Like Markings</A></DT><DL>
 			<DT>
 			5.7.1 <A HREF="markings.html#FIM">Facing Identification Mark (FIM)</A>
-			</DT><DT>
+						</DT><DT>
 			5.7.2 <A HREF="markings.html#FLAT">Flattermarken</A> 
 			</DT></DL>
-		</DT></DL>
+	</DL>
 	<DT>
 	6 <A HREF="legal.html">Legal and Version Information</A> 
 	</DT><DL>
@@ -266,7 +273,7 @@ the barcode symbologies supported by them.</P>
 		</DT><DT>
 		6.4 <A HREF="legal.html#CREDITS">Sources of Information</A> 
 		</DT><DT>
-		6.5 <A HREF="legal.html#STANDARD">Standard Compliance</A>
+		6.5 <A HREF="legal.html#STANDARD">Standard Compliance</A> 
 		</DT></DL>
 	<DT>
 	A <A HREF="appxa.html">Appendix A: Character Encoding</A> 
@@ -275,20 +282,23 @@ the barcode symbologies supported by them.</P>
 		A.1 <A HREF="appxa.html#ASCII">ASCII Standard</A> 
 		</DT><DT>
 		A.2 <A HREF="appxa.html#LATIN1">Latin Alphabet No 1 (ISO 8859-1)</A>
-		</DT></DL>
+				</DT></DL>
 	<DT>
 	B <A HREF="appxb.html">Appendix B: Three Digit Country Codes (ISO
 	3166)</A> 
 	</DT><DT>
-	C <A HREF="appxc.html">Appendix C: GS1 General Specification</A>
+	C <A HREF="appxc.html">Appendix C: GS1 General Specification</A> 
 	</DT><DL>
 		<DT>
 		C.1 <A HREF="appxc.html#AI">Application Identifiers</A> 
-		</DT><DT>
-		C.2 <A HREF="appxc.html#FIELDS">Fixed Length Fields</A>
+		</DT><DT STYLE="margin-bottom: 0.5cm">
+		C.2 <A HREF="appxc.html#FIELDS">Fixed Length Fields</A> 
 		</DT></DL>
 </DL>
+<P>
+&nbsp;</P>
 <HR>
+<P>&nbsp;</P>
 <TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0>
 	<TR VALIGN=TOP>
 		<TD WIDTH=33%>
@@ -313,5 +323,7 @@ the barcode symbologies supported by them.</P>
 		</TD>
 	</TR>
 </TABLE>
+<P><BR><BR>
+</P>
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/docs/introduction.html b/docs/introduction.html
index fd6c9e09..4b0ab0ba 100644
--- a/docs/introduction.html
+++ b/docs/introduction.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Introduction</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
-	<META NAME="CHANGED" CONTENT="20080309;19055500">
+	<META NAME="CHANGED" CONTENT="20080714;8412100">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -49,8 +49,8 @@ Numeric, Code 39, Extended Code 39, Code 93, PZN, LOGMARS, Codabar,
 Pharmacode, Code 128, GS1-128, NVE-18, GS1 DataBar, DataBar-14,
 DataBar Limited, DataBar Extended, Code 16k, PDF417, MicroPDF417,
 Two-Track Pharmacode, PostNet, PLANET, Australia Post 4-State
-Symbols, RM4SCC, USPS OneCode, Data Matrix, QR Code, Maxicode,
-Composite Symbols, FIM and Flattermarken.</P>
+Symbols, Dutch Post KIX Code, RM4SCC, USPS OneCode, Data Matrix, QR
+Code, Maxicode, Composite Symbols, FIM and Flattermarken.</P>
 <P>In addition Zint also provides barcode stacking, colour options
 and a verification stage for SBN, ISBN and ISBN-13 data. The aim of
 the Zint project is to provide an open source API for encoding all
@@ -61,8 +61,20 @@ available. Please remember that, although a great deal of care has
 been taken to de-bug Zint, many of the symbologies have not been
 tested with commercial barcode scanners so you are recommended to
 test that symbols decode properly before you use them.</P>
-<P><BR><BR>
-</P>
+<H1><FONT COLOR="#ff0000">This project needs your support!</FONT></H1>
+<P><B>The Zint project is committed to providing the open source
+community with encoding software for all public domain barcode
+standards. For this we need access to the standard documentation and,
+unfortunately, this is not free. Your donation will contribute
+towards the purchase of standard documents from the ISO and ANSI.
+Standards which we hope to add to Zint in this way include Aztec
+Code, Codablock-F, Code 49, Supercode, Code One and (when it becomes
+available) Ultracode. If you have a preference regarding which
+standard you would like your donation to go towards then please let
+us know and we will reserve your donation for that standard. Thank
+you.</B></P>
+<P>To make a donation please go to:
+<A HREF="http://sourceforge.net/project/project_donations.php?group_id=199350">http://sourceforge.net/project/project_donations.php?group_id=199350</A></P>
 <P>[1] Note that some of these symbologies have more than one name,
 and that some of the names given in this list are not the official
 names for the symbologies referred to.</P>
diff --git a/docs/itf14.png b/docs/itf14.png
index d39be574..8fb6e804 100644
Binary files a/docs/itf14.png and b/docs/itf14.png differ
diff --git a/docs/kix.png b/docs/kix.png
new file mode 100644
index 00000000..5db14965
Binary files /dev/null and b/docs/kix.png differ
diff --git a/docs/legal.html b/docs/legal.html
index 95636201..7c55d908 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Legal and Version Information</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
-	<META NAME="CHANGED" CONTENT="20080422;8453800">
+	<META NAME="CHANGED" CONTENT="20080728;14235700">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -38,7 +38,7 @@
 <H1>6. Legal and Version Information</H1>
 <P><A NAME="LICENSE"></A><FONT SIZE=5><B>6.1 License</B></FONT></P>
 <P><IMG SRC="gplv3-127x51.png" NAME="graphics1" ALIGN=RIGHT WIDTH=127 HEIGHT=51 BORDER=0>Zint
-and <I>libzint</I> are Copyright &copy; 2008 Robin Stuart and are
+and <I>libzint</I> are Copyright © 2008 Robin Stuart and are
 distributed under the terms of the <A HREF="http://www.gnu.org/copyleft/gpl.html">GNU
 General Public License</A> version 3 [1]. See the file <FONT FACE="Courier">COPYING</FONT>
 for more information. The following terms form part of the GPL:</P>
@@ -50,21 +50,24 @@ version 3 of the License, or (at your option) any later version.</FONT></P>
 it will be useful, but WITHOUT ANY WARRANTY; without even the implied
 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
 the GNU General Public License for more details.</FONT></P>
-<P>Data Matrix code is Copyright &copy; 2004 Adrian Kennard, Andrews
-&amp; Arnold Ltd and &copy; 2006 Stefan Schmidt, used under the terms
-of the GNU General Public Licence.</P>
-<P>Reed-Solomon code is Copyright &copy; 2004 Cliff Hones, used under
-the terms of the GNU General Public Licence.</P>
+<P>Data Matrix code is Copyright © 2004 Adrian Kennard, Andrews &amp;
+Arnold Ltd and © 2006 Stefan Schmidt, used under the terms of the
+GNU General Public Licence.</P>
+<P>Reed-Solomon code is Copyright © 2004 Cliff Hones, used under the
+terms of the GNU General Public Licence.</P>
 <P>Portions of GS1 DataBar and Composite Symbology code are Copyright
-&copy; 2006 ISO/BSI Global and used with permission.</P>
-<P>Portions of OneCode code is &copy; 2006 United States Postal
-Service. This is indicated where appropriate in the source code and
-is used on the understanding that this code has been released to the
-public domain and that such use is intended by the copyright holder.</P>
-<P><I>libqrencode</I> is Copyright &copy; 2006, 2007, 2008 Kentaro
+© 2006 ISO/BSI Global and used with permission.</P>
+<P>Portions of OneCode code is © 2006 United States Postal Service.
+This is indicated where appropriate in the source code and is used on
+the understanding that this code has been released to the public
+domain and that such use is intended by the copyright holder.</P>
+<P><I>libqrencode</I> is Copyright © 2006, 2007, 2008 Kentaro
 Fukuchi and is released under the terms of the GNU General Public
 Licence.</P>
 <P>QR Code is a registered trademark of Denso Corp. of Kariya, Japan.</P>
+<P><IMG SRC="rse_logo.png" NAME="graphics2" ALIGN=RIGHT WIDTH=120 HEIGHT=64 BORDER=0>Zint.org.uk
+website design and hosting provided by <A HREF="http://www.rsewebsolutions.co.uk/">RSE
+Web Solutions.</A></P>
 <P><A NAME="PATENT"></A><FONT SIZE=5><B>6.2 Patent Issues</B></FONT></P>
 <P>All of the code in Zint is developed using information in the
 public domain, usually freely available on the Internet. Some of the
@@ -156,6 +159,14 @@ Reed-Solomon functions – this also fixes a bug in Maxicode error
 correction and replaces the last of the Lien code. Added PNG output
 for Maxicode symbols. Removed some useless code. Updated QR support
 for <I>libqrencode</I> v2.0.0. 22/4/2008</P>
+<P>v1.6.1 – Major restructuring of PNG generating code: Now draws
+UPCA and EAN symbols properly and puts human readable text into the
+image. Also corrected some nasty 'never ending loop' bugs in Code 128
+and check digit bugs in PostNet and Planet. 8/7/2008</P>
+<P>v1.6.2 – Added KIX Code support and PNG image rotation.
+Corrected a bug affecting extended ASCII support in Code 128 and Code
+16k. 28/7/2008.</P>
+<P>v1.6.3 – Added Aztec Code and Code 32 support.</P>
 <P><A NAME="CREDITS"></A><FONT SIZE=5><B>6.4 Sources of Information</B></FONT></P>
 <P>Below is a list of some of the sources used in rough chronological
 order:</P>
@@ -221,6 +232,9 @@ Symbology (RSS) bar code symbology specification</P>
 <P>BS ISO/IEC 24728:2006 Information technology – Automatic
 identification and data capture techniques – MicroPDF417 bar code
 symbology specification</P>
+<P>ISO/IEC 24778:2008 Information technology – Automatic
+identification and data capture techniques – Aztec Code bar code
+symbology specification</P>
 <P ALIGN=LEFT><BR><BR>
 </P>
 <P ALIGN=LEFT>[1] Some of the third party code in this library was
diff --git a/docs/msi.png b/docs/msi.png
index 90e5abc1..fc9d357a 100644
Binary files a/docs/msi.png and b/docs/msi.png differ
diff --git a/docs/onedim.html b/docs/onedim.html
index 13319c40..a56a1e2d 100644
--- a/docs/onedim.html
+++ b/docs/onedim.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>One-Dimensional Symbols</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
-	<META NAME="CHANGED" CONTENT="20080316;11412400">
+	<META NAME="CHANGED" CONTENT="20080719;21533300">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -46,7 +46,7 @@ spaces of differing widths.</P>
 Matrix and is primarily used in telecommunications. The symbol can
 encode any length string consisting of the digits 0-9 and the dash
 character (-). One modulo-11 check digit is calculated.</P>
-<P ALIGN=CENTER><IMG SRC="code11.png" NAME="graphics1" ALIGN=LEFT WIDTH=225 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="code11.png" NAME="graphics1" ALIGN=LEFT WIDTH=190 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="CODE25"></A><FONT SIZE=5><B>5.1.2 Code 2 of 5</B></FONT></P>
 <P>Code 2 of 5 is a family of one-dimensional symbols, 8 of which are
@@ -79,16 +79,16 @@ numeric input (digits 0-9).</P>
 <P>ITF-14, also known as UPC Shipping Container Symbol, Case Code and
 EAN-14, is based on Interleaved Code 2 of 5 and requires a 13 digit
 numeric input (digits 0-9). One modulo-10 check digit is calculated.</P>
-<P><A NAME="DPLEIT"></A><FONT SIZE=4><B>5.1.2.7 Deutche Post Leitcode</B></FONT></P>
+<P><A NAME="DPLEIT"></A><FONT SIZE=4><B>5.1.2.7 Deutsche Post Leitcode</B></FONT></P>
 <P>Leitcode is based on Interleaved Code 2 of 5 and is used by
-Deutche Post for mailing purposes. Leitcode requires a 13-digit
+Deutsche Post for mailing purposes. Leitcode requires a 13-digit
 numerical input and includes a check digit.</P>
-<P><A NAME="DPIDENT"></A><FONT SIZE=4><B>5.1.2.8 Deutche Post
+<P><A NAME="DPIDENT"></A><FONT SIZE=4><B>5.1.2.8 Deutsche Post
 Identcode</B></FONT></P>
 <P>Identcode is based on Interleaved Code 2 of 5 and is used by
-Deutche Post for mailing purposes. Identcode requires an 11-digit
+Deutsche Post for mailing purposes. Identcode requires an 11-digit
 numerical input and includes a check digit.</P>
-<P ALIGN=CENTER><IMG SRC="itf14.png" NAME="graphics2" ALIGN=LEFT WIDTH=451 HEIGHT=177 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="itf14.png" NAME="graphics2" ALIGN=LEFT WIDTH=382 HEIGHT=150 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="UPC"></A><FONT SIZE=5><B>5.1.3 Universal Product Code (EN
 797)</B></FONT></P>
@@ -119,7 +119,7 @@ number stating with the digit 1. For example:</P>
 <P><FONT FACE="Courier, monospace"><FONT SIZE=2>my_symbol-&gt;symbology
 = BARCODE_UPCE;<BR>error = ZBarcode_Encode_and_Print(my_symbol,
 &quot;1123456&quot;);</FONT></FONT></P>
-<P><IMG SRC="upca.png" NAME="graphics3" ALIGN=LEFT WIDTH=272 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P><IMG SRC="upca.png" NAME="graphics3" ALIGN=LEFT WIDTH=288 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="EAN"></A><FONT SIZE=5><B>5.1.4 European Article Number
 (EN 797)</B></FONT></P>
@@ -150,14 +150,14 @@ The relevant check digit needs to be present in the input data and
 will be verified before the symbol is generated. In addition EAN-2
 and EAN-5 add-on symbols can be added using the + symbol as with UPC
 symbols.</P>
-<P><IMG SRC="ean13.png" NAME="graphics4" ALIGN=LEFT WIDTH=272 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P><IMG SRC="ean13.png" NAME="graphics4" ALIGN=LEFT WIDTH=288 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="PLESSEY"></A><FONT SIZE=5><B>5.1.5 Plessey</B></FONT></P>
 <P>Also known as Plessey Code, this symbology was developed by the
 Plessey Company Ltd. in the UK. The symbol can encode any length data
 consisting of digits (0-9) or letters A-F and includes a CRC check
 digit.</P>
-<P ALIGN=CENTER><IMG SRC="plessey.png" NAME="graphics5" ALIGN=LEFT WIDTH=461 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="plessey.png" NAME="graphics5" ALIGN=LEFT WIDTH=390 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="MSI"></A><FONT SIZE=5><B>5.1.6 MSI Plessey</B></FONT></P>
 <P>Based on Plessey and developed by MSE Data Corporation, MSI
@@ -243,7 +243,7 @@ options available:</P>
 </CENTER>
 <P><BR><BR>
 </P>
-<P ALIGN=CENTER><IMG SRC="msi.png" NAME="graphics6" ALIGN=LEFT WIDTH=244 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="msi.png" NAME="graphics6" ALIGN=LEFT WIDTH=230 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="TELEPEN"></A><FONT SIZE=5><B>5.1.7 Telepen</B></FONT></P>
 <P><A NAME="TELEPENASCII"></A><FONT SIZE=4><B>5.1.7.1 Telepen Alpha</B></FONT></P>
@@ -253,7 +253,7 @@ modulo-127 check digit.</P>
 <P><A NAME="TELENUM"></A><FONT SIZE=4><B>5.1.7.2 Telepen Numeric</B></FONT></P>
 <P>Telepen Numeric allows compression of purely numeric data into a
 Telepen symbol and includes a modulo-127 check digit.</P>
-<P ALIGN=CENTER><IMG SRC="telepen.png" NAME="graphics7" ALIGN=LEFT WIDTH=378 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="telepen.png" NAME="graphics7" ALIGN=LEFT WIDTH=320 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="CODE39"></A><FONT SIZE=5><B>5.1.8 Code 39</B></FONT></P>
 <P><A NAME="CODE39STAND"></A><FONT SIZE=4><B>5.1.8.1 Standard Code 39
@@ -281,7 +281,12 @@ modulo-10 check digit.</P>
 Symbols) is a variation of the Code 39 symbology used by the US
 Department of Defence. LOGMARS encodes the same character set as
 Standard Code 39 and adds a modulo-43 check digit.</P>
-<P ALIGN=CENTER><IMG SRC="code39.png" NAME="graphics8" ALIGN=LEFT WIDTH=244 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P><A NAME="CODE32"></A><FONT SIZE=4><B>5.1.8.6 Code 32</B></FONT></P>
+<P>A variation of Code 39 used by the Italian Ministry of Health
+(Ministero della Sanità) for encoding pharmacode data on
+pharmaceutical products. Requires a numeric input up to 8 digits
+in length. Check digit is added by Zint.</P>
+<P ALIGN=CENTER><IMG SRC="code39.png" NAME="graphics8" ALIGN=LEFT WIDTH=206 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="CODABAR"></A><FONT SIZE=5><B>5.1.9 Codabar (EN 798)</B></FONT></P>
 <P>Also known as NW-7, Monarch, ABC Codabar, USD-4, Ames Code and
@@ -292,7 +297,7 @@ Codabar can encode any length string starting and ending with the
 letters A-D and containing between these letters the numbers 0-9,
 dash (-), dollar ($), colon (:), slash (/), full stop (.) or plus
 (+). No check digit is generated.</P>
-<P ALIGN=CENTER><IMG SRC="codabar.png" NAME="graphics9" ALIGN=LEFT WIDTH=194 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="codabar.png" NAME="graphics9" ALIGN=LEFT WIDTH=164 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P><A NAME="PHARMA"></A><FONT SIZE=5><B>5.1.10 Pharmacode</B></FONT></P>
 <P>Developed by Laetus, Pharmacode One-Track is used for the
@@ -309,7 +314,7 @@ supports full ASCII text and uses a three-mode system to compress the
 data into a smaller symbol. Zint automatically switches between modes
 and adds a modulo-103 check digit. Code 128 is the default barcode
 symbology used by Zint. In addition Zint supports the encoding of
-Latin-1 (non-English) characters in Code 128 symbols. The Latin-1
+Latin-1 (non-English) characters in Code 128 symbols [1]. The Latin-1
 character set is shown in <A HREF="appxa.html">Appendix A</A>.</P>
 <P><A NAME="CODE128B"></A><FONT SIZE=4><B>5.1.11.2 Code 128 Subset B</B></FONT></P>
 <P>It is sometimes advantageous to stop Code 128 from using subset
@@ -334,7 +339,7 @@ data. The following is an example of a valid GS1-128 input:</P>
 <P>A variation of Code 128 the Nummber der Versandeinheit standard
 includes both modulo-10 and modulo-103 check digits. NVE-18 requires
 a 17 digit numerical input.</P>
-<P ALIGN=CENTER><IMG SRC="code128.png" NAME="graphics11" ALIGN=LEFT WIDTH=291 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="code128.png" NAME="graphics11" ALIGN=LEFT WIDTH=246 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <P ALIGN=LEFT><A NAME="DATABAR"></A><FONT SIZE=5><B>5.1.12 GS1
 DataBar (ISO 24724)</B></FONT></P>
@@ -380,7 +385,17 @@ C</A>). </SPAN><FONT SIZE=3><SPAN STYLE="font-weight: medium">The
 following is an example of a valid DataBar Expanded input</SPAN></FONT></P>
 <P ALIGN=LEFT STYLE="font-weight: medium"><FONT FACE="Courier, monospace"><FONT SIZE=2>zint
 --barcode=31 -d &quot;[01]98898765432106[3202]012345[15]991231&quot;</FONT></FONT></P>
-<P ALIGN=CENTER><IMG SRC="databar.png" NAME="graphics12" ALIGN=LEFT WIDTH=357 HEIGHT=140 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=CENTER><IMG SRC="databar.png" NAME="graphics12" ALIGN=LEFT WIDTH=302 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
+</P>
+<P ALIGN=LEFT>[1] Extended ASCII support requires the input data to
+be in a plain ASCII format. This can be difficult to do from the
+command prompt which may use the UTF-8 standard or similar
+international character support. An example program <FONT FACE="Courier, monospace">exttest.c</FONT>
+is included in the frontend folder to show how extended ASCII can be
+used to produce the following symbol. Extended ASCII characters may
+not display properly in EPS images due to the restrictions of the EPS
+format.</P>
+<P ALIGN=LEFT><IMG SRC="barext.png" NAME="graphics13" ALIGN=LEFT WIDTH=246 HEIGHT=118 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
 <HR>
 <TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0>
diff --git a/docs/pink.png b/docs/pink.png
index e7a619e6..1a2c338f 100644
Binary files a/docs/pink.png and b/docs/pink.png differ
diff --git a/docs/plessey.png b/docs/plessey.png
index e3f4504d..1193d2d4 100644
Binary files a/docs/plessey.png and b/docs/plessey.png differ
diff --git a/docs/rse_logo.png b/docs/rse_logo.png
new file mode 100644
index 00000000..27bef469
Binary files /dev/null and b/docs/rse_logo.png differ
diff --git a/docs/symbologies.html b/docs/symbologies.html
index f49b1715..98496d37 100644
--- a/docs/symbologies.html
+++ b/docs/symbologies.html
@@ -3,7 +3,7 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Types of Symbol</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
 	<META NAME="CHANGED" CONTENT="20080316;13273800">
 	<STYLE TYPE="text/css">
@@ -66,7 +66,7 @@ has a page dedicated to it.</P>
 					<P ALIGN=CENTER><A HREF="onedim.html">One-Dimensional</A></P>
 				</TD>
 				<TD WIDTH=318>
-					<P ALIGN=CENTER><IMG SRC="box.png" NAME="graphics1" ALIGN=BOTTOM WIDTH=238 HEIGHT=120 BORDER=0></P>
+					<P ALIGN=CENTER><IMG SRC="box.png" NAME="graphics1" ALIGN=BOTTOM WIDTH=238 HEIGHT=138 BORDER=0></P>
 				</TD>
 				<TD WIDTH=247>
 					<P ALIGN=CENTER STYLE="font-style: normal; font-weight: medium">Code
diff --git a/docs/telepen.png b/docs/telepen.png
index 2b309a97..d861a4ed 100644
Binary files a/docs/telepen.png and b/docs/telepen.png differ
diff --git a/docs/twodims.html b/docs/twodims.html
index 46a541f6..f3f3a16b 100644
--- a/docs/twodims.html
+++ b/docs/twodims.html
@@ -3,9 +3,9 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Two-Dimensional Symbols</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Linux)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Unix)">
 	<META NAME="CREATED" CONTENT="20070730;21081900">
-	<META NAME="CHANGED" CONTENT="20080422;8283700">
+	<META NAME="CHANGED" CONTENT="20080708;13271600">
 	<STYLE TYPE="text/css">
 	<!--
 		TD P { color: #000000 }
@@ -47,7 +47,7 @@ data and Reed-Solomon error correction is added.</P>
 <P><A NAME="QRCODE"></A><FONT SIZE=5><B>5.6.2 QR Code (ISO 18004)</B></FONT></P>
 <P>Also known as Quick Response Code this symbology was developed by
 Denso. QR Code support in Zint relies on <I>libqrencode</I> (version
-2.0.0) which is available from
+2.0.0 or later) which is available from
 <A HREF="http://megaui.net/fukuchi/works/qrencode/index.en.html">http://megaui.net/fukuchi/works/qrencode/index.en.html</A>.
 Support for QR Code through <I>libzint</I> means that developers only
 need to write handlers for one API which covers QR Code as well as
@@ -342,8 +342,143 @@ border width and output options will be ignored. Colour options are
 available as with other symbologies. PNG output is set at a
 resolution of 12 pixels per millimetre (approx 300 dpi) and uses the
 methods set out in Annex J of the ISO/IEC standard.</P>
-<P ALIGN=LEFT><IMG SRC="maxicode.png" NAME="graphics3" ALIGN=LEFT WIDTH=150 HEIGHT=150 BORDER=0><BR CLEAR=LEFT><BR><BR>
+<P ALIGN=LEFT><IMG SRC="maxicode.png" NAME="graphics3" ALIGN=LEFT WIDTH=200 HEIGHT=200 BORDER=0><BR CLEAR=LEFT><BR><BR>
 </P>
+<P><A NAME="AZTEC"></A><FONT SIZE=5><B>5.6.4 Aztec Code (ISO 24778)</B></FONT></P>
+<P ALIGN=LEFT>Invented by Andrew Longacre at Welch Allyn Inc in 1995
+the Aztec Code symbol is a matrix symbol with a distinctive bulls-eye
+finder pattern. Zint can generate Compact Aztec Code (sometimes
+called Small Aztec Code) as well as “full-range” Aztec Code
+symbols and by default will automatically select symbol type and size
+dependent on the length of the data to be encoded. Error correction
+codewords will normally be generated to fill at least 23% of the
+symbol. Two options are available to change this behaviour:</P>
+<P ALIGN=LEFT>The size of the symbol can be specified using the
+<FONT FACE="Courier, monospace">--ver=</FONT> switch followed by (or
+setting <FONT FACE="Courier, monospace">option_2</FONT> to) a value
+between 1 and 36 according to the following table:</P>
+<DL>
+	<DL>
+		<DL>
+			<DL>
+				<DL>
+					<DL>
+						<DL>
+							<DD>
+							<TABLE WIDTH=684 BORDER=1 CELLPADDING=4 CELLSPACING=3>
+								<COL WIDTH=184>
+								<COL WIDTH=473>
+								<TR VALIGN=TOP>
+									<TH WIDTH=184>
+										<P>Value Entered</P>
+									</TH>
+									<TH WIDTH=473>
+										<P>Symbol Generated</P>
+									</TH>
+								</TR>
+								<TR VALIGN=TOP>
+									<TD WIDTH=184>
+										<P ALIGN=CENTER>1-4</P>
+									</TD>
+									<TD WIDTH=473>
+										<P ALIGN=CENTER>Compact Aztec Code with [value] layers</P>
+									</TD>
+								</TR>
+								<TR VALIGN=TOP>
+									<TD WIDTH=184>
+										<P ALIGN=CENTER>5-36</P>
+									</TD>
+									<TD WIDTH=473>
+										<P ALIGN=CENTER>“Full-Range” Aztec Code with [value –
+										4] layers</P>
+									</TD>
+								</TR>
+							</TABLE>
+						</DL>
+					</DL>
+				</DL>
+			</DL>
+		</DL>
+	</DL>
+</DL>
+<P ALIGN=LEFT><BR><BR>
+</P>
+<P ALIGN=LEFT>Note that in symbols which have a specified size the
+amount of error correction is dependent on the length of the data
+input and Zint will allow error correction capacities as low as 3
+codewords.</P>
+<P ALIGN=LEFT>Alternatively the amount of error correction data can
+be specified by use of the <FONT FACE="Courier, monospace">--mode=</FONT>
+switch followed by (or setting <FONT FACE="Courier, monospace">option_1</FONT>
+to) a value from the following table:</P>
+<DL>
+	<DL>
+		<DL>
+			<DL>
+				<DL>
+					<DL>
+						<DL>
+							<DD>
+							<TABLE WIDTH=681 BORDER=1 CELLPADDING=4 CELLSPACING=3>
+								<COL WIDTH=220>
+								<COL WIDTH=434>
+								<TR VALIGN=TOP>
+									<TH WIDTH=220>
+										<P ALIGN=CENTER>Mode</P>
+									</TH>
+									<TH WIDTH=434>
+										<P ALIGN=CENTER>Error Correction Capacity</P>
+									</TH>
+								</TR>
+								<TR VALIGN=TOP>
+									<TD WIDTH=220>
+										<P ALIGN=CENTER>1</P>
+									</TD>
+									<TD WIDTH=434>
+										<P ALIGN=CENTER>&gt;10% + 3 codewords</P>
+									</TD>
+								</TR>
+								<TR VALIGN=TOP>
+									<TD WIDTH=220>
+										<P ALIGN=CENTER>2</P>
+									</TD>
+									<TD WIDTH=434>
+										<P ALIGN=CENTER>&gt;23% + 3 codewords</P>
+									</TD>
+								</TR>
+								<TR VALIGN=TOP>
+									<TD WIDTH=220>
+										<P ALIGN=CENTER>3</P>
+									</TD>
+									<TD WIDTH=434>
+										<P ALIGN=CENTER>&gt;36% + 3 codewords</P>
+									</TD>
+								</TR>
+								<TR VALIGN=TOP>
+									<TD WIDTH=220>
+										<P ALIGN=CENTER>4</P>
+									</TD>
+									<TD WIDTH=434>
+										<P ALIGN=CENTER>&gt;50% + 3 codewords</P>
+									</TD>
+								</TR>
+							</TABLE>
+						</DL>
+					</DL>
+				</DL>
+			</DL>
+		</DL>
+	</DL>
+</DL>
+<P ALIGN=LEFT><BR><BR>
+</P>
+<P ALIGN=LEFT>It is not possible to select both symbol size and error
+correction capacity for the same symbol. If both options are selected
+then the error correction capacity selection will be ignored.</P>
+<P ALIGN=LEFT>Aztec Code is able to encode any extended ASCII
+character data up to a maximum length of approximately 3823 numeric
+or 3067 alphabetic characters or 1914 bytes of data.</P>
+<P ALIGN=LEFT><IMG SRC="aztec.png" NAME="graphics4" ALIGN=BOTTOM WIDTH=114 HEIGHT=114 BORDER=0></P>
 <HR>
 <TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0>
 	<TR VALIGN=TOP>
diff --git a/docs/upca.png b/docs/upca.png
index a365f795..f453f70d 100644
Binary files a/docs/upca.png and b/docs/upca.png differ
