--- documentViewer/zpt/page_main_text.zpt	2010/06/17 17:35:24	1.5.2.1
+++ documentViewer/zpt/page_main_text.zpt	2011/07/29 10:32:26	1.18
@@ -1,16 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <!--  block used for definitions and scripts in head -->
-  <metal:block metal:define-macro="head">
-  </metal:block>
-</head>
-<body>
-  <!-- block used for main content area -->
-  <metal:block metal:define-macro="main" tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn','')">
-    <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo, highlightQuery=highlightQuery, sn=sn, pageinfo=pageinfo)"></div>
-  </metal:block>
-</body>
-</html>
+<tal:block tal:define="pageinfo python:options.get('pageinfo',None); 
+                       docinfo python:options.get('docinfo',None);
+                       highlightQuery python:pageinfo.get('highlightQuery','');
+                       s python:pageinfo.get('s','');
+                       pn python:pageinfo.get('pn',1);
+                       characterNormalization python:pageinfo.get('characterNormalization','');
+                       optionToggle python:pageinfo.get('optionToggle','');">
+  <div tal:content="structure python:pageinfo['textPage']"></div>
+  
+</tal:block>
\ No newline at end of file
