Index: openacs-4/contrib/packages/simulation/lib/sim-insts-grouped.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-insts-grouped.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/lib/sim-insts-grouped.adp	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1 @@
+<p><listtemplate name="sims"></listtemplate></p>
Index: openacs-4/contrib/packages/simulation/lib/sim-insts-grouped.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-insts-grouped.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/lib/sim-insts-grouped.tcl	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1,58 @@
+simulation::include_contract {
+    Displays grouped list of simulations in development and casting for the current simulation package instance.
+
+    @author Joel Aufrecht
+    @creation-date 2003-11-12
+    @cvs-id $Id: sim-insts-grouped.tcl,v 1.1 2003/12/11 13:21:52 joela Exp $
+} {
+}
+
+######################################################################
+# Set general variables
+
+set package_id [ad_conn package_id]
+set user_id [auth::get_user_id]
+set base_url [apm_package_url_from_id $package_id]
+set add_url "${base_url}/siminst/simulation-new"
+set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+
+#---------------------------------------------------------------------
+# sims: simulations in development or casting
+#---------------------------------------------------------------------
+
+template::list::create \
+    -name sims \
+    -multirow sims \
+    -actions "{New Simulation From Template} $add_url" \
+    -no_data "You have no Simulations in Development or Casting" \
+    -elements {
+        status {
+            label "Status"
+        }
+        count {
+            label "Count"
+        }
+    }
+
+# if user is admin, show all.  otherwise, show only records owned by user
+if { $admin_p } {
+    set sim_filter_sql ""
+} else {
+    set sim_filter_sql "and ao.creation_user = :user_id"
+}
+
+db_multirow -extend { cast_url } sims select_sims "
+    select ss.sim_type as status,
+           count(w.workflow_id) as count
+      from workflows w,
+           sim_simulations ss,
+           acs_objects ao
+     where w.object_id = :package_id
+       and ss.simulation_id = w.workflow_id
+       and ao.object_id = w.workflow_id
+       and (ss.sim_type = 'dev_sim' or ss.sim_type = 'casting_sim')
+     group by ss.sim_type
+    $sim_filter_sql
+" {
+    set cast_url [export_vars -base "cast-edit" { workflow_id }]
+}
Index: openacs-4/contrib/packages/simulation/lib/sim-objects-grouped.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-objects-grouped.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/lib/sim-objects-grouped.adp	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1 @@
+<p><listtemplate name="objects"></listtemplate></p>
Index: openacs-4/contrib/packages/simulation/lib/sim-objects-grouped.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-objects-grouped.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/lib/sim-objects-grouped.tcl	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1,77 @@
+simulation::include_contract {
+    Displays a grouped list of simulation objects for the current simulation package instance.
+
+    @author Joel Aufrecht
+    @creation-date 2003-11-12
+    @cvs-id $Id: sim-objects-grouped.tcl,v 1.1 2003/12/11 13:21:52 joela Exp $
+} {
+}
+
+######################################################################
+# Set general variables
+
+set package_id [ad_conn package_id]
+set user_id [auth::get_user_id]
+set base_url [apm_package_url_from_id $package_id]
+set create_p [permission::permission_p -object_id $package_id -privilege sim_object_create]
+
+if { ![exists_and_not_null parent_id] } {
+    set parent_id [bcms::folder::get_id_by_package_id -parent_id 0]
+}
+
+
+######################################################################
+#
+# objects list 
+#
+######################################################################
+
+#---------------------------------------------------------------------
+# Set up supporting variables for list
+
+set add_url [export_vars -base "[ad_conn package_url]citybuild/object-edit" { parent_id }]
+
+if { $create_p } {
+    set actions "{Add an object} $add_url"
+} else {
+    set actions ""
+}
+
+#---------------------------------------------------------------------
+# Set basic elements list
+set elements {
+    pretty_name {
+        label "Type"
+        orderby upper(ot.pretty_name)
+    }
+    count { 
+        label "Number"
+        orderby count
+        link_url_col view_url
+    }
+}
+
+######################################################################
+template::list::create \
+    -name objects \
+    -multirow objects \
+    -actions  $actions \
+    -elements $elements 
+
+#---------------------------------------------------------------------
+# database query
+
+db_multirow -extend { view_url } objects select_objects "
+    select ot.pretty_name,
+           count(*) 
+      from cr_folders f,
+           cr_items i,
+           acs_object_types ot
+     where f.package_id = :package_id
+       and i.parent_id = f.folder_id
+       and ot.object_type = i.content_type
+     group by ot.pretty_name
+    [template::list::orderby_clause -orderby -name "objects"]
+" {
+    set view_url $base_url/citybuild/TODOfilter
+}
Index: openacs-4/contrib/packages/simulation/lib/sim-objects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-objects.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/simulation/lib/sim-objects.tcl	2 Dec 2003 13:46:53 -0000	1.9
+++ openacs-4/contrib/packages/simulation/lib/sim-objects.tcl	11 Dec 2003 13:21:52 -0000	1.10
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     display_mode {
-        allowed_values {edit display display-grouped}
+        allowed_values {edit display}
         default_value display
     }
     size {
Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl	11 Dec 2003 13:19:22 -0000	1.10
+++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl	11 Dec 2003 13:21:52 -0000	1.11
@@ -18,7 +18,7 @@
     display {}
 
     edit {
-	set add_task_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { workflow_id } ]
+	set add_task_url [export_vars -base "[apm_package_url_from_id $package_id]jsimbuild/task-edit" { workflow_id } ]
     }
 }
 
Index: openacs-4/contrib/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-templates.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl	2 Dec 2003 17:29:48 -0000	1.8
+++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl	11 Dec 2003 13:21:52 -0000	1.9
@@ -120,9 +120,13 @@
            (select count(action_id)
               from workflow_actions
              where workflow_id = w.workflow_id) as task_count
-      from workflows w, acs_objects a
+      from workflows w, 
+           sim_simulations ss,
+           acs_objects a
      where w.workflow_id = a.object_id
+       and ss.simulation_id = w.workflow_id
        and w.object_id = :package_id 
+       and ss.sim_type in ('dev_template','ready_template')
    [template::list::orderby_clause -orderby -name sim_templates]
 " {
     set description [string_truncate -len 200 $description]
Index: openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/sql/postgresql/Attic/simulation-priv-test-users-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql	2 Dec 2003 17:29:48 -0000	1.2
+++ openacs-4/contrib/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql	11 Dec 2003 13:21:52 -0000	1.3
@@ -1,4 +1,4 @@
-1-- create dummy users for permissions testing
+-- create dummy users for permissions testing
 -- create each user and then assign appropriate privs directly
 
 -- this is a temp solution - should instead create all the groups 
Index: openacs-4/contrib/packages/simulation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/contrib/packages/simulation/www/index.adp	2 Dec 2003 17:24:32 -0000	1.25
+++ openacs-4/contrib/packages/simulation/www/index.adp	11 Dec 2003 13:21:52 -0000	1.26
@@ -2,29 +2,11 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-
-<div style="margin: 4px; padding: 4px; border: 1px solid black;">
-  <h3><a href="simplay/">SimPlay</a></h3>
-
-  <if @user_id@ ne 0>
-    <include src="/packages/simulation/lib/cases" party_id="@user_id@"/>
-  </if>
-  <else>
-    <u>Log in</u> to see your active cases.
-  </else>
-
-    <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/>
-</div>
-
-<div style="margin: 4px; padding: 4px; border: 1px solid black;">
-  <h3><a href="yellow-pages">Yellow Pages</a></h3>
-</div>
-
 <if @citybuild_p@>
 <div style="margin: 4px; padding: 4px; border: 1px solid black;">
   <h3><a href="citybuild/">CityBuild</a></h3>
 
-  <include src="/packages/simulation/lib/sim-objects" size="short" display_mode="display"/>
+  <include src="/packages/simulation/lib/sim-objects-grouped/">
 </div>
 </if>
 
@@ -37,8 +19,26 @@
 </if>
 
 <if @siminst_p@>
-<div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid
+<div style="margin: 4px; padding: 4px; border: 1px solid
 black;">
   <h3><a href="siminst/">SimInst</a></h3>
+    <include src="/packages/simulation/lib/sim-insts-grouped"/>
 </div>
-</if>
\ No newline at end of file
+</if>
+
+<div style="margin: 4px; padding: 4px; border: 1px solid black;">
+  <h3><a href="simplay/">SimPlay</a></h3>
+
+  <if @user_id@ ne 0>
+    <include src="/packages/simulation/lib/cases" party_id="@user_id@"/>
+  </if>
+  <else>
+    <u>Log in</u> to see your active cases.
+  </else>
+
+    <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/>
+</div>
+
+<div style="margin: 4px; padding: 4px; border: 1px solid black;">
+  <h3><a href="yellow-pages">Yellow Pages</a></h3>
+</div>
Index: openacs-4/contrib/packages/simulation/www/simulation-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/simulation-master.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/simulation-master.adp	18 Nov 2003 13:31:33 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/simulation-master.adp	11 Dec 2003 13:21:52 -0000	1.7
@@ -1,15 +1,14 @@
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="subnavbar_link">@subnavbar_link;noquote@</property>
 
+
 <property name="header_stuff">    
   <link rel="stylesheet" type="text/css" href="resources/under-construction.css" media="all">
 </property>
-<if @admin_p@>
-  <property name="subnavbar_link">
-      <a href="@parameters_url@">Configuration</a> | <a
-       href="@documentation_url@">Documentation</a> | <a href="/test/admin/index?by_package_key=simulation&view_by=testcase&quiet=0">Tests</a>
-</property>
+
 </if>
 <slave>
 
+
Index: openacs-4/contrib/packages/simulation/www/simulation-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/simulation-master.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/simulation-master.tcl	18 Nov 2003 13:31:33 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/simulation-master.tcl	11 Dec 2003 13:21:52 -0000	1.4
@@ -1,5 +1,50 @@
 set package_id [ad_conn package_id]
 set return_url [ad_return_url]
-set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+
 set parameters_url [export_vars -base "/shared/parameters" {package_id return_url}]
-set documentation_url /doc/simulation
\ No newline at end of file
+set base_url [apm_package_url_from_id $package_id]
+
+######################################################################
+#
+# Build a link bar for the subsite
+#
+######################################################################
+
+set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+set citybuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create]
+set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create]
+set siminst_p [permission::permission_p -object_id $package_id -privilege sim_inst]
+
+if { $citybuild_p } {
+    lappend subnavbar_list [list "${base_url}citybuild" "CityBuild"]
+}
+
+if { $simbuild_p } {
+    lappend subnavbar_list [list "${base_url}simbuild" "SimBuild"]
+}
+
+if { $siminst_p } {
+    lappend subnavbar_list [list "${base_url}siminst" "SimInst"]
+}
+
+lappend subnavbar_list [list "${base_url}simplay" "SimPlay"]
+
+if { $admin_p } {
+    lappend subnavbar_list [list $parameters_url Configuration] 
+    lappend subnavbar_list [list "/test/admin/index?by_package_key=simulation&view_by=testcase&quiet=0" Tests]
+}
+
+lappend subnavbar_list [list "/doc/simulation" "Doc"]
+
+# TODO: should use ad_navbar
+# couldn't figure out how to pass the input to ad_narbar so hacking it in here
+# and also added context checking
+set link_list ""
+foreach arg $subnavbar_list {
+    if { [string match *[lindex $arg 0]* [ad_conn url]] } {
+        lappend link_list "[lindex $arg 1]"
+    } else {
+        lappend link_list "<a href=\"[lindex $arg 0]\">[lindex $arg 1]</a>"
+    }
+}
+set subnavbar_link "\[[join $link_list " | "]\]"
Index: openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/generate-xml.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.adp	13 Nov 2003 14:55:26 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.adp	11 Dec 2003 13:21:52 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/citybuild/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/citybuild/index.adp	2 Dec 2003 13:46:53 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/citybuild/index.adp	11 Dec 2003 13:21:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/citybuild/object-delete.adp	13 Nov 2003 14:55:26 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-delete.adp	11 Dec 2003 13:21:52 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	2 Dec 2003 13:46:53 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	11 Dec 2003 13:21:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">object.title</property>
Index: openacs-4/contrib/packages/simulation/www/doc/data-model.dia
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/data-model.dia,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/doc/data-model.dia	3 Dec 2003 15:00:49 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/doc/data-model.dia	11 Dec 2003 13:21:52 -0000	1.8
@@ -1,89 +1,94 @@
-��}M��8��޿B���Dd��A�`k�'���c��S5o��Tr,�
-���ܼ��J�!%%�![�iG��)���x.�{�=�?���j9�WVVy���##��$[ϊy�^�������������<���oQ���~Ǻ2?���7�����G�|�Һ(�2 U���K���g=���0����<�S��oӺ.��u6Y��엏��ٗEY<����v�fŲ('�J��|����ǟw��y�:'��I��2K��4����!��d��eW������i�nȑ��3f7�҃֋?�����-�~�z��=j�^��"_���?����`�A���z��׫�^��Wɦ(�2���>�2K�[#w�ʆ�f�R?��A	�Br�������y��C�d�1����������W����}�x��_���s,�|~�q�8r��sJ�v}��?���'��W��e�6�����_�i��~G���v�gb{����\e2����C>Ϫ��m̑+���������`��:�24&��SV�.�����d��|ΛO���٬�M��:]��r>�������u�w>����������Ŵ��l���薱�D�&��<��{�q���χ&J=�t�Xfo�(c%��[ňd����aF�e�JfE�~�Gur��C�~�H�$L���_?0�=W�����r���>B�0:3����k�	d�Q��I�^�{�ce�<%e:���_%����_n�<���f4��&�b[�alkǠ����qNbx��m.��ջ��C����p>�5������Tn�Lo%����H��N��
vD���b��f
aؾ^l����p��9�nU$�/��ދ��HLoCA$�b
-=F�(�e��I��7��=˖a��"�(xG��lsx#m��>]��;ѝ��`�Éi�<�uZ�IZ�����3���v'����2[/NOA����������ψ:^��'�jb��ǀ[{��wO��+�{� MxC�ú0��q���>Ӿ�{˛����A쿛��1���Ǎ��#6�h���1#\Bo�BR����77����ÿ;��ý��p��b��e�8����c�tv�QH�	Wːȡ�^;7�oIo�c"�ϡ>����1&iu��J3���v������"^N�����I~����t�q��:�Z�H��9�b��|����ˉ<������O��U�|��������~�y��[�+[�+��Y��M����A˺#݌�{�v%L�_;(EB&����(��-R�J��b��ڿ�׽��Қ���G�/�S�
-�|�1F���X�eS������4���Ns�Y.��>SO�0ϩ��w��5��D�5���݆��7ő{�) 2��oM-P{���Q��녀*���1&i�)�>w��b슱+��]�j2��Ci�bW<ʮ���^8]�Uղt�1�I�I&��/`��$�v��6����,�O��x��$m��p��n��C���1{���W�*��t����~���
-����lBC��{�OgU�P�l*��ߛ�j_���a�)�'���Py7Ul�2m�ھL=�XNj�.������{��ٹ+�l�q��%�}�6�/D��uQ��er�Cz�;Z�ڤ������̳r��g��N�q�b��*��}>t����l�?�oao��N�T}��D�t';�5?�uc�s���=|��Y��?3�OK��hԇӗ��O��)]{�������c���ݗy}����6��	^���~��qVfӒ/�������޲I�,����&լh0�;rh?d�^3�0c��yV��|c�|@��X#g��ݭ�0p�7ָ��Ú~$����F
-��.����=>�ݛ�b�nz���
-��.���-��ER��N�9��8}�3K+�
pz
�,VXs@gt��:W�^��%D?wT(�6z��
-���W�-J\%b�:ј��x�۷4�U�EkǷ������c�@`
X���N1"�[����Dl��VQӸBR"$��>��R��`~�$Tҳ����D����
B����A��\-8v�XB���m��{�d$c,�gZB���N����\si��9Q���F���!4a�s)
-][E�$�����/XG�_GC"l�����$����4�`ץT��g�SS}F��´B�e�re�6�(>O�����.���d0���i�P��
-������_�!v���)��nԶ�/�޻~��G�����GҲ
-_3�N?/��@2:��	�N(tB�
-�P脎j	:��	m�rm�|��O�/���.ϖ磝��:��*��c�O9��ߔ��w��b�
-����
-�����7a�?Lʫ%n�@A#,��MJ�Ƭ-���)A�db�j[&��>g���o�"[�����7<�^Cސ��x�ҷ����>����m��(m�;Rr��bx��_��1%����	�YRN����1�+�_�X@b�W@^
y��W@^
y������A��0hG\!����>?S��-u�%��It����<�4���W@\
q�W@\
q�W@\
�D�~zէ|�)]�����C�N�ҧ�mF�闹`L�hgJ��[�XD[�l���fF���662V�5V�{��ށ��5	N��
-8��>��ԏg��%�3,tU�:TF�Ҳ,���:^:Yf����W�&:? Kè[�>u�=Z�̞�,��������*w��
8�<{�7�X��b�d0I���9i��� Kg��������C}���$��ћ	����*]?M��:���oU���.�擙~ޫۻ������9�Ǟ�k��o��szW�}Ą��+D>��d�6v��sƨ��32T��r3�:��q�Y┄�䨝Ƀ���qK�,����@��7�괬;w�������o���C��f�A��A�;h�g��*'���x#n˽�wi#J��$��ۈ5��-I
-�S�SD�}ʡ�$�Ϡ7���a���@n�
jL`78	��v�
-`7�����^���d8�=H 9\�����)ـtY�A��o��l]�e2���\?rfieRL���Zt���:}�3�*"���۵+��
�����1��-Kq]�Y2Ok�	!@������y2(�� u��V�3wM����&�TQ�u-8�M�XD��٬"R5{�~��PL>�/c�e��p�J�#O�5�~w�5��Z��
-D��_ ‚���lc��@��&�Շ(�=��x�|,�/w��B]�BP����b�e1�BP��ԅ�.u!�N���GT��*9��9���d��(��;p���O�u��9@T�����⤳/�"K�dO@���]qP��9��3ϪY�o�-�)���d��2�>���W���^",�*�G$�Jx3�������_�
-͍.��xazv��ܧ*2�$���Ϊd������oྡ�3�oཱྀ���o�e.�70ߐBXI�W�H/��W0x����L*�$_�g�P�GB���Z�Q}������������;ð�c��9���S��U1����`ر�N�'�C	�w�����
-���:u�eIU�5*M
T,\[�B�\�F����0��R�Ϛm��gS"�ކ���v����҅Q�iS� 	�Y� H8~�9��j
UWV��nE(Z@��P���-�9�d
%��!�8�����x�t���Q����͈�J ��
#T��H���'g��5�k������!���9�8��C �8���uD �8�.���Z�ը�7�
-�W���b+�c�Jآ�6f��\6:�B�dR�����_l/LҽPvR�<٤e����
-�l#���6�l#����%���MBۣ��]$��2 :�������m�XoD��,����9��AC�6Qm�����v��]P[\09;Y���Fal���Fal���*�O��GX
aD��06P�\>j��P"�
-� �}y1���t=O���v�)_|J���-����ّQ��aL��g4ۘ��M�PNoÐ����P�sQ��I3���kG��0JI O��w�zO�(��Oq�;���xU�Pe�Pk?�,K��wݢ;���BG~�:4���'iY�ǿ4N/�,�����+W����Y�^gͩ�z�}>�2�׾nլ�������{	��of�73쿛�����Ԩ9v�c����j��Sb�V�l�p��7?2��_�6��aR�
-b4���ff�p|1|1|q�/~�N{9�8���X��7N��G�cZ�_?N�c�u��[cGo���٥ycm'���Xm��`��z�}�o�X�����{��zk�Mw��]��ְ��W�jm�!%�$�6���){u�m�k�L+�AQנ�Y�����/�.�8���X\f���>��7l,B��=�q��
�6.�` |2|2|���1?X�������NJ�h�)��� ,#'ܱ�zww�-��7>�Y��M�+�9|l�D[;�[�x��r���w��Z
-2��E8Tl���G�Ƈ�8���8{����]:�7����V8�4v��Jnp�7ح��83݌��^�����U�?���$�	��̀ld3~�����̀ld3 �
��f�,��?B��
-!�=�:���\�O�b�
�@��tP�]ЖQq����V��8n�rqH�Ʃ�lwT�ujva9�G�?*7�[)�("�x�q��m�qww��!�x�q��!w*�����!�P\��R�'@����Mܘ�
�
k�,�Y�h��4=@��+K��|[�����ؓt��p�>�O�����\�
tk�TuQ���
t@o��^7b�^71��(��m
j<m�6E�ҩ
��~l��Zƙ��1�o�N���w�"�^�_�iYw��3����kd�:�!::�DpE/�
-tF��r��R�W�Ő��ٔ��2"j���0x�O�2O��8~[m���QO���*݀N
-:5�ԠSC�tjЩA��tj��u�zX6k1H� � �ӟT�O`�T6H�\k�'���:���Dd�g�H\`���D��k��`,��!
-!h�]E�I��׺�'�tg���
�,<�5#�k��*Ehd:DE�Е�k�uB<s4�_w���_Ά�����~ ������<[~���v��1�[6�pJŇ�Y5Y���/'�r9��&[����'������2�F��D�,"C�"dC��]@�-(@�_��e��y�~}A�
-f�E/����Ѡ�^�φ�=��70���xu?|+{��zC�1�5b"��ѻ��&c&��l=_=嗻�^�gi�%�b�̵7E�y[�m���)�Y#o��-���~�y[�� s�z��*�z�2��`�%{b� �1��̠���"8t��(�T)=O?Ucgz�B���c�^�v�T&f��D�`�$�ҹ�Ya��F�akto@�ak��Qn���E,�y���5�p�¡�	j�����Z�_3=03ϪY�ojHic�
rz�?|^�սavc�����Cg�����%��۠nY%�t�xH��@�O���@ �o� ��Pӻ��VK�
x���X��c2q�;�:$�G�$�K�I,����U8������!Q,�[Y��l=�֊k������R���፼\��7z�LЛǟ���\������	��Գ�"�oomjכG�2�yAh��7�(�+��+��NƨB�JdP"se%2�P!�
-TȠB2��A�̑������A��'r!Ȭ �����eV��r1�~�rRF�iH�x85���ƶ
-����ѩ��5ͼ�c!˂,�B�o�e	�~�D�4�a�i�h�1���c���VED����s��M>%p�zwB���P��U�)�
-R*H�@u9�mN��Yr*ȩ ���
-r*'s*z��1�S�O郚b���M�
l�TAR��*�r�U"�卥@EM��`��dK	c��*W�I�r$RP��c����r?;�qF�F�vr>���BB���ډ3ʉL{̀��}x�[���Pq~y.���C�.�S���.�8rI�yH	��};rc������ n~d�oV��I�o�^�I�
-b�u�2s����ZQ�-	�#�F���
-��uQu�^�:�^��b�Θ�����&Fϴ��̝n*=�T���	ON���[!HFac;���Ǧ�2V�;�w�����\Ӌ�����@у��n���_��f?(���|�1m�Ho���z���n�]۸�Q��Q�@q8������[��;������{Opy>�#y�$9	Ý���$ϧ�Q�v����`�C	d} ���>�� 냬oE�o��P@c���й�˪N̨
-�}����F`�8�
-p�b�k+v��E)��B%��e7
-b�����PW
-b�Dۖ�p(���
��� &(��hzr�\�w�r��0��t�}����"��tI��t����>=�O�O�O�<�~�{�t����w�_�\x�D;�1���6��?�d�y�iE�K����4t"�<
��0O�<
��0O�<�H6[G�D�u��y� y��9��8�W��Do{����vru���h'����ehR�AD�T�!��wG;�F�C�N��D��ǣ���i'd_�6��F�[%̨b"��*�*�j�I���Ů�.S
-](��]A��1GQZ��Ͻ��}�=_=,�����L~M��B�a�S��!w�.z��!F��>�㰭���g����^���SA��Ѐ��0A�}�����5�#a�7qL��b�^Ki�S��"���gیR��\�6������5�ˢ>\�i&X讄̟U)��3L�b�ٔa�1E���w&�(���L0�	V�l��,l�,�m�o>��>�`��]��+�'v��x�"��PdL5���[��|�"�y��B"奝��������ɯzw�s�E8�\�:��p.¹�"��.�\�GL��%��K�h�#���E�w�(��c�cQ~�[�8�H�#�D�i��H�H�#�D8�HtQ�g�{'���0j��}�∰���RH��6f�K7�6+�Eg-�l6�l���Z���f�f�5s�5;��d�O��8���:ŃsF"��k�o�LM�F`�Tm�l�r��w��=1��e1���+T�D�gı�Bq,H`zꃷ�=��*�0���<6�t�l �1?��6�:��&�T�O���O:���P�5֨��/�
dk���٠
5@
-�ʯ��F��3`�<<cgz�m)b�y��D���p_<�&�R�gY
-�
�`�i�
�`�i�
�����#�� �p�eh�{p����2�ɕ�*qȦ-�7Q��
�uh��<��$Dz������NT�u���
-������y��r���'Vb�#�ˉYԴ�:C5q/��^^^�G��/ޑ��k�0E�^�UR��%��N�7m~
-�I�4���슉c�9>I��s|�2�g�URf�
->d���C�2���!Ç2|��ug����=���׻�bHs�BB��C
�o	�ڤu6O�A1,<���?F��N���{ݗr����
j�`�X�|�)]c����O��_������m�n�4j@�Z.������6��a�z$�%G��YQ�-��#Ӄ�؉��Iñ!�PL�LD/��:�u?O𤯌��2j:��}e����Ҿ�t�(6����9A�a��%���|(����J��:|%.d<�R}�U��w����s�{[ᣮ�m�W�m�U�J��@\���{��� �oX��KK��m���P��%�y�)���bE��R+�ݧ&V��W@eNg�.�Y��V3X�`5��V3X�`5���=�o^G��~�c�!S���
f�{�̳jV曣��� �i��W��ݚ7�
-pc�Iֲ������Q���
p�֠�����:͗�
-p����E�&���?(��>�������F)�
pk�.��b�M['������)�<�
.K��.A�P�E}s�e	�{.J���h8�1�����쾇�9��tWE²��G��(H@A
-P���$� 
	(H@A
-_@p	�0�� �AApܠ 
�
j�$8
-��	��s�T�l�䈬
;�j��G��u�J7�Fl��<��,�E
�2��=d�����,�D
����>��
-�
j�{E���T)5@
-PcON�_ �@��T=gU����ۨ���ۨ���6:�����,6����t=��
]�z@������t=a@P��0] ȁ�p�@��
j��z8t=�����s��y,�/UrW��
-p�X�̪|���8P�lP�p�U	���z��s}��#�Z�U&H�~�L��
-$�Jy�8�b* L���(c�4!
-�j�6M�O=s�[o�}�
-|����/2�˳��oi�N�Q̳�ͤ�/��ɲX�ti�=,�'oR����x���Jj�)��;xǨkcսm�:���S����쳴��<�2_��-7����s��b���4^�l�_��k׳{x�B{�����ս�{�����Pv���ę�)kC/͔UD?��e��6Sv��M�U�4�.��Z�v�ܪ	N^A�
-�P`�+X��
-V(�B�
-�P`�`)��(�f�X
9@
-����A�P"ȏ(O��Iit�<�6�&O����˓Ɨ�'�(D��R$K�,E��R$K�,E��R$KP@�R`�A��
r�,n�$K�����=Y�F(*�D��c�b^�
-w��2)�Д�߰�%|���0O��~�ώ~�m-��
-���"��C"�T$R�HE"�T$R�HE"�����V2��: �X�5v�m���&wy��W��;��]U�.v�ة���1hf�S���(\F�6�F�+��1&i�SC�iV���~�uuZ}A�a:���C�a:���C�a�~�m��D�A�P%�2� �g�/��<)T
;�N�^��|���
-�7��r��3"'A�0&��w��-_g-lE��2"�
-���<�A*©�7�]hJ��w�_0E��
-��I��7��=˖a�����E:����F^�?0���_~w�0�3,t0-(�뢪:-�$-������3�'�l�8=�n��c�vY�;?#�xi�Ы��>�A�Ae��A�wxoy7۽;������XT1g�7Lpy�վ���;�}��Q��+��q^v���Ҋ=����R#m�VYrW�����c`�i;wwC�=��c`��=���ǚ���c��)�;6���jlei�BU�5�*�
-� ��W��/>��c�>Nd.�(f�\���hW$l2+���I5[��IwR�erm�j;��$8��QM�q\�e��:�"^c'^��� ���a�����������v���gDLF�������@No3�׿���87;9O�S��c~�OBn��v��An��vΟ�	����q��;�2�w��\�	ROV��>_g�#D�����c
-�F
�PR�]����vц�m�8�Y�~֭�kGI�a��� �]z�:}�}l����K����?B��s2��R������X��=ܖ#E��]v�C��Ҁ��ƨ[�u��evm�Af9�v9�E:|}�3F�)J,YG����^)�8��e����x����G�X-��-U�m�.7P����F��!6{oI���s�A��٤(���LQ2�$�c���r����r�x������f#׈�0�I�g�s��^�5��kޤ�y�"��-��׺+8y0��*U�ߠ��A��"wp*�2����u��nF��n���E���{[��1��X%<&��b},�zd�<R�����෬����I��Ѵ�����5%��F��S�ς�����6Lˌe1KGU�zw!G�kp"�_�a�D�aX���:��H���C�����1
-1 �v����=�����D_uU�Q��ڞ?8)L�HDt.���Ɉd�g7�l����T�j��s��23D��U�pU��!���/ު;n��'��g�V���jH��V�cL�6�*��y�T ��(*���E5�L��
-a�3�Qc6��PDgY@�Dd��zEh~���q	��_b��q�� b��eA�Mx"vW��6�.��k���Rd���ۘ��,ԅ$}6e����s�!���ૼ�{N�N�b?e�v<�'�U-���VI����,�.�ӛ`>�rhQ�)�	�iWYU��zЛ���&~�����&�7
-qh�Cm�Cmb�y<��8&�%~�Z�u����
H�8=�s��s���+��@��:���.]I��c
-��(fJ)�)��*���$cS�9��Į����R�zOeA�p�x{A���!��c<y9�s�ؚ���������:�un6d�v��,@���Q�՗
-D=@��D=@��D=,�nz눦� z w�8�L�o�n8��4��������}����A�
-Y��ʺu��ñ���1l�!ENo�t�
-�9B��c�zp�;�yJ�t�PA �l���)�Y#��@6�d#��@�ɸB�yD(�l���B����:�7U$��!�
-�Xc�%x�
- �遜�(�Q:p�p�so�cF
8�c
-�M�����9���I�:��u�?��=~�y^'wy��W@���Ǧ���S�d���2�'��
|��3ϪY�oLj�
r��!�IV�*K�`B��U�+D���Hr�S�0�q��㪆c/�3xr6U�_�1�(ªj�Z�r
��\@��;��A�*P���T.|w��.�l��#t��1��FT�kD�.,*�F��S���.~��Y[|N9����&�w!�΅1�\�Ċ(9�
-CG&jƆF����O�I��Z۠�nۗ�h7džk�4s*ʼ%�t�7��N�6�>ԅ>����
-F��R?������q��b�d��^b�:I˲x<��q�|�d�����܍t~LCU��s_��˥�}B�&��|�]`4�o���!���������6X�T��TT�X^�R���ε�`+,VX��X}����XY�����~U���k��R���
-?ιhV�����#�Q44��^'��^�Z�y|��ah��6���ruGG���)�iG.�}O8�qF��+�uF8l0��r��H;�ƌ!�ɈH�nX��ܦf�X<�B�2�����M�W_
+��}�s�8����
+E�e7�B A���٘鉉=��ll�^� %Z�$*Hz\�|���ɔ��R��該1	�/
d�|���m���+-�,����y�n��"�,����}*?��?��"K���[�z�ޱ)�O�|����~���񑬞ʤ���H������*�Y
+���?M&o/�H�D�n�ۤ�����J'�d����6�]��f��7�Wy1�W����Ow��>�����{�9q�m�Lo�4�z��T�/��\z���]o�2SC���!G����͘ݨR
+�,���_���[����Zm7z�H�N�e�yoG}6��`�A���:������W��x�U�d�{�y�J�Mc�.Y��pC�<Y����4(�“�n�.���cU�ZYx���{#٦��6����ly_Y^�����z�e�-N;��G�RN�o|���xrg�_Y�ݮҶ9�|���O�\��;�א׷[>�Վ.R��T�_���"-;��1G�t��sק~8��i~u�e�M�����]����������7�B~���M��*�,�b1�N������Q;�l�������pB�bʇ��|���C4e, ���""���w�q{{h�P�H6�U�ƌ�V|1�JF�7̧D3���u<ϋ��=ʨ���z�G�	¤�<���>�sU}������چѹ�3�F�٘��N 8��>�[��݋x+���"{(��x�o~� y0��5��h��M�Ŷ��XcG��G��qN"�w
+p�)� \0��w�D�m
��|�+�y�ctS�ؙM%�ƶ�9��fg�*F��|�<`�z��[�I[���o�ixè$��}9
+	��^\���lxD�0R�c�á_�f��E=�޳l��*�N���w�yXϷ�7�8�sѕ���?:��r�C�Y%E'E�?^>U�nw¬/��������Ώi�m�������}B�&��|4��Q�|��?�2�WR�7�?�r���>O^_Vg�wpoy3۽Y9��w3�>FspS�q���xȂ���l1¥祉Z@�?��x}C>>���p�ԇ���Fq�_��{�=fkD�p���5s����f<"��9P��m�|�I�����1���0�'�}�����6@�G>�o��b�0ΗP�ߪ��у1GW�␯p@}9B|9��=���7U�!���]��VO�~�M�yRVO;oݼ���տ�*�'o�t�;ha��;��ȾnwP��+%I�<;s�(9J�z��!��U�ܬ����u�����]ƨ����Tp�����$jٔ�/�jʡ'
+�����L�K?"��ԓG�������tM�1�gM;�}��t��8��=�D�~q���0
�gi6
+�fS�*�n�ǘ�٦���3슱+Ʈ�wŲ�`+��b�]�(�����oj��u��e��)Lj'�'?��Ǔ�Y�x��׳H=5��I֓4Y:��X���
+����9�2[��,�e������"���{̚�	���]?��q���Tr�ޛ�+W���a�-�'��P:7�o�"��ڮL=�Nj�.������{��ٹˋ�ٸu�׾^�ݗ
+��
+�&/��*>�!����M^n�y�~��k�Pdi1��3��܁Z'Ƹ�m�zZ���>���Qnb����ݷ��Q��v�����w"G�����ɺ�й�N�>k�,�
˝����{4������'�ٔ��������ep���]����K�>���`���>��Xz�yu8+�i�VY�t�dkyPo�$f��4@�r��?��9��2UV��`�1��"-�E��g> �
r������V_�
n�c���aM=@
+P��p
\�p
\Ƈ�����S1aSF����b�.���|Ϭf��l
�8N�̓�
p�^��+�5�@��:��UA�W�k	���뭂^�����~�[��ȺN4�/��u��-ͦR�h�Xc��_wlp�,@`
Y`A�tC��OXp�O��hl֍+%��n���Z�U�O�R8������Z<�6�!�������A��\-8,v�XB���m�=�u��HDXBϴ��z�s�@L���0�Bk_s"k�2O�Ch��˥4�m��(N�#,��`
+H�{A-�&!�w&	lfߧ���.���wz=05Sg�����.����(�4YG���4�/:�ksN��A�#�m��e�� ��Õ�v�?�]/geʫ��j��R�]}�z������#i؅���Z%��f�H�B':��	�N(tB�
+��Q-A':�m[�m����i�5}��e��|��ER%�Q�~l�)���R��N0[n����Q�C�����&���Ny����(h���w��ҡ1k���G�ڔG<��٫mA�j���O���t�����y���cx
+yC���kH���K�{���ﷹ磴��H1��R�z�ӄ�R�)�W�J���E@��%�`5O#�,aN�����$�+�`oy��W@^
y��Wh�q5��X �0�ŅA;�
+�x���=�����L5�ŗ�'��
+V�Ҹ�_W@\
q�W@\
q�W@\
q�W�
�U_��d�[�I�"�=�J��>%�-sA���Δ�fS���l����zF���662V�5V�{��ځ��5	N��
+8��>��R�g��%��,,tU�:TF�������Z^:^����ۗ�&:? Cè[�>u�=Z�̞�,�����2��J{��
8	{�7�X��b�d0A���9i�W� M���������Su��$Q�ћ	���ŧ�:�<M��:���oe���.K��z���]�W������c��5p^����9����>�#�E�B��H0Bk;>Q�9mT���Fj��k�^�8�qJqr�����K߸%U^�U�^�X�K��URT��Cf}qw�÷F��!�A3�O���g��*'���x-n˝�w)#R��$�i�j���
+I
+�S3SD�\ʡF$�Ϡ6���aU��@n�
jL`7X	��v�
+`7�����^���d8��=H 9\��>���(nZ�^?l�M��V@���C�<)u�	�
t�A�N��t@�/tƔEp�b��b�
p�!��z�6��њ���7y�Ƌ�B��z@�a�L�*]ċ��8��P�}�}58���H n��F.i�'��ya4{6+����=kC��_8&�ԗ�|�(5�����x
+������{kp>V��+D��\!R�m��U „�I���j��y��n�?�(Aa
+CP�SD�4Ba
+CP����0�ԩ�y����� ��7�p�����
r�1p�ɶ��� ȁL9ڟ
7�W�d�5Y����	�
r���+*� �ri9/�-��8�9C���u��?��>sϾ��i���N	oڐ�ؙMu�H3���b݌��g&��]�"3J��oɼ���
+�7p��}�
+-��}�
+�7p��}���T0��|CRa9$�~\�#������
p���Gsu����ls���[	!�|�Q�:��P������(�a�
v�a'Î
+�
ȓ��T��|��e)���c��6O���;8�<��=�@�t�"M�2/*T�:�X���ߺb!	
+8�a�$R�.k�)ƞMy�l0"k�>'��.�2O��A������.�3	�P�peU��P���-�h
E(Z@�‘�#JP���\O�B�C<񸫊�	�x�/k�
+��!ʌW[��l�3B�M��c�����C��|wM�b�q8���@:g!�@q�!gR֠���!�@���r@˾���A ��فu �k��y�X	۫����ٔ�Z��[2���L�ҭ�&�^(;.�o��z����m��F`�m��F`��t�&	�����.QD�CB�
p\����
+�7�
+��W�G�j��Am��g먶�A�fg[��,��]09;^�K���Fal���Fal���*�O��GX
aD�>n�
j.5�q(�lþ���U�Y$�b2�|ɖ_��o�&m�fK�hv�?n$t��fBqE$�i�(�YJp΋�>�g�~m�(1F)���qA�nT���E��=�)^c'^�J���*�]�e���[x��XX��OPB�f?6�8)�����Ʃ��U�Y��}ik��2�0�7��>�����W&����U���<y}y/�s��l�fF��w�w�����#G�r��H�fJ��
+������GF%q��f�2Lxf�
+;<���8___��߹�^�8
+��/���k'��?��X���׏��n��;�;������zcvi�X�	B�7��?���E*<��>�=��q�����ǎ����}��1��f�լd�T�ZY�I�
�g5C���v�Nr���8��tP�5��Ɔ/�/�/�狅�/��/�.3j��=>��7l�dw{&�t�.L\��@�d�d�d��c~��������%a�S���A>XFN�c����[d;o|�-���W�q�X�	;�[ly�7r���w��
+���E0Tl���G�Ƈ�8���8{�����"t�o󇟥�p�k?��̦R4?���Vΰ���nF@"�Z�||�2S��}�����f@6�?ݩ�Q�f@6��̀ld3N��?�!e�ކ�
艞l/2}B΋�x1����@��tP�^ЖQ�1�8*��4�8��rQ@�Ʃ�lwT�vjfa9�G�?*7W[)�("�x�q��5�;���C<�8���;QP[G���C(�W)� �	IN�n��׀�1dV�<Y
4Xg������E���|�`�
v�I:E}�
|��?|�M�ᣯ
+�:��1t�*/�e
+�:��]q�o�^7	Ϡ+)	æ5��F�"yaՀ�@?�mv-�������e���t�K��/���:k�����U�52V���~"�^/�tF��pֈlIߩ�b@�l��gS��" ���G��	�Z]����V���X�k�lA��tjЩ!o:5�ԠS�N
+:�A�:[?���j�v���O�V'0p�
�~�5���Km��g^��g��_`�@����k��`,��!
+!h�]��q��?�oU�Of#���9�|�Xx�1�)�<�JIh�;D��Е�[�uB<s4�_컖w���_Ά���*��z ��T���"]}���v¢O�M���'�R����l�jR�珓d���s�n����_�B�cr�J��v|a!��Щِ;xh�
+���������a�_��ك�ѫl�9v6�Yﳣ�����L�Ws����^)3��2����������$e&��l(_=��׻�Z��I�ƫ|/�;E��[$n���)�i!q��-�H�~�ĭ�t����=�y�=A)�^���>
1@c����fP�
+��e1:��(
+U)=OCUmg6�
a�ߑU3R�~�3	`"]�#8i��,���
+[#l��5�7 l��5�֨7B�� ��}D�Q8D����F�c�TY1z�����Y��ȶ����9�*�nWYy���Xt��:��Ygkic�
n�v�[��*�,�%��%��ө���b����`�
jzw�j�d�\�U�;�����ku4N"���D^�ז�fӈ�x�~������&N7�n���y�a�[*��<�������9��y�i�y���\p��<����|���sۜG��5�Q�ts�#����	uܜg�y�ʸzrP'�e��%2(���{C��A�*dP!�
+TȠB����	DT� ��9�dV�YAf��2+��Q��P�Q9!	B��H#y0Ӷ��ڶ�����ѩ���ݼ����eA�E���w˲�b?Q��t�a�i�p�1���c��l*C�lN���YL�$���]�;���O���:��)�T�:��J�S�h���
+r*ȩ ����ɜ��:Bq��S��&���do
$U�T������r��0��ڒ/ú\�c��dK	c��*W�H�r$RP��c�����r?Y�qF�F�rr.���B�WGʉ3ʉ�1�1}8��msl��7��C�p���s�ܳ�8t�¿d�/��#�ڑ��ȵ#�V���p1��Q�#�|x#�����}x���HM�� �Y�(=7�n`��E֒>�it�;����W�P�E�Pe���C�/Y &����-�qt@kb�L;j����g��*S���	�&�l�y$ �
+�t�cSm���;Uw*����\Ӌ�����@у��n���_�Dz?(���|�66vX���jk��,��[g�6�'~�k`�5�;t�{ll��-�ɭ����G¾'�8���8�?��N�H:�?��?r�(\�hH��B�p��!��>�@�Yd}��A�7"��{G( ���~O��eEY�zT	�>H�@�y#�d��A�˵����t�����2�j1�����P}(1N¦�%
+b`u�5��)���ut.��1W�ܧ��(��.�O�2�a(k�.�s�.z���٧����������r/��}>��{b��+��}�ܓp�=Ѧvܓ�FX�瞌1O3�Hyi����N$�'`��y�	�'`��y�	�'I�z��H�N�;�$ϑ<pz
���l�mO6r��N��v^��#~ �:E��)��a~@B��h'M<�)J�(<�I��v�G��j��r�U´*�G<O:�\�j�j�I ��ŮP.S](�U]A��1GQZ��Ͻ��}�=[?����'��L~M��B�a�S��!w�.z��!F��>�㰭���g����^e�ͱSA��Ѐ��0A�}�����5�%#�E7QD�#�^K*�iS�D^���϶�$�.�sM�YGpX�;���"\��.��pY��`��2V�T[ �L0e��gS�	�$��/|�L�Q����`��|�>�
+6�Y�`#XB�`�|0�
+|0����<>��W�O�8��E4<ۡH��E
���|�"�y��"ĥ����M7���ɯjw�s�E8�\�:��p.¹�"��.�\�GL��%��K���`��"�:Y�_ڱ�1/�ޭ�G�p$‘G��?E4M#��p$‘G"�p$��ҳ���_�o�R�.DQHX�Xm)�|6��BF5��G�u�Y�$�Fu!�i��lp�E�jͬk��0�Sl�o�����9#�[��;3]���>�C[9F�,'�
r��#�s����<#�u�
+��c��8�X�c!�	LG}�v�G�_�&��z�G�f�l�-�� ���&�ċLG���	�
x��Ij���5s�
2� c����4���P�UЈQx���g��̦�'aCs�3���	� $�%π��ԉ��>M+0
+�4�L0
+�4�L0
+�4�'���5���+-C�ֵW��.e��!�B��3^G�zԡ���XH��uh�y�:���C;QI�]�4L�c�:�����⺞Xz��|.'fa�����}���#xqxqx�͋�.�xG�o����.�uگ�zM-1U�s��i�S0�O����fVL9��	����:Ӯ�"]���!Ç2|�	G�>d���C��;çv��L�!����C�3�
+�|O��&��E��?�Oo�h�*Y:(�t�u_�EZ���
��b�_��dy�
��?u�aT�w.f�Z�>�iT��\T�q7��m��Ä�0c�w8����"kI٘��N�FL�	���`ҏ`��"���Z���O�ʐ��+úS���W���Ԗ�}��G1��'x�	��-�䨯�C�(���W����+�gCƓ�)է]%�|W)�wq�ro+|�U�m��*���jW���ˡ}{o��G�
+�CœzIm)z�4��!�ae��ǘ���w)VĨ+���}�cuiqT�d^%X�`5��V3X�`5��V3X�Γ��ud���?�2UV��`�1��"-�E�=���
r����{��ݭ�0p�7�=��a-��
j�5m0�i
+�?�o7I�n���\ `�,S6�N�P��
|��%�e>ϴR��8��
\��|�������S�xH\�4@G]�7B���͝�%hC�(!�PF�����5խg�*���]	�|��� 
	(H@A
+P���$� 
	(H@|
�9$3�
+� 	�
+p����
jP��8(Hn�$>��e��l�@�"�Yv��$.���>��x�lQ��6(�
x��Y���
dsȤU��i��1�}V�=P�5�8���Rj��Ɯ��� @����U�z�֪?W�Qm�M�Q)��mt�)^u��m�o��
]�z@������t=��
]�z €�t=�`�@�]����P�5��p�z7�
+t=��r��_��./���1�M���"�<.�
p��
ؠ*�ʫ~���")��G��j�L��F�$�7��J���)�0)뮣��9 r��J2.�`�Qj��)/�i�{����.K��%U2�G�HW7��>T#&�|�͓�����I�ܮ���(X���S�!w��P�F�{�u�����߃;l	�'i�9�U��[m^�?u�#��f�����;�<�2�W�g��T�r4����{��|��*��ygꥬ��RfT�X
+>��k�K�~v&�V��4��bhUکj�:6y�V��B}�P_��*�W��
+�U��B}b�����
+�
fP_�9��n���U@
+x ?�:eh�'����Л<)�?�ϓ���,O]Z���z�R$K�,E��R$K�,E��R$K�,E@
a8$K�`�R �A��
n�,j�$K?z�T�PTʉ�u�"$�u��2�LyR�L��b>�Dz��KG��YC��eC?�m-����ʗ"t�C"�T$R�HE"�T$R�HE"�����V2��: �X�1v�m�l�&wY�Z���;��]U�.���ɀ��2hf����P\�aBB¥�p��4��ɡ�4�`]@|7��*)�"L�0�t�!L�0�t�!L�0]?��D"@� t�dg�Q3ʖ�t9���`�W��y����n�T�
9@������n��m�6���l����hh݌� $��7�]�K�|���_0I€
+�n6q�Y���=˖a�����"���|{x#/�_^�/�;u��?:��ЁuQe�U�E�xx�W�Ǚ���U�Y����7��1
+e�l������O���X�ϠƠ���֠�;��������of�h,*�����q:�U�Q��j;�}��Qz�S����c�{>��׻�B�<)���\C-�1���Sv���
{�1���{�a�ջ�3�DzS�?vl�#6�]���B;��J*�U.;�A^�5��%[~I�Dz+|�Ȝ?XQ�0�B	��8.IPgVx��j�����J���R/�t��:=#�����ˋ�%u�E��N�F��Av�&�Ð�9�ݑ��'����7���x���!�iJ�vBTV3��MӝW�s��i9739Oϥ����Ο���r;�� ���r;��?� �3$�c?dw�eﲍ�v�����}�I�G�*D��5Z�[�B�D
�PR�Y�A�	wц�4H�r�
��������0�QT���.=d�<T�:�T���ʥG���!�˹��])�Hl~c,F�6�H��|�Y��5�C�hV�+�2N�̮-5��.���H��op�HQ"E�%��uXB�+E�o�FY��������Q+�_�omKU0BB�����,�uj���[P�	����LR�~H\�(����ۼX�E'��.޹����?�ld
+1&R��t�����r\���d�hY䭿�*�Vu'�]���tA;��N�P���;ص�5��Ⱦ�muP�Woj��V��e�%F	�A��U�����-�#�y��C?�-+fh�bR�t�-2��> oMyZ}#Rǩ�g������6tˌU>OFU�8w!G�kp"�]�a�D�aX���:��H����C�����4�'a���C͞�WM�E���.��wTm�����A$"<�����Q�P�`D�ȱ�z�DYT{��9���T�j"��
+�\�����ʅ�o�7��xފ�@��x���K5 �q+�1�hFNż"�!��(*���EէL��a�3�Q#6���ϲ���y�����1j�{�%Ԯ�
+��
+����
+���>��^$�M�]HB�Ӭϋ�Po�gӈogٓ�����j��Α��ʁ�r��9�;y#�)-���?�F�(��DZi%F#l�e�7�\!�Т�S��ӮӲL�)�&�7
�	�M�tw�	�M@oZ����D���n�xN9q(L@K��ī<.�m8�f
pz��
+,��sW�k�9��3:Xu(�]���1~�z
�L�RR]j�TFogID�hs6
+�]'%�����:��aC�8���1>�C|��x�r�}�x�13���5��u���L����]Y�
+գJʯ%� z��
�� z��
�� z����M�A�@�'pԙ8�j�p$.7h�]q��'��z=U_	����n��u�cc���bغC��M}Vw���9B��a�zp�3�yJ|w��I� ��@6�d��4��F �l��F �d\��<"��P6Br}�S��r�.�*D��v����@	���@N�U\+�8H
8�����ѣ�1ζH��	�
r��A��&eW�~���?�"��,]-J �
r�cӫ�䩌�Mr�J��
|c�,�r^d[�r� gr�u�Ncm�P�pU�
+�h�;��CtGW)̦^T��ت�����I�B�Vu�ZaT�pW�Q���T.�r�H�r
��\@�*>\��([���&}��*���Q��ʽ����-�$�߲M����� ����]�͂sAD(7�$R̦A@�PG����S^T�q=��Sk�
+b�����p
+�zNy��D������؉����*Wg�j�����X��;b��?:B����QKlQ�IQ�ǿ6ά/��������Ώi���f��3z���O���X�Ϡ������;ķ�����}�E��*����
+�Z���2ѹV��b��
+����X	NjՑe�Qj�NI�W�I��f-Uʌʠ��{�jp��t� ���7�X=C�KV�4�/5C?�����>^������m9�#?�Ƚ`��V~��3��G��J��� T�6�Ik"$BX���5���1�|�����̮&��y���W_
 |5���W_
-|5���W_�F��AW]
-t5(����@)�A�5�B
J�@���"�>�gP:rP�s�e9G�cܙz�[��@G���	1�����#�y'��ϳm ׷DId`_�,r ���3���k��Dž;8 2ԮK*B��J~����Vq"v��P˵�`:6�c�"�ܯ�x��Wɦ,Ɠ/>Hm[��O�������f+�B7#�`��pض|��"��,/����	��a��u��;pt�
-uV���ٻ�^�������HIZ�'=x�#�r^'y����6��N�8(��e���e��t�ʪr4��Ol�}o��ƻ�E{rִ@=��g��kw��g�-�0�����i��v�-��`+�ԃ����n��Ps�^�փ�\Z�������k1Ͳ��Z;�֕Y;�������غ�l{;�c�V7�����~Ԉ�s�u�Ļ�������
�O�o{<�q�u�cO�WGz��=��uz'Vx�$�}�`�g6����'Ϭ������1�Ŷ��m�l�����O�G�s]��!Ǝ��,�f�>У��1��t�
-f6�^?P�<�g��,����E�Lf��l���p�9.g�%-�`v�0�dmaT�s*=d�1+���C��r����.��k�ې��y����$���f}d��:���6�#$���FRIm����ݾP��Hj#���6��Hj#���	�m���ݧ��Jd�
4�'�2>��͛:����н��=K��1ob�ڌѠWQS}#b"�jлM�F�>\6k�A�A�ބ"gi�Av�󐝇���h"d�!;?����<d�!;���f���S���<T���Cu���)�L�߈7!��9~(�5Q��w���B(���Xe,�/BǡoӖI�ɰE�7w�!b
-S��^��)?�c����>�D�cl��[�ͼ��j#JۈHl�`Dh��������`�39S]Y�:��$�'-Y�$$��DB	I$$��DB	I$$���7�H�U�VAZ�jv�.��
n���d"�5P�\$Pc��2[6ђ�N���4����c�4~�d��$��4����&��
-�D~�L"�S�ΐ�o�f�8}O,F?R���T>E*�t*?>�ŋ~�|�����|F�����&��m&[Y�c�%�?tj6�|��&�����7vA1����#��|>����#��|>����#���$2,��7�����Y5@
-X0H�5`�:�X0,Ɯ����j�^嘵"Dpc������f�d|�xD� �M�i�剔k8�H0 �|C=qT�‚���c���X�D\
-�Ɽ3r��(�:I�:#U\4�㘟I�h�mtFNX��Hxrxrx�KW&n�\�͓��!�s�b�%��Pl��2�NE��ӷ�\��OO���=yb���e������A��(�՟?��Rk�h�
\ No newline at end of file
+|5���W3џ�{G��@W]
+J� �
9P
+pP
+�P��R(����ȹ�)����\zY�Q���DA�^�Ȣ�p�7�BϛM#F8�|g�Ɯ����6��[�$�20�/�@Z�"�1���[���={�OD�\���J�
+�l)$B��Tr��,{C-W�����9��b�&�}$&[��"O�� �m��>��rﲚ����?���a����Έ�3h��ʖ�c'����
��A����16�Yib�v�~z�_�C�v;�#%i��੏��y���jc�i@	ӜX�غ��v"��9��a[(���D�?9�!��I?���Y��X䢟�Vn������X��VZ�����I��K��SO2g���C͝{z-,Z�Npi��~�N0j[�E4M#k�Z[f�P����ھ7r�ck˲��p��[������#��֭ﶿCh�[���>���u�p�5�E�=E^�
vk�43w��Xፓp�i��M��Ȟ��<��'����Ǩ�2r�y�!���r.-��u�w�;��3L�
+�@�f��0z4�}6���z�@
+8s�3
+�}<�P
�����}<���3�8�\κKZ3��Ja�3��¨4�T:�:�cV�������Xim�]�g�k��fӀ��q����$���f]d��:�����#$���FRIm����ݾP��Hj#���6��Hj#���	�m����'�Md�
4�'�2>���MN�pe`_�랅[
+���1JeFk�˰���""�j��M�D��\6k�A�@�^�"�I�Bv�󐝇���h"d�!;?����<d�!;���z���S���<T���Cu���)�L�߈3!��:~�K�k5Q��w!�<�
+���3m���W�H�UL[&�&�^���)DL!bzi"����5���xm�]��}l�h=h�T�T��FH"��'���9���`�Mͬ
+�'\� �b�+Y%�׸y��u�EB	I$$��DB	I$$��DB	��q��DZi�Uz�fw�n��nt&2�5�E5ƨ)�U-��d	�:H�__?�O�Gu��
+�L	AX��ʐ�K��R'�9%����i��>Q��"�#E*���)R��S��A.��ɗ��Α�gt�L>��g��d��b��,���S3��3f7����^ﾱ���G>�|���G>�|���G>�|�%�aA>�
n>"n g
�5`� �Ԁ�:`�X�`�N�2�{�I�;�cVV���7��z3�����n�I0m�<�r
+�R�@�
	$��g��0 �0z��AGa��8r>�*�C�x錜� 'IeMg��{��(�g�%ڟf��V�.����ҕ�<;O�͓{CL�DF�!���k����k�N����O.@L�'�'�ш釞�?1��y�<�ş?5?���E����7Α�i�
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/doc/data-model.eps
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/data-model.eps,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/doc/data-model.eps	3 Dec 2003 15:00:49 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/doc/data-model.eps	11 Dec 2003 13:21:52 -0000	1.4
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: /var/lib/aolserver/service1/packages/simulation/www/doc/data-model.dia
 %%Creator: Dia v0.92
-%%CreationDate: Wed Dec  3 14:13:00 2003
+%%CreationDate: Thu Dec 11 11:44:59 2003
 %%For: joel
 %%Orientation: Portrait
 %%Magnification: 1.0000
@@ -6807,112 +6807,118 @@
 end_ol grestore 
 gsave -79.235933 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-2624 1984 moveto
-2487 2085 2346 2130 conicto
-2205 2176 2035 2176 conicto
-1637 2176 1426 1936 conicto
-1216 1696 1216 1243 conicto
-1216 0 lineto
-832 0 lineto
-832 2496 lineto
-1216 2496 lineto
-1216 2010 lineto
-1322 2276 1543 2418 conicto
-1765 2560 2068 2560 conicto
-2226 2560 2362 2529 conicto
-2498 2498 2624 2432 conicto
-2624 1984 lineto
+2240 2432 moveto
+2240 2048 lineto
+2054 2144 1865 2192 conicto
+1677 2240 1481 2240 conicto
+1186 2240 1041 2149 conicto
+896 2059 896 1873 conicto
+896 1706 1009 1623 conicto
+1123 1540 1575 1461 conicto
+1757 1429 lineto
+2058 1370 2213 1193 conicto
+2368 1017 2368 734 conicto
+2368 359 2100 147 conicto
+1832 -64 1355 -64 conicto
+1166 -64 959 -32 conicto
+753 0 512 64 conicto
+512 512 lineto
+752 385 971 320 conicto
+1191 256 1387 256 conicto
+1672 256 1828 371 conicto
+1984 487 1984 693 conicto
+1984 991 1380 1106 conicto
+1360 1110 lineto
+1190 1143 lineto
+837 1211 674 1373 conicto
+512 1536 512 1817 conicto
+512 2173 761 2366 conicto
+1011 2560 1472 2560 conicto
+1678 2560 1867 2528 conicto
+2057 2496 2240 2432 conicto
 end_ol grestore 
 gsave -78.871867 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
+576 2496 moveto
+1600 2496 lineto
+1600 320 lineto
+2432 320 lineto
+2432 0 lineto
+384 0 lineto
+384 320 lineto
+1216 320 lineto
+1216 2176 lineto
+576 2176 lineto
+576 2496 lineto
+1216 3520 moveto
+1600 3520 lineto
+1600 3008 lineto
+1216 3008 lineto
+1216 3520 lineto
 end_ol grestore 
 gsave -78.507800 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-1633 1280 moveto
-1485 1280 lineto
-1097 1280 900 1148 conicto
-704 1016 704 754 conicto
-704 518 851 387 conicto
-999 256 1259 256 conicto
-1626 256 1835 502 conicto
-2045 749 2048 1184 conicto
-2048 1280 lineto
-1633 1280 lineto
-2432 1449 moveto
-2432 0 lineto
-2048 0 lineto
-2048 353 lineto
-1910 139 1701 37 conicto
-1493 -64 1194 -64 conicto
-796 -64 558 154 conicto
-320 372 320 739 conicto
-320 1161 607 1380 conicto
-895 1600 1452 1600 conicto
-2048 1600 lineto
-2048 1662 lineto
-2045 1966 1889 2103 conicto
-1733 2240 1390 2240 conicto
-1172 2240 948 2174 conicto
-724 2109 512 1984 conicto
-512 2368 lineto
-744 2464 956 2512 conicto
-1169 2560 1369 2560 conicto
-1686 2560 1910 2470 conicto
-2134 2380 2272 2201 conicto
-2359 2091 2395 1931 conicto
-2432 1771 2432 1449 conicto
+1534 2267 moveto
+1610 2417 1727 2488 conicto
+1845 2560 2010 2560 conicto
+2312 2560 2436 2330 conicto
+2560 2100 2560 1464 conicto
+2560 0 lineto
+2176 0 lineto
+2176 1446 lineto
+2176 1981 2118 2110 conicto
+2060 2240 1906 2240 conicto
+1730 2240 1665 2101 conicto
+1600 1963 1600 1446 conicto
+1600 0 lineto
+1216 0 lineto
+1216 1446 lineto
+1216 1987 1153 2113 conicto
+1090 2240 928 2240 conicto
+766 2240 703 2101 conicto
+640 1963 640 1446 conicto
+640 0 lineto
+256 0 lineto
+256 2496 lineto
+640 2496 lineto
+640 2303 lineto
+714 2428 824 2494 conicto
+935 2560 1076 2560 conicto
+1246 2560 1358 2487 conicto
+1471 2414 1534 2267 conicto
 end_ol grestore 
 gsave -78.143733 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-2048 2207 moveto
-2048 3520 lineto
-2432 3520 lineto
-2432 0 lineto
-2048 0 lineto
-2048 288 lineto
-1935 117 1749 26 conicto
-1563 -64 1319 -64 conicto
-824 -64 540 287 conicto
-256 639 256 1257 conicto
-256 1866 541 2213 conicto
-826 2560 1319 2560 conicto
-1565 2560 1753 2469 conicto
-1941 2379 2048 2207 conicto
-704 1248 moveto
-704 756 873 506 conicto
-1042 256 1373 256 conicto
-1703 256 1875 508 conicto
-2048 761 2048 1248 conicto
-2048 1737 1875 1988 conicto
-1703 2240 1373 2240 conicto
-1042 2240 873 1989 conicto
-704 1739 704 1248 conicto
+2304 -768 moveto
+2304 -1088 lineto
+0 -1088 lineto
+0 -768 lineto
+2304 -768 lineto
 end_ol grestore 
 gsave -77.779667 125.950000 translate 0.035278 -0.035278 scale
 start_ol
+1344 3200 moveto
+1344 2496 lineto
+2304 2496 lineto
+2304 2176 lineto
+1344 2176 lineto
+1344 816 lineto
+1344 539 1451 429 conicto
+1559 320 1828 320 conicto
+2304 320 lineto
+2304 0 lineto
+1787 0 lineto
+1333 0 1146 184 conicto
+960 368 960 816 conicto
+960 2176 lineto
+256 2176 lineto
+256 2496 lineto
+960 2496 lineto
+960 3200 lineto
+1344 3200 lineto
+end_ol grestore 
+gsave -77.415600 125.950000 translate 0.035278 -0.035278 scale
+start_ol
 1962 784 moveto
 1858 525 1698 101 conicto
 1477 -485 1400 -614 conicto
@@ -6930,14 +6936,6 @@
 2624 2496 lineto
 1962 784 lineto
 end_ol grestore 
-gsave -77.415600 125.950000 translate 0.035278 -0.035278 scale
-start_ol
-2304 -768 moveto
-2304 -1088 lineto
-0 -1088 lineto
-0 -768 lineto
-2304 -768 lineto
-end_ol grestore 
 gsave -77.051533 125.950000 translate 0.035278 -0.035278 scale
 start_ol
 832 288 moveto
@@ -6964,6 +6962,32 @@
 1840 256 2008 506 conicto
 2176 756 2176 1248 conicto
 end_ol grestore 
+gsave -76.687467 125.950000 translate 0.035278 -0.035278 scale
+start_ol
+2496 1352 moveto
+2496 1152 lineto
+688 1152 lineto
+688 1139 lineto
+688 717 901 486 conicto
+1114 256 1501 256 conicto
+1697 256 1911 319 conicto
+2125 383 2368 512 conicto
+2368 128 lineto
+2134 32 1916 -16 conicto
+1698 -64 1496 -64 conicto
+912 -64 584 285 conicto
+256 634 256 1248 conicto
+256 1846 582 2203 conicto
+908 2560 1452 2560 conicto
+1936 2560 2216 2236 conicto
+2496 1912 2496 1352 conicto
+2112 1472 moveto
+2103 1848 1934 2044 conicto
+1766 2240 1450 2240 conicto
+1141 2240 941 2036 conicto
+741 1832 704 1470 conicto
+2112 1472 lineto
+end_ol grestore 
 gsave -79.600000 126.750000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
@@ -24038,80 +24062,69 @@
 end_ol grestore 
 gsave -101.067933 95.700000 translate 0.035278 -0.035278 scale
 start_ol
-2175 2432 moveto
-1698 2432 1425 2159 conicto
-1152 1886 1152 1409 conicto
-1152 930 1425 657 conicto
-1698 384 2175 384 conicto
-2651 384 2925 658 conicto
-3200 933 3200 1409 conicto
-3200 1886 2927 2159 conicto
-2655 2432 2175 2432 conicto
-1519 2708 moveto
-1074 2817 825 3121 conicto
-576 3425 576 3863 conicto
-576 4474 1004 4829 conicto
-1432 5184 2176 5184 conicto
-2924 5184 3350 4829 conicto
-3776 4474 3776 3863 conicto
-3776 3425 3526 3121 conicto
-3277 2817 2832 2708 conicto
-3339 2591 3621 2250 conicto
-3904 1910 3904 1418 conicto
-3904 670 3457 271 conicto
-3010 -128 2176 -128 conicto
-1343 -128 895 271 conicto
-448 670 448 1418 conicto
-448 1910 731 2250 conicto
-1015 2591 1519 2708 conicto
-1280 3808 moveto
-1280 3400 1515 3172 conicto
-1750 2944 2174 2944 conicto
-2596 2944 2834 3172 conicto
-3072 3400 3072 3808 conicto
-3072 4215 2834 4443 conicto
-2596 4672 2174 4672 conicto
-1750 4672 1515 4443 conicto
-1280 4215 1280 3808 conicto
+768 64 moveto
+768 704 lineto
+1021 548 1279 466 conicto
+1538 384 1787 384 conicto
+2451 384 2801 830 conicto
+3151 1277 3200 2186 conicto
+3008 1902 2712 1751 conicto
+2417 1600 2058 1600 conicto
+1315 1600 881 2078 conicto
+448 2557 448 3389 conicto
+448 4202 904 4693 conicto
+1360 5184 2119 5184 conicto
+2988 5184 3446 4503 conicto
+3904 3822 3904 2526 conicto
+3904 1316 3341 594 conicto
+2779 -128 1829 -128 conicto
+1574 -128 1312 -80 conicto
+1050 -32 768 64 conicto
+2112 2112 moveto
+2554 2112 2813 2454 conicto
+3072 2796 3072 3393 conicto
+3072 3984 2813 4328 conicto
+2554 4672 2112 4672 conicto
+1669 4672 1410 4328 conicto
+1152 3984 1152 3393 conicto
+1152 2796 1410 2454 conicto
+1669 2112 2112 2112 conicto
 end_ol grestore 
 gsave -105.750000 96.900000 translate 0.035278 -0.035278 scale
 start_ol
-2773 2710 moveto
-3275 2604 3557 2271 conicto
-3840 1938 3840 1448 conicto
-3840 696 3325 284 conicto
-2811 -128 1862 -128 conicto
-1544 -128 1207 -64 conicto
-870 0 512 128 conicto
-512 768 lineto
-793 578 1129 481 conicto
-1465 384 1830 384 conicto
-2468 384 2802 651 conicto
-3136 919 3136 1430 conicto
-3136 1900 2829 2166 conicto
-2523 2432 1978 2432 conicto
-1408 2432 lineto
-1408 2944 lineto
-2004 2944 lineto
-2490 2944 2749 3163 conicto
-3008 3383 3008 3795 conicto
-3008 4219 2741 4445 conicto
-2475 4672 1978 4672 conicto
-1690 4672 1362 4610 conicto
-1034 4548 640 4416 conicto
-640 4992 lineto
-1032 5088 1373 5136 conicto
-1715 5184 2018 5184 conicto
-2801 5184 3256 4822 conicto
-3712 4461 3712 3845 conicto
-3712 3415 3468 3119 conicto
-3224 2824 2773 2710 conicto
+896 512 moveto
+1984 512 lineto
+1984 4544 lineto
+768 4288 lineto
+768 4800 lineto
+1994 5056 lineto
+2688 5056 lineto
+2688 512 lineto
+3776 512 lineto
+3776 0 lineto
+896 0 lineto
+896 512 lineto
 end_ol grestore 
 gsave -105.165800 96.900000 translate 0.035278 -0.035278 scale
 start_ol
+896 512 moveto
+1984 512 lineto
+1984 4544 lineto
+768 4288 lineto
+768 4800 lineto
+1994 5056 lineto
+2688 5056 lineto
+2688 512 lineto
+3776 512 lineto
+3776 0 lineto
+896 0 lineto
+896 512 lineto
 end_ol grestore 
-gsave -104.877933 96.900000 translate 0.035278 -0.035278 scale
+gsave -104.581600 96.900000 translate 0.035278 -0.035278 scale
 start_ol
+end_ol grestore 
+gsave -104.293733 96.900000 translate 0.035278 -0.035278 scale
+start_ol
 1344 4480 moveto
 1344 576 lineto
 2162 576 lineto
@@ -24129,7 +24142,7 @@
 640 0 lineto
 640 5056 lineto
 end_ol grestore 
-gsave -104.175200 96.900000 translate 0.035278 -0.035278 scale
+gsave -103.591000 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -24154,7 +24167,7 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -103.616400 96.900000 translate 0.035278 -0.035278 scale
+gsave -103.032200 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 3392 3648 moveto
 3392 3072 lineto
@@ -24176,10 +24189,10 @@
 2583 3904 2858 3840 conicto
 3134 3776 3392 3648 conicto
 end_ol grestore 
-gsave -103.116867 96.900000 translate 0.035278 -0.035278 scale
+gsave -102.532667 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -102.829000 96.900000 translate 0.035278 -0.035278 scale
+gsave -102.244800 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 1355 512 moveto
 3739 512 lineto
@@ -24204,7 +24217,7 @@
 3086 2332 2633 1852 conicto
 2180 1373 1355 512 conicto
 end_ol grestore 
-gsave -102.244800 96.900000 translate 0.035278 -0.035278 scale
+gsave -101.660600 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 2174 4672 moveto
 1665 4672 1408 4136 conicto
@@ -24225,7 +24238,7 @@
 448 3822 891 4503 conicto
 1335 5184 2176 5184 conicto
 end_ol grestore 
-gsave -101.660600 96.900000 translate 0.035278 -0.035278 scale
+gsave -101.076400 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 2174 4672 moveto
 1665 4672 1408 4136 conicto
@@ -24246,7 +24259,7 @@
 448 3822 891 4503 conicto
 1335 5184 2176 5184 conicto
 end_ol grestore 
-gsave -101.076400 96.900000 translate 0.035278 -0.035278 scale
+gsave -100.492200 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 2773 2710 moveto
 3275 2604 3557 2271 conicto
@@ -31386,7 +31399,7 @@
 0 slc
 n -52.704515 145.391428 m -52.013492 145.794525 l s
 0.000000 0.000000 0.000000 srgb
-gsave -13.350368 124.137868 translate 0.035278 -0.035278 scale
+gsave -13.350400 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 2496 3200 moveto
 2496 2752 lineto
@@ -31418,7 +31431,7 @@
 1744 3392 1991 3344 conicto
 2238 3297 2496 3200 conicto
 end_ol grestore 
-gsave -12.960901 124.137868 translate 0.035278 -0.035278 scale
+gsave -12.960933 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31431,7 +31444,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -12.791568 124.137868 translate 0.035278 -0.035278 scale
+gsave -12.791600 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 2431 2020 moveto
 2590 2296 2809 2428 conicto
@@ -31462,7 +31475,7 @@
 1942 2560 2139 2422 conicto
 2337 2284 2431 2020 conicto
 end_ol grestore 
-gsave -12.198901 124.137868 translate 0.035278 -0.035278 scale
+gsave -12.198933 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 986 moveto
 448 2496 lineto
@@ -31482,15 +31495,15 @@
 906 -64 677 203 conicto
 448 471 448 986 conicto
 end_ol grestore 
-gsave -11.809435 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.809467 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 3520 moveto
 832 3520 lineto
 832 0 lineto
 448 0 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -11.640101 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.640133 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 1559 1280 moveto
 1040 1280 840 1160 conicto
@@ -31523,7 +31536,7 @@
 1835 2560 2101 2284 conicto
 2368 2009 2368 1449 conicto
 end_ol grestore 
-gsave -11.267568 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.267600 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 832 3200 moveto
 832 2496 lineto
@@ -31545,7 +31558,7 @@
 448 3200 lineto
 832 3200 lineto
 end_ol grestore 
-gsave -11.030501 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.030533 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31558,7 +31571,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -10.861168 124.137868 translate 0.035278 -0.035278 scale
+gsave -10.861200 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 1409 2240 moveto
 1083 2240 893 1974 conicto
@@ -31579,7 +31592,7 @@
 256 1864 562 2212 conicto
 869 2560 1408 2560 conicto
 end_ol grestore 
-gsave -10.488635 124.137868 translate 0.035278 -0.035278 scale
+gsave -10.488667 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 2560 1509 moveto
 2560 0 lineto
@@ -31599,7 +31612,7 @@
 2106 2560 2333 2293 conicto
 2560 2027 2560 1509 conicto
 end_ol grestore 
-gsave -13.274168 124.937868 translate 0.035278 -0.035278 scale
+gsave -13.274200 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 1559 1280 moveto
 1040 1280 840 1160 conicto
@@ -31632,7 +31645,7 @@
 1835 2560 2101 2284 conicto
 2368 2009 2368 1449 conicto
 end_ol grestore 
-gsave -12.901635 124.937868 translate 0.035278 -0.035278 scale
+gsave -12.901667 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2560 1509 moveto
 2560 0 lineto
@@ -31652,7 +31665,7 @@
 2106 2560 2333 2293 conicto
 2560 2027 2560 1509 conicto
 end_ol grestore 
-gsave -12.512168 124.937868 translate 0.035278 -0.035278 scale
+gsave -12.512200 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2112 2112 moveto
 2112 3520 lineto
@@ -31678,10 +31691,10 @@
 1079 2240 891 1976 conicto
 704 1713 704 1249 conicto
 end_ol grestore 
-gsave -12.122701 124.937868 translate 0.035278 -0.035278 scale
+gsave -12.122733 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -11.927968 124.937868 translate 0.035278 -0.035278 scale
+gsave -11.928000 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2944 3072 moveto
 2944 2624 lineto
@@ -31703,7 +31716,7 @@
 2183 3392 2447 3311 conicto
 2712 3231 2944 3072 conicto
 end_ol grestore 
-gsave -11.504635 124.937868 translate 0.035278 -0.035278 scale
+gsave -11.504667 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 1559 1280 moveto
 1040 1280 840 1160 conicto
@@ -31736,7 +31749,7 @@
 1835 2560 2101 2284 conicto
 2368 2009 2368 1449 conicto
 end_ol grestore 
-gsave -11.132101 124.937868 translate 0.035278 -0.035278 scale
+gsave -11.132133 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2048 2432 moveto
 2048 2048 lineto
@@ -31768,7 +31781,7 @@
 1466 2560 1670 2528 conicto
 1875 2496 2048 2432 conicto
 end_ol grestore 
-gsave -10.810368 124.937868 translate 0.035278 -0.035278 scale
+gsave -10.810400 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2624 1352 moveto
 2624 1152 lineto
@@ -31793,7 +31806,7 @@
 750 1836 718 1470 conicto
 2240 1472 lineto
 end_ol grestore 
-gsave -10.437835 124.937868 translate 0.035278 -0.035278 scale
+gsave -10.437867 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2048 2432 moveto
 2048 2048 lineto
@@ -31825,7 +31838,7 @@
 1466 2560 1670 2528 conicto
 1875 2496 2048 2432 conicto
 end_ol grestore 
-gsave -85.273601 100.387868 translate 0.035278 -0.035278 scale
+gsave -85.273633 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2496 3200 moveto
 2496 2752 lineto
@@ -31857,7 +31870,7 @@
 1744 3392 1991 3344 conicto
 2238 3297 2496 3200 conicto
 end_ol grestore 
-gsave -84.884135 100.387868 translate 0.035278 -0.035278 scale
+gsave -84.884167 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31870,7 +31883,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -84.714801 100.387868 translate 0.035278 -0.035278 scale
+gsave -84.714833 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2431 2020 moveto
 2590 2296 2809 2428 conicto
@@ -31901,10 +31914,10 @@
 1942 2560 2139 2422 conicto
 2337 2284 2431 2020 conicto
 end_ol grestore 
-gsave -84.122135 100.387868 translate 0.035278 -0.035278 scale
+gsave -84.122167 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -83.927401 100.387868 translate 0.035278 -0.035278 scale
+gsave -83.927433 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 1827 3008 moveto
 1311 3008 1007 2647 conicto
@@ -31925,7 +31938,7 @@
 256 2453 683 2922 conicto
 1111 3392 1827 3392 conicto
 end_ol grestore 
-gsave -83.444801 100.387868 translate 0.035278 -0.035278 scale
+gsave -83.444833 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2240 1249 moveto
 2240 1713 2052 1976 conicto
@@ -31951,7 +31964,7 @@
 832 3520 lineto
 832 2112 lineto
 end_ol grestore 
-gsave -83.055335 100.387868 translate 0.035278 -0.035278 scale
+gsave -83.055367 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31970,7 +31983,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -82.886001 100.387868 translate 0.035278 -0.035278 scale
+gsave -82.886033 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2624 1352 moveto
 2624 1152 lineto
@@ -31995,7 +32008,7 @@
 750 1836 718 1470 conicto
 2240 1472 lineto
 end_ol grestore 
-gsave -82.513468 100.387868 translate 0.035278 -0.035278 scale
+gsave -82.513500 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2240 2432 moveto
 2240 2048 lineto
@@ -32017,7 +32030,7 @@
 1707 2560 1888 2528 conicto
 2070 2496 2240 2432 conicto
 end_ol grestore 
-gsave -82.174801 100.387868 translate 0.035278 -0.035278 scale
+gsave -82.174833 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 832 3200 moveto
 832 2496 lineto
@@ -32039,7 +32052,7 @@
 448 3200 lineto
 832 3200 lineto
 end_ol grestore 
-gsave -81.937735 100.387868 translate 0.035278 -0.035278 scale
+gsave -81.937767 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2048 2432 moveto
 2048 2048 lineto
@@ -44902,10 +44915,10 @@
 1840 256 2008 506 conicto
 2176 756 2176 1248 conicto
 end_ol grestore 
-gsave -118.312132 146.287868 translate 0.035278 -0.035278 scale
+gsave -118.312000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -118.024265 146.287868 translate 0.035278 -0.035278 scale
+gsave -118.024133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3648 4928 moveto
 3648 4288 lineto
@@ -44937,7 +44950,7 @@
 2543 5184 2905 5120 conicto
 3268 5056 3648 4928 conicto
 end_ol grestore 
-gsave -117.440065 146.287868 translate 0.035278 -0.035278 scale
+gsave -117.439933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -44950,7 +44963,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -117.186065 146.287868 translate 0.035278 -0.035278 scale
+gsave -117.185933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3604 3061 moveto
 3836 3493 4158 3698 conicto
@@ -44981,7 +44994,7 @@
 2894 3904 3180 3688 conicto
 3467 3473 3604 3061 conicto
 end_ol grestore 
-gsave -116.297065 146.287868 translate 0.035278 -0.035278 scale
+gsave -116.296933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 512 moveto
 1280 -1408 lineto
@@ -45007,15 +45020,15 @@
 2828 384 3110 784 conicto
 3392 1185 3392 1889 conicto
 end_ol grestore 
-gsave -115.712865 146.287868 translate 0.035278 -0.035278 scale
+gsave -115.712733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -115.458865 146.287868 translate 0.035278 -0.035278 scale
+gsave -115.458733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45028,7 +45041,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -115.204865 146.287868 translate 0.035278 -0.035278 scale
+gsave -115.204733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2624 5248 moveto
 2624 4736 lineto
@@ -45050,7 +45063,7 @@
 1363 5248 2010 5248 conicto
 2624 5248 lineto
 end_ol grestore 
-gsave -114.883132 146.287868 translate 0.035278 -0.035278 scale
+gsave -114.883000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45063,7 +45076,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -114.629132 146.287868 translate 0.035278 -0.035278 scale
+gsave -114.629000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -45088,7 +45101,7 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -114.070332 146.287868 translate 0.035278 -0.035278 scale
+gsave -114.070200 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 3264 moveto
 3136 5248 lineto
@@ -45114,10 +45127,10 @@
 1586 3392 1305 2992 conicto
 1024 2592 1024 1889 conicto
 end_ol grestore 
-gsave -113.486132 146.287868 translate 0.035278 -0.035278 scale
+gsave -113.486000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -113.198265 146.287868 translate 0.035278 -0.035278 scale
+gsave -113.198133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1344 4480 moveto
 1344 576 lineto
@@ -45136,7 +45149,7 @@
 640 0 lineto
 640 5056 lineto
 end_ol grestore 
-gsave -112.495532 146.287868 translate 0.035278 -0.035278 scale
+gsave -112.495400 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45169,7 +45182,7 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -111.936732 146.287868 translate 0.035278 -0.035278 scale
+gsave -111.936600 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 4864 moveto
 1280 3776 lineto
@@ -45191,7 +45204,7 @@
 640 4864 lineto
 1280 4864 lineto
 end_ol grestore 
-gsave -111.581132 146.287868 translate 0.035278 -0.035278 scale
+gsave -111.581000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45224,10 +45237,10 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -111.022332 146.287868 translate 0.035278 -0.035278 scale
+gsave -111.022200 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -110.734465 146.287868 translate 0.035278 -0.035278 scale
+gsave -110.734333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5056 moveto
 1689 5056 lineto
@@ -45244,7 +45257,7 @@
 640 0 lineto
 640 5056 lineto
 end_ol grestore 
-gsave -109.947065 146.287868 translate 0.035278 -0.035278 scale
+gsave -109.946933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45265,7 +45278,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -109.388265 146.287868 translate 0.035278 -0.035278 scale
+gsave -109.388133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 3264 moveto
 3136 5248 lineto
@@ -45291,7 +45304,7 @@
 1586 3392 1305 2992 conicto
 1024 2592 1024 1889 conicto
 end_ol grestore 
-gsave -108.804065 146.287868 translate 0.035278 -0.035278 scale
+gsave -108.803933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -45316,15 +45329,15 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -108.245265 146.287868 translate 0.035278 -0.035278 scale
+gsave -108.245133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -107.991265 146.287868 translate 0.035278 -0.035278 scale
+gsave -107.991133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 832 832 moveto
 1536 832 lineto
@@ -45334,10 +45347,10 @@
 832 251 lineto
 832 832 lineto
 end_ol grestore 
-gsave -107.703399 146.287868 translate 0.035278 -0.035278 scale
+gsave -107.703267 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -107.415532 146.287868 translate 0.035278 -0.035278 scale
+gsave -107.415400 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3072 3712 moveto
 3072 3136 lineto
@@ -45369,7 +45382,7 @@
 2199 3904 2506 3856 conicto
 2813 3808 3072 3712 conicto
 end_ol grestore 
-gsave -106.941399 146.287868 translate 0.035278 -0.035278 scale
+gsave -106.941267 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3776 2287 moveto
 3776 0 lineto
@@ -45389,7 +45402,7 @@
 3119 3904 3447 3494 conicto
 3776 3084 3776 2287 conicto
 end_ol grestore 
-gsave -106.365665 146.287868 translate 0.035278 -0.035278 scale
+gsave -106.365533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45410,7 +45423,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -105.806865 146.287868 translate 0.035278 -0.035278 scale
+gsave -105.806733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 320 3776 moveto
 939 3776 lineto
@@ -45427,7 +45440,7 @@
 1306 0 lineto
 320 3776 lineto
 end_ol grestore 
-gsave -105.061799 146.287868 translate 0.035278 -0.035278 scale
+gsave -105.061667 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45440,7 +45453,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -104.807799 146.287868 translate 0.035278 -0.035278 scale
+gsave -104.807667 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3776 2287 moveto
 3776 0 lineto
@@ -45460,7 +45473,7 @@
 3119 3904 3447 3494 conicto
 3776 3084 3776 2287 conicto
 end_ol grestore 
-gsave -104.232065 146.287868 translate 0.035278 -0.035278 scale
+gsave -104.231933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 1950 moveto
 3136 2637 2858 3014 conicto
@@ -45494,18 +45507,18 @@
 3776 3776 lineto
 3776 462 lineto
 end_ol grestore 
-gsave -103.647865 146.287868 translate 0.035278 -0.035278 scale
+gsave -103.647733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -103.359999 146.287868 translate 0.035278 -0.035278 scale
+gsave -103.359867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -103.105999 146.287868 translate 0.035278 -0.035278 scale
+gsave -103.105867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45526,7 +45539,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -102.547199 146.287868 translate 0.035278 -0.035278 scale
+gsave -102.547067 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 1950 moveto
 3136 2637 2858 3014 conicto
@@ -45560,7 +45573,7 @@
 3776 3776 lineto
 3776 462 lineto
 end_ol grestore 
-gsave -101.962999 146.287868 translate 0.035278 -0.035278 scale
+gsave -101.962867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45573,7 +45586,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -101.708999 146.287868 translate 0.035278 -0.035278 scale
+gsave -101.708867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3392 3648 moveto
 3392 3072 lineto
@@ -45595,7 +45608,7 @@
 2583 3904 2858 3840 conicto
 3134 3776 3392 3648 conicto
 end_ol grestore 
-gsave -101.209465 146.287868 translate 0.035278 -0.035278 scale
+gsave -101.209333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45628,18 +45641,18 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -100.650665 146.287868 translate 0.035278 -0.035278 scale
+gsave -100.650533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -100.396665 146.287868 translate 0.035278 -0.035278 scale
+gsave -100.396533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -100.108799 146.287868 translate 0.035278 -0.035278 scale
+gsave -100.108667 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3648 4928 moveto
 3648 4288 lineto
@@ -45671,7 +45684,7 @@
 2543 5184 2905 5120 conicto
 3268 5056 3648 4928 conicto
 end_ol grestore 
-gsave -99.524599 146.287868 translate 0.035278 -0.035278 scale
+gsave -99.524467 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45684,7 +45697,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -99.270599 146.287868 translate 0.035278 -0.035278 scale
+gsave -99.270467 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3604 3061 moveto
 3836 3493 4158 3698 conicto
@@ -45715,7 +45728,7 @@
 2894 3904 3180 3688 conicto
 3467 3473 3604 3061 conicto
 end_ol grestore 
-gsave -98.381599 146.287868 translate 0.035278 -0.035278 scale
+gsave -98.381467 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 1487 moveto
 640 3776 lineto
@@ -45735,15 +45748,15 @@
 1302 -128 971 283 conicto
 640 695 640 1487 conicto
 end_ol grestore 
-gsave -97.805865 146.287868 translate 0.035278 -0.035278 scale
+gsave -97.805733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -97.551865 146.287868 translate 0.035278 -0.035278 scale
+gsave -97.551733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45776,7 +45789,7 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -96.993065 146.287868 translate 0.035278 -0.035278 scale
+gsave -96.992933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 4864 moveto
 1280 3776 lineto
@@ -45798,7 +45811,7 @@
 640 4864 lineto
 1280 4864 lineto
 end_ol grestore 
-gsave -96.637465 146.287868 translate 0.035278 -0.035278 scale
+gsave -96.637333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45811,7 +45824,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -96.383465 146.287868 translate 0.035278 -0.035278 scale
+gsave -96.383333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45832,7 +45845,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -95.824665 146.287868 translate 0.035278 -0.035278 scale
+gsave -95.824533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3776 2287 moveto
 3776 0 lineto
@@ -45852,10 +45865,10 @@
 3119 3904 3447 3494 conicto
 3776 3084 3776 2287 conicto
 end_ol grestore 
-gsave -95.248932 146.287868 translate 0.035278 -0.035278 scale
+gsave -95.248800 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -94.961065 146.287868 translate 0.035278 -0.035278 scale
+gsave -94.960933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 4864 moveto
 1280 3776 lineto
@@ -45877,7 +45890,7 @@
 640 4864 lineto
 1280 4864 lineto
 end_ol grestore 
-gsave -94.605465 146.287868 translate 0.035278 -0.035278 scale
+gsave -94.605333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45910,7 +45923,7 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -94.046665 146.287868 translate 0.035278 -0.035278 scale
+gsave -94.046533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3392 1889 moveto
 3392 2592 3110 2992 conicto
@@ -45936,15 +45949,15 @@
 1280 5248 lineto
 1280 3264 lineto
 end_ol grestore 
-gsave -93.462465 146.287868 translate 0.035278 -0.035278 scale
+gsave -93.462333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -93.208465 146.287868 translate 0.035278 -0.035278 scale
+gsave -93.208333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -45969,7 +45982,7 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -92.649665 146.287868 translate 0.035278 -0.035278 scale
+gsave -92.649533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3072 3712 moveto
 3072 3136 lineto
@@ -52697,10 +52710,10 @@
 1584 1984 1752 1782 conicto
 1920 1581 1920 1190 conicto
 end_ol grestore 
-gsave -117.000000 149.425630 translate 0.035278 -0.035278 scale
+gsave -117.000000 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -116.856067 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.856067 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1664 1920 moveto
 1664 1600 lineto
@@ -52722,7 +52735,7 @@
 1268 1984 1403 1968 conicto
 1538 1952 1664 1920 conicto
 end_ol grestore 
-gsave -116.602067 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.602067 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -52740,15 +52753,15 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.415800 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.415800 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -116.187200 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.187200 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -52761,7 +52774,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -116.060200 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.060200 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 640 2432 moveto
 640 1920 lineto
@@ -52783,7 +52796,7 @@
 320 2432 lineto
 640 2432 lineto
 end_ol grestore 
-gsave -115.882400 149.425630 translate 0.035278 -0.035278 scale
+gsave -115.882400 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -52808,7 +52821,7 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -115.603000 149.425630 translate 0.035278 -0.035278 scale
+gsave -115.603000 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1802 1592 moveto
 1918 1792 2079 1888 conicto
@@ -52839,7 +52852,7 @@
 1447 1984 1590 1883 conicto
 1734 1783 1802 1592 conicto
 end_ol grestore 
-gsave -115.154267 149.425630 translate 0.035278 -0.035278 scale
+gsave -115.154267 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
@@ -52871,10 +52884,10 @@
 1056 1984 1202 1968 conicto
 1348 1952 1472 1920 conicto
 end_ol grestore 
-gsave -117.050000 151.518725 translate 0.035278 -0.035278 scale
+gsave -117.050000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -116.906067 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.906067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1664 1920 moveto
 1664 1600 lineto
@@ -52896,7 +52909,7 @@
 1268 1984 1403 1968 conicto
 1538 1952 1664 1920 conicto
 end_ol grestore 
-gsave -116.652067 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.652067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -52914,15 +52927,15 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.465800 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.465800 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -116.237200 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.237200 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -52940,7 +52953,7 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.059400 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.059400 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -52965,7 +52978,7 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -115.780000 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.780000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 128 1920 moveto
 470 1920 lineto
@@ -52976,7 +52989,7 @@
 844 0 lineto
 128 1920 lineto
 end_ol grestore 
-gsave -115.509067 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.509067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -52989,7 +53002,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -115.382067 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.382067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
@@ -53021,7 +53034,7 @@
 1056 1984 1202 1968 conicto
 1348 1952 1472 1920 conicto
 end_ol grestore 
-gsave -115.145000 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.145000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -53034,7 +53047,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -115.018000 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.018000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1057 1728 moveto
 805 1728 658 1523 conicto
@@ -53055,7 +53068,7 @@
 192 1440 421 1712 conicto
 650 1984 1056 1984 conicto
 end_ol grestore 
-gsave -114.738600 151.518725 translate 0.035278 -0.035278 scale
+gsave -114.738600 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1190 moveto
 1920 0 lineto
@@ -53075,7 +53088,7 @@
 1584 1984 1752 1782 conicto
 1920 1581 1920 1190 conicto
 end_ol grestore 
-gsave -114.450733 151.518725 translate 0.035278 -0.035278 scale
+gsave -114.450733 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
@@ -53114,10 +53127,10 @@
 0.749020 0.749020 0.749020 srgb
 n -117.050000 152.685000 m -117.050000 156.588000 l -69.500000 156.588000 l -69.500000 152.685000 l cp s
 0.000000 0.000000 0.000000 srgb
-gsave -117.050000 154.636500 translate 0.035278 -0.035278 scale
+gsave -117.050000 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -116.906067 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.906067 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1664 1920 moveto
 1664 1600 lineto
@@ -53139,7 +53152,7 @@
 1268 1984 1403 1968 conicto
 1538 1952 1664 1920 conicto
 end_ol grestore 
-gsave -116.652067 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.652067 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -53157,15 +53170,15 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.465800 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.465800 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -116.237200 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.237200 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -53178,7 +53191,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -116.110200 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.110200 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 640 2432 moveto
 640 1920 lineto
@@ -53200,7 +53213,7 @@
 320 2432 lineto
 640 2432 lineto
 end_ol grestore 
-gsave -115.932400 154.636500 translate 0.035278 -0.035278 scale
+gsave -115.932400 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -53225,7 +53238,7 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -115.653000 154.636500 translate 0.035278 -0.035278 scale
+gsave -115.653000 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1802 1592 moveto
 1918 1792 2079 1888 conicto
@@ -53256,15 +53269,15 @@
 1447 1984 1590 1883 conicto
 1734 1783 1802 1592 conicto
 end_ol grestore 
-gsave -115.204267 154.636500 translate 0.035278 -0.035278 scale
+gsave -115.204267 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -114.975667 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.975667 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -53282,7 +53295,7 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -114.797867 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.797867 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -53307,15 +53320,15 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -114.518467 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.518467 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 320 2624 moveto
 640 2624 lineto
 640 0 lineto
 320 0 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -114.391467 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.391467 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
Index: openacs-4/contrib/packages/simulation/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/index.html,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/doc/index.html	3 Dec 2003 15:00:50 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/doc/index.html	11 Dec 2003 13:21:52 -0000	1.11
@@ -1 +1 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="next" href="install.html" title="Installation"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"> </td><th width="60%" align="center"></th><td width="20%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2762182"></a>Simulation</h1></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="article"><a href="install.html">Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="package-install.html">Package installation</a></span></dt></dl></dd><dt><span class="article"><a href="admin.html">Admin Guide</a></span></dt><dd><dl><dt><span class="sect1"><a href="map_xml.html">Map XML</a></span></dt></dl></dd><dt><span class="article"><a href="design.html">Design</a></span></dt><dd><dl><dt><span class="sect1"><a href="interfaces.html">Interfaces</a></span></dt><dt><span class="sect1"><a href="internals.html">Internal Design</a></span></dt><dt><span class="sect1"><a href="permissions.html">Permissions</a></span></dt><dt><span class="sect1"><a href="object-orientation-notes.html">Notes on an object-oriented simulated space</a></span></dt><dt><span class="sect1"><a href="simulation-lifecycle.html">Lifecycle of a Simulation</a></span></dt></dl></dd><dt><span class="appendix"><a href="licensing.html">A. Licencing</a></span></dt></dl></div><div class="list-of-tables"><p><b>List of Tables</b></p><dl><dt>1. <a href="simulation-lifecycle.html#id2825036">Casting Paths</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> Installation</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/index.html#comments">View comments on this page at openacs.org</a></center></body></html>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="next" href="install.html" title="Installation"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"> </td><th width="60%" align="center"></th><td width="20%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2762182"></a>Simulation</h1></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="article"><a href="install.html">Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="package-install.html">Package installation</a></span></dt></dl></dd><dt><span class="article"><a href="admin.html">Admin Guide</a></span></dt><dd><dl><dt><span class="sect1"><a href="map_xml.html">Map XML</a></span></dt></dl></dd><dt><span class="article"><a href="design.html">Design</a></span></dt><dd><dl><dt><span class="sect1"><a href="interfaces.html">Interfaces</a></span></dt><dt><span class="sect1"><a href="internals.html">Internal Design</a></span></dt><dt><span class="sect1"><a href="permissions.html">Permissions</a></span></dt><dt><span class="sect1"><a href="object-orientation-notes.html">Notes on an object-oriented simulated space</a></span></dt><dt><span class="sect1"><a href="simulation-lifecycle.html">Lifecycle of a Simulation</a></span></dt></dl></dd><dt><span class="appendix"><a href="licensing.html">A. Licencing</a></span></dt></dl></div><div class="list-of-tables"><p><b>List of Tables</b></p><dl><dt>1. <a href="simulation-lifecycle.html#id2825064">Casting Paths</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> Installation</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/index.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/contrib/packages/simulation/www/doc/simulation-lifecycle.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/Attic/simulation-lifecycle.html,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/doc/simulation-lifecycle.html	3 Dec 2003 15:00:50 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/doc/simulation-lifecycle.html	11 Dec 2003 13:21:52 -0000	1.2
@@ -1 +1 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Lifecycle of a Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="up" href="design.html" title="Design"><link rel="previous" href="object-orientation-notes.html" title="Notes on an object-oriented simulated space"><link rel="next" href="licensing.html" title="Appendix�A.�Licencing"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><th width="60%" align="center">Design</th><td width="20%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="simulation-lifecycle"></a>Lifecycle of a Simulation</h2></div></div><div></div></div><div class="orderedlist"><ol type="1"><li><p><b>Template Not ready.�</b>  ready_p not true.  Only shows up in SimBuild lists.</p></li><li><p><b>Template Ready.�</b>Ready_p is true.  Shows up in list of available templates in SimBuild.</p></li><li><p><b>Simulation in Development.�</b>Owned by a single person.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</p></li><li><p><b>Simulation in Casting.�</b>Several paths depending on enrollment and casting type.</p><div class="table"><a name="id2825036"></a><p class="title"><b>Table�1.�Casting Paths</b></p><table summary="Casting Paths" cellspacing="0" border="1"><colgroup><col><col><col></colgroup><thead><tr><th>Closed Enrollment/Automatic Casting</th><th>Open Enrollment/Automatic Casting</th><th>Open Enrollment/Group Casting</th><th>Open Enrollment/Open Casting</th></tr></thead><tbody><tr><td>set start/end date</td><td colspan="3">set start/end date, enrollment dates</td></tr><tr><td colspan="4">For each role, choose which user groups can be cast</td></tr><tr><td>Select user group(s) to enroll</td><td colspan="2">optionally restrict enrollment to selected groups.</td><td>optionally restrict enrollment to selected groups.  Set expected number of users.</td></tr><tr><td>�</td><td colspan="3">Users can go enroll themselves in simulations</td></tr><tr><td colspan="2">Automatic casting creates cases and assigns users to groups in roles in cases</td><td>Users see a list of groups, and choose which group to join.  After enrollment period is over, automatic casting creates cases and assigns groups to roles in cases</td><td>Users see a list of cases, roles in each case, and users in groups for each role.  Users can choose any available slot.  Admin can add new, empty cases.</td></tr><tr><td colspan="4">Any empty slots remaining are assigned to the professor</td></tr></tbody></table></div></li><li><p><b>Live Simulation.�</b>start date &lt; now &lt; end date.  Shows up in list of sims in Simplay for admin.  </p></li><li><p><b>Finished Simulation.�</b>now &gt; end date.  Shows up in special list in simplay.</p></li></ol></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr><tr><td width="40%" align="left">Notes on an object-oriented simulated space </td><td width="20%" align="center"><a accesskey="u" href="design.html">Up</a></td><td width="40%" align="right"> Appendix�A.�Licencing</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/simulation-lifecycle.html#comments">View comments on this page at openacs.org</a></center></body></html>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Lifecycle of a Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="up" href="design.html" title="Design"><link rel="previous" href="object-orientation-notes.html" title="Notes on an object-oriented simulated space"><link rel="next" href="licensing.html" title="Appendix�A.�Licencing"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><th width="60%" align="center">Design</th><td width="20%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="simulation-lifecycle"></a>Lifecycle of a Simulation</h2></div></div><div></div></div><div class="orderedlist"><ol type="1"><li><p><b>Template Not ready (<span class="bold"><b>dev_template</b></span>).�</b>  ready_p not true.  Only shows up in SimBuild lists.</p></li><li><p><b>Template Ready (<span class="bold"><b>ready_template</b></span>).�</b>Ready_p is true.  Shows up in list of available templates in SimBuild.</p></li><li><p><b>Simulation in Development (<span class="bold"><b>dev_sim</b></span>).�</b>Owned by a single party.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</p></li><li><p><b>Simulation in Casting (<span class="bold"><b>casting_sim</b></span>).�</b>Several paths depending on enrollment and casting type.</p><div class="table"><a name="id2825064"></a><p class="title"><b>Table�1.�Casting Paths</b></p><table summary="Casting Paths" cellspacing="0" border="1"><colgroup><col><col><col></colgroup><thead><tr><th>Closed Enrollment/Automatic Casting</th><th>Open Enrollment/Automatic Casting</th><th>Open Enrollment/Group Casting</th><th>Open Enrollment/Open Casting</th></tr></thead><tbody><tr><td>set start/end date</td><td colspan="3">set start/end date, enrollment dates</td></tr><tr><td colspan="4">For each role, choose which user groups can be cast</td></tr><tr><td>Select user group(s) to enroll</td><td colspan="2">optionally restrict enrollment to selected groups.</td><td>optionally restrict enrollment to selected groups.  Set expected number of users.</td></tr><tr><td>�</td><td colspan="3">Users can go enroll themselves in simulations</td></tr><tr><td colspan="2">Automatic casting creates cases and assigns users to groups in roles in cases</td><td>Users see a list of groups, and choose which group to join.  After enrollment period is over, automatic casting creates cases and assigns groups to roles in cases</td><td>Users see a list of cases, roles in each case, and users in groups for each role.  Users can choose any available slot.  Admin can add new, empty cases.</td></tr><tr><td colspan="4">Any empty slots remaining are assigned to the professor</td></tr></tbody></table></div></li><li><p><b>Live Simulation (<span class="bold"><b>live_sim</b></span>).�</b>start date &lt; now &lt; end date.  Shows up in list of sims in Simplay for admin.  </p></li><li><p><b>Finished Simulation (<span class="bold"><b>live_sim</b></span>).�</b>now &gt; end date.  Shows up in special list in simplay.</p></li></ol></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr><tr><td width="40%" align="left">Notes on an object-oriented simulated space </td><td width="20%" align="center"><a accesskey="u" href="design.html">Up</a></td><td width="40%" align="right"> Appendix�A.�Licencing</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/simulation-lifecycle.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/contrib/packages/simulation/www/doc/xml/design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/doc/xml/Attic/design.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/doc/xml/design.xml	3 Dec 2003 15:00:50 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/doc/xml/design.xml	11 Dec 2003 13:21:52 -0000	1.8
@@ -121,31 +121,30 @@
         </itemizedlist>
       </sect2>
     </sect1>
-
     <sect1 id="simulation-lifecycle">
       <title>Lifecycle of a Simulation</title>
       <orderedlist>
         <listitem>
           <formalpara>
-            <title>Template Not ready.</title>
+            <title>Template Not ready (<emphasis role="bold">dev_template</emphasis>)</title>
             <para>  ready_p not true.  Only shows up in SimBuild lists.</para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Template Ready</title>
+            <title>Template Ready (<emphasis role="bold">ready_template</emphasis>)</title>
             <para>Ready_p is true.  Shows up in list of available templates in SimBuild.</para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Simulation in Development.</title>
-            <para>Owned by a single person.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</para>
+            <title>Simulation in Development (<emphasis role="bold">dev_sim</emphasis>)</title>
+            <para>Owned by a single party.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Simulation in Casting.</title>
+            <title>Simulation in Casting (<emphasis role="bold">casting_sim</emphasis>)</title>
             <para>Several paths depending on enrollment and casting type.</para>
           </formalpara>
           <table>
@@ -194,20 +193,16 @@
         </listitem>
         <listitem>
           <formalpara>
-            <title>Live Simulation</title>
+            <title>Live Simulation (<emphasis role="bold">live_sim</emphasis>)</title>
             <para>start date &lt; now &lt; end date.  Shows up in list of sims in Simplay for admin.  </para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Finished Simulation</title>
+            <title>Finished Simulation (<emphasis role="bold">live_sim</emphasis>)</title>
             <para>now &gt; end date.  Shows up in special list in simplay.</para>
           </formalpara>
         </listitem>
       </orderedlist>
     </sect1>
   </article>
-  
-
-
-
Index: openacs-4/contrib/packages/simulation/www/simbuild/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/simbuild/index.adp	18 Nov 2003 09:44:32 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/simbuild/index.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/simbuild/role-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/role-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simbuild/role-delete.adp	13 Nov 2003 15:35:48 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/role-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/simbuild/role-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/role-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/simbuild/role-edit.adp	10 Dec 2003 16:06:46 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/simbuild/role-edit.adp	11 Dec 2003 13:21:53 -0000	1.4
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">role.pretty_name</property>
Index: openacs-4/contrib/packages/simulation/www/simbuild/state-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/state-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simbuild/state-edit.adp	9 Dec 2003 15:58:13 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/state-edit.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">state.pretty_name</property>
Index: openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp	10 Dec 2003 16:06:46 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp	11 Dec 2003 13:21:53 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">task.pretty_name</property>
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-clone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-clone.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simbuild/template-clone.adp	20 Nov 2003 12:57:00 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-clone.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simbuild/template-delete.adp	13 Nov 2003 15:35:48 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	9 Dec 2003 17:31:29 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	11 Dec 2003 13:21:53 -0000	1.8
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">sim_template.name</property>
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-actors.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-actors.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/cast-actors.adp	28 Nov 2003 16:55:52 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-actors.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-complete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/cast-complete.adp	27 Nov 2003 16:43:36 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-complete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/cast-edit.adp	27 Nov 2003 16:43:36 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-edit.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/siminst/index.adp	9 Dec 2003 17:30:49 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/siminst/index.adp	11 Dec 2003 13:21:53 -0000	1.10
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
@@ -11,5 +11,5 @@
   <listtemplate name="casting_sims"></listtemplate>
 </p>
 <p>
-<a href="../simplay/admin">Live Simulations</a>
+<a href="../simplay/">Live Simulations</a>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/siminst/index.tcl	9 Dec 2003 17:30:50 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/siminst/index.tcl	11 Dec 2003 13:21:53 -0000	1.7
@@ -8,7 +8,8 @@
 
 permission::require_permission -object_id $package_id -privilege sim_inst
 set admin_p [permission::permission_p -object_id $package_id -privilege admin]
-set add_url "simulation-new"
+set base_url [apm_package_url_from_id $package_id]
+set add_url "${base_url}/siminst/simulation-new"
 
 #---------------------------------------------------------------------
 # dev_sims: simulations in development
Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	28 Nov 2003 16:55:52 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/map-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-complete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/map-complete.adp	28 Nov 2003 09:32:26 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/map-complete.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/map-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-create.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/map-create.adp	28 Nov 2003 16:55:52 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/map-create.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">template.pretty_name</property>
Index: openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-tasks.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	28 Nov 2003 09:32:26 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-delete.adp	18 Nov 2003 09:44:32 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-new.adp	2 Dec 2003 17:24:33 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-new.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-new.tcl	2 Dec 2003 17:24:33 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-new.tcl	11 Dec 2003 13:21:53 -0000	1.2
@@ -63,7 +63,7 @@
        workflows w
  where ss.simulation_id = w.workflow_id
    and w.object_id = :package_id
-   and ready_p = 't'
+   and ss.sim_type = 'ready_template'
 } {
     set map_url [export_vars -base "map-create" { workflow_id }]
 
Index: openacs-4/packages/simulation/lib/sim-insts-grouped.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-insts-grouped.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/sim-insts-grouped.adp	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1 @@
+<p><listtemplate name="sims"></listtemplate></p>
Index: openacs-4/packages/simulation/lib/sim-insts-grouped.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-insts-grouped.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/sim-insts-grouped.tcl	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1,58 @@
+simulation::include_contract {
+    Displays grouped list of simulations in development and casting for the current simulation package instance.
+
+    @author Joel Aufrecht
+    @creation-date 2003-11-12
+    @cvs-id $Id: sim-insts-grouped.tcl,v 1.1 2003/12/11 13:21:52 joela Exp $
+} {
+}
+
+######################################################################
+# Set general variables
+
+set package_id [ad_conn package_id]
+set user_id [auth::get_user_id]
+set base_url [apm_package_url_from_id $package_id]
+set add_url "${base_url}/siminst/simulation-new"
+set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+
+#---------------------------------------------------------------------
+# sims: simulations in development or casting
+#---------------------------------------------------------------------
+
+template::list::create \
+    -name sims \
+    -multirow sims \
+    -actions "{New Simulation From Template} $add_url" \
+    -no_data "You have no Simulations in Development or Casting" \
+    -elements {
+        status {
+            label "Status"
+        }
+        count {
+            label "Count"
+        }
+    }
+
+# if user is admin, show all.  otherwise, show only records owned by user
+if { $admin_p } {
+    set sim_filter_sql ""
+} else {
+    set sim_filter_sql "and ao.creation_user = :user_id"
+}
+
+db_multirow -extend { cast_url } sims select_sims "
+    select ss.sim_type as status,
+           count(w.workflow_id) as count
+      from workflows w,
+           sim_simulations ss,
+           acs_objects ao
+     where w.object_id = :package_id
+       and ss.simulation_id = w.workflow_id
+       and ao.object_id = w.workflow_id
+       and (ss.sim_type = 'dev_sim' or ss.sim_type = 'casting_sim')
+     group by ss.sim_type
+    $sim_filter_sql
+" {
+    set cast_url [export_vars -base "cast-edit" { workflow_id }]
+}
Index: openacs-4/packages/simulation/lib/sim-objects-grouped.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-objects-grouped.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/sim-objects-grouped.adp	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1 @@
+<p><listtemplate name="objects"></listtemplate></p>
Index: openacs-4/packages/simulation/lib/sim-objects-grouped.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-objects-grouped.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/sim-objects-grouped.tcl	11 Dec 2003 13:21:52 -0000	1.1
@@ -0,0 +1,77 @@
+simulation::include_contract {
+    Displays a grouped list of simulation objects for the current simulation package instance.
+
+    @author Joel Aufrecht
+    @creation-date 2003-11-12
+    @cvs-id $Id: sim-objects-grouped.tcl,v 1.1 2003/12/11 13:21:52 joela Exp $
+} {
+}
+
+######################################################################
+# Set general variables
+
+set package_id [ad_conn package_id]
+set user_id [auth::get_user_id]
+set base_url [apm_package_url_from_id $package_id]
+set create_p [permission::permission_p -object_id $package_id -privilege sim_object_create]
+
+if { ![exists_and_not_null parent_id] } {
+    set parent_id [bcms::folder::get_id_by_package_id -parent_id 0]
+}
+
+
+######################################################################
+#
+# objects list 
+#
+######################################################################
+
+#---------------------------------------------------------------------
+# Set up supporting variables for list
+
+set add_url [export_vars -base "[ad_conn package_url]citybuild/object-edit" { parent_id }]
+
+if { $create_p } {
+    set actions "{Add an object} $add_url"
+} else {
+    set actions ""
+}
+
+#---------------------------------------------------------------------
+# Set basic elements list
+set elements {
+    pretty_name {
+        label "Type"
+        orderby upper(ot.pretty_name)
+    }
+    count { 
+        label "Number"
+        orderby count
+        link_url_col view_url
+    }
+}
+
+######################################################################
+template::list::create \
+    -name objects \
+    -multirow objects \
+    -actions  $actions \
+    -elements $elements 
+
+#---------------------------------------------------------------------
+# database query
+
+db_multirow -extend { view_url } objects select_objects "
+    select ot.pretty_name,
+           count(*) 
+      from cr_folders f,
+           cr_items i,
+           acs_object_types ot
+     where f.package_id = :package_id
+       and i.parent_id = f.folder_id
+       and ot.object_type = i.content_type
+     group by ot.pretty_name
+    [template::list::orderby_clause -orderby -name "objects"]
+" {
+    set view_url $base_url/citybuild/TODOfilter
+}
Index: openacs-4/packages/simulation/lib/sim-objects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-objects.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/simulation/lib/sim-objects.tcl	2 Dec 2003 13:46:53 -0000	1.9
+++ openacs-4/packages/simulation/lib/sim-objects.tcl	11 Dec 2003 13:21:52 -0000	1.10
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     display_mode {
-        allowed_values {edit display display-grouped}
+        allowed_values {edit display}
         default_value display
     }
     size {
Index: openacs-4/packages/simulation/lib/sim-template-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/lib/sim-template-tasks.tcl	11 Dec 2003 13:19:22 -0000	1.10
+++ openacs-4/packages/simulation/lib/sim-template-tasks.tcl	11 Dec 2003 13:21:52 -0000	1.11
@@ -18,7 +18,7 @@
     display {}
 
     edit {
-	set add_task_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { workflow_id } ]
+	set add_task_url [export_vars -base "[apm_package_url_from_id $package_id]jsimbuild/task-edit" { workflow_id } ]
     }
 }
 
Index: openacs-4/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-templates.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/lib/sim-templates.tcl	2 Dec 2003 17:29:48 -0000	1.8
+++ openacs-4/packages/simulation/lib/sim-templates.tcl	11 Dec 2003 13:21:52 -0000	1.9
@@ -120,9 +120,13 @@
            (select count(action_id)
               from workflow_actions
              where workflow_id = w.workflow_id) as task_count
-      from workflows w, acs_objects a
+      from workflows w, 
+           sim_simulations ss,
+           acs_objects a
      where w.workflow_id = a.object_id
+       and ss.simulation_id = w.workflow_id
        and w.object_id = :package_id 
+       and ss.sim_type in ('dev_template','ready_template')
    [template::list::orderby_clause -orderby -name sim_templates]
 " {
     set description [string_truncate -len 200 $description]
Index: openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql	2 Dec 2003 17:29:48 -0000	1.2
+++ openacs-4/packages/simulation/sql/postgresql/simulation-priv-test-users-create.sql	11 Dec 2003 13:21:52 -0000	1.3
@@ -1,4 +1,4 @@
-1-- create dummy users for permissions testing
+-- create dummy users for permissions testing
 -- create each user and then assign appropriate privs directly
 
 -- this is a temp solution - should instead create all the groups 
Index: openacs-4/packages/simulation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/simulation/www/index.adp	2 Dec 2003 17:24:32 -0000	1.25
+++ openacs-4/packages/simulation/www/index.adp	11 Dec 2003 13:21:52 -0000	1.26
@@ -2,29 +2,11 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-
-<div style="margin: 4px; padding: 4px; border: 1px solid black;">
-  <h3><a href="simplay/">SimPlay</a></h3>
-
-  <if @user_id@ ne 0>
-    <include src="/packages/simulation/lib/cases" party_id="@user_id@"/>
-  </if>
-  <else>
-    <u>Log in</u> to see your active cases.
-  </else>
-
-    <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/>
-</div>
-
-<div style="margin: 4px; padding: 4px; border: 1px solid black;">
-  <h3><a href="yellow-pages">Yellow Pages</a></h3>
-</div>
-
 <if @citybuild_p@>
 <div style="margin: 4px; padding: 4px; border: 1px solid black;">
   <h3><a href="citybuild/">CityBuild</a></h3>
 
-  <include src="/packages/simulation/lib/sim-objects" size="short" display_mode="display"/>
+  <include src="/packages/simulation/lib/sim-objects-grouped/">
 </div>
 </if>
 
@@ -37,8 +19,26 @@
 </if>
 
 <if @siminst_p@>
-<div style="margin: 4px; padding: 4px; background: lightgray; border: 1px solid
+<div style="margin: 4px; padding: 4px; border: 1px solid
 black;">
   <h3><a href="siminst/">SimInst</a></h3>
+    <include src="/packages/simulation/lib/sim-insts-grouped"/>
 </div>
-</if>
\ No newline at end of file
+</if>
+
+<div style="margin: 4px; padding: 4px; border: 1px solid black;">
+  <h3><a href="simplay/">SimPlay</a></h3>
+
+  <if @user_id@ ne 0>
+    <include src="/packages/simulation/lib/cases" party_id="@user_id@"/>
+  </if>
+  <else>
+    <u>Log in</u> to see your active cases.
+  </else>
+
+    <include src="/packages/simulation/lib/simulations-available" party_id="@user_id@"/>
+</div>
+
+<div style="margin: 4px; padding: 4px; border: 1px solid black;">
+  <h3><a href="yellow-pages">Yellow Pages</a></h3>
+</div>
Index: openacs-4/packages/simulation/www/simulation-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simulation-master.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simulation-master.adp	18 Nov 2003 13:31:33 -0000	1.6
+++ openacs-4/packages/simulation/www/simulation-master.adp	11 Dec 2003 13:21:52 -0000	1.7
@@ -1,15 +1,14 @@
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="subnavbar_link">@subnavbar_link;noquote@</property>
 
+
 <property name="header_stuff">    
   <link rel="stylesheet" type="text/css" href="resources/under-construction.css" media="all">
 </property>
-<if @admin_p@>
-  <property name="subnavbar_link">
-      <a href="@parameters_url@">Configuration</a> | <a
-       href="@documentation_url@">Documentation</a> | <a href="/test/admin/index?by_package_key=simulation&view_by=testcase&quiet=0">Tests</a>
-</property>
+
 </if>
 <slave>
 
+
Index: openacs-4/packages/simulation/www/simulation-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simulation-master.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/www/simulation-master.tcl	18 Nov 2003 13:31:33 -0000	1.3
+++ openacs-4/packages/simulation/www/simulation-master.tcl	11 Dec 2003 13:21:52 -0000	1.4
@@ -1,5 +1,50 @@
 set package_id [ad_conn package_id]
 set return_url [ad_return_url]
-set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+
 set parameters_url [export_vars -base "/shared/parameters" {package_id return_url}]
-set documentation_url /doc/simulation
\ No newline at end of file
+set base_url [apm_package_url_from_id $package_id]
+
+######################################################################
+#
+# Build a link bar for the subsite
+#
+######################################################################
+
+set admin_p [permission::permission_p -object_id $package_id -privilege admin]
+set citybuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create]
+set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_object_create]
+set siminst_p [permission::permission_p -object_id $package_id -privilege sim_inst]
+
+if { $citybuild_p } {
+    lappend subnavbar_list [list "${base_url}citybuild" "CityBuild"]
+}
+
+if { $simbuild_p } {
+    lappend subnavbar_list [list "${base_url}simbuild" "SimBuild"]
+}
+
+if { $siminst_p } {
+    lappend subnavbar_list [list "${base_url}siminst" "SimInst"]
+}
+
+lappend subnavbar_list [list "${base_url}simplay" "SimPlay"]
+
+if { $admin_p } {
+    lappend subnavbar_list [list $parameters_url Configuration] 
+    lappend subnavbar_list [list "/test/admin/index?by_package_key=simulation&view_by=testcase&quiet=0" Tests]
+}
+
+lappend subnavbar_list [list "/doc/simulation" "Doc"]
+
+# TODO: should use ad_navbar
+# couldn't figure out how to pass the input to ad_narbar so hacking it in here
+# and also added context checking
+set link_list ""
+foreach arg $subnavbar_list {
+    if { [string match *[lindex $arg 0]* [ad_conn url]] } {
+        lappend link_list "[lindex $arg 1]"
+    } else {
+        lappend link_list "<a href=\"[lindex $arg 0]\">[lindex $arg 1]</a>"
+    }
+}
+set subnavbar_link "\[[join $link_list " | "]\]"
Index: openacs-4/packages/simulation/www/citybuild/generate-xml.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/generate-xml.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/citybuild/generate-xml.adp	13 Nov 2003 14:55:26 -0000	1.1
+++ openacs-4/packages/simulation/www/citybuild/generate-xml.adp	11 Dec 2003 13:21:52 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/citybuild/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/citybuild/index.adp	2 Dec 2003 13:46:53 -0000	1.2
+++ openacs-4/packages/simulation/www/citybuild/index.adp	11 Dec 2003 13:21:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/citybuild/object-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/citybuild/object-delete.adp	13 Nov 2003 14:55:26 -0000	1.1
+++ openacs-4/packages/simulation/www/citybuild/object-delete.adp	11 Dec 2003 13:21:52 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/citybuild/object-edit.adp	2 Dec 2003 13:46:53 -0000	1.2
+++ openacs-4/packages/simulation/www/citybuild/object-edit.adp	11 Dec 2003 13:21:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">object.title</property>
Index: openacs-4/packages/simulation/www/doc/data-model.dia
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/data-model.dia,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/doc/data-model.dia	3 Dec 2003 15:00:49 -0000	1.7
+++ openacs-4/packages/simulation/www/doc/data-model.dia	11 Dec 2003 13:21:52 -0000	1.8
@@ -1,89 +1,94 @@
-��}M��8��޿B���Dd��A�`k�'���c��S5o��Tr,�
-���ܼ��J�!%%�![�iG��)���x.�{�=�?���j9�WVVy���##��$[ϊy�^�������������<���oQ���~Ǻ2?���7�����G�|�Һ(�2 U���K���g=���0����<�S��oӺ.��u6Y��엏��ٗEY<����v�fŲ('�J��|����ǟw��y�:'��I��2K��4����!��d��eW������i�nȑ��3f7�҃֋?�����-�~�z��=j�^��"_���?����`�A���z��׫�^��Wɦ(�2���>�2K�[#w�ʆ�f�R?��A	�Br�������y��C�d�1����������W����}�x��_���s,�|~�q�8r��sJ�v}��?���'��W��e�6�����_�i��~G���v�gb{����\e2����C>Ϫ��m̑+���������`��:�24&��SV�.�����d��|ΛO���٬�M��:]��r>�������u�w>����������Ŵ��l���薱�D�&��<��{�q���χ&J=�t�Xfo�(c%��[ňd����aF�e�JfE�~�Gur��C�~�H�$L���_?0�=W�����r���>B�0:3����k�	d�Q��I�^�{�ce�<%e:���_%����_n�<���f4��&�b[�alkǠ����qNbx��m.��ջ��C����p>�5������Tn�Lo%����H��N��
vD���b��f
aؾ^l����p��9�nU$�/��ދ��HLoCA$�b
-=F�(�e��I��7��=˖a��"�(xG��lsx#m��>]��;ѝ��`�Éi�<�uZ�IZ�����3���v'����2[/NOA����������ψ:^��'�jb��ǀ[{��wO��+�{� MxC�ú0��q���>Ӿ�{˛����A쿛��1���Ǎ��#6�h���1#\Bo�BR����77����ÿ;��ý��p��b��e�8����c�tv�QH�	Wːȡ�^;7�oIo�c"�ϡ>����1&iu��J3���v������"^N�����I~����t�q��:�Z�H��9�b��|����ˉ<������O��U�|��������~�y��[�+[�+��Y��M����A˺#݌�{�v%L�_;(EB&����(��-R�J��b��ڿ�׽��Қ���G�/�S�
-�|�1F���X�eS������4���Ns�Y.��>SO�0ϩ��w��5��D�5���݆��7ő{�) 2��oM-P{���Q��녀*���1&i�)�>w��b슱+��]�j2��Ci�bW<ʮ���^8]�Uղt�1�I�I&��/`��$�v��6����,�O��x��$m��p��n��C���1{���W�*��t����~���
-����lBC��{�OgU�P�l*��ߛ�j_���a�)�'���Py7Ul�2m�ھL=�XNj�.������{��ٹ+�l�q��%�}�6�/D��uQ��er�Cz�;Z�ڤ������̳r��g��N�q�b��*��}>t����l�?�oao��N�T}��D�t';�5?�uc�s���=|��Y��?3�OK��hԇӗ��O��)]{�������c���ݗy}����6��	^���~��qVfӒ/�������޲I�,����&լh0�;rh?d�^3�0c��yV��|c�|@��X#g��ݭ�0p�7ָ��Ú~$����F
-��.����=>�ݛ�b�nz���
-��.���-��ER��N�9��8}�3K+�
pz
�,VXs@gt��:W�^��%D?wT(�6z��
-���W�-J\%b�:ј��x�۷4�U�EkǷ������c�@`
X���N1"�[����Dl��VQӸBR"$��>��R��`~�$Tҳ����D����
B����A��\-8v�XB���m��{�d$c,�gZB���N����\si��9Q���F���!4a�s)
-][E�$�����/XG�_GC"l�����$����4�`ץT��g�SS}F��´B�e�re�6�(>O�����.���d0���i�P��
-������_�!v���)��nԶ�/�޻~��G�����GҲ
-_3�N?/��@2:��	�N(tB�
-�P脎j	:��	m�rm�|��O�/���.ϖ磝��:��*��c�O9��ߔ��w��b�
-����
-�����7a�?Lʫ%n�@A#,��MJ�Ƭ-���)A�db�j[&��>g���o�"[�����7<�^Cސ��x�ҷ����>����m��(m�;Rr��bx��_��1%����	�YRN����1�+�_�X@b�W@^
y��W@^
y������A��0hG\!����>?S��-u�%��It����<�4���W@\
q�W@\
q�W@\
�D�~zէ|�)]�����C�N�ҧ�mF�闹`L�hgJ��[�XD[�l���fF���662V�5V�{��ށ��5	N��
-8��>��ԏg��%�3,tU�:TF�Ҳ,���:^:Yf����W�&:? Kè[�>u�=Z�̞�,��������*w��
8�<{�7�X��b�d0I���9i��� Kg��������C}���$��ћ	����*]?M��:���oU���.�擙~ޫۻ������9�Ǟ�k��o��szW�}Ą��+D>��d�6v��sƨ��32T��r3�:��q�Y┄�䨝Ƀ���qK�,����@��7�괬;w�������o���C��f�A��A�;h�g��*'���x#n˽�wi#J��$��ۈ5��-I
-�S�SD�}ʡ�$�Ϡ7���a���@n�
jL`78	��v�
-`7�����^���d8�=H 9\�����)ـtY�A��o��l]�e2���\?rfieRL���Zt���:}�3�*"���۵+��
�����1��-Kq]�Y2Ok�	!@������y2(�� u��V�3wM����&�TQ�u-8�M�XD��٬"R5{�~��PL>�/c�e��p�J�#O�5�~w�5��Z��
-D��_ ‚���lc��@��&�Շ(�=��x�|,�/w��B]�BP����b�e1�BP��ԅ�.u!�N���GT��*9��9���d��(��;p���O�u��9@T�����⤳/�"K�dO@���]qP��9��3ϪY�o�-�)���d��2�>���W���^",�*�G$�Jx3�������_�
-͍.��xazv��ܧ*2�$���Ϊd������oྡ�3�oཱྀ���o�e.�70ߐBXI�W�H/��W0x����L*�$_�g�P�GB���Z�Q}������������;ð�c��9���S��U1����`ر�N�'�C	�w�����
-���:u�eIU�5*M
T,\[�B�\�F����0��R�Ϛm��gS"�ކ���v����҅Q�iS� 	�Y� H8~�9��j
UWV��nE(Z@��P���-�9�d
%��!�8�����x�t���Q����͈�J ��
#T��H���'g��5�k������!���9�8��C �8���uD �8�.���Z�ը�7�
-�W���b+�c�Jآ�6f��\6:�B�dR�����_l/LҽPvR�<٤e����
-�l#���6�l#����%���MBۣ��]$��2 :�������m�XoD��,����9��AC�6Qm�����v��]P[\09;Y���Fal���Fal���*�O��GX
aD��06P�\>j��P"�
-� �}y1���t=O���v�)_|J���-����ّQ��aL��g4ۘ��M�PNoÐ����P�sQ��I3���kG��0JI O��w�zO�(��Oq�;���xU�Pe�Pk?�,K��wݢ;���BG~�:4���'iY�ǿ4N/�,�����+W����Y�^gͩ�z�}>�2�׾nլ�������{	��of�73쿛�����Ԩ9v�c����j��Sb�V�l�p��7?2��_�6��aR�
-b4���ff�p|1|1|q�/~�N{9�8���X��7N��G�cZ�_?N�c�u��[cGo���٥ycm'���Xm��`��z�}�o�X�����{��zk�Mw��]��ְ��W�jm�!%�$�6���){u�m�k�L+�AQנ�Y�����/�.�8���X\f���>��7l,B��=�q��
�6.�` |2|2|���1?X�������NJ�h�)��� ,#'ܱ�zww�-��7>�Y��M�+�9|l�D[;�[�x��r���w��Z
-2��E8Tl���G�Ƈ�8���8{����]:�7����V8�4v��Jnp�7ح��83݌��^�����U�?���$�	��̀ld3~�����̀ld3 �
��f�,��?B��
-!�=�:���\�O�b�
�@��tP�]ЖQq����V��8n�rqH�Ʃ�lwT�ujva9�G�?*7�[)�("�x�q��m�qww��!�x�q��!w*�����!�P\��R�'@����Mܘ�
�
k�,�Y�h��4=@��+K��|[�����ؓt��p�>�O�����\�
tk�TuQ���
t@o��^7b�^71��(��m
j<m�6E�ҩ
��~l��Zƙ��1�o�N���w�"�^�_�iYw��3����kd�:�!::�DpE/�
-tF��r��R�W�Ő��ٔ��2"j���0x�O�2O��8~[m���QO���*݀N
-:5�ԠSC�tjЩA��tj��u�zX6k1H� � �ӟT�O`�T6H�\k�'���:���Dd�g�H\`���D��k��`,��!
-!h�]E�I��׺�'�tg���
�,<�5#�k��*Ehd:DE�Е�k�uB<s4�_w���_Ά�����~ ������<[~���v��1�[6�pJŇ�Y5Y���/'�r9��&[����'������2�F��D�,"C�"dC��]@�-(@�_��e��y�~}A�
-f�E/����Ѡ�^�φ�=��70���xu?|+{��zC�1�5b"��ѻ��&c&��l=_=嗻�^�gi�%�b�̵7E�y[�m���)�Y#o��-���~�y[�� s�z��*�z�2��`�%{b� �1��̠���"8t��(�T)=O?Ucgz�B���c�^�v�T&f��D�`�$�ҹ�Ya��F�akto@�ak��Qn���E,�y���5�p�¡�	j�����Z�_3=03ϪY�ojHic�
rz�?|^�սavc�����Cg�����%��۠nY%�t�xH��@�O���@ �o� ��Pӻ��VK�
x���X��c2q�;�:$�G�$�K�I,����U8������!Q,�[Y��l=�֊k������R���፼\��7z�LЛǟ���\������	��Գ�"�oomjכG�2�yAh��7�(�+��+��NƨB�JdP"se%2�P!�
-TȠB2��A�̑������A��'r!Ȭ �����eV��r1�~�rRF�iH�x85���ƶ
-����ѩ��5ͼ�c!˂,�B�o�e	�~�D�4�a�i�h�1���c���VED����s��M>%p�zwB���P��U�)�
-R*H�@u9�mN��Yr*ȩ ���
-r*'s*z��1�S�O郚b���M�
l�TAR��*�r�U"�卥@EM��`��dK	c��*W�I�r$RP��c����r?;�qF�F�vr>���BB���ډ3ʉL{̀��}x�[���Pq~y.���C�.�S���.�8rI�yH	��};rc������ n~d�oV��I�o�^�I�
-b�u�2s����ZQ�-	�#�F���
-��uQu�^�:�^��b�Θ�����&Fϴ��̝n*=�T���	ON���[!HFac;���Ǧ�2V�;�w�����\Ӌ�����@у��n���_��f?(���|�1m�Ho���z���n�]۸�Q��Q�@q8������[��;������{Opy>�#y�$9	Ý���$ϧ�Q�v����`�C	d} ���>�� 냬oE�o��P@c���й�˪N̨
-�}����F`�8�
-p�b�k+v��E)��B%��e7
-b�����PW
-b�Dۖ�p(���
��� &(��hzr�\�w�r��0��t�}����"��tI��t����>=�O�O�O�<�~�{�t����w�_�\x�D;�1���6��?�d�y�iE�K����4t"�<
��0O�<
��0O�<�H6[G�D�u��y� y��9��8�W��Do{����vru���h'����ehR�AD�T�!��wG;�F�C�N��D��ǣ���i'd_�6��F�[%̨b"��*�*�j�I���Ů�.S
-](��]A��1GQZ��Ͻ��}�=_=,�����L~M��B�a�S��!w�.z��!F��>�㰭���g����^���SA��Ѐ��0A�}�����5�#a�7qL��b�^Ki�S��"���gیR��\�6������5�ˢ>\�i&X讄̟U)��3L�b�ٔa�1E���w&�(���L0�	V�l��,l�,�m�o>��>�`��]��+�'v��x�"��PdL5���[��|�"�y��B"奝��������ɯzw�s�E8�\�:��p.¹�"��.�\�GL��%��K�h�#���E�w�(��c�cQ~�[�8�H�#�D�i��H�H�#�D8�HtQ�g�{'���0j��}�∰���RH��6f�K7�6+�Eg-�l6�l���Z���f�f�5s�5;��d�O��8���:ŃsF"��k�o�LM�F`�Tm�l�r��w��=1��e1���+T�D�gı�Bq,H`zꃷ�=��*�0���<6�t�l �1?��6�:��&�T�O���O:���P�5֨��/�
dk���٠
5@
-�ʯ��F��3`�<<cgz�m)b�y��D���p_<�&�R�gY
-�
�`�i�
�`�i�
�����#�� �p�eh�{p����2�ɕ�*qȦ-�7Q��
�uh��<��$Dz������NT�u���
-������y��r���'Vb�#�ˉYԴ�:C5q/��^^^�G��/ޑ��k�0E�^�UR��%��N�7m~
-�I�4���슉c�9>I��s|�2�g�URf�
->d���C�2���!Ç2|��ug����=���׻�bHs�BB��C
�o	�ڤu6O�A1,<���?F��N���{ݗr����
j�`�X�|�)]c����O��_������m�n�4j@�Z.������6��a�z$�%G��YQ�-��#Ӄ�؉��Iñ!�PL�LD/��:�u?O𤯌��2j:��}e����Ҿ�t�(6����9A�a��%���|(����J��:|%.d<�R}�U��w����s�{[ᣮ�m�W�m�U�J��@\���{��� �oX��KK��m���P��%�y�)���bE��R+�ݧ&V��W@eNg�.�Y��V3X�`5��V3X�`5���=�o^G��~�c�!S���
f�{�̳jV曣��� �i��W��ݚ7�
-pc�Iֲ������Q���
p�֠�����:͗�
-p����E�&���?(��>�������F)�
pk�.��b�M['������)�<�
.K��.A�P�E}s�e	�{.J���h8�1�����쾇�9��tWE²��G��(H@A
-P���$� 
	(H@A
-_@p	�0�� �AApܠ 
�
j�$8
-��	��s�T�l�䈬
;�j��G��u�J7�Fl��<��,�E
�2��=d�����,�D
����>��
-�
j�{E���T)5@
-PcON�_ �@��T=gU����ۨ���ۨ���6:�����,6����t=��
]�z@������t=a@P��0] ȁ�p�@��
j��z8t=�����s��y,�/UrW��
-p�X�̪|���8P�lP�p�U	���z��s}��#�Z�U&H�~�L��
-$�Jy�8�b* L���(c�4!
-�j�6M�O=s�[o�}�
-|����/2�˳��oi�N�Q̳�ͤ�/��ɲX�ti�=,�'oR����x���Jj�)��;xǨkcսm�:���S����쳴��<�2_��-7����s��b���4^�l�_��k׳{x�B{�����ս�{�����Pv���ę�)kC/͔UD?��e��6Sv��M�U�4�.��Z�v�ܪ	N^A�
-�P`�+X��
-V(�B�
-�P`�`)��(�f�X
9@
-����A�P"ȏ(O��Iit�<�6�&O����˓Ɨ�'�(D��R$K�,E��R$K�,E��R$KP@�R`�A��
r�,n�$K�����=Y�F(*�D��c�b^�
-w��2)�Д�߰�%|���0O��~�ώ~�m-��
-���"��C"�T$R�HE"�T$R�HE"�����V2��: �X�5v�m���&wy��W��;��]U�.v�ة���1hf�S���(\F�6�F�+��1&i�SC�iV���~�uuZ}A�a:���C�a:���C�a�~�m��D�A�P%�2� �g�/��<)T
;�N�^��|���
-�7��r��3"'A�0&��w��-_g-lE��2"�
-���<�A*©�7�]hJ��w�_0E��
-��I��7��=˖a�����E:����F^�?0���_~w�0�3,t0-(�뢪:-�$-������3�'�l�8=�n��c�vY�;?#�xi�Ы��>�A�Ae��A�wxoy7۽;������XT1g�7Lpy�վ���;�}��Q��+��q^v���Ҋ=����R#m�VYrW�����c`�i;wwC�=��c`��=���ǚ���c��)�;6���jlei�BU�5�*�
-� ��W��/>��c�>Nd.�(f�\���hW$l2+���I5[��IwR�erm�j;��$8��QM�q\�e��:�"^c'^��� ���a�����������v���gDLF�������@No3�׿���87;9O�S��c~�OBn��v��An��vΟ�	����q��;�2�w��\�	ROV��>_g�#D�����c
-�F
�PR�]����vц�m�8�Y�~֭�kGI�a��� �]z�:}�}l����K����?B��s2��R������X��=ܖ#E��]v�C��Ҁ��ƨ[�u��evm�Af9�v9�E:|}�3F�)J,YG����^)�8��e����x����G�X-��-U�m�.7P����F��!6{oI���s�A��٤(���LQ2�$�c���r����r�x������f#׈�0�I�g�s��^�5��kޤ�y�"��-��׺+8y0��*U�ߠ��A��"wp*�2����u��nF��n���E���{[��1��X%<&��b},�zd�<R�����෬����I��Ѵ�����5%��F��S�ς�����6Lˌe1KGU�zw!G�kp"�_�a�D�aX���:��H���C�����1
-1 �v����=�����D_uU�Q��ڞ?8)L�HDt.���Ɉd�g7�l����T�j��s��23D��U�pU��!���/ު;n��'��g�V���jH��V�cL�6�*��y�T ��(*���E5�L��
-a�3�Qc6��PDgY@�Dd��zEh~���q	��_b��q�� b��eA�Mx"vW��6�.��k���Rd���ۘ��,ԅ$}6e����s�!���ૼ�{N�N�b?e�v<�'�U-���VI����,�.�ӛ`>�rhQ�)�	�iWYU��zЛ���&~�����&�7
-qh�Cm�Cmb�y<��8&�%~�Z�u����
H�8=�s��s���+��@��:���.]I��c
-��(fJ)�)��*���$cS�9��Į����R�zOeA�p�x{A���!��c<y9�s�ؚ���������:�un6d�v��,@���Q�՗
-D=@��D=@��D=,�nz눦� z w�8�L�o�n8��4��������}����A�
-Y��ʺu��ñ���1l�!ENo�t�
-�9B��c�zp�;�yJ�t�PA �l���)�Y#��@6�d#��@�ɸB�yD(�l���B����:�7U$��!�
-�Xc�%x�
- �遜�(�Q:p�p�so�cF
8�c
-�M�����9���I�:��u�?��=~�y^'wy��W@���Ǧ���S�d���2�'��
|��3ϪY�oLj�
r��!�IV�*K�`B��U�+D���Hr�S�0�q��㪆c/�3xr6U�_�1�(ªj�Z�r
��\@��;��A�*P���T.|w��.�l��#t��1��FT�kD�.,*�F��S���.~��Y[|N9����&�w!�΅1�\�Ċ(9�
-CG&jƆF����O�I��Z۠�nۗ�h7džk�4s*ʼ%�t�7��N�6�>ԅ>����
-F��R?������q��b�d��^b�:I˲x<��q�|�d�����܍t~LCU��s_��˥�}B�&��|�]`4�o���!���������6X�T��TT�X^�R���ε�`+,VX��X}����XY�����~U���k��R���
-?ιhV�����#�Q44��^'��^�Z�y|��ah��6���ruGG���)�iG.�}O8�qF��+�uF8l0��r��H;�ƌ!�ɈH�nX��ܦf�X<�B�2�����M�W_
+��}�s�8����
+E�e7�B A���٘鉉=��ll�^� %Z�$*Hz\�|���ɔ��R��該1	�/
d�|���m���+-�,����y�n��"�,����}*?��?��"K���[�z�ޱ)�O�|����~���񑬞ʤ���H������*�Y
+���?M&o/�H�D�n�ۤ�����J'�d����6�]��f��7�Wy1�W����Ow��>�����{�9q�m�Lo�4�z��T�/��\z���]o�2SC���!G����͘ݨR
+�,���_���[����Zm7z�H�N�e�yoG}6��`�A���:������W��x�U�d�{�y�J�Mc�.Y��pC�<Y����4(�“�n�.���cU�ZYx���{#٦��6����ly_Y^�����z�e�-N;��G�RN�o|���xrg�_Y�ݮҶ9�|���O�\��;�א׷[>�Վ.R��T�_���"-;��1G�t��sק~8��i~u�e�M�����]����������7�B~���M��*�,�b1�N������Q;�l�������pB�bʇ��|���C4e, ���""���w�q{{h�P�H6�U�ƌ�V|1�JF�7̧D3���u<ϋ��=ʨ���z�G�	¤�<���>�sU}������چѹ�3�F�٘��N 8��>�[��݋x+���"{(��x�o~� y0��5��h��M�Ŷ��XcG��G��qN"�w
+p�)� \0��w�D�m
��|�+�y�ctS�ؙM%�ƶ�9��fg�*F��|�<`�z��[�I[���o�ixè$��}9
+	��^\���lxD�0R�c�á_�f��E=�޳l��*�N���w�yXϷ�7�8�sѕ���?:��r�C�Y%E'E�?^>U�nw¬/��������Ώi�m�������}B�&��|4��Q�|��?�2�WR�7�?�r���>O^_Vg�wpoy3۽Y9��w3�>FspS�q���xȂ���l1¥祉Z@�?��x}C>>���p�ԇ���Fq�_��{�=fkD�p���5s����f<"��9P��m�|�I�����1���0�'�}�����6@�G>�o��b�0ΗP�ߪ��у1GW�␯p@}9B|9��=���7U�!���]��VO�~�M�yRVO;oݼ���տ�*�'o�t�;ha��;��ȾnwP��+%I�<;s�(9J�z��!��U�ܬ����u�����]ƨ����Tp�����$jٔ�/�jʡ'
+�����L�K?"��ԓG�������tM�1�gM;�}��t��8��=�D�~q���0
�gi6
+�fS�*�n�ǘ�٦���3슱+Ʈ�wŲ�`+��b�]�(�����oj��u��e��)Lj'�'?��Ǔ�Y�x��׳H=5��I֓4Y:��X���
+����9�2[��,�e������"���{̚�	���]?��q���Tr�ޛ�+W���a�-�'��P:7�o�"��ڮL=�Nj�.������{��ٹˋ�ٸu�׾^�ݗ
+��
+�&/��*>�!����M^n�y�~��k�Pdi1��3��܁Z'Ƹ�m�zZ���>���Qnb����ݷ��Q��v�����w"G�����ɺ�й�N�>k�,�
˝����{4������'�ٔ��������ep���]����K�>���`���>��Xz�yu8+�i�VY�t�dkyPo�$f��4@�r��?��9��2UV��`�1��"-�E��g> �
r������V_�
n�c���aM=@
+P��p
\�p
\Ƈ�����S1aSF����b�.���|Ϭf��l
�8N�̓�
p�^��+�5�@��:��UA�W�k	���뭂^�����~�[��ȺN4�/��u��-ͦR�h�Xc��_wlp�,@`
Y`A�tC��OXp�O��hl֍+%��n���Z�U�O�R8������Z<�6�!�������A��\-8,v�XB���m�=�u��HDXBϴ��z�s�@L���0�Bk_s"k�2O�Ch��˥4�m��(N�#,��`
+H�{A-�&!�w&	lfߧ���.���wz=05Sg�����.����(�4YG���4�/:�ksN��A�#�m��e�� ��Õ�v�?�]/geʫ��j��R�]}�z������#i؅���Z%��f�H�B':��	�N(tB�
+��Q-A':�m[�m����i�5}��e��|��ER%�Q�~l�)���R��N0[n����Q�C�����&���Ny����(h���w��ҡ1k���G�ڔG<��٫mA�j���O���t�����y���cx
+yC���kH���K�{���ﷹ磴��H1��R�z�ӄ�R�)�W�J���E@��%�`5O#�,aN�����$�+�`oy��W@^
y��Wh�q5��X �0�ŅA;�
+�x���=�����L5�ŗ�'��
+V�Ҹ�_W@\
q�W@\
q�W@\
q�W�
�U_��d�[�I�"�=�J��>%�-sA���Δ�fS���l����zF���662V�5V�{��ځ��5	N��
+8��>��R�g��%��,,tU�:TF�������Z^:^����ۗ�&:? Cè[�>u�=Z�̞�,�����2��J{��
8	{�7�X��b�d0A���9i�W� M���������Su��$Q�ћ	���ŧ�:�<M��:���oe���.K��z���]�W������c��5p^����9����>�#�E�B��H0Bk;>Q�9mT���Fj��k�^�8�qJqr�����K߸%U^�U�^�X�K��URT��Cf}qw�÷F��!�A3�O���g��*'���x-n˝�w)#R��$�i�j���
+I
+�S3SD�\ʡF$�Ϡ6���aU��@n�
jL`7X	��v�
+`7�����^���d8��=H 9\��>���(nZ�^?l�M��V@���C�<)u�	�
t�A�N��t@�/tƔEp�b��b�
p�!��z�6��њ���7y�Ƌ�B��z@�a�L�*]ċ��8��P�}�}58���H n��F.i�'��ya4{6+����=kC��_8&�ԗ�|�(5�����x
+������{kp>V��+D��\!R�m��U „�I���j��y��n�?�(Aa
+CP�SD�4Ba
+CP����0�ԩ�y����� ��7�p�����
r�1p�ɶ��� ȁL9ڟ
7�W�d�5Y����	�
r���+*� �ri9/�-��8�9C���u��?��>sϾ��i���N	oڐ�ؙMu�H3���b݌��g&��]�"3J��oɼ���
+�7p��}�
+-��}�
+�7p��}���T0��|CRa9$�~\�#������
p���Gsu����ls���[	!�|�Q�:��P������(�a�
v�a'Î
+�
ȓ��T��|��e)���c��6O���;8�<��=�@�t�"M�2/*T�:�X���ߺb!	
+8�a�$R�.k�)ƞMy�l0"k�>'��.�2O��A������.�3	�P�peU��P���-�h
E(Z@�‘�#JP���\O�B�C<񸫊�	�x�/k�
+��!ʌW[��l�3B�M��c�����C��|wM�b�q8���@:g!�@q�!gR֠���!�@���r@˾���A ��فu �k��y�X	۫����ٔ�Z��[2���L�ҭ�&�^(;.�o��z����m��F`�m��F`��t�&	�����.QD�CB�
p\����
+�7�
+��W�G�j��Am��g먶�A�fg[��,��]09;^�K���Fal���Fal���*�O��GX
aD�>n�
j.5�q(�lþ���U�Y$�b2�|ɖ_��o�&m�fK�hv�?n$t��fBqE$�i�(�YJp΋�>�g�~m�(1F)���qA�nT���E��=�)^c'^�J���*�]�e���[x��XX��OPB�f?6�8)�����Ʃ��U�Y��}ik��2�0�7��>�����W&����U���<y}y/�s��l�fF��w�w�����#G�r��H�fJ��
+������GF%q��f�2Lxf�
+;<���8___��߹�^�8
+��/���k'��?��X���׏��n��;�;������zcvi�X�	B�7��?���E*<��>�=��q�����ǎ����}��1��f�լd�T�ZY�I�
�g5C���v�Nr���8��tP�5��Ɔ/�/�/�狅�/��/�.3j��=>��7l�dw{&�t�.L\��@�d�d�d��c~��������%a�S���A>XFN�c����[d;o|�-���W�q�X�	;�[ly�7r���w��
+���E0Tl���G�Ƈ�8���8{�����"t�o󇟥�p�k?��̦R4?���Vΰ���nF@"�Z�||�2S��}�����f@6�?ݩ�Q�f@6��̀ld3N��?�!e�ކ�
艞l/2}B΋�x1����@��tP�^ЖQ�1�8*��4�8��rQ@�Ʃ�lwT�vjfa9�G�?*7W[)�("�x�q��5�;���C<�8���;QP[G���C(�W)� �	IN�n��׀�1dV�<Y
4Xg������E���|�`�
v�I:E}�
|��?|�M�ᣯ
+�:��1t�*/�e
+�:��]q�o�^7	Ϡ+)	æ5��F�"yaՀ�@?�mv-�������e���t�K��/���:k�����U�52V���~"�^/�tF��pֈlIߩ�b@�l��gS��" ���G��	�Z]����V���X�k�lA��tjЩ!o:5�ԠS�N
+:�A�:[?���j�v���O�V'0p�
�~�5���Km��g^��g��_`�@����k��`,��!
+!h�]��q��?�oU�Of#���9�|�Xx�1�)�<�JIh�;D��Е�[�uB<s4�_컖w���_Ά���*��z ��T���"]}���v¢O�M���'�R����l�jR�珓d���s�n����_�B�cr�J��v|a!��Щِ;xh�
+���������a�_��ك�ѫl�9v6�Yﳣ�����L�Ws����^)3��2����������$e&��l(_=��׻�Z��I�ƫ|/�;E��[$n���)�i!q��-�H�~�ĭ�t����=�y�=A)�^���>
1@c����fP�
+��e1:��(
+U)=OCUmg6�
a�ߑU3R�~�3	`"]�#8i��,���
+[#l��5�7 l��5�֨7B�� ��}D�Q8D����F�c�TY1z�����Y��ȶ����9�*�nWYy���Xt��:��Ygkic�
n�v�[��*�,�%��%��ө���b����`�
jzw�j�d�\�U�;�����ku4N"���D^�ז�fӈ�x�~������&N7�n���y�a�[*��<�������9��y�i�y���\p��<����|���sۜG��5�Q�ts�#����	uܜg�y�ʸzrP'�e��%2(���{C��A�*dP!�
+TȠB����	DT� ��9�dV�YAf��2+��Q��P�Q9!	B��H#y0Ӷ��ڶ�����ѩ���ݼ����eA�E���w˲�b?Q��t�a�i�p�1���c��l*C�lN���YL�$���]�;���O���:��)�T�:��J�S�h���
+r*ȩ ����ɜ��:Bq��S��&���do
$U�T������r��0��ڒ/ú\�c��dK	c��*W�H�r$RP��c�����r?Y�qF�F�rr.���B�WGʉ3ʉ�1�1}8��msl��7��C�p���s�ܳ�8t�¿d�/��#�ڑ��ȵ#�V���p1��Q�#�|x#�����}x���HM�� �Y�(=7�n`��E֒>�it�;����W�P�E�Pe���C�/Y &����-�qt@kb�L;j����g��*S���	�&�l�y$ �
+�t�cSm���;Uw*����\Ӌ�����@у��n���_�Dz?(���|�66vX���jk��,��[g�6�'~�k`�5�;t�{ll��-�ɭ����G¾'�8���8�?��N�H:�?��?r�(\�hH��B�p��!��>�@�Yd}��A�7"��{G( ���~O��eEY�zT	�>H�@�y#�d��A�˵����t�����2�j1�����P}(1N¦�%
+b`u�5��)���ut.��1W�ܧ��(��.�O�2�a(k�.�s�.z���٧����������r/��}>��{b��+��}�ܓp�=Ѧvܓ�FX�瞌1O3�Hyi����N$�'`��y�	�'`��y�	�'I�z��H�N�;�$ϑ<pz
���l�mO6r��N��v^��#~ �:E��)��a~@B��h'M<�)J�(<�I��v�G��j��r�U´*�G<O:�\�j�j�I ��ŮP.S](�U]A��1GQZ��Ͻ��}�=[?����'��L~M��B�a�S��!w�.z��!F��>�㰭���g����^e�ͱSA��Ѐ��0A�}�����5�%#�E7QD�#�^K*�iS�D^���϶�$�.�sM�YGpX�;���"\��.��pY��`��2V�T[ �L0e��gS�	�$��/|�L�Q����`��|�>�
+6�Y�`#XB�`�|0�
+|0����<>��W�O�8��E4<ۡH��E
���|�"�y��"ĥ����M7���ɯjw�s�E8�\�:��p.¹�"��.�\�GL��%��K���`��"�:Y�_ڱ�1/�ޭ�G�p$‘G��?E4M#��p$‘G"�p$��ҳ���_�o�R�.DQHX�Xm)�|6��BF5��G�u�Y�$�Fu!�i��lp�E�jͬk��0�Sl�o�����9#�[��;3]���>�C[9F�,'�
r��#�s����<#�u�
+��c��8�X�c!�	LG}�v�G�_�&��z�G�f�l�-�� ���&�ċLG���	�
x��Ij���5s�
2� c����4���P�UЈQx���g��̦�'aCs�3���	� $�%π��ԉ��>M+0
+�4�L0
+�4�L0
+�4�'���5���+-C�ֵW��.e��!�B��3^G�zԡ���XH��uh�y�:���C;QI�]�4L�c�:�����⺞Xz��|.'fa�����}���#xqxqx�͋�.�xG�o����.�uگ�zM-1U�s��i�S0�O����fVL9��	����:Ӯ�"]���!Ç2|�	G�>d���C��;çv��L�!����C�3�
+�|O��&��E��?�Oo�h�*Y:(�t�u_�EZ���
��b�_��dy�
��?u�aT�w.f�Z�>�iT��\T�q7��m��Ä�0c�w8����"kI٘��N�FL�	���`ҏ`��"���Z���O�ʐ��+úS���W���Ԗ�}��G1��'x�	��-�䨯�C�(���W����+�gCƓ�)է]%�|W)�wq�ro+|�U�m��*���jW���ˡ}{o��G�
+�CœzIm)z�4��!�ae��ǘ���w)VĨ+���}�cuiqT�d^%X�`5��V3X�`5��V3X�Γ��ud���?�2UV��`�1��"-�E�=���
r����{��ݭ�0p�7�=��a-��
j�5m0�i
+�?�o7I�n���\ `�,S6�N�P��
|��%�e>ϴR��8��
\��|�������S�xH\�4@G]�7B���͝�%hC�(!�PF�����5խg�*���]	�|��� 
	(H@A
+P���$� 
	(H@|
�9$3�
+� 	�
+p����
jP��8(Hn�$>��e��l�@�"�Yv��$.���>��x�lQ��6(�
x��Y���
dsȤU��i��1�}V�=P�5�8���Rj��Ɯ��� @����U�z�֪?W�Qm�M�Q)��mt�)^u��m�o��
]�z@������t=��
]�z €�t=�`�@�]����P�5��p�z7�
+t=��r��_��./���1�M���"�<.�
p��
ؠ*�ʫ~���")��G��j�L��F�$�7��J���)�0)뮣��9 r��J2.�`�Qj��)/�i�{����.K��%U2�G�HW7��>T#&�|�͓�����I�ܮ���(X���S�!w��P�F�{�u�����߃;l	�'i�9�U��[m^�?u�#��f�����;�<�2�W�g��T�r4����{��|��*��ygꥬ��RfT�X
+>��k�K�~v&�V��4��bhUکj�:6y�V��B}�P_��*�W��
+�U��B}b�����
+�
fP_�9��n���U@
+x ?�:eh�'����Л<)�?�ϓ���,O]Z���z�R$K�,E��R$K�,E��R$K�,E@
a8$K�`�R �A��
n�,j�$K?z�T�PTʉ�u�"$�u��2�LyR�L��b>�Dz��KG��YC��eC?�m-����ʗ"t�C"�T$R�HE"�T$R�HE"�����V2��: �X�1v�m�l�&wY�Z���;��]U�.���ɀ��2hf����P\�aBB¥�p��4��ɡ�4�`]@|7��*)�"L�0�t�!L�0�t�!L�0]?��D"@� t�dg�Q3ʖ�t9���`�W��y����n�T�
9@������n��m�6���l����hh݌� $��7�]�K�|���_0I€
+�n6q�Y���=˖a�����"���|{x#/�_^�/�;u��?:��ЁuQe�U�E�xx�W�Ǚ���U�Y����7��1
+e�l������O���X�ϠƠ���֠�;��������of�h,*�����q:�U�Q��j;�}��Qz�S����c�{>��׻�B�<)���\C-�1���Sv���
{�1���{�a�ջ�3�DzS�?vl�#6�]���B;��J*�U.;�A^�5��%[~I�Dz+|�Ȝ?XQ�0�B	��8.IPgVx��j�����J���R/�t��:=#�����ˋ�%u�E��N�F��Av�&�Ð�9�ݑ��'����7���x���!�iJ�vBTV3��MӝW�s��i9739Oϥ����Ο���r;�� ���r;��?� �3$�c?dw�eﲍ�v�����}�I�G�*D��5Z�[�B�D
�PR�Y�A�	wц�4H�r�
��������0�QT���.=d�<T�:�T���ʥG���!�˹��])�Hl~c,F�6�H��|�Y��5�C�hV�+�2N�̮-5��.���H��op�HQ"E�%��uXB�+E�o�FY��������Q+�_�omKU0BB�����,�uj���[P�	����LR�~H\�(����ۼX�E'��.޹����?�ld
+1&R��t�����r\���d�hY䭿�*�Vu'�]���tA;��N�P���;ص�5��Ⱦ�muP�Woj��V��e�%F	�A��U�����-�#�y��C?�-+fh�bR�t�-2��> oMyZ}#Rǩ�g������6tˌU>OFU�8w!G�kp"�]�a�D�aX���:��H����C�����4�'a���C͞�WM�E���.��wTm�����A$"<�����Q�P�`D�ȱ�z�DYT{��9���T�j"��
+�\�����ʅ�o�7��xފ�@��x���K5 �q+�1�hFNż"�!��(*���EէL��a�3�Q#6���ϲ���y�����1j�{�%Ԯ�
+��
+����
+���>��^$�M�]HB�Ӭϋ�Po�gӈogٓ�����j��Α��ʁ�r��9�;y#�)-���?�F�(��DZi%F#l�e�7�\!�Т�S��ӮӲL�)�&�7
�	�M�tw�	�M@oZ����D���n�xN9q(L@K��ī<.�m8�f
pz��
+,��sW�k�9��3:Xu(�]���1~�z
�L�RR]j�TFogID�hs6
+�]'%�����:��aC�8���1>�C|��x�r�}�x�13���5��u���L����]Y�
+գJʯ%� z��
�� z��
�� z����M�A�@�'pԙ8�j�p$.7h�]q��'��z=U_	����n��u�cc���bغC��M}Vw���9B��a�zp�3�yJ|w��I� ��@6�d��4��F �l��F �d\��<"��P6Br}�S��r�.�*D��v����@	���@N�U\+�8H
8�����ѣ�1ζH��	�
r��A��&eW�~���?�"��,]-J �
r�cӫ�䩌�Mr�J��
|c�,�r^d[�r� gr�u�Ncm�P�pU�
+�h�;��CtGW)̦^T��ت�����I�B�Vu�ZaT�pW�Q���T.�r�H�r
��\@�*>\��([���&}��*���Q��ʽ����-�$�߲M����� ����]�͂sAD(7�$R̦A@�PG����S^T�q=��Sk�
+b�����p
+�zNy��D������؉����*Wg�j�����X��;b��?:B����QKlQ�IQ�ǿ6ά/��������Ώi���f��3z���O���X�Ϡ������;ķ�����}�E��*����
+�Z���2ѹV��b��
+����X	NjՑe�Qj�NI�W�I��f-Uʌʠ��{�jp��t� ���7�X=C�KV�4�/5C?�����>^������m9�#?�Ƚ`��V~��3��G��J��� T�6�Ik"$BX���5���1�|�����̮&��y���W_
 |5���W_
-|5���W_�F��AW]
-t5(����@)�A�5�B
J�@���"�>�gP:rP�s�e9G�cܙz�[��@G���	1�����#�y'��ϳm ׷DId`_�,r ���3���k��Dž;8 2ԮK*B��J~����Vq"v��P˵�`:6�c�"�ܯ�x��Wɦ,Ɠ/>Hm[��O�������f+�B7#�`��pض|��"��,/����	��a��u��;pt�
-uV���ٻ�^�������HIZ�'=x�#�r^'y����6��N�8(��e���e��t�ʪr4��Ol�}o��ƻ�E{rִ@=��g��kw��g�-�0�����i��v�-��`+�ԃ����n��Ps�^�փ�\Z�������k1Ͳ��Z;�֕Y;�������غ�l{;�c�V7�����~Ԉ�s�u�Ļ�������
�O�o{<�q�u�cO�WGz��=��uz'Vx�$�}�`�g6����'Ϭ������1�Ŷ��m�l�����O�G�s]��!Ǝ��,�f�>У��1��t�
-f6�^?P�<�g��,����E�Lf��l���p�9.g�%-�`v�0�dmaT�s*=d�1+���C��r����.��k�ې��y����$���f}d��:���6�#$���FRIm����ݾP��Hj#���6��Hj#���	�m���ݧ��Jd�
4�'�2>��͛:����н��=K��1ob�ڌѠWQS}#b"�jлM�F�>\6k�A�A�ބ"gi�Av�󐝇���h"d�!;?����<d�!;���f���S���<T���Cu���)�L�߈7!��9~(�5Q��w���B(���Xe,�/BǡoӖI�ɰE�7w�!b
-S��^��)?�c����>�D�cl��[�ͼ��j#JۈHl�`Dh��������`�39S]Y�:��$�'-Y�$$��DB	I$$��DB	I$$���7�H�U�VAZ�jv�.��
n���d"�5P�\$Pc��2[6ђ�N���4����c�4~�d��$��4����&��
-�D~�L"�S�ΐ�o�f�8}O,F?R���T>E*�t*?>�ŋ~�|�����|F�����&��m&[Y�c�%�?tj6�|��&�����7vA1����#��|>����#��|>����#���$2,��7�����Y5@
-X0H�5`�:�X0,Ɯ����j�^嘵"Dpc������f�d|�xD� �M�i�剔k8�H0 �|C=qT�‚���c���X�D\
-�Ɽ3r��(�:I�:#U\4�㘟I�h�mtFNX��Hxrxrx�KW&n�\�͓��!�s�b�%��Pl��2�NE��ӷ�\��OO���=yb���e������A��(�՟?��Rk�h�
\ No newline at end of file
+|5���W3џ�{G��@W]
+J� �
9P
+pP
+�P��R(����ȹ�)����\zY�Q���DA�^�Ȣ�p�7�BϛM#F8�|g�Ɯ����6��[�$�20�/�@Z�"�1���[���={�OD�\���J�
+�l)$B��Tr��,{C-W�����9��b�&�}$&[��"O�� �m��>��rﲚ����?���a����Έ�3h��ʖ�c'����
��A����16�Yib�v�~z�_�C�v;�#%i��੏��y���jc�i@	ӜX�غ��v"��9��a[(���D�?9�!��I?���Y��X䢟�Vn������X��VZ�����I��K��SO2g���C͝{z-,Z�Npi��~�N0j[�E4M#k�Z[f�P����ھ7r�ck˲��p��[������#��֭ﶿCh�[���>���u�p�5�E�=E^�
vk�43w��Xፓp�i��M��Ȟ��<��'����Ǩ�2r�y�!���r.-��u�w�;��3L�
+�@�f��0z4�}6���z�@
+8s�3
+�}<�P
�����}<���3�8�\κKZ3��Ja�3��¨4�T:�:�cV�������Xim�]�g�k��fӀ��q����$���f]d��:�����#$���FRIm����ݾP��Hj#���6��Hj#���	�m����'�Md�
4�'�2>���MN�pe`_�랅[
+���1JeFk�˰���""�j��M�D��\6k�A�@�^�"�I�Bv�󐝇���h"d�!;?����<d�!;���z���S���<T���Cu���)�L�߈3!��:~�K�k5Q��w!�<�
+���3m���W�H�UL[&�&�^���)DL!bzi"����5���xm�]��}l�h=h�T�T��FH"��'���9���`�Mͬ
+�'\� �b�+Y%�׸y��u�EB	I$$��DB	I$$��DB	��q��DZi�Uz�fw�n��nt&2�5�E5ƨ)�U-��d	�:H�__?�O�Gu��
+�L	AX��ʐ�K��R'�9%����i��>Q��"�#E*���)R��S��A.��ɗ��Α�gt�L>��g��d��b��,���S3��3f7����^ﾱ���G>�|���G>�|���G>�|�%�aA>�
n>"n g
�5`� �Ԁ�:`�X�`�N�2�{�I�;�cVV���7��z3�����n�I0m�<�r
+�R�@�
	$��g��0 �0z��AGa��8r>�*�C�x錜� 'IeMg��{��(�g�%ڟf��V�.����ҕ�<;O�͓{CL�DF�!���k����k�N����O.@L�'�'�ш釞�?1��y�<�ş?5?���E����7Α�i�
\ No newline at end of file
Index: openacs-4/packages/simulation/www/doc/data-model.eps
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/data-model.eps,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/www/doc/data-model.eps	3 Dec 2003 15:00:49 -0000	1.3
+++ openacs-4/packages/simulation/www/doc/data-model.eps	11 Dec 2003 13:21:52 -0000	1.4
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: /var/lib/aolserver/service1/packages/simulation/www/doc/data-model.dia
 %%Creator: Dia v0.92
-%%CreationDate: Wed Dec  3 14:13:00 2003
+%%CreationDate: Thu Dec 11 11:44:59 2003
 %%For: joel
 %%Orientation: Portrait
 %%Magnification: 1.0000
@@ -6807,112 +6807,118 @@
 end_ol grestore 
 gsave -79.235933 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-2624 1984 moveto
-2487 2085 2346 2130 conicto
-2205 2176 2035 2176 conicto
-1637 2176 1426 1936 conicto
-1216 1696 1216 1243 conicto
-1216 0 lineto
-832 0 lineto
-832 2496 lineto
-1216 2496 lineto
-1216 2010 lineto
-1322 2276 1543 2418 conicto
-1765 2560 2068 2560 conicto
-2226 2560 2362 2529 conicto
-2498 2498 2624 2432 conicto
-2624 1984 lineto
+2240 2432 moveto
+2240 2048 lineto
+2054 2144 1865 2192 conicto
+1677 2240 1481 2240 conicto
+1186 2240 1041 2149 conicto
+896 2059 896 1873 conicto
+896 1706 1009 1623 conicto
+1123 1540 1575 1461 conicto
+1757 1429 lineto
+2058 1370 2213 1193 conicto
+2368 1017 2368 734 conicto
+2368 359 2100 147 conicto
+1832 -64 1355 -64 conicto
+1166 -64 959 -32 conicto
+753 0 512 64 conicto
+512 512 lineto
+752 385 971 320 conicto
+1191 256 1387 256 conicto
+1672 256 1828 371 conicto
+1984 487 1984 693 conicto
+1984 991 1380 1106 conicto
+1360 1110 lineto
+1190 1143 lineto
+837 1211 674 1373 conicto
+512 1536 512 1817 conicto
+512 2173 761 2366 conicto
+1011 2560 1472 2560 conicto
+1678 2560 1867 2528 conicto
+2057 2496 2240 2432 conicto
 end_ol grestore 
 gsave -78.871867 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-2496 1352 moveto
-2496 1152 lineto
-688 1152 lineto
-688 1139 lineto
-688 717 901 486 conicto
-1114 256 1501 256 conicto
-1697 256 1911 319 conicto
-2125 383 2368 512 conicto
-2368 128 lineto
-2134 32 1916 -16 conicto
-1698 -64 1496 -64 conicto
-912 -64 584 285 conicto
-256 634 256 1248 conicto
-256 1846 582 2203 conicto
-908 2560 1452 2560 conicto
-1936 2560 2216 2236 conicto
-2496 1912 2496 1352 conicto
-2112 1472 moveto
-2103 1848 1934 2044 conicto
-1766 2240 1450 2240 conicto
-1141 2240 941 2036 conicto
-741 1832 704 1470 conicto
-2112 1472 lineto
+576 2496 moveto
+1600 2496 lineto
+1600 320 lineto
+2432 320 lineto
+2432 0 lineto
+384 0 lineto
+384 320 lineto
+1216 320 lineto
+1216 2176 lineto
+576 2176 lineto
+576 2496 lineto
+1216 3520 moveto
+1600 3520 lineto
+1600 3008 lineto
+1216 3008 lineto
+1216 3520 lineto
 end_ol grestore 
 gsave -78.507800 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-1633 1280 moveto
-1485 1280 lineto
-1097 1280 900 1148 conicto
-704 1016 704 754 conicto
-704 518 851 387 conicto
-999 256 1259 256 conicto
-1626 256 1835 502 conicto
-2045 749 2048 1184 conicto
-2048 1280 lineto
-1633 1280 lineto
-2432 1449 moveto
-2432 0 lineto
-2048 0 lineto
-2048 353 lineto
-1910 139 1701 37 conicto
-1493 -64 1194 -64 conicto
-796 -64 558 154 conicto
-320 372 320 739 conicto
-320 1161 607 1380 conicto
-895 1600 1452 1600 conicto
-2048 1600 lineto
-2048 1662 lineto
-2045 1966 1889 2103 conicto
-1733 2240 1390 2240 conicto
-1172 2240 948 2174 conicto
-724 2109 512 1984 conicto
-512 2368 lineto
-744 2464 956 2512 conicto
-1169 2560 1369 2560 conicto
-1686 2560 1910 2470 conicto
-2134 2380 2272 2201 conicto
-2359 2091 2395 1931 conicto
-2432 1771 2432 1449 conicto
+1534 2267 moveto
+1610 2417 1727 2488 conicto
+1845 2560 2010 2560 conicto
+2312 2560 2436 2330 conicto
+2560 2100 2560 1464 conicto
+2560 0 lineto
+2176 0 lineto
+2176 1446 lineto
+2176 1981 2118 2110 conicto
+2060 2240 1906 2240 conicto
+1730 2240 1665 2101 conicto
+1600 1963 1600 1446 conicto
+1600 0 lineto
+1216 0 lineto
+1216 1446 lineto
+1216 1987 1153 2113 conicto
+1090 2240 928 2240 conicto
+766 2240 703 2101 conicto
+640 1963 640 1446 conicto
+640 0 lineto
+256 0 lineto
+256 2496 lineto
+640 2496 lineto
+640 2303 lineto
+714 2428 824 2494 conicto
+935 2560 1076 2560 conicto
+1246 2560 1358 2487 conicto
+1471 2414 1534 2267 conicto
 end_ol grestore 
 gsave -78.143733 125.950000 translate 0.035278 -0.035278 scale
 start_ol
-2048 2207 moveto
-2048 3520 lineto
-2432 3520 lineto
-2432 0 lineto
-2048 0 lineto
-2048 288 lineto
-1935 117 1749 26 conicto
-1563 -64 1319 -64 conicto
-824 -64 540 287 conicto
-256 639 256 1257 conicto
-256 1866 541 2213 conicto
-826 2560 1319 2560 conicto
-1565 2560 1753 2469 conicto
-1941 2379 2048 2207 conicto
-704 1248 moveto
-704 756 873 506 conicto
-1042 256 1373 256 conicto
-1703 256 1875 508 conicto
-2048 761 2048 1248 conicto
-2048 1737 1875 1988 conicto
-1703 2240 1373 2240 conicto
-1042 2240 873 1989 conicto
-704 1739 704 1248 conicto
+2304 -768 moveto
+2304 -1088 lineto
+0 -1088 lineto
+0 -768 lineto
+2304 -768 lineto
 end_ol grestore 
 gsave -77.779667 125.950000 translate 0.035278 -0.035278 scale
 start_ol
+1344 3200 moveto
+1344 2496 lineto
+2304 2496 lineto
+2304 2176 lineto
+1344 2176 lineto
+1344 816 lineto
+1344 539 1451 429 conicto
+1559 320 1828 320 conicto
+2304 320 lineto
+2304 0 lineto
+1787 0 lineto
+1333 0 1146 184 conicto
+960 368 960 816 conicto
+960 2176 lineto
+256 2176 lineto
+256 2496 lineto
+960 2496 lineto
+960 3200 lineto
+1344 3200 lineto
+end_ol grestore 
+gsave -77.415600 125.950000 translate 0.035278 -0.035278 scale
+start_ol
 1962 784 moveto
 1858 525 1698 101 conicto
 1477 -485 1400 -614 conicto
@@ -6930,14 +6936,6 @@
 2624 2496 lineto
 1962 784 lineto
 end_ol grestore 
-gsave -77.415600 125.950000 translate 0.035278 -0.035278 scale
-start_ol
-2304 -768 moveto
-2304 -1088 lineto
-0 -1088 lineto
-0 -768 lineto
-2304 -768 lineto
-end_ol grestore 
 gsave -77.051533 125.950000 translate 0.035278 -0.035278 scale
 start_ol
 832 288 moveto
@@ -6964,6 +6962,32 @@
 1840 256 2008 506 conicto
 2176 756 2176 1248 conicto
 end_ol grestore 
+gsave -76.687467 125.950000 translate 0.035278 -0.035278 scale
+start_ol
+2496 1352 moveto
+2496 1152 lineto
+688 1152 lineto
+688 1139 lineto
+688 717 901 486 conicto
+1114 256 1501 256 conicto
+1697 256 1911 319 conicto
+2125 383 2368 512 conicto
+2368 128 lineto
+2134 32 1916 -16 conicto
+1698 -64 1496 -64 conicto
+912 -64 584 285 conicto
+256 634 256 1248 conicto
+256 1846 582 2203 conicto
+908 2560 1452 2560 conicto
+1936 2560 2216 2236 conicto
+2496 1912 2496 1352 conicto
+2112 1472 moveto
+2103 1848 1934 2044 conicto
+1766 2240 1450 2240 conicto
+1141 2240 941 2036 conicto
+741 1832 704 1470 conicto
+2112 1472 lineto
+end_ol grestore 
 gsave -79.600000 126.750000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
@@ -24038,80 +24062,69 @@
 end_ol grestore 
 gsave -101.067933 95.700000 translate 0.035278 -0.035278 scale
 start_ol
-2175 2432 moveto
-1698 2432 1425 2159 conicto
-1152 1886 1152 1409 conicto
-1152 930 1425 657 conicto
-1698 384 2175 384 conicto
-2651 384 2925 658 conicto
-3200 933 3200 1409 conicto
-3200 1886 2927 2159 conicto
-2655 2432 2175 2432 conicto
-1519 2708 moveto
-1074 2817 825 3121 conicto
-576 3425 576 3863 conicto
-576 4474 1004 4829 conicto
-1432 5184 2176 5184 conicto
-2924 5184 3350 4829 conicto
-3776 4474 3776 3863 conicto
-3776 3425 3526 3121 conicto
-3277 2817 2832 2708 conicto
-3339 2591 3621 2250 conicto
-3904 1910 3904 1418 conicto
-3904 670 3457 271 conicto
-3010 -128 2176 -128 conicto
-1343 -128 895 271 conicto
-448 670 448 1418 conicto
-448 1910 731 2250 conicto
-1015 2591 1519 2708 conicto
-1280 3808 moveto
-1280 3400 1515 3172 conicto
-1750 2944 2174 2944 conicto
-2596 2944 2834 3172 conicto
-3072 3400 3072 3808 conicto
-3072 4215 2834 4443 conicto
-2596 4672 2174 4672 conicto
-1750 4672 1515 4443 conicto
-1280 4215 1280 3808 conicto
+768 64 moveto
+768 704 lineto
+1021 548 1279 466 conicto
+1538 384 1787 384 conicto
+2451 384 2801 830 conicto
+3151 1277 3200 2186 conicto
+3008 1902 2712 1751 conicto
+2417 1600 2058 1600 conicto
+1315 1600 881 2078 conicto
+448 2557 448 3389 conicto
+448 4202 904 4693 conicto
+1360 5184 2119 5184 conicto
+2988 5184 3446 4503 conicto
+3904 3822 3904 2526 conicto
+3904 1316 3341 594 conicto
+2779 -128 1829 -128 conicto
+1574 -128 1312 -80 conicto
+1050 -32 768 64 conicto
+2112 2112 moveto
+2554 2112 2813 2454 conicto
+3072 2796 3072 3393 conicto
+3072 3984 2813 4328 conicto
+2554 4672 2112 4672 conicto
+1669 4672 1410 4328 conicto
+1152 3984 1152 3393 conicto
+1152 2796 1410 2454 conicto
+1669 2112 2112 2112 conicto
 end_ol grestore 
 gsave -105.750000 96.900000 translate 0.035278 -0.035278 scale
 start_ol
-2773 2710 moveto
-3275 2604 3557 2271 conicto
-3840 1938 3840 1448 conicto
-3840 696 3325 284 conicto
-2811 -128 1862 -128 conicto
-1544 -128 1207 -64 conicto
-870 0 512 128 conicto
-512 768 lineto
-793 578 1129 481 conicto
-1465 384 1830 384 conicto
-2468 384 2802 651 conicto
-3136 919 3136 1430 conicto
-3136 1900 2829 2166 conicto
-2523 2432 1978 2432 conicto
-1408 2432 lineto
-1408 2944 lineto
-2004 2944 lineto
-2490 2944 2749 3163 conicto
-3008 3383 3008 3795 conicto
-3008 4219 2741 4445 conicto
-2475 4672 1978 4672 conicto
-1690 4672 1362 4610 conicto
-1034 4548 640 4416 conicto
-640 4992 lineto
-1032 5088 1373 5136 conicto
-1715 5184 2018 5184 conicto
-2801 5184 3256 4822 conicto
-3712 4461 3712 3845 conicto
-3712 3415 3468 3119 conicto
-3224 2824 2773 2710 conicto
+896 512 moveto
+1984 512 lineto
+1984 4544 lineto
+768 4288 lineto
+768 4800 lineto
+1994 5056 lineto
+2688 5056 lineto
+2688 512 lineto
+3776 512 lineto
+3776 0 lineto
+896 0 lineto
+896 512 lineto
 end_ol grestore 
 gsave -105.165800 96.900000 translate 0.035278 -0.035278 scale
 start_ol
+896 512 moveto
+1984 512 lineto
+1984 4544 lineto
+768 4288 lineto
+768 4800 lineto
+1994 5056 lineto
+2688 5056 lineto
+2688 512 lineto
+3776 512 lineto
+3776 0 lineto
+896 0 lineto
+896 512 lineto
 end_ol grestore 
-gsave -104.877933 96.900000 translate 0.035278 -0.035278 scale
+gsave -104.581600 96.900000 translate 0.035278 -0.035278 scale
 start_ol
+end_ol grestore 
+gsave -104.293733 96.900000 translate 0.035278 -0.035278 scale
+start_ol
 1344 4480 moveto
 1344 576 lineto
 2162 576 lineto
@@ -24129,7 +24142,7 @@
 640 0 lineto
 640 5056 lineto
 end_ol grestore 
-gsave -104.175200 96.900000 translate 0.035278 -0.035278 scale
+gsave -103.591000 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -24154,7 +24167,7 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -103.616400 96.900000 translate 0.035278 -0.035278 scale
+gsave -103.032200 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 3392 3648 moveto
 3392 3072 lineto
@@ -24176,10 +24189,10 @@
 2583 3904 2858 3840 conicto
 3134 3776 3392 3648 conicto
 end_ol grestore 
-gsave -103.116867 96.900000 translate 0.035278 -0.035278 scale
+gsave -102.532667 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -102.829000 96.900000 translate 0.035278 -0.035278 scale
+gsave -102.244800 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 1355 512 moveto
 3739 512 lineto
@@ -24204,7 +24217,7 @@
 3086 2332 2633 1852 conicto
 2180 1373 1355 512 conicto
 end_ol grestore 
-gsave -102.244800 96.900000 translate 0.035278 -0.035278 scale
+gsave -101.660600 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 2174 4672 moveto
 1665 4672 1408 4136 conicto
@@ -24225,7 +24238,7 @@
 448 3822 891 4503 conicto
 1335 5184 2176 5184 conicto
 end_ol grestore 
-gsave -101.660600 96.900000 translate 0.035278 -0.035278 scale
+gsave -101.076400 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 2174 4672 moveto
 1665 4672 1408 4136 conicto
@@ -24246,7 +24259,7 @@
 448 3822 891 4503 conicto
 1335 5184 2176 5184 conicto
 end_ol grestore 
-gsave -101.076400 96.900000 translate 0.035278 -0.035278 scale
+gsave -100.492200 96.900000 translate 0.035278 -0.035278 scale
 start_ol
 2773 2710 moveto
 3275 2604 3557 2271 conicto
@@ -31386,7 +31399,7 @@
 0 slc
 n -52.704515 145.391428 m -52.013492 145.794525 l s
 0.000000 0.000000 0.000000 srgb
-gsave -13.350368 124.137868 translate 0.035278 -0.035278 scale
+gsave -13.350400 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 2496 3200 moveto
 2496 2752 lineto
@@ -31418,7 +31431,7 @@
 1744 3392 1991 3344 conicto
 2238 3297 2496 3200 conicto
 end_ol grestore 
-gsave -12.960901 124.137868 translate 0.035278 -0.035278 scale
+gsave -12.960933 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31431,7 +31444,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -12.791568 124.137868 translate 0.035278 -0.035278 scale
+gsave -12.791600 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 2431 2020 moveto
 2590 2296 2809 2428 conicto
@@ -31462,7 +31475,7 @@
 1942 2560 2139 2422 conicto
 2337 2284 2431 2020 conicto
 end_ol grestore 
-gsave -12.198901 124.137868 translate 0.035278 -0.035278 scale
+gsave -12.198933 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 986 moveto
 448 2496 lineto
@@ -31482,15 +31495,15 @@
 906 -64 677 203 conicto
 448 471 448 986 conicto
 end_ol grestore 
-gsave -11.809435 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.809467 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 3520 moveto
 832 3520 lineto
 832 0 lineto
 448 0 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -11.640101 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.640133 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 1559 1280 moveto
 1040 1280 840 1160 conicto
@@ -31523,7 +31536,7 @@
 1835 2560 2101 2284 conicto
 2368 2009 2368 1449 conicto
 end_ol grestore 
-gsave -11.267568 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.267600 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 832 3200 moveto
 832 2496 lineto
@@ -31545,7 +31558,7 @@
 448 3200 lineto
 832 3200 lineto
 end_ol grestore 
-gsave -11.030501 124.137868 translate 0.035278 -0.035278 scale
+gsave -11.030533 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31558,7 +31571,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -10.861168 124.137868 translate 0.035278 -0.035278 scale
+gsave -10.861200 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 1409 2240 moveto
 1083 2240 893 1974 conicto
@@ -31579,7 +31592,7 @@
 256 1864 562 2212 conicto
 869 2560 1408 2560 conicto
 end_ol grestore 
-gsave -10.488635 124.137868 translate 0.035278 -0.035278 scale
+gsave -10.488667 124.138000 translate 0.035278 -0.035278 scale
 start_ol
 2560 1509 moveto
 2560 0 lineto
@@ -31599,7 +31612,7 @@
 2106 2560 2333 2293 conicto
 2560 2027 2560 1509 conicto
 end_ol grestore 
-gsave -13.274168 124.937868 translate 0.035278 -0.035278 scale
+gsave -13.274200 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 1559 1280 moveto
 1040 1280 840 1160 conicto
@@ -31632,7 +31645,7 @@
 1835 2560 2101 2284 conicto
 2368 2009 2368 1449 conicto
 end_ol grestore 
-gsave -12.901635 124.937868 translate 0.035278 -0.035278 scale
+gsave -12.901667 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2560 1509 moveto
 2560 0 lineto
@@ -31652,7 +31665,7 @@
 2106 2560 2333 2293 conicto
 2560 2027 2560 1509 conicto
 end_ol grestore 
-gsave -12.512168 124.937868 translate 0.035278 -0.035278 scale
+gsave -12.512200 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2112 2112 moveto
 2112 3520 lineto
@@ -31678,10 +31691,10 @@
 1079 2240 891 1976 conicto
 704 1713 704 1249 conicto
 end_ol grestore 
-gsave -12.122701 124.937868 translate 0.035278 -0.035278 scale
+gsave -12.122733 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -11.927968 124.937868 translate 0.035278 -0.035278 scale
+gsave -11.928000 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2944 3072 moveto
 2944 2624 lineto
@@ -31703,7 +31716,7 @@
 2183 3392 2447 3311 conicto
 2712 3231 2944 3072 conicto
 end_ol grestore 
-gsave -11.504635 124.937868 translate 0.035278 -0.035278 scale
+gsave -11.504667 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 1559 1280 moveto
 1040 1280 840 1160 conicto
@@ -31736,7 +31749,7 @@
 1835 2560 2101 2284 conicto
 2368 2009 2368 1449 conicto
 end_ol grestore 
-gsave -11.132101 124.937868 translate 0.035278 -0.035278 scale
+gsave -11.132133 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2048 2432 moveto
 2048 2048 lineto
@@ -31768,7 +31781,7 @@
 1466 2560 1670 2528 conicto
 1875 2496 2048 2432 conicto
 end_ol grestore 
-gsave -10.810368 124.937868 translate 0.035278 -0.035278 scale
+gsave -10.810400 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2624 1352 moveto
 2624 1152 lineto
@@ -31793,7 +31806,7 @@
 750 1836 718 1470 conicto
 2240 1472 lineto
 end_ol grestore 
-gsave -10.437835 124.937868 translate 0.035278 -0.035278 scale
+gsave -10.437867 124.938000 translate 0.035278 -0.035278 scale
 start_ol
 2048 2432 moveto
 2048 2048 lineto
@@ -31825,7 +31838,7 @@
 1466 2560 1670 2528 conicto
 1875 2496 2048 2432 conicto
 end_ol grestore 
-gsave -85.273601 100.387868 translate 0.035278 -0.035278 scale
+gsave -85.273633 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2496 3200 moveto
 2496 2752 lineto
@@ -31857,7 +31870,7 @@
 1744 3392 1991 3344 conicto
 2238 3297 2496 3200 conicto
 end_ol grestore 
-gsave -84.884135 100.387868 translate 0.035278 -0.035278 scale
+gsave -84.884167 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31870,7 +31883,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -84.714801 100.387868 translate 0.035278 -0.035278 scale
+gsave -84.714833 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2431 2020 moveto
 2590 2296 2809 2428 conicto
@@ -31901,10 +31914,10 @@
 1942 2560 2139 2422 conicto
 2337 2284 2431 2020 conicto
 end_ol grestore 
-gsave -84.122135 100.387868 translate 0.035278 -0.035278 scale
+gsave -84.122167 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -83.927401 100.387868 translate 0.035278 -0.035278 scale
+gsave -83.927433 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 1827 3008 moveto
 1311 3008 1007 2647 conicto
@@ -31925,7 +31938,7 @@
 256 2453 683 2922 conicto
 1111 3392 1827 3392 conicto
 end_ol grestore 
-gsave -83.444801 100.387868 translate 0.035278 -0.035278 scale
+gsave -83.444833 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2240 1249 moveto
 2240 1713 2052 1976 conicto
@@ -31951,7 +31964,7 @@
 832 3520 lineto
 832 2112 lineto
 end_ol grestore 
-gsave -83.055335 100.387868 translate 0.035278 -0.035278 scale
+gsave -83.055367 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 448 2496 moveto
 832 2496 lineto
@@ -31970,7 +31983,7 @@
 448 3008 lineto
 448 3520 lineto
 end_ol grestore 
-gsave -82.886001 100.387868 translate 0.035278 -0.035278 scale
+gsave -82.886033 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2624 1352 moveto
 2624 1152 lineto
@@ -31995,7 +32008,7 @@
 750 1836 718 1470 conicto
 2240 1472 lineto
 end_ol grestore 
-gsave -82.513468 100.387868 translate 0.035278 -0.035278 scale
+gsave -82.513500 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2240 2432 moveto
 2240 2048 lineto
@@ -32017,7 +32030,7 @@
 1707 2560 1888 2528 conicto
 2070 2496 2240 2432 conicto
 end_ol grestore 
-gsave -82.174801 100.387868 translate 0.035278 -0.035278 scale
+gsave -82.174833 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 832 3200 moveto
 832 2496 lineto
@@ -32039,7 +32052,7 @@
 448 3200 lineto
 832 3200 lineto
 end_ol grestore 
-gsave -81.937735 100.387868 translate 0.035278 -0.035278 scale
+gsave -81.937767 100.387900 translate 0.035278 -0.035278 scale
 start_ol
 2048 2432 moveto
 2048 2048 lineto
@@ -44902,10 +44915,10 @@
 1840 256 2008 506 conicto
 2176 756 2176 1248 conicto
 end_ol grestore 
-gsave -118.312132 146.287868 translate 0.035278 -0.035278 scale
+gsave -118.312000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -118.024265 146.287868 translate 0.035278 -0.035278 scale
+gsave -118.024133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3648 4928 moveto
 3648 4288 lineto
@@ -44937,7 +44950,7 @@
 2543 5184 2905 5120 conicto
 3268 5056 3648 4928 conicto
 end_ol grestore 
-gsave -117.440065 146.287868 translate 0.035278 -0.035278 scale
+gsave -117.439933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -44950,7 +44963,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -117.186065 146.287868 translate 0.035278 -0.035278 scale
+gsave -117.185933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3604 3061 moveto
 3836 3493 4158 3698 conicto
@@ -44981,7 +44994,7 @@
 2894 3904 3180 3688 conicto
 3467 3473 3604 3061 conicto
 end_ol grestore 
-gsave -116.297065 146.287868 translate 0.035278 -0.035278 scale
+gsave -116.296933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 512 moveto
 1280 -1408 lineto
@@ -45007,15 +45020,15 @@
 2828 384 3110 784 conicto
 3392 1185 3392 1889 conicto
 end_ol grestore 
-gsave -115.712865 146.287868 translate 0.035278 -0.035278 scale
+gsave -115.712733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -115.458865 146.287868 translate 0.035278 -0.035278 scale
+gsave -115.458733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45028,7 +45041,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -115.204865 146.287868 translate 0.035278 -0.035278 scale
+gsave -115.204733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2624 5248 moveto
 2624 4736 lineto
@@ -45050,7 +45063,7 @@
 1363 5248 2010 5248 conicto
 2624 5248 lineto
 end_ol grestore 
-gsave -114.883132 146.287868 translate 0.035278 -0.035278 scale
+gsave -114.883000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45063,7 +45076,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -114.629132 146.287868 translate 0.035278 -0.035278 scale
+gsave -114.629000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -45088,7 +45101,7 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -114.070332 146.287868 translate 0.035278 -0.035278 scale
+gsave -114.070200 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 3264 moveto
 3136 5248 lineto
@@ -45114,10 +45127,10 @@
 1586 3392 1305 2992 conicto
 1024 2592 1024 1889 conicto
 end_ol grestore 
-gsave -113.486132 146.287868 translate 0.035278 -0.035278 scale
+gsave -113.486000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -113.198265 146.287868 translate 0.035278 -0.035278 scale
+gsave -113.198133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1344 4480 moveto
 1344 576 lineto
@@ -45136,7 +45149,7 @@
 640 0 lineto
 640 5056 lineto
 end_ol grestore 
-gsave -112.495532 146.287868 translate 0.035278 -0.035278 scale
+gsave -112.495400 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45169,7 +45182,7 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -111.936732 146.287868 translate 0.035278 -0.035278 scale
+gsave -111.936600 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 4864 moveto
 1280 3776 lineto
@@ -45191,7 +45204,7 @@
 640 4864 lineto
 1280 4864 lineto
 end_ol grestore 
-gsave -111.581132 146.287868 translate 0.035278 -0.035278 scale
+gsave -111.581000 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45224,10 +45237,10 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -111.022332 146.287868 translate 0.035278 -0.035278 scale
+gsave -111.022200 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -110.734465 146.287868 translate 0.035278 -0.035278 scale
+gsave -110.734333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5056 moveto
 1689 5056 lineto
@@ -45244,7 +45257,7 @@
 640 0 lineto
 640 5056 lineto
 end_ol grestore 
-gsave -109.947065 146.287868 translate 0.035278 -0.035278 scale
+gsave -109.946933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45265,7 +45278,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -109.388265 146.287868 translate 0.035278 -0.035278 scale
+gsave -109.388133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 3264 moveto
 3136 5248 lineto
@@ -45291,7 +45304,7 @@
 1586 3392 1305 2992 conicto
 1024 2592 1024 1889 conicto
 end_ol grestore 
-gsave -108.804065 146.287868 translate 0.035278 -0.035278 scale
+gsave -108.803933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -45316,15 +45329,15 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -108.245265 146.287868 translate 0.035278 -0.035278 scale
+gsave -108.245133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -107.991265 146.287868 translate 0.035278 -0.035278 scale
+gsave -107.991133 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 832 832 moveto
 1536 832 lineto
@@ -45334,10 +45347,10 @@
 832 251 lineto
 832 832 lineto
 end_ol grestore 
-gsave -107.703399 146.287868 translate 0.035278 -0.035278 scale
+gsave -107.703267 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -107.415532 146.287868 translate 0.035278 -0.035278 scale
+gsave -107.415400 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3072 3712 moveto
 3072 3136 lineto
@@ -45369,7 +45382,7 @@
 2199 3904 2506 3856 conicto
 2813 3808 3072 3712 conicto
 end_ol grestore 
-gsave -106.941399 146.287868 translate 0.035278 -0.035278 scale
+gsave -106.941267 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3776 2287 moveto
 3776 0 lineto
@@ -45389,7 +45402,7 @@
 3119 3904 3447 3494 conicto
 3776 3084 3776 2287 conicto
 end_ol grestore 
-gsave -106.365665 146.287868 translate 0.035278 -0.035278 scale
+gsave -106.365533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45410,7 +45423,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -105.806865 146.287868 translate 0.035278 -0.035278 scale
+gsave -105.806733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 320 3776 moveto
 939 3776 lineto
@@ -45427,7 +45440,7 @@
 1306 0 lineto
 320 3776 lineto
 end_ol grestore 
-gsave -105.061799 146.287868 translate 0.035278 -0.035278 scale
+gsave -105.061667 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45440,7 +45453,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -104.807799 146.287868 translate 0.035278 -0.035278 scale
+gsave -104.807667 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3776 2287 moveto
 3776 0 lineto
@@ -45460,7 +45473,7 @@
 3119 3904 3447 3494 conicto
 3776 3084 3776 2287 conicto
 end_ol grestore 
-gsave -104.232065 146.287868 translate 0.035278 -0.035278 scale
+gsave -104.231933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 1950 moveto
 3136 2637 2858 3014 conicto
@@ -45494,18 +45507,18 @@
 3776 3776 lineto
 3776 462 lineto
 end_ol grestore 
-gsave -103.647865 146.287868 translate 0.035278 -0.035278 scale
+gsave -103.647733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -103.359999 146.287868 translate 0.035278 -0.035278 scale
+gsave -103.359867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -103.105999 146.287868 translate 0.035278 -0.035278 scale
+gsave -103.105867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45526,7 +45539,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -102.547199 146.287868 translate 0.035278 -0.035278 scale
+gsave -102.547067 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3136 1950 moveto
 3136 2637 2858 3014 conicto
@@ -45560,7 +45573,7 @@
 3776 3776 lineto
 3776 462 lineto
 end_ol grestore 
-gsave -101.962999 146.287868 translate 0.035278 -0.035278 scale
+gsave -101.962867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45573,7 +45586,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -101.708999 146.287868 translate 0.035278 -0.035278 scale
+gsave -101.708867 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3392 3648 moveto
 3392 3072 lineto
@@ -45595,7 +45608,7 @@
 2583 3904 2858 3840 conicto
 3134 3776 3392 3648 conicto
 end_ol grestore 
-gsave -101.209465 146.287868 translate 0.035278 -0.035278 scale
+gsave -101.209333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45628,18 +45641,18 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -100.650665 146.287868 translate 0.035278 -0.035278 scale
+gsave -100.650533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -100.396665 146.287868 translate 0.035278 -0.035278 scale
+gsave -100.396533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -100.108799 146.287868 translate 0.035278 -0.035278 scale
+gsave -100.108667 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3648 4928 moveto
 3648 4288 lineto
@@ -45671,7 +45684,7 @@
 2543 5184 2905 5120 conicto
 3268 5056 3648 4928 conicto
 end_ol grestore 
-gsave -99.524599 146.287868 translate 0.035278 -0.035278 scale
+gsave -99.524467 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45684,7 +45697,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -99.270599 146.287868 translate 0.035278 -0.035278 scale
+gsave -99.270467 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3604 3061 moveto
 3836 3493 4158 3698 conicto
@@ -45715,7 +45728,7 @@
 2894 3904 3180 3688 conicto
 3467 3473 3604 3061 conicto
 end_ol grestore 
-gsave -98.381599 146.287868 translate 0.035278 -0.035278 scale
+gsave -98.381467 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 1487 moveto
 640 3776 lineto
@@ -45735,15 +45748,15 @@
 1302 -128 971 283 conicto
 640 695 640 1487 conicto
 end_ol grestore 
-gsave -97.805865 146.287868 translate 0.035278 -0.035278 scale
+gsave -97.805733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -97.551865 146.287868 translate 0.035278 -0.035278 scale
+gsave -97.551733 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45776,7 +45789,7 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -96.993065 146.287868 translate 0.035278 -0.035278 scale
+gsave -96.992933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 4864 moveto
 1280 3776 lineto
@@ -45798,7 +45811,7 @@
 640 4864 lineto
 1280 4864 lineto
 end_ol grestore 
-gsave -96.637465 146.287868 translate 0.035278 -0.035278 scale
+gsave -96.637333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 3776 moveto
 1280 3776 lineto
@@ -45811,7 +45824,7 @@
 640 4480 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -96.383465 146.287868 translate 0.035278 -0.035278 scale
+gsave -96.383333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2114 3392 moveto
 1610 3392 1317 2989 conicto
@@ -45832,7 +45845,7 @@
 384 2834 843 3369 conicto
 1302 3904 2112 3904 conicto
 end_ol grestore 
-gsave -95.824665 146.287868 translate 0.035278 -0.035278 scale
+gsave -95.824533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3776 2287 moveto
 3776 0 lineto
@@ -45852,10 +45865,10 @@
 3119 3904 3447 3494 conicto
 3776 3084 3776 2287 conicto
 end_ol grestore 
-gsave -95.248932 146.287868 translate 0.035278 -0.035278 scale
+gsave -95.248800 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -94.961065 146.287868 translate 0.035278 -0.035278 scale
+gsave -94.960933 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 1280 4864 moveto
 1280 3776 lineto
@@ -45877,7 +45890,7 @@
 640 4864 lineto
 1280 4864 lineto
 end_ol grestore 
-gsave -94.605465 146.287868 translate 0.035278 -0.035278 scale
+gsave -94.605333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 2336 1856 moveto
 1596 1856 1310 1684 conicto
@@ -45910,7 +45923,7 @@
 2766 3904 3175 3463 conicto
 3584 3023 3584 2127 conicto
 end_ol grestore 
-gsave -94.046665 146.287868 translate 0.035278 -0.035278 scale
+gsave -94.046533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3392 1889 moveto
 3392 2592 3110 2992 conicto
@@ -45936,15 +45949,15 @@
 1280 5248 lineto
 1280 3264 lineto
 end_ol grestore 
-gsave -93.462465 146.287868 translate 0.035278 -0.035278 scale
+gsave -93.462333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 640 5248 moveto
 1280 5248 lineto
 1280 0 lineto
 640 0 lineto
 640 5248 lineto
 end_ol grestore 
-gsave -93.208465 146.287868 translate 0.035278 -0.035278 scale
+gsave -93.208333 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3904 2111 moveto
 3904 1792 lineto
@@ -45969,7 +45982,7 @@
 1092 2819 1045 2300 conicto
 3264 2304 lineto
 end_ol grestore 
-gsave -92.649665 146.287868 translate 0.035278 -0.035278 scale
+gsave -92.649533 146.288000 translate 0.035278 -0.035278 scale
 start_ol
 3072 3712 moveto
 3072 3136 lineto
@@ -52697,10 +52710,10 @@
 1584 1984 1752 1782 conicto
 1920 1581 1920 1190 conicto
 end_ol grestore 
-gsave -117.000000 149.425630 translate 0.035278 -0.035278 scale
+gsave -117.000000 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -116.856067 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.856067 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1664 1920 moveto
 1664 1600 lineto
@@ -52722,7 +52735,7 @@
 1268 1984 1403 1968 conicto
 1538 1952 1664 1920 conicto
 end_ol grestore 
-gsave -116.602067 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.602067 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -52740,15 +52753,15 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.415800 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.415800 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -116.187200 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.187200 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -52761,7 +52774,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -116.060200 149.425630 translate 0.035278 -0.035278 scale
+gsave -116.060200 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 640 2432 moveto
 640 1920 lineto
@@ -52783,7 +52796,7 @@
 320 2432 lineto
 640 2432 lineto
 end_ol grestore 
-gsave -115.882400 149.425630 translate 0.035278 -0.035278 scale
+gsave -115.882400 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -52808,7 +52821,7 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -115.603000 149.425630 translate 0.035278 -0.035278 scale
+gsave -115.603000 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1802 1592 moveto
 1918 1792 2079 1888 conicto
@@ -52839,7 +52852,7 @@
 1447 1984 1590 1883 conicto
 1734 1783 1802 1592 conicto
 end_ol grestore 
-gsave -115.154267 149.425630 translate 0.035278 -0.035278 scale
+gsave -115.154267 149.426000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
@@ -52871,10 +52884,10 @@
 1056 1984 1202 1968 conicto
 1348 1952 1472 1920 conicto
 end_ol grestore 
-gsave -117.050000 151.518725 translate 0.035278 -0.035278 scale
+gsave -117.050000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -116.906067 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.906067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1664 1920 moveto
 1664 1600 lineto
@@ -52896,7 +52909,7 @@
 1268 1984 1403 1968 conicto
 1538 1952 1664 1920 conicto
 end_ol grestore 
-gsave -116.652067 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.652067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -52914,15 +52927,15 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.465800 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.465800 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -116.237200 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.237200 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -52940,7 +52953,7 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.059400 151.518725 translate 0.035278 -0.035278 scale
+gsave -116.059400 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -52965,7 +52978,7 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -115.780000 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.780000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 128 1920 moveto
 470 1920 lineto
@@ -52976,7 +52989,7 @@
 844 0 lineto
 128 1920 lineto
 end_ol grestore 
-gsave -115.509067 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.509067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -52989,7 +53002,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -115.382067 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.382067 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
@@ -53021,7 +53034,7 @@
 1056 1984 1202 1968 conicto
 1348 1952 1472 1920 conicto
 end_ol grestore 
-gsave -115.145000 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.145000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -53034,7 +53047,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -115.018000 151.518725 translate 0.035278 -0.035278 scale
+gsave -115.018000 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1057 1728 moveto
 805 1728 658 1523 conicto
@@ -53055,7 +53068,7 @@
 192 1440 421 1712 conicto
 650 1984 1056 1984 conicto
 end_ol grestore 
-gsave -114.738600 151.518725 translate 0.035278 -0.035278 scale
+gsave -114.738600 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1190 moveto
 1920 0 lineto
@@ -53075,7 +53088,7 @@
 1584 1984 1752 1782 conicto
 1920 1581 1920 1190 conicto
 end_ol grestore 
-gsave -114.450733 151.518725 translate 0.035278 -0.035278 scale
+gsave -114.450733 151.519000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
@@ -53114,10 +53127,10 @@
 0.749020 0.749020 0.749020 srgb
 n -117.050000 152.685000 m -117.050000 156.588000 l -69.500000 156.588000 l -69.500000 152.685000 l cp s
 0.000000 0.000000 0.000000 srgb
-gsave -117.050000 154.636500 translate 0.035278 -0.035278 scale
+gsave -117.050000 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 end_ol grestore 
-gsave -116.906067 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.906067 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1664 1920 moveto
 1664 1600 lineto
@@ -53139,7 +53152,7 @@
 1268 1984 1403 1968 conicto
 1538 1952 1664 1920 conicto
 end_ol grestore 
-gsave -116.652067 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.652067 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -53157,15 +53170,15 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -116.465800 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.465800 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -116.237200 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.237200 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 320 1920 moveto
 640 1920 lineto
@@ -53178,7 +53191,7 @@
 320 2240 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -116.110200 154.636500 translate 0.035278 -0.035278 scale
+gsave -116.110200 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 640 2432 moveto
 640 1920 lineto
@@ -53200,7 +53213,7 @@
 320 2432 lineto
 640 2432 lineto
 end_ol grestore 
-gsave -115.932400 154.636500 translate 0.035278 -0.035278 scale
+gsave -115.932400 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -53225,7 +53238,7 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -115.653000 154.636500 translate 0.035278 -0.035278 scale
+gsave -115.653000 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1802 1592 moveto
 1918 1792 2079 1888 conicto
@@ -53256,15 +53269,15 @@
 1447 1984 1590 1883 conicto
 1734 1783 1802 1592 conicto
 end_ol grestore 
-gsave -115.204267 154.636500 translate 0.035278 -0.035278 scale
+gsave -115.204267 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1792 -576 moveto
 1792 -832 lineto
 -64 -832 lineto
 -64 -576 lineto
 1792 -576 lineto
 end_ol grestore 
-gsave -114.975667 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.975667 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1408 1664 moveto
 1358 1697 1298 1712 conicto
@@ -53282,7 +53295,7 @@
 1361 1984 1406 1984 conicto
 1408 1664 lineto
 end_ol grestore 
-gsave -114.797867 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.797867 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1920 1056 moveto
 1920 896 lineto
@@ -53307,15 +53320,15 @@
 544 1426 522 1150 conicto
 1600 1152 lineto
 end_ol grestore 
-gsave -114.518467 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.518467 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 320 2624 moveto
 640 2624 lineto
 640 0 lineto
 320 0 lineto
 320 2624 lineto
 end_ol grestore 
-gsave -114.391467 154.636500 translate 0.035278 -0.035278 scale
+gsave -114.391467 154.637000 translate 0.035278 -0.035278 scale
 start_ol
 1472 1920 moveto
 1472 1600 lineto
Index: openacs-4/packages/simulation/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/index.html,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/www/doc/index.html	3 Dec 2003 15:00:50 -0000	1.10
+++ openacs-4/packages/simulation/www/doc/index.html	11 Dec 2003 13:21:52 -0000	1.11
@@ -1 +1 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="next" href="install.html" title="Installation"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"> </td><th width="60%" align="center"></th><td width="20%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2762182"></a>Simulation</h1></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="article"><a href="install.html">Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="package-install.html">Package installation</a></span></dt></dl></dd><dt><span class="article"><a href="admin.html">Admin Guide</a></span></dt><dd><dl><dt><span class="sect1"><a href="map_xml.html">Map XML</a></span></dt></dl></dd><dt><span class="article"><a href="design.html">Design</a></span></dt><dd><dl><dt><span class="sect1"><a href="interfaces.html">Interfaces</a></span></dt><dt><span class="sect1"><a href="internals.html">Internal Design</a></span></dt><dt><span class="sect1"><a href="permissions.html">Permissions</a></span></dt><dt><span class="sect1"><a href="object-orientation-notes.html">Notes on an object-oriented simulated space</a></span></dt><dt><span class="sect1"><a href="simulation-lifecycle.html">Lifecycle of a Simulation</a></span></dt></dl></dd><dt><span class="appendix"><a href="licensing.html">A. Licencing</a></span></dt></dl></div><div class="list-of-tables"><p><b>List of Tables</b></p><dl><dt>1. <a href="simulation-lifecycle.html#id2825036">Casting Paths</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> Installation</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/index.html#comments">View comments on this page at openacs.org</a></center></body></html>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="next" href="install.html" title="Installation"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"> </td><th width="60%" align="center"></th><td width="20%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2762182"></a>Simulation</h1></div></div><div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="article"><a href="install.html">Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="package-install.html">Package installation</a></span></dt></dl></dd><dt><span class="article"><a href="admin.html">Admin Guide</a></span></dt><dd><dl><dt><span class="sect1"><a href="map_xml.html">Map XML</a></span></dt></dl></dd><dt><span class="article"><a href="design.html">Design</a></span></dt><dd><dl><dt><span class="sect1"><a href="interfaces.html">Interfaces</a></span></dt><dt><span class="sect1"><a href="internals.html">Internal Design</a></span></dt><dt><span class="sect1"><a href="permissions.html">Permissions</a></span></dt><dt><span class="sect1"><a href="object-orientation-notes.html">Notes on an object-oriented simulated space</a></span></dt><dt><span class="sect1"><a href="simulation-lifecycle.html">Lifecycle of a Simulation</a></span></dt></dl></dd><dt><span class="appendix"><a href="licensing.html">A. Licencing</a></span></dt></dl></div><div class="list-of-tables"><p><b>List of Tables</b></p><dl><dt>1. <a href="simulation-lifecycle.html#id2825064">Casting Paths</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> <a accesskey="n" href="install.html">Next</a></td></tr><tr><td width="40%" align="left"> </td><td width="20%" align="center"></td><td width="40%" align="right"> Installation</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/index.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/simulation/www/doc/simulation-lifecycle.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/simulation-lifecycle.html,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/doc/simulation-lifecycle.html	3 Dec 2003 15:00:50 -0000	1.1
+++ openacs-4/packages/simulation/www/doc/simulation-lifecycle.html	11 Dec 2003 13:21:52 -0000	1.2
@@ -1 +1 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Lifecycle of a Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="up" href="design.html" title="Design"><link rel="previous" href="object-orientation-notes.html" title="Notes on an object-oriented simulated space"><link rel="next" href="licensing.html" title="Appendix�A.�Licencing"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><th width="60%" align="center">Design</th><td width="20%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="simulation-lifecycle"></a>Lifecycle of a Simulation</h2></div></div><div></div></div><div class="orderedlist"><ol type="1"><li><p><b>Template Not ready.�</b>  ready_p not true.  Only shows up in SimBuild lists.</p></li><li><p><b>Template Ready.�</b>Ready_p is true.  Shows up in list of available templates in SimBuild.</p></li><li><p><b>Simulation in Development.�</b>Owned by a single person.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</p></li><li><p><b>Simulation in Casting.�</b>Several paths depending on enrollment and casting type.</p><div class="table"><a name="id2825036"></a><p class="title"><b>Table�1.�Casting Paths</b></p><table summary="Casting Paths" cellspacing="0" border="1"><colgroup><col><col><col></colgroup><thead><tr><th>Closed Enrollment/Automatic Casting</th><th>Open Enrollment/Automatic Casting</th><th>Open Enrollment/Group Casting</th><th>Open Enrollment/Open Casting</th></tr></thead><tbody><tr><td>set start/end date</td><td colspan="3">set start/end date, enrollment dates</td></tr><tr><td colspan="4">For each role, choose which user groups can be cast</td></tr><tr><td>Select user group(s) to enroll</td><td colspan="2">optionally restrict enrollment to selected groups.</td><td>optionally restrict enrollment to selected groups.  Set expected number of users.</td></tr><tr><td>�</td><td colspan="3">Users can go enroll themselves in simulations</td></tr><tr><td colspan="2">Automatic casting creates cases and assigns users to groups in roles in cases</td><td>Users see a list of groups, and choose which group to join.  After enrollment period is over, automatic casting creates cases and assigns groups to roles in cases</td><td>Users see a list of cases, roles in each case, and users in groups for each role.  Users can choose any available slot.  Admin can add new, empty cases.</td></tr><tr><td colspan="4">Any empty slots remaining are assigned to the professor</td></tr></tbody></table></div></li><li><p><b>Live Simulation.�</b>start date &lt; now &lt; end date.  Shows up in list of sims in Simplay for admin.  </p></li><li><p><b>Finished Simulation.�</b>now &gt; end date.  Shows up in special list in simplay.</p></li></ol></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr><tr><td width="40%" align="left">Notes on an object-oriented simulated space </td><td width="20%" align="center"><a accesskey="u" href="design.html">Up</a></td><td width="40%" align="right"> Appendix�A.�Licencing</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/simulation-lifecycle.html#comments">View comments on this page at openacs.org</a></center></body></html>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Lifecycle of a Simulation</title><meta name="generator" content="DocBook XSL Stylesheets V1.62.4"><link rel="home" href="index.html" title="Simulation"><link rel="up" href="design.html" title="Design"><link rel="previous" href="object-orientation-notes.html" title="Notes on an object-oriented simulated space"><link rel="next" href="licensing.html" title="Appendix�A.�Licencing"><link rel="stylesheet" href="openacs.css" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><a href="http://openacs.org"><img src="/doc/images/alex.jpg" border="0"></a><table width="100%" summary="Navigation header" border="0"><tr><td width="20%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><th width="60%" align="center">Design</th><td width="20%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="simulation-lifecycle"></a>Lifecycle of a Simulation</h2></div></div><div></div></div><div class="orderedlist"><ol type="1"><li><p><b>Template Not ready (<span class="bold"><b>dev_template</b></span>).�</b>  ready_p not true.  Only shows up in SimBuild lists.</p></li><li><p><b>Template Ready (<span class="bold"><b>ready_template</b></span>).�</b>Ready_p is true.  Shows up in list of available templates in SimBuild.</p></li><li><p><b>Simulation in Development (<span class="bold"><b>dev_sim</b></span>).�</b>Owned by a single party.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</p></li><li><p><b>Simulation in Casting (<span class="bold"><b>casting_sim</b></span>).�</b>Several paths depending on enrollment and casting type.</p><div class="table"><a name="id2825064"></a><p class="title"><b>Table�1.�Casting Paths</b></p><table summary="Casting Paths" cellspacing="0" border="1"><colgroup><col><col><col></colgroup><thead><tr><th>Closed Enrollment/Automatic Casting</th><th>Open Enrollment/Automatic Casting</th><th>Open Enrollment/Group Casting</th><th>Open Enrollment/Open Casting</th></tr></thead><tbody><tr><td>set start/end date</td><td colspan="3">set start/end date, enrollment dates</td></tr><tr><td colspan="4">For each role, choose which user groups can be cast</td></tr><tr><td>Select user group(s) to enroll</td><td colspan="2">optionally restrict enrollment to selected groups.</td><td>optionally restrict enrollment to selected groups.  Set expected number of users.</td></tr><tr><td>�</td><td colspan="3">Users can go enroll themselves in simulations</td></tr><tr><td colspan="2">Automatic casting creates cases and assigns users to groups in roles in cases</td><td>Users see a list of groups, and choose which group to join.  After enrollment period is over, automatic casting creates cases and assigns groups to roles in cases</td><td>Users see a list of cases, roles in each case, and users in groups for each role.  Users can choose any available slot.  Admin can add new, empty cases.</td></tr><tr><td colspan="4">Any empty slots remaining are assigned to the professor</td></tr></tbody></table></div></li><li><p><b>Live Simulation (<span class="bold"><b>live_sim</b></span>).�</b>start date &lt; now &lt; end date.  Shows up in list of sims in Simplay for admin.  </p></li><li><p><b>Finished Simulation (<span class="bold"><b>live_sim</b></span>).�</b>now &gt; end date.  Shows up in special list in simplay.</p></li></ol></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="object-orientation-notes.html">Prev</a> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right"> <a accesskey="n" href="licensing.html">Next</a></td></tr><tr><td width="40%" align="left">Notes on an object-oriented simulated space </td><td width="20%" align="center"><a accesskey="u" href="design.html">Up</a></td><td width="40%" align="right"> Appendix�A.�Licencing</td></tr></table><hr><address><a href="mailto:docs@openacs.org">docs@openacs.org</a></address></div><a name="comments"></a><center><a href="http://openacs.org/doc/simulation-lifecycle.html#comments">View comments on this page at openacs.org</a></center></body></html>
Index: openacs-4/packages/simulation/www/doc/xml/design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/doc/xml/design.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/doc/xml/design.xml	3 Dec 2003 15:00:50 -0000	1.7
+++ openacs-4/packages/simulation/www/doc/xml/design.xml	11 Dec 2003 13:21:52 -0000	1.8
@@ -121,31 +121,30 @@
         </itemizedlist>
       </sect2>
     </sect1>
-
     <sect1 id="simulation-lifecycle">
       <title>Lifecycle of a Simulation</title>
       <orderedlist>
         <listitem>
           <formalpara>
-            <title>Template Not ready.</title>
+            <title>Template Not ready (<emphasis role="bold">dev_template</emphasis>)</title>
             <para>  ready_p not true.  Only shows up in SimBuild lists.</para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Template Ready</title>
+            <title>Template Ready (<emphasis role="bold">ready_template</emphasis>)</title>
             <para>Ready_p is true.  Shows up in list of available templates in SimBuild.</para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Simulation in Development.</title>
-            <para>Owned by a single person.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</para>
+            <title>Simulation in Development (<emphasis role="bold">dev_sim</emphasis>)</title>
+            <para>Owned by a single party.  Shows up only in their Siminst page. between zero and all of the roles are mapped to characters.  Between zero and all of the tasks are developed (description added, attachment slots linked to sim objects).</para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Simulation in Casting.</title>
+            <title>Simulation in Casting (<emphasis role="bold">casting_sim</emphasis>)</title>
             <para>Several paths depending on enrollment and casting type.</para>
           </formalpara>
           <table>
@@ -194,20 +193,16 @@
         </listitem>
         <listitem>
           <formalpara>
-            <title>Live Simulation</title>
+            <title>Live Simulation (<emphasis role="bold">live_sim</emphasis>)</title>
             <para>start date &lt; now &lt; end date.  Shows up in list of sims in Simplay for admin.  </para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara>
-            <title>Finished Simulation</title>
+            <title>Finished Simulation (<emphasis role="bold">live_sim</emphasis>)</title>
             <para>now &gt; end date.  Shows up in special list in simplay.</para>
           </formalpara>
         </listitem>
       </orderedlist>
     </sect1>
   </article>
-  
-
-
-
Index: openacs-4/packages/simulation/www/simbuild/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/simbuild/index.adp	18 Nov 2003 09:44:32 -0000	1.2
+++ openacs-4/packages/simulation/www/simbuild/index.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/simbuild/role-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/role-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simbuild/role-delete.adp	13 Nov 2003 15:35:48 -0000	1.1
+++ openacs-4/packages/simulation/www/simbuild/role-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/simbuild/role-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/role-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/www/simbuild/role-edit.adp	10 Dec 2003 16:06:46 -0000	1.3
+++ openacs-4/packages/simulation/www/simbuild/role-edit.adp	11 Dec 2003 13:21:53 -0000	1.4
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">role.pretty_name</property>
Index: openacs-4/packages/simulation/www/simbuild/state-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/state-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simbuild/state-edit.adp	9 Dec 2003 15:58:13 -0000	1.1
+++ openacs-4/packages/simulation/www/simbuild/state-edit.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">state.pretty_name</property>
Index: openacs-4/packages/simulation/www/simbuild/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simbuild/task-edit.adp	10 Dec 2003 16:06:46 -0000	1.6
+++ openacs-4/packages/simulation/www/simbuild/task-edit.adp	11 Dec 2003 13:21:53 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">task.pretty_name</property>
Index: openacs-4/packages/simulation/www/simbuild/template-clone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-clone.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simbuild/template-clone.adp	20 Nov 2003 12:57:00 -0000	1.1
+++ openacs-4/packages/simulation/www/simbuild/template-clone.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/simbuild/template-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simbuild/template-delete.adp	13 Nov 2003 15:35:48 -0000	1.1
+++ openacs-4/packages/simulation/www/simbuild/template-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/simbuild/template-edit.adp	9 Dec 2003 17:31:29 -0000	1.7
+++ openacs-4/packages/simulation/www/simbuild/template-edit.adp	11 Dec 2003 13:21:53 -0000	1.8
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">sim_template.name</property>
Index: openacs-4/packages/simulation/www/siminst/cast-actors.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-actors.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/cast-actors.adp	28 Nov 2003 16:55:52 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/cast-actors.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/cast-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-complete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/cast-complete.adp	27 Nov 2003 16:43:36 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/cast-complete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/cast-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/cast-edit.adp	27 Nov 2003 16:43:36 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/cast-edit.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/simulation/www/siminst/index.adp	9 Dec 2003 17:30:49 -0000	1.9
+++ openacs-4/packages/simulation/www/siminst/index.adp	11 Dec 2003 13:21:53 -0000	1.10
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
@@ -11,5 +11,5 @@
   <listtemplate name="casting_sims"></listtemplate>
 </p>
 <p>
-<a href="../simplay/admin">Live Simulations</a>
+<a href="../simplay/">Live Simulations</a>
 
Index: openacs-4/packages/simulation/www/siminst/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/siminst/index.tcl	9 Dec 2003 17:30:50 -0000	1.6
+++ openacs-4/packages/simulation/www/siminst/index.tcl	11 Dec 2003 13:21:53 -0000	1.7
@@ -8,7 +8,8 @@
 
 permission::require_permission -object_id $package_id -privilege sim_inst
 set admin_p [permission::permission_p -object_id $package_id -privilege admin]
-set add_url "simulation-new"
+set base_url [apm_package_url_from_id $package_id]
+set add_url "${base_url}/siminst/simulation-new"
 
 #---------------------------------------------------------------------
 # dev_sims: simulations in development
Index: openacs-4/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/map-characters.adp	28 Nov 2003 16:55:52 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/map-characters.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/map-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/map-complete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/map-complete.adp	28 Nov 2003 09:32:26 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/map-complete.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/map-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-create.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/map-create.adp	28 Nov 2003 16:55:52 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/map-create.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">template.pretty_name</property>
Index: openacs-4/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-tasks.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/map-tasks.adp	28 Nov 2003 09:32:26 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/map-tasks.adp	11 Dec 2003 13:21:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/simulation-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/simulation-delete.adp	18 Nov 2003 09:44:32 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/simulation-delete.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/simulation-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/simulation-new.adp	2 Dec 2003 17:24:33 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/simulation-new.adp	11 Dec 2003 13:21:53 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="/packages/simulation/www/simulation-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
Index: openacs-4/packages/simulation/www/siminst/simulation-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/simulation-new.tcl	2 Dec 2003 17:24:33 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/simulation-new.tcl	11 Dec 2003 13:21:53 -0000	1.2
@@ -63,7 +63,7 @@
        workflows w
  where ss.simulation_id = w.workflow_id
    and w.object_id = :package_id
-   and ready_p = 't'
+   and ss.sim_type = 'ready_template'
 } {
     set map_url [export_vars -base "map-create" { workflow_id }]