--- zogiLib/zpt/head_js.zpt	2005/11/08 10:13:31	1.1
+++ zogiLib/zpt/head_js.zpt	2010/10/15 13:01:21	1.7
@@ -1,29 +1,44 @@
-<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'jslib_js'"></script>
-<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'dllib_js'"></script>
+<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'template/jslib_js'"></script>
+<script type="text/javascript" tal:attributes="src python:here.zogilibPath()+'template/dllib_js'"></script>
 <script type="text/javascript" tal:content="structure python:'''\n
   base_init();\n
   var baseUrl = '%s';\n
   var toolbarEnabledURL = '%s';\n
   var dlTarget = '%s';\n
   window.name = dlTarget;\n
-  document.id = dlTarget;\n
-  newParameter('fn', '', 1);\n
-  newParameter('pn', '1', 1);\n
-  newParameter('ws', '1.0', 1);\n
-  newParameter('mo', '', 1);\n
-  newParameter('mk', '', 3);\n
-  newParameter('wx', '0.0', 2);\n
-  newParameter('wy', '0.0', 2);\n
-  newParameter('ww', '1.0', 2);\n
-  newParameter('wh', '1.0', 2);\n
-  newParameter('pt', '0', 1);\n
-  newParameter('brgt', '0.0', 3);\n
-  newParameter('cont', '0.0', 3);\n
-  newParameter('rot', '0.0', 3);\n
-  newParameter('rgba', '', 3);\n
-  newParameter('rgbm', '', 3);\n
-  newParameter('ddpi', '', 1);\n
-  newParameter('ddpix', '', 1);\n
-  newParameter('ddpiy', '', 1);\n
-  dl_param_init();\n
-'''%(here.zogilibPath(), here.getToolbarPageURL(), here.getDLTarget())"></script>
+  document.id = dlTarget;\n'''%(here.zogilibPath(), here.getToolbarPageURL(), here.getDLTarget())"/>
+<script type="text/javascript">
+  newParameter('fn', '', 1);
+  newParameter('pn', 1, 2);
+  newParameter('ws', '1.0', 2);
+  newParameter('mo', '', 2);
+  newParameter('wx', '0.0', 4);
+  newParameter('wy', '0.0', 4);
+  newParameter('ww', '1.0', 4);
+  newParameter('wh', '1.0', 4);
+  newParameter('brgt', '0.0', 4);
+  newParameter('cont', '0.0', 4);
+  newParameter('rot', '0.0', 4);
+  newParameter('rgba', '', 4);
+  newParameter('rgbm', '', 4);
+  newParameter('ddpi', '', 8);
+  newParameter('ddpix', '', 8);
+  newParameter('ddpiy', '', 8);
+  // non-digilib parameters have detail level 32
+  newParameter('mk', '', 64);
+  newParameter('pt', '0', 128);
+</script>
+<script type="text/javascript" tal:condition="exists:options/newparams" tal:repeat="p options/newparams" tal:content="python:'''\n
+  newParameter('%s', '%s', %s);\n'''%(p[0],p[1],p[2])"/>
+<script type="text/javascript">
+  dl_param_init();
+</script>
+<script type="text/javascript" tal:condition="python:here.getDLParam('pt', None) is not None" 
+  tal:content="structure python:'''setParameter('pt', %d);'''%here.getPT()"></script>
+<script type="text/javascript" tal:condition="exists:options/fn" tal:content="python:'''\n
+  // fn and pn defined outside -- mask in URL\n
+  setParameter('fn', '%s');\n
+  setParameter('pn', '%s');\n
+  dlUrlParamMask = 254;
+'''%(options.get('fn'),options.get('pn', 1))"/>
+  
\ No newline at end of file